3474 files changed, 0 insertions, 507608 deletions

diff --git a/features/org.eclipse.jst.doc.user.feature/.cvsignore b/features/org.eclipse.jst.doc.user.feature/.cvsignore
deleted file mode 100644
index de0aa9303..000000000
--- a/features/org.eclipse.jst.doc.user.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.doc.user.feature_0.7.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.doc.user.feature/.project b/features/org.eclipse.jst.doc.user.feature/.project
deleted file mode 100644
index 20b066ae8..000000000
--- a/features/org.eclipse.jst.doc.user.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.doc.isv.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.doc.user.feature/build.properties b/features/org.eclipse.jst.doc.user.feature/build.properties
deleted file mode 100644
index 5ccd634a8..000000000
--- a/features/org.eclipse.jst.doc.user.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.doc.user.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.doc.user.feature/epl-v10.html b/features/org.eclipse.jst.doc.user.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.doc.user.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.doc.user.feature/feature.properties b/features/org.eclipse.jst.doc.user.feature/feature.properties
deleted file mode 100644
index f831e7317..000000000
--- a/features/org.eclipse.jst.doc.user.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST User documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.doc.user.feature/feature.xml b/features/org.eclipse.jst.doc.user.feature/feature.xml
deleted file mode 100644
index 0d59fac02..000000000
--- a/features/org.eclipse.jst.doc.user.feature/feature.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.doc.user.feature"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName">
-   <install-handler/>
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.help"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.ejb.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.server.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.server.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.doc.user.feature/license.html b/features/org.eclipse.jst.doc.user.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.doc.user.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore b/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.project b/features/org.eclipse.jst.enterprise_core.feature/.project
deleted file mode 100644
index b522b4769..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/feature.properties
deleted file mode 100644
index 3841e6245..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST enterprise core functionality
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/feature.xml
deleted file mode 100644
index abe56da8c..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_core.feature"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
-      <import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
-      <import feature="org.eclipse.jem" version="1.2" match="equivalent"/>
-      <import feature="org.eclipse.jst.web_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jst.common_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.ws_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.uddi4j.feature" version="2.0.3" match="greaterOrEqual"/>
-      <import feature="org.eclipse.emf.ecore.sdo" version="2.2" match="equivalent"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/license.html b/features/org.eclipse.jst.enterprise_core.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f10..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 111ad159e..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise Core Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 6db92df6e..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_core.feature.source"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.jst.enterprise_core.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 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 &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea00f..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a2e..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index c3f19257e..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index f95b457f2..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49de2..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 85bf6e4bc..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore b/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
deleted file mode 100644
index 95a8d29f1..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-org.eclipse.jst.enterprise_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.project b/features/org.eclipse.jst.enterprise_sdk.feature/.project
deleted file mode 100644
index 44e698217..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties b/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
deleted file mode 100644
index cd7869f40..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-generate.feature@org.eclipse.jst.enterprise_ui.feature.source=org.eclipse.jst.enterprise_ui.feature
-
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties b/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
deleted file mode 100644
index 01f44c75a..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
deleted file mode 100644
index 52b12e999..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_sdk.feature"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.enterprise_ui.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/license.html b/features/org.eclipse.jst.enterprise_sdk.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.project b/features/org.eclipse.jst.enterprise_ui.feature/.project
deleted file mode 100644
index 956956314..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
deleted file mode 100644
index fa7d5b2c4..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST enterprise UI functionality
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
deleted file mode 100644
index 3e959d6ea..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.enterprise_userdoc.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
-      <import feature="org.eclipse.jem" version="1.2" match="equivalent"/>
-      <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
-      <import feature="org.eclipse.jdt" version="3.2" match="equivalent"/>
-      <import feature="org.eclipse.wst.rdb_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.apache.axis.feature" version="1.2.1" match="greaterOrEqual"/>
-      <import feature="org.uddi4j.feature" version="2.0.3" match="greaterOrEqual"/>
-      <import feature="org.wsdl4j.feature" version="1.4.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.common_ui.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.rdb_ui.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.server_ui.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.web_ui.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.ws_ui.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jst.enterprise_core.feature" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.ws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.navigator.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.uddiregistry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotation.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.emitter"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.xdoclet.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 2ff923484..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.enterprise_core.feature.source = org.eclipse.jst.enterprise_core.feature
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 5628c5c24..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 4f3435f83..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature.source"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.enterprise_core.feature.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.enterprise_ui.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 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 &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea00f..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a2e..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e00fafaaf..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597f9..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49de2..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index d6209ea83..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore b/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
deleted file mode 100644
index 4b5f609bf..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.enterprise_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.project b/features/org.eclipse.jst.enterprise_userdoc.feature/.project
deleted file mode 100644
index ffcfb55b8..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
deleted file mode 100644
index 6d2f0a84f..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST enterprise user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
deleted file mode 100644
index f1ad3d313..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_userdoc.feature"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.jst.ejb.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html b/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_core.feature/.cvsignore b/features/org.eclipse.jst.web_core.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_core.feature/.project b/features/org.eclipse.jst.web_core.feature/.project
deleted file mode 100644
index 5eac7ba28..000000000
--- a/features/org.eclipse.jst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_core.feature/build.properties b/features/org.eclipse.jst.web_core.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_core.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature/feature.properties b/features/org.eclipse.jst.web_core.feature/feature.properties
deleted file mode 100644
index cad8ae4e9..000000000
--- a/features/org.eclipse.jst.web_core.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST Web core functionality.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/feature.xml b/features/org.eclipse.jst.web_core.feature/feature.xml
deleted file mode 100644
index c5f3a99f0..000000000
--- a/features/org.eclipse.jst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_core.feature"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
-      <import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
-      <import feature="org.eclipse.jdt" version="3.2" match="equivalent"/>
-      <import feature="org.eclipse.jem" version="1.2" match="equivalent"/>
-      <import feature="org.eclipse.jst.common_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.wst.web_core.feature" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.controller"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.frameworks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.servlet.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/license.html b/features/org.eclipse.jst.web_core.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_core.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f10..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 5a6e37654..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Core Developer Resources
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST Web core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index d4b43781b..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_core.feature.source"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.jst.web_core.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 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 &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea00f..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a2e..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index cedcbea0d..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index f95b457f2..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49de2..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f188816f6..000000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_sdk.feature/.cvsignore b/features/org.eclipse.jst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 262183fe9..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.jst.web_sdk.feature_1.0.0.bin.dist.zip
-features
-plugins
-dev.properties
diff --git a/features/org.eclipse.jst.web_sdk.feature/.project b/features/org.eclipse.jst.web_sdk.feature/.project
deleted file mode 100644
index 0aa6f523e..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_sdk.feature/build.properties b/features/org.eclipse.jst.web_sdk.feature/build.properties
deleted file mode 100644
index c41ca06be..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-
-generate.feature@org.eclipse.jst.web_ui.feature.source=org.eclipse.jst.web_ui.feature
diff --git a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html b/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.properties b/features/org.eclipse.jst.web_sdk.feature/feature.properties
deleted file mode 100644
index a10d1e3d0..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST Web tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.xml b/features/org.eclipse.jst.web_sdk.feature/feature.xml
deleted file mode 100644
index b6aac48c3..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_sdk.feature"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.web_ui.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_sdk.feature/license.html b/features/org.eclipse.jst.web_sdk.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_sdk.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_ui.feature/.cvsignore b/features/org.eclipse.jst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature/.project b/features/org.eclipse.jst.web_ui.feature/.project
deleted file mode 100644
index 75b769791..000000000
--- a/features/org.eclipse.jst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature/build.properties b/features/org.eclipse.jst.web_ui.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.properties b/features/org.eclipse.jst.web_ui.feature/feature.properties
deleted file mode 100644
index 5d7c4c143..000000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST Web UI functionality.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.xml b/features/org.eclipse.jst.web_ui.feature/feature.xml
deleted file mode 100644
index 02d857a4b..000000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.web_userdoc.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.jst.web_core.feature" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/license.html b/features/org.eclipse.jst.web_ui.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_ui.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index a7c973f3b..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.web_core.feature.source = org.eclipse.jst.web_core.feature
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 6c55a0a7c..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for JST Web UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index c4a6adc6f..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature.source"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.web_core.feature.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.web_ui.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 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 &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 0a8aea00f..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a2e..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb7355d..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 307bab915..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597f9..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49de2..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e711acf76..000000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore b/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.project b/features/org.eclipse.jst.web_userdoc.feature/.project
deleted file mode 100644
index 56501046f..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/build.properties b/features/org.eclipse.jst.web_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694aa..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.properties b/features/org.eclipse.jst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 1cdbe4202..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST Web user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.xml b/features/org.eclipse.jst.web_userdoc.feature/feature.xml
deleted file mode 100644
index 0d179b1e3..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_userdoc.feature"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/license.html b/features/org.eclipse.jst.web_userdoc.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/plugins/org.eclipse.jem/.cvsignore b/plugins/org.eclipse.jem/.cvsignore
deleted file mode 100644
index 60463af3f..000000000
--- a/plugins/org.eclipse.jem/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/plugins/org.eclipse.jem/.options b/plugins/org.eclipse.jem/.options
deleted file mode 100644
index 493f8d482..000000000
--- a/plugins/org.eclipse.jem/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem/debug/logtrace=default
-org.eclipse.jem/debug/logtracefile=default
-org.eclipse.jem/debug/loglevel=default
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/.project b/plugins/org.eclipse.jem/.project
deleted file mode 100644
index 1575735b0..000000000
--- a/plugins/org.eclipse.jem/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem</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>
-		<buildCommand>
-			<name>com.ibm.rtp.tools.rose.builder</name>
-			<arguments>
-				<dictionary>
-					<key>rose</key>
-					<value></value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.rtp.tools.rose.toolnature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index dab32cbf9..000000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:03 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem/READ_ME_BEFORE_CHANGING_MANIFEST!!! b/plugins/org.eclipse.jem/READ_ME_BEFORE_CHANGING_MANIFEST!!!
deleted file mode 100644
index 26d6b2e81..000000000
--- a/plugins/org.eclipse.jem/READ_ME_BEFORE_CHANGING_MANIFEST!!!
+++ /dev/null
@@ -1,8 +0,0 @@
-Do not include a new dependency plugin to the MANIFEST for this plugind!!!
-
-The reason for this is that this plugin is also executed outside of Eclipse framework, such IBM Websphere Application Server (c) IBM. We cannot add
-new dependencies to the plugin because the current set is considered to be API. Adding a new set without consulting those users would break
-them.
-
-The external API is anything in the mofjava folder. If it is only for a class in the other source folder(s) it may be OK since they would not be 
-using that code. But it would be best to consult with them first.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/about.html b/plugins/org.eclipse.jem/about.html
deleted file mode 100644
index afceed0cc..000000000
--- a/plugins/org.eclipse.jem/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/about.ini b/plugins/org.eclipse.jem/about.ini
deleted file mode 100644
index 1931489a7..000000000
--- a/plugins/org.eclipse.jem/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/plugins/org.eclipse.jem/about.mappings b/plugins/org.eclipse.jem/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/plugins/org.eclipse.jem/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/about.properties b/plugins/org.eclipse.jem/about.properties
deleted file mode 100644
index 93e5168df..000000000
--- a/plugins/org.eclipse.jem/about.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/about.properties,v $
-# $Revision: 1.8 $  $Date: 2006/05/18 19:09:58 $
-#
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Java EMF Model\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/vep
diff --git a/plugins/org.eclipse.jem/build.properties b/plugins/org.eclipse.jem/build.properties
deleted file mode 100644
index 6f5781d63..000000000
--- a/plugins/org.eclipse.jem/build.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               overrides/,\
-               .options,\
-               META-INF/,\
-               .
-jars.compile.order = .
-src.includes = about.html,\
-               model/,\
-               rose/
-output.. = bin/
-source.. = mofjava/,\
-           javainst/
diff --git a/plugins/org.eclipse.jem/eclipse32.png b/plugins/org.eclipse.jem/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/plugins/org.eclipse.jem/eclipse32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java
deleted file mode 100644
index b6058ee4e..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.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
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: ImplicitAllocation.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Implicit Allocation</b></em>'.
- * <p>
- * This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm.
- * </p> 
- * @since 1.0.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent <em>Parent</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature <em>Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getImplicitAllocation()
- * @model
- * @generated
- */
-public interface ImplicitAllocation extends JavaAllocation{
-	/**
-	 * Returns the value of the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * The parent who is to give up the value.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent</em>' reference.
-	 * @see #setParent(EObject)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getImplicitAllocation_Parent()
-	 * @model required="true"
-	 * @generated
-	 */
-	EObject getParent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent <em>Parent</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent</em>' reference.
-	 * @see #getParent()
-	 * @generated
-	 */
-	void setParent(EObject value);
-
-	/**
-	 * Returns the value of the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * The feature that will be used to query the live value.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Feature</em>' reference.
-	 * @see #setFeature(EStructuralFeature)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getImplicitAllocation_Feature()
-	 * @model required="true"
-	 * @generated
-	 */
-	EStructuralFeature getFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature <em>Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Feature</em>' reference.
-	 * @see #getFeature()
-	 * @generated
-	 */
-	void setFeature(EStructuralFeature value);
-
-} // ImplicitAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java
deleted file mode 100644
index b2f8973ba..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.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
- *******************************************************************************/
-/*
- *  $RCSfile: InitStringAllocation.java,v $
- *  $Revision: 1.8 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Init String Allocation</b></em>'.
- * <p>
- * This is used when the allocation string can be parsed by the remote vm. It uses the allocString. 
- * </p>
- * @see org.eclipse.jem.internal.instantiation.JavaAllocation#getAllocString()
- * @since 1.0.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is used when the allocation string can be parsed by the remote vm. It uses the allocString.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString <em>Init String</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getInitStringAllocation()
- * @model
- * @generated
- */
-public interface InitStringAllocation extends JavaAllocation{
-	/**
-	 * Returns the value of the '<em><b>Init String</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init String</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the initialization string for this object.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Init String</em>' attribute.
-	 * @see #setInitString(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getInitStringAllocation_InitString()
-	 * @model
-	 * @generated
-	 */
-	String getInitString();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString <em>Init String</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Init String</em>' attribute.
-	 * @see #getInitString()
-	 * @generated
-	 */
-	void setInitString(String value);
-
-} // InitStringAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java
deleted file mode 100644
index 9eed1667a..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java
+++ /dev/null
@@ -1,520 +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.jem.internal.instantiation;
-/*
- *  $RCSfile: InstantiationFactory.java,v $
- *  $Revision: 1.10 $  $Date: 2005/10/28 22:56:46 $ 
- */
-
-import org.eclipse.emf.ecore.EFactory;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage
- * @generated
- */
-public interface InstantiationFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	InstantiationFactory eINSTANCE = new org.eclipse.jem.internal.instantiation.impl.InstantiationFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Init String Allocation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Init String Allocation</em>'.
-	 * @generated
-	 */
-	InitStringAllocation createInitStringAllocation();
-
-	/**
-	 * Returns a new object of class '<em>Implicit Allocation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Implicit Allocation</em>'.
-	 * @generated
-	 */
-	ImplicitAllocation createImplicitAllocation();
-
-	/**
-	 * Returns a new object of class '<em>Parse Tree Allocation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Parse Tree Allocation</em>'.
-	 * @generated
-	 */
-	ParseTreeAllocation createParseTreeAllocation();
-
-	/**
-	 * Utility to create a parse tree allocation with an expression.
-	 * 
-	 * @param expression
-	 * @return The new parse tree allocation.
-	 * 
-	 * @since 1.0.0
-	 */
-	ParseTreeAllocation createParseTreeAllocation(PTExpression expression);
-	
-	/**
-	 * Returns a new object of class '<em>PT Array Access</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Array Access</em>'.
-	 * @generated
-	 */
-	PTArrayAccess createPTArrayAccess();
-
-	/**
-	 * Utility to create a new array access with the array and indexes.
-	 * 
-	 * @param array
-	 * @param indexes list of index expressions
-	 * @return The new array access.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTArrayAccess createPTArrayAccess(PTExpression array, List indexes);
-
-	/**
-	 * Returns a new object of class '<em>PT Array Creation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Array Creation</em>'.
-	 * @generated
-	 */
-	PTArrayCreation createPTArrayCreation();
-
-	/**
-	 * Utility to create an array creation with the type, dimensions, and initializer.
-	 * 
-	 * @param type The type, e.g. <code>java.lang.String</code>.
-	 * @param dimensions The dimension expressions, <code>null</code> if no dimension expressions.
-	 * @param initializer The initializer, <code>null</code> if no initializer.
-	 * @return The new array creation.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTArrayCreation createPTArrayCreation(String type, List dimensions, PTArrayInitializer initializer);
-
-	/**
-	 * Returns a new object of class '<em>PT Array Initializer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Array Initializer</em>'.
-	 * @generated
-	 */
-	PTArrayInitializer createPTArrayInitializer();
-
-	/**
-	 * Utility to create an array initilizer with initialize expessions.
-	 * @param expressions The list of expressions, <code>null</code> if empty array initializer.
-	 * @return The new array initializer.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTArrayInitializer createPTArrayInitializer(List expressions);
-
-	/**
-	 * Returns a new object of class '<em>PT Boolean Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Boolean Literal</em>'.
-	 * @generated
-	 */
-	PTBooleanLiteral createPTBooleanLiteral();
-
-	/**
-	 * Utility to create a boolean literal with a given value.
-	 * @param booleanValue
-	 * @return The new boolean literal.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTBooleanLiteral createPTBooleanLiteral(boolean booleanValue);
-	
-	/**
-	 * Returns a new object of class '<em>PT Cast Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Cast Expression</em>'.
-	 * @generated
-	 */
-	PTCastExpression createPTCastExpression();
-
-	/**
-	 * Utility to create a new cast expression.
-	 * 
-	 * @param type The type of the expression, e.g. <code>short</code> or <code>java.lang.String</code>
-	 * @param expression The expression being cast.
-	 * @return The new cast expression.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTCastExpression createPTCastExpression(String type, PTExpression expression);
-
-	/**
-	 * Returns a new object of class '<em>PT Character Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Character Literal</em>'.
-	 * @generated
-	 */
-	PTCharacterLiteral createPTCharacterLiteral();
-
-	/**
-	 * Utility to create a new character literal.
-	 * @param escapedValue The escaped value to use.
-	 * @return The new character literal.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTCharacterLiteral createPTCharacterLiteral(String escapedValue);	
-
-	/**
-	 * Returns a new object of class '<em>PT Class Instance Creation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Class Instance Creation</em>'.
-	 * @generated
-	 */
-	PTClassInstanceCreation createPTClassInstanceCreation();
-
-	/**
-	 * Utility to create a new class instance creation.
-	 * 
-	 * @param type The type of the class, e.g. <code>java.lang.String</code>.
-	 * @param arguments The list of expressions for arguments, or <code>null</code> for no args.
-	 * @return The new class instance creation.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTClassInstanceCreation createPTClassInstanceCreation(String type, List arguments);
-
-	/**
-	 * Returns a new object of class '<em>PT Conditional Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Conditional Expression</em>'.
-	 * @generated
-	 */
-	PTConditionalExpression createPTConditionalExpression();
-
-	/**
-	 * Utility to create a new conditional expression with the condition and true/false expressions.
-	 * 
-	 * @param condition
-	 * @param trueExpressoin
-	 * @param falseExpression
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	PTConditionalExpression createPTConditionalExpression(PTExpression condition, PTExpression trueExpressoin, PTExpression falseExpression);
-
-	/**
-	 * Returns a new object of class '<em>PT Field Access</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Field Access</em>'.
-	 * @generated
-	 */
-	PTFieldAccess createPTFieldAccess();
-
-	/**
-	 * Utility to create a new field access with receiver and field name.
-	 * @param receiver The receiver expression, or <code>null</code> if none.
-	 * @param field The field name.
-	 * @return The new field access.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTFieldAccess createPTFieldAccess(PTExpression receiver, String field);	
-
-	/**
-	 * Returns a new object of class '<em>PT Infix Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Infix Expression</em>'.
-	 * @generated
-	 */
-	PTInfixExpression createPTInfixExpression();
-
-	/**
-	 * Utility to create a new infix expression with the left/right/extended operands and the operator.
-	 * @param leftOperand
-	 * @param operator
-	 * @param rightOperand
-	 * @param extendedOperands The list of extended operands, or <code>null</code> if no extended operands.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	PTInfixExpression createPTInfixExpression(PTExpression leftOperand, PTInfixOperator operator, PTExpression rightOperand, List extendedOperands);
-
-	/**
-	 * Returns a new object of class '<em>PT Instanceof</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Instanceof</em>'.
-	 * @generated
-	 */
-	PTInstanceof createPTInstanceof();
-
-	/**
-	 * Utility to create a new instance of with an operand and a type.
-	 * @param operand
-	 * @param type
-	 * @return The new instance of.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTInstanceof createPTInstanceof(PTExpression operand, String type);
-
-	/**
-	 * Returns a new object of class '<em>PT Method Invocation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Method Invocation</em>'.
-	 * @generated
-	 */
-	PTMethodInvocation createPTMethodInvocation();
-
-	/**
-	 * Utility to create a new method invocation with a receiver, name, and arguments.
-	 * 
-	 * @param receiver The receiver expression, or <code>null</code> if no receiver.
-	 * @param name The name of the method.
-	 * @param arguments The list of argument expressions, or <code>null</code> if no arguments.
-	 * @return The new method invocation.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTMethodInvocation createPTMethodInvocation(PTExpression receiver, String name, List arguments);
-
-	/**
-	 * Returns a new object of class '<em>PT Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Name</em>'.
-	 * @generated
-	 */
-	PTName createPTName();
-
-	/**
-	 * Utility to create a new name with the name.
-	 * 
-	 * @param name
-	 * @return The new name.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTName createPTName(String name);
-
-	/**
-	 * Returns a new object of class '<em>PT Null Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Null Literal</em>'.
-	 * @generated
-	 */
-	PTNullLiteral createPTNullLiteral();
-
-	/**
-	 * Returns a new object of class '<em>PT Number Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Number Literal</em>'.
-	 * @generated
-	 */
-	PTNumberLiteral createPTNumberLiteral();
-
-	/**
-	 * Utility to create a new number literal with the token.
-	 * @param token
-	 * @return The new number literal.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTNumberLiteral createPTNumberLiteral(String token);
-
-	/**
-	 * Returns a new object of class '<em>PT Parenthesized Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Parenthesized Expression</em>'.
-	 * @generated
-	 */
-	PTParenthesizedExpression createPTParenthesizedExpression();
-
-	/**
-	 * Utility to create a new parenthesized expression with the expression.
-	 * @param expression The expression that is in the parenthesis.
-	 * @return The new parenthesized expression.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTParenthesizedExpression createPTParenthesizedExpression(PTExpression expression);
-
-	/**
-	 * Returns a new object of class '<em>PT Prefix Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Prefix Expression</em>'.
-	 * @generated
-	 */
-	PTPrefixExpression createPTPrefixExpression();
-
-	/**
-	 * Utility to create a new prefix expression given an operator and expression.
-	 * @param operator
-	 * @param expression
-	 * @return The new prefix expression.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTPrefixExpression createPTPrefixExpression(PTPrefixOperator operator, PTExpression expression);
-
-	/**
-	 * Returns a new object of class '<em>PT String Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT String Literal</em>'.
-	 * @generated
-	 */
-	PTStringLiteral createPTStringLiteral();
-
-	/**
-	 * Utility to create a new string literal given the escaped literal string.
-	 * @param escapeLiteral
-	 * @return The new string literal.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTStringLiteral createPTStringLiteral(String escapeLiteral);
-
-	/**
-	 * Returns a new object of class '<em>PT This Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT This Literal</em>'.
-	 * @generated
-	 */
-	PTThisLiteral createPTThisLiteral();
-
-	/**
-	 * Returns a new object of class '<em>PT Type Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Type Literal</em>'.
-	 * @generated
-	 */
-	PTTypeLiteral createPTTypeLiteral();
-
-	/**
-	 * Utility to create a new type literal given the type.
-	 * @param type
-	 * @return The new type literal.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTTypeLiteral createPTTypeLiteral(String type);
-
-	/**
-	 * Returns a new object of class '<em>PT Invalid Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Invalid Expression</em>'.
-	 * @generated
-	 */
-	PTInvalidExpression createPTInvalidExpression();
-
-	/**
-	 * Returns a new object of class '<em>PT Instance Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Instance Reference</em>'.
-	 * @generated
-	 */
-	PTInstanceReference createPTInstanceReference();
-
-	/**
-	 * Returns a new object of class '<em>PT Anonymous Class Declaration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>PT Anonymous Class Declaration</em>'.
-	 * @generated
-	 */
-	PTAnonymousClassDeclaration createPTAnonymousClassDeclaration();
-
-	/**
-	 * Utility to create a new PTInstanceReference with a reference.
-	 * 
-	 * @param instance
-	 * @return a new object of class '<em>PT Instance Reference</em>'.
-	 * 
-	 * @since 1.2.0
-	 */
-	PTInstanceReference createPTInstanceReference(IJavaInstance instance);
-
-	/**
-	 * Utility to create a new invalid expression with a message.
-	 * @param message
-	 * @return The new invalid expression.
-	 * 
-	 * @since 1.0.0
-	 */
-	PTInvalidExpression createPTInvalidExpression(String message);
-
-	/**
-	 * Returns a new object of class '<em>Implicit Allocation</em>' as
-	 * utility with a given init string.
-	 * @param initString - String to put into initialization.
-	 * @return The allocation initialized.
-	 * 
-	 * @since 1.0.0
-	 */
-	InitStringAllocation createInitStringAllocation(String initString);
-	
-	/**
-	 * Returns a new object of class '<em>Implicit Allocation</em>' as
-	 * utility with a given parent and feature.
-	 * @param parent The source to get the value from.
-	 * @param sf The feature on the source for the value.
-	 * @return The allocation initialized.
-	 * 
-	 * @since 1.0.0
-	 */
-	ImplicitAllocation createImplicitAllocation(EObject parent, EStructuralFeature sf);
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	InstantiationPackage getInstantiationPackage();
-
-} //InstantiationFactory
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java
deleted file mode 100644
index 4f5a95fd0..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java
+++ /dev/null
@@ -1,1889 +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.jem.internal.instantiation;
-/*
- *  $RCSfile: InstantiationPackage.java,v $
- *  $Revision: 1.12 $  $Date: 2005/10/28 22:56:46 $ 
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Java Instantiation Package
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory
- * @model kind="package"
- * @generated
- */
-public interface InstantiationPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "instantiation"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/jem/internal/instantiation.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jem.internal.instantiation"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	InstantiationPackage eINSTANCE = org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.base.IJavaInstance <em>IJava Instance</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getIJavaInstance()
-	 * @generated
-	 */
-	int IJAVA_INSTANCE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>IJava Instance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IJAVA_INSTANCE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance <em>IJava Object Instance</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getIJavaObjectInstance()
-	 * @generated
-	 */
-	int IJAVA_OBJECT_INSTANCE = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance <em>IJava Data Type Instance</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getIJavaDataTypeInstance()
-	 * @generated
-	 */
-	int IJAVA_DATA_TYPE_INSTANCE = 0;
-
-
-	/**
-	 * The number of structural features of the the '<em>IJava Data Type Instance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IJAVA_DATA_TYPE_INSTANCE_FEATURE_COUNT = IJAVA_INSTANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>IJava Object Instance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IJAVA_OBJECT_INSTANCE_FEATURE_COUNT = IJAVA_INSTANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.JavaAllocationImpl <em>Java Allocation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.JavaAllocationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getJavaAllocation()
-	 * @generated
-	 */
-	int JAVA_ALLOCATION = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Java Allocation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_ALLOCATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.InitStringAllocationImpl <em>Init String Allocation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.InitStringAllocationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getInitStringAllocation()
-	 * @generated
-	 */
-	int INIT_STRING_ALLOCATION = 4;
-
-	/**
-	 * The feature id for the '<em><b>Init String</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_STRING_ALLOCATION__INIT_STRING = JAVA_ALLOCATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Init String Allocation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_STRING_ALLOCATION_FEATURE_COUNT = JAVA_ALLOCATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl <em>Implicit Allocation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getImplicitAllocation()
-	 * @generated
-	 */
-	int IMPLICIT_ALLOCATION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLICIT_ALLOCATION__PARENT = JAVA_ALLOCATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLICIT_ALLOCATION__FEATURE = JAVA_ALLOCATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Implicit Allocation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLICIT_ALLOCATION_FEATURE_COUNT = JAVA_ALLOCATION_FEATURE_COUNT + 2;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.ParseTreeAllocationImpl <em>Parse Tree Allocation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.ParseTreeAllocationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getParseTreeAllocation()
-	 * @generated
-	 */
-	int PARSE_TREE_ALLOCATION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARSE_TREE_ALLOCATION__EXPRESSION = JAVA_ALLOCATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Parse Tree Allocation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARSE_TREE_ALLOCATION_FEATURE_COUNT = JAVA_ALLOCATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTExpressionImpl <em>PT Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTExpression()
-	 * @generated
-	 */
-	int PT_EXPRESSION = 7;
-
-	/**
-	 * The number of structural features of the the '<em>PT Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_EXPRESSION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl <em>PT Array Access</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTArrayAccess()
-	 * @generated
-	 */
-	int PT_ARRAY_ACCESS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Array</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_ACCESS__ARRAY = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_ACCESS__INDEXES = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Array Access</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_ACCESS_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl <em>PT Array Creation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTArrayCreation()
-	 * @generated
-	 */
-	int PT_ARRAY_CREATION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_CREATION__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Dimensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_CREATION__DIMENSIONS = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Initializer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_CREATION__INITIALIZER = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>PT Array Creation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_CREATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTArrayInitializerImpl <em>PT Array Initializer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTArrayInitializerImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTArrayInitializer()
-	 * @generated
-	 */
-	int PT_ARRAY_INITIALIZER = 10;
-
-	/**
-	 * The feature id for the '<em><b>Expressions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_INITIALIZER__EXPRESSIONS = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Array Initializer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ARRAY_INITIALIZER_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTBooleanLiteralImpl <em>PT Boolean Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTBooleanLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTBooleanLiteral()
-	 * @generated
-	 */
-	int PT_BOOLEAN_LITERAL = 11;
-
-	/**
-	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_BOOLEAN_LITERAL__BOOLEAN_VALUE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Boolean Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_BOOLEAN_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl <em>PT Cast Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTCastExpression()
-	 * @generated
-	 */
-	int PT_CAST_EXPRESSION = 12;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CAST_EXPRESSION__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CAST_EXPRESSION__EXPRESSION = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Cast Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CAST_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl <em>PT Character Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTCharacterLiteral()
-	 * @generated
-	 */
-	int PT_CHARACTER_LITERAL = 13;
-
-	/**
-	 * The feature id for the '<em><b>Escaped Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CHARACTER_LITERAL__ESCAPED_VALUE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Char Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CHARACTER_LITERAL__CHAR_VALUE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Character Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CHARACTER_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl <em>PT Class Instance Creation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTClassInstanceCreation()
-	 * @generated
-	 */
-	int PT_CLASS_INSTANCE_CREATION = 14;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CLASS_INSTANCE_CREATION__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Arguments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CLASS_INSTANCE_CREATION__ARGUMENTS = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Class Instance Creation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CLASS_INSTANCE_CREATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl <em>PT Conditional Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTConditionalExpression()
-	 * @generated
-	 */
-	int PT_CONDITIONAL_EXPRESSION = 15;
-
-	/**
-	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CONDITIONAL_EXPRESSION__CONDITION = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>True</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CONDITIONAL_EXPRESSION__TRUE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>False</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CONDITIONAL_EXPRESSION__FALSE = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>PT Conditional Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_CONDITIONAL_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl <em>PT Field Access</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTFieldAccess()
-	 * @generated
-	 */
-	int PT_FIELD_ACCESS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Receiver</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_FIELD_ACCESS__RECEIVER = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_FIELD_ACCESS__FIELD = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Field Access</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_FIELD_ACCESS_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl <em>PT Infix Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInfixExpression()
-	 * @generated
-	 */
-	int PT_INFIX_EXPRESSION = 17;
-
-	/**
-	 * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INFIX_EXPRESSION__LEFT_OPERAND = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INFIX_EXPRESSION__OPERATOR = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Right Operand</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INFIX_EXPRESSION__RIGHT_OPERAND = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Extended Operands</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INFIX_EXPRESSION__EXTENDED_OPERANDS = PT_EXPRESSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>PT Infix Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INFIX_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl <em>PT Instanceof</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInstanceof()
-	 * @generated
-	 */
-	int PT_INSTANCEOF = 18;
-
-	/**
-	 * The feature id for the '<em><b>Operand</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INSTANCEOF__OPERAND = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INSTANCEOF__TYPE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Instanceof</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INSTANCEOF_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl <em>PT Method Invocation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTMethodInvocation()
-	 * @generated
-	 */
-	int PT_METHOD_INVOCATION = 19;
-
-	/**
-	 * The feature id for the '<em><b>Receiver</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_METHOD_INVOCATION__RECEIVER = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_METHOD_INVOCATION__NAME = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Arguments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_METHOD_INVOCATION__ARGUMENTS = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>PT Method Invocation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_METHOD_INVOCATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTNameImpl <em>PT Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTNameImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTName()
-	 * @generated
-	 */
-	int PT_NAME = 20;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_NAME__NAME = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_NAME_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTNullLiteralImpl <em>PT Null Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTNullLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTNullLiteral()
-	 * @generated
-	 */
-	int PT_NULL_LITERAL = 21;
-
-	/**
-	 * The number of structural features of the the '<em>PT Null Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_NULL_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTNumberLiteralImpl <em>PT Number Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTNumberLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTNumberLiteral()
-	 * @generated
-	 */
-	int PT_NUMBER_LITERAL = 22;
-
-	/**
-	 * The feature id for the '<em><b>Token</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_NUMBER_LITERAL__TOKEN = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Number Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_NUMBER_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTParenthesizedExpressionImpl <em>PT Parenthesized Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTParenthesizedExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTParenthesizedExpression()
-	 * @generated
-	 */
-	int PT_PARENTHESIZED_EXPRESSION = 23;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_PARENTHESIZED_EXPRESSION__EXPRESSION = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Parenthesized Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_PARENTHESIZED_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl <em>PT Prefix Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTPrefixExpression()
-	 * @generated
-	 */
-	int PT_PREFIX_EXPRESSION = 24;
-
-	/**
-	 * The feature id for the '<em><b>Operator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_PREFIX_EXPRESSION__OPERATOR = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_PREFIX_EXPRESSION__EXPRESSION = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Prefix Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_PREFIX_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl <em>PT String Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTStringLiteral()
-	 * @generated
-	 */
-	int PT_STRING_LITERAL = 25;
-
-	/**
-	 * The feature id for the '<em><b>Escaped Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_STRING_LITERAL__ESCAPED_VALUE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Literal Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_STRING_LITERAL__LITERAL_VALUE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT String Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_STRING_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTThisLiteralImpl <em>PT This Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTThisLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTThisLiteral()
-	 * @generated
-	 */
-	int PT_THIS_LITERAL = 26;
-
-	/**
-	 * The number of structural features of the the '<em>PT This Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_THIS_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTTypeLiteralImpl <em>PT Type Literal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTTypeLiteralImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTTypeLiteral()
-	 * @generated
-	 */
-	int PT_TYPE_LITERAL = 27;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_TYPE_LITERAL__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Type Literal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_TYPE_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInvalidExpressionImpl <em>PT Invalid Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTInvalidExpressionImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInvalidExpression()
-	 * @generated
-	 */
-	int PT_INVALID_EXPRESSION = 28;
-
-	/**
-	 * The feature id for the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INVALID_EXPRESSION__MESSAGE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Invalid Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INVALID_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceReferenceImpl <em>PT Instance Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTInstanceReferenceImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInstanceReference()
-	 * @generated
-	 */
-	int PT_INSTANCE_REFERENCE = 29;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INSTANCE_REFERENCE__REFERENCE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>PT Instance Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INSTANCE_REFERENCE_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl <em>PT Anonymous Class Declaration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTAnonymousClassDeclaration()
-	 * @generated
-	 */
-	int PT_ANONYMOUS_CLASS_DECLARATION = 30;
-
-	/**
-	 * The feature id for the '<em><b>Declaration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION = PT_EXPRESSION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Imports</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS = PT_EXPRESSION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>PT Anonymous Class Declaration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_ANONYMOUS_CLASS_DECLARATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.PTInfixOperator <em>PT Infix Operator</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInfixOperator()
-	 * @generated
-	 */
-	int PT_INFIX_OPERATOR = 31;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.PTPrefixOperator <em>PT Prefix Operator</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
-	 * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTPrefixOperator()
-	 * @generated
-	 */
-	int PT_PREFIX_OPERATOR = 32;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance <em>IJava Object Instance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IJava Object Instance</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance
-	 * @model instanceClass="org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance"
-	 * @generated
-	 */
-	EClass getIJavaObjectInstance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.JavaAllocation <em>Java Allocation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Java Allocation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.JavaAllocation
-	 * @generated
-	 */
-	EClass getJavaAllocation();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.InitStringAllocation <em>Init String Allocation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Init String Allocation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.InitStringAllocation
-	 * @generated
-	 */
-	EClass getInitStringAllocation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString <em>Init String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Init String</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString()
-	 * @see #getInitStringAllocation()
-	 * @generated
-	 */
-	EAttribute getInitStringAllocation_InitString();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation <em>Implicit Allocation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Implicit Allocation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation
-	 * @generated
-	 */
-	EClass getImplicitAllocation();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent <em>Parent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Parent</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent()
-	 * @see #getImplicitAllocation()
-	 * @generated
-	 */
-	EReference getImplicitAllocation_Parent();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Feature</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature()
-	 * @see #getImplicitAllocation()
-	 * @generated
-	 */
-	EReference getImplicitAllocation_Feature();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation <em>Parse Tree Allocation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Parse Tree Allocation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.ParseTreeAllocation
-	 * @generated
-	 */
-	EClass getParseTreeAllocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression()
-	 * @see #getParseTreeAllocation()
-	 * @generated
-	 */
-	EReference getParseTreeAllocation_Expression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTExpression <em>PT Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTExpression
-	 * @generated
-	 */
-	EClass getPTExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess <em>PT Array Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Array Access</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayAccess
-	 * @generated
-	 */
-	EClass getPTArrayAccess();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray <em>Array</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Array</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray()
-	 * @see #getPTArrayAccess()
-	 * @generated
-	 */
-	EReference getPTArrayAccess_Array();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getIndexes <em>Indexes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Indexes</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayAccess#getIndexes()
-	 * @see #getPTArrayAccess()
-	 * @generated
-	 */
-	EReference getPTArrayAccess_Indexes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation <em>PT Array Creation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Array Creation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayCreation
-	 * @generated
-	 */
-	EClass getPTArrayCreation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayCreation#getType()
-	 * @see #getPTArrayCreation()
-	 * @generated
-	 */
-	EAttribute getPTArrayCreation_Type();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getDimensions <em>Dimensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Dimensions</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayCreation#getDimensions()
-	 * @see #getPTArrayCreation()
-	 * @generated
-	 */
-	EReference getPTArrayCreation_Dimensions();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer <em>Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Initializer</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer()
-	 * @see #getPTArrayCreation()
-	 * @generated
-	 */
-	EReference getPTArrayCreation_Initializer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTArrayInitializer <em>PT Array Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Array Initializer</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayInitializer
-	 * @generated
-	 */
-	EClass getPTArrayInitializer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTArrayInitializer#getExpressions <em>Expressions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Expressions</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTArrayInitializer#getExpressions()
-	 * @see #getPTArrayInitializer()
-	 * @generated
-	 */
-	EReference getPTArrayInitializer_Expressions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral <em>PT Boolean Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Boolean Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTBooleanLiteral
-	 * @generated
-	 */
-	EClass getPTBooleanLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue <em>Boolean Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Boolean Value</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue()
-	 * @see #getPTBooleanLiteral()
-	 * @generated
-	 */
-	EAttribute getPTBooleanLiteral_BooleanValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTCastExpression <em>PT Cast Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Cast Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTCastExpression
-	 * @generated
-	 */
-	EClass getPTCastExpression();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTCastExpression#getType()
-	 * @see #getPTCastExpression()
-	 * @generated
-	 */
-	EAttribute getPTCastExpression_Type();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression()
-	 * @see #getPTCastExpression()
-	 * @generated
-	 */
-	EReference getPTCastExpression_Expression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral <em>PT Character Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Character Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTCharacterLiteral
-	 * @generated
-	 */
-	EClass getPTCharacterLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue <em>Escaped Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Escaped Value</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue()
-	 * @see #getPTCharacterLiteral()
-	 * @generated
-	 */
-	EAttribute getPTCharacterLiteral_EscapedValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue <em>Char Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Char Value</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue()
-	 * @see #getPTCharacterLiteral()
-	 * @generated
-	 */
-	EAttribute getPTCharacterLiteral_CharValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation <em>PT Class Instance Creation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Class Instance Creation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTClassInstanceCreation
-	 * @generated
-	 */
-	EClass getPTClassInstanceCreation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType()
-	 * @see #getPTClassInstanceCreation()
-	 * @generated
-	 */
-	EAttribute getPTClassInstanceCreation_Type();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getArguments <em>Arguments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Arguments</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getArguments()
-	 * @see #getPTClassInstanceCreation()
-	 * @generated
-	 */
-	EReference getPTClassInstanceCreation_Arguments();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression <em>PT Conditional Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Conditional Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression
-	 * @generated
-	 */
-	EClass getPTConditionalExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition <em>Condition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Condition</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition()
-	 * @see #getPTConditionalExpression()
-	 * @generated
-	 */
-	EReference getPTConditionalExpression_Condition();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue <em>True</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>True</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue()
-	 * @see #getPTConditionalExpression()
-	 * @generated
-	 */
-	EReference getPTConditionalExpression_True();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse <em>False</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>False</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse()
-	 * @see #getPTConditionalExpression()
-	 * @generated
-	 */
-	EReference getPTConditionalExpression_False();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess <em>PT Field Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Field Access</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTFieldAccess
-	 * @generated
-	 */
-	EClass getPTFieldAccess();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver <em>Receiver</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Receiver</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver()
-	 * @see #getPTFieldAccess()
-	 * @generated
-	 */
-	EReference getPTFieldAccess_Receiver();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getField <em>Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTFieldAccess#getField()
-	 * @see #getPTFieldAccess()
-	 * @generated
-	 */
-	EAttribute getPTFieldAccess_Field();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression <em>PT Infix Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Infix Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixExpression
-	 * @generated
-	 */
-	EClass getPTInfixExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand <em>Left Operand</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Left Operand</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand()
-	 * @see #getPTInfixExpression()
-	 * @generated
-	 */
-	EReference getPTInfixExpression_LeftOperand();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Operator</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator()
-	 * @see #getPTInfixExpression()
-	 * @generated
-	 */
-	EAttribute getPTInfixExpression_Operator();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand <em>Right Operand</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Right Operand</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand()
-	 * @see #getPTInfixExpression()
-	 * @generated
-	 */
-	EReference getPTInfixExpression_RightOperand();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getExtendedOperands <em>Extended Operands</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extended Operands</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getExtendedOperands()
-	 * @see #getPTInfixExpression()
-	 * @generated
-	 */
-	EReference getPTInfixExpression_ExtendedOperands();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInstanceof <em>PT Instanceof</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Instanceof</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInstanceof
-	 * @generated
-	 */
-	EClass getPTInstanceof();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand <em>Operand</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Operand</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand()
-	 * @see #getPTInstanceof()
-	 * @generated
-	 */
-	EReference getPTInstanceof_Operand();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInstanceof#getType()
-	 * @see #getPTInstanceof()
-	 * @generated
-	 */
-	EAttribute getPTInstanceof_Type();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation <em>PT Method Invocation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Method Invocation</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation
-	 * @generated
-	 */
-	EClass getPTMethodInvocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver <em>Receiver</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Receiver</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver()
-	 * @see #getPTMethodInvocation()
-	 * @generated
-	 */
-	EReference getPTMethodInvocation_Receiver();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName()
-	 * @see #getPTMethodInvocation()
-	 * @generated
-	 */
-	EAttribute getPTMethodInvocation_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getArguments <em>Arguments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Arguments</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation#getArguments()
-	 * @see #getPTMethodInvocation()
-	 * @generated
-	 */
-	EReference getPTMethodInvocation_Arguments();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTName <em>PT Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Name</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTName
-	 * @generated
-	 */
-	EClass getPTName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTName#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTName#getName()
-	 * @see #getPTName()
-	 * @generated
-	 */
-	EAttribute getPTName_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTNullLiteral <em>PT Null Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Null Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTNullLiteral
-	 * @generated
-	 */
-	EClass getPTNullLiteral();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral <em>PT Number Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Number Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTNumberLiteral
-	 * @generated
-	 */
-	EClass getPTNumberLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken <em>Token</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Token</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken()
-	 * @see #getPTNumberLiteral()
-	 * @generated
-	 */
-	EAttribute getPTNumberLiteral_Token();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression <em>PT Parenthesized Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Parenthesized Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTParenthesizedExpression
-	 * @generated
-	 */
-	EClass getPTParenthesizedExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression()
-	 * @see #getPTParenthesizedExpression()
-	 * @generated
-	 */
-	EReference getPTParenthesizedExpression_Expression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression <em>PT Prefix Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Prefix Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixExpression
-	 * @generated
-	 */
-	EClass getPTPrefixExpression();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator <em>Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Operator</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator()
-	 * @see #getPTPrefixExpression()
-	 * @generated
-	 */
-	EAttribute getPTPrefixExpression_Operator();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression()
-	 * @see #getPTPrefixExpression()
-	 * @generated
-	 */
-	EReference getPTPrefixExpression_Expression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral <em>PT String Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT String Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTStringLiteral
-	 * @generated
-	 */
-	EClass getPTStringLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue <em>Escaped Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Escaped Value</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue()
-	 * @see #getPTStringLiteral()
-	 * @generated
-	 */
-	EAttribute getPTStringLiteral_EscapedValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue <em>Literal Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Literal Value</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue()
-	 * @see #getPTStringLiteral()
-	 * @generated
-	 */
-	EAttribute getPTStringLiteral_LiteralValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTThisLiteral <em>PT This Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT This Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTThisLiteral
-	 * @generated
-	 */
-	EClass getPTThisLiteral();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral <em>PT Type Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Type Literal</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTTypeLiteral
-	 * @generated
-	 */
-	EClass getPTTypeLiteral();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType()
-	 * @see #getPTTypeLiteral()
-	 * @generated
-	 */
-	EAttribute getPTTypeLiteral_Type();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression <em>PT Invalid Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Invalid Expression</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInvalidExpression
-	 * @generated
-	 */
-	EClass getPTInvalidExpression();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage <em>Message</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage()
-	 * @see #getPTInvalidExpression()
-	 * @generated
-	 */
-	EAttribute getPTInvalidExpression_Message();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference <em>PT Instance Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Instance Reference</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInstanceReference
-	 * @generated
-	 */
-	EClass getPTInstanceReference();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference <em>Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Reference</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference()
-	 * @see #getPTInstanceReference()
-	 * @generated
-	 */
-	EReference getPTInstanceReference_Reference();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration <em>PT Anonymous Class Declaration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>PT Anonymous Class Declaration</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration
-	 * @generated
-	 */
-	EClass getPTAnonymousClassDeclaration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration <em>Declaration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Declaration</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration()
-	 * @see #getPTAnonymousClassDeclaration()
-	 * @generated
-	 */
-	EAttribute getPTAnonymousClassDeclaration_Declaration();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getImports <em>Imports</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Imports</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getImports()
-	 * @see #getPTAnonymousClassDeclaration()
-	 * @generated
-	 */
-	EAttribute getPTAnonymousClassDeclaration_Imports();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jem.internal.instantiation.PTInfixOperator <em>PT Infix Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>PT Infix Operator</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
-	 * @generated
-	 */
-	EEnum getPTInfixOperator();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jem.internal.instantiation.PTPrefixOperator <em>PT Prefix Operator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>PT Prefix Operator</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
-	 * @generated
-	 */
-	EEnum getPTPrefixOperator();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance <em>IJava Data Type Instance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IJava Data Type Instance</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance
-	 * @model instanceClass="org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance"
-	 * @generated
-	 */
-	EClass getIJavaDataTypeInstance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.base.IJavaInstance <em>IJava Instance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IJava Instance</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance
-	 * @model instanceClass="org.eclipse.jem.internal.instantiation.base.IJavaInstance"
-	 * @generated
-	 */
-	EClass getIJavaInstance();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	InstantiationFactory getInstantiationFactory();
-
-} //InstantiationPackage
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java
deleted file mode 100644
index 75529f431..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java
+++ /dev/null
@@ -1,54 +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.jem.internal.instantiation;
-/*
- *  $RCSfile: JavaAllocation.java,v $
- *  $Revision: 1.7 $  $Date: 2005/10/03 19:20:41 $ 
- */
- 
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Allocation</b></em>'.
- * <p>
- * This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized.
- * </p>
- * @since 1.0.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getJavaAllocation()
- * @model abstract="true"
- * @generated
- */
-public interface JavaAllocation extends EObject{
-	
-	/**
-	 * Answer whether the allocation is a parse tree allocation.
-	 * @return <code>true</code> if parse tree allocation
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isParseTree();
-	
-	/**
-	 * Answer whether the allocation is an implicit allocation.
-	 * @return <code>true</code> if implicit allocation
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isImplicit();
-} // JavaAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTAnonymousClassDeclaration.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTAnonymousClassDeclaration.java
deleted file mode 100644
index 2eb6b8a9f..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTAnonymousClassDeclaration.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PTAnonymousClassDeclaration.java,v 1.1 2005/10/28 22:56:46 rkulp Exp $
- */
-package org.eclipse.jem.internal.instantiation;
-
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>PT Anonymous Class Declaration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An anonymous class declaration. Currently we only store the 
- * entire declaration as a string, including the "new AClass() {...}".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration <em>Declaration</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getImports <em>Imports</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTAnonymousClassDeclaration()
- * @model
- * @generated
- */
-public interface PTAnonymousClassDeclaration extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Declaration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The declaration text.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Declaration</em>' attribute.
-	 * @see #setDeclaration(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTAnonymousClassDeclaration_Declaration()
-	 * @model
-	 * @generated
-	 */
-	String getDeclaration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration <em>Declaration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Declaration</em>' attribute.
-	 * @see #getDeclaration()
-	 * @generated
-	 */
-	void setDeclaration(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Imports</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the imports needed in the main class by this declaration. This is a transient attribute. It is not serialized, nor is it parsed into from existing code. Its only purpose is to help code generation on a brand new declaration to know what imports should be added to the main class.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Imports</em>' attribute list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTAnonymousClassDeclaration_Imports()
-	 * @model type="java.lang.String" transient="true"
-	 * @generated
-	 */
-	EList getImports();
-
-} // PTAnonymousClassDeclaration
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java
deleted file mode 100644
index ab68fa6f9..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTArrayAccess.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Access</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Array access. e.g. x[3]. 
- * 
- * Unlike AST, the entire expression of type x[3][4] will be done in one expression rather than having a separate ArrayAccess for each dimension. This is just a simplification. This can only be used if it is a simple array access where it is of the form {expression}[expression][expression].
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray <em>Array</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getIndexes <em>Indexes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayAccess()
- * @model
- * @generated
- */
-public interface PTArrayAccess extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Array</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The expression representing the array to access.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Array</em>' containment reference.
-	 * @see #setArray(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayAccess_Array()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getArray();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray <em>Array</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Array</em>' containment reference.
-	 * @see #getArray()
-	 * @generated
-	 */
-	void setArray(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The expressions representing the indexes of the access.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Indexes</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayAccess_Indexes()
-	 * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true" required="true"
-	 * @generated
-	 */
-	EList getIndexes();
-
-} // ArrayAccess
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java
deleted file mode 100644
index a84740b6f..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTArrayCreation.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Creation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Array Creation expression, e.g. new int[3] or new java.langString[][] {{"a"}, {"b"}}
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getDimensions <em>Dimensions</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer <em>Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation()
- * @model
- * @generated
- */
-public interface PTArrayCreation extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The fully-qualified type, e.g. int[][] or java.lang.String[], including the number of dimension brackets.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Dimensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The list of expressions for the dimensions. You can have [3][4][] but [][33] is invalid. So for each dimension that has an expression, there will be an entry in the list, in the correct order. When you reach the empty dimensions, the list will end too. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Dimensions</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation_Dimensions()
-	 * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
-	 * @generated
-	 */
-	EList getDimensions();
-
-	/**
-	 * Returns the value of the '<em><b>Initializer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the initializer, if any, for this array. E.g. new int[] {2,3}. It is the {2,3}.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Initializer</em>' containment reference.
-	 * @see #setInitializer(PTArrayInitializer)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation_Initializer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTArrayInitializer getInitializer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer <em>Initializer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Initializer</em>' containment reference.
-	 * @see #getInitializer()
-	 * @generated
-	 */
-	void setInitializer(PTArrayInitializer value);
-
-} // ArrayCreation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java
deleted file mode 100644
index bfaaa4e2f..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTArrayInitializer.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Initializer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Array initialization expression. This is the entire expression, e.g. {2, 3}, or {{2,3}, 4}. In the second case, the {2,3} will be an ArrayInitializer contained within the expressions list for the top ArrayInitializer.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTArrayInitializer#getExpressions <em>Expressions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayInitializer()
- * @model
- * @generated
- */
-public interface PTArrayInitializer extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Expressions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This isthe list of expressions within the initializer, e.g. {2, 3}, or {{2,3}, 4}. In the first case it will be two NumberLiterals. In the second case, the {2,3} will be an ArrayInitializer, followed by a NumberLiteral.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expressions</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayInitializer_Expressions()
-	 * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
-	 * @generated
-	 */
-	EList getExpressions();
-
-} // ArrayInitializer
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java
deleted file mode 100644
index 4ad258d69..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTBooleanLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a primitive boolean literal, i.e. true or false directly in the code.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue <em>Boolean Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTBooleanLiteral()
- * @model
- * @generated
- */
-public interface PTBooleanLiteral extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of the literal.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Boolean Value</em>' attribute.
-	 * @see #setBooleanValue(boolean)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTBooleanLiteral_BooleanValue()
-	 * @model
-	 * @generated
-	 */
-	boolean isBooleanValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Boolean Value</em>' attribute.
-	 * @see #isBooleanValue()
-	 * @generated
-	 */
-	void setBooleanValue(boolean value);
-
-} // BooleanLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java
deleted file mode 100644
index f34a37385..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTCastExpression.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cast</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Cast expression, e.g. (short) 10
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCastExpression()
- * @model
- * @generated
- */
-public interface PTCastExpression extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the fully-qualified type of the cast, e.g. int or java.lang.String
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCastExpression_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The expression being casted.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expression</em>' containment reference.
-	 * @see #setExpression(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCastExpression_Expression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(PTExpression value);
-
-} // Cast
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java
deleted file mode 100644
index bc37ec5b7..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTCharacterLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Character Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a primitive character expression, e.g. 'a' or '\r'.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue <em>Escaped Value</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue <em>Char Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCharacterLiteral()
- * @model
- * @generated
- */
-public interface PTCharacterLiteral extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Escaped Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the escaped character. In other words the literal exactly as it is in the java file. E.g. 'a' or '\r'. Including the surrounding single quotes themselves.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Escaped Value</em>' attribute.
-	 * @see #setEscapedValue(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCharacterLiteral_EscapedValue()
-	 * @model
-	 * @generated
-	 */
-	String getEscapedValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Escaped Value</em>' attribute.
-	 * @see #getEscapedValue()
-	 * @generated
-	 */
-	void setEscapedValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Char Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual primitive character without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Char Value</em>' attribute.
-	 * @see #setCharValue(char)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCharacterLiteral_CharValue()
-	 * @model transient="true"
-	 * @generated
-	 */
-	char getCharValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue <em>Char Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Char Value</em>' attribute.
-	 * @see #getCharValue()
-	 * @generated
-	 */
-	void setCharValue(char value);
-
-} // CharacterLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java
deleted file mode 100644
index e3da3c755..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTClassInstanceCreation.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Class Instance Creation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Class instance creation expression. E.g. new String("a")
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTClassInstanceCreation()
- * @model
- * @generated
- */
-public interface PTClassInstanceCreation extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the type of the class. E.g. java.lang.String. This should be fully-qualified for allocation purposes. It should also be in reflection format, i.e. if X is an inner class of j.Y, then the type here should be "j.Y$X". 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTClassInstanceCreation_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Arguments</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The arguments to the constructor.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Arguments</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTClassInstanceCreation_Arguments()
-	 * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
-	 * @generated
-	 */
-	EList getArguments();
-
-} // ClassInstanceCreation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java
deleted file mode 100644
index eab051719..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTConditionalExpression.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Conditional Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The test Expresson, e.g. (x=3) ? 1 : 2
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue <em>True</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse <em>False</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression()
- * @model
- * @generated
- */
-public interface PTConditionalExpression extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The condition expression.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Condition</em>' containment reference.
-	 * @see #setCondition(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression_Condition()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getCondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition <em>Condition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Condition</em>' containment reference.
-	 * @see #getCondition()
-	 * @generated
-	 */
-	void setCondition(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>True</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The true expression
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>True</em>' containment reference.
-	 * @see #setTrue(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression_True()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getTrue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue <em>True</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>True</em>' containment reference.
-	 * @see #getTrue()
-	 * @generated
-	 */
-	void setTrue(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>False</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The false expression.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>False</em>' containment reference.
-	 * @see #setFalse(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression_False()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getFalse();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse <em>False</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>False</em>' containment reference.
-	 * @see #getFalse()
-	 * @generated
-	 */
-	void setFalse(PTExpression value);
-
-} // ConditionalExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java
deleted file mode 100644
index 9b716ef36..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTExpression.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTExpression()
- * @model abstract="true"
- * @generated
- */
-public interface PTExpression extends EObject{
-	/**
-	 * Accepts the given visitor on a visit of the current node.
-	 * 
-	 * @param visitor the visitor object
-	 * @exception IllegalArgumentException if the visitor is null
-	 */
-	public void accept(ParseVisitor visitor);
-} // Expression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java
deleted file mode 100644
index f8f76c072..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTFieldAccess.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Field Access</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Access a field expression, e.g. java.awt.Color.red
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver <em>Receiver</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTFieldAccess()
- * @model
- * @generated
- */
-public interface PTFieldAccess extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Receiver</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The expression representing the object that the field is in, e.g. java.awt.Color.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Receiver</em>' containment reference.
-	 * @see #setReceiver(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTFieldAccess_Receiver()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getReceiver();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver <em>Receiver</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Receiver</em>' containment reference.
-	 * @see #getReceiver()
-	 * @generated
-	 */
-	void setReceiver(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Field</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the field being accessed, e.g. red.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field</em>' attribute.
-	 * @see #setField(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTFieldAccess_Field()
-	 * @model
-	 * @generated
-	 */
-	String getField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getField <em>Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field</em>' attribute.
-	 * @see #getField()
-	 * @generated
-	 */
-	void setField(String value);
-
-} // FieldAccess
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java
deleted file mode 100644
index 6a81b66ae..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTInfixExpression.java,v $
- *  $Revision: 1.5 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Infix Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An expression with an operator that has two operands, e.g. 3 + 4.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand <em>Left Operand</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand <em>Right Operand</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getExtendedOperands <em>Extended Operands</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression()
- * @model
- * @generated
- */
-public interface PTInfixExpression extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Left Operand</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Left Operand</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Left Operand</em>' containment reference.
-	 * @see #setLeftOperand(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_LeftOperand()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getLeftOperand();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand <em>Left Operand</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Left Operand</em>' containment reference.
-	 * @see #getLeftOperand()
-	 * @generated
-	 */
-	void setLeftOperand(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jem.internal.instantiation.PTInfixOperator}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The operator, e.g. +
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Operator</em>' attribute.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
-	 * @see #setOperator(PTInfixOperator)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_Operator()
-	 * @model
-	 * @generated
-	 */
-	PTInfixOperator getOperator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Operator</em>' attribute.
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
-	 * @see #getOperator()
-	 * @generated
-	 */
-	void setOperator(PTInfixOperator value);
-
-	/**
-	 * Returns the value of the '<em><b>Right Operand</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The right expression. i.e. 4 of "3 + 4"
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Right Operand</em>' containment reference.
-	 * @see #setRightOperand(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_RightOperand()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getRightOperand();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand <em>Right Operand</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Right Operand</em>' containment reference.
-	 * @see #getRightOperand()
-	 * @generated
-	 */
-	void setRightOperand(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Extended Operands</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Used when there are a series of infix operations of the same operator, e.g. 1 + 2 + 3 + 4. 1 and 2 will go into left and right, while {3, 4} will go into the extended operands. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Operands</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_ExtendedOperands()
-	 * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
-	 * @generated
-	 */
-	EList getExtendedOperands();
-
-	/**
-	 * Compress the expression
-	 * If there is no left operand and a right operand, or vice versa, and no extended operands
-	 * return the remaining single operand
-	 * If there is no left operand and a right and some extended ones shuffle everything along
-	 * so that the right becomes the left and the first extended moves into the right
-	 * or if no right and a left then just move the first extended into the right
-	 * 
-	 * @since 1.0.0
-	 */
-	PTExpression asCompressedExpression();
-
-} // InfixExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java
deleted file mode 100644
index 58af728c9..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTInfixOperator.java,v $
- *  $Revision: 1.5 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Infix Operator</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Enumerator for the operator on an InfixExpression.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixOperator()
- * @model
- * @generated
- */
-public final class PTInfixOperator extends AbstractEnumerator {
-	/**
-	 * The '<em><b>TIMES</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * * operator
-	 * <!-- end-model-doc -->
-	 * @see #TIMES_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIMES = 0;
-
-	/**
-	 * The '<em><b>DIVIDE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * / operator
-	 * <!-- end-model-doc -->
-	 * @see #DIVIDE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DIVIDE = 1;
-
-	/**
-	 * The '<em><b>REMAINDER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * % operator
-	 * <!-- end-model-doc -->
-	 * @see #REMAINDER_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REMAINDER = 2;
-
-	/**
-	 * The '<em><b>PLUS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * + operator
-	 * <!-- end-model-doc -->
-	 * @see #PLUS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PLUS = 3;
-
-	/**
-	 * The '<em><b>MINUS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * - operator
-	 * <!-- end-model-doc -->
-	 * @see #MINUS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MINUS = 4;
-
-	/**
-	 * The '<em><b>LEFT SHIFT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * << operator
-	 * <!-- end-model-doc -->
-	 * @see #LEFT_SHIFT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LEFT_SHIFT = 5;
-
-	/**
-	 * The '<em><b>RIGHT SHIFT SIGNED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * >> operator
-	 * <!-- end-model-doc -->
-	 * @see #RIGHT_SHIFT_SIGNED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RIGHT_SHIFT_SIGNED = 6;
-
-	/**
-	 * The '<em><b>RIGHT SHIFT UNSIGNED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * >>> operator
-	 * <!-- end-model-doc -->
-	 * @see #RIGHT_SHIFT_UNSIGNED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RIGHT_SHIFT_UNSIGNED = 7;
-
-	/**
-	 * The '<em><b>LESS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * <  operator
-	 * <!-- end-model-doc -->
-	 * @see #LESS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LESS = 8;
-
-	/**
-	 * The '<em><b>GREATER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * > operator
-	 * <!-- end-model-doc -->
-	 * @see #GREATER_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREATER = 9;
-
-	/**
-	 * The '<em><b>LESS EQUALS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * <= operator
-	 * <!-- end-model-doc -->
-	 * @see #LESS_EQUALS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LESS_EQUALS = 10;
-
-	/**
-	 * The '<em><b>GREATER EQUALS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * >= operator
-	 * <!-- end-model-doc -->
-	 * @see #GREATER_EQUALS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREATER_EQUALS = 11;
-
-	/**
-	 * The '<em><b>EQUALS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * == operator
-	 * <!-- end-model-doc -->
-	 * @see #EQUALS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EQUALS = 12;
-
-	/**
-	 * The '<em><b>NOT EQUALS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * != operator
-	 * <!-- end-model-doc -->
-	 * @see #NOT_EQUALS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_EQUALS = 13;
-
-	/**
-	 * The '<em><b>XOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * ^ operator
-	 * <!-- end-model-doc -->
-	 * @see #XOR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XOR = 14;
-
-	/**
-	 * The '<em><b>AND</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * & operator
-	 * <!-- end-model-doc -->
-	 * @see #AND_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int AND = 15;
-
-	/**
-	 * The '<em><b>OR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * |  operator
-	 * <!-- end-model-doc -->
-	 * @see #OR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OR = 16;
-
-	/**
-	 * The '<em><b>CONDITIONAL AND</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * && operator
-	 * <!-- end-model-doc -->
-	 * @see #CONDITIONAL_AND_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONDITIONAL_AND = 17;
-
-	/**
-	 * The '<em><b>CONDITIONAL OR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * || operator
-	 * <!-- end-model-doc -->
-	 * @see #CONDITIONAL_OR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONDITIONAL_OR = 18;
-
-	/**
-	 * The '<em><b>TIMES</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TIMES
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator TIMES_LITERAL = new PTInfixOperator(TIMES, "TIMES");
-
-	/**
-	 * The '<em><b>DIVIDE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DIVIDE
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator DIVIDE_LITERAL = new PTInfixOperator(DIVIDE, "DIVIDE");
-
-	/**
-	 * The '<em><b>REMAINDER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REMAINDER
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator REMAINDER_LITERAL = new PTInfixOperator(REMAINDER, "REMAINDER");
-
-	/**
-	 * The '<em><b>PLUS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PLUS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator PLUS_LITERAL = new PTInfixOperator(PLUS, "PLUS");
-
-	/**
-	 * The '<em><b>MINUS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MINUS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator MINUS_LITERAL = new PTInfixOperator(MINUS, "MINUS");
-
-	/**
-	 * The '<em><b>LEFT SHIFT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LEFT_SHIFT
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator LEFT_SHIFT_LITERAL = new PTInfixOperator(LEFT_SHIFT, "LEFT_SHIFT");
-
-	/**
-	 * The '<em><b>RIGHT SHIFT SIGNED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RIGHT_SHIFT_SIGNED
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator RIGHT_SHIFT_SIGNED_LITERAL = new PTInfixOperator(RIGHT_SHIFT_SIGNED, "RIGHT_SHIFT_SIGNED");
-
-	/**
-	 * The '<em><b>RIGHT SHIFT UNSIGNED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RIGHT_SHIFT_UNSIGNED
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator RIGHT_SHIFT_UNSIGNED_LITERAL = new PTInfixOperator(RIGHT_SHIFT_UNSIGNED, "RIGHT_SHIFT_UNSIGNED");
-
-	/**
-	 * The '<em><b>LESS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LESS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator LESS_LITERAL = new PTInfixOperator(LESS, "LESS");
-
-	/**
-	 * The '<em><b>GREATER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GREATER
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator GREATER_LITERAL = new PTInfixOperator(GREATER, "GREATER");
-
-	/**
-	 * The '<em><b>LESS EQUALS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LESS_EQUALS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator LESS_EQUALS_LITERAL = new PTInfixOperator(LESS_EQUALS, "LESS_EQUALS");
-
-	/**
-	 * The '<em><b>GREATER EQUALS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GREATER_EQUALS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator GREATER_EQUALS_LITERAL = new PTInfixOperator(GREATER_EQUALS, "GREATER_EQUALS");
-
-	/**
-	 * The '<em><b>EQUALS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EQUALS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator EQUALS_LITERAL = new PTInfixOperator(EQUALS, "EQUALS");
-
-	/**
-	 * The '<em><b>NOT EQUALS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_EQUALS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator NOT_EQUALS_LITERAL = new PTInfixOperator(NOT_EQUALS, "NOT_EQUALS");
-
-	/**
-	 * The '<em><b>XOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #XOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator XOR_LITERAL = new PTInfixOperator(XOR, "XOR");
-
-	/**
-	 * The '<em><b>AND</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #AND
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator AND_LITERAL = new PTInfixOperator(AND, "AND");
-
-	/**
-	 * The '<em><b>OR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OR
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator OR_LITERAL = new PTInfixOperator(OR, "OR");
-
-	/**
-	 * The '<em><b>CONDITIONAL AND</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONDITIONAL_AND
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator CONDITIONAL_AND_LITERAL = new PTInfixOperator(CONDITIONAL_AND, "CONDITIONAL_AND");
-
-	/**
-	 * The '<em><b>CONDITIONAL OR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONDITIONAL_OR
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTInfixOperator CONDITIONAL_OR_LITERAL = new PTInfixOperator(CONDITIONAL_OR, "CONDITIONAL_OR");
-
-	/**
-	 * An array of all the '<em><b>PT Infix Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final PTInfixOperator[] VALUES_ARRAY =
-		new PTInfixOperator[] {
-			TIMES_LITERAL,
-			DIVIDE_LITERAL,
-			REMAINDER_LITERAL,
-			PLUS_LITERAL,
-			MINUS_LITERAL,
-			LEFT_SHIFT_LITERAL,
-			RIGHT_SHIFT_SIGNED_LITERAL,
-			RIGHT_SHIFT_UNSIGNED_LITERAL,
-			LESS_LITERAL,
-			GREATER_LITERAL,
-			LESS_EQUALS_LITERAL,
-			GREATER_EQUALS_LITERAL,
-			EQUALS_LITERAL,
-			NOT_EQUALS_LITERAL,
-			XOR_LITERAL,
-			AND_LITERAL,
-			OR_LITERAL,
-			CONDITIONAL_AND_LITERAL,
-			CONDITIONAL_OR_LITERAL,
-		};
-	
-	private static final String[] OPERATOR_STRING;
-	static {
-		OPERATOR_STRING = new String[VALUES_ARRAY.length];
-		OPERATOR_STRING[TIMES] = "*";
-		OPERATOR_STRING[DIVIDE] = "/";
-		OPERATOR_STRING[REMAINDER] = "%";
-		OPERATOR_STRING[PLUS] = "+";
-		OPERATOR_STRING[MINUS] = "-";
-		OPERATOR_STRING[LEFT_SHIFT] = "<";
-		OPERATOR_STRING[RIGHT_SHIFT_SIGNED] = ">>";
-		OPERATOR_STRING[RIGHT_SHIFT_UNSIGNED] = ">>>";
-		OPERATOR_STRING[LESS] = "<";
-		OPERATOR_STRING[GREATER] = ">";
-		OPERATOR_STRING[LESS_EQUALS] = "<=";
-		OPERATOR_STRING[GREATER_EQUALS] = ">=";
-		OPERATOR_STRING[EQUALS] = "==";
-		OPERATOR_STRING[NOT_EQUALS] = "!=";
-		OPERATOR_STRING[XOR] = "^";
-		OPERATOR_STRING[AND] = "&";
-		OPERATOR_STRING[OR] = "|";
-		OPERATOR_STRING[CONDITIONAL_AND] = "&&";
-		OPERATOR_STRING[CONDITIONAL_OR] = "||";
-	}
-
-	/**
-	 * A public read-only list of all the '<em><b>PT Infix Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>PT Infix Operator</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PTInfixOperator get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PTInfixOperator result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>PT Infix Operator</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PTInfixOperator get(int value) {
-		switch (value) {
-			case TIMES: return TIMES_LITERAL;
-			case DIVIDE: return DIVIDE_LITERAL;
-			case REMAINDER: return REMAINDER_LITERAL;
-			case PLUS: return PLUS_LITERAL;
-			case MINUS: return MINUS_LITERAL;
-			case LEFT_SHIFT: return LEFT_SHIFT_LITERAL;
-			case RIGHT_SHIFT_SIGNED: return RIGHT_SHIFT_SIGNED_LITERAL;
-			case RIGHT_SHIFT_UNSIGNED: return RIGHT_SHIFT_UNSIGNED_LITERAL;
-			case LESS: return LESS_LITERAL;
-			case GREATER: return GREATER_LITERAL;
-			case LESS_EQUALS: return LESS_EQUALS_LITERAL;
-			case GREATER_EQUALS: return GREATER_EQUALS_LITERAL;
-			case EQUALS: return EQUALS_LITERAL;
-			case NOT_EQUALS: return NOT_EQUALS_LITERAL;
-			case XOR: return XOR_LITERAL;
-			case AND: return AND_LITERAL;
-			case OR: return OR_LITERAL;
-			case CONDITIONAL_AND: return CONDITIONAL_AND_LITERAL;
-			case CONDITIONAL_OR: return CONDITIONAL_OR_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private PTInfixOperator(int value, String name) {
-		super(value, name);
-	}
-
-	/**
-	 * Return the operator string (i.e. for PLUS return "+").
-	 * @return The operator string.
-	 * 
-	 * @since 1.0.0
-	 */
-	public String getOperator() {
-		return OPERATOR_STRING[getValue()];
-	}
-
-} //InfixOperator
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java
deleted file mode 100644
index 03ce93c0f..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInstanceReference.java,v $
- *  $Revision: 1.6 $  $Date: 2005/10/03 19:20:41 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>PT Instance Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference <em>Reference</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceReference()
- * @model
- * @generated
- */
-public interface PTInstanceReference extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Reference</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reference</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reference</em>' reference.
-	 * @see #setReference(IJavaInstance)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceReference_Reference()
-	 * @model required="true"
-	 * @generated
-	 */
-	IJavaInstance getReference();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference <em>Reference</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reference</em>' reference.
-	 * @see #getReference()
-	 * @generated
-	 */
-	void setReference(IJavaInstance value);
-
-} // PTInstanceReference
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java
deleted file mode 100644
index 79ccdf7dd..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInstanceof.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Instanceof</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Instanceof expression, e.g. x instanceof java.lang.String
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand <em>Operand</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceof()
- * @model
- * @generated
- */
-public interface PTInstanceof extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Operand</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value to test, e.g. x in x instanceof java.lang.String
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Operand</em>' containment reference.
-	 * @see #setOperand(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceof_Operand()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getOperand();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand <em>Operand</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Operand</em>' containment reference.
-	 * @see #getOperand()
-	 * @generated
-	 */
-	void setOperand(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of the instance test, e.g. java.lang.String. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceof_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-} // Instanceof
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java
deleted file mode 100644
index 916ea41f3..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInvalidExpression.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invalid Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is used when we have some expression we just can't evaluate for our purposes. It allows us to tell the evaluation what is actually wrong. It should be placed as the root expression to prevent processing much of the tree and then finally fail.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage <em>Message</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInvalidExpression()
- * @model
- * @generated
- */
-public interface PTInvalidExpression extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A message as to why it is invalid.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message</em>' attribute.
-	 * @see #setMessage(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInvalidExpression_Message()
-	 * @model
-	 * @generated
-	 */
-	String getMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message</em>' attribute.
-	 * @see #getMessage()
-	 * @generated
-	 */
-	void setMessage(String value);
-
-} // InvalidExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java
deleted file mode 100644
index b4a534f55..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTMethodInvocation.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Invocation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * MethodInvocation expression, e.g. x.getY(3)
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver <em>Receiver</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation()
- * @model
- * @generated
- */
-public interface PTMethodInvocation extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Receiver</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Who the method is invoked against. This may be not set, which means "this". It may also be a Name, which would mean a class like "java.lang.String"
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Receiver</em>' containment reference.
-	 * @see #setReceiver(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation_Receiver()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getReceiver();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver <em>Receiver</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Receiver</em>' containment reference.
-	 * @see #getReceiver()
-	 * @generated
-	 */
-	void setReceiver(PTExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the method being invoked.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Arguments</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The list of arguments, if any, to the method.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Arguments</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation_Arguments()
-	 * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
-	 * @generated
-	 */
-	EList getArguments();
-
-} // MethodInvocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java
deleted file mode 100644
index dcde00ddd..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTName.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a name. This can happen for the receiver of a method invocation, e.g. x.getY() or java.lang.String.valueOf(10). In these cases you would have a name of "x" or "java.lang.String".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTName#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTName()
- * @model
- * @generated
- */
-public interface PTName extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name, which can be a type or a variable. If it is a type, then  it must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTName_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTName#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // Name
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java
deleted file mode 100644
index 45fa4ce0c..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNullLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Null Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents the expression "null"
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTNullLiteral()
- * @model
- * @generated
- */
-public interface PTNullLiteral extends PTExpression{
-} // NullLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java
deleted file mode 100644
index 8a074c631..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNumberLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Number Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represent a number primitive literal, e.g. 10. One optimization that will be performed is that if an expression is of the form +number or -number, it will be converted from a PrefixExpression with a NumberLiteral to just a NumberLiteral. This will simplify the model.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken <em>Token</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTNumberLiteral()
- * @model
- * @generated
- */
-public interface PTNumberLiteral extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Token</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The token value, e.g. 10, 10d, or -10.75
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Token</em>' attribute.
-	 * @see #setToken(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTNumberLiteral_Token()
-	 * @model
-	 * @generated
-	 */
-	String getToken();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken <em>Token</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Token</em>' attribute.
-	 * @see #getToken()
-	 * @generated
-	 */
-	void setToken(String value);
-
-} // NumberLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java
deleted file mode 100644
index 66dc0247a..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTParenthesizedExpression.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parenthesized Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An expression within parenthesis, e.g. (x+3)
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTParenthesizedExpression()
- * @model
- * @generated
- */
-public interface PTParenthesizedExpression extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The expression wrapped by the parenthesis, e.g. (x+3) then the expression is "x+3"
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expression</em>' containment reference.
-	 * @see #setExpression(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTParenthesizedExpression_Expression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(PTExpression value);
-
-} // ParenthesizedExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java
deleted file mode 100644
index 4e5d563ae..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTPrefixExpression.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prefix Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A one operand operator, where the operator comes before the operand, e.g. - (x+3). In AST, even -3 is modeled as a PrefixExpression of operator "-" and expression of NumberLiteral(3). But we optimize this away and just use a NumberLiteral(-3) directly instead.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixExpression()
- * @model
- * @generated
- */
-public interface PTPrefixExpression extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jem.internal.instantiation.PTPrefixOperator}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The operator of this expression.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Operator</em>' attribute.
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
-	 * @see #setOperator(PTPrefixOperator)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixExpression_Operator()
-	 * @model
-	 * @generated
-	 */
-	PTPrefixOperator getOperator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Operator</em>' attribute.
-	 * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
-	 * @see #getOperator()
-	 * @generated
-	 */
-	void setOperator(PTPrefixOperator value);
-
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The expression that the operator is applied to.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expression</em>' containment reference.
-	 * @see #setExpression(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixExpression_Expression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	PTExpression getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(PTExpression value);
-
-} // PrefixExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java
deleted file mode 100644
index 49a6a250f..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: PTPrefixOperator.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Prefix Operator</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The prefix expression operator. We are not modeling ++ and --.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixOperator()
- * @model
- * @generated
- */
-public final class PTPrefixOperator extends AbstractEnumerator {
-	/**
-	 * The '<em><b>PLUS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * + operator
-	 * <!-- end-model-doc -->
-	 * @see #PLUS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PLUS = 0;
-
-	/**
-	 * The '<em><b>MINUS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * - operator
-	 * <!-- end-model-doc -->
-	 * @see #MINUS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MINUS = 1;
-
-	/**
-	 * The '<em><b>COMPLEMENT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * ~ operator
-	 * <!-- end-model-doc -->
-	 * @see #COMPLEMENT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COMPLEMENT = 2;
-
-	/**
-	 * The '<em><b>NOT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * ! operator
-	 * <!-- end-model-doc -->
-	 * @see #NOT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT = 3;
-
-	/**
-	 * The '<em><b>PLUS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PLUS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTPrefixOperator PLUS_LITERAL = new PTPrefixOperator(PLUS, "PLUS");
-
-	/**
-	 * The '<em><b>MINUS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MINUS
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTPrefixOperator MINUS_LITERAL = new PTPrefixOperator(MINUS, "MINUS");
-
-	/**
-	 * The '<em><b>COMPLEMENT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COMPLEMENT
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTPrefixOperator COMPLEMENT_LITERAL = new PTPrefixOperator(COMPLEMENT, "COMPLEMENT");
-
-	/**
-	 * The '<em><b>NOT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT
-	 * @generated
-	 * @ordered
-	 */
-	public static final PTPrefixOperator NOT_LITERAL = new PTPrefixOperator(NOT, "NOT");
-
-	/**
-	 * An array of all the '<em><b>PT Prefix Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final PTPrefixOperator[] VALUES_ARRAY =
-		new PTPrefixOperator[] {
-			PLUS_LITERAL,
-			MINUS_LITERAL,
-			COMPLEMENT_LITERAL,
-			NOT_LITERAL,
-		};
-	
-	private static final String[] OPERATOR_STRING;
-	static {
-		OPERATOR_STRING = new String[VALUES_ARRAY.length];
-		OPERATOR_STRING[PLUS] = "+";
-		OPERATOR_STRING[MINUS] = "-";
-		OPERATOR_STRING[COMPLEMENT] = "~";
-		OPERATOR_STRING[NOT] = "!";
-	}
-
-	/**
-	 * A public read-only list of all the '<em><b>PT Prefix Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>PT Prefix Operator</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PTPrefixOperator get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PTPrefixOperator result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>PT Prefix Operator</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PTPrefixOperator get(int value) {
-		switch (value) {
-			case PLUS: return PLUS_LITERAL;
-			case MINUS: return MINUS_LITERAL;
-			case COMPLEMENT: return COMPLEMENT_LITERAL;
-			case NOT: return NOT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private PTPrefixOperator(int value, String name) {
-		super(value, name);
-	}
-
-	/**
-	 * Return the operator string (i.e. for PLUS return "+").
-	 * @return The operator string.
-	 * 
-	 * @since 1.0.0
-	 */
-	public String getOperator() {
-		return OPERATOR_STRING[getValue()];
-	}
-} //PrefixOperator
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java
deleted file mode 100644
index f0d103d63..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTStringLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Representation of a string literal, e.g. "asdf".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue <em>Escaped Value</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue <em>Literal Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTStringLiteral()
- * @model
- * @generated
- */
-public interface PTStringLiteral extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Escaped Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the escaped string. In other words the literal exactly as it is in the java file. E.g. "ab" or "c\r". Including the surrounding quotes themselves.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Escaped Value</em>' attribute.
-	 * @see #setEscapedValue(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTStringLiteral_EscapedValue()
-	 * @model
-	 * @generated
-	 */
-	String getEscapedValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Escaped Value</em>' attribute.
-	 * @see #getEscapedValue()
-	 * @generated
-	 */
-	void setEscapedValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Literal Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual string without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Literal Value</em>' attribute.
-	 * @see #setLiteralValue(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTStringLiteral_LiteralValue()
-	 * @model transient="true"
-	 * @generated
-	 */
-	String getLiteralValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue <em>Literal Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Literal Value</em>' attribute.
-	 * @see #getLiteralValue()
-	 * @generated
-	 */
-	void setLiteralValue(String value);
-
-} // StringLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java
deleted file mode 100644
index 8d1c2d989..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTThisLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>This Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents "this", e.g. this.getX() will be a MethodInvocation with the receiver being a ThisLiteral. We can't handle the format XYZ.this because that is for inner classes and we don't support that right now.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTThisLiteral()
- * @model
- * @generated
- */
-public interface PTThisLiteral extends PTExpression{
-} // ThisLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java
deleted file mode 100644
index 790c4c888..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTTypeLiteral.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a literal of the form j.XYZ.class. For instance in a method invocation x.getX(jXYZ.class) the argument will be a TypeLiteral.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTTypeLiteral()
- * @model
- * @generated
- */
-public interface PTTypeLiteral extends PTExpression{
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of the literal.  It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTTypeLiteral_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-} // TypeLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java
deleted file mode 100644
index 5fafe7905..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeAllocation.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/15 21:02:19 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parse Tree Allocation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Allocations via Parse Trees.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getParseTreeAllocation()
- * @model
- * @generated
- */
-public interface ParseTreeAllocation extends JavaAllocation{
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expression</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expression</em>' containment reference.
-	 * @see #setExpression(PTExpression)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getParseTreeAllocation_Expression()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	PTExpression getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(PTExpression value);
-
-} // ParseTreeAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
deleted file mode 100644
index 0cc6f8591..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseVisitor.java,v $
- *  $Revision: 1.7 $  $Date: 2005/10/28 22:56:46 $ 
- */
-package org.eclipse.jem.internal.instantiation;
- 
-/**
- * A visitor for abstract parse expression trees.
- * <p>
- * For each different concrete Expression node type <it>T</it> there are
- * a pair of methods:
- * <ul>
- * <li><code>public boolean visit(<it>T</it> node)</code> - Visits
- * the given node to perform some arbitrary operation. If <code>true</code>
- * is returned, the given node's child nodes will be visited next; however,
- * if <code>false</code> is returned, the given node's child nodes will 
- * not be visited. The default implementation provided by this class does
- * nothing and returns <code>true</code>. Subclasses may reimplement
- * this method as needed.</li>
- * <li><code>public void endVisit(<it>T</it> node)</code> - Visits
- * the given node to perform some arbitrary operation. When used in the
- * conventional way, this method is called after all of the given node's
- * children have been visited (or immediately, if <code>visit</code> returned
- * <code>false</code>). The default implementation provided by this class does
- * nothing. Subclasses may reimplement this method as needed.</li>
- * </ul>
- * </p>
- * In addition, there are a pair of methods for visiting AST nodes in the 
- * abstract, regardless of node type:
- * <ul>
- * <li><code>public void preVisit(ASTNode node)</code> - Visits
- * the given node to perform some arbitrary operation. 
- * This method is invoked prior to the appropriate type-specific
- * <code>visit</code> method.
- * The default implementation of this method does nothing.
- * Subclasses may reimplement this method as needed.</li>
- * <li><code>public void postVisit(ASTNode node)</code> - Visits
- * the given node to perform some arbitrary operation. 
- * This method is invoked after the appropriate type-specific
- * <code>endVisit</code> method.
- * The default implementation of this method does nothing.
- * Subclasses may reimplement this method as needed.</li>
- * </ul>
- * <p>
- * For nodes with list-valued properties, the child nodes within the list
- * are visited in order. For nodes with multiple properties, the child nodes
- * are visited in the order that most closely corresponds to the lexical
- * reading order of the source program. For instance, for a type declaration
- * node, the child ordering is: name, superclass, superinterfaces, and 
- * body declarations.
- * </p>
- * <p>
- * While it is possible to modify the tree in the visitor, care is required to
- * ensure that the consequences are as expected and desirable.
- * During the course of an ordinary visit starting at a given node, every node
- * in the subtree is visited exactly twice, first with <code>visit</code> and
- * then with <code>endVisit</code>. During a traversal of a stationary tree, 
- * each node is either behind (after <code>endVisit</code>), ahead (before 
- * <code>visit</code>), or in progress (between <code>visit</code> and
- * the matching <code>endVisit</code>). Changes to the "behind" region of the
- * tree are of no consequence to the visit in progress. Changes to the "ahead"
- * region will be taken in stride. Changes to the "in progress" portion are
- * the more interesting cases. With a node, the various properties are arranged
- * in a linear list, with a cursor that separates the properties that have
- * been visited from the ones that are still to be visited (the cursor
- * is between the elements, rather than on an element). The cursor moves from
- * the head to the tail of this list, advancing to the next position just
- * <it>before</it> <code>visit</code> if called for that child. After the child
- * subtree has been completely visited, the visit moves on the child 
- * immediately after the cursor. Removing a child while it is being visited
- * does not alter the course of the visit. But any children added at positions
- * after the cursor are considered in the "ahead" portion and will be visited.
- * </p>
- * <p>
- * Cases to watch out for:
- * <ul>
- * <li>Moving a child node further down the list. This could result in the
- * child subtree being visited multiple times; these visits are sequential.</li>
- * <li>Moving a child node up into an ancestor. If the new home for
- * the node is in the "ahead" portion, the subtree will be visited 
- * a second time; again, these visits are sequential.</li>
- * <li>Moving a node down into a child. If the new home for
- * the node is in the "ahead" portion, the subtree will be visited 
- * a second time; in this case, the visits will be nested. In some cases,
- * this can lead to a stack overflow or out of memory condition.</li>
- * </ul>
- * </p>
- *
- * Note: This is based upon the visit concept in org.eclipse.jdt.core.dom.ASTVisitor. 
- *
- * @see Expression#accept
- *  
- * @since 1.0.0
- */
-public class ParseVisitor {
-	
-	/**
-	 * Exception to throw to just stop visiting a parse visit. It doesn't mean error, it
-	 * just means stop visiting. ParseVisitors should throw this when they want to stop
-	 * visiting further without an explicit error.
-	 * <p>
-	 * If they want to indicate an error, parse visitors can throw any other RuntimeException. 
-	 * Those will also stop visiting, but the exception will be passed on out of the 
-	 * {@link PTExpression#accept(ParseVisitor)}. StopVisiting will not be passed on
-	 * but will be caught inside accept.
-	 * 
-	 * @since 1.1.0.1
-	 */
-	public static class StopVisiting extends RuntimeException {
-
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 * 
-		 * @since 1.1.0.1
-		 */
-		private static final long serialVersionUID = -5246860806568355520L;
-		
-	}
-	/**
-	 * Visits the given parse node prior to the type-specific visit. (before <code>visit</code>).
-	 * <p>
-	 * The default implementation does nothing. Subclasses may reimplement.
-	 * </p>
-	 * 
-	 * @param node
-	 *            the node to visit
-	 */
-	public void preVisit(PTExpression node) {
-		// default implementation: do nothing
-	}
-
-	/**
-	 * Visits the given parse node following the type-specific visit (after <code>endVisit</code>).
-	 * <p>
-	 * The default implementation does nothing. Subclasses may reimplement.
-	 * </p>
-	 * 
-	 * @param node
-	 *            the node to visit
-	 */
-	public void postVisit(PTExpression node) {
-		// default implementation: do nothing
-	}
-
-	public boolean visit(PTAnonymousClassDeclaration node) {
-		return true;
-	}
-	public boolean visit(PTArrayAccess node) {
-		return true;
-	}
-	public boolean visit(PTArrayCreation node) {
-		return true;
-	}
-	public boolean visit(PTArrayInitializer node) {
-		return true;
-	}
-	public boolean visit(PTBooleanLiteral node) {
-		return true;
-	}
-	public boolean visit(PTCastExpression node) {
-		return true;
-	}
-	public boolean visit(PTCharacterLiteral node) {
-		return true;
-	}
-	public boolean visit(PTClassInstanceCreation node) {
-		return true;
-	}
-	public boolean visit(PTConditionalExpression node) {
-		return true;
-	}
-	public boolean visit(PTFieldAccess node) {
-		return true;
-	}
-	public boolean visit(PTInfixExpression node) {
-		return true;
-	}
-	public boolean visit(PTInstanceof node) {
-		return true;
-	}
-	public boolean visit(PTInvalidExpression node) {
-		return true;
-	}
-	public boolean visit(PTMethodInvocation node) {
-		return true;
-	}
-	public boolean visit(PTName node) {
-		return true;
-	}
-	public boolean visit(PTNullLiteral node) {
-		return true;
-	}
-	public boolean visit(PTNumberLiteral node) {
-		return true;
-	}
-	public boolean visit(PTParenthesizedExpression node) {
-		return true;
-	}
-	public boolean visit(PTPrefixExpression node) {
-		return true;
-	}
-	public boolean visit(PTStringLiteral node) {
-		return true;
-	}
-	public boolean visit(PTThisLiteral node) {
-		return true;
-	}
-	public boolean visit(PTTypeLiteral node) {
-		return true;
-	}
-	public boolean visit(PTInstanceReference node) {
-		return true;
-	}
-	public void endVisit(PTAnonymousClassDeclaration node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTArrayAccess node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTArrayCreation node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTArrayInitializer node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTBooleanLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTCastExpression node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTCharacterLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTClassInstanceCreation node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTConditionalExpression node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTFieldAccess node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTInfixExpression node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTInstanceof node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTInvalidExpression node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTMethodInvocation node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTName node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTNullLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTNumberLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTParenthesizedExpression node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTPrefixExpression node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTStringLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTThisLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTTypeLiteral node) {
-		// default implementation: do nothing
-	}
-	public void endVisit(PTInstanceReference node) {
-		// default implementation: do nothing
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java
deleted file mode 100644
index 611c8bbe4..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: FeatureValueProvider.java,v $
- *  $Revision: 1.8 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Implementers of this interface (an EMF EObject subclass) provide a visiter
- * capability to the set features on the EObject. This way only the set features
- * are presented to the visitor. This can save a lot of time.
- * 
- * @since 1.1.0
- */
-public interface FeatureValueProvider {
-	
-	/**
-	 * A helper class for FeatureValueProvider.
-	 * 
-	 * @see FeatureValueProviderHelper#visitSetFeatures(EObject, Visitor)
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class FeatureValueProviderHelper {
-		
-		/**
-		 * A helper to handle where the object may or may not be
-		 * implement FeatureValueProvider. This way it can be a
-		 * common access to do it.
-		 * 
-		 * @param eobject
-		 * @param visitor
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public static Object visitSetFeatures(EObject eobject, Visitor visitor) {
-			if (eobject instanceof FeatureValueProvider)
-				return ((FeatureValueProvider)eobject).visitSetFeatures(visitor);
-			else {
-				// Not a FeatureValueProvider, so do normal.
-				Iterator features = eobject.eClass().getEAllStructuralFeatures().iterator();
-				while(features.hasNext()){
-					EStructuralFeature sf = (EStructuralFeature)features.next();
-					if(eobject.eIsSet(sf)){
-						Object result = visitor.isSet(sf, eobject.eGet(sf));
-						if (result != null)
-							return result;
-					}
-				}
-				return null;
-			}
-		}
-		
-		/**
-		 * Answers whether any feature is set or not.
-		 * <p>
-		 * <b>Note:</b> This SHOULD NOT be used as a test before deciding whether to do visitSetFeatures or not. It is more efficient to just call
-		 * visitSetFeatures. It should be used only to see if any features are set.
-		 * 
-		 * @param eobject
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public static boolean isAnyFeatureSet(EObject eobject) {
-			if (eobject instanceof FeatureValueProvider)
-				return ((FeatureValueProvider)eobject).isAnyFeatureSet();
-			else {
-				// Not a FeatureValueProvider, so do normal.
-				Iterator features = eobject.eClass().getEAllStructuralFeatures().iterator();
-				while(features.hasNext()){
-					EStructuralFeature sf = (EStructuralFeature)features.next();
-					if(eobject.eIsSet(sf)){
-						return true;
-					}
-				}
-				return false;
-			}			
-		}
-		
-		private FeatureValueProviderHelper() {
-		}
-	}
-	
-	/**
-	 * The interface for the visiter callback.
-	 * 
-	 * @since 1.1.0
-	 */
-	public interface Visitor{
-		/**
-		 * Called for each set feature on the FeatureValueProvider.
-		 * 
-		 * @param feature
-		 * @param value
-		 * @return <code>null</code> to continue to next setting, or a value to stop visiting and return that value be the real exception.
-		 * @since 1.1.0
-		 */
-		Object isSet(EStructuralFeature feature, Object value);
-	}	
-
-	/**
-	 * Visit the set features.
-	 * @param aVisitor
-	 * @param <code>null</code> if all settings visited, or the value returned from the visit (isSet) that returned a non-nullSe.
-	 * @since 1.1.0
-	 */
-	public Object visitSetFeatures(Visitor aVisitor);
-	
-	/**
-	 * Answers whether any feature is set or not.
-	 * <p>
-	 * <b>Note:</b> This SHOULD NOT be used as a test before deciding whether to do visitSetFeatures or not. It is
-	 * more efficient to just call visitSetFeatures. It should be used only to see if any features are set.
-	 * 
-	 * @return <code>true</code> if any features are set.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isAnyFeatureSet();
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java
deleted file mode 100644
index b2954639e..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: IJavaDataTypeInstance.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-/**
- * Interface for instances of java data types.
- */
-
-public interface IJavaDataTypeInstance extends IJavaInstance {
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java
deleted file mode 100644
index 14ed414da..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: IJavaInstance.java,v $
- *  $Revision: 1.7 $  $Date: 2005/10/03 19:20:42 $ 
- */
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance;
-/**
- * A common interface for Java instances. It will be
- * shared by Java Objects and Java DataType instances.
- */
-public interface IJavaInstance extends EObject, FeatureValueProvider, IInstantiationInstance {
-	
-	/**
-	 * Get the allocation object.
-	 * @return The allocation object.
-	 */
-	public JavaAllocation getAllocation();
-	
-	/**
-	 * Set the allocation for this object instance.
-	 * @param allocation
-	 */
-	public void setAllocation(JavaAllocation allocation);	
-	
-	/**
-	 * Return whether the allocation has been set or not.
-	 * @return <code>true</code> if set. 
-	 */
-	public boolean isSetAllocation();
-	
-	/**
-	 * Answer true if we are an instance of one of Java's primitive data types.
-	 * e.g. boolean, char - true otherwise, e.g. java.lang.Boolean
-	 */
-	public boolean isPrimitive();
-	
-	/**
-	 * Answer whether this has an implicit allocation.
-	 * @return <code>true</code> if implicit allocation. <code>false</code> if not set or not implicit.
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isImplicitAllocation();
-	
-	/**
-	 * Answer whether this has an parsetree allocation.
-	 * @return <code>true</code> if parsetree allocation. <code>false</code> if not set or not parsetree.
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isParseTreeAllocation();
-
-	
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.java
deleted file mode 100644
index b279b3c61..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: IJavaObjectInstance.java,v $
- *  $Revision: 1.7 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-
-/**
- * Interface for java object instances.
- */
-public interface IJavaObjectInstance extends IJavaInstance {
-	
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
deleted file mode 100644
index f4524508c..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class InstantiationBaseMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.base.messages";//$NON-NLS-1$
-
-	private InstantiationBaseMessages() {
-		// Do not instantiate
-	}
-
-	public static String ParseTreeAllocationInstantiationVisitor_CurrentlyThisNotSupported_EXC_;
-	public static String ParseTreeAllocationInstantiationVisitor_CannotProcessAnonymousDeclarations_EXC_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, InstantiationBaseMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java
deleted file mode 100644
index e62ce3486..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JavaDataTypeInstance.java,v $
- *  $Revision: 1.8 $  $Date: 2005/08/24 20:20:24 $ 
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-
-/**
- * This is the default instance of a Java Model Datatype (i.e. primitive).
- * It can be created from a string, which becomes the initialization string
- * for the instance. It's toString will be the initialization string.
- *
- * It should not be referenced directly, the IJavaDataTypeInstance interface should be
- * used instead. It is public so that it can be subclassed. 
- */
-public class JavaDataTypeInstance extends JavaInstance implements IJavaDataTypeInstance {
-
-	protected JavaDataTypeInstance() {
-	}
-		
-	public boolean isPrimitive(){
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java
deleted file mode 100644
index 05e425570..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java
+++ /dev/null
@@ -1,60 +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.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaFactoryHandler.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:25 $ 
- */
-
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaDataType;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler;
-
-/**
- * Adapter on JavaFactoryImpl to do instantiation.
- */
-public class JavaFactoryHandler implements IInstantiationHandler {
-
-	public final static JavaFactoryHandler INSTANCE = new JavaFactoryHandler();
-
-	/**
-	 * Constructor for JavaFactoryAdapter.
-	 */
-	protected JavaFactoryHandler() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#handlesClass(org.eclipse.emf.ecore.EClass)
-	 */
-	public boolean handlesClass(EClass type) {
-		return type instanceof JavaClass || type instanceof JavaDataType;
-		// During XMI loading, it can't tell the JavaDataType is different than JavaClass.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#handlesDataType(org.eclipse.jem.java.JavaDataType)
-	 */
-	public boolean handlesDataType(JavaDataType type) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#create(org.eclipse.emf.ecore.EClass)
-	 */
-	public EObject create(EClass javaClass) {
-		EObject result = javaClass instanceof JavaClass ? (EObject) new JavaObjectInstance() : new JavaDataTypeInstance();
-		((InternalEObject) result).eSetClass(javaClass);
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstance.java
deleted file mode 100644
index f5b149bee..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstance.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile$
- *  $Revision$  $Date$ 
- */
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.EStructuralFeature.Internal.DynamicValueHolder;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-import org.eclipse.jem.java.JavaHelpers;
-
-/**
- * This is the default instance for java model objects.
- * It should not be referenced directly, the IJavaObjectInstance interface should be
- * used instead. It is public so that it can be subclassed.
- */
-public abstract class JavaInstance extends EObjectImpl implements IJavaInstance {
-	
-	public JavaHelpers getJavaType(){
-		return (JavaHelpers) eClass();
-	}
-	
-	public JavaAllocation getAllocation() {
-		return isSetAllocation() ? (JavaAllocation) eGet(JavaInstantiation.getAllocationFeature(this)) : null;
-	}
-	
-	public boolean isImplicitAllocation() {
-		return isSetAllocation() && getAllocation().isImplicit();
-	}
-	
-	public boolean isParseTreeAllocation() {
-		return isSetAllocation() && getAllocation().isParseTree();
-	}
-	
-	/** 
-	 * Visit the argument with all of the set features in an optimized fashion 
-	 */
-	private final static Object NIL = EStructuralFeatureImpl.InternalSettingDelegateSingle.NIL;
-	public Object visitSetFeatures(Visitor aVisitor) {
-		Object result = null;
-		if (eHasSettings()) {
-			JavaInstancePropertiesHolder settings = (JavaInstancePropertiesHolder) eSettings();
-
-			Object[] setPropertyValues = settings.eSettings();
-			if (setPropertyValues != null) {
-				List allFeatures = settings.getAllStructuralFeatures();
-				for (int i = 0; i < setPropertyValues.length; i++) {
-					Object propertyValue = setPropertyValues[i];
-					if (propertyValue != null) {
-						// <null> is handled by the placeholder NIL. A setting of true null means not set. A setting of NIL means set to null.
-						if (propertyValue == NIL)
-							propertyValue = null;
-						if ((result = aVisitor.isSet((EStructuralFeature) allFeatures.get(i), propertyValue)) != null)
-							break;
-					}
-				}
-			} 
-		}
-		return result;
-	}
-	
-	public boolean isAnyFeatureSet() {
-		if (eHasSettings()) {
-			JavaInstancePropertiesHolder settings = (JavaInstancePropertiesHolder) eSettings();
-
-			Object[] setPropertyValues = settings.eSettings();
-			if (setPropertyValues != null) {
-				for (int i = 0; i < setPropertyValues.length; i++) {
-					Object propertyValue = setPropertyValues[i];
-					if (propertyValue != null) {
-						return true;
-					}
-				}
-			} 
-		}
-		return false;
-	}
-		
-	public boolean isSetAllocation() {
-		EReference allocationFeature = JavaInstantiation.getAllocationFeature(this);
-		return allocationFeature != null && eIsSet(allocationFeature);
-	}
-	
-	public void setAllocation(JavaAllocation allocation) {
-		EReference allocationFeature = JavaInstantiation.getAllocationFeature(this);
-		if (allocationFeature != null)
-			eSet(allocationFeature, allocation);
-	}
-	
-	
-	public String toString() {
-		// EObject's toString is too big for us, so we do a customized one.
-		StringBuffer result = new StringBuffer(getClass().getName());
-		result.append('@');
-		result.append(Integer.toHexString(hashCode()));
-		
-		if (eIsProxy())
-		{
-		  result.append(" (eProxyURI: "); //$NON-NLS-1$
-		  result.append(eProxyURI());
-		  result.append(')');
-		}
-		if(getJavaType() != null){
-			result.append('{');
-			result.append(getJavaType().getQualifiedName());
-			result.append('}');
-		}
-		
-		try {
-			JavaAllocation allocation = getAllocation();
-			if (allocation != null) {
-				result.append(':'); //$NON-NLS-1$
-				result.append(allocation.toString());
-			}
-		} catch (IllegalArgumentException e) {
-		} catch (NullPointerException e) {
-			// This can occur because sometimes this eClass can't be constructed right and won't have an initstring feature.
-			// In that case an NPE is thrown.
-		}
-		return result.toString();
-	}
-	
-	protected static class JavaInstancePropertiesHolder extends EPropertiesHolderImpl {
-		private EList allStructuralFeatures;
-		
-		public JavaInstancePropertiesHolder() {
-		}
-		
-		public Object[] eSettings() {
-			return eSettings;
-		}
-
-		public EList getAllStructuralFeatures() {
-			return allStructuralFeatures;
-		}
-		
-		/*
-		 * Clear the cache. This is due to 
-		 * structural features have changed.
-		 */
-		public void clearCache() {
-			eSettings = null;
-			setEContents(null);
-			setECrossReferences(null);
-			allStructuralFeatures = null;			
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.ecore.impl.EObjectImpl.EPropertiesHolderImpl#allocateSettings(int)
-		 */
-		public void allocateSettings(int maximumDynamicFeatureID) {
-			if (allStructuralFeatures == null)
-				allStructuralFeatures = getEClass().getEAllStructuralFeatures();			
-			super.allocateSettings(maximumDynamicFeatureID);
-		}
-		
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.ecore.impl.EObjectImpl.EPropertiesHolderImpl#setEContents(org.eclipse.emf.common.util.EList)
-		 */
-		public void setEContents(EList eContents) {
-			if (allStructuralFeatures == null)
-				allStructuralFeatures = getEClass().getEAllStructuralFeatures();
-			super.setEContents(eContents);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.ecore.impl.EObjectImpl.EPropertiesHolderImpl#setECrossReferences(org.eclipse.emf.common.util.EList)
-		 */
-		public void setECrossReferences(EList eCrossReferences) {
-			if (allStructuralFeatures == null)
-				allStructuralFeatures = getEClass().getEAllStructuralFeatures();
-			super.setECrossReferences(eCrossReferences);
-		}
-
-	}
-	
-	protected EPropertiesHolder eProperties()
-	{
-	  if (eProperties == null)
-	  {
-		eProperties = new JavaInstancePropertiesHolder();
-	  }
-	  return eProperties;
-	}
-		
-	/**
-	 * @see org.eclipse.emf.ecore.InternalEObject#eSetClass(EClass)
-	 */
-	public void eSetClass(EClass eClass) {
-		super.eSetClass(eClass);
-		migrate();
-	}
-
-	/**
-	 * @param newEClass New eClass set to. (null) when migrating while not setting a new EClass.
-	 */
-	protected void migrate() {
-		// Note: This is extremelly implementation dependent. It may change for any implementation of EMF.	
-		if (eProperties != null && (eProperties.hasSettings() || eProperties.getEContents() != null || eProperties.getECrossReferences() != null)) {
-			// Maybe need to reconstruct settings or clear cache.
-			JavaInstancePropertiesHolder properties = (JavaInstancePropertiesHolder) eProperties;
-			EList oldAllFeatures = properties.getAllStructuralFeatures();
-			
-			// See if migration needed.
-			if (properties.getEClass().getEAllStructuralFeatures() == oldAllFeatures)
-				return;	// No migration needed.
-			
-			Object[] oldSettings = properties.eSettings();			
-			properties.clearCache();	// Clear the cache so we can rebuild it.
-			if (oldSettings == null) {
-				return;	// It was just either contents or crossrefs, and they have been appropriately cleared.			
-			}
-			
-			// It is assumed that any SF that (by identity) is in
-			// both the old and the new eClass, then it doesn't have any internal changes. It simply changed position
-			// in the settings list. Otherwise, need to see if compatible by same name, and if so, move it.			
-			eSettings();	// Create new settings
-			Object[] newSettings = properties.eSettings();
-			int staticFeatureCnt = eStaticFeatureCount();			
-			for (int oldIndex = 0; oldIndex < oldSettings.length; oldIndex++) {
-				if (oldSettings[oldIndex] != null) {
-					EStructuralFeature sf = (EStructuralFeature) oldAllFeatures.get(oldIndex+staticFeatureCnt);
-					int newIndex = super.eDynamicFeatureID(sf);	// To avoid recurse on migrate.
-					if (newIndex > -1) {
-						moveESetting(oldSettings, newSettings, oldIndex, sf, newIndex);
-					} else {
-						// See if it exists by name and is compatible.
-						EStructuralFeature newSF = properties.getEClass().getEStructuralFeature(sf.getName());
-						if (newSF != null && newSF.getClass().equals(sf.getClass()) &&
-							newSF.isMany() == sf.isMany() && newSF.isChangeable() == sf.isChangeable()) {
-							boolean compatible = newSF.isUnique() == sf.isUnique() || !newSF.isUnique();	// If new is not unique, then doesn't matter if old and new are the same
-							if (newSF instanceof EReference) {
-								EReference newRef = (EReference) newSF;
-								EReference ref = (EReference) sf;
-								compatible = newRef.isContainment() == ref.isContainment() && newRef.getEReferenceType().isSuperTypeOf(ref.getEReferenceType());
-							} else
-								compatible = newSF.getEType().equals(sf.getEType());
-								
-							if (compatible) {
-								newIndex = eDynamicFeatureID(newSF);
-								moveESetting(oldSettings, newSettings, oldIndex, newSF, newIndex);
-							}
-						}
-					}
-				}
-			}
-		} 
-	}
-
-	private void moveESetting(Object[] oldSettings, Object[] newSettings, int oldIndex, EStructuralFeature sf, int newIndex) {
-		// See if single vs many.
-		if (!sf.isMany())
-			newSettings[newIndex] = oldSettings[oldIndex];	// Great, we can just move it over.
-		else {
-			// Many is more difficult. Need to create a new dynamic list of right type, and
-			// then just copy over the data from the old one. We create new one by doing a simple eGet.
-			// This will construct an empty one with no notifications going out.
-			// Note: This is extremelly implementation dependent. We will be throwing away the old
-			// oldMany, so it is ok to reuse the actual array of data for the newMany.
-			BasicEList newMany = (BasicEList) eGet(sf);
-			BasicEList oldMany = (BasicEList) oldSettings[oldIndex];
-			newMany.setData(oldMany.size(), oldMany.data()); 
-		}
-	}
-	
-	protected DynamicValueHolder eSettings() {
-		migrate();
-		return super.eSettings();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java
deleted file mode 100644
index ab46b249d..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaInstantiation.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter;
-
-/**
- * This class is used to initialize java model instantiation code and to access dynamic features.
- */
-public class JavaInstantiation {
-	
-	
-	public static final String ALLOCATION = "allocation";  //$NON-NLS-1$
-
-	/**
-	 * Get a structural feature from an instance of an IJavaObjectInstance, where the feature
-	 * is specified by its name.
-	 */
-	public static EStructuralFeature getSFeature(IJavaObjectInstance jobject, String featureName) {
-		return jobject.eClass().getEStructuralFeature(featureName);
-	}
-	
-	/**
-	 * Get a reference from an instance of an IJavaObjectInstance, where the feature
-	 * is specified by its name.
-	 */
-	public static EReference getReference(IJavaObjectInstance jobject, String featureName) {
-		return (EReference) getSFeature(jobject, featureName);
-	}	
-	
-	/**
-	 * Get a structural feature from an instance of an IJavaObjectInstance, where the feature
-	 * is specified by its URI (e.g. "java:/java.lang#Object/class").
-	 */
-	public static EStructuralFeature getSFeature(IJavaObjectInstance jobject, URI sfURI) {
-		return getSFeature((JavaClass) jobject.getJavaType(), sfURI);
-	}
-
-	/**
-	 * Get a structural feature from a JavaClass, where the feature
-	 * is specified by its URI (e.g. "java:/java.lang#Object/class").
-	 */
-	public static EStructuralFeature getSFeature(JavaClass jclass, URI sfURI) {
-		return getSFeature(jclass.eResource().getResourceSet(), sfURI);
-	}
-	
-	/**
-	 * Get a structural feature from a ResourceSet, where the feature
-	 * is specified by its URI (e.g. "java:/java.lang#Object/class").
-	 */
-	public static EStructuralFeature getSFeature(ResourceSet rset, URI sfURI) {
-		return (EStructuralFeature) rset.getEObject(sfURI, true);
-	}	
-	
-	/**
-	 * Get a reference from an instance of an IJavaObjectInstance, where the feature
-	 * is specified by its URI (e.g. "java:/java.lang#Object/class").
-	 */
-	public static EReference getReference(IJavaObjectInstance jobject, URI sfURI) {
-		return (EReference) getSFeature((JavaClass) jobject.getJavaType(), sfURI);
-	}
-
-	/**
-	 * Get a reference from a JavaClass, where the feature
-	 * is specified by its URI (e.g. "java:/java.lang#Object/class").
-	 */
-	public static EReference getReference(JavaClass jclass, URI sfURI) {
-		return (EReference) getSFeature(jclass.eResource().getResourceSet(), sfURI);
-	}
-	
-	/**
-	 * Get a reference from a ResourceSet, where the feature
-	 * is specified by its URI (e.g. "java:/java.lang#Object/class").
-	 */
-	public static EReference getReference(ResourceSet rset, URI sfURI) {
-		return (EReference) rset.getEObject(sfURI, true);
-	}	
-	
-	/**
-	 * Get the allocation Feature for this object. Since it depends
-	 * on what resource that the metaclass is defined in, we must look for it.
-	 */
-	public static EReference getAllocationFeature(IJavaInstance jinstance) {
-		return (EReference) jinstance.eClass().getEStructuralFeature(ALLOCATION);
-	}
-			
-	public static void initialize(ResourceSet rset) {
-			if (EcoreUtil.getExistingAdapter(rset, IInstantiationHandlerFactoryAdapter.ADAPTER_KEY) == null)
-				rset.eAdapters().add(new JavaInstantiationHandlerFactoryAdapter());
-	}
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java
deleted file mode 100644
index 8d5df8646..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.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.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaInstantiationHandlerFactoryAdapter.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/14 23:30:35 $ 
- */
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-
-import org.eclipse.jem.java.internal.impl.JavaFactoryImpl;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter;
-
-/**
- * This adapter is attached to the resource set for a java model. The
- * JavaXMIFactory will ask for this adapter and ask it for the IInstantiationHandler.
- */
-public class JavaInstantiationHandlerFactoryAdapter extends AdapterImpl implements IInstantiationHandlerFactoryAdapter {
-
-	/**
-	 * Constructor for JavaInstantiationHandlerFactoryAdapter.
-	 */
-	public JavaInstantiationHandlerFactoryAdapter() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.instantiation.IInstantiationHandlerFactoryAdapter#getInstantiationHandler(JavaFactoryImpl)
-	 */
-	public IInstantiationHandler getInstantiationHandler(JavaFactoryImpl factory) {
-		return JavaFactoryHandler.INSTANCE;
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return IInstantiationHandlerFactoryAdapter.ADAPTER_KEY == type;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java
deleted file mode 100644
index 8d7327f8d..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java
+++ /dev/null
@@ -1,31 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JavaObjectInstance.java,v $
- *  $Revision: 1.18 $  $Date: 2005/08/23 21:13:01 $ 
- */
-package org.eclipse.jem.internal.instantiation.base;
- 
-
-/**
- * Java Object Instance implementation.
- * @since 1.1.0.1
- */
-public class JavaObjectInstance extends JavaInstance implements IJavaObjectInstance {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance#isPrimitive()
-	 */
-	public boolean isPrimitive() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
deleted file mode 100644
index 39274677e..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeAllocationInstantiationVisitor.java,v $
- *  $Revision: 1.9 $  $Date: 2005/10/28 22:56:46 $ 
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
- 
-/**
- * This is the standard parse visitor for instantiating a bean proxy from a java parse tree allocation.
- * It can be reused, but is not thread-safe.
- * 
- * @since 1.0.0
- */
-public class ParseTreeAllocationInstantiationVisitor extends ParseVisitor {
-		
-	/**
-	 * The expression that is being created and evaluated.
-	 */
-	private IExpression expression;
-	
-	/*
-	 * The next expression type that should be used. It is used when one expression is sending the
-	 * visitation to the next expression. It will set this to what that expression should be using. This
-	 * is necessary because the next expression doesn't know what it should be.
-	 */
-	private ForExpression nextExpression = ForExpression.ROOTEXPRESSION;
-	
-	/**
-	 * An exception occurred during processing. It is a RuntimeException because
-	 * it can be thrown at any time. It wrappers another exception. That exception
-	 * can be retrieved from the cause of the ProcessingException.
-	 * 
-	 * @see Throwable#getCause()
-	 * @since 1.0.0
-	 */
-	public static class ProcessingException extends RuntimeException {
-		
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 * 
-		 * @since 1.1.0
-		 */
-		private static final long serialVersionUID = 1268624222490406643L;
-
-		/**
-		 * @param cause
-		 * 
-		 * @since 1.0.0
-		 */
-		public ProcessingException(Throwable cause) {
-			super(cause);
-		}
-	}
-	
-	static final InfixOperator[] INFIXTOPROXY;
-	static {
-		INFIXTOPROXY = new InfixOperator[PTInfixOperator.VALUES.size()];
-		INFIXTOPROXY[PTInfixOperator.AND] = InfixOperator.IN_AND;
-		INFIXTOPROXY[PTInfixOperator.CONDITIONAL_AND] = InfixOperator.IN_CONDITIONAL_AND;
-		INFIXTOPROXY[PTInfixOperator.CONDITIONAL_OR] = InfixOperator.IN_CONDITIONAL_OR;
-		INFIXTOPROXY[PTInfixOperator.DIVIDE] = InfixOperator.IN_DIVIDE;
-		INFIXTOPROXY[PTInfixOperator.EQUALS] = InfixOperator.IN_EQUALS;
-		INFIXTOPROXY[PTInfixOperator.GREATER] = InfixOperator.IN_GREATER;
-		INFIXTOPROXY[PTInfixOperator.GREATER_EQUALS] = InfixOperator.IN_GREATER_EQUALS;
-		INFIXTOPROXY[PTInfixOperator.LEFT_SHIFT] = InfixOperator.IN_LEFT_SHIFT;
-		INFIXTOPROXY[PTInfixOperator.LESS] = InfixOperator.IN_LESS;
-		INFIXTOPROXY[PTInfixOperator.LESS_EQUALS] = InfixOperator.IN_LESS_EQUALS;
-		INFIXTOPROXY[PTInfixOperator.MINUS] = InfixOperator.IN_MINUS;
-		INFIXTOPROXY[PTInfixOperator.NOT_EQUALS] = InfixOperator.IN_NOT_EQUALS;
-		INFIXTOPROXY[PTInfixOperator.OR] = InfixOperator.IN_OR;
-		INFIXTOPROXY[PTInfixOperator.PLUS] = InfixOperator.IN_PLUS;
-		INFIXTOPROXY[PTInfixOperator.REMAINDER] = InfixOperator.IN_REMAINDER;
-		INFIXTOPROXY[PTInfixOperator.RIGHT_SHIFT_SIGNED] = InfixOperator.IN_RIGHT_SHIFT_SIGNED;
-		INFIXTOPROXY[PTInfixOperator.RIGHT_SHIFT_UNSIGNED] = InfixOperator.IN_RIGHT_SHIFT_UNSIGNED;
-		INFIXTOPROXY[PTInfixOperator.TIMES] = InfixOperator.IN_TIMES;
-		INFIXTOPROXY[PTInfixOperator.XOR] = InfixOperator.IN_XOR;
-	}
-	
-	/**
-	 * A helper method to convert the parse tree's infix operator to the Proxy infix operator.
-	 * 
-	 * @param operator
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public static InfixOperator convertPTInfixOperatorToProxyInfixOperator(PTInfixOperator operator) {
-		return INFIXTOPROXY[operator.getValue()];
-	}
-
-	static final PrefixOperator[] PREFIXTOPROXY;
-	static {
-		PREFIXTOPROXY = new PrefixOperator[PTPrefixOperator.VALUES.size()];
-		PREFIXTOPROXY[PTPrefixOperator.COMPLEMENT] = PrefixOperator.PRE_COMPLEMENT;
-		PREFIXTOPROXY[PTPrefixOperator.MINUS] = PrefixOperator.PRE_MINUS;
-		PREFIXTOPROXY[PTPrefixOperator.NOT] = PrefixOperator.PRE_NOT;
-		PREFIXTOPROXY[PTPrefixOperator.PLUS] = PrefixOperator.PRE_PLUS;
-	}
-	
-	/**
-	 * A helper method to convert the parse tree's prefix operator to the Proxy prefix operator.
-	 * 
-	 * @param operator
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public static PrefixOperator convertPTPrefixOperatorToProxyPrefixOperator(PTPrefixOperator operator) {
-		return PREFIXTOPROXY[operator.getValue()];
-	}
-	
-	/**
-	 * Create the visitor with the given registry.
-	 * 
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public ParseTreeAllocationInstantiationVisitor() {
-	}
-	
-	/**
-	 * Get the current registry.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final ProxyFactoryRegistry getRegistry() {
-		return expression.getRegistry();
-	}
-	
-	/**
-	 * Get the current expression.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final IExpression getExpression() {
-		return expression;
-	}	
-
-	/**
-	 * Get the beanproxy for the given expression and registry. It will evaluate immediately.
-	 * 
-	 * @param expression
-	 * @param registry
-	 * @return
-	 * @throws IllegalStateException
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * @throws ProcessingException
-	 * 
-	 * @since 1.0.0
-	 */
-	public IBeanProxy getBeanProxy(PTExpression expression, ProxyFactoryRegistry registry) throws IllegalStateException, IllegalArgumentException, ThrowableProxy, NoExpressionValueException, ProcessingException {
-		this.expression = registry.getBeanProxyFactory().createExpression();
-		setNextExpression(ForExpression.ROOTEXPRESSION);
-		try {
-			expression.accept(this);
-		} catch (ProcessingException e) {
-			// Handle the most common that make sense to be know distinctly and throw them instead of ProcessingException.
-			Throwable t = e.getCause();
-			if (t instanceof NoExpressionValueException)
-				throw (NoExpressionValueException) t;
-			else if (t instanceof IllegalStateException)
-				throw (IllegalStateException) t;
-			else
-				throw e;
-		}
-		
-		return getExpression().getExpressionValue();
-	}
-	
-	/**
-	 * Using the given expression processor allocate the proxy. It will not evaluate immediately, but just push onto the expression.
-	 * @param expression
-	 * @param expressionProcessor
-	 * @return the ExpressionProxy for the allocation.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * @throws ProcessingException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy getProxy(PTExpression expression, IExpression expressionProcessor) throws IllegalStateException, IllegalArgumentException, ProcessingException {
-		this.expression = expressionProcessor;
-		try {
-			ExpressionProxy proxy = expressionProcessor.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
-			setNextExpression(ForExpression.ASSIGNMENT_RIGHT);
-			expression.accept(this);
-			return proxy;
-		} catch (ProcessingException e) {
-			// Handle the most common that make sense to be know distinctly and throw them instead of ProcessingException.
-			Throwable t = e.getCause();
-			if (t instanceof IllegalStateException)
-				throw (IllegalStateException) t;
-			else
-				throw e;
-		}
-	}
-
-	
-	/**
-	 * Set the next expression type. (i.e. the <code>forExpression</code> field of most of the create expression methods.
-	 * 
-	 * @param nextExpression
-	 * 
-	 * @see IExpression#createInfixExpression(int, int, int)
-	 * @since 1.0.0
-	 */
-	protected final void setNextExpression(ForExpression nextExpression) {
-		this.nextExpression = nextExpression;
-	}
-
-	/**
-	 * Get the next expression type. (i.e. the <code>forExpression</code> field of most of the create expression methods.
-	 * 
-	 * @return
-	 * 
-	 * @see IExpression#createInfixExpression(int, int, int)
-	 * @since 1.0.0
-	 */
-	protected final ForExpression getNextExpression() {
-		return nextExpression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration)
-	 */
-	public boolean visit(PTAnonymousClassDeclaration node) {
-		throw new IllegalArgumentException(MessageFormat.format(InstantiationBaseMessages.ParseTreeAllocationInstantiationVisitor_CannotProcessAnonymousDeclarations_EXC_, new Object[] {node.getDeclaration()}));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayAccess)
-	 */
-	public boolean visit(PTArrayAccess node) {
-		getExpression().createArrayAccess(getNextExpression(), node.getIndexes().size());
-		setNextExpression(ForExpression.ARRAYACCESS_ARRAY);
-		node.getArray().accept(this);
-		List idx = node.getIndexes();
-		int s = idx.size();
-		for (int i = 0; i < s; i++) {
-			setNextExpression(ForExpression.ARRAYACCESS_INDEX);
-			((PTExpression) idx.get(i)).accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayCreation)
-	 */
-	public boolean visit(PTArrayCreation node) {
-		getExpression().createArrayCreation(getNextExpression(), node.getType(), node.getDimensions().size());
-		if (node.getDimensions().isEmpty()) {
-			node.getInitializer().accept(this);	// Array initializer doesn't require a next expression.
-		} else {
-			List dims = node.getDimensions();
-			int s = dims.size();
-			for (int i = 0; i < s; i++) {
-				setNextExpression(ForExpression.ARRAYCREATION_DIMENSION);
-				((PTExpression) dims.get(i)).accept(this);
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayInitializer)
-	 */
-	public boolean visit(PTArrayInitializer node) {
-		getExpression().createArrayInitializer(node.getExpressions().size());
-		List exps = node.getExpressions();
-		int s = exps.size();
-		for (int i = 0; i < s; i++) {
-			setNextExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-			((PTExpression) exps.get(i)).accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTBooleanLiteral)
-	 */
-	public boolean visit(PTBooleanLiteral node) {
-		getExpression().createPrimitiveLiteral(getNextExpression(), node.isBooleanValue());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCastExpression)
-	 */
-	public boolean visit(PTCastExpression node) {
-		getExpression().createCastExpression(getNextExpression(), node.getType());
-		setNextExpression(ForExpression.CAST_EXPRESSION);
-		node.getExpression().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCharacterLiteral)
-	 */
-	public boolean visit(PTCharacterLiteral node) {
-		getExpression().createPrimitiveLiteral(getNextExpression(), node.getCharValue());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTClassInstanceCreation)
-	 */
-	public boolean visit(PTClassInstanceCreation node) {
-		getExpression().createClassInstanceCreation(getNextExpression(), node.getType(), node.getArguments().size());
-		List args = node.getArguments();
-		int s = args.size();
-		for (int i = 0; i < s; i++) {
-			setNextExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT);
-			((PTExpression) args.get(i)).accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTConditionalExpression)
-	 */
-	public boolean visit(PTConditionalExpression node) {
-		getExpression().createConditionalExpression(getNextExpression());
-		setNextExpression(ForExpression.CONDITIONAL_CONDITION);
-		node.getCondition().accept(this);
-		setNextExpression(ForExpression.CONDITIONAL_TRUE);
-		node.getTrue().accept(this);
-		setNextExpression(ForExpression.CONDITIONAL_FALSE);
-		node.getFalse().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTFieldAccess)
-	 */
-	public boolean visit(PTFieldAccess node) {
-		getExpression().createFieldAccess(getNextExpression(), node.getField(), node.getReceiver() != null);
-		if (node.getReceiver() != null) {
-			setNextExpression(ForExpression.FIELD_RECEIVER);
-			node.getReceiver().accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInfixExpression)
-	 */
-	public boolean visit(PTInfixExpression node) {
-		getExpression().createInfixExpression(getNextExpression(), convertPTInfixOperatorToProxyInfixOperator(node.getOperator()), node.getExtendedOperands().size());
-		setNextExpression(ForExpression.INFIX_LEFT);
-		node.getLeftOperand().accept(this);
-		setNextExpression(ForExpression.INFIX_RIGHT);
-		node.getRightOperand().accept(this);
-		List extended = node.getExtendedOperands();
-		int s = extended.size();
-		for (int i = 0; i < s; i++) {
-			setNextExpression(ForExpression.INFIX_EXTENDED);
-			((PTExpression) extended.get(i)).accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInstanceof)
-	 */
-	public boolean visit(PTInstanceof node) {
-		getExpression().createInstanceofExpression(getNextExpression(), node.getType());
-		setNextExpression(ForExpression.INSTANCEOF_VALUE);
-		node.getOperand().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInvalidExpression)
-	 */
-	public boolean visit(PTInvalidExpression node) {
-		throw new IllegalArgumentException(node.getMessage());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTMethodInvocation)
-	 */
-	public boolean visit(PTMethodInvocation node) {
-		getExpression().createMethodInvocation(getNextExpression(), node.getName(), node.getReceiver() != null, node.getArguments().size());
-		if (node.getReceiver() != null) {
-			setNextExpression(ForExpression.METHOD_RECEIVER);
-			node.getReceiver().accept(this);
-		}
-		List args = node.getArguments();
-		int s = args.size();
-		for (int i = 0; i < s; i++) {
-			setNextExpression(ForExpression.METHOD_ARGUMENT);
-			((PTExpression) args.get(i)).accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTName)
-	 */
-	public boolean visit(PTName node) {
-		// This is special in the PTName can only be used as a type receiver at this time.
-		getExpression().createTypeReceiver(node.getName());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNullLiteral)
-	 */
-	public boolean visit(PTNullLiteral node) {
-		// This is special in the PTName can only be used as a type receiver at this time.
-		getExpression().createNull(getNextExpression());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNumberLiteral)
-	 */
-	public boolean visit(PTNumberLiteral node) {
-		// It is assumed the tokens are trimmed.
-		String lit = node.getToken();
-		char lastChar = lit.charAt(lit.length()-1);
-		if (lastChar == 'l' || lastChar == 'L' ) {
-			// It is definitely a long.
-			// Using decode so that things like 0x3 will be parsed. parseLong won't recognize those.
-			getExpression().createPrimitiveLiteral(getNextExpression(), Long.decode(lit.substring(0, lit.length()-1)).longValue());
-		} else if (lastChar == 'F' || lastChar == 'f') {
-			// It is definitely a float.
-			getExpression().createPrimitiveLiteral(getNextExpression(), Float.parseFloat(lit.substring(0, lit.length()-1)));
-		} else if (lastChar == 'D' || lastChar == 'd')  {
-			// It is definitely a double.
-			getExpression().createPrimitiveLiteral(getNextExpression(), Double.parseDouble(lit.substring(0, lit.length()-1)));
-		} else if (lit.indexOf('.') != -1 || lit.indexOf('e') != -1 || lit.indexOf('E') != -1) {
-				// It is definitely a double. (has a period or an exponent, but does not have an 'f' on the end is always a double).
-				getExpression().createPrimitiveLiteral(getNextExpression(), Double.parseDouble(lit.substring(0, lit.length())));
-		} else {
-			// Using decode so that things like 0x3 will be parsed. parseInt won't recognize those.
-			getExpression().createPrimitiveLiteral(getNextExpression(), Integer.decode(lit).intValue());
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTParenthesizedExpression)
-	 */
-	public boolean visit(PTParenthesizedExpression node) {
-		node.getExpression().accept(this);	// For instantiation purposes, the parenthesis can be ignored.
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTPrefixExpression)
-	 */
-	public boolean visit(PTPrefixExpression node) {
-		getExpression().createPrefixExpression(getNextExpression(), convertPTPrefixOperatorToProxyPrefixOperator(node.getOperator()));
-		setNextExpression(ForExpression.PREFIX_OPERAND);
-		node.getExpression().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTStringLiteral)
-	 */
-	public boolean visit(PTStringLiteral node) {
-		getExpression().createProxyExpression(getNextExpression(), getRegistry().getBeanProxyFactory().createBeanProxyWith(node.getLiteralValue()));
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTThisLiteral)
-	 */
-	public boolean visit(PTThisLiteral node) {
-		throw new IllegalArgumentException(InstantiationBaseMessages.ParseTreeAllocationInstantiationVisitor_CurrentlyThisNotSupported_EXC_); 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTTypeLiteral)
-	 */
-	public boolean visit(PTTypeLiteral node) {
-		getExpression().createTypeLiteral(getNextExpression(), node.getType());
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
deleted file mode 100644
index d7e1f1615..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-ParseTreeAllocationInstantiationVisitor_CurrentlyThisNotSupported_EXC_ = IWAV0001E Currently "this" is not supported
-ParseTreeAllocationInstantiationVisitor_CannotProcessAnonymousDeclarations_EXC_ = Cannot process anonymous declarations: "{0}"
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java
deleted file mode 100644
index 8ea295f75..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java
+++ /dev/null
@@ -1,233 +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.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: ImplicitAllocationImpl.java,v $
- *  $Revision: 1.9 $  $Date: 2005/10/03 19:20:41 $ 
- */
- 
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.ImplicitAllocation;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Implicit Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl#getParent <em>Parent</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl#getFeature <em>Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImplicitAllocationImpl extends JavaAllocationImpl implements ImplicitAllocation {
-	/**
-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParent()
-	 * @generated
-	 * @ordered
-	 */
-	protected EObject parent = null;
-
-	/**
-	 * The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature feature = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ImplicitAllocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getImplicitAllocation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject getParent() {
-		if (parent != null && parent.eIsProxy()) {
-			EObject oldParent = parent;
-			parent = eResolveProxy((InternalEObject)parent);
-			if (parent != oldParent) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.IMPLICIT_ALLOCATION__PARENT, oldParent, parent));
-			}
-		}
-		return parent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject basicGetParent() {
-		return parent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParent(EObject newParent) {
-		EObject oldParent = parent;
-		parent = newParent;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.IMPLICIT_ALLOCATION__PARENT, oldParent, parent));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getFeature() {
-		if (feature != null && feature.eIsProxy()) {
-			EStructuralFeature oldFeature = feature;
-			feature = (EStructuralFeature)eResolveProxy((InternalEObject)feature);
-			if (feature != oldFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE, oldFeature, feature));
-			}
-		}
-		return feature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetFeature() {
-		return feature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFeature(EStructuralFeature newFeature) {
-		EStructuralFeature oldFeature = feature;
-		feature = newFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE, oldFeature, feature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
-				if (resolve) return getParent();
-				return basicGetParent();
-			case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
-				if (resolve) return getFeature();
-				return basicGetFeature();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
-				setParent((EObject)newValue);
-				return;
-			case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
-				setFeature((EStructuralFeature)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
-				setParent((EObject)null);
-				return;
-			case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
-				setFeature((EStructuralFeature)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
-				return parent != null;
-			case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
-				return feature != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return "ImplicitAllocation(" + getParent() + "-" + getFeature();
-	}
-
-	public boolean isImplicit() {
-		return true;
-	}
-	
-} //ImplicitAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java
deleted file mode 100644
index 78dfa34ce..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java
+++ /dev/null
@@ -1,163 +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.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: InitStringAllocationImpl.java,v $
- *  $Revision: 1.8 $  $Date: 2005/09/15 21:02:19 $ 
- */
- 
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.InitStringAllocation;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Init String Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.InitStringAllocationImpl#getInitString <em>Init String</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InitStringAllocationImpl extends JavaAllocationImpl implements InitStringAllocation {
-	/**
-	 * The default value of the '{@link #getInitString() <em>Init String</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitString()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INIT_STRING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInitString() <em>Init String</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitString()
-	 * @generated
-	 * @ordered
-	 */
-	protected String initString = INIT_STRING_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InitStringAllocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getInitStringAllocation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInitString() {
-		return initString;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInitString(String newInitString) {
-		String oldInitString = initString;
-		initString = newInitString;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING, oldInitString, initString));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
-				return getInitString();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
-				setInitString((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
-				setInitString(INIT_STRING_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
-				return INIT_STRING_EDEFAULT == null ? initString != null : !INIT_STRING_EDEFAULT.equals(initString);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer();
-		result.append("InitString: ");
-		result.append(initString);
-		return result.toString();
-	}
-
-} //InitStringAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java
deleted file mode 100644
index 002898228..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java
+++ /dev/null
@@ -1,633 +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.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: InstantiationFactoryImpl.java,v $
- *  $Revision: 1.12 $  $Date: 2005/10/28 22:56:46 $ 
- */
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class InstantiationFactoryImpl extends EFactoryImpl implements InstantiationFactory {
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InstantiationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case InstantiationPackage.INIT_STRING_ALLOCATION: return createInitStringAllocation();
-			case InstantiationPackage.IMPLICIT_ALLOCATION: return createImplicitAllocation();
-			case InstantiationPackage.PARSE_TREE_ALLOCATION: return createParseTreeAllocation();
-			case InstantiationPackage.PT_ARRAY_ACCESS: return createPTArrayAccess();
-			case InstantiationPackage.PT_ARRAY_CREATION: return createPTArrayCreation();
-			case InstantiationPackage.PT_ARRAY_INITIALIZER: return createPTArrayInitializer();
-			case InstantiationPackage.PT_BOOLEAN_LITERAL: return createPTBooleanLiteral();
-			case InstantiationPackage.PT_CAST_EXPRESSION: return createPTCastExpression();
-			case InstantiationPackage.PT_CHARACTER_LITERAL: return createPTCharacterLiteral();
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION: return createPTClassInstanceCreation();
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION: return createPTConditionalExpression();
-			case InstantiationPackage.PT_FIELD_ACCESS: return createPTFieldAccess();
-			case InstantiationPackage.PT_INFIX_EXPRESSION: return createPTInfixExpression();
-			case InstantiationPackage.PT_INSTANCEOF: return createPTInstanceof();
-			case InstantiationPackage.PT_METHOD_INVOCATION: return createPTMethodInvocation();
-			case InstantiationPackage.PT_NAME: return createPTName();
-			case InstantiationPackage.PT_NULL_LITERAL: return createPTNullLiteral();
-			case InstantiationPackage.PT_NUMBER_LITERAL: return createPTNumberLiteral();
-			case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION: return createPTParenthesizedExpression();
-			case InstantiationPackage.PT_PREFIX_EXPRESSION: return createPTPrefixExpression();
-			case InstantiationPackage.PT_STRING_LITERAL: return createPTStringLiteral();
-			case InstantiationPackage.PT_THIS_LITERAL: return createPTThisLiteral();
-			case InstantiationPackage.PT_TYPE_LITERAL: return createPTTypeLiteral();
-			case InstantiationPackage.PT_INVALID_EXPRESSION: return createPTInvalidExpression();
-			case InstantiationPackage.PT_INSTANCE_REFERENCE: return createPTInstanceReference();
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION: return createPTAnonymousClassDeclaration();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case InstantiationPackage.PT_INFIX_OPERATOR: {
-				PTInfixOperator result = PTInfixOperator.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case InstantiationPackage.PT_PREFIX_OPERATOR: {
-				PTPrefixOperator result = PTPrefixOperator.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case InstantiationPackage.PT_INFIX_OPERATOR:
-				return instanceValue == null ? null : instanceValue.toString();
-			case InstantiationPackage.PT_PREFIX_OPERATOR:
-				return instanceValue == null ? null : instanceValue.toString();
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InitStringAllocation createInitStringAllocation() {
-		InitStringAllocationImpl initStringAllocation = new InitStringAllocationImpl();
-		return initStringAllocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplicitAllocation createImplicitAllocation() {
-		ImplicitAllocationImpl implicitAllocation = new ImplicitAllocationImpl();
-		return implicitAllocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParseTreeAllocation createParseTreeAllocation() {
-		ParseTreeAllocationImpl parseTreeAllocation = new ParseTreeAllocationImpl();
-		return parseTreeAllocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTArrayAccess createPTArrayAccess() {
-		PTArrayAccessImpl ptArrayAccess = new PTArrayAccessImpl();
-		return ptArrayAccess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTArrayCreation createPTArrayCreation() {
-		PTArrayCreationImpl ptArrayCreation = new PTArrayCreationImpl();
-		return ptArrayCreation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTArrayInitializer createPTArrayInitializer() {
-		PTArrayInitializerImpl ptArrayInitializer = new PTArrayInitializerImpl();
-		return ptArrayInitializer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTBooleanLiteral createPTBooleanLiteral() {
-		PTBooleanLiteralImpl ptBooleanLiteral = new PTBooleanLiteralImpl();
-		return ptBooleanLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTCastExpression createPTCastExpression() {
-		PTCastExpressionImpl ptCastExpression = new PTCastExpressionImpl();
-		return ptCastExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTCharacterLiteral createPTCharacterLiteral() {
-		PTCharacterLiteralImpl ptCharacterLiteral = new PTCharacterLiteralImpl();
-		return ptCharacterLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTClassInstanceCreation createPTClassInstanceCreation() {
-		PTClassInstanceCreationImpl ptClassInstanceCreation = new PTClassInstanceCreationImpl();
-		return ptClassInstanceCreation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTConditionalExpression createPTConditionalExpression() {
-		PTConditionalExpressionImpl ptConditionalExpression = new PTConditionalExpressionImpl();
-		return ptConditionalExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTFieldAccess createPTFieldAccess() {
-		PTFieldAccessImpl ptFieldAccess = new PTFieldAccessImpl();
-		return ptFieldAccess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTInfixExpression createPTInfixExpression() {
-		PTInfixExpressionImpl ptInfixExpression = new PTInfixExpressionImpl();
-		return ptInfixExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTInstanceof createPTInstanceof() {
-		PTInstanceofImpl ptInstanceof = new PTInstanceofImpl();
-		return ptInstanceof;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTMethodInvocation createPTMethodInvocation() {
-		PTMethodInvocationImpl ptMethodInvocation = new PTMethodInvocationImpl();
-		return ptMethodInvocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTName createPTName() {
-		PTNameImpl ptName = new PTNameImpl();
-		return ptName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTNullLiteral createPTNullLiteral() {
-		PTNullLiteralImpl ptNullLiteral = new PTNullLiteralImpl();
-		return ptNullLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTNumberLiteral createPTNumberLiteral() {
-		PTNumberLiteralImpl ptNumberLiteral = new PTNumberLiteralImpl();
-		return ptNumberLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTParenthesizedExpression createPTParenthesizedExpression() {
-		PTParenthesizedExpressionImpl ptParenthesizedExpression = new PTParenthesizedExpressionImpl();
-		return ptParenthesizedExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTPrefixExpression createPTPrefixExpression() {
-		PTPrefixExpressionImpl ptPrefixExpression = new PTPrefixExpressionImpl();
-		return ptPrefixExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTStringLiteral createPTStringLiteral() {
-		PTStringLiteralImpl ptStringLiteral = new PTStringLiteralImpl();
-		return ptStringLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTThisLiteral createPTThisLiteral() {
-		PTThisLiteralImpl ptThisLiteral = new PTThisLiteralImpl();
-		return ptThisLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTTypeLiteral createPTTypeLiteral() {
-		PTTypeLiteralImpl ptTypeLiteral = new PTTypeLiteralImpl();
-		return ptTypeLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTInvalidExpression createPTInvalidExpression() {
-		PTInvalidExpressionImpl ptInvalidExpression = new PTInvalidExpressionImpl();
-		return ptInvalidExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTInstanceReference createPTInstanceReference() {
-		PTInstanceReferenceImpl ptInstanceReference = new PTInstanceReferenceImpl();
-		return ptInstanceReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTAnonymousClassDeclaration createPTAnonymousClassDeclaration() {
-		PTAnonymousClassDeclarationImpl ptAnonymousClassDeclaration = new PTAnonymousClassDeclarationImpl();
-		return ptAnonymousClassDeclaration;
-	}
-
-	public PTInstanceReference createPTInstanceReference(IJavaInstance instance) {
-		PTInstanceReference ptInstanceReference = createPTInstanceReference();
-		ptInstanceReference.setReference(instance);
-		return ptInstanceReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InstantiationPackage getInstantiationPackage() {
-		return (InstantiationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static InstantiationPackage getPackage() {
-		return InstantiationPackage.eINSTANCE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createImplicitAllocation(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public ImplicitAllocation createImplicitAllocation(EObject parent, EStructuralFeature sf) {
-		ImplicitAllocation alloc = createImplicitAllocation();
-		alloc.setParent(parent);
-		alloc.setFeature(sf);
-		return alloc;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createInitStringAllocation(java.lang.String)
-	 */
-	public InitStringAllocation createInitStringAllocation(String initString) {
-		InitStringAllocation alloc = createInitStringAllocation();
-		alloc.setInitString(initString);
-		return alloc;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createParseTreeAllocation(org.eclipse.jem.internal.instantiation.PTExpression)
-	 */
-	public ParseTreeAllocation createParseTreeAllocation(PTExpression expression) {
-		ParseTreeAllocation a = createParseTreeAllocation();
-		a.setExpression(expression);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTArrayAccess(org.eclipse.jem.internal.instantiation.PTExpression, java.util.List)
-	 */
-	public PTArrayAccess createPTArrayAccess(PTExpression array, List indexes) {
-		PTArrayAccess a = createPTArrayAccess();
-		a.setArray(array);
-		a.getIndexes().addAll(indexes);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTArrayCreation(java.lang.String, java.util.List, org.eclipse.jem.internal.instantiation.PTArrayInitializer)
-	 */
-	public PTArrayCreation createPTArrayCreation(String type, List dimensions, PTArrayInitializer initializer) {
-		PTArrayCreation a = createPTArrayCreation();
-		a.setType(type);
-		if (dimensions != null)
-			a.getDimensions().addAll(dimensions);
-		a.setInitializer(initializer);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTArrayInitializer(java.util.List)
-	 */
-	public PTArrayInitializer createPTArrayInitializer(List expressions) {
-		PTArrayInitializer a = createPTArrayInitializer();
-		if (expressions != null)
-			a.getExpressions().addAll(expressions);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTBooleanLiteral(boolean)
-	 */
-	public PTBooleanLiteral createPTBooleanLiteral(boolean booleanValue) {
-		PTBooleanLiteral a = createPTBooleanLiteral();
-		a.setBooleanValue(booleanValue);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTCastExpression(java.lang.String, org.eclipse.jem.internal.instantiation.PTExpression)
-	 */
-	public PTCastExpression createPTCastExpression(String type, PTExpression expression) {
-		PTCastExpression a = createPTCastExpression();
-		a.setType(type);
-		a.setExpression(expression);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTCharacterLiteral(java.lang.String)
-	 */
-	public PTCharacterLiteral createPTCharacterLiteral(String escapedValue) {
-		PTCharacterLiteral a = createPTCharacterLiteral();
-		a.setEscapedValue(escapedValue);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTClassInstanceCreation(java.lang.String, java.util.List)
-	 */
-	public PTClassInstanceCreation createPTClassInstanceCreation(String type, List arguments) {
-		PTClassInstanceCreation a = createPTClassInstanceCreation();
-		a.setType(type);
-		if (arguments != null)
-			a.getArguments().addAll(arguments);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTConditionalExpression(org.eclipse.jem.internal.instantiation.PTExpression, org.eclipse.jem.internal.instantiation.PTExpression, org.eclipse.jem.internal.instantiation.PTExpression)
-	 */
-	public PTConditionalExpression createPTConditionalExpression(
-		PTExpression condition,
-		PTExpression trueExpressoin,
-		PTExpression falseExpression) {
-		PTConditionalExpression a = createPTConditionalExpression();
-		a.setCondition(condition);
-		a.setTrue(trueExpressoin);
-		a.setFalse(falseExpression);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTFieldAccess(org.eclipse.jem.internal.instantiation.PTExpression, java.lang.String)
-	 */
-	public PTFieldAccess createPTFieldAccess(PTExpression receiver, String field) {
-		PTFieldAccess a = createPTFieldAccess();
-		a.setReceiver(receiver);
-		a.setField(field);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTInfixExpression(org.eclipse.jem.internal.instantiation.PTExpression, org.eclipse.jem.internal.instantiation.PTInfixOperator, org.eclipse.jem.internal.instantiation.PTExpression, java.util.List)
-	 */
-	public PTInfixExpression createPTInfixExpression(
-		PTExpression leftOperand,
-		PTInfixOperator operator,
-		PTExpression rightOperand,
-		List extendedOperands) {
-		PTInfixExpression a = createPTInfixExpression();
-		a.setLeftOperand(leftOperand);
-		a.setOperator(operator);
-		a.setRightOperand(rightOperand);
-		if (extendedOperands != null)
-			a.getExtendedOperands().addAll(extendedOperands);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTInstanceof(org.eclipse.jem.internal.instantiation.PTExpression, java.lang.String)
-	 */
-	public PTInstanceof createPTInstanceof(PTExpression operand, String type) {
-		PTInstanceof a = createPTInstanceof();
-		a.setOperand(operand);
-		a.setType(type);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTInvalidExpression(java.lang.String)
-	 */
-	public PTInvalidExpression createPTInvalidExpression(String message) {
-		PTInvalidExpression a = createPTInvalidExpression();
-		a.setMessage(message);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTMethodInvocation(org.eclipse.jem.internal.instantiation.PTExpression, java.lang.String, java.util.List)
-	 */
-	public PTMethodInvocation createPTMethodInvocation(PTExpression receiver, String name, List arguments) {
-		PTMethodInvocation a = createPTMethodInvocation();
-		a.setReceiver(receiver);
-		a.setName(name);
-		if (arguments != null)
-			a.getArguments().addAll(arguments);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTName(java.lang.String)
-	 */
-	public PTName createPTName(String name) {
-		PTName a = createPTName();
-		a.setName(name);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTNumberLiteral(java.lang.String)
-	 */
-	public PTNumberLiteral createPTNumberLiteral(String token) {
-		PTNumberLiteral a = createPTNumberLiteral();
-		a.setToken(token);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTParenthesizedExpression(org.eclipse.jem.internal.instantiation.PTExpression)
-	 */
-	public PTParenthesizedExpression createPTParenthesizedExpression(PTExpression expression) {
-		PTParenthesizedExpression a = createPTParenthesizedExpression();
-		a.setExpression(expression);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTPrefixExpression(org.eclipse.jem.internal.instantiation.PTPrefixOperator, org.eclipse.jem.internal.instantiation.PTExpression)
-	 */
-	public PTPrefixExpression createPTPrefixExpression(PTPrefixOperator operator, PTExpression expression) {
-		PTPrefixExpression a = createPTPrefixExpression();
-		a.setOperator(operator);
-		a.setExpression(expression);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTStringLiteral(java.lang.String)
-	 */
-	public PTStringLiteral createPTStringLiteral(String escapeLiteral) {
-		PTStringLiteral a = createPTStringLiteral();
-		a.setEscapedValue(escapeLiteral);
-		return a;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTTypeLiteral(java.lang.String)
-	 */
-	public PTTypeLiteral createPTTypeLiteral(String type) {
-		PTTypeLiteral a = createPTTypeLiteral();
-		a.setType(type);
-		return a;
-	}
-
-} //InstantiationFactoryImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
deleted file mode 100644
index 8debe1f24..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class InstantiationImplMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.impl.messages";//$NON-NLS-1$
-
-	private InstantiationImplMessages() {
-		// Do not instantiate
-	}
-
-	public static String NaiveExpressionFlattener_InvalidExpression;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, InstantiationImplMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
deleted file mode 100644
index 3a385ba63..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
+++ /dev/null
@@ -1,1392 +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.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: InstantiationPackageImpl.java,v $
- *  $Revision: 1.13 $  $Date: 2005/10/28 22:56:46 $ 
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-
-import org.eclipse.jem.internal.instantiation.PTArrayAccess;
-import org.eclipse.jem.internal.instantiation.PTArrayCreation;
-import org.eclipse.jem.internal.instantiation.PTArrayInitializer;
-import org.eclipse.jem.internal.instantiation.PTBooleanLiteral;
-import org.eclipse.jem.internal.instantiation.PTCastExpression;
-import org.eclipse.jem.internal.instantiation.PTCharacterLiteral;
-import org.eclipse.jem.internal.instantiation.PTClassInstanceCreation;
-import org.eclipse.jem.internal.instantiation.PTConditionalExpression;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTFieldAccess;
-import org.eclipse.jem.internal.instantiation.ImplicitAllocation;
-import org.eclipse.jem.internal.instantiation.PTInfixExpression;
-import org.eclipse.jem.internal.instantiation.PTInfixOperator;
-import org.eclipse.jem.internal.instantiation.PTInstanceReference;
-import org.eclipse.jem.internal.instantiation.InitStringAllocation;
-import org.eclipse.jem.internal.instantiation.PTInstanceof;
-import org.eclipse.jem.internal.instantiation.InstantiationFactory;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInvalidExpression;
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-
-import org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration;
-import org.eclipse.jem.internal.instantiation.PTMethodInvocation;
-import org.eclipse.jem.internal.instantiation.PTName;
-import org.eclipse.jem.internal.instantiation.PTNullLiteral;
-import org.eclipse.jem.internal.instantiation.PTNumberLiteral;
-import org.eclipse.jem.internal.instantiation.PTParenthesizedExpression;
-import org.eclipse.jem.internal.instantiation.ParseTreeAllocation;
-
-import org.eclipse.jem.internal.instantiation.PTPrefixExpression;
-import org.eclipse.jem.internal.instantiation.PTPrefixOperator;
-import org.eclipse.jem.internal.instantiation.PTStringLiteral;
-import org.eclipse.jem.internal.instantiation.PTThisLiteral;
-import org.eclipse.jem.internal.instantiation.PTTypeLiteral;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance;
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-import org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class InstantiationPackageImpl extends EPackageImpl implements InstantiationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iJavaDataTypeInstanceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iJavaObjectInstanceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaAllocationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass initStringAllocationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass implicitAllocationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass parseTreeAllocationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptArrayAccessEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptArrayCreationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptArrayInitializerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptBooleanLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptCastExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptCharacterLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptClassInstanceCreationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptConditionalExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptFieldAccessEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptInfixExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptInstanceofEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptMethodInvocationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptNullLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptNumberLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptParenthesizedExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptPrefixExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptStringLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptThisLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptTypeLiteralEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptInvalidExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptInstanceReferenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ptAnonymousClassDeclarationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum ptInfixOperatorEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum ptPrefixOperatorEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iJavaInstanceEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private InstantiationPackageImpl() {
-		super(eNS_URI, InstantiationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static InstantiationPackage init() {
-		if (isInited) return (InstantiationPackage)EPackage.Registry.INSTANCE.getEPackage(InstantiationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		InstantiationPackageImpl theInstantiationPackage = (InstantiationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof InstantiationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new InstantiationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-
-		// Create package meta-data objects
-		theInstantiationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theInstantiationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theInstantiationPackage.freeze();
-
-		return theInstantiationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIJavaObjectInstance() {
-		return iJavaObjectInstanceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJavaAllocation() {
-		return javaAllocationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInitStringAllocation() {
-		return initStringAllocationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInitStringAllocation_InitString() {
-		return (EAttribute)initStringAllocationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getImplicitAllocation() {
-		return implicitAllocationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getImplicitAllocation_Parent() {
-		return (EReference)implicitAllocationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getImplicitAllocation_Feature() {
-		return (EReference)implicitAllocationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParseTreeAllocation() {
-		return parseTreeAllocationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParseTreeAllocation_Expression() {
-		return (EReference)parseTreeAllocationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTExpression() {
-		return ptExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTArrayAccess() {
-		return ptArrayAccessEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTArrayAccess_Array() {
-		return (EReference)ptArrayAccessEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTArrayAccess_Indexes() {
-		return (EReference)ptArrayAccessEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTArrayCreation() {
-		return ptArrayCreationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTArrayCreation_Type() {
-		return (EAttribute)ptArrayCreationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTArrayCreation_Dimensions() {
-		return (EReference)ptArrayCreationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTArrayCreation_Initializer() {
-		return (EReference)ptArrayCreationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTArrayInitializer() {
-		return ptArrayInitializerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTArrayInitializer_Expressions() {
-		return (EReference)ptArrayInitializerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTBooleanLiteral() {
-		return ptBooleanLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTBooleanLiteral_BooleanValue() {
-		return (EAttribute)ptBooleanLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTCastExpression() {
-		return ptCastExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTCastExpression_Type() {
-		return (EAttribute)ptCastExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTCastExpression_Expression() {
-		return (EReference)ptCastExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTCharacterLiteral() {
-		return ptCharacterLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTCharacterLiteral_EscapedValue() {
-		return (EAttribute)ptCharacterLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTCharacterLiteral_CharValue() {
-		return (EAttribute)ptCharacterLiteralEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTClassInstanceCreation() {
-		return ptClassInstanceCreationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTClassInstanceCreation_Type() {
-		return (EAttribute)ptClassInstanceCreationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTClassInstanceCreation_Arguments() {
-		return (EReference)ptClassInstanceCreationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTConditionalExpression() {
-		return ptConditionalExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTConditionalExpression_Condition() {
-		return (EReference)ptConditionalExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTConditionalExpression_True() {
-		return (EReference)ptConditionalExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTConditionalExpression_False() {
-		return (EReference)ptConditionalExpressionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTFieldAccess() {
-		return ptFieldAccessEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTFieldAccess_Receiver() {
-		return (EReference)ptFieldAccessEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTFieldAccess_Field() {
-		return (EAttribute)ptFieldAccessEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTInfixExpression() {
-		return ptInfixExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTInfixExpression_LeftOperand() {
-		return (EReference)ptInfixExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTInfixExpression_Operator() {
-		return (EAttribute)ptInfixExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTInfixExpression_RightOperand() {
-		return (EReference)ptInfixExpressionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTInfixExpression_ExtendedOperands() {
-		return (EReference)ptInfixExpressionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTInstanceof() {
-		return ptInstanceofEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTInstanceof_Operand() {
-		return (EReference)ptInstanceofEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTInstanceof_Type() {
-		return (EAttribute)ptInstanceofEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTMethodInvocation() {
-		return ptMethodInvocationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTMethodInvocation_Receiver() {
-		return (EReference)ptMethodInvocationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTMethodInvocation_Name() {
-		return (EAttribute)ptMethodInvocationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTMethodInvocation_Arguments() {
-		return (EReference)ptMethodInvocationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTName() {
-		return ptNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTName_Name() {
-		return (EAttribute)ptNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTNullLiteral() {
-		return ptNullLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTNumberLiteral() {
-		return ptNumberLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTNumberLiteral_Token() {
-		return (EAttribute)ptNumberLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTParenthesizedExpression() {
-		return ptParenthesizedExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTParenthesizedExpression_Expression() {
-		return (EReference)ptParenthesizedExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTPrefixExpression() {
-		return ptPrefixExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTPrefixExpression_Operator() {
-		return (EAttribute)ptPrefixExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTPrefixExpression_Expression() {
-		return (EReference)ptPrefixExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTStringLiteral() {
-		return ptStringLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTStringLiteral_EscapedValue() {
-		return (EAttribute)ptStringLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTStringLiteral_LiteralValue() {
-		return (EAttribute)ptStringLiteralEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTThisLiteral() {
-		return ptThisLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTTypeLiteral() {
-		return ptTypeLiteralEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTTypeLiteral_Type() {
-		return (EAttribute)ptTypeLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTInvalidExpression() {
-		return ptInvalidExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTInvalidExpression_Message() {
-		return (EAttribute)ptInvalidExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTInstanceReference() {
-		return ptInstanceReferenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPTInstanceReference_Reference() {
-		return (EReference)ptInstanceReferenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPTAnonymousClassDeclaration() {
-		return ptAnonymousClassDeclarationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTAnonymousClassDeclaration_Declaration() {
-		return (EAttribute)ptAnonymousClassDeclarationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPTAnonymousClassDeclaration_Imports() {
-		return (EAttribute)ptAnonymousClassDeclarationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getPTInfixOperator() {
-		return ptInfixOperatorEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getPTPrefixOperator() {
-		return ptPrefixOperatorEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIJavaDataTypeInstance() {
-		return iJavaDataTypeInstanceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIJavaInstance() {
-		return iJavaInstanceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InstantiationFactory getInstantiationFactory() {
-		return (InstantiationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		iJavaDataTypeInstanceEClass = createEClass(IJAVA_DATA_TYPE_INSTANCE);
-
-		iJavaInstanceEClass = createEClass(IJAVA_INSTANCE);
-
-		iJavaObjectInstanceEClass = createEClass(IJAVA_OBJECT_INSTANCE);
-
-		javaAllocationEClass = createEClass(JAVA_ALLOCATION);
-
-		initStringAllocationEClass = createEClass(INIT_STRING_ALLOCATION);
-		createEAttribute(initStringAllocationEClass, INIT_STRING_ALLOCATION__INIT_STRING);
-
-		implicitAllocationEClass = createEClass(IMPLICIT_ALLOCATION);
-		createEReference(implicitAllocationEClass, IMPLICIT_ALLOCATION__PARENT);
-		createEReference(implicitAllocationEClass, IMPLICIT_ALLOCATION__FEATURE);
-
-		parseTreeAllocationEClass = createEClass(PARSE_TREE_ALLOCATION);
-		createEReference(parseTreeAllocationEClass, PARSE_TREE_ALLOCATION__EXPRESSION);
-
-		ptExpressionEClass = createEClass(PT_EXPRESSION);
-
-		ptArrayAccessEClass = createEClass(PT_ARRAY_ACCESS);
-		createEReference(ptArrayAccessEClass, PT_ARRAY_ACCESS__ARRAY);
-		createEReference(ptArrayAccessEClass, PT_ARRAY_ACCESS__INDEXES);
-
-		ptArrayCreationEClass = createEClass(PT_ARRAY_CREATION);
-		createEAttribute(ptArrayCreationEClass, PT_ARRAY_CREATION__TYPE);
-		createEReference(ptArrayCreationEClass, PT_ARRAY_CREATION__DIMENSIONS);
-		createEReference(ptArrayCreationEClass, PT_ARRAY_CREATION__INITIALIZER);
-
-		ptArrayInitializerEClass = createEClass(PT_ARRAY_INITIALIZER);
-		createEReference(ptArrayInitializerEClass, PT_ARRAY_INITIALIZER__EXPRESSIONS);
-
-		ptBooleanLiteralEClass = createEClass(PT_BOOLEAN_LITERAL);
-		createEAttribute(ptBooleanLiteralEClass, PT_BOOLEAN_LITERAL__BOOLEAN_VALUE);
-
-		ptCastExpressionEClass = createEClass(PT_CAST_EXPRESSION);
-		createEAttribute(ptCastExpressionEClass, PT_CAST_EXPRESSION__TYPE);
-		createEReference(ptCastExpressionEClass, PT_CAST_EXPRESSION__EXPRESSION);
-
-		ptCharacterLiteralEClass = createEClass(PT_CHARACTER_LITERAL);
-		createEAttribute(ptCharacterLiteralEClass, PT_CHARACTER_LITERAL__ESCAPED_VALUE);
-		createEAttribute(ptCharacterLiteralEClass, PT_CHARACTER_LITERAL__CHAR_VALUE);
-
-		ptClassInstanceCreationEClass = createEClass(PT_CLASS_INSTANCE_CREATION);
-		createEAttribute(ptClassInstanceCreationEClass, PT_CLASS_INSTANCE_CREATION__TYPE);
-		createEReference(ptClassInstanceCreationEClass, PT_CLASS_INSTANCE_CREATION__ARGUMENTS);
-
-		ptConditionalExpressionEClass = createEClass(PT_CONDITIONAL_EXPRESSION);
-		createEReference(ptConditionalExpressionEClass, PT_CONDITIONAL_EXPRESSION__CONDITION);
-		createEReference(ptConditionalExpressionEClass, PT_CONDITIONAL_EXPRESSION__TRUE);
-		createEReference(ptConditionalExpressionEClass, PT_CONDITIONAL_EXPRESSION__FALSE);
-
-		ptFieldAccessEClass = createEClass(PT_FIELD_ACCESS);
-		createEReference(ptFieldAccessEClass, PT_FIELD_ACCESS__RECEIVER);
-		createEAttribute(ptFieldAccessEClass, PT_FIELD_ACCESS__FIELD);
-
-		ptInfixExpressionEClass = createEClass(PT_INFIX_EXPRESSION);
-		createEReference(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__LEFT_OPERAND);
-		createEAttribute(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__OPERATOR);
-		createEReference(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__RIGHT_OPERAND);
-		createEReference(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__EXTENDED_OPERANDS);
-
-		ptInstanceofEClass = createEClass(PT_INSTANCEOF);
-		createEReference(ptInstanceofEClass, PT_INSTANCEOF__OPERAND);
-		createEAttribute(ptInstanceofEClass, PT_INSTANCEOF__TYPE);
-
-		ptMethodInvocationEClass = createEClass(PT_METHOD_INVOCATION);
-		createEReference(ptMethodInvocationEClass, PT_METHOD_INVOCATION__RECEIVER);
-		createEAttribute(ptMethodInvocationEClass, PT_METHOD_INVOCATION__NAME);
-		createEReference(ptMethodInvocationEClass, PT_METHOD_INVOCATION__ARGUMENTS);
-
-		ptNameEClass = createEClass(PT_NAME);
-		createEAttribute(ptNameEClass, PT_NAME__NAME);
-
-		ptNullLiteralEClass = createEClass(PT_NULL_LITERAL);
-
-		ptNumberLiteralEClass = createEClass(PT_NUMBER_LITERAL);
-		createEAttribute(ptNumberLiteralEClass, PT_NUMBER_LITERAL__TOKEN);
-
-		ptParenthesizedExpressionEClass = createEClass(PT_PARENTHESIZED_EXPRESSION);
-		createEReference(ptParenthesizedExpressionEClass, PT_PARENTHESIZED_EXPRESSION__EXPRESSION);
-
-		ptPrefixExpressionEClass = createEClass(PT_PREFIX_EXPRESSION);
-		createEAttribute(ptPrefixExpressionEClass, PT_PREFIX_EXPRESSION__OPERATOR);
-		createEReference(ptPrefixExpressionEClass, PT_PREFIX_EXPRESSION__EXPRESSION);
-
-		ptStringLiteralEClass = createEClass(PT_STRING_LITERAL);
-		createEAttribute(ptStringLiteralEClass, PT_STRING_LITERAL__ESCAPED_VALUE);
-		createEAttribute(ptStringLiteralEClass, PT_STRING_LITERAL__LITERAL_VALUE);
-
-		ptThisLiteralEClass = createEClass(PT_THIS_LITERAL);
-
-		ptTypeLiteralEClass = createEClass(PT_TYPE_LITERAL);
-		createEAttribute(ptTypeLiteralEClass, PT_TYPE_LITERAL__TYPE);
-
-		ptInvalidExpressionEClass = createEClass(PT_INVALID_EXPRESSION);
-		createEAttribute(ptInvalidExpressionEClass, PT_INVALID_EXPRESSION__MESSAGE);
-
-		ptInstanceReferenceEClass = createEClass(PT_INSTANCE_REFERENCE);
-		createEReference(ptInstanceReferenceEClass, PT_INSTANCE_REFERENCE__REFERENCE);
-
-		ptAnonymousClassDeclarationEClass = createEClass(PT_ANONYMOUS_CLASS_DECLARATION);
-		createEAttribute(ptAnonymousClassDeclarationEClass, PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION);
-		createEAttribute(ptAnonymousClassDeclarationEClass, PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS);
-
-		// Create enums
-		ptInfixOperatorEEnum = createEEnum(PT_INFIX_OPERATOR);
-		ptPrefixOperatorEEnum = createEEnum(PT_PREFIX_OPERATOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add supertypes to classes
-		iJavaDataTypeInstanceEClass.getESuperTypes().add(this.getIJavaInstance());
-		iJavaObjectInstanceEClass.getESuperTypes().add(this.getIJavaInstance());
-		initStringAllocationEClass.getESuperTypes().add(this.getJavaAllocation());
-		implicitAllocationEClass.getESuperTypes().add(this.getJavaAllocation());
-		parseTreeAllocationEClass.getESuperTypes().add(this.getJavaAllocation());
-		ptArrayAccessEClass.getESuperTypes().add(this.getPTExpression());
-		ptArrayCreationEClass.getESuperTypes().add(this.getPTExpression());
-		ptArrayInitializerEClass.getESuperTypes().add(this.getPTExpression());
-		ptBooleanLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptCastExpressionEClass.getESuperTypes().add(this.getPTExpression());
-		ptCharacterLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptClassInstanceCreationEClass.getESuperTypes().add(this.getPTExpression());
-		ptConditionalExpressionEClass.getESuperTypes().add(this.getPTExpression());
-		ptFieldAccessEClass.getESuperTypes().add(this.getPTExpression());
-		ptInfixExpressionEClass.getESuperTypes().add(this.getPTExpression());
-		ptInstanceofEClass.getESuperTypes().add(this.getPTExpression());
-		ptMethodInvocationEClass.getESuperTypes().add(this.getPTExpression());
-		ptNameEClass.getESuperTypes().add(this.getPTExpression());
-		ptNullLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptNumberLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptParenthesizedExpressionEClass.getESuperTypes().add(this.getPTExpression());
-		ptPrefixExpressionEClass.getESuperTypes().add(this.getPTExpression());
-		ptStringLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptThisLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptTypeLiteralEClass.getESuperTypes().add(this.getPTExpression());
-		ptInvalidExpressionEClass.getESuperTypes().add(this.getPTExpression());
-		ptInstanceReferenceEClass.getESuperTypes().add(this.getPTExpression());
-		ptAnonymousClassDeclarationEClass.getESuperTypes().add(this.getPTExpression());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(iJavaDataTypeInstanceEClass, IJavaDataTypeInstance.class, "IJavaDataTypeInstance", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(iJavaInstanceEClass, IJavaInstance.class, "IJavaInstance", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(iJavaObjectInstanceEClass, IJavaObjectInstance.class, "IJavaObjectInstance", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(javaAllocationEClass, JavaAllocation.class, "JavaAllocation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(initStringAllocationEClass, InitStringAllocation.class, "InitStringAllocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInitStringAllocation_InitString(), ecorePackage.getEString(), "initString", null, 0, 1, InitStringAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(implicitAllocationEClass, ImplicitAllocation.class, "ImplicitAllocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getImplicitAllocation_Parent(), theEcorePackage.getEObject(), null, "parent", null, 1, 1, ImplicitAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getImplicitAllocation_Feature(), theEcorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, ImplicitAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(parseTreeAllocationEClass, ParseTreeAllocation.class, "ParseTreeAllocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getParseTreeAllocation_Expression(), this.getPTExpression(), null, "expression", null, 1, 1, ParseTreeAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptExpressionEClass, PTExpression.class, "PTExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(ptArrayAccessEClass, PTArrayAccess.class, "PTArrayAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTArrayAccess_Array(), this.getPTExpression(), null, "array", null, 0, 1, PTArrayAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTArrayAccess_Indexes(), this.getPTExpression(), null, "indexes", null, 1, -1, PTArrayAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptArrayCreationEClass, PTArrayCreation.class, "PTArrayCreation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTArrayCreation_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTArrayCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTArrayCreation_Dimensions(), this.getPTExpression(), null, "dimensions", null, 0, -1, PTArrayCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTArrayCreation_Initializer(), this.getPTArrayInitializer(), null, "initializer", null, 0, 1, PTArrayCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptArrayInitializerEClass, PTArrayInitializer.class, "PTArrayInitializer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTArrayInitializer_Expressions(), this.getPTExpression(), null, "expressions", null, 0, -1, PTArrayInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptBooleanLiteralEClass, PTBooleanLiteral.class, "PTBooleanLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTBooleanLiteral_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, PTBooleanLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptCastExpressionEClass, PTCastExpression.class, "PTCastExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTCastExpression_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTCastExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTCastExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, PTCastExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptCharacterLiteralEClass, PTCharacterLiteral.class, "PTCharacterLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTCharacterLiteral_EscapedValue(), ecorePackage.getEString(), "escapedValue", null, 0, 1, PTCharacterLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTCharacterLiteral_CharValue(), ecorePackage.getEChar(), "charValue", null, 0, 1, PTCharacterLiteral.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptClassInstanceCreationEClass, PTClassInstanceCreation.class, "PTClassInstanceCreation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTClassInstanceCreation_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTClassInstanceCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTClassInstanceCreation_Arguments(), this.getPTExpression(), null, "arguments", null, 0, -1, PTClassInstanceCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptConditionalExpressionEClass, PTConditionalExpression.class, "PTConditionalExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTConditionalExpression_Condition(), this.getPTExpression(), null, "condition", null, 0, 1, PTConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTConditionalExpression_True(), this.getPTExpression(), null, "true", null, 0, 1, PTConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTConditionalExpression_False(), this.getPTExpression(), null, "false", null, 0, 1, PTConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptFieldAccessEClass, PTFieldAccess.class, "PTFieldAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTFieldAccess_Receiver(), this.getPTExpression(), null, "receiver", null, 0, 1, PTFieldAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTFieldAccess_Field(), ecorePackage.getEString(), "field", null, 0, 1, PTFieldAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptInfixExpressionEClass, PTInfixExpression.class, "PTInfixExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTInfixExpression_LeftOperand(), this.getPTExpression(), null, "leftOperand", null, 0, 1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTInfixExpression_Operator(), this.getPTInfixOperator(), "operator", null, 0, 1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTInfixExpression_RightOperand(), this.getPTExpression(), null, "rightOperand", null, 0, 1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTInfixExpression_ExtendedOperands(), this.getPTExpression(), null, "extendedOperands", null, 0, -1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptInstanceofEClass, PTInstanceof.class, "PTInstanceof", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTInstanceof_Operand(), this.getPTExpression(), null, "operand", null, 0, 1, PTInstanceof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTInstanceof_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTInstanceof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptMethodInvocationEClass, PTMethodInvocation.class, "PTMethodInvocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTMethodInvocation_Receiver(), this.getPTExpression(), null, "receiver", null, 0, 1, PTMethodInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTMethodInvocation_Name(), ecorePackage.getEString(), "name", null, 0, 1, PTMethodInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTMethodInvocation_Arguments(), this.getPTExpression(), null, "arguments", null, 0, -1, PTMethodInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptNameEClass, PTName.class, "PTName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTName_Name(), ecorePackage.getEString(), "name", null, 0, 1, PTName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptNullLiteralEClass, PTNullLiteral.class, "PTNullLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(ptNumberLiteralEClass, PTNumberLiteral.class, "PTNumberLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTNumberLiteral_Token(), ecorePackage.getEString(), "token", null, 0, 1, PTNumberLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptParenthesizedExpressionEClass, PTParenthesizedExpression.class, "PTParenthesizedExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTParenthesizedExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, PTParenthesizedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptPrefixExpressionEClass, PTPrefixExpression.class, "PTPrefixExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTPrefixExpression_Operator(), this.getPTPrefixOperator(), "operator", null, 0, 1, PTPrefixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPTPrefixExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, PTPrefixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptStringLiteralEClass, PTStringLiteral.class, "PTStringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTStringLiteral_EscapedValue(), ecorePackage.getEString(), "escapedValue", null, 0, 1, PTStringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTStringLiteral_LiteralValue(), ecorePackage.getEString(), "literalValue", null, 0, 1, PTStringLiteral.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptThisLiteralEClass, PTThisLiteral.class, "PTThisLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(ptTypeLiteralEClass, PTTypeLiteral.class, "PTTypeLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTTypeLiteral_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptInvalidExpressionEClass, PTInvalidExpression.class, "PTInvalidExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTInvalidExpression_Message(), ecorePackage.getEString(), "message", null, 0, 1, PTInvalidExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptInstanceReferenceEClass, PTInstanceReference.class, "PTInstanceReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPTInstanceReference_Reference(), this.getIJavaInstance(), null, "reference", null, 1, 1, PTInstanceReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ptAnonymousClassDeclarationEClass, PTAnonymousClassDeclaration.class, "PTAnonymousClassDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPTAnonymousClassDeclaration_Declaration(), ecorePackage.getEString(), "declaration", null, 0, 1, PTAnonymousClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPTAnonymousClassDeclaration_Imports(), ecorePackage.getEString(), "imports", null, 0, -1, PTAnonymousClassDeclaration.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(ptInfixOperatorEEnum, PTInfixOperator.class, "PTInfixOperator");
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.TIMES_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.DIVIDE_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.REMAINDER_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.PLUS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.MINUS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.LEFT_SHIFT_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.RIGHT_SHIFT_SIGNED_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.RIGHT_SHIFT_UNSIGNED_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.LESS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.GREATER_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.LESS_EQUALS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.GREATER_EQUALS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.EQUALS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.NOT_EQUALS_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.XOR_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.AND_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.OR_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.CONDITIONAL_AND_LITERAL);
-		addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.CONDITIONAL_OR_LITERAL);
-
-		initEEnum(ptPrefixOperatorEEnum, PTPrefixOperator.class, "PTPrefixOperator");
-		addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.PLUS_LITERAL);
-		addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.MINUS_LITERAL);
-		addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.COMPLEMENT_LITERAL);
-		addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.NOT_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //InstantiationPackageImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java
deleted file mode 100644
index 828d46054..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.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.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: JavaAllocationImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/10/03 19:20:41 $ 
- */
- 
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllocation {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaAllocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getJavaAllocation();
-	}
-	
-	public boolean isParseTree() {
-		return false;
-	}
-
-	public boolean isImplicit() {
-		return false;
-	}
-
-} //JavaAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
deleted file mode 100644
index c5b051fcf..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: NaiveExpressionFlattener.java,v $
- *  $Revision: 1.11 $  $Date: 2006/08/16 18:32:28 $ 
- */
-package org.eclipse.jem.internal.instantiation.impl;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
- 
-/**
- * This naively flattens the ParseTree. It just works with what's there.
- * 
- * @since 1.0.0
- */
-public class NaiveExpressionFlattener extends ParseVisitor {
-	
-	private StringBuffer buffer = new StringBuffer(100);
-	
-	protected final StringBuffer getStringBuffer() {
-		return buffer;
-	}
-	
-	/**
-	 * Return the string result of the flattening.
-	 * @return The flattened string.
-	 * 
-	 * @since 1.0.0
-	 */
-	public String getResult() {
-		return buffer.toString();
-	}
-	
-	/**
-	 * Reset the result so that flattener can be used again.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void reset() {
-		buffer.setLength(0);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration)
-	 */
-	public boolean visit(PTAnonymousClassDeclaration node) {
-		buffer.append(node.getDeclaration());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayAccess)
-	 */
-	public boolean visit(PTArrayAccess node) {
-		node.getArray().accept(this);
-		if (!node.getIndexes().isEmpty()) {
-			List indexes = node.getIndexes();
-			for (int i = 0; i < indexes.size(); i++) {
-				buffer.append('[');
-				((PTExpression) indexes.get(i)).accept(this);
-				buffer.append(']');
-			}
-		}
-		return false;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayCreation)
-	 */
-	public boolean visit(PTArrayCreation node) {
-        String arrayType = node.getType();
-        int ob = arrayType.indexOf('[');
-        String type = handleQualifiedName(arrayType.substring(0, ob));
-        buffer.append("new "); //$NON-NLS-1$
-        buffer.append(type);
-        int realdims = 0;
-        while (ob != -1) {
-                realdims++;
-                ob = arrayType.indexOf('[',ob+1);
-        }
-        List dims = node.getDimensions();
-        for (int i = 0; i < dims.size(); i++) {
-                buffer.append('[');
-                ((PTExpression) dims.get(i)).accept(this);
-                buffer.append(']');
-        }
-        for (int i=dims.size(); i < realdims; i++) {
-                buffer.append("[]"); //$NON-NLS-1$
-        }
-
-        if (node.getInitializer() != null) {
-                buffer.append(' ');
-                ((PTExpression) node.getInitializer()).accept(this);
-        }
-
-        return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayInitializer)
-	 */
-	public boolean visit(PTArrayInitializer node) {
-		buffer.append('{');
-		List exp = node.getExpressions();
-		for (int i = 0; i < exp.size(); i++) {
-			if (i != 0)
-				buffer.append(", "); //$NON-NLS-1$
-			((PTExpression) exp.get(i)).accept(this);
-		}
-		buffer.append('}');
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTBooleanLiteral)
-	 */
-	public boolean visit(PTBooleanLiteral node) {
-		buffer.append(node.isBooleanValue() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCastExpression)
-	 */
-	public boolean visit(PTCastExpression node) {
-		buffer.append('(');
-		buffer.append(handleQualifiedName(node.getType()));
-		buffer.append(") "); //$NON-NLS-1$
-		node.getExpression().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCharacterLiteral)
-	 */
-	public boolean visit(PTCharacterLiteral node) {
-		buffer.append(node.getEscapedValue());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTClassInstanceCreation)
-	 */
-	public boolean visit(PTClassInstanceCreation node) {
-		buffer.append("new "); //$NON-NLS-1$
-		buffer.append(handleQualifiedName(node.getType()));
-		buffer.append('(');
-		List args = node.getArguments();
-		for (int i = 0; i < args.size(); i++) {
-			if (i != 0)
-				buffer.append(", "); //$NON-NLS-1$
-			((PTExpression) args.get(i)).accept(this);
-		}
-		buffer.append(')');
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTConditionalExpression)
-	 */
-	public boolean visit(PTConditionalExpression node) {
-		node.getCondition().accept(this);
-		buffer.append(" ? "); //$NON-NLS-1$
-		node.getTrue().accept(this);
-		buffer.append(" : "); //$NON-NLS-1$
-		node.getFalse().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTFieldAccess)
-	 */
-	public boolean visit(PTFieldAccess node) {
-		node.getReceiver().accept(this);
-		buffer.append('.');
-		buffer.append(node.getField());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInfixExpression)
-	 */
-	public boolean visit(PTInfixExpression node) {
-		node.getLeftOperand().accept(this);
-		buffer.append(' ');
-		String oper = node.getOperator().getOperator();
-		buffer.append(oper);
-		buffer.append(' ');
-		node.getRightOperand().accept(this);
-		List ext = node.getExtendedOperands();
-		for (int i = 0; i < ext.size(); i++) {
-			buffer.append(' ');
-			buffer.append(oper);
-			buffer.append(' ');
-			((PTExpression) ext.get(i)).accept(this);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInstanceof)
-	 */
-	public boolean visit(PTInstanceof node) {
-		node.getOperand().accept(this);
-		buffer.append(" instanceof "); //$NON-NLS-1$
-		buffer.append(handleQualifiedName(node.getType()));
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInvalidExpression)
-	 */
-	public boolean visit(PTInvalidExpression node) {
-		buffer.append(MessageFormat.format(InstantiationImplMessages.NaiveExpressionFlattener_InvalidExpression, new Object[]{node.getMessage()})); 
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTMethodInvocation)
-	 */
-	public boolean visit(PTMethodInvocation node) {
-		if (node.getReceiver() != null) {
-			node.getReceiver().accept(this);
-			buffer.append('.');
-		}
-		
-		buffer.append(node.getName());
-		buffer.append('(');
-		List args = node.getArguments();
-		for (int i = 0; i < args.size(); i++) {
-			if (i != 0)
-				buffer.append(", "); //$NON-NLS-1$
-			((PTExpression) args.get(i)).accept(this);
-		}
-		buffer.append(')');
-		return false;	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTName)
-	 */
-	public boolean visit(PTName node) {
-		buffer.append(handleQualifiedName(node.getName()));
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNullLiteral)
-	 */
-	public boolean visit(PTNullLiteral node) {
-		buffer.append("null"); //$NON-NLS-1$
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNumberLiteral)
-	 */
-	public boolean visit(PTNumberLiteral node) {
-		buffer.append(node.getToken());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTParenthesizedExpression)
-	 */
-	public boolean visit(PTParenthesizedExpression node) {
-		buffer.append('(');
-		node.getExpression().accept(this);
-		buffer.append(')');
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTPrefixExpression)
-	 */
-	public boolean visit(PTPrefixExpression node) {
-		buffer.append(node.getOperator().getOperator());
-		node.getExpression().accept(this);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTStringLiteral)
-	 */
-	public boolean visit(PTStringLiteral node) {
-		buffer.append(node.getEscapedValue());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTThisLiteral)
-	 */
-	public boolean visit(PTThisLiteral node) {
-		buffer.append("this"); //$NON-NLS-1$
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTTypeLiteral)
-	 */
-	public boolean visit(PTTypeLiteral node) {
-		buffer.append(handleQualifiedName(node.getType()));
-		buffer.append(".class"); //$NON-NLS-1$
-		return false;
-	}
-	
-	/**
-	 * This method enables one to overide the handling of qualified names.
-	 * The default operation is to do nothing.
-	 * 
-	 * Overriders may choose to use short names, relying on import statement handling.
-	 * 
-	 * @param qName  
-	 * @return Name to use for the flattened result
-	 */
-	protected String handleQualifiedName(String qName) {
-		return qName;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTAnonymousClassDeclarationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTAnonymousClassDeclarationImpl.java
deleted file mode 100644
index 911d3fcec..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTAnonymousClassDeclarationImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTAnonymousClassDeclarationImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/10/28 22:56:46 $ 
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>PT Anonymous Class Declaration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl#getDeclaration <em>Declaration</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl#getImports <em>Imports</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTAnonymousClassDeclarationImpl extends PTExpressionImpl implements PTAnonymousClassDeclaration {
-	/**
-	 * The default value of the '{@link #getDeclaration() <em>Declaration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeclaration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DECLARATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDeclaration() <em>Declaration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeclaration()
-	 * @generated
-	 * @ordered
-	 */
-	protected String declaration = DECLARATION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getImports() <em>Imports</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImports()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList imports = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTAnonymousClassDeclarationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTAnonymousClassDeclaration();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDeclaration() {
-		return declaration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDeclaration(String newDeclaration) {
-		String oldDeclaration = declaration;
-		declaration = newDeclaration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION, oldDeclaration, declaration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getImports() {
-		if (imports == null) {
-			imports = new EDataTypeUniqueEList(String.class, this, InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS);
-		}
-		return imports;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
-				return getDeclaration();
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
-				return getImports();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
-				setDeclaration((String)newValue);
-				return;
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
-				getImports().clear();
-				getImports().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
-				setDeclaration(DECLARATION_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
-				getImports().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
-				return DECLARATION_EDEFAULT == null ? declaration != null : !DECLARATION_EDEFAULT.equals(declaration);
-			case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
-				return imports != null && !imports.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (declaration: ");
-		result.append(declaration);
-		result.append(", imports: ");
-		result.append(imports);
-		result.append(')');
-		return result.toString();
-	}
-
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-
-} //PTAnonymousClassDeclarationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java
deleted file mode 100644
index 21be599ce..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTArrayAccessImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayAccess;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Access</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl#getArray <em>Array</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl#getIndexes <em>Indexes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTArrayAccessImpl extends PTExpressionImpl implements PTArrayAccess {
-	/**
-	 * The cached value of the '{@link #getArray() <em>Array</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getArray()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression array = null;
-
-	/**
-	 * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList indexes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTArrayAccessImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTArrayAccess();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getArray() {
-		return array;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetArray(PTExpression newArray, NotificationChain msgs) {
-		PTExpression oldArray = array;
-		array = newArray;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, oldArray, newArray);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setArray(PTExpression newArray) {
-		if (newArray != array) {
-			NotificationChain msgs = null;
-			if (array != null)
-				msgs = ((InternalEObject)array).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, null, msgs);
-			if (newArray != null)
-				msgs = ((InternalEObject)newArray).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, null, msgs);
-			msgs = basicSetArray(newArray, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, newArray, newArray));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIndexes() {
-		if (indexes == null) {
-			indexes = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_ARRAY_ACCESS__INDEXES);
-		}
-		return indexes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
-					return basicSetArray(null, msgs);
-				case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
-					return ((InternalEList)getIndexes()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
-				return getArray();
-			case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
-				return getIndexes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
-				setArray((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
-				getIndexes().clear();
-				getIndexes().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
-				setArray((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
-				getIndexes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
-				return array != null;
-			case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
-				return indexes != null && !indexes.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getArray());
-			if (indexes != null)
-				acceptChildren(visitor, indexes);
-		}
-		visitor.endVisit(this);
-	}	
-
-} //ArrayAccessImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java
deleted file mode 100644
index 34011e658..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTArrayCreationImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayCreation;
-import org.eclipse.jem.internal.instantiation.PTArrayInitializer;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Creation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl#getDimensions <em>Dimensions</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl#getInitializer <em>Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTArrayCreationImpl extends PTExpressionImpl implements PTArrayCreation {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDimensions() <em>Dimensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDimensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList dimensions = null;
-
-	/**
-	 * The cached value of the '{@link #getInitializer() <em>Initializer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitializer()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTArrayInitializer initializer = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTArrayCreationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTArrayCreation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_CREATION__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDimensions() {
-		if (dimensions == null) {
-			dimensions = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS);
-		}
-		return dimensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTArrayInitializer getInitializer() {
-		return initializer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInitializer(PTArrayInitializer newInitializer, NotificationChain msgs) {
-		PTArrayInitializer oldInitializer = initializer;
-		initializer = newInitializer;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, oldInitializer, newInitializer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInitializer(PTArrayInitializer newInitializer) {
-		if (newInitializer != initializer) {
-			NotificationChain msgs = null;
-			if (initializer != null)
-				msgs = ((InternalEObject)initializer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, null, msgs);
-			if (newInitializer != null)
-				msgs = ((InternalEObject)newInitializer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, null, msgs);
-			msgs = basicSetInitializer(newInitializer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, newInitializer, newInitializer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
-					return ((InternalEList)getDimensions()).basicRemove(otherEnd, msgs);
-				case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
-					return basicSetInitializer(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
-				return getType();
-			case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
-				return getDimensions();
-			case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
-				return getInitializer();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
-				setType((String)newValue);
-				return;
-			case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
-				getDimensions().clear();
-				getDimensions().addAll((Collection)newValue);
-				return;
-			case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
-				setInitializer((PTArrayInitializer)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
-				getDimensions().clear();
-				return;
-			case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
-				setInitializer((PTArrayInitializer)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
-				return dimensions != null && !dimensions.isEmpty();
-			case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
-				return initializer != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChildren(visitor, dimensions);
-			acceptChild(visitor, getInitializer());
-		}
-		visitor.endVisit(this);
-	}	
-} //ArrayCreationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java
deleted file mode 100644
index 4f37a37b8..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTArrayInitializerImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayInitializer;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Initializer</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayInitializerImpl#getExpressions <em>Expressions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTArrayInitializerImpl extends PTExpressionImpl implements PTArrayInitializer {
-	/**
-	 * The cached value of the '{@link #getExpressions() <em>Expressions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpressions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList expressions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTArrayInitializerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTArrayInitializer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExpressions() {
-		if (expressions == null) {
-			expressions = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS);
-		}
-		return expressions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
-					return ((InternalEList)getExpressions()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
-				return getExpressions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
-				getExpressions().clear();
-				getExpressions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
-				getExpressions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
-				return expressions != null && !expressions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			acceptChildren(visitor, expressions);
-		}
-		visitor.endVisit(this);
-	}
-} //ArrayInitializerImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java
deleted file mode 100644
index 9ece1f675..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTBooleanLiteralImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/09/15 21:02:19 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTBooleanLiteral;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTBooleanLiteralImpl#isBooleanValue <em>Boolean Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTBooleanLiteralImpl extends PTExpressionImpl implements PTBooleanLiteral {
-	/**
-	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBooleanValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBooleanValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BOOLEAN_VALUE_EFLAG = 1 << 8;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTBooleanLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTBooleanLiteral();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isBooleanValue() {
-		return (eFlags & BOOLEAN_VALUE_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBooleanValue(boolean newBooleanValue) {
-		boolean oldBooleanValue = (eFlags & BOOLEAN_VALUE_EFLAG) != 0;
-		if (newBooleanValue) eFlags |= BOOLEAN_VALUE_EFLAG; else eFlags &= ~BOOLEAN_VALUE_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE, oldBooleanValue, newBooleanValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
-				return isBooleanValue() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
-				setBooleanValue(((Boolean)newValue).booleanValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
-				setBooleanValue(BOOLEAN_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
-				return ((eFlags & BOOLEAN_VALUE_EFLAG) != 0) != BOOLEAN_VALUE_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-
-} //BooleanLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java
deleted file mode 100644
index c6da964b3..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTCastExpressionImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTCastExpression;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cast</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTCastExpressionImpl extends PTExpressionImpl implements PTCastExpression {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression expression = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTCastExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTCastExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CAST_EXPRESSION__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
-		PTExpression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(PTExpression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
-					return basicSetExpression(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
-				return getType();
-			case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
-				return getExpression();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
-				setType((String)newValue);
-				return;
-			case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
-				setExpression((PTExpression)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
-				setExpression((PTExpression)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
-				return expression != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getExpression());
-		}
-		visitor.endVisit(this);
-	}
-} //CastImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java
deleted file mode 100644
index e5504e70e..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTCharacterLiteralImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTCharacterLiteral;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Character Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl#getEscapedValue <em>Escaped Value</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl#getCharValue <em>Char Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTCharacterLiteralImpl extends PTExpressionImpl implements PTCharacterLiteral {
-	/**
-	 * The default value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEscapedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ESCAPED_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEscapedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String escapedValue = ESCAPED_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCharValue() <em>Char Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCharValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final char CHAR_VALUE_EDEFAULT = '\u0000';
-
-	/**
-	 * The cached value of the '{@link #getCharValue() <em>Char Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCharValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected char charValue = CHAR_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTCharacterLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTCharacterLiteral();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEscapedValue() {
-		return escapedValue;
-	}
-
-	public void setEscapedValue(String newEscapedValue) {
-		charValueSet = false;
-		setCharValueGen(CHAR_VALUE_EDEFAULT);
-		setEscapedValueGen(newEscapedValue);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEscapedValueGen(String newEscapedValue) {
-		String oldEscapedValue = escapedValue;
-		escapedValue = newEscapedValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE, oldEscapedValue, escapedValue));
-	}
-
-	private boolean charValueSet;
-	
-	public char getCharValue() {
-		if (!charValueSet && escapedValue != ESCAPED_VALUE_EDEFAULT) {
-			String s = getEscapedValue();
-			int len = s.length();
-			if (len < 2 || s.charAt(0) != '\'' || s.charAt(len-1) != '\'' ) {
-				throw new IllegalArgumentException();
-			}
-			char c = s.charAt(1);
-			if (c == '\'') {
-				throw new IllegalArgumentException();
-			}
-			if (c == '\\') {
-				if (len == 4) {
-					setCharValueGen(getCharEscaped(s.charAt(2)));
-				} else if (len == 8) {
-					//handle the case of unicode.
-					int currentPosition = 2;
-					int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-					if (s.charAt(currentPosition++) == 'u') {
-						if ((c1 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c1 < 0
-								|| (c2 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c2 < 0
-								|| (c3 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c3 < 0
-								|| (c4 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c4 < 0){
-							throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
-						} else {
-							setCharValueGen((char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4));
-						}
-					} else {
-						throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
-					}
-				} else {
-					throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
-				}
-			} else
-				setCharValueGen(c);
-			
-			charValueSet = true;
-		}
-		return getCharValueGen();
-	}
-	
-	public static char getCharEscaped(char nextChar) {
-		switch(nextChar) {
-			case 'b' :
-				return '\b';
-			case 't' :
-				return '\t';
-			case 'n' :
-				return '\n';
-			case 'f' :
-				return '\f';
-			case 'r' :
-				return '\r';
-			case '\"':
-				return '\"';
-			case '\'':
-				return '\'';
-			case '\\':
-				return '\\';
-			case '0' :
-				return '\0';
-			case '1' :
-				return '\1';
-			case '2' :
-				return '\2';
-			case '3' :
-				return '\3';
-			case '4' :
-				return '\4';
-			case '5' :
-				return '\5';
-			case '6' :
-				return '\6';
-			case '7' :
-				return '\7';
-			default:
-				throw new IllegalArgumentException("illegal character");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public char getCharValueGen() {
-		return charValue;
-	}
-
-	public void setCharValue(char newCharValue) {		
-		charValueSet = true;
-		setCharValueGen(newCharValue);
-		
-		StringBuffer b = new StringBuffer(8);
-		b.append('\''); // opening delimiter
-		appendCharacter(newCharValue, b);
-		b.append('\''); // closing delimiter
-		setEscapedValueGen(b.toString());
-	}
-	
-	public static void appendCharacter(char character, StringBuffer b) {
-		switch(character) {
-			case '\b' :
-				b.append("\\b"); //$NON-NLS-1$
-				break;
-			case '\t' :
-				b.append("\\t"); //$NON-NLS-1$
-				break;
-			case '\n' :
-				b.append("\\n"); //$NON-NLS-1$
-				break;
-			case '\f' :
-				b.append("\\f"); //$NON-NLS-1$
-				break;
-			case '\r' :
-				b.append("\\r"); //$NON-NLS-1$
-				break;
-			case '\"':
-				b.append("\\\""); //$NON-NLS-1$
-				break;
-			case '\'':
-				b.append("\\\'"); //$NON-NLS-1$
-				break;
-			case '\\':
-				b.append("\\\\"); //$NON-NLS-1$
-				break;
-			case '\0' :
-				b.append("\\0"); //$NON-NLS-1$
-				break;
-			case '\1' :
-				b.append("\\1"); //$NON-NLS-1$
-				break;
-			case '\2' :
-				b.append("\\2"); //$NON-NLS-1$
-				break;
-			case '\3' :
-				b.append("\\3"); //$NON-NLS-1$
-				break;
-			case '\4' :
-				b.append("\\4"); //$NON-NLS-1$
-				break;
-			case '\5' :
-				b.append("\\5"); //$NON-NLS-1$
-				break;
-			case '\6' :
-				b.append("\\6"); //$NON-NLS-1$
-				break;
-			case '\7' :
-				b.append("\\7"); //$NON-NLS-1$
-				break;			
-			default:
-				// use a simple algorithm, if char is < 255 then just use it, else use it as unicode.
-				if (character < 255)
-					b.append(character);
-				else {
-					b.append("\\u");
-					String s = Integer.toString(character, 16);
-					int zeros = 4-s.length();
-					while (zeros-- > 0) {
-						b.append('0');
-					}
-					b.append(s);
-				}	
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCharValueGen(char newCharValue) {
-		char oldCharValue = charValue;
-		charValue = newCharValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE, oldCharValue, charValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				return getEscapedValue();
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				return new Character(getCharValue());
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				setEscapedValue((String)newValue);
-				return;
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				setCharValue(((Character)newValue).charValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				setEscapedValue(ESCAPED_VALUE_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				setCharValue(CHAR_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				return ESCAPED_VALUE_EDEFAULT == null ? escapedValue != null : !ESCAPED_VALUE_EDEFAULT.equals(escapedValue);
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				return charValue != CHAR_VALUE_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-} //CharacterLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java
deleted file mode 100644
index 91ea19152..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTClassInstanceCreationImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTClassInstanceCreation;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Class Instance Creation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTClassInstanceCreationImpl extends PTExpressionImpl implements PTClassInstanceCreation {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getArguments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList arguments = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTClassInstanceCreationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTClassInstanceCreation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getArguments() {
-		if (arguments == null) {
-			arguments = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS);
-		}
-		return arguments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
-					return ((InternalEList)getArguments()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
-				return getType();
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
-				return getArguments();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
-				setType((String)newValue);
-				return;
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
-				getArguments().clear();
-				getArguments().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
-				getArguments().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
-				return arguments != null && !arguments.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChildren(visitor, arguments);
-		}
-		visitor.endVisit(this);
-	}
-} //ClassInstanceCreationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java
deleted file mode 100644
index 96cae4795..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTConditionalExpressionImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTConditionalExpression;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Conditional Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl#getTrue <em>True</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl#getFalse <em>False</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTConditionalExpressionImpl extends PTExpressionImpl implements PTConditionalExpression {
-	/**
-	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression condition = null;
-
-	/**
-	 * The cached value of the '{@link #getTrue() <em>True</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTrue()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression true_ = null;
-
-	/**
-	 * The cached value of the '{@link #getFalse() <em>False</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFalse()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression false_ = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTConditionalExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTConditionalExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getCondition() {
-		return condition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCondition(PTExpression newCondition, NotificationChain msgs) {
-		PTExpression oldCondition = condition;
-		condition = newCondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, oldCondition, newCondition);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCondition(PTExpression newCondition) {
-		if (newCondition != condition) {
-			NotificationChain msgs = null;
-			if (condition != null)
-				msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, null, msgs);
-			if (newCondition != null)
-				msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, null, msgs);
-			msgs = basicSetCondition(newCondition, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, newCondition, newCondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getTrue() {
-		return true_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTrue(PTExpression newTrue, NotificationChain msgs) {
-		PTExpression oldTrue = true_;
-		true_ = newTrue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, oldTrue, newTrue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTrue(PTExpression newTrue) {
-		if (newTrue != true_) {
-			NotificationChain msgs = null;
-			if (true_ != null)
-				msgs = ((InternalEObject)true_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, null, msgs);
-			if (newTrue != null)
-				msgs = ((InternalEObject)newTrue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, null, msgs);
-			msgs = basicSetTrue(newTrue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, newTrue, newTrue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getFalse() {
-		return false_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFalse(PTExpression newFalse, NotificationChain msgs) {
-		PTExpression oldFalse = false_;
-		false_ = newFalse;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, oldFalse, newFalse);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFalse(PTExpression newFalse) {
-		if (newFalse != false_) {
-			NotificationChain msgs = null;
-			if (false_ != null)
-				msgs = ((InternalEObject)false_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, null, msgs);
-			if (newFalse != null)
-				msgs = ((InternalEObject)newFalse).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, null, msgs);
-			msgs = basicSetFalse(newFalse, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, newFalse, newFalse));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
-					return basicSetCondition(null, msgs);
-				case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
-					return basicSetTrue(null, msgs);
-				case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
-					return basicSetFalse(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
-				return getCondition();
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
-				return getTrue();
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
-				return getFalse();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
-				setCondition((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
-				setTrue((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
-				setFalse((PTExpression)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
-				setCondition((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
-				setTrue((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
-				setFalse((PTExpression)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
-				return condition != null;
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
-				return true_ != null;
-			case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
-				return false_ != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getCondition());
-			acceptChild(visitor, getTrue());
-			acceptChild(visitor, getFalse());
-		}
-		visitor.endVisit(this);
-	}	
-
-} //ConditionalExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java
deleted file mode 100644
index 2264d70ef..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTExpressionImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class PTExpressionImpl extends EObjectImpl implements PTExpression {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTExpression();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.Expression#accept(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	public final void accept(ParseVisitor visitor) {
-		try {
-			childAccept0(visitor);
-		} catch (ParseVisitor.StopVisiting e) {
-			// Do nothing, this is a normal way to just stop visiting.
-		}
-	}
-
-	/**
-	 * Accepts the given visitor on a type-specific visit of the current node.
-	 * This method must be implemented in all concrete Expression node types.
-	 * <p>
-	 * General template for implementation on each concrete ASTNode class:
-	 * <pre>
-	 * <code>
-	 * boolean visitChildren = visitor.visit(this);
-	 * if (visitChildren) {
-	 *    // visit children in normal left to right reading order
-	 *    acceptChild(visitor, getProperty1());
-	 *    acceptChildren(visitor, rawListProperty);
-	 *    acceptChild(visitor, getProperty2());
-	 * }
-	 * visitor.endVisit(this);
-	 * </code>
-	 * </pre>
-	 * Note that the caller (<code>accept</code>) take cares of invoking
-	 * <code>visitor.preVisit(this)</code> and <code>visitor.postVisit(this)</code>.
-	 * </p>
-	 * 
-	 * @param visitor the visitor object
-	 */
-	protected abstract void accept0(ParseVisitor visitor);
-
-	/**
-	 * Accepts the given visitor on a visit of the current node.
-	 * <p>
-	 * This method should be used by the concrete implementations of
-	 * <code>accept0</code> to traverse optional properties. Equivalent
-	 * to <code>child.accept(visitor)</code> if <code>child</code>
-	 * is not <code>null</code>.
-	 * </p>
-	 * 
-	 * @param visitor the visitor object
-	 * @param child the child Expression node to dispatch too, or <code>null</code>
-	 *    if none. It actually must be an instance of PTExpressionImpl, but 
-	 *    it would be too difficult to put the cast in each call to acceptChild.
-	 */
-	protected final void acceptChild(ParseVisitor visitor, PTExpression child) {
-		if (child == null) {
-			return;
-		}
-		((PTExpressionImpl) child).childAccept0(visitor);
-	}
-	
-	/**
-	 * Called ONLY by PTExpressionImpl for the child to accept the visitor, but
-	 * it doesn't catch StopVisiting.
-	 * @param visitor
-	 * 
-	 * @since 1.1.0.1
-	 */
-	protected final void childAccept0(ParseVisitor visitor) {
-		if (visitor == null) {
-			throw new IllegalArgumentException();
-		}
-		// begin with the generic pre-visit
-		visitor.preVisit(this);
-		// dynamic dispatch to internal method for type-specific visit/endVisit
-		accept0(visitor);
-		// end with the generic post-visit
-		visitor.postVisit(this);
-	}
-	
-	/**
-	 * Accepts the given visitor on a visit of the given live list of
-	 * child nodes. 
-	 * @param visitor the visitor object
-	 * @param children the child Expression nodes to dispatch to, or <code>null</code> if none.
-	 */
-	protected final void acceptChildren(ParseVisitor visitor, List children) {
-		if (children != null) {
-			int size = children.size();
-			for (int i = 0; i < size; i++) {
-				acceptChild(visitor, (PTExpression) children.get(i));
-			}
-		} 
-	}
-	
-	public String toString() {
-		// allocate a buffer that is large enough to hold an average compilation unit
-		StringBuffer buffer = new StringBuffer(6000);
-		int p = buffer.length();
-		try {
-			appendDebugString(buffer);
-		} catch (RuntimeException e) {
-			// since debugger sometimes call toString methods, problems can easily happen when
-			// toString is called on an instance that is being initialized
-			buffer.setLength(p);
-			buffer.append("!"); //$NON-NLS-1$
-			buffer.append(standardToString());
-		}
-		// convert to a string, but lose the extra space in the string buffer by copying
-		return buffer.toString();
-	}
-	
-	protected final String standardToString() {
-		return super.toString();
-	}
-	
-	protected void appendDebugString(StringBuffer buffer) {
-		// print the subtree by default
-		appendPrintString(buffer);
-	}
-	
-	/*
-	 * Appends a standard Java source code representation of this subtree to the given
-	 * string buffer.
-	 * 
-	 * @param buffer the string buffer to append to
-	 */
-	protected final void appendPrintString(StringBuffer buffer) {
-		NaiveExpressionFlattener printer = new NaiveExpressionFlattener();
-		this.accept(printer);
-		buffer.append(printer.getResult());
-	}	
-
-} //ExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java
deleted file mode 100644
index 7e87e15b5..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTFieldAccessImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTFieldAccess;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Field Access</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl#getReceiver <em>Receiver</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTFieldAccessImpl extends PTExpressionImpl implements PTFieldAccess {
-	/**
-	 * The cached value of the '{@link #getReceiver() <em>Receiver</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReceiver()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression receiver = null;
-
-	/**
-	 * The default value of the '{@link #getField() <em>Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getField()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getField() <em>Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getField()
-	 * @generated
-	 * @ordered
-	 */
-	protected String field = FIELD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTFieldAccessImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTFieldAccess();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getReceiver() {
-		return receiver;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReceiver(PTExpression newReceiver, NotificationChain msgs) {
-		PTExpression oldReceiver = receiver;
-		receiver = newReceiver;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, oldReceiver, newReceiver);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReceiver(PTExpression newReceiver) {
-		if (newReceiver != receiver) {
-			NotificationChain msgs = null;
-			if (receiver != null)
-				msgs = ((InternalEObject)receiver).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, null, msgs);
-			if (newReceiver != null)
-				msgs = ((InternalEObject)newReceiver).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, null, msgs);
-			msgs = basicSetReceiver(newReceiver, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, newReceiver, newReceiver));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getField() {
-		return field;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setField(String newField) {
-		String oldField = field;
-		field = newField;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_FIELD_ACCESS__FIELD, oldField, field));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
-					return basicSetReceiver(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
-				return getReceiver();
-			case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
-				return getField();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
-				setReceiver((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
-				setField((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
-				setReceiver((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
-				setField(FIELD_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
-				return receiver != null;
-			case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
-				return FIELD_EDEFAULT == null ? field != null : !FIELD_EDEFAULT.equals(field);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getReceiver());
-		}
-		visitor.endVisit(this);
-	}	
-
-} //FieldAccessImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java
deleted file mode 100644
index cec877669..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTInfixExpressionImpl.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTInfixExpression;
-import org.eclipse.jem.internal.instantiation.PTInfixOperator;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Infix Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getLeftOperand <em>Left Operand</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getRightOperand <em>Right Operand</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getExtendedOperands <em>Extended Operands</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInfixExpressionImpl extends PTExpressionImpl implements PTInfixExpression {
-	/**
-	 * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLeftOperand()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression leftOperand = null;
-
-	/**
-	 * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final PTInfixOperator OPERATOR_EDEFAULT = PTInfixOperator.TIMES_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTInfixOperator operator = OPERATOR_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRightOperand()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression rightOperand = null;
-
-	/**
-	 * The cached value of the '{@link #getExtendedOperands() <em>Extended Operands</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedOperands()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extendedOperands = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTInfixExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTInfixExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getLeftOperand() {
-		return leftOperand;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLeftOperand(PTExpression newLeftOperand, NotificationChain msgs) {
-		PTExpression oldLeftOperand = leftOperand;
-		leftOperand = newLeftOperand;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLeftOperand(PTExpression newLeftOperand) {
-		if (newLeftOperand != leftOperand) {
-			NotificationChain msgs = null;
-			if (leftOperand != null)
-				msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, null, msgs);
-			if (newLeftOperand != null)
-				msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, null, msgs);
-			msgs = basicSetLeftOperand(newLeftOperand, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, newLeftOperand, newLeftOperand));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTInfixOperator getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(PTInfixOperator newOperator) {
-		PTInfixOperator oldOperator = operator;
-		operator = newOperator == null ? OPERATOR_EDEFAULT : newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getRightOperand() {
-		return rightOperand;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRightOperand(PTExpression newRightOperand, NotificationChain msgs) {
-		PTExpression oldRightOperand = rightOperand;
-		rightOperand = newRightOperand;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, oldRightOperand, newRightOperand);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRightOperand(PTExpression newRightOperand) {
-		if (newRightOperand != rightOperand) {
-			NotificationChain msgs = null;
-			if (rightOperand != null)
-				msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, null, msgs);
-			if (newRightOperand != null)
-				msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, null, msgs);
-			msgs = basicSetRightOperand(newRightOperand, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, newRightOperand, newRightOperand));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtendedOperands() {
-		if (extendedOperands == null) {
-			extendedOperands = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS);
-		}
-		return extendedOperands;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
-					return basicSetLeftOperand(null, msgs);
-				case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
-					return basicSetRightOperand(null, msgs);
-				case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
-					return ((InternalEList)getExtendedOperands()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
-				return getLeftOperand();
-			case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
-				return getOperator();
-			case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
-				return getRightOperand();
-			case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
-				return getExtendedOperands();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
-				setLeftOperand((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
-				setOperator((PTInfixOperator)newValue);
-				return;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
-				setRightOperand((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
-				getExtendedOperands().clear();
-				getExtendedOperands().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
-				setLeftOperand((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
-				setOperator(OPERATOR_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
-				setRightOperand((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
-				getExtendedOperands().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
-				return leftOperand != null;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
-				return operator != OPERATOR_EDEFAULT;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
-				return rightOperand != null;
-			case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
-				return extendedOperands != null && !extendedOperands.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getLeftOperand());
-			acceptChild(visitor, getRightOperand());
-			acceptChildren(visitor, extendedOperands);
-		}
-		visitor.endVisit(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#asCompressedExpression()
-	 */
-	public PTExpression asCompressedExpression() {
-		// If no left and no right
-		if(getLeftOperand() == null && getRightOperand() != null){
-			// no extends so just use the right operand
-			if(getExtendedOperands().isEmpty()){
-				return getRightOperand();
-			} else {
-				// The right becomes the new left
-				setLeftOperand(getRightOperand());
-				// The first operand becomes the right one
-				setRightOperand((PTExpression) getExtendedOperands().remove(0));
-				return this;
-			}
-		} else if (getRightOperand() == null && getLeftOperand() != null){
-			// no extends so just use the left operand
-			if(getExtendedOperands().isEmpty()){
-				return getLeftOperand();
-			} else {
-				// The right becomes the first extended
-				setRightOperand((PTExpression)getExtendedOperands().remove(0));
-				return this;
-			}			
-		}	
-		return this;
-	}
-} //InfixExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java
deleted file mode 100644
index 86f5d0dc0..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * %W%
- * @version %I% %H%
- */
-package org.eclipse.jem.internal.instantiation.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInstanceReference;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-import org.eclipse.jem.internal.instantiation.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>PT Instance Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceReferenceImpl#getReference <em>Reference</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInstanceReferenceImpl extends PTExpressionImpl implements PTInstanceReference {
-	/**
-	 * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReference()
-	 * @generated
-	 * @ordered
-	 */
-	protected IJavaInstance reference = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTInstanceReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTInstanceReference();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IJavaInstance getReference() {
-		if (reference != null && reference.eIsProxy()) {
-			IJavaInstance oldReference = reference;
-			reference = (IJavaInstance)eResolveProxy((InternalEObject)reference);
-			if (reference != oldReference) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE, oldReference, reference));
-			}
-		}
-		return reference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IJavaInstance basicGetReference() {
-		return reference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReference(IJavaInstance newReference) {
-		IJavaInstance oldReference = reference;
-		reference = newReference;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE, oldReference, reference));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
-				if (resolve) return getReference();
-				return basicGetReference();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
-				setReference((IJavaInstance)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
-				setReference((IJavaInstance)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
-				return reference != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.PTExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-	
-	public String toString() {
-		return "InstanceRef{" + reference + "}";
-	}
-
-} //PTInstanceReferenceImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java
deleted file mode 100644
index 172892ed1..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTInstanceofImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTInstanceof;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Instanceof</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl#getOperand <em>Operand</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInstanceofImpl extends PTExpressionImpl implements PTInstanceof {
-	/**
-	 * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperand()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression operand = null;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTInstanceofImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTInstanceof();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getOperand() {
-		return operand;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOperand(PTExpression newOperand, NotificationChain msgs) {
-		PTExpression oldOperand = operand;
-		operand = newOperand;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCEOF__OPERAND, oldOperand, newOperand);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperand(PTExpression newOperand) {
-		if (newOperand != operand) {
-			NotificationChain msgs = null;
-			if (operand != null)
-				msgs = ((InternalEObject)operand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INSTANCEOF__OPERAND, null, msgs);
-			if (newOperand != null)
-				msgs = ((InternalEObject)newOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INSTANCEOF__OPERAND, null, msgs);
-			msgs = basicSetOperand(newOperand, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCEOF__OPERAND, newOperand, newOperand));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCEOF__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_INSTANCEOF__OPERAND:
-					return basicSetOperand(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCEOF__OPERAND:
-				return getOperand();
-			case InstantiationPackage.PT_INSTANCEOF__TYPE:
-				return getType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCEOF__OPERAND:
-				setOperand((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_INSTANCEOF__TYPE:
-				setType((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCEOF__OPERAND:
-				setOperand((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_INSTANCEOF__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCEOF__OPERAND:
-				return operand != null;
-			case InstantiationPackage.PT_INSTANCEOF__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getOperand());
-		}
-		visitor.endVisit(this);
-	}
-
-} //InstanceofImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java
deleted file mode 100644
index ff8dd5936..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTInvalidExpressionImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInvalidExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invalid Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInvalidExpressionImpl#getMessage <em>Message</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInvalidExpressionImpl extends PTExpressionImpl implements PTInvalidExpression {
-	/**
-	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String message = MESSAGE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTInvalidExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTInvalidExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessage(String newMessage) {
-		String oldMessage = message;
-		message = newMessage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE, oldMessage, message));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
-				return getMessage();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
-				setMessage((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
-				setMessage(MESSAGE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
-				return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-
-} //InvalidExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java
deleted file mode 100644
index c3504ff22..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTMethodInvocationImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTMethodInvocation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Invocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl#getReceiver <em>Receiver</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTMethodInvocationImpl extends PTExpressionImpl implements PTMethodInvocation {
-	/**
-	 * The cached value of the '{@link #getReceiver() <em>Receiver</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReceiver()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression receiver = null;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getArguments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList arguments = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTMethodInvocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTMethodInvocation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getReceiver() {
-		return receiver;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReceiver(PTExpression newReceiver, NotificationChain msgs) {
-		PTExpression oldReceiver = receiver;
-		receiver = newReceiver;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, oldReceiver, newReceiver);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReceiver(PTExpression newReceiver) {
-		if (newReceiver != receiver) {
-			NotificationChain msgs = null;
-			if (receiver != null)
-				msgs = ((InternalEObject)receiver).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, null, msgs);
-			if (newReceiver != null)
-				msgs = ((InternalEObject)newReceiver).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, null, msgs);
-			msgs = basicSetReceiver(newReceiver, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, newReceiver, newReceiver));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_METHOD_INVOCATION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getArguments() {
-		if (arguments == null) {
-			arguments = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS);
-		}
-		return arguments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
-					return basicSetReceiver(null, msgs);
-				case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
-					return ((InternalEList)getArguments()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
-				return getReceiver();
-			case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
-				return getName();
-			case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
-				return getArguments();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
-				setReceiver((PTExpression)newValue);
-				return;
-			case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
-				setName((String)newValue);
-				return;
-			case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
-				getArguments().clear();
-				getArguments().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
-				setReceiver((PTExpression)null);
-				return;
-			case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
-				getArguments().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
-				return receiver != null;
-			case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
-				return arguments != null && !arguments.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getReceiver());
-			acceptChildren(visitor, arguments);
-		}
-		visitor.endVisit(this);
-	}
-} //MethodInvocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java
deleted file mode 100644
index 91190db22..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTNameImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTNameImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTNameImpl extends PTExpressionImpl implements PTName {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_NAME__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NAME__NAME:
-				return getName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NAME__NAME:
-				setName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NAME__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NAME__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-
-} //NameImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java
deleted file mode 100644
index 8c2691e39..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTNullLiteralImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTNullLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Null Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PTNullLiteralImpl extends PTExpressionImpl implements PTNullLiteral {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTNullLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTNullLiteral();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}	
-
-} //NullLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java
deleted file mode 100644
index 56d94b39a..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTNumberLiteralImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTNumberLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Number Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTNumberLiteralImpl#getToken <em>Token</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTNumberLiteralImpl extends PTExpressionImpl implements PTNumberLiteral {
-	/**
-	 * The default value of the '{@link #getToken() <em>Token</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToken()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TOKEN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getToken() <em>Token</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToken()
-	 * @generated
-	 * @ordered
-	 */
-	protected String token = TOKEN_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTNumberLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTNumberLiteral();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getToken() {
-		return token;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setToken(String newToken) {
-		String oldToken = token;
-		token = newToken;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_NUMBER_LITERAL__TOKEN, oldToken, token));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
-				return getToken();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
-				setToken((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
-				setToken(TOKEN_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
-				return TOKEN_EDEFAULT == null ? token != null : !TOKEN_EDEFAULT.equals(token);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (token: ");
-		result.append(token);
-		result.append(')');
-		return result.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-} //NumberLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java
deleted file mode 100644
index 1ee8dff35..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTParenthesizedExpressionImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTParenthesizedExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parenthesized Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTParenthesizedExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTParenthesizedExpressionImpl extends PTExpressionImpl implements PTParenthesizedExpression {
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression expression = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTParenthesizedExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTParenthesizedExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
-		PTExpression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(PTExpression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
-					return basicSetExpression(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
-				return getExpression();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
-				setExpression((PTExpression)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
-				setExpression((PTExpression)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
-				return expression != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			acceptChild(visitor, getExpression());
-		}
-		visitor.endVisit(this);
-	}	
-
-} //ParenthesizedExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java
deleted file mode 100644
index ff150a429..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTPrefixExpressionImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTPrefixExpression;
-import org.eclipse.jem.internal.instantiation.PTPrefixOperator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Prefix Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTPrefixExpressionImpl extends PTExpressionImpl implements PTPrefixExpression {
-	/**
-	 * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final PTPrefixOperator OPERATOR_EDEFAULT = PTPrefixOperator.PLUS_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOperator()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTPrefixOperator operator = OPERATOR_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression expression = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTPrefixExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTPrefixExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTPrefixOperator getOperator() {
-		return operator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOperator(PTPrefixOperator newOperator) {
-		PTPrefixOperator oldOperator = operator;
-		operator = newOperator == null ? OPERATOR_EDEFAULT : newOperator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR, oldOperator, operator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
-		PTExpression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(PTExpression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
-					return basicSetExpression(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
-				return getOperator();
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
-				return getExpression();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
-				setOperator((PTPrefixOperator)newValue);
-				return;
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
-				setExpression((PTExpression)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
-				setOperator(OPERATOR_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
-				setExpression((PTExpression)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
-				return operator != OPERATOR_EDEFAULT;
-			case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
-				return expression != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		boolean visitChildren = visitor.visit(this);
-		if (visitChildren) {
-			// visit children in normal left to right reading order
-			acceptChild(visitor, getExpression());
-		}
-		visitor.endVisit(this);
-	}
-
-} //PrefixExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java
deleted file mode 100644
index a2b891011..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTStringLiteralImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTStringLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl#getEscapedValue <em>Escaped Value</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl#getLiteralValue <em>Literal Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTStringLiteralImpl extends PTExpressionImpl implements PTStringLiteral {
-	/**
-	 * The default value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEscapedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ESCAPED_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEscapedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String escapedValue = ESCAPED_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLiteralValue() <em>Literal Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLiteralValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LITERAL_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLiteralValue() <em>Literal Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLiteralValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String literalValue = LITERAL_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTStringLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTStringLiteral();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEscapedValue() {
-		return escapedValue;
-	}
-
-	public void setEscapedValue(String newEscapedValue) {
-		stringLiteralSet = false;
-		setLiteralValueGen(LITERAL_VALUE_EDEFAULT);
-		setEscapedValueGen(newEscapedValue);		
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEscapedValueGen(String newEscapedValue) {
-		String oldEscapedValue = escapedValue;
-		escapedValue = newEscapedValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE, oldEscapedValue, escapedValue));
-	}
-
-	private boolean stringLiteralSet;
-	
-	public String getLiteralValue() {
-		if (!stringLiteralSet && escapedValue != ESCAPED_VALUE_EDEFAULT) {
-			String s = getEscapedValue();
-			int len = s.length();
-			if (len < 2 || s.charAt(0) != '\"' || s.charAt(len-1) != '\"' ) {
-				throw new IllegalArgumentException();
-			}
-			
-			StringBuffer buffer = new StringBuffer(len);
-			int stop = len-1;
-			for (int i = 1; i < stop; i++) {
-				char ati = s.charAt(i);
-				if (ati == '\\') {
-					if (++i < stop) {
-						ati = s.charAt(i);
-						if (ati == 'u') {
-							int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-							if (i+4 >= stop
-									|| (c1 = Character.getNumericValue(s.charAt(++i))) > 15
-									|| c1 < 0
-									|| (c2 = Character.getNumericValue(s.charAt(++i))) > 15
-									|| c2 < 0
-									|| (c3 = Character.getNumericValue(s.charAt(++i))) > 15
-									|| c3 < 0
-									|| (c4 = Character.getNumericValue(s.charAt(++i))) > 15
-									|| c4 < 0){
-								throw new IllegalArgumentException("illegal string literal");//$NON-NLS-1$
-							} else
-								buffer.append((char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4));
-						} else
-							buffer.append(PTCharacterLiteralImpl.getCharEscaped(ati));
-					} else
-						throw new IllegalArgumentException("illegal string literal");//$NON-NLS-1$
-				} else
-					buffer.append(ati);	
-			}
-			
-			stringLiteralSet = true;
-			setLiteralValueGen(buffer.toString());
-		}
-		
-		return getLiteralValueGen();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteralValueGen() {
-		return literalValue;
-	}
-
-	public void setLiteralValue(String newLiteralValue) {
-		stringLiteralSet = true;
-		setLiteralValueGen(newLiteralValue);
-		
-		StringBuffer b = new StringBuffer(newLiteralValue.length()+2);
-		b.append('\"'); // opening delimiter
-		int stop = newLiteralValue.length();
-		for (int i = 0; i < stop; i++) {
-			PTCharacterLiteralImpl.appendCharacter(newLiteralValue.charAt(i), b);	
-		}
-		b.append('\"'); // closing delimiter
-		setEscapedValueGen(b.toString());
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLiteralValueGen(String newLiteralValue) {
-		String oldLiteralValue = literalValue;
-		literalValue = newLiteralValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE, oldLiteralValue, literalValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
-				return getEscapedValue();
-			case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
-				return getLiteralValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
-				setEscapedValue((String)newValue);
-				return;
-			case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
-				setLiteralValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
-				setEscapedValue(ESCAPED_VALUE_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
-				setLiteralValue(LITERAL_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
-				return ESCAPED_VALUE_EDEFAULT == null ? escapedValue != null : !ESCAPED_VALUE_EDEFAULT.equals(escapedValue);
-			case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
-				return LITERAL_VALUE_EDEFAULT == null ? literalValue != null : !LITERAL_VALUE_EDEFAULT.equals(literalValue);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-
-} //StringLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java
deleted file mode 100644
index 35be71a3b..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTThisLiteralImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTThisLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>This Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PTThisLiteralImpl extends PTExpressionImpl implements PTThisLiteral {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTThisLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTThisLiteral();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}	
-
-} //ThisLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java
deleted file mode 100644
index 93c1c1349..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: PTTypeLiteralImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTTypeLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTTypeLiteralImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTTypeLiteralImpl extends PTExpressionImpl implements PTTypeLiteral {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTTypeLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTTypeLiteral();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_TYPE_LITERAL__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
-				return getType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
-				setType((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-} //TypeLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java
deleted file mode 100644
index fd838f5f6..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: ParseTreeAllocationImpl.java,v $
- *  $Revision: 1.5 $  $Date: 2005/10/03 19:20:41 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.ParseTreeAllocation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parse Tree Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.ParseTreeAllocationImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParseTreeAllocationImpl extends JavaAllocationImpl implements ParseTreeAllocation {
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected PTExpression expression = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParseTreeAllocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getParseTreeAllocation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PTExpression getExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
-		PTExpression oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, oldExpression, newExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(PTExpression newExpression) {
-		if (newExpression != expression) {
-			NotificationChain msgs = null;
-			if (expression != null)
-				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, null, msgs);
-			if (newExpression != null)
-				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, null, msgs);
-			msgs = basicSetExpression(newExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, newExpression, newExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
-					return basicSetExpression(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
-				return getExpression();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
-				setExpression((PTExpression)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
-				setExpression((PTExpression)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
-				return expression != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getExpression() != null ? getExpression().toString() : super.toString();
-	}
-
-	public boolean isParseTree() {
-		return true;
-	}
-
-} //ParseTreeAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
deleted file mode 100644
index 43b44ad73..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-NaiveExpressionFlattener_InvalidExpression= invalid: "{0}"
diff --git a/plugins/org.eclipse.jem/model/instance.ecore b/plugins/org.eclipse.jem/model/instance.ecore
deleted file mode 100644
index 6a4ff9f7b..000000000
--- a/plugins/org.eclipse.jem/model/instance.ecore
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="instantiation"
-    nsURI="http:///org/eclipse/jem/internal/instantiation.ecore" nsPrefix="org.eclipse.jem.internal.instantiation">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="Java Instantiation Package"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="IJavaDataTypeInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance"
-      abstract="true" interface="true" eSuperTypes="#//IJavaInstance"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IJavaInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaInstance"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IJavaObjectInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance"
-      abstract="true" interface="true" eSuperTypes="#//IJavaInstance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This interface is the instance of an java object in the java model."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaAllocation" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class is the abstract base class of the allocation class. It is the value of the &quot;allocation&quot; property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InitStringAllocation" eSuperTypes="#//JavaAllocation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is used when the allocation string can be parsed by the remote vm. It uses the allocString."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the initialization string for this object."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplicitAllocation" eSuperTypes="#//JavaAllocation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ParseTreeAllocation" eSuperTypes="#//JavaAllocation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Allocations via Parse Trees."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"
-        eType="#//PTExpression" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTExpression" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PTArrayAccess" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Array access. e.g. x[3]. &#xD;&#xA;&#xD;&#xA;Unlike AST, the entire expression of type x[3][4] will be done in one expression rather than having a separate ArrayAccess for each dimension. This is just a simplification. This can only be used if it is a simple array access where it is of the form {expression}[expression][expression]."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="array" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The expression representing the array to access."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" lowerBound="1"
-        upperBound="-1" eType="#//PTExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The expressions representing the indexes of the access."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTArrayCreation" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Array Creation expression, e.g. new int[3] or new java.langString[][] {{&quot;a&quot;}, {&quot;b&quot;}}"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The fully-qualified type, e.g. int[][] or java.lang.String[], including the number of dimension brackets."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dimensions" upperBound="-1"
-        eType="#//PTExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The list of expressions for the dimensions. You can have [3][4][] but [][33] is invalid. So for each dimension that has an expression, there will be an entry in the list, in the correct order. When you reach the empty dimensions, the list will end too. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" eType="#//PTArrayInitializer"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the initializer, if any, for this array. E.g. new int[] {2,3}. It is the {2,3}."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTArrayInitializer" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Array initialization expression. This is the entire expression, e.g. {2, 3}, or {{2,3}, 4}. In the second case, the {2,3} will be an ArrayInitializer contained within the expressions list for the top ArrayInitializer."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" upperBound="-1"
-        eType="#//PTExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This isthe list of expressions within the initializer, e.g. {2, 3}, or {{2,3}, 4}. In the first case it will be two NumberLiterals. In the second case, the {2,3} will be an ArrayInitializer, followed by a NumberLiteral."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTBooleanLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This represents a primitive boolean literal, i.e. true or false directly in the code."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the literal."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTCastExpression" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Cast expression, e.g. (short) 10"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the fully-qualified type of the cast, e.g. int or java.lang.String"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The expression being casted."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTCharacterLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This represents a primitive character expression, e.g. 'a' or '\r'."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the escaped character. In other words the literal exactly as it is in the java file. E.g. 'a' or '\r'. Including the surrounding single quotes themselves."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="charValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"
-        transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual primitive character without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTClassInstanceCreation" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Class instance creation expression. E.g. new String(&quot;a&quot;)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the type of the class. E.g. java.lang.String. This should be fully-qualified for allocation purposes. It should also be in reflection format, i.e. if X is an inner class of j.Y, then the type here should be &quot;j.Y$X&quot;. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
-        eType="#//PTExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The arguments to the constructor."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTConditionalExpression" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The test Expresson, e.g. (x=3) ? 1 : 2"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The condition expression."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="true" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The true expression"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="false" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The false expression."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTFieldAccess" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Access a field expression, e.g. java.awt.Color.red"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="receiver" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The expression representing the object that the field is in, e.g. java.awt.Color."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="field" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the field being accessed, e.g. red."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTInfixExpression" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An expression with an operator that has two operands, e.g. 3 + 4."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//PTExpression"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//PTInfixOperator">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The operator, e.g. +"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The right expression. i.e. 4 of &quot;3 + 4&quot;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedOperands" upperBound="-1"
-        eType="#//PTExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Used when there are a series of infix operations of the same operator, e.g. 1 + 2 + 3 + 4. 1 and 2 will go into left and right, while {3, 4} will go into the extended operands. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="PTInfixOperator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Enumerator for the operator on an InfixExpression."/>
-    </eAnnotations>
-    <eLiterals name="TIMES">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="* operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="DIVIDE" value="1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="/ operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="REMAINDER" value="2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="% operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="PLUS" value="3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="+ operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="MINUS" value="4">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="- operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="LEFT_SHIFT" value="5">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;&lt; operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="RIGHT_SHIFT_SIGNED" value="6">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=">> operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="RIGHT_SHIFT_UNSIGNED" value="7">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=">>> operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="LESS" value="8">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;  operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="GREATER" value="9">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="> operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="LESS_EQUALS" value="10">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;= operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="GREATER_EQUALS" value="11">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=">= operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="EQUALS" value="12">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="== operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="NOT_EQUALS" value="13">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="!= operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="XOR" value="14">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="^ operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="AND" value="15">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&amp; operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="OR" value="16">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="|  operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="CONDITIONAL_AND" value="17">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&amp;&amp; operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="CONDITIONAL_OR" value="18">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="|| operator"/>
-      </eAnnotations>
-    </eLiterals>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTInstanceof" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Instanceof expression, e.g. x instanceof java.lang.String"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value to test, e.g. x in x instanceof java.lang.String"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of the instance test, e.g. java.lang.String. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTMethodInvocation" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="MethodInvocation expression, e.g. x.getY(3)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="receiver" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Who the method is invoked against. This may be not set, which means &quot;this&quot;. It may also be a Name, which would mean a class like &quot;java.lang.String&quot;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the method being invoked."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
-        eType="#//PTExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The list of arguments, if any, to the method."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTName" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This represents a name. This can happen for the receiver of a method invocation, e.g. x.getY() or java.lang.String.valueOf(10). In these cases you would have a name of &quot;x&quot; or &quot;java.lang.String&quot;."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name, which can be a type or a variable. If it is a type, then  it must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTNullLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents the expression &quot;null&quot;"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTNumberLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represent a number primitive literal, e.g. 10. One optimization that will be performed is that if an expression is of the form +number or -number, it will be converted from a PrefixExpression with a NumberLiteral to just a NumberLiteral. This will simplify the model."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="token" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The token value, e.g. 10, 10d, or -10.75"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTParenthesizedExpression" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An expression within parenthesis, e.g. (x+3)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The expression wrapped by the parenthesis, e.g. (x+3) then the expression is &quot;x+3&quot;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTPrefixExpression" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A one operand operator, where the operator comes before the operand, e.g. - (x+3). In AST, even -3 is modeled as a PrefixExpression of operator &quot;-&quot; and expression of NumberLiteral(3). But we optimize this away and just use a NumberLiteral(-3) directly instead."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//PTPrefixOperator">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The operator of this expression."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//PTExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The expression that the operator is applied to."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="PTPrefixOperator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The prefix expression operator. We are not modeling ++ and --."/>
-    </eAnnotations>
-    <eLiterals name="PLUS">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="+ operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="MINUS" value="1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="- operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="COMPLEMENT" value="2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="~ operator"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="NOT" value="3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="! operator"/>
-      </eAnnotations>
-    </eLiterals>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTStringLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Representation of a string literal, e.g. &quot;asdf&quot;."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the escaped string. In other words the literal exactly as it is in the java file. E.g. &quot;ab&quot; or &quot;c\r&quot;. Including the surrounding quotes themselves."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="literalValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual string without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTThisLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents &quot;this&quot;, e.g. this.getX() will be a MethodInvocation with the receiver being a ThisLiteral. We can't handle the format XYZ.this because that is for inner classes and we don't support that right now."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTTypeLiteral" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This represents a literal of the form j.XYZ.class. For instance in a method invocation x.getX(jXYZ.class) the argument will be a TypeLiteral."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of the literal.  It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTInvalidExpression" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is used when we have some expression we just can't evaluate for our purposes. It allows us to tell the evaluation what is actually wrong. It should be placed as the root expression to prevent processing much of the tree and then finally fail."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A message as to why it is invalid."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTInstanceReference" eSuperTypes="#//PTExpression">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" lowerBound="1"
-        eType="#//IJavaInstance"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PTAnonymousClassDeclaration" eSuperTypes="#//PTExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An anonymous class declaration. Currently we only store the &#xD;&#xA;entire declaration as a string, including the &quot;new AClass() {...}&quot;."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="declaration" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The declaration text."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="imports" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the imports needed in the main class by this declaration. This is a transient attribute. It is not serialized, nor is it parsed into from existing code. Its only purpose is to help code generation on a brand new declaration to know what imports should be added to the main class."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem/model/instance.genmodel b/plugins/org.eclipse.jem/model/instance.genmodel
deleted file mode 100644
index e1c764a20..000000000
--- a/plugins/org.eclipse.jem/model/instance.genmodel
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/javainst"
-    editDirectory="/org.eclipse.jem.edit/src" editorDirectory="/org.eclipse.jem.editor/src"
-    modelPluginID="" modelName="instance" editPluginClass="org.eclipse.jem.internal.instantiation.provider.instanceEditPlugin"
-    editorPluginClass="org.eclipse.jem.internal.instantiation.presentation.instanceEditorPlugin"
-    updateClasspath="false" booleanFlagsField="eFlags" booleanFlagsReservedBits="8"
-    importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>..\rose\instance.mdl</foreignModel>
-  <foreignModel>WorkspaceRoot</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Instantiation" basePackage="org.eclipse.jem.internal" adapterFactory="false"
-      ecorePackage="instance.ecore#/">
-    <genEnums ecoreEnum="instance.ecore#//PTInfixOperator">
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/TIMES"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/DIVIDE"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/REMAINDER"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/PLUS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/MINUS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/LEFT_SHIFT"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/RIGHT_SHIFT_SIGNED"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/RIGHT_SHIFT_UNSIGNED"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/LESS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/GREATER"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/LESS_EQUALS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/GREATER_EQUALS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/EQUALS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/NOT_EQUALS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/XOR"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/AND"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/OR"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/CONDITIONAL_AND"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/CONDITIONAL_OR"/>
-    </genEnums>
-    <genEnums ecoreEnum="instance.ecore#//PTPrefixOperator">
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/PLUS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/MINUS"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/COMPLEMENT"/>
-      <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/NOT"/>
-    </genEnums>
-    <genClasses ecoreClass="instance.ecore#//IJavaDataTypeInstance"/>
-    <genClasses ecoreClass="instance.ecore#//IJavaInstance"/>
-    <genClasses ecoreClass="instance.ecore#//IJavaObjectInstance"/>
-    <genClasses ecoreClass="instance.ecore#//JavaAllocation"/>
-    <genClasses ecoreClass="instance.ecore#//InitStringAllocation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//InitStringAllocation/initString"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//ImplicitAllocation">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference instance.ecore#//ImplicitAllocation/parent"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference instance.ecore#//ImplicitAllocation/feature"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//ParseTreeAllocation">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//ParseTreeAllocation/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTExpression"/>
-    <genClasses ecoreClass="instance.ecore#//PTArrayAccess">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayAccess/array"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayAccess/indexes"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTArrayCreation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTArrayCreation/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayCreation/dimensions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayCreation/initializer"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTArrayInitializer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayInitializer/expressions"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTBooleanLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTBooleanLiteral/booleanValue"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTCastExpression">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTCastExpression/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTCastExpression/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTCharacterLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTCharacterLiteral/escapedValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTCharacterLiteral/charValue"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTClassInstanceCreation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTClassInstanceCreation/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTClassInstanceCreation/arguments"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTConditionalExpression">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/condition"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/true"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/false"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTFieldAccess">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTFieldAccess/receiver"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTFieldAccess/field"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInfixExpression">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/leftOperand"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTInfixExpression/operator"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/rightOperand"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/extendedOperands"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInstanceof">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInstanceof/operand"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTInstanceof/type"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTMethodInvocation">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTMethodInvocation/receiver"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTMethodInvocation/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTMethodInvocation/arguments"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTName">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTName/name"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTNullLiteral"/>
-    <genClasses ecoreClass="instance.ecore#//PTNumberLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTNumberLiteral/token"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTParenthesizedExpression">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTParenthesizedExpression/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTPrefixExpression">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTPrefixExpression/operator"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTPrefixExpression/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTStringLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTStringLiteral/escapedValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTStringLiteral/literalValue"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTThisLiteral"/>
-    <genClasses ecoreClass="instance.ecore#//PTTypeLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTTypeLiteral/type"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInvalidExpression">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTInvalidExpression/message"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInstanceReference">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference instance.ecore#//PTInstanceReference/reference"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTAnonymousClassDeclaration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTAnonymousClassDeclaration/declaration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTAnonymousClassDeclaration/imports"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem/model/java.ecore b/plugins/org.eclipse.jem/model/java.ecore
deleted file mode 100644
index 2f8aa37cc..000000000
--- a/plugins/org.eclipse.jem/model/java.ecore
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="java"
-    nsURI="java.xmi" nsPrefix="org.eclipse.jem.java">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="Changes to synch up with Java3e:&#xD;&#xA;- deleted JavaElement, BodyElement which didn't add anything useful&#xD;&#xA;- deleted NestedClass and the association which described nesting, contents can be used instead&#xD;&#xA;- deleted extends/extendedBy which is replaced with MOF subtype/supertype&#xD;&#xA;- deleted the clumsy main diagram&#xD;&#xA;- moved the MOF inheritance details to the MOF binding diagram&#xD;&#xA;- deleted &quot;final&quot; on JavaParameter, don't know what that was supposed to be&#xD;&#xA;- deleted the Category junk&#xD;&#xA;- changed the Block-typed attributes on Field, Method, Initializer to be associations to Block&#xD;&#xA;&#xD;&#xA;Outstanding questions/issues:&#xD;&#xA;- JavaParameterKind should go away if we get the base Parameter kind fixed up&#xD;&#xA;"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaClass" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass">
-    <eOperations name="isNested" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="getField" eType="#//Field">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return an Field with the passed name, or null."/>
-      </eAnnotations>
-      <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getFieldExtended" eType="#//Field">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=" Return an Field with the passed name from this JavaClass or any supertypes.&#xD;&#xA;&#xD;&#xA;Return null if a Field named fieldName is not found."/>
-      </eAnnotations>
-      <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getFieldNamed" eType="#//Field">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return an Field with the passed name, or null."/>
-      </eAnnotations>
-      <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getFieldsExtended" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return all fields, including those from supertypes."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getMethod" eType="#//Method">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the method of this name and these parameters. It will not look up the supertype hierarchy."/>
-      </eAnnotations>
-      <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="parameterTypes" eType="#//JTypeList">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of parameter types."/>
-        </eAnnotations>
-      </eParameters>
-    </eOperations>
-    <eOperations name="getMethodElementSignatures" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return a List of Strings that represent MethodElement signatures from most general to most specific."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getMethodExtended" eType="#//Method">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the method of this name and these parameters. It will look up the supertype hierarchy."/>
-      </eAnnotations>
-      <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="parameterTypes" eType="#//JTypeList">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of parameter types."/>
-        </eAnnotations>
-      </eParameters>
-    </eOperations>
-    <eOperations name="getMethodsExtended" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return all methods, including those from supertypes."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getOnlySpecificMethods" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.&#xD;&#xA;"/>
-      </eAnnotations>
-      <eParameters name="aMethodNamePrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="excludedNames" eType="#//JTypeList"/>
-    </eOperations>
-    <eOperations name="getPublicMethod" eType="#//Method">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists.  It will not look up the supertype hierarchy."/>
-      </eAnnotations>
-      <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="parameterTypes" eType="#//JTypeList">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of parameter types."/>
-        </eAnnotations>
-      </eParameters>
-    </eOperations>
-    <eOperations name="getPublicMethods" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return all methods, it will not go up the supertype hierarchy."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getPublicMethodsExtended" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return all public methods, including those from supertypes."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getPublicMethodsNamed" eType="#//JTypeList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Returns a filtered list on the methods of this class, having a name equal to that of the parameter."/>
-      </eAnnotations>
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getSupertype" eType="#//JavaClass"/>
-    <eOperations name="implementsInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Test whether the receiver implements the passed interface (or one of its supertypes)."/>
-      </eAnnotations>
-      <eParameters name="interfaceType" eType="#//JavaClass"/>
-    </eOperations>
-    <eOperations name="infoString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return a string showing our details."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="inheritsFrom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Tests whether this class inherits from the passed in class."/>
-      </eAnnotations>
-      <eParameters name="javaClass" eType="#//JavaClass"/>
-    </eOperations>
-    <eOperations name="isExistingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Does this type exist."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="isInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this an interface."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="setSupertype">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set the supertype."/>
-      </eAnnotations>
-      <eParameters name="javaclass" eType="#//JavaClass"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//TypeKind"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="public" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="implementsInterfaces" upperBound="-1"
-        eType="#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="classImport" upperBound="-1"
-        eType="#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="packageImports" upperBound="-1"
-        eType="#//JavaPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fields" upperBound="-1"
-        eType="#//Field" containment="true" eOpposite="#//Field/javaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
-        eType="#//Method" containment="true" eOpposite="#//Method/javaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" upperBound="-1"
-        eType="#//Initializer" containment="true" eOpposite="#//Initializer/javaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="declaredClasses" upperBound="-1"
-        eType="#//JavaClass" eOpposite="#//JavaClass/declaringClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="declaringClass" eType="#//JavaClass"
-        eOpposite="#//JavaClass/declaredClasses"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaPackage" eType="#//JavaPackage"
-        changeable="false" volatile="true" transient="true" eOpposite="#//JavaPackage/javaClasses"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"
-        eType="#//JavaEvent" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="allEvents" upperBound="-1"
-        eType="#//JavaEvent" volatile="true" transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Initializer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStatic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass"
-        transient="true" eOpposite="#//JavaClass/initializers"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Block"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaParameter" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EParameter">
-    <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this parameter type an array type."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="isReturn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this a return parameter."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getJavaType" eType="#//JTypeJavaHelpers"/>
-    <eOperations name="getQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterKind" eType="#//JavaParameterKind"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Method" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EOperation">
-    <eOperations name="getContainingJavaClass" eType="#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return the java class that this method is defined in."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getMethodElementSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return a String with the the method name and its parameters. e.g. &lt;code> setFirstName(java.lang.String) &lt;/code> .&#xD;&#xA; "/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getParameter" eType="#//JavaParameter">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return a Parameter with the passed name, or null."/>
-      </eAnnotations>
-      <eParameters name="parameterName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getReturnType" eType="#//JTypeJavaHelpers">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the return type."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="setReturnType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set the return type"/>
-      </eAnnotations>
-      <eParameters name="type" eType="#//JTypeJavaHelpers"/>
-    </eOperations>
-    <eOperations name="getSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Replicate the functionality of java.lang.reflect.Method.toString().&#xD;&#xA;&#xD;&#xA;Returns a string describing this Method.  The string is formatted as the method access modifiers, if any, followed by the method return type, followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.&#xD;&#xA;&#xD;&#xA;For example:&#xD;&#xA;&#xD;&#xA;    public boolean java.lang.Object.equals(java.lang.Object)&#xD;&#xA;&#xD;&#xA;The access modifiers are placed in canonical order as specified by &quot;The Java Language Specification&quot;.  This is public, &lt;tt>protected&lt;/tt> or &lt;tt>private&lt;/tt> first, and then other modifiers in the following order: &lt;tt>abstract&lt;/tt>, &lt;tt>static&lt;/tt>, &lt;tt>final&lt;/tt>, &lt;tt>synchronized&lt;/tt> &lt;tt>native&lt;/tt>.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="isGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Returns true if the method is system generated.&#xD;&#xA;This is usually determined by the @generated tag in the comment."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="setIsGenerated">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set the isGenerated flag."/>
-      </eAnnotations>
-      <eParameters name="generated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    </eOperations>
-    <eOperations name="isVoid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this a void return type method."/>
-      </eAnnotations>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="native" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="synchronized" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVisibility" eType="#//JavaVisibilityKind"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
-        eType="#//JavaParameter" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaExceptions" upperBound="-1"
-        eType="#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass"
-        transient="true" eOpposite="#//JavaClass/methods"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Block"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Field" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//ETypedElement">
-    <eOperations name="getContainingJavaClass" eType="#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the class that this field is within."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this field an array type."/>
-      </eAnnotations>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVisibility" eType="#//JavaVisibilityKind"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="volatile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass"
-        transient="true" eOpposite="#//JavaClass/fields"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" eType="#//Block"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TypeKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4"/>
-    </eAnnotations>
-    <eLiterals name="UNDEFINED"/>
-    <eLiterals name="CLASS" value="1"/>
-    <eLiterals name="INTERFACE" value="2"/>
-    <eLiterals name="EXCEPTION" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Block">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"
-        eType="#//Block" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//Block"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Statement" eSuperTypes="#//Block"/>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaPackage" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaClasses" upperBound="-1"
-        eType="#//JavaClass" changeable="false" volatile="true" transient="true" eOpposite="#//JavaClass/javaPackage"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="JavaVisibilityKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="PACKAGE=1&#xD;&#xA;PUBLIC=2&#xD;&#xA;PRIVATE=3&#xD;&#xA;PROTECTED=4"/>
-    </eAnnotations>
-    <eLiterals name="PUBLIC"/>
-    <eLiterals name="PRIVATE" value="1"/>
-    <eLiterals name="PROTECTED" value="2"/>
-    <eLiterals name="PACKAGE" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="JavaParameterKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="IN=0&#xD;&#xA;OUT=1&#xD;&#xA;INOUT=2&#xD;&#xA;RETURN=3"/>
-    </eAnnotations>
-    <eLiterals name="IN"/>
-    <eLiterals name="OUT" value="1"/>
-    <eLiterals name="INOUT" value="2"/>
-    <eLiterals name="RETURN" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaDataType" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass">
-    <eOperations name="getDefaultValueString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Return the default string representing the default value of the primitive."/>
-      </eAnnotations>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ArrayType" eSuperTypes="#//JavaClass">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Describes a Java Array type&#xD;&#xA;   For multi-dimensional arrays, it is unlikely that the component type will be&#xD;&#xA;   specified directly.  This would require instantiating a chain of component types&#xD;&#xA;   such as String[][][][]->String[][][]->String[][]->String[]->String.&#xD;&#xA;&#xD;&#xA;  The component type relationship will be computed if the finalComponentType&#xD;&#xA;  and array dimensions is specified.&#xD;&#xA; &#xD;&#xA;  For this reason, the preferred way to create is through the JavaRefFactory factory method:&#xD;&#xA;       createArrayType(JavaClass finalComponentType, int dimensions)"/>
-    </eAnnotations>
-    <eOperations name="getFinalComponentType" eType="#//JTypeJavaHelpers">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the final component type for this Array Type.&#xD;&#xA;&#xD;&#xA;In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getComponentTypeAsHelper" eType="#//JTypeJavaHelpers">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Get the component type of this array. &#xD;&#xA;&#xD;&#xA;If this is a multi-dimensional array, the component type will be the nested array type."/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="isPrimitiveArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this an array of java primitives"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="setComponentType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set the component type."/>
-      </eAnnotations>
-      <eParameters name="helperComponentType" eType="#//JTypeJavaHelpers"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayDimensions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="JTypeJavaHelpers" instanceClassName="org.eclipse.jem.java.JavaHelpers">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This interface is a common interface between JavaClass and JavaDataType plus some common helper methods."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="JTypeList" instanceClassName="java.util.List">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="java.util.List type"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaEvent" abstract="true" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem/model/javaModel.genmodel b/plugins/org.eclipse.jem/model/javaModel.genmodel
deleted file mode 100644
index c94fd6a9d..000000000
--- a/plugins/org.eclipse.jem/model/javaModel.genmodel
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/mofjava"
-    editDirectory="/org.eclipse.jem.edit/src" editorDirectory="/org.eclipse.jem.editor/src"
-    modelPluginID="" modelName="Java" modelPluginClass="" editPluginClass="java.provider.JavaEditPlugin"
-    editorPluginClass="java.presentation.JavaEditorPlugin" updateClasspath="false"
-    booleanFlagsField="eFlags" booleanFlagsReservedBits="8" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>..\rose\javaModel.mdl</foreignModel>
-  <foreignModel>WorkspaceRoot</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="JavaRef" basePackage="org.eclipse.jem" classPackageSuffix="internal.impl"
-      ecorePackage="java.ecore#/">
-    <genEnums ecoreEnum="java.ecore#//TypeKind">
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/UNDEFINED"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/CLASS"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/INTERFACE"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/EXCEPTION"/>
-    </genEnums>
-    <genEnums ecoreEnum="java.ecore#//JavaVisibilityKind">
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PUBLIC"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PRIVATE"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PROTECTED"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PACKAGE"/>
-    </genEnums>
-    <genEnums ecoreEnum="java.ecore#//JavaParameterKind">
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/IN"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/OUT"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/INOUT"/>
-      <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/RETURN"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="java.ecore#//JTypeJavaHelpers"/>
-    <genDataTypes ecoreDataType="java.ecore#//JTypeList"/>
-    <genClasses ecoreClass="java.ecore#//JavaClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/public"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/final"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/implementsInterfaces"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/classImport"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/packageImports"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/fields"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/methods"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/initializers"/>
-      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/declaredClasses"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/declaringClass"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/javaPackage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/events"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/allEvents"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/isNested"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getField">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getField/fieldName"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getFieldExtended">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getFieldExtended/fieldName"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getFieldNamed">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getFieldNamed/fieldName"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getFieldsExtended"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getMethod">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getMethod/methodName"/>
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getMethod/parameterTypes"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getMethodElementSignatures"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getMethodExtended">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getMethodExtended/methodName"/>
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getMethodExtended/parameterTypes"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getMethodsExtended"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getOnlySpecificMethods">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getOnlySpecificMethods/aMethodNamePrefix"/>
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getOnlySpecificMethods/excludedNames"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethod">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getPublicMethod/methodName"/>
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getPublicMethod/parameterTypes"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethods"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethodsExtended"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethodsNamed">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/getPublicMethodsNamed/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/getSupertype"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/implementsInterface">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/implementsInterface/interfaceType"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/infoString"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/inheritsFrom">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/inheritsFrom/javaClass"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/isExistingType"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/isInterface"/>
-      <genOperations ecoreOperation="java.ecore#//JavaClass/setSupertype">
-        <genParameters ecoreParameter="java.ecore#//JavaClass/setSupertype/javaclass"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//Initializer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Initializer/isStatic"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Initializer/javaClass"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Initializer/source"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//JavaParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaParameter/final"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaParameter/parameterKind"/>
-      <genOperations ecoreOperation="java.ecore#//JavaParameter/isArray"/>
-      <genOperations ecoreOperation="java.ecore#//JavaParameter/isReturn"/>
-      <genOperations ecoreOperation="java.ecore#//JavaParameter/getJavaType"/>
-      <genOperations ecoreOperation="java.ecore#//JavaParameter/getQualifiedName"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//Method">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/abstract"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/native"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/synchronized"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/final"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/constructor"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/static"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/javaVisibility"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Method/parameters"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Method/javaExceptions"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Method/javaClass"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Method/source"/>
-      <genOperations ecoreOperation="java.ecore#//Method/getContainingJavaClass"/>
-      <genOperations ecoreOperation="java.ecore#//Method/getMethodElementSignature"/>
-      <genOperations ecoreOperation="java.ecore#//Method/getParameter">
-        <genParameters ecoreParameter="java.ecore#//Method/getParameter/parameterName"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//Method/getReturnType"/>
-      <genOperations ecoreOperation="java.ecore#//Method/setReturnType">
-        <genParameters ecoreParameter="java.ecore#//Method/setReturnType/type"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//Method/getSignature"/>
-      <genOperations ecoreOperation="java.ecore#//Method/isGenerated"/>
-      <genOperations ecoreOperation="java.ecore#//Method/setIsGenerated">
-        <genParameters ecoreParameter="java.ecore#//Method/setIsGenerated/generated"/>
-      </genOperations>
-      <genOperations ecoreOperation="java.ecore#//Method/isVoid"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//Field">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/final"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/static"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/javaVisibility"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/transient"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/volatile"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Field/javaClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Field/initializer"/>
-      <genOperations ecoreOperation="java.ecore#//Field/getContainingJavaClass"/>
-      <genOperations ecoreOperation="java.ecore#//Field/isArray"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//Block">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Block/source"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Block/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Block/contents"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//Comment"/>
-    <genClasses ecoreClass="java.ecore#//Statement"/>
-    <genClasses ecoreClass="java.ecore#//JavaPackage">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaPackage/javaClasses"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//JavaDataType">
-      <genOperations ecoreOperation="java.ecore#//JavaDataType/getDefaultValueString"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//ArrayType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//ArrayType/arrayDimensions"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//ArrayType/componentType"/>
-      <genOperations ecoreOperation="java.ecore#//ArrayType/getFinalComponentType"/>
-      <genOperations ecoreOperation="java.ecore#//ArrayType/getComponentTypeAsHelper"/>
-      <genOperations ecoreOperation="java.ecore#//ArrayType/isPrimitiveArray"/>
-      <genOperations ecoreOperation="java.ecore#//ArrayType/setComponentType">
-        <genParameters ecoreParameter="java.ecore#//ArrayType/setComponentType/helperComponentType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//JavaEvent"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem/mofjava/javaadapters.properties b/plugins/org.eclipse.jem/mofjava/javaadapters.properties
deleted file mode 100644
index c8d8a81a9..000000000
--- a/plugins/org.eclipse.jem/mofjava/javaadapters.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/mofjava/javaadapters.properties,v $
-# $Revision: 1.5 $  $Date: 2005/08/24 20:20:25 $
-#
-
-Failed_reflecting_values_ERROR_       = IWAV0002E Failed reflecting values.
-Could_Not_Reflect_Methods_ERROR_      = IWAV0003E Could not reflect methods for {0} because one of the methods references a type that could not be loaded.  Exception: {1}
-Could_Not_Reflect_Constructors_ERROR_ = IWAV0142E Could not reflect constructors for {0} because one of the methods references a type that could not be loaded.  Exception: {1}
-Could_Not_Reflect_Fields_ERROR_       = IWAV0143E Could not reflect fields for {0} because one of the fields is a type that could not be loaded. Exception: {1}
-Error_Looking_Up_Type_ERROR_          = IWAV0144E Error looking up type {0}.  Exception: {1}
-Error_Introspecting_Flags_ERROR_      = IWAV0145E Error introspecting flags on {0}.  Exception: {1}
-Error_Setting_GenFlag_ERROR_          = IWAV0153E Error setting the generated flag on {0}.  Exception: {1}
-Java_Inh_Cycle_ERROR_                 = IWAV0154E Detected an inheritance cycle when {0} trys to extend {1}.
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java
deleted file mode 100644
index 08cf242ed..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JEMPlugin.java,v $
- *  $Revision: 1.8 $  $Date: 2005/08/24 20:20:25 $ 
- */
-package org.eclipse.jem.internal.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-
-/**
- * org.eclipse.jem plugin
- */
-public class JEMPlugin extends Plugin {
-
-	private static JEMPlugin PLUGIN;
-	private Logger logger;
-	
-	public JEMPlugin() {
-		PLUGIN = this;
-	}
-	
-	public static JEMPlugin getPlugin() {
-		return PLUGIN;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		logger = EclipseLogger.getEclipseLogger(this);		
-	}
-	
-	public Logger getLogger() {
-		return logger;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java
deleted file mode 100644
index 95cbb9009..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: IJavaClassAdaptor.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:25 $ 
- */
-/**
- * Insert the type's description here.
- * Creation date: (8/27/2001 1:17:46 PM)
- * @author: Administrator
- */
-public interface IJavaClassAdaptor {
-/**
- * Return true if the sourceType is null or if
- * it is a binary type.
- */
-boolean isSourceTypeFromBinary() ;
-/**
- * Return true if the sourceType can be found.
- */
-boolean sourceTypeExists() ;
-
-/**
- * Reflect the fields
- * @return <code>true</code> if reflection occurred.
- * 
- * @since 1.0.0
- */
-boolean reflectFieldsIfNecessary();	
-
-/**
- * Reflect the methods.
- * @return <code>true</code> if reflection occurred.
- * 
- * @since 1.0.0
- */
-boolean reflectMethodsIfNecessary();
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java
deleted file mode 100644
index 550630be2..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IJavaMethodAdapter.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:25 $ 
- */
-package org.eclipse.jem.internal.java.adapters;
- 
-
-/**
- * Used to reflect methods
- * @since 1.0.0
- */
-public interface IJavaMethodAdapter {
-
-	/**
-	 * Reflect the generated if necessary.
-	 * @return <code>true</code> if reflection occurred.
-	 * 
-	 * @since 1.0.0
-	 */
-	public boolean reflectGeneratedIfNecessary();
-	
-	/**
-	 * Reflect the names of the method parameters if necessary.
-	 * @return <code>true</code> if reflection occurred.
-	 * 
-	 * @since 1.0.0
-	 */
-	public boolean reflectParamNamesIfNecessary();
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java
deleted file mode 100644
index 7b6feb49b..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: InternalReadAdaptable.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:25 $ 
- */
-
-public interface InternalReadAdaptable extends org.eclipse.emf.common.notify.Notifier {
-/**
- * Implementers of this interface need to contain the following method
- * implementations:
- * public Object primRefValue(EObject a) {
- *	return super.getValue(a);
- * }
- * public Object getValue(EObject a) {
- *	return ReflectionAdaptor.getValue(this, a);
- * }
- */
-//public Object primRefValue(EObject a);
-void setReflected(boolean aBoolean);
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java
deleted file mode 100644
index 60c62814a..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JavaArrayTypeReflectionAdapter.java,v $
- *  $Revision: 1.8 $  $Date: 2005/09/14 23:30:35 $ 
- */
-package org.eclipse.jem.internal.java.adapters;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.InheritanceCycleException;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.internal.impl.ArrayTypeImpl;
-
-/**
- * Array type reflection adapter. Since arrays are very constant we don't need any fancy reflection to the source type (class object). It really
- * doesn't do anything. It is just here so that it exists. Everything is constant or depends on the final component type.
- * 
- * @since 1.0.0
- */
-public class JavaArrayTypeReflectionAdapter extends JavaReflectionAdaptor implements IJavaClassAdaptor {
-
-	public JavaArrayTypeReflectionAdapter(Notifier target) {
-		super(target);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#getReflectionSource()
-	 */
-	public Object getReflectionSource() {
-		return null; // There isn't any for arrays.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
-	 */
-	public boolean hasReflectionSource() {
-		// This method is used to determine if valid, so we pass on to use the final component.
-		ArrayType jh = (ArrayType) getTarget();
-		JavaHelpers fc = jh.getFinalComponentType();
-		return (fc.isPrimitive() || ((JavaClass) fc).isExistingType());
-	}
-	
-	public boolean hasCachedReflectionSource() {
-		ArrayType jh = (ArrayType) getTarget();
-		JavaHelpers fc = jh.getFinalComponentType();
-		if(fc.isPrimitive())
-		    return true;
-		else {
-		    JavaReflectionAdaptor reflectionAdaptor = (JavaReflectionAdaptor) EcoreUtil.getExistingAdapter(fc, ReflectionAdaptor.TYPE_KEY);
-		    return (reflectionAdaptor != null) ? reflectionAdaptor.hasCachedReflectionSource() : false;		    
-		} 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.java.adapters.ReflectionAdaptor#reflectValues()
-	 */
-	public boolean reflectValues() {
-		ArrayTypeImpl at = (ArrayTypeImpl) getTarget();
-
-		// Arrays are always:
-		//		final
-		//		Supertype of java.lang.Object
-		//		implements java.lang.Cloneable, java.io.Serializable
-		at.setFinal(true);
-		try {
-			at.setSupertype((JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.lang.Object", (EObject) getTarget())); //$NON-NLS-1$
-		} catch (InheritanceCycleException e) {
-		}
-		List list = at.getImplementsInterfacesGen();
-		list.add(JavaRefFactory.eINSTANCE.createClassRef("java.lang.Cloneable")); //$NON-NLS-1$
-		list.add(JavaRefFactory.eINSTANCE.createClassRef("java.io.Serializable")); //$NON-NLS-1$
-		return super.reflectValues();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#flushReflectedValues(boolean)
-	 */
-	protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-		ArrayTypeImpl at = (ArrayTypeImpl) getTarget();
-		at.getImplementsInterfacesGen().clear();
-		return true;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#isSourceTypeFromBinary()
-	 */
-	public boolean isSourceTypeFromBinary() {
-		return false;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#reflectFieldsIfNecessary()
-	 */
-	public synchronized boolean reflectFieldsIfNecessary() {
-		return reflectValuesIfNecessary();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#reflectMethodsIfNecessary()
-	 */
-	public synchronized boolean reflectMethodsIfNecessary() {
-		return reflectValuesIfNecessary();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#sourceTypeExists()
-	 */
-	public boolean sourceTypeExists() {
-		return hasReflectionSource();
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java
deleted file mode 100644
index 9bb360d00..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaReflectionAdapterFactory.java,v $
- *  $Revision: 1.7 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.jem.java.JavaRefPackage;
-public abstract class JavaReflectionAdapterFactory extends AdapterFactoryImpl {
-	// Maintain a mapping of the source objects to the adaptors which have
-	// relfected from them.  This allows a flush operation to force those
-	// adapters to re-reflect.
-	protected HashMap reflected = new HashMap();
-	/**
-	 * Key for the type of adapters that this factory creates. (Used in isFactoryForType()).
-	 */
-	public static final String TYPE_KEY = ReadAdaptor.TYPE_KEY;
-	protected boolean isBusyIteratingReflected = false;
-	protected Map registerQueue;
-	protected List unregisterQueue;
-/**
- * JavaReflectionAdapterFactory constructor comment.
- */
-public JavaReflectionAdapterFactory() {
-	super();
-}
-public Adapter createAdapter(Notifier target) {
-	ReflectionAdaptor adapter = null;
-	EObject object = (EObject) target;
-	JavaRefPackage pack = getJavaRefPackage();
-	if (object.eClass() == pack.getJavaClass())
-		adapter = createJavaClassAdaptor(target);
-	else
-		if (object.eClass() == pack.getArrayType())
-			adapter = createArrayTypeAdaptor(target);
-		else
-			if (object.eClass() == pack.getMethod())
-				adapter = createJavaMethodAdaptor(target);
-			else
-				if (object.eClass() == pack.getField())
-					adapter = createJavaFieldAdaptor(target);
-	return adapter;
-}
-
-protected ReflectionAdaptor createArrayTypeAdaptor(Notifier target) {
-	return new JavaArrayTypeReflectionAdapter(target);
-}
-
-protected abstract ReflectionAdaptor createJavaClassAdaptor(Notifier target) ;
-protected abstract ReflectionAdaptor createJavaFieldAdaptor(Notifier target) ;
-protected abstract ReflectionAdaptor createJavaMethodAdaptor(Notifier target) ;
-// Flush the adapter for a source object
-public Notification disAssociateSource(String source) {
-	return disAssociateSource(source, true);
-}
-
-public Notification disAssociateSource(String source, boolean doNotify) {
-	JavaReflectionAdaptor a = (JavaReflectionAdaptor) reflected.get(source);
-	Notification notification = null;
-	if (a != null) {
-		if (doNotify)
-			a.releaseSourceType();
-		else
-			notification = a.releaseSourceTypeNoNotification();
-	}
-	return notification;
-}
-public void flushAll() {}
-// Flush the adapter for a source object
-public void flushReflection(String source) {}
-protected JavaRefPackage getJavaRefPackage() {
-	return (JavaRefPackage) EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-}
-public void registerReflection(String source, ReflectionAdaptor adapter) {
-	if (isBusyIteratingReflected) {
-		if (registerQueue == null)
-			registerQueue = new HashMap();
-		registerQueue.put(source, adapter);
-	} else
-		reflected.put(source, adapter);
-}
-public void unregisterReflection(String source) {
-	if (isBusyIteratingReflected) {
-		if (unregisterQueue == null)
-			unregisterQueue = new ArrayList();
-		unregisterQueue.add(source);
-	} else
-		reflected.remove(source);
-}
-public void disAssociateSourcePlusInner(String source) {
-	disAssociateSourcePlusInner(source, true);
-}
-
-public Notification disAssociateSourcePlusInner(String source, boolean doNotify) {
-	isBusyIteratingReflected = true;
-	Notification notification = null;
-	try {
-		String innerName = source + '$';
-		Iterator it = reflected.entrySet().iterator();
-		Map.Entry entry;
-		String key;
-		JavaReflectionAdaptor adaptor;
-		while (it.hasNext()) {
-			entry = (Map.Entry) it.next();
-			key = (String) entry.getKey();
-			if (key.equals(source) || key.startsWith(innerName)) {
-				adaptor = (JavaReflectionAdaptor) reflected.get(key);
-				if (adaptor != null) {
-					if (doNotify)
-						adaptor.releaseSourceType();
-					else
-						notification = adaptor.releaseSourceTypeNoNotification();
-				}
-			}
-		}
-	} finally {
-		finishedIteratingReflected();
-	}
-	return notification;
-}
-
-protected void finishedIteratingReflected() {
-	isBusyIteratingReflected = false;
-	if (unregisterQueue != null && !unregisterQueue.isEmpty()) {
-		for (int i = 0; i < unregisterQueue.size(); i++) {
-			reflected.remove(unregisterQueue.get(i));
-		}
-		unregisterQueue.clear();
-	}
-	if (registerQueue != null && !registerQueue.isEmpty()) {
-		Iterator it = registerQueue.entrySet().iterator();
-		Map.Entry entry;
-		while (it.hasNext()) {
-			entry = (Map.Entry) it.next();
-			reflected.put(entry.getKey(), entry.getValue());
-		}
-		registerQueue.clear();
-	}
-}
-public boolean isFactoryForType(Object type) {
-	return TYPE_KEY.equals(type);
-}
-}
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java
deleted file mode 100644
index 4e37f0b4f..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaReflectionAdaptor.java,v $
- *  $Revision: 1.15 $  $Date: 2006/05/17 20:13:07 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.util.logger.proxy.Logger;
-	
-/**
- * 
- */
-public abstract class JavaReflectionAdaptor extends ReflectionAdaptor {
-	private static final String C_METHOD_DEFAULT_CTOR = String.valueOf(C_METHOD_PARM_DELIMITER) + S_CONSTRUCTOR_TOKEN;
-	protected static final String LEFT_BRACKET = "[";//$NON-NLS-1$
-	
-	/**
-	 * Special notification event type. This is sent against a JavaClass (as the target) whenever flush of the reflection occurs. It will be
-	 * sent under the notification event type of REFLECTION_EVENT.
-	 * @since 1.1.0
-	 */
-	public static final EAttribute FLUSH_REFLECTION_EVENT = EcorePackage.eINSTANCE.getEcoreFactory().createEAttribute();
-	
-	/**
-	 * Special notification event type. This is sent against a JavaClass (as the target) whenever flush of a new class (i.e. 
-	 * no source was found) of the reflection occurs. It will be
-	 * sent under the notification event type of REFLECTION_EVENT.
-	 * @since 1.1.0
-	 */
-	public static final EAttribute FLUSH_NEW_REFLECTION_EVENT = EcorePackage.eINSTANCE.getEcoreFactory().createEAttribute();
-
-	/*
-	 * Fill in the name. Not really needed but it would be nice.
-	 */
-	static {
-		FLUSH_REFLECTION_EVENT.setName("flushReflectedValues");    //$NON-NLS-1$
-		FLUSH_NEW_REFLECTION_EVENT.setName("flushNewReflectedValues"); //$NON-NLS-1$
-	}
-	protected boolean hasFlushed = false;
-	protected boolean isFlushing = false;
-/**
- * JavaReflectionAdapter constructor comment.
- */
-public JavaReflectionAdaptor() {
-	super();
-}
-/**
- * JavaReflectionAdapter constructor comment.
- * @param target org.eclipse.emf.common.notify.Notifier
- */
-public JavaReflectionAdaptor(org.eclipse.emf.common.notify.Notifier target) {
-	super(target);
-}
-/**
- * createBlock - instantiate a Block containing the passed source
- */
-public Block createBlock(String name, String sourceString) {
-	Block newBlock = getJavaFactory().createBlock();
-	newBlock.setName(name + "_" + "block");//$NON-NLS-2$//$NON-NLS-1$
-	newBlock.setSource(sourceString);
-	return newBlock;
-}
-/**
- * setSuper - set our supertype here, implemented interface are handled separately
- */
-public JavaClass createJavaClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-/**
- * createJavaParameter - instantiate a Java Parameter based on the passed name and type name (a simple name, NOT A SIGNATURE!!!)
- * The id for a parameter has to be complex in order to be parsable into class, method, and parm.
- * It is created by appending the parm name to the method id, with a known separator.
- * It will look something like "Foo.doSomething(java.lang.Integer-arg0"
- */
-public JavaParameter createJavaParameter(Method parentMethod, String parmName, String parmTypeName) {
-	JavaParameter newParm = getJavaFactory().createJavaParameter();
-	if (parmName!=null)
-	   newParm.setName(parmName);
-// ((InternalEObject)newParm).eSetID(parentMethod.eID() + C_METHODID_PARMID_DELIMITER + parmName);
-	String classRefString = parmTypeName;
-	newParm.setEType(createJavaClassRef(classRefString));
-	return newParm;
-}
-/**
- * This method will return a List of dimensions for a typeName.
- * For example "foo[][]" would return a List of Integers
- * 1, 1.  At some point we may want to actually capture the size
- * for Fields but we would need the initializer source to determine that.
- */
-public List getArrayDimensions(String typeName) {
-	List dimensions = new java.util.ArrayList();
-	if (typeName != null) {
-		int begin = 0;
-		int index = -1;
-		while (begin < typeName.length()) {
-			index = typeName.indexOf(LEFT_BRACKET, begin);
-			if (index > -1) {
-				dimensions.add(new Integer(1));
-				begin = index + 1;
-			} else {
-				begin = typeName.length();
-			}
-		}
-	}
-	return dimensions;
-}
-/* Get the Java Factory
- */
-protected static JavaRefFactory getJavaFactory() {
-	return ((org.eclipse.jem.java.JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jem.java.JavaRefPackage.eNS_URI)).getJavaRefFactory();
-}
-public abstract Object getReflectionSource();
-/**
- * getTypeNamesFromMethodUUID - Pull the parm type names out of a method ID
- * 		It will be in the form: "simpleclass.methodName(com.fronk.Parm1_type,parm2type"
- */
-protected static String[] getTypeNamesFromMethodID(String methodID) {
-	if (methodID.charAt(methodID.length()-1) == C_METHOD_PARM_DELIMITER || methodID.endsWith(C_METHOD_DEFAULT_CTOR))
-		return emptyStringArray;
-		
-	// Count the parms first.  The number of parms is the number of occurrences of ',' + 1
-	int numParms = 1;
-	int pos = -1;
-	// Skip the '.' after classname
-	pos = methodID.indexOf(C_CLASS_MEMBER_DELIMITER, ++pos);
-	// Look for the start of the parms
-	int parmPos = methodID.indexOf(C_METHOD_PARM_DELIMITER, ++pos);
-	pos = parmPos;
-	while ((pos = methodID.indexOf(C_PARM_PARM_DELIMITER, ++pos)) != -1)
-		numParms++;
-	String[] parmTypeNames = new String[numParms];
-	// now collect the parm names
-	// skip the method name
-	pos = parmPos;
-	int i = 0, end;
-	do {
-		end = methodID.indexOf(C_PARM_PARM_DELIMITER, pos + 1);
-		// This is the last parameter, we may need to strip a trailing &V for a constructor
-		if (end == -1)
-			end = methodID.indexOf(S_CONSTRUCTOR_TOKEN, pos + 1);
-		// otherwise take the rest of the ID
-		if (end == -1)
-			end = methodID.length();
-		parmTypeNames[i++] = methodID.substring(pos + 1, end);
-	} while ((pos = methodID.indexOf(C_PARM_PARM_DELIMITER, ++pos)) != -1);
-	return parmTypeNames;
-}
-public abstract boolean hasCachedReflectionSource();
-
-public boolean hasReflectionSource() {
-    return getReflectionSource() != null;
-}
-
-/**
- * Subclasses should override.
- *
- */
-public void releaseSourceType(){
-}
-
-/**
- * Subclasses should override.
- * @return
- */
-public Notification releaseSourceTypeNoNotification() {
-	return null;
-}
-
-public static void releaseSourceType(JavaClass javaClass) {
-	if (javaClass == null)
-		return;
-
-	JavaReflectionAdaptor existing = (JavaReflectionAdaptor) retrieveAdaptorFrom(javaClass);
-	if (existing != null)
-		existing.releaseSourceType();
-}
-/*
- * This method is called by a Field Adaptor to set the type of aField
- * to be aTypeName.  aTypeName may contain array brackets which need
- * to be detected in order to set the array dimensions on aField.
- */
-protected void setFieldType(Field aField, String aTypeName) {
-	if (aField != null && aTypeName != null) {
-		String classRefString = aTypeName;
-		aField.setEType(createJavaClassRef(classRefString));
-	}
-}
-public final boolean flushReflectedValuesIfNecessary() {
-	return flushReflectedValuesIfNecessary(false);
-}
-public final boolean flushReflectedValuesIfNecessary(boolean clearCachedModelObject) {
-	Notification not = flushReflectedValuesIfNecessaryNoNotification(clearCachedModelObject);
-	if (not != null)
-		getTarget().eNotify(not);
-	return hasFlushed;
-}
-
-public synchronized Notification flushReflectedValuesIfNecessaryNoNotification(boolean clearCachedModelObject) {
-	if (!hasFlushed && !isFlushing) {
-		boolean isExisting = hasCachedReflectionSource();
-		try {
-			isFlushing = true;
-			hasReflected = false;
-			hasFlushed = flushReflectedValues(clearCachedModelObject);
-		} catch (Throwable e) {
-			hasFlushed = false;
-			Logger.getLogger().log(e);
-			if (e instanceof RuntimeException)
-				throw (RuntimeException) e;
-			else if (e instanceof Error)
-				throw (Error) e;
-			else
-				throw new RuntimeException(e.getMessage());
-		} finally {
-			isFlushing = false;
-			postFlushReflectedValuesIfNecessary(isExisting);
-		}
-		return createFlushNotification(isExisting);
-	}
-	return null;
-}
-
-/**
- * @param isExisting
- * @return
- */
-protected Notification createFlushNotification(boolean isExisting) {
-	EStructuralFeature feature = isExisting ? FLUSH_REFLECTION_EVENT : FLUSH_NEW_REFLECTION_EVENT;
-	return new ENotificationImpl((InternalEObject)getTarget(),EVENT, feature, null, null);
-}
-protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
-}
-/**
- * Subclasses should override to perform the actual clearing of the values.
- */
-protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-	return true;
-}
-/**
- * Return a boolean indicating whether reflection had occurred.
- */
-public boolean reflectValuesIfNecessary() {
-	if (isFlushing)
-		return false;
-	return super.reflectValuesIfNecessary();
-}
-
-/**
- * reflectValues - template method, subclasses override to pump values into target
- */
-public boolean reflectValues() {
-	hasFlushed = false;
-	return true;
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java
deleted file mode 100644
index c10096145..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaReflectionKey.java,v $
- *  $Revision: 1.10 $  $Date: 2006/05/17 20:13:07 $ 
- */
-import java.util.*;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.adapters.IJavaReflectionKey;
-import org.eclipse.jem.java.adapters.IJavaReflectionKeyExtension;
-import org.eclipse.jem.util.CharacterUtil;
-import org.eclipse.jem.util.CharacterUtil.StringIterator;
-
-/**
- * This key handles Java Reflection. It creates the appropriate type of entries if
- * they are not already in the resource. There is an extension mechanism for other
- * types of ids that are not recognized by this key. They are registered with the
- * JavaXMIFactory that is used to create these keys, and the factory will pass in
- * a List of these registered extension processers (IJavaReflectionKeyExtension).
- * 
- * Creation date: (10/4/2000 8:24:36 AM)
- * @author: Administrator
- */
-public class JavaReflectionKey implements IJavaReflectionKey {
-	private static final Collection PRIMITIVES = new ArrayList(8);
-
-	static { initializePrimitivesCollection(); }
-	
-	protected JavaXMIFactoryImpl.JavaXMIResource resource; //FB
-	protected List extensions;
-
-public JavaReflectionKey(List extensions, JavaXMIFactoryImpl.JavaXMIResource resource) {
-  this.extensions = extensions;
-  this.resource = resource;
-}
-//FB END
-
-/* 
- * Create an ArrayType instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createArrayType()
- */
-public ArrayType createArrayType() {
-	return getJavaFactory().createArrayType();
-}
-/* 
- * Create a JavaClass instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaClass()
- */
-public JavaClass createJavaClass() {
-	return getJavaFactory().createJavaClass();
-}
-/**
- * Create a data type and put it in the primitives resource
- */
-protected EClassifier getJavaDataType(String typeName) {
-	JavaDataType result = getJavaFactory().createJavaDataType();
-	result.setName(typeName);
-	// ((InternalEObject)result).eSetID(typeName);
-	//result.eSetUUID((UUID) null);
-	//result.setEPackage(getPackage());
-	getPackage().getEClassifiers().add(result);
-	resource.setID(result, typeName);	
-	return result;
-}
-/* 
- * Create a Field instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaField()
- */
-public Field createJavaField() {
-	return getJavaFactory().createField();
-}
-/* 
- * Create a Method instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaMethod()
- */
-public Method createJavaMethod() {
-	return getJavaFactory().createMethod();
-}
-/* 
- * Create a JavaParameter instance in the current document
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaParameter()
- */
-public JavaParameter createJavaParameter() {
-	return getJavaFactory().createJavaParameter();
-}
-//FB/**
-//FB * Override to try to introspect objects
-//FB * that aren't found using the default mechanism.
-//FB */
-//FBpublic Object get(Object key) {
-//FB 	Object javaObject = super.get(key);
-//FB 	if (javaObject == null) {
-//FB 		javaObject = getObjectFromExtensions((String) key);
-//FB 		if (javaObject == null)
-//FB 			javaObject = getJavaObject((String) key);
-//FB 	}
-//FB	return javaObject;
-//FB}
-
-//FB ADDED
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#get(java.lang.String)
- */
-public Object get(String key) {
-	Object javaObject = getObjectFromExtensions(key);
-	if (javaObject == null)
-		javaObject = getJavaObject(key);
-	return javaObject;
-}
-//FB END
-
-/*
- * Instantiate the named class.
- * If we make it to this point, the class has not yet been instantiated or reflected.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getArrayType(java.lang.String)
- */
-public EClassifier getArrayType(String typeName) {
-	ArrayType arrayType = this.createArrayType();
-	arrayType.setName(typeName);
-	// ((InternalEObject)arrayType).eSetID(typeName);
-	//arrayType.eSetUUID((UUID) null);
-	int pos = -1, braces = 0;
-	do {
-		pos = typeName.indexOf("[", pos+1);//$NON-NLS-1$
-		if (pos != -1)
-			braces++;
-	} while (pos != -1);
-	arrayType.setArrayDimensions(braces);
-	//arrayType.setEPackage(getPackage());
-	getPackage().getEClassifiers().add(arrayType);
-	resource.setID(arrayType, typeName);	
-	return arrayType;
-}
-/*
- * Instantiate the named class.
- * If we make it to this point, teh class has not yet been instantiated or reflected.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getJavaClass(java.lang.String)
- */
-public EClassifier getJavaClass(String typeName) {
-	JavaClass javaClass = this.createJavaClass();
-	javaClass.setName(typeName);
-	// ((InternalEObject)javaClass).eSetID(javaClass.getName());
-	//javaClass.eSetUUID((UUID) null);
-	// javaClass.setEPackage(getPackage());
-	getPackage().getEClassifiers().add(javaClass);
-	resource.setID(javaClass, typeName);
-	return javaClass;
-}
-/* Get the Java Factory
- */
-protected static JavaRefFactory getJavaFactory() {
-	return JavaRefFactory.eINSTANCE;
-}
-/**
- * This allows for the direct retrieval of fields with the following notation:
- * field: java:/com.ibm.foo#Test.foo
- * 
- */
-protected Field getJavaField(String keyValue) {
-	Field result = null;
-	String className, memberName;
-	int memberDelimiter = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-	className = keyValue.substring(0, memberDelimiter);
-	memberName = keyValue.substring(memberDelimiter + 1);
-	EClassifier javaClass = (EClassifier) primGet(className);
-	// if we haven't already instantiated the containing class, then go do it.
-	if (javaClass == null)
-		javaClass = getJavaType(className);
-	if ((javaClass != null) && !((JavaHelpers) javaClass).isPrimitive()) {
-		// We have a class. Now we need to force reflection, this will cause
-		// the JavaReflectionKey to be updated and have the member added to the
-		// list.
-		((JavaClass) javaClass).getFields();
-		//FB result = (Field) super.get(keyValue); // It should now be registered.
-		result = (Field) primGet(keyValue); // It should now be registered.
-		
-		if (result == null) {
-			Field tempField = createJavaField();
-			tempField.setName(memberName);
-			// ((InternalEObject)tempField).eSetID(keyValue);
-			//tempField.eSetUUID((UUID) null);
-			((JavaClass) javaClass).getFields().add(tempField);
-			result = tempField;
-		}
-	}
-	return result;
-}
-/**
- * This allows for the retrieval of methods with the following notation:
- * method: java:/com.ibm.foo#Test.foofoo(
- * 
- */
-protected Method getJavaMethod(String keyValue) {
-	Method result = null;
-	String className, memberName;
-	int memberDelimiter = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-	className = keyValue.substring(0, memberDelimiter);
-	int parmDelimiter = keyValue.indexOf(ReflectionAdaptor.C_METHOD_PARM_DELIMITER, memberDelimiter);
-	memberName = keyValue.substring(memberDelimiter + 1, parmDelimiter);
-	EClassifier javaClass = (EClassifier) primGet(className);
-	// if we haven't already instantiated the containing class, then go do it.
-	if (javaClass == null)
-		javaClass = getJavaType(className);
-	if ((javaClass != null) && !((JavaHelpers) javaClass).isPrimitive()) {
-		// We have a class. Now we need to force reflection, this will cause
-		// the JavaReflectionKey to be updated and have the member added to the
-		// list.
-		((JavaClass) javaClass).getMethods();
-		result = (Method) primGet(keyValue); // It should now be registered.
-		
-		if (result == null) {
-			Method tempMethod = createJavaMethod();
-			tempMethod.setName(memberName);
-			resource.setID(tempMethod, keyValue);
-			((JavaClass) javaClass).getMethods().add(tempMethod);
-			result = tempMethod;
-		}
-	}
-	return result;
-}
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getJavaObject(java.lang.String)
- */
-public EObject getJavaObject(String keyValue) {
-	EObject result = null;
-	int index = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-	if (index > 0) {
-		// The reference is to a member: field, method, or parameter.
-		// Take the most specific case first, a parameter.
-		// Only a parameter should contain the methodID to parmID delimiter.
-		boolean isParameter = (keyValue.indexOf(ReflectionAdaptor.C_METHODID_PARMID_DELIMITER, index) != -1);
-		if (isParameter) {
-			result = getJavaParameter(keyValue);
-		} else {
-			// The target is a field or method. If it has a "(", then it is a method.
-			// If it is not found, then we will create a temporary object.
-			int parmStart = keyValue.indexOf(ReflectionAdaptor.C_METHOD_PARM_DELIMITER, index);
-			boolean isField = parmStart == -1;
-			if (isField) {
-				result = getJavaField(keyValue);
-			} else {
-				result = getJavaMethod(keyValue);
-			}
-		}
-	} else {
-		result = getJavaType(keyValue);
-	}
-	return result;
-}
-
-/**
- * See if the extensions can resolve this first.
- */
-protected Object getObjectFromExtensions(String keyValue) {
-	if (extensions != null) {
-		for (Iterator iter = extensions.iterator(); iter.hasNext();) {
-			IJavaReflectionKeyExtension extension = (IJavaReflectionKeyExtension) iter.next();
-			Object obj = extension.getObject(keyValue, this);
-			if (obj != null)
-				return obj;
-		}
-	}
-
-	return null;
-}
-/**
- * This allows for the retrieval of parameters with the following notation:
- * parameter: java:/com.ibm.foo#Test.foofoo(-arg0
- * 
- */
-protected JavaParameter getJavaParameter(String keyValue) {
-	JavaParameter result = null;
-	String parmName;
-	int memberDelimiter = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-	int parmDelimiter = keyValue.indexOf(ReflectionAdaptor.C_METHODID_PARMID_DELIMITER, memberDelimiter);
-	parmName = keyValue.substring(parmDelimiter + 1);
-	// getMethod() will find or create a method
-	Method method = this.getJavaMethod(keyValue.substring(parmDelimiter));
-	if (method != null) {
-		result = method.getParameter(parmName);
-		if (result == null) {
-			JavaParameter tempParameter = createJavaParameter();
-			tempParameter.setName(parmName);
-			// ((InternalEObject)tempParameter).eSetID(keyValue);
-			// tempParameter.eSetUUID((UUID) null);
-			method.getParameters().add(tempParameter);
-			result = tempParameter;
-		}
-	}
-	return result;
-}
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getJavaType(java.lang.String)
- */
-public EClassifier getJavaType(String typeName) {
-	if (isPrimitive(typeName))
-		return getJavaDataType(typeName);
-	else if (isArray(typeName))
-		return getArrayType(typeName);
-	else if (isValidJavaIdentifier(typeName))
-		return getJavaClass(typeName);
-	return null;
-}
-
-protected boolean isValidJavaIdentifier(String typeName) {
-	if (typeName.length() > 0) {
-		StringIterator charIter = new StringIterator(typeName);
-		if (CharacterUtil.isJavaIdentifierStart(charIter.next())) {
-			// Starts with a valid java identifier character.
-			// Now see if the rest are valid.
-			while (charIter.hasNext()) {
-				if (!CharacterUtil.isJavaIdentifierPart(charIter.next()))
-					return false; // Not valid
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#primGet(java.lang.String)
- */
-public Object primGet(String key) {
-	return resource.primGetEObject(key);
-}
-protected EPackage getPackage() {
-	//FB return (EPackage) super.get(JavaPackage.PACKAGE_ID);
-	// return (EPackage) resource.getEObject(JavaPackage.PACKAGE_ID); //FB
-	//return (EPackage) resource.getEObject(JavaPackage.PACKAGE_ID); //FB
-	return (EPackage)EcoreUtil.getObjectByType(resource.getContents(), EcorePackage.eINSTANCE.getEPackage());
-}
-/**
- * Insert the method's description here.
- * Creation date: (10/4/2000 9:56:53 AM)
- */
-private static void initializePrimitivesCollection() {
-	PRIMITIVES.add(N_VOID);
-	PRIMITIVES.add(N_BOOLEAN);
-	PRIMITIVES.add(N_BYTE);
-	PRIMITIVES.add(N_CHAR);
-	PRIMITIVES.add(N_DOUBLE);
-	PRIMITIVES.add(N_FLOAT);
-	PRIMITIVES.add(N_INT);
-	PRIMITIVES.add(N_LONG);
-	PRIMITIVES.add(N_SHORT);
-}
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#isArray(java.lang.String)
- */
-public boolean isArray(String typeName) {
-	return typeName.endsWith("[]");//$NON-NLS-1$
-}
-/**
- * Insert the method's description here.
- * Creation date: (10/4/2000 9:54:23 AM)
- * @return boolean
- * @param typeName java.lang.String
- */
-private boolean isPrimitive(String typeName) {
-	return PRIMITIVES.contains(typeName);
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java
deleted file mode 100644
index 0fda308d7..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaXMIFactoryImpl.java,v $
- *  $Revision: 1.8 $  $Date: 2005/09/14 23:30:35 $ 
- */
-import java.io.IOException;
-import java.util.*;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.adapters.*;
-import org.eclipse.jem.java.internal.impl.JavaFactoryImpl;
-
-/**
- * Factory to create the Resource for the Java protocol.
- * 
- * It allows extensions to the reflection key to be registered with it.
- * 
- * Creation date: (10/4/2000 8:22:23 AM)
- * @author: Administrator
- */
-public class JavaXMIFactoryImpl extends XMIResourceFactoryImpl implements JavaXMIFactory {
-	private static final String SCHEMA_SEPERATOR = ":/"; //$NON-NLS-1$
-	protected List extensions = new ArrayList();
-
-	/**
-	 * JavaXMIFactoryImpl constructor comment.
-	 */
-	public JavaXMIFactoryImpl() {
-		super();
-	}
-
-	
-	public void registerReflectionKeyExtension(IJavaReflectionKeyExtension extension) {
-		extensions.add(extension);
-	}
-
-	
-	public void deregisterReflectionKeyExtension(IJavaReflectionKeyExtension extension) {
-		extensions.remove(extension);
-	}
-
-	protected void createJavaPackage(String packageName, String xmiuri, Resource resource) {
-		// changed to allow a zero-length package name 
-		// for the special case of "java:/#int", etc.
-		JavaRefFactory jfac = JavaRefFactory.eINSTANCE;
-		JavaPackage pack = jfac.createJavaPackage();
-		// Need to create and add special JavaFactory for instantiation to work.
-		JavaFactoryImpl fact = new JavaFactoryImpl();
-		pack.setEFactoryInstance(fact);
-		if (packageName.length() > 0) {
-			// Standard Java package
-			pack.setNsPrefix(packageName);
-			pack.setName(packageName);
-		} else {
-			// Primitive package
-			pack.setNsPrefix(JavaPackage.PRIMITIVE_PACKAGE_NAME);
-			pack.setName(JavaPackage.PRIMITIVE_PACKAGE_NAME);
-		}
-
-		pack.setNsURI(xmiuri);
-		resource.getContents().add(pack);
-		((XMIResource) pack.eResource()).setID(pack, JavaPackage.PACKAGE_ID);
-	}
-	public static class JavaXMIResource extends XMIResourceImpl {
-		protected IJavaReflectionKey reflectionKey;
-
-		public JavaXMIResource(URI uri) {
-			super(uri);
-		}
-
-		public void setReflectionKey(IJavaReflectionKey key) {
-			reflectionKey = key;
-		}
-
-		public void load(Map options) throws IOException {
-			try {
-				super.load(options);
-			} catch (Exception exception) {
-			}
-		}
-
-		public EObject getEObject(String uriFragment) {
-			EObject result = super.getEObject(uriFragment);
-			if (result == null && reflectionKey != null) {
-				result = (EObject) reflectionKey.get(uriFragment);
-			}
-			return result;
-		}
-		
-		/**
-		 * Used by JavaReflectionKey to look directly into ID table to bypass an infinite loop. It will 
-		 * call here because it may not of first been found, but then added, so now is found.
-		 * 
-		 * @param uriFragment
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		EObject primGetEObject(String uriFragment) {
-			return super.getEObject(uriFragment);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#useIDAttributes()
-		 */
-		protected boolean useIDAttributes() {
-			return false;
-		}
-
-	}
-
-	public Resource createResource(URI uri) {
-		JavaXMIResource resource = new JavaXMIResource(uri);
-		resource.setReflectionKey(new JavaReflectionKey(extensions, resource));
-
-		String uriString = uri.toString();
-		createJavaPackage(stripScheme(uriString), uriString, resource);
-
-		return resource;
-	}
-
-	public static void register() {
-		Resource.Factory.Registry.INSTANCE.getProtocolToFactoryMap().put(JavaXMIFactory.SCHEME, JavaXMIFactory.INSTANCE);
-	}
-
-	/**
-	 * Strip the trailing identifier, if any, from the uri.  An identifier
-	 * begins with # or |.
-	 */
-	private String stripScheme(String uri) {
-		int index = uri.indexOf(SCHEMA_SEPERATOR);
-		if (index != -1)
-			return uri.substring(index + SCHEMA_SEPERATOR.length(), uri.length());
-		else
-			return uri;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java
deleted file mode 100644
index e6f02d9d4..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: ReadAdaptor.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:25 $ 
- */
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * Extended Adaptor interface which adds support for an adapter
- * providing default values for attributes.
- * Creation date: (6/6/2000 4:41:19 PM)
- * @author: Scott Rich
- */
-public interface ReadAdaptor extends org.eclipse.emf.common.notify.Adapter {
-	public static final String TYPE_KEY = "JavaReflection"; //$NON-NLS-1$
-	public Object getValueIn(EObject object, EObject attribute);
-	public boolean reflectValuesIfNecessary(); //FB
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java
deleted file mode 100644
index e9df6b021..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: ReflectionAdaptor.java,v $
- *  $Revision: 1.14 $  $Date: 2006/05/17 20:13:07 $ 
- */
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-/**
- * ReflectionAdaptor - a read adaptor base implementation which does a bulk
- * 	load of relflected values on the first request.
- * 	Subclasses can optimize to defer some properties.
- * 	Properties may also be deferred by setting their values with proxy references,
- * 	for example, for supertype and other referenced types.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class ReflectionAdaptor extends org.eclipse.emf.common.notify.impl.AdapterImpl implements ReadAdaptor {
-	public static final char C_CLASS_MEMBER_DELIMITER = '.';
-	public static final char C_METHOD_PARM_DELIMITER = '(';
-	public static final char C_METHODID_PARMID_DELIMITER = '-';
-	public static final char C_PARM_PARM_DELIMITER = ',';
-	public static final char PATH_DELIMITER = '/';
-	// SW id contains & in xml file casues exception throw during load
-        // public static final String S_CONSTRUCTOR_TOKEN = "&V";//$NON-NLS-1$
-	public static final String S_CONSTRUCTOR_TOKEN = "_V";//$NON-NLS-1$ // SW
-	// cache a static empty String[] for no parm methods
-	protected static String[] emptyStringArray = new String[0];
-	
-	
-	/**
-	 * Notification event type for special Reflection notifications. This will be the event type for the special ones, like REFLECTION_EVENT.
-	 * The listener should listen for this event type, and then check the feature for the type of special event (like REFLECTION_EVENT).
-	 * @since 1.1.0
-	 */
-	public static final int EVENT = -3456;	// Using a funny number to try to eliminate confliction with any other specials that may of occur from other code on the JavaClass.
-	
-	/**
-	 * Special notification event type. This is sent against a JavaClass (as the target) whenever reflection occurs. It will be
-	 * sent under the notification event type of REFLECTION_EVENT.
-	 * @since 1.1.0
-	 */
-	public static final EAttribute REFLECTION_EVENT = EcoreFactory.eINSTANCE.createEAttribute();
-
-	/*
-	 * Fill in the name. Not really needed but it would be nice.
-	 */
-	static {REFLECTION_EVENT.setName("reflectValues");} //$NON-NLS-1$
-	
-	protected boolean hasReflected = false;
-	protected boolean isReflecting = false;
-public ReflectionAdaptor() {
-	super();
-}
-public ReflectionAdaptor(Notifier target) {
-	super();
-	setTarget(target);
-}
-/**
- * Helper method to ensure full initialization of the target.  Required
- * for serialization.
- */
-public static void forceDeferredReadFor(EObject target) {
-	ReflectionAdaptor adaptor = retrieveAdaptorFrom(target);
-	if (adaptor != null) {
-		adaptor.reflectValuesIfNecessary();
-	}
-}
-protected Resource getTargetResource() {
-	if (getTarget() != null)
-		return ((org.eclipse.emf.ecore.EObject) getTarget()).eResource();
-	return null;
-}
-/**
- * Helper method to fetch the adaptor from the object, and if it exists, get the adapted
- * value for the attribute.  Overloaded for many-sided attributes where the return value would
- * otherwise be an enumeration; in this case will return an Array instead. 
- */
-public static Object getValue(EObject object, EReference attribute) {	
-//FB	ReflectionAdaptor adaptor = retrieveAdaptorFrom(object);
-//FB	if (adaptor != null)
-//FB		return adaptor.getValueIn(object, attribute);
-//FB	return ((IReadAdaptable) object).primRefValue(attribute);
-	return object.eGet(attribute); //FB
-	
-}
-/*Helper method to fetch the adaptor from the object, and if it exists, get the adapted
- *value for the attribute.
- */
-public static Object getValue(EObject object, EObject attribute) {	
-//FB	ReflectionAdaptor adaptor = retrieveAdaptorFrom(object);
-//FB	if (adaptor != null)
-//FB		return adaptor.getValueIn(object, attribute);
-//FB	return ((IReadAdaptable) object).primRefValue(attribute);
-	return object.eGet((EStructuralFeature)attribute); //FB
-}
-/**
- * getValueIn method comment.
- */
-public Object getValueIn(EObject object, EObject attribute) {
-//FB	reflectValuesIfNecessary();
-//FB	return ((IReadAdaptable) object).primRefValue(attribute);
-	return object.eGet((EStructuralFeature)attribute); //FB
-}
-/**
- * isAdaptorForType method comment.
- */
-public boolean isAdapterForType(Object type) {
-	return (type == ReadAdaptor.TYPE_KEY);
-}
-/**
- * reflectValues - template method, subclasses override to pump values into target
- */
-public abstract boolean reflectValues();
-/**
- * Return a boolean indicating whether reflection had occurred.
- */
-public synchronized boolean reflectValuesIfNecessary() {
-	if (!hasReflected && !isReflecting) {
-		try {
-			isReflecting = true;
-			EObject etarget = (EObject)getTarget();
-			if (!etarget.eIsProxy() && etarget.eResource() != null && etarget.eResource().getResourceSet() != null)
-				hasReflected = reflectValues();
-			else
-				hasReflected = false;	// AS long we are a proxy or is not in a valid resource or set, we won't reflect.
-		} catch (Throwable e) {
-			hasReflected = false;
-			Logger logger = Logger.getLogger();
-			if (logger.isLoggingLevel(Level.WARNING)) {
-				logger.log(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), Level.WARNING); //$NON-NLS-1$ = "Failed reflecting values!!!"
-				logger.logWarning(e);
-			}
-		} finally {
-			isReflecting = false;
-			getTarget().eNotify(new ENotificationImpl((InternalEObject)getTarget(), EVENT, REFLECTION_EVENT, null, null, Notification.NO_INDEX));
-		}
-	}
-	return hasReflected;
-}
-public static ReflectionAdaptor retrieveAdaptorFrom(EObject object) {
-	synchronized (object) {
-		return (ReflectionAdaptor)EcoreUtil.getRegisteredAdapter(object, ReadAdaptor.TYPE_KEY);
-	}
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java
deleted file mode 100644
index 6e423e81e..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java
+++ /dev/null
@@ -1,320 +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.jem.internal.java.adapters.jdk;
-/*
- *  $RCSfile: JDKAdaptor.java,v $
- *  $Revision: 1.7 $  $Date: 2005/08/24 20:20:25 $ 
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class JDKAdaptor extends JavaReflectionAdaptor {
-	public JavaJDKAdapterFactory adapterFactory;
-	public JDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
-		super(target);
-		setAdapterFactory(anAdapterFactory);
-	}
-	/**
-	 * computeMethodID - generate the unique ID to be used to identify a constructor.
-	 * Similar to a Signature, but hopefully more readable.
-	 * The name format will be:
-	 * 	simpleClassName.simpleClassName(com.fronk.ParmType1_parmType2&V
-	 * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
-	 *
-	 * It has to be done separately for JDK because Constructors and Methods are different classes.
-	 * However, in the Java Model they are both just Methods with a flag indicating Constructor.
-	 */
-	public static String computeMethodID(java.lang.reflect.Constructor jdkConstructor) {
-		StringBuffer out = new StringBuffer();
-		String className = getSimpleName(jdkConstructor.getDeclaringClass().getName());
-		out.append(className);
-		out.append(C_CLASS_MEMBER_DELIMITER);
-		out.append(computeMethodName(jdkConstructor));
-		out.append(C_METHOD_PARM_DELIMITER);
-		Class[] parmTypes = jdkConstructor.getParameterTypes();
-		for (int i = 0; i < parmTypes.length; i++) {
-			out.append(parmTypes[i].getName());
-			if (i < parmTypes.length - 1)
-				out.append(C_PARM_PARM_DELIMITER);
-		}
-		out.append(S_CONSTRUCTOR_TOKEN); //It's a constructor
-		return out.toString();
-	}
-	/**
-	 * computeMethodID - generate the unique ID to be used to identify a method.
-	 * Similar to a Signature, but hopefully more readable.
-	 * If there are no parms, it will end with a "(" so that it can be distictive from a field.
-	 * The name format will be:
-	 * 	simpleClassName.methodName(com.fronk.ParmType1_parmType2
-	 * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
-	 */
-	public static String computeMethodID(java.lang.reflect.Method jdkMethod) {
-		StringBuffer out = new StringBuffer();
-		String className = getSimpleName(jdkMethod.getDeclaringClass().getName());
-		out.append(className);
-		out.append(C_CLASS_MEMBER_DELIMITER);
-		out.append(computeMethodName(jdkMethod));
-		out.append(C_METHOD_PARM_DELIMITER);
-		Class[] parmTypes = jdkMethod.getParameterTypes();
-		for (int i = 0; i < parmTypes.length; i++) {
-			out.append(parmTypes[i].getName());
-			if (i < parmTypes.length - 1)
-				out.append(C_PARM_PARM_DELIMITER);
-		}
-		if (jdkMethod.getDeclaringClass().getName().equals(jdkMethod.getName()))
-			out.append(S_CONSTRUCTOR_TOKEN); //It's a constructor
-		return out.toString();
-	}
-	/**
-	 * computeMethodName - generate the name to be used to identify a constructor.
-	 * For the moment, names are simple, and UUID's are complex.
-	 *
-	 * It has to be done separately for JDK because Constructors and Methods are different classes.
-	 * However, in the Java Model they are both just Methods with a flag indicating Constructor. 
-	 */
-	public static String computeMethodName(java.lang.reflect.Constructor jdkConstructor) {
-		return getSimpleName(jdkConstructor.getName()); // CTOR names come back fully-qualified with package.
-	}
-	/**
-	 * computeMethodName - generate the name to be used to identify a method.
-	 * For the moment, names are simple, and UUID's are complex.
-	 */
-	public static String computeMethodName(java.lang.reflect.Method jdkMethod) {
-		return jdkMethod.getName();
-	}
-	/**
-	 * createJavaField - instantiate a Java Field based on the passed Field
-	 * We are deferring field contents assuming that its adaptor will reflect its details.
-	 */
-	public Field createJavaField(java.lang.reflect.Field reflectedField, XMIResource resource) {
-		Field newField = getJavaFactory().createField();
-		newField.setName(reflectedField.getName());
-		String className = getSimpleName(reflectedField.getDeclaringClass().getName());
-		resource.setID(newField, className + C_CLASS_MEMBER_DELIMITER + reflectedField.getName());
-		return newField;
-	}
-	/**
-	 * createJavaMethod - instantiate a Java Method based on the passed Java Reflection Constructor
-	 * We are deferring method contents assuming that its adaptor will reflect its details.
-	 * We need to store enough info in the empty Method to find its Java source.
-	 * The ID will eventually hold enough info to identify the source, so we use it.
-	 */
-	public Method createJavaMethod(java.lang.reflect.Constructor jdkConstructor, XMIResource resource) {
-		Method newMethod = getJavaFactory().createMethod();
-		// We use a simple name, but a complex ID 
-		newMethod.setName(computeMethodName(jdkConstructor));
-		resource.setID(newMethod, computeMethodID(jdkConstructor));
-		return newMethod;
-	}
-	/**
-	 * createJavaMethod - instantiate a Java Method based on the passed Java Reflection Method
-	 * We are deferring method contents assuming that its adaptor will reflect its details.
-	 * We need to store enough info in the empty Method to find its Java source.
-	 * The ID will eventually hold enough info to identify the source, so we use it.
-	 */
-	public Method createJavaMethod(java.lang.reflect.Method jdkMethod, XMIResource resource) {
-		Method newMethod = getJavaFactory().createMethod();
-		// We use a simple name, but a complex ID 
-		newMethod.setName(computeMethodName(jdkMethod));
-		resource.setID(newMethod, computeMethodID(jdkMethod));
-		return newMethod;
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (11/07/00 3:43:55 PM)
-	 * @return org.eclipse.jem.java.adapters.JavaJDKAdapterFactory
-	 */
-	public JavaJDKAdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-	public ClassLoader getAlternateClassLoader() {
-		return getAdapterFactory().getContextClassLoader();
-	}
-	/*****************************************************************************
-	* Method to convert the textual form of a primitive type into its Class object
-	*
-	* @param type The primitive type's textual representation
-	*/
-	public static Class getPrimitiveType(String type) {
-		Class c = null;
-
-		if (type.equals(byte.class.getName())) {
-			c = byte.class;
-		} else if (type.equals(short.class.getName())) {
-			c = short.class;
-		} else if (type.equals(int.class.getName())) {
-			c = int.class;
-		} else if (type.equals(long.class.getName())) {
-			c = long.class;
-		} else if (type.equals(float.class.getName())) {
-			c = float.class;
-		} else if (type.equals(double.class.getName())) {
-			c = double.class;
-		} else if (type.equals(boolean.class.getName())) {
-			c = boolean.class;
-		} else if (type.equals(char.class.getName())) {
-			c = char.class;
-		} else if (type.equals(void.class.getName())) {
-			c = void.class;
-		}
-
-		return c;
-	}
-	/**
-	 * Returns the last segment of a '.'-separated qualified name.
-	 * Returns the given name if it is not qualified.
-	 * For example:
-	 * <pre>
-	 * getSimpleName("java.lang.Object") -> "Object"
-	 * </pre>
-	 */
-	public static String getSimpleName(String name) {
-		int lastDot = name.lastIndexOf('.');
-		if (lastDot == -1)
-			return name;
-		return name.substring(lastDot + 1);
-	}
-	public Class getType(JavaHelpers modelClass) {
-		Class result = null;
-		if (modelClass.isArray()) {
-			ArrayType arrayType = (ArrayType) modelClass;
-			Class componentClass = getType(arrayType.getFinalComponentType());
-			result = (Array.newInstance(componentClass, new int[arrayType.getArrayDimensions()])).getClass();
-		} else if (modelClass.isPrimitive()) {
-			result = getType(modelClass.getQualifiedName());
-		} else {
-			result = getType(((JavaClass) modelClass).getQualifiedNameForReflection());
-		}
-		return result;
-	}
-	public Class getType(String qualifiedName) {
-		// Try for a primitive type ("int","char",etc.) first
-		Class primType = getPrimitiveType(qualifiedName);
-		if (primType == null) {
-			// Changed for defect #212147 botp@ausaix19.austin.ibm.com@7630 system.
-			//
-			// Search only one of the following classloaders (the first one that exists) in this order. If not found
-			// in a classloader, it will not roll-over to another class loader. This is to avoid problems where a
-			// class may exist in more than one classloader. You get errors when this happens due to one class that
-			// was found in only one classloader that refers to another class that was found in both classloaders.
-			// They don't match when trying to reflect later.
-			// 1) Alternate classloader (if exists)
-			// 2) Thread context classloader (if exists)
-			// 3) System classloader (if exists)
-			// 4) Class.forName().
-			if (getAlternateClassLoader() != null) {
-				try {
-					return getAlternateClassLoader().loadClass(qualifiedName);
-				} catch (ClassNotFoundException cnf2) {
-					return null;
-				}
-			}
-			
-			ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-			if (contextClassLoader != null) {
-				try {
-					return contextClassLoader.loadClass(qualifiedName);
-				} catch (ClassNotFoundException e) {
-					return null;
-				}
-			}
-			
-			ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
-			if (systemClassLoader != null) {
-				try {
-					return systemClassLoader.loadClass(qualifiedName);
-				} catch (ClassNotFoundException e) {
-					return null;
-				}
-			}
-			
-			try {
-				return Class.forName(qualifiedName);
-			} catch (ClassNotFoundException e) {
-				return null;
-			}
-		} else
-			return primType;
-	}
-	/*
-	 * Utility routine to paper over array type names
-	 * Borrowed from a package-visibility helper on java.lang.reflect.Field
-	 */
-	static String getTypeName(Class type) {
-		if (type.isArray()) {
-			try {
-				Class cl = type;
-				int dimensions = 0;
-				while (cl.isArray()) {
-					dimensions++;
-					cl = cl.getComponentType();
-				}
-				StringBuffer sb = new StringBuffer();
-				sb.append(cl.getName());
-				for (int i = 0; i < dimensions; i++) {
-					sb.append("[]"); //$NON-NLS-1$
-				}
-				return sb.toString();
-			} catch (Throwable e) { /*FALLTHRU*/
-			}
-		}
-		return type.getName();
-	}
-
-	/*****************************************************************************
-	* Method to convert the textual form of a primitive type into its Class object
-	*
-	* @param type The primitive type's textual representation
-	*/
-	public static Class primitiveForName(String type) {
-		Class c = null;
-
-		if (type.equals(byte.class.getName())) {
-			c = byte.class;
-		} else if (type.equals(short.class.getName())) {
-			c = short.class;
-		} else if (type.equals(int.class.getName())) {
-			c = int.class;
-		} else if (type.equals(long.class.getName())) {
-			c = long.class;
-		} else if (type.equals(float.class.getName())) {
-			c = float.class;
-		} else if (type.equals(double.class.getName())) {
-			c = double.class;
-		} else if (type.equals(boolean.class.getName())) {
-			c = boolean.class;
-		} else if (type.equals(char.class.getName())) {
-			c = char.class;
-		} else if (type.equals(void.class.getName())) {
-			c = void.class;
-		}
-
-		return c;
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (11/07/00 3:43:55 PM)
-	 * @param newAdapterFactory org.eclipse.jem.java.adapters.JavaJDKAdapterFactory
-	 */
-	public void setAdapterFactory(JavaJDKAdapterFactory newAdapterFactory) {
-		adapterFactory = newAdapterFactory;
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java
deleted file mode 100644
index 241b69fa0..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JavaClassJDKAdaptor.java,v $
- *  $Revision: 1.15 $  $Date: 2005/12/01 22:02:00 $ 
- */
-
-package org.eclipse.jem.internal.java.adapters.jdk;
-
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Reflect the class using standard java.reflect methods.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaClassJDKAdaptor extends JDKAdaptor implements IJavaClassAdaptor {
-
-	protected Class sourceType = null;
-
-	public JavaClassJDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
-		super(target, anAdapterFactory);
-	}
-
-	/**
-	 * addFields - reflect our fields
-	 */
-	protected void addFields() {
-		XMIResource resource = (XMIResource) getJavaClassTarget().eResource();
-		List targetFields = getJavaClassTarget().getFieldsGen();
-		targetFields.clear();
-		java.lang.reflect.Field[] fields = {};
-		try {
-			fields = getSourceType().getDeclaredFields();
-		} catch (NoClassDefFoundError error) {
-			System.out.println(ResourceHandler.getString(
-					"Could_Not_Reflect_Fields_ERROR_", new Object[] { getJavaClassTarget().getQualifiedName(), error.getMessage()})); //$NON-NLS-1$
-		}
-		for (int i = 0; i < fields.length; i++) {
-			targetFields.add(createJavaField(fields[i], resource));
-		}
-	}
-
-	/**
-	 * addMethods - reflect our methods
-	 */
-	protected void addMethods() {
-		// We need to first do methods and then do constructors because the JDK treats them as two
-		// different objects, which the Java Model treats them as both Method's.
-		XMIResource resource = (XMIResource) getJavaClassTarget().eResource();
-		List targetMethods = getJavaClassTarget().getMethodsGen();
-		targetMethods.clear();
-		java.lang.reflect.Method[] methods = {};
-		try {
-			methods = getSourceType().getDeclaredMethods();
-		} catch (NoClassDefFoundError error) {
-			Logger logger = Logger.getLogger();
-			if (logger.isLoggingLevel(Level.WARNING)) {
-				logger
-						.log(
-								ResourceHandler
-										.getString(
-												"Could_Not_Reflect_Methods_ERROR_", new Object[] { getJavaClassTarget().getQualifiedName(), error.toString()}), Level.WARNING); //$NON-NLS-1$
-			}
-		}
-		for (int i = 0; i < methods.length; i++) {
-			targetMethods.add(createJavaMethod(methods[i], resource));
-		}
-
-		// Now do the constructors
-		java.lang.reflect.Constructor[] ctors = {};
-		try {
-			ctors = getSourceType().getDeclaredConstructors();
-		} catch (NoClassDefFoundError error) {
-			Logger logger = Logger.getLogger();
-			if (logger.isLoggingLevel(Level.WARNING)) {
-				logger
-						.log(
-								ResourceHandler
-										.getString(
-												"Could_Not_Reflect_Constructors_ERROR_", new Object[] { getJavaClassTarget().getQualifiedName(), error.getMessage()}), Level.WARNING); //$NON-NLS-1$
-			}
-		}
-		for (int i = 0; i < ctors.length; i++) {
-			targetMethods.add(createJavaMethod(ctors[i], resource));
-		}
-
-	}
-
-	/**
-	 * Clear the reflected fields list.
-	 */
-	protected boolean flushFields() {
-		getJavaClassTarget().getFieldsGen().clear();
-		return true;
-	}
-
-	/**
-	 * Clear the implements list.
-	 */
-	protected boolean flushImplements() {
-		getJavaClassTarget().getImplementsInterfacesGen().clear();
-		return true;
-	}
-
-	/**
-	 * Clear the reflected methods list.
-	 */
-	protected boolean flushMethods() {
-		getJavaClassTarget().getMethodsGen().clear();
-		return true;
-	}
-
-	protected boolean flushInnerClasses() {
-		getJavaClassTarget().getDeclaredClassesGen().clear();
-		return true;
-	}
-
-	protected boolean flushModifiers() {
-		JavaClass javaClassTarget = (JavaClass) getTarget();
-		javaClassTarget.setAbstract(false);
-		javaClassTarget.setFinal(false);
-		javaClassTarget.setPublic(false);
-		javaClassTarget.setKind(TypeKind.UNDEFINED_LITERAL);
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jem.java.adapters.JavaReflectionAdaptor#flushReflectedValues(boolean)
-	 */
-	protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-		boolean result = flushModifiers();
-		result &= flushSuper();
-		result &= flushImplements();
-		result &= flushMethods();
-		result &= flushFields();
-		result &= flushInnerClasses();
-		return result;
-	}
-
-	/**
-	 * @see org.eclipse.jem.java.adapters.JavaReflectionAdaptor#postFlushReflectedValuesIfNecessary()
-	 */
-	protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
-		getJavaClassTarget().setReflected(false);
-		super.postFlushReflectedValuesIfNecessary(isExisting);
-	}
-
-	/**
-	 * Set the supertype to be null.
-	 */
-	protected boolean flushSuper() {
-		List targetSupers = getJavaClassTarget().primGetESuperTypes();
-		targetSupers.clear();
-		return true;
-	}
-
-	/**
-	 * Return the target typed to a JavaClass.
-	 */
-	protected JavaClassImpl getJavaClassTarget() {
-		return (JavaClassImpl) getTarget();
-	}
-
-	public Object getReflectionSource() {
-		return getSourceType();
-	}
-    /* (non-Javadoc)
-     * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
-     */
-    public boolean hasCachedReflectionSource() {
-        return sourceType != null;
-    }
-
-	/**
-	 * getSourceType - return the java.lang.Class which describes our existing Java class
-	 */
-	protected Class getSourceType() {
-		if (sourceType == null) {
-			sourceType = getType((JavaClass) getTarget());
-		}
-		return sourceType;
-	}
-
-	/**
-	 * getValueIn method comment.
-	 */
-	public Object getValueIn(EObject object, EObject attribute) {
-		// At this point, this adapter does not dynamically compute any values,
-		// all values are pushed back into the target on the initial call.
-		return super.getValueIn(object, attribute);
-	}
-
-	/**
-	 * Return true if the sourceType is null or if it is a binary type. Reflection from the JDK is always from binary.
-	 */
-	public boolean isSourceTypeFromBinary() {
-		return true;
-	}
-
-	/**
-	 * reflectValues - template method, subclasses override to pump values into target. on entry: name, containing package (and qualified name), and
-	 * document must be set. Return true if successful JavaClass adaptor: - set modifiers - set name - set reference to super - create methods -
-	 * create fields - add imports
-	 */
-	public boolean reflectValues() {
-		super.reflectValues();
-		try {
-			if (getSourceType() != null) {
-				setModifiers();
-				setNaming();
-				try {
-					setSuper();
-				} catch (InheritanceCycleException e) {
-					Logger.getLogger().log(e);
-				}
-				setImplements();
-				addMethods();
-				addFields();
-				reflectInnerClasses();
-				setDeclaringClass();
-				getAdapterFactory().registerReflection(getSourceType().getName(), this);
-				//	addImports();
-				return true;
-			}
-			return false;
-		} finally {
-			//Don't cache the class beyond the operation of reflect values;
-			//this enables dynamic swapping of the alternate class loader
-			//for java reflection, as well as avoids potential memory leakage
-			sourceType = null;
-		}
-	}
-	
-	protected void setDeclaringClass() {
-		Class declaringType = getSourceType().getDeclaringClass();
-		if (declaringType != null) {
-			// Need to get it and reflect it so that the declared type of this target is set correctly. We can just
-			// set it ourselves directly because ECore would try to add it to the list of inner classes of the declaring type. This
-			// would cause it to be added twice, once from the reflection caused by the inverse setting, and once from our doing
-			// the inverse setting itself.
-			ResourceSet set = getTargetResource().getResourceSet();
-			JavaClassImpl declaringClass = (JavaClassImpl) JavaRefFactory.eINSTANCE.reflectType(declaringType.getName(), set);
-			declaringClass.getDeclaredClasses();	// This will cause it to put us into its list and also set our declaring class to this declaring type.
-		}
-	}
-
-	/**
-	 *  
-	 */
-	protected void reflectInnerClasses() {
-		Class[] innerClasses = getSourceType().getClasses();
-		if (innerClasses.length != 0) {
-			List declaredClasses = getJavaClassTarget().getDeclaredClassesGen();
-			JavaClass inner;
-			ResourceSet set = getTargetResource().getResourceSet();
-			for (int i = 0; i < innerClasses.length; i++) {
-				inner = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(innerClasses[i].getName(), set);
-				declaredClasses.add(inner);
-			}
-		}
-
-	}
-
-	/**
-	 * setImplements - set our implemented/super interfaces here For an interface, these are superclasses. For a class, these are implemented
-	 * interfaces.
-	 */
-	protected void setImplements() {
-		Class[] interfaces = getSourceType().getInterfaces();
-		// needs work, the names above will be simple names if we are relfecting from a source file
-		JavaClassImpl javaClassTarget = (JavaClassImpl) getTarget();
-		JavaClass ref;
-		List intList = javaClassTarget.getImplementsInterfacesGen();
-		intList.clear();
-		for (int i = 0; i < interfaces.length; i++) {
-			ref = createJavaClassRef(interfaces[i].getName());
-			intList.add(ref);
-		}
-	}
-
-	/**
-	 * setModifiers - set the attribute values related to modifiers here
-	 */
-	protected void setModifiers() {
-		JavaClass javaClassTarget = (JavaClass) getTarget();
-		javaClassTarget.setAbstract(java.lang.reflect.Modifier.isAbstract(getSourceType().getModifiers()));
-		javaClassTarget.setFinal(java.lang.reflect.Modifier.isFinal(getSourceType().getModifiers()));
-		javaClassTarget.setPublic(java.lang.reflect.Modifier.isPublic(getSourceType().getModifiers()));
-		// Set type to class or interface, not yet handling EXCEPTION
-		if (getSourceType().isInterface())
-			javaClassTarget.setKind(TypeKind.INTERFACE_LITERAL);
-		else
-			javaClassTarget.setKind(TypeKind.CLASS_LITERAL);
-	}
-
-	/**
-	 * setNaming - set the naming values here - qualified name (package name + name) must be set first, that is the path to the real Java class - ID -
-	 * simple name, identity within a package document - NO UUID!!!
-	 */
-	protected void setNaming() {
-		//	JavaClass javaClassTarget = (JavaClass) getTarget();
-		//	javaClassTarget.refSetUUID((String) null);
-		//	((XMIResource)javaClassTarget.eResource()).setID(javaClassTarget,getSimpleName(getSourceType().getName()));
-	}
-
-	/**
-	 * setSuper - set our supertype here, implemented interface are handled separately
-	 */
-	protected void setSuper() throws InheritanceCycleException {
-		Class superClass = null;
-		superClass = getSourceType().getSuperclass();
-		if (superClass != null) {
-			JavaClass javaClassTarget = (JavaClass) getTarget();
-			javaClassTarget.setSupertype(createJavaClassRef(superClass.getName()));
-		}
-	}
-
-	/**
-	 * Return true if the sourceType can be found.
-	 */
-	public boolean sourceTypeExists() {
-		return getSourceType() != null;
-	}
-
-	public boolean reflectFieldsIfNecessary() {
-		return reflectValuesIfNecessary();
-	}
-
-	public boolean reflectMethodsIfNecessary() {
-		return reflectValuesIfNecessary();
-	}
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java
deleted file mode 100644
index fafa6c5b3..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.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.jem.internal.java.adapters.jdk;
-/*
- *  $RCSfile: JavaFieldJDKAdaptor.java,v $
- *  $Revision: 1.7 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaFieldJDKAdaptor extends JDKAdaptor {
-	protected java.lang.reflect.Field sourceField = null;
-	protected Class parentType = null;
-	public JavaFieldJDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
-		super(target, anAdapterFactory);
-	}
-	/**
-	 * getParentType - return the Class which corresponds to our parent JavaClass
-	 * we're going to do this a lot, so cache it.
-	 */
-	protected Class getParentType() {
-		if (parentType == null) {
-			Field targetField = (Field) getTarget();
-			JavaClass parentJavaClass = targetField.getJavaClass();
-			JavaClassJDKAdaptor pa = (JavaClassJDKAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
-			if (pa != null)
-				parentType = pa.getSourceType();
-		}
-		return parentType;
-	}
-	public Object getReflectionSource() {
-		return getSourceField();
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
-     */
-    public boolean hasCachedReflectionSource() {
-        return sourceField != null;
-    }
-	/**
-	 * getSourceField - return the java.lang.reflect.Field which describes our implementing field
-	 */
-	protected java.lang.reflect.Field getSourceField() {
-		if (sourceField == null) {
-			Class parent = this.getParentType();
-			if (parent != null) {
-				try {
-					sourceField = parent.getDeclaredField(((Field) getTarget()).getName());
-				} catch (NoSuchFieldException e) {
-					// OK, carry on
-				}
-			}
-		}
-		return sourceField;
-	}
-	public Field getTargetField() {
-		return (Field) getTarget();
-	}
-	/**
-	 * getValueIn method comment.
-	 */
-	public Object getValueIn(EObject object, EObject attribute) {
-		// At this point, this adapter does not dynamically compute any values,
-		// all values are pushed back into the target on the initial call.
-		return super.getValueIn(object, attribute);
-	}
-	/**
-	 * reflectValues - template method, subclasses override to pump values into target.
-	 * on entry: name, containing package (and qualified name), and document must be set.
-	 * JavaClass adaptor:
-	 *	- set modifiers
-	 *	- set name
-	 * 	- set type
-	 */
-	public boolean reflectValues() {
-		if (getSourceField() != null) {
-			setModifiers();
-			setType();
-			setInitializerIfPossible();
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * Used for the very narrow case of final static Strings
-	 */
-	protected void setInitializerIfPossible() {
-		if (!(getTargetField().isStatic() && getTargetField().isFinal() && "java.lang.String".equals(((JavaHelpers) getTargetField().getEType()).getQualifiedName()))) //$NON-NLS-1$
-			return;
-
-		String value = null;
-		try {
-			value = (String) getSourceField().get(null);
-		} catch (IllegalAccessException ex) {
-			return;
-		}
-
-		if (value == null)
-			return;
-		else
-			value = "\"".concat(value).concat("\""); //$NON-NLS-2$//$NON-NLS-1$
-
-		Block aBlock = createBlock(getTargetField().getName(), value);
-		getTargetField().setInitializer(aBlock);
-	}
-	/**
-	 * setModifiers - set the attribute values related to modifiers here
-	 */
-	protected void setModifiers() {
-		Field javaFieldTarget = (Field) getTarget();
-		// For JDK reflection, I don't think we can set the initializer
-		int modifiers = getSourceField().getModifiers();
-		javaFieldTarget.setStatic(java.lang.reflect.Modifier.isStatic(modifiers));
-		javaFieldTarget.setTransient(java.lang.reflect.Modifier.isTransient(modifiers));
-		javaFieldTarget.setVolatile(java.lang.reflect.Modifier.isVolatile(modifiers));
-		javaFieldTarget.setFinal(java.lang.reflect.Modifier.isFinal(modifiers));
-		// Set visibility
-		if (java.lang.reflect.Modifier.isPublic(modifiers))
-			javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
-		else if (java.lang.reflect.Modifier.isPrivate(modifiers))
-			javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
-		else if (java.lang.reflect.Modifier.isProtected(modifiers))
-			javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
-		else
-			javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
-	}
-	/**
-	 * setType - set our type here
-	 */
-	protected void setType() {
-		String typeName = getTypeName(getSourceField().getType());
-		setFieldType(getTargetField(), typeName);
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.java
deleted file mode 100644
index bf0b5e47c..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.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.jem.internal.java.adapters.jdk;
-/*
- *  $RCSfile: JavaJDKAdapterFactory.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/13/2000 1:20:31 PM)
- * @author: Administrator
- */
-public class JavaJDKAdapterFactory extends JavaReflectionAdapterFactory {
-	protected ClassLoader contextClassLoader;
-	/**
-	 * JavaJDOMAdapterFactory constructor comment.
-	 */
-	public JavaJDKAdapterFactory() {
-		super();
-		//adapterKey = TYPE_NAME;
-	}
-	/**
-	 * JavaJDOMAdapterFactory constructor comment.
-	 */
-	public JavaJDKAdapterFactory(ClassLoader aClassLoader) {
-		this();
-		setContextClassLoader(aClassLoader);
-	}
-	protected ReflectionAdaptor createJavaClassAdaptor(Notifier target) {
-		return new JavaClassJDKAdaptor(target, this);
-	}
-	protected ReflectionAdaptor createJavaFieldAdaptor(Notifier target) {
-		return new JavaFieldJDKAdaptor(target, this);
-	}
-	protected ReflectionAdaptor createJavaMethodAdaptor(Notifier target) {
-		return new JavaMethodJDKAdaptor(target, this);
-	}
-	// Flush ALL adapters, worst case
-	public void flushAll() {
-		isBusyIteratingReflected = true;
-		try {
-			Iterator i = reflected.values().iterator();
-			while (i.hasNext())
-				 ((JavaClassJDKAdaptor) i.next()).flushReflectedValuesIfNecessary();
-		} finally {
-			finishedIteratingReflected();
-		}
-	}
-	// Flush the adapter for a source object
-	public void flushReflection(String source) {
-		JavaClassJDKAdaptor a = (JavaClassJDKAdaptor) reflected.get(source);
-		if (a != null)
-			a.flushReflectedValuesIfNecessary();
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (11/07/00 3:38:12 PM)
-	 * @return java.lang.ClassLoader
-	 */
-	public java.lang.ClassLoader getContextClassLoader() {
-		return contextClassLoader;
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (11/07/00 3:38:12 PM)
-	 * @param newContextClassLoader java.lang.ClassLoader
-	 */
-	public void setContextClassLoader(java.lang.ClassLoader newContextClassLoader) {
-		contextClassLoader = newContextClassLoader;
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java
deleted file mode 100644
index f922fa0f2..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java
+++ /dev/null
@@ -1,245 +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.jem.internal.java.adapters.jdk;
-/*
- *  $RCSfile: JavaMethodJDKAdaptor.java,v $
- *  $Revision: 1.9 $  $Date: 2005/09/14 23:30:35 $ 
- */
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.internal.impl.MethodImpl;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaMethodJDKAdaptor extends JDKAdaptor implements IJavaMethodAdapter {
-	protected java.lang.reflect.AccessibleObject sourceAccessible = null; // Could be method or ctor.
-	protected Class parentType = null;
-	// cache a static empty Class[] for no parm methods
-	protected static Class[] emptyClassArray = new Class[0];
-	// cache a static empty String[], too
-	protected static String[] emptyStringArray = new String[0];
-	public JavaMethodJDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
-		super(target, anAdapterFactory);
-	}
-	/**
-	 * addExceptions - reflect our exception list
-	 */
-	protected void addExceptions() {
-		Class[] exceptions =
-			(getSourceAccessible() instanceof java.lang.reflect.Method)
-				? ((java.lang.reflect.Method) getSourceAccessible()).getExceptionTypes()
-				: ((java.lang.reflect.Constructor) getSourceAccessible()).getExceptionTypes();
-		//	EList exList = (EList) javaMethodTarget.primRefValue(JavaRefPackage.eINSTANCE.getMethod_JavaExceptions());
-		List exList = getMethodTarget().getJavaExceptionsGen();
-		for (int i = 0; i < exceptions.length; i++) {
-			exList.add(createJavaClassRef(exceptions[i].getName()));
-		}
-	}
-
-	protected MethodImpl getMethodTarget() {
-		return (MethodImpl) getTarget();
-	}
-	/**
-	 * addParameters - reflect our parms
-	 */
-	protected void addParameters() {
-		Class[] parmTypes =
-			(getSourceAccessible() instanceof java.lang.reflect.Method)
-				? ((java.lang.reflect.Method) getSourceAccessible()).getParameterTypes()
-				: ((java.lang.reflect.Constructor) getSourceAccessible()).getParameterTypes();
-		MethodImpl javaMethodTarget = getMethodTarget();
-		// 	List pList = (List) javaMethodTarget.primRefValue(JavaRefPackage.eINSTANCE.getMethod_Parameters());
-		List pList = javaMethodTarget.getParametersGen();
-		for (int i = 0; i < parmTypes.length; i++) {
-			pList.add(createJavaParameter(javaMethodTarget, "arg" + i, getTypeName(parmTypes[i]))); //$NON-NLS-1$
-		}
-	}
-	protected JavaClass getContainingJavaClass() {
-		return ((Method) getTarget()).getContainingJavaClass();
-	}
-	/**
-	 * getParentType - return the Class which corresponds to our parent JavaClass
-	 * we're going to do this a lot, so cache it.
-	 */
-	protected Class getParentType() {
-		if (parentType == null) {
-			Method targetMethod = (Method) getTarget();
-			JavaClass parentJavaClass = targetMethod.getContainingJavaClass();
-			JavaClassJDKAdaptor pa = (JavaClassJDKAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
-			if (pa != null)
-				parentType = pa.getSourceType();
-		}
-		return parentType;
-	}
-	/**
-	 * getParmTypeSignatures - return an array of Classes for our parameter types
-	 * 	For reflection purposes, we can only rely on our ID, since our parms may
-	 *  not yet be known.
-	 */
-	protected Class[] getParmTypes() {
-		Method javaMethodTarget = (Method) getTarget();
-		String id = ((XMIResource) javaMethodTarget.eResource()).getID(javaMethodTarget);
-		String[] typeNames = getTypeNamesFromMethodID(id);
-		if (typeNames == null)
-			return emptyClassArray;
-		int n = typeNames.length;
-		if (n == 0)
-			return emptyClassArray;
-		Class[] types = new Class[n];
-		for (int i = 0; i < n; ++i) {
-			types[i] = getType(typeNames[i]);
-		}
-		return types;
-	}
-	public Object getReflectionSource() {
-		return getSourceAccessible();
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
-     */
-    public boolean hasCachedReflectionSource() { 
-        return sourceAccessible != null;
-    }
-	/**
-	 * getsourceMethod - return the java.lang.reflect.Method which describes our implementing method
-	 */
-	protected java.lang.reflect.AccessibleObject getSourceAccessible() {
-		if (sourceAccessible == null) {
-			Class parent = this.getParentType();
-			if (parent != null) {
-				Class[] parmTypes = this.getParmTypes();
-				try {
-					sourceAccessible = parent.getDeclaredMethod(((Method) getTarget()).getName(), parmTypes);
-				} catch (NoSuchMethodException e) {
-					// OK, can't reflect it
-				}
-
-				if (sourceAccessible == null) {
-					// It wasn't a method, try for constructor.
-					try {
-						sourceAccessible = parent.getDeclaredConstructor(parmTypes);
-					} catch (NoSuchMethodException e) {
-						// OK, can't reflect it
-					}
-				}
-			}
-		}
-		return sourceAccessible;
-	}
-	/**
-	 * getValueIn method comment.
-	 */
-	public Object getValueIn(EObject object, EObject attribute) {
-		// At this point, this adapter does not dynamically compute any values,
-		// all values are pushed back into the target on the initial call.
-		return super.getValueIn(object, attribute);
-	}
-	/**
-	 * reflectValues - template method, subclasses override to pump values into target.
-	 * on entry: UUID, name, containing package (and qualified name), and document must be set.
-	 * Method adaptor:
-	 *	- set modifiers
-	 *	- set name
-	 * 	- set return type
-	 * 	- add parameters
-	 * 	- add exceptions
-	 */
-	public boolean reflectValues() {
-		if (getSourceAccessible() != null) {
-			((Method) getTarget()).setIsGenerated(false);
-			setModifiers();
-			setNaming();
-			setReturnType();
-			addParameters();
-			addExceptions();
-			return true;
-		}
-		return false;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter#reflectGeneratedIfNecessary()
-	 */
-	public boolean reflectGeneratedIfNecessary() {
-		return reflectValuesIfNecessary();
-	}
-	
-	public boolean reflectParamNamesIfNecessary() {
-		return reflectValuesIfNecessary();
-	}
-	
-	/**
-	 * setModifiers - set the attribute values related to modifiers here
-	 */
-	protected void setModifiers() {
-		Method methodTarget = (Method) getTarget();
-		int modifiers =
-			(getSourceAccessible() instanceof java.lang.reflect.Method)
-				? ((java.lang.reflect.Method) getSourceAccessible()).getModifiers()
-				: ((java.lang.reflect.Constructor) getSourceAccessible()).getModifiers();
-		methodTarget.setAbstract(java.lang.reflect.Modifier.isAbstract(modifiers));
-		methodTarget.setFinal(java.lang.reflect.Modifier.isFinal(modifiers));
-		methodTarget.setNative(java.lang.reflect.Modifier.isNative(modifiers));
-		methodTarget.setStatic(java.lang.reflect.Modifier.isStatic(modifiers));
-		methodTarget.setSynchronized(java.lang.reflect.Modifier.isSynchronized(modifiers));
-		methodTarget.setConstructor(getSourceAccessible() instanceof java.lang.reflect.Constructor);
-		// Set visibility
-		JavaClass javaClass = getContainingJavaClass();
-		if ((javaClass.getKind() == TypeKind.INTERFACE_LITERAL) || (java.lang.reflect.Modifier.isPublic(modifiers)))
-			methodTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
-		else if (java.lang.reflect.Modifier.isPrivate(modifiers))
-			methodTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
-		else if (java.lang.reflect.Modifier.isProtected(modifiers))
-			methodTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
-		else
-			//Visibility must be package
-			methodTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
-	}
-	/**
-	 * setNaming - set the naming values here
-	 * 	- qualified name must be set first, that is the path to the real Java class
-	 *	- ID
-	 * 	- name-based UUID
-	 */
-	protected void setNaming() {
-		//
-		//	naming is currently a no-op since the name and UUID must be set prior to reflection
-		//	...and ID is redundant with UUID.
-		//	javaFieldTarget.setID(parent.getQualifiedName() + "_" + javaFieldTarget.getName());
-	}
-	/**
-	 * setType - set our return type here
-	 */
-	protected void setReturnType() {
-		if (getSourceAccessible() instanceof java.lang.reflect.Method) {
-			Class type = ((java.lang.reflect.Method) getSourceAccessible()).getReturnType();
-			Method javaMethodTarget = (Method) getTarget();
-			/*
-					JavaParameter newParameter = createJavaParameter(javaMethodTarget, "result", getTypeName(type));//$NON-NLS-1$
-					newParameter.setParameterKind(MetaJavaParameterKind.RETURN);
-					javaMethodTarget.getParameters().add(newParameter);
-			*/
-			javaMethodTarget.setEType(createJavaClassRef(getTypeName(type)));
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java
deleted file mode 100644
index 11ef6dd78..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.nls;
-/*
- *  $RCSfile: ResourceHandler.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.text.MessageFormat;
-
-public class ResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("javaadapters");//$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$
-			}
-		} else {
-			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);}
-
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java
deleted file mode 100644
index 01ef0fc06..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.beaninfo;
-/*
- *  $RCSfile: IIntrospectionAdapter.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * The interface for the Beaninfo adapter. The actual implementation
- * is in a separate project so that beaninfo code will not be loaded
- * unless it needs to be.
- */
-
-public interface IIntrospectionAdapter extends org.eclipse.emf.common.notify.Adapter {
-	public static final Class ADAPTER_KEY = IIntrospectionAdapter.class;
-	public void introspectIfNecessary();
-	public boolean isStale();
-	public EList getEStructuralFeatures();
-	public EList getEOperations();
-	public BasicEList getEAllOperations();
-	public EList getEvents();
-	public EList getAllEvents();
-	public EList getAllProperties();	
-}
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java
deleted file mode 100644
index 8b6f1c837..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.init;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
-
-/**
- * Initialize the Java Reflection mechanisms. 
- */
-public class JavaInit {
-	protected static boolean initialized = false;
-	protected static boolean plugin_initialized = false;
-
-	public static void init() {
-		init(true);
-	}
-
-	public static void init(boolean shouldPreRegisterPackages) {
-		if (!initialized) {
-			initialized = true;
-			if (shouldPreRegisterPackages) {
-				preRegisterPackages();
-				setDefaultResourceFactory();
-			}
-			//Register resource factory
-			JavaXMIFactoryImpl.register();
-		}
-	}
-
-	private static void preRegisterPackages() {
-		//ecore
-		if (!EPackage.Registry.INSTANCE.containsKey("ecore.xmi")) //$NON-NLS-1$
-			EPackage.Registry.INSTANCE.put("ecore.xmi", EcorePackage.eINSTANCE); //$NON-NLS-1$
-		//java
-		if (!EPackage.Registry.INSTANCE.containsKey("java.xmi")) //$NON-NLS-1$
-			EPackage.Registry.INSTANCE.put("java.xmi", JavaRefPackage.eINSTANCE); //$NON-NLS-1$
-	}
-	protected static void setDefaultResourceFactory() {
-		//This is not done outside of Eclipse
-		if (Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().get(Resource.Factory.Registry.DEFAULT_EXTENSION) == null)
-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
-				Resource.Factory.Registry.DEFAULT_EXTENSION,
-				new XMIResourceFactoryImpl());
-	}
-
-	public static void setPluginInit(boolean bPluginInit) {
-		// Here's where the configuration file would be read.
-		plugin_initialized = bPluginInit;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java
deleted file mode 100644
index 96702afb8..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
- *  $RCSfile: IInstantiationHandler.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.java.JavaDataType;
-
-/**
- * The interface for the Instantiation handler. The actual implementation
- * is in a separate project so that instantiation code will not be loaded
- * unless it needs to be.
- */
-
-public interface IInstantiationHandler {
-	/**
-	 * Answers whether the adapter handles the datatype
-	 * or whether the standard EFactory does.
-	 */
-	public boolean handlesDataType(JavaDataType type);
-	
-	/**
-	 * Answers whether the adapter handles the EClass or the
-	 * standard EFactory does.
-	 */
-	public boolean handlesClass(EClass type);
-	
-	/**
-	 * If adapterHandlesInstance returns true, then
-	 * this method will be called to create the instance.
-	 */
-	public EObject create(EClass javaClass);
-
-}
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java
deleted file mode 100644
index 933617705..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
- *  $RCSfile: IInstantiationHandlerFactoryAdapter.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/14 23:30:35 $ 
- */
-import org.eclipse.emf.common.notify.Adapter;
-
-import org.eclipse.jem.java.internal.impl.JavaFactoryImpl;
-
-/**
- * This adapter is a factory for IInstantiationHandler's. It is attached as
- * an adapter on the ResourceSet that contains the java model. JavaXMIFactory
- * will use it to retrieve its IInstantiationHandler. If the adapter is not
- * found, then no instantiation handler exists.
- */
-public interface IInstantiationHandlerFactoryAdapter extends Adapter {
-	
-	public final static Class ADAPTER_KEY = IInstantiationHandlerFactoryAdapter.class;
-	
-	/**
-	 * Return an IInstantiationHandler.
-	 */
-	public IInstantiationHandler getInstantiationHandler(JavaFactoryImpl factory);
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java
deleted file mode 100644
index cdc9de990..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
- *  $RCSfile: IInstantiationInstance.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:25 $ 
- */
-import org.eclipse.jem.java.JavaHelpers;
-
-/**
- * The interface for an instance. The actual implementation
- * is in a separate project so that instantiation code will not be loaded
- * unless it needs to be.
- */
-public interface IInstantiationInstance {
-	/**
-	 * @return The JavaHelpers for the java type of the instance.
-	 */
-	public JavaHelpers getJavaType();
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java
deleted file mode 100644
index 205a39bad..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: ArrayType.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-import org.eclipse.emf.ecore.EClassifier;
-/**
- * Describes a Java Array type
- *    For multi-dimensional arrays, it is unlikely that the component type will be
- *    specified directly.  This would require instantiating a chain of component types
- *    such as String[][][][]->String[][][]->String[][]->String[]->String.
- * 
- *   The component type relationship will be computed if the finalComponentType
- *   and array dimensions is specified.
- *  
- *   For this reason, the preferred way to create is through the JavaRefFactory factory method:
- *        createArrayType(JavaClass finalComponentType, int dimensions)
- */
-public interface ArrayType extends JavaClass{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ArrayDimensions attribute
-	 */
-	int getArrayDimensions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ArrayDimensions attribute
-	 */
-	void setArrayDimensions(int value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ComponentType reference
-	 */
-	EClassifier getComponentType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.ArrayType#getComponentType <em>Component Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Component Type</em>' reference.
-	 * @see #getComponentType()
-	 * @generated
-	 */
-	void setComponentType(EClassifier value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Get the final component type for this Array Type.
-	 * 
-	 * In order to ensure a unique instance, we will resolve this type using
-	 * reflection. It turns out to be most efficient to just do this by trimming the
-	 * name.
-	 */
-	JavaHelpers getFinalComponentType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Get the component type of this array. 
-	 * 
-	 * If this is a multi-dimensional array, the component type will be the nested
-	 * array type.
-	 */
-	JavaHelpers getComponentTypeAsHelper();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Is this an array of java primitives
-	 */
-	boolean isPrimitiveArray();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Set the component type.
-	 */
-	void setComponentType(JavaHelpers helperComponentType);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java
deleted file mode 100644
index d2864c66b..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: Block.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- */
-public interface Block extends EObject{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Source attribute
-	 */
-	String getSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Source attribute
-	 */
-	void setSource(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Contents references
-	 */
-	EList getContents();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java
deleted file mode 100644
index 73c16abf7..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: Comment.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:24 $ 
- */
-package org.eclipse.jem.java;
-
-
-/**
- * @generated
- */
-public interface Comment extends Block {
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java
deleted file mode 100644
index 0daaff4b4..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: Field.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.ETypedElement;
-
-/**
- * @generated
- */
-public interface Field extends ETypedElement{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsFinal attribute
-	 */
-	boolean isFinal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#isFinal <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Final</em>' attribute.
-	 * @see #isFinal()
-	 * @generated
-	 */
-	void setFinal(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsStatic attribute
-	 */
-	boolean isStatic();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#isStatic <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Static</em>' attribute.
-	 * @see #isStatic()
-	 * @generated
-	 */
-	void setStatic(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the JavaVisibility attribute
-	 */
-	JavaVisibilityKind getJavaVisibility();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#getJavaVisibility <em>Java Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Visibility</em>' attribute.
-	 * @see org.eclipse.jem.java.JavaVisibilityKind
-	 * @see #getJavaVisibility()
-	 * @generated
-	 */
-	void setJavaVisibility(JavaVisibilityKind value);
-
-	/**
-	 * Returns the value of the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transient</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transient</em>' attribute.
-	 * @see #setTransient(boolean)
-	 * @see org.eclipse.jem.java.JavaRefPackage#getField_Transient()
-	 * @model
-	 * @generated
-	 */
-	boolean isTransient();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#isTransient <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transient</em>' attribute.
-	 * @see #isTransient()
-	 * @generated
-	 */
-	void setTransient(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Volatile</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Volatile</em>' attribute.
-	 * @see #setVolatile(boolean)
-	 * @see org.eclipse.jem.java.JavaRefPackage#getField_Volatile()
-	 * @model
-	 * @generated
-	 */
-	boolean isVolatile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#isVolatile <em>Volatile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Volatile</em>' attribute.
-	 * @see #isVolatile()
-	 * @generated
-	 */
-	void setVolatile(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The JavaClass reference
-	 */
-	JavaClass getJavaClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#getJavaClass <em>Java Class</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Class</em>' container reference.
-	 * @see #getJavaClass()
-	 * @generated
-	 */
-	void setJavaClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Initializer reference
-	 */
-	Block getInitializer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Field#getInitializer <em>Initializer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Initializer</em>' containment reference.
-	 * @see #getInitializer()
-	 * @generated
-	 */
-	void setInitializer(Block value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Get the class that this field is within.
-	 */
-	JavaClass getContainingJavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Is this field an array type.
-	 */
-	boolean isArray();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
deleted file mode 100644
index 1c9631d36..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: InheritanceCycleException.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.text.MessageFormat;
-
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class InheritanceCycleException extends Exception {
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 * 
-	 * @since 1.1.0
-	 */
-	private static final long serialVersionUID = -2385690847427897656L;
-	private static String MSG_PATTERN = ResourceHandler.getString("Java_Inh_Cycle_ERROR_");//$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	public InheritanceCycleException(JavaClass aSubclass, JavaClass aSuperclass) {
-		this(MessageFormat.format(MSG_PATTERN, new String[]{aSubclass.getQualifiedName(), aSuperclass.getQualifiedName()}));
-	}
-
-	/**
-	 * @param s
-	 */
-	public InheritanceCycleException(String s) {
-		super(s);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java
deleted file mode 100644
index be85f1856..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: Initializer.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- */
-public interface Initializer extends EObject{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsStatic attribute
-	 */
-	Boolean getIsStatic();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the IsStatic attribute
-	 */
-	void setIsStatic(Boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The JavaClass reference
-	 */
-	JavaClass getJavaClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Initializer#getJavaClass <em>Java Class</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Class</em>' container reference.
-	 * @see #getJavaClass()
-	 * @generated
-	 */
-	void setJavaClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Source reference
-	 */
-	Block getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Initializer#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' reference.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(Block value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
deleted file mode 100644
index 888218467..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaClass.java,v $
- *  $Revision: 1.7 $  $Date: 2005/09/15 13:42:04 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-/**
- * <!-- begin-user-doc -->
- * @extends JavaHelpers
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getImplementsInterfaces <em>Implements Interfaces</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getClassImport <em>Class Import</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getPackageImports <em>Package Imports</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getFields <em>Fields</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getInitializers <em>Initializers</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getDeclaredClasses <em>Declared Classes</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getJavaPackage <em>Java Package</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getEvents <em>Events</em>}</li>
- *   <li>{@link org.eclipse.jem.java.JavaClass#getAllEvents <em>All Events</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaClass()
- * @model
- * @generated
- */
-public interface JavaClass extends EClass, JavaHelpers{
-
-	public static final String DEFAULT_METHOD_NAME = "*";
-	/**
-	 * Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists.  It will not look up the supertype hierarchy.
-	 */
-	public Method getPublicMethodExtended(String methodName, List parameterTypes) ;
-	/**
-	 * Returns a filtered list on the methods of this class, having a name equal to that of the parameter.
-	 */
-	public List getPublicMethodsExtendedNamed(String name);
-
-	/**
-	 * Return an array listing our Fields, including inherited fields.
-	 * The field relationship is derived from contents.
-	 */  
-	public Field[] listFieldExtended();
-	/**
-	 * Return an array listing our Methods, including inherited methods.
-	 * The method relationship is derived from contents.
-	 */  
-	public Method[] listMethodExtended();
-//FB   /**
-//FB    * This is required for internal reflection. Do not use.
-//FB    */
-//FB   Object primRefValue(EObject feature);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Kind attribute
-	 */
-	TypeKind getKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#getKind <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.jem.java.TypeKind
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(TypeKind value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsPublic attribute
-	 */
-	boolean isPublic();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Public</em>' attribute.
-	 * @see #isPublic()
-	 * @generated
-	 */
-	void setPublic(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsFinal attribute
-	 */
-	boolean isFinal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Final</em>' attribute.
-	 * @see #isFinal()
-	 * @generated
-	 */
-	void setFinal(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ImplementsInterfaces references
-	 */
-	EList getImplementsInterfaces();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ClassImport references
-	 */
-	EList getClassImport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of PackageImports references
-	 */
-	EList getPackageImports();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Fields references
-	 */
-	EList getFields();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Methods references
-	 */
-	EList getMethods();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Initializers references
-	 */
-	EList getInitializers();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The DeclaringClass reference
-	 */
-	JavaClass getDeclaringClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Declaring Class</em>' reference.
-	 * @see #getDeclaringClass()
-	 * @generated
-	 */
-	void setDeclaringClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of DeclaredClasses references
-	 */
-	EList getDeclaredClasses();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The JavaPackage reference
-	 */
-	JavaPackage getJavaPackage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Events references
-	 */
-	EList getEvents();
-
-	/**
-	 * Returns the value of the '<em><b>All Events</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.java.JavaEvent}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>All Events</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>All Events</em>' reference list.
-	 * @see org.eclipse.jem.java.JavaRefPackage#getJavaClass_AllEvents()
-	 * @model type="org.eclipse.jem.java.JavaEvent" transient="true" volatile="true"
-	 * @generated
-	 */
-	EList getAllEvents();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	boolean isNested();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return an Field with the passed name, or null.
-	 */
-	Field getField(String fieldName);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 *  Return an Field with the passed name from this JavaClass or any supertypes.
-	 * 
-	 * Return null if a Field named fieldName is not found.
-	 */
-	Field getFieldExtended(String fieldName);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return an Field with the passed name, or null.
-	 */
-	Field getFieldNamed(String fieldName);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return all fields, including those from supertypes.
-	 */
-	List getFieldsExtended();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Get the method of this name and these parameters. It will not look up the
-	 * supertype hierarchy.
-	 */
-	Method getMethod(String methodName, List parameterTypes);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return a List of Strings that represent MethodElement signatures from most
-	 * general to most specific.
-	 */
-	List getMethodElementSignatures();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Get the method of this name and these parameters. It will look up the supertype 
-	 * hierarchy.
-	 */
-	Method getMethodExtended(String methodName, List parameterTypes);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return all methods, including those from supertypes.
-	 */
-	List getMethodsExtended();
-
-	/**
-	 * Return all methods, including those from supertypes excluding particular classes and methods.
-	 * @param excludedClasses - A list of JavaClass instances to be ignored.
-	 * @param excludedMethods - A list of Method instances to be ignored.
-	 */
-	List getMethodsExtendedWithFilters(List excludedClasses, List excludedMethods) ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return a List of Methods that begins with @aMethodNamePrefix and is not
-	 * included in the @excludedNames list. If @aMethodNamePrefix is null, all methods 
-	 * will be returned.
-
-	 */
-	List getOnlySpecificMethods(String aMethodNamePrefix, List excludedNames);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return a method matching the name, and non-return parameters with fully
-	 * qualified types matching all the types in the list, if it exists.  It will not
-	 * look up the supertype hierarchy.
-	 */
-	Method getPublicMethod(String methodName, List parameterTypes);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return all methods, it will not go up the supertype hierarchy.
-	 */
-	List getPublicMethods();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return all public methods, including those from supertypes.
-	 */
-	List getPublicMethodsExtended();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Returns a filtered list on the methods of this class, having a name equal to
-	 * that of the parameter.
-	 */
-	List getPublicMethodsNamed(String name);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	JavaClass getSupertype();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Test whether the receiver implements the passed interface (or one of its
-	 * supertypes).
-	 */
-	boolean implementsInterface(JavaClass interfaceType);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return a string showing our details.
-	 */
-	String infoString();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Tests whether this class inherits from the passed in class.
-	 */
-	boolean inheritsFrom(JavaClass javaClass);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Does this type exist.
-	 */
-	boolean isExistingType();
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this an interface.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-  boolean isInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Set the supertype.
-	 */
-	void setSupertype(JavaClass javaclass) throws InheritanceCycleException;
-
-	/**
-	 * Return true if the passed JavaClass can be set as the supertype
-	 * of this JavaClass.  This method will test to see if aJavaClass will
-	 * create a cycle in the inheritance structure.  Return true if no
-	 * inheritance cycle will be created.
-	 */
-	public boolean isValidSupertype(JavaClass aJavaClass) ;
-
-	/**
-	 * Get the EStructuralFeatures that represent the BeanInfo properties for
-	 * just this Java class, not including inherited. It will return any EStructuralFeature
-	 * that was specified as being at this class either through the XMI override document or
-	 * through the BeanInfo. Structural features through the XMI may not be bean properties,
-	 * but they are part of the features available at this class only. 
-	 * 
-	 * This is a combination of getEAttributes() and getEReferences().
-	 * 
-	 * To retrieve only the Bean Properties, then use Beaninfo 
-	 * Utilities.getPropertiesIterator(javaclass.getProperties()) and this will iterate over
-	 * the Bean PropertyDecorators, and filter out the non-bean features.
-	 * 
-	 * @return The list of properties (as EStructuralFeature's) for this java class. This list is
-	 * not modifiable.
-	 */
-	EList getProperties();
-	
-	/**
-	 * Get all of the EStructuralFeatures that represent the BeanInfo properties for
-	 * just this Java class, including inherited. It will return any EStructuralFeature
-	 * that was specified through the XMI override document or
-	 * through the BeanInfo. Structural features through the XMI may not be bean properties,
-	 * but they are part of the features available.
-	 * 
-	 * The is like getEAllStructuralFeatures() except that if BeanInfo hides any bean properties
-	 * from the super class, this list will also hide them, while getEAllStructuralFeatures
-	 * will not.
-	 * 
-	 * To retrieve only the Bean Properties, then use Beaninfo 
-	 * Utilities.getPropertiesIterator(javaclass.getAllProperties()) and this will iterate over
-	 * the Bean PropertyDecorators, and filter out the non-bean features.
-	 * 
-	 * @return The list of all properties, including inherited, (as EStructuralFeature's) for this class. This list is
-	 * not modifiable.
-	 */
-	EList getAllProperties();
-	
-	
-	/**
-	 * Return the reflection type, if it exists, for this class. If running within Eclipse this
-	 * will be an {@link org.eclipse.jdt.core.IType}, or running outside of Eclipse it will be a {@link java.lang.Class}.
-	 * 
-	 * @return IType if in Eclipse, Class if outside Eclipse, or <code>null</code> if type not found.
-	 * 
-	 * @since 1.1.0
-	 */
-	Object getReflectionType();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java
deleted file mode 100644
index 735b85824..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaDataType.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * @extends JavaHelpers
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaDataType()
- * @model
- * @generated
- */
-public interface JavaDataType extends EClass, JavaHelpers{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return the default string representing the default value of the primitive.
-	 */
-	String getDefaultValueString();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java
deleted file mode 100644
index c260421af..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaEvent.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Event</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaEvent()
- * @model abstract="true"
- * @generated
- */
-public interface JavaEvent extends EStructuralFeature{
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java
deleted file mode 100644
index 31cefaf2c..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaHelpers.java,v $
- *  $Revision: 1.7 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-
-/**
- * Insert the type's description here.
- * Creation date: (6/27/2000 4:42:04 PM)
- * @author: Administrator
- */
-public interface JavaHelpers extends EClass {
-	static final String BOOLEAN_NAME = "java.lang.Boolean"; //$NON-NLS-1$
-	static final String CHARACTER_NAME = "java.lang.Character"; //$NON-NLS-1$
-	static final String BYTE_NAME = "java.lang.Byte"; //$NON-NLS-1$
-	static final String DOUBLE_NAME = "java.lang.Double"; //$NON-NLS-1$
-	static final String FLOAT_NAME = "java.lang.Float"; //$NON-NLS-1$
-	static final String INTEGER_NAME = "java.lang.Integer"; //$NON-NLS-1$
-	static final String LONG_NAME = "java.lang.Long"; //$NON-NLS-1$
-	static final String SHORT_NAME = "java.lang.Short"; //$NON-NLS-1$
-	static final String PRIM_BOOLEAN_NAME = "boolean"; //$NON-NLS-1$
-	static final String PRIM_CHARACTER_NAME = "char"; //$NON-NLS-1$
-	static final String PRIM_BYTE_NAME = "byte"; //$NON-NLS-1$
-	static final String PRIM_DOUBLE_NAME = "double"; //$NON-NLS-1$
-	static final String PRIM_FLOAT_NAME = "float"; //$NON-NLS-1$
-	static final String PRIM_INTEGER_NAME = "int"; //$NON-NLS-1$
-	static final String PRIM_LONG_NAME = "long"; //$NON-NLS-1$
-	static final String PRIM_SHORT_NAME = "short"; //$NON-NLS-1$
-	
-	static final int PRIM_NOT_ID = 0;
-	static final int PRIM_BOOLEAN_ID = 1;
-	static final int PRIM_CHARACTER_ID = 2;
-	static final int PRIM_BYTE_ID = 3;
-	static final int PRIM_DOUBLE_ID = 4;
-	static final int PRIM_FLOAT_ID = 5;
-	static final int PRIM_INTEGER_ID = 6;
-	static final int PRIM_LONG_ID = 7;
-	static final int PRIM_SHORT_ID = 8;
-	
-	/**
-	 * Get the qualified name (with using '.' for inner classes). Will return the name if primitive too (e.g. "boolean")
-	 * Note: This should of been get the simple name and not the qualifed name, but it is too late and has been established
-	 * as the API. Use <code>getSimpleName()</code> instead if you want the name not qualified.
-	 * @return the qualified name of the type.
-	 * @see JavaHelpers#getSimpleName()
-	 * @since 1.0.0
-	 */
-	public String getJavaName();
-	/**
-	 * Get the simple name. This is the name of the primitive, or if a class, the name without the package. And if it is an
-	 * inner class, it will use '.' instead of '$'. If you want the simple name for reflection (i.e. with '$') use <code>getName()</code>.
-	 * @return the simple name (no package) of the type.
-	 * 
-	 * @since 1.0.0
-	 */
-	public String getSimpleName();
-
-	/**
-	 * Get the primitive type that this helper wrappers or is (e.g. "java.lang.Integer" and "int" types return "int" type). If not a primitive
-	 * or a wrapper for a primitive, then return null.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public JavaDataType getPrimitive();
-	
-	/**
-	 * Get the primitive id that this helper wrappers or is (e.g. "java.lang.Integer" and "int" will return {@link JavaHelpers#PRIM_INTEGER_ID}). If
-	 * not a wrapper for a primitive then return {@link JavaHelpers#PRIM_NOT_ID}.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public int getPrimitiveID();
-	/**
-	 * To be used by people that need to get the qualified name. This would use '.' for inner classes
-	 * and include the package name.
-	 * @return the qualified name, including package.
-	 * 
-	 * @since 1.0.0
-	 */	
-	public String getQualifiedName();
-	public JavaClass getWrapper();
-	public boolean isArray();
-	/**
-	 * Can an object of the passed in class be assigned to an
-	 * object of this class? In other words is this class a
-	 * supertype of the passed in class, or is it superinterface
-	 * of it? Or in the case of primitives, are they the same. 
-	 * @param aClass
-	 * @return <code>true</code> if assignable from the given class.
-	 * 
-	 * @since 1.0.0
-	 */
-	public boolean isAssignableFrom(EClassifier aClass);
-	public boolean isPrimitive();
-
-	/**
-	 * To be used by people that need to get the qualified name used for reflection. This would use '$' instead of '.' for inner classes
-	 * and include the package name.
-	 * Typically bean info would need to use something like this.
-	 * @return the qualified name, use '$' for inner classes
-	 * 
-	 * @since 1.0.0
-	 */
-	public String getQualifiedNameForReflection() ;	
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java
deleted file mode 100644
index 56f71ec34..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaPackage.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EPackage;
-
-public interface JavaPackage extends EPackage{
-	
-	public static final String PACKAGE_ID = "*package";	// The id (the part that goes after the '#' for a java package.) //$NON-NLS-1$
-														// There will only be one package per java resource so it
-														// can be unique. No java types, methods, fields ids can
-														// start with an asterick so will be unique.
-														
-	public static final String PRIMITIVE_PACKAGE_NAME = "_-javaprim"; //$NON-NLS-1$
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of JavaClasses references
-	 */
-	EList getJavaClasses();
-
-	public String getPackageName() ;
-
-} //JavaPackage
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java
deleted file mode 100644
index 99e7a03eb..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaParameter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:24 $ 
- */
-
-import org.eclipse.emf.ecore.EParameter;
-
-/**
- * @generated
- */
-public interface JavaParameter extends EParameter {
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsFinal attribute
-	 */
-	boolean isFinal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.JavaParameter#isFinal <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Final</em>' attribute.
-	 * @see #isFinal()
-	 * @generated
-	 */
-	void setFinal(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParameterKind attribute
-	 */
-	JavaParameterKind getParameterKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.JavaParameter#getParameterKind <em>Parameter Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Kind</em>' attribute.
-	 * @see org.eclipse.jem.java.JavaParameterKind
-	 * @see #getParameterKind()
-	 * @generated
-	 */
-	void setParameterKind(JavaParameterKind value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Is this parameter type an array type.
-	 */
-	boolean isArray();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Is this a return parameter.
-	 */
-	boolean isReturn();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	JavaHelpers getJavaType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	String getQualifiedName();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java
deleted file mode 100644
index 163473784..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaParameterKind.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Java Parameter Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * IN=0
- * OUT=1
- * INOUT=2
- * RETURN=3
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaParameterKind()
- * @model
- * @generated
- */
-public final class JavaParameterKind extends AbstractEnumerator
-{
-	/**
-	 * The '<em><b>IN</b></em>' literal value.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @see #IN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IN = 0;
-	/**
-	 * The '<em><b>OUT</b></em>' literal value.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @see #OUT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OUT = 1;
-	/**
-	 * The '<em><b>INOUT</b></em>' literal value.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @see #INOUT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INOUT = 2;
-	/**
-	 * The '<em><b>RETURN</b></em>' literal value.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @see #RETURN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RETURN = 3;
-	/**
-	 * The '<em><b>IN</b></em>' literal object.
-	 * <!-- begin-user-doc --> 
-   * <p>
-   * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc --> 
-	 * @see #IN
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaParameterKind IN_LITERAL = new JavaParameterKind(IN, "IN");
-
-	/**
-	 * The '<em><b>OUT</b></em>' literal object.
-	 * <!-- begin-user-doc --> 
-   * <p>
-   * If the meaning of '<em><b>OUT</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc --> 
-	 * @see #OUT
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaParameterKind OUT_LITERAL = new JavaParameterKind(OUT, "OUT");
-
-	/**
-	 * The '<em><b>INOUT</b></em>' literal object.
-	 * <!-- begin-user-doc --> 
-   * <p>
-   * If the meaning of '<em><b>INOUT</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc --> 
-	 * @see #INOUT
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaParameterKind INOUT_LITERAL = new JavaParameterKind(INOUT, "INOUT");
-
-	/**
-	 * The '<em><b>RETURN</b></em>' literal object.
-	 * <!-- begin-user-doc --> 
-   * <p>
-   * If the meaning of '<em><b>RETURN</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc --> 
-	 * @see #RETURN
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaParameterKind RETURN_LITERAL = new JavaParameterKind(RETURN, "RETURN");
-
-	/**
-	 * An array of all the '<em><b>Java Parameter Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @generated
-	 */
-  private static final JavaParameterKind[] VALUES_ARRAY =
-		new JavaParameterKind[] {
-			IN_LITERAL,
-			OUT_LITERAL,
-			INOUT_LITERAL,
-			RETURN_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Java Parameter Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @generated
-	 */
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Java Parameter Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @generated
-	 */
-  public static JavaParameterKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			JavaParameterKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Java Parameter Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @generated
-	 */
-  public static JavaParameterKind get(int value) {
-		switch (value) {
-			case IN: return IN_LITERAL;
-			case OUT: return OUT_LITERAL;
-			case INOUT: return INOUT_LITERAL;
-			case RETURN: return RETURN_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc --> 
-   * <!-- end-user-doc --> 
-	 * @generated
-	 */
-  private JavaParameterKind(int value, String name) {
-		super(value, name);
-	}
-
-} //JavaParameterKind
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java
deleted file mode 100644
index d492895a8..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaRefFactory.java,v $
- *  $Revision: 1.8 $  $Date: 2006/05/17 20:13:08 $ 
- */
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-/**
- * @generated
- */
-public interface JavaRefFactory extends EFactory{
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JavaRefFactory eINSTANCE = new org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl();
-
-
-	/**
-	 * Create a proxy reference to the class name.
-	 * @param targetName Classname to create a proxy reference to. This must be fully-qualified.
-	 * @return A proxy reference
-	 * 
-	 * @since 1.0.0
-	 */
-	public JavaClass createClassRef(String targetName);
-	
-	/**
-	 * reflect - reflect a java type (class or primitive) for a given qualified name.
-	 * <p>If the package or type does not exist, one will be created through
-	 * the reflection mechanism.
-	 * <p>Lookup the JavaClass in the context of the passed object, handling some error cases.
-	 * @param aQualifiedName Fully qualified name of class or primitive (e.g. <code>java.lang.Object</code> or <code>int</code>
-	 * @param relatedObject EObject that it will be related too (it will look through the resource set's project of the EObject)
-	 * @return The type. <code>null</code> if name is not of correct format, relatedObject is not contained by a resource set, or resource set is not associated with a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public JavaHelpers reflectType(String aQualifiedName, EObject relatedObject);
-	
-	
-	/**
-	 * reflect - reflect a java type (class or primitive) for a given qualified name.
-	 * <p>If the package or class does not exist, one will be created through
-	 * the reflection mechanism.
-	 * @param aQualifiedName Fully qualified name of class or primitive (e.g. <code>java.lang.Object</code> or <code>int</code>. 
-	 * @param set Resource set to use. Its project will be used to find the type.
-	 * @return The type. <code>null</code> if name is not of correct format, or resource set is not associated with a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public JavaHelpers reflectType(String aQualifiedName, ResourceSet set);	
-	
-	
-	/**
-	 * reflect - reflect a type for a given package name and class name.
-	 * <p>If the package or class does not exist, one will be created through
-	 * the reflection mechanism.
-	 * @param aPackageName Package name
-	 * @param aTypeName Type name 
-	 * @param set Resource set to use. Its project will be used to find the type.
-	 * @return The type. <code>null</code> if name is not of correct format, or resource set is not associated with a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public JavaHelpers reflectType(String aPackageName, String aTypeName, ResourceSet set);
-	
-	/**
-	 * reflect - reflect a Java package for a given package name.
-	 * <p>If the package does not exist, one will be created through
-	 * the reflection mechanism.
-	 * @param packageName Name of package
-	 * @param set Resource set to use. Its project will be used to find the package.
-	 * @return The package. <code>null</code> if name is not of correct format, or resource set is not associated with a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public JavaPackage reflectPackage(String packageName, ResourceSet set);
-	
-	/**
-	 * The scheme for a java URI.
-	 * 
-	 * @since 1.2.0
-	 */
-	public static final String JAVA_PROTOCOL_URI_SCHEME = "java"; //$NON-NLS-1$
-	
-	/**
-	 * Create the URI for accessing a type through {@link ResourceSet#getEObject(URI, boolean)}.
-	 * @param aQualifiedName
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public URI createTypeURI(String aQualifiedName);
-	
-	/**
-	 * Create the URI for accessing a type through {@link ResourceSet#getEObject(URI, boolean)}.
-	 * @param packageName package name (may be <code>null</code> or <code>""</code> for primitives or default package)
-	 * @param typeName type name
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public URI createTypeURI(String packageName, String typeName);
-	
-	/**
-	 * Create the URI for accessing a package through {@link ResourceSet#getEObject(URI, boolean)}.
-	 * @param packageName package name (may be <code>null</code> or <code>""</code> for primitives or default package)
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public URI createPackageURI(String packageName);
-	
-	/**
-	 * Get just the type name without the package name.
-	 * @param typeURI
-	 * @return the type name or <code>""</code> if not a valid type URI
-	 * 
-	 * @throws IllegalArgumentException if not a valid type URI
-	 * @since 1.2.0
-	 */
-	public String getTypeName(URI typeURI);
-	
-	/**
-	 * Get just the package name.
-	 * @param javaURI either a type or a package URI.
-	 * @return package name or <code>""</code> if default package or primitive.
-	 * 
-	 * @throws IllegalArgumentException if not a valid package or type URI
-	 * @since 1.2.0
-	 */
-	public String getPackageName(URI javaURI);
-	
-	/**
-	 * Get the fully qualified type name.
-	 * @param typeURI
-	 * @return fully qualified name or <code>""</code> if not a valid type URI
-	 * 
-	 * @throws IllegalArgumentException if not a valid type URI
-	 * @since 1.2.0
-	 */
-	public String getFullTypeName(URI typeURI);
-	
-	/**
-	 * Is this a valid java uri.
-	 * @param uri
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isJavaURI(URI uri);
-
-	/**
-	 * Is this a valid type uri.
-	 * @param uri
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isTypeURI(URI uri);
-	
-	/**
-	 * Is this a valid package uri.
-	 * @param uri
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public boolean isPackageURI(URI uri);
-	
-	/**
-	 * @return ArrayType value with an array of the component type
-	 */
-	public ArrayType createArrayType(JavaHelpers componentType);
-	/**
-	 * @return ArrayType value with an array of the specified dimensions and final component type.
-	 */
-	public ArrayType createArrayType(JavaHelpers finalComponentType, int dimensions);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Method value
-	 */
-	Method createMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaClass value
-	 */
-	JavaClass createJavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Field value
-	 */
-	Field createField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Block value
-	 */
-	Block createBlock();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Comment value
-	 */
-	Comment createComment();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Statement value
-	 */
-	Statement createStatement();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Initializer value
-	 */
-	Initializer createInitializer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaParameter value
-	 */
-	JavaParameter createJavaParameter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ArrayType value
-	 */
-	ArrayType createArrayType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaDataType value
-	 */
-	JavaDataType createJavaDataType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaPackage value
-	 */
-	JavaPackage createJavaPackage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	JavaRefPackage getJavaRefPackage();
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java
deleted file mode 100644
index 106ba96a5..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java
+++ /dev/null
@@ -1,1972 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaRefPackage.java,v $
- *  $Revision: 1.6 $  $Date: 2005/09/14 23:30:35 $ 
- */
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-
-/**
- * @lastgen interface JavaRefPackage extends EPackage {}
- */
-public interface JavaRefPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "java";
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS = 0;
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__NAME = EcorePackage.ECLASS__NAME;
-	/**
-	 * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
-	/**
-	 * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EReferences</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EAttributes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EID Attribute</b></em>' reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_CLASS__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__KIND = EcorePackage.ECLASS_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Public</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__PUBLIC = EcorePackage.ECLASS_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Final</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS__FINAL = EcorePackage.ECLASS_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__IMPLEMENTS_INTERFACES = EcorePackage.ECLASS_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__CLASS_IMPORT = EcorePackage.ECLASS_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__PACKAGE_IMPORTS = EcorePackage.ECLASS_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__FIELDS = EcorePackage.ECLASS_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__METHODS = EcorePackage.ECLASS_FEATURE_COUNT + 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__INITIALIZERS = EcorePackage.ECLASS_FEATURE_COUNT + 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__DECLARED_CLASSES = EcorePackage.ECLASS_FEATURE_COUNT + 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__DECLARING_CLASS = EcorePackage.ECLASS_FEATURE_COUNT + 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__JAVA_PACKAGE = EcorePackage.ECLASS_FEATURE_COUNT + 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__EVENTS = EcorePackage.ECLASS_FEATURE_COUNT + 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLASS__ALL_EVENTS = EcorePackage.ECLASS_FEATURE_COUNT + 13;
-	/**
-	 * The number of structural features of the the '<em>Java Class</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLASS_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 14;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FIELD = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PARAMETER = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_DATA_TYPE = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_EVENT = 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PACKAGE = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int BLOCK = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int COMMENT = 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int STATEMENT = 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INITIALIZER = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INITIALIZER__IS_STATIC = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INITIALIZER__JAVA_CLASS = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INITIALIZER__SOURCE = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Initializer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INITIALIZER_FEATURE_COUNT = 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__EANNOTATIONS = EcorePackage.EPARAMETER__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PARAMETER__NAME = EcorePackage.EPARAMETER__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__ORDERED = EcorePackage.EPARAMETER__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__UNIQUE = EcorePackage.EPARAMETER__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__LOWER_BOUND = EcorePackage.EPARAMETER__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__UPPER_BOUND = EcorePackage.EPARAMETER__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__MANY = EcorePackage.EPARAMETER__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__REQUIRED = EcorePackage.EPARAMETER__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__ETYPE = EcorePackage.EPARAMETER__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>EOperation</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__EOPERATION = EcorePackage.EPARAMETER__EOPERATION;
-
-	/**
-	 * The feature id for the '<em><b>Final</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER__FINAL = EcorePackage.EPARAMETER_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PARAMETER__PARAMETER_KIND = EcorePackage.EPARAMETER_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>Java Parameter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PARAMETER_FEATURE_COUNT = EcorePackage.EPARAMETER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD__NAME = EcorePackage.EOPERATION__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__ORDERED = EcorePackage.EOPERATION__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__UNIQUE = EcorePackage.EOPERATION__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__MANY = EcorePackage.EOPERATION__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__REQUIRED = EcorePackage.EOPERATION__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__ETYPE = EcorePackage.EOPERATION__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>EParameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS;
-
-	/**
-	 * The feature id for the '<em><b>EExceptions</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__ABSTRACT = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Native</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__NATIVE = EcorePackage.EOPERATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Synchronized</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__SYNCHRONIZED = EcorePackage.EOPERATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Final</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__FINAL = EcorePackage.EOPERATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Constructor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__CONSTRUCTOR = EcorePackage.EOPERATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Static</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD__STATIC = EcorePackage.EOPERATION_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD__JAVA_VISIBILITY = EcorePackage.EOPERATION_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD__PARAMETERS = EcorePackage.EOPERATION_FEATURE_COUNT + 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD__JAVA_EXCEPTIONS = EcorePackage.EOPERATION_FEATURE_COUNT + 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD__JAVA_CLASS = EcorePackage.EOPERATION_FEATURE_COUNT + 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD__SOURCE = EcorePackage.EOPERATION_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the the '<em>Method</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__EANNOTATIONS = EcorePackage.ETYPED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FIELD__NAME = EcorePackage.ETYPED_ELEMENT__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__ORDERED = EcorePackage.ETYPED_ELEMENT__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__UNIQUE = EcorePackage.ETYPED_ELEMENT__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__LOWER_BOUND = EcorePackage.ETYPED_ELEMENT__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__UPPER_BOUND = EcorePackage.ETYPED_ELEMENT__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__MANY = EcorePackage.ETYPED_ELEMENT__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__REQUIRED = EcorePackage.ETYPED_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__ETYPE = EcorePackage.ETYPED_ELEMENT__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Final</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__FINAL = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Static</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__STATIC = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FIELD__JAVA_VISIBILITY = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__TRANSIENT = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD__VOLATILE = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FIELD__JAVA_CLASS = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FIELD__INITIALIZER = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 6;
-	/**
-	 * The number of structural features of the the '<em>Field</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIELD_FEATURE_COUNT = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int BLOCK__SOURCE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int BLOCK__NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int BLOCK__CONTENTS = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Block</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BLOCK_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int COMMENT__SOURCE = BLOCK__SOURCE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int COMMENT__NAME = BLOCK__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int COMMENT__CONTENTS = BLOCK__CONTENTS;
-
-	/**
-	 * The number of structural features of the the '<em>Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT_FEATURE_COUNT = BLOCK_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int STATEMENT__SOURCE = BLOCK__SOURCE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int STATEMENT__NAME = BLOCK__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int STATEMENT__CONTENTS = BLOCK__CONTENTS;
-
-	/**
-	 * The number of structural features of the the '<em>Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATEMENT_FEATURE_COUNT = BLOCK_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE__EANNOTATIONS = EcorePackage.EPACKAGE__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PACKAGE__NAME = EcorePackage.EPACKAGE__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PACKAGE__NS_URI = EcorePackage.EPACKAGE__NS_URI;
-	/**
-	 * The feature id for the '<em><b>Ns Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE__NS_PREFIX = EcorePackage.EPACKAGE__NS_PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>EFactory Instance</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE__EFACTORY_INSTANCE = EcorePackage.EPACKAGE__EFACTORY_INSTANCE;
-
-	/**
-	 * The feature id for the '<em><b>EClassifiers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE__ECLASSIFIERS = EcorePackage.EPACKAGE__ECLASSIFIERS;
-
-	/**
-	 * The feature id for the '<em><b>ESubpackages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE__ESUBPACKAGES = EcorePackage.EPACKAGE__ESUBPACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>ESuper Package</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE__ESUPER_PACKAGE = EcorePackage.EPACKAGE__ESUPER_PACKAGE;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PACKAGE__JAVA_CLASSES = EcorePackage.EPACKAGE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Java Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_PACKAGE_FEATURE_COUNT = EcorePackage.EPACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_DATA_TYPE__NAME = EcorePackage.ECLASS__NAME;
-	/**
-	 * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_DATA_TYPE__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
-	/**
-	 * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EReferences</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EAttributes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EID Attribute</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES;
-
-	/**
-	 * The number of structural features of the the '<em>Java Data Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_DATA_TYPE_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EANNOTATIONS = JAVA_CLASS__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__NAME = JAVA_CLASS__NAME;
-	/**
-	 * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__INSTANCE_CLASS_NAME = JAVA_CLASS__INSTANCE_CLASS_NAME;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__INSTANCE_CLASS = JAVA_CLASS__INSTANCE_CLASS;
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__DEFAULT_VALUE = JAVA_CLASS__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EPACKAGE = JAVA_CLASS__EPACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__ABSTRACT = JAVA_CLASS__ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__INTERFACE = JAVA_CLASS__INTERFACE;
-
-	/**
-	 * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__ESUPER_TYPES = JAVA_CLASS__ESUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EOPERATIONS = JAVA_CLASS__EOPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EALL_ATTRIBUTES = JAVA_CLASS__EALL_ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EALL_REFERENCES = JAVA_CLASS__EALL_REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EReferences</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EREFERENCES = JAVA_CLASS__EREFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>EAttributes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EATTRIBUTES = JAVA_CLASS__EATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EALL_CONTAINMENTS = JAVA_CLASS__EALL_CONTAINMENTS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EALL_OPERATIONS = JAVA_CLASS__EALL_OPERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EALL_STRUCTURAL_FEATURES = JAVA_CLASS__EALL_STRUCTURAL_FEATURES;
-
-	/**
-	 * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__EALL_SUPER_TYPES = JAVA_CLASS__EALL_SUPER_TYPES;
-
-	/**
-	 * The feature id for the '<em><b>EID Attribute</b></em>' reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ARRAY_TYPE__EID_ATTRIBUTE = JAVA_CLASS__EID_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__ESTRUCTURAL_FEATURES = JAVA_CLASS__ESTRUCTURAL_FEATURES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__KIND = JAVA_CLASS__KIND;
-	/**
-	 * The feature id for the '<em><b>Public</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__PUBLIC = JAVA_CLASS__PUBLIC;
-
-	/**
-	 * The feature id for the '<em><b>Final</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE__FINAL = JAVA_CLASS__FINAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__IMPLEMENTS_INTERFACES = JAVA_CLASS__IMPLEMENTS_INTERFACES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__CLASS_IMPORT = JAVA_CLASS__CLASS_IMPORT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__PACKAGE_IMPORTS = JAVA_CLASS__PACKAGE_IMPORTS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__FIELDS = JAVA_CLASS__FIELDS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__METHODS = JAVA_CLASS__METHODS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__INITIALIZERS = JAVA_CLASS__INITIALIZERS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__DECLARED_CLASSES = JAVA_CLASS__DECLARED_CLASSES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__DECLARING_CLASS = JAVA_CLASS__DECLARING_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__JAVA_PACKAGE = JAVA_CLASS__JAVA_PACKAGE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__EVENTS = JAVA_CLASS__EVENTS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__ALL_EVENTS = JAVA_CLASS__ALL_EVENTS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__ARRAY_DIMENSIONS = JAVA_CLASS_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARRAY_TYPE__COMPONENT_TYPE = JAVA_CLASS_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>Array Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARRAY_TYPE_FEATURE_COUNT = JAVA_CLASS_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__EANNOTATIONS = EcorePackage.ESTRUCTURAL_FEATURE__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_EVENT__NAME = EcorePackage.ESTRUCTURAL_FEATURE__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__ORDERED = EcorePackage.ESTRUCTURAL_FEATURE__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__UNIQUE = EcorePackage.ESTRUCTURAL_FEATURE__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__LOWER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__UPPER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__MANY = EcorePackage.ESTRUCTURAL_FEATURE__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__REQUIRED = EcorePackage.ESTRUCTURAL_FEATURE__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__ETYPE = EcorePackage.ESTRUCTURAL_FEATURE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__CHANGEABLE = EcorePackage.ESTRUCTURAL_FEATURE__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__VOLATILE = EcorePackage.ESTRUCTURAL_FEATURE__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__TRANSIENT = EcorePackage.ESTRUCTURAL_FEATURE__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__DEFAULT_VALUE_LITERAL = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__DEFAULT_VALUE = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__UNSETTABLE = EcorePackage.ESTRUCTURAL_FEATURE__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__DERIVED = EcorePackage.ESTRUCTURAL_FEATURE__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT__ECONTAINING_CLASS = EcorePackage.ESTRUCTURAL_FEATURE__ECONTAINING_CLASS;
-
-	/**
-	 * The number of structural features of the the '<em>Java Event</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EVENT_FEATURE_COUNT = EcorePackage.ESTRUCTURAL_FEATURE_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_VISIBILITY_KIND = 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_PARAMETER_KIND = 14;
-	/**
-	 * The meta object id for the '<em>JType Java Helpers</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.java.JavaHelpers
-	 * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJTypeJavaHelpers()
-	 * @generated
-	 */
-	int JTYPE_JAVA_HELPERS = 15;
-
-	/**
-	 * The meta object id for the '<em>JType List</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.List
-	 * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJTypeList()
-	 * @generated
-	 */
-	int JTYPE_LIST = 16;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TYPE_KIND = 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "java.xmi";
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jem.java";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JavaRefPackage eINSTANCE = org.eclipse.jem.java.internal.impl.JavaRefPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaClass object
-	 */
-	EClass getJavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJavaClass_Kind();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Public</em>'.
-	 * @see org.eclipse.jem.java.JavaClass#isPublic()
-	 * @see #getJavaClass()
-	 * @generated
-	 */
-	EAttribute getJavaClass_Public();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Final</em>'.
-	 * @see org.eclipse.jem.java.JavaClass#isFinal()
-	 * @see #getJavaClass()
-	 * @generated
-	 */
-	EAttribute getJavaClass_Final();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_ImplementsInterfaces();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_ClassImport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_PackageImports();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_Fields();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_Methods();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_Initializers();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_DeclaringClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_DeclaredClasses();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_JavaPackage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_Events();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaClass_AllEvents();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Field object
-	 */
-	EClass getField();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isFinal <em>Final</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Final</em>'.
-	 * @see org.eclipse.jem.java.Field#isFinal()
-	 * @see #getField()
-	 * @generated
-	 */
-	EAttribute getField_Final();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isStatic <em>Static</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Static</em>'.
-	 * @see org.eclipse.jem.java.Field#isStatic()
-	 * @see #getField()
-	 * @generated
-	 */
-	EAttribute getField_Static();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getField_JavaVisibility();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isTransient <em>Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transient</em>'.
-	 * @see org.eclipse.jem.java.Field#isTransient()
-	 * @see #getField()
-	 * @generated
-	 */
-	EAttribute getField_Transient();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isVolatile <em>Volatile</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Volatile</em>'.
-	 * @see org.eclipse.jem.java.Field#isVolatile()
-	 * @see #getField()
-	 * @generated
-	 */
-	EAttribute getField_Volatile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getField_JavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getField_Initializer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Method object
-	 */
-	EClass getMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isAbstract <em>Abstract</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Abstract</em>'.
-	 * @see org.eclipse.jem.java.Method#isAbstract()
-	 * @see #getMethod()
-	 * @generated
-	 */
-	EAttribute getMethod_Abstract();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isNative <em>Native</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Native</em>'.
-	 * @see org.eclipse.jem.java.Method#isNative()
-	 * @see #getMethod()
-	 * @generated
-	 */
-	EAttribute getMethod_Native();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isSynchronized <em>Synchronized</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Synchronized</em>'.
-	 * @see org.eclipse.jem.java.Method#isSynchronized()
-	 * @see #getMethod()
-	 * @generated
-	 */
-	EAttribute getMethod_Synchronized();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isFinal <em>Final</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Final</em>'.
-	 * @see org.eclipse.jem.java.Method#isFinal()
-	 * @see #getMethod()
-	 * @generated
-	 */
-	EAttribute getMethod_Final();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isConstructor <em>Constructor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Constructor</em>'.
-	 * @see org.eclipse.jem.java.Method#isConstructor()
-	 * @see #getMethod()
-	 * @generated
-	 */
-	EAttribute getMethod_Constructor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isStatic <em>Static</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Static</em>'.
-	 * @see org.eclipse.jem.java.Method#isStatic()
-	 * @see #getMethod()
-	 * @generated
-	 */
-	EAttribute getMethod_Static();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethod_JavaVisibility();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethod_Parameters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethod_JavaExceptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethod_JavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethod_Source();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaParameter object
-	 */
-	EClass getJavaParameter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaParameter#isFinal <em>Final</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Final</em>'.
-	 * @see org.eclipse.jem.java.JavaParameter#isFinal()
-	 * @see #getJavaParameter()
-	 * @generated
-	 */
-	EAttribute getJavaParameter_Final();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJavaParameter_ParameterKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ArrayType object
-	 */
-	EClass getArrayType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getArrayType_ArrayDimensions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getArrayType_ComponentType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaDataType object
-	 */
-	EClass getJavaDataType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaEvent object
-	 */
-	EClass getJavaEvent();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaPackage object
-	 */
-	EClass getJavaPackage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJavaPackage_JavaClasses();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Block object
-	 */
-	EClass getBlock();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getBlock_Source();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getBlock_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getBlock_Contents();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Comment object
-	 */
-	EClass getComment();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Statement object
-	 */
-	EClass getStatement();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Initializer object
-	 */
-	EClass getInitializer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitializer_IsStatic();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getInitializer_JavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getInitializer_Source();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaVisibilityKind object
-	 */
-	EEnum getJavaVisibilityKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaParameterKind object
-	 */
-	EEnum getJavaParameterKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TypeKind object
-	 */
-	EEnum getTypeKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JTypeList object
-	 */
-	EDataType getJTypeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JTypeJavaHelpers object
-	 */
-	EDataType getJTypeJavaHelpers();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	JavaRefFactory getJavaRefFactory();
-
-} //JavaRefPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java
deleted file mode 100644
index 9f6792873..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaURL.java,v $
- *  $Revision: 1.8 $  $Date: 2006/05/17 20:13:08 $ 
- */
-
-
-/**
- * @deprecated Use the appropriate {@link JavaRefFactory} URI methods instead.
- * 
- * @since 1.2.0
- */
-public class JavaURL extends org.eclipse.jem.java.internal.impl.URL {
-	public static final String JAVA_PROTOCOL_URI_PREFIX = "java:/"; //$NON-NLS-1$
-	/**
-	 * JavaURL constructor comment.
-	 * @param urlString java.lang.String
-	 * 
-	 * @deprecated Use {@link JavaRefFactory#createTypeURI(String)} or {@link JavaRefFactory#createPackageURI(String)}
-	 */
-	public JavaURL(String urlString) {
-		super(urlString);
-	}
-	/**
-	 * JavaURL constructor comment.
-	 * @param nameSpaceName java.lang.String
-	 * @param iD java.lang.String
-	 * @deprecated Use {@link JavaRefFactory#createTypeURI(String, String)}
-	 * 
-	 */
-	public JavaURL(String nameSpaceName, String iD) {
-		super(null, null);
-		initializeNamespaceString(nameSpaceName);
-		this.ID = iD;
-	}
-	
-	/**
-	 * 
-	 * @return
-	 * @deprecated Use {@link JavaRefFactory#getTypeName(org.eclipse.emf.common.util.URI)} 
-	 */
-	public String getClassName() {
-		return ID;
-	}
-	
-	/**
-	 * This method was created in VisualAge.
-	 * @return java.lang.String
-	 * 
-	 * @deprecated Use {@link JavaRefFactory#getFullTypeName(org.eclipse.emf.common.util.URI)}
-	 */
-	public String getFullString() {
-		StringBuffer buf = new StringBuffer();
-		if (namespaceName != null) {
-			buf.append(namespaceName);
-			if (ID != null)
-				buf.append("#"); //$NON-NLS-1$
-		}
-		if (ID != null)
-			buf.append(ID);
-		return buf.toString();
-	}
-	
-	/**
-	 * 
-	 * @return
-	 * @deprecated Use {@link JavaRefFactory#getPackageName(org.eclipse.emf.common.util.URI)}
-	 * @since 1.2.0
-	 */
-	public String getPackageName() {
-		String internalName = namespaceName.substring(JAVA_PROTOCOL_URI_PREFIX.length(), namespaceName.length());
-		return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(internalName) ? "" : internalName; //$NON-NLS-1$
-	}
-	/* If we don't have a # sign to delimit the start of the java package us the inherited behavior
-	 */
-	public void initializeFromString(String url) {
-		if (url.indexOf("#") != -1) //$NON-NLS-1$
-			super.initializeFromString(url);
-		else {
-			int endOfPackageName = url.lastIndexOf('.');
-			if (endOfPackageName == -1)
-				initializeNamespaceString(null);
-			else
-				initializeNamespaceString(url.substring(0, endOfPackageName));
-			ID = url.substring(endOfPackageName + 1);
-		}
-
-	}
-	/* 
-	 */
-	public void initializeNamespaceString(String aNamespaceName) {
-		if (aNamespaceName == null)
-			namespaceName = JAVA_PROTOCOL_URI_PREFIX;
-		else
-			namespaceName = JAVA_PROTOCOL_URI_PREFIX + aNamespaceName;
-	}
-	
-	/**
-	 * 
-	 * @param aUrlString
-	 * @return
-	 * @deprecated Use {@link JavaRefFactory#isJavaURI(org.eclipse.emf.common.util.URI)} 
-	 */
-	public static boolean isJavaURL(String aUrlString) {
-		if (aUrlString == null)
-			return false;
-		return aUrlString.startsWith(JAVA_PROTOCOL_URI_PREFIX);
-	}
-
-	public String toString() {
-		return "URL(" + getFullString() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java
deleted file mode 100644
index 4ce813da6..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaVisibilityKind.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Java Visibility Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * PACKAGE=1
- * PUBLIC=2
- * PRIVATE=3
- * PROTECTED=4
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaVisibilityKind()
- * @model
- * @generated
- */
-public final class JavaVisibilityKind extends AbstractEnumerator
-{
-	/**
-	 * The '<em><b>PUBLIC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #PUBLIC_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int PUBLIC = 0;
-
-	/**
-	 * The '<em><b>PRIVATE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #PRIVATE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int PRIVATE = 1;
-
-	/**
-	 * The '<em><b>PROTECTED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #PROTECTED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int PROTECTED = 2;
-
-	/**
-	 * The '<em><b>PACKAGE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #PACKAGE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int PACKAGE = 3;
-
-	/**
-	 * The '<em><b>PUBLIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>PUBLIC</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #PUBLIC
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaVisibilityKind PUBLIC_LITERAL = new JavaVisibilityKind(PUBLIC, "PUBLIC");
-
-	/**
-	 * The '<em><b>PRIVATE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>PRIVATE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #PRIVATE
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaVisibilityKind PRIVATE_LITERAL = new JavaVisibilityKind(PRIVATE, "PRIVATE");
-
-	/**
-	 * The '<em><b>PROTECTED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>PROTECTED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #PROTECTED
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaVisibilityKind PROTECTED_LITERAL = new JavaVisibilityKind(PROTECTED, "PROTECTED");
-
-	/**
-	 * The '<em><b>PACKAGE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>PACKAGE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #PACKAGE
-	 * @generated
-	 * @ordered
-	 */
-  public static final JavaVisibilityKind PACKAGE_LITERAL = new JavaVisibilityKind(PACKAGE, "PACKAGE");
-
-	/**
-	 * An array of all the '<em><b>Java Visibility Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static final JavaVisibilityKind[] VALUES_ARRAY =
-		new JavaVisibilityKind[] {
-			PUBLIC_LITERAL,
-			PRIVATE_LITERAL,
-			PROTECTED_LITERAL,
-			PACKAGE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Java Visibility Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Java Visibility Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public static JavaVisibilityKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			JavaVisibilityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Java Visibility Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public static JavaVisibilityKind get(int value) {
-		switch (value) {
-			case PUBLIC: return PUBLIC_LITERAL;
-			case PRIVATE: return PRIVATE_LITERAL;
-			case PROTECTED: return PROTECTED_LITERAL;
-			case PACKAGE: return PACKAGE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private JavaVisibilityKind(int value, String name) {
-		super(value, name);
-	}
-
-} //JavaVisibilityKind
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java
deleted file mode 100644
index 3e5369e93..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: Method.java,v $
- *  $Revision: 1.7 $  $Date: 2005/09/15 13:42:04 $ 
- */
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EOperation;
-
-/**
- * @generated
- */
-public interface Method extends EOperation{
-
-	public static final String GENERATED_COMMENT_TAG = "@generated";
-	/**
-	 * Lists all the parameters, excluding the return type
-	 */ 
-	public JavaParameter[] listParametersWithoutReturn();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsAbstract attribute
-	 */
-	boolean isAbstract();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#isAbstract <em>Abstract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abstract</em>' attribute.
-	 * @see #isAbstract()
-	 * @generated
-	 */
-	void setAbstract(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsNative attribute
-	 */
-	boolean isNative();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#isNative <em>Native</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Native</em>' attribute.
-	 * @see #isNative()
-	 * @generated
-	 */
-	void setNative(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsSynchronized attribute
-	 */
-	boolean isSynchronized();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#isSynchronized <em>Synchronized</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Synchronized</em>' attribute.
-	 * @see #isSynchronized()
-	 * @generated
-	 */
-	void setSynchronized(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsFinal attribute
-	 */
-	boolean isFinal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#isFinal <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Final</em>' attribute.
-	 * @see #isFinal()
-	 * @generated
-	 */
-	void setFinal(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsConstructor attribute
-	 */
-	boolean isConstructor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#isConstructor <em>Constructor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constructor</em>' attribute.
-	 * @see #isConstructor()
-	 * @generated
-	 */
-	void setConstructor(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsStatic attribute
-	 */
-	boolean isStatic();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#isStatic <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Static</em>' attribute.
-	 * @see #isStatic()
-	 * @generated
-	 */
-	void setStatic(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the JavaVisibility attribute
-	 */
-	JavaVisibilityKind getJavaVisibility();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#getJavaVisibility <em>Java Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Visibility</em>' attribute.
-	 * @see org.eclipse.jem.java.JavaVisibilityKind
-	 * @see #getJavaVisibility()
-	 * @generated
-	 */
-	void setJavaVisibility(JavaVisibilityKind value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Parameters references
-	 */
-	EList getParameters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of JavaExceptions references
-	 */
-	EList getJavaExceptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The JavaClass reference
-	 */
-	JavaClass getJavaClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#getJavaClass <em>Java Class</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Class</em>' container reference.
-	 * @see #getJavaClass()
-	 * @generated
-	 */
-	void setJavaClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Source reference
-	 */
-	Block getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.java.Method#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' reference.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(Block value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return the java class that this method is defined in.
-	 */
-	JavaClass getContainingJavaClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return a String with the the method name and its parameters. e.g. <code>
-	 * setFirstName(java.lang.String) <//code> .
-	 *  
-	 */
-	String getMethodElementSignature();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Return a Parameter with the passed name, or null.
-	 */
-	JavaParameter getParameter(String parameterName);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Get the return type.
-	 */
-	JavaHelpers getReturnType();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set the return type
-	 * <!-- end-model-doc -->
-	 * @model typeDataType="org.eclipse.jem.java.JTypeJavaHelpers"
-	 * @generated
-	 */
-	void setReturnType(JavaHelpers type);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Replicate the functionality of java.lang.reflect.Method.toString().
-	 * 
-	 * Returns a string describing this Method.  The string is formatted as the method 
-	 * access modifiers, if any, followed by the method return type, followed by a
-	 * space, followed by the class declaring the method, followed by a period,
-	 * followed by the method name, followed by a parenthesized, comma-separated list
-	 * of the method's formal parameter types. If the method throws checked
-	 * exceptions, the parameter list is followed by a space, followed by the word
-	 * throws followed by a comma-separated list of the thrown exception types.
-	 * 
-	 * For example:
-	 * 
-	 *     public boolean java.lang.Object.equals(java.lang.Object)
-	 * 
-	 * The access modifiers are placed in canonical order as specified by "The Java
-	 * Language Specification".  This is public, <tt>protected<//tt> or
-	 * <tt>private<//tt> first, and then other modifiers in the following order:
-	 * <tt>abstract<//tt>, <tt>static<//tt>, <tt>final<//tt>, <tt>synchronized<//tt>
-	 * <tt>native<//tt>.
-
-	 */
-	String getSignature();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Returns true if the method is system generated.
-	 * This is usually determined by the @generated tag in the comment.
-	 */
-	boolean isGenerated();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set the isGenerated flag.
-	 * <!-- end-model-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setIsGenerated(boolean generated);
-
-    /**
-	 * @generated This field/method will be replaced during code generation 
-	 * Is this a void return type method.
-	 */
-	boolean isVoid();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java
deleted file mode 100644
index 1aa557ead..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: Statement.java,v $
- *  $Revision: 1.5 $  $Date: 2005/08/24 20:20:24 $ 
- */
-package org.eclipse.jem.java;
-
-/**
- * @generated
- */
-public interface Statement extends Block {
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java
deleted file mode 100644
index e2a5769a0..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: TypeKind.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Type Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage#getTypeKind()
- * @model
- * @generated
- */
-public final class TypeKind extends AbstractEnumerator
-{
-	/**
-	 * The '<em><b>UNDEFINED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #UNDEFINED_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int UNDEFINED = 0;
-
-	/**
-	 * The '<em><b>CLASS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #CLASS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int CLASS = 1;
-
-	/**
-	 * The '<em><b>INTERFACE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #INTERFACE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int INTERFACE = 2;
-
-	/**
-	 * The '<em><b>EXCEPTION</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #EXCEPTION_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-  public static final int EXCEPTION = 3;
-
-	/**
-	 * The '<em><b>UNDEFINED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNDEFINED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #UNDEFINED
-	 * @generated
-	 * @ordered
-	 */
-  public static final TypeKind UNDEFINED_LITERAL = new TypeKind(UNDEFINED, "UNDEFINED");
-
-	/**
-	 * The '<em><b>CLASS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>CLASS</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #CLASS
-	 * @generated
-	 * @ordered
-	 */
-  public static final TypeKind CLASS_LITERAL = new TypeKind(CLASS, "CLASS");
-
-	/**
-	 * The '<em><b>INTERFACE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>INTERFACE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #INTERFACE
-	 * @generated
-	 * @ordered
-	 */
-  public static final TypeKind INTERFACE_LITERAL = new TypeKind(INTERFACE, "INTERFACE");
-
-	/**
-	 * The '<em><b>EXCEPTION</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>EXCEPTION</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @see #EXCEPTION
-	 * @generated
-	 * @ordered
-	 */
-  public static final TypeKind EXCEPTION_LITERAL = new TypeKind(EXCEPTION, "EXCEPTION");
-
-	/**
-	 * An array of all the '<em><b>Type Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static final TypeKind[] VALUES_ARRAY =
-		new TypeKind[] {
-			UNDEFINED_LITERAL,
-			CLASS_LITERAL,
-			INTERFACE_LITERAL,
-			EXCEPTION_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Type Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Type Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public static TypeKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TypeKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Type Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public static TypeKind get(int value) {
-		switch (value) {
-			case UNDEFINED: return UNDEFINED_LITERAL;
-			case CLASS: return CLASS_LITERAL;
-			case INTERFACE: return INTERFACE_LITERAL;
-			case EXCEPTION: return EXCEPTION_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private TypeKind(int value, String name) {
-		super(value, name);
-	}
-
-} //TypeKind
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKey.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKey.java
deleted file mode 100644
index 4605d58cb..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKey.java
+++ /dev/null
@@ -1,129 +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
- *******************************************************************************/
-/*
- *  $RCSfile: IJavaReflectionKey.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-package org.eclipse.jem.java.adapters;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jem.java.*;
-
-public interface IJavaReflectionKey {
-
-	/* Constants for the primitive type names
-	 * These are the values which are used to refer to a primitive type,
-	 * i.e. new JavaURL("int")  or new URL("java://#int")
-	 * These types are cached by pre-loading documents for the primitives,
-	 * in "java://", and for the java.lang (Object and String) classes
-	 */
-	static final public String N_VOID = "void";	 //$NON-NLS-1$
-	static final public String N_INT = "int";//$NON-NLS-1$
-	static final public String N_BOOLEAN = "boolean";//$NON-NLS-1$
-	static final public String N_CHAR = "char";//$NON-NLS-1$
-	static final public String N_BYTE = "byte";//$NON-NLS-1$
-	static final public String N_LONG = "long";//$NON-NLS-1$
-	static final public String N_FLOAT = "float";//$NON-NLS-1$
-	static final public String N_DOUBLE = "double";//$NON-NLS-1$
-	static final public String N_SHORT = "short";//$NON-NLS-1$
-
-	/* 
-	 * Create an ArrayType instance in the current document
-	 * Handles the push and pop of the current document.
-	 */
-	public abstract ArrayType createArrayType();
-
-	/* 
-	 * Create a JavaClass instance in the current document
-	 * Handles the push and pop of the current document.
-	 */
-	public abstract JavaClass createJavaClass();
-
-	/* 
-	 * Create a Field instance in the current document
-	 * Handles the push and pop of the current document.
-	 */
-	public abstract Field createJavaField();
-
-	/* 
-	 * Create a Method instance in the current document
-	 * Handles the push and pop of the current document.
-	 */
-	public abstract Method createJavaMethod();
-
-	/* 
-	 * Create a JavaParameter instance in the current document
-	 */
-	public abstract JavaParameter createJavaParameter();
-
-	//FB/**
-	//FB * Override to try to introspect objects
-	//FB * that aren't found using the default mechanism.
-	//FB */
-	//FBpublic Object get(Object key) {
-	//FB 	Object javaObject = super.get(key);
-	//FB 	if (javaObject == null) {
-	//FB 		javaObject = getObjectFromExtensions((String) key);
-	//FB 		if (javaObject == null)
-	//FB 			javaObject = getJavaObject((String) key);
-	//FB 	}
-	//FB	return javaObject;
-	//FB}
-
-	//FB ADDED
-	public abstract Object get(String key);
-
-	//FB END
-
-	/*
-	 * Instantiate the named class.
-	 * If we make it to this point, the class has not yet been instantiated or reflected.
-	 */
-	public abstract EClassifier getArrayType(String typeName);
-
-	/*
-	 * Instantiate the named class.
-	 * If we make it to this point, teh class has not yet been instantiated or reflected.
-	 */
-	public abstract EClassifier getJavaClass(String typeName);
-
-	/**
-	 * This allows for the retrieval of attributes/methods with the following notation:
-	 * field: java:/com.ibm.foo#Test.foo
-	 * method: java:/com.ibm.foo#Test.foofoo(
-	 * parameter: java:/com.ibm.foo#Test.foofoo(-arg0
-	 * 
-	 */
-	public abstract EObject getJavaObject(String keyValue);
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (10/4/2000 9:52:28 AM)
-	 * @return org.eclipse.emf.ecore.EClassifier
-	 * @param typeName java.lang.String
-	 */
-	public abstract EClassifier getJavaType(String typeName);
-
-	/**
-	 * Get the object from the key but don't do any 
-	 * tries at creation of the key if not found.
-	 * The Key must be an ID for it to be found.
-	 */
-	public abstract Object primGet(String key);
-
-	/**
-	 * Return true if the passed type represents a Java Array type
-	 */
-	public abstract boolean isArray(String typeName);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKeyExtension.java
deleted file mode 100644
index ba6d35bc8..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IJavaReflectionKeyExtension.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-package org.eclipse.jem.java.adapters;
-
-/**
- * Extension interface to add an additional reflection key in to handle
- * other types of key's not specifically handled.
- * 
- * @since 1.0.0
- */
-public interface IJavaReflectionKeyExtension {
-
-	/**
-	 * Get the object from the given id.
-	 * @param id
-	 * @param reflectionKey
-	 * @return the object (it should add the id with object to the resource's id table before returning it) or <code>null</code> if not one it handles.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object getObject(String id, IJavaReflectionKey reflectionKey);
-	
-}
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/JavaXMIFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/JavaXMIFactory.java
deleted file mode 100644
index 78df6fd5d..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/JavaXMIFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JavaXMIFactory.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-package org.eclipse.jem.java.adapters;
-
-import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
- 
-
-/**
- * Factory for Java XMI Resources.
- * @since 1.2.0
- */
-public interface JavaXMIFactory {
-
-	/**
-	 * Scheme used in URI's for jem elements.
-	 * @since 1.2.0
-	 */
-	public static final String SCHEME = "java"; //$NON-NLS-1$
-	public static final JavaXMIFactory INSTANCE = new JavaXMIFactoryImpl();
-
-	/**
-	 * Register the reflection key extension.
-	 * @param extension
-	 * 
-	 * @since 1.2.0
-	 */
-	public void registerReflectionKeyExtension(IJavaReflectionKeyExtension extension);
-	
-	/**
-	 * Deregister the reflection key extension.
-	 * @param extension
-	 * 
-	 * @since 1.2.0
-	 */
-	public void deregisterReflectionKeyExtension(IJavaReflectionKeyExtension extension);
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java
deleted file mode 100644
index df4c6d37f..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java
+++ /dev/null
@@ -1,43 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JavaRefPackageImpl.java,v $
- *  $Revision: 1.10 $  $Date: 2006/01/17 15:57:42 $ 
- */
-package org.eclipse.jem.java.impl;
-
-import org.eclipse.jem.java.JavaRefPackage;
-
- 
-
-/**
- * 
- * Do not use. This is here only for the older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface.
- * This is kind of API and must not go away, but new clients should not reference this class.
- * @since 1.2.0
- */
-public class JavaRefPackageImpl extends org.eclipse.jem.java.internal.impl.JavaRefPackageImpl {
-
-	public JavaRefPackageImpl() {
-		super(true);
-	}
-	
-	/**
-	 * Do not use. This is here only for the older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface.
-	 * @return
-	 * @deprecated Do not use. This is here only for the older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface.
-	 * @since 1.2.0
-	 */
-	public static JavaRefPackage init() {
-		return org.eclipse.jem.java.internal.impl.JavaRefPackageImpl.init();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/ArrayTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/ArrayTypeImpl.java
deleted file mode 100644
index 8de14f650..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/ArrayTypeImpl.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: ArrayTypeImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/09/15 20:28:04 $ 
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.TypeKind;
-
-/**
- * Describes a Java Array type
- *    For multi-dimensional arrays, it is unlikely that the component type will be
- *    specified directly.  This would require instantiating a chain of component types
- *    such as String[][][][]->String[][][]->String[][]->String[]->String.
- * 
- *   The component type relationship will be computed if the finalComponentType
- *   and array dimensions is specified.
- *  
- *   For this reason, the preferred way to create is through the JavaRefFactory factory method:
- *        createArrayType(JavaClass finalComponentType, int dimensions)
- */
-public class ArrayTypeImpl extends JavaClassImpl implements ArrayType, JavaClass{
-
-	/**
-	 * The default value of the '{@link #getArrayDimensions() <em>Array Dimensions</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getArrayDimensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ARRAY_DIMENSIONS_EDEFAULT = 0;
-
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected int arrayDimensions = ARRAY_DIMENSIONS_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getComponentType() <em>Component Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComponentType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClassifier componentType = null;
-	
-	protected JavaHelpers finalComponentType = null;
-
-	protected ArrayTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getArrayType();
-	}
-
-	/**
-	 * Compute the component type for this array type from our type name.
-	 * The component type of this array type is essentially: new ArrayTypeImpl(finalComponentType, arrayDimensions-1)
-	 * unless our array dimension is 1, in which case it is only our final component type.
-	 *
-	 * In order to ensure a unique instance, we will resolve this type using reflection.
-	 * "java.lang.String[][]" component type is "java.lang.String[]"
-	 *
-	 */
-	public JavaHelpers computeComponentType() {
-		String componentName = getQualifiedNameForReflection();
-		// Strip the last [] form my name to get my component type's name
-		componentName = componentName.substring(0, componentName.length() - 2);
-		return JavaRefFactory.eINSTANCE.reflectType(componentName, this);
-	}
-	/**
-	 * Override to perform some lazy initialization
-	 */
-	public EClassifier getComponentType() {
-		// If we do not have a component type set, but we have a name (which contains our component type name)
-		// we can compute the component type.
-		if ((this.getComponentTypeGen() == null) && (this.getName() != null)) {
-			componentType = computeComponentType();
-		}
-		return getComponentTypeGen();
-	}
-	/**
-	 * Get the component type of this array. 
-	 * 
-	 * If this is a multi-dimensional array, the component type will be the nested array type.
-	 */
-	public JavaHelpers getComponentTypeAsHelper() {
-		return (JavaHelpers) getComponentType();
-	}
-	/**
-	 * Get the final component type for this Array Type.
-	 * 
-	 * In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name.
-	 */
-	public JavaHelpers getFinalComponentType() {
-		if (finalComponentType == null) {
-			String componentName = getQualifiedNameForReflection();
-			// Strip all the [] from my name to get my FINAL component type's name
-			componentName = componentName.substring(0, componentName.indexOf("["));
-			finalComponentType = JavaRefFactory.eINSTANCE.reflectType(componentName, this);
-		}
-		return finalComponentType;
-	}
-	/**
-	 * (JavaHelpers)isArray - ArrayTypes are arrays
-	 * Override from JavaClass.
-	 */    
-	public boolean isArray() {
-		return true;
-	}
-	/**
-	 * Is this an array of java primitives
-	 */
-	public boolean isPrimitiveArray() {
-		return getFinalComponentType().isPrimitive();
-	}
-	/**
-	 * Set the component type.
-	 */
-	public void setComponentType(JavaHelpers helperComponentType) {
-		setComponentType((EClassifier) helperComponentType);		
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public int getArrayDimensions() {
-		return arrayDimensions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setArrayDimensions(int newArrayDimensions) {
-		int oldArrayDimensions = arrayDimensions;
-		arrayDimensions = newArrayDimensions;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS, oldArrayDimensions, arrayDimensions));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.ARRAY_TYPE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.ARRAY_TYPE__INSTANCE_CLASS_NAME:
-				return INSTANCE_CLASS_NAME_EDEFAULT == null ? instanceClassName != null : !INSTANCE_CLASS_NAME_EDEFAULT.equals(instanceClassName);
-			case JavaRefPackage.ARRAY_TYPE__INSTANCE_CLASS:
-				return INSTANCE_CLASS_EDEFAULT == null ? getInstanceClass() != null : !INSTANCE_CLASS_EDEFAULT.equals(getInstanceClass());
-			case JavaRefPackage.ARRAY_TYPE__DEFAULT_VALUE:
-				return DEFAULT_VALUE_EDEFAULT == null ? getDefaultValue() != null : !DEFAULT_VALUE_EDEFAULT.equals(getDefaultValue());
-			case JavaRefPackage.ARRAY_TYPE__EPACKAGE:
-				return getEPackage() != null;
-			case JavaRefPackage.ARRAY_TYPE__ABSTRACT:
-				return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__INTERFACE:
-				return ((eFlags & INTERFACE_EFLAG) != 0) != INTERFACE_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__ESUPER_TYPES:
-				return eSuperTypes != null && !eSuperTypes.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EOPERATIONS:
-				return eOperations != null && !eOperations.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EALL_ATTRIBUTES:
-				return !getEAllAttributes().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EALL_REFERENCES:
-				return !getEAllReferences().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EREFERENCES:
-				return !getEReferences().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EATTRIBUTES:
-				return !getEAttributes().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EALL_CONTAINMENTS:
-				return !getEAllContainments().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EALL_OPERATIONS:
-				return !getEAllOperations().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EALL_STRUCTURAL_FEATURES:
-				return !getEAllStructuralFeatures().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EALL_SUPER_TYPES:
-				return !getEAllSuperTypes().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__EID_ATTRIBUTE:
-				return getEIDAttribute() != null;
-			case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES:
-				return eStructuralFeatures != null && !eStructuralFeatures.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__KIND:
-				return kind != KIND_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__PUBLIC:
-				return ((eFlags & PUBLIC_EFLAG) != 0) != PUBLIC_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__FINAL:
-				return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__IMPLEMENTS_INTERFACES:
-				return implementsInterfaces != null && !implementsInterfaces.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__CLASS_IMPORT:
-				return classImport != null && !classImport.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__PACKAGE_IMPORTS:
-				return packageImports != null && !packageImports.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__FIELDS:
-				return fields != null && !fields.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__METHODS:
-				return methods != null && !methods.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__INITIALIZERS:
-				return initializers != null && !initializers.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__DECLARED_CLASSES:
-				return declaredClasses != null && !declaredClasses.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__DECLARING_CLASS:
-				return declaringClass != null;
-			case JavaRefPackage.ARRAY_TYPE__JAVA_PACKAGE:
-				return basicGetJavaPackage() != null;
-			case JavaRefPackage.ARRAY_TYPE__EVENTS:
-				return events != null && !events.isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__ALL_EVENTS:
-				return !getAllEvents().isEmpty();
-			case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
-				return arrayDimensions != ARRAY_DIMENSIONS_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
-				return componentType != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.ARRAY_TYPE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__INSTANCE_CLASS_NAME:
-				setInstanceClassName((String)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ABSTRACT:
-				setAbstract(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.ARRAY_TYPE__INTERFACE:
-				setInterface(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ESUPER_TYPES:
-				getESuperTypes().clear();
-				getESuperTypes().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__EOPERATIONS:
-				getEOperations().clear();
-				getEOperations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES:
-				getEStructuralFeatures().clear();
-				getEStructuralFeatures().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__KIND:
-				setKind((TypeKind)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__PUBLIC:
-				setPublic(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.ARRAY_TYPE__FINAL:
-				setFinal(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.ARRAY_TYPE__IMPLEMENTS_INTERFACES:
-				getImplementsInterfaces().clear();
-				getImplementsInterfaces().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__CLASS_IMPORT:
-				getClassImport().clear();
-				getClassImport().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__PACKAGE_IMPORTS:
-				getPackageImports().clear();
-				getPackageImports().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__FIELDS:
-				getFields().clear();
-				getFields().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__METHODS:
-				getMethods().clear();
-				getMethods().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__INITIALIZERS:
-				getInitializers().clear();
-				getInitializers().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__DECLARED_CLASSES:
-				getDeclaredClasses().clear();
-				getDeclaredClasses().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__DECLARING_CLASS:
-				setDeclaringClass((JavaClass)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__EVENTS:
-				getEvents().clear();
-				getEvents().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ALL_EVENTS:
-				getAllEvents().clear();
-				getAllEvents().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
-				setArrayDimensions(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
-				setComponentType((EClassifier)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.ARRAY_TYPE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__INSTANCE_CLASS_NAME:
-				setInstanceClassName(INSTANCE_CLASS_NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ABSTRACT:
-				setAbstract(ABSTRACT_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__INTERFACE:
-				setInterface(INTERFACE_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ESUPER_TYPES:
-				getESuperTypes().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__EOPERATIONS:
-				getEOperations().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES:
-				getEStructuralFeatures().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__KIND:
-				setKind(KIND_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__PUBLIC:
-				setPublic(PUBLIC_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__FINAL:
-				setFinal(FINAL_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__IMPLEMENTS_INTERFACES:
-				getImplementsInterfaces().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__CLASS_IMPORT:
-				getClassImport().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__PACKAGE_IMPORTS:
-				getPackageImports().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__FIELDS:
-				getFields().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__METHODS:
-				getMethods().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__INITIALIZERS:
-				getInitializers().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__DECLARED_CLASSES:
-				getDeclaredClasses().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__DECLARING_CLASS:
-				setDeclaringClass((JavaClass)null);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__EVENTS:
-				getEvents().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ALL_EVENTS:
-				getAllEvents().clear();
-				return;
-			case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
-				setArrayDimensions(ARRAY_DIMENSIONS_EDEFAULT);
-				return;
-			case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
-				setComponentType((EClassifier)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (arrayDimensions: ");
-		result.append(arrayDimensions);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EClassifier getComponentTypeGen() {
-		if (componentType != null && componentType.eIsProxy()) {
-			EClassifier oldComponentType = componentType;
-			componentType = (EClassifier)eResolveProxy((InternalEObject)componentType);
-			if (componentType != oldComponentType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE, oldComponentType, componentType));
-			}
-		}
-		return componentType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClassifier basicGetComponentType() {
-		return componentType;
-	}
-
-	public void setComponentType(EClassifier newComponentType) {
-		finalComponentType = null;
-		setComponentTypeGen(newComponentType);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setComponentTypeGen(EClassifier newComponentType) {
-		EClassifier oldComponentType = componentType;
-		componentType = newComponentType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE, oldComponentType, componentType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.ARRAY_TYPE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__EPACKAGE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.ARRAY_TYPE__EPACKAGE, msgs);
-				case JavaRefPackage.ARRAY_TYPE__EOPERATIONS:
-					return ((InternalEList)getEOperations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES:
-					return ((InternalEList)getEStructuralFeatures()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__FIELDS:
-					return ((InternalEList)getFields()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__METHODS:
-					return ((InternalEList)getMethods()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__INITIALIZERS:
-					return ((InternalEList)getInitializers()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__DECLARED_CLASSES:
-					return ((InternalEList)getDeclaredClasses()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__DECLARING_CLASS:
-					if (declaringClass != null)
-						msgs = ((InternalEObject)declaringClass).eInverseRemove(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
-					return basicSetDeclaringClass((JavaClass)otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.ARRAY_TYPE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__EPACKAGE:
-					return eBasicSetContainer(null, JavaRefPackage.ARRAY_TYPE__EPACKAGE, msgs);
-				case JavaRefPackage.ARRAY_TYPE__EOPERATIONS:
-					return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES:
-					return ((InternalEList)getEStructuralFeatures()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__FIELDS:
-					return ((InternalEList)getFields()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__METHODS:
-					return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__INITIALIZERS:
-					return ((InternalEList)getInitializers()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__DECLARED_CLASSES:
-					return ((InternalEList)getDeclaredClasses()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.ARRAY_TYPE__DECLARING_CLASS:
-					return basicSetDeclaringClass(null, msgs);
-				case JavaRefPackage.ARRAY_TYPE__EVENTS:
-					return ((InternalEList)getEvents()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.ARRAY_TYPE__EPACKAGE:
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ECLASSIFIERS, EPackage.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.ARRAY_TYPE__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.ARRAY_TYPE__NAME:
-				return getName();
-			case JavaRefPackage.ARRAY_TYPE__INSTANCE_CLASS_NAME:
-				return getInstanceClassName();
-			case JavaRefPackage.ARRAY_TYPE__INSTANCE_CLASS:
-				return getInstanceClass();
-			case JavaRefPackage.ARRAY_TYPE__DEFAULT_VALUE:
-				return getDefaultValue();
-			case JavaRefPackage.ARRAY_TYPE__EPACKAGE:
-				return getEPackage();
-			case JavaRefPackage.ARRAY_TYPE__ABSTRACT:
-				return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.ARRAY_TYPE__INTERFACE:
-				return isInterface() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.ARRAY_TYPE__ESUPER_TYPES:
-				return getESuperTypes();
-			case JavaRefPackage.ARRAY_TYPE__EOPERATIONS:
-				return getEOperations();
-			case JavaRefPackage.ARRAY_TYPE__EALL_ATTRIBUTES:
-				return getEAllAttributes();
-			case JavaRefPackage.ARRAY_TYPE__EALL_REFERENCES:
-				return getEAllReferences();
-			case JavaRefPackage.ARRAY_TYPE__EREFERENCES:
-				return getEReferences();
-			case JavaRefPackage.ARRAY_TYPE__EATTRIBUTES:
-				return getEAttributes();
-			case JavaRefPackage.ARRAY_TYPE__EALL_CONTAINMENTS:
-				return getEAllContainments();
-			case JavaRefPackage.ARRAY_TYPE__EALL_OPERATIONS:
-				return getEAllOperations();
-			case JavaRefPackage.ARRAY_TYPE__EALL_STRUCTURAL_FEATURES:
-				return getEAllStructuralFeatures();
-			case JavaRefPackage.ARRAY_TYPE__EALL_SUPER_TYPES:
-				return getEAllSuperTypes();
-			case JavaRefPackage.ARRAY_TYPE__EID_ATTRIBUTE:
-				return getEIDAttribute();
-			case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES:
-				return getEStructuralFeatures();
-			case JavaRefPackage.ARRAY_TYPE__KIND:
-				return getKind();
-			case JavaRefPackage.ARRAY_TYPE__PUBLIC:
-				return isPublic() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.ARRAY_TYPE__FINAL:
-				return isFinal() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.ARRAY_TYPE__IMPLEMENTS_INTERFACES:
-				return getImplementsInterfaces();
-			case JavaRefPackage.ARRAY_TYPE__CLASS_IMPORT:
-				return getClassImport();
-			case JavaRefPackage.ARRAY_TYPE__PACKAGE_IMPORTS:
-				return getPackageImports();
-			case JavaRefPackage.ARRAY_TYPE__FIELDS:
-				return getFields();
-			case JavaRefPackage.ARRAY_TYPE__METHODS:
-				return getMethods();
-			case JavaRefPackage.ARRAY_TYPE__INITIALIZERS:
-				return getInitializers();
-			case JavaRefPackage.ARRAY_TYPE__DECLARED_CLASSES:
-				return getDeclaredClasses();
-			case JavaRefPackage.ARRAY_TYPE__DECLARING_CLASS:
-				if (resolve) return getDeclaringClass();
-				return basicGetDeclaringClass();
-			case JavaRefPackage.ARRAY_TYPE__JAVA_PACKAGE:
-				if (resolve) return getJavaPackage();
-				return basicGetJavaPackage();
-			case JavaRefPackage.ARRAY_TYPE__EVENTS:
-				return getEvents();
-			case JavaRefPackage.ARRAY_TYPE__ALL_EVENTS:
-				return getAllEvents();
-			case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
-				return new Integer(getArrayDimensions());
-			case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
-				if (resolve) return getComponentType();
-				return basicGetComponentType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaClass#getKind()
-	 */
-	public TypeKind getKind() {
-		// Override to always return the class if final type is valid.
-		JavaHelpers ft = getFinalComponentType();
-		if (!ft.isPrimitive()) {
-			TypeKind ftKind = ((JavaClass) ft).getKind(); 
-			return  ftKind != TypeKind.UNDEFINED_LITERAL ? TypeKind.CLASS_LITERAL : TypeKind.UNDEFINED_LITERAL;
-		} else
-			return TypeKind.CLASS_LITERAL;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaClass#isPublic()
-	 */
-	public boolean isPublic() {
-		// Override to return the kind of the final component, because that determines it.
-		JavaHelpers ft = getFinalComponentType();
-		if (!ft.isPrimitive()) {
-			return ((JavaClass) ft).isPublic();
-		} else
-			return true;
-	}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/BlockImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/BlockImpl.java
deleted file mode 100644
index 6eff12ee5..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/BlockImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
- *  $RCSfile: BlockImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.Block;
-import org.eclipse.jem.java.JavaRefPackage;
-
-/**
- * @generated
- */
-public class BlockImpl extends EObjectImpl implements Block{
-
-	/**
-	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SOURCE_EDEFAULT = null;
-
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String source = SOURCE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getContents() <em>Contents</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContents()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList contents = null;
-
-	protected BlockImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getBlock();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getSource() {
-		return source;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSource(String newSource) {
-		String oldSource = source;
-		source = newSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.BLOCK__SOURCE, oldSource, source));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.BLOCK__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getContents() {
-		if (contents == null) {
-			contents = new EObjectContainmentEList(Block.class, this, JavaRefPackage.BLOCK__CONTENTS);
-		}
-		return contents;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.BLOCK__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.BLOCK__SOURCE:
-				return getSource();
-			case JavaRefPackage.BLOCK__NAME:
-				return getName();
-			case JavaRefPackage.BLOCK__CONTENTS:
-				return getContents();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.BLOCK__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case JavaRefPackage.BLOCK__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.BLOCK__CONTENTS:
-				return contents != null && !contents.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.BLOCK__SOURCE:
-				setSource((String)newValue);
-				return;
-			case JavaRefPackage.BLOCK__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.BLOCK__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.BLOCK__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case JavaRefPackage.BLOCK__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.BLOCK__CONTENTS:
-				getContents().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (source: ");
-		result.append(source);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/CommentImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/CommentImpl.java
deleted file mode 100644
index cd18ea3b5..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/CommentImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
- *  $RCSfile: CommentImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.Comment;
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * @generated
- */
-public class CommentImpl extends BlockImpl implements Comment{
-
-	
-	protected CommentImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getComment();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.COMMENT__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.COMMENT__SOURCE:
-				return getSource();
-			case JavaRefPackage.COMMENT__NAME:
-				return getName();
-			case JavaRefPackage.COMMENT__CONTENTS:
-				return getContents();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.COMMENT__SOURCE:
-				setSource((String)newValue);
-				return;
-			case JavaRefPackage.COMMENT__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.COMMENT__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.COMMENT__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case JavaRefPackage.COMMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.COMMENT__CONTENTS:
-				getContents().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.COMMENT__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case JavaRefPackage.COMMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.COMMENT__CONTENTS:
-				return contents != null && !contents.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/FieldImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/FieldImpl.java
deleted file mode 100644
index b1ffc24c0..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/FieldImpl.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: FieldImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2006/05/17 20:13:07 $ 
- */
-package org.eclipse.jem.java.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.ETypedElementImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-
-/**
- * @generated
- */
-public class FieldImpl extends ETypedElementImpl implements Field {
-
-	/**
-	 * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FINAL_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FINAL_EFLAG = 1 << 10;
-
-	/**
-	 * The default value of the '{@link #isStatic() <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean STATIC_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isStatic() <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int STATIC_EFLAG = 1 << 11;
-
-	/**
-	 * The default value of the '{@link #getJavaVisibility() <em>Java Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJavaVisibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final JavaVisibilityKind JAVA_VISIBILITY_EDEFAULT = JavaVisibilityKind.PUBLIC_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaVisibilityKind javaVisibility = JAVA_VISIBILITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isTransient() <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean TRANSIENT_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isTransient() <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int TRANSIENT_EFLAG = 1 << 12;
-
-	/**
-	 * The default value of the '{@link #isVolatile() <em>Volatile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVolatile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean VOLATILE_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isVolatile() <em>Volatile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVolatile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int VOLATILE_EFLAG = 1 << 13;
-
-	/**
-	 * The cached value of the '{@link #getInitializer() <em>Initializer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitializer()
-	 * @generated
-	 * @ordered
-	 */
-	protected Block initializer = null;
-
-	protected FieldImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getField();
-	}
-
-	/**
-	 * createFieldRef - return a JavaURL reference to the named field in the named Java class in the form "package.class_field"
-	 * @deprecated no replacement at this time.
-	 */
-	public static Field createFieldRef(String className, String fieldName) {
-		Field ref = JavaRefFactory.eINSTANCE.createField();
-		URI classURI = JavaRefFactory.eINSTANCE.createTypeURI(className);
-		((InternalEObject) ref).eSetProxyURI(URI.createURI(classURI.toString()+ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER+fieldName));
-		return ref;
-	}
-
-	/**
-	 * Get the class that this field is within.
-	 */
-	public JavaClass getContainingJavaClass() {
-		return this.getJavaClass();
-	}
-
-	/**
-	 * Overrides to perform lazy initializations/reflection.
-	 */
-	public EClassifier getEType() {
-		reflectValues();
-		return super.getEType();
-	}
-
-	public Block getInitializer() {
-		reflectValues();
-		return getInitializerGen();
-	}
-
-	public boolean isFinal() {
-		reflectValues();
-		return isFinalGen();
-	}
-
-	public boolean isStatic() {
-		reflectValues();
-		return isStaticGen();
-	}
-
-	public boolean isTransient() {
-		reflectValues();
-		return isTransientGen();
-	}
-	
-	public boolean isVolatile() {
-		reflectValues();
-		return isVolatileGen();
-	}	
-
-	public JavaHelpers getJavaType() {
-		return (JavaHelpers) getEType();
-	}
-
-	public JavaVisibilityKind getJavaVisibility() {
-		reflectValues();
-		return getJavaVisibilityGen();
-	}
-
-	protected synchronized ReadAdaptor getReadAdapter() {
-		return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(this, ReadAdaptor.TYPE_KEY);
-	}
-
-	protected boolean hasReflected = false;
-
-	protected void reflectValues() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if (!hasReflected) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = readAdaptor.reflectValuesIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				if (setReflected)
-					hasReflected = setReflected;
-			}
-		}
-	}
-
-	/*
-	 * Used by reflection adapter to clear the reflection. This not intended to be used by others.
-	 */
-	public synchronized void setReflected(boolean reflected) {
-		hasReflected = reflected;
-	}
-
-	/**
-	 * Is this field an array type.
-	 */
-	public boolean isArray() {
-		return getJavaType().isArray();
-	}
-
-	/**
-	 * Overridden to prevent the reflection of the class.
-	 */
-	public EList eContents() {
-		EList results = new BasicEList();
-		//FB
-		//FB EList containments = eClass().getEAllContainments();
-		//FB if (containments != null) {
-		//FB Iterator i = containments.iterator();
-		//FB while (i.hasNext()) {
-		//FB EStructuralFeature sf = (EStructuralFeature) i.next();
-		//FB //Change from super to primRefValue
-		//FB Object value = primRefValue(sf);
-		//FB //EndChange
-		//FB if (value != null)
-		//FB if (sf.isMany())
-		//FB results.addAll((Collection) value);
-		//FB else
-		//FB results.add(value);
-		//FB }
-		//FB }
-		if (getInitializerGen() != null)
-			results.add(getInitializerGen()); //FB
-		return results;
-	}
-
-	public String toString() {
-		return getClass().getName() + " " + "(" + getName() + ")";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaVisibilityKind getJavaVisibilityGen() {
-		return javaVisibility;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isFinalGen() {
-		return (eFlags & FINAL_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
-		if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__FINAL, oldFinal, newFinal));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isStaticGen() {
-		return (eFlags & STATIC_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatic(boolean newStatic) {
-		boolean oldStatic = (eFlags & STATIC_EFLAG) != 0;
-		if (newStatic) eFlags |= STATIC_EFLAG; else eFlags &= ~STATIC_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__STATIC, oldStatic, newStatic));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJavaVisibility(JavaVisibilityKind newJavaVisibility) {
-		JavaVisibilityKind oldJavaVisibility = javaVisibility;
-		javaVisibility = newJavaVisibility == null ? JAVA_VISIBILITY_EDEFAULT : newJavaVisibility;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__JAVA_VISIBILITY, oldJavaVisibility, javaVisibility));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isTransientGen() {
-		return (eFlags & TRANSIENT_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransient(boolean newTransient) {
-		boolean oldTransient = (eFlags & TRANSIENT_EFLAG) != 0;
-		if (newTransient) eFlags |= TRANSIENT_EFLAG; else eFlags &= ~TRANSIENT_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__TRANSIENT, oldTransient, newTransient));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isVolatileGen() {
-		return (eFlags & VOLATILE_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVolatile(boolean newVolatile) {
-		boolean oldVolatile = (eFlags & VOLATILE_EFLAG) != 0;
-		if (newVolatile) eFlags |= VOLATILE_EFLAG; else eFlags &= ~VOLATILE_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__VOLATILE, oldVolatile, newVolatile));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getJavaClass() {
-		if (eContainerFeatureID != JavaRefPackage.FIELD__JAVA_CLASS) return null;
-		return (JavaClass)eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJavaClass(JavaClass newJavaClass) {
-		if (newJavaClass != eContainer || (eContainerFeatureID != JavaRefPackage.FIELD__JAVA_CLASS && newJavaClass != null)) {
-			if (EcoreUtil.isAncestor(this, newJavaClass))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newJavaClass != null)
-				msgs = ((InternalEObject)newJavaClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaClass.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newJavaClass, JavaRefPackage.FIELD__JAVA_CLASS, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__JAVA_CLASS, newJavaClass, newJavaClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.FIELD__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.FIELD__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.FIELD__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case JavaRefPackage.FIELD__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case JavaRefPackage.FIELD__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case JavaRefPackage.FIELD__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case JavaRefPackage.FIELD__MANY:
-				return isMany() != MANY_EDEFAULT;
-			case JavaRefPackage.FIELD__REQUIRED:
-				return isRequired() != REQUIRED_EDEFAULT;
-			case JavaRefPackage.FIELD__ETYPE:
-				return eType != null;
-			case JavaRefPackage.FIELD__FINAL:
-				return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
-			case JavaRefPackage.FIELD__STATIC:
-				return ((eFlags & STATIC_EFLAG) != 0) != STATIC_EDEFAULT;
-			case JavaRefPackage.FIELD__JAVA_VISIBILITY:
-				return javaVisibility != JAVA_VISIBILITY_EDEFAULT;
-			case JavaRefPackage.FIELD__TRANSIENT:
-				return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
-			case JavaRefPackage.FIELD__VOLATILE:
-				return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
-			case JavaRefPackage.FIELD__JAVA_CLASS:
-				return getJavaClass() != null;
-			case JavaRefPackage.FIELD__INITIALIZER:
-				return initializer != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.FIELD__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.FIELD__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.FIELD__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.FIELD__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.FIELD__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.FIELD__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.FIELD__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case JavaRefPackage.FIELD__FINAL:
-				setFinal(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.FIELD__STATIC:
-				setStatic(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.FIELD__JAVA_VISIBILITY:
-				setJavaVisibility((JavaVisibilityKind)newValue);
-				return;
-			case JavaRefPackage.FIELD__TRANSIENT:
-				setTransient(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.FIELD__VOLATILE:
-				setVolatile(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.FIELD__JAVA_CLASS:
-				setJavaClass((JavaClass)newValue);
-				return;
-			case JavaRefPackage.FIELD__INITIALIZER:
-				setInitializer((Block)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.FIELD__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.FIELD__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case JavaRefPackage.FIELD__FINAL:
-				setFinal(FINAL_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__STATIC:
-				setStatic(STATIC_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__JAVA_VISIBILITY:
-				setJavaVisibility(JAVA_VISIBILITY_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__TRANSIENT:
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__VOLATILE:
-				setVolatile(VOLATILE_EDEFAULT);
-				return;
-			case JavaRefPackage.FIELD__JAVA_CLASS:
-				setJavaClass((JavaClass)null);
-				return;
-			case JavaRefPackage.FIELD__INITIALIZER:
-				setInitializer((Block)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Block getInitializerGen() {
-		return initializer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInitializer(Block newInitializer, NotificationChain msgs) {
-		Block oldInitializer = initializer;
-		initializer = newInitializer;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__INITIALIZER, oldInitializer, newInitializer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInitializer(Block newInitializer) {
-		if (newInitializer != initializer) {
-			NotificationChain msgs = null;
-			if (initializer != null)
-				msgs = ((InternalEObject)initializer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaRefPackage.FIELD__INITIALIZER, null, msgs);
-			if (newInitializer != null)
-				msgs = ((InternalEObject)newInitializer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaRefPackage.FIELD__INITIALIZER, null, msgs);
-			msgs = basicSetInitializer(newInitializer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__INITIALIZER, newInitializer, newInitializer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.FIELD__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.FIELD__JAVA_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.FIELD__JAVA_CLASS, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.FIELD__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.FIELD__JAVA_CLASS:
-					return eBasicSetContainer(null, JavaRefPackage.FIELD__JAVA_CLASS, msgs);
-				case JavaRefPackage.FIELD__INITIALIZER:
-					return basicSetInitializer(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.FIELD__JAVA_CLASS:
-					return eContainer.eInverseRemove(this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaClass.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.FIELD__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.FIELD__NAME:
-				return getName();
-			case JavaRefPackage.FIELD__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case JavaRefPackage.FIELD__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case JavaRefPackage.FIELD__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case JavaRefPackage.FIELD__FINAL:
-				return isFinal() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__STATIC:
-				return isStatic() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__JAVA_VISIBILITY:
-				return getJavaVisibility();
-			case JavaRefPackage.FIELD__TRANSIENT:
-				return isTransient() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__VOLATILE:
-				return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.FIELD__JAVA_CLASS:
-				return getJavaClass();
-			case JavaRefPackage.FIELD__INITIALIZER:
-				return getInitializer();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (final: ");
-		result.append((eFlags & FINAL_EFLAG) != 0);
-		result.append(", static: ");
-		result.append((eFlags & STATIC_EFLAG) != 0);
-		result.append(", javaVisibility: ");
-		result.append(javaVisibility);
-		result.append(", transient: ");
-		result.append((eFlags & TRANSIENT_EFLAG) != 0);
-		result.append(", volatile: ");
-		result.append((eFlags & VOLATILE_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/InitializerImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/InitializerImpl.java
deleted file mode 100644
index a72550ba4..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/InitializerImpl.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: InitializerImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.Block;
-import org.eclipse.jem.java.Initializer;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * @generated
- */
-public class InitializerImpl extends EObjectImpl implements Initializer{
-
-	/**
-	 * The default value of the '{@link #getIsStatic() <em>Is Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_STATIC_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Boolean isStatic = IS_STATIC_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected Block source = null;
-
-	protected InitializerImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getInitializer();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Boolean getIsStatic() {
-		return isStatic;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setIsStatic(Boolean newIsStatic) {
-		Boolean oldIsStatic = isStatic;
-		isStatic = newIsStatic;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.INITIALIZER__IS_STATIC, oldIsStatic, isStatic));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getJavaClass() {
-		if (eContainerFeatureID != JavaRefPackage.INITIALIZER__JAVA_CLASS) return null;
-		return (JavaClass)eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJavaClass(JavaClass newJavaClass) {
-		if (newJavaClass != eContainer || (eContainerFeatureID != JavaRefPackage.INITIALIZER__JAVA_CLASS && newJavaClass != null)) {
-			if (EcoreUtil.isAncestor(this, newJavaClass))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newJavaClass != null)
-				msgs = ((InternalEObject)newJavaClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__INITIALIZERS, JavaClass.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newJavaClass, JavaRefPackage.INITIALIZER__JAVA_CLASS, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.INITIALIZER__JAVA_CLASS, newJavaClass, newJavaClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Block getSource() {
-		if (source != null && source.eIsProxy()) {
-			Block oldSource = source;
-			source = (Block)eResolveProxy((InternalEObject)source);
-			if (source != oldSource) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.INITIALIZER__SOURCE, oldSource, source));
-			}
-		}
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Block basicGetSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSource(Block newSource) {
-		Block oldSource = source;
-		source = newSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.INITIALIZER__SOURCE, oldSource, source));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.INITIALIZER__JAVA_CLASS, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-					return eBasicSetContainer(null, JavaRefPackage.INITIALIZER__JAVA_CLASS, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-					return eContainer.eInverseRemove(this, JavaRefPackage.JAVA_CLASS__INITIALIZERS, JavaClass.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.INITIALIZER__IS_STATIC:
-				return getIsStatic();
-			case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-				return getJavaClass();
-			case JavaRefPackage.INITIALIZER__SOURCE:
-				if (resolve) return getSource();
-				return basicGetSource();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.INITIALIZER__IS_STATIC:
-				return IS_STATIC_EDEFAULT == null ? isStatic != null : !IS_STATIC_EDEFAULT.equals(isStatic);
-			case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-				return getJavaClass() != null;
-			case JavaRefPackage.INITIALIZER__SOURCE:
-				return source != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.INITIALIZER__IS_STATIC:
-				setIsStatic((Boolean)newValue);
-				return;
-			case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-				setJavaClass((JavaClass)newValue);
-				return;
-			case JavaRefPackage.INITIALIZER__SOURCE:
-				setSource((Block)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.INITIALIZER__IS_STATIC:
-				setIsStatic(IS_STATIC_EDEFAULT);
-				return;
-			case JavaRefPackage.INITIALIZER__JAVA_CLASS:
-				setJavaClass((JavaClass)null);
-				return;
-			case JavaRefPackage.INITIALIZER__SOURCE:
-				setSource((Block)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isStatic: ");
-		result.append(isStatic);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java
deleted file mode 100644
index e2040fda8..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java
+++ /dev/null
@@ -1,1949 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JavaClassImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2006/05/17 20:13:07 $ 
- */
-package org.eclipse.jem.java.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import java.util.*;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.*;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.*;
-
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#isPublic <em>Public</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#isFinal <em>Final</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getImplementsInterfaces <em>Implements Interfaces</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getClassImport <em>Class Import</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getPackageImports <em>Package Imports</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getFields <em>Fields</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getInitializers <em>Initializers</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getDeclaredClasses <em>Declared Classes</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getDeclaringClass <em>Declaring Class</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getJavaPackage <em>Java Package</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getEvents <em>Events</em>}</li>
- *   <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getAllEvents <em>All Events</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaClassImpl extends EClassImpl implements JavaClass {
-
-	/**
-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TypeKind KIND_EDEFAULT = TypeKind.UNDEFINED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TypeKind kind = KIND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isPublic() <em>Public</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPublic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PUBLIC_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isPublic() <em>Public</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPublic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PUBLIC_EFLAG = 1 << 10;
-
-	/**
-	 * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FINAL_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FINAL_EFLAG = 1 << 11;
-
-	/**
-	 * The cached value of the '{@link #getImplementsInterfaces() <em>Implements Interfaces</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplementsInterfaces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList implementsInterfaces = null;
-
-	/**
-	 * The cached value of the '{@link #getClassImport() <em>Class Import</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassImport()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList classImport = null;
-
-	/**
-	 * The cached value of the '{@link #getPackageImports() <em>Package Imports</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackageImports()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList packageImports = null;
-
-	/**
-	 * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList fields = null;
-
-	/**
-	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methods = null;
-
-	/**
-	 * The cached value of the '{@link #getInitializers() <em>Initializers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitializers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initializers = null;
-
-	/**
-	 * The cached value of the '{@link #getDeclaredClasses() <em>Declared Classes</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeclaredClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList declaredClasses = null;
-
-	/**
-	 * The cached value of the '{@link #getDeclaringClass() <em>Declaring Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeclaringClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass declaringClass = null;
-
-	/**
-	 * The cached value of the '{@link #getEvents() <em>Events</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList events = null;
-
-	protected JavaClassImpl() {
-		super();
-	}
-	
-	public EList getEAnnotationsInternal() {
-		return super.getEAnnotations();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getJavaClass();
-	}
-
-	/**
-	 * Protected helper methods.
-	 */
-	protected void collectFieldsExtended(List fields) {
-		fields.addAll(getFields());
-		Iterator it;
-		it = getExtendedLookupIterator();
-		while (it.hasNext())
-			((JavaClassImpl) it.next()).collectFieldsExtended(fields);
-	}
-
-	protected void collectMethodsExtended(Map methods, boolean onlyPublic, List excludedClasses, List excludedMethods) {
-		Iterator it1, it2;
-		it2 = getExtendedLookupIterator();
-		JavaClassImpl javaClass;
-		while (it2.hasNext()) {
-			javaClass = (JavaClassImpl) it2.next();
-			if (!excludedClasses.contains(javaClass))
-				javaClass.collectMethodsExtended(methods, onlyPublic, excludedClasses, excludedMethods);
-		}
-		it1 = onlyPublic ? getPublicMethods().iterator() : getMethods().iterator();
-		Method nextMethod;
-		while (it1.hasNext()) {
-			nextMethod = (Method) it1.next();
-			if (!excludedMethods.contains(nextMethod))
-				methods.put(nextMethod.getMethodElementSignature(), nextMethod);
-		}
-	}
-
-	/**
-	 * createClassRef - return a JavaURL reference to the named Java class
-	 * 
-	 * @deprecated @see org.eclipse.jem.java.JavaRefFactory#createClassRef(java.lang.String)
-	 */
-	public static JavaClass createClassRef(String targetName) {
-		return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-	}
-
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 */
-	protected Method findClassMethodExtended(String methodName, List parameterTypes) {
-		Method method = getMethod(methodName, parameterTypes);
-		if (method != null)
-			return method;
-		else {
-			JavaClassImpl mySuper;
-			mySuper = (JavaClassImpl) getSupertype();
-			if (mySuper != null)
-				return mySuper.findClassMethodExtended(methodName, parameterTypes);
-		}
-		return null;
-	}
-
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 */
-	protected Method findInterfaceMethodExtended(String methodName, List parameterTypes) {
-		Method method = getMethod(methodName, parameterTypes);
-		if (method != null)
-			return method;
-		else {
-			JavaClassImpl superInterface;
-			List list = getImplementsInterfaces();
-			for (int i = 0; i < list.size(); i++) {
-				superInterface = (JavaClassImpl) list.get(i);
-				method = superInterface.findInterfaceMethodExtended(methodName, parameterTypes);
-				if (method != null)
-					return method;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @return
-	 * @deprecated If anyone is referencing this, please use getEAllSuperTypes() instead. This was placed here and misspelled by mistake.
-	 */
-	public EList getAllSupertypes() {
-		getESuperTypes(); //Force reflection, if needed, before getting all supertypes.
-		return super.getEAllSuperTypes();
-	}
-
-	/**
-	 * Overrides to perform reflection if necessary
-	 */
-	public EList getClassImport() {
-		reflectBase();
-		return getClassImportGen();
-	}
-
-	public EList getEAllOperations() {
-		IIntrospectionAdapter ia = getIntrospectionAdapter();
-		if (ia == null)
-			return super.getEAllOperations(); // No introspection, do normal.
-		if (eAllOperations == null)
-			eAllOperations = ia.getEAllOperations();
-		return eAllOperations;
-	}
-	
-	/**
-	 * This is not meant to be used by others. It is here so that BeanInfo adapter can access
-	 * un-introspected all operations.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public EList primGetEAllOperations() {
-		return super.getEAllOperations();
-	}
-
-	public EList getEOperations() {
-		IIntrospectionAdapter adapter = getIntrospectionAdapter();
-		if (adapter != null)
-			return adapter.getEOperations();
-		return super.getEOperations();
-	}
-
-	/**
-	 * This method is not meant to be used by others. It is here so that BeanInfo adapters can go to
-	 * the non-introspected operations.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public EList getEOperationsInternal() {
-		// An internal method for returning actual wo fluffing up.
-		return super.getEOperations();
-	}
-
-	public EList getEAnnotations() {
-		IIntrospectionAdapter adapter = getIntrospectionAdapter();
-		if (adapter != null)
-			adapter.introspectIfNecessary(); // To cause introspection so the appropriate decorator is added.
-		return super.getEAnnotations();
-	}
-
-	public EList getEStructuralFeatures() {
-		IIntrospectionAdapter adapter = getIntrospectionAdapter();
-		if (adapter != null)
-			return adapter.getEStructuralFeatures();
-		return super.getEStructuralFeatures();
-	}
-
-	public EList getEStructuralFeaturesInternal() {
-		// An internal method for returning actual wo fluffing up.
-		return super.getEStructuralFeatures();
-	}
-
-	/**
-	 * Return an Iterator on the implemntsInferface List if this is an interface class or on the super List if it is a class.
-	 */
-	protected Iterator getExtendedLookupIterator() {
-		if (isInterface())
-			return getImplementsInterfaces().iterator();
-		else
-			return getESuperTypes().iterator();
-	}
-
-	/**
-	 * Return an Field with the passed name, or null.
-	 */
-	public Field getField(String fieldName) {
-		java.util.List fields = getFields();
-		Field field;
-		for (int i = 0; i < fields.size(); i++) {
-			field = (Field) fields.get(i);
-			if (field.getName().equals(fieldName))
-				return field;
-		}
-		return null;
-	}
-
-	/**
-	 * Return an Field with the passed name from this JavaClass or any supertypes.
-	 * 
-	 * Return null if a Field named fieldName is not found.
-	 */
-	public Field getFieldExtended(String fieldName) {
-		Field field = getFieldNamed(fieldName);
-		if (field != null)
-			return field;
-		Iterator it = getExtendedLookupIterator();
-		while (it.hasNext()) {
-			Field result = ((JavaClass) it.next()).getFieldExtended(fieldName);
-			if (result != null)
-				return result;
-		}
-		return null;
-	}
-
-	/**
-	 * Return an Field with the passed name, or null.
-	 */
-	public Field getFieldNamed(String fieldName) {
-		return getField(fieldName);
-	}
-
-	public EList getFields() {
-		reflectFields();
-		return getFieldsGen();
-	}
-
-	/**
-	 * Return all fields, including those from supertypes.
-	 */
-	public List getFieldsExtended() {
-		List fields = new ArrayList();
-		collectFieldsExtended(fields);
-		return fields;
-	}
-
-	public EList getImplementsInterfaces() {
-		reflectBase();
-		return getImplementsInterfacesGen();
-	}
-
-	/**
-	 * Return an IntrospectionAdaptor which can introspect our Java properties
-	 */
-	protected synchronized IIntrospectionAdapter getIntrospectionAdapter() {
-		// Need to sync this because we are now in multi-thread env.
-		return (IIntrospectionAdapter) EcoreUtil.getRegisteredAdapter(this, IIntrospectionAdapter.ADAPTER_KEY);
-	}
-
-	public String getJavaName() {
-		return getQualifiedName();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaHelpers#getSimpleName()
-	 */
-	public String getSimpleName() {
-		return primGetName().replace('$', '.');
-	}
-	/**
-	 * getJavaPackage. This is a derived relationship, so we must implement it here to get the EPackage that this object is contained in.
-	 */
-	public JavaPackage getJavaPackage() {
-		return (JavaPackage) getEPackage();
-	}
-
-	/**
-	 * Get the method of this name and these parameters. It will not look up the supertype hierarchy.
-	 */
-	public Method getMethod(String methodName, List parameterTypes) {
-		return getMethod(methodName, parameterTypes, getMethods());
-	}
-
-	protected Method getMethod(String name, List parameterTypes, List methodList) {
-		boolean found = false;
-		Method method;
-		for (int i = 0; i < methodList.size(); i++) {
-			method = (Method) methodList.get(i);
-			JavaParameter[] params;
-			if (method.getName().equals(name)) {
-				params = method.listParametersWithoutReturn();
-				if (params.length == parameterTypes.size()) {
-					found = true; //Maybe; we need more info
-					for (int j = 0; j < params.length; j++) {
-						//if any one of the parameters doesn't match then flip back to false
-						JavaHelpers jh = (JavaHelpers) params[j].getEType();
-						if (!jh.getQualifiedName().equals(parameterTypes.get(j))) {
-							found = false;
-							break;
-						} // end if params equal
-					} // end compare all params
-					if (found) //short circuit out of this loop and return the winner
-						return method;
-				} // end compare lengths
-			} // end compare names
-		} // end loop through all methodList
-		return null;
-	}
-
-	/**
-	 * Return a List of Strings that represent MethodElement signatures from most general to most specific.
-	 */
-	public List getMethodElementSignatures() {
-		List methods, signatures, sameNames;
-		methods = getMethodsExtended();
-		sameNames = new ArrayList();
-		signatures = new ArrayList(methods.size() + 1);
-		signatures.add(DEFAULT_METHOD_NAME);
-		Iterator it = methods.iterator();
-		Method aMethod;
-		String methodName;
-		while (it.hasNext()) {
-			aMethod = (Method) it.next();
-			methodName = aMethod.getName();
-			if (sameNames.contains(methodName)) {
-				if (!signatures.contains(methodName))
-					signatures.add(methodName);
-			} else
-				sameNames.add(methodName);
-			signatures.add(aMethod.getMethodElementSignature());
-		}
-		Collections.sort(signatures);
-		return signatures;
-	}
-
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 */
-	public Method getMethodExtended(String methodName, List parameterTypes) {
-		if (isInterface())
-			return findInterfaceMethodExtended(methodName, parameterTypes);
-		else
-			return findClassMethodExtended(methodName, parameterTypes);
-	}
-
-	public EList getMethods() {
-		reflectMethods();
-		return getMethodsGen();
-	}
-
-	/**
-	 * Return all methods, including those from supertypes.
-	 */
-	public List getMethodsExtended() {
-		Map methods = new HashMap();
-		collectMethodsExtended(methods, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-		return new ArrayList(methods.values());
-	}
-
-	/*
-	 * @see getMethodsExtendedWithFilters(List, List) on JavaClass.
-	 */
-	public List getMethodsExtendedWithFilters(List excludedClasses, List excludedMethods) {
-		Map methods = new HashMap();
-		collectMethodsExtended(methods, false, excludedClasses, excludedMethods);
-		return new ArrayList(methods.values());
-	}
-
-	public String getName() {
-		String result = this.primGetName();
-		if (result == null && eIsProxy()) {
-			return JavaRefFactory.eINSTANCE.getTypeName(eProxyURI());
-		}
-		return result;
-	}
-
-	/**
-	 * Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.
-	 
-	 */
-	public List getOnlySpecificMethods(String aMethodNamePrefix, List excludedNames) {
-		List methods, specific;
-		methods = getMethodsExtended();
-		specific = new ArrayList(methods.size());
-		Iterator it = methods.iterator();
-		Method aMethod;
-		String methodName;
-		while (it.hasNext()) {
-			aMethod = (Method) it.next();
-			methodName = aMethod.getName();
-			if (aMethodNamePrefix != null && methodName.startsWith(aMethodNamePrefix) && excludedNames != null && !excludedNames.contains(methodName))
-				specific.add(aMethod);
-		}
-		return specific;
-	}
-
-	public EList getPackageImports() {
-		reflectBase();
-		return getPackageImportsGen();
-	}
-
-	/**
-	 * getPrimitive method comment.
-	 */
-	public JavaDataType getPrimitive() {
-		String primitiveName = getPrimitiveName();
-		if (primitiveName != null) {
-			Resource res = eResource();
-			return (JavaDataType) JavaClassImpl.reflect(primitiveName, res.getResourceSet());
-		}
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaHelpers#getPrimitiveID()
-	 */
-	public int getPrimitiveID() {
-		String myName = getQualifiedName();
-		if (myName.equals(INTEGER_NAME))
-			return PRIM_INTEGER_ID;
-		if (myName.equals(BOOLEAN_NAME))
-			return PRIM_BOOLEAN_ID;
-		if (myName.equals(BYTE_NAME))
-			return PRIM_BYTE_ID;
-		if (myName.equals(SHORT_NAME))
-			return PRIM_SHORT_ID;
-		if (myName.equals(LONG_NAME))
-			return PRIM_LONG_ID;
-		if (myName.equals(FLOAT_NAME))
-			return PRIM_FLOAT_ID;
-		if (myName.equals(DOUBLE_NAME))
-			return PRIM_DOUBLE_ID;
-		if (myName.equals(CHARACTER_NAME))
-			return PRIM_CHARACTER_ID;
-		return PRIM_NOT_ID;
-	}
-
-	/**
-	 * Return the primitive name for this type if one exists.
-	 */
-	protected String getPrimitiveName() {
-		String myName = getQualifiedName();
-		if (myName.equals(INTEGER_NAME))
-			return PRIM_INTEGER_NAME;
-		if (myName.equals(BOOLEAN_NAME))
-			return PRIM_BOOLEAN_NAME;
-		if (myName.equals(BYTE_NAME))
-			return PRIM_BYTE_NAME;
-		if (myName.equals(SHORT_NAME))
-			return PRIM_SHORT_NAME;
-		if (myName.equals(LONG_NAME))
-			return PRIM_LONG_NAME;
-		if (myName.equals(FLOAT_NAME))
-			return PRIM_FLOAT_NAME;
-		if (myName.equals(DOUBLE_NAME))
-			return PRIM_DOUBLE_NAME;
-		if (myName.equals(CHARACTER_NAME))
-			return PRIM_CHARACTER_NAME;
-		return null;
-	}
-
-	/**
-	 * Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It
-	 * will not look up the supertype hierarchy.
-	 */
-	public Method getPublicMethod(String methodName, List parameterTypes) {
-		return getMethod(methodName, parameterTypes, getPublicMethods());
-	}
-
-	/**
-	 * Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It
-	 * will not look up the supertype hierarchy.
-	 */
-	public Method getPublicMethodExtended(String methodName, List parameterTypes) {
-		return getMethod(methodName, parameterTypes, getPublicMethodsExtended());
-	}
-
-	/**
-	 * Return all methods, it will not go up the supertype hierarchy.
-	 */
-	public List getPublicMethods() {
-		List publicMethods = new ArrayList();
-		List theMethods = getMethods();
-		for (int i = 0; i < theMethods.size(); i++) {
-			Method m = (Method) theMethods.get(i);
-			if (JavaVisibilityKind.PUBLIC_LITERAL == m.getJavaVisibility())
-				publicMethods.add(m);
-		}
-		return publicMethods;
-	}
-
-	/**
-	 * Return all public methods, including those from supertypes.
-	 */
-	public List getPublicMethodsExtended() {
-		Map methods = new HashMap();
-		collectMethodsExtended(methods, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-		return new ArrayList(methods.values());
-	}
-
-	/**
-	 * Returns a filtered list on the methods of this class, having a name equal to that of the parameter.
-	 */
-	public List getPublicMethodsExtendedNamed(String name) {
-		List publicMethods = new ArrayList();
-		List theMethods = getPublicMethodsExtended();
-		for (int i = 0; i < theMethods.size(); i++) {
-			Method m = (Method) theMethods.get(i);
-			if (m.getName().equals(name))
-				publicMethods.add(m);
-		}
-		return publicMethods;
-	}
-
-	/**
-	 * Returns a filtered list on the methods of this class, having a name equal to that of the parameter.
-	 */
-	public List getPublicMethodsNamed(String name) {
-		List publicMethods = new ArrayList();
-		List theMethods = getPublicMethods();
-		for (int i = 0; i < theMethods.size(); i++) {
-			Method m = (Method) theMethods.get(i);
-			if (m.getName().equals(name))
-				publicMethods.add(m);
-		}
-		return publicMethods;
-	}
-
-	public String getQualifiedName() {
-		String result = null;
-		if (eIsProxy()) {
-			result = JavaRefFactory.eINSTANCE.getFullTypeName(eProxyURI());
-		} else {
-			result = primGetQualifiedName();
-		}
-		if (result != null)
-			result = result.replace('$', '.');
-		return result;
-	}
-
-	/**
-	 * To be used by people that need to get the qualified name used for reflection. Typically bean info would need to use something like this.
-	 */
-	public String getQualifiedNameForReflection() {
-		return primGetQualifiedName();
-	}
-
-	/**
-	 * Return a ReadAdaptor which can reflect our Java properties
-	 */
-	protected synchronized ReadAdaptor getReadAdapter() {
-		// Need to sync because now in a multi-thread env.
-		return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(this, ReadAdaptor.TYPE_KEY);
-	}
-
-	private static final int NOT_REFLECTED = 0x0, REFLECTED_BASE = 0x1, REFLECTED_METHODS = 0x2, REFLECTED_FIELDS = 0x4;
-
-	protected int reflectionStatus = NOT_REFLECTED;
-
-	protected void reflectBase() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if ((reflectionStatus & REFLECTED_BASE) == 0) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = readAdaptor.reflectValuesIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				if (setReflected)
-					reflectionStatus |= REFLECTED_BASE;
-			}
-		}
-	}
-
-	protected void reflectFields() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if ((reflectionStatus & REFLECTED_FIELDS) == 0) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = ((IJavaClassAdaptor) readAdaptor).reflectFieldsIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				if (setReflected)
-					reflectionStatus |= (REFLECTED_FIELDS | REFLECTED_BASE); // We can be certain base will be done by reflect fields if not already
-																			 // done.
-			}
-		}
-	}
-
-	protected void reflectMethods() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if ((reflectionStatus & REFLECTED_METHODS) == 0) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = ((IJavaClassAdaptor) readAdaptor).reflectMethodsIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				if (setReflected)
-					reflectionStatus |= (REFLECTED_METHODS | REFLECTED_BASE); // We can be certain base will be done by reflect fields if not already
-																			  // done.
-			}
-		}
-	}
-
-	public JavaClass getSupertype() {
-		// If this is an interface, there is no supertype. However, the eSuperTypes IS filled in with any interface that this extends. 
-		if (isInterface())
-			return null;
-		List list = getESuperTypes();
-		return (!list.isEmpty()) ? (JavaClass) list.get(0) : null;
-	}
-
-	public JavaClass getWrapper() {
-		return this;
-	}
-
-	/**
-	 * Test whether the receiver implements the passed interface (or one of its supertypes).
-	 */
-	public boolean implementsInterface(JavaClass interfaceType) {
-		if (this == interfaceType)
-			return true;
-		EList implemented = getImplementsInterfaces();
-		JavaClass anInterface;
-		for (int i = 0; i < implemented.size(); i++) {
-			anInterface = (JavaClass) implemented.get(i);
-			if (anInterface.implementsInterface(interfaceType))
-				return true;
-		}
-		if (getSupertype() != null)
-			return getSupertype().implementsInterface(interfaceType);
-		else
-			return false;
-	}
-
-	/**
-	 * Return a string showing our details.
-	 */
-	public String infoString() {
-		StringBuffer out = new StringBuffer();
-		// trip class reflection
-		//FB this.eGet(JavaRefPackage.eINSTANCE.getJavaClass_Public());
-		reflectBase(); //FB
-		out.append("Java class: " + getQualifiedName() + "\n");
-		out.append("  superclass: " + this.getSupertype() + "\n");
-		EList fields = getFields();
-		Field field;
-		if (fields.size() > 0) {
-			out.append("  Fields:\n");
-			for (int i = 0; i < fields.size(); i++) {
-				field = (Field) fields.get(i);
-				out.append("    " + ((JavaHelpers) field.getEType()).getJavaName() + " " + field.getName() + "\n");
-			}
-		}
-		EList methods = getMethods();
-		Method method;
-		if (methods.size() > 0) {
-			out.append("  Methods:\n");
-			for (int i = 0; i < methods.size(); i++) {
-				method = (Method) methods.get(i);
-				// trip method reflection
-				method.isStatic();
-				if (method.getReturnType() != null)
-					out.append("    " + method.getReturnType().getJavaName() + " ");
-				else
-					out.append("    void ");
-				out.append(method.getName() + "(");
-				EList parms = method.getParameters();
-				JavaParameter parm;
-				if (parms.size() > 0) {
-					for (int ii = 0; ii < parms.size(); ii++) {
-						parm = (JavaParameter) parms.get(ii);
-						//FB if (!parm.isReturn()) {
-						out.append(((JavaHelpers) parm.getEType()).getJavaName() + " " + parm.getName());
-						if (ii < parms.size() - 1)
-							out.append(", ");
-						//FB }
-					}
-				}
-				out.append(")\n");
-			}
-		}
-		return out.toString();
-	}
-
-	/**
-	 * Tests whether this class inherits from the passed in class.
-	 */
-	public boolean inheritsFrom(JavaClass javaClass) {
-		if (this == javaClass)
-			return true;
-		else if (getSupertype() != null)
-			return getSupertype().inheritsFrom(javaClass);
-		else
-			return false;
-	}
-
-	public boolean isArray() {
-		return false;
-	}
-
-	/**
-	 * Can an object of the passed in class be assigned to an object of this class. In other words is this class a supertype of the passed in class,
-	 * or is it superinterface of it.
-	 */
-	public boolean isAssignableFrom(EClassifier aClass) {
-		if (aClass instanceof JavaClass) {
-			JavaClass theClass = (JavaClass) aClass;
-			// If either this class or aClass kind is unknown then it isn't assignableFrom.
-			if (getKind() == TypeKind.UNDEFINED_LITERAL || theClass.getKind() == TypeKind.UNDEFINED_LITERAL)
-				return false;
-			// If the "aClass" is not a JavaClass (i.e. it is either a JavaDatatype or
-			// some other kind of MOF classifier), then it cannot be
-			// assigned to something of this class.
-			if (getKind() != TypeKind.INTERFACE_LITERAL)
-				if (theClass.getKind() != TypeKind.INTERFACE_LITERAL)
-					return theClass.inheritsFrom(this);
-				else {
-					// aClass is an interface, so it is assignable only if
-					// "this" is "java.lang.Object".
-					return getQualifiedName().equals("java.lang.Object");
-				}
-			else
-				return theClass.implementsInterface(this);
-		}
-		return false;
-	}
-
-	/**
-	 * Does this type exist.
-	 */
-	public boolean isExistingType() {
-		// TODO: Temporary, inefficient implementation
-		return ((JavaReflectionAdaptor) getReadAdapter()).hasReflectionSource();
-	}
-
-	/**
-	 * See if this is valid object of this type.
-	 */
-	public boolean isInstance(Object o) {
-		return o instanceof IInstantiationInstance ? isAssignableFrom(((IInstantiationInstance) o).getJavaType()) : false;
-	}
-
-	/**
-	 * Is this an interface.
-	 */
-	public boolean isInterface() {
-		return getKind() == TypeKind.INTERFACE_LITERAL;
-	}
-
-	public boolean isNested() {
-		return getDeclaringClass() != null;
-	}
-
-	public boolean isPrimitive() {
-		return false;
-	}
-
-	/**
-	 * Return an array listing our fields, including inherited fields. The field relationship is derived from contents. This implementation depends on
-	 * the assumption that supertypes above JavaClass will hold Attributes rather than Fields.
-	 */
-	public Field[] listFieldExtended() {
-		List fields = getFieldsExtended();
-		Field[] result = new Field[fields.size()];
-		fields.toArray(result);
-		return result;
-	}
-
-	/**
-	 * Return an array listing our Methods, including inherited methods. The method relationship is derived from contents. This implementation depends
-	 * on the assumption that supertypes above JavaClass will hold Operations rather than Methods.
-	 */
-	public Method[] listMethodExtended() {
-		java.util.List methods = getMethodsExtended();
-		Method[] result = new Method[methods.size()];
-		methods.toArray(result);
-		return result;
-	}
-
-	/**
-	 * This is required for internal reflection do not use.
-	 */
-	public String primGetName() {
-		return super.getName();
-	}
-
-	/**
-	 * This is required for internal reflection do not use.
-	 */
-	public String primGetQualifiedName() {
-		String result = "";
-		if (eIsProxy()) {
-			result = JavaRefFactory.eINSTANCE.getFullTypeName(eProxyURI());
-		} else {
-			JavaPackage pack = getJavaPackage();
-			if (pack != null && pack.getPackageName().length() != 0)
-				result = pack.getPackageName() + "." + ((JavaRefFactoryImpl) JavaRefFactory.eINSTANCE).primGetTypeName(this.primGetName());
-			else
-				result = this.getName();
-		}
-		return result;
-	}
-
-	/**
-	 * reflect - reflect a JavaClass for a given qualified name. If the package or class does not exist, one will be created through the reflection
-	 * mechanism. Lookup the JavaClass in the context of the passed object, handling some error cases.
-	 * 
-	 * @deprecated @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 *  
-	 */
-	public static JavaHelpers reflect(String aQualifiedName, EObject relatedObject) {
-		return JavaRefFactory.eINSTANCE.reflectType(aQualifiedName, relatedObject);
-	}
-
-	/**
-	 * reflect - reflect a JavaClass for a given qualified name. If the package or class does not exist, one will be created through the reflection
-	 * mechanism.
-	 * 
-	 * @deprecated @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	public static JavaHelpers reflect(String aQualifiedName, ResourceSet set) {
-		return JavaRefFactory.eINSTANCE.reflectType(aQualifiedName, set);
-	}
-
-	/**
-	 * reflect - reflect a JavaClass for a given package name or class name. If the package or class does not exist, one will be created through the
-	 * reflection mechanism.
-	 * 
-	 * @deprecated @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, java.lang.String,
-	 *             org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	public static JavaHelpers reflect(String aPackageName, String aClassName, ResourceSet set) {
-		return JavaRefFactory.eINSTANCE.reflectType(aPackageName, aClassName, set);
-	}
-
-	public void setSupertype(JavaClass aJavaClass) throws InheritanceCycleException {
-		validateSupertype(aJavaClass);
-		List s = super.getESuperTypes();
-		s.clear();
-		if (aJavaClass != null)
-			s.add(aJavaClass);
-	}
-
-	/**
-	 * Check to make sure that the passed JavaClass is a valid super class (i.e., it does not create any cycles in the inheritance.
-	 * 
-	 * @param aJavaClass
-	 */
-	protected void validateSupertype(JavaClass aJavaClass) throws InheritanceCycleException {
-		if (!isValidSupertype(aJavaClass))
-			throw new InheritanceCycleException(this, aJavaClass);
-	}
-
-	public boolean isValidSupertype(JavaClass aJavaClass) {
-		if (aJavaClass != null) {
-			if (this.equals(aJavaClass))
-				return false;
-			return extendedIsValidSupertype(getSubtypes(), aJavaClass);
-		}
-		return true;
-	}
-
-	/**
-	 * @param subtypes
-	 * @param aJavaClass
-	 */
-	private boolean extendedIsValidSupertype(List subtypes, JavaClass aJavaClass) {
-		if (!basicIsValidSupertype(subtypes, aJavaClass))
-			return false;
-		JavaClass subtype;
-		for (int i = 0; i < subtypes.size(); i++) {
-			subtype = (JavaClass) subtypes.get(i);
-			if (!subtype.isValidSupertype(aJavaClass))
-				return false;
-		}
-		return true;
-	}
-
-	private boolean basicIsValidSupertype(List subtypes, JavaClass aJavaClass) {
-		JavaClass subtype;
-		for (int i = 0; i < subtypes.size(); i++) {
-			subtype = (JavaClass) subtypes.get(i);
-			if (subtype.equals(aJavaClass))
-				return false;
-		}
-		return true;
-	}
-
-	protected List getSubtypes() {
-		return getESuperAdapter().getSubclasses();
-	}
-
-	public String toString() {
-		return getClass().getName() + "(" + getQualifiedName() + ")";
-	}
-
-	public TypeKind getKind() {
-		reflectBase();
-		return getKindGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKind(TypeKind newKind) {
-		TypeKind oldKind = kind;
-		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__KIND, oldKind, kind));
-	}
-
-	public boolean isPublic() {
-		reflectBase();
-		return isPublicGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPublic(boolean newPublic) {
-		boolean oldPublic = (eFlags & PUBLIC_EFLAG) != 0;
-		if (newPublic) eFlags |= PUBLIC_EFLAG; else eFlags &= ~PUBLIC_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__PUBLIC, oldPublic, newPublic));
-	}
-
-	public boolean isFinal() {
-		reflectBase();
-		return isFinalGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
-		if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__FINAL, oldFinal, newFinal));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypeKind getKindGen() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isPublicGen() {
-		return (eFlags & PUBLIC_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFinalGen() {
-		return (eFlags & FINAL_EFLAG) != 0;
-	}
-
-	public EList getInitializers() {
-		if (initializers == null) {
-			initializers = new EObjectContainmentWithInverseEList(Initializer.class, this, JavaRefPackage.JAVA_CLASS__INITIALIZERS,
-					JavaRefPackage.INITIALIZER__JAVA_CLASS);
-		}
-		return initializers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDeclaringClass(JavaClass newDeclaringClass) {
-		if (newDeclaringClass != declaringClass) {
-			NotificationChain msgs = null;
-			if (declaringClass != null)
-				msgs = ((InternalEObject)declaringClass).eInverseRemove(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
-			if (newDeclaringClass != null)
-				msgs = ((InternalEObject)newDeclaringClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
-			msgs = basicSetDeclaringClass(newDeclaringClass, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, newDeclaringClass, newDeclaringClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getDeclaringClass() {
-		if (declaringClass != null && declaringClass.eIsProxy()) {
-			JavaClass oldDeclaringClass = declaringClass;
-			declaringClass = (JavaClass)eResolveProxy((InternalEObject)declaringClass);
-			if (declaringClass != oldDeclaringClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, oldDeclaringClass, declaringClass));
-			}
-		}
-		return declaringClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetDeclaringClass() {
-		return declaringClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDeclaringClass(JavaClass newDeclaringClass, NotificationChain msgs) {
-		JavaClass oldDeclaringClass = declaringClass;
-		declaringClass = newDeclaringClass;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, oldDeclaringClass, newDeclaringClass);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	public EList getDeclaredClasses() {
-		reflectBase();
-		return getDeclaredClassesGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDeclaredClassesGen() {
-		if (declaredClasses == null) {
-			declaredClasses = new EObjectWithInverseResolvingEList(JavaClass.class, this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS);
-		}
-		return declaredClasses;
-	}
-
-	public EList getProperties() {
-		return getEStructuralFeatures(); // As of EMF 2.0, local properties are the local features. Used to be a merge of eattributes and ereferences.
-	}
-
-	public EList getEvents() {
-		IIntrospectionAdapter adapter = getIntrospectionAdapter();
-		if (adapter != null)
-			return adapter.getEvents();
-		return getEventsGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEventsGen() {
-		if (events == null) {
-			events = new EObjectContainmentEList(JavaEvent.class, this, JavaRefPackage.JAVA_CLASS__EVENTS);
-		}
-		return events;
-	}
-
-	private EList allEvents;
-
-	public EList getAllEvents() {
-		IIntrospectionAdapter ia = getIntrospectionAdapter();
-		if (ia == null)
-			return ECollections.EMPTY_ELIST; // No introspection, do normal.
-		return allEvents = ia.getAllEvents();
-	}
-
-	public EList getAllEventsGen() {
-		return allEvents;
-	}
-
-	private EList allProperties;
-
-	public EList getAllProperties() {
-		IIntrospectionAdapter ia = getIntrospectionAdapter();
-		if (ia == null)
-			return ECollections.EMPTY_ELIST; // No introspection, do normal.
-		return allProperties = ia.getAllProperties();
-	}
-
-	public EList getAllPropertiesGen() {
-		return allProperties;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_CLASS__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.JAVA_CLASS__INSTANCE_CLASS_NAME:
-				return INSTANCE_CLASS_NAME_EDEFAULT == null ? instanceClassName != null : !INSTANCE_CLASS_NAME_EDEFAULT.equals(instanceClassName);
-			case JavaRefPackage.JAVA_CLASS__INSTANCE_CLASS:
-				return INSTANCE_CLASS_EDEFAULT == null ? getInstanceClass() != null : !INSTANCE_CLASS_EDEFAULT.equals(getInstanceClass());
-			case JavaRefPackage.JAVA_CLASS__DEFAULT_VALUE:
-				return DEFAULT_VALUE_EDEFAULT == null ? getDefaultValue() != null : !DEFAULT_VALUE_EDEFAULT.equals(getDefaultValue());
-			case JavaRefPackage.JAVA_CLASS__EPACKAGE:
-				return getEPackage() != null;
-			case JavaRefPackage.JAVA_CLASS__ABSTRACT:
-				return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
-			case JavaRefPackage.JAVA_CLASS__INTERFACE:
-				return ((eFlags & INTERFACE_EFLAG) != 0) != INTERFACE_EDEFAULT;
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				return eSuperTypes != null && !eSuperTypes.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				return eOperations != null && !eOperations.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EALL_ATTRIBUTES:
-				return !getEAllAttributes().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EALL_REFERENCES:
-				return !getEAllReferences().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EREFERENCES:
-				return !getEReferences().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EATTRIBUTES:
-				return !getEAttributes().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EALL_CONTAINMENTS:
-				return !getEAllContainments().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EALL_OPERATIONS:
-				return !getEAllOperations().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EALL_STRUCTURAL_FEATURES:
-				return !getEAllStructuralFeatures().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EALL_SUPER_TYPES:
-				return !getEAllSuperTypes().isEmpty();
-			case JavaRefPackage.JAVA_CLASS__EID_ATTRIBUTE:
-				return getEIDAttribute() != null;
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				return eStructuralFeatures != null && !eStructuralFeatures.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__KIND:
-				return kind != KIND_EDEFAULT;
-			case JavaRefPackage.JAVA_CLASS__PUBLIC:
-				return ((eFlags & PUBLIC_EFLAG) != 0) != PUBLIC_EDEFAULT;
-			case JavaRefPackage.JAVA_CLASS__FINAL:
-				return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
-			case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
-				return implementsInterfaces != null && !implementsInterfaces.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
-				return classImport != null && !classImport.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
-				return packageImports != null && !packageImports.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__FIELDS:
-				return fields != null && !fields.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__METHODS:
-				return methods != null && !methods.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
-				return initializers != null && !initializers.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
-				return declaredClasses != null && !declaredClasses.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
-				return declaringClass != null;
-			case JavaRefPackage.JAVA_CLASS__JAVA_PACKAGE:
-				return basicGetJavaPackage() != null;
-			case JavaRefPackage.JAVA_CLASS__EVENTS:
-				return events != null && !events.isEmpty();
-			case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
-				return !getAllEvents().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_CLASS__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__INSTANCE_CLASS_NAME:
-				setInstanceClassName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__ABSTRACT:
-				setAbstract(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_CLASS__INTERFACE:
-				setInterface(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				getESuperTypes().clear();
-				getESuperTypes().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				getEOperations().clear();
-				getEOperations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				getEStructuralFeatures().clear();
-				getEStructuralFeatures().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__KIND:
-				setKind((TypeKind)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__PUBLIC:
-				setPublic(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_CLASS__FINAL:
-				setFinal(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
-				getImplementsInterfaces().clear();
-				getImplementsInterfaces().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
-				getClassImport().clear();
-				getClassImport().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
-				getPackageImports().clear();
-				getPackageImports().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__FIELDS:
-				getFields().clear();
-				getFields().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__METHODS:
-				getMethods().clear();
-				getMethods().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
-				getInitializers().clear();
-				getInitializers().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
-				getDeclaredClasses().clear();
-				getDeclaredClasses().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
-				setDeclaringClass((JavaClass)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__EVENTS:
-				getEvents().clear();
-				getEvents().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
-				getAllEvents().clear();
-				getAllEvents().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_CLASS__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__INSTANCE_CLASS_NAME:
-				setInstanceClassName(INSTANCE_CLASS_NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__ABSTRACT:
-				setAbstract(ABSTRACT_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__INTERFACE:
-				setInterface(INTERFACE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				getESuperTypes().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				getEOperations().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				getEStructuralFeatures().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__KIND:
-				setKind(KIND_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__PUBLIC:
-				setPublic(PUBLIC_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__FINAL:
-				setFinal(FINAL_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
-				getImplementsInterfaces().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
-				getClassImport().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
-				getPackageImports().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__FIELDS:
-				getFields().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__METHODS:
-				getMethods().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
-				getInitializers().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
-				getDeclaredClasses().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
-				setDeclaringClass((JavaClass)null);
-				return;
-			case JavaRefPackage.JAVA_CLASS__EVENTS:
-				getEvents().clear();
-				return;
-			case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
-				getAllEvents().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *  
-	 */
-	public EList getImplementsInterfacesGen() {
-		if (implementsInterfaces == null) {
-			implementsInterfaces = new EObjectResolvingEList(JavaClass.class, this, JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES) {
-
-				/**
-				 * Comment for <code>serialVersionUID</code>
-				 * 
-				 * @since 1.1.0
-				 */
-				private static final long serialVersionUID = 1L;
-
-				public Object get(int index) {
-					if (isInterface())
-						getInterfaceSuperTypes().get(index); //force resolution so the ESuperAdapter will be updated correctly
-					return super.get(index);
-				}
-
-				public void clear() {
-					super.clear();
-					if (isInterface())
-						getInterfaceSuperTypes().clear();
-				}
-
-				public Object remove(int index) {
-					Object result = super.remove(index);
-					if (isInterface())
-						getInterfaceSuperTypes().remove(index);
-					return result;
-
-				}
-
-				public boolean removeAll(Collection collection) {
-					boolean result = super.removeAll(collection);
-					if (isInterface())
-						getInterfaceSuperTypes().removeAll(collection);
-					return result;
-				}
-
-				public void add(int index, Object object) {
-					super.add(index, object);
-					if (isInterface())
-						getInterfaceSuperTypes().add(index, object);
-				}
-
-				public boolean add(Object object) {
-					boolean result = super.add(object);
-					if (isInterface())
-						getInterfaceSuperTypes().add(object);
-					return result;
-				}
-
-				public boolean addAll(Collection collection) {
-					boolean result = super.addAll(collection);
-					if (isInterface())
-						getInterfaceSuperTypes().addAll(collection);
-					return result;
-				}
-
-				public boolean addAll(int index, Collection collection) {
-					boolean result = super.addAll(index, collection);
-					if (isInterface())
-						getInterfaceSuperTypes().addAll(index, collection);
-					return result;
-				}
-			};
-		}
-		return implementsInterfaces;
-	}
-
-	private EList getInterfaceSuperTypes() {
-		return super.getESuperTypes();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getClassImportGen() {
-		if (classImport == null) {
-			classImport = new EObjectResolvingEList(JavaClass.class, this, JavaRefPackage.JAVA_CLASS__CLASS_IMPORT);
-		}
-		return classImport;
-	}
-
-	public EList getEAllSuperTypes() {
-		reflectBase();//Force reflection, if needed, before getting all supertypes.
-		return super.getEAllSuperTypes();
-	}
-
-	public EList getESuperTypes() {
-		reflectBase();
-		return super.getESuperTypes();
-	}
-	
-	/**
-	 * This method is not meant to be used by others. It is here so that the reflection
-	 * adapters can reference the unreflected supertypes.
-	 *  
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public EList primGetESuperTypes() {
-		return super.getESuperTypes();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPackageImportsGen() {
-		if (packageImports == null) {
-			packageImports = new EObjectResolvingEList(JavaPackage.class, this, JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS);
-		}
-		return packageImports;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFieldsGen() {
-		if (fields == null) {
-			fields = new EObjectContainmentWithInverseEList(Field.class, this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaRefPackage.FIELD__JAVA_CLASS);
-		}
-		return fields;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodsGen() {
-		if (methods == null) {
-			methods = new EObjectContainmentWithInverseEList(Method.class, this, JavaRefPackage.JAVA_CLASS__METHODS, JavaRefPackage.METHOD__JAVA_CLASS);
-		}
-		return methods;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaPackage getJavaPackageGen() {
-		JavaPackage javaPackage = basicGetJavaPackage();
-		return javaPackage == null ? null : (JavaPackage)eResolveProxy((InternalEObject)javaPackage);
-	}
-
-	/*
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public JavaPackage basicGetJavaPackage() {
-		return getJavaPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_CLASS__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__EPACKAGE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_CLASS__EPACKAGE, msgs);
-				case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-					return ((InternalEList)getEOperations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-					return ((InternalEList)getEStructuralFeatures()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__FIELDS:
-					return ((InternalEList)getFields()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__METHODS:
-					return ((InternalEList)getMethods()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
-					return ((InternalEList)getInitializers()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
-					return ((InternalEList)getDeclaredClasses()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
-					if (declaringClass != null)
-						msgs = ((InternalEObject)declaringClass).eInverseRemove(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
-					return basicSetDeclaringClass((JavaClass)otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_CLASS__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__EPACKAGE:
-					return eBasicSetContainer(null, JavaRefPackage.JAVA_CLASS__EPACKAGE, msgs);
-				case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-					return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-					return ((InternalEList)getEStructuralFeatures()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__FIELDS:
-					return ((InternalEList)getFields()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__METHODS:
-					return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
-					return ((InternalEList)getInitializers()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
-					return ((InternalEList)getDeclaredClasses()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
-					return basicSetDeclaringClass(null, msgs);
-				case JavaRefPackage.JAVA_CLASS__EVENTS:
-					return ((InternalEList)getEvents()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.JAVA_CLASS__EPACKAGE:
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ECLASSIFIERS, EPackage.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_CLASS__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.JAVA_CLASS__NAME:
-				return getName();
-			case JavaRefPackage.JAVA_CLASS__INSTANCE_CLASS_NAME:
-				return getInstanceClassName();
-			case JavaRefPackage.JAVA_CLASS__INSTANCE_CLASS:
-				return getInstanceClass();
-			case JavaRefPackage.JAVA_CLASS__DEFAULT_VALUE:
-				return getDefaultValue();
-			case JavaRefPackage.JAVA_CLASS__EPACKAGE:
-				return getEPackage();
-			case JavaRefPackage.JAVA_CLASS__ABSTRACT:
-				return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_CLASS__INTERFACE:
-				return isInterface() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				return getESuperTypes();
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				return getEOperations();
-			case JavaRefPackage.JAVA_CLASS__EALL_ATTRIBUTES:
-				return getEAllAttributes();
-			case JavaRefPackage.JAVA_CLASS__EALL_REFERENCES:
-				return getEAllReferences();
-			case JavaRefPackage.JAVA_CLASS__EREFERENCES:
-				return getEReferences();
-			case JavaRefPackage.JAVA_CLASS__EATTRIBUTES:
-				return getEAttributes();
-			case JavaRefPackage.JAVA_CLASS__EALL_CONTAINMENTS:
-				return getEAllContainments();
-			case JavaRefPackage.JAVA_CLASS__EALL_OPERATIONS:
-				return getEAllOperations();
-			case JavaRefPackage.JAVA_CLASS__EALL_STRUCTURAL_FEATURES:
-				return getEAllStructuralFeatures();
-			case JavaRefPackage.JAVA_CLASS__EALL_SUPER_TYPES:
-				return getEAllSuperTypes();
-			case JavaRefPackage.JAVA_CLASS__EID_ATTRIBUTE:
-				return getEIDAttribute();
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				return getEStructuralFeatures();
-			case JavaRefPackage.JAVA_CLASS__KIND:
-				return getKind();
-			case JavaRefPackage.JAVA_CLASS__PUBLIC:
-				return isPublic() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_CLASS__FINAL:
-				return isFinal() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
-				return getImplementsInterfaces();
-			case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
-				return getClassImport();
-			case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
-				return getPackageImports();
-			case JavaRefPackage.JAVA_CLASS__FIELDS:
-				return getFields();
-			case JavaRefPackage.JAVA_CLASS__METHODS:
-				return getMethods();
-			case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
-				return getInitializers();
-			case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
-				return getDeclaredClasses();
-			case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
-				if (resolve) return getDeclaringClass();
-				return basicGetDeclaringClass();
-			case JavaRefPackage.JAVA_CLASS__JAVA_PACKAGE:
-				if (resolve) return getJavaPackage();
-				return basicGetJavaPackage();
-			case JavaRefPackage.JAVA_CLASS__EVENTS:
-				return getEvents();
-			case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
-				return getAllEvents();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (kind: ");
-		result.append(kind);
-		result.append(", public: ");
-		result.append((eFlags & PUBLIC_EFLAG) != 0);
-		result.append(", final: ");
-		result.append((eFlags & FINAL_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * This should never be called with true. It is basically only for reset of reflection, not to set a particular state. But InternalReadAdaptable
-	 * may be used by someone that shouldn't so to be be safe we keep it. TODO Remove InternalReadAdaptable in next version. Need to wait because we
-	 * need time to notify everyone.
-	 * 
-	 * @see org.eclipse.jem.java.adapters.InternalReadAdaptable#setReflected(boolean)
-	 */
-	public synchronized void setReflected(boolean aBoolean) {
-		if (!aBoolean)
-			reflectionStatus = NOT_REFLECTED;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaClass#getReflectionType()
-	 */
-	public Object getReflectionType() {
-		JavaReflectionAdaptor ja = ((JavaReflectionAdaptor) getReadAdapter());
-		return ja != null ? ja.getReflectionSource() : null;
-	}
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaDataTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaDataTypeImpl.java
deleted file mode 100644
index f5e2ede55..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaDataTypeImpl.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: JavaDataTypeImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaDataType;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance;
-/**
- * @generated
- */
-public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{
-
-	
-	static final String FALSE = "false";
-	static final String DOUBLE_ZERO = "0.0";
-	static final String FLOAT_ZERO = "0.0f";
-	static final String CHAR_ZERO = "'0'";
-	static final String ZERO = "0";
-	
-	private int primitive_type = PRIM_NOT_ID;
-	
-	protected JavaDataTypeImpl() {
-		super();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getJavaDataType();
-	}
-
-	/**
-	 * Return the default string representing the default value of the primitive.
-	 */
-	public String getDefaultValueString() {
-		String typeName = getJavaName();
-		if (typeName.equals(PRIM_BOOLEAN_NAME))
-			return FALSE;
-		if (typeName.equals(PRIM_DOUBLE_NAME))
-			return DOUBLE_ZERO;
-		if (typeName.equals(PRIM_FLOAT_NAME))
-			return FLOAT_ZERO;			
-		if (typeName.equals(PRIM_CHARACTER_NAME))
-			return CHAR_ZERO;
-		return ZERO;
-	}
-	public String getJavaName() {
-		return getName();
-	}
-	public JavaDataType getPrimitive() {
-		return this;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaHelpers#getPrimitiveID()
-	 */
-	public int getPrimitiveID() {
-		if (primitive_type == PRIM_NOT_ID) {
-			String name = getName();
-			if (name.equals(PRIM_BOOLEAN_NAME))
-				primitive_type = PRIM_BOOLEAN_ID;
-			if (name.equals(PRIM_CHARACTER_NAME))
-				primitive_type = PRIM_CHARACTER_ID;
-			if (name.equals(PRIM_BYTE_NAME))
-				primitive_type = PRIM_BYTE_ID;
-			if (name.equals(PRIM_SHORT_NAME))
-				primitive_type = PRIM_SHORT_ID;
-			if (name.equals(PRIM_INTEGER_NAME))
-				primitive_type = PRIM_INTEGER_ID;
-			if (name.equals(PRIM_LONG_NAME))
-				primitive_type = PRIM_LONG_ID;
-			if (name.equals(PRIM_FLOAT_NAME))
-				primitive_type = PRIM_FLOAT_ID;
-			if (name.equals(PRIM_DOUBLE_NAME))
-				primitive_type = PRIM_DOUBLE_ID;
-		}
-		return primitive_type;
-	}
-	
-	public String getSimpleName() {
-		return getName();
-	}
-	public String getQualifiedName() {
-		return getJavaName();
-	}
-	public JavaClass getWrapper() {
-		String wrapperName = getWrapperQualifiedName();
-		if (wrapperName != null) {
-			return (JavaClass) JavaRefFactory.eINSTANCE.reflectType(wrapperName, this);
-		}
-		return null;
-	}
-	/**
-	 * getWrapper method comment.
-	 */
-	protected String getWrapperQualifiedName() {
-		switch (getPrimitiveID()) {
-			case PRIM_INTEGER_ID:
-				return INTEGER_NAME;
-			case PRIM_CHARACTER_ID:
-				return CHARACTER_NAME;
-			case PRIM_BOOLEAN_ID:
-				return BOOLEAN_NAME;
-			case PRIM_BYTE_ID:
-				return BYTE_NAME;
-			case PRIM_SHORT_ID:
-				return SHORT_NAME;
-			case PRIM_LONG_ID:
-				return LONG_NAME;
-			case PRIM_FLOAT_ID:
-				return FLOAT_NAME;
-			case PRIM_DOUBLE_ID:
-				return DOUBLE_NAME;
-			default:
-				return null;
-		}
-	}
-	/*
-	 * JavaHelpers.isArray() - array types are always JavaClasses, even if their component type is
-	 *		a primitive data type. Return false.
-	 */
-	public boolean isArray() {
-		return false;
-	}
-	/**
-	 * Can an object of the passed in class be assigned to an
-	 * object of this class? In the case of primitives, are they the same.
-	 */
-	public boolean isAssignableFrom(EClassifier aClass) {
-		return this == aClass;
-	}
-	/**
-	 * See if this is valid object of this type.
-	 */
-	public boolean isInstance(Object o) {
-		return o instanceof IInstantiationInstance ? isAssignableFrom(((IInstantiationInstance) o).getJavaType()) : false;
-	}
-	public boolean isPrimitive() {
-		return true;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_DATA_TYPE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE, msgs);
-				case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS:
-					return ((InternalEList)getEOperations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES:
-					return ((InternalEList)getEStructuralFeatures()).basicAdd(otherEnd, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_DATA_TYPE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE:
-					return eBasicSetContainer(null, JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE, msgs);
-				case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS:
-					return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES:
-					return ((InternalEList)getEStructuralFeatures()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE:
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ECLASSIFIERS, EPackage.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_DATA_TYPE__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.JAVA_DATA_TYPE__NAME:
-				return getName();
-			case JavaRefPackage.JAVA_DATA_TYPE__INSTANCE_CLASS_NAME:
-				return getInstanceClassName();
-			case JavaRefPackage.JAVA_DATA_TYPE__INSTANCE_CLASS:
-				return getInstanceClass();
-			case JavaRefPackage.JAVA_DATA_TYPE__DEFAULT_VALUE:
-				return getDefaultValue();
-			case JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE:
-				return getEPackage();
-			case JavaRefPackage.JAVA_DATA_TYPE__ABSTRACT:
-				return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_DATA_TYPE__INTERFACE:
-				return isInterface() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESUPER_TYPES:
-				return getESuperTypes();
-			case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS:
-				return getEOperations();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_ATTRIBUTES:
-				return getEAllAttributes();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_REFERENCES:
-				return getEAllReferences();
-			case JavaRefPackage.JAVA_DATA_TYPE__EREFERENCES:
-				return getEReferences();
-			case JavaRefPackage.JAVA_DATA_TYPE__EATTRIBUTES:
-				return getEAttributes();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_CONTAINMENTS:
-				return getEAllContainments();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_OPERATIONS:
-				return getEAllOperations();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_STRUCTURAL_FEATURES:
-				return getEAllStructuralFeatures();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_SUPER_TYPES:
-				return getEAllSuperTypes();
-			case JavaRefPackage.JAVA_DATA_TYPE__EID_ATTRIBUTE:
-				return getEIDAttribute();
-			case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES:
-				return getEStructuralFeatures();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_DATA_TYPE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__INSTANCE_CLASS_NAME:
-				setInstanceClassName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__ABSTRACT:
-				setAbstract(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__INTERFACE:
-				setInterface(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESUPER_TYPES:
-				getESuperTypes().clear();
-				getESuperTypes().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS:
-				getEOperations().clear();
-				getEOperations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES:
-				getEStructuralFeatures().clear();
-				getEStructuralFeatures().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_DATA_TYPE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__INSTANCE_CLASS_NAME:
-				setInstanceClassName(INSTANCE_CLASS_NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__ABSTRACT:
-				setAbstract(ABSTRACT_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__INTERFACE:
-				setInterface(INTERFACE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESUPER_TYPES:
-				getESuperTypes().clear();
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS:
-				getEOperations().clear();
-				return;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES:
-				getEStructuralFeatures().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_DATA_TYPE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.JAVA_DATA_TYPE__INSTANCE_CLASS_NAME:
-				return INSTANCE_CLASS_NAME_EDEFAULT == null ? instanceClassName != null : !INSTANCE_CLASS_NAME_EDEFAULT.equals(instanceClassName);
-			case JavaRefPackage.JAVA_DATA_TYPE__INSTANCE_CLASS:
-				return INSTANCE_CLASS_EDEFAULT == null ? getInstanceClass() != null : !INSTANCE_CLASS_EDEFAULT.equals(getInstanceClass());
-			case JavaRefPackage.JAVA_DATA_TYPE__DEFAULT_VALUE:
-				return DEFAULT_VALUE_EDEFAULT == null ? getDefaultValue() != null : !DEFAULT_VALUE_EDEFAULT.equals(getDefaultValue());
-			case JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE:
-				return getEPackage() != null;
-			case JavaRefPackage.JAVA_DATA_TYPE__ABSTRACT:
-				return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
-			case JavaRefPackage.JAVA_DATA_TYPE__INTERFACE:
-				return ((eFlags & INTERFACE_EFLAG) != 0) != INTERFACE_EDEFAULT;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESUPER_TYPES:
-				return eSuperTypes != null && !eSuperTypes.isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS:
-				return eOperations != null && !eOperations.isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_ATTRIBUTES:
-				return !getEAllAttributes().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_REFERENCES:
-				return !getEAllReferences().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EREFERENCES:
-				return !getEReferences().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EATTRIBUTES:
-				return !getEAttributes().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_CONTAINMENTS:
-				return !getEAllContainments().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_OPERATIONS:
-				return !getEAllOperations().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_STRUCTURAL_FEATURES:
-				return !getEAllStructuralFeatures().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EALL_SUPER_TYPES:
-				return !getEAllSuperTypes().isEmpty();
-			case JavaRefPackage.JAVA_DATA_TYPE__EID_ATTRIBUTE:
-				return getEIDAttribute() != null;
-			case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES:
-				return eStructuralFeatures != null && !eStructuralFeatures.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaHelpers#getQualifiedNameForReflection()
-	 */
-	public String getQualifiedNameForReflection() {
-		return getJavaName();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaEventImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaEventImpl.java
deleted file mode 100644
index 217c1ec5f..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaEventImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: JavaEventImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.JavaEvent;
-import org.eclipse.jem.java.JavaRefPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class JavaEventImpl extends EStructuralFeatureImpl implements JavaEvent {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaEventImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getJavaEvent();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_EVENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_EVENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS:
-					return eBasicSetContainer(null, JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS:
-					return eContainer.eInverseRemove(this, EcorePackage.ECLASS__ESTRUCTURAL_FEATURES, EClass.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_EVENT__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.JAVA_EVENT__NAME:
-				return getName();
-			case JavaRefPackage.JAVA_EVENT__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case JavaRefPackage.JAVA_EVENT__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case JavaRefPackage.JAVA_EVENT__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case JavaRefPackage.JAVA_EVENT__CHANGEABLE:
-				return isChangeable() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__VOLATILE:
-				return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__TRANSIENT:
-				return isTransient() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL:
-				return getDefaultValueLiteral();
-			case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE:
-				return getDefaultValue();
-			case JavaRefPackage.JAVA_EVENT__UNSETTABLE:
-				return isUnsettable() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__DERIVED:
-				return isDerived() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS:
-				return getEContainingClass();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_EVENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_EVENT__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_EVENT__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case JavaRefPackage.JAVA_EVENT__CHANGEABLE:
-				setChangeable(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__VOLATILE:
-				setVolatile(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__TRANSIENT:
-				setTransient(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_EVENT__UNSETTABLE:
-				setUnsettable(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_EVENT__DERIVED:
-				setDerived(((Boolean)newValue).booleanValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_EVENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.JAVA_EVENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case JavaRefPackage.JAVA_EVENT__CHANGEABLE:
-				setChangeable(CHANGEABLE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__VOLATILE:
-				setVolatile(VOLATILE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__TRANSIENT:
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__UNSETTABLE:
-				setUnsettable(UNSETTABLE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_EVENT__DERIVED:
-				setDerived(DERIVED_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_EVENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.JAVA_EVENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.JAVA_EVENT__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__MANY:
-				return isMany() != MANY_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__REQUIRED:
-				return isRequired() != REQUIRED_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__ETYPE:
-				return eType != null;
-			case JavaRefPackage.JAVA_EVENT__CHANGEABLE:
-				return ((eFlags & CHANGEABLE_EFLAG) != 0) != CHANGEABLE_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__VOLATILE:
-				return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__TRANSIENT:
-				return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL:
-				return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral);
-			case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE:
-				return DEFAULT_VALUE_EDEFAULT == null ? getDefaultValue() != null : !DEFAULT_VALUE_EDEFAULT.equals(getDefaultValue());
-			case JavaRefPackage.JAVA_EVENT__UNSETTABLE:
-				return ((eFlags & UNSETTABLE_EFLAG) != 0) != UNSETTABLE_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__DERIVED:
-				return ((eFlags & DERIVED_EFLAG) != 0) != DERIVED_EDEFAULT;
-			case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS:
-				return getEContainingClass() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaFactoryImpl.java
deleted file mode 100644
index dbcfdfd5e..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaFactoryImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: JavaFactoryImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter;
-
-/**
- * The factory to use JavaRef packages. It will use the
- * IInstantiationHandler, if there is one, to do the
- * factory requests. Else it will let the superclass handle it.
- */
-public class JavaFactoryImpl extends EFactoryImpl {
-	
-	private IInstantiationHandler instantiationHandler;
-	private boolean retrievedHandler;
-
-	/**
-	 * Constructor for JavaFactoryImpl.
-	 */
-	public JavaFactoryImpl() {
-		super();
-	}
-
-	protected IInstantiationHandler getInstantiationHandler() {
-		if (!retrievedHandler) {
-			// Need to retrieve handler lazily because when factory is created it does not yet know what ResourceSet it is in.
-			// Can't know that until the first time we need a handler.
-			ResourceSet rset = getEPackage().eResource().getResourceSet();
-			if (rset != null) {
-				retrievedHandler = true;
-				IInstantiationHandlerFactoryAdapter factory = (IInstantiationHandlerFactoryAdapter) EcoreUtil.getExistingAdapter(rset, IInstantiationHandlerFactoryAdapter.ADAPTER_KEY);
-				if (factory != null)
-					instantiationHandler = factory.getInstantiationHandler(this);
-			}
-		}
-		return instantiationHandler;
-	}
-	
-	/**
-	 * @see org.eclipse.emf.ecore.EFactory#create(EClass)
-	 */
-	public EObject create(EClass eClass) {
-		IInstantiationHandler ia = getInstantiationHandler();
-		if (ia == null || !ia.handlesClass(eClass))
-			return super.create(eClass);
-		else
-			return ia.create(eClass);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaPackageImpl.java
deleted file mode 100644
index ca4caf503..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaPackageImpl.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: JavaPackageImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.java.JavaRefPackage;
-
-import org.eclipse.jem.java.*;
-
-public class JavaPackageImpl extends EPackageImpl implements JavaPackage, EPackage {
-		/**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	protected JavaPackageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getJavaPackage();
-	}
-
-	/**
-	 * Get the list of classes that this package contains.
-	 * Since this is a derived relationship, we need to implement
-	 * it here. It will get the metaobjects list. These are the
-	 * java classes this package contains.
-	 *
-	 * If this is the primitives package, then it must return
-	 * an empty list because it doesn't contain any classes.
-	 */
-	public EList getJavaClasses() {
-		return !PRIMITIVE_PACKAGE_NAME.equals(getName()) ?
-			ECollections.unmodifiableEList(getEClassifiers()) :
-			ECollections.EMPTY_ELIST;
-	}
-/**
- * Return the name for this package.
- * We do not want to expose the .javaprim package
- * since this is the name of the default package.
- */
-public String getName() {
-	if (isDefault())
-		return "";
-	else
-		return super.getName();
-}
-	public String getPackageName() {
-
-	String internalName = super.getName() ;
-	return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(internalName) ? "" : internalName ;	
-}
-protected boolean isDefault() {
-	return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(super.getName());	
-}
-	/**
-	 * Since classes are loaded dynamically and not from a schema, a
-	 * class could be asked for through this method, and if not yet reflected,
-	 * it wouldn't be found. We need to make sure that any class asked for
-	 * in this package is found (i.e. poofed up). Otherwise loading an instance
-	 * document that refers to java class through namespaces won't be found.
-	 */
-	public EClassifier getEClassifier(String className) {			
-		// Try to get the class from the resource that this package is in.
-		// This will create it if not found. This works because the
-		// structure is there is one java package per resource, and
-		// the id of the class is the class name without the package
-		// portion, which is what className above is.
-		Object result = eResource().getEObject(className);
-		return (result instanceof EClassifier) ? (EClassifier) result : null;
-	}
-	
-	/**
-	 * reflect - reflect a Java package for a given package name.
-	 * If the package does not exist, one will be created through
-	 * the reflection mechanism.
-	 * @deprecated
-	 * @see org.eclipse.jem.java.JavaRefFactory#reflectPackage(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet) 
-	 */
-	public static JavaPackage reflect(String packageName, ResourceSet set) {
-		return JavaRefFactory.eINSTANCE.reflectPackage(packageName, set);
-    }
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_PACKAGE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__EFACTORY_INSTANCE:
-					if (eFactoryInstance != null)
-						msgs = ((InternalEObject)eFactoryInstance).eInverseRemove(this, EcorePackage.EFACTORY__EPACKAGE, EFactory.class, msgs);
-					return basicSetEFactoryInstance((EFactory)otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__ECLASSIFIERS:
-					return ((InternalEList)getEClassifiers()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__ESUBPACKAGES:
-					return ((InternalEList)getESubpackages()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_PACKAGE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__EFACTORY_INSTANCE:
-					return basicSetEFactoryInstance(null, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__ECLASSIFIERS:
-					return ((InternalEList)getEClassifiers()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__ESUBPACKAGES:
-					return ((InternalEList)getESubpackages()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE:
-					return eBasicSetContainer(null, JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE:
-					return eContainer.eInverseRemove(this, EcorePackage.EPACKAGE__ESUBPACKAGES, EPackage.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PACKAGE__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.JAVA_PACKAGE__NAME:
-				return getName();
-			case JavaRefPackage.JAVA_PACKAGE__NS_URI:
-				return getNsURI();
-			case JavaRefPackage.JAVA_PACKAGE__NS_PREFIX:
-				return getNsPrefix();
-			case JavaRefPackage.JAVA_PACKAGE__EFACTORY_INSTANCE:
-				return getEFactoryInstance();
-			case JavaRefPackage.JAVA_PACKAGE__ECLASSIFIERS:
-				return getEClassifiers();
-			case JavaRefPackage.JAVA_PACKAGE__ESUBPACKAGES:
-				return getESubpackages();
-			case JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE:
-				return getESuperPackage();
-			case JavaRefPackage.JAVA_PACKAGE__JAVA_CLASSES:
-				return getJavaClasses();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PACKAGE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__NS_URI:
-				setNsURI((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__NS_PREFIX:
-				setNsPrefix((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__EFACTORY_INSTANCE:
-				setEFactoryInstance((EFactory)newValue);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__ECLASSIFIERS:
-				getEClassifiers().clear();
-				getEClassifiers().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__ESUBPACKAGES:
-				getESubpackages().clear();
-				getESubpackages().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PACKAGE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__NS_URI:
-				setNsURI(NS_URI_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__NS_PREFIX:
-				setNsPrefix(NS_PREFIX_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__EFACTORY_INSTANCE:
-				setEFactoryInstance((EFactory)null);
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__ECLASSIFIERS:
-				getEClassifiers().clear();
-				return;
-			case JavaRefPackage.JAVA_PACKAGE__ESUBPACKAGES:
-				getESubpackages().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PACKAGE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.JAVA_PACKAGE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.JAVA_PACKAGE__NS_URI:
-				return NS_URI_EDEFAULT == null ? nsURI != null : !NS_URI_EDEFAULT.equals(nsURI);
-			case JavaRefPackage.JAVA_PACKAGE__NS_PREFIX:
-				return NS_PREFIX_EDEFAULT == null ? nsPrefix != null : !NS_PREFIX_EDEFAULT.equals(nsPrefix);
-			case JavaRefPackage.JAVA_PACKAGE__EFACTORY_INSTANCE:
-				return eFactoryInstance != null;
-			case JavaRefPackage.JAVA_PACKAGE__ECLASSIFIERS:
-				return eClassifiers != null && !eClassifiers.isEmpty();
-			case JavaRefPackage.JAVA_PACKAGE__ESUBPACKAGES:
-				return eSubpackages != null && !eSubpackages.isEmpty();
-			case JavaRefPackage.JAVA_PACKAGE__ESUPER_PACKAGE:
-				return getESuperPackage() != null;
-			case JavaRefPackage.JAVA_PACKAGE__JAVA_CLASSES:
-				return !getJavaClasses().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //JavaPackageImpl
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaParameterImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaParameterImpl.java
deleted file mode 100644
index 7c3aba30d..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaParameterImpl.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
- *  $RCSfile: JavaParameterImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/09/15 20:28:04 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EParameterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaParameterKind;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Method;
-
-/**
- * @generated
- */
-public class JavaParameterImpl extends EParameterImpl implements JavaParameter{
-
-	/**
-	 * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FINAL_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FINAL_EFLAG = 1 << 10;
-
-	/**
-	 * The default value of the '{@link #getParameterKind() <em>Parameter Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameterKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final JavaParameterKind PARAMETER_KIND_EDEFAULT = JavaParameterKind.IN_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaParameterKind parameterKind = PARAMETER_KIND_EDEFAULT;
-	protected JavaParameterImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getJavaParameter();
-	}
-
-	public JavaHelpers getJavaType() {
-		return (JavaHelpers)getEType();
-	}
-  public String getQualifiedName() {
-    return (eContainer() instanceof Method) ? ((Method)eContainer()).getName() + "." + this.getName() : this.getName();
-  }
-	/**
-	 * Is this parameter type an array type.
-	 */
-	public boolean isArray() {
-		return getJavaType().isArray();
-	}
-	/**
-	 * Is this a return parameter.
-	 */
-	public boolean isReturn() {
-		return JavaParameterKind.RETURN == getParameterKind().getValue();
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isFinal() {
-		return (eFlags & FINAL_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
-		if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_PARAMETER__FINAL, oldFinal, newFinal));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaParameterKind getParameterKind() {
-		return parameterKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParameterKind(JavaParameterKind newParameterKind) {
-		JavaParameterKind oldParameterKind = parameterKind;
-		parameterKind = newParameterKind == null ? PARAMETER_KIND_EDEFAULT : newParameterKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND, oldParameterKind, parameterKind));
-	}
-
-	/*
-	 * This is not meant to be used outside of the reflection adapters.
-	 */
-	public synchronized ReadAdaptor getReadAdapter() {
-		return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(eContainer(), ReadAdaptor.TYPE_KEY);
-	}
-	
-	private static final int  REFLECTED_BASE = 0x1, REFLECTED_PARAM_NAME = 0x2;
-
-	protected int reflectionStatus = REFLECTED_BASE;  // At this time base reflection
-													  // is performed at creation.
-
-	protected void reflectParamName() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if ((reflectionStatus & REFLECTED_PARAM_NAME) == 0) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = ((IJavaMethodAdapter) readAdaptor).reflectParamNamesIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				// Normally we wouldn't need to set this because it would be set during the reflectParamNamesIfNecessary, but
-				// in case there was a problem we mark it still reflected so we don't try again.
-				if (setReflected)
-					reflectionStatus |= (REFLECTED_BASE | REFLECTED_PARAM_NAME); // We can be certain base will be done by reflect generated if not already
-																			  // done.
-			}
-		}
-	}
-	
-	public String getName() {
-		reflectParamName();
-		return super.getName();
-	}
-	
-	public void setName(String name) {
-		super.setName(name);
-		synchronized (this) {
-		   reflectionStatus |= (REFLECTED_PARAM_NAME);
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PARAMETER__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.JAVA_PARAMETER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.JAVA_PARAMETER__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__MANY:
-				return isMany() != MANY_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__REQUIRED:
-				return isRequired() != REQUIRED_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__ETYPE:
-				return eType != null;
-			case JavaRefPackage.JAVA_PARAMETER__EOPERATION:
-				return getEOperation() != null;
-			case JavaRefPackage.JAVA_PARAMETER__FINAL:
-				return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
-			case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
-				return parameterKind != PARAMETER_KIND_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PARAMETER__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__FINAL:
-				setFinal(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
-				setParameterKind((JavaParameterKind)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PARAMETER__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__FINAL:
-				setFinal(FINAL_EDEFAULT);
-				return;
-			case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
-				setParameterKind(PARAMETER_KIND_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (final: ");
-		result.append((eFlags & FINAL_EFLAG) != 0);
-		result.append(", parameterKind: ");
-		result.append(parameterKind);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_PARAMETER__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PARAMETER__EOPERATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_PARAMETER__EOPERATION, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.JAVA_PARAMETER__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.JAVA_PARAMETER__EOPERATION:
-					return eBasicSetContainer(null, JavaRefPackage.JAVA_PARAMETER__EOPERATION, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.JAVA_PARAMETER__EOPERATION:
-					return eContainer.eInverseRemove(this, EcorePackage.EOPERATION__EPARAMETERS, EOperation.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.JAVA_PARAMETER__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.JAVA_PARAMETER__NAME:
-				return getName();
-			case JavaRefPackage.JAVA_PARAMETER__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_PARAMETER__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case JavaRefPackage.JAVA_PARAMETER__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_PARAMETER__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_PARAMETER__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case JavaRefPackage.JAVA_PARAMETER__EOPERATION:
-				return getEOperation();
-			case JavaRefPackage.JAVA_PARAMETER__FINAL:
-				return isFinal() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
-				return getParameterKind();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefFactoryImpl.java
deleted file mode 100644
index 3d433baac..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefFactoryImpl.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.util.JavaContext;
-
-
-
-/**
- * @generated
- */
-public class JavaRefFactoryImpl extends EFactoryImpl implements JavaRefFactory {
-	
-	/**
-	 * Notes about Type URI's.
-	 * <p>
-	 * The format of a type uri is: "java:/package#classname". "package" is either the package name,
-	 * with '.' for package separator (e.g. "java:/a.b#XYZ"). Or for primitive (e.g. "java:/#int") or
-	 * for default package (e.g. "java:/#XYZ").
-	 * <p>
-	 * The classname has some special changes. First it must use reflection format which means
-	 * that any inner class must use the '$' format, i.e. "A.B" must be "A$B".
-	 * <p>
-	 * Next if there is
-	 * a generic involved then it must be changed in the following way: "A<? extends a.B>" will
-	 * be changed to "A{? extends a!B}". The reason for this is first that '<' and '>' are
-	 * invalid in a fragment (id) of a URI. So we replace them with '{}'. Next because we use
-	 * the fragment "A.field" or "A.method(" to mean a field or method id, we can't have the
-	 * '.' in the generic portion. If it was there we couldn't quickly find the appropriate nesting
-	 * of the generic's '{}' because there could be another generic within the generic, and then
-	 * say to find the '.' after that nested set.
-	 */
-
-	
-	/**
-	 * Comment for <code>GENERIC_ID_SEPARATOR</code>
-	 * 
-	 * @since 1.2.0
-	 */
-	private static final char GENERIC_ID_SEPARATOR = '!';
-	/**
-	 * Comment for <code>GENERIC_SEPARATOR</code>
-	 * 
-	 * @since 1.2.0
-	 */
-	private static final char GENERIC_SEPARATOR = '.';
-	/**
-	 * Comment for <code>GENERIC_ID_END</code>
-	 * 
-	 * @since 1.2.0
-	 */
-	private static final char GENERIC_ID_END = '}';
-	/**
-	 * Comment for <code>GENERIC_END</code>
-	 * 
-	 * @since 1.2.0
-	 */
-	private static final char GENERIC_END = '>';
-	/**
-	 * Comment for <code>GENERIC_ID_START</code>
-	 * 
-	 * @since 1.2.0
-	 */
-	private static final char GENERIC_ID_START = '{';
-	/**
-	 * Comment for <code>GENERIC_START</code>
-	 * 
-	 * @since 1.2.0
-	 */
-	private static final char GENERIC_START = '<';
-	
-
-	public JavaRefFactoryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JavaRefPackage.JAVA_CLASS: return createJavaClass();
-			case JavaRefPackage.INITIALIZER: return createInitializer();
-			case JavaRefPackage.JAVA_PARAMETER: return createJavaParameter();
-			case JavaRefPackage.METHOD: return createMethod();
-			case JavaRefPackage.FIELD: return createField();
-			case JavaRefPackage.BLOCK: return createBlock();
-			case JavaRefPackage.COMMENT: return createComment();
-			case JavaRefPackage.STATEMENT: return createStatement();
-			case JavaRefPackage.JAVA_PACKAGE: return createJavaPackage();
-			case JavaRefPackage.JAVA_DATA_TYPE: return createJavaDataType();
-			case JavaRefPackage.ARRAY_TYPE: return createArrayType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case JavaRefPackage.TYPE_KIND: {
-				TypeKind result = TypeKind.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case JavaRefPackage.JAVA_VISIBILITY_KIND: {
-				JavaVisibilityKind result = JavaVisibilityKind.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case JavaRefPackage.JAVA_PARAMETER_KIND: {
-				JavaParameterKind result = JavaParameterKind.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case JavaRefPackage.JTYPE_JAVA_HELPERS:
-				return createJTypeJavaHelpersFromString(eDataType, initialValue);
-			case JavaRefPackage.JTYPE_LIST:
-				return createJTypeListFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case JavaRefPackage.TYPE_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			case JavaRefPackage.JAVA_VISIBILITY_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			case JavaRefPackage.JAVA_PARAMETER_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			case JavaRefPackage.JTYPE_JAVA_HELPERS:
-				return convertJTypeJavaHelpersToString(eDataType, instanceValue);
-			case JavaRefPackage.JTYPE_LIST:
-				return convertJTypeListToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	public ArrayType createArrayType(JavaHelpers componentType) {
-		ArrayType at = createArrayType();
-		
-		String computedName = componentType.getQualifiedName() + "[]";
-		at.setName(computedName);
-		return at;
-	}
-	public ArrayType createArrayType(JavaHelpers finalComponentType, int dimensions) {
-		ArrayType at = createArrayType();
-		
-		String computedName = finalComponentType.getQualifiedName();
-		for (int i = 0; i < dimensions; i++){
-			computedName = computedName + "[]";
-		}
-		at.setName(computedName);
-		return at;
-	}
-
-  /**
-   * Get the java context
-   * @return
-   * 
-   * @deprecated Use the API {@link JavaContext#createJavaContext()} instead.
-   * @since 1.2.0
-   */
-  public static ResourceSet createJavaContext() {
-    return JavaContext.createJavaContext();
-  }
-	/**
-	 * Return the Class for the Java refection adapter factory.
-	 * @deprecated Use the API {@link JavaContext#getReflectionAdapterFactoryClass()} instead.
-	 */
-	public static Class getReflectionAdapterFactoryClass() {
-		return JavaContext.getReflectionAdapterFactoryClass();
-	}
-	
-	/**
-	 * Set the Class for the Java refection adapter factory.
-	 * 
-	 * @deprecated Use the API {@link JavaContext#setReflectionAdapterFactoryClass(Class)} instead.
-	 */
-	public static void setReflectionAdapterFactoryClass(Class javaReflectionFactoryClass) {
-		JavaContext.setReflectionAdapterFactoryClass(javaReflectionFactoryClass);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Method createMethod() {
-		MethodImpl method = new MethodImpl();
-		return method;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaClass createJavaClass() {
-		JavaClassImpl javaClass = new JavaClassImpl();
-		return javaClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Field createField() {
-		FieldImpl field = new FieldImpl();
-		return field;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Block createBlock() {
-		BlockImpl block = new BlockImpl();
-		return block;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Comment createComment() {
-		CommentImpl comment = new CommentImpl();
-		return comment;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Statement createStatement() {
-		StatementImpl statement = new StatementImpl();
-		return statement;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Initializer createInitializer() {
-		InitializerImpl initializer = new InitializerImpl();
-		return initializer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaParameter createJavaParameter() {
-		JavaParameterImpl javaParameter = new JavaParameterImpl();
-		return javaParameter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ArrayType createArrayType() {
-		ArrayTypeImpl arrayType = new ArrayTypeImpl();
-		return arrayType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaHelpers createJTypeJavaHelpersFromString(EDataType eDataType, String initialValue) {
-		return (JavaHelpers)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJTypeJavaHelpersToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List createJTypeListFromString(EDataType eDataType, String initialValue) {
-		return (List)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJTypeListToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaDataType createJavaDataType() {
-		JavaDataTypeImpl javaDataType = new JavaDataTypeImpl();
-		return javaDataType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaPackage createJavaPackage() {
-		JavaPackageImpl javaPackage = new JavaPackageImpl();
-		return javaPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaRefPackage getJavaRefPackage() {
-		return (JavaRefPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JavaRefPackage getPackage() {
-		return JavaRefPackage.eINSTANCE;
-	}
-
-	public static JavaRefFactory getActiveFactory() {
-		return JavaRefFactory.eINSTANCE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.java.JavaRefFactory#createClassRef(java.lang.String)
-	 */
-	public JavaClass createClassRef(String targetName) {
-		JavaClass ref = createJavaClass();
-		((InternalEObject) ref).eSetProxyURI(createTypeURI(targetName));
-		return ref;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public JavaHelpers reflectType(String aQualifiedName, EObject relatedObject) {
-		Resource r = relatedObject.eResource();
-		if (r != null) {
-			ResourceSet rs = r.getResourceSet();
-			if (rs != null) {
-				return reflectType(aQualifiedName, rs);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	public JavaHelpers reflectType(String aQualifiedName, ResourceSet set) {
-		if (aQualifiedName != null) {
-			int index = aQualifiedName.lastIndexOf(".");
-			if (index > 0)
-				return reflectType(aQualifiedName.substring(0, index), aQualifiedName.substring(index + 1, aQualifiedName.length()), set);
-			else
-				return reflectType("", aQualifiedName, set);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	public JavaHelpers reflectType(String aPackageName, String aTypeName, ResourceSet set) {
-		if (aTypeName != null && aPackageName != null) {
-			org.eclipse.jem.internal.java.init.JavaInit.init();
-			return (JavaHelpers) set.getEObject(createTypeURI(aPackageName, aTypeName), true);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#reflectPackage(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	public JavaPackage reflectPackage(String packageName, ResourceSet set) {
-		if (packageName != null) {
-			org.eclipse.jem.internal.java.init.JavaInit.init();
-			return (JavaPackage) set.getEObject(createPackageURI(packageName), true);
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#createTypeURI(java.lang.String)
-	 */
-	public URI createTypeURI(String aQualifiedName) {
-		// for need to just tolerate generics (i.e. "<...>". Fully support later.
-		//In this case tolerate means ignore the parameter types.
-		int genNdx = aQualifiedName.indexOf(GENERIC_START);
-		int pkgNdx = genNdx == -1 ? aQualifiedName.lastIndexOf('.') : aQualifiedName.lastIndexOf('.', genNdx);
-		if (pkgNdx > -1)
-			return createTypeURI(aQualifiedName.substring(0, pkgNdx), genNdx == -1 ? aQualifiedName.substring(pkgNdx+1) : aQualifiedName.substring(pkgNdx+1, genNdx));
-		else
-			return createTypeURI(null, aQualifiedName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#createTypeURI(java.lang.String, java.lang.String)
-	 */
-	public URI createTypeURI(String packageName, String typeName) {
-		String[] pkgname = null;
-		if (packageName != null && packageName.length() > 0)
-			pkgname = new String[] {packageName};
-		return URI.createHierarchicalURI(JAVA_PROTOCOL_URI_SCHEME, null, null, pkgname, null, createTypeName(typeName));
-	}
-	
-	/**
-	 * Create a URI'd type name from a regular typename.
-	 * <p>
-	 * This should only be used by friends of the Impl package.
-	 * @param typeName type name, no package allowed, and must be in form for reflection (i.e. '$' not '.' to separate outer and inner classes).
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public String createTypeName(String typeName) {
-
-		int genStart = typeName.indexOf(GENERIC_START);
-		if (genStart > -1) {
-			char[] chName = new char[typeName.length()];
-			typeName.getChars(0, chName.length, chName, 0);
-			for (int i = 0; i < chName.length; i++) {
-				switch (chName[i]) {
-					case GENERIC_START:
-						chName[i] = GENERIC_ID_START;
-						break;
-					case GENERIC_END:
-						chName[i] = GENERIC_ID_END;
-						break;
-					case GENERIC_SEPARATOR:
-						chName[i] = GENERIC_ID_SEPARATOR;
-						break;
-					default:
-						break;
-				}
-			}
-			typeName = new String(chName);
-		}
-		return typeName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#getTypeName(org.eclipse.emf.common.util.URI)
-	 */
-	public String getTypeName(URI typeURI) {
-		if (isTypeURI(typeURI)) {
-			return primGetTypeName(typeURI.fragment());
-		} else
-			throw new IllegalArgumentException(typeURI.toString());
-	}
-	
-	/**
-	 * Get type name from URI'd typename.
-	 * <p>
-	 * This should only be used by friends of the Impl package.
-	 * @param type uri fragment value for type name.
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public String primGetTypeName(String typeName) {
-		int genStart = typeName.indexOf(GENERIC_ID_START);
-		if (genStart > -1) {
-			char[] chName = new char[typeName.length()];
-			typeName.getChars(0, chName.length, chName, 0);
-			for (int i = 0; i < chName.length; i++) {
-				switch (chName[i]) {
-					case GENERIC_ID_START:
-						chName[i] = GENERIC_START;
-						break;
-					case GENERIC_ID_END:
-						chName[i] = GENERIC_END;
-						break;
-					case GENERIC_ID_SEPARATOR:
-						chName[i] = GENERIC_SEPARATOR;
-						break;
-					default:
-						break;
-				}
-			}
-			typeName = new String(chName);
-		}
-		return typeName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#getPackageName(org.eclipse.emf.common.util.URI)
-	 */
-	public String getPackageName(URI javaURI) {
-		if (isTypeURI(javaURI) || isPackageURI(javaURI)) {
-			if (javaURI.segmentCount() == 1) {
-				return javaURI.segment(0);
-			} else if (javaURI.segmentCount() == 0)
-				return "";	//$NON-NLS-1$	
-			else
-				throw new IllegalArgumentException(javaURI.toString());
-		} else
-			throw new IllegalArgumentException(javaURI.toString());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#getFullTypeName(org.eclipse.emf.common.util.URI)
-	 */
-	public String getFullTypeName(URI typeURI) {
-		String pkgName = getPackageName(typeURI);
-		if (!isTypeURI(typeURI))
-			throw new IllegalArgumentException(typeURI.toString());
-		
-		if (pkgName.length() > 0)
-			return pkgName+'.'+getTypeName(typeURI);
-		else
-			return typeURI.fragment();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#createPackageURI(java.lang.String)
-	 */
-	public URI createPackageURI(String packageName) {
-		String[] pkgname = null;
-		if (packageName != null && packageName.length() > 0)
-			pkgname = new String[] {packageName};
-		return URI.createHierarchicalURI(JAVA_PROTOCOL_URI_SCHEME, null, null, pkgname, null, JavaPackage.PACKAGE_ID);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#isJavaURI(org.eclipse.emf.common.util.URI)
-	 */
-	public boolean isJavaURI(URI uri) {
-		return JAVA_PROTOCOL_URI_SCHEME.equals(uri.scheme());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#isTypeURI(org.eclipse.emf.common.util.URI)
-	 */
-	public boolean isTypeURI(URI uri) {
-		if (isJavaURI(uri)) {
-			String frag = uri.fragment();
-			if (frag != null && !JavaPackage.PACKAGE_ID.equals(frag)) {
-				int delimNdx = frag.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-				if (delimNdx != -1)
-					return false;
-				delimNdx = frag.indexOf('/');	// From beaninfo for property.
-				if (delimNdx != -1)
-					return false;
-				else
-					return true;
-			} else
-				return false;
-		} else
-			return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.java.JavaRefFactory#isPackageURI(org.eclipse.emf.common.util.URI)
-	 */
-	public boolean isPackageURI(URI uri) {
-		return isJavaURI(uri) && JavaPackage.PACKAGE_ID.equals(uri.fragment());
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefPackageImpl.java
deleted file mode 100644
index 6ab5bd316..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefPackageImpl.java
+++ /dev/null
@@ -1,1029 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: JavaRefPackageImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2006/05/17 20:13:07 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-
-
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.Block;
-import org.eclipse.jem.java.Comment;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.Initializer;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaDataType;
-import org.eclipse.jem.java.JavaEvent;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaParameterKind;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.Statement;
-import org.eclipse.jem.java.TypeKind;
-
-
-/**
- * @lastgen class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage, EPackage {}
- */
-public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaClassEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass initializerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaParameterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass fieldEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass blockEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass commentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass statementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaDataTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass arrayTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaEventEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum typeKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum javaVisibilityKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum javaParameterKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType jTypeJavaHelpersEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType jTypeListEDataType = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private JavaRefPackageImpl() {
-		super(eNS_URI, JavaRefFactory.eINSTANCE);
-	}
-	
-	/**
-	 * Do not use. This is here only for the use of the older deprecated org.eclipse.jem.java.impl.JavaRefPackageImpl.
-	 * @param b
-	 * 
-	 * 
-	 * @since 1.2.0
-	 */
-	protected JavaRefPackageImpl(boolean b) {
-		this();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * This is here only for older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface. New
-	 * code should not use this directly.
-	 * @return
-	 * @since 1.2.0
-	 */
-	public static JavaRefPackage init() {
-		if (isInited) return (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Note: Need to be careful here. If EMF ever changes how it generates the init method and assigns the
-		// package in a different way then this will need to change too.
-		if (!(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof org.eclipse.jem.java.impl.JavaRefPackageImpl))
-			new org.eclipse.jem.java.impl.JavaRefPackageImpl();
-		return initGen();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JavaRefPackage initGen() {
-		if (isInited) return (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Obtain or create and register package
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JavaRefPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JavaRefPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-
-		// Create package meta-data objects
-		theJavaRefPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theJavaRefPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theJavaRefPackage.freeze();
-
-		return theJavaRefPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJavaClass() {
-		return javaClassEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJavaClass_Kind() {
-		return (EAttribute)javaClassEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaClass_Public() {
-		return (EAttribute)javaClassEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaClass_Final() {
-		return (EAttribute)javaClassEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_ImplementsInterfaces() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_ClassImport() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_PackageImports() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_Fields() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_Methods() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_Initializers() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_DeclaringClass() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_DeclaredClasses() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_JavaPackage() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_Events() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaClass_AllEvents() {
-		return (EReference)javaClassEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getField() {
-		return fieldEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getField_Final() {
-		return (EAttribute)fieldEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getField_Static() {
-		return (EAttribute)fieldEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getField_JavaVisibility() {
-		return (EAttribute)fieldEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getField_Transient() {
-		return (EAttribute)fieldEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getField_Volatile() {
-		return (EAttribute)fieldEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getField_JavaClass() {
-		return (EReference)fieldEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getField_Initializer() {
-		return (EReference)fieldEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethod() {
-		return methodEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethod_Abstract() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethod_Native() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethod_Synchronized() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethod_Final() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethod_Constructor() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethod_Static() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethod_JavaVisibility() {
-		return (EAttribute)methodEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethod_Parameters() {
-		return (EReference)methodEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethod_JavaExceptions() {
-		return (EReference)methodEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethod_JavaClass() {
-		return (EReference)methodEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethod_Source() {
-		return (EReference)methodEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJavaParameter() {
-		return javaParameterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaParameter_Final() {
-		return (EAttribute)javaParameterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJavaParameter_ParameterKind() {
-		return (EAttribute)javaParameterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getArrayType() {
-		return arrayTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getArrayType_ArrayDimensions() {
-		return (EAttribute)arrayTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getArrayType_ComponentType() {
-		return (EReference)arrayTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJavaDataType() {
-		return javaDataTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJavaEvent() {
-		return javaEventEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJavaPackage() {
-		return javaPackageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJavaPackage_JavaClasses() {
-		return (EReference)javaPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getBlock() {
-		return blockEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getBlock_Source() {
-		return (EAttribute)blockEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getBlock_Name() {
-		return (EAttribute)blockEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getBlock_Contents() {
-		return (EReference)blockEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getComment() {
-		return commentEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getStatement() {
-		return statementEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getInitializer() {
-		return initializerEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitializer_IsStatic() {
-		return (EAttribute)initializerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getInitializer_JavaClass() {
-		return (EReference)initializerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getInitializer_Source() {
-		return (EReference)initializerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getJavaVisibilityKind() {
-		return javaVisibilityKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getJavaParameterKind() {
-		return javaParameterKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTypeKind() {
-		return typeKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EDataType getJTypeList() {
-		return jTypeListEDataType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EDataType getJTypeJavaHelpers() {
-		return jTypeJavaHelpersEDataType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaRefFactory getJavaRefFactory() {
-		return (JavaRefFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		javaClassEClass = createEClass(JAVA_CLASS);
-		createEAttribute(javaClassEClass, JAVA_CLASS__KIND);
-		createEAttribute(javaClassEClass, JAVA_CLASS__PUBLIC);
-		createEAttribute(javaClassEClass, JAVA_CLASS__FINAL);
-		createEReference(javaClassEClass, JAVA_CLASS__IMPLEMENTS_INTERFACES);
-		createEReference(javaClassEClass, JAVA_CLASS__CLASS_IMPORT);
-		createEReference(javaClassEClass, JAVA_CLASS__PACKAGE_IMPORTS);
-		createEReference(javaClassEClass, JAVA_CLASS__FIELDS);
-		createEReference(javaClassEClass, JAVA_CLASS__METHODS);
-		createEReference(javaClassEClass, JAVA_CLASS__INITIALIZERS);
-		createEReference(javaClassEClass, JAVA_CLASS__DECLARED_CLASSES);
-		createEReference(javaClassEClass, JAVA_CLASS__DECLARING_CLASS);
-		createEReference(javaClassEClass, JAVA_CLASS__JAVA_PACKAGE);
-		createEReference(javaClassEClass, JAVA_CLASS__EVENTS);
-		createEReference(javaClassEClass, JAVA_CLASS__ALL_EVENTS);
-
-		initializerEClass = createEClass(INITIALIZER);
-		createEAttribute(initializerEClass, INITIALIZER__IS_STATIC);
-		createEReference(initializerEClass, INITIALIZER__JAVA_CLASS);
-		createEReference(initializerEClass, INITIALIZER__SOURCE);
-
-		javaParameterEClass = createEClass(JAVA_PARAMETER);
-		createEAttribute(javaParameterEClass, JAVA_PARAMETER__FINAL);
-		createEAttribute(javaParameterEClass, JAVA_PARAMETER__PARAMETER_KIND);
-
-		methodEClass = createEClass(METHOD);
-		createEAttribute(methodEClass, METHOD__ABSTRACT);
-		createEAttribute(methodEClass, METHOD__NATIVE);
-		createEAttribute(methodEClass, METHOD__SYNCHRONIZED);
-		createEAttribute(methodEClass, METHOD__FINAL);
-		createEAttribute(methodEClass, METHOD__CONSTRUCTOR);
-		createEAttribute(methodEClass, METHOD__STATIC);
-		createEAttribute(methodEClass, METHOD__JAVA_VISIBILITY);
-		createEReference(methodEClass, METHOD__PARAMETERS);
-		createEReference(methodEClass, METHOD__JAVA_EXCEPTIONS);
-		createEReference(methodEClass, METHOD__JAVA_CLASS);
-		createEReference(methodEClass, METHOD__SOURCE);
-
-		fieldEClass = createEClass(FIELD);
-		createEAttribute(fieldEClass, FIELD__FINAL);
-		createEAttribute(fieldEClass, FIELD__STATIC);
-		createEAttribute(fieldEClass, FIELD__JAVA_VISIBILITY);
-		createEAttribute(fieldEClass, FIELD__TRANSIENT);
-		createEAttribute(fieldEClass, FIELD__VOLATILE);
-		createEReference(fieldEClass, FIELD__JAVA_CLASS);
-		createEReference(fieldEClass, FIELD__INITIALIZER);
-
-		blockEClass = createEClass(BLOCK);
-		createEAttribute(blockEClass, BLOCK__SOURCE);
-		createEAttribute(blockEClass, BLOCK__NAME);
-		createEReference(blockEClass, BLOCK__CONTENTS);
-
-		commentEClass = createEClass(COMMENT);
-
-		statementEClass = createEClass(STATEMENT);
-
-		javaPackageEClass = createEClass(JAVA_PACKAGE);
-		createEReference(javaPackageEClass, JAVA_PACKAGE__JAVA_CLASSES);
-
-		javaDataTypeEClass = createEClass(JAVA_DATA_TYPE);
-
-		arrayTypeEClass = createEClass(ARRAY_TYPE);
-		createEAttribute(arrayTypeEClass, ARRAY_TYPE__ARRAY_DIMENSIONS);
-		createEReference(arrayTypeEClass, ARRAY_TYPE__COMPONENT_TYPE);
-
-		javaEventEClass = createEClass(JAVA_EVENT);
-
-		// Create enums
-		typeKindEEnum = createEEnum(TYPE_KIND);
-		javaVisibilityKindEEnum = createEEnum(JAVA_VISIBILITY_KIND);
-		javaParameterKindEEnum = createEEnum(JAVA_PARAMETER_KIND);
-
-		// Create data types
-		jTypeJavaHelpersEDataType = createEDataType(JTYPE_JAVA_HELPERS);
-		jTypeListEDataType = createEDataType(JTYPE_LIST);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add supertypes to classes
-		javaClassEClass.getESuperTypes().add(theEcorePackage.getEClass());
-		javaParameterEClass.getESuperTypes().add(theEcorePackage.getEParameter());
-		methodEClass.getESuperTypes().add(theEcorePackage.getEOperation());
-		fieldEClass.getESuperTypes().add(theEcorePackage.getETypedElement());
-		commentEClass.getESuperTypes().add(this.getBlock());
-		statementEClass.getESuperTypes().add(this.getBlock());
-		javaPackageEClass.getESuperTypes().add(theEcorePackage.getEPackage());
-		javaDataTypeEClass.getESuperTypes().add(theEcorePackage.getEClass());
-		arrayTypeEClass.getESuperTypes().add(this.getJavaClass());
-		javaEventEClass.getESuperTypes().add(theEcorePackage.getEStructuralFeature());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(javaClassEClass, JavaClass.class, "JavaClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJavaClass_Kind(), this.getTypeKind(), "kind", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaClass_Public(), ecorePackage.getEBoolean(), "public", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaClass_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_ImplementsInterfaces(), this.getJavaClass(), null, "implementsInterfaces", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_ClassImport(), this.getJavaClass(), null, "classImport", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_PackageImports(), this.getJavaPackage(), null, "packageImports", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_Fields(), this.getField(), this.getField_JavaClass(), "fields", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_Methods(), this.getMethod(), this.getMethod_JavaClass(), "methods", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_Initializers(), this.getInitializer(), this.getInitializer_JavaClass(), "initializers", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_DeclaredClasses(), this.getJavaClass(), this.getJavaClass_DeclaringClass(), "declaredClasses", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_DeclaringClass(), this.getJavaClass(), this.getJavaClass_DeclaredClasses(), "declaringClass", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_JavaPackage(), this.getJavaPackage(), this.getJavaPackage_JavaClasses(), "javaPackage", null, 0, 1, JavaClass.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_Events(), this.getJavaEvent(), null, "events", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaClass_AllEvents(), this.getJavaEvent(), null, "allEvents", null, 0, -1, JavaClass.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isNested");
-
-		EOperation op = addEOperation(javaClassEClass, this.getField(), "getField");
-		addEParameter(op, ecorePackage.getEString(), "fieldName");
-
-		op = addEOperation(javaClassEClass, this.getField(), "getFieldExtended");
-		addEParameter(op, ecorePackage.getEString(), "fieldName");
-
-		op = addEOperation(javaClassEClass, this.getField(), "getFieldNamed");
-		addEParameter(op, ecorePackage.getEString(), "fieldName");
-
-		addEOperation(javaClassEClass, this.getJTypeList(), "getFieldsExtended");
-
-		op = addEOperation(javaClassEClass, this.getMethod(), "getMethod");
-		addEParameter(op, ecorePackage.getEString(), "methodName");
-		addEParameter(op, this.getJTypeList(), "parameterTypes");
-
-		addEOperation(javaClassEClass, this.getJTypeList(), "getMethodElementSignatures");
-
-		op = addEOperation(javaClassEClass, this.getMethod(), "getMethodExtended");
-		addEParameter(op, ecorePackage.getEString(), "methodName");
-		addEParameter(op, this.getJTypeList(), "parameterTypes");
-
-		addEOperation(javaClassEClass, this.getJTypeList(), "getMethodsExtended");
-
-		op = addEOperation(javaClassEClass, this.getJTypeList(), "getOnlySpecificMethods");
-		addEParameter(op, ecorePackage.getEString(), "aMethodNamePrefix");
-		addEParameter(op, this.getJTypeList(), "excludedNames");
-
-		op = addEOperation(javaClassEClass, this.getMethod(), "getPublicMethod");
-		addEParameter(op, ecorePackage.getEString(), "methodName");
-		addEParameter(op, this.getJTypeList(), "parameterTypes");
-
-		addEOperation(javaClassEClass, this.getJTypeList(), "getPublicMethods");
-
-		addEOperation(javaClassEClass, this.getJTypeList(), "getPublicMethodsExtended");
-
-		op = addEOperation(javaClassEClass, this.getJTypeList(), "getPublicMethodsNamed");
-		addEParameter(op, ecorePackage.getEString(), "name");
-
-		addEOperation(javaClassEClass, this.getJavaClass(), "getSupertype");
-
-		op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "implementsInterface");
-		addEParameter(op, this.getJavaClass(), "interfaceType");
-
-		addEOperation(javaClassEClass, ecorePackage.getEString(), "infoString");
-
-		op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "inheritsFrom");
-		addEParameter(op, this.getJavaClass(), "javaClass");
-
-		addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isExistingType");
-
-		addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isInterface");
-
-		op = addEOperation(javaClassEClass, null, "setSupertype");
-		addEParameter(op, this.getJavaClass(), "javaclass");
-
-		initEClass(initializerEClass, Initializer.class, "Initializer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInitializer_IsStatic(), ecorePackage.getEBooleanObject(), "isStatic", null, 0, 1, Initializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getInitializer_JavaClass(), this.getJavaClass(), this.getJavaClass_Initializers(), "javaClass", null, 0, 1, Initializer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getInitializer_Source(), this.getBlock(), null, "source", null, 0, 1, Initializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(javaParameterEClass, JavaParameter.class, "JavaParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJavaParameter_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, JavaParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaParameter_ParameterKind(), this.getJavaParameterKind(), "parameterKind", null, 0, 1, JavaParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(javaParameterEClass, ecorePackage.getEBoolean(), "isArray");
-
-		addEOperation(javaParameterEClass, ecorePackage.getEBoolean(), "isReturn");
-
-		addEOperation(javaParameterEClass, this.getJTypeJavaHelpers(), "getJavaType");
-
-		addEOperation(javaParameterEClass, ecorePackage.getEString(), "getQualifiedName");
-
-		initEClass(methodEClass, Method.class, "Method", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethod_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethod_Native(), ecorePackage.getEBoolean(), "native", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethod_Synchronized(), ecorePackage.getEBoolean(), "synchronized", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethod_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethod_Constructor(), ecorePackage.getEBoolean(), "constructor", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethod_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethod_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethod_Parameters(), this.getJavaParameter(), null, "parameters", null, 0, -1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethod_JavaExceptions(), this.getJavaClass(), null, "javaExceptions", null, 0, -1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethod_JavaClass(), this.getJavaClass(), this.getJavaClass_Methods(), "javaClass", null, 0, 1, Method.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethod_Source(), this.getBlock(), null, "source", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(methodEClass, this.getJavaClass(), "getContainingJavaClass");
-
-		addEOperation(methodEClass, ecorePackage.getEString(), "getMethodElementSignature");
-
-		op = addEOperation(methodEClass, this.getJavaParameter(), "getParameter");
-		addEParameter(op, ecorePackage.getEString(), "parameterName");
-
-		addEOperation(methodEClass, this.getJTypeJavaHelpers(), "getReturnType");
-
-		op = addEOperation(methodEClass, null, "setReturnType");
-		addEParameter(op, this.getJTypeJavaHelpers(), "type");
-
-		addEOperation(methodEClass, ecorePackage.getEString(), "getSignature");
-
-		addEOperation(methodEClass, ecorePackage.getEBoolean(), "isGenerated");
-
-		op = addEOperation(methodEClass, null, "setIsGenerated");
-		addEParameter(op, ecorePackage.getEBoolean(), "generated");
-
-		addEOperation(methodEClass, ecorePackage.getEBoolean(), "isVoid");
-
-		initEClass(fieldEClass, Field.class, "Field", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getField_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getField_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getField_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getField_Transient(), ecorePackage.getEBoolean(), "transient", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getField_Volatile(), ecorePackage.getEBoolean(), "volatile", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getField_JavaClass(), this.getJavaClass(), this.getJavaClass_Fields(), "javaClass", null, 0, 1, Field.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getField_Initializer(), this.getBlock(), null, "initializer", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(fieldEClass, this.getJavaClass(), "getContainingJavaClass");
-
-		addEOperation(fieldEClass, ecorePackage.getEBoolean(), "isArray");
-
-		initEClass(blockEClass, Block.class, "Block", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBlock_Source(), ecorePackage.getEString(), "source", null, 0, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBlock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBlock_Contents(), this.getBlock(), null, "contents", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(statementEClass, Statement.class, "Statement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(javaPackageEClass, JavaPackage.class, "JavaPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getJavaPackage_JavaClasses(), this.getJavaClass(), this.getJavaClass_JavaPackage(), "javaClasses", null, 0, -1, JavaPackage.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(javaDataTypeEClass, JavaDataType.class, "JavaDataType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		addEOperation(javaDataTypeEClass, ecorePackage.getEString(), "getDefaultValueString");
-
-		initEClass(arrayTypeEClass, ArrayType.class, "ArrayType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getArrayType_ArrayDimensions(), ecorePackage.getEInt(), "arrayDimensions", null, 0, 1, ArrayType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getArrayType_ComponentType(), theEcorePackage.getEClassifier(), null, "componentType", null, 1, 1, ArrayType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(arrayTypeEClass, this.getJTypeJavaHelpers(), "getFinalComponentType");
-
-		addEOperation(arrayTypeEClass, this.getJTypeJavaHelpers(), "getComponentTypeAsHelper");
-
-		addEOperation(arrayTypeEClass, ecorePackage.getEBoolean(), "isPrimitiveArray");
-
-		op = addEOperation(arrayTypeEClass, null, "setComponentType");
-		addEParameter(op, this.getJTypeJavaHelpers(), "helperComponentType");
-
-		initEClass(javaEventEClass, JavaEvent.class, "JavaEvent", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(typeKindEEnum, TypeKind.class, "TypeKind");
-		addEEnumLiteral(typeKindEEnum, TypeKind.UNDEFINED_LITERAL);
-		addEEnumLiteral(typeKindEEnum, TypeKind.CLASS_LITERAL);
-		addEEnumLiteral(typeKindEEnum, TypeKind.INTERFACE_LITERAL);
-		addEEnumLiteral(typeKindEEnum, TypeKind.EXCEPTION_LITERAL);
-
-		initEEnum(javaVisibilityKindEEnum, JavaVisibilityKind.class, "JavaVisibilityKind");
-		addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PUBLIC_LITERAL);
-		addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PRIVATE_LITERAL);
-		addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PROTECTED_LITERAL);
-		addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PACKAGE_LITERAL);
-
-		initEEnum(javaParameterKindEEnum, JavaParameterKind.class, "JavaParameterKind");
-		addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.IN_LITERAL);
-		addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.OUT_LITERAL);
-		addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.INOUT_LITERAL);
-		addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.RETURN_LITERAL);
-
-		// Initialize data types
-		initEDataType(jTypeJavaHelpersEDataType, JavaHelpers.class, "JTypeJavaHelpers", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(jTypeListEDataType, List.class, "JTypeList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java
deleted file mode 100644
index 4486cbbc5..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java
+++ /dev/null
@@ -1,1133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
- *  $RCSfile: MethodImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/09/15 20:28:03 $ 
- */
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EOperationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.Block;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-
-
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-
-/**
- * @generated
- */
-public class MethodImpl extends EOperationImpl implements Method {
-
-	protected String signature;
-
-	/**
-	 * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAbstract()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ABSTRACT_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAbstract()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ABSTRACT_EFLAG = 1 << 10;
-
-	/**
-	 * The default value of the '{@link #isNative() <em>Native</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNative()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NATIVE_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isNative() <em>Native</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNative()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int NATIVE_EFLAG = 1 << 11;
-
-	/**
-	 * The default value of the '{@link #isSynchronized() <em>Synchronized</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSynchronized()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SYNCHRONIZED_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isSynchronized() <em>Synchronized</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSynchronized()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SYNCHRONIZED_EFLAG = 1 << 12;
-
-	/**
-	 * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FINAL_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FINAL_EFLAG = 1 << 13;
-
-	/**
-	 * The default value of the '{@link #isConstructor() <em>Constructor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstructor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CONSTRUCTOR_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isConstructor() <em>Constructor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstructor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CONSTRUCTOR_EFLAG = 1 << 14;
-
-	/**
-	 * The default value of the '{@link #isStatic() <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean STATIC_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isStatic() <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int STATIC_EFLAG = 1 << 15;
-
-	/**
-	 * The default value of the '{@link #getJavaVisibility() <em>Java Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJavaVisibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final JavaVisibilityKind JAVA_VISIBILITY_EDEFAULT = JavaVisibilityKind.PUBLIC_LITERAL;
-
-	private transient boolean isGenerated = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaVisibilityKind javaVisibility = JAVA_VISIBILITY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList parameters = null;
-
-	/**
-	 * The cached value of the '{@link #getJavaExceptions() <em>Java Exceptions</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJavaExceptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList javaExceptions = null;
-
-	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected Block source = null;
-
-	protected MethodImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getMethod();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAbstractGen() {
-		return (eFlags & ABSTRACT_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAbstract(boolean newAbstract) {
-		boolean oldAbstract = (eFlags & ABSTRACT_EFLAG) != 0;
-		if (newAbstract) eFlags |= ABSTRACT_EFLAG; else eFlags &= ~ABSTRACT_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__ABSTRACT, oldAbstract, newAbstract));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNativeGen() {
-		return (eFlags & NATIVE_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNative(boolean newNative) {
-		boolean oldNative = (eFlags & NATIVE_EFLAG) != 0;
-		if (newNative) eFlags |= NATIVE_EFLAG; else eFlags &= ~NATIVE_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__NATIVE, oldNative, newNative));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSynchronizedGen() {
-		return (eFlags & SYNCHRONIZED_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSynchronized(boolean newSynchronized) {
-		boolean oldSynchronized = (eFlags & SYNCHRONIZED_EFLAG) != 0;
-		if (newSynchronized) eFlags |= SYNCHRONIZED_EFLAG; else eFlags &= ~SYNCHRONIZED_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__SYNCHRONIZED, oldSynchronized, newSynchronized));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFinalGen() {
-		return (eFlags & FINAL_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
-		if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__FINAL, oldFinal, newFinal));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isConstructorGen() {
-		return (eFlags & CONSTRUCTOR_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConstructor(boolean newConstructor) {
-		boolean oldConstructor = (eFlags & CONSTRUCTOR_EFLAG) != 0;
-		if (newConstructor) eFlags |= CONSTRUCTOR_EFLAG; else eFlags &= ~CONSTRUCTOR_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__CONSTRUCTOR, oldConstructor, newConstructor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isStaticGen() {
-		return (eFlags & STATIC_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatic(boolean newStatic) {
-		boolean oldStatic = (eFlags & STATIC_EFLAG) != 0;
-		if (newStatic) eFlags |= STATIC_EFLAG; else eFlags &= ~STATIC_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__STATIC, oldStatic, newStatic));
-	}
-
-	/**
-	 * Return the java class that this method is defined in.
-	 */
-	public JavaClass getContainingJavaClass() {
-		return this.getJavaClass();
-	}
-
-	/**
-	 * Overrides to ensure reflection is done.
-	 */
-	public boolean isAbstract() {
-		reflectValues();
-		return isAbstractGen();
-	}
-
-	public boolean isConstructor() {
-		reflectValues();
-		return isConstructorGen();
-	}
-
-	public boolean isFinal() {
-		reflectValues();
-		return isFinalGen();
-	}
-
-	public boolean isNative() {
-		reflectValues();
-		return isNativeGen();
-	}
-
-	public boolean isStatic() {
-		reflectValues();
-		return isStaticGen();
-	}
-
-	public boolean isSynchronized() {
-		reflectValues();
-		return isSynchronizedGen();
-	}
-
-	public EList getJavaExceptions() {
-		reflectValues();
-		return getJavaExceptionsGen();
-	}
-
-	public JavaVisibilityKind getJavaVisibility() {
-		reflectValues();
-		return getJavaVisibilityGen();
-	}
-
-	public EList getParameters() {
-		reflectValues();
-		return getParametersGen();
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.ETypedElement#getEType()
-	 */
-	public EClassifier getEType() {
-		reflectValues();
-		return super.getEType();
-	}
-
-	/**
-	 * Return a String with the the method name and its parameters. e.g. <code> setFirstName(java.lang.String) <//code> .
-	 *
-	 */
-	public String getMethodElementSignature() {
-		StringBuffer sb = new StringBuffer(75);
-		sb.append(getName());
-		sb.append("(");
-		List params = getParameters();
-		JavaParameter param;
-		int parmSize = params.size();
-		int commaTest = 0;
-		for (int j = 0; j < parmSize; j++) {
-			if (j > commaTest) {
-				sb.append(",");
-			}
-			param = (JavaParameter) params.get(j);
-			//FB if (param.isReturn()) {
-			//FB commaTest ++;
-			//FB continue;
-			//FB }
-			sb.append(((JavaHelpers) param.getEType()).getQualifiedName());
-		}
-		sb.append(")");
-		return sb.toString();
-	}
-
-	/**
-	 * Return a Parameter with the passed name, or null.
-	 */
-	public JavaParameter getParameter(String parameterName) {
-		List parms = getParameters();
-		JavaParameter parm;
-		int parmSize = parms.size();
-		for (int j = 0; j < parmSize; j++) {
-			parm = (JavaParameter) parms.get(j);
-			if (parm.getName().equals(parameterName))
-				return parm;
-		}
-		return null;
-	}
-
-	private static final int NOT_REFLECTED = 0x0, REFLECTED_BASE = 0x1, REFLECTED_GENERATED = 0x2;
-
-	protected int reflectionStatus = NOT_REFLECTED;
-
-	protected void reflectValues() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if ((reflectionStatus & REFLECTED_BASE) == 0) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = readAdaptor.reflectValuesIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				if (setReflected)
-					reflectionStatus |= REFLECTED_BASE;
-			}
-		}
-	}
-
-	/*
-	 * This is not meant to be used outside of the reflection adapters.
-	 */
-	public synchronized ReadAdaptor getReadAdapter() {
-		return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(this, ReadAdaptor.TYPE_KEY);
-	}
-
-	/*
-	 * Used by reflection adapter to clear the reflection. This not intended to be used by others.
-	 */
-	public synchronized void setReflected(boolean reflected) {
-		if (!reflected)
-			reflectionStatus = NOT_REFLECTED;
-	}
-
-	/**
-	 * Get the return type.
-	 */
-	public JavaHelpers getReturnType() {
-		return (JavaHelpers) getEType();
-	}
-
-	public String getSignature() {
-		if (signature == null)
-			signature = doGetSignature();
-		return signature;
-	}
-
-	/**
-	 * Replicate the functionality of java.lang.reflect.Method.toString().
-	 * 
-	 * Returns a string describing this Method. The string is formatted as the method access modifiers, if any, followed by the method return type,
-	 * followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a
-	 * parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is
-	 * followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.
-	 * 
-	 * For example:
-	 * 
-	 * public boolean java.lang.Object.equals(java.lang.Object)
-	 * 
-	 * The access modifiers are placed in canonical order as specified by "The Java Language Specification". This is public,
-	 * <tt>protected<//tt> or <tt>private<//tt> first, and then other modifiers in the following order: <tt>abstract<//tt>, <tt>static<//tt>, <tt>final<//tt>, <tt>synchronized<//tt> <tt>native<//tt>.
-
-	 */
-	protected String doGetSignature() {
-		StringBuffer sb = new StringBuffer();
-		switch (getJavaVisibility().getValue()) {
-			case JavaVisibilityKind.PUBLIC:
-				sb.append("Public ");
-				break;
-			case JavaVisibilityKind.PROTECTED:
-				sb.append("Protected ");
-				break;
-			case JavaVisibilityKind.PRIVATE:
-				sb.append("Private ");
-				break;
-			case JavaVisibilityKind.PACKAGE:
-				sb.append("Package ");
-				break;
-		}
-		if (isAbstract())
-			sb.append("abstract ");
-		if (isStatic())
-			sb.append("static ");
-		if (isFinal())
-			sb.append("final ");
-		if (isSynchronized())
-			sb.append("synchronized ");
-		if (isNative())
-			sb.append("native ");
-		if (isVoid())
-			sb.append("void ");
-		else
-			sb.append(getReturnType().getQualifiedName() + " ");
-		sb.append(getContainingJavaClass().getJavaName() + ".");
-		sb.append(getName() + "(");
-		List params = getParameters();
-		JavaParameter param;
-		int parmSize = params.size();
-		for (int j = 0; j < parmSize; j++) {
-			param = (JavaParameter) params.get(j);
-			//FB if (param.isReturn())
-			//FB continue; // listParameters() includes return type in array
-			sb.append(((JavaHelpers) param.getEType()).getQualifiedName());
-			if (j < (params.size() - 1)) {
-				sb.append(",");
-			}
-		}
-		sb.append(")");
-		List exceptions = getJavaExceptions();
-		JavaClass exception;
-		if (exceptions.size() > 0) {
-			sb.append(" throws ");
-			for (int k = 0; k < exceptions.size(); k++) {
-				exception = (JavaClass) exceptions.get(k);
-				sb.append(exception.getJavaName());
-				if (k < (exceptions.size() - 1)) {
-					sb.append(",");
-				}
-			}
-		}
-		return sb.toString();
-	}
-
-	protected void reflectGenerated() {
-		// We only want the testing of the hasReflected and get readadapter to be sync(this) so that
-		// it is short and no deadlock possibility (this is because the the method reflection adapter may go
-		// back to the containing java class to get its reflection adapter, which would lock on itself. So
-		// we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
-		// during the sync.
-		ReadAdaptor readAdaptor = null;
-		synchronized (this) {
-			if ((reflectionStatus & REFLECTED_GENERATED) == 0) {
-				readAdaptor = getReadAdapter();
-			}
-		}
-		if (readAdaptor != null) {
-			boolean setReflected = ((IJavaMethodAdapter) readAdaptor).reflectGeneratedIfNecessary();
-			synchronized (this) {
-				// Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
-				if (setReflected)
-					reflectionStatus |= (REFLECTED_GENERATED | REFLECTED_BASE); // We can be certain base will be done by reflect generated if not already
-																			  // done.
-			}
-		}
-	}
-
-	/**
-	 * Returns true if the method is system generated. This is usually determined by the "generated" tag in the comment.
-	 */
-	public boolean isGenerated() {
-		reflectGenerated();
-		return isGenerated;
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public boolean isGeneratedGen() {
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Is this a void return type method.
-	 */
-	public boolean isVoid() {
-		//FB return (getReturnParameter() == null || "void".equals(getReturnType().getName()));
-		return (getReturnType() == null || "void".equals(getReturnType().getName()));
-	}
-
-	public JavaParameter[] listParametersWithoutReturn() {
-		Collection v = getParameters();
-		JavaParameter[] result = new JavaParameter[v.size()];
-		v.toArray(result);
-		return result;
-	}
-
-	public EList eContents() {
-		EList results = new BasicEList();
-		results.addAll(getParametersGen()); //FB
-		return results;
-	}
-
-	/**
-	 * Set the isGenerated flag.
-	 */
-	public void setIsGenerated(boolean generated) {
-		isGenerated = generated;
-	}
-
-	/**
-	 * Set the return type
-	 */
-	public void setReturnType(JavaHelpers type) {
-		this.setEType(type);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaVisibilityKind getJavaVisibilityGen() {
-		return javaVisibility;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJavaVisibility(JavaVisibilityKind newJavaVisibility) {
-		JavaVisibilityKind oldJavaVisibility = javaVisibility;
-		javaVisibility = newJavaVisibility == null ? JAVA_VISIBILITY_EDEFAULT : newJavaVisibility;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__JAVA_VISIBILITY, oldJavaVisibility, javaVisibility));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getJavaClass() {
-		if (eContainerFeatureID != JavaRefPackage.METHOD__JAVA_CLASS) return null;
-		return (JavaClass)eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJavaClass(JavaClass newJavaClass) {
-		if (newJavaClass != eContainer || (eContainerFeatureID != JavaRefPackage.METHOD__JAVA_CLASS && newJavaClass != null)) {
-			if (EcoreUtil.isAncestor(this, newJavaClass))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newJavaClass != null)
-				msgs = ((InternalEObject)newJavaClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__METHODS, JavaClass.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newJavaClass, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__JAVA_CLASS, newJavaClass, newJavaClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Block getSource() {
-		if (source != null && source.eIsProxy()) {
-			Block oldSource = source;
-			source = (Block)eResolveProxy((InternalEObject)source);
-			if (source != oldSource) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.METHOD__SOURCE, oldSource, source));
-			}
-		}
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Block basicGetSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSource(Block newSource) {
-		Block oldSource = source;
-		source = newSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__SOURCE, oldSource, source));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.METHOD__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case JavaRefPackage.METHOD__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.METHOD__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case JavaRefPackage.METHOD__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case JavaRefPackage.METHOD__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case JavaRefPackage.METHOD__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case JavaRefPackage.METHOD__MANY:
-				return isMany() != MANY_EDEFAULT;
-			case JavaRefPackage.METHOD__REQUIRED:
-				return isRequired() != REQUIRED_EDEFAULT;
-			case JavaRefPackage.METHOD__ETYPE:
-				return eType != null;
-			case JavaRefPackage.METHOD__ECONTAINING_CLASS:
-				return getEContainingClass() != null;
-			case JavaRefPackage.METHOD__EPARAMETERS:
-				return eParameters != null && !eParameters.isEmpty();
-			case JavaRefPackage.METHOD__EEXCEPTIONS:
-				return eExceptions != null && !eExceptions.isEmpty();
-			case JavaRefPackage.METHOD__ABSTRACT:
-				return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
-			case JavaRefPackage.METHOD__NATIVE:
-				return ((eFlags & NATIVE_EFLAG) != 0) != NATIVE_EDEFAULT;
-			case JavaRefPackage.METHOD__SYNCHRONIZED:
-				return ((eFlags & SYNCHRONIZED_EFLAG) != 0) != SYNCHRONIZED_EDEFAULT;
-			case JavaRefPackage.METHOD__FINAL:
-				return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
-			case JavaRefPackage.METHOD__CONSTRUCTOR:
-				return ((eFlags & CONSTRUCTOR_EFLAG) != 0) != CONSTRUCTOR_EDEFAULT;
-			case JavaRefPackage.METHOD__STATIC:
-				return ((eFlags & STATIC_EFLAG) != 0) != STATIC_EDEFAULT;
-			case JavaRefPackage.METHOD__JAVA_VISIBILITY:
-				return javaVisibility != JAVA_VISIBILITY_EDEFAULT;
-			case JavaRefPackage.METHOD__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
-			case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
-				return javaExceptions != null && !javaExceptions.isEmpty();
-			case JavaRefPackage.METHOD__JAVA_CLASS:
-				return getJavaClass() != null;
-			case JavaRefPackage.METHOD__SOURCE:
-				return source != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.METHOD__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.METHOD__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.METHOD__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.METHOD__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case JavaRefPackage.METHOD__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case JavaRefPackage.METHOD__EPARAMETERS:
-				getEParameters().clear();
-				getEParameters().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.METHOD__EEXCEPTIONS:
-				getEExceptions().clear();
-				getEExceptions().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.METHOD__ABSTRACT:
-				setAbstract(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__NATIVE:
-				setNative(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__SYNCHRONIZED:
-				setSynchronized(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__FINAL:
-				setFinal(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__CONSTRUCTOR:
-				setConstructor(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__STATIC:
-				setStatic(((Boolean)newValue).booleanValue());
-				return;
-			case JavaRefPackage.METHOD__JAVA_VISIBILITY:
-				setJavaVisibility((JavaVisibilityKind)newValue);
-				return;
-			case JavaRefPackage.METHOD__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
-				getJavaExceptions().clear();
-				getJavaExceptions().addAll((Collection)newValue);
-				return;
-			case JavaRefPackage.METHOD__JAVA_CLASS:
-				setJavaClass((JavaClass)newValue);
-				return;
-			case JavaRefPackage.METHOD__SOURCE:
-				setSource((Block)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.METHOD__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case JavaRefPackage.METHOD__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case JavaRefPackage.METHOD__EPARAMETERS:
-				getEParameters().clear();
-				return;
-			case JavaRefPackage.METHOD__EEXCEPTIONS:
-				getEExceptions().clear();
-				return;
-			case JavaRefPackage.METHOD__ABSTRACT:
-				setAbstract(ABSTRACT_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__NATIVE:
-				setNative(NATIVE_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__SYNCHRONIZED:
-				setSynchronized(SYNCHRONIZED_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__FINAL:
-				setFinal(FINAL_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__CONSTRUCTOR:
-				setConstructor(CONSTRUCTOR_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__STATIC:
-				setStatic(STATIC_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__JAVA_VISIBILITY:
-				setJavaVisibility(JAVA_VISIBILITY_EDEFAULT);
-				return;
-			case JavaRefPackage.METHOD__PARAMETERS:
-				getParameters().clear();
-				return;
-			case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
-				getJavaExceptions().clear();
-				return;
-			case JavaRefPackage.METHOD__JAVA_CLASS:
-				setJavaClass((JavaClass)null);
-				return;
-			case JavaRefPackage.METHOD__SOURCE:
-				setSource((Block)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (abstract: ");
-		result.append((eFlags & ABSTRACT_EFLAG) != 0);
-		result.append(", native: ");
-		result.append((eFlags & NATIVE_EFLAG) != 0);
-		result.append(", synchronized: ");
-		result.append((eFlags & SYNCHRONIZED_EFLAG) != 0);
-		result.append(", final: ");
-		result.append((eFlags & FINAL_EFLAG) != 0);
-		result.append(", constructor: ");
-		result.append((eFlags & CONSTRUCTOR_EFLAG) != 0);
-		result.append(", static: ");
-		result.append((eFlags & STATIC_EFLAG) != 0);
-		result.append(", javaVisibility: ");
-		result.append(javaVisibility);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getParametersGen() {
-		if (parameters == null) {
-			parameters = new EObjectContainmentEList(JavaParameter.class, this, JavaRefPackage.METHOD__PARAMETERS);
-		}
-		return parameters;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getJavaExceptionsGen() {
-		if (javaExceptions == null) {
-			javaExceptions = new EObjectResolvingEList(JavaClass.class, this, JavaRefPackage.METHOD__JAVA_EXCEPTIONS);
-		}
-		return javaExceptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.METHOD__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.METHOD__ECONTAINING_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.METHOD__ECONTAINING_CLASS, msgs);
-				case JavaRefPackage.METHOD__EPARAMETERS:
-					return ((InternalEList)getEParameters()).basicAdd(otherEnd, msgs);
-				case JavaRefPackage.METHOD__JAVA_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.METHOD__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.METHOD__ECONTAINING_CLASS:
-					return eBasicSetContainer(null, JavaRefPackage.METHOD__ECONTAINING_CLASS, msgs);
-				case JavaRefPackage.METHOD__EPARAMETERS:
-					return ((InternalEList)getEParameters()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.METHOD__PARAMETERS:
-					return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
-				case JavaRefPackage.METHOD__JAVA_CLASS:
-					return eBasicSetContainer(null, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case JavaRefPackage.METHOD__ECONTAINING_CLASS:
-					return eContainer.eInverseRemove(this, EcorePackage.ECLASS__EOPERATIONS, EClass.class, msgs);
-				case JavaRefPackage.METHOD__JAVA_CLASS:
-					return eContainer.eInverseRemove(this, JavaRefPackage.JAVA_CLASS__METHODS, JavaClass.class, msgs);
-				default:
-					return eDynamicBasicRemoveFromContainer(msgs);
-			}
-		}
-		return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.METHOD__EANNOTATIONS:
-				return getEAnnotations();
-			case JavaRefPackage.METHOD__NAME:
-				return getName();
-			case JavaRefPackage.METHOD__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case JavaRefPackage.METHOD__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case JavaRefPackage.METHOD__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case JavaRefPackage.METHOD__ECONTAINING_CLASS:
-				return getEContainingClass();
-			case JavaRefPackage.METHOD__EPARAMETERS:
-				return getEParameters();
-			case JavaRefPackage.METHOD__EEXCEPTIONS:
-				return getEExceptions();
-			case JavaRefPackage.METHOD__ABSTRACT:
-				return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__NATIVE:
-				return isNative() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__SYNCHRONIZED:
-				return isSynchronized() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__FINAL:
-				return isFinal() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__CONSTRUCTOR:
-				return isConstructor() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__STATIC:
-				return isStatic() ? Boolean.TRUE : Boolean.FALSE;
-			case JavaRefPackage.METHOD__JAVA_VISIBILITY:
-				return getJavaVisibility();
-			case JavaRefPackage.METHOD__PARAMETERS:
-				return getParameters();
-			case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
-				return getJavaExceptions();
-			case JavaRefPackage.METHOD__JAVA_CLASS:
-				return getJavaClass();
-			case JavaRefPackage.METHOD__SOURCE:
-				if (resolve) return getSource();
-				return basicGetSource();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/StatementImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/StatementImpl.java
deleted file mode 100644
index 8ea3905a5..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/StatementImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: StatementImpl.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Statement;
-/**
- * @generated
- */
-public class StatementImpl extends BlockImpl implements Statement{
-
-	protected StatementImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getStatement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JavaRefPackage.STATEMENT__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.STATEMENT__SOURCE:
-				return getSource();
-			case JavaRefPackage.STATEMENT__NAME:
-				return getName();
-			case JavaRefPackage.STATEMENT__CONTENTS:
-				return getContents();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.STATEMENT__SOURCE:
-				setSource((String)newValue);
-				return;
-			case JavaRefPackage.STATEMENT__NAME:
-				setName((String)newValue);
-				return;
-			case JavaRefPackage.STATEMENT__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.STATEMENT__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case JavaRefPackage.STATEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JavaRefPackage.STATEMENT__CONTENTS:
-				getContents().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JavaRefPackage.STATEMENT__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case JavaRefPackage.STATEMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaRefPackage.STATEMENT__CONTENTS:
-				return contents != null && !contents.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/URL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/URL.java
deleted file mode 100644
index 4b6febd2f..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/URL.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
- *  $RCSfile: URL.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:32 $ 
- */
-import java.util.ArrayList;
-import java.util.List;
-
-public class URL {
-	public String namespaceName;
-	public String ID;
-	List attributeNames;
-/**
- * URL constructor comment.
- */
-public URL(String urlString) {
-	initializeFromString(urlString);
-}
-/**
- * URL constructor comment.
- */
-public URL(String nameSpaceName, String anID) {
-	this.namespaceName = nameSpaceName;
-	this.ID = anID;
-}
-public List getAttributeNames() {
-	return attributeNames;
-}
-public void initializeFromString(String urlString) {
-	int poundInx = urlString.lastIndexOf('#');
-	if (poundInx > -1) {
-		namespaceName = urlString.substring(0, poundInx);
-		urlString = urlString.substring(poundInx + 1);
-		int dotIndex = urlString.indexOf("->"); //$NON-NLS-1$
-		if (dotIndex > -1) {
-			ID = urlString.substring(0, dotIndex);
-			String attributeNameString = urlString.substring(dotIndex + 2);
-			attributeNames = new ArrayList();
-			do {
-				dotIndex = attributeNameString.indexOf("->"); //$NON-NLS-1$
-				if (dotIndex > -1) {
-					attributeNames.add(attributeNameString.substring(0, dotIndex));
-					attributeNameString = attributeNameString.substring(dotIndex + 2);
-				} else
-					attributeNames.add(attributeNameString);
-			} while (dotIndex > -1);
-		} else {
-			ID = urlString;
-		}
-	} else {
-		// assume that any URL string that ends with .xmi is a namespace.
-		if (urlString.endsWith(".xmi")){ //$NON-NLS-1$
-			namespaceName = urlString;
-			ID = null;
-		} else {
-			namespaceName = "?defaultURL?"; //$NON-NLS-1$
-			ID = urlString;
-		}
-	}
-}
-public String toString() {
-	return "URL(" + ((namespaceName == null) ? "" : namespaceName + "#") + ((ID == null) ? "" : ID) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaContext.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaContext.java
deleted file mode 100644
index 4e8d07ba2..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaContext.java
+++ /dev/null
@@ -1,90 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JavaContext.java,v $
- *  $Revision: 1.1 $  $Date: 2006/01/13 23:46:51 $ 
- */
-package org.eclipse.jem.java.util;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-
-/**
- * Static helper class to handle the java context. The java context is a resource set
- * that has the appropriate reflection adapter attached, either for java reflection or
- * for JDT reflection. The default is for java reflection. When running in Eclipse it
- * will be the JDT reflection.
- * <p>
- * <b>Note:</b>This should only be used by customers that are not doing normal Eclipse JDT JEM
- * reflection. Normal JEM should be using the JEM EMF nature access instead.
- * @since 1.2.0
- */
-public class JavaContext {
-
-	private static Class ReflectionFactoryClass = JavaJDKAdapterFactory.class;
-	
-	private JavaContext() {
-		
-	}
-	
-	/**
-	 * Create the java context. To be used outside of Eclipse.
-	 * Within normal Eclipse JEM usage the JEM EMF nature should be used instead.
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public static ResourceSet createJavaContext() {
-		org.eclipse.jem.internal.java.init.JavaInit.init();
-		ResourceSet set = new ResourceSetImpl();
-		set.getAdapterFactories().add(createJavaReflectionAdapterFactory());
-		return set;
-	}
-	
-	private static AdapterFactory createJavaReflectionAdapterFactory() {
-		AdapterFactory factoryInstance = null;
-		try {
-			if (getReflectionAdapterFactoryClass() != null)
-				factoryInstance = (AdapterFactory) getReflectionAdapterFactoryClass().newInstance();
-		} catch (Exception e) {
-			// Reflection or instantiation problems.
-			// OK, can't do Java Model reflection
-		}
-		return factoryInstance;
-	}
-
-	/**
-	 * Return the Class for the Java refection adapter factory.
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	public static Class getReflectionAdapterFactoryClass() {
-		return ReflectionFactoryClass;
-	}
-
-	/**
-	 * Set the Class for the Java refection adapter factory. Within Eclipse this should not
-	 * be set by customers.
-	 * 
-	 * @param javaReflectionFactoryClass
-	 * 
-	 * @since 1.2.0
-	 */
-	public static void setReflectionAdapterFactoryClass(Class javaReflectionFactoryClass) {
-		ReflectionFactoryClass = javaReflectionFactoryClass;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java
deleted file mode 100644
index 469898c1a..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java
+++ /dev/null
@@ -1,478 +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.jem.java.util;
-/*
- *  $RCSfile: JavaRefAdapterFactory.java,v $
- *  $Revision: 1.6 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.jem.java.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage
- * @generated
- */
-public class JavaRefAdapterFactory extends AdapterFactoryImpl
-{
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JavaRefPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaRefAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = JavaRefPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaRefSwitch modelSwitch =
-		new JavaRefSwitch() {
-			public Object caseJavaClass(JavaClass object) {
-				return createJavaClassAdapter();
-			}
-			public Object caseInitializer(Initializer object) {
-				return createInitializerAdapter();
-			}
-			public Object caseJavaParameter(JavaParameter object) {
-				return createJavaParameterAdapter();
-			}
-			public Object caseMethod(Method object) {
-				return createMethodAdapter();
-			}
-			public Object caseField(Field object) {
-				return createFieldAdapter();
-			}
-			public Object caseBlock(Block object) {
-				return createBlockAdapter();
-			}
-			public Object caseComment(Comment object) {
-				return createCommentAdapter();
-			}
-			public Object caseStatement(Statement object) {
-				return createStatementAdapter();
-			}
-			public Object caseJavaPackage(JavaPackage object) {
-				return createJavaPackageAdapter();
-			}
-			public Object caseJavaDataType(JavaDataType object) {
-				return createJavaDataTypeAdapter();
-			}
-			public Object caseArrayType(ArrayType object) {
-				return createArrayTypeAdapter();
-			}
-			public Object caseJavaEvent(JavaEvent object) {
-				return createJavaEventAdapter();
-			}
-			public Object caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			public Object caseENamedElement(ENamedElement object) {
-				return createENamedElementAdapter();
-			}
-			public Object caseEClassifier(EClassifier object) {
-				return createEClassifierAdapter();
-			}
-			public Object caseEClass(EClass object) {
-				return createEClassAdapter();
-			}
-			public Object caseETypedElement(ETypedElement object) {
-				return createETypedElementAdapter();
-			}
-			public Object caseEParameter(EParameter object) {
-				return createEParameterAdapter();
-			}
-			public Object caseEOperation(EOperation object) {
-				return createEOperationAdapter();
-			}
-			public Object caseEPackage(EPackage object) {
-				return createEPackageAdapter();
-			}
-			public Object caseEStructuralFeature(EStructuralFeature object) {
-				return createEStructuralFeatureAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaClass <em>Java Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.JavaClass
-	 * @generated
-	 */
-	public Adapter createJavaClassAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Initializer <em>Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.Initializer
-	 * @generated
-	 */
-	public Adapter createInitializerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaParameter <em>Java Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.JavaParameter
-	 * @generated
-	 */
-	public Adapter createJavaParameterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Method <em>Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.Method
-	 * @generated
-	 */
-	public Adapter createMethodAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Field <em>Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.Field
-	 * @generated
-	 */
-	public Adapter createFieldAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Block <em>Block</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.Block
-	 * @generated
-	 */
-	public Adapter createBlockAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Comment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.Comment
-	 * @generated
-	 */
-	public Adapter createCommentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Statement <em>Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.Statement
-	 * @generated
-	 */
-	public Adapter createStatementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaPackage <em>Java Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.JavaPackage
-	 * @generated
-	 */
-	public Adapter createJavaPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaDataType <em>Java Data Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.JavaDataType
-	 * @generated
-	 */
-	public Adapter createJavaDataTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.ArrayType <em>Array Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.ArrayType
-	 * @generated
-	 */
-	public Adapter createArrayTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaEvent <em>Java Event</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jem.java.JavaEvent
-	 * @generated
-	 */
-	public Adapter createJavaEventAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ENamedElement <em>ENamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.ENamedElement
-	 * @generated
-	 */
-	public Adapter createENamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EClassifier <em>EClassifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EClassifier
-	 * @generated
-	 */
-	public Adapter createEClassifierAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EClass <em>EClass</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EClass
-	 * @generated
-	 */
-	public Adapter createEClassAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ETypedElement <em>ETyped Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.ETypedElement
-	 * @generated
-	 */
-	public Adapter createETypedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EParameter <em>EParameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EParameter
-	 * @generated
-	 */
-	public Adapter createEParameterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EOperation <em>EOperation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EOperation
-	 * @generated
-	 */
-	public Adapter createEOperationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EStructuralFeature <em>EStructural Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EStructuralFeature
-	 * @generated
-	 */
-	public Adapter createEStructuralFeatureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EPackage <em>EPackage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EPackage
-	 * @generated
-	 */
-	public Adapter createEPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //JavaRefAdapterFactory
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java
deleted file mode 100644
index 1c7edff5b..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java
+++ /dev/null
@@ -1,547 +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.jem.java.util;
-
-/*
- *  $RCSfile: JavaRefSwitch.java,v $
- *  $Revision: 1.7 $  $Date: 2005/08/24 20:20:24 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.jem.java.*;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage
- * @generated
- */
-public class JavaRefSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JavaRefPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaRefSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JavaRefPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case JavaRefPackage.JAVA_CLASS: {
-				JavaClass javaClass = (JavaClass)theEObject;
-				Object result = caseJavaClass(javaClass);
-				if (result == null) result = caseEClass(javaClass);
-				if (result == null) result = caseEClassifier(javaClass);
-				if (result == null) result = caseENamedElement(javaClass);
-				if (result == null) result = caseEModelElement(javaClass);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.INITIALIZER: {
-				Initializer initializer = (Initializer)theEObject;
-				Object result = caseInitializer(initializer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.JAVA_PARAMETER: {
-				JavaParameter javaParameter = (JavaParameter)theEObject;
-				Object result = caseJavaParameter(javaParameter);
-				if (result == null) result = caseEParameter(javaParameter);
-				if (result == null) result = caseETypedElement(javaParameter);
-				if (result == null) result = caseENamedElement(javaParameter);
-				if (result == null) result = caseEModelElement(javaParameter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.METHOD: {
-				Method method = (Method)theEObject;
-				Object result = caseMethod(method);
-				if (result == null) result = caseEOperation(method);
-				if (result == null) result = caseETypedElement(method);
-				if (result == null) result = caseENamedElement(method);
-				if (result == null) result = caseEModelElement(method);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.FIELD: {
-				Field field = (Field)theEObject;
-				Object result = caseField(field);
-				if (result == null) result = caseETypedElement(field);
-				if (result == null) result = caseENamedElement(field);
-				if (result == null) result = caseEModelElement(field);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.BLOCK: {
-				Block block = (Block)theEObject;
-				Object result = caseBlock(block);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.COMMENT: {
-				Comment comment = (Comment)theEObject;
-				Object result = caseComment(comment);
-				if (result == null) result = caseBlock(comment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.STATEMENT: {
-				Statement statement = (Statement)theEObject;
-				Object result = caseStatement(statement);
-				if (result == null) result = caseBlock(statement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.JAVA_PACKAGE: {
-				JavaPackage javaPackage = (JavaPackage)theEObject;
-				Object result = caseJavaPackage(javaPackage);
-				if (result == null) result = caseEPackage(javaPackage);
-				if (result == null) result = caseENamedElement(javaPackage);
-				if (result == null) result = caseEModelElement(javaPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.JAVA_DATA_TYPE: {
-				JavaDataType javaDataType = (JavaDataType)theEObject;
-				Object result = caseJavaDataType(javaDataType);
-				if (result == null) result = caseEClass(javaDataType);
-				if (result == null) result = caseEClassifier(javaDataType);
-				if (result == null) result = caseENamedElement(javaDataType);
-				if (result == null) result = caseEModelElement(javaDataType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.ARRAY_TYPE: {
-				ArrayType arrayType = (ArrayType)theEObject;
-				Object result = caseArrayType(arrayType);
-				if (result == null) result = caseJavaClass(arrayType);
-				if (result == null) result = caseEClass(arrayType);
-				if (result == null) result = caseEClassifier(arrayType);
-				if (result == null) result = caseENamedElement(arrayType);
-				if (result == null) result = caseEModelElement(arrayType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JavaRefPackage.JAVA_EVENT: {
-				JavaEvent javaEvent = (JavaEvent)theEObject;
-				Object result = caseJavaEvent(javaEvent);
-				if (result == null) result = caseEStructuralFeature(javaEvent);
-				if (result == null) result = caseETypedElement(javaEvent);
-				if (result == null) result = caseENamedElement(javaEvent);
-				if (result == null) result = caseEModelElement(javaEvent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Class</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Class</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJavaClass(JavaClass object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Initializer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Initializer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInitializer(Initializer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Parameter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Parameter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJavaParameter(JavaParameter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethod(Method object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Field</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseField(Field object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Block</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Block</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBlock(Block object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Comment</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseComment(Comment object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Statement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseStatement(Statement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJavaPackage(JavaPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Data Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Data Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJavaDataType(JavaDataType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Array Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Array Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseArrayType(ArrayType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Event</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Event</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJavaEvent(JavaEvent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseENamedElement(ENamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EClassifier</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EClassifier</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEClassifier(EClassifier object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EClass</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EClass</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEClass(EClass object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseETypedElement(ETypedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EParameter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EParameter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEParameter(EParameter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EOperation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EOperation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEOperation(EOperation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEStructuralFeature(EStructuralFeature object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EPackage</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EPackage</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEPackage(EPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JavaRefSwitch
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/NotificationUtil.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/NotificationUtil.java
deleted file mode 100644
index c479002ab..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/NotificationUtil.java
+++ /dev/null
@@ -1,73 +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
- *******************************************************************************/
-/*
- *  $RCSfile: NotificationUtil.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:37:02 $ 
- */
-package org.eclipse.jem.java.util;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
- 
-
-/**
- * This is a utility class of static methods for handling special JEM notifications.
- * 
- * @since 1.1.0
- */
-public class NotificationUtil {
-	/*
-	 * Not meant to be constructed.
-	 */
-	private NotificationUtil() {
-		
-	}
-	
-	/**
-	 * Answer whether this notification is a reflection notification. If it is, then it means that the JavaClass has
-	 * just had reflection performed on it.
-	 * @param msg
-	 * @return <code>true</code> if this is a reflection event.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isReflectionEvent(Notification msg) {
-		return msg.getEventType() == ReflectionAdaptor.EVENT && msg.getFeature() == ReflectionAdaptor.REFLECTION_EVENT;
-	}
-	
-	/**
-	 * Answer whether this notification is a reflection flush event of a JavaClass with existing code. If it is, then it means that the 
-	 * JavaClass has just had the reflection results flushed, AND this was a class that had either source or binary code on it..
-	 * @param msg
-	 * @return <code>true</code> if this is a flush event.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isFlushEvent(Notification msg) {
-		return msg.getEventType() == ReflectionAdaptor.EVENT && msg.getFeature() == JavaReflectionAdaptor.FLUSH_REFLECTION_EVENT;
-	}
-
-	/**
-	 * Answer whether this notification is a reflection flush event of a JavaClass that is new and doesn't have existing code.
-	 * If it is, then it means that the JavaClass has just had the reflection results flushed, AND this was a class that was new and
-	 * had no code behind it.
-	 * @param msg
-	 * @return <code>true</code> if this is a flush event of new class.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isFlushNewEvent(Notification msg) {
-		return msg.getEventType() == ReflectionAdaptor.EVENT && msg.getFeature() == JavaReflectionAdaptor.FLUSH_NEW_REFLECTION_EVENT;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/overrides/..ROOT...override b/plugins/org.eclipse.jem/overrides/..ROOT...override
deleted file mode 100644
index afa4ad94f..000000000
--- a/plugins/org.eclipse.jem/overrides/..ROOT...override
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0">
-   <objectChanges key="X:ROOT#//@root">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="_eStructuralFeatures"/>
-         <!-- too remind us that these are need to be done yet in the new allocation scheme. 
-  <addedEObjects xsi:type="ecore:EAttribute" name="instantiateUsing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  <addedEObjects xsi:type="ecore:EAttribute" name="serializeData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
--->
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="_eStructuralFeatures" xsi:type="ecore:EReference"/>
-</change:ChangeDescription>
diff --git a/plugins/org.eclipse.jem/overrides/java/lang/Object.override b/plugins/org.eclipse.jem/overrides/java/lang/Object.override
deleted file mode 100644
index a5892fada..000000000
--- a/plugins/org.eclipse.jem/overrides/java/lang/Object.override
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.jem.internal.beaninfo.beaninfo="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0">
-   <objectChanges key="X:ROOT#//@root">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <!-- Turn class property to a hidden and not introspected property. This is because we don't handle Java 1.5 templates
-        yet as valid JavaClasses and it causes XMI serialization errors because it includes the "<" in the serialization of the class name
-        for the standard java class which is: "java:/java.lang#Class<? extends Class>". this is invalid in the serialization. -->
-        
-   <objectsToAttach name="class" xmi:id="_eStructuralFeatures" xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject">
-     <eAnnotations hidden="true" mergeIntrospection="false" xsi:type="org.eclipse.jem.internal.beaninfo.beaninfo:PropertyDecorator"/>
-   </objectsToAttach>
-   
-   <!-- 
-      This is kind of cheat, but datatypes are never introspected, so we can't get these attributes
-      added to them in a normal way. By doing it here, when java.lang.Object is introspected, these
-      will be done at the same time. And since Object needs to be introspected before anything else
-      can be done, these will be done before anything needs them. -->
-   <objectChanges key="java:/#boolean">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="boolean_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="boolean_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#char">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="char_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="char_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#int">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="int_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="int_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#float">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="float_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="float_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#short">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="short_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="short_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#long">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="long_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="long_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#double">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="double_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="double_eStructuralFeatures" xsi:type="ecore:EReference"/>
-   <objectChanges key="java:/#byte">
-      <value featureName="eStructuralFeatures">
-         <listChanges referenceValues="byte_eStructuralFeatures"/>
-      </value>
-   </objectChanges>
-   <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="byte_eStructuralFeatures" xsi:type="ecore:EReference"/>
-</change:ChangeDescription>
diff --git a/plugins/org.eclipse.jem/plugin.properties b/plugins/org.eclipse.jem/plugin.properties
deleted file mode 100644
index 50bea86eb..000000000
--- a/plugins/org.eclipse.jem/plugin.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/plugin.properties,v $
-# $Revision: 1.3 $  $Date: 2005/08/24 20:20:25 $
-#
-
-
-pluginName = Java EMF Model
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.jem/plugin.xml b/plugins/org.eclipse.jem/plugin.xml
deleted file mode 100644
index bad4c0ee6..000000000
--- a/plugins/org.eclipse.jem/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http:///org/eclipse/jem/internal/instantiation.ecore"
-            class="org.eclipse.jem.internal.instantiation.InstantiationPackage">
-      </package>
-      <package
-            uri="java.xmi"
-            class="org.eclipse.jem.java.JavaRefPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.jem.beaninfo.registrations">
-      <registration container="org.eclipse.jdt.launching.JRE_CONTAINER">
-        <override
-            package="java.lang"
-            path="overrides/java/lang">
-        </override>
-        <override
-            package="..ROOT.."
-            path="overrides">
-        </override>
-      </registration>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem/rose/.cvsignore b/plugins/org.eclipse.jem/rose/.cvsignore
deleted file mode 100644
index 1be3a373d..000000000
--- a/plugins/org.eclipse.jem/rose/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.md~
-*.ca~
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/rose/edocjava2.cat b/plugins/org.eclipse.jem/rose/edocjava2.cat
deleted file mode 100644
index 25b1eec2a..000000000
--- a/plugins/org.eclipse.jem/rose/edocjava2.cat
+++ /dev/null
@@ -1,5613 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "java"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"IDL"
-	    name       	"uuid"
-	    value      	(value Text "DCE:c74525a0-8826-11e1-0000-005d9e6adec4:1"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jem"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	(value Text "JavaRef"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	(value Text "java.xmi")))
-    quid       	"36549F2C004E"
-    documentation 	
-|Changes to synch up with Java3e:
-|- deleted JavaElement, BodyElement which didn't add anything useful
-|- deleted NestedClass and the association which described nesting, contents can be used instead
-|- deleted extends/extendedBy which is replaced with MOF subtype/supertype
-|- deleted the clumsy main diagram
-|- moved the MOF inheritance details to the MOF binding diagram
-|- deleted "final" on JavaParameter, don't know what that was supposed to be
-|- deleted the Category junk
-|- changed the Block-typed attributes on Field, Method, Initializer to be associations to Block
-|
-|Outstanding questions/issues:
-|- JavaParameterKind should go away if we get the base Parameter kind fixed up
-|
-    
-    stereotype 	"metamodel"
-    visible_categories 	(list visibility_relationship_list
-	(object Visibility_Relationship
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0001-005d9e6adec4:1")))
-	    quid       	"381DDF470271"
-	    supplier   	"Logical View::mof"
-	    quidu      	"374AA8F9028E")
-	(object Visibility_Relationship
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0002-005d9e6adec4:1")))
-	    quid       	"39BD366000FE"
-	    supplier   	"Logical View::ecore"
-	    quidu      	"39A5ED04004E"))
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "JavaClass"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0003-005d9e6adec4:1")))
-	    quid       	"36549FCC00FA"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0004-005d9e6adec4:1")))
-		    quid       	"3990950000B3"
-		    supplier   	"Logical View::ecore::EClass"
-		    quidu      	"3903D5BF000A"))
-	    operations 	(list Operations
-		(object Operation "isNested"
-		    quid       	"3A9D7C2101D6"
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getField"
-		    quid       	"3B65B5B30044"
-		    documentation 	"Return an Field with the passed name, or null."
-		    parameters 	(list Parameters
-			(object Parameter "fieldName"
-			    quid       	"3C62FAB901AA"
-			    type       	"String"))
-		    result     	"Field"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AF8F0280")
-		(object Operation "getFieldExtended"
-		    quid       	"3B65B625011A"
-		    documentation 	
-| Return an Field with the passed name from this JavaClass or any supertypes.
-|
-|Return null if a Field named fieldName is not found.
-		    
-		    parameters 	(list Parameters
-			(object Parameter "fieldName"
-			    quid       	"3C62FAB901AC"
-			    type       	"String"))
-		    result     	"Field"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AF8F0280")
-		(object Operation "getFieldNamed"
-		    quid       	"3B65B6670255"
-		    documentation 	"Return an Field with the passed name, or null."
-		    parameters 	(list Parameters
-			(object Parameter "fieldName"
-			    quid       	"3C62FAB901AE"
-			    type       	"String"))
-		    result     	"Field"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AF8F0280")
-		(object Operation "getFieldsExtended"
-		    quid       	"3B65B68A0328"
-		    documentation 	"Return all fields, including those from supertypes."
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getMethod"
-		    quid       	"3B65B911021A"
-		    documentation 	"Get the method of this name and these parameters. It will not look up the supertype hierarchy."
-		    parameters 	(list Parameters
-			(object Parameter "methodName"
-			    quid       	"3C62FAB901B1"
-			    type       	"String")
-			(object Parameter "parameterTypes"
-			    quid       	"3C62FAB901B2"
-			    documentation 	"List of parameter types."
-			    type       	"JTypeList"
-			    quidu      	"3B65B87602C1"))
-		    result     	"Method"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AE910271")
-		(object Operation "getMethodElementSignatures"
-		    quid       	"3B65B9EA03CA"
-		    documentation 	"Return a List of Strings that represent MethodElement signatures from most general to most specific."
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getMethodExtended"
-		    quid       	"3B65BA510115"
-		    documentation 	"Get the method of this name and these parameters. It will look up the supertype hierarchy."
-		    parameters 	(list Parameters
-			(object Parameter "methodName"
-			    quid       	"3C62FAB901B5"
-			    type       	"String")
-			(object Parameter "parameterTypes"
-			    quid       	"3C62FAB901B6"
-			    documentation 	"List of parameter types."
-			    type       	"JTypeList"
-			    quidu      	"3B65B87602C1"))
-		    result     	"Method"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AE910271")
-		(object Operation "getMethodsExtended"
-		    quid       	"3B65BA7D0354"
-		    documentation 	"Return all methods, including those from supertypes."
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getOnlySpecificMethods"
-		    quid       	"3B65BAC3021E"
-		    documentation 	
-|Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.
-|
-		    
-		    parameters 	(list Parameters
-			(object Parameter "aMethodNamePrefix"
-			    quid       	"3C62FAB901B9"
-			    type       	"String")
-			(object Parameter "excludedNames"
-			    quid       	"3C62FAB901BA"
-			    type       	"JTypeList"
-			    quidu      	"3B65B87602C1"))
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getPublicMethod"
-		    quid       	"3B65BBC90383"
-		    documentation 	"Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists.  It will not look up the supertype hierarchy."
-		    parameters 	(list Parameters
-			(object Parameter "methodName"
-			    quid       	"3C62FAB901BC"
-			    type       	"String")
-			(object Parameter "parameterTypes"
-			    quid       	"3C62FAB901BD"
-			    documentation 	"List of parameter types."
-			    type       	"JTypeList"
-			    quidu      	"3B65B87602C1"))
-		    result     	"Method"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AE910271")
-		(object Operation "getPublicMethods"
-		    quid       	"3B65BC3D034E"
-		    documentation 	"Return all methods, it will not go up the supertype hierarchy."
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getPublicMethodsExtended"
-		    quid       	"3B65BC630320"
-		    documentation 	"Return all public methods, including those from supertypes."
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getPublicMethodsNamed"
-		    quid       	"3B65BCAA005B"
-		    documentation 	"Returns a filtered list on the methods of this class, having a name equal to that of the parameter."
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    quid       	"3C62FAB901C1"
-			    type       	"String"))
-		    result     	"JTypeList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65B87602C1")
-		(object Operation "getSupertype"
-		    quid       	"3B65BCF900CD"
-		    result     	"JavaClass"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"36549FCC00FA")
-		(object Operation "implementsInterface"
-		    quid       	"3B65BD39009D"
-		    documentation 	"Test whether the receiver implements the passed interface (or one of its supertypes)."
-		    parameters 	(list Parameters
-			(object Parameter "interfaceType"
-			    quid       	"3C62FAB901C4"
-			    type       	"JavaClass"
-			    quidu      	"36549FCC00FA"))
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "infoString"
-		    quid       	"3B65BD8202D3"
-		    documentation 	"Return a string showing our details."
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "inheritsFrom"
-		    quid       	"3B65BD9E02E7"
-		    documentation 	"Tests whether this class inherits from the passed in class."
-		    parameters 	(list Parameters
-			(object Parameter "javaClass"
-			    quid       	"3C62FAB901C7"
-			    type       	"JavaClass"
-			    quidu      	"36549FCC00FA"))
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "isExistingType"
-		    quid       	"3B65BE110120"
-		    documentation 	"Does this type exist."
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "isInterface"
-		    quid       	"3B65BE2F0137"
-		    documentation 	"Is this an interface."
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setSupertype"
-		    quid       	"3B65BE7B00A0"
-		    documentation 	"Set the supertype."
-		    parameters 	(list Parameters
-			(object Parameter "javaclass"
-			    quid       	"3C62FAB901CB"
-			    type       	"JavaClass"
-			    quidu      	"36549FCC00FA"))
-		    result     	"void"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "kind"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0005-005d9e6adec4:1")))
-		    quid       	"3654A45E0232"
-		    type       	"TypeKind"
-		    quidu      	"3654B46002BF"
-		    exportControl 	"Public")
-		(object ClassAttribute "public"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0006-005d9e6adec4:1")))
-		    quid       	"380F8CE8020C"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "final"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0008-005d9e6adec4:1")))
-		    quid       	"380F8F9C02D7"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"none")
-	(object Class "Initializer"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0009-005d9e6adec4:1")))
-	    quid       	"3654A5DC00BB"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "isStatic"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-000a-005d9e6adec4:1")))
-		    quid       	"3654A865000F"
-		    type       	"Boolean"
-		    exportControl 	"Public"))
-	    language   	"none")
-	(object Class "JavaParameter"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-000b-005d9e6adec4:1")))
-	    quid       	"3654AD780280"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B7818B00186"
-		    supplier   	"Logical View::ecore::EParameter"
-		    quidu      	"3903E6150104"))
-	    operations 	(list Operations
-		(object Operation "isArray"
-		    quid       	"3B65BFD4034F"
-		    documentation 	"Is this parameter type an array type."
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "isReturn"
-		    quid       	"3B65BFEF0005"
-		    documentation 	"Is this a return parameter."
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getJavaType"
-		    quid       	"3B65C8E7001A"
-		    result     	"JTypeJavaHelpers"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65ADE403A6")
-		(object Operation "getQualifiedName"
-		    quid       	"3B65C926002F"
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "final"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-000c-005d9e6adec4:1")))
-		    quid       	"3654B64702AF"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "parameterKind"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-000e-005d9e6adec4:1")))
-		    quid       	"391C1EB400C2"
-		    type       	"JavaParameterKind"
-		    quidu      	"391C1E8F0123"
-		    exportControl 	"Public"))
-	    language   	"none")
-	(object Class "Method"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-000f-005d9e6adec4:1")))
-	    quid       	"3654AE910271"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0010-005d9e6adec4:1")))
-		    quid       	"3990953803AD"
-		    supplier   	"Logical View::ecore::EOperation"
-		    quidu      	"3904DAA200A0"))
-	    operations 	(list Operations
-		(object Operation "getContainingJavaClass"
-		    quid       	"3B65C04202A3"
-		    documentation 	"Return the java class that this method is defined in."
-		    result     	"JavaClass"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"36549FCC00FA")
-		(object Operation "getMethodElementSignature"
-		    quid       	"3B65C076013F"
-		    documentation 	
-|Return a String with the the method name and its parameters. e.g. <code> setFirstName(java.lang.String) </code> .
-| 
-		    
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getParameter"
-		    quid       	"3B65C0B8011C"
-		    documentation 	"Return a Parameter with the passed name, or null."
-		    parameters 	(list Parameters
-			(object Parameter "parameterName"
-			    quid       	"3C62FAB901E3"
-			    type       	"String"))
-		    result     	"JavaParameter"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3654AD780280")
-		(object Operation "getReturnType"
-		    quid       	"3B65C1470013"
-		    documentation 	"Get the return type."
-		    result     	"JTypeJavaHelpers"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65ADE403A6")
-		(object Operation "setReturnType"
-		    quid       	"3B65C27403CE"
-		    documentation 	"Set the return type"
-		    parameters 	(list Parameters
-			(object Parameter "type"
-			    quid       	"3C62FAB901E8"
-			    type       	"JTypeJavaHelpers"
-			    quidu      	"3B65ADE403A6"))
-		    result     	"void"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getSignature"
-		    quid       	"3B65C17D0043"
-		    documentation 	
-|Replicate the functionality of java.lang.reflect.Method.toString().
-|
-|Returns a string describing this Method.  The string is formatted as the method access modifiers, if any, followed by the method return type, followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.
-|
-|For example:
-|
-|    public boolean java.lang.Object.equals(java.lang.Object)
-|
-|The access modifiers are placed in canonical order as specified by "The Java Language Specification".  This is public, <tt>protected</tt> or <tt>private</tt> first, and then other modifiers in the following order: <tt>abstract</tt>, <tt>static</tt>, <tt>final</tt>, <tt>synchronized</tt> <tt>native</tt>.
-|
-		    
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "isGenerated"
-		    quid       	"3B65C1FC006E"
-		    documentation 	
-|Returns true if the method is system generated.
-|This is usually determined by the @generated tag in the comment.
-		    
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setIsGenerated"
-		    quid       	"3B65C244037F"
-		    documentation 	"Set the isGenerated flag."
-		    parameters 	(list Parameters
-			(object Parameter "generated"
-			    quid       	"3C62FAB901EC"
-			    type       	"boolean"))
-		    result     	"void"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "isVoid"
-		    quid       	"3B65C218038F"
-		    documentation 	"Is this a void return type method."
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "abstract"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0011-005d9e6adec4:1")))
-		    quid       	"380F90BC022B"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "native"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0012-005d9e6adec4:1")))
-		    quid       	"380F90D10364"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "synchronized"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0013-005d9e6adec4:1")))
-		    quid       	"380F90DB03C1"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "final"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0014-005d9e6adec4:1")))
-		    quid       	"3829C6E00033"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "constructor"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0015-005d9e6adec4:1")))
-		    quid       	"391ADD280245"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "static"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0016-005d9e6adec4:1")))
-		    quid       	"3829C6E40350"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaVisibility"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0017-005d9e6adec4:1")))
-		    quid       	"3829C6EB0397"
-		    type       	"JavaVisibilityKind"
-		    quidu      	"382333BE032E"
-		    exportControl 	"Public"))
-	    language   	"none")
-	(object Class "Field"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0018-005d9e6adec4:1")))
-	    quid       	"3654AF8F0280"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400487F90334"
-		    supplier   	"Logical View::ecore::ETypedElement"
-		    quidu      	"3903D4F60398"))
-	    operations 	(list Operations
-		(object Operation "getContainingJavaClass"
-		    quid       	"3B65B5120024"
-		    documentation 	"Get the class that this field is within."
-		    result     	"JavaClass"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"36549FCC00FA")
-		(object Operation "isArray"
-		    quid       	"3B65B55F01E7"
-		    documentation 	"Is this field an array type."
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "final"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-001d-005d9e6adec4:1")))
-		    quid       	"3829C6BE026F"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "static"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-001e-005d9e6adec4:1")))
-		    quid       	"3829C6C202ED"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaVisibility"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-001f-005d9e6adec4:1")))
-		    quid       	"3829C6C7034F"
-		    type       	"JavaVisibilityKind"
-		    quidu      	"382333BE032E"
-		    exportControl 	"Public")
-		(object ClassAttribute "transient"
-		    quid       	"4004880103B8"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "volatile"
-		    quid       	"40048808012D"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"none")
-	(object Class "TypeKind"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0020-005d9e6adec4:1")))
-	    quid       	"3654B46002BF"
-	    documentation 	"UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4"
-	    stereotype 	"enumeration"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "UNDEFINED"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0021-005d9e6adec4:1")))
-		    quid       	"380B9E3601A1"
-		    exportControl 	"Public")
-		(object ClassAttribute "CLASS"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0022-005d9e6adec4:1")))
-		    quid       	"380B9E44025D"
-		    exportControl 	"Public")
-		(object ClassAttribute "INTERFACE"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0023-005d9e6adec4:1")))
-		    quid       	"380B9E560124"
-		    exportControl 	"Public")
-		(object ClassAttribute "EXCEPTION"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0024-005d9e6adec4:1")))
-		    quid       	"380B9E6501A1"
-		    exportControl 	"Public"))
-	    language   	"none")
-	(object Class "Block"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0025-005d9e6adec4:1")))
-	    quid       	"380F88370150"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "source"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0026-005d9e6adec4:1")))
-		    quid       	"3810E7FC0239"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "name"
-		    quid       	"3A6C53E10029"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "Comment"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0027-005d9e6adec4:1")))
-	    quid       	"380F889B02B8"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0028-005d9e6adec4:1")))
-		    quid       	"380F88D600A5"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150")))
-	(object Class "Statement"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0029-005d9e6adec4:1")))
-	    quid       	"380F88B9025A"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-002a-005d9e6adec4:1")))
-		    quid       	"380F88DA0056"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150")))
-	(object Class "JavaPackage"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-002b-005d9e6adec4:1")))
-	    quid       	"38108E0301D2"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-002c-005d9e6adec4:1")))
-		    quid       	"399094D70046"
-		    supplier   	"Logical View::ecore::EPackage"
-		    quidu      	"3905C3F7000A"))
-	    language   	"Java")
-	(object Class "JavaVisibilityKind"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0030-005d9e6adec4:1")))
-	    quid       	"382333BE032E"
-	    documentation 	
-|PACKAGE=1
-|PUBLIC=2
-|PRIVATE=3
-|PROTECTED=4
-	    
-	    stereotype 	"enumeration"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "PUBLIC"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0031-005d9e6adec4:1")))
-		    quid       	"382333E2022C"
-		    exportControl 	"Public")
-		(object ClassAttribute "PRIVATE"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0032-005d9e6adec4:1")))
-		    quid       	"382333E7003E"
-		    exportControl 	"Public")
-		(object ClassAttribute "PROTECTED"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0033-005d9e6adec4:1")))
-		    quid       	"382333E80389"
-		    exportControl 	"Public")
-		(object ClassAttribute "PACKAGE"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0034-005d9e6adec4:1")))
-		    quid       	"382333EA038C"
-		    exportControl 	"Public")))
-	(object Class "JavaParameterKind"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0035-005d9e6adec4:1")))
-	    quid       	"391C1E8F0123"
-	    documentation 	
-|IN=0
-|OUT=1
-|INOUT=2
-|RETURN=3
-	    
-	    stereotype 	"enumeration"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "IN"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0036-005d9e6adec4:1")))
-		    quid       	"391C1EFC02EC"
-		    exportControl 	"Public")
-		(object ClassAttribute "OUT"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0037-005d9e6adec4:1")))
-		    quid       	"391C1EFF016A"
-		    exportControl 	"Public")
-		(object ClassAttribute "INOUT"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0038-005d9e6adec4:1")))
-		    quid       	"391C1F010040"
-		    exportControl 	"Public")
-		(object ClassAttribute "RETURN"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0039-005d9e6adec4:1")))
-		    quid       	"391C21940387"
-		    exportControl 	"Public")))
-	(object Class "JavaDataType"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-003a-005d9e6adec4:1")))
-	    quid       	"395913340316"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E5268E201B1"
-		    supplier   	"Logical View::ecore::EClass"
-		    quidu      	"3903D5BF000A"))
-	    operations 	(list Operations
-		(object Operation "getDefaultValueString"
-		    quid       	"3B65BF910303"
-		    documentation 	"Return the default string representing the default value of the primitive."
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)))
-	(object Class "ArrayType"
-	    quid       	"3A9D79ED01DF"
-	    documentation 	
-|Describes a Java Array type
-|   For multi-dimensional arrays, it is unlikely that the component type will be
-|   specified directly.  This would require instantiating a chain of component types
-|   such as String[][][][]->String[][][]->String[][]->String[]->String.
-|
-|  The component type relationship will be computed if the finalComponentType
-|  and array dimensions is specified.
-| 
-|  For this reason, the preferred way to create is through the JavaRefFactory factory method:
-|       createArrayType(JavaClass finalComponentType, int dimensions)
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A9D79FD010F"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"))
-	    operations 	(list Operations
-		(object Operation "getFinalComponentType"
-		    quid       	"3A9D7A820193"
-		    documentation 	
-|Get the final component type for this Array Type.
-|
-|In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name.
-		    
-		    result     	"JTypeJavaHelpers"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65ADE403A6")
-		(object Operation "getComponentTypeAsHelper"
-		    quid       	"3B65AF980136"
-		    documentation 	
-|Get the component type of this array. 
-|
-|If this is a multi-dimensional array, the component type will be the nested array type.
-		    
-		    result     	"JTypeJavaHelpers"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3B65ADE403A6")
-		(object Operation "isPrimitiveArray"
-		    quid       	"3B65B41702B8"
-		    documentation 	"Is this an array of java primitives"
-		    result     	"boolean"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setComponentType"
-		    quid       	"3B65B45503BC"
-		    documentation 	"Set the component type."
-		    parameters 	(list Parameters
-			(object Parameter "helperComponentType"
-			    quid       	"3C62FAB90226"
-			    type       	"JTypeJavaHelpers"
-			    quidu      	"3B65ADE403A6"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "arrayDimensions"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Java"
-			    name       	"Final"
-			    value      	FALSE)
-			(object Attribute
-			    tool       	"Java"
-			    name       	"Volatile"
-			    value      	FALSE)
-			(object Attribute
-			    tool       	"Java"
-			    name       	"Transient"
-			    value      	FALSE)
-			(object Attribute
-			    tool       	"Java"
-			    name       	"IndividualChangeMgt"
-			    value      	FALSE)
-			(object Attribute
-			    tool       	"Java"
-			    name       	"PropertyType"
-			    value      	("BeanProperty_Set" 71))
-			(object Attribute
-			    tool       	"Java"
-			    name       	"Read/Write"
-			    value      	("Read/Write_Set" 81)))
-		    quid       	"3A9D7AC80284"
-		    type       	"int"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JTypeJavaHelpers"
-	    quid       	"3B65ADE403A6"
-	    documentation 	"This interface is a common interface between JavaClass and JavaDataType plus some common helper methods."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.eclipse.jem.java.JavaHelpers"
-		    quid       	"3B65AE170269"
-		    stereotype 	"javaclass"
-		    exportControl 	"Public")))
-	(object Class "JTypeList"
-	    quid       	"3B65B87602C1"
-	    documentation 	"java.util.List type"
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.List"
-		    quid       	"3B65B88F0399"
-		    stereotype 	"javaclass"
-		    exportControl 	"Public")))
-	(object Class "JavaEvent"
-	    quid       	"3C62FAF103C8"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3DF4CE830390"
-		    supplier   	"Logical View::ecore::EStructuralFeature"
-		    quidu      	"3903D59D0230"))
-	    abstract   	TRUE)
-	(object Association "Implements"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-003c-005d9e6adec4:1")))
-	    quid       	"3654A0D70242"
-	    documentation 	"Constraint - Source of implements is of TypeKind CLASSTYPE and target is INTERFACETYPE"
-	    roles      	(list role_list
-		(object Role "implementsInterfaces"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-003d-005d9e6adec4:1")))
-		    quid       	"3654A0DA0109"
-		    label      	"implementsInterfaces"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)
-		(object Role "implementedBy"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-003e-005d9e6adec4:1")))
-		    quid       	"3654A0DA0138"
-		    label      	"implementedBy"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n"))))
-	(object Association "MethodHas"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-003f-005d9e6adec4:1")))
-	    quid       	"3654AF0302CE"
-	    roles      	(list role_list
-		(object Role "parameters"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0040-005d9e6adec4:1")))
-		    quid       	"3654AF080196"
-		    label      	"parameters"
-		    supplier   	"Logical View::java::JavaParameter"
-		    quidu      	"3654AD780280"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "method"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0041-005d9e6adec4:1")))
-		    quid       	"3654AF080197"
-		    label      	"method"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$0"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0042-005d9e6adec4:1")))
-	    quid       	"3654B08801A5"
-	    roles      	(list role_list
-		(object Role "/type"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0043-005d9e6adec4:1")))
-		    quid       	"3654B091007D"
-		    label      	"/type"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    is_navigable 	TRUE)
-		(object Role "/typedElement"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0044-005d9e6adec4:1")))
-		    quid       	"3654B091008C"
-		    label      	"/typedElement"
-		    supplier   	"Logical View::java::JavaParameter"
-		    quidu      	"3654AD780280"
-		    client_cardinality 	(value cardinality "1"))))
-	(object Association "MethodThrows"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0045-005d9e6adec4:1")))
-	    quid       	"3810B61B0178"
-	    documentation 	"Target must be of kind EXCEPTIONTYPE"
-	    roles      	(list role_list
-		(object Role "javaExceptions"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0046-005d9e6adec4:1")))
-		    quid       	"3810B61E01C3"
-		    label      	"javaExceptions"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)
-		(object Role "method"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0047-005d9e6adec4:1")))
-		    quid       	"3810B61E0227"
-		    label      	"method"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271")))
-	(object Association "Contents"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0048-005d9e6adec4:1")))
-	    quid       	"3810E6080268"
-	    roles      	(list role_list
-		(object Role "containedBy"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0049-005d9e6adec4:1")))
-		    quid       	"3810E60E0144"
-		    label      	"containedBy"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_aggregate 	TRUE)
-		(object Role "contents"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-004a-005d9e6adec4:1")))
-		    quid       	"3810E60E0162"
-		    label      	"contents"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "ClassImports"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-004b-005d9e6adec4:1")))
-	    quid       	"3829C4BF000D"
-	    roles      	(list role_list
-		(object Role "classImport"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-004c-005d9e6adec4:1")))
-		    quid       	"3829C4BF000E"
-		    label      	"classImport"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    is_navigable 	TRUE)
-		(object Role "importedBy"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-004d-005d9e6adec4:1")))
-		    quid       	"3829C4BF000F"
-		    label      	"importedBy"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n"))))
-	(object Association "PackageImports"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-004e-005d9e6adec4:1")))
-	    quid       	"3829C4EC0207"
-	    roles      	(list role_list
-		(object Role "packageImports"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-004f-005d9e6adec4:1")))
-		    quid       	"3829C4EE00FB"
-		    label      	"packageImports"
-		    supplier   	"Logical View::java::JavaPackage"
-		    quidu      	"38108E0301D2"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    is_navigable 	TRUE)
-		(object Role "importedBy"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0050-005d9e6adec4:1")))
-		    quid       	"3829C4EE0105"
-		    label      	"importedBy"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n"))))
-	(object Association "$UNNAMED$1"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0051-005d9e6adec4:1")))
-	    quid       	"382A29BD0219"
-	    roles      	(list role_list
-		(object Role "fields"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0052-005d9e6adec4:1")))
-		    quid       	"382A29BE0350"
-		    label      	"fields"
-		    supplier   	"Logical View::java::Field"
-		    quidu      	"3654AF8F0280"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "javaClass"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0053-005d9e6adec4:1")))
-		    quid       	"382A29BE03BF"
-		    label      	"javaClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0054-005d9e6adec4:1")))
-	    quid       	"382A29C0017D"
-	    roles      	(list role_list
-		(object Role "methods"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0055-005d9e6adec4:1")))
-		    quid       	"382A29C10174"
-		    label      	"methods"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "javaClass"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0056-005d9e6adec4:1")))
-		    quid       	"382A29C1020A"
-		    label      	"javaClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$3"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0057-005d9e6adec4:1")))
-	    quid       	"392A9EB403C6"
-	    roles      	(list role_list
-		(object Role "/supertype"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0058-005d9e6adec4:1")))
-		    quid       	"392A9EB803B7"
-		    label      	"/supertype"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "/subtype"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0059-005d9e6adec4:1")))
-		    quid       	"392A9EB90098"
-		    label      	"/subtype"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n"))))
-	(object Association "$UNNAMED$4"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-005a-005d9e6adec4:1")))
-	    quid       	"392A9F0301AC"
-	    roles      	(list role_list
-		(object Role "/supertype"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-005b-005d9e6adec4:1")))
-		    quid       	"392A9F090328"
-		    label      	"/supertype"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)
-		(object Role "/subtype"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-005c-005d9e6adec4:1")))
-		    quid       	"392A9F0A001C"
-		    label      	"/subtype"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$5"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-005d-005d9e6adec4:1")))
-	    quid       	"392AA09503E5"
-	    roles      	(list role_list
-		(object Role "initializers"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-005e-005d9e6adec4:1")))
-		    quid       	"392AA0970153"
-		    label      	"initializers"
-		    supplier   	"Logical View::java::Initializer"
-		    quidu      	"3654A5DC00BB"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "javaClass"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-005f-005d9e6adec4:1")))
-		    quid       	"392AA097015D"
-		    label      	"javaClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0060-005d9e6adec4:1")))
-	    quid       	"392AA21200C2"
-	    roles      	(list role_list
-		(object Role "declaredClasses"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0061-005d9e6adec4:1")))
-		    quid       	"392AA21701D8"
-		    label      	"declaredClasses"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)
-		(object Role "declaringClass"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0062-005d9e6adec4:1")))
-		    quid       	"392AA21702DC"
-		    label      	"declaringClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$7"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0063-005d9e6adec4:1")))
-	    quid       	"392AA2A701C1"
-	    stereotype 	"derived"
-	    roles      	(list role_list
-		(object Role "javaClasses"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0064-005d9e6adec4:1"))
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isChangeable"
-			    value      	FALSE))
-		    quid       	"392AA2A80367"
-		    label      	"javaClasses"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)
-		(object Role "javaPackage"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0065-005d9e6adec4:1"))
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isChangeable"
-			    value      	FALSE))
-		    quid       	"392AA2A90083"
-		    label      	"javaPackage"
-		    supplier   	"Logical View::java::JavaPackage"
-		    quidu      	"38108E0301D2"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$8"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0066-005d9e6adec4:1")))
-	    quid       	"392AAC33036A"
-	    roles      	(list role_list
-		(object Role "source"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0067-005d9e6adec4:1")))
-		    quid       	"392AAC380140"
-		    label      	"source"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "initializer"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-0068-005d9e6adec4:1")))
-		    quid       	"392AAC380168"
-		    label      	"initializer"
-		    supplier   	"Logical View::java::Initializer"
-		    quidu      	"3654A5DC00BB")))
-	(object Association "$UNNAMED$9"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-0069-005d9e6adec4:1")))
-	    quid       	"392AAC5602A2"
-	    roles      	(list role_list
-		(object Role "initializer"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-006a-005d9e6adec4:1")))
-		    quid       	"392AAC5702DF"
-		    label      	"initializer"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "field"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c74525a0-8826-11e1-006b-005d9e6adec4:1")))
-		    quid       	"392AAC570307"
-		    label      	"field"
-		    supplier   	"Logical View::java::Field"
-		    quidu      	"3654AF8F0280"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$10"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"IDL"
-		    name       	"uuid"
-		    value      	(value Text "DCE:c74525a0-8826-11e1-006c-005d9e6adec4:1")))
-	    quid       	"392AACA501E7"
-	    roles      	(list role_list
-		(object Role "source"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c746ac40-8826-11e1-0000-005d9e6adec4:1")))
-		    quid       	"392AACA7017C"
-		    label      	"source"
-		    supplier   	"Logical View::java::Block"
-		    quidu      	"380F88370150"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "method"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"IDL"
-			    name       	"uuid"
-			    value      	(value Text "DCE:c746ac40-8826-11e1-0001-005d9e6adec4:1")))
-		    quid       	"392AACA701B8"
-		    label      	"method"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271")))
-	(object Association "$UNNAMED$11"
-	    quid       	"3C62FBE00168"
-	    roles      	(list role_list
-		(object Role "events"
-		    quid       	"3C62FBE2008F"
-		    label      	"events"
-		    supplier   	"Logical View::java::JavaEvent"
-		    quidu      	"3C62FAF103C8"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$12"
-		    quid       	"3C62FBE20091"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$13"
-	    quid       	"3C8938770253"
-	    roles      	(list role_list
-		(object Role "allEvents"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE))
-		    quid       	"3C89387802CC"
-		    label      	"allEvents"
-		    supplier   	"Logical View::java::JavaEvent"
-		    quidu      	"3C62FAF103C8"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$14"
-		    quid       	"3C89387802CE"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$15"
-	    quid       	"3DF4CAAD01A3"
-	    roles      	(list role_list
-		(object Role "componentType"
-		    quid       	"3DF4CAAE01EB"
-		    label      	"componentType"
-		    supplier   	"Logical View::ecore::EClassifier"
-		    quidu      	"3ACE4FEE0371"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$16"
-		    quid       	"3DF4CAAE01F5"
-		    supplier   	"Logical View::java::ArrayType"
-		    quidu      	"3A9D79ED01DF"))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Ecore binding"
-	    quid       	"38109C0F009B"
-	    title      	"Ecore binding"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	4094
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::java::Field" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1104, 576)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(689, 368)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	830
-			justify    	0
-			label      	"Field")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AF8F0280"
-		    compartment 	(object Compartment
-			Parent_View 	@1
-			location   	(689, 424)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	8
-			max_width  	709)
-		    width      	848
-		    height     	438
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaPackage" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(192, 480)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(31, 434)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	322
-			justify    	0
-			label      	"JavaPackage")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"38108E0301D2"
-		    width      	340
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EPackage" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(192, 144)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(103, 45)
-			nlines     	2
-			max_width  	178
-			justify    	0
-			label      	"EPackage")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3905C3F7000A"
-		    width      	196
-		    height     	222
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @4
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"399094D70046"
-		    client     	@2
-		    supplier   	@3
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::ecore::EClass" @5
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 1824)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@5
-			location   	(1465, 1615)
-			nlines     	2
-			max_width  	526
-			justify    	0
-			label      	"EClass")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3903D5BF000A"
-		    compartment 	(object Compartment
-			Parent_View 	@5
-			location   	(1465, 1715)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			anchor     	2
-			nlines     	6
-			max_width  	452)
-		    width      	544
-		    height     	440
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EOperation" @6
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2320, 144)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@6
-			location   	(2231, 45)
-			nlines     	2
-			max_width  	178
-			justify    	0
-			label      	"EOperation")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3904DAA200A0"
-		    width      	196
-		    height     	222
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaDataType" @7
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(352, 1216)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@7
-			location   	(11, 1143)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	682
-			justify    	0
-			label      	"JavaDataType")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"395913340316"
-		    compartment 	(object Compartment
-			Parent_View 	@7
-			location   	(11, 1199)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	585)
-		    width      	700
-		    height     	168
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Method" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(2336, 768)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(1736, 357)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1200
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AE910271"
-		    compartment 	(object Compartment
-			Parent_View 	@8
-			location   	(1736, 413)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	17
-			max_width  	1027)
-		    width      	1218
-		    height     	844
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @9
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3990953803AD"
-		    client     	@8
-		    supplier   	@6
-		    line_style 	3
-		    origin_attachment 	(2376, 346)
-		    terminal_attachment 	(2376, 255))
-		(object ClassView "Class" "Logical View::java::JavaClass" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1312, 2864)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(330, 2273)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1964
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"36549FCC00FA"
-		    compartment 	(object Compartment
-			Parent_View 	@10
-			location   	(330, 2329)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	25
-			max_width  	1680)
-		    width      	1982
-		    height     	1204
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @11
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3990950000B3"
-		    client     	@10
-		    supplier   	@5
-		    line_style 	3
-		    origin_attachment 	(1594, 2262)
-		    terminal_attachment 	(1594, 2044))
-		(object ClassView "Class" "Logical View::java::JavaParameter" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1008, 1472)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(608, 1286)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	800
-			justify    	0
-			label      	"JavaParameter")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AD780280"
-		    compartment 	(object Compartment
-			Parent_View 	@12
-			location   	(608, 1342)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	7
-			max_width  	685)
-		    width      	818
-		    height     	394
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EParameter" @13
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1008, 960)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@13
-			location   	(919, 861)
-			nlines     	2
-			max_width  	178
-			justify    	0
-			label      	"EParameter")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3903E6150104"
-		    width      	196
-		    height     	222
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @14
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B7818B00186"
-		    client     	@12
-		    supplier   	@13
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::ecore::EClass" @15
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(320, 816)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@15
-			location   	(56, 630)
-			nlines     	1
-			max_width  	528
-			justify    	0
-			label      	"EClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3903D5BF000A"
-		    compartment 	(object Compartment
-			Parent_View 	@15
-			location   	(56, 730)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			anchor     	2
-			nlines     	6
-			max_width  	452)
-		    width      	546
-		    height     	394
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @16
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E5268E201B1"
-		    client     	@7
-		    supplier   	@15
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::ecore::ETypedElement" @17
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1104, 112)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@17
-			location   	(916, 41)
-			nlines     	1
-			max_width  	376
-			justify    	0
-			label      	"ETypedElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3903D4F60398"
-		    width      	394
-		    height     	164
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @18
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400487F90334"
-		    client     	@1
-		    supplier   	@17
-		    line_style 	0)))
-	(object ClassDiagram "Polymorphism"
-	    quid       	"38109D000373"
-	    title      	"Polymorphism"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::java::JavaClass" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(496, 576)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@19
-			location   	(365, 530)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"36549FCC00FA"
-		    width      	280
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$3" @20
-		    location   	(166, 537)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392A9EB403C6"
-		    roleview_list 	(list RoleViews
-			(object RoleView "/supertype" @21
-			    Parent_View 	@20
-			    location   	(-330, 217)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @22
-				Parent_View 	@21
-				location   	(234, 480)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	226
-				justify    	0
-				label      	"+/supertype"
-				pctDist    	0.419192
-				height     	38
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392A9EB803B7"
-			    client     	@20
-			    supplier   	@19
-			    vertices   	(list Points
-				(166, 537)
-				(166, 517)
-				(356, 517))
-			    line_style 	3
-			    origin_attachment 	(166, 537)
-			    terminal_attachment 	(356, 517)
-			    label      	(object SegLabel @23
-				Parent_View 	@21
-				location   	(334, 464)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "/subtype" @24
-			    Parent_View 	@20
-			    location   	(-330, 217)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @25
-				Parent_View 	@24
-				location   	(257, 582)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	188
-				justify    	0
-				label      	"+/subtype"
-				pctDist    	0.532468
-				height     	24
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392A9EB90098"
-			    client     	@20
-			    supplier   	@19
-			    vertices   	(list Points
-				(166, 537)
-				(166, 558)
-				(356, 558))
-			    line_style 	3
-			    origin_attachment 	(166, 537)
-			    terminal_attachment 	(356, 558)
-			    label      	(object SegLabel @26
-				Parent_View 	@24
-				location   	(334, 612)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::java::JavaClass" @27
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1392, 576)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@27
-			location   	(1261, 530)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"36549FCC00FA"
-		    width      	280
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "Implements" @28
-		    location   	(944, 521)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3654A0D70242"
-		    roleview_list 	(list RoleViews
-			(object RoleView "implementsInterfaces" @29
-			    Parent_View 	@28
-			    location   	(430, -54)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(839, 488)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	407
-				justify    	0
-				label      	"+implementsInterfaces"
-				pctDist    	-0.343558
-				height     	34
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3654A0DA0109"
-			    client     	@28
-			    supplier   	@27
-			    line_style 	3
-			    origin_attachment 	(944, 521)
-			    terminal_attachment 	(1252, 521)
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(1181, 485)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.773006
-				height     	37
-				orientation 	0))
-			(object RoleView "implementedBy" @32
-			    Parent_View 	@28
-			    location   	(430, -54)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @33
-				Parent_View 	@32
-				location   	(1087, 575)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	312
-				justify    	0
-				label      	"+implementedBy"
-				pctDist    	-0.470769
-				height     	54
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3654A0DA0138"
-			    client     	@28
-			    supplier   	@19
-			    line_style 	3
-			    origin_attachment 	(944, 521)
-			    terminal_attachment 	(636, 521)
-			    label      	(object SegLabel @34
-				Parent_View 	@32
-				location   	(684, 564)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.843230
-				height     	43
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$4" @35
-		    location   	(1750, 601)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392A9F0301AC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "/supertype" @36
-			    Parent_View 	@35
-			    location   	(358, 265)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @37
-				Parent_View 	@36
-				location   	(1721, 640)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	226
-				justify    	0
-				label      	"+/supertype"
-				pctDist    	0.227273
-				height     	13
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392A9F090328"
-			    client     	@35
-			    supplier   	@27
-			    vertices   	(list Points
-				(1750, 601)
-				(1750, 627)
-				(1532, 627))
-			    line_style 	3
-			    origin_attachment 	(1750, 601)
-			    terminal_attachment 	(1532, 627)
-			    label      	(object SegLabel @38
-				Parent_View 	@36
-				location   	(1557, 574)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "/subtype" @39
-			    Parent_View 	@35
-			    location   	(358, 265)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @40
-				Parent_View 	@39
-				location   	(1626, 553)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	188
-				justify    	0
-				label      	"+/subtype"
-				pctDist    	0.615970
-				height     	24
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392A9F0A001C"
-			    client     	@35
-			    supplier   	@27
-			    vertices   	(list Points
-				(1750, 601)
-				(1750, 576)
-				(1532, 576))
-			    line_style 	3
-			    origin_attachment 	(1750, 601)
-			    terminal_attachment 	(1532, 576)
-			    label      	(object SegLabel @41
-				Parent_View 	@39
-				location   	(1557, 630)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))))))
-	(object ClassDiagram "Main"
-	    quid       	"38109F92000B"
-	    title      	"Main"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	2760
-	    items      	(list diagram_item_list
-		(object NoteView @42
-		    location   	(848, 1840)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@42
-			location   	(551, 1718)
-			fill_color 	13434879
-			nlines     	4
-			max_width  	559
-			label      	"This should really be JavaClass and JavaDataType, eClassifier is their closest common ancestor.")
-		    line_color 	3342489
-		    fill_color 	8421631
-		    width      	619
-		    height     	256)
-		(object NoteView @43
-		    location   	(272, 320)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@43
-			location   	(107, 166)
-			fill_color 	13434879
-			nlines     	6
-			max_width  	295
-			label      	"The classes will be contained by the standard EPackage metaObjects relationship.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	355
-		    height     	320)
-		(object ClassView "Class" "Logical View::java::Field" @44
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1776, 480)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@44
-			location   	(1680, 434)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	192
-			justify    	0
-			label      	"Field")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AF8F0280"
-		    width      	210
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Initializer" @45
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1568, 224)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@45
-			location   	(1363, 151)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	410
-			justify    	0
-			label      	"Initializer")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654A5DC00BB"
-		    compartment 	(object Compartment
-			Parent_View 	@45
-			location   	(1363, 207)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	345)
-		    width      	428
-		    height     	168
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaPackage" @46
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(608, 96)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@46
-			location   	(447, 50)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	322
-			justify    	0
-			label      	"JavaPackage")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"38108E0301D2"
-		    width      	340
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaParameter" @47
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1744, 1584)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@47
-			location   	(1344, 1488)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	800
-			justify    	0
-			label      	"JavaParameter")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AD780280"
-		    compartment 	(object Compartment
-			Parent_View 	@47
-			location   	(1344, 1544)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	678)
-		    width      	818
-		    height     	214
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Method" @48
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1712, 992)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@48
-			location   	(1613, 946)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	198
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AE910271"
-		    width      	216
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "MethodHas" @49
-		    location   	(1700, 1262)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3654AF0302CE"
-		    roleview_list 	(list RoleViews
-			(object RoleView "method" @50
-			    Parent_View 	@49
-			    location   	(308, 238)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3654AF080197"
-			    client     	@49
-			    supplier   	@48
-			    line_style 	3
-			    origin_attachment 	(1700, 1262)
-			    terminal_attachment 	(1700, 1049)
-			    label      	(object SegLabel @51
-				Parent_View 	@50
-				location   	(1633, 1097)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.781659
-				height     	68
-				orientation 	0))
-			(object RoleView "parameters" @52
-			    Parent_View 	@49
-			    location   	(308, 238)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @53
-				Parent_View 	@52
-				location   	(1837, 1433)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	235
-				justify    	0
-				label      	"+parameters"
-				pctDist    	0.803565
-				height     	137
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3654AF080196"
-			    client     	@49
-			    supplier   	@47
-			    line_style 	3
-			    origin_attachment 	(1700, 1262)
-			    terminal_attachment 	(1700, 1476)
-			    label      	(object SegLabel @54
-				Parent_View 	@52
-				location   	(1636, 1456)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.905128
-				height     	65
-				orientation 	1)
-			    label      	(object SegLabel @55
-				Parent_View 	@52
-				location   	(1592, 1397)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.628821
-				height     	109
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::java::JavaEvent" @56
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(2192, 656)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@56
-			location   	(2064, 607)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"JavaEvent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C62FAF103C8"
-		    width      	274
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaClass" @57
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(560, 672)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@57
-			location   	(374, 554)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	372
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"36549FCC00FA"
-		    compartment 	(object Compartment
-			Parent_View 	@57
-			location   	(374, 610)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	313)
-		    width      	390
-		    height     	258
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$1" @58
-		    location   	(1213, 538)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"382A29BD0219"
-		    roleview_list 	(list RoleViews
-			(object RoleView "fields" @59
-			    Parent_View 	@58
-			    location   	(733, 282)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @60
-				Parent_View 	@59
-				location   	(1511, 513)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	"+fields"
-				pctDist    	0.653017
-				height     	26
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"382A29BE0350"
-			    client     	@58
-			    supplier   	@44
-			    line_style 	3
-			    origin_attachment 	(1213, 538)
-			    terminal_attachment 	(1671, 538)
-			    label      	(object SegLabel @61
-				Parent_View 	@59
-				location   	(1624, 485)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "javaClass" @62
-			    Parent_View 	@58
-			    location   	(733, 282)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"382A29BE03BF"
-			    client     	@58
-			    supplier   	@57
-			    line_style 	3
-			    origin_attachment 	(1213, 538)
-			    terminal_attachment 	(755, 538))))
-		(object AssociationViewNew "$UNNAMED$5" @63
-		    location   	(916, 307)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392AA09503E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "initializers" @64
-			    Parent_View 	@63
-			    location   	(276, 99)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1096, 216)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	212
-				justify    	0
-				label      	"+initializers"
-				pctDist    	0.410719
-				height     	92
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AA0970153"
-			    client     	@63
-			    supplier   	@45
-			    line_style 	3
-			    origin_attachment 	(916, 307)
-			    terminal_attachment 	(1354, 307)
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1345, 368)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.979687
-				height     	61
-				orientation 	1))
-			(object RoleView "javaClass" @67
-			    Parent_View 	@63
-			    location   	(276, 99)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AA097015D"
-			    client     	@63
-			    supplier   	@57
-			    vertices   	(list Points
-				(916, 307)
-				(713, 307)
-				(713, 543))
-			    line_style 	3
-			    origin_attachment 	(916, 307)
-			    terminal_attachment 	(713, 543))))
-		(object AssociationViewNew "$UNNAMED$6" @68
-		    location   	(206, 642)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392AA21200C2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "declaredClasses" @69
-			    Parent_View 	@68
-			    location   	(-578, 274)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @70
-				Parent_View 	@69
-				location   	(240, 582)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	325
-				justify    	0
-				label      	"+declaredClasses"
-				pctDist    	0.343195
-				height     	31
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AA21701D8"
-			    client     	@68
-			    supplier   	@57
-			    vertices   	(list Points
-				(206, 642)
-				(206, 612)
-				(365, 612))
-			    line_style 	3
-			    origin_attachment 	(206, 642)
-			    terminal_attachment 	(365, 612)
-			    label      	(object SegLabel @71
-				Parent_View 	@69
-				location   	(347, 556)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.902367
-				height     	57
-				orientation 	0))
-			(object RoleView "declaringClass" @72
-			    Parent_View 	@68
-			    location   	(-578, 274)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @73
-				Parent_View 	@72
-				location   	(258, 675)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	298
-				justify    	0
-				label      	"+declaringClass"
-				pctDist    	0.434286
-				height     	3
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AA21702DC"
-			    client     	@68
-			    supplier   	@57
-			    vertices   	(list Points
-				(206, 642)
-				(206, 672)
-				(365, 672))
-			    line_style 	3
-			    origin_attachment 	(206, 642)
-			    terminal_attachment 	(365, 672)
-			    label      	(object SegLabel @74
-				Parent_View 	@72
-				location   	(345, 726)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$7" @75
-		    location   	(603, 347)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	(object SegLabel @76
-			Parent_View 	@75
-			location   	(603, 228)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			anchor     	10
-			anchor_loc 	1
-			nlines     	1
-			max_width  	450
-			justify    	0
-			label      	"<<derived>>"
-			pctDist    	0.500000
-			height     	120
-			orientation 	0)
-		    line_color 	3342489
-		    quidu      	"392AA2A701C1"
-		    roleview_list 	(list RoleViews
-			(object RoleView "javaClasses" @77
-			    Parent_View 	@75
-			    location   	(27, 219)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @78
-				Parent_View 	@77
-				location   	(720, 419)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	248
-				justify    	0
-				label      	"+javaClasses"
-				pctDist    	0.367521
-				height     	117
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AA2A80367"
-			    client     	@75
-			    supplier   	@57
-			    line_style 	3
-			    origin_attachment 	(603, 347)
-			    terminal_attachment 	(603, 543)
-			    label      	(object SegLabel @79
-				Parent_View 	@77
-				location   	(657, 522)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "javaPackage" @80
-			    Parent_View 	@75
-			    location   	(27, 219)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @81
-				Parent_View 	@80
-				location   	(482, 179)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	263
-				justify    	0
-				label      	"+javaPackage"
-				pctDist    	0.862903
-				height     	122
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AA2A90083"
-			    client     	@75
-			    supplier   	@46
-			    line_style 	3
-			    origin_attachment 	(603, 347)
-			    terminal_attachment 	(603, 152)
-			    label      	(object SegLabel @82
-				Parent_View 	@80
-				location   	(657, 172)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object AttachView "" @83
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@43
-		    supplier   	@75
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$0" @84
-		    location   	(616, 1524)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @85
-			Parent_View 	@84
-			location   	(616, 1465)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			hidden     	TRUE
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	600
-			justify    	0
-			label      	""
-			pctDist    	0.500000
-			height     	60
-			orientation 	0)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3654B08801A5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "/typedElement" @86
-			    Parent_View 	@84
-			    location   	(56, 948)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3654B091008C"
-			    client     	@84
-			    supplier   	@47
-			    vertices   	(list Points
-				(616, 1524)
-				(616, 1584)
-				(1335, 1584))
-			    line_style 	3
-			    origin_attachment 	(616, 1524)
-			    terminal_attachment 	(1335, 1584)
-			    label      	(object SegLabel @87
-				Parent_View 	@86
-				location   	(1256, 1531)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "/type" @88
-			    Parent_View 	@84
-			    location   	(56, 948)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @89
-				Parent_View 	@88
-				location   	(697, 1099)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	116
-				justify    	0
-				label      	"+/type"
-				pctDist    	0.588161
-				height     	81
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3654B091007D"
-			    client     	@84
-			    supplier   	@57
-			    line_style 	3
-			    origin_attachment 	(616, 1524)
-			    terminal_attachment 	(616, 801))))
-		(object AssociationViewNew "$UNNAMED$2" @90
-		    location   	(1088, 961)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"382A29C0017D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "methods" @91
-			    Parent_View 	@90
-			    location   	(608, 705)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @92
-				Parent_View 	@91
-				location   	(1409, 889)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	"+methods"
-				pctDist    	0.624023
-				height     	73
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"382A29C10174"
-			    client     	@90
-			    supplier   	@48
-			    line_style 	3
-			    origin_attachment 	(1088, 961)
-			    terminal_attachment 	(1604, 961)
-			    label      	(object SegLabel @93
-				Parent_View 	@91
-				location   	(1483, 1017)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.766040
-				height     	56
-				orientation 	1))
-			(object RoleView "javaClass" @94
-			    Parent_View 	@90
-			    location   	(608, 705)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"382A29C1020A"
-			    client     	@90
-			    supplier   	@57
-			    vertices   	(list Points
-				(1088, 961)
-				(732, 961)
-				(732, 801))
-			    line_style 	3
-			    origin_attachment 	(1088, 961)
-			    terminal_attachment 	(732, 801))))
-		(object AssociationViewNew "MethodThrows" @95
-		    location   	(1047, 981)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3810B61B0178"
-		    roleview_list 	(list RoleViews
-			(object RoleView "method" @96
-			    Parent_View 	@95
-			    location   	(487, 405)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3810B61E0227"
-			    client     	@95
-			    supplier   	@48
-			    line_style 	3
-			    origin_attachment 	(1047, 981)
-			    terminal_attachment 	(1604, 981))
-			(object RoleView "javaExceptions" @97
-			    Parent_View 	@95
-			    location   	(487, 405)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @98
-				Parent_View 	@97
-				location   	(733, 945)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	312
-				justify    	0
-				label      	"+javaExceptions"
-				pctDist    	0.563664
-				height     	37
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3810B61E01C3"
-			    client     	@95
-			    supplier   	@57
-			    vertices   	(list Points
-				(1047, 981)
-				(669, 981)
-				(669, 801))
-			    line_style 	3
-			    origin_attachment 	(1047, 981)
-			    terminal_attachment 	(669, 801)
-			    label      	(object SegLabel @99
-				Parent_View 	@97
-				location   	(723, 857)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$11" @100
-		    location   	(1541, 806)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C62FBE00168"
-		    roleview_list 	(list RoleViews
-			(object RoleView "events" @101
-			    Parent_View 	@100
-			    location   	(981, 134)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @102
-				Parent_View 	@101
-				location   	(2169, 765)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+events"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C62FBE2008F"
-			    client     	@100
-			    supplier   	@56
-			    vertices   	(list Points
-				(1541, 806)
-				(2238, 806)
-				(2238, 717))
-			    line_style 	3
-			    origin_attachment 	(1541, 806)
-			    terminal_attachment 	(2238, 717)
-			    label      	(object SegLabel @103
-				Parent_View 	@101
-				location   	(2292, 796)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$12" @104
-			    Parent_View 	@100
-			    location   	(981, 134)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C62FBE20091"
-			    client     	@100
-			    supplier   	@57
-			    line_style 	3
-			    origin_attachment 	(1541, 806)
-			    terminal_attachment 	(755, 806))))
-		(object AssociationViewNew "$UNNAMED$13" @105
-		    location   	(1405, 663)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C8938770253"
-		    roleview_list 	(list RoleViews
-			(object RoleView "allEvents" @106
-			    Parent_View 	@105
-			    location   	(845, -9)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @107
-				Parent_View 	@106
-				location   	(1925, 622)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	193
-				justify    	0
-				label      	"+allEvents"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C89387802CC"
-			    client     	@105
-			    supplier   	@56
-			    line_style 	3
-			    origin_attachment 	(1405, 663)
-			    terminal_attachment 	(2055, 663)
-			    label      	(object SegLabel @108
-				Parent_View 	@106
-				location   	(1975, 702)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.876336
-				height     	39
-				orientation 	1))
-			(object RoleView "$UNNAMED$14" @109
-			    Parent_View 	@105
-			    location   	(845, -9)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C89387802CE"
-			    client     	@105
-			    supplier   	@57
-			    line_style 	3
-			    origin_attachment 	(1405, 663)
-			    terminal_attachment 	(755, 663))))
-		(object ClassView "Class" "Logical View::ecore::EClassifier" @110
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 2256)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@110
-			location   	(130, 2059)
-			nlines     	1
-			max_width  	636
-			justify    	0
-			label      	"EClassifier")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3ACE4FEE0371"
-		    compartment 	(object Compartment
-			Parent_View 	@110
-			location   	(130, 2162)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			anchor     	2
-			nlines     	6
-			max_width  	538)
-		    width      	654
-		    height     	418
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::ArrayType" @111
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(352, 1328)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@111
-			location   	(112, 1255)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	480
-			justify    	0
-			label      	"ArrayType")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A9D79ED01DF"
-		    compartment 	(object Compartment
-			Parent_View 	@111
-			location   	(112, 1311)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	405)
-		    width      	498
-		    height     	168
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @112
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A9D79FD010F"
-		    client     	@111
-		    supplier   	@57
-		    line_style 	3
-		    origin_attachment 	(431, 1243)
-		    terminal_attachment 	(431, 801))
-		(object AssociationViewNew "$UNNAMED$15" @113
-		    location   	(393, 1729)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3DF4CAAD01A3"
-		    roleview_list 	(list RoleViews
-			(object RoleView "componentType" @114
-			    Parent_View 	@113
-			    location   	(-55, 385)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @115
-				Parent_View 	@114
-				location   	(378, 1986)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	328
-				justify    	0
-				label      	"+componentType"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3DF4CAAE01EB"
-			    client     	@113
-			    supplier   	@110
-			    line_style 	0
-			    label      	(object SegLabel @116
-				Parent_View 	@114
-				location   	(477, 2008)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$16" @117
-			    Parent_View 	@113
-			    location   	(-55, 385)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3DF4CAAE01F5"
-			    client     	@113
-			    supplier   	@111
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::ecore::EStructuralFeature" @118
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(2224, 224)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@118
-			location   	(2033, 145)
-			nlines     	1
-			max_width  	382
-			justify    	0
-			label      	"EStructuralFeature")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3903D59D0230"
-		    width      	400
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @119
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3DF4CE830390"
-		    client     	@56
-		    supplier   	@118
-		    line_style 	0)))
-	(object ClassDiagram "Imports"
-	    quid       	"3810A0DC015D"
-	    title      	"Imports"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::java::JavaClass" @120
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(320, 672)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@120
-			location   	(189, 626)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"36549FCC00FA"
-		    width      	280
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "ClassImports" @121
-		    location   	(643, 1115)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @122
-			Parent_View 	@121
-			location   	(677, 1040)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	600
-			justify    	0
-			label      	"ClassImports"
-			pctDist    	1.066667
-			height     	76
-			orientation 	0)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3829C4BF000D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "classImport" @123
-			    Parent_View 	@121
-			    location   	(227, 331)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @124
-				Parent_View 	@123
-				location   	(665, 671)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+classImport"
-				pctDist    	0.727154
-				height     	2
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3829C4BF000E"
-			    client     	@121
-			    supplier   	@120
-			    vertices   	(list Points
-				(643, 1115)
-				(703, 1115)
-				(703, 672)
-				(460, 672))
-			    line_style 	3
-			    origin_attachment 	(643, 1115)
-			    terminal_attachment 	(460, 672)
-			    label      	(object SegLabel @125
-				Parent_View 	@123
-				location   	(525, 723)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.914676
-				height     	51
-				orientation 	0)
-			    label      	(object SegLabel @126
-				Parent_View 	@123
-				location   	(742, 737)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.587467
-				height     	39
-				orientation 	1))
-			(object RoleView "importedBy" @127
-			    Parent_View 	@121
-			    location   	(227, 331)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @128
-				Parent_View 	@127
-				location   	(330, 936)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+importedBy"
-				pctDist    	0.708040
-				height     	10
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3829C4BF000F"
-			    client     	@121
-			    supplier   	@120
-			    vertices   	(list Points
-				(643, 1115)
-				(320, 1115)
-				(320, 729))
-			    line_style 	3
-			    origin_attachment 	(643, 1115)
-			    terminal_attachment 	(320, 729)
-			    label      	(object SegLabel @129
-				Parent_View 	@127
-				location   	(280, 802)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.897611
-				height     	41
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::java::JavaPackage" @130
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1408, 224)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@130
-			location   	(1247, 178)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	322
-			justify    	0
-			label      	"JavaPackage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"38108E0301D2"
-		    width      	340
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "PackageImports" @131
-		    location   	(1023, 382)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @132
-			Parent_View 	@131
-			location   	(1038, 419)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	600
-			justify    	0
-			label      	"PackageImports"
-			pctDist    	0.750000
-			height     	37
-			orientation 	1)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3829C4EC0207"
-		    roleview_list 	(list RoleViews
-			(object RoleView "importedBy" @133
-			    Parent_View 	@131
-			    location   	(-417, -306)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @134
-				Parent_View 	@133
-				location   	(648, 430)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+importedBy"
-				pctDist    	0.646526
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3829C4EE0105"
-			    client     	@131
-			    supplier   	@120
-			    vertices   	(list Points
-				(1023, 382)
-				(1023, 255)
-				(413, 614))
-			    line_style 	0
-			    label      	(object SegLabel @135
-				Parent_View 	@133
-				location   	(512, 618)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "packageImports" @136
-			    Parent_View 	@131
-			    location   	(-417, -306)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @137
-				Parent_View 	@136
-				location   	(1223, 579)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	312
-				justify    	0
-				label      	"+packageImports"
-				pctDist    	0.522472
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3829C4EE00FB"
-			    client     	@131
-			    supplier   	@130
-			    vertices   	(list Points
-				(1023, 382)
-				(1023, 618)
-				(1265, 618)
-				(1386, 281))
-			    line_style 	0
-			    label      	(object SegLabel @138
-				Parent_View 	@136
-				location   	(1409, 378)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @139
-				Parent_View 	@136
-				location   	(1424, 500)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.769663
-				height     	109
-				orientation 	1))))))
-	(object ClassDiagram "Source code"
-	    quid       	"3810A13B0159"
-	    title      	"Source code"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::java::Comment" @140
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(592, 688)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@140
-			location   	(475, 642)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	234
-			justify    	0
-			label      	"Comment")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"380F889B02B8"
-		    width      	252
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Statement" @141
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1104, 688)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@141
-			location   	(983, 642)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	242
-			justify    	0
-			label      	"Statement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"380F88B9025A"
-		    width      	260
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Initializer" @142
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(144, 288)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@142
-			location   	(33, 242)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	222
-			justify    	0
-			label      	"Initializer")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654A5DC00BB"
-		    width      	240
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Field" @143
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(256, 112)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@143
-			location   	(160, 66)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	192
-			justify    	0
-			label      	"Field")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AF8F0280"
-		    width      	210
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Block" @144
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(864, 352)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@144
-			location   	(692, 256)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"Block")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"380F88370150"
-		    compartment 	(object Compartment
-			Parent_View 	@144
-			location   	(692, 312)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	290)
-		    width      	362
-		    height     	214
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @145
-		    location   	(864, 580)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@144
-		    vertices   	(list Points
-			(864, 580)
-			(864, 459)))
-		(object InheritView "" @146
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"380F88D600A5"
-		    client     	@140
-		    supplier   	@144
-		    line_style 	3
-		    origin_attachment 	(581, 631)
-		    terminal_attachment 	(581, 580)
-		    drawSupplier 	@145)
-		(object InheritView "" @147
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"380F88DA0056"
-		    client     	@141
-		    supplier   	@144
-		    line_style 	3
-		    origin_attachment 	(1121, 630)
-		    terminal_attachment 	(1121, 580)
-		    drawSupplier 	@145)
-		(object AssociationViewNew "$UNNAMED$8" @148
-		    location   	(473, 300)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392AAC33036A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "source" @149
-			    Parent_View 	@148
-			    location   	(153, -388)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @150
-				Parent_View 	@149
-				location   	(599, 267)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	145
-				justify    	0
-				label      	"+source"
-				pctDist    	0.599393
-				height     	34
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AAC380140"
-			    client     	@148
-			    supplier   	@144
-			    line_style 	3
-			    origin_attachment 	(473, 300)
-			    terminal_attachment 	(683, 300)
-			    label      	(object SegLabel @151
-				Parent_View 	@149
-				location   	(605, 334)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.635266
-				height     	34
-				orientation 	1))
-			(object RoleView "initializer" @152
-			    Parent_View 	@148
-			    location   	(153, -388)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AAC380168"
-			    client     	@148
-			    supplier   	@142
-			    line_style 	3
-			    origin_attachment 	(473, 300)
-			    terminal_attachment 	(264, 300))))
-		(object AssociationViewNew "$UNNAMED$9" @153
-		    location   	(671, 114)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @154
-			Parent_View 	@153
-			location   	(671, 55)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			hidden     	TRUE
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	60
-			justify    	0
-			label      	""
-			pctDist    	0.500000
-			height     	60
-			orientation 	0)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392AAC5602A2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "initializer" @155
-			    Parent_View 	@153
-			    location   	(319, -334)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @156
-				Parent_View 	@155
-				location   	(954, 210)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	195
-				justify    	0
-				label      	"+initializer"
-				pctDist    	0.891827
-				height     	104
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AAC5702DF"
-			    client     	@153
-			    supplier   	@144
-			    vertices   	(list Points
-				(671, 114)
-				(850, 114)
-				(850, 245))
-			    line_style 	3
-			    origin_attachment 	(671, 114)
-			    terminal_attachment 	(850, 245)
-			    label      	(object SegLabel @157
-				Parent_View 	@155
-				location   	(790, 218)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.913462
-				height     	61
-				orientation 	1))
-			(object RoleView "field" @158
-			    Parent_View 	@153
-			    location   	(319, -334)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AAC570307"
-			    client     	@153
-			    supplier   	@143
-			    line_style 	3
-			    origin_attachment 	(671, 114)
-			    terminal_attachment 	(361, 114))))
-		(object ClassView "Class" "Logical View::java::Method" @159
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(288, 496)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@159
-			location   	(190, 450)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	196
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654AE910271"
-		    width      	214
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$10" @160
-		    location   	(596, 496)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"392AACA501E7"
-		    roleview_list 	(list RoleViews
-			(object RoleView "source" @161
-			    Parent_View 	@160
-			    location   	(276, -448)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @162
-				Parent_View 	@161
-				location   	(690, 463)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	145
-				justify    	0
-				label      	"+source"
-				pctDist    	0.474777
-				height     	34
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AACA7017C"
-			    client     	@160
-			    supplier   	@144
-			    vertices   	(list Points
-				(596, 496)
-				(759, 496)
-				(759, 459))
-			    line_style 	3
-			    origin_attachment 	(596, 496)
-			    terminal_attachment 	(759, 459)
-			    label      	(object SegLabel @163
-				Parent_View 	@161
-				location   	(817, 477)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.915367
-				height     	58
-				orientation 	1))
-			(object RoleView "method" @164
-			    Parent_View 	@160
-			    location   	(276, -448)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"392AACA701B8"
-			    client     	@160
-			    supplier   	@159
-			    line_style 	3
-			    origin_attachment 	(596, 496)
-			    terminal_attachment 	(395, 496))))))
-	(object ClassDiagram "Data Types"
-	    quid       	"3810A1CE02EB"
-	    title      	"Data Types"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::java::TypeKind" @165
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 224)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@165
-			location   	(77, 84)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	326
-			justify    	0
-			label      	"TypeKind")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@165
-			location   	(77, 39)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	326
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3654B46002BF"
-		    compartment 	(object Compartment
-			Parent_View 	@165
-			location   	(77, 140)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	5
-			max_width  	277)
-		    width      	344
-		    height     	392
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaVisibilityKind" @166
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 640)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@166
-			location   	(68, 500)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"JavaVisibilityKind")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@166
-			location   	(68, 455)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"382333BE032E"
-		    compartment 	(object Compartment
-			Parent_View 	@166
-			location   	(68, 556)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	5
-			max_width  	292)
-		    width      	362
-		    height     	392
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object NoteView @167
-		    location   	(1296, 208)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@167
-			location   	(887, 52)
-			fill_color 	13434879
-			nlines     	6
-			max_width  	783
-			label      	
-|The Java primitive types are instances of JavaDataType.  The common parent class with JavaClass is Classifier.  The primitive types can be obtained via a JavaURL("int"), which resolves to a reference like: "java:/#int"
-			)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	843
-		    height     	325)
-		(object ClassView "Class" "Logical View::java::JavaParameterKind" @168
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(256, 1088)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@168
-			location   	(63, 948)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	386
-			justify    	0
-			label      	"JavaParameterKind")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@168
-			location   	(63, 903)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	386
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"391C1E8F0123"
-		    compartment 	(object Compartment
-			Parent_View 	@168
-			location   	(63, 1004)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	5
-			max_width  	207)
-		    width      	404
-		    height     	392
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object NoteView @169
-		    location   	(768, 1120)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@169
-			location   	(574, 1017)
-			fill_color 	13434879
-			nlines     	4
-			max_width  	352
-			label      	"Temporary enum for Java parameter kind until we get the base sorted out")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	412
-		    height     	219)
-		(object ClassView "Class" "Logical View::java::JavaDataType" @170
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1168, 1408)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@170
-			location   	(999, 1362)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	338
-			justify    	0
-			label      	"JavaDataType")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"395913340316"
-		    width      	356
-		    height     	114
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EDataType" @171
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1088, 640)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@171
-			location   	(812, 511)
-			nlines     	2
-			max_width  	552
-			justify    	0
-			label      	"EDataType")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3903D525033E"
-		    compartment 	(object Compartment
-			Parent_View 	@171
-			location   	(812, 611)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			anchor     	2
-			nlines     	2
-			max_width  	522)
-		    width      	570
-		    height     	282
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AttachView "" @172
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@169
-		    supplier   	@168
-		    line_style 	0)))
-	(object ClassDiagram "Java Types"
-	    quid       	"3B65B823020D"
-	    title      	"Java Types"
-	    documentation 	"This class diagram contains the Java Types that are not EMF classes but are referenced in this diagram."
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	478
-	    origin_y   	35
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::java::JTypeJavaHelpers" @173
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(912, 208)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@173
-			location   	(398, 154)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1028
-			justify    	0
-			label      	"JTypeJavaHelpers")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@173
-			location   	(398, 109)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	1028
-			justify    	0
-			label      	"<<datatype>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B65ADE403A6"
-		    compartment 	(object Compartment
-			Parent_View 	@173
-			location   	(398, 210)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	873)
-		    width      	1046
-		    height     	220
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JTypeList" @174
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(880, 576)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@174
-			location   	(628, 523)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	504
-			justify    	0
-			label      	"JTypeList")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@174
-			location   	(628, 478)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	504
-			justify    	0
-			label      	"<<datatype>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B65B87602C1"
-		    compartment 	(object Compartment
-			Parent_View 	@174
-			location   	(628, 579)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	507)
-		    width      	522
-		    height     	218
-		    annotation 	8
-		    autoResize 	TRUE)))))
diff --git a/plugins/org.eclipse.jem/rose/instance.mdl b/plugins/org.eclipse.jem/rose/instance.mdl
deleted file mode 100644
index a9007e507..000000000
--- a/plugins/org.eclipse.jem/rose/instance.mdl
+++ /dev/null
@@ -1,8669 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"3A79EBA50331"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	FALSE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3A7999AD0297"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3A7999B702F6"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3A7999AD028E"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3B86F172016F"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "instantiation"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.jem\\rose\\instantiation.cat"
-		quid       	"3B86F1720180")
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3B86F1720173"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::instantiation" @1
-			location   	(334, 240)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(190, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"instantiation")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3B86F1720180"
-			width      	300
-			height     	180)))
-	    (object ClassDiagram "Dependencies (Don't edit)"
-		quid       	"3B86F31F0281"
-		title      	"Dependencies (Don't edit)"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object NoteView @2
-			location   	(753, 685)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(305, 539)
-			    fill_color 	13434879
-			    nlines     	6
-			    max_width  	860
-			    label      	"These are the dependencies. They are not to be edited. They must only be edited by their owner models.")
-			line_color 	3342489
-			fill_color 	8421631
-			width      	920
-			height     	305)
-		    (object CategoryView "Logical View::ecore" @3
-			location   	(263, 185)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(119, 101)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3B86F172016F"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3B86F1720176"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3B86F1720170"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3B86F1720172"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ClearCase"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	"None")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	";D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\charsets.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jce.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jsse.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\rt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\sunrsasign.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\dnsns.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\ldapsec.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\localedata.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\sunjce_provider.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\local_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\US_export_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\dt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\htmlconverter.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\tools.jar")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateFriendBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateFriendDecl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SpecialDeclReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969"))
-	quid       	"3B86F1720171"))
diff --git a/plugins/org.eclipse.jem/rose/instantiation.cat b/plugins/org.eclipse.jem/rose/instantiation.cat
deleted file mode 100644
index 00ad0d2ba..000000000
--- a/plugins/org.eclipse.jem/rose/instantiation.cat
+++ /dev/null
@@ -1,2953 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "instantiation"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jem.internal")))
-    quid       	"3B86F1720180"
-    documentation 	"Java Instantiation Package"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "IJavaDataTypeInstance"
-	    quid       	"3B8AB17802B1"
-	    stereotype 	"Interface"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E529562014E"
-		    supplier   	"Logical View::instantiation::IJavaInstance"
-		    quidu      	"3E51575A02D4"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance"
-		    quid       	"3B8AB19100C2"
-		    stereotype 	"javaclass")))
-	(object Class "IJavaInstance"
-	    quid       	"3E51575A02D4"
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.eclipse.jem.internal.instantiation.base.IJavaInstance"
-		    quid       	"3E51577802B9"
-		    stereotype 	"javaclass")))
-	(object Class "IJavaObjectInstance"
-	    quid       	"3B782D790296"
-	    documentation 	"This interface is the instance of an java object in the java model."
-	    stereotype 	"Interface"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E5157DA03DD"
-		    supplier   	"Logical View::instantiation::IJavaInstance"
-		    quidu      	"3E51575A02D4"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance"
-		    quid       	"3B78301801C9"
-		    stereotype 	"javaclass")))
-	(object Class "JavaAllocation"
-	    quid       	"3FD9E6900061"
-	    documentation 	
-|This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized.
-	    
-	    abstract   	TRUE)
-	(object Class "InitStringAllocation"
-	    quid       	"3FD9EAF9001E"
-	    documentation 	"This is used when the allocation string can be parsed by the remote vm. It uses the allocString."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3FD9EB7502DA"
-		    supplier   	"Logical View::instantiation::JavaAllocation"
-		    quidu      	"3FD9E6900061"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "initString"
-		    quid       	"3FFDE1DE032E"
-		    documentation 	"This is the initialization string for this object."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "ImplicitAllocation"
-	    quid       	"3FD9EC140242"
-	    documentation 	"This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3FD9EC4700E7"
-		    supplier   	"Logical View::instantiation::JavaAllocation"
-		    quidu      	"3FD9E6900061")))
-	(object Class "ParseTreeAllocation"
-	    quid       	"40082C910005"
-	    documentation 	"Allocations via Parse Trees."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40082CB701D6"
-		    supplier   	"Logical View::instantiation::JavaAllocation"
-		    quidu      	"3FD9E6900061")))
-	(object Class "PTExpression"
-	    quid       	"40082D0A01CB"
-	    abstract   	TRUE)
-	(object Class "PTArrayAccess"
-	    quid       	"40082E140250"
-	    documentation 	
-|Array access. e.g. x[3]. 
-|
-|Unlike AST, the entire expression of type x[3][4] will be done in one expression rather than having a separate ArrayAccess for each dimension. This is just a simplification. This can only be used if it is a simple array access where it is of the form {expression}[expression][expression].
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40082E6F01F7"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "array"
-		    quid       	"40082E8E0237"
-		    documentation 	"The expression representing the array to access."
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "indexes"
-		    quid       	"40082E9B007D"
-		    documentation 	"The expressions representing the indexes of the access."
-		    stereotype 	"1..*"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTArrayCreation"
-	    quid       	"40083712025A"
-	    documentation 	
-|Array Creation expression, e.g. new int[3] or new java.langString[][] {{"a"}, {"b"}}
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400837210049"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "type"
-		    quid       	"400837E902BD"
-		    documentation 	"The fully-qualified type, e.g. int[][] or java.lang.String[], including the number of dimension brackets."
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "dimensions"
-		    quid       	"4008389501E8"
-		    documentation 	"The list of expressions for the dimensions. You can have [3][4][] but [][33] is invalid. So for each dimension that has an expression, there will be an entry in the list, in the correct order. When you reach the empty dimensions, the list will end too. "
-		    stereotype 	"0..*"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "initializer"
-		    quid       	"4008397C0231"
-		    documentation 	"This is the initializer, if any, for this array. E.g. new int[] {2,3}. It is the {2,3}."
-		    type       	"PTArrayInitializer"
-		    quidu      	"40083968014C"
-		    exportControl 	"Public")))
-	(object Class "PTArrayInitializer"
-	    quid       	"40083968014C"
-	    documentation 	"Array initialization expression. This is the entire expression, e.g. {2, 3}, or {{2,3}, 4}. In the second case, the {2,3} will be an ArrayInitializer contained within the expressions list for the top ArrayInitializer."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400839790038"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "expressions"
-		    quid       	"40083A5700EB"
-		    documentation 	"This isthe list of expressions within the initializer, e.g. {2, 3}, or {{2,3}, 4}. In the first case it will be two NumberLiterals. In the second case, the {2,3} will be an ArrayInitializer, followed by a NumberLiteral."
-		    stereotype 	"0..*"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTBooleanLiteral"
-	    quid       	"40083AE70247"
-	    documentation 	"This represents a primitive boolean literal, i.e. true or false directly in the code."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40083B1D0000"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "booleanValue"
-		    quid       	"40083B3D001A"
-		    documentation 	"The value of the literal."
-		    type       	"boolean"
-		    exportControl 	"Public")))
-	(object Class "PTCastExpression"
-	    quid       	"40083B6F0058"
-	    documentation 	"Cast expression, e.g. (short) 10"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40083BD60309"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "type"
-		    quid       	"40083B9600F4"
-		    documentation 	"This is the fully-qualified type of the cast, e.g. int or java.lang.String"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "expression"
-		    quid       	"40083BB6033F"
-		    documentation 	"The expression being casted."
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTCharacterLiteral"
-	    quid       	"40084DF10277"
-	    documentation 	"This represents a primitive character expression, e.g. 'a' or '\\r'."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40084E1301EA"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "escapedValue"
-		    quid       	"40084E39014E"
-		    documentation 	"This is the escaped character. In other words the literal exactly as it is in the java file. E.g. 'a' or '\\r'. Including the surrounding single quotes themselves."
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "charValue"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"40084EB702CC"
-		    documentation 	"The actual primitive character without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."
-		    type       	"char"
-		    exportControl 	"Public")))
-	(object Class "PTClassInstanceCreation"
-	    quid       	"40084F40026F"
-	    documentation 	
-|Class instance creation expression. E.g. new String("a")
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40084F4C02F8"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "type"
-		    quid       	"40084FAD0294"
-		    documentation 	
-|This is the type of the class. E.g. java.lang.String. This should be fully-qualified for allocation purposes. It should also be in reflection format, i.e. if X is an inner class of j.Y, then the type here should be "j.Y$X". 
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "arguments"
-		    quid       	"4008515E0138"
-		    documentation 	"The arguments to the constructor."
-		    stereotype 	"0..*"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTConditionalExpression"
-	    quid       	"400851FB026A"
-	    documentation 	"The test Expresson, e.g. (x=3) ? 1 : 2"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40085274012E"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "condition"
-		    quid       	"4008521D02AF"
-		    documentation 	"The condition expression."
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "true"
-		    quid       	"400852410333"
-		    documentation 	"The true expression"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "false"
-		    quid       	"4008525F0296"
-		    documentation 	"The false expression."
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTFieldAccess"
-	    quid       	"400852DF0204"
-	    documentation 	"Access a field expression, e.g. java.awt.Color.red"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4008535D0241"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "receiver"
-		    quid       	"40085313012C"
-		    documentation 	"The expression representing the object that the field is in, e.g. java.awt.Color."
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "field"
-		    quid       	"4008534500AC"
-		    documentation 	"The name of the field being accessed, e.g. red."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTInfixExpression"
-	    quid       	"4008538B0143"
-	    documentation 	"An expression with an operator that has two operands, e.g. 3 + 4."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400855700032"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "leftOperand"
-		    quid       	"400853AC0000"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "operator"
-		    quid       	"400853B600D7"
-		    documentation 	"The operator, e.g. +"
-		    type       	"PTInfixOperator"
-		    quidu      	"400853E10359"
-		    exportControl 	"Public")
-		(object ClassAttribute "rightOperand"
-		    quid       	"4008540D0186"
-		    documentation 	
-|The right expression. i.e. 4 of "3 + 4"
-		    
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "extendedOperands"
-		    quid       	"40085511039C"
-		    documentation 	"Used when there are a series of infix operations of the same operator, e.g. 1 + 2 + 3 + 4. 1 and 2 will go into left and right, while {3, 4} will go into the extended operands. "
-		    stereotype 	"0..*"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTInfixOperator"
-	    quid       	"400853E10359"
-	    documentation 	"Enumerator for the operator on an InfixExpression."
-	    stereotype 	"enumeration"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "TIMES"
-		    quid       	"400856830240"
-		    documentation 	"* operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "DIVIDE"
-		    quid       	"4008568E01E2"
-		    documentation 	"/ operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "REMAINDER"
-		    quid       	"4008569202BA"
-		    documentation 	"% operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "PLUS"
-		    quid       	"40085697039D"
-		    documentation 	"+ operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "MINUS"
-		    quid       	"4008569C01D8"
-		    documentation 	"- operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "LEFT_SHIFT"
-		    quid       	"400856B50274"
-		    documentation 	"<< operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "RIGHT_SHIFT_SIGNED"
-		    quid       	"400856BA00CD"
-		    documentation 	">> operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "RIGHT_SHIFT_UNSIGNED"
-		    quid       	"400856C3038D"
-		    documentation 	">>> operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "LESS"
-		    quid       	"400856CC03CC"
-		    documentation 	"<  operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "GREATER"
-		    quid       	"400856D9001D"
-		    documentation 	"> operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "LESS_EQUALS"
-		    quid       	"400856DD004B"
-		    documentation 	"<= operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "GREATER_EQUALS"
-		    quid       	"400856E5029B"
-		    documentation 	">= operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "EQUALS"
-		    quid       	"400856EC0273"
-		    documentation 	"== operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "NOT_EQUALS"
-		    quid       	"400856F9039E"
-		    documentation 	"!= operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "XOR"
-		    quid       	"400857010328"
-		    documentation 	"^ operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "AND"
-		    quid       	"40085712034A"
-		    documentation 	"& operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "OR"
-		    quid       	"4008570402FA"
-		    documentation 	"|  operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "CONDITIONAL_AND"
-		    quid       	"400857160075"
-		    documentation 	"&& operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "CONDITIONAL_OR"
-		    quid       	"4008572602BD"
-		    documentation 	"|| operator"
-		    exportControl 	"Public")))
-	(object Class "PTInstanceof"
-	    quid       	"400857D303A2"
-	    documentation 	"Instanceof expression, e.g. x instanceof java.lang.String"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4008589103AF"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "operand"
-		    quid       	"400858070234"
-		    documentation 	"The value to test, e.g. x in x instanceof java.lang.String"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "type"
-		    quid       	"4008582A0220"
-		    documentation 	"The type of the instance test, e.g. java.lang.String. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTMethodInvocation"
-	    quid       	"400858B6018B"
-	    documentation 	"MethodInvocation expression, e.g. x.getY(3)"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40085B9D0067"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "receiver"
-		    quid       	"40085B0A01EC"
-		    documentation 	
-|Who the method is invoked against. This may be not set, which means "this". It may also be a Name, which would mean a class like "java.lang.String"
-		    
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")
-		(object ClassAttribute "name"
-		    quid       	"40085B6100D9"
-		    documentation 	"The name of the method being invoked."
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "arguments"
-		    quid       	"40085B6902ED"
-		    documentation 	"The list of arguments, if any, to the method."
-		    stereotype 	"0..*"
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTName"
-	    quid       	"400858EA0280"
-	    documentation 	
-|This represents a name. This can happen for the receiver of a method invocation, e.g. x.getY() or java.lang.String.valueOf(10). In these cases you would have a name of "x" or "java.lang.String".
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40085BA100DB"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"400C110401BE"
-		    documentation 	"The name, which can be a type or a variable. If it is a type, then  it must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTNullLiteral"
-	    quid       	"40085BBF0020"
-	    documentation 	
-|Represents the expression "null"
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40085BD402F1"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB")))
-	(object Class "PTNumberLiteral"
-	    quid       	"40085C40035B"
-	    documentation 	"Represent a number primitive literal, e.g. 10. One optimization that will be performed is that if an expression is of the form +number or -number, it will be converted from a PrefixExpression with a NumberLiteral to just a NumberLiteral. This will simplify the model."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40085CEF0244"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "token"
-		    quid       	"40085CAA024F"
-		    documentation 	"The token value, e.g. 10, 10d, or -10.75"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTParenthesizedExpression"
-	    quid       	"40085CF9007C"
-	    documentation 	"An expression within parenthesis, e.g. (x+3)"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40085F4E03E1"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "expression"
-		    quid       	"40085F22012B"
-		    documentation 	
-|The expression wrapped by the parenthesis, e.g. (x+3) then the expression is "x+3"
-		    
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTPrefixExpression"
-	    quid       	"40085FAD008B"
-	    documentation 	
-|A one operand operator, where the operator comes before the operand, e.g. - (x+3). In AST, even -3 is modeled as a PrefixExpression of operator "-" and expression of NumberLiteral(3). But we optimize this away and just use a NumberLiteral(-3) directly instead.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400862DC01D7"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "operator"
-		    quid       	"400860BC0199"
-		    documentation 	"The operator of this expression."
-		    type       	"PTPrefixOperator"
-		    quidu      	"4008602400D2"
-		    exportControl 	"Public")
-		(object ClassAttribute "expression"
-		    quid       	"400860C50065"
-		    documentation 	"The expression that the operator is applied to."
-		    type       	"PTExpression"
-		    quidu      	"40082D0A01CB"
-		    exportControl 	"Public")))
-	(object Class "PTPrefixOperator"
-	    quid       	"4008602400D2"
-	    documentation 	"The prefix expression operator. We are not modeling ++ and --."
-	    stereotype 	"enumeration"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "PLUS"
-		    quid       	"4008606F01B6"
-		    documentation 	"+ operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "MINUS"
-		    quid       	"4008607203B9"
-		    documentation 	"- operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "COMPLEMENT"
-		    quid       	"4008607800AB"
-		    documentation 	"~ operator"
-		    exportControl 	"Public")
-		(object ClassAttribute "NOT"
-		    quid       	"4008607D0148"
-		    documentation 	"! operator"
-		    exportControl 	"Public")))
-	(object Class "PTStringLiteral"
-	    quid       	"400861E2000B"
-	    documentation 	
-|Representation of a string literal, e.g. "asdf".
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400862D70338"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "escapedValue"
-		    quid       	"400861FC01CB"
-		    documentation 	
-|This is the escaped string. In other words the literal exactly as it is in the java file. E.g. "ab" or "c\r". Including the surrounding quotes themselves.
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "literalValue"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"4008620A00BD"
-		    documentation 	"The actual string without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTThisLiteral"
-	    quid       	"400863A700CB"
-	    documentation 	
-|Represents "this", e.g. this.getX() will be a MethodInvocation with the receiver being a ThisLiteral. We can't handle the format XYZ.this because that is for inner classes and we don't support that right now.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"40086418019F"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB")))
-	(object Class "PTTypeLiteral"
-	    quid       	"400864950181"
-	    documentation 	"This represents a literal of the form j.XYZ.class. For instance in a method invocation x.getX(jXYZ.class) the argument will be a TypeLiteral."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4008654C0008"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "type"
-		    quid       	"400864D7037B"
-		    documentation 	"The type of the literal.  It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTInvalidExpression"
-	    quid       	"400865AF0209"
-	    documentation 	"This is used when we have some expression we just can't evaluate for our purposes. It allows us to tell the evaluation what is actually wrong. It should be placed as the root expression to prevent processing much of the tree and then finally fail."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"400866F50258"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "message"
-		    quid       	"400866E40299"
-		    documentation 	"A message as to why it is invalid."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PTInstanceReference"
-	    quid       	"4017DB1802B3"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4017DB4A0341"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB")))
-	(object Class "PTAnonymousClassDeclaration"
-	    quid       	"43627C140396"
-	    documentation 	
-|An anonymous class declaration. Currently we only store the 
-|entire declaration as a string, including the "new AClass() {...}".
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"43627D4E00D0"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "declaration"
-		    quid       	"43627D690147"
-		    documentation 	"The declaration text."
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "imports"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"436289E5034B"
-		    documentation 	"This is the imports needed in the main class by this declaration. This is a transient attribute. It is not serialized, nor is it parsed into from existing code. Its only purpose is to help code generation on a brand new declaration to know what imports should be added to the main class."
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Implementation")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3FD9ED7103D5"
-	    documentation 	"The parent who is to give up the value."
-	    roles      	(list role_list
-		(object Role "parent"
-		    quid       	"3FD9ED720390"
-		    label      	"parent"
-		    supplier   	"Logical View::ecore::EObject"
-		    quidu      	"3C4F1C860123"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3FD9ED72039A"
-		    supplier   	"Logical View::instantiation::ImplicitAllocation"
-		    quidu      	"3FD9EC140242")))
-	(object Association "$UNNAMED$2"
-	    quid       	"3FD9EDD00088"
-	    documentation 	"The feature that will be used to query the live value."
-	    roles      	(list role_list
-		(object Role "feature"
-		    quid       	"3FD9EDD10148"
-		    label      	"feature"
-		    supplier   	"Logical View::ecore::EStructuralFeature"
-		    quidu      	"3903D59D0230"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3FD9EDD10152"
-		    supplier   	"Logical View::instantiation::ImplicitAllocation"
-		    quidu      	"3FD9EC140242")))
-	(object Association "$UNNAMED$4"
-	    quid       	"400834CE001B"
-	    documentation 	"The root expression of the parse tree. The result of it is the allocation."
-	    roles      	(list role_list
-		(object Role "expression"
-		    quid       	"400834CF02E4"
-		    label      	"expression"
-		    supplier   	"Logical View::instantiation::PTExpression"
-		    quidu      	"40082D0A01CB"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"400834CF02E6"
-		    supplier   	"Logical View::instantiation::ParseTreeAllocation"
-		    quidu      	"40082C910005"
-		    Containment 	"By Value"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    quid       	"4017DBE30138"
-	    roles      	(list role_list
-		(object Role "reference"
-		    quid       	"4017DBE60006"
-		    label      	"reference"
-		    supplier   	"Logical View::instantiation::IJavaInstance"
-		    quidu      	"3E51575A02D4"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"4017DBE60164"
-		    supplier   	"Logical View::instantiation::PTInstanceReference"
-		    quidu      	"4017DB1802B3"
-		    Containment 	"By Reference"))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Main"
-	    quid       	"3B782D1B034F"
-	    title      	"Main"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object NoteView @1
-		    location   	(747, 1008)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(342, 854)
-			fill_color 	13434879
-			nlines     	6
-			max_width  	775
-			label      	"This is used as the EClassifier when you want a code-generated class to point to an instance of a IJavaObjectInstance implementer. (Which is an instance of a java model java object).")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	835
-		    height     	320)
-		(object ClassView "Class" "Logical View::instantiation::IJavaDataTypeInstance" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2659, 664)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(1777, 605)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1764
-			justify    	0
-			label      	"IJavaDataTypeInstance")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@2
-			location   	(1777, 555)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	1764
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8AB17802B1"
-		    compartment 	(object Compartment
-			Parent_View 	@2
-			location   	(1777, 666)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	1512)
-		    width      	1782
-		    height     	242
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object NoteView @3
-		    location   	(2378, 1053)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(1970, 889)
-			fill_color 	13434879
-			nlines     	7
-			max_width  	780
-			label      	"This is used as the EClassifier when you want a code-generated class to point to an instance of an IJavaDataTypeInstance implementer. (Which is an instance of a java model java primitive).")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	840
-		    height     	340)
-		(object AttachView "" @4
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@2
-		    supplier   	@3
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::instantiation::IJavaInstance" @5
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1584, 166)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@5
-			location   	(804, 85)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1560
-			justify    	0
-			label      	"IJavaInstance")
-		    icon       	"Interface"
-		    icon_style 	"None"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E51575A02D4"
-		    compartment 	(object Compartment
-			Parent_View 	@5
-			location   	(804, 146)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	1340)
-		    width      	1578
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @6
-		    location   	(1584, 455)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@5
-		    vertices   	(list Points
-			(1584, 455)
-			(1584, 259)))
-		(object ClassView "Class" "Logical View::instantiation::IJavaObjectInstance" @7
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(858, 666)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@7
-			location   	(627, 614)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	480
-			justify    	0
-			label      	"IJavaObjectInstance")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@7
-			location   	(627, 564)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B782D790296"
-		    compartment 	(object Compartment
-			Parent_View 	@7
-			location   	(627, 675)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	1459)
-		    width      	480
-		    height     	228
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AttachView "" @8
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@1
-		    supplier   	@7
-		    line_style 	0)
-		(object InheritView "" @9
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E5157DA03DD"
-		    client     	@7
-		    supplier   	@5
-		    line_style 	3
-		    origin_attachment 	(795, 552)
-		    terminal_attachment 	(795, 455)
-		    drawSupplier 	@6)
-		(object InheritView "" @10
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E529562014E"
-		    client     	@2
-		    supplier   	@5
-		    line_style 	3
-		    origin_attachment 	(2659, 543)
-		    terminal_attachment 	(2659, 455)
-		    drawSupplier 	@6)))
-	(object ClassDiagram "Java Constructors"
-	    quid       	"3FD9E66D007F"
-	    title      	"Java Constructors"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::instantiation::JavaAllocation" @11
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1073, 120)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@11
-			location   	(902, 69)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	342
-			justify    	0
-			label      	"JavaAllocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3FD9E6900061"
-		    width      	360
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::InitStringAllocation" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(553, 495)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(329, 414)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	448
-			justify    	0
-			label      	"InitStringAllocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3FD9EAF9001E"
-		    width      	466
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @13
-		    location   	(1073, 323)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@11
-		    vertices   	(list Points
-			(1073, 323)
-			(1073, 183)))
-		(object InheritView "" @14
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3FD9EB7502DA"
-		    client     	@12
-		    supplier   	@11
-		    line_style 	3
-		    origin_attachment 	(668, 401)
-		    terminal_attachment 	(668, 323)
-		    drawSupplier 	@13)
-		(object ClassView "Class" "Logical View::ecore::EObject" @15
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1751, 942)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@15
-			location   	(1645, 896)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	212
-			justify    	0
-			label      	"EObject")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3C4F1C860123"
-		    width      	230
-		    height     	117
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EStructuralFeature" @16
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(2142, 927)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@16
-			location   	(1918, 881)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	448
-			justify    	0
-			label      	"EStructuralFeature")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3903D59D0230"
-		    width      	466
-		    height     	117
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::ImplicitAllocation" @17
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2018, 510)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@17
-			location   	(1819, 458)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	398
-			justify    	0
-			label      	"ImplicitAllocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3FD9EC140242"
-		    width      	416
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @18
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3FD9EC4700E7"
-		    client     	@17
-		    supplier   	@11
-		    line_style 	3
-		    origin_attachment 	(2023, 446)
-		    terminal_attachment 	(2023, 323)
-		    drawSupplier 	@13)
-		(object AssociationViewNew "$UNNAMED$0" @19
-		    location   	(1881, 728)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3FD9ED7103D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parent" @20
-			    Parent_View 	@19
-			    location   	(716, 228)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @21
-				Parent_View 	@20
-				location   	(1727, 844)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	137
-				justify    	0
-				label      	"+parent"
-				pctDist    	0.991224
-				height     	72
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3FD9ED720390"
-			    client     	@19
-			    supplier   	@15
-			    line_style 	0
-			    label      	(object SegLabel @22
-				Parent_View 	@20
-				location   	(1871, 794)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.337817
-				height     	26
-				orientation 	0))
-			(object RoleView "$UNNAMED$1" @23
-			    Parent_View 	@19
-			    location   	(716, 228)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3FD9ED72039A"
-			    client     	@19
-			    supplier   	@17
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$2" @24
-		    location   	(2080, 721)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3FD9EDD00088"
-		    roleview_list 	(list RoleViews
-			(object RoleView "feature" @25
-			    Parent_View 	@24
-			    location   	(915, 221)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(2028, 766)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"+feature"
-				pctDist    	0.181346
-				height     	64
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3FD9EDD10148"
-			    client     	@24
-			    supplier   	@16
-			    line_style 	0
-			    label      	(object SegLabel @27
-				Parent_View 	@25
-				location   	(2172, 839)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @28
-			    Parent_View 	@24
-			    location   	(915, 221)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3FD9EDD10152"
-			    client     	@24
-			    supplier   	@17
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::instantiation::PTExpression" @29
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1264, 776)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@29
-			location   	(1095, 725)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	338
-			justify    	0
-			label      	"PTExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12615935
-		    quidu      	"40082D0A01CB"
-		    width      	356
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::ParseTreeAllocation" @30
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1265, 495)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@30
-			location   	(1032, 443)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	466
-			justify    	0
-			label      	"ParseTreeAllocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40082C910005"
-		    width      	484
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @31
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40082CB701D6"
-		    client     	@30
-		    supplier   	@11
-		    line_style 	3
-		    origin_attachment 	(1265, 431)
-		    terminal_attachment 	(1265, 323)
-		    drawSupplier 	@13)
-		(object AssociationViewNew "$UNNAMED$4" @32
-		    location   	(1264, 635)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400834CE001B"
-		    roleview_list 	(list RoleViews
-			(object RoleView "expression" @33
-			    Parent_View 	@32
-			    location   	(-1, 140)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @34
-				Parent_View 	@33
-				location   	(1111, 672)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	220
-				justify    	0
-				label      	"+expression"
-				pctDist    	0.492537
-				height     	154
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"400834CF02E4"
-			    client     	@32
-			    supplier   	@29
-			    line_style 	0
-			    label      	(object SegLabel @35
-				Parent_View 	@33
-				location   	(1307, 679)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.567164
-				height     	43
-				orientation 	0))
-			(object RoleView "$UNNAMED$5" @36
-			    Parent_View 	@32
-			    location   	(-1, 140)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"400834CF02E6"
-			    client     	@32
-			    supplier   	@30
-			    line_style 	0)))))
-	(object ClassDiagram "Parse Tree Expressions"
-	    quid       	"40082CC20146"
-	    title      	"Parse Tree Expressions"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	25
-	    origin_y   	5768
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::instantiation::PTExpression" @37
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1348, 124)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@37
-			location   	(1179, 73)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	338
-			justify    	0
-			label      	"PTExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40082D0A01CB"
-		    width      	356
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTArrayAccess" @38
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2235, 544)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@38
-			location   	(1848, 413)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	774
-			justify    	0
-			label      	"PTArrayAccess")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40082E140250"
-		    width      	792
-		    height     	286
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTArrayCreation" @39
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(434, 519)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@39
-			location   	(9, 363)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	850
-			justify    	0
-			label      	"PTArrayCreation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083712025A"
-		    width      	868
-		    height     	336
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTArrayInitializer" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1361, 519)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@40
-			location   	(929, 438)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	864
-			justify    	0
-			label      	"PTArrayInitializer")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083968014C"
-		    width      	882
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTBooleanLiteral" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(997, 870)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@41
-			location   	(719, 790)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	556
-			justify    	0
-			label      	"PTBooleanLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083AE70247"
-		    width      	574
-		    height     	184
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTCastExpression" @42
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1791, 889)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@42
-			location   	(1474, 758)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	634
-			justify    	0
-			label      	"PTCastExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083B6F0058"
-		    width      	652
-		    height     	286
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @43
-		    location   	(1348, 330)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@37
-		    vertices   	(list Points
-			(1348, 330)
-			(1348, 187)))
-		(object InheritView "" @44
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400839790038"
-		    client     	@40
-		    supplier   	@37
-		    line_style 	3
-		    origin_attachment 	(1381, 425)
-		    terminal_attachment 	(1381, 330)
-		    drawSupplier 	@43)
-		(object InheritView "" @45
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40083B1D0000"
-		    client     	@41
-		    supplier   	@37
-		    line_style 	3
-		    origin_attachment 	(918, 778)
-		    terminal_attachment 	(918, 330)
-		    drawSupplier 	@43)
-		(object InheritView "" @46
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40083BD60309"
-		    client     	@42
-		    supplier   	@37
-		    line_style 	3
-		    origin_attachment 	(1791, 746)
-		    terminal_attachment 	(1791, 330)
-		    drawSupplier 	@43)
-		(object InheritView "" @47
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40082E6F01F7"
-		    client     	@38
-		    supplier   	@37
-		    line_style 	3
-		    origin_attachment 	(2235, 401)
-		    terminal_attachment 	(2235, 330)
-		    drawSupplier 	@43)
-		(object ClassView "Class" "Logical View::instantiation::PTExpression" @48
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1372, 1095)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@48
-			location   	(1203, 1044)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	338
-			justify    	0
-			label      	"PTExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12615935
-		    quidu      	"40082D0A01CB"
-		    width      	356
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTCharacterLiteral" @49
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(430, 1438)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@49
-			location   	(164, 1332)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	532
-			justify    	0
-			label      	"PTCharacterLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40084DF10277"
-		    width      	550
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @50
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400837210049"
-		    client     	@39
-		    supplier   	@37
-		    line_style 	3
-		    origin_attachment 	(561, 351)
-		    terminal_attachment 	(561, 330)
-		    drawSupplier 	@43)
-		(object ClassView "Class" "Logical View::instantiation::PTClassInstanceCreation" @51
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1346, 1464)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@51
-			location   	(930, 1333)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	832
-			justify    	0
-			label      	"PTClassInstanceCreation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40084F40026F"
-		    width      	850
-		    height     	286
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @52
-		    location   	(1372, 1260)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@48
-		    vertices   	(list Points
-			(1372, 1260)
-			(1372, 1158)))
-		(object InheritView "" @53
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40084E1301EA"
-		    client     	@49
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(564, 1319)
-		    terminal_attachment 	(564, 1260)
-		    drawSupplier 	@52)
-		(object InheritView "" @54
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40084F4C02F8"
-		    client     	@51
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(1267, 1320)
-		    terminal_attachment 	(1267, 1260)
-		    drawSupplier 	@52)
-		(object ClassView "Class" "Logical View::instantiation::PTConditionalExpression" @55
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2169, 1481)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@55
-			location   	(1872, 1325)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	594
-			justify    	0
-			label      	"PTConditionalExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400851FB026A"
-		    width      	612
-		    height     	336
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @56
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085274012E"
-		    client     	@55
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(2168, 1313)
-		    terminal_attachment 	(2168, 1260)
-		    drawSupplier 	@52)
-		(object ClassView "Class" "Logical View::instantiation::PTFieldAccess" @57
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(761, 1794)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@57
-			location   	(479, 1663)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	564
-			justify    	0
-			label      	"PTFieldAccess")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400852DF0204"
-		    width      	582
-		    height     	286
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @58
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4008535D0241"
-		    client     	@57
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(760, 1651)
-		    terminal_attachment 	(760, 1260)
-		    drawSupplier 	@52)
-		(object ClassView "Class" "Logical View::instantiation::PTInfixExpression" @59
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1790, 1845)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@59
-			location   	(1286, 1664)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	1008
-			justify    	0
-			label      	"PTInfixExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"4008538B0143"
-		    width      	1026
-		    height     	386
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTInfixOperator" @60
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2660, 2207)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@60
-			location   	(2345, 1699)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	630
-			justify    	0
-			label      	"PTInfixOperator")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@60
-			location   	(2345, 1649)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	630
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400853E10359"
-		    width      	648
-		    height     	1140
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @61
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400855700032"
-		    client     	@59
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(1789, 1652)
-		    terminal_attachment 	(1789, 1260)
-		    drawSupplier 	@52)
-		(object ClassView "Class" "Logical View::instantiation::PTExpression" @62
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1272, 2853)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@62
-			location   	(1103, 2802)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	338
-			justify    	0
-			label      	"PTExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12615935
-		    quidu      	"40082D0A01CB"
-		    width      	356
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTInstanceof" @63
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(371, 3255)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@63
-			location   	(85, 3124)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	572
-			justify    	0
-			label      	"PTInstanceof")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400857D303A2"
-		    compartment 	(object Compartment
-			Parent_View 	@63
-			location   	(85, 3185)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	493)
-		    width      	590
-		    height     	286
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTMethodInvocation" @64
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1246, 3258)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@64
-			location   	(860, 3117)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	772
-			justify    	0
-			label      	"PTMethodInvocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400858B6018B"
-		    compartment 	(object Compartment
-			Parent_View 	@64
-			location   	(860, 3178)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	4
-			max_width  	715)
-		    width      	790
-		    height     	304
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTName" @65
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1962, 3212)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@65
-			location   	(1809, 3121)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	307
-			justify    	0
-			label      	"PTName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400858EA0280"
-		    compartment 	(object Compartment
-			Parent_View 	@65
-			location   	(1809, 3182)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	303)
-		    width      	325
-		    height     	205
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @66
-		    location   	(1272, 3061)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@62
-		    vertices   	(list Points
-			(1272, 3061)
-			(1272, 2916)))
-		(object InheritView "" @67
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4008589103AF"
-		    client     	@63
-		    supplier   	@62
-		    line_style 	3
-		    origin_attachment 	(474, 3112)
-		    terminal_attachment 	(474, 3061)
-		    drawSupplier 	@66)
-		(object InheritView "" @68
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085B9D0067"
-		    client     	@64
-		    supplier   	@62
-		    line_style 	3
-		    origin_attachment 	(1245, 3106)
-		    terminal_attachment 	(1245, 3061)
-		    drawSupplier 	@66)
-		(object InheritView "" @69
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085BA100DB"
-		    client     	@65
-		    supplier   	@62
-		    line_style 	3
-		    origin_attachment 	(1905, 3110)
-		    terminal_attachment 	(1905, 3061)
-		    drawSupplier 	@66)
-		(object ClassView "Class" "Logical View::instantiation::PTNullLiteral" @70
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2328, 3195)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@70
-			location   	(2170, 3143)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	316
-			justify    	0
-			label      	"PTNullLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40085BBF0020"
-		    width      	334
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @71
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085BD402F1"
-		    client     	@70
-		    supplier   	@62
-		    line_style 	3
-		    origin_attachment 	(2297, 3131)
-		    terminal_attachment 	(2297, 3061)
-		    drawSupplier 	@66)
-		(object ClassView "Class" "Logical View::instantiation::PTExpression" @72
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1243, 3867)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@72
-			location   	(1074, 3816)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	338
-			justify    	0
-			label      	"PTExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12615935
-		    quidu      	"40082D0A01CB"
-		    width      	356
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTNumberLiteral" @73
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(802, 3583)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@73
-			location   	(619, 3489)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	367
-			justify    	0
-			label      	"PTNumberLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40085C40035B"
-		    compartment 	(object Compartment
-			Parent_View 	@73
-			location   	(619, 3550)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	2
-			max_width  	303)
-		    width      	385
-		    height     	210
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @74
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085CEF0244"
-		    client     	@73
-		    supplier   	@62
-		    line_style 	3
-		    origin_attachment 	(730, 3478)
-		    terminal_attachment 	(730, 3061)
-		    drawSupplier 	@66)
-		(object ClassView "Class" "Logical View::instantiation::PTParenthesizedExpression" @75
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1679, 3609)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@75
-			location   	(1381, 3513)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	596
-			justify    	0
-			label      	"PTParenthesizedExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40085CF9007C"
-		    compartment 	(object Compartment
-			Parent_View 	@75
-			location   	(1381, 3574)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	2
-			max_width  	546)
-		    width      	614
-		    height     	214
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @76
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085F4E03E1"
-		    client     	@75
-		    supplier   	@62
-		    line_style 	3
-		    origin_attachment 	(1677, 3502)
-		    terminal_attachment 	(1677, 3061)
-		    drawSupplier 	@66)
-		(object ClassView "Class" "Logical View::instantiation::PTPrefixExpression" @77
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(330, 4221)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@77
-			location   	(9, 4090)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	642
-			justify    	0
-			label      	"PTPrefixExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40085FAD008B"
-		    compartment 	(object Compartment
-			Parent_View 	@77
-			location   	(9, 4151)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	553)
-		    width      	660
-		    height     	286
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTPrefixOperator" @78
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(233, 4602)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@78
-			location   	(34, 4468)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	398
-			justify    	0
-			label      	"PTPrefixOperator")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@78
-			location   	(34, 4418)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	398
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"4008602400D2"
-		    compartment 	(object Compartment
-			Parent_View 	@78
-			location   	(34, 4529)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	5
-			max_width  	343)
-		    width      	416
-		    height     	392
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTStringLiteral" @79
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1025, 4196)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@79
-			location   	(849, 4092)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	352
-			justify    	0
-			label      	"PTStringLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400861E2000B"
-		    compartment 	(object Compartment
-			Parent_View 	@79
-			location   	(849, 4153)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	3
-			max_width  	459)
-		    width      	370
-		    height     	230
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @80
-		    location   	(1243, 4020)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@72
-		    vertices   	(list Points
-			(1243, 4020)
-			(1243, 3930)))
-		(object InheritView "" @81
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400862D70338"
-		    client     	@79
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(1008, 4081)
-		    terminal_attachment 	(1008, 4020)
-		    drawSupplier 	@80)
-		(object InheritView "" @82
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400862DC01D7"
-		    client     	@77
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(297, 4078)
-		    terminal_attachment 	(297, 4020)
-		    drawSupplier 	@80)
-		(object ClassView "Class" "Logical View::instantiation::PTThisLiteral" @83
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1655, 4180)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@83
-			location   	(1494, 4129)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	322
-			justify    	0
-			label      	"PTThisLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400863A700CB"
-		    width      	340
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @84
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40086418019F"
-		    client     	@83
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(1627, 4117)
-		    terminal_attachment 	(1627, 4020)
-		    drawSupplier 	@80)
-		(object ClassView "Class" "Logical View::instantiation::PTTypeLiteral" @85
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2256, 4201)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@85
-			location   	(2093, 4106)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	327
-			justify    	0
-			label      	"PTTypeLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400864950181"
-		    compartment 	(object Compartment
-			Parent_View 	@85
-			location   	(2093, 4167)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	2
-			max_width  	281)
-		    width      	345
-		    height     	215
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @86
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4008654C0008"
-		    client     	@85
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(2197, 4093)
-		    terminal_attachment 	(2197, 4020)
-		    drawSupplier 	@80)
-		(object ClassView "Class" "Logical View::instantiation::PTInvalidExpression" @87
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1457, 4545)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@87
-			location   	(1279, 4449)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	357
-			justify    	0
-			label      	"PTInvalidExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400865AF0209"
-		    compartment 	(object Compartment
-			Parent_View 	@87
-			location   	(1279, 4510)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	2
-			max_width  	368)
-		    width      	375
-		    height     	215
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @88
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400866F50258"
-		    client     	@87
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(1413, 4438)
-		    terminal_attachment 	(1413, 4020)
-		    drawSupplier 	@80)
-		(object ClassView "Class" "Logical View::instantiation::IJavaInstance" @89
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2301, 4917)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@89
-			location   	(2137, 4887)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	328
-			justify    	0
-			label      	"IJavaInstance")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@89
-			location   	(2137, 4837)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	328
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E51575A02D4"
-		    width      	346
-		    height     	184
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::instantiation::PTInstanceReference" @90
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2005, 4509)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@90
-			location   	(1805, 4393)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	401
-			justify    	0
-			label      	"PTInstanceReference")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"4017DB1802B3"
-		    width      	419
-		    height     	257
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @91
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4017DB4A0341"
-		    client     	@90
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(1943, 4381)
-		    terminal_attachment 	(1943, 4020)
-		    drawSupplier 	@80)
-		(object AssociationViewNew "$UNNAMED$6" @92
-		    location   	(2165, 4730)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4017DBE30138"
-		    roleview_list 	(list RoleViews
-			(object RoleView "reference" @93
-			    Parent_View 	@92
-			    location   	(227, 259)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @94
-				Parent_View 	@93
-				location   	(2120, 4797)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	189
-				justify    	0
-				label      	"+reference"
-				pctDist    	0.231960
-				height     	77
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4017DBE60006"
-			    client     	@92
-			    supplier   	@89
-			    line_style 	0
-			    label      	(object SegLabel @95
-				Parent_View 	@93
-				location   	(2270, 4783)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$7" @96
-			    Parent_View 	@92
-			    location   	(227, 259)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4017DBE60164"
-			    client     	@92
-			    supplier   	@90
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::instantiation::PTAnonymousClassDeclaration" @97
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(852, 4577)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@97
-			location   	(495, 4471)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	714
-			justify    	0
-			label      	"PTAnonymousClassDeclaration")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"43627C140396"
-		    compartment 	(object Compartment
-			Parent_View 	@97
-			location   	(495, 4532)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	3
-			max_width  	503)
-		    width      	732
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @98
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"43627D4E00D0"
-		    client     	@97
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(677, 4459)
-		    terminal_attachment 	(677, 4020)
-		    drawSupplier 	@80)))))
diff --git a/plugins/org.eclipse.jem/rose/javaModel.mdl b/plugins/org.eclipse.jem/rose/javaModel.mdl
deleted file mode 100644
index 5efb92d59..000000000
--- a/plugins/org.eclipse.jem/rose/javaModel.mdl
+++ /dev/null
@@ -1,8819 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"39EDFBE003B4"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"39EDFBE003B6"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"39EDFBE2008D"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"39EDFBE003B5"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"39EDFBE003B7"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"39EDFBE2008E"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::java" @1
-			location   	(784, 528)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(630, 493)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	308
-			    justify    	0
-			    label      	"java")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(630, 443)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	308
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"36549F2C004E"
-			width      	320
-			height     	182)
-		    (object CategoryView "Logical View::ecore" @2
-			location   	(304, 544)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(160, 460)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"39EDFBE003B7"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"39EDFBE2008C"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"39EDFBE003B8"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"39EDFBE003BA"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"roseId"
-		value      	"753117540")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ClearCase"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdatable"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	";D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\charsets.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jce.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jsse.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\rt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\sunrsasign.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\dnsns.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\ldapsec.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\localedata.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\sunjce_provider.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\local_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\US_export_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\dt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\htmlconverter.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\tools.jar")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateFriendBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateFriendDecl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SpecialDeclReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	""))))
-	quid       	"39EDFBE003B9"))
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.classpath b/plugins/org.eclipse.jst.common.annotations.controller/.classpath
deleted file mode 100644
index 409868143..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="controller"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore b/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
deleted file mode 100644
index a43227330..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-controller.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.project b/plugins/org.eclipse.jst.common.annotations.controller/.project
deleted file mode 100644
index 8cc7f2234..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.controller</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cf88a9a0e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 12:52:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1ef7c3784..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Tue Apr 04 12:52:48 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
deleted file mode 100644
index 5b51b29be..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Controller Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.controller; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.controller;x-internal:=true,
- org.eclipse.jst.common.internal.annotations.registry;x-internal:=true
-Require-Bundle:  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.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.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jst.common.annotations.core;bundle-version="[1.1.0,1.2.0)"
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/about.html b/plugins/org.eclipse.jst.common.annotations.controller/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/build.properties b/plugins/org.eclipse.jst.common.annotations.controller/build.properties
deleted file mode 100644
index 318510368..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/build.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               schema/,\
-               META-INF/,\
-               about.html,\
-               plugin.properties,\
-               .
-jars.compile.order = .
-src.includes = schema/
-output.. = bin/
-source.. = controller/,\
-           property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
deleted file mode 100644
index 31a30cd46..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
+++ /dev/null
@@ -1,86 +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 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Annotations Controller interface used for communicating with emitters and determining available
- * tag sets
- */
-public interface AnnotationsController {
-
-	/**
-	 * Determines if a tag handler is installed for the specified tag
-	 * 
-	 * @param tagset
-	 *            the name of a tagset (e.g. "ejb")
-	 * @return true only if the given tagset is available and enabled
-	 */
-	public boolean isTagHandlerInstalled(String tagset);
-
-	/**
-	 * Disables annotation processing for the specified resource
-	 * 
-	 * @param modelObject
-	 *            The Annotated EMF Object
-	 * @param tagset
-	 *            The name of the annotations tagset to disable on the object
-	 * @return an IStatus representing success or failure
-	 */
-	public IStatus disableAnnotations(EObject modelObject, String tagset);
-
-	/**
-	 * Returns the associated annotated file if the specified model object was generated via
-	 * annotations from a parent resource and is enabled
-	 * 
-	 * @param modelObject
-	 *            The Annotated EMF Object
-	 * @return the annotated source file associated with the given modelObject
-	 */
-	public IFile getEnabledAnnotationFile(EObject modelObject);
-
-	/**
-	 * Process the annotations on the given resource during creation
-	 * 
-	 * @return all files touched by the annotations processing
-	 * @throws CoreException
-	 *             if a problem occurs while processing
-	 */
-	public IFile[] process(IResource res) throws CoreException;
-
-	/**
-	 * Process the annotations on the given resource array
-	 * 
-	 * @return all files touched by the annotations processing
-	 * @throws CoreException
-	 *             if a problem occurs while processing
-	 */
-	public IFile[] process(IResource[] res) throws CoreException;
-
-	/**
-	 * Provides the annotation processor an opportunity to initialize
-	 */
-	public void initialize(IProject project);
-
-	/**
-	 * Provides the annotation processor an opportunity to dispose and cleanup
-	 */
-	public void dispose();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
deleted file mode 100644
index 7f35d5e5f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
+++ /dev/null
@@ -1,235 +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.common.internal.annotations.controller;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsAdapter;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsProviderManager;
-import org.eclipse.jst.common.internal.annotations.core.IAnnotationsProvider;
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsControllerHelper {
-	public static final AnnotationsControllerHelper INSTANCE = new AnnotationsControllerHelper();
-
-	protected AnnotationsControllerHelper() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @param eObject the annotated model object
-	 * @return true only if the object has annotations
-	 */
-	public boolean isAnnotated(EObject eObject) {
-		if (AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED) != null)
-			return true;
-		List annotationsProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
-		for (int i=0; i<annotationsProviders.size(); i++) {
-			IAnnotationsProvider provider = (IAnnotationsProvider) annotationsProviders.get(i);
-			if (provider!=null && provider.isAnnotated(eObject))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A convenience method to tag a model object as annotated
-	 * 
-	 * @param eObject
-	 * @param value
-	 */
-	public void setAnnotated(EObject eObject, String value) {
-		AnnotationsAdapter.addAnnotations(eObject, AnnotationsAdapter.GENERATED, value);
-	}
-
-	/**
-	 * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
-	 * information.
-	 * 
-	 * @param eObject
-	 * @param name
-	 *            A string key
-	 * @param value
-	 *            A String value
-	 */
-	public void addAnnotations(EObject eObject, String name, Object value) {
-		AnnotationsAdapter.addAnnotations(eObject, name, value);
-	}
-
-	/**
-	 * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
-	 * information.
-	 * 
-	 * @param eObject
-	 * @param name
-	 *            A string key
-	 * @param value
-	 *            A String value
-	 */
-	public Object getAnnotations(EObject eObject, String name) {
-		return AnnotationsAdapter.getAnnotations(eObject, name);
-	}
-
-	/**
-	 * Acquires the generated annotation comment and parses the Fragment URL of the following form
-	 * to return the tagset name:
-	 * 
-	 * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
-	 * 
-	 * @param eObject
-	 *            The annotated object
-	 * @return the value of <tagset>in the URL example
-	 */
-	public String getTagset(EObject eObject) {
-		String tagset = getTagsetFromProviders(eObject);
-		if (tagset == null) {
-			tagset = getTagsetFromFragment(eObject);
-		}
-		return tagset;
-	}
-	
-	/**
-	 * Acquires the generated annotation comment and parses the Fragment URL of the following form
-	 * to return the tagset name:
-	 * 
-	 * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
-	 * 
-	 * @param eObject
-	 *            The annotated object
-	 * @return the value of <tagset>in the URL example
-	 */
-	private String getTagsetFromFragment(EObject eObject) {
-
-		String generatedComment = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
-		if (generatedComment == null || generatedComment.length() == 0)
-			return null;
-		int poundit = generatedComment.indexOf('#');
-		int slash = generatedComment.indexOf('/');
-		if (poundit < 0 || slash < 0 || poundit >= slash)
-			return null;
-		return generatedComment.substring(poundit + 1, slash);
-
-	}
-	
-	/**
-	 * Detect the primary tagset used to create an eObject using the providers.
-	 * 
-	 * @since 1.0.2
-	 * @param eObject - An {@link EObject} that may be annotated.
-	 * @return a String array of the used tagset names.
-	 */
-	private String getTagsetFromProviders(EObject eObject) {
-		String tagset = null;
-		List annotationProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
-		int size = annotationProviders.size();
-		for (int i=0; i < size && tagset == null; i++) {
-			IAnnotationsProvider provider = (IAnnotationsProvider) annotationProviders.get(i);
-			tagset = provider != null ? provider.getPrimaryTagset(eObject) : null;
-		}
-		return tagset;
-	}
-
-	/**
-	 * Returns the CompilationUnit associated with the given model object
-	 * 
-	 * @param eObject
-	 *            an Annotated model Object
-	 * @return The compilation unit which was responsible for the generation of the model object
-	 */
-	public ICompilationUnit getAnnotatedCU(EObject eObject) {
-		ICompilationUnit cu = getAnnotatedCUFromProvider(eObject);
-		if (cu == null) {
-			cu = getAnnotatedCUFromFragment(eObject);
-		}
-		return cu;
-	}
-	
-	/**
-	 * Returns the CompilationUnit associated with the given model object
-	 * 
-	 * @param eObject
-	 *            an Annotated model Object
-	 * @return The compilation unit which was responsible for the generation of the model object
-	 */
-	private ICompilationUnit getAnnotatedCUFromFragment(EObject eObject) {
-		String fragmentString = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
-		if (fragmentString == null)
-			return null;
-
-		String typeString = fragmentString;
-		if (fragmentString.indexOf('#')>0)
-			typeString = fragmentString.substring(0, fragmentString.indexOf('#'));
-		IType itype;
-
-		if (typeString != null && (itype = findType(typeString, eObject)) != null) {
-			return itype.getCompilationUnit();
-		}
-		return null;
-	}
-	
-	/**
-	 * Need to delegate the retrieval of the annotated {@link ICompilationUnit} for
-	 * the passed eObject.  There could be multiple but in this case the first will be returned.
-	 * 
-	 * <p>
-	 * This API would need to be revisited in the future if there is a requirement to show
-	 * all {@link ICompilationUnit} elements that contribute to the eObject via annotations.
-	 * </p>
-	 * 
-	 * @param eObject - an instance of an {@link EObject} that may be annotated.
-	 * @since 1.0.2
-	 */
-	private ICompilationUnit getAnnotatedCUFromProvider(EObject eObject) {
-		ICompilationUnit primaryCU = null;
-		List annotationProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
-		int size = annotationProviders.size();
-		for (int i=0; i < size && primaryCU == null; i++) {
-			IAnnotationsProvider provider = (IAnnotationsProvider) annotationProviders.get(i);
-			primaryCU = provider != null ? provider.getPrimaryAnnotatedCompilationUnit(eObject) : null;
-		}
-		return primaryCU;
-	}
-
-	protected IType findType(String type, EObject eObject) {
-		IType result = null;
-		IProject project = ProjectUtilities.getProject(eObject);
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-		if (javaProject != null)
-			try {
-				result = javaProject.findType(type);
-			} catch (JavaModelException e) {
-				Logger.getLogger().logError(e);
-			}
-		return result;
-	}
-
-	/**
-	 * Return true if <code>project</code> has annotation support enabled on it.
-	 * 
-	 * @return
-	 */
-	public boolean hasAnnotationSupport(IProject project) {
-		return AnnotationsControllerManager.INSTANCE.hasAnnotationsBuilder(project);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
deleted file mode 100644
index 59a6f3d05..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
+++ /dev/null
@@ -1,220 +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 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationsControllerResources;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener;
-import org.eclipse.wst.common.frameworks.internal.enablement.Identifiable;
-import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-
-
-/**
- * AnnotationsControllerRegistry for reading annotations controller extensions
- */
-public class AnnotationsControllerManager extends RegistryReader implements IEnablementIdentifierListener {
-
-	public static final AnnotationsControllerManager INSTANCE = new AnnotationsControllerManager();
-	
-	static {
-		INSTANCE.readRegistry();
-	}
-
-	private SortedSet descriptors;
-
-	private Map annotationsControllers;
-
-	public static class Descriptor implements Identifiable {
-
-		public static final String ANNOTATIONS_CONTROLLER = "annotationsController"; //$NON-NLS-1$
-
-		public static final String ATT_ID = "id"; //$NON-NLS-1$
-
-		public static final String CLASS = "class"; //$NON-NLS-1$
-		
-		public static final String BUILDER_ID = "builderID"; //$NON-NLS-1$
-
-		private final IConfigurationElement configElement;
-		private final String ID;
-		private String builderID;
-		private final int loadOrder;
-		private static int loadOrderCounter = 0;
-
-		public Descriptor(IConfigurationElement aConfigElement) {
-			super();
-			Assert.isLegal(ANNOTATIONS_CONTROLLER.equals(aConfigElement.getName()), AnnotationsControllerResources.AnnotationsControllerManager_ERROR_0);
-			configElement = aConfigElement;
-			ID = configElement.getAttribute(ATT_ID);
-			builderID = configElement.getAttribute(BUILDER_ID);
-			loadOrder = loadOrderCounter++;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getID()
-		 */
-		public String getID() {
-			return ID;
-		}
-		
-		public String getBuilderID() {
-			return builderID;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getLoadOrder()
-		 */
-		public int getLoadOrder() {
-			return loadOrder;
-		}
-
-		public AnnotationsController createInstance() {
-			AnnotationsController instance = null;
-			try {
-				instance = (AnnotationsController) configElement.createExecutableExtension(CLASS);
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-			return instance;
-		}
-	}
-
-	/**
-	 * Default constructor
-	 */
-	public AnnotationsControllerManager() {
-		super("org.eclipse.jst.common.annotations.controller", "annotationsController"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * read extension element
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(Descriptor.ANNOTATIONS_CONTROLLER))
-			return false;
-		addAnnotationController(new Descriptor(element));
-		return true;
-	}
-
-	/**
-	 * @param descriptor
-	 */
-	protected void addAnnotationController(Descriptor descriptor) {
-		EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), null).addIdentifierListener(this);
-		getDescriptors().add(descriptor);
-	}
-
-	/**
-	 * @return Returns the annotationControllers.
-	 */
-	protected SortedSet getDescriptors() {
-		if (descriptors == null)
-			descriptors = new TreeSet(IdentifiableComparator.getInstance());
-		return descriptors;
-	}
-
-	public Descriptor getDescriptor(IProject project) {
-		for (Iterator iter = getDescriptors().iterator(); iter.hasNext();) {
-			Descriptor descriptor = (Descriptor) iter.next();
-			IEnablementIdentifier identifier = EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), project);
-			if (identifier.isEnabled())
-				return descriptor;
-		}
-		return null;
-	}
-
-	/**
-	 * Determine if any annotations are supported
-	 */
-	public boolean isAnyAnnotationsSupported() {
-		return getDescriptors().size() > 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener#identifierChanged(org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent)
-	 */
-	public void identifierChanged(EnablementIdentifierEvent identifierEvent) {
-		IProject project = ((EnablementIdentifier) identifierEvent.getIdentifier()).getProject();
-		getAnnotationsControllers().remove(project);
-	}
-
-	/**
-	 * Return the annotations controller for the specified project
-	 */
-	public AnnotationsController getAnnotationsController(IProject project) {
-		AnnotationsController controller = (AnnotationsController) getAnnotationsControllers().get(project);
-		if (controller == null) {
-			if (!hasAnnotationsBuilder(project))
-				return null;
-			Descriptor descriptor = getDescriptor(project);
-			if (descriptor != null)
-				getAnnotationsControllers().put(project, (controller = descriptor.createInstance()));
-		}
-
-		return controller;
-	}
-
-	/**
-	 * @return Returns the annotationControllers.
-	 */
-	public Map getAnnotationsControllers() {
-		if (annotationsControllers == null)
-			annotationsControllers = new WeakHashMap();
-		return annotationsControllers;
-	}
-	
-	public boolean hasAnnotationsBuilder(IProject project) {
-		Descriptor annotationsDescriptor = getDescriptor(project);
-		if (annotationsDescriptor==null)
-			return false;
-		return hasBuilder(project, annotationsDescriptor.getBuilderID());
-	}
-
-	public boolean hasBuilder(IProject project, String builderName) {
-		try {
-			ICommand[] builders = project.getDescription().getBuildSpec();
-			for (int i = 0; i < builders.length; i++) {
-				ICommand builder = builders[i];
-				if (builder != null) {
-					if (builder.getBuilderName().equals(builderName))
-						return true;
-				}
-			}
-		} catch (Exception e) {
-			// Do nothing
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
deleted file mode 100644
index 122209c56..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.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.common.internal.annotations.registry;
-
-/**
- * This method will be called by the AnnotationTagRegistry
- * when it is time to register the tags for a given
- * TagSet.  An AnnotationTagDynamicInitializer defined
- * using the annotationTagDynamicInitializer.
- * 
- * @see com.ibm.wtp.annotations.registry.AnnotationTagRegistry
- */
-public interface AnnotationTagDynamicInitializer {
-	void registerTags();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
deleted file mode 100644
index 249d7d6d3..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
+++ /dev/null
@@ -1,512 +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 Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * @author kelleyp
- * 
- * Singleton that parses the annotation tag information from the annotation-taghandler extension
- * point, and provides an interface for accessing it for other classes. Largely taken from the
- * AnnotationProcessor builder.
- */
-
-public class AnnotationTagRegistry {
-
-	/**
-	 * Set to true once we've read in the annotation tag information from the plugin registry.
-	 */
-	private static boolean initialized = false;
-	private static final String ANNOTATION_TAG_INFO = "org.eclipse.jst.common.annotations.controller.AnnotationTagInfo"; //$NON-NLS-1$
-
-	/**
-	 * List of tag specs for all of the tags.
-	 */
-	private static ArrayList allTagSpecs = new ArrayList() {
-		final private static long serialVersionUID = 8683452581122892190L;
-
-		private void scopeAll(Collection c, boolean forAdd) {
-			Iterator iter = c.iterator();
-			while (iter.hasNext()) {
-				TagSpec ts = (TagSpec) iter.next();
-				if (forAdd)
-					addScope(ts);
-				else
-					removeScope(ts);
-			}
-		}
-
-		private void addScope(TagSpec ts) {
-			if (ts == null)
-				return;
-			switch (ts.getScope()) {
-				case TagSpec.FIELD :
-					fieldTags.put(ts.getTagName(), ts);
-					break;
-				case TagSpec.METHOD :
-					methodTags.put(ts.getTagName(), ts);
-					break;
-				case TagSpec.TYPE :
-					typeTags.put(ts.getTagName(), ts);
-					break;
-			}
-		}
-
-		private void removeScope(TagSpec ts) {
-			if (ts == null)
-				return;
-			switch (ts.getScope()) {
-				case TagSpec.FIELD :
-					fieldTags.remove(ts.getTagName());
-					break;
-				case TagSpec.METHOD :
-					methodTags.remove(ts.getTagName());
-					break;
-				case TagSpec.TYPE :
-					typeTags.remove(ts.getTagName());
-					break;
-			}
-		}
-
-		public void add(int index, Object element) {
-			super.add(index, element);
-			addScope((TagSpec)element);
-		}
-
-		public boolean add(Object o) {
-			TagSpec newTagSpec = (TagSpec)o;
-			// search for already existing tag spec with same name and same tag set name
-			for (int i=0; i<this.size(); i++) {
-				TagSpec tagSpec = (TagSpec) get(i);
-				if (tagSpec.getTagName().equals(newTagSpec.getTagName()) && tagSpec.getScope() == newTagSpec.getScope()) {
-					remove(tagSpec);
-					removeScope(tagSpec);
-				}	
-			}
-			// add the new tag spec
-			addScope(newTagSpec);
-			return super.add(newTagSpec);
-		}
-
-		public boolean addAll(Collection c) {
-			scopeAll(c, true);
-			return super.addAll(c);
-		}
-
-		public boolean addAll(int index, Collection c) {
-			scopeAll(c, true);
-			return super.addAll(index, c);
-		}
-
-		public Object remove(int index) {
-			Object result = super.remove(index);
-			removeScope((TagSpec) result);
-			return result;
-		}
-
-		public boolean remove(Object o) {
-			removeScope((TagSpec) o);
-			return super.remove(o);
-		}
-
-		public boolean removeAll(Collection c) {
-			scopeAll(c, false);
-			return super.removeAll(c);
-		}
-
-		public boolean retainAll(Collection c) {
-			Iterator iter = this.iterator();
-			while (iter.hasNext()) {
-				TagSpec ts = (TagSpec) iter.next();
-				if (!c.contains(ts))
-					removeScope(ts);
-			}
-			return super.retainAll(c);
-		}
-	};
-
-	/**
-	 * Map from a tag name to a InitTagInfo. Only live during up to the end of the init() method.
-	 */
-	private static Hashtable tagAttribs = new Hashtable();
-
-	/**
-	 * Division of tag names between allowed scopes.
-	 */
-	private static Map methodTags = new HashMap();
-
-	private static Map typeTags = new HashMap();
-
-	private static Map fieldTags = new HashMap();
-	
-	private static final String CLASS_PROP = "class"; //$NON-NLS-1$
-	private static final String DYNAMIC_INITIALIZER_EX_PT = "annotationTagDynamicInitializer"; //$NON-NLS-1$
-	private static final String ANNOTATIONS_CONTROLLER_NAMESPACE = "org.eclipse.jst.common.annotations.controller"; //$NON-NLS-1$
-
-	/**
-	 * Helper for init, parse the tag attributes for a AnnotationTagInfo tag.
-	 * 
-	 * @param elems
-	 *            Array of "attrib" configuration elements.
-	 * @param tagName
-	 *            Lowercased name of the tag these attributes are associated with.
-	 */
-	private static InitTagInfo parseTagAttribs(IConfigurationElement[] elems, String tagName, String scope) {
-		int i;
-		ArrayList attribList = new ArrayList();
-
-		InitTagInfo tagInf = new InitTagInfo(tagName, scope, attribList);
-
-		for (i = 0; i < elems.length; i++) {
-			IConfigurationElement elem = elems[i];
-
-			if (elem.getName().equalsIgnoreCase("attrib")) { //$NON-NLS-1$
-				TagAttribSpec tas = new TagAttribSpec(elem.getAttribute("name"), elem.getAttribute("description")); //$NON-NLS-1$ //$NON-NLS-2$
-				String use = elem.getAttribute("use"); //$NON-NLS-1$
-
-				tas.setType(elem.getAttribute("type")); //$NON-NLS-1$
-
-				// add valid values
-				if ("enum".equals(elem.getAttribute("type"))) { //$NON-NLS-1$ //$NON-NLS-2$
-					IConfigurationElement[] validValues = elem.getChildren("enumValues"); //$NON-NLS-1$
-					List valuesList = new ArrayList();
-					for (int j = 0; j < validValues.length; j++) {
-						String value = validValues[j].getAttribute("value"); //$NON-NLS-1$
-						valuesList.add(value);
-					}
-					String[] validValuesArray = new String[valuesList.size()];
-					validValuesArray = (String[]) valuesList.toArray(validValuesArray);
-
-					tas.setValidValues(validValuesArray);
-				}
-
-				if (use == null) {
-					tas.clearRequired();
-				} else if (use.equalsIgnoreCase("required")) { //$NON-NLS-1$
-					tas.setRequired();
-				} else if (use.equalsIgnoreCase("optional")) { //$NON-NLS-1$
-					tas.clearRequired();
-				} else {
-					// Unlikely, unless annotation extension spec changes
-					// without changes here.
-					System.err.println(AnnotationsControllerResources.AnnotationTagRegistry_9 + use);
-					return null;
-				}
-
-				IConfigurationElement[] elemUniqueArray = elem.getChildren("unique"); //$NON-NLS-1$
-				if (elemUniqueArray.length > 0) {
-					tas.setUnique();
-					if (elemUniqueArray[0].getAttribute("scope") != null) //$NON-NLS-1$
-						tas.getUnique().setScope(TagAttribSpec.uniqueScopeFromString(elemUniqueArray[0].getAttribute("scope"))); //$NON-NLS-1$
-					if (elemUniqueArray.length > 1) {
-						Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_2 + elemUniqueArray.length);
-					}
-				} else {
-					tas.clearUnique();
-				}
-
-				attribList.add(tas);
-			}
-		}
-		return tagInf;
-	}
-
-	/**
-	 * Return the tag set name from a full tag name.
-	 * 
-	 * @param name
-	 *            Full tag name (without the '@' at the beginning)
-	 * @return
-	 */
-	public static String tagSetFromTagName(String name) {
-		if (name == null)
-			return null;
-		int idx = name.lastIndexOf('.');
-
-		if (idx != -1)
-			return name.substring(0, idx);
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the short name from a full tag name.
-	 * 
-	 * @param name
-	 *            Full tag name (without the '@' at the beginning)
-	 * @return
-	 */
-	public static String tagFromTagName(String name) {
-		if (name == null)
-			return null;
-		int idx = name.indexOf('.');
-
-		if (idx != -1) {
-			return name.substring(idx + 1);
-		}
-		// Default to the whole name being the tagset.
-		return name;
-	}
-
-	/**
-	 * Reads in all of the tag attribute information from all annotation-tag-info extensions defined
-	 * in the system, and initializes the tagAttribs hashtable with them.
-	 * 
-	 * @param registry
-	 */
-	private static void readAllAttributeInfo(IExtensionPoint xp) {
-
-		if (xp == null) {
-			return;
-		}
-
-		IExtension[] exts = xp.getExtensions();
-		Bundle bundle = null;
-		for (int i = 0; i < exts.length; i++) {
-			IConfigurationElement[] elems = exts[i].getConfigurationElements();
-			bundle = Platform.getBundle(exts[i].getNamespace());
-			String identifier = exts[i].getUniqueIdentifier();
-
-			IConfigurationElement elem = null;
-			String tagName = null;
-			String scope = null;
-			String tagSet = null;
-			String fullTagName = null;
-			for (int j = 0; j < elems.length; j++) {
-				elem = elems[j];
-				if (!elem.getName().equalsIgnoreCase("AnnotationTagInfo")) { //$NON-NLS-1$
-					continue;
-				}
-				tagSet = elem.getAttribute("tagSet"); //$NON-NLS-1$
-				tagName = elem.getAttribute("tagName"); //$NON-NLS-1$
-				scope = elem.getAttribute("scope"); //$NON-NLS-1$
-				if (isNullOrEmpty(tagSet) || isNullOrEmpty(tagName) || isNullOrEmpty(scope)) {
-					Logger.getLogger().log(NLS.bind(AnnotationsControllerResources.AnnotationTagRegistry_10, new Object[]{identifier}));
-					continue;
-				}
-				fullTagName = tagSet + "." + tagName; //$NON-NLS-1$
-
-				InitTagInfo tagInf = parseTagAttribs(elem.getChildren(), fullTagName.toLowerCase(), scope);
-				String key = (fullTagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
-				/*
-				 * There should only ever be one AnnotationTagInfo tag for any one annotation tag.
-				 */
-				if (tagAttribs.containsKey(key)) {
-					Logger.getLogger().log(AnnotationsControllerResources.AnnotationTagRegistry_0 + tagName + "'."); //$NON-NLS-1$
-				} else {
-					tagInf.bundle = bundle;
-					tagAttribs.put(key, tagInf);
-				}
-			}
-		}
-	}
-
-	private static boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.length() == 0;
-	}
-
-	/**
-	 * Reads tagSpec information in from the plugin registry. Taken from AnnotationProcessor.
-	 * 
-	 * @return True if initialization completed successfully.
-	 * @throws CoreException
-	 *             If there were problems reading the registry.
-	 */
-	private static/* synchronized */boolean init() throws CoreException {
-
-		 /* Prevent multiple initialization */
-       if (initialized) {
-           return true;
-       }
-      initializeStaticTagDefinitions();
-      initiaizeDynamicTagDefinitions();
-       initialized = true;
-
-       /* Don't need this anymore */
-       tagAttribs = null;
-
-       return true;
-   }
-	
-	private static void initializeStaticTagDefinitions() throws CoreException {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-
-		// TODO: Not even checking the tagset extension point yet.
-		IExtensionPoint xp = registry.getExtensionPoint(ANNOTATION_TAG_INFO);
-
-        if (xp == null)
-            return;
-
-        IExtension[] x = xp.getExtensions();
-
-        /* Get all tag attribute information */
-        readAllAttributeInfo(xp);
-		for (int j = 0; j < x.length; j++) {
-			IConfigurationElement[] tagSpecs = x[j].getConfigurationElements();
-			for (int i = 0; i < tagSpecs.length; i++) {
-				IConfigurationElement tagSpec = tagSpecs[i];
-				String tagName = tagSpec.getAttribute("tagSet") + "." + tagSpec.getAttribute("tagName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				String scope = tagSpec.getAttribute("scope"); //$NON-NLS-1$
-				String multiplicity = tagSpec.getAttribute("multiplicity"); //$NON-NLS-1$
-				TagSpec ts = null;
-				if (multiplicity != null)
-					ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.multiplicityFromString(multiplicity));
-				else
-					ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.Multiplicity.ONE);
-				String key = (tagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
-				InitTagInfo tagInf = (InitTagInfo) tagAttribs.get(key);
-
-				allTagSpecs.add(ts);
-
-				if (tagInf != null) {
-					ts.setAttributes(tagInf.attributes);
-					ts.setBundle(tagInf.bundle);
-				}
-			}
-		}
-    }
-
-	private static void initiaizeDynamicTagDefinitions() {
-		IExtensionPoint xp = Platform.getExtensionRegistry().getExtensionPoint(ANNOTATIONS_CONTROLLER_NAMESPACE, DYNAMIC_INITIALIZER_EX_PT);
-		if (xp == null)
-			return;
-		IExtension[] extensions = xp.getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IExtension extension = extensions[i];
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-			for (int j = 0; j < elements.length; j++) {
-				try {
-					AnnotationTagDynamicInitializer initializer = (AnnotationTagDynamicInitializer) elements[j].createExecutableExtension(CLASS_PROP);
-					initializer.registerTags();
-				} catch (CoreException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 
-	 * @return List of AnnotationTagRegistry.TagSpecs for all tags.
-	 * @throws CoreException
-	 *             If there were problems reading the initialization data from the plugin registry.
-	 */
-	public static synchronized List getAllTagSpecs() {
-		return allTagSpecs;
-	}
-
-	public static synchronized boolean isMethodTag(String tagName) {
-		return methodTags.containsKey(tagName);
-	}
-
-	public static synchronized boolean isFieldTag(String tagName) {
-		return fieldTags.containsKey(tagName);
-	}
-
-	public static synchronized boolean isTypeTag(String tagName) {
-		return typeTags.containsKey(tagName);
-	}
-
-	/**
-	 * Answers the tagspec for the specified method tag name.
-	 * 
-	 * @param tagName
-	 *            Full name for a tag.
-	 * @return a TagSpec for the tag name, or null if no tag with that name is registered.
-	 */
-	public static synchronized TagSpec getMethodTag(String tagName) {
-		return (TagSpec) methodTags.get(tagName);
-	}
-
-	/**
-	 * Answers the tagspec for the specified field tag name.
-	 * 
-	 * @param tagName
-	 *            Full name for a tag.
-	 * @return a TagSpec for the tag name, or null if no tag with that name is registered.
-	 */
-	public static synchronized TagSpec getFieldTag(String tagName) {
-		return (TagSpec) fieldTags.get(tagName);
-	}
-
-	/**
-	 * Answers the tagspec for the specified type tag name.
-	 * 
-	 * @param tagName
-	 *            Full name for a tag.
-	 * @return a TagSpec for the tag name, or null if no tag with that name is registered.
-	 */
-	public static synchronized TagSpec getTypeTag(String tagName) {
-		return (TagSpec) typeTags.get(tagName);
-	}
-
-	private static class InitTagInfo {
-		private String name;
-
-		private List attributes;
-
-		private Bundle bundle;
-
-		private String scope;
-
-		public InitTagInfo(String name, String scope, List att) {
-			attributes = att;
-			this.name = name;
-			this.scope = scope;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			else if (!(obj instanceof InitTagInfo))
-				return false;
-
-			return name.equals(((InitTagInfo) obj).name) || (scope.equals(((InitTagInfo) obj).name));
-
-		}
-	}
-
-	static {
-		try {
-			AnnotationTagRegistry.init();
-		} catch (CoreException e) {
-			Logger.getLogger().logError(AnnotationsControllerResources.AnnotationTagRegistry_ERROR_1);
-			Logger.getLogger().logError(e);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
deleted file mode 100644
index d86e11748..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
+++ /dev/null
@@ -1,105 +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 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-
-/**
- * @author mdelder
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagsetRegistry extends RegistryReader {
-
-	public static final AnnotationTagsetRegistry INSTANCE = new AnnotationTagsetRegistry();
-
-	private Map index;
-
-	protected AnnotationTagsetRegistry() {
-		super("org.eclipse.wst.common.internal.annotations.controller", TagsetDescriptor.TAGSET); //$NON-NLS-1$
-		readRegistry();
-	}
-
-	private List descriptors;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (TagsetDescriptor.TAGSET.equals(element.getName())) {
-			getDescriptors().add(new TagsetDescriptor(element));
-			return true;
-		}
-		return false;
-	}
-
-	public TagsetDescriptor getDescriptor(String name) {
-		if (name != null && name.length() > 0) {
-
-			/* Index descriptors to avoid unnecessary searching */
-			TagsetDescriptor descriptor = (TagsetDescriptor) getIndex().get(name);
-			if (descriptor != null)
-				return descriptor;
-
-			for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
-				descriptor = (TagsetDescriptor) itr.next();
-				if (name.equals(descriptor.getName())) {
-					getIndex().put(descriptor.getName(), descriptor);
-					return descriptor;
-
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @return Returns the descriptors.
-	 */
-	protected List getDescriptors() {
-		if (descriptors == null)
-			descriptors = new ArrayList();
-		return descriptors;
-	}
-
-	/**
-	 * @return Returns the index.
-	 */
-	protected Map getIndex() {
-		if (index == null)
-			index = new HashMap();
-		return index;
-	}
-
-	/**
-	 * @param descriptor
-	 */
-	public void registerTagset(TagsetDescriptor descriptor) {
-		if (descriptor != null && getDescriptor(descriptor.getName()) == null)
-			getDescriptors().add(descriptor);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
deleted file mode 100644
index a143c59a2..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
+++ /dev/null
@@ -1,47 +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 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.osgi.util.NLS;
-
-public class AnnotationsControllerResources extends NLS {
-	private static final String BUNDLE_NAME = "annotationcontroller";//$NON-NLS-1$
-
-	private AnnotationsControllerResources() {
-		// Do not instantiate
-	}
-
-	public static String TagSpec_3;
-	public static String TagSpec_4;
-	public static String TagSpec_5;
-	public static String TagSpec_6;
-	public static String TagAttribSpec_1;
-	public static String TagAttribSpec_2;
-	public static String AnnotationTagParser_0;
-	public static String AnnotationTagParser_1;
-	public static String AnnotationTagRegistry_0;
-	public static String AnnotationTagRegistry_9;
-	public static String AnnotationTagRegistry_10;
-	public static String AnnotationTagRegistry_11;
-	public static String AnnotationsControllerManager_ERROR_0;
-	public static String AnnotationTagRegistry_ERROR_1;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AnnotationsControllerResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
deleted file mode 100644
index be5670b60..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
+++ /dev/null
@@ -1,79 +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.common.internal.annotations.registry;
-
-/**
- * @author DABERG
- *  
- */
-public class AttributeValueProposalHelper {
-	private String replacementString;
-	private int valueOffset = 0;
-	private int replacementLength = 0;
-	private String valueDisplayString;
-	private boolean ensureBeginQuote = true;
-	private boolean ensureEndQuote = true;
-
-	public AttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
-		this.replacementString = replacementString;
-		this.valueOffset = valueOffset;
-		this.replacementLength = replacementLength;
-		this.valueDisplayString = valueDisplayString;
-	}
-
-	public int getReplacementLength() {
-		return replacementLength;
-	}
-
-	public void setReplacementLength(int replacementLength) {
-		this.replacementLength = replacementLength;
-	}
-
-	public String getReplacementString() {
-		return replacementString;
-	}
-
-	public void setReplacementString(String replacementString) {
-		this.replacementString = replacementString;
-	}
-
-	public String getValueDisplayString() {
-		return valueDisplayString;
-	}
-
-	public void setValueDisplayString(String valueDisplayString) {
-		this.valueDisplayString = valueDisplayString;
-	}
-
-	public int getValueOffset() {
-		return valueOffset;
-	}
-
-	public void setValueOffset(int valueOffset) {
-		this.valueOffset = valueOffset;
-	}
-
-	public boolean ensureBeginQuote() {
-		return ensureBeginQuote;
-	}
-
-	public void setEnsureBeginQuote(boolean ensureBeginQuote) {
-		this.ensureBeginQuote = ensureBeginQuote;
-	}
-
-	public boolean ensureEndQuote() {
-		return ensureEndQuote;
-	}
-
-	public void setEnsureEndQuote(boolean ensureEndQuote) {
-		this.ensureEndQuote = ensureEndQuote;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
deleted file mode 100644
index 76c0a8f65..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
+++ /dev/null
@@ -1,48 +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 Jul 1, 2004
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * @author jlanuti
- */
-public interface AttributeValuesHelper {
-	static final String[] EMPTY_VALUES = new String[0];
-	static final AttributeValueProposalHelper[] EMPTY_PROPOSAL_HELPERS = new AttributeValueProposalHelper[0];
-
-	/**
-	 * Return a simple String array containing the valid values for the given
-	 * {@link TagAttributeSpec}and {@link IJavaElement}.
-	 * 
-	 * @param tas
-	 * @param javaElement
-	 * @return
-	 */
-	public String[] getValidValues(TagAttribSpec tas, IJavaElement javaElement);
-
-	/**
-	 * This is a more advanced api for returning valid values for a given {@link TagAttribSpec}.
-	 * This api provides you with more flexibility to control the replacement string that is used
-	 * for the completion.
-	 * 
-	 * @param tas
-	 * @param partialValue
-	 * @param valueOffset
-	 * @param javaElement
-	 * @return
-	 */
-	public AttributeValueProposalHelper[] getAttributeValueProposalHelpers(TagAttribSpec tas, String partialValue, int valueOffset, IJavaElement javaElement);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
deleted file mode 100644
index 37dad5f5b..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
+++ /dev/null
@@ -1,350 +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 Aug 25, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsCoreResources;
-
-/**
- * @author kelleyp Information on a single parameter for a tag. Parameters have names, and can be
- *         marked as being required. (ie, not optional)
- */
-public class TagAttribSpec {
-	private String attribName;
-	private int flags;
-	private String helpKey;
-	private int type = Type.TEXT;
-	private static final int FLG_REQUIRED = 1;
-	private String[] validValues;
-	private TagSpec tagSpec;
-
-	/* Enum for type */
-	public interface Type {
-		public static final int TEXT = 0;
-		public static final int BOOLEAN = 1;
-		public static final int JAVATYPE = 2;
-		public static final int ENUM = 3;
-	}
-
-	public class Unique {
-		public static final int MODULE = 0;
-		public static final int FILE = 1;
-		public static final int TYPE = 2;
-		public static final int METHOD = 3;
-		public static final int FIELD = 4;
-
-		private int scope = MODULE;
-
-		public int getScope() {
-			return scope;
-		}
-
-		public void setScope(int in) {
-			scope = in;
-		}
-	}
-
-	private Unique unique;
-
-	public Unique getUnique() {
-		return unique;
-	}
-
-	public boolean isUnique() {
-		return unique != null;
-	}
-
-	public void setUnique() {
-		unique = new Unique();
-	}
-
-	public void clearUnique() {
-		unique = null;
-	}
-
-	/**
-	 * Converts a string representation of a tag attribute type to the integer representation.
-	 * 
-	 * @param name
-	 * @return Integer type, defaults to TEXT if the type name is not recognized.
-	 */
-	public static int typeNameToType(String name) {
-		//TODO add enum
-		if (name != null) {
-			if (name.equalsIgnoreCase("text") || name.equalsIgnoreCase("string")) { //$NON-NLS-1$ //$NON-NLS-2$
-				return Type.TEXT;
-			} else if (name.equalsIgnoreCase("boolean") || name.equalsIgnoreCase("bool")) { //$NON-NLS-1$ //$NON-NLS-2$
-				return Type.BOOLEAN;
-			} else if (name.equalsIgnoreCase("javaType")) { //$NON-NLS-1$
-				return Type.JAVATYPE;
-			}
-		}
-		return Type.TEXT;
-	}
-
-	/**
-	 * Converts a type enum to a type string.
-	 * 
-	 * @param ty
-	 * @return
-	 */
-	public static String typeToTypeName(int ty) {
-		switch (ty) {
-			case Type.TEXT :
-				return "string"; //$NON-NLS-1$
-			case Type.BOOLEAN :
-				return "bool"; //$NON-NLS-1$
-			case Type.JAVATYPE :
-				return "javaType"; //$NON-NLS-1$
-			default :
-				return "string"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Constructs a TagAttribSpec with <code>name</code> as the attribute name.
-	 * 
-	 * @param name
-	 *            Name for the attribute. Must not be null.
-	 * @throws IllegalArgumentException
-	 *             if name is null.
-	 */
-	public TagAttribSpec(String name) throws IllegalArgumentException {
-		this(name, null);
-	}
-
-	public TagAttribSpec(String name, String hlpKey) {
-		setAttribName(name);
-		setHelpKey(hlpKey);
-	}
-
-	/**
-	 * Sets the type of this attribute.
-	 * 
-	 * @param t
-	 *            TEXT | BOOLEAN
-	 */
-	public void setType(int t) {
-		type = t;
-	}
-
-	/**
-	 * Sets the type of this attribute.
-	 * 
-	 * @param typename
-	 *            String representation, should be text or boolean.
-	 */
-	public void setType(String typename) {
-		type = typeNameToType(typename);
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public boolean valueIsJavaType() {
-		return type == Type.JAVATYPE;
-	}
-
-	public boolean valueIsText() {
-		return type == Type.TEXT;
-	}
-
-	public boolean valueIsBool() {
-		return type == Type.BOOLEAN;
-	}
-
-	/**
-	 * @return Name of the attribute.
-	 */
-	public String getAttribName() {
-		return attribName;
-	}
-
-	/**
-	 * Sets the attribute name. This can not be null.
-	 * 
-	 * @param name
-	 *            New name for the attribute.
-	 * @throws IllegalArgumentException
-	 *             if the name is null.
-	 */
-	public void setAttribName(String name) throws IllegalArgumentException {
-		if (name == null) {
-			throw new IllegalArgumentException(AnnotationsCoreResources.TagAttribSpec_6); 
-		}
-		attribName = name;
-	}
-
-	/**
-	 * 
-	 * @return true if this is a required attribute.
-	 */
-	public boolean isRequired() {
-		return (flags & FLG_REQUIRED) != 0;
-	}
-
-	/**
-	 * Sets the required flag for this attribute.
-	 */
-	public void setRequired() {
-		flags |= FLG_REQUIRED;
-	}
-
-	/**
-	 * Clears the required flag for this attribute.
-	 *  
-	 */
-	public void clearRequired() {
-		flags &= (~FLG_REQUIRED);
-	}
-
-	/**
-	 * 
-	 * @return The help key for this tag attribute. Should never return null.
-	 */
-	public String getTextKey(int aType) {
-		if (aType != TagSpec.HELP_TEXT) {
-			return null;
-		}
-
-		if (helpKey == null) {
-			helpKey = defaultHelpKey();
-		}
-		return helpKey;
-	}
-
-	/**
-	 * Formats the help text so it includes type and use information.
-	 */
-	public String transformLocalizedText(String txt) {
-		if (txt == null)
-			return txt;
-		StringBuffer buf = new StringBuffer(txt.length() + 50);
-
-		buf.append("<b>Type: "); //$NON-NLS-1$
-		buf.append(typeToTypeName(type));
-		buf.append(", Use: "); //$NON-NLS-1$
-		if (this.isRequired()) {
-			buf.append("required"); //$NON-NLS-1$
-		} else {
-			buf.append("optional"); //$NON-NLS-1$
-		}
-		if (this.isUnique()) {
-			buf.append(", unique:scope: "); //$NON-NLS-1$
-			buf.append(TagAttribSpec.uniqueScopeToString(this.getUnique().getScope()));
-		}
-		buf.append("</b><p>"); //$NON-NLS-1$
-		buf.append(txt);
-		buf.append("</p>"); //$NON-NLS-1$
-		return buf.toString();
-
-	}
-
-	/**
-	 * 
-	 * @return The help key for this tag attribute. Should never return null.
-	 */
-	public String getHelpKey() {
-		return getTextKey(TagSpec.HELP_TEXT);
-	}
-
-	/**
-	 * Sets the help key. Setting this to null resets the help key to the default help key.
-	 * 
-	 * @param key
-	 */
-	public void setHelpKey(String key) {
-		helpKey = key;
-	}
-
-	/**
-	 * @return the default help key name for this tag.
-	 *  
-	 */
-	private String defaultHelpKey() {
-		return "ath." + attribName; //$NON-NLS-1$
-	}
-
-	public static int uniqueScopeFromString(String scopeStr) {
-		if (scopeStr != null) {
-			if (scopeStr.equalsIgnoreCase("module"))return TagAttribSpec.Unique.MODULE; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("file"))return TagAttribSpec.Unique.FILE; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("type"))return TagAttribSpec.Unique.TYPE; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("method"))return TagAttribSpec.Unique.METHOD; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("field"))return TagAttribSpec.Unique.FIELD; //$NON-NLS-1$
-		}
-		Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_1 + scopeStr);
-		return TagAttribSpec.Unique.MODULE;
-	}
-
-	public static String uniqueScopeToString(int scope) {
-		switch (scope) {
-			case TagAttribSpec.Unique.MODULE :
-				return "module"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.FILE :
-				return "file"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.TYPE :
-				return "type"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.METHOD :
-				return "method"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.FIELD :
-				return "field"; //$NON-NLS-1$
-			default :
-				Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_1 + scope);
-				return "unknown value"; //$NON-NLS-1$
-
-		}
-	}
-
-	/**
-	 * @return Returns the validValues.
-	 */
-	public String[] getValidValues() {
-		return validValues;
-	}
-
-	/**
-	 * @param validValues
-	 *            The validValues to set.
-	 */
-	public void setValidValues(String[] validValues) {
-		this.validValues = validValues;
-	}
-
-	public TagSpec getTagSpec() {
-		return tagSpec;
-	}
-
-	void setTagSpec(TagSpec tagSpec) {
-		this.tagSpec = tagSpec;
-	}
-
-	public String lookupTagHelp() throws MissingResourceException {
-		ResourceBundle b = getTagSpec().getResourceBundle();
-		if (b == null)
-			return null;
-		String key = getHelpKey();
-		String val = b.getString(getHelpKey());
-		if (val == key)
-			val = null;
-		return transformLocalizedText(val);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
deleted file mode 100644
index 70ef208a3..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
+++ /dev/null
@@ -1,331 +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 Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * All of the information in a single tagSpec tag, including the enclosing handler.
- */
-public class TagSpec {
-
-	/**
-	 * Handle to the descriptor of the plugin that declared the completion information for this tag,
-	 * if any.
-	 */
-	Bundle bundle;
-
-	protected ResourceBundle resourceBundle;
-
-	private boolean attemptedToFindResourceBundle = false;
-
-	private AttributeValuesHelper validValuesHelper;
-	private TagsetDescriptor tagsetDescriptor;
-
-	/**
-	 * Name of the tag.
-	 */
-	private String tagName;
-
-	/**
-	 * Scope of the tag: METHOD | FIELD | TYPE
-	 */
-	private int scope;
-
-	/**
-	 * Multiplicity of the tag: ONE | MANY
-	 */
-	private int multiplicity;
-
-	/**
-	 * Attributes that can be set for this tag. (Instances of TagAttribSpec)
-	 */
-	private List attributes = new ArrayList();
-
-	private String helpKey;
-
-	/**
-	 * Text type for use with localized text container.
-	 */
-	public static final int HELP_TEXT = 0;
-
-	public static final int METHOD = 0;
-
-	public static final int TYPE = 1;
-
-	public static final int FIELD = 2;
-
-	public interface Multiplicity {
-		public static final int ONE = 1;
-
-		public static final int MANY = 2;
-	}
-
-	public TagSpec(String aName, int aScope, int aMultiplicity) {
-		tagName = aName;
-		scope = aScope;
-		multiplicity = aMultiplicity;
-	}
-
-	public static int scopeFromString(String s) throws CoreException {
-		if (s != null) {
-			if (s.equalsIgnoreCase("type")) { //$NON-NLS-1$
-				return TagSpec.TYPE;
-			} else if (s.equalsIgnoreCase("field")) { //$NON-NLS-1$
-				return TagSpec.FIELD;
-			} else if (s.equalsIgnoreCase("method")) { //$NON-NLS-1$
-				return TagSpec.METHOD;
-			} else {
-				// Should be impossible unless the annotation-taghandler.exsd or
-				// calling code changes.
-				//TODO: Logging
-				throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_3 + s, null)); //$NON-NLS-1$
-			}
-		}
-		throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_4, null)); //$NON-NLS-1$
-
-	}
-
-	public static int multiplicityFromString(String s) throws CoreException {
-		if (s != null) {
-			if (s.equalsIgnoreCase("1")) { //$NON-NLS-1$
-				return TagSpec.Multiplicity.ONE;
-			} else if (s.equalsIgnoreCase("*")) { //$NON-NLS-1$
-				return TagSpec.Multiplicity.MANY;
-			}
-			throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_4, null)); //$NON-NLS-1$
-		}
-		//Return default
-		return TagSpec.Multiplicity.ONE;
-	}
-
-	/**
-	 * @return Scope for tag, METHOD | TYPE | FIELD
-	 */
-	public int getScope() {
-		return scope;
-	}
-
-	/**
-	 * @return multiplicity for tag, ONE | MANY
-	 */
-	public int getMultiplicity() {
-		return multiplicity;
-	}
-
-	/**
-	 * @return Name of the tag
-	 */
-	public String getTagName() {
-		return tagName;
-	}
-
-	public TagsetDescriptor getTagSetDescriptor() {
-		if (tagsetDescriptor == null) {
-			String tagSetName = getTagName();
-			int index = tagSetName.lastIndexOf('.');
-			if (index == -1)
-				tagSetName = ""; //$NON-NLS-1$
-			else
-				tagSetName = tagSetName.substring(index + 1);
-			tagsetDescriptor = AnnotationTagsetRegistry.INSTANCE.getDescriptor(tagSetName);
-		}
-		return tagsetDescriptor;
-	}
-
-	/**
-	 * Sets the scope of this tag.
-	 * 
-	 * @param i
-	 *            METHOD | TYPE | FIELD
-	 */
-	public void setScope(int i) {
-		scope = i;
-	}
-
-	/**
-	 * Sets the multiplicity of this tag.
-	 * 
-	 * @param i
-	 *            ONE | MANY
-	 */
-	public void setMultiplicity(int i) {
-		multiplicity = i;
-	}
-
-	/**
-	 * Sets the name of the tag
-	 * 
-	 * @param string
-	 *            Name for the tag.
-	 */
-	public void setTagName(String string) {
-		tagName = string;
-	}
-
-	/**
-	 * 
-	 * @return List of attributes for this tag.
-	 */
-	public List getAttributes() {
-		return attributes;
-	}
-
-	/**
-	 * Adds an attribute to the list of attributes for this tag.
-	 * 
-	 * @param att
-	 *            A TagAttribSpec
-	 */
-	public void addAttribute(TagAttribSpec att) {
-		if (att == null)
-			return;
-		attributes.add(att);
-		att.setTagSpec(this);
-	}
-
-	/**
-	 * Sets the list of attributes for this tag.
-	 * 
-	 * @param lst
-	 *            An array list of TagAttribSpecs
-	 */
-	public void setAttributes(List lst) {
-		if (lst == null)
-			attributes.clear();
-		else {
-			attributes = lst;
-			for (int i = 0; i < lst.size(); i++) {
-				TagAttribSpec tas = (TagAttribSpec) lst.get(i);
-				tas.setTagSpec(this);
-			}
-		}
-	}
-
-	/**
-	 * Looks for attribute named <code>attName</code>. Case insensitive.
-	 * 
-	 * @param attName
-	 *            Name to look for
-	 * @return A TagAttribSpec, or null if none was found.
-	 */
-	public TagAttribSpec attributeNamed(String attName) {
-		Iterator i = getAttributes().iterator();
-
-		while (i.hasNext()) {
-			TagAttribSpec tas = (TagAttribSpec) i.next();
-
-			if (attName.equalsIgnoreCase(tas.getAttribName())) {
-				return tas;
-			}
-		}
-		return null;
-
-	}
-
-	/**
-	 * @return Returns the declaringPlugin.
-	 */
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-	/**
-	 * @param declaringPlugin
-	 *            The declaringPlugin to set.
-	 */
-	protected void setBundle(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	/**
-	 * @return Returns the resourceBundle.
-	 */
-	public ResourceBundle getResourceBundle() {
-		if (resourceBundle == null && !attemptedToFindResourceBundle) {
-			attemptedToFindResourceBundle = true;
-			Bundle aBundle = getBundle();
-			if (aBundle != null)
-				resourceBundle = Platform.getResourceBundle(bundle);
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * @param resourceBundle
-	 *            The resourceBundle to set.
-	 */
-	public void setResourceBundle(ResourceBundle resourceBundle) {
-		attemptedToFindResourceBundle = false;
-		this.resourceBundle = resourceBundle;
-	}
-
-	/**
-	 * @return Returns the validValuesHelper.
-	 */
-	public AttributeValuesHelper getValidValuesHelper() {
-		if (validValuesHelper == null && getTagSetDescriptor() != null)
-			setValidValuesHelper(getTagSetDescriptor().getValidValuesHelper());
-		return validValuesHelper;
-	}
-
-	/**
-	 * @param validValuesHelper
-	 *            The validValuesHelper to set.
-	 */
-	public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
-		this.validValuesHelper = validValuesHelper;
-	}
-
-	public String getHelpKey() {
-		if (helpKey == null)
-			helpKey = computeHelpKey();
-		return helpKey;
-	}
-
-	/**
-	 * @return
-	 */
-	protected String computeHelpKey() {
-		return "tagh." + getTagName(); //$NON-NLS-1$
-	}
-
-	public void setHelpKey(String helpKey) {
-		this.helpKey = helpKey;
-	}
-
-	public String lookupTagHelp() throws MissingResourceException {
-		ResourceBundle b = getResourceBundle();
-		if (b == null)
-			return null;
-		String key = getHelpKey();
-		String val = b.getString(getHelpKey());
-		if (val == key)
-			val = null;
-		return val;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
deleted file mode 100644
index 8e4c4da60..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
+++ /dev/null
@@ -1,146 +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 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
- * @author mdelder
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TagsetDescriptor {
-
-	public static final String TAGSET = "AnnotationTagSet"; //$NON-NLS-1$
-	public static final String ATT_NAME = "name"; //$NON-NLS-1$
-	public static final String ATT_DISPLAY_NAME = "displayName"; //$NON-NLS-1$
-	public static final String ATT_DESCRIPTION = "description"; //$NON-NLS-1$
-	public static final String ATT_PARENT_TAGSET = "parentTagset"; //$NON-NLS-1$
-	public static final String ATT_VALID_VALUES_HELPER = "validValuesHelper"; //$NON-NLS-1$
-
-	private final IConfigurationElement element;
-
-	protected String name;
-	protected String displayName;
-	protected String description;
-	protected String parentTagset;
-	protected AttributeValuesHelper validValuesHelper;
-
-	protected TagsetDescriptor() {
-		element = null;
-	}
-
-	public TagsetDescriptor(IConfigurationElement element) {
-		this.element = element;
-		init();
-	}
-
-	/**
-	 *  
-	 */
-	private void init() {
-		this.name = this.element.getAttribute(ATT_NAME);
-		this.displayName = this.element.getAttribute(ATT_DISPLAY_NAME);
-		this.description = this.element.getAttribute(ATT_DESCRIPTION);
-		this.parentTagset = this.element.getAttribute(ATT_PARENT_TAGSET);
-		// set the valid values helper if there is one
-		try {
-			String validValuesHelperName = this.element.getAttribute(ATT_VALID_VALUES_HELPER);
-			if (validValuesHelperName != null) {
-				Class loaded = Class.forName(validValuesHelperName);
-				this.validValuesHelper = (AttributeValuesHelper) loaded.newInstance();
-			}
-		} catch (Exception e) {
-			// Do nothing
-		}
-	}
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @return Returns the displayName.
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * @return Returns the element.
-	 */
-	public IConfigurationElement getElement() {
-		return element;
-	}
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @return Returns the parentTagset.
-	 */
-	public String getParentTagset() {
-		return parentTagset;
-	}
-
-	public TagsetDescriptor[] getDirectDependents() {
-
-		if (getName() == null || getName().equals("")) //$NON-NLS-1$
-			return new TagsetDescriptor[0];
-
-		List dependents = new ArrayList();
-
-		TagsetDescriptor descriptor = null;
-		for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
-			descriptor = (TagsetDescriptor) itr.next();
-			if (getName().equals(descriptor.getParentTagset()))
-				dependents.add(descriptor);
-		}
-
-		TagsetDescriptor[] descriptors = new TagsetDescriptor[dependents.size()];
-		dependents.toArray(descriptors);
-		return descriptors;
-	}
-
-	/**
-	 * @return Returns the validValuesHelper.
-	 */
-	public AttributeValuesHelper getValidValuesHelper() {
-		return validValuesHelper;
-	}
-
-	/**
-	 * @param validValuesHelper
-	 *            The validValuesHelper to set.
-	 */
-	public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
-		this.validValuesHelper = validValuesHelper;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties b/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties
deleted file mode 100644
index 475ed7eb5..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-Annotations_Controller=Annotations Controller
-annotation_tag_info=annotation tag info
-annotation_tagset=annotation tagset
-annotationTagDynamicInitializer=annotationTagDynamicInitializer
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml b/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
deleted file mode 100644
index 990fda021..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension-point id="annotationsController" name="%Annotations_Controller" schema="schema/annotationsController.exsd"/>
-   <extension-point id="AnnotationTagInfo" name="%annotation_tag_info" schema="schema/annotation-tag-info.exsd"/>
-   <extension-point id="AnnotationTagSet" name="%annotation_tagset" schema="schema/annotation.tagset.exsd"/>
-   <extension-point id="annotationTagDynamicInitializer" name="%annotationTagDynamicInitializer" schema="schema/annotationTagDynamicInitializer.exsd"/>
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
deleted file mode 100644
index 833fffa60..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.controller"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties b/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
deleted file mode 100644
index a2631de7a..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-TagSpec_3=Unknown tag scope:
-TagSpec_4=Null tag scope.
-TagSpec_5=Unknown tag multiplicity:
-TagSpec_6=Null tag multiplicity.
-TagAttribSpec_1=Unknown 'unique' scope value:
-TagAttribSpec_2=More than one 'unique' tag defined:
-AnnotationTagParser_0=Null event handler.
-AnnotationTagParser_1=
-AnnotationTagRegistry_0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry_9=parseTagAttribs: unknown 'use' value:
-AnnotationTagRegistry_10=Incomplete element AnnotationTagInfo in plugin {0}
-AnnotationTagRegistry_11=parseTagAttribs: unknown 'isJavaTypeIdentifier' value:
-AnnotationsControllerManager_ERROR_0=IWAE0001E Invalid IConfigurationElement used to create AnnotationsControllerRegistry.Descriptor.
-AnnotationTagRegistry_ERROR_1=
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
deleted file mode 100644
index 37f2397f6..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="AnnotationTagInfo" name="Annotation Tag Info"/>

-      </appInfo>

-      <documentation>

-         Describes the tags contained by a tag set and the tag&apos;s attributes.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="AnnotationTagInfo" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="AnnotationTagInfo">

-      <complexType>

-         <sequence>

-            <element ref="attrib" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="tagSet" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the tag set this tag comes underneath.  ( for instance, if we&apos;re defining the &lt;code&gt;@ejb.bean&lt;/code&gt;

-tag, then the tag set would be &lt;code&gt;ejb&lt;/code&gt;. )  The tag set must have been defined using the annotation.tagset extension point.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="tagName" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the tag.  ( if we&apos;re defining the &lt;code&gt;@ejb.bean&lt;/code&gt; tag, then the tagName would be &lt;code&gt;bean&lt;/code&gt; ).

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="scope" use="required">

-            <annotation>

-               <documentation>

-                  Scope of the bean.  Must be &lt;code&gt;type&lt;/code&gt;,&lt;code&gt;method&lt;/code&gt;, or &lt;code&gt;field&lt;/code&gt;.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="type">

-                  </enumeration>

-                  <enumeration value="method">

-                  </enumeration>

-                  <enumeration value="field">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="multiplicity" use="default" value="1">

-            <annotation>

-               <documentation>

-                  Multiplicity of the tagset.  Must be &lt;code&gt;1&lt;/code&gt; or&lt;code&gt;*&lt;/code&gt;. The default value is 1, if not specified.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="1">

-                  </enumeration>

-                  <enumeration value="*">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  Optional description.  May be a description string, or a

-key to localized text for the description in the declaring plugin&apos;s resource bundle. No default if this is

-not specified.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="attrib">

-      <complexType>

-         <sequence>

-            <element ref="unique" minOccurs="0" maxOccurs="1"/>

-            <element ref="enumValues" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="name" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the attribute.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  Description text for the attribute, or key pointing to the localized description text inside of the declaring plugin&apos;s resource bundle.  If not specified, defaults to &lt;code&gt;ath.ATTRIBUTE_NAME&lt;/code&gt;.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="use" use="default" value="optional">

-            <annotation>

-               <documentation>

-                  Sets whether this tag is &lt;code&gt;optional&lt;/code&gt; or &lt;code&gt;required&lt;/code&gt;.  The default is &lt;code&gt;optional&lt;/code&gt;.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="optional">

-                  </enumeration>

-                  <enumeration value="required">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="type" use="default" value="string">

-            <annotation>

-               <documentation>

-                  Type of the attribute, &lt;code&gt;string|boolean|javaType&lt;/code&gt;.  Defaults to &lt;code&gt;string&lt;/code&gt; if not specified.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="string">

-                  </enumeration>

-                  <enumeration value="bool">

-                  </enumeration>

-                  <enumeration value="javaType">

-                  </enumeration>

-                  <enumeration value="enum">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="unique">

-      <annotation>

-         <documentation>

-            Specifies that the attribute value is unique within the specified scope.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="scope" use="default" value="module">

-            <annotation>

-               <documentation>

-                  The scope of the uniqueness for the attribute value. It is one of the &lt;code&gt;module&lt;/code&gt;, &lt;code&gt;file&lt;/code&gt;, &lt;code&gt;type&lt;/code&gt;, &lt;code&gt;method&lt;/code&gt;,or  &lt;code&gt;field&lt;/code&gt;. The default value is &apos;module&apos;.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="module">

-                  </enumeration>

-                  <enumeration value="file">

-                  </enumeration>

-                  <enumeration value="type">

-                  </enumeration>

-                  <enumeration value="method">

-                  </enumeration>

-                  <enumeration value="field">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="enumValues">

-      <complexType>

-         <attribute name="value" type="string" use="required">

-            <annotation>

-               <documentation>

-                  This can be used to supply the user a drop down choice of values for a specific attribute selection.  Each one of these &quot;values&quot; is an entry in that drop down for the selected attribute.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
deleted file mode 100644
index e113ef54e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="AnnotationTagSet" name="Annotations Tag Set"/>

-      </appInfo>

-      <documentation>

-         Allows clients to define a tag set for an annotation 

-tag.  A tag set named X would contain all of the tags that

-look like &lt;code&gt;@X.tag&lt;/code&gt;.  So the &lt;code&gt;ejb&lt;/code&gt;

-tag set would contain the &lt;code&gt;@ejb.bean&lt;/code&gt; tag, 

-the &lt;code&gt;@ejb.persistence&lt;/code&gt; tag, the &lt;code&gt;@ejb.pk&lt;/code&gt; tag, etc...

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="AnnotationTagSet" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="AnnotationTagSet">

-      <complexType>

-         <attribute name="name" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the tagset.  The name for the tagset that contains the &lt;code&gt;@ejb.bean&lt;/code&gt; tag would be &lt;code&gt;ejb&lt;/code&gt;.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="displayName" type="string">

-            <annotation>

-               <documentation>

-                  The text of the display name for the tag, or a resource

-key pointing to the localized display name inside of the

-declaring plugin&apos;s resource bundle.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  A description of the tag set.  Can be the text of the 

-description, or a key for the declaring plugin&apos;s resource bundle that points to the localized text for the tag set description.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="parentTagset" type="string">

-            <annotation>

-               <documentation>

-                  This can be used optionally to set a tagset as a parent to this one, which will enforce the parent as a prerequisite tag set which will be handled first.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="validValuesHelper" type="string">

-            <annotation>

-               <documentation>

-                  This can be used optionally to add a programmatic dynamic helper to supply the user with a set of valid values for attributes in this tag set, depending on attribute selection.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
deleted file mode 100644
index 3eab09e9e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationTagDynamicInitializer" name="Annotation Tag Dynamic Initializer"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to allow for clients to define their annotation tags dynamically.  This means that it is not necessary to statically define annotation tags using the tag-info extension point.  The extensions for this point will be called just after initializing the static annotation tags from the tag-info extension point.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="initializer"/>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="initializer">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Set the qualified name of a class that implements the com.ibm.wtp.annotations.registry.AnnotationTagDynamicInitializer interface.  This class must have a default constructor.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
deleted file mode 100644
index a7c5daa21..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationsController" name="Annotations Controller"/>

-      </appInfo>

-      <documentation>

-         The annotationsController is used in generating annotated beans.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="annotationsController" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="annotationsController">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The id is used to coordinate precedence using function groups so this must be consistent with the function group bindings.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  This is the name of the extension class defined by the extension

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="builderID" type="string" use="required">

-            <annotation>

-               <documentation>

-                  This is the ID of the annotations builder to be used by this annotations controller.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.common.annotations.core/.classpath b/plugins/org.eclipse.jst.common.annotations.core/.classpath
deleted file mode 100644
index ccf4d764f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore b/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
deleted file mode 100644
index 7bc35c810..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-annotations-core.jar
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.project b/plugins/org.eclipse.jst.common.annotations.core/.project
deleted file mode 100644
index 51f02e380..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6447921e1..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 16 17:15:11 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fcbd764a1..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 17:14:52 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 1eab9cf49..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.core;singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.core;x-internal:=true
-Require-Bundle:  org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)"
diff --git a/plugins/org.eclipse.jst.common.annotations.core/about.html b/plugins/org.eclipse.jst.common.annotations.core/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/build.properties b/plugins/org.eclipse.jst.common.annotations.core/build.properties
deleted file mode 100644
index 3e0c003cb..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/build.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               META-INF/,\
-               about.html,\
-               .,\
-               schema/,\
-               plugin.properties,\
-               property_files/
-jars.compile.order = .
-output.. = bin/
-source.. = src/,\
-           property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.properties b/plugins/org.eclipse.jst.common.annotations.core/plugin.properties
deleted file mode 100644
index ceb9d8362..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# properties file for org.eclipse.jst.common.annotations.core
-Bundle-Name.0 = Annotation Core Plug-in
-Bundle-Vendor.0 = Eclipse.org
-extension-point.name.0 = Annotations Provider
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml b/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
deleted file mode 100644
index c543d62c4..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="annotationsProvider" name="%extension-point.name.0" schema="schema/annotationsProvider.exsd"/>
- <extension
-       id="AnnotationsTranslator"
-       point="org.eclipse.wst.common.emf.translatorExtension">
-       <translator
-       		className="org.eclipse.jst.common.internal.annotations.core.AnnotationsTranslator">
-       </translator>
- </extension>
-    
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
deleted file mode 100644
index 87718a68e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.core"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties b/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
deleted file mode 100644
index 19a34cc61..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-TagSpec_3=Unknown tag scope:
-TagSpec_4=Null tag scope.
-TagAttribSpec_6=
-AnnotationTagParser_0=Null event handler.
-AnnotationTagParser_1=
-AnnotationTagRegistry_0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry_9=parseTagAttribs: unknown 'use' value:
diff --git a/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd b/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd
deleted file mode 100644
index 960dce2e0..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.common.annotations.core" id="annotationsProvider" name="Annotations Provider"/>
-      </appInfo>
-      <documentation>
-         [This extension point is used by clients to allow their own annotation provider to detail information on whether or not a given EObject is annotated for one of their tag sets.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="annotationsProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="annotationsProvider">
-      <complexType>
-         <attribute name="className" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified class name for a class which implments the IAnnotationsProvider interface.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [1.0.2]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [This is for internal use only.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
deleted file mode 100644
index 47767e3c6..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
+++ /dev/null
@@ -1,74 +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.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotatedCommentHandler implements TagParseEventHandler {
-
-	private Map annotations;
-
-	private Token annotationToken;
-
-	/**
-	 *  
-	 */
-	public AnnotatedCommentHandler() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#annotationTag(org.eclipse.wst.common.internal.annotations.core.Token)
-	 */
-	public void annotationTag(Token tag) {
-		this.annotationToken = tag;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#endOfTag(int)
-	 */
-	public void endOfTag(int pos) {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#attribute(org.eclipse.wst.common.internal.annotations.core.Token,
-	 *      int, org.eclipse.wst.common.internal.annotations.core.Token)
-	 */
-	public void attribute(Token name, int equalsPosition, Token value) {
-		if (value.getText() == null || value.getText().length() == 0)
-			getAnnotations().put(this.annotationToken.getText(), name.getText());
-		else
-			getAnnotations().put(name.getText(), value.getText());
-	}
-
-	/**
-	 * @return Returns the annotations.
-	 */
-	public Map getAnnotations() {
-		if (annotations == null)
-			annotations = new HashMap();
-		return annotations;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
deleted file mode 100644
index 61966933a..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
+++ /dev/null
@@ -1,266 +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 Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class AnnotationTagParser {
-
-	private TagParseEventHandler handler;
-
-	private char[] input;
-
-	int pos;
-
-	int endOfLastGoodAttParse;
-
-	public AnnotationTagParser(TagParseEventHandler tp) {
-		if (tp == null) {
-			throw new IllegalArgumentException(AnnotationsCoreResources.AnnotationTagParser_0); 
-		}
-		handler = tp;
-	}
-
-	private boolean eos() {
-		return pos >= input.length;
-	}
-
-	private boolean isWS(char c) {
-		return c == ' ' || c == '\n' || c == '\r' || c == '\t';
-	}
-
-	private void skipWS() {
-		while (pos < input.length && (isWS(input[pos]) || input[pos] == '*')) {
-			pos++;
-		}
-	}
-
-	// Caller is expected to make sure the eos has not been reached.
-	private char peek() {
-		return input[pos];
-	}
-
-	// Caller is expected to check for EOS.
-	private char nextChar() {
-		return input[pos++];
-	}
-
-	private boolean isNextChar(char c) {
-		if (eos())
-			return false;
-		return peek() == c;
-	}
-
-	private boolean isIDChar(char c) {
-		return !isWS(c) && c != '=' && c != '@' && c != '\"';
-	}
-
-	private Token collectID() {
-		StringBuffer b = new StringBuffer(16);
-		Token t = new Token();
-
-		t.setBeginning(pos);
-		while (!eos() && isIDChar(peek())) {
-			b.append(nextChar());
-		}
-		t.setEnd(pos - 1);
-		t.setText(b.toString());
-		return t;
-	}
-
-	private Token expectAttribName() {
-		if (eos()) {
-			return null;
-		}
-		int save = pos;
-
-		Token retval = collectID();
-		if (retval.length() == 0) {
-			pos = save;
-			return null;
-		}
-		return retval;
-	}
-
-	private Token expectTag() {
-		if (eos()) {
-			return null;
-		}
-		int savePos = pos;
-
-		if (nextChar() != '@') {
-			return null;
-		}
-
-		if (eos() || isWS(peek())) {
-			return null;
-		}
-
-		Token retval = expectAttribName();
-
-		if (retval.length() == 0) {
-			pos = savePos + 1;
-		}
-		retval.setBeginning(savePos);
-
-		// Save end of parse so we can pass it as the end of the parsed tag.
-		endOfLastGoodAttParse = pos;
-		return retval;
-	}
-
-	private Token expectQuotedValue() {
-		skipWS();
-		if (eos()) {
-			return null;
-		}
-
-		Token tok = new Token();
-
-		tok.setBeginning(pos);
-		if (peek() != '\"') {
-			return null;
-		}
-		nextChar();
-
-		if (eos()) {
-			return null;
-		}
-
-		StringBuffer b = new StringBuffer(64);
-
-		while (!eos() && peek() != '\"') {
-			b.append(nextChar());
-		}
-		if (!eos()) {
-			nextChar();
-		}
-
-		tok.setEnd(pos - 1);
-		tok.setText(b.toString());
-		return tok;
-	}
-
-	private boolean expectAssign() {
-		if (eos()) {
-			return false;
-		}
-
-		if (nextChar() == '=') {
-			return true;
-		}
-		pos--;
-		return false;
-	}
-
-	private Token mkNullToken() {
-		Token retval = new Token();
-
-		retval.setBeginning(pos);
-		retval.setEnd(pos - 1);
-		retval.setText(""); //$NON-NLS-1$
-		return retval;
-	}
-
-	private boolean parseNextAttribute() {
-		skipWS();
-		if (eos()) {
-			return false;
-		}
-		Token key = collectID();
-
-		if (key == null || key.length() == 0) {
-			return false;
-		}
-
-		skipWS();
-		if (eos()) {
-			// Go ahead and report it, even though it is a partial attribute. (
-			// we still fail here )
-			handler.attribute(key, -1, mkNullToken());
-			return false;
-		}
-
-		int eqPos = pos;
-
-		if (!expectAssign()) {
-			// Even though we won't parse this as a full attribute, go ahead and
-			// call the handler with it. Some clients want to see partial
-			// attributes.
-			handler.attribute(key, -1, mkNullToken());
-			return false;
-		}
-		skipWS();
-
-		if (eos()) {
-			// Same here - we fail on it, but we report it anyway
-			handler.attribute(key, eqPos, mkNullToken());
-			return false;
-		}
-		Token value = expectQuotedValue();
-
-		if (value == null) {
-			value = collectID();
-			if (isNextChar('=')) {
-				pos = value.getBeginning();
-				value = mkNullToken();
-			}
-		}
-		endOfLastGoodAttParse = pos;
-		handler.attribute(key, eqPos, value);
-		return true;
-	}
-
-	private void parseAttributes() {
-		while (!eos() && parseNextAttribute()) {
-			// loop while not end of string
-		}
-	}
-
-	private void skipToTagChar() {
-		while (!eos() && peek() != '@') {
-			nextChar();
-		}
-	}
-
-	public void setParserInput(char[] text) {
-		input = text;
-		pos = 0;
-		endOfLastGoodAttParse = 0;
-	}
-
-	public void setParserInput(String text) {
-		setParserInput(text.toCharArray());
-	}
-
-	public void parse() {
-		while (!eos()) {
-			skipToTagChar();
-			Token tag = expectTag();
-			if (tag == null) {
-				break;
-			}
-			handler.annotationTag(tag);
-			parseAttributes();
-			handler.endOfTag(endOfLastGoodAttParse);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
deleted file mode 100644
index d9431cf2a..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
+++ /dev/null
@@ -1,161 +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.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsAdapter extends AdapterImpl implements CloneablePublic {
-
-	public static final String GENERATED = "generated"; //$NON-NLS-1$
-
-	protected final static String ADAPTER_TYPE = AnnotationsAdapter.class.getName();
-
-	public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
-		// anonymous inner class
-	};
-
-	private Map annotationsMap;
-
-	/**
-	 *  
-	 */
-	public AnnotationsAdapter() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() { // throws CloneNotSupportedException {
-		//return super.clone();
-		return null;
-	}
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static void addAnnotations(EObject emfObject, String name, Object value) {
-		if (emfObject == null)
-			return;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		adapter.addAnnotations(name, value);
-	}
-
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static Object getAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		return internalGetAnnotations(emfObject, name);
-	}
-
-	protected static Object internalGetAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		return (adapter == null) ? internalGetAnnotations(emfObject.eContainer(), name) : adapter.getAnnotations(name);
-	}
-
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static Object removeAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		return adapter.removeAnnotations(name);
-	}
-
-	/**
-	 * @param name
-	 * @param value
-	 */
-	protected void addAnnotations(String name, Object value) {
-		getAnnnotations().put(name, value);
-	}
-
-	protected Object getAnnotations(String name) {
-		return getAnnnotations().get(name);
-	}
-
-	protected Object removeAnnotations(String name) {
-		return getAnnnotations().remove(name);
-	}
-
-	/**
-	 * @return
-	 */
-	protected Map getAnnnotations() {
-		if (annotationsMap == null)
-			annotationsMap = new HashMap();
-		return annotationsMap;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter getAdapter(EObject emfObject) {
-		AnnotationsAdapter adapter = retrieveExistingAdapter(emfObject);
-		return adapter == null ? createAdapter(emfObject) : adapter;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter createAdapter(EObject emfObject) {
-		AnnotationsAdapter adapter = new AnnotationsAdapter();
-		adapter.setTarget(emfObject);
-		emfObject.eAdapters().add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter retrieveExistingAdapter(EObject emfObject) {
-		return (AnnotationsAdapter) EcoreUtil.getExistingAdapter(emfObject, ADAPTER_TYPE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_TYPE.equals(type);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
deleted file mode 100644
index 81b8276fa..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AnnotationsCoreResources extends NLS {
-
-	private static final String BUNDLE_NAME = "annotationcore";//$NON-NLS-1$
-
-	private AnnotationsCoreResources() {
-		// Do not instantiate
-	}
-
-	public static String TagSpec_3;
-	public static String TagSpec_4;
-	public static String TagAttribSpec_6;
-	public static String AnnotationTagParser_0;
-	public static String AnnotationTagParser_1;
-	public static String AnnotationTagRegistry_0;
-	public static String AnnotationTagRegistry_9;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AnnotationsCoreResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java
deleted file mode 100644
index 0f98b62ab..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-public class AnnotationsProviderManager extends RegistryReader {
-	
-	public static final AnnotationsProviderManager INSTANCE = new AnnotationsProviderManager();
-	
-	static {
-		INSTANCE.readRegistry();
-	}
-
-	public static class Descriptor {
-
-		public static final String EXTENSION_PT_PLUGIN = "org.eclipse.jst.common.annotations.core"; //$NON-NLS-1$
-		public static final String ANNOTATIONS_PROVIDER = "annotationsProvider"; //$NON-NLS-1$
-		public static final String CLASSNAME = "className"; //$NON-NLS-1$
-		
-		private final IConfigurationElement configElement;
-
-		public Descriptor(IConfigurationElement aConfigElement) {
-			super();
-			configElement = aConfigElement;
-		}
-
-		public IAnnotationsProvider createInstance() {
-			IAnnotationsProvider instance = null;
-			try {
-				instance = (IAnnotationsProvider) configElement.createExecutableExtension(CLASSNAME);
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-			return instance;
-		}
-	}
-	
-	private List annotationsProviders;
-	
-	/**
-	 * Default constructor
-	 */
-	public AnnotationsProviderManager() {
-		super(Descriptor.EXTENSION_PT_PLUGIN, Descriptor.ANNOTATIONS_PROVIDER);
-	}
-	
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(Descriptor.ANNOTATIONS_PROVIDER))
-			return false;
-		addAnnotationsProvider(new Descriptor(element));
-		return true;
-	}
-	
-	/**
-	 * @param descriptor
-	 */
-	protected void addAnnotationsProvider(Descriptor descriptor) {
-		IAnnotationsProvider provider = descriptor.createInstance();
-		if (provider != null)
-			getAnnotationsProviders().add(provider);
-	}
-	
-	/**
-	 * @return Returns the annotationsProviders.
-	 */
-	public List getAnnotationsProviders() {
-		if (annotationsProviders == null)
-			annotationsProviders = new ArrayList();
-		return annotationsProviders;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
deleted file mode 100644
index f110ad3c8..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
+++ /dev/null
@@ -1,150 +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.common.internal.annotations.core;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsTranslator extends Translator {
-
-	private AnnotatedCommentHandler handler;
-
-	private AnnotationTagParser parser;
-
-	public static final AnnotationsTranslator INSTANCE = new AnnotationsTranslator();
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AnnotationsTranslator() {
-		super("#comment", AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AnnotationsTranslator(String domNameAndPath) {
-		super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public AnnotationsTranslator(String domNameAndPath, int style) {
-		super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, style | Translator.COMMENT_FEATURE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.emf.xml.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.Object)
-	 */
-	public void setMOFValue(EObject emfObject, Object value) {
-		if (value == null)
-			return;
-		getHandler().getAnnotations().clear();
-		getParser().setParserInput(value.toString());
-		getParser().parse();
-		String name;
-		Map annotations = getHandler().getAnnotations();
-		for (Iterator keys = annotations.keySet().iterator(); keys.hasNext();) {
-			name = (String) keys.next();
-			AnnotationsAdapter.addAnnotations(emfObject, name, annotations.get(name));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean isSetMOFValue(EObject emfObject) {
-		return getMOFValue(emfObject) != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getMOFValue(EObject emfObject) {
-		return AnnotationsAdapter.getAnnotations(emfObject, AnnotationsAdapter.GENERATED);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public void unSetMOFValue(EObject emfObject) {
-		AnnotationsAdapter.removeAnnotations(emfObject, AnnotationsAdapter.GENERATED);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean featureExists(EObject emfObject) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
-	 */
-	public boolean isDataType() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
-		return (aFeature == feature);
-	}
-
-	/**
-	 * @return Returns the handler.
-	 */
-	protected AnnotatedCommentHandler getHandler() {
-		if (handler == null)
-			handler = new AnnotatedCommentHandler();
-		return handler;
-	}
-
-	/**
-	 * @return Returns the parser.
-	 */
-	protected AnnotationTagParser getParser() {
-		if (parser == null)
-			parser = new AnnotationTagParser(getHandler());
-		return parser;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java
deleted file mode 100644
index 1d1f3b134..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jst.common.internal.annotations.core;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-/**
- * This interface is used by clients to allow their own annotation provider to detail information
- * on whether or not a given EObject is annotated for one of their tag sets.
- * 
- * @author jlanuti
- * @planned for 2.0
- */
-public interface IAnnotationsProvider {
-	
-	/**
-	 * Return whether or not the passed EObject is annotated by your annotation provider
-	 * 
-	 * @planned for 2.0
-	 * @param eObject
-	 * @return boolean value of isAnnotated
-	 */
-	public boolean isAnnotated(EObject eObject);
-
-	/**
-	 * The passed eObject may have been annoted.  If true, it is desired to
-	 * determine which {@link ICompilationUnit} has the tag or tags that created
-	 * this object.
-	 * 
-	 * @planned for 2.0
-	 * @param eObject - An {@link EObject} that may be annotated.
-	 * @return the {@link ICompilationUnit} that has the tag that created this eObject.
-	 * 
-	 * @see #getPrimaryTagset(EObject)
-	 */
-	public ICompilationUnit getPrimaryAnnotatedCompilationUnit(EObject eObject);
-
-	/**
-	 * It is desired to obtain the tagset name which is used to create the passed
-	 * eObject.
-	 * 
-	 * @planned for 2.0
-	 * @param eObject An {@link EObject} which may be annotated.
-	 * @return The name of the tagset which creates the passed eObject.
-	 * 
-	 * @see #getPrimaryAnnotatedCompilationUnit(EObject)
-	 */
-	public String getPrimaryTagset(EObject eObject);
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
deleted file mode 100644
index f9794150c..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
+++ /dev/null
@@ -1,55 +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 Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-
-/**
- * Parser and interface for objects that want to receive parsing events. When parsing is started
- * through the <code>parse()</code> method, event methods are called for interesting features in
- * the parse. ( like a SAX ContentHandler )
- * 
- * @author Pat Kelley
- */
-public interface TagParseEventHandler {
-
-	/**
-	 * Called when the annotation tag is encountered. This will always be the first piece of content
-	 * encountered. Followed by a endOfTag( ) call when the end of the tag is reached.
-	 */
-	public void annotationTag(Token tag);
-
-	/**
-	 * Called when the entire annotation for a single tag has been parsed.
-	 * 
-	 * @param pos
-	 *            Position in the stream of the end of the annotation.
-	 */
-	public void endOfTag(int pos);
-
-	/**
-	 * Called for every attribute setting encountered for an annotation tag.
-	 * 
-	 * @param name
-	 *            Name of the attribute.
-	 * @param equalsPosition
-	 *            Source position of the equals sign, or -1 if no equals sign was found.
-	 * @param value
-	 *            Value of the attribute, with any quotes stripped off. Will be zero length token if
-	 *            no attribute was found.
-	 */
-	public void attribute(Token name, int equalsPosition, Token value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
deleted file mode 100644
index 9d0310236..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
+++ /dev/null
@@ -1,103 +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 Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * A string, and the range it was taken from in the source file. The range is inclusive. (ie, with
- * source "ABCD", the beginning and end for the Token "BC" would be (1,2) )
- * 
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class Token {
-	private String text;
-	private int beginning;
-	private int end;
-
-
-
-	/**
-	 * @return Position in original source of the first character of this token.
-	 */
-	public int getBeginning() {
-		return beginning;
-	}
-
-	/**
-	 * @return Position in the original source of the last character of this token.
-	 */
-	public int getEnd() {
-		return end;
-	}
-
-	/**
-	 * @return The token string.
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * @param i
-	 *            A source position
-	 */
-	public void setBeginning(int i) {
-		beginning = i;
-	}
-
-	/**
-	 * @param i
-	 *            A source position.
-	 */
-	public void setEnd(int i) {
-		end = i;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setText(String string) {
-		text = string;
-	}
-
-	public int length() {
-		return text.length();
-	}
-
-	/**
-	 * Tests whether <code>srcPos</code> comes immediately after the last character in this token.
-	 * 
-	 * @param srcPos
-	 *            A position in the original source the token came from.
-	 * @return true if srcPos comes immediately after this token.
-	 */
-	public boolean immediatelyPrecedes(int srcPos) {
-		return end + 1 == srcPos;
-	}
-
-	/**
-	 * Tests whether srcPos is within the original source range range of the token.
-	 * 
-	 * @param srcPos
-	 * @return
-	 */
-	public boolean contains(int srcPos) {
-		return srcPos >= beginning && srcPos <= end;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.classpath b/plugins/org.eclipse.jst.common.annotations.ui/.classpath
deleted file mode 100644
index ccf4d764f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
deleted file mode 100644
index 8e6034673..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.project b/plugins/org.eclipse.jst.common.annotations.ui/.project
deleted file mode 100644
index 04b8576ce..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6447921e1..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 16 17:15:11 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index b543eb3e6..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Aug 20 16:07:35 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 371402ad5..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Sun Aug 20 04:30:51 EDT 2006
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.wst.validation.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index ca43670ad..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sun Aug 20 16:07:35 EDT 2006
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e7ba51ae7..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Annotations_UI_
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Activator: org.eclipse.jst.common.internal.annotations.ui.UiPlugin
-Bundle-Vendor: %Eclipse_UI_
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.ui;x-internal:=true
-Require-Bundle: org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;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.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.annotations.core;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/about.html b/plugins/org.eclipse.jst.common.annotations.ui/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.common.annotations.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/build.properties b/plugins/org.eclipse.jst.common.annotations.ui/build.properties
deleted file mode 100644
index a21afc649..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               META-INF/,\
-               about.html,\
-               plugin.properties,\
-               .
-src.includes=schema/
-jars.compile.order = .
-output.. = bin/
-source.. = src/,\
-           property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties b/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties
deleted file mode 100644
index beb14099f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-AnnotationsCompletionProcessor=AnnotationsCompletionProcessor
-Annotations_UI_=Annotations UI Plug-in
-Eclipse_UI_=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml b/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
deleted file mode 100644
index efa96ed00..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.jdt.ui.javadocCompletionProcessor">
-      <javadocCompletionProcessor
-            name="%AnnotationsCompletionProcessor"
-            class="org.eclipse.jst.common.internal.annotations.ui.AnnotationTagCompletionProc"
-            id="AnnotationsCompletionProcessor">
-      </javadocCompletionProcessor>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
deleted file mode 100644
index 9a4918e29..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.ui"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties b/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
deleted file mode 100644
index 2d2909951..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-J2EEAnnotationsCompletionProcessor_3=Error parsing attributes - was expecing a '=' but found '
-J2EEAnnotationsCompletionProcessor_4=' instead.
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd b/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
deleted file mode 100644
index b3af9ecea..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.common.annotations.ui">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.common.annotations.ui" id="AnnotationUI" name="AnnotationUI"/>

-      </appInfo>

-      <documentation>

-         Extension point for enabling content assist for an existing tag set.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="AutoCompleteData" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="AutoCompleteData">

-      <annotation>

-         <documentation>

-            Enables content assist for a single tag set.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="tagSet" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the tag set code assist should be enabled for.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
deleted file mode 100644
index 9f1a77baf..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
+++ /dev/null
@@ -1,926 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.CharOperation;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.DefaultPositionUpdater;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.IPositionUpdater;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.ITextViewerExtension2;
-import org.eclipse.jface.text.ITextViewerExtension5;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.link.ILinkedModeListener;
-import org.eclipse.jface.text.link.LinkedModeModel;
-import org.eclipse.jface.text.link.LinkedModeUI;
-import org.eclipse.jface.text.link.LinkedPosition;
-import org.eclipse.jface.text.link.LinkedPositionGroup;
-import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags;
-import org.eclipse.jface.text.link.LinkedModeUI.IExitPolicy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- * @since 3.2
- */
-public abstract class AbstractAnnotationTagProposal {
-	/**
-	 * A class to simplify tracking a reference position in a document.
-	 */
-	static final class ReferenceTracker {
-	
-		/** The reference position category name. */
-		private static final String CATEGORY= "reference_position"; //$NON-NLS-1$
-		/** The position updater of the reference position. */
-		private final IPositionUpdater fPositionUpdater= new DefaultPositionUpdater(CATEGORY);
-		/** The reference position. */
-		private final Position fPosition= new Position(0);
-	
-		/**
-		 * Called before document changes occur. It must be followed by a call to postReplace().
-		 *
-		 * @param document the document on which to track the reference position.
-		 *
-		 */
-		public void preReplace(IDocument document, int offset) throws BadLocationException {
-			fPosition.setOffset(offset);
-			try {
-				document.addPositionCategory(CATEGORY);
-				document.addPositionUpdater(fPositionUpdater);
-				document.addPosition(CATEGORY, fPosition);
-	
-			} catch (BadPositionCategoryException e) {
-				// should not happen
-				e.printStackTrace();
-			}
-		}
-	
-		/**
-		 * Called after the document changed occurred. It must be preceded by a call to preReplace().
-		 *
-		 * @param document the document on which to track the reference position.
-		 */
-		public int postReplace(IDocument document) {
-			try {
-				document.removePosition(CATEGORY, fPosition);
-				document.removePositionUpdater(fPositionUpdater);
-				document.removePositionCategory(CATEGORY);
-	
-			} catch (BadPositionCategoryException e) {
-				// should not happen
-				e.printStackTrace();
-			}
-			return fPosition.getOffset();
-		}
-	}
-
-	protected static final class ExitPolicy implements IExitPolicy {
-	
-		final char fExitCharacter;
-		private final IDocument fDocument;
-	
-		public ExitPolicy(char exitCharacter, IDocument document) {
-			fExitCharacter= exitCharacter;
-			fDocument= document;
-		}
-	
-		/*
-		 * @see org.eclipse.jdt.internal.ui.text.link.LinkedPositionUI.ExitPolicy#doExit(org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager, org.eclipse.swt.events.VerifyEvent, int, int)
-		 */
-		public ExitFlags doExit(LinkedModeModel environment, VerifyEvent event, int offset, int length) {
-	
-			if (event.character == fExitCharacter) {
-				if (environment.anyPositionContains(offset))
-					return new ExitFlags(ILinkedModeListener.UPDATE_CARET, false);
-				return new ExitFlags(ILinkedModeListener.UPDATE_CARET, true);
-			}
-	
-			switch (event.character) {
-				case ';':
-					return new ExitFlags(ILinkedModeListener.NONE, true);
-				case SWT.CR:
-					// when entering an anonymous class as a parameter, we don't want
-					// to jump after the parenthesis when return is pressed
-					if (offset > 0) {
-						try {
-							if (fDocument.getChar(offset - 1) == '{')
-								return new ExitFlags(ILinkedModeListener.EXIT_ALL, true);
-						} catch (BadLocationException e) {
-						}
-					}
-					// fall through
-				default:
-					return null;
-			}
-		}
-	
-	}
-
-	private String fDisplayString;
-	private String fReplacementString;
-	private int fReplacementOffset;
-	private int fReplacementLength;
-	private int fCursorPosition;
-	private Image fImage;
-	private IContextInformation fContextInformation;
-	//private ProposalInfo fProposalInfo;
-	private char[] fTriggerCharacters;
-	private String fSortString;
-	private int fRelevance;
-	private boolean fIsInJavadoc;
-	
-	private StyleRange fRememberedStyleRange;
-	private boolean fToggleEating;
-	private ITextViewer fTextViewer;
-	
-	/**
-	 * The URL of the style sheet (css).
-	 * @since 3.2
-	 */
-	private URL fStyleSheetURL;	
-
-	protected AbstractAnnotationTagProposal() {
-	}
-
-	/*
-	 * @see ICompletionProposalExtension#getTriggerCharacters()
-	 */
-	public char[] getTriggerCharacters() {
-		return fTriggerCharacters;
-	}
-	
-	/**
-	 * Sets the trigger characters.
-	 * 
-	 * @param triggerCharacters The set of characters which can trigger the application of this
-	 *        completion proposal
-	 */
-	public void setTriggerCharacters(char[] triggerCharacters) {
-		fTriggerCharacters= triggerCharacters;
-	}
-
-	/**
-	 * Sets the proposal info.
-	 * 
-	 * @param proposalInfo The additional information associated with this proposal or
-	 *        <code>null</code>
-	 */
-//	public void setProposalInfo(ProposalInfo proposalInfo) {
-//		fProposalInfo= proposalInfo;
-//	}
-
-	/**
-	 * Returns the additional proposal info, or <code>null</code> if none exists.
-	 * 
-	 * @return the additional proposal info, or <code>null</code> if none exists
-	 */
-//	protected ProposalInfo getProposalInfo() {
-//		return fProposalInfo;
-//	}
-
-	/**
-	 * Sets the cursor position relative to the insertion offset. By default this is the length of
-	 * the completion string (Cursor positioned after the completion)
-	 * 
-	 * @param cursorPosition The cursorPosition to set
-	 */
-	public void setCursorPosition(int cursorPosition) {
-		Assert.isTrue(cursorPosition >= 0);
-		fCursorPosition= cursorPosition;
-	}
-	
-	protected int getCursorPosition() {
-		return fCursorPosition;
-	}
-
-	/*
-	 * @see ICompletionProposal#apply
-	 */
-	public final void apply(IDocument document) {
-		// not used any longer
-		apply(document, (char) 0, getReplacementOffset() + getReplacementLength());
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(org.eclipse.jface.text.IDocument, char, int)
-	 */
-	public void apply(IDocument document, char trigger, int offset) {
-		try {
-			// patch replacement length
-			int delta= offset - (getReplacementOffset() + getReplacementLength());
-			if (delta > 0)
-				setReplacementLength(getReplacementLength() + delta);
-	
-			boolean isSmartTrigger= isSmartTrigger(trigger);
-	
-			String replacement;
-			if (isSmartTrigger || trigger == (char) 0) {
-				replacement= getReplacementString();
-			} else {
-				StringBuffer buffer= new StringBuffer(getReplacementString());
-	
-				// fix for PR #5533. Assumes that no eating takes place.
-				if ((getCursorPosition() > 0 && getCursorPosition() <= buffer.length() && buffer.charAt(getCursorPosition() - 1) != trigger)) {
-					buffer.insert(getCursorPosition(), trigger);
-					setCursorPosition(getCursorPosition() + 1);
-				}
-	
-				replacement= buffer.toString();
-				setReplacementString(replacement);
-			}
-	
-			// reference position just at the end of the document change.
-			int referenceOffset= getReplacementOffset() + getReplacementLength();
-			final ReferenceTracker referenceTracker= new ReferenceTracker();
-			referenceTracker.preReplace(document, referenceOffset);
-	
-			replace(document, getReplacementOffset(), getReplacementLength(), replacement);
-	
-			referenceOffset= referenceTracker.postReplace(document);
-			setReplacementOffset(referenceOffset - (replacement == null ? 0 : replacement.length()));
-	
-			// PR 47097
-			if (isSmartTrigger)
-				handleSmartTrigger(document, trigger, referenceOffset);
-	
-		} catch (BadLocationException x) {
-			// ignore
-		}
-	}
-
-	private boolean isSmartTrigger(char trigger) {
-		return trigger == ';' && getBooleanPreference(PreferenceConstants.EDITOR_SMART_SEMICOLON)
-				|| trigger == '{' && getBooleanPreference(PreferenceConstants.EDITOR_SMART_OPENING_BRACE);
-	}
-	
-	private boolean getBooleanPreference(String preferenceKey) {
-		String value = PreferenceConstants.getPreference(preferenceKey, getProject());
-		if (value != null)
-			return Boolean.valueOf(value).booleanValue();
-		return false;
-	}
-
-	private void handleSmartTrigger(IDocument document, char trigger, int referenceOffset) throws BadLocationException {
-		DocumentCommand cmd= new DocumentCommand() {
-		};
-		
-		cmd.offset= referenceOffset;
-		cmd.length= 0;
-		cmd.text= Character.toString(trigger);
-		cmd.doit= true;
-		cmd.shiftsCaret= true;
-		cmd.caretOffset= getReplacementOffset() + getCursorPosition();
-		
-//		SmartSemicolonAutoEditStrategy strategy= new SmartSemicolonAutoEditStrategy(IJavaPartitions.JAVA_PARTITIONING);
-//		strategy.customizeDocumentCommand(document, cmd);
-		
-		replace(document, cmd.offset, cmd.length, cmd.text);
-		setCursorPosition(cmd.caretOffset - getReplacementOffset() + cmd.text.length());
-	}
-	
-	protected final void replace(IDocument document, int offset, int length, String string) throws BadLocationException {
-		if (!document.get(offset, length).equals(string))
-			document.replace(offset, length, string);
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension1#apply(org.eclipse.jface.text.ITextViewer, char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-
-		IDocument document= viewer.getDocument();
-		if (fTextViewer == null)
-			fTextViewer= viewer;
-		
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=96059
-		// don't apply the proposal if for some reason we're not valid any longer
-		if (!isInJavadoc() && !validate(document, offset, null)) {
-			setCursorPosition(offset - getReplacementOffset());
-			if (trigger != '\0') {
-				try {
-					document.replace(offset, 0, String.valueOf(trigger));
-					setCursorPosition(getCursorPosition() + 1);
-					if (trigger == '(' && autocloseBrackets()) {
-						document.replace(getReplacementOffset() + getCursorPosition(), 0, ")"); //$NON-NLS-1$
-						setUpLinkedMode(document, ')');
-					}
-				} catch (BadLocationException x) {
-					// ignore
-				}
-			}
-			return;
-		}
-
-		// don't eat if not in preferences, XOR with modifier key 1 (Ctrl)
-		// but: if there is a selection, replace it!
-		Point selection= viewer.getSelectedRange();
-		fToggleEating= (stateMask & SWT.MOD1) != 0;
-		int newLength= selection.x + selection.y - getReplacementOffset();
-		if ((insertCompletion() ^ fToggleEating) && newLength >= 0)
-			setReplacementLength(newLength);
-
-		apply(document, trigger, offset);
-		fToggleEating= false;
-	}
-
-	/**
-	 * Returns <code>true</code> if the proposal is within javadoc, <code>false</code>
-	 * otherwise.
-	 * 
-	 * @return <code>true</code> if the proposal is within javadoc, <code>false</code> otherwise
-	 */
-	protected boolean isInJavadoc(){
-		return fIsInJavadoc;
-	}
-	
-	/**
-	 * Sets the javadoc attribute.
-	 * 
-	 * @param isInJavadoc <code>true</code> if the proposal is within javadoc
-	 */
-	protected void setInJavadoc(boolean isInJavadoc) {
-		fIsInJavadoc= isInJavadoc;
-	}
-
-	/*
-	 * @see ICompletionProposal#getSelection
-	 */
-	public Point getSelection(IDocument document) {
-		return new Point(getReplacementOffset() + getCursorPosition(), 0);
-	}
-
-	/*
-	 * @see ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return fContextInformation;
-	}
-
-	/**
-	 * Sets the context information.
-	 * @param contextInformation The context information associated with this proposal
-	 */
-	public void setContextInformation(IContextInformation contextInformation) {
-		fContextInformation= contextInformation;
-	}
-	
-	/*
-	 * @see ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		return fDisplayString;
-	}
-
-	/*
-	 * @see ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-//		if (getProposalInfo() != null) {
-//			String info= getProposalInfo().getInfo(null);
-//			if (info != null && info.length() > 0) {
-//				StringBuffer buffer= new StringBuffer();
-//				HTMLPrinter.insertPageProlog(buffer, 0, getStyleSheetURL());
-//				buffer.append(info);
-//				HTMLPrinter.addPageEpilog(buffer);
-//				info= buffer.toString();
-//			}
-//			return info;
-//		}
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension5#getAdditionalProposalInfo(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Object getAdditionalProposalInfo(IProgressMonitor monitor) {
-//		if (getProposalInfo() != null) {
-//			String info= getProposalInfo().getInfo(monitor);
-//			if (info != null && info.length() > 0) {
-//				StringBuffer buffer= new StringBuffer();
-//				HTMLPrinter.insertPageProlog(buffer, 0, getStyleSheetURL());
-//				buffer.append(info);
-//				HTMLPrinter.addPageEpilog(buffer);
-//				info= buffer.toString();
-//			}
-//			return info;
-//		}
-		return null;
-	}
-	
-	/**
-	 * Returns the style sheet URL.
-	 *
-	 * @since 3.1
-	 */
-	protected URL getStyleSheetURL() {
-		if (fStyleSheetURL == null) {
-
-			Bundle bundle= Platform.getBundle(JavaUI.ID_PLUGIN);
-			fStyleSheetURL= bundle.getEntry("/JavadocHoverStyleSheet.css"); //$NON-NLS-1$
-			if (fStyleSheetURL != null) {
-				try {
-					fStyleSheetURL= FileLocator.toFileURL(fStyleSheetURL);
-				} catch (IOException ex) {
-					ex.printStackTrace();
-				}
-			}
-		}
-		return fStyleSheetURL;
-	}
-
-	/*
-	 * @see ICompletionProposalExtension#getContextInformationPosition()
-	 */
-	public int getContextInformationPosition() {
-		if (getContextInformation() == null)
-			return getReplacementOffset() - 1;
-		return getReplacementOffset() + getCursorPosition();
-	}
-
-	/**
-	 * Gets the replacement offset.
-	 * @return Returns a int
-	 */
-	public int getReplacementOffset() {
-		return fReplacementOffset;
-	}
-
-	/**
-	 * Sets the replacement offset.
-	 * @param replacementOffset The replacement offset to set
-	 */
-	public void setReplacementOffset(int replacementOffset) {
-		Assert.isTrue(replacementOffset >= 0);
-		fReplacementOffset= replacementOffset;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getCompletionOffset()
-	 */
-	public int getPrefixCompletionStart(IDocument document, int completionOffset) {
-		return getReplacementOffset();
-	}
-
-	/**
-	 * Gets the replacement length.
-	 * @return Returns a int
-	 */
-	public int getReplacementLength() {
-		return fReplacementLength;
-	}
-
-	/**
-	 * Sets the replacement length.
-	 * @param replacementLength The replacementLength to set
-	 */
-	public void setReplacementLength(int replacementLength) {
-		Assert.isTrue(replacementLength >= 0);
-		fReplacementLength= replacementLength;
-	}
-
-	/**
-	 * Gets the replacement string.
-	 * @return Returns a String
-	 */
-	public String getReplacementString() {
-		return fReplacementString;
-	}
-
-	/**
-	 * Sets the replacement string.
-	 * @param replacementString The replacement string to set
-	 */
-	public void setReplacementString(String replacementString) {
-		Assert.isNotNull(replacementString);
-		fReplacementString= replacementString;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getReplacementText()
-	 */
-	public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
-		if (!isCamelCaseMatching())
-			return getReplacementString();
-		
-		String prefix= getPrefix(document, completionOffset);
-		return getCamelCaseCompound(prefix, getReplacementString());
-	}
-
-	/*
-	 * @see ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-
-	/**
-	 * Sets the image.
-	 * @param image The image to set
-	 */
-	public void setImage(Image image) {
-		fImage= image;
-	}
-
-	/*
-	 * @see ICompletionProposalExtension#isValidFor(IDocument, int)
-	 */
-	public boolean isValidFor(IDocument document, int offset) {
-		return validate(document, offset, null);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
-	 */
-	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-
-		if (offset < getReplacementOffset())
-			return false;
-		
-		boolean validated= isValidPrefix(getPrefix(document, offset));
-
-		if (validated && event != null) {
-			// adapt replacement range to document change
-			int delta= (event.fText == null ? 0 : event.fText.length()) - event.fLength;
-			final int newLength= Math.max(getReplacementLength() + delta, 0);
-			setReplacementLength(newLength);
-		}
-
-		return validated;
-	}
-
-	/**
-	 * Checks whether <code>prefix</code> is a valid prefix for this proposal. Usually, while code
-	 * completion is in progress, the user types and edits the prefix in the document in order to
-	 * filter the proposal list. From {@link #validate(IDocument, int, DocumentEvent) }, the
-	 * current prefix in the document is extracted and this method is called to find out whether the
-	 * proposal is still valid.
-	 * <p>
-	 * The default implementation checks if <code>prefix</code> is a prefix of the proposal's
-	 * {@link #getDisplayString() display string} using the {@link #isPrefix(String, String) }
-	 * method.
-	 * </p>
-	 * 
-	 * @param prefix the current prefix in the document
-	 * @return <code>true</code> if <code>prefix</code> is a valid prefix of this proposal
-	 */
-	protected boolean isValidPrefix(String prefix) {
-		/*
-		 * See http://dev.eclipse.org/bugs/show_bug.cgi?id=17667
-		 * why we do not use the replacement string.
-		 * String word= fReplacementString;
-		 */
-		return isPrefix(prefix, getDisplayString());
-	}
-
-	/**
-	 * Gets the proposal's relevance.
-	 * @return Returns a int
-	 */
-	public int getRelevance() {
-		return fRelevance;
-	}
-
-	/**
-	 * Sets the proposal's relevance.
-	 * @param relevance The relevance to set
-	 */
-	public void setRelevance(int relevance) {
-		fRelevance= relevance;
-	}
-
-	/**
-	 * Returns the text in <code>document</code> from {@link #getReplacementOffset()} to
-	 * <code>offset</code>. Returns the empty string if <code>offset</code> is before the
-	 * replacement offset or if an exception occurs when accessing the document.
-	 * 
-	 * @since 3.2
-	 */
-	protected String getPrefix(IDocument document, int offset) {
-		try {
-			int length= offset - getReplacementOffset();
-			if (length > 0)
-				return document.get(getReplacementOffset(), length);
-		} catch (BadLocationException x) {
-		}
-		return ""; //$NON-NLS-1$
-	}
-	
-	/**
-	 * Case insensitive comparison of <code>prefix</code> with the start of <code>string</code>.
-	 * Returns <code>false</code> if <code>prefix</code> is longer than <code>string</code>
-	 * 
-	 * @since 3.2
-	 */
-	protected boolean isPrefix(String prefix, String string) {
-		if (prefix == null || string ==null || prefix.length() > string.length())
-			return false;
-		String start= string.substring(0, prefix.length());
-		return start.equalsIgnoreCase(prefix) || isCamelCaseMatching() && CharOperation.camelCaseMatch(prefix.toCharArray(), string.toCharArray());
-	}
-
-	/**
-	 * Matches <code>prefix</code> against <code>string</code> and replaces the matched region
-	 * by prefix. Case is preserved as much as possible. This method returns <code>string</code> if camel case completion
-	 * is disabled. Examples when camel case completion is enabled:
-	 * <ul>
-	 * <li>getCamelCompound("NuPo", "NullPointerException") -> "NuPointerException"</li>
-	 * <li>getCamelCompound("NuPoE", "NullPointerException") -> "NuPoException"</li>
-	 * <li>getCamelCompound("hasCod", "hashCode") -> "hasCode"</li>
-	 * </ul>
-	 * 
-	 * @param prefix the prefix to match against
-	 * @param string the string to match
-	 * @return a compound of prefix and any postfix taken from <code>string</code>
-	 * @since 3.2
-	 */
-	protected final String getCamelCaseCompound(String prefix, String string) {
-		if (prefix.length() > string.length())
-			return string;
-
-		// a normal prefix - no camel case logic at all
-		String start= string.substring(0, prefix.length());
-		if (start.equalsIgnoreCase(prefix))
-			return string;
-
-		final char[] patternChars= prefix.toCharArray();
-		final char[] stringChars= string.toCharArray();
-
-		for (int i= 1; i <= stringChars.length; i++)
-			if (CharOperation.camelCaseMatch(patternChars, 0, patternChars.length, stringChars, 0, i))
-				return prefix + string.substring(i);
-
-		// Not a camel case match at all.
-		// This should not happen -> stay with the default behavior
-		return string;
-	}
-
-	/**
-	 * Returns true if camel case matching is enabled.
-	 * 
-	 * @since 3.2
-	 */
-	protected boolean isCamelCaseMatching() {
-		IJavaProject project= getProject();
-		String value;
-		if (project == null)
-			value= JavaCore.getOption(JavaCore.CODEASSIST_CAMEL_CASE_MATCH);
-		else
-			value= project.getOption(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, true);
-		
-		return JavaCore.ENABLED.equals(value);
-	}
-	
-	private IJavaProject getProject() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-	private static boolean insertCompletion() {
-		IPreferenceStore preference= PreferenceConstants.getPreferenceStore();
-		return preference.getBoolean(PreferenceConstants.CODEASSIST_INSERT_COMPLETION);
-	}
-
-	private static Color getForegroundColor(StyledText text) {
-
-		IPreferenceStore preference= PreferenceConstants.getPreferenceStore();
-		RGB rgb= PreferenceConverter.getColor(preference, PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND);
-		return JavaUI.getColorManager().getColor(rgb);
-	}
-
-	private static Color getBackgroundColor(StyledText text) {
-
-		IPreferenceStore preference= PreferenceConstants.getPreferenceStore();
-		RGB rgb= PreferenceConverter.getColor(preference, PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND);
-		return JavaUI.getColorManager().getColor(rgb);
-	}
-
-	private void repairPresentation(ITextViewer viewer) {
-		if (fRememberedStyleRange != null) {
-			 if (viewer instanceof ITextViewerExtension2) {
-			 	// attempts to reduce the redraw area
-			 	ITextViewerExtension2 viewer2= (ITextViewerExtension2) viewer;
-
-			 	if (viewer instanceof ITextViewerExtension5) {
-
-			 		ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
-			 		IRegion modelRange= extension.widgetRange2ModelRange(new Region(fRememberedStyleRange.start, fRememberedStyleRange.length));
-			 		if (modelRange != null)
-			 			viewer2.invalidateTextPresentation(modelRange.getOffset(), modelRange.getLength());
-
-			 	} else {
-					viewer2.invalidateTextPresentation(fRememberedStyleRange.start + viewer.getVisibleRegion().getOffset(), fRememberedStyleRange.length);
-			 	}
-
-			} else
-				viewer.invalidateTextPresentation();
-		}
-	}
-
-	private void updateStyle(ITextViewer viewer) {
-
-		StyledText text= viewer.getTextWidget();
-		if (text == null || text.isDisposed())
-			return;
-
-		int widgetCaret= text.getCaretOffset();
-
-		int modelCaret= 0;
-		if (viewer instanceof ITextViewerExtension5) {
-			ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
-			modelCaret= extension.widgetOffset2ModelOffset(widgetCaret);
-		} else {
-			IRegion visibleRegion= viewer.getVisibleRegion();
-			modelCaret= widgetCaret + visibleRegion.getOffset();
-		}
-
-		if (modelCaret >= getReplacementOffset() + getReplacementLength()) {
-			repairPresentation(viewer);
-			return;
-		}
-
-		int offset= widgetCaret;
-		int length= getReplacementOffset() + getReplacementLength() - modelCaret;
-
-		Color foreground= getForegroundColor(text);
-		Color background= getBackgroundColor(text);
-
-		StyleRange range= text.getStyleRangeAtOffset(offset);
-		int fontStyle= range != null ? range.fontStyle : SWT.NORMAL;
-
-		repairPresentation(viewer);
-		fRememberedStyleRange= new StyleRange(offset, length, foreground, background, fontStyle);
-		if (range != null) {
-			fRememberedStyleRange.strikeout= range.strikeout;
-			fRememberedStyleRange.underline= range.underline;
-		}
-
-		// http://dev.eclipse.org/bugs/show_bug.cgi?id=34754
-		try {
-			text.setStyleRange(fRememberedStyleRange);
-		} catch (IllegalArgumentException x) {
-			// catching exception as offset + length might be outside of the text widget
-			fRememberedStyleRange= null;
-		}
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(ITextViewer, boolean)
-	 */
-	public void selected(ITextViewer viewer, boolean smartToggle) {
-		if (!insertCompletion() ^ smartToggle)
-			updateStyle(viewer);
-		else {
-			repairPresentation(viewer);
-			fRememberedStyleRange= null;
-		}
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(ITextViewer)
-	 */
-	public void unselected(ITextViewer viewer) {
-		repairPresentation(viewer);
-		fRememberedStyleRange= null;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
-	 */
-	public IInformationControlCreator getInformationControlCreator() {
-//		if (!BrowserInformationControl.isAvailable(null))
-//			return null;
-//		
-//		if (fCreator == null) {
-//			fCreator= new AbstractReusableInformationControlCreator() {
-//				
-//				/*
-//				 * @see org.eclipse.jdt.internal.ui.text.java.hover.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell)
-//				 */
-//				public IInformationControl doCreateInformationControl(Shell parent) {
-//					return new BrowserInformationControl(parent, SWT.NO_TRIM | SWT.TOOL, SWT.NONE, null);
-//				}
-//			};
-//		}
-//		return fCreator;
-		return null;
-	}
-
-	public String getSortString() {
-		return fSortString;
-	}
-
-	protected void setSortString(String string) {
-		fSortString= string;
-	}
-
-	protected ITextViewer getTextViewer() {
-		return fTextViewer;
-	}
-
-	protected boolean isToggleEating() {
-		return fToggleEating;
-	}
-
-	/**
-	 * Sets up a simple linked mode at {@link #getCursorPosition()} and an exit policy that will
-	 * exit the mode when <code>closingCharacter</code> is typed and an exit position at
-	 * <code>getCursorPosition() + 1</code>.
-	 * 
-	 * @param document the document
-	 * @param closingCharacter the exit character
-	 */
-	protected void setUpLinkedMode(IDocument document, char closingCharacter) {
-		if (getTextViewer() != null && autocloseBrackets()) {
-			int offset= getReplacementOffset() + getCursorPosition();
-			int exit= getReplacementOffset() + getReplacementString().length();
-			try {
-				LinkedPositionGroup group= new LinkedPositionGroup();
-				group.addPosition(new LinkedPosition(document, offset, 0, LinkedPositionGroup.NO_STOP));
-				
-				LinkedModeModel model= new LinkedModeModel();
-				model.addGroup(group);
-				model.forceInstall();
-				
-				LinkedModeUI ui= new EditorLinkedModeUI(model, getTextViewer());
-				ui.setSimpleMode(true);
-				ui.setExitPolicy(new ExitPolicy(closingCharacter, document));
-				ui.setExitPosition(getTextViewer(), exit, 0, Integer.MAX_VALUE);
-				ui.setCyclingMode(LinkedModeUI.CYCLE_NEVER);
-				ui.enter();
-			} catch (BadLocationException x) {
-				x.printStackTrace();
-			}
-		}
-	}
-	
-	protected boolean autocloseBrackets() {
-		IPreferenceStore preferenceStore= PreferenceConstants.getPreferenceStore();
-		return preferenceStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_BRACKETS);
-	}
-
-	protected void setDisplayString(String string) {
-		fDisplayString= string;
-	}
-	
-	/*
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getDisplayString();
-	}
-	
-	/**
-	 * Returns the java element proposed by the receiver, possibly <code>null</code>.
-	 * 
-	 * @return the java element proposed by the receiver, possibly <code>null</code>
-	 */
-	public IJavaElement getJavaElement() {
-//		if (getProposalInfo() != null)
-//			try {
-//				return getProposalInfo().getJavaElement();
-//			} catch (JavaModelException x) {
-//				JavaPlugin.log(x);
-//			}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
deleted file mode 100644
index 43bd2a4ae..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
+++ /dev/null
@@ -1,728 +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 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationTagParser;
-import org.eclipse.jst.common.internal.annotations.core.TagParseEventHandler;
-import org.eclipse.jst.common.internal.annotations.core.Token;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationTagRegistry;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValuesHelper;
-import org.eclipse.jst.common.internal.annotations.registry.TagAttribSpec;
-import org.eclipse.jst.common.internal.annotations.registry.TagSpec;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-
-/**
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagCompletionProc implements IJavadocCompletionProcessor, TagParseEventHandler {
-	private static final String[] BOOLEAN_VALID_VALUES = new String[]{"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
-	ICompilationUnit m_icu;
-
-	IDocument m_doc;
-
-	List m_tags;
-
-	// Instance variables active when maybeCompleteAttribute is live.
-	Token m_tagName;
-
-	/**
-	 * Set of all attributes names encountered. Only live when maybeCompleteAttribute is live.
-	 */
-	Set m_attSet = new TreeSet();
-
-	/**
-	 * List of Attribute. Only live when maybeCompleAttribute is live.
-	 */
-	List m_attributes = new ArrayList();
-
-	AnnotationTagParser m_parser = new AnnotationTagParser(this);
-
-	/**
-	 * Scope of the tag. TagSpec.TYPE | TagSpec.METHOD | TagSpec.FIELD. Not valid until
-	 * getAnnotationArea has been called for a completions request, and only then if
-	 * getAnnotationArea() did not return null.
-	 */
-	int m_tagScope;
-
-	public AnnotationTagCompletionProc() {
-		initTagInfo();
-	}
-
-	private void initTagInfo() {
-		if (m_tags == null)
-			m_tags = AnnotationTagRegistry.getAllTagSpecs();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
-	 *      int)
-	 */
-	public IContextInformation[] computeContextInformation(ICompilationUnit cu, int offset) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
-	 *      int, int, int)
-	 */
-	public IJavaCompletionProposal[] computeCompletionProposals(ICompilationUnit cu, int offset, int length, int flags) {
-		IEditorInput editorInput = new FileEditorInput((IFile) cu.getResource());
-
-		// Set up completion processor state.
-		m_doc = JavaUI.getDocumentProvider().getDocument(editorInput);
-		m_icu = cu;
-
-		try {
-			AnnotationArea area = getAnnotationArea(offset);
-
-			if (area == null) {
-				return null;
-			}
-
-			// Check for tag completion first. ( the easier case )
-			String tsf = getTagSoFarIfNotCompleted(area.beginOffset, offset);
-
-			if (tsf != null) {
-				return getTagCompletionsFor(tsf, area, length);
-			}
-
-			// Ach, have to try the harder case now, where we parse the
-			// annotation
-			return maybeCompleteAttribute(area, offset);
-
-		} catch (JavaModelException e) {
-			// Silently fail.
-			return null;
-		} catch (BadLocationException ex) {
-			return null;
-		}
-	}
-
-	private IJavaCompletionProposal[] maybeCompleteAttribute(AnnotationArea area, int cursorPos) throws BadLocationException {
-		m_attSet.clear();
-		m_attributes.clear();
-
-		m_parser.setParserInput(m_doc.get(area.beginOffset, area.length()));
-		m_parser.parse();
-
-		TagSpec ts = null;
-		if (m_tagName!=null)
-			ts = getTagSpecForTagName(m_tagName.getText());
-
-		// Do we even recognize this tag?
-		if (ts == null) {
-			return null;
-		}
-
-		// Loop through and determine whether the cursor is within a attribute
-		// assignment, or between assignements.
-		Attribute target = null;
-		Attribute last = null;
-		Attribute before = null;
-		Attribute a = null;
-		boolean between = false;
-		int rCurPos = area.relativeCursorPos(cursorPos);
-		Iterator i = m_attributes.iterator();
-		while (i.hasNext()) {
-			a = (Attribute) i.next();
-
-			if (a.contains(rCurPos)) {
-				target = a;
-				break;
-			} else if (last != null) {
-				// See if the cursor is between, but not directly adjacent to
-				// the last two attributes.
-				if (rCurPos > last.maxExtent() + 1 && rCurPos < a.minExtent() - 1) {
-					between = true;
-					break;
-				} else if (a.immediatelyPrecedes(rCurPos)) {
-					before = a;
-					break;
-				}
-			}
-			last = a;
-		}
-
-		if (target == null) {
-			if (between) {
-				// If we're between attributes, suggest all possible attributes.
-				return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-			} else if (before != null) {
-				// We're right after the attribute named in 'before', so set the
-				// target to it, and fall
-				//  through to the target handling code.
-				target = before;
-			} else {
-				// not between and not immediately after an attribute. We are
-				// past the end of the parsed annotation.
-				//  Only offer suggestions if it looks like the last annotation
-				// attribute is valid.
-				if (a == null) {
-					// No annotations attributes, suggest everything.
-					return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-				} else if (rCurPos > a.maxExtent()) {
-					if (a.hasAssignment() && a.hasValue()) {
-						// Last annotation was good, and we're past it, so do
-						// completions for anything
-						return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-					} else if (a.hasAssignment())
-						return attributeValidValuesFor(ts, a, area, cursorPos);
-					else
-						return attributeCompletionsFor(ts, cursorPos - a.name.length(), 0, a.name.getText(), true);
-				} else {
-					// Didn't match anything, not past the end - we're probably
-					// the first attribute
-					// being added to the tag.
-					return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-				}
-			}
-		}
-
-		// Completion for a partial attribute name?
-		if (target.name.immediatelyPrecedes(rCurPos)) {
-			return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText(), !target.hasAssignment());
-		}
-
-		// Are we in the middle of a name?
-		if (target.name.contains(rCurPos)) {
-			// We've opted to replace the entire name for this case, which seems
-			// to make the most sense.
-			return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText().substring(0, rCurPos - target.name.getBeginning()), !target.hasAssignment());
-		}
-
-		// If we got this far, we're either in a value, or really confused.
-		// try and return valid values or bail?
-		if (a.value != null && (a.value.contains(rCurPos) || (target.hasAssignment() && area.relativeCursorPos(cursorPos) > a.name.getBeginning())))
-			return attributeValidValuesFor(ts, a, area, cursorPos);
-		return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-	}
-
-	/**
-	 * @return valid values for the attribute
-	 */
-	private IJavaCompletionProposal[] attributeValidValuesFor(TagSpec ts, Attribute a, AnnotationArea area, int cursorPos) {
-		TagAttribSpec tas = ts.attributeNamed(a.name.getText());
-		if (tas == null)
-			return null;
-		String[] validValues = getValidValues(tas, a, area);
-		String partialValue = calculatePartialValue(a, area, cursorPos);
-		int valueOffset = calculateValueOffset(a, area, cursorPos);
-		if (validValues == null || validValues.length == 0)
-			return createCustomAttributeCompletionProposals(ts, tas, partialValue, valueOffset, a.value.getText(), area.javaElement);
-		return createAttributeCompletionProposals(partialValue, valueOffset, validValues);
-	}
-
-	/**
-	 * @param ts
-	 * @param tas
-	 * @param partialValue
-	 * @param valueOffset
-	 * @param value
-	 * @param javaElement
-	 * @return
-	 */
-	private IJavaCompletionProposal[] createCustomAttributeCompletionProposals(TagSpec ts, TagAttribSpec tas, String partialValue, int valueOffset, String value, IJavaElement javaElement) {
-		AttributeValuesHelper helper = ts.getValidValuesHelper();
-		if (helper == null)
-			return null;
-		AttributeValueProposalHelper[] proposalHelpers = helper.getAttributeValueProposalHelpers(tas, partialValue, valueOffset, javaElement);
-		if (proposalHelpers == null || proposalHelpers.length == 0)
-			return null;
-		IJavaCompletionProposal[] proposals = new IJavaCompletionProposal[proposalHelpers.length];
-		AnnotationTagProposal proposal;
-		for (int i = 0; i < proposalHelpers.length; i++) {
-			proposal = new AnnotationTagProposal(proposalHelpers[i]);
-			//proposal.setPartialValueString(partialValue);
-			proposals[i] = proposal;
-		}
-		return proposals;
-	}
-
-	private IJavaCompletionProposal[] createAttributeCompletionProposals(String partialValue, int valueOffset, String[] validValues) {
-		List resultingValues = new ArrayList();
-		for (int i = 0; i < validValues.length; i++) {
-			String rplString = validValues[i];
-			if (partialValue != null && !rplString.startsWith(partialValue))
-				continue;
-			AnnotationTagProposal prop = new AnnotationTagProposal(rplString, valueOffset, 0, null, rplString, 90);
-			prop.setEnsureQuoted(true);
-			//prop.setPartialValueString(partialValue);
-			resultingValues.add(prop);
-		}
-		if (resultingValues.isEmpty())
-			return null;
-		return (IJavaCompletionProposal[]) resultingValues.toArray(new IJavaCompletionProposal[resultingValues.size()]);
-	}
-
-	private String[] getValidValues(TagAttribSpec tas, Attribute a, AnnotationArea area) {
-		String[] validValues = tas.getValidValues();
-		if (validValues == null || validValues.length == 0) {
-			AttributeValuesHelper helper = tas.getTagSpec().getValidValuesHelper();
-			if (helper == null)
-				return null;
-			validValues = helper.getValidValues(tas, area.javaElement);
-			if ((validValues == null || validValues.length == 0) && tas.valueIsBool())
-				validValues = BOOLEAN_VALID_VALUES;
-		}
-		return validValues;
-	}
-
-	/**
-	 * @param a
-	 * @param area
-	 * @param cursorPos
-	 * @return
-	 */
-	private int calculateValueOffset(Attribute a, AnnotationArea area, int cursorPos) {
-		if (a.value == null)
-			return cursorPos;
-		int nameEnd = a.name.getEnd();
-		int valBeg = a.value.getBeginning();
-		if (valBeg > nameEnd + 2)
-			return area.relativeToAbs(nameEnd + 2); //Value too far away to be correct.
-		return area.relativeToAbs(valBeg);
-	}
-
-	/**
-	 * @param a
-	 * @param area
-	 * @param cursorPos
-	 * @return
-	 */
-	private String calculatePartialValue(Attribute a, AnnotationArea area, int cursorPos) {
-		if (a.value == null)
-			return null;
-		int nameEnd = a.name.getEnd();
-		int valueBeg = a.value.getBeginning();
-		if (valueBeg > nameEnd + 2)
-			return null; //Value is too far away so it must not be part of this attribute.
-		int relativePos = area.relativeCursorPos(cursorPos);
-		if (a.value.contains(relativePos)) {
-			boolean hasBeginQuote = valueBeg - nameEnd == 2;
-			String value = a.value.getText();
-			int end = relativePos - valueBeg;
-			if (hasBeginQuote)
-				end--;
-			if (end > -1) {
-				int length = value.length();
-				if (end < length)
-					return value.substring(0, end);
-				else if (end == length)
-					return value;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param tagName
-	 * @return
-	 */
-	private TagSpec getTagSpecForTagName(String tagName) {
-		String simpleName = tagName;
-		if (tagName != null && tagName.length() > 0 && tagName.charAt(0) == '@')
-			simpleName = tagName.length() == 2 ? "" : tagName.substring(1); //$NON-NLS-1$
-		switch (m_tagScope) {
-			case TagSpec.TYPE :
-				return AnnotationTagRegistry.getTypeTag(simpleName);
-			case TagSpec.METHOD :
-				return AnnotationTagRegistry.getMethodTag(simpleName);
-			case TagSpec.FIELD :
-				return AnnotationTagRegistry.getFieldTag(simpleName);
-		}
-		return null;
-	}
-
-	private IJavaCompletionProposal[] attributeCompletionsFor(TagSpec ts, int replaceOffset, int replaceLength, String partialAttributeName, boolean appendEquals) {
-		Iterator i = ts.getAttributes().iterator();
-		List props = new ArrayList();
-		while (i.hasNext()) {
-			TagAttribSpec tas = (TagAttribSpec) i.next();
-			String aname = tas.getAttribName();
-
-			// Don't suggest attributes that have already been specified.
-			if (!m_attSet.contains(aname)) {
-				if (aname.startsWith(partialAttributeName)) {
-					String rtxt = appendEquals ? aname + '=' : aname;
-					AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, replaceOffset, replaceLength, null, aname, 90);
-					prop.setHelpText(lookupAttHelp(tas));
-					props.add(prop);
-				}
-			}
-		}
-		if (props.isEmpty()) {
-			return null;
-		}
-		return (IJavaCompletionProposal[]) props.toArray(new IJavaCompletionProposal[props.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#annotationTag(com.ibm.ws.rd.annotations.Token)
-	 */
-	public void annotationTag(Token tag) {
-		m_tagName = tag;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#endOfTag(int)
-	 */
-	public void endOfTag(int pos) {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#attribute(com.ibm.ws.rd.annotations.Token,
-	 *      int, com.ibm.ws.rd.annotations.Token)
-	 */
-	public void attribute(Token name, int equalsPosition, Token value) {
-		m_attributes.add(new Attribute(name, equalsPosition, value));
-		m_attSet.add(name.getText());
-	}
-
-	private String getReplacementForTag(TagSpec ts, int beginIndex) {
-		StringBuffer bud = new StringBuffer(32);
-
-		bud.append('@');
-		bud.append(ts.getTagName());
-
-		String prefix = getArrayPrefixForMultipleAttribs(beginIndex);
-		List attributes = ts.getAttributes();
-
-		for (int i = 0; i < attributes.size(); i++) {
-			TagAttribSpec tas = (TagAttribSpec) attributes.get(i);
-
-			if (tas.isRequired()) {
-				bud.append(prefix);
-				bud.append(tas.getAttribName());
-				bud.append('=');
-			}
-		}
-		return bud.toString();
-	}
-
-	private String getArrayPrefixForMultipleAttribs(int beginIndex) {
-		String result = null;
-		String source = null;
-		// Get source from compilation unit
-		try {
-			source = m_icu.getSource();
-			if (source == null || beginIndex < 0)
-				return result;
-			// trim off everything after our begin index
-			source = source.substring(0, beginIndex + 1);
-			int newLineIndex = source.lastIndexOf('\n');
-			//if we are on first line...
-			if (newLineIndex == -1)
-				newLineIndex = 0;
-			// Get the current line
-			String currentLine = source.substring(newLineIndex, beginIndex + 1);
-			// Currently we have to have the '@' sign to show our menu
-			int annotationIndex = currentLine.lastIndexOf('@');
-			result = currentLine.substring(0, annotationIndex);
-			result = result + "  "; //$NON-NLS-1$
-		} catch (Exception e) {
-			// Do nothing
-		}
-
-		return result;
-	}
-
-	private IJavaCompletionProposal[] getTagCompletionsFor(String partialTagName, AnnotationArea area, int selectLength) {
-		List found = new ArrayList();
-
-		for (int i = 0; i < m_tags.size(); i++) {
-			TagSpec ts = (TagSpec) m_tags.get(i);
-			String tname = ts.getTagName();
-
-			if (ts.getScope() == m_tagScope && tname.startsWith(partialTagName)) {
-				String rtxt = getReplacementForTag(ts, area.beginOffset);
-				String labl = '@' + tname;
-				AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, area.beginOffset, Math.max(selectLength, rtxt.length()), null, labl, 90);
-				prop.setHelpText(lookupTagHelp(ts));
-				found.add(prop);
-			}
-		}
-
-		if (!found.isEmpty()) {
-			return (IJavaCompletionProposal[]) found.toArray(new IJavaCompletionProposal[found.size()]);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	private static boolean isWS1(char c) {
-		return c == ' ' || c == '\t' || c == '*' || c == '\r' || c == '\n';
-	}
-
-	private String getTagSoFarIfNotCompleted(int startingAt, int cursorAt) throws BadLocationException {
-		if (m_doc.getChar(startingAt) != '@') {
-			return null;
-		}
-
-		int firstChar = startingAt + 1;
-
-		if (firstChar == cursorAt) {
-			return ""; //$NON-NLS-1$
-		}
-
-		for (int i = firstChar; i < cursorAt; i++) {
-			char c = m_doc.getChar(i);
-
-			if (isWS1(c)) {
-				return null;
-			}
-		}
-
-		return m_doc.get(firstChar, cursorAt - firstChar);
-	}
-
-	/**
-	 * Calculates the the area of the annotation we're trying to complete. Also initializes
-	 * m_tagScope.
-	 * 
-	 * @param fromOffset
-	 * @return
-	 * @throws JavaModelException
-	 */
-	private AnnotationArea getAnnotationArea(int fromOffset) throws JavaModelException {
-		// First, roughly calculate the end of the comment.
-		IJavaElement el = m_icu.getElementAt(fromOffset);
-		int absmax, absmin;
-		if (el == null)
-			return null;
-		int ty = el.getElementType();
-
-		switch (ty) {
-			case IJavaElement.FIELD :
-				IField f = (IField) el;
-				absmax = f.getNameRange().getOffset();
-				absmin = f.getSourceRange().getOffset();
-				m_tagScope = TagSpec.FIELD;
-				break;
-
-			case IJavaElement.TYPE :
-				IType t = (IType) el;
-				absmax = t.getNameRange().getOffset();
-				absmin = t.getSourceRange().getOffset();
-				m_tagScope = TagSpec.TYPE;
-				break;
-
-			case IJavaElement.METHOD :
-				IMethod m = (IMethod) el;
-				absmax = m.getNameRange().getOffset();
-				absmin = m.getSourceRange().getOffset();
-				m_tagScope = TagSpec.METHOD;
-				break;
-
-			default :
-				m_tagScope = -1;
-				return null;
-		}
-
-		// Make sure we're not after the name for the member.
-		if (absmax < fromOffset) {
-			return null;
-		}
-
-		int min = 0, max = 0;
-		try {
-			// Search backwards for the starting '@'.
-			boolean found = false;
-			for (min = fromOffset; min >= absmin; min--) {
-				if (m_doc.getChar(min) == '@') {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				return null;
-			}
-
-			// Search forwards for the next '@', or the end of the comment.
-			for (max = fromOffset + 1; max < absmax; max++) {
-				if (m_doc.getChar(max) == '@') {
-					break;
-				}
-			}
-		} catch (BadLocationException e) {
-			return null;
-		}
-
-		return new AnnotationArea(el, min, Math.min(absmax, max));
-	}
-
-	private String lookupTagHelp(TagSpec ts) {
-		if (ts != null)
-			try {
-				return ts.lookupTagHelp();
-			} catch (MissingResourceException e) {
-				// Do nothing, return null
-			}
-		return null;
-	}
-
-	private String lookupAttHelp(TagAttribSpec tas) {
-		if (tas != null)
-			try {
-				return tas.lookupTagHelp();
-			} catch (MissingResourceException e) {
-				// Do nothing, return null
-			}
-		return null;
-	}
-
-	/**
-	 * A range that goes from the beginning position up to, but not including, the end position.
-	 */
-	private static class AnnotationArea {
-		/**
-		 * Document offset of the beginning of the javadoc annotation.
-		 */
-		int beginOffset;
-
-		/**
-		 * Document offset of the end of the area that could contain an annotation.
-		 */
-		int endOffset;
-		/**
-		 * The Java element that this annotation is assigned.
-		 * 
-		 * @param beg
-		 * @param end
-		 */
-		IJavaElement javaElement;
-
-		public AnnotationArea(IJavaElement javaElement, int beg, int end) {
-			this.javaElement = javaElement;
-			beginOffset = beg;
-			endOffset = end;
-		}
-
-		public boolean contains(int offset) {
-			return offset >= beginOffset && offset < endOffset;
-		}
-
-		public int length() {
-			return endOffset - beginOffset;
-		}
-
-		/**
-		 * Returns the cursor position relative to the area. Only valid if
-		 * <code>this.contains( absCursorPos )</code>
-		 * 
-		 * @param absCursorPos
-		 * @return
-		 */
-		public int relativeCursorPos(int absCursorPos) {
-			return absCursorPos - beginOffset;
-		}
-
-		public int relativeToAbs(int relPos) {
-			return beginOffset + relPos;
-		}
-	}
-
-	private static class Attribute {
-		Token name;
-
-		Token value;
-
-		int equalsPos;
-
-		Attribute(Token n, int ep, Token v) {
-			name = n;
-			value = v;
-			equalsPos = ep;
-		}
-
-		public boolean hasAssignment() {
-			return equalsPos != -1;
-		}
-
-		public boolean hasValue() {
-			return value.length() != 0;
-		}
-
-		public boolean contains(int srcPos) {
-			return srcPos >= minExtent() && srcPos <= maxExtent();
-		}
-
-		public int minExtent() {
-			return name.getBeginning();
-		}
-
-		public int maxExtent() {
-			if (hasAssignment()) {
-				if (hasValue())
-					return value.getEnd();
-				return equalsPos;
-			}
-			return name.getEnd();
-		}
-
-		public boolean immediatelyPrecedes(int pos) {
-			return maxExtent() + 1 == pos;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
deleted file mode 100644
index 8dfa29aeb..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
+++ /dev/null
@@ -1,208 +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 Sep 4, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author kelleyp
- * 
- * A completion proposal especially for Annotation tag completions. This problem this class was
- * created to solve was the problem of attaching help text to a proposal. The mechanism inside of
- * JavaCompletionProposal was useless to us, since it was tied to the idea that the proposal would
- * be for an actual java element, that has javadoc attached to it, etc... So here we subclass
- * JavaCompletionProposal and override <code>getAdditionalProposalInfo</code> for a more suitable
- * way of associating help text with a proposal.
- */
-public class AnnotationTagProposal extends AbstractAnnotationTagProposal implements IJavaCompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2 {
-	private static final char QUOTE = '"';
-	private boolean ensureBeginQuote = false;
-	private boolean ensureEndQuote = false;
-	private String localString;
-	//String used to validate the prefix.
-	private String fValidationString;
-
-	/**
-	 * Localized help text.
-	 */
-	private String locText;
-
-	/**
-	 * 
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param image
-	 * @param displayString
-	 * @param relevance
-	 */
-	public AnnotationTagProposal(String replacementString, int replacementOffset, int replacementLength, Image image, String displayString, int relevance) {
-		Assert.isNotNull(replacementString);
-		Assert.isTrue(replacementOffset >= 0);
-		Assert.isTrue(replacementLength >= 0);
-
-		setReplacementString(replacementString);
-		setReplacementOffset(replacementOffset);
-		setReplacementLength(replacementLength);
-		setImage(image);
-		setDisplayString(displayString == null ? replacementString : displayString);
-		setRelevance(relevance);
-		setCursorPosition(replacementString.length());
-		setSortString(displayString == null ? replacementString : displayString);
-		this.localString = replacementString;
-	}
-
-	/**
-	 * @see JavaCompletionProposal#JavaCompletionProposal(java.lang.String, int, int,
-	 *      org.eclipse.swt.graphics.Image, java.lang.String, int,
-	 *      org.eclipse.jface.text.ITextViewer)
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param image
-	 * @param displayString
-	 * @param relevance
-	 */
-
-	public AnnotationTagProposal(AttributeValueProposalHelper proposalHelper) {
-		this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), null, proposalHelper.getValueDisplayString(), 90);
-		if (proposalHelper instanceof UIAttributeValueProposalHelper)
-			setImage(((UIAttributeValueProposalHelper) proposalHelper).getImage());
-		setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
-		setEnsureEndQuote(proposalHelper.ensureEndQuote());
-	}
-
-	public AnnotationTagProposal(UIAttributeValueProposalHelper proposalHelper) {
-		this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), proposalHelper.getImage(), proposalHelper.getValueDisplayString(), 90);
-		setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
-		setEnsureEndQuote(proposalHelper.ensureEndQuote());
-	}
-
-	/**
-	 * Our override that uses <code>textHolder</code> to provide the help text.
-	 */
-	public String getAdditionalProposalInfo() {
-		return locText;
-	}
-
-	/**
-	 * Sets the holder of the help text that can be displayed with this proposal.
-	 * 
-	 * @param hld
-	 *            an LocalizedTextContainer
-	 */
-	public void setHelpText(String s) {
-		locText = s;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal#apply(org.eclipse.jface.text.IDocument,
-	 *      char, int)
-	 */
-	public void apply(IDocument document, char trigger, int offset) {
-		ensureQuotedIfNecessary(document, offset);
-		super.apply(document, trigger, offset);
-	}
-
-	/**
-	 * @param document
-	 * @param offset
-	 */
-	private void ensureQuotedIfNecessary(IDocument document, int offset) {
-		if (ensureBeginQuote || ensureEndQuote) {
-			try {
-				char begin = document.getChar(getReplacementOffset() - 1);
-				char end = document.getChar(offset);
-				if (ensureBeginQuote && ensureEndQuote && begin != QUOTE && end != QUOTE) {
-					StringBuffer b = new StringBuffer();
-					b.append(QUOTE).append(localString).append(QUOTE);
-					localString = b.toString();
-				} else if (ensureBeginQuote && begin != QUOTE)
-					localString = QUOTE + localString;
-				else if (ensureEndQuote && end != QUOTE)
-					localString = localString + QUOTE;
-				setReplacementString(localString);
-				setCursorPosition(localString.length());
-			} catch (BadLocationException e) {
-				// Do nothing
-			}
-		}
-	}
-
-	public void setEnsureQuoted(boolean ensureQuoted) {
-		setEnsureBeginQuote(ensureQuoted);
-		setEnsureEndQuote(ensureQuoted);
-	}
-
-	//public void setPartialValueString(String partialValueString) {
-	//	this.partialValueString = partialValueString;
-	//}
-	public void setEnsureBeginQuote(boolean ensureBeginQuote) {
-		this.ensureBeginQuote = ensureBeginQuote;
-	}
-
-	public void setEnsureEndQuote(boolean ensureEndQuote) {
-		this.ensureEndQuote = ensureEndQuote;
-	}
-	
-	protected boolean isValidPrefix(String prefix) {
-		if (getReplacementString().startsWith(getDisplayString())) {
-			return super.isValidPrefix(prefix);
-		}
-		return super.isPrefix(trim(prefix), getValidationString());
-	}
-	
-	private String getValidationString() {
-		if (fValidationString == null) {
-			fValidationString = trim(getReplacementString());
-		}
-		return fValidationString;
-	}
-
-	
-	/*
-	 * It is possible that the replacement string is complex and larger than the prefix.
-	 * In this case we want to trim the prefix to the last whitespace character.  This
-	 * will provide us with a prefix to use when matching the display string.
-	 */
-	private String trim(String aString) {
-		if (aString == null || aString.length() == 0)
-			return aString;
-		StringBuffer buffer = new StringBuffer();
-		char[] chars = aString.toCharArray();
-		for (int i = chars.length - 1; i > -1; i--) {
-			if (Character.isWhitespace(chars[i])) {
-				break;
-			} else {
-				buffer.append(chars[i]);
-			}
-		}
-		buffer = buffer.reverse();
-		return buffer.toString();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
deleted file mode 100644
index 6ef86fa68..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class IWRDResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jst.common.internal.annotations.ui.taghandlerui";//$NON-NLS-1$
-
-	private IWRDResources() {
-		// Do not instantiate
-	}
-
-	public static String J2EEAnnotationsCompletionProcessor_3;
-	public static String J2EEAnnotationsCompletionProcessor_4;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, IWRDResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
deleted file mode 100644
index d59538458..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
+++ /dev/null
@@ -1,41 +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.common.internal.annotations.ui;
-
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author DABERG
- *  
- */
-public class UIAttributeValueProposalHelper extends AttributeValueProposalHelper {
-	private Image image;
-
-	/**
-	 * @param replacementString
-	 * @param valueOffset
-	 * @param replacementLength
-	 * @param valueDisplayString
-	 */
-	public UIAttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
-		super(replacementString, valueOffset, replacementLength, valueDisplayString);
-	}
-
-	public Image getImage() {
-		return image;
-	}
-
-	public void setImage(Image image) {
-		this.image = image;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
deleted file mode 100644
index 6e96f4cb3..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.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
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static UiPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public UiPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.internal.annotations.ui.UiPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UiPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/.classpath b/plugins/org.eclipse.jst.j2ee.core/.classpath
deleted file mode 100644
index dcc933ecb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="mofj2ee/"/>
-	<classpathentry kind="src" path="webservices/"/>
-	<classpathentry kind="src" path="commonArchive/"/>
-	<classpathentry kind="src" path="j2ee-validation/"/>
-	<classpathentry kind="src" path="j2eeCorePlugin/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.core/.cvsignore b/plugins/org.eclipse.jst.j2ee.core/.cvsignore
deleted file mode 100644
index b39f8f47b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-runtime
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.core/.project b/plugins/org.eclipse.jst.j2ee.core/.project
deleted file mode 100644
index fc4f457ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 1a97c1c94..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,81 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: J2EE Core Component
-Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.application,
- org.eclipse.jst.j2ee.application.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.application.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.client,
- org.eclipse.jst.j2ee.client.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.client.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.common,
- org.eclipse.jst.j2ee.common.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.common.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.exception;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.core.internal.bindings,
- org.eclipse.jst.j2ee.core.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.ejb.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal;x-internal:=true,
- org.eclipse.jst.j2ee.internal.common;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.application;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.client;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.common;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.connector;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.ejb;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.webapplication;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.webservices;x-internal:=true,
- org.eclipse.jst.j2ee.internal.xml;x-internal:=true,
- org.eclipse.jst.j2ee.jca,
- org.eclipse.jst.j2ee.jca.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.jca.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.jsp,
- org.eclipse.jst.j2ee.jsp.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.jsp.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.model.internal.validation;x-internal:=true,
- org.eclipse.jst.j2ee.taglib.internal;x-internal:=true,
- org.eclipse.jst.j2ee.taglib.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.taglib.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webapplication,
- org.eclipse.jst.j2ee.webapplication.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webapplication.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.internal;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.internal.wsdd;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.jaxrpcmap,
- org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsclient,
- org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsclient.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wscommon,
- org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wscommon.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsdd,
- org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsdd.internal.util;x-internal:=true
-Require-Bundle: org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.core/about.html b/plugins/org.eclipse.jst.j2ee.core/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.core/build.properties b/plugins/org.eclipse.jst.j2ee.core/build.properties
deleted file mode 100644
index f1ce0a8e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               .,\
-               schema/
-src.includes = rose/,\
-               component.xml,\
-               model/
-jars.compile.order = .
-output.. = bin/
-source.. = mofj2ee/,\
-           webservices/,\
-           commonArchive/,\
-           j2eeCorePlugin/,\
-           j2ee-validation/
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties
deleted file mode 100644
index f50f5490a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} must be implemented in subclass
-key_class_reflection_ERROR_=IWAE0002E Unable to reflect the class "{0}" in order to compare the primary key field "{1}" from entity "{2}"
-key_field_reflection_ERROR_=IWAE0003E Unable to reflect the type of the primary key field "{0}" from entity "{1}"
-removing_key_field_INFO_=IWAE0004I Removing invalid prim-key-field "{0}" from entity "{1}"
-repair_usage_ERROR_=IWAE0005E RepairArchiveCommand usage: cannot write to destinationPath: {0}
-invalid_archive_EXC_=IWAE0006E Archive is not a valid {0} because the deployment descriptor can not be found (case sensitive): {1}
-load_resource_EXC_=IWAE0007E Could not load resource "{0}" in archive "{1}"
-nested_jar_EXC_=IWAE0008E An error occurred reading {0} from {1}
-make_temp_dir_EXC_=IWAE0009E Unable to make temp directory: {0}
-invalid_classpath_WARN_=IWAE0010W Classpath element "{0}" is not a directory or a Zip file
-invalid_cp_file_WARN_=IWAE0011W Classpath element "{0}" does not point to a local file
-io_ex_loading_EXC_=IWAE0012E An IO exception occurred loading {0}
-tx_bean_mgd_WARN_=IWAE0013W EJB 1.0 Import: Not mapping TX_BEAN_MANAGED control descriptor for {0}
-error_saving_EXC_=IWAE0014E Error saving {0}
-io_ex_manifest_EXC_=IWAE0015E An IOException occurred reading the manifest in archive: {0}
-io_ex_reopen_EXC_=IWAE0016E IOException occurred while reopening {0}
-unable_replace_EXC_=IWAE0017E Unable to replace original archive: {0}
-duplicate_file_EXC_=IWAE0018E The archive named {0} already contains a file named {1}
-duplicate_entry_EXC_=IWAE0019E A file or resource with uri {0} already exists in the archive named {1}
-file_exist_as_dir_EXC_=IWAE0020E A file named {0} exists and is a directory
-uncontained_module_EXC_=IWAE0021E Module {0} is not contained by an EAR file
-dd_in_ear_load_EXC_=IWAE0022E Exception occurred loading deployment descriptor for module "{0}" in EAR file "{1}"
-nested_open_fail_EXC_=IWAE0023E Unable to open module file "{0}" in EAR file "{1}"
-duplicate_module_EXC_=IWAE0024E The deployment descriptor for the EAR file "{0}" already contains a module having uri "{1}"
-no_sec_role_EXC_=IWAE0025E {0}: EAR File deployment descriptor does not contain a security role named {1}
-dup_sec_role_EXC_=IWAE0026E {0}: EAR File deployment descriptor already contains a security role named {1}
-dup_sec_role_module_EXC_=IWAE0027E Deployment descriptor for {0} already contains a security role named {1}
-dup_resource_EXC_=IWAE0028E Resource named "{0}" already exists in archive "{1}"
-error_saving_EXC_=IWAE0030E Error saving {0}
-add_copy_class_dir_EXC_=IWAE0031E The method "addCopyClass" is not supported for directories. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E The method "addCopyLib" is not supported for directories. URI: {0}
-list_components_war_EXC_=IWAE0033E Exception occurred listing components in WAR file: {0}
-open_nested_EXC_=IWAE0034E Could not open the nested archive "{0}" in "{1}"
-make_temp_file_WARN_=IWAE0035W Warning: Unable to create temp file for {0}.  This will impact performance.
-file_not_found_EXC_=IWAE0036E URI Name: {0}; File name: {1}
-could_not_open_EXC_=IWAE0037E Could not open {0}
-could_not_find_dir_EXC_=IWAE0038E Unable to open directory {0}
-not_a_dir_EXC_=IWAE0039E Unable to open directory because file is not a directory: {0}
-inferred_dds_EXC_=IWAE0040E The EJB JAR file "{0}" was inferred to be of version 1.0 because the manifest does not declare enterprise beans but serialized deployment descriptors exist in the JAR.
-filename_exception_EXC_=IWAE0041E Filename: {0}; Exception: {1}
-no_dds_10_EXC_=IWAE0042E No deployment descriptors in EJB 1.0 JAR file: {0}
-manifest_dd_load_EXC_=IWAE0043E The JAR manifest declares an enterprise bean for which the deployment descriptor file can not be loaded: {0}
-manifest_dd_find_EXC_=IWAE0044E The JAR manifest declares an enterprise bean for which the deployment descriptor file can not be found: {0}
-io_ex_reading_dd_EXC_=IWAE0045E IO Exception occurred reading {0}
-ser_not_dd_EXC_=IWAE0046E The serialized object in file "{0}" is not a an instance of javax.ejb.deployment.DeploymentDescriptor
-reading_dd_EXC_=IWAE0047E Exception occurred reading {0}
-missing_class_EXC_=IWAE0048E Could not deserialize {0} because a required class could not be found.  Exception: {1}
-Converted=Converted
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Stack trace of nested exception:
-IOException_occurred_while_EXC_=IWAE0050E IOException occurred while copying manifest
-Extract_destination_is_the_EXC_=IWAE0051E Extract destination is the same path as source file
-Parameter_should_not_be_nu_EXC_=IWAE0052E Parameter should not be null
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E Archive is not a valid EJB JAR file (1.0) because no serialized deployment descriptors can be found, either in the manifest or in entries with a ".ser" extension
-_The_following_files_could_EXC_=IWAE0056E The following files could not be loaded:
-FixPrimKeyCommand_failed___EXC_=IWAE0057E FixPrimKeyCommand failed - exception stack trace:
-FixPrimKeyCommand_usage___=FixPrimKeyCommand usage:  <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E FixPrimKeyCommand usage: sourceJarFilePath must point to a valid EJB JAR file or directory of an inflated EJB JAR file
-Repair_command_failed___ex_EXC_=IWAE0059E Repair command failed - exception stack trace:
-Repairs_all_entries_in_the=Repairs all entries in the META-INF and/or WEB-INF directories to be the correct case
-RepairArchiveCommand_usage=RepairArchiveCommand usage:  <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E RepairArchiveCommand usage: sourceJarFilePath must point to a valid archive or directory of an inflated archive
-Application_Client_Jar_Fil=Application Client JAR File
-EAR_File=EAR File
-EJB_Jar_File=EJB JAR File
-RAR_File=RAR File
-WAR_File=WAR File
-Error_occurred_iterating_f_EXC_=IWAE0061E Error occurred iterating files
-End_of_list_reached_EXC_=IWAE0062E Reached end of list
-Internal_Error__Iterator_o_EXC_=IWAE0063E Internal Error: Iterator out of sync with zip entries
-Error_iterating_the_archiv_EXC_=IWAE0064E Error iterating the archive
-Absolute_path_unknown_EXC_=IWAE0065E Absolute path unknown
-Original_archive_is_not_a__EXC_=IWAE0066E Original archive is not a directory
-Null_uri_EXC_=IWAE0067E Null uri
-Module_file=Module file
-A_WAR_file=WAR file
-An_EJB_JAR_file=EJB JAR file
-An_Application_Client_JAR_file=Application Client JAR file
-A_RAR_file=RAR file
-A_Application_file=Application file
-A_file_does_not_exist_for_module=A file does not exist for module element having uri: {0}
-File_not_correct_type=The file {0} in EAR file {1} is not the correct type based on the application deployment descriptor.  Expected type: {2}";
-Module_not_in_EAR=Module is not in an EAR: {0}
-Module_file_does_not_exist_2=Module file does not exist for Module ref.  Module = {0}
-FileImpl__Error_0=Recursive containment not allowed for
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ApplicationClientFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ApplicationClientFile.java
deleted file mode 100644
index 73b84984b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ApplicationClientFile.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-
-
-/**
- * @generated
- */
-public interface ApplicationClientFile extends ModuleFile {
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The DeploymentDescriptor reference
-	 */
-	ApplicationClient getDeploymentDescriptor() throws DeploymentDescriptorLoadException;
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the DeploymentDescriptor reference
-	 */
-	void setDeploymentDescriptor(ApplicationClient value);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java
deleted file mode 100644
index e94010896..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.commonarchivecore.internal;
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ReopenException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-
-
-/**
- * @generated
- */
-public interface Archive extends Container {
-
-	public static final int EXPAND_NONE = 0;
-	public static final int EXPAND_WAR_FILES = 1 << 1;
-	public static final int EXPAND_EAR_FILES = 1 << 2;
-	public static final int EXPAND_EJBJAR_FILES = 1 << 3;
-	public static final int EXPAND_APPCLIENT_FILES = 1 << 4;
-	public static final int EXPAND_ARCHIVES = 1 << 5;
-	public static final int EXPAND_RAR_FILES = 1 << 6;
-	public static final int EXPAND_ALL = (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | (1 << 6);
-
-	public Archive addCopy(Archive anArchive) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	public File addCopy(File aFile) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	/**
-	 * Get a flattened list from the directory, then addCopy the list
-	 * 
-	 * @throws com.ibm.etools.archive.exception.DuplicateObjectException
-	 *             if a file with a uri that equals one of the nested files in the directory exists
-	 * 
-	 * @return java.util.List the copied files that were added to the archive
-	 */
-	public List addCopy(ReadOnlyDirectory dir) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	public List addCopyFiles(List listOfFiles) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	public void addOrReplaceMofResource(Resource aResource);
-
-	/**
-	 * @deprecated Use {@link #getDependentOpenArchives()}
-	 * 
-	 * If any opened archive contains files that have this archive as its loading container, return
-	 * false; otherwise return true. This method supports the following scenario: open jar A. create
-	 * jar B. Copy files from A to B. Attempt to close jar A before saving jar B. Then attempt to
-	 * save B, and the save fails because A is closed. This method allows client code to test for
-	 * dependent open archives before saving the source archive. If this method returns false, the
-	 * solution is to either close or save B before closing A.
-	 */
-	public boolean canClose();
-
-	/**
-	 * Closes the load strategy for this archive and closes all contained archives; WARNING: If
-	 * files have been copied from this archive to another archive, then the destination archive
-	 * should be saved or closed before this archive can be safely closed; to test if this archive
-	 * can safely close invoke {@link #canClose()}
-	 */
-	public void close();
-
-	/**
-	 * Save this archive as an expanded directory where the flags is the result of bitwise or of the
-	 * specified types to be expanded; example:
-	 * <code>anEarFile.saveAsDirectory(anEarFile.EXPAND_WAR_FILES | anEarFile.EXPAND_EJBJARFILES)</code>;
-	 * 
-	 * If this archive was loaded from the same uri as it is being extracted to, the orignal will be
-	 * deleted and replaced with the directory
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @throws ReopenException
-	 *             if an exception occurs while re-syncing the archive to the newly saved
-	 *             destination
-	 */
-	public void extract(int expansionFlags) throws SaveFailureException, ReopenException;
-
-	/**
-	 * For performance, save the archive without reopening; Further operations on this instance
-	 * without first calling {@link #reopen}will yield unexpected results.
-	 * 
-	 * @see #extract(int)
-	 */
-	public void extractNoReopen(int expansionFlags) throws SaveFailureException;
-
-	/**
-	 * Save this archive as a directory using the specified uri
-	 * 
-	 * The archive will not be renamed
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @see #extract(int)
-	 */
-	public void extractTo(String uri, int expansionFlags) throws SaveFailureException;
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.ClassLoader
-	 */
-	public java.lang.ClassLoader getArchiveClassLoader();
-
-	/**
-	 * Return a list of files in the ARchive that start with the prefix
-	 */
-	public java.util.List filterFilesByPrefix(String prefix);
-
-	/**
-	 * Return a list of files in the Archive excluding any file that starts with one of the prefixes
-	 */
-	public java.util.List filterFilesWithoutPrefix(String[] prefixes);
-
-	/**
-	 * Returns a filtered list of archive files; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getArchiveFiles();
-
-	public ResourceSet getResourceSet();
-
-	/**
-	 * Return a list of all root level (non-nested) opened archives containing files that have this
-	 * archive as its loading container; the set will be empty if no such opened archive exists.
-	 * This method supports the following scenario: open jar A. create jar B. Copy files from A to
-	 * B. Attempt to close jar A before saving jar B. Then attempt to save B, and the save fails
-	 * because A is closed. This method allows client code to test for dependent open archives
-	 * before saving the source archive. If the return value is not empty, the solution is to either
-	 * close or save B before closing A.
-	 */
-	public Set getDependentOpenArchives();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getExtraClasspath();
-
-	/**
-	 * Used internally by the framework, specifically as an optimization when saving/exploding
-	 * archives with nested archives
-	 */
-	public FileIterator getFilesForSave() throws IOException;
-
-	public Collection getLoadedMofResources();
-
-	public ArchiveManifest getManifest();
-
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException;
-
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions getOptions();
-
-	/**
-	 * @see LoadStrategy#getResourceInputStream(String)
-	 */
-	public InputStream getResourceInputStream(String uri) throws IOException;
-
-	/**
-	 * Used for websphere runtime where archives are on disk (not nested in jars)
-	 * 
-	 * @return list of absolute paths that represents this archive only, and in the case of
-	 *         WARFiles, the nested loadable contents.
-	 */
-	public RuntimeClasspathEntry[] getLocalRuntimeClassPath();
-
-	/**
-	 * Used for websphere runtime where archives are on disk (not nested in jars) to get the
-	 * recursive behavior, the Archive must belong to an EAR file
-	 * 
-	 * @return list of absolute paths that represents this archive, all it's prereqs, recursive.
-	 */
-	public RuntimeClasspathEntry[] getFullRuntimeClassPath();
-
-	/**
-	 * Used for websphere runtime where archives are on disk (not nested in jars) to get the
-	 * recursive behavior, the Archive must belong to an EAR file
-	 * 
-	 * @return list of absolute paths that represents the dependencies of this Archive, all it's
-	 *         prereqs, recursive.
-	 */
-	public RuntimeClasspathEntry[] getDependencyClassPath();
-
-	/**
-	 * Return the absolute path of the root from which meta resources get loaded
-	 */
-	public String getResourcesPath() throws FileNotFoundException;
-
-	/**
-	 * Return the absolute path of the root from which classes and properties are loaded
-	 */
-	public String getBinariesPath() throws FileNotFoundException;
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	public SaveFilter getSaveFilter();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.SaveStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy getSaveStrategy();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getXmlEncoding();
-
-	/**
-	 * Return whether this Archive has
-	 * 
-	 * @other on it's classpath, either directly or transitively
-	 * @param Archive
-	 *            other - another archive in the same EAR file
-	 */
-	public boolean hasClasspathVisibilityTo(Archive other);
-
-	/**
-	 * Internal API; Used for implementation of {@link #hasClasspathVisibilityTo(Archive)}
-	 * 
-	 * @param Archive
-	 *            other - another archive in the same EAR file
-	 * @param Set
-	 *            visited - the set of archives already visited
-	 */
-	public boolean hasClasspathVisibilityTo(Archive other, Set visited, EARFile ear);
-
-	/**
-	 * Perform any necessary initialization after the archive has been opened.
-	 */
-	public void initializeAfterOpen();
-
-	/**
-	 * Used internally by the load strategy
-	 */
-	public void initializeClassLoader();
-
-	/**
-	 * An item is considered a duplicate if the archive contains a file or loaded mof resource with
-	 * the uri, or if the uri is equal to the manifest uri
-	 */
-	public boolean isDuplicate(String uri);
-
-	/**
-	 * Used as an optimization at copy time
-	 */
-	public boolean isManifestSet();
-
-	public boolean isMofResourceLoaded(String uri);
-
-	/**
-	 * Used internally for dispatch between the archive and the load strategy when building the file
-	 * list; clients should not need to call this method.
-	 */
-	public boolean isNestedArchive(String uri);
-
-	/**
-	 * Indicates whether the archive is still opened for read; if not, IOExceptions could be thrown
-	 * on attempts to get input streams on file entries. reopen() will cause this archive and its
-	 * nested archives to rebuild their load strategies
-	 */
-	public boolean isOpen();
-
-	/**
-	 * Create a new mof resource and add it to the resource set of the context of this archive; all
-	 * resources in memory are saved when the archive is saved
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if a resource already exists in this archive having the uri
-	 */
-	public Resource makeMofResource(String uri) throws DuplicateObjectException;
-
-	/**
-	 * Create a new mof resource and add it to the resource set of the context of this archive; all
-	 * resources in memory are saved when the archive is saved
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if a resource already exists in this archive having the uri
-	 */
-	public Resource makeMofResource(String uri, EList extent) throws DuplicateObjectException;
-
-	/**
-	 * Used internally for dispatch between the archive and the load strategy when building the file
-	 * list; clients should not need to call this method.
-	 */
-	public Archive openNestedArchive(String uri) throws OpenFailureException;
-
-	/**
-	 * Used internally for dispatch between the archive and the load strategy when building the file
-	 * list; clients should not need to call this method.
-	 */
-	public Archive openNestedArchive(LooseArchive loose) throws OpenFailureException;
-
-	/**
-	 * Set the value of the extra class path with no refresh of the class loader
-	 */
-	public void primSetExtraClasspath(java.lang.String newExtraClasspath);
-
-	public void remove(File aFile);
-
-	/**
-	 * Used internally for "re-syncing" an archive after save; clients normally should not need this
-	 * method
-	 */
-	public void reopen() throws ReopenException;
-
-	/**
-	 * Used internally for reopening nested archives; clients normally should not need this method
-	 */
-	public void reopen(Archive parent) throws ReopenException;
-
-	/**
-	 * Save this archive as a jar file with the uri of the archive;
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @throws ReopenException
-	 *             if an exception occurs while re-syncing the archive to the newly saved
-	 *             destination
-	 */
-	public void save() throws SaveFailureException, ReopenException;
-
-	/**
-	 * Save this archive using the save strategy specified
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 */
-	public void save(SaveStrategy aStrategy) throws SaveFailureException;
-
-	/**
-	 * Save this archive as a jar file using uri provided; If the uri is different than the URI of
-	 * this archive, the uri of this archive will change to the new uri (for reopen)
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @throws ReopenException
-	 *             if an exception occurs while re-syncing the archive to the newly saved
-	 *             destination
-	 */
-	public void saveAs(String uri) throws SaveFailureException, ReopenException;
-
-	/**
-	 * For performance, save the archive without reopening; Further operations on this instance
-	 * without first calling {@link #reopen}will yield unexpected results.
-	 * 
-	 * @see #saveAs(String)
-	 */
-	public void saveAsNoReopen(String uri) throws SaveFailureException;
-
-	/**
-	 * For performance, save the archive without reopening; Further operations on this instance
-	 * without first calling {@link #reopen}will yield unexpected results.
-	 * 
-	 * @see #save()
-	 */
-	public void saveNoReopen() throws SaveFailureException;
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newArchiveClassLoader
-	 *            java.lang.ClassLoader
-	 */
-	public void setArchiveClassLoader(java.lang.ClassLoader newArchiveClassLoader);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newExtraClasspath
-	 *            java.lang.String
-	 */
-	public void setExtraClasspath(java.lang.String newExtraClasspath);
-
-	public void setManifest(ArchiveManifest newManifest);
-
-	public void setManifest(java.util.jar.Manifest aManifest);
-
-	/**
-	 * Sets the Class-path manifest entry, rebuilds the class loader, and refreshes any reflected
-	 * java classes
-	 */
-	public void setManifestClassPathAndRefresh(String classpath);
-
-	public void setOptions(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions newOptions);
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	public void setSaveFilter(SaveFilter aFilter);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newSaveStrategy
-	 *            com.ibm.etools.archive.SaveStrategy
-	 */
-	public void setSaveStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy newSaveStrategy);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newXmlEncoding
-	 *            java.lang.String
-	 */
-	public void setXmlEncoding(java.lang.String newXmlEncoding);
-
-	/**
-	 * Determine whether java reflection should be set up for this archive
-	 */
-	public boolean shouldUseJavaReflection();
-
-	/**
-	 * Returns the value of the '<em><b>Types</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Types</em>' attribute list isn't clear, there really should be
-	 * more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Types</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.CommonarchivePackage#getArchive_Types()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getTypes();
-
-	boolean isType(String type);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ArchiveTypeDiscriminatorRegistry.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ArchiveTypeDiscriminatorRegistry.java
deleted file mode 100644
index d0a763084..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ArchiveTypeDiscriminatorRegistry.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-
-
-/**
- * @author mdelder
- */
-public class ArchiveTypeDiscriminatorRegistry {
-
-	private Collection discriminators = null;
-	private Collection customTypes = null;
-
-	/*
-	 * Most known types are of length 3. Whenver a new type is added that is not of length 3,
-	 * modifications may be necessary to the 'isKnownArchiveType() method
-	 */
-	private static final String[] defaultKnownTypes = new String[]{"ear", "war", "jar", "zip", "far"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
-
-	public static final ArchiveTypeDiscriminatorRegistry INSTANCE = new ArchiveTypeDiscriminatorRegistry();
-
-	public static void registorDiscriminator(GenericArchiveTypeDiscriminator discriminator) {
-		INSTANCE.getDiscriminators().add(discriminator);
-		INSTANCE.addKnownArchiveTypes(discriminator.getCustomFileExtensions());
-	}
-
-	public static ArchiveTypeDiscriminatorRegistry getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * @return
-	 */
-	public Collection getDiscriminators() {
-		if (discriminators == null)
-			discriminators = new ArrayList();
-		return discriminators;
-	}
-
-	public void contributeTypes(Archive archive) {
-		if (discriminators == null)
-			return;
-		GenericArchiveTypeDiscriminator discriminator = null;
-		for (Iterator itr = discriminators.iterator(); itr.hasNext();) {
-			discriminator = (GenericArchiveTypeDiscriminator) itr.next();
-			if (discriminator.discriminate(archive))
-				archive.getTypes().add(discriminator.getTypeKey());
-		}
-	}
-
-	public void addKnownArchiveTypes(String[] newTypes) {
-		if (customTypes == null) {
-			customTypes = new ArrayList();
-		}
-		for (int i = 0; i < newTypes.length; i++) {
-			customTypes.add(newTypes[i]);
-		}
-	}
-
-	public boolean isKnownArchiveType(String fileURI) {
-		if (fileURI == null || fileURI.length() == 0)
-			return false;
-
-		String lowerCaseUri = fileURI.toLowerCase();
-		/*
-		 * Ensure that the length of the URI is long enough to contain a .3 style extension
-		 */
-		if (lowerCaseUri.length() > 4 && lowerCaseUri.charAt(lowerCaseUri.length() - 4) == '.') {
-			String ending = lowerCaseUri.substring(lowerCaseUri.length() - 3);
-			for (int i = 0; i < defaultKnownTypes.length; i++)
-				if (defaultKnownTypes[i].equals(ending))
-					return true;
-		}
-
-		String customType = null;
-		if (customTypes != null) {
-			Iterator customTypesIterator = customTypes.iterator();
-			while (customTypesIterator.hasNext()) {
-				customType = (String) customTypesIterator.next();
-				if (fileURI.endsWith(customType))
-					return true;
-			}
-		}
-
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ClientModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ClientModuleRef.java
deleted file mode 100644
index b85a81eb9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ClientModuleRef.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-
-/**
- * @generated
- */
-public interface ClientModuleRef extends ModuleRef {
-	ApplicationClient getApplicationClient() throws ArchiveWrappedException;
-} //ClientModuleRef
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveFactoryRegistry.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveFactoryRegistry.java
deleted file mode 100644
index 153081021..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveFactoryRegistry.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 7, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CommonArchiveFactoryRegistry {
-
-	public static CommonArchiveFactoryRegistry INSTANCE = new CommonArchiveFactoryRegistry();
-
-	protected CommonarchiveFactory commonArchiveFactory = ((CommonarchiveFactoryImpl) CommonarchivePackage.eINSTANCE.getCommonarchiveFactory()).getDelegate();
-
-	/**
-	 * Constructor
-	 */
-	public CommonArchiveFactoryRegistry() {
-		super();
-	}
-
-	public CommonarchiveFactory getCommonArchiveFactory() {
-		return commonArchiveFactory;
-	}
-
-	public void setCommonArchiveFactory(CommonarchiveFactory factory) {
-		commonArchiveFactory = factory;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveResourceHandler.java
deleted file mode 100644
index 829627066..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveResourceHandler.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import org.eclipse.osgi.util.NLS;
-
-public class CommonArchiveResourceHandler extends NLS {
-	private static final String BUNDLE_NAME = "commonarchive";//$NON-NLS-1$
-
-	private CommonArchiveResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String not_a_dir_EXC_;
-	public static String FileImpl__Error_0;
-	public static String RepairArchiveCommand_usage1_ERROR_;
-	public static String file_exist_as_dir_EXC_;
-	public static String duplicate_entry_EXC_;
-	public static String ser_not_dd_EXC_;
-	public static String EAR_File;
-	public static String RAR_File;
-	public static String filename_exception_EXC_;
-	public static String An_Application_Client_JAR_file;
-	public static String no_sec_role_EXC_;
-	public static String Original_archive_is_not_a__EXC_;
-	public static String duplicate_module_EXC_;
-	public static String reading_dd_EXC_;
-	public static String Module_file_does_not_exist_2;
-	public static String A_WAR_file;
-	public static String IOException_occurred_while_EXC_;
-	public static String io_ex_manifest_EXC_;
-	public static String FixPrimKeyCommand_usage__s_EXC_;
-	public static String FixPrimKeyCommand_usage___;
-	public static String Parameter_should_not_be_nu_EXC_;
-	public static String dd_in_ear_load_EXC_;
-	public static String no_dds_10_EXC_;
-	public static String list_components_war_EXC_;
-	public static String An_EJB_JAR_file;
-	public static String open_nested_EXC_;
-	public static String Repair_command_failed___ex_EXC_;
-	public static String nested_open_fail_EXC_;
-	public static String Error_iterating_the_archiv_EXC_;
-	public static String make_temp_file_WARN_;
-	public static String missing_class_EXC_;
-	public static String repair_usage_ERROR_;
-	public static String Application_Client_Jar_Fil;
-	public static String WAR_File;
-	public static String could_not_find_dir_EXC_;
-	public static String Converted;
-	public static String Absolute_path_unknown_EXC_;
-	public static String add_copy_lib_dir_EXC_;
-	public static String removing_key_field_INFO_;
-	public static String Module_file;
-	public static String Stack_trace_of_nested_exce_EXC_;
-	public static String tx_bean_mgd_WARN_;
-	public static String manifest_dd_load_EXC_;
-	public static String key_class_reflection_ERROR_;
-	public static String uncontained_module_EXC_;
-	public static String file_not_found_EXC_;
-	public static String io_ex_reading_dd_EXC_;
-	public static String invalid_cp_file_WARN_;
-	public static String invalid_archive_EXC_;
-	public static String load_resource_EXC_;
-	public static String invalid_classpath_WARN_;
-	public static String Extract_destination_is_the_EXC_;
-	public static String subclass_responsibilty_EXC_;
-	public static String Module_not_in_EAR;
-	public static String File_not_correct_type;
-	public static String io_ex_loading_EXC_;
-	public static String could_not_open_EXC_;
-	public static String manifest_dd_find_EXC_;
-	public static String nested_jar_EXC_;
-	public static String dup_resource_EXC_;
-	public static String Repairs_all_entries_in_the;
-	public static String add_copy_class_dir_EXC_;
-	public static String io_ex_reopen_EXC_;
-	public static String Error_occurred_iterating_f_EXC_;
-	public static String dup_sec_role_module_EXC_;
-	public static String duplicate_file_EXC_;
-	public static String inferred_dds_EXC_;
-	public static String unable_replace_EXC_;
-	public static String EJB_Jar_File;
-	public static String A_file_does_not_exist_for_module;
-	public static String A_RAR_file;
-	public static String dup_sec_role_EXC_;
-	public static String _The_following_files_could_EXC_;
-	public static String key_field_reflection_ERROR_;
-	public static String End_of_list_reached_EXC_;
-	public static String error_saving_EXC_;
-	public static String Archive_is_not_a_valid_EJB_EXC_;
-	public static String make_temp_dir_EXC_;
-	public static String RepairArchiveCommand_usage;
-	public static String FixPrimKeyCommand_failed___EXC_;
-	public static String A_Application_file;
-	public static String Null_uri_EXC_;
-	public static String Internal_Error__Iterator_o_EXC_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonArchiveResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java
deleted file mode 100644
index 26c935847..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-
-
-/**
- * @generated
- */
-public interface CommonarchiveFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonarchiveFactory eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl.init();
-
-	/**
-	 * Tell the factory that an archive has been opened; the factory maintains a weak set of all the
-	 * open archives to determine if another archive can be closed.
-	 */
-	public void archiveClosed(Archive aClosedArchive);
-
-	/**
-	 * Tell the factory that an archive has been opened; the factory maintains a weak set of all the
-	 * open archives to determine if another archive can be closed.
-	 */
-	public void archiveOpened(Archive anOpenArchive);
-
-	/**
-	 * @deprecated Use {@link #getOpenArchivesDependingOn(Archive)}
-	 * 
-	 * If any opened archive contains files that have the parameter as its loading container, return
-	 * false; otherwise return true. This method supports the following scenario: open jar A. create
-	 * jar B. Copy files from A to B. Attempt to close jar A before saving jar B. Then attempt to
-	 * save B, and the save fails because A is closed. This method allows client code to test for
-	 * dependent open archives before saving the source archive. If this method returns false, the
-	 * solution is to either close or save B before closing A.
-	 */
-	public boolean canClose(Archive anArchive);
-
-	/**
-	 * Close any open archives and delete the temp files associated with nested archives. Due to
-	 * limitations in the deleteOnExit() method of file, in 1.2.2 there is no way to ensure these
-	 * files get deleted. Client code should use good practice by calling {@link Archive#close}when
-	 * finished with an Archive instance, rather than just discard an instance with open file
-	 * handles and wait for it to be gc'd. Beyond that, program code compiled for 1.3 can (and
-	 * should) implement the following shutdown hook: <code>
-	 * 	Runtime.getRuntime().addShutdownHook(new Thread() {
-	 public void run() {
-	 ((CommonarchivePackage)EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory().closeOpenArchives();
-	 }
-	 });</code>
-	 */
-	public void closeOpenArchives();
-
-	public Archive copy(Archive anArchive);
-
-	public ModuleFile copy(ModuleFile aModuleFile);
-
-	/**
-	 * Creates a new archive for editing, and initializes it appropriately (adds an empty deployment
-	 * descriptor)
-	 */
-	public ApplicationClientFile createApplicationClientFileInitialized(String uri);
-
-	/**
-	 * Creates a new archive for editing, and initializes it appropriately
-	 */
-	public Archive createArchiveInitialized(String uri);
-
-	/**
-	 * Used internally; clients usually should not need this method
-	 */
-	public LoadStrategy createChildLoadStrategy(String uri, LoadStrategy parent) throws java.io.IOException, java.io.FileNotFoundException;
-
-	/**
-	 * Creates a new archive for editing, and initializes it appropriately (adds an empty deployment
-	 * descriptor)
-	 */
-	public EARFile createEARFileInitialized(String uri);
-
-	/**
-	 * Creates a new archive for editing, and initializes it appropriately (adds an empty deployment
-	 * descriptor)
-	 */
-	public EJBJarFile createEJBJarFileInitialized(String uri);
-
-	/**
-	 * Create an initialized archive based on the given URI and options
-	 */
-	public Archive createArchiveInitialized(ArchiveOptions options, java.lang.String uri);
-
-	/**
-	 * Create an initialized EAR based on the given URI and options
-	 */
-	public EARFile createEARFileInitialized(ArchiveOptions options, java.lang.String uri);
-
-	/**
-	 * Create an initialized EJB based on the given URI and options
-	 */
-	public EJBJarFile createEJBJarFileInitialized(ArchiveOptions options, java.lang.String uri);
-
-	/**
-	 * Initialize archive based on the options
-	 */
-	public void initializeNewApplicationClientFile(ApplicationClientFile anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Initialize archive based on the options
-	 */
-	public void initializeNewArchive(Archive anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Initialize archive based on the options
-	 */
-	public void initializeNewEARFile(EARFile anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Initialized archive based on the options
-	 */
-	public void initializeNewEJBJarFile(EJBJarFile anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Initialized archive based on the options
-	 */
-	public void initializeNewModuleFile(ModuleFile anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Initialized archive based on the options
-	 */
-	public void initializeNewRARFile(RARFile anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Initialized archive based on the options
-	 */
-	public void initializeNewWARFile(WARFile anArchive, String uri, ArchiveOptions options);
-
-	/**
-	 * Returns a NullLoadStrategyImpl; used for new archives
-	 */
-	LoadStrategy createEmptyLoadStrategy();
-
-	/**
-	 * Helper method to dynamically build a load strategy from the file system. Determines whether
-	 * the uri points to a jar file or directory and returns the appropriate strategy
-	 */
-	public LoadStrategy createLoadStrategy(String uri) throws FileNotFoundException, IOException;
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public RARFile createRARFileInitialized(java.lang.String uri);
-
-	/**
-	 * Creates a new archive for editing, and initializes it appropriately (adds an empty deployment
-	 * descriptor)
-	 */
-	public WARFile createWARFileInitialized(String uri);
-
-	/**
-	 * Helper method to introspect an archive and get it's class path entries before fully opening
-	 * the archive; needed because we may need extra classpath info to be able to open the 1.0 file
-	 * and deserialize its deployment descriptor
-	 * 
-	 * @return a tokenized array of class path components
-	 */
-	public String[] getManifestClassPathValues(String uri) throws OpenFailureException;
-
-	/**
-	 * Return a list of all root level (non-nested) opened archives containing files that have the
-	 * parameter as its loading container; the set will be empty if no such opened archive exists.
-	 * This method supports the following scenario: open jar A. create jar B. Copy files from A to
-	 * B. Attempt to close jar A before saving jar B. Then attempt to save B, and the save fails
-	 * because A is closed. This method allows client code to test for dependent open archives
-	 * before saving the source archive. If the return value is not empty, the solution is to either
-	 * close or save B before closing A.
-	 */
-	public Set getOpenArchivesDependingOn(Archive anArchive);
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public ApplicationClientFile openApplicationClientFile(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public ApplicationClientFile openApplicationClientFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	public ApplicationClientFile openApplicationClientFile(String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public Archive openArchive(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public Archive openArchive(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive by the passed uri
-	 * 
-	 * @return the appropriate kind of archive
-	 */
-	public Archive openArchive(String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive by the passed uri, and use the extraClassPath for java reflection, in
-	 * addition to the manifest class-path; mostly used for ejb 1.0 jar files to be converted
-	 * 
-	 * @return the appropriate kind of archive
-	 */
-	public Archive openArchive(String uri, String extraClassPath) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EARFile openEARFile(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EARFile openEARFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	public EARFile openEARFile(String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EJBJarFile openEJB11JarFile(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJB11JarFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJB11JarFile(String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EJBJarFile openEJBJarFile(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EJBJarFile openEJBJarFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EJBJarFile openEJBJarFile(LoadStrategy aLoadStrategy, String uri, String extraClassPath) throws OpenFailureException;
-
-	public EJBJarFile openEJBJarFile(String uri) throws OpenFailureException;
-
-	public EJBJarFile openEJBJarFile(String uri, String extraClassPath) throws OpenFailureException;
-
-	/**
-	 * Used internally for openning an Archive in an Archive
-	 */
-	public Archive openNestedArchive(String uri, Archive parent) throws OpenFailureException;
-
-	/**
-	 * Used internally for openning an Archive in an Archive
-	 */
-	public Archive openNestedArchive(LooseArchive loose, Archive parent) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public RARFile openRARFile(ArchiveOptions options, java.lang.String uri) throws OpenFailureException;
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public RARFile openRARFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public RARFile openRARFile(String uri) throws OpenFailureException;
-
-	public ReadOnlyDirectory openReadOnlyDirectory(String uri) throws java.io.IOException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public WARFile openWARFile(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public WARFile openWARFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	public WARFile openWARFile(String uri) throws OpenFailureException;
-
-	/**
-	 * Open the archive by the passed parameter, without attempting to determine what kind of
-	 * archive it is
-	 * 
-	 * @return an instance of Archive, but not a subclass
-	 */
-	Archive primOpenArchive(String uri) throws OpenFailureException;
-
-	Archive primOpenArchive(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException;
-
-	Archive primOpenArchive(ArchiveOptions options, String uri) throws OpenFailureException;
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return WARFile value
-	 */
-	WARFile createWARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EJBJarFile value
-	 */
-	EJBJarFile createEJBJarFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ApplicationClientFile value
-	 */
-	ApplicationClientFile createApplicationClientFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EARFile value
-	 */
-	EARFile createEARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return RARFile value
-	 */
-	RARFile createRARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return Archive value
-	 */
-	Archive createArchive();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return File value
-	 */
-	File createFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ReadOnlyDirectory value
-	 */
-	ReadOnlyDirectory createReadOnlyDirectory();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	CommonarchivePackage getCommonarchivePackage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EJBModuleRef value
-	 */
-	EJBModuleRef createEJBModuleRef();
-
-	/**
-	 * Convienince method for wrapping a standalone EJB JAR file
-	 */
-	EJBModuleRef createEJBModuleRef(EJBJarFile ejbJarFile);
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return WebModuleRef value
-	 */
-	WebModuleRef createWebModuleRef();
-
-	/**
-	 * Convienince method for wrapping a standalone WAR file
-	 */
-	WebModuleRef createWebModuleRef(WARFile warFile);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ClientModuleRef value
-	 */
-	ClientModuleRef createClientModuleRef();
-
-	/**
-	 * Convienince method for wrapping a standalone Application Client JAR file
-	 */
-	ClientModuleRef createClientModuleRef(ApplicationClientFile clientFile);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ConnectorModuleRef value
-	 */
-	ConnectorModuleRef createConnectorModuleRef();
-
-	/**
-	 * Convienince method for wrapping a standalone RAR file
-	 */
-	ConnectorModuleRef createConnectorModuleRef(RARFile rarFile);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java
deleted file mode 100644
index 5861cd110..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java
+++ /dev/null
@@ -1,1327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-/**
- * @lastgen interface CommonarchivePackage extends EPackage {}
- */
-public interface CommonarchivePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "commonarchivecore"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER = 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE = 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_REF = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE_REF = 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE_REF = 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CLIENT_MODULE_REF = 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE_REF = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__LAST_MODIFIED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__SIZE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILE__DIRECTORY_ENTRY = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__ORIGINAL_URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__LOADING_CONTAINER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__CONTAINER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>File</em>' class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__URI = FILE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__LAST_MODIFIED = FILE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__SIZE = FILE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER__DIRECTORY_ENTRY = FILE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__ORIGINAL_URI = FILE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__LOADING_CONTAINER = FILE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__CONTAINER = FILE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER__FILES = FILE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Container</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_FEATURE_COUNT = FILE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__URI = CONTAINER__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__LAST_MODIFIED = CONTAINER__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__SIZE = CONTAINER__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARCHIVE__DIRECTORY_ENTRY = CONTAINER__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__ORIGINAL_URI = CONTAINER__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__LOADING_CONTAINER = CONTAINER__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__CONTAINER = CONTAINER__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ARCHIVE__FILES = CONTAINER__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARCHIVE__TYPES = CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Archive</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int ARCHIVE_FEATURE_COUNT = CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__URI = ARCHIVE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__LAST_MODIFIED = ARCHIVE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__SIZE = ARCHIVE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_FILE__DIRECTORY_ENTRY = ARCHIVE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__ORIGINAL_URI = ARCHIVE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__LOADING_CONTAINER = ARCHIVE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__CONTAINER = ARCHIVE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_FILE__FILES = ARCHIVE__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_FILE__TYPES = ARCHIVE__TYPES;
-
-	/**
-	 * The number of structural features of the the '<em>Module File</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_FILE_FEATURE_COUNT = ARCHIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__URI = MODULE_FILE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__LAST_MODIFIED = MODULE_FILE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__SIZE = MODULE_FILE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_FILE__DIRECTORY_ENTRY = MODULE_FILE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__ORIGINAL_URI = MODULE_FILE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__LOADING_CONTAINER = MODULE_FILE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__CONTAINER = MODULE_FILE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__FILES = MODULE_FILE__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_FILE__TYPES = MODULE_FILE__TYPES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR = MODULE_FILE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>EJB Jar File</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_FILE_FEATURE_COUNT = MODULE_FILE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__URI = MODULE_FILE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__LAST_MODIFIED = MODULE_FILE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__SIZE = MODULE_FILE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WAR_FILE__DIRECTORY_ENTRY = MODULE_FILE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__ORIGINAL_URI = MODULE_FILE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__LOADING_CONTAINER = MODULE_FILE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__CONTAINER = MODULE_FILE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__FILES = MODULE_FILE__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WAR_FILE__TYPES = MODULE_FILE__TYPES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WAR_FILE__DEPLOYMENT_DESCRIPTOR = MODULE_FILE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>WAR File</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int WAR_FILE_FEATURE_COUNT = MODULE_FILE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__URI = MODULE_FILE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__LAST_MODIFIED = MODULE_FILE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__SIZE = MODULE_FILE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EAR_FILE__DIRECTORY_ENTRY = MODULE_FILE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__ORIGINAL_URI = MODULE_FILE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__LOADING_CONTAINER = MODULE_FILE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__CONTAINER = MODULE_FILE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__FILES = MODULE_FILE__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EAR_FILE__TYPES = MODULE_FILE__TYPES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__MODULE_REFS = MODULE_FILE_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_FILE__DEPLOYMENT_DESCRIPTOR = MODULE_FILE_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>EAR File</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int EAR_FILE_FEATURE_COUNT = MODULE_FILE_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__URI = MODULE_FILE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__LAST_MODIFIED = MODULE_FILE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__SIZE = MODULE_FILE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY = MODULE_FILE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__ORIGINAL_URI = MODULE_FILE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__LOADING_CONTAINER = MODULE_FILE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__CONTAINER = MODULE_FILE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__FILES = MODULE_FILE__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_FILE__TYPES = MODULE_FILE__TYPES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR = MODULE_FILE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Application Client File</em>' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_FILE_FEATURE_COUNT = MODULE_FILE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__URI = CONTAINER__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__LAST_MODIFIED = CONTAINER__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__SIZE = CONTAINER__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int READ_ONLY_DIRECTORY__DIRECTORY_ENTRY = CONTAINER__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__ORIGINAL_URI = CONTAINER__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__LOADING_CONTAINER = CONTAINER__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__CONTAINER = CONTAINER__CONTAINER;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int READ_ONLY_DIRECTORY__FILES = CONTAINER__FILES;
-	/**
-	 * The number of structural features of the the '<em>Read Only Directory</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int READ_ONLY_DIRECTORY_FEATURE_COUNT = CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__URI = MODULE_FILE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__LAST_MODIFIED = MODULE_FILE__LAST_MODIFIED;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__SIZE = MODULE_FILE__SIZE;
-	/**
-	 * The feature id for the '<em><b>Directory Entry</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RAR_FILE__DIRECTORY_ENTRY = MODULE_FILE__DIRECTORY_ENTRY;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__ORIGINAL_URI = MODULE_FILE__ORIGINAL_URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__LOADING_CONTAINER = MODULE_FILE__LOADING_CONTAINER;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__CONTAINER = MODULE_FILE__CONTAINER;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RAR_FILE__FILES = MODULE_FILE__FILES;
-	/**
-	 * The feature id for the '<em><b>Types</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RAR_FILE__TYPES = MODULE_FILE__TYPES;
-
-	/**
-	 * The feature id for the '<em><b>Deployment Descriptor</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int RAR_FILE__DEPLOYMENT_DESCRIPTOR = MODULE_FILE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>RAR File</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int RAR_FILE_FEATURE_COUNT = MODULE_FILE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_REF__MODULE_FILE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_REF__EAR_FILE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Module</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_REF__MODULE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Module Ref</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_REF_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE_REF__MODULE_FILE = MODULE_REF__MODULE_FILE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Module</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_MODULE_REF__MODULE = MODULE_REF__MODULE;
-
-	/**
-	 * The number of structural features of the the '<em>EJB Module Ref</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_MODULE_REF_FEATURE_COUNT = MODULE_REF_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE_REF__MODULE_FILE = MODULE_REF__MODULE_FILE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Module</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_MODULE_REF__MODULE = MODULE_REF__MODULE;
-
-	/**
-	 * The number of structural features of the the '<em>Web Module Ref</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_MODULE_REF_FEATURE_COUNT = MODULE_REF_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CLIENT_MODULE_REF__MODULE_FILE = MODULE_REF__MODULE_FILE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CLIENT_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Module</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT_MODULE_REF__MODULE = MODULE_REF__MODULE;
-
-	/**
-	 * The number of structural features of the the '<em>Client Module Ref</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT_MODULE_REF_FEATURE_COUNT = MODULE_REF_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE_REF__MODULE_FILE = MODULE_REF__MODULE_FILE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE;
-
-	/**
-	 * The feature id for the '<em><b>Module</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_MODULE_REF__MODULE = MODULE_REF__MODULE;
-
-	/**
-	 * The number of structural features of the the '<em>Connector Module Ref</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_MODULE_REF_FEATURE_COUNT = MODULE_REF_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "commonarchive.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.commonarchivecore"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonarchivePackage eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return Container object
-	 */
-	EClass getContainer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getContainer_Files();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return WARFile object
-	 */
-	EClass getWARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWARFile_DeploymentDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ModuleFile object
-	 */
-	EClass getModuleFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EARFile object
-	 */
-	EClass getEARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEARFile_DeploymentDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEARFile_ModuleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ModuleRef object
-	 */
-	EClass getModuleRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getModuleRef_ModuleFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getModuleRef_EarFile();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef#getModule <em>Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Module</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef#getModule()
-	 * @see #getModuleRef()
-	 * @generated
-	 */
-	EReference getModuleRef_Module();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EJBModuleRef object
-	 */
-	EClass getEJBModuleRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return WebModuleRef object
-	 */
-	EClass getWebModuleRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ClientModuleRef object
-	 */
-	EClass getClientModuleRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ConnectorModuleRef object
-	 */
-	EClass getConnectorModuleRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ApplicationClientFile object
-	 */
-	EClass getApplicationClientFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplicationClientFile_DeploymentDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EJBJarFile object
-	 */
-	EClass getEJBJarFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJarFile_DeploymentDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return RARFile object
-	 */
-	EClass getRARFile();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile#getDeploymentDescriptor <em>Deployment Descriptor</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Deployment Descriptor</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile#getDeploymentDescriptor()
-	 * @see #getRARFile()
-	 * @generated
-	 */
-	EReference getRARFile_DeploymentDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return Archive object
-	 */
-	EClass getArchive();
-
-	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.Archive#getTypes <em>Types</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute list '<em>Types</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.commonarchivecore.Archive#getTypes()
-	 * @see #getArchive()
-	 * @generated
-	 */
-	EAttribute getArchive_Types();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return File object
-	 */
-	EClass getFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFile_URI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFile_LastModified();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFile_Size();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Directory Entry</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry()
-	 * @see #getFile()
-	 * @generated
-	 */
-	EAttribute getFile_DirectoryEntry();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFile_OriginalURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFile_LoadingContainer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFile_Container();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ReadOnlyDirectory object
-	 */
-	EClass getReadOnlyDirectory();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	CommonarchiveFactory getCommonarchiveFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl <em>File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getFile()
-		 * @generated
-		 */
-		EClass FILE = eINSTANCE.getFile();
-
-		/**
-		 * The meta object literal for the '<em><b>URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILE__URI = eINSTANCE.getFile_URI();
-
-		/**
-		 * The meta object literal for the '<em><b>Last Modified</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILE__LAST_MODIFIED = eINSTANCE.getFile_LastModified();
-
-		/**
-		 * The meta object literal for the '<em><b>Size</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILE__SIZE = eINSTANCE.getFile_Size();
-
-		/**
-		 * The meta object literal for the '<em><b>Directory Entry</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILE__DIRECTORY_ENTRY = eINSTANCE.getFile_DirectoryEntry();
-
-		/**
-		 * The meta object literal for the '<em><b>Original URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILE__ORIGINAL_URI = eINSTANCE.getFile_OriginalURI();
-
-		/**
-		 * The meta object literal for the '<em><b>Loading Container</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILE__LOADING_CONTAINER = eINSTANCE.getFile_LoadingContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILE__CONTAINER = eINSTANCE.getFile_Container();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ArchiveImpl <em>Archive</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ArchiveImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getArchive()
-		 * @generated
-		 */
-		EClass ARCHIVE = eINSTANCE.getArchive();
-
-		/**
-		 * The meta object literal for the '<em><b>Types</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ARCHIVE__TYPES = eINSTANCE.getArchive_Types();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EJBJarFileImpl <em>EJB Jar File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EJBJarFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getEJBJarFile()
-		 * @generated
-		 */
-		EClass EJB_JAR_FILE = eINSTANCE.getEJBJarFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Deployment Descriptor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR = eINSTANCE.getEJBJarFile_DeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl <em>WAR File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getWARFile()
-		 * @generated
-		 */
-		EClass WAR_FILE = eINSTANCE.getWARFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Deployment Descriptor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WAR_FILE__DEPLOYMENT_DESCRIPTOR = eINSTANCE.getWARFile_DeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EARFileImpl <em>EAR File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EARFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getEARFile()
-		 * @generated
-		 */
-		EClass EAR_FILE = eINSTANCE.getEARFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Module Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EAR_FILE__MODULE_REFS = eINSTANCE.getEARFile_ModuleRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Deployment Descriptor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EAR_FILE__DEPLOYMENT_DESCRIPTOR = eINSTANCE.getEARFile_DeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ApplicationClientFileImpl <em>Application Client File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ApplicationClientFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getApplicationClientFile()
-		 * @generated
-		 */
-		EClass APPLICATION_CLIENT_FILE = eINSTANCE.getApplicationClientFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Deployment Descriptor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR = eINSTANCE.getApplicationClientFile_DeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ModuleFileImpl <em>Module File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ModuleFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getModuleFile()
-		 * @generated
-		 */
-		EClass MODULE_FILE = eINSTANCE.getModuleFile();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ContainerImpl <em>Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ContainerImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getContainer()
-		 * @generated
-		 */
-		EClass CONTAINER = eINSTANCE.getContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Files</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER__FILES = eINSTANCE.getContainer_Files();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ReadOnlyDirectoryImpl <em>Read Only Directory</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ReadOnlyDirectoryImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getReadOnlyDirectory()
-		 * @generated
-		 */
-		EClass READ_ONLY_DIRECTORY = eINSTANCE.getReadOnlyDirectory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.RARFileImpl <em>RAR File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.RARFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getRARFile()
-		 * @generated
-		 */
-		EClass RAR_FILE = eINSTANCE.getRARFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Deployment Descriptor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RAR_FILE__DEPLOYMENT_DESCRIPTOR = eINSTANCE.getRARFile_DeploymentDescriptor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ModuleRefImpl <em>Module Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ModuleRefImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getModuleRef()
-		 * @generated
-		 */
-		EClass MODULE_REF = eINSTANCE.getModuleRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Module File</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODULE_REF__MODULE_FILE = eINSTANCE.getModuleRef_ModuleFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Ear File</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODULE_REF__EAR_FILE = eINSTANCE.getModuleRef_EarFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Module</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODULE_REF__MODULE = eINSTANCE.getModuleRef_Module();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EJBModuleRefImpl <em>EJB Module Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EJBModuleRefImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getEJBModuleRef()
-		 * @generated
-		 */
-		EClass EJB_MODULE_REF = eINSTANCE.getEJBModuleRef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WebModuleRefImpl <em>Web Module Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WebModuleRefImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getWebModuleRef()
-		 * @generated
-		 */
-		EClass WEB_MODULE_REF = eINSTANCE.getWebModuleRef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ClientModuleRefImpl <em>Client Module Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ClientModuleRefImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getClientModuleRef()
-		 * @generated
-		 */
-		EClass CLIENT_MODULE_REF = eINSTANCE.getClientModuleRef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ConnectorModuleRefImpl <em>Connector Module Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ConnectorModuleRefImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl#getConnectorModuleRef()
-		 * @generated
-		 */
-		EClass CONNECTOR_MODULE_REF = eINSTANCE.getConnectorModuleRef();
-
-	}
-
-} //CommonarchivePackage
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ConnectorModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ConnectorModuleRef.java
deleted file mode 100644
index cdb536bf0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ConnectorModuleRef.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.jca.Connector;
-
-/**
- * @generated
- */
-public interface ConnectorModuleRef extends ModuleRef {
-	Connector getConnector() throws ArchiveWrappedException;
-
-} //ConnectorModuleRef
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Container.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Container.java
deleted file mode 100644
index cea334e92..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Container.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @generated
- */
-public interface Container extends File {
-
-	/**
-	 * Indicate whether the archive contains a file having a relative path of the parameter; the uri
-	 * may or may not have a leading separator
-	 */
-	public boolean containsFile(String uri);
-
-	/**
-	 * Return the absolute path of the file from its load strategy, if it is known. Should be used
-	 * mainly for read-only runtime purposes, as edit-time modifications may make the result
-	 * undefined.
-	 * 
-	 * @throws FileNotFoundException
-	 *             if the archive is "virtual", eg, a nested jar
-	 */
-	public String getAbsolutePath() throws FileNotFoundException;
-
-	public File getFile(String uri) throws FileNotFoundException;
-
-	public InputStream getInputStream(String uri) throws FileNotFoundException, IOException;
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.LoadStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy getLoadStrategy();
-
-	/**
-	 * Indicates whether the archive has ever had its files enumerated; used as an optimization
-	 */
-	public boolean isIndexed();
-
-	/**
-	 * Goes directly to the strategy
-	 */
-	public InputStream primGetInputStream(String uri) throws FileNotFoundException, IOException;
-
-	public void rebuildFileIndex();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newLoadStrategy
-	 *            com.ibm.etools.archive.LoadStrategy
-	 */
-	public void setLoadStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy newLoadStrategy);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of Files references
-	 */
-	EList getFiles();
-
-	/**
-	 * Clears the list of files in this Container and drops the index
-	 */
-	public void clearFiles();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java
deleted file mode 100644
index 20c7545d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.io.FileNotFoundException;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.EmptyResourceException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ObjectNotFoundException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @generated
- */
-public interface EARFile extends ModuleFile {
-
-	/**
-	 * Makes a copy of
-	 * 
-	 * @aModuleFile, using its local deployment descriptor; creates a new Module and adds it to the
-	 *               Application deployment descriptor of this EAR file and adds the copy of the
-	 *               ModuleFile to this EAR.
-	 * 
-	 * @return The copied module file
-	 * 
-	 * @exception DuplicateObjectException
-	 *                if this EAR already contains a file with the same uri as
-	 * @aModuleFile
-	 */
-
-	public ModuleFile addCopy(ModuleFile aModuleFile) throws DuplicateObjectException;
-
-
-	/**
-	 * This is the same as addCopy(ModuleFile) except the return value is the new ModuleRef
-	 */
-	public ModuleRef addCopyRef(ModuleFile aModuleFile) throws DuplicateObjectException;
-
-	/**
-	 * Add a copy of the security role to the dd for the module; if an alt dd is specified, add to
-	 * that dd; otherwise add to the standard dd of the module; also add a copy of the role to the
-	 * ear file dd if a role with that name does not already exist
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if the dd for aModule already contains a role with that name
-	 */
-	public SecurityRole addCopy(SecurityRole aRole, Module aModule) throws DuplicateObjectException;
-
-	/**
-	 * Add a copy of the security role to the ear file's dd, if it does not already contain a role
-	 * with the same name
-	 */
-	public SecurityRole addCopyIfNotExists(SecurityRole aRole);
-
-	EObject getAltDeploymentDescriptor(Module aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException;
-
-	/**
-	 * Returns a filtered list of ApplicationClientFiles; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getApplicationClientFiles();
-
-	/**
-	 * Returns a filtered list of ClientModuleRefs
-	 */
-	public List getClientModuleRefs();
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The DeploymentDescriptor reference
-	 */
-	Application getDeploymentDescriptor() throws DeploymentDescriptorLoadException;
-
-	Connector getDeploymentDescriptor(ConnectorModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException;
-
-	EJBJar getDeploymentDescriptor(EjbModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException;
-
-	ApplicationClient getDeploymentDescriptor(JavaClientModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException;
-
-	EObject getDeploymentDescriptor(Module aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException;
-
-	WebApp getDeploymentDescriptor(WebModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException;
-
-	/**
-	 * Returns a filtered list of EJBJarFiles; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getEJBJarFiles();
-
-	/**
-	 * Returns a filtered list of EJBModuleRefs
-	 */
-	public List getEJBModuleRefs();
-
-
-	/**
-	 * Return an enterprise bean referenced by the EjbRef, if one exists. The ejb-link value of the
-	 * ref must equate to a named enterprise bean contained in the jar; otherwise return null.
-	 * Returns the first hit found; assumption that the ejb names are unique within the scope of the
-	 * ear file. This will likely be replaced with a better way for dereferencing ejb refs.
-	 * 
-	 * Can be used with ejb 1.1 references only.
-	 * 
-	 * @deprecated {@link#getEnterpiseBeanFromRef(EjbRef ref, String moduleUri )
-	 * @param EjbRef
-	 *            ref - An ejb reference
-	 * @return EnterpriseBean
-	 */
-	public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref);
-
-	/**
-	 * Return an enterprise bean referenced by the EjbRef and a module uri, if one exists. The
-	 * ejb-link value of the ref must equate to a named enterprise bean contained in the jar;
-	 * otherwise return null. Returns the first hit found; assumption that the ejb names are unique
-	 * within the scope of the ear file. This will likely be replaced with a better way for
-	 * dereferencing ejb refs.
-	 * 
-	 * Can be used with ejb 1.1 & ejb 2.0 references.
-	 * 
-	 * @param EjbRef
-	 *            ref - An ejb reference
-	 * @param String
-	 *            moduleUri - The module uri
-	 * @return EnterpriseBean
-	 */
-	public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref, String moduleUri);
-
-	public Module getModule(String uri, String altDD);
-
-	/**
-	 * @return the module ref which references
-	 * @moduleDescriptor
-	 */
-	public ModuleRef getModuleRef(Module moduleDescriptor);
-
-	/**
-	 * @return java.util.List of all module refs in this EAR having a reference to
-	 * @aModuleFile
-	 */
-	public List getModuleRefs(ModuleFile aModuleFile);
-
-	/**
-	 * Returns a filtered list of ModuleFiles; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getModuleFiles();
-
-	/**
-	 * Returns a filtered list of RarFiles; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getRARFiles();
-
-	/**
-	 * Returns a filtered list of FARFiles; adds will not be reflected; use
-	 * {@link Archive#add(File)}
-	 */
-	public List getFARFiles();
-
-	/**
-	 * Returns a filtered list of ConnectorModuleRefs
-	 */
-	public List getConnectorModuleRefs();
-
-	/**
-	 * Return all security roles from all existing modules (EjbModule and WebModule)
-	 */
-	public EList getRolesFromAllModules();
-
-	/**
-	 * Return all security roles from an existing module (EjbModule and WebModule)
-	 */
-	public EList getRolesFromModule(Module aModule);
-
-	/**
-	 * Returns a filtered list of WarFiles; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getWARFiles();
-
-	/**
-	 * Returns a filtered list of WebModuleRefs
-	 */
-	public List getWebModuleRefs();
-
-	/**
-	 * Copy the role into each ModuleFile in the ear file which does not already contain the role
-	 * Assumption: a role with the same name as
-	 * 
-	 * @role exists in the application deployment descriptor
-	 */
-	public void pushDownRole(SecurityRole role);
-
-	/**
-	 * Copy the role into the ModuleFile for the module, if the module does not already contain the
-	 * role Assumption: a role with the same name as
-	 * 
-	 * @role exists in the application deployment descriptor
-	 */
-	public void pushDownRole(SecurityRole role, Module aModule);
-
-	/**
-	 * Attempt to remove the module for the parameter from this object's dd, then remove the module
-	 * file, if it is not referenced from any other ModuleRef, from the list of files
-	 */
-	public void remove(ModuleRef aModuleRef);
-
-	/**
-	 * Rename the security role in the ear file's dd; push this change down to any contained module
-	 * dd's; if the module specifies an alt-dd, the change will be reflected there; otherwise it
-	 * will be reflected in the standard dd of the module
-	 * 
-	 * @throws ObjectNotFoundException
-	 *             if the dd for the ear does not contain a role with the existingRoleName
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if the dd for the ear file already contains a role with the new name
-	 */
-	public void renameSecurityRole(String existingRoleName, String newRoleName) throws ObjectNotFoundException, DuplicateObjectException;
-
-	/**
-	 * For each security role in the dd for each module, add a copy to the ear file's dd; if an
-	 * alt-dd is specified for the module, use that dd; otherwise use the standard dd in the module
-	 * file
-	 */
-	public void rollUpRoles();
-
-	/**
-	 * For each security role in the dd for a module, add a copy to the ear file's dd; if an alt-dd
-	 * is specified for the module, use that dd; otherwise use the standard dd in the module file
-	 */
-	public void rollUpRoles(Module aModule);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the DeploymentDescriptor reference
-	 */
-	void setDeploymentDescriptor(Application value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of ModuleRefs references
-	 */
-	EList getModuleRefs();
-
-	public List getArchivesOfType(String type);
-
-	/**
-	 * Return a Map of Modules as keys and a List of EJB References as the values. This will let you
-	 * know which Modules the references came from. You can filter the list of EJB References
-	 * returned on the linked attributed of the reference. This means that you can filter linked
-	 * references, non-linked references, or neither (i.e., return all references).
-	 */
-	Map getEJBReferences(boolean filterLinkedReferences, boolean filterNonLinkedReferences) throws ArchiveWrappedException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBJarFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBJarFile.java
deleted file mode 100644
index e7bd0a70a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBJarFile.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @generated
- */
-public interface EJBJarFile extends ModuleFile {
-
-	/**
-	 * Used for tools performing selective import
-	 */
-	public List getAssociatedFiles(EnterpriseBean ejb);
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The DeploymentDescriptor reference
-	 */
-	EJBJar getDeploymentDescriptor() throws DeploymentDescriptorLoadException;
-
-	public boolean isImportedFrom10();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the DeploymentDescriptor reference
-	 */
-	void setDeploymentDescriptor(EJBJar value);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBModuleRef.java
deleted file mode 100644
index fc37ae0dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBModuleRef.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-
-/**
- * @generated
- */
-public interface EJBModuleRef extends ModuleRef {
-
-	EJBJar getEJBJar() throws ArchiveWrappedException;
-
-} //EJBModuleRef
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java
deleted file mode 100644
index 2d2aa1897..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.io.InputStream;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * @generated
- */
-public interface File extends J2EEEObject {
-
-	/**
-	 * Return the path up to the filename; e.g., from com/ibm/foo/bar.class, com/ibm/foo
-	 */
-	public String getDirectoryURI();
-
-	public InputStream getInputStream() throws java.io.FileNotFoundException, java.io.IOException;
-
-	/**
-	 * Return the tail of the file path; e.g., from com/ibm/foo/bar.class, return bar.class
-	 */
-	public String getName();
-
-	public boolean isApplicationClientFile();
-
-	public boolean isArchive();
-
-	public boolean isContainer();
-
-	public boolean isEARFile();
-
-	public boolean isFARFile();
-
-	public boolean isEJBJarFile();
-
-	public boolean isModuleFile();
-
-	public boolean isRARFile();
-
-	public boolean isReadOnlyDirectory();
-
-	public boolean isWARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the URI attribute
-	 */
-	String getURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the URI attribute
-	 */
-	void setURI(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the LastModified attribute
-	 */
-	long getLastModified();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getLastModified <em>Last Modified</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Last Modified</em>' attribute.
-	 * @see #isSetLastModified()
-	 * @see #unsetLastModified()
-	 * @see #getLastModified()
-	 * @generated
-	 */
-	void setLastModified(long value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getLastModified <em>Last Modified</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #isSetLastModified()
-	 * @see #getLastModified()
-	 * @see #setLastModified(long)
-	 * @generated
-	 */
-	void unsetLastModified();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getLastModified <em>Last Modified</em>}' attribute is set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Last Modified</em>' attribute is set.
-	 * @see #unsetLastModified()
-	 * @see #getLastModified()
-	 * @see #setLastModified(long)
-	 * @generated
-	 */
-	boolean isSetLastModified();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the Size attribute
-	 */
-	long getSize();
-
-	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Size</em>' attribute.
-	 * @see #isSetSize()
-	 * @see #unsetSize()
-	 * @see #getSize()
-	 * @generated
-	 */
-	void setSize(long value);
-
-	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isSetSize()
-	 * @see #getSize()
-	 * @see #setSize(long)
-	 * @generated
-	 */
-	void unsetSize();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getSize <em>Size</em>}' attribute is set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Size</em>' attribute is set.
-	 * @see #unsetSize()
-	 * @see #getSize()
-	 * @see #setSize(long)
-	 * @generated
-	 */
-	boolean isSetSize();
-
-	/**
-	 * Returns the value of the '<em><b>Directory Entry</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Directory Entry</em>' attribute isn't clear, there really
-	 * should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Directory Entry</em>' attribute.
-	 * @see #isSetDirectoryEntry()
-	 * @see #unsetDirectoryEntry()
-	 * @see #setDirectoryEntry(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.commonarchivecore.CommonarchivePackage#getFile_DirectoryEntry()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isDirectoryEntry();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Directory Entry</em>' attribute.
-	 * @see #isSetDirectoryEntry()
-	 * @see #unsetDirectoryEntry()
-	 * @see #isDirectoryEntry()
-	 * @generated
-	 */
-	void setDirectoryEntry(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #isSetDirectoryEntry()
-	 * @see #isDirectoryEntry()
-	 * @see #setDirectoryEntry(boolean)
-	 * @generated
-	 */
-	void unsetDirectoryEntry();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}' attribute is set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Directory Entry</em>' attribute is set.
-	 * @see #unsetDirectoryEntry()
-	 * @see #isDirectoryEntry()
-	 * @see #setDirectoryEntry(boolean)
-	 * @generated
-	 */
-	boolean isSetDirectoryEntry();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the OriginalURI attribute
-	 */
-	String getOriginalURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the OriginalURI attribute
-	 */
-	void setOriginalURI(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The LoadingContainer reference
-	 */
-	Container getLoadingContainer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the LoadingContainer reference
-	 */
-	void setLoadingContainer(Container value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The Container reference
-	 */
-	Container getContainer();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the Container reference
-	 */
-	void setContainer(Container value);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/GenericArchiveTypeDiscriminator.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/GenericArchiveTypeDiscriminator.java
deleted file mode 100644
index c2acce7f1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/GenericArchiveTypeDiscriminator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-/**
- * @author mdelder
- */
-public interface GenericArchiveTypeDiscriminator {
-
-	/**
-	 * This is a unique identifier that contributors should use to specify the generic type that
-	 * should be associated with archives. Example: com.yourcompany.j2ee.extension.customModule
-	 * 
-	 * @return
-	 */
-	public String getTypeKey();
-
-	/**
-	 * If common archive should recognize file extensions other than the standard ones, e.g., .jar,
-	 * .zip, then these file extensions can be specified here.
-	 * 
-	 * @return
-	 */
-	public String[] getCustomFileExtensions();
-
-	/**
-	 * Method that individual discriminators can implement to determine if an Archive is of a
-	 * particular type. Implementers should be sensitive to performance requirments. Usually simple
-	 * tests should be performed, such as:
-	 * <code>if (anArchive.containsFile("xxx.xml")<code>.  The result will
-	 * be stored in the Archive's "types" attribute.
-	 * @param anArchive
-	 * @return
-	 */
-	public boolean discriminate(Archive anArchive);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleFile.java
deleted file mode 100644
index 5704b827b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleFile.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-
-/**
- * @generated
- */
-public interface ModuleFile extends Archive {
-
-	public Resource getDeploymentDescriptorResource() throws java.io.FileNotFoundException, ResourceLoadException;
-
-	public String getDeploymentDescriptorUri();
-
-	/**
-	 * Return the container for this archive casted to EARFile; null if this file is not contained
-	 * in an EARFile
-	 */
-	public EARFile getEARFile();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.ExportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ExportStrategy getExportStrategy();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy getImportStrategy();
-
-	/**
-	 * Returns the specification version of the module file. For example, "2.0"
-	 * 
-	 * @deprecated, Use getDeploymentDescriptorResource().getModuleVersionID();
-	 */
-	public String getSpecVersion();
-
-	/**
-	 * Return the version ID of the module For example, "20"
-	 * 
-	 * @return int
-	 */
-	public int getSpecVersionID();
-
-	EObject getStandardDeploymentDescriptor() throws DeploymentDescriptorLoadException;
-
-	/**
-	 * Answers whether the deployment descriptor is null; used for copy, to determine whether the
-	 * import strategy needs to be copied or not
-	 */
-	public boolean isDeploymentDescriptorSet();
-
-	public Resource makeDeploymentDescriptorResource();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newExportStrategy
-	 *            com.ibm.etools.archive.ExportStrategy
-	 */
-	public void setExportStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ExportStrategy newExportStrategy);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newImportStrategy
-	 *            com.ibm.etools.archive.ImportStrategy
-	 */
-	public void setImportStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy newImportStrategy);
-
-	/**
-	 * Sets the J2EE version for this archive
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
-	 */
-	public void setJ2EEVersion(int versionID);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java
deleted file mode 100644
index 13f5ea195..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-
-/**
- * @generated
- */
-public interface ModuleRef extends J2EEEObject {
-
-	/**
-	 * Return the parsed local deployment descriptor from the ModuleFile
-	 */
-	EObject getStandardDeploymentDescriptor();
-
-	/**
-	 * Return the parsed alt dd, if it exists, from the EAR file containing this module
-	 */
-	EObject getAltDeploymentDescriptor() throws ArchiveWrappedException;
-
-	/**
-	 * Return an alt dd if it exists, otherwise the local dd
-	 */
-	EObject getDeploymentDescriptor() throws ArchiveWrappedException;
-
-
-	/**
-	 * Gets the uri from the {@link Module}referenced by this ref; if there is no module, (eg. a
-	 * standalone JAR), gets the uri from the {@link ModuleFile}. Assumption: The uri of the
-	 * {@link Module}and {@link ModuleFile}should stay in sync
-	 */
-	String getUri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The ModuleFile reference
-	 */
-	ModuleFile getModuleFile();
-
-	/**
-	 * Similar to {@link Archive#getMofResource(String)}, except that alt-dd indirection is
-	 * considered. If this module uses an alt-dd, then the uri will be prepended with the "alt-root"
-	 * and the resource will be loaded from the owning EAR file. In this case, all hrefs into and
-	 * out of this resource should be relative to the root of the EAR. The hrefs are taken care of
-	 * for free when the client uses {@link #makeAltDescriptorsAndResources()}. The alt root is
-	 * automatically generated when it does not exist.
-	 * 
-	 * @see ModuleExtension#getAltRoot()
-	 */
-	Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException;
-
-	public InputStream getAltResourceInputStream(String uri) throws IOException;
-
-	public InputStream getLocalResourceInputStream(String uri) throws IOException;
-
-	/**
-	 * Return an input stream from the resources path of either the ModuleFile, if the module does
-	 * not use alt-dd, or from the altRoot of the module, found in the resources path of the EAR
-	 * 
-	 * @see LoadStrategy#getResourceInputStream(String)
-	 */
-	public InputStream getResourceInputStream(String uri) throws IOException;
-
-
-	/**
-	 * Retrieve a resource from the ModuleFile
-	 * 
-	 * @see Archive#getMofResource(String)
-	 */
-	Resource getLocalMofResource(String uri) throws FileNotFoundException, ResourceLoadException;
-
-	/**
-	 * The uri will be prepended with the "alt-root" and the resource will be loaded from the owning
-	 * EAR file.
-	 */
-	Resource getAltMofResource(String uri) throws FileNotFoundException, ResourceLoadException;
-
-	/**
-	 * Create a new mof resource and add it to the resource set of the context of either the module
-	 * file if this ModuleRef is not an alt, or to the EAR file if it is an alt. If this module is
-	 * uses an alt-dd, then the uri will be prepended with the "alt-root" The alt root is
-	 * automatically generated when it does not exist.
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if a resource already exists in this archive having the uri
-	 */
-	Resource makeMofResource(String uri) throws DuplicateObjectException;
-
-	Resource makeLocalMofResource(String uri) throws DuplicateObjectException;
-
-	Resource makeAltMofResource(String uri) throws DuplicateObjectException;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the ModuleFile reference
-	 */
-	void setModuleFile(ModuleFile value);
-
-	/**
-	 * Rename this module; both its ModuleFile and Module element from the Application deployment
-	 * descriptor.
-	 */
-	public void setURI(String uri);
-
-	boolean isEJB();
-
-	boolean isWeb();
-
-	boolean isClient();
-
-	boolean isConnector();
-
-	boolean usesAltDD();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The EarFile reference
-	 */
-	EARFile getEarFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the EarFile reference
-	 */
-	void setEarFile(EARFile value);
-
-	/**
-	 * Returns the value of the '<em><b>Module</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Module</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Module</em>' reference.
-	 * @see #setModule(Module)
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.CommonarchivePackage#getModuleRef_Module()
-	 * @model required="true"
-	 * @generated
-	 */
-	Module getModule();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef#getModule <em>Module</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Module</em>' reference.
-	 * @see #getModule()
-	 * @generated
-	 */
-	void setModule(Module value);
-
-} //ModuleRef
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java
deleted file mode 100644
index 7df552076..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.jca.Connector;
-
-
-/**
- * @generated
- */
-public interface RARFile extends ModuleFile{
-
-	/**
-	 * Returns the value of the '<em><b>Deployment Descriptor</b></em>' reference. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Deployment Descriptor</em>' reference list isn't clear, there
-	 * really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Deployment Descriptor</em>' reference.
-	 * @see #setDeploymentDescriptor(Connector)
-	 * @see org.eclipse.jst.j2ee.internal.commonarchivecore.CommonarchivePackage#getRARFile_DeploymentDescriptor()
-	 * @model required="true"
-	 * @generated
-	 */
-	Connector getDeploymentDescriptor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile#getDeploymentDescriptor <em>Deployment Descriptor</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Deployment Descriptor</em>' reference.
-	 * @see #getDeploymentDescriptor()
-	 * @generated
-	 */
-	void setDeploymentDescriptor(Connector value);
-
-	/**
-	 * Extracts the RAR file to the specified directory. This method should be used for expanding
-	 * the RAR file if it is a standalone RAR. If the RAR file is packaged as part of an EAR, this
-	 * method should not be used. Instead, the expandTo() of the EAR should be used expand the
-	 * contents of the ear and the nested RAR relative to the EAR's directory (similar to WAR's).
-	 * Creation date: (2/6/2001 7:44:41 PM)
-	 * 
-	 * @param dir
-	 *            java.lang.String
-	 * @param expandFlags
-	 *            int
-	 */
-	void extractToConnectorDirectory(String dir, int expandFlags) throws SaveFailureException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ReadOnlyDirectory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ReadOnlyDirectory.java
deleted file mode 100644
index 83ef763a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ReadOnlyDirectory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.util.List;
-
-/**
- * @generated
- */
-public interface ReadOnlyDirectory extends Container {
-
-	public boolean containsFileInSelfOrSubdirectory(String uri);
-
-	public File getFileInSelfOrSubdirectory(String uri) throws java.io.FileNotFoundException;
-
-	/**
-	 * Returns a flat list of all the files contained in this directory and subdirectories, with the
-	 * directories filtered out, as the list would appear in an archive
-	 */
-	public List getFilesRecursive();
-
-	/**
-	 * Return a filtered list on the files with just the instances of ReadOnlyDirectory
-	 */
-	public List getReadOnlyDirectories();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RepairArchiveCommand.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RepairArchiveCommand.java
deleted file mode 100644
index 94c750cec..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RepairArchiveCommand.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-/**
- * Insert the type's description here. Creation date: (02/27/01 2:20:44 PM)
- * 
- * @author: Administrator
- */
-public class RepairArchiveCommand extends AbstractCommand {
-	protected Archive archive;
-	protected static Map directoryNames;
-
-	/**
-	 * RepairMetaInfCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 */
-	public RepairArchiveCommand(Archive anArchive) {
-		super("Repair Archive", CommonArchiveResourceHandler.Repairs_all_entries_in_the); // = "Repairs all entries in the META-INF and/or WEB-INF directories to be the correct case"//$NON-NLS-1$
-		archive = anArchive;
-		//Ensure Initiailization
-		getDirectoryNames();
-	}
-
-	/**
-	 * @see com.ibm.etools.common.command.Command
-	 */
-	public void execute() {
-		List files = archive.getFiles();
-		for (int i = 0; i < files.size(); i++) {
-			File aFile = (File) files.get(i);
-			if (aFile.isArchive()) {
-				new RepairArchiveCommand((Archive) aFile).execute();
-			} else {
-				String upperUri = aFile.getURI().toUpperCase();
-				Iterator keysAndValues = directoryNames.entrySet().iterator();
-				while (keysAndValues.hasNext()) {
-					String uri = aFile.getURI();
-					Map.Entry entry = (Map.Entry) keysAndValues.next();
-					String key = (String) entry.getKey();
-					String value = (String) entry.getValue();
-					if (upperUri.startsWith(key) && !uri.startsWith(value)) {
-						String tail = uri.substring(key.length());
-						aFile.setURI(value.concat(tail));
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/14/01 5:55:14 PM)
-	 * 
-	 * @return java.util.Set
-	 */
-	protected static java.util.Map getDirectoryNames() {
-		if (directoryNames == null) {
-			directoryNames = new HashMap(6);
-			directoryNames.put(J2EEConstants.META_INF.toUpperCase(), J2EEConstants.META_INF);
-			directoryNames.put(J2EEConstants.WEB_INF.toUpperCase(), J2EEConstants.WEB_INF);
-			directoryNames.put(ArchiveConstants.WEBAPP_LIB_URI.toUpperCase(), ArchiveConstants.WEBAPP_LIB_URI);
-			directoryNames.put(ArchiveConstants.WEBAPP_CLASSES_URI.toUpperCase(), ArchiveConstants.WEBAPP_CLASSES_URI);
-		}
-		return directoryNames;
-	}
-
-	public Collection getResult() {
-		return Arrays.asList(new Object[]{archive});
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/14/01 6:46:16 PM)
-	 * 
-	 * @param args
-	 *            java.lang.String[]
-	 */
-	public static void main(String[] args) {
-		if (!validateArgs(args))
-			return;
-		try {
-			Archive anArchive = CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().primOpenArchive(args[0]);
-			new RepairArchiveCommand(anArchive).execute();
-			anArchive.saveAs(args[1]);
-		} catch (Exception ex) {
-			System.out.println(CommonArchiveResourceHandler.Repair_command_failed___ex_EXC_); // = "Repair command failed - exception stack trace:"
-			ex.printStackTrace();
-		}
-	}
-
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.common.command.Command
-	 */
-	public void redo() {
-		//Default
-	}
-
-	protected static boolean validateArgs(String[] args) {
-		if (!(args.length == 2)) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(CommonArchiveResourceHandler.RepairArchiveCommand_usage); // = "RepairArchiveCommand usage:  <sourceJarFilePath> <destinationPath>"
-			return false;
-		}
-		java.io.File file = new java.io.File(args[0]);
-		boolean isZip = false;
-		java.util.zip.ZipFile zip = null;
-		try {
-			zip = new java.util.zip.ZipFile(file);
-			isZip = true;
-		} catch (java.io.IOException ex) {
-			isZip = false;
-		} finally {
-			if (zip != null)
-				try {
-					zip.close();
-				} catch (java.io.IOException ex) {
-					//Ignore
-				}
-		}
-		if (!isZip && !file.isDirectory()) {
-			System.out.println(CommonArchiveResourceHandler.RepairArchiveCommand_usage1_ERROR_); // = "RepairArchiveCommand usage: sourceJarFilePath must point to a valid archive or directory of an inflated archive"
-			return false;
-		}
-		if (new java.io.File(args[1]).canWrite()) {
-			System.out.println(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.repair_usage_ERROR_, (new Object[]{args[1]}))); // = "RepairArchiveCommand usage: cannot write to destinationPath "
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java
deleted file mode 100644
index f1de9168a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.xml.CollectingErrorHandler;
-import org.eclipse.jst.j2ee.internal.xml.XmlDocumentReader;
-import org.xml.sax.InputSource;
-
-/**
- * Insert the type's description here. Creation date: (03/19/01 10:04:08 AM)
- * 
- * @author: Administrator
- */
-public class ValidateXmlCommand extends AbstractCommand {
-	protected List results;
-	protected ModuleFile archive;
-	public boolean validateNested = true;
-
-	/**
-	 * ValidateXmlCommand constructor comment.
-	 */
-	protected ValidateXmlCommand() {
-		super();
-	}
-
-	/**
-	 * ValidateXmlCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 */
-	public ValidateXmlCommand(ModuleFile m) {
-		super();
-		archive = m;
-	}
-
-	/**
-	 * ValidateXmlCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 */
-	protected ValidateXmlCommand(String label) {
-		super(label);
-	}
-
-	/**
-	 * ValidateXmlCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 */
-	protected ValidateXmlCommand(String label, String description) {
-		super(label, description);
-	}
-
-	/**
-	 * @see Command
-	 */
-	public void execute() {
-		results = new ArrayList();
-		validatateXml();
-		if (isValidateNested()) {
-			List archives = archive.getArchiveFiles();
-			for (int i = 0; i < archives.size(); i++) {
-				Archive a = (Archive) archives.get(i);
-				if (!a.isModuleFile())
-					continue;
-				ModuleFile m = (ModuleFile) a;
-				ValidateXmlCommand cmd = new ValidateXmlCommand(m);
-				cmd.execute();
-				results.addAll(cmd.getResult());
-			}
-		}
-	}
-
-	/**
-	 * @return List of XmlValidationResult; 1 for the archive, and one for each nested module file
-	 */
-	public Collection getResult() {
-		return results;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/22/2001 1:06:52 PM)
-	 * 
-	 * @return boolean
-	 */
-	public boolean isValidateNested() {
-		return validateNested;
-	}
-
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * @see Command
-	 */
-	public void redo() {
-		//Default
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/22/2001 1:06:52 PM)
-	 * 
-	 * @param newValidateNested
-	 *            boolean
-	 */
-	public void setValidateNested(boolean newValidateNested) {
-		validateNested = newValidateNested;
-	}
-
-	protected void validatateXml() {
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		Resource res = archive.getStandardDeploymentDescriptor().eResource();
-		XmlValidationResult result = new XmlValidationResult();
-		result.setArchive(archive);
-		try {
-			res.save(bos, new java.util.HashMap());
-		} catch (Exception ex) {
-			throw new org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException(ex);
-		}
-		ByteArrayInputStream inStream = new ByteArrayInputStream(bos.toByteArray());
-		InputSource source = new InputSource(inStream);
-		CollectingErrorHandler handler = new CollectingErrorHandler();
-		XmlDocumentReader parseAdapter = new XmlDocumentReader(source, null, handler);
-
-		// the following try/catch clause is added to handle the case
-		// when SAX parser throws a fatal exception (type SAXException)
-		// for unmatching end tag that results in a RuntimeException to
-		// be thrown. Need to catch it so we can get the parser exceptions
-		// and display them to the user.
-		try {
-			parseAdapter.parseDocument();
-		} catch (RuntimeException re) {
-
-			if (handler.getCaughtExceptions() != null) {
-				result.setArchive(archive);
-				result.setCaughtExceptions(handler.getCaughtExceptions());
-				results.add(result);
-			}
-
-			throw re;
-		}
-
-		result.setArchive(archive);
-		result.setCaughtExceptions(handler.getCaughtExceptions());
-		results.add(result);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java
deleted file mode 100644
index 577b0849a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @generated
- */
-public interface WARFile extends ModuleFile {
-
-	/**
-	 * Copy the file, and swizzle the file uri if necessary by prepending the classes directory
-	 * 
-	 * @throws DuplicateObjectException
-	 *             of a file with the modified uri already exists in the archive
-	 * 
-	 * @throws IllegalArgumentException
-	 *             if the parameter is a ReadOnlyDirectory
-	 */
-	public File addCopyClass(File aFile) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	/**
-	 * Copy the file, and swizzle the file uri if necessary by prepending the libs directory
-	 * 
-	 * @throws DuplicateObjectException
-	 *             of a file with the modified uri already exists in the archive
-	 * 
-	 * @throws IllegalArgumentException
-	 *             if the parameter is a ReadOnlyDirectory
-	 */
-	public File addCopyLib(File aFile) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	/**
-	 * getClasses() - filter files to return the class files from \web-inf\classes
-	 */
-	public List getClasses();
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The DeploymentDescriptor reference
-	 */
-	WebApp getDeploymentDescriptor() throws DeploymentDescriptorLoadException;
-
-	/**
-	 * Filter files to return the files from \we-inf\lib
-	 */
-	public List getLibs();
-
-	/**
-	 * Filter files to return the JARs and Zips from \we-inf\lib
-	 */
-	public List getLibArchives();
-
-	/**
-	 * getResources() - filter files to return the Web resources within the WAR (no
-	 * classes/libs/metadata)
-	 */
-	public List getResources();
-
-	/**
-	 * Return the source file that matches the output file passed in
-	 * 
-	 * @param aClassFile
-	 *            The .class file or other output file to find the source for
-	 * @return String The matching source. Null if there is no matching source found
-	 */
-	public File getSourceFile(File aClassFile);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the DeploymentDescriptor reference
-	 */
-	void setDeploymentDescriptor(WebApp value);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WebModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WebModuleRef.java
deleted file mode 100644
index 85ed49911..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WebModuleRef.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @generated
- */
-public interface WebModuleRef extends ModuleRef {
-	WebApp getWebApp() throws ArchiveWrappedException;
-
-} //WebModuleRef
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/XmlValidationResult.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/XmlValidationResult.java
deleted file mode 100644
index c55958531..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/XmlValidationResult.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import java.util.List;
-
-
-
-/**
- * Insert the type's description here. Creation date: (03/19/01 3:31:53 PM)
- * 
- * @author: Administrator
- */
-public class XmlValidationResult {
-	protected ModuleFile archive;
-	protected List caughtExceptions;
-
-	/**
-	 * XmlValidationResult constructor comment.
-	 */
-	public XmlValidationResult() {
-		super();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/19/01 3:34:45 PM)
-	 * 
-	 * @return com.ibm.etools.commonarchive.ModuleFile
-	 */
-	public ModuleFile getArchive() {
-		return archive;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/19/01 3:34:45 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getCaughtExceptions() {
-		return caughtExceptions;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/19/01 3:34:45 PM)
-	 * 
-	 * @param newArchive
-	 *            com.ibm.etools.commonarchive.ModuleFile
-	 */
-	public void setArchive(ModuleFile newArchive) {
-		archive = newArchive;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/19/01 3:34:45 PM)
-	 * 
-	 * @param newCaughtExceptions
-	 *            java.util.List
-	 */
-	public void setCaughtExceptions(java.util.List newCaughtExceptions) {
-		caughtExceptions = newCaughtExceptions;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveException.java
deleted file mode 100644
index 5357b47d3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Base exception class for non-runtime exceptions occurring with manipulation of archives
- */
-public class ArchiveException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4340145465956505570L;
-
-	/**
-	 *  
-	 */
-	public ArchiveException() {
-		super();
-	}
-
-	/**
-	 *  
-	 */
-	public ArchiveException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveRuntimeException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveRuntimeException.java
deleted file mode 100644
index 11b1a5ae2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveRuntimeException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-import org.eclipse.jst.j2ee.internal.IWrappedException;
-import org.eclipse.jst.j2ee.internal.WrappedRuntimeException;
-
-
-
-/**
- * Base exception class for runtime exceptions occurring with manipulation of archives; there are
- * some situations where we can only throw a runtime exception instead of a subtype of exception,
- * because the signatures of etools generated methods cannot be overridden to throw any exception
- * other than runtime.
- */
-public class ArchiveRuntimeException extends WrappedRuntimeException implements IWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4727603215052186958L;
-
-	/**
-	 * Constructor for ArchiveRuntimeException.
-	 */
-	public ArchiveRuntimeException() {
-		super();
-	}
-
-	/**
-	 * Constructor for ArchiveRuntimeException.
-	 * 
-	 * @param e
-	 */
-	public ArchiveRuntimeException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * Constructor for ArchiveRuntimeException.
-	 * 
-	 * @param s
-	 */
-	public ArchiveRuntimeException(String s) {
-		super(s);
-	}
-
-	/**
-	 * Constructor for ArchiveRuntimeException.
-	 * 
-	 * @param s
-	 * @param e
-	 */
-	public ArchiveRuntimeException(String s, Exception e) {
-		super(s, e);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveWrappedException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveWrappedException.java
deleted file mode 100644
index 2396cb7fb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveWrappedException.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-import org.eclipse.jst.j2ee.internal.IWrappedException;
-import org.eclipse.jst.j2ee.internal.WrappedException;
-
-
-
-/**
- * Base exception class for non-runtime exceptions occurring with manipulation of archives, where a
- * caught exception causes this exception to be thrown
- */
-public class ArchiveWrappedException extends WrappedException implements IWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3011655166037300546L;
-
-	/**
-	 * Constructor for ArchiveWrappedException.
-	 */
-	public ArchiveWrappedException() {
-		super();
-	}
-
-	/**
-	 * Constructor for ArchiveWrappedException.
-	 * 
-	 * @param e
-	 */
-	public ArchiveWrappedException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * Constructor for ArchiveWrappedException.
-	 * 
-	 * @param s
-	 */
-	public ArchiveWrappedException(String s) {
-		super(s);
-	}
-
-	/**
-	 * Constructor for ArchiveWrappedException.
-	 * 
-	 * @param s
-	 * @param e
-	 */
-	public ArchiveWrappedException(String s, Exception e) {
-		super(s, e);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DeploymentDescriptorLoadException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DeploymentDescriptorLoadException.java
deleted file mode 100644
index d7b8e6228..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DeploymentDescriptorLoadException.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception which can occur if an error/exception occurs while loading a deployment descriptor
- */
-public class DeploymentDescriptorLoadException extends ArchiveRuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3870314481148871665L;
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 */
-	public DeploymentDescriptorLoadException() {
-		super();
-	}
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 * 
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public DeploymentDescriptorLoadException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public DeploymentDescriptorLoadException(String s) {
-		super(s);
-	}
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public DeploymentDescriptorLoadException(String s, Exception e) {
-		super(s, e);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DuplicateObjectException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DuplicateObjectException.java
deleted file mode 100644
index 9c8be7893..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DuplicateObjectException.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception which can occur when an attemp is made to add to a list an object equaling, or having
- * the same name, id, etc, as another object in the list.
- */
-public class DuplicateObjectException extends ArchiveException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7269139518957826130L;
-	protected Object duplicate;
-
-	/**
-	 * DuplicateObjectException constructor comment.
-	 */
-	public DuplicateObjectException() {
-		super();
-	}
-
-	/**
-	 * DuplicateObjectException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public DuplicateObjectException(String s) {
-		super(s);
-	}
-
-	/**
-	 * DuplicateObjectException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public DuplicateObjectException(String s, Object o) {
-		super(s);
-		setDuplicate(o);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (04/16/01 9:43:00 AM)
-	 * 
-	 * @return java.lang.Object
-	 */
-	public java.lang.Object getDuplicate() {
-		return duplicate;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (04/16/01 9:43:00 AM)
-	 * 
-	 * @param newDuplicate
-	 *            java.lang.Object
-	 */
-	protected void setDuplicate(java.lang.Object newDuplicate) {
-		duplicate = newDuplicate;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/EmptyResourceException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/EmptyResourceException.java
deleted file mode 100644
index 4d39f86b3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/EmptyResourceException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception which occurs when a mof resource's extent contains zero elements and an attempt is made
- * to access an elememt from the resource.
- */
-public class EmptyResourceException extends ArchiveException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -6482393304280160585L;
-
-	/**
-	 * EmptyResourceException constructor comment.
-	 */
-	public EmptyResourceException() {
-		super();
-	}
-
-	/**
-	 * EmptyResourceException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public EmptyResourceException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/IArchiveWrappedException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/IArchiveWrappedException.java
deleted file mode 100644
index aa97248eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/IArchiveWrappedException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-import org.eclipse.jst.j2ee.internal.IWrappedException;
-
-/**
- * @deprecated
- * @see org.eclipse.jst.j2ee.internal.exception.IWrappedException
- */
-public interface IArchiveWrappedException extends IWrappedException {
-	//Default
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ManifestException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ManifestException.java
deleted file mode 100644
index 93fe20594..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ManifestException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-public class ManifestException extends ArchiveRuntimeException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1045140899078192019L;
-
-	/**
-	 * Constructor for ManifestException.
-	 */
-	public ManifestException() {
-		super();
-	}
-
-	/**
-	 * Constructor for ManifestException.
-	 * 
-	 * @param e
-	 */
-	public ManifestException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * Constructor for ManifestException.
-	 * 
-	 * @param s
-	 */
-	public ManifestException(String s) {
-		super(s);
-	}
-
-	/**
-	 * Constructor for ManifestException.
-	 * 
-	 * @param s
-	 * @param e
-	 */
-	public ManifestException(String s, Exception e) {
-		super(s, e);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NestedJarException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NestedJarException.java
deleted file mode 100644
index 5828f5790..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NestedJarException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Runtime exception thrown when an error occurs reading a jar within a jar
- */
-public class NestedJarException extends ArchiveRuntimeException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -559954723242646381L;
-
-	public NestedJarException() {
-		super();
-	}
-
-	public NestedJarException(Exception e) {
-		super(e);
-	}
-
-	public NestedJarException(String s, Exception e) {
-		super(s, e);
-	}
-
-	public NestedJarException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoEJB10DescriptorsException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoEJB10DescriptorsException.java
deleted file mode 100644
index d9973e5b6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoEJB10DescriptorsException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Insert the type's description here. Creation date: (06/05/01 7:31:27 PM)
- * 
- * @author: Administrator
- */
-public class NoEJB10DescriptorsException extends RuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7222290886333179223L;
-
-	/**
-	 * NoEJB10DescriptorsException constructor comment.
-	 */
-	public NoEJB10DescriptorsException() {
-		super();
-	}
-
-	/**
-	 * NoEJB10DescriptorsException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public NoEJB10DescriptorsException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleElementException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleElementException.java
deleted file mode 100644
index 68bc7ecc1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleElementException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * @deprecated No Longer used; check for null instead Exception which occurs if an attempt is made
- *             to access a non-existent module dd element from an ear file
- */
-public class NoModuleElementException extends ArchiveException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3781813351160222774L;
-
-	/**
-	 * NoModuleElementException constructor comment.
-	 */
-	public NoModuleElementException() {
-		super();
-	}
-
-	/**
-	 * NoModuleElementException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public NoModuleElementException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleFileException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleFileException.java
deleted file mode 100644
index e1f435a4e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleFileException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-public class NoModuleFileException extends ArchiveRuntimeException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7261084646147362776L;
-
-	/**
-	 * Constructor for NoModuleFileException.
-	 */
-	public NoModuleFileException() {
-		super();
-	}
-
-	/**
-	 * Constructor for NoModuleFileException.
-	 * 
-	 * @param e
-	 */
-	public NoModuleFileException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * Constructor for NoModuleFileException.
-	 * 
-	 * @param s
-	 */
-	public NoModuleFileException(String s) {
-		super(s);
-	}
-
-	/**
-	 * Constructor for NoModuleFileException.
-	 * 
-	 * @param s
-	 * @param e
-	 */
-	public NoModuleFileException(String s, Exception e) {
-		super(s, e);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotADeploymentDescriptorException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotADeploymentDescriptorException.java
deleted file mode 100644
index 418974546..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotADeploymentDescriptorException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Insert the type's description here. Creation date: (06/06/01 9:26:43 AM)
- * 
- * @author: Administrator
- */
-public class NotADeploymentDescriptorException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -9072252417343910963L;
-
-	/**
-	 * NotADeploymentDescriptorException constructor comment.
-	 */
-	public NotADeploymentDescriptorException() {
-		super();
-	}
-
-	/**
-	 * NotADeploymentDescriptorException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public NotADeploymentDescriptorException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotSupportedException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotSupportedException.java
deleted file mode 100644
index 435d13e4f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotSupportedException.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-public class NotSupportedException extends ArchiveWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -6690631631593101382L;
-
-	/**
-	 * NotSupportedException constructor comment.
-	 */
-	public NotSupportedException() {
-		super();
-	}
-
-	/**
-	 * NotSupportedException constructor comment.
-	 * 
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public NotSupportedException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * NotSupportedException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public NotSupportedException(String s) {
-		super(s);
-	}
-
-	/**
-	 * NotSupportedException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public NotSupportedException(String s, Exception e) {
-		super(s, e);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ObjectNotFoundException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ObjectNotFoundException.java
deleted file mode 100644
index 1c266b007..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ObjectNotFoundException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Insert the type's description here. Creation date: (02/08/01 8:33:51 PM)
- * 
- * @author: Administrator
- */
-public class ObjectNotFoundException extends ArchiveException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3539317762510485699L;
-
-	/**
-	 * ObjectNotFoundException constructor comment.
-	 */
-	public ObjectNotFoundException() {
-		super();
-	}
-
-	/**
-	 * ObjectNotFoundException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public ObjectNotFoundException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/OpenFailureException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/OpenFailureException.java
deleted file mode 100644
index c78d4a496..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/OpenFailureException.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception which occurs while opening an archive; could occur for a variety of reasons, eg, io
- * failure, deployment descriptor errors, etc. Check the nested exception for more info.
- */
-public class OpenFailureException extends ArchiveWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1786924156051091340L;
-
-	/**
-	 * OpenFailureException constructor comment.
-	 */
-	public OpenFailureException() {
-		super();
-	}
-
-	/**
-	 * OpenFailureException constructor comment.
-	 * 
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public OpenFailureException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * OpenFailureException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public OpenFailureException(String s) {
-		super(s);
-	}
-
-	/**
-	 * OpenFailureException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public OpenFailureException(String s, Exception e) {
-		super(s, e);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ReopenException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ReopenException.java
deleted file mode 100644
index be479db6f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ReopenException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception which can be thrown as a result of an IO exception which may occur while "re-syncing"
- * an archive after it has been saved. For example, if 10 files are copied from Archive A to Archive
- * B, then archive b is saved, its contents will be loaded from a new source, the newly saved jar
- * file. Therefore, the archive will be reopened after saving, which could result in an IOException.
- */
-public class ReopenException extends ArchiveWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2797595721842336360L;
-
-	/**
-	 * ReopenException constructor comment.
-	 */
-	public ReopenException() {
-		super();
-	}
-
-	/**
-	 * ReopenException constructor comment.
-	 * 
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public ReopenException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * ReopenException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public ReopenException(String s) {
-		super(s);
-	}
-
-	/**
-	 * ReopenException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public ReopenException(String s, Exception e) {
-		super(s, e);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ResourceLoadException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ResourceLoadException.java
deleted file mode 100644
index 394c836bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ResourceLoadException.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception thrown if in exception other than java.io.FileNotFoundException is caught while
- * attempting to load a mof resource.
- */
-public class ResourceLoadException extends ArchiveRuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3337225489102635339L;
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 */
-	public ResourceLoadException() {
-		super();
-	}
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 * 
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public ResourceLoadException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public ResourceLoadException(String s) {
-		super(s);
-	}
-
-	/**
-	 * ResourceLoadException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 * @param e
-	 *            java.lang.Exception
-	 */
-	public ResourceLoadException(String s, Exception e) {
-		super(s, e);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SaveFailureException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SaveFailureException.java
deleted file mode 100644
index b2bd5562b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SaveFailureException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Exception which occurs while saving an archive; could occur for a variety of reasons, eg, io
- * failure, etc. Check the nested exception for more info.
- */
-public class SaveFailureException extends ArchiveWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8593253339847650246L;
-
-	/**
-	 * SaveFailureException constructor comment.
-	 */
-	public SaveFailureException() {
-		super();
-	}
-
-	/**
-	 * SaveFailureException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public SaveFailureException(Exception e) {
-		super(e);
-	}
-
-	/**
-	 * SaveFailureException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public SaveFailureException(String s) {
-		super(s);
-	}
-
-	/**
-	 * SaveFailureException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public SaveFailureException(String s, Exception e) {
-		super(s, e);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SubclassResponsibilityException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SubclassResponsibilityException.java
deleted file mode 100644
index 2c1ef6ee0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SubclassResponsibilityException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-
-/**
- * Runtime exception used as a way to enforce abstract behavior without declaring the methods
- * abstract. Necessary because impl classes in the etools generated hierarchy cannot be abstract if
- * they have subtypes.
- */
-public class SubclassResponsibilityException extends ArchiveRuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -6815673671775564354L;
-
-	/**
-	 * SubclassResponsibilityException constructor comment.
-	 */
-	public SubclassResponsibilityException() {
-		super();
-	}
-
-	/**
-	 * SubclassResponsibilityException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public SubclassResponsibilityException(String methodName) {
-		super(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.subclass_responsibilty_EXC_, (new Object[]{methodName}))); // = " must be implemented in subclass"
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.java
deleted file mode 100644
index 61ed8253f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-
-
-/**
- * @deprecated Exception no longer thrown; check for null instead. Exception which may be thrown
- *             whenever a {@link ModuleFile}is expected to be contained within an ear file but it
- *             is not
- */
-public class UncontainedModuleFileException extends ArchiveRuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7311775746549718190L;
-
-	/**
-	 * UncontainedModuleException constructor comment.
-	 */
-	public UncontainedModuleFileException() {
-		super();
-	}
-
-	/**
-	 * UncontainedModuleException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public UncontainedModuleFileException(String s) {
-		super(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveConstants.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveConstants.java
deleted file mode 100644
index 47418eeb1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveConstants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-
-/**
- * This is a catalog of useful constants for the archive support. Can be used to store relative
- * paths to specific xml and xmi resources.
- */
-public interface ArchiveConstants extends J2EEConstants {
-	//Standard Jar info
-	/** "com" */
-	String RAR_CLASSES_URI = "com"; //$NON-NLS-1$
-
-	/**
-	 * Relative path in a war file with no leading slash "WEB-INF/lib/"
-	 */
-	String WEBAPP_LIB_URI = "WEB-INF/lib/"; //$NON-NLS-1$
-
-	/**
-	 * Relative path in a war file with no leading slash "WEB-INF/classes/"
-	 */
-	String WEBAPP_CLASSES_URI = "WEB-INF/classes/"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java
deleted file mode 100644
index 9866325af..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-/**
- * Initializer class to preregister packages
- */
-public class ArchiveInit {
-	protected static boolean initialized = false;
-	protected static boolean plugin_initialized = false;
-
-	public static void init() {
-		init(true);
-	}
-
-	public static void init(boolean shouldPreRegisterPackages) {
-		if (!initialized) {
-			initialized = true;
-			invokePrereqInits(shouldPreRegisterPackages);
-			if (shouldPreRegisterPackages)
-				preRegisterPackages();
-		}
-	}
-
-	private static void preRegisterPackages() {
-		//CommonarchivePackage reg
-		ExtendedEcoreUtil.preRegisterPackage("commonarchive.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-						public EPackage getEPackage() {
-							return CommonarchivePackage.eINSTANCE;
-						}
-						public EFactory getEFactory() {
-							return CommonarchiveFactory.eINSTANCE;
-						}
-					});
-		ExtendedEcoreUtil.preRegisterPackage("commonarchive.looseconfig.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-						public EPackage getEPackage() {
-							return LooseconfigPackage.eINSTANCE;
-						}
-						public EFactory getEFactory() {
-							return LooseconfigFactory.eINSTANCE;
-						}
-					});
-	}
-
-	public static void invokePrereqInits(boolean shouldPreRegisterPackages) {
-		J2EEInit.init(shouldPreRegisterPackages);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifest.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifest.java
deleted file mode 100644
index cc4d35094..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.jar.Attributes;
-
-/**
- * Contains the API of
- * 
- * @link java.util.jar.Manifest, along with added helpers
- */
-public interface ArchiveManifest {
-	/**
-	 * Creates a new manifest entry (attributes) for the given name
-	 */
-	public void addEntry(String entryName);
-
-	public void addEntry(String entryName, Attributes attr);
-
-	/**
-	 * Adds the key/value pair to the attributes for the given entry name; if the entry does not
-	 * exist, creates a new attributes
-	 */
-	public void addEntryAttribute(String entryName, String key, String value);
-
-	/**
-	 * Defaults the version to "1.0" if not already set
-	 */
-	public void addVersionIfNecessary();
-
-	public void appendClassPath(String extension);
-
-	/**
-	 * @see java.util.jar.Manifest#clear
-	 */
-	public void clear();
-
-	/**
-	 * @see java.util.jar.Manifest#getAttributes
-	 */
-	public Attributes getAttributes(String name);
-
-	public String getClassPath();
-
-	public String[] getClassPathTokenized();
-
-	/**
-	 * @see java.util.jar.Manifest#getEntries
-	 */
-	public Map getEntries();
-
-	public String getEntryAttribute(String entryName, String key);
-
-	/**
-	 * @see java.util.jar.Manifest#getAttributes
-	 */
-	public Attributes getMainAttributes();
-
-	public String getMainClass();
-
-	/**
-	 * Return the value iff the entry exists in a case-sensitive manner; manifest version is
-	 * required for the manifest to save correctly
-	 */
-	public String getManifestVersion();
-	
-	/**
-	 * Return the value iff the entry exists in a case-sensitive manner; implementation version is
-	 * optional in  the manifest
-	 * */
-	public String getImplementationVersion();
-
-	/**
-	 * Add all the entries not already contained in the class path of this manifest
-	 */
-	public void mergeClassPath(String[] classPathEntries);
-
-	/**
-	 * @see java.util.jar.Manifest#read
-	 */
-	public void read(InputStream is) throws IOException;
-
-	public void removeEntry(String entryName);
-
-	public void removeEntryAttribute(String entryName, Object key);
-
-	public void setClassPath(String aSpaceDelimitedPath);
-
-	public void setMainClass(String className);
-
-	public void setManifestVersion(java.lang.String version);
-	
-	public void setImplemenationVersion(java.lang.String version);
-
-	/**
-	 * @see java.util.jar.Manifest#write
-	 */
-	public void write(OutputStream out) throws IOException;
-
-	/**
-	 * Writes the Manifest to the specified OutputStream, splitting each classpath entry on a line
-	 * by itself.
-	 * 
-	 * @param out
-	 *            the output stream
-	 * @exception IOException
-	 *                if an I/O error has occurred
-	 */
-	public void writeSplittingClasspath(OutputStream out) throws IOException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifestImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifestImpl.java
deleted file mode 100644
index 2d2feb6a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifestImpl.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import com.ibm.icu.util.StringTokenizer;
-import java.util.jar.Attributes;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * Helper class for manifest files
- */
-public class ArchiveManifestImpl extends java.util.jar.Manifest implements org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest {
-	/**
-	 * ArchiveManifest constructor comment.
-	 */
-	public ArchiveManifestImpl() {
-		super();
-	}
-
-	/**
-	 * ArchiveManifest constructor comment.
-	 * 
-	 * @param is
-	 *            java.io.InputStream
-	 * @throws java.io.IOException
-	 *             The exception description.
-	 */
-	public ArchiveManifestImpl(java.io.InputStream is) throws java.io.IOException {
-		super(is);
-	}
-
-	/**
-	 * ArchiveManifest constructor comment.
-	 * 
-	 * @param man
-	 *            java.util.jar.Manifest
-	 */
-	public ArchiveManifestImpl(java.util.jar.Manifest man) {
-		super(man);
-	}
-
-	/**
-	 * Creates a new manifest entry (attributes) for the given name
-	 */
-	public void addEntry(String entryName) {
-		Attributes attr = new Attributes();
-		addEntry(entryName, attr);
-	}
-
-	public void addEntry(String entryName, Attributes attr) {
-		getEntries().put(entryName, attr);
-	}
-
-	/**
-	 * Adds the key/value pair to the attributes for the given entry name; if the entry does not
-	 * exist, creates a new attributes
-	 */
-	public void addEntryAttribute(String entryName, String key, String value) {
-		Attributes attr = getAttributes(entryName);
-		if (attr == null)
-			addEntry(entryName);
-		attr = getAttributes(entryName);
-		attr.putValue(key, value);
-	}
-
-	public void addVersionIfNecessary() {
-		//This is a hack because of the fact that the manifest does not serialize correctly if
-		//The version is not set. In addition to saves, the serialization is used for copy
-		if (getManifestVersion() == null || getManifestVersion().equals(""))//$NON-NLS-1$
-			setManifestVersion("1.0");//$NON-NLS-1$
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void appendClassPath(java.lang.String extension) {
-		String classPath = getClassPath();
-		if (classPath != null)
-			setClassPath(classPath + " " + extension);//$NON-NLS-1$
-		else
-			setClassPath(extension);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public java.lang.String getClassPath() {
-		return ArchiveUtil.getValueIgnoreKeyCase(Attributes.Name.CLASS_PATH.toString(), getMainAttributes());
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public java.lang.String[] getClassPathTokenized() {
-		String classPath = getClassPath();
-		if (classPath == null)
-			return new String[0];
-		return org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.getTokens(classPath);
-	}
-
-	public String getEntryAttribute(String entryName, String key) {
-		Attributes attr = getAttributes(entryName);
-		if (attr == null)
-			return null;
-		return attr.getValue(key);
-	}
-
-	public String getMainClass() {
-		return ArchiveUtil.getValueIgnoreKeyCase(Attributes.Name.MAIN_CLASS.toString(), getMainAttributes());
-	}
-
-	public String getManifestVersion() {
-		return getMainAttributes().getValue(Attributes.Name.MANIFEST_VERSION);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void mergeClassPath(java.lang.String[] classPathEntries) {
-		StringBuffer sb = new StringBuffer();
-		java.util.List existing = java.util.Arrays.asList(getClassPathTokenized());
-		String cp = getClassPath();
-		if (cp != null)
-			sb.append(cp);
-		boolean empty = cp == null || "".equals(cp); //$NON-NLS-1$
-		for (int i = 0; i < classPathEntries.length; i++) {
-			if (!existing.contains(classPathEntries[i])) {
-				if (!empty)
-					sb.append(" "); //$NON-NLS-1$
-				else
-					empty = false;
-				sb.append(classPathEntries[i]);
-			}
-		}
-		setClassPath(sb.toString());
-	}
-
-	public void removeEntry(String entryName) {
-		getEntries().remove(entryName);
-	}
-
-	public void removeEntryAttribute(String entryName, Object key) {
-		Attributes attr = getAttributes(entryName);
-		if (attr != null)
-			attr.remove(key);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void setClassPath(java.lang.String aSpaceDelimitedPath) {
-		Attributes attributes = getMainAttributes();
-		if (aSpaceDelimitedPath == null)
-			attributes.remove(Attributes.Name.CLASS_PATH);
-		else
-			attributes.putValue(Attributes.Name.CLASS_PATH.toString(), aSpaceDelimitedPath);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void setMainClass(java.lang.String className) {
-		Attributes attributes = getMainAttributes();
-		if (className == null)
-			attributes.remove(Attributes.Name.MAIN_CLASS);
-		else
-			attributes.putValue(Attributes.Name.MAIN_CLASS.toString(), className);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void setManifestVersion(java.lang.String version) {
-		Attributes attributes = getMainAttributes();
-		attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), version);
-	}
-
-	/**
-	 * Writes the Manifest to the specified OutputStream, splitting each classpath entry on a line
-	 * by itself.
-	 * 
-	 * @param out
-	 *            the output stream
-	 * @exception IOException
-	 *                if an I/O error has occurred
-	 */
-	public void writeSplittingClasspath(OutputStream out) throws IOException {
-		DataOutputStream dos = new DataOutputStream(out);
-		// Write out the main attributes for the manifest
-		writeMainSplittingClasspath(getMainAttributes(), dos);
-		// Now write out the pre-entry attributes
-		Iterator it = getEntries().entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry e = (Map.Entry) it.next();
-			StringBuffer buffer = new StringBuffer("Name: "); //$NON-NLS-1$
-			buffer.append((String) e.getKey());
-			buffer.append("\r\n"); //$NON-NLS-1$
-			localMake72Safe(buffer);
-			dos.writeBytes(buffer.toString());
-			write((Attributes) e.getValue(), dos);
-		}
-		dos.flush();
-	}
-
-	/*
-	 * Writes the current attributes to the specified data output stream. XXX Need to handle UTF8
-	 * values and break up lines longer than 72 bytes
-	 * 
-	 * @see Attributes#write
-	 */
-	protected void write(Attributes attributes, DataOutputStream os) throws IOException {
-		Iterator it = attributes.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry e = (Map.Entry) it.next();
-			StringBuffer buffer = new StringBuffer(((Attributes.Name) e.getKey()).toString());
-			buffer.append(": "); //$NON-NLS-1$
-			buffer.append(toUtf8((String) e.getValue()));
-			buffer.append("\r\n"); //$NON-NLS-1$
-			localMake72Safe(buffer);
-			os.writeBytes(buffer.toString());
-		}
-		os.writeBytes("\r\n"); //$NON-NLS-1$
-	}
-
-	/*
-	 * Writes the current attributes to the specified data output stream, make sure to write out the
-	 * MANIFEST_VERSION or SIGNATURE_VERSION attributes first.
-	 * 
-	 * @see Attributes#writeMain
-	 */
-	protected void writeMainSplittingClasspath(Attributes attributes, DataOutputStream out) throws IOException {
-		// write out the *-Version header first, if it exists
-		String vername = Attributes.Name.MANIFEST_VERSION.toString();
-		String version = toUtf8(attributes.getValue(vername));
-		if (version == null) {
-			vername = Attributes.Name.SIGNATURE_VERSION.toString();
-			version = toUtf8(attributes.getValue(vername));
-		}
-
-		if (version != null) {
-			out.writeBytes(vername + ": " + version + "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		// write out all attributes except for the version
-		// we wrote out earlier
-		Iterator it = attributes.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry e = (Map.Entry) it.next();
-			String name = ((Attributes.Name) e.getKey()).toString();
-			if ((version != null) && !(name.equalsIgnoreCase(vername))) {
-				if (name.equalsIgnoreCase(Attributes.Name.CLASS_PATH.toString())) {
-					writeSplit(out, name, toUtf8((String) e.getValue()));
-					continue;
-				}
-				StringBuffer buffer = new StringBuffer(name);
-				buffer.append(": "); //$NON-NLS-1$
-				buffer.append(toUtf8((String) e.getValue()));
-				buffer.append("\r\n"); //$NON-NLS-1$
-				localMake72Safe(buffer);
-				out.writeBytes(buffer.toString());
-			}
-		}
-		out.writeBytes("\r\n"); //$NON-NLS-1$
-	}
-
-	protected void writeSplit(DataOutputStream out, String name, String value) throws IOException {
-		StringTokenizer tok = new StringTokenizer(value);
-		int inc = 0;
-		while (tok.hasMoreTokens()) {
-			StringBuffer buffer = null;
-			if (inc == 0) {
-				buffer = new StringBuffer(name);
-				buffer.append(": "); //$NON-NLS-1$
-			} else {
-				buffer = new StringBuffer();
-				buffer.append(' ');
-			}
-			buffer.append(tok.nextToken());
-			if (tok.countTokens() > 0)
-				buffer.append(" \r\n"); //$NON-NLS-1$
-			else
-				buffer.append("\r\n"); //$NON-NLS-1$
-			localMake72Safe(buffer);
-			out.writeBytes(buffer.toString());
-			inc++;
-		}
-	}
-
-	/**
-	 * Adds line breaks to enforce a maximum 72 bytes per line.
-	 */
-	protected static void localMake72Safe(StringBuffer line) {
-		int length = line.length();
-		if (length > 72) {
-			int index = 70;
-			while (index - 1 < length) {
-				line.insert(index, "\r\n "); //$NON-NLS-1$
-				index += 72;
-				length += 3;
-			}
-		}
-		return;
-	}
-
-	public String getImplementationVersion() {
-		return getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
-	}
-
-	public void setImplemenationVersion(String version) {
-		Attributes attributes = getMainAttributes();
-		attributes.putValue(Attributes.Name.IMPLEMENTATION_VERSION.toString(), version);
-	}
-    
-    /**
-     * Encodes a double-byte string into UTF8 form. Every character in the
-     * returned string represents one byte of the UTF8 encoding. 
-     */
-    
-    private String toUtf8( final String str ) throws IOException
-    {
-        if( str == null )
-        {
-            return null;
-        }
-        else
-        {
-            final byte[] utf8 = str.getBytes( "UTF-8" );
-            return new String( utf8, 0, 0, utf8.length );
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveOptions.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveOptions.java
deleted file mode 100644
index 98afdf9c2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveOptions.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-
-
-/**
- * Insert the type's description here. Creation date: (05/02/01 2:58:48 PM)
- * 
- * @author: Administrator
- */
-public class ArchiveOptions implements Cloneable {
-
-	public static final int SAX = 1;
-	public static final int DOM = 2;
-	public static final int DEFAULT = 3;
-
-	private int rendererType = DEFAULT;
-
-	public static final int LOAD_MODE_COMPAT = 0;
-	public static final int LOAD_MODE_SPEC = 1;
-
-	private int classLoadingMode = LOAD_MODE_COMPAT;
-
-	
-	/**
-	 * Load strategy for opening/reading the archive; optional - if null a load strategy will be
-	 * created when the archive is opened
-	 */
-	private LoadStrategy loadStrategy;
-	/**
-	 * Indicator for whether auto java reflection should be turned on in the archive - defaults to
-	 * true
-	 */
-	private boolean useJavaReflection = true;
-	/**
-	 * Indicator for whether the archive will be modified after opening or if it is just being
-	 * opened, read, saved to a new location; this is an optimization to avoid temp file creation
-	 * and saving of individual files within a nested archive if the nested archive will not change -
-	 * defaults to false
-	 */
-	private boolean isReadOnly;
-
-	/**
-	 * Indicator for whether a libary nested in another archive (eg, utility JARs in an EAR) will be
-	 * saved out as an ordinary file or as a nested Archive. When loaded into memory these files are
-	 * treated as Archives, to support dynamic class loading for Java reflection of classes in
-	 * EJBJarFiles and dependent JARs. An archive opened for edit, either by adding or removing
-	 * files or changning the Manifest or a deployment descriptor, will be saved as a new file one
-	 * file at a time. The default for this flag is true; it only applies to library Archives, not
-	 * instances of ModuleFile. If you wish to edit a nested library, set this flag to false
-	 */
-	private boolean saveLibrariesAsFiles = true;
-
-
-	private boolean saveOnlyDirtyMofResources = true;
-
-	/**
-	 * By default, nested archives are treated as primitive archives and are not piped through the
-	 * discriminator tree on the archive factory; module files in an EAR are opened using the
-	 * specific open methods on the factory; change this flag if you'd like nested archives to be
-	 * discriminated
-	 */
-	private boolean discriminateNestedArchives = false;
-
-	private Map readOnlyFlags;
-
-	/**
-	 * ArchiveOptions constructor comment.
-	 */
-	public ArchiveOptions() {
-		super();
-	}
-
-	/**
-	 * Make a copy of the reciever, setting the loadStrategy to null
-	 */
-	public Object clone() {
-		return cloneWith(null);
-	}
-
-	/**
-	 * Make a copy of the reciever, setting the loadStrategy to null
-	 */
-	public ArchiveOptions cloneWith(LoadStrategy aLoadStrategy) {
-		try {
-			ArchiveOptions result = (ArchiveOptions) super.clone();
-			result.setLoadStrategy(aLoadStrategy);
-			result.readOnlyFlags = null;
-			return result;
-		} catch (CloneNotSupportedException ignore) {
-			return null;
-		}
-	}
-
-	public ArchiveOptions cloneWith(LoadStrategy aLoadStrategy, String uri) {
-		ArchiveOptions result = cloneWith(aLoadStrategy);
-		result.setIsReadOnly(isReadOnly(uri));
-		return result;
-	}
-
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy getLoadStrategy() {
-		return loadStrategy;
-	}
-
-	public boolean isReadOnly() {
-		return isReadOnly;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/18/2001 2:42:11 PM)
-	 * 
-	 * @return boolean
-	 */
-	public boolean saveOnlyDirtyMofResources() {
-		return saveOnlyDirtyMofResources;
-	}
-
-	public void setIsReadOnly(boolean newIsReadOnly) {
-		isReadOnly = newIsReadOnly;
-	}
-
-	public void setIsReadOnly(boolean readOnly, String uri) {
-		if (readOnlyFlags == null)
-			readOnlyFlags = new HashMap();
-		readOnlyFlags.put(uri, new Boolean(readOnly));
-	}
-
-	public boolean isReadOnly(String uri) {
-		if (readOnlyFlags != null) {
-			Boolean bool = (Boolean) readOnlyFlags.get(uri);
-			if (bool != null)
-				return bool.booleanValue();
-		}
-		return isReadOnly;
-	}
-
-	public void setLoadStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy newLoadStrategy) {
-		loadStrategy = newLoadStrategy;
-		loadStrategy.setReadOnly(isReadOnly());
-		loadStrategy.setRendererType(getRendererType());
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/18/2001 2:42:11 PM)
-	 * 
-	 * @param newSaveOnlyDirtyMofResources
-	 *            boolean
-	 */
-	public void setSaveOnlyDirtyMofResources(boolean newSaveOnlyDirtyMofResources) {
-		saveOnlyDirtyMofResources = newSaveOnlyDirtyMofResources;
-	}
-
-	public void setUseJavaReflection(boolean newUseJavaReflection) {
-		useJavaReflection = newUseJavaReflection;
-	}
-
-	public boolean useJavaReflection() {
-		return useJavaReflection;
-	}
-
-	/**
-	 * Gets the saveLibrariesAsFiles.
-	 * 
-	 * @return Returns a boolean
-	 */
-	public boolean isSaveLibrariesAsFiles() {
-		return saveLibrariesAsFiles;
-	}
-
-	/**
-	 * Sets the saveLibrariesAsFiles.
-	 * 
-	 * @param saveLibrariesAsFiles
-	 *            The saveLibrariesAsFiles to set
-	 */
-	public void setSaveLibrariesAsFiles(boolean saveLibrariesAsFiles) {
-		this.saveLibrariesAsFiles = saveLibrariesAsFiles;
-	}
-
-
-	/**
-	 * Gets the discriminateNestedArchives.
-	 * 
-	 * @return Returns a boolean
-	 */
-	public boolean shouldDiscriminateNestedArchives() {
-		return discriminateNestedArchives;
-	}
-
-	/**
-	 * Sets the discriminateNestedArchives.
-	 * 
-	 * @param discriminateNestedArchives
-	 *            The discriminateNestedArchives to set
-	 */
-	public void setDiscriminateNestedArchives(boolean discriminateNestedArchives) {
-		this.discriminateNestedArchives = discriminateNestedArchives;
-	}
-
-	/**
-	 * @return Returns the rendererType.
-	 */
-	public int getRendererType() {
-		return rendererType;
-	}
-
-	/**
-	 * The rendererType allows a user to override the renderer used by Common Archive for special
-	 * cases in the UI where you really want to use a non-synchronizing renderer.
-	 * 
-	 * @param rendererType
-	 *            The rendererType to set.
-	 */
-	public void setRendererType(int rendererType) {
-		this.rendererType = rendererType;
-	}
-	
-	public int getClassLoadingMode() {
-		return classLoadingMode;
-	}
-
-	/**
-	 * Valid values are LOAD_MODE_COMPAT or LOAD_MODE_SPEC. The default is LOAD_MODE_COMPAT. This
-	 * flag is to set the class loading mode; the default is LOAD_MODE_COMPAT for backwards
-	 * compatibility, while LOAD_MODE_SPEC will enforce spec defined class loading.
-	 * 
-	 * @param classLoadingMode
-	 */
-	public void setClassLoadingMode(int classLoadingMode) {
-		this.classLoadingMode = classLoadingMode;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveTypeDiscriminator.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveTypeDiscriminator.java
deleted file mode 100644
index 9236586fd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveTypeDiscriminator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy;
-
-
-/**
- * An interface that defines an API for opening archives. The {@link CommonArchiveFactory}
- * implementation uses a root level discriminator to open an archive. The main benefit of this api
- * is it allows extended teams or third parties to plug in to the framework to allow specialized
- * kinds of jar files do be discerned at creation/open time without the client having to provide a
- * lot of logic. For example, a client would simply write
- * <code>((CommonArchivePackage)EPackage.Registry.INSTANCE.getEPackage(CommonArchivePackage.eNS_URI)).getCommonArchiveFactory().open(aString)<code>, and get back 
- * the correct kind of archive instance.  A discriminator contains children, which is an ordered list of discriminators, each of which 
- * can have its turn to determine if it can open an archive.  The first one to succeed wins.  Once a discriminator determines that it
- * can open an archive, it gives each of its children the opportuntity to do something more specific, and so on. In the base
- * implementation, discriminators are defined as single instances of an inner class for each import strategy.  The following code shows 
- * how to register a discriminator for a specialized EJBJarFile: 
- * <code>EjbJar11ImportStrategyImpl.getDiscriminator().addChild(aDiscriminator);</code>
- * This would be done as an initialization at startup time.  If the child discriminator is ever invoked, the parent will have already
- * determined that the archive is an EJBJarFile and will have converted it to that type.
- */
-public interface ArchiveTypeDiscriminator {
-	public void addChild(ArchiveTypeDiscriminator child);
-
-	/**
-	 * @throws java.util.NoSuchElementException
-	 *             if the predecessor is not included in the list of children
-	 */
-	public void addChildAfter(ArchiveTypeDiscriminator child, ArchiveTypeDiscriminator predecessor) throws java.util.NoSuchElementException;
-
-	/**
-	 * @throws java.util.NoSuchElementException
-	 *             if the successor is not included in the list of children
-	 */
-	public void addChildBefore(ArchiveTypeDiscriminator child, ArchiveTypeDiscriminator successor) throws java.util.NoSuchElementException;
-
-	/**
-	 * Performs tests on the archive to determine if it is the kind this discriminator is interested
-	 * in
-	 */
-	public boolean canImport(Archive anArchive);
-
-	/**
-	 * Factory method to create the import strategy for a converted archive
-	 */
-	public ImportStrategy createImportStrategy(Archive old, Archive newArchive);
-
-	/**
-	 * Return a string to be presented either through an exception or error message when a specific
-	 * kind of archive is expected and this discriminator can't open it.
-	 */
-	public String getUnableToOpenMessage();
-
-	public boolean hasChild(ArchiveTypeDiscriminator disc);
-
-	public boolean hasChildren();
-
-	/**
-	 * Point of entry for attempting to open an archive
-	 * 
-	 * @return a converted archive or null if this discriminator can't convert it
-	 */
-	public Archive openArchive(Archive anArchive) throws OpenFailureException;
-
-	public void removeChild(ArchiveTypeDiscriminator child);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveTypeDiscriminatorImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveTypeDiscriminatorImpl.java
deleted file mode 100644
index 9046b3c7b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveTypeDiscriminatorImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy;
-
-
-/**
- * @see ArchiveTypeDiscriminator
- */
-public abstract class ArchiveTypeDiscriminatorImpl implements ArchiveTypeDiscriminator {
-	protected List children;
-
-	public ArchiveTypeDiscriminatorImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public void addChild(ArchiveTypeDiscriminator child) {
-		if (hasChild(child))
-			return;
-		getChildren().add(child);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public void addChildAfter(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator child, org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator predecessor) throws java.util.NoSuchElementException {
-		if (hasChild(child))
-			return;
-		int index = getChildren().indexOf(predecessor);
-		if (index >= 0) {
-			index++;
-			getChildren().add(index, child);
-		} else {
-			throw new java.util.NoSuchElementException(predecessor.toString());
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public void addChildBefore(ArchiveTypeDiscriminator child, ArchiveTypeDiscriminator successor) throws java.util.NoSuchElementException {
-		if (hasChild(child))
-			return;
-		int index = getChildren().indexOf(successor);
-		if (index >= 0) {
-			getChildren().add(index, child);
-		} else {
-			throw new java.util.NoSuchElementException(successor.toString());
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public abstract boolean canImport(Archive anArchive);
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public Archive convert(Archive anArchive) throws OpenFailureException {
-		Archive destination = createConvertedArchive();
-
-		//turn of notifications
-		destination.eSetDeliver(false);
-		destination.eSetDeliver(false);
-
-		//Copy the relevant attributes
-		destination.setURI(anArchive.getURI());
-		destination.setOriginalURI(anArchive.getURI());
-		destination.setSize(anArchive.getSize());
-		destination.setLastModified(anArchive.getLastModified());
-
-		destination.setLoadStrategy(anArchive.getLoadStrategy());
-		destination.setOptions(anArchive.getOptions());
-		destination.setExtraClasspath(anArchive.getExtraClasspath());
-		if (destination.isModuleFile()) {
-			ImportStrategy importStrategy = createImportStrategy(anArchive, destination);
-			((ModuleFile) destination).setImportStrategy(importStrategy);
-		}
-
-
-
-		//turn notifications back on
-		destination.eSetDeliver(true);
-		destination.eSetDeliver(true);
-
-		return destination;
-	}
-
-	public abstract Archive createConvertedArchive();
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public abstract ImportStrategy createImportStrategy(Archive old, Archive newArchive);
-
-	public java.util.List getChildren() {
-		if (children == null)
-			children = new java.util.ArrayList();
-		return children;
-	}
-
-	/**
-	 * Iterate through each child and attempt to convert the archive to the child's type; return the
-	 * converted archive from the first child that succeeds, or null if no child succeeds or no
-	 * child exists
-	 */
-	protected Archive getImportableArchiveFromChild(Archive anArchive) throws OpenFailureException {
-		if (!hasChildren()) {
-			return null;
-		}
-		List theChildren = getChildren();
-		Archive childConvertedArchive = null;
-		for (int i = 0; i < theChildren.size(); i++) {
-			ArchiveTypeDiscriminator child = (ArchiveTypeDiscriminator) theChildren.get(i);
-			childConvertedArchive = child.openArchive(anArchive);
-			if (childConvertedArchive != null) {
-				return childConvertedArchive;
-			}
-		}
-		return null;
-	}
-
-	protected String getXmlDDMessage(String archiveType, String ddUri) {
-		return CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.invalid_archive_EXC_, (new Object[]{archiveType, ddUri})); // = "Archive is not a valid {0} because the deployment descriptor can not be found (case sensitive): {1}"
-	}
-
-	public boolean hasChild(ArchiveTypeDiscriminator disc) {
-		return hasChildren() && getChildren().contains(disc);
-	}
-
-	public boolean hasChildren() {
-		return children != null && children.size() > 0;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public Archive openArchive(Archive anArchive) throws OpenFailureException {
-		if (!canImport(anArchive)) {
-			return null;
-		}
-		Archive convertedArchive = convert(anArchive);
-		Archive childConvertedArchive = getImportableArchiveFromChild(convertedArchive);
-		if (childConvertedArchive != null)
-			return childConvertedArchive;
-		return convertedArchive;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public void removeChild(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator child) {
-		getChildren().remove(child);
-	}
-
-	public void setChildren(java.util.List newChildren) {
-		children = newChildren;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java
deleted file mode 100644
index 6c4982a02..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import com.ibm.icu.util.StringTokenizer;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-
-
-/**
- * Helper class used for loading of mof resources contained within an archive; knows how to retrieve
- * an input stream for a given uri
- */
-public class ArchiveURIConverterImpl extends URIConverterImpl {
-	protected static final String fileProtocol = "file"; //$NON-NLS-1$
-	protected static final String platformProtocol = "platform"; //$NON-NLS-1$
-	private String inFilepath, outFilepath;
-
-	public ArchiveURIConverterImpl(org.eclipse.jst.j2ee.commonarchivecore.internal.Archive anArchive, String resourcesPath) {
-		setArchive(anArchive);
-		this.resourcesPath = resourcesPath;
-		setInputFilepath(resourcesPath);
-		String outpath = resourcesPath;
-		if (outpath == null) {
-			LoadStrategy l = anArchive.getLoadStrategy();
-			if (l != null && l.isDirectory()) {
-				try {
-					outpath = l.getAbsolutePath();
-				} catch (FileNotFoundException ignore) {
-					//Ignore
-				}
-			}
-		}
-		setOutputFilepath(outpath);
-	}
-
-	/** The archive from which resources will be loaded */
-	protected org.eclipse.jst.j2ee.commonarchivecore.internal.Archive archive;
-	protected String resourcesPath;
-
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.Archive getArchive() {
-		return archive;
-	}
-
-	public InputStream createInputStream(URI uri) throws IOException {
-		InputStream in = null;
-		if (resourcesPath != null)
-			in = makeInputStream(uri);
-		if (in != null)
-			return in;
-		return getArchive().getInputStream(uri.toString());
-	}
-
-	public void setArchive(org.eclipse.jst.j2ee.commonarchivecore.internal.Archive newArchive) {
-		archive = newArchive;
-	}
-
-	/**
-	 * Gets the resourcesPath.
-	 * 
-	 * @return Returns a String
-	 */
-	public String getResourcesPath() {
-		return resourcesPath;
-	}
-
-	/**
-	 * Sets the resourcesPath.
-	 * 
-	 * @param resourcesPath
-	 *            The resourcesPath to set
-	 */
-	public void setResourcesPath(String resourcesPath) {
-		this.resourcesPath = resourcesPath;
-		setInputFilepath(resourcesPath);
-		setOutputFilepath(resourcesPath);
-	}
-
-	public URI normalize(URI uri) {
-		return getInternalURIMap().getURI(uri);
-	}
-
-	/**
-	 * The input file path consists of a string of directories or zip files separated by semi-colons
-	 * that are searched when an input stream is constructed.
-	 * 
-	 * @return The file path
-	 */
-	public String getInputFilepath() {
-		return inFilepath;
-	}
-
-	/**
-	 * @param filepath
-	 *            The file path
-	 */
-	public void setInputFilepath(String filepath) {
-		inFilepath = filepath;
-	}
-
-	/**
-	 * @return The output file path
-	 */
-	public String getOutputFilepath() {
-		return outFilepath;
-	}
-
-	/**
-	 * The output file path is the path name of a directory to prepend to relative file path names
-	 * when an output stream is constructed.
-	 * 
-	 * @param filepath
-	 *            The output file path
-	 */
-	public void setOutputFilepath(String filepath) {
-		outFilepath = filepath;
-	}
-
-	/**
-	 * Convert the URI to an input stream.
-	 * 
-	 * @param uri
-	 *            The uri
-	 */
-	public InputStream makeInputStream(URI uri) throws IOException {
-		URI converted = uri;
-
-		if ((fileProtocol.equals(converted.scheme()) || converted.scheme() == null) && inFilepath != null) {
-			return searchFilePath(converted.toString());
-		}
-		URL url = createURL(converted.toString());
-		URLConnection urlConnection = url.openConnection();
-		return urlConnection.getInputStream();
-	}
-
-	/**
-	 * Search the file path if the file portion of the URL is not absolute (does not begin with "/";
-	 * otherwise, attempt to create an input stream for the file.
-	 */
-	protected InputStream searchFilePath(String filename) throws IOException {
-		File file = new File(filename);
-		if (file.isAbsolute())
-			return new FileInputStream(file);
-		StringTokenizer st = new StringTokenizer(inFilepath, ";"); //$NON-NLS-1$
-		while (st.hasMoreTokens()) {
-			String f = st.nextToken();
-			ZipFile zf = null;
-			try {
-				zf = new ZipFile(f);
-			} catch (Exception e) {
-				//Ignore
-			}
-			InputStream in = null;
-			if (zf != null) {
-				in = searchZipFile(zf, filename);
-				if (in == null)
-					try {
-						zf.close();
-					} catch (Exception e) {
-						//Ignore
-					}
-			} else {
-				in = searchDirectory(f, filename);
-			}
-			if (in != null)
-				return in;
-		}
-		return null;
-	}
-
-	/**
-	 * This method determines whether the file with the relative path name of filename exists in the
-	 * given directory. If not, it returns null; otherwise, it opens the file up and returns the
-	 * input source.
-	 * 
-	 * @param dir
-	 *            java.lang.String
-	 * @return java.io.InputSource
-	 */
-	protected InputStream searchDirectory(String dir, String filename) throws IOException {
-		if (dir.equals(".")) //$NON-NLS-1$
-			dir = System.getProperty("user.dir"); //$NON-NLS-1$
-		File f = new File(dir + System.getProperty("file.separator") + filename.replace('/', File.separatorChar)); //$NON-NLS-1$
-		if (!f.exists())
-			return null;
-		return new FileInputStream(f);
-	}
-
-	/**
-	 * This method determines whether there is a ZipEntry whose name is filename in the given
-	 * ZipFile. If not, it returns null; otherwise, it returns an input source to read from the
-	 * ZipEntry.
-	 * 
-	 * @param zip
-	 *            java.util.zip.ZipFile
-	 * @return java.io.InputSource
-	 */
-	protected InputStream searchZipFile(ZipFile zip, String filename) throws IOException {
-		ZipEntry entry = zip.getEntry(filename);
-		if (entry == null)
-			return null;
-		return zip.getInputStream(entry);
-	}
-
-	/**
-	 * Make a URL from the uri; if the attempt fails, attempt to append "file:" to the URI; if the
-	 * attempt still fails, attempt to replace the protocol with the file protocol.
-	 * 
-	 * @param uri
-	 *            The string uri
-	 */
-	public URL createURL(String uri) throws MalformedURLException {
-		MalformedURLException m = null;
-		if (uri == null)
-			return null;
-		URL url = null;
-		try {
-			url = new URL(uri);
-		} catch (Exception e) {
-			m = (MalformedURLException) e;
-		}
-		if (url != null)
-			return url;
-		// Either treat the URI as a filepath (if there are no : or
-		// a : in position 1) or replace the given protocol with the
-		// file protocol.
-		int index = uri.indexOf(":"); //$NON-NLS-1$
-		if (index == -1 || index == 1)
-			uri = fileProtocol + ":" + uri; //$NON-NLS-1$
-		else if (index > 0)
-			uri = fileProtocol + ":" + uri.substring(index + 1); //$NON-NLS-1$
-		try {
-			url = new URL(uri);
-		} catch (Exception e) {
-			//Ignore
-		}
-		if (url != null)
-			return url;
-		throw m;
-	}
-
-	/**
-	 * Convert the URI to an output stream.
-	 * 
-	 * @param uri
-	 *            The uri
-	 */
-	public OutputStream createOutputStream(URI uri) throws IOException {
-		URI converted = uri;
-		if (platformProtocol.equals(converted.scheme())) {
-			URL resolvedURL = resolvePlatform(new URL(converted.toString()));
-			if (resolvedURL != null) {
-				converted = URI.createFileURI(resolvedURL.getFile());
-			}
-		}
-		if (fileProtocol.equals(converted.scheme()) || converted.scheme() == null) {
-			return openFileOutputStream(converted);
-		}
-		URL url = createURL(converted.toString());
-		URLConnection urlConnection = url.openConnection();
-		urlConnection.setDoOutput(true);
-		return urlConnection.getOutputStream();
-	}
-
-	protected URL resolvePlatform(URL url) throws IOException {
-		// let WorkbenchURIConverter implement this one.
-		return null;
-	}
-
-	/**
-	 * Open a file output stream for the given uri (the uri has file protocol). If an output file
-	 * path is specified and the file name is relative, prepend the output file path to the file
-	 * name. Make the directories that contain the file if they do not exist.
-	 */
-	protected OutputStream openFileOutputStream(URI uri) throws IOException {
-		File file = new File(uri.toFileString());
-		if (!file.isAbsolute() && outFilepath != null) {
-			file = new File(outFilepath + File.separator + uri.toFileString());
-		}
-		String parent = file.getParent();
-		if (parent != null) {
-			new File(parent).mkdirs();
-		}
-		OutputStream outputStream = new FileOutputStream(file);
-		return outputStream;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ExportStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ExportStrategy.java
deleted file mode 100644
index 89b080090..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ExportStrategy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ArchiveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-
-
-
-/**
- * ExportStrategy knows what to do just before a dump of an archive is about to occur, typically
- * adding items such as deployment descriptors and such. This provides a delegation model for
- * archive/version/platform specific rules about which resources etc need to be exported. Clients
- * can implement this interface, and "plug in" to an instance of an archive.
- */
-public interface ExportStrategy extends ArchiveStrategy {
-	/**
-	 * Returns whether this strategy has already saved a file entry having a uri named by the
-	 * parameter
-	 */
-	public boolean hasSaved(String uri);
-
-	/**
-	 * The archive is saving itself, and giving the export strategy the opportunity to do whatever
-	 * it needs to do. The export strategy may write entries directly to the SaveStrategy, but if it
-	 * does, it should remember the names of these entries so the archive does not attempt to
-	 * duplicate by saving an entry with the same name
-	 */
-	public void preSave(SaveStrategy aSaveStrategy) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileExtensionsFilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileExtensionsFilterImpl.java
deleted file mode 100644
index 7fb9b7c73..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileExtensionsFilterImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-
-
-/**
- * Insert the type's description here. Creation date: (02/28/01 1:20:09 PM)
- * 
- * @author: Administrator
- */
-public class FileExtensionsFilterImpl extends SaveFilterImpl implements org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter {
-	protected Set excludedExtensions;
-	protected boolean isCaseSensitive = false;
-	protected Set excludedExtensionsAsUppercase;
-
-	/**
-	 * FileExtensionsFilterImpl constructor comment.
-	 */
-	public FileExtensionsFilterImpl(String[] extensionsToExclude, boolean caseSensitive) {
-		super();
-		Set extensions = new java.util.HashSet();
-		for (int i = 0; i < extensionsToExclude.length; i++) {
-			extensions.add(extensionsToExclude[i]);
-		}
-		setExcludedExtensions(extensions);
-		setIsCaseSensitive(caseSensitive);
-		initialize();
-	}
-
-	/**
-	 * FileExtensionsFilterImpl constructor comment.
-	 */
-	public FileExtensionsFilterImpl(String extension, boolean caseSensitive) {
-		super();
-		Set extensions = new java.util.HashSet(1);
-		extensions.add(extension);
-		setExcludedExtensions(extensions);
-		setIsCaseSensitive(caseSensitive);
-		initialize();
-	}
-
-	/**
-	 * FileExtensionsFilterImpl constructor comment.
-	 */
-	public FileExtensionsFilterImpl(Set extensionsToExclude, boolean caseSensitive) {
-		super();
-		setExcludedExtensions(extensionsToExclude);
-		setIsCaseSensitive(caseSensitive);
-		initialize();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/28/01 1:24:28 PM)
-	 * 
-	 * @return java.util.Set
-	 */
-	public java.util.Set getExcludedExtensions() {
-		return excludedExtensions;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/28/01 2:42:20 PM)
-	 * 
-	 * @return java.util.Set
-	 */
-	protected java.util.Set getExcludedExtensionsAsUppercase() {
-		return excludedExtensionsAsUppercase;
-	}
-
-	protected void initialize() {
-		if (isCaseSensitive())
-			return;
-
-		java.util.HashSet aSet = new java.util.HashSet();
-		java.util.Iterator it = getExcludedExtensions().iterator();
-		while (it.hasNext()) {
-			aSet.add(((String) it.next()).toUpperCase());
-		}
-		setExcludedExtensionsAsUppercase(aSet);
-	}
-
-	public boolean isCaseSensitive() {
-		return isCaseSensitive;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/28/01 1:24:28 PM)
-	 * 
-	 * @param newExcludedExtensions
-	 *            java.util.Set
-	 */
-	protected void setExcludedExtensions(java.util.Set newExcludedExtensions) {
-		excludedExtensions = newExcludedExtensions;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/28/01 2:42:20 PM)
-	 * 
-	 * @param newExcludedExtensionsAsUppercase
-	 *            java.util.Set
-	 */
-	protected void setExcludedExtensionsAsUppercase(java.util.Set newExcludedExtensionsAsUppercase) {
-		excludedExtensionsAsUppercase = newExcludedExtensionsAsUppercase;
-	}
-
-	protected void setIsCaseSensitive(boolean value) {
-		isCaseSensitive = value;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveFilter
-	 */
-	public boolean shouldSave(String uri, Archive anArchive) {
-		String extension = org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.getFileNameExtension(uri);
-		if (extension.equals(""))//$NON-NLS-1$
-			return true;
-
-		Set excluded;
-		if (isCaseSensitive()) {
-			excluded = getExcludedExtensions();
-		} else {
-			excluded = getExcludedExtensionsAsUppercase();
-			extension = extension.toUpperCase();
-		}
-
-		return !excluded.contains(extension);
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileIterator.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileIterator.java
deleted file mode 100644
index 9502b6165..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileIterator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.io.InputStream;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-
-
-/**
- * Insert the type's description here. Creation date: (05/02/01 5:20:00 PM)
- * 
- * @author: Administrator
- */
-public interface FileIterator {
-	public InputStream getInputStream(File aFile) throws java.io.IOException, java.io.FileNotFoundException;
-
-	public boolean hasNext();
-
-	public File next();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileIteratorImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileIteratorImpl.java
deleted file mode 100644
index b1f4641e5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/FileIteratorImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.io.InputStream;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-
-
-public class FileIteratorImpl implements FileIterator {
-	protected List files;
-	protected int position = 0;
-
-	/**
-	 * Insert the method's description here. Creation date: (05/02/01 6:16:52 PM)
-	 */
-	public FileIteratorImpl() {
-		//Default
-	}
-
-	public FileIteratorImpl(List theFiles) {
-		super();
-		files = theFiles;
-	}
-
-	public InputStream getInputStream(File aFile) throws java.io.IOException, java.io.FileNotFoundException {
-		return aFile.getInputStream();
-	}
-
-	public boolean hasNext() {
-		return position < files.size();
-	}
-
-	public File next() {
-		if (!hasNext())
-			throw new NoSuchElementException(CommonArchiveResourceHandler.End_of_list_reached_EXC_); // = "End of list reached"
-		return (File) files.get(position++);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ManifestPackageEntryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ManifestPackageEntryImpl.java
deleted file mode 100644
index a3ef827a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ManifestPackageEntryImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-
-/**
- * Used for manifest support.
- */
-public class ManifestPackageEntryImpl extends java.util.jar.Attributes {
-	static final String NAME = "Name";//$NON-NLS-1$
-	static final String SPECIFICATION_TITLE = "Specification-Title";//$NON-NLS-1$
-	static final String SPECIFICATION_VERSION = "Specification-Version";//$NON-NLS-1$
-	static final String SPECIFICATION_VENDOR = "Specification-Vendor";//$NON-NLS-1$
-	static final String IMPLEMENTATION_TITLE = "Implementation-Title";//$NON-NLS-1$
-	static final String IMPLEMENTATION_VERSION = "Implementation-Version";//$NON-NLS-1$
-	static final String IMPLEMENTATION_VENDOR = "Implementation-Vendor";//$NON-NLS-1$
-
-	/**
-	 * ManifestPackageEntry constructor comment.
-	 */
-	public ManifestPackageEntryImpl() {
-		super();
-	}
-
-	/**
-	 * ManifestPackageEntry constructor comment.
-	 * 
-	 * @param size
-	 *            int
-	 */
-	public ManifestPackageEntryImpl(int size) {
-		super(size);
-	}
-
-	/**
-	 * ManifestPackageEntry constructor comment.
-	 * 
-	 * @param attr
-	 *            java.util.jar.Attributes
-	 */
-	public ManifestPackageEntryImpl(java.util.jar.Attributes attr) {
-		super(attr);
-	}
-
-	public String getImplementationTitle() {
-		return (String) get(IMPLEMENTATION_TITLE);
-	}
-
-	public String getImplementationVendor() {
-		return (String) get(IMPLEMENTATION_VENDOR);
-	}
-
-	public String getImplementationVersion() {
-		return (String) get(IMPLEMENTATION_VERSION);
-	}
-
-	public String getName() {
-		return (String) get(NAME);
-	}
-
-	public String getSpecificationTitle() {
-		return (String) get(SPECIFICATION_TITLE);
-	}
-
-	public String getSpecificationVendor() {
-		return (String) get(SPECIFICATION_VENDOR);
-	}
-
-	public String getSpecificationVersion() {
-		return (String) get(SPECIFICATION_VERSION);
-	}
-
-	public void setImplementationTitle(String value) {
-		put(IMPLEMENTATION_TITLE, value);
-	}
-
-	public void setImplementationVendor(String value) {
-		put(IMPLEMENTATION_VENDOR, value);
-	}
-
-	public void setImplementationVersion(String value) {
-		put(IMPLEMENTATION_VERSION, value);
-	}
-
-	public void setName(String value) {
-		put(NAME, value);
-	}
-
-	public void setSpecificationTitle(String value) {
-		put(SPECIFICATION_TITLE, value);
-	}
-
-	public void setSpecificationVendor(String value) {
-		put(SPECIFICATION_VENDOR, value);
-	}
-
-	public void setSpecificationVersion(String value) {
-		put(SPECIFICATION_VERSION, value);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/NestedArchiveIterator.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/NestedArchiveIterator.java
deleted file mode 100644
index 622d94034..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/NestedArchiveIterator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-
-
-public class NestedArchiveIterator extends FileIteratorImpl {
-	protected ZipInputStream zipInputStream;
-	protected ZipEntry currentEntry;
-
-	static class WrapperInputStream extends FilterInputStream {
-		/**
-		 * @param in
-		 */
-		public WrapperInputStream(InputStream in) {
-			super(in);
-			// TODO Auto-generated constructor stub
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.io.FilterInputStream#close()
-		 */
-		public void close() throws IOException {
-			//do nothing because we want to prevent the clients from closing the zip
-		}
-	}
-
-	/**
-	 * NestedArchiveIterator constructor comment.
-	 */
-	public NestedArchiveIterator(List theFiles, ZipInputStream stream) {
-		super(theFiles);
-		zipInputStream = stream;
-	}
-
-	public InputStream getInputStream(File aFile) throws java.io.IOException, java.io.FileNotFoundException {
-		if (!aFile.getURI().equals(currentEntry.getName()))
-			throw new java.io.IOException(CommonArchiveResourceHandler.Internal_Error__Iterator_o_EXC_); // = "Internal Error: Iterator out of sync with zip entries"
-		return new WrapperInputStream(zipInputStream);
-	}
-
-	public File next() {
-		File next = super.next();
-		try {
-			do {
-				currentEntry = zipInputStream.getNextEntry();
-			} while (currentEntry.isDirectory());
-		} catch (java.io.IOException ex) {
-			throw new ArchiveRuntimeException(CommonArchiveResourceHandler.Error_iterating_the_archiv_EXC_, ex); // = "Error iterating the archive"
-		}
-		return next;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ResourceProxyValidator.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ResourceProxyValidator.java
deleted file mode 100644
index a28a3b9c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ResourceProxyValidator.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-final class ResourceProxyValidator {
-	static HashMap resourceURIMap = new HashMap();
-
-	private static void resolveContainedProxies(EObject refObject) {
-		List contained = refObject.eContents();
-		EObject mofObject;
-		for (int i = 0; i < contained.size(); i++) {
-			mofObject = (EObject) contained.get(i);
-			resolveProxies(mofObject);
-		}
-	}
-
-	private static void resolveNonContainedProxies(EObject refObject) {
-		List references = refObject.eClass().getEAllReferences();
-		EReference reference;
-		EObject proxyOrObject;
-		for (int i = 0; i < references.size(); i++) {
-			reference = (EReference) references.get(i);
-			if (!reference.isContainment() && !reference.isTransient()) {
-				if (reference.isMany()) {
-					Iterator value = ((List) refObject.eGet(reference)).iterator();
-					while (value.hasNext()) {
-						proxyOrObject = (EObject) value.next();
-						if (proxyOrObject.eIsProxy())
-							value.remove();
-					}
-				} else {
-					proxyOrObject = (EObject) refObject.eGet(reference, false);
-					if (proxyOrObject != null && proxyOrObject.eIsProxy()) {
-						URI resourceURI = ((EObjectImpl) proxyOrObject).eProxyURI().trimFragment();
-						String protocol = resourceURI.scheme();
-						if (protocol == null || !protocol.equals("java")) { //$NON-NLS-1$
-							String id = ((EObjectImpl) proxyOrObject).eProxyURI().fragment();
-							if (resourceURIMap.get(resourceURI) != null) {
-								Resource cachedResource = (Resource) resourceURIMap.get(resourceURI);
-								proxyOrObject = (EObject) ((XMLResource) cachedResource).getIDToEObjectMap().get(id);
-							} else {
-								proxyOrObject = (EObject) refObject.eGet(reference);
-								resourceURIMap.put(resourceURI, proxyOrObject.eResource());
-							}
-							if (proxyOrObject == null || proxyOrObject.eIsProxy())
-								refObject.eSet(reference, null);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private static void resolveProxies(EObject refObject) {
-		if (refObject != null) {
-			resolveNonContainedProxies(refObject);
-			resolveContainedProxies(refObject);
-		}
-	}
-
-	/**
-	 * Force all of the proxies with <code>resource</code> to be resolved.
-	 */
-	static void checkForUnresolvableProxies(Resource resource) {
-		resourceURIMap = new HashMap(); //Reset hashmap on each call
-		if (resource != null) {
-			List topLevels = resource.getContents();
-			EObject mofObject;
-			for (int i = 0; i < topLevels.size(); i++) {
-				mofObject = (EObject) topLevels.get(i);
-				resolveProxies(mofObject);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/RuntimeClasspathEntry.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/RuntimeClasspathEntry.java
deleted file mode 100644
index 3281c6716..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/RuntimeClasspathEntry.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-
-public interface RuntimeClasspathEntry {
-
-
-	/**
-	 * The resolved absolute path of the entry
-	 */
-	String getAbsolutePath();
-
-	void setAbsolutePath(String absolutePath);
-
-	/**
-	 * A single token from the Class-Path: attrbute
-	 */
-	String getManifestValue();
-
-	void setManifestValue(String manifestValue);
-
-	/**
-	 * valid only if this entry is a library in a WARFile, under WEB-INF/lib
-	 */
-	WARFile getWarFile();
-
-	void setWarFile(WARFile aWarFile);
-
-	/**
-	 * true if this entry is a library in a WAR file
-	 */
-	boolean isWebLib();
-
-	/**
-	 * The resolved archive inside an EAR that this entry points to; Note that this is NOT the
-	 * Archive that has the entry in the manifest, but rather the referenced archive/
-	 */
-	Archive getReferencedArchive();
-
-	void setReferencedArchive(Archive anArchive);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/RuntimeClasspathEntryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/RuntimeClasspathEntryImpl.java
deleted file mode 100644
index caf60cb51..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/RuntimeClasspathEntryImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-
-public class RuntimeClasspathEntryImpl implements RuntimeClasspathEntry {
-
-	/** A single token from the Class-Path: attrbute */
-	protected String manifestValue;
-	/** The resolved absolute path of the entry */
-	protected String absolutePath;
-	/** valid only if this entry is a library in a WARFile, under WEB-INF/lib */
-	protected WARFile warFile;
-
-	protected Archive referencedArchive;
-
-	/**
-	 * Constructor for ManifestClasspathEntryImpl.
-	 */
-	public RuntimeClasspathEntryImpl() {
-		super();
-	}
-
-	/**
-	 * Gets the absolutePath.
-	 * 
-	 * @return Returns a String
-	 */
-	public String getAbsolutePath() {
-		return absolutePath;
-	}
-
-	/**
-	 * Sets the absolutePath.
-	 * 
-	 * @param absolutePath
-	 *            The absolutePath to set
-	 */
-	public void setAbsolutePath(String absolutePath) {
-		this.absolutePath = absolutePath;
-	}
-
-	/**
-	 * Gets the manifestValue.
-	 * 
-	 * @return Returns a String
-	 */
-	public String getManifestValue() {
-		return manifestValue;
-	}
-
-	/**
-	 * Sets the manifestValue.
-	 * 
-	 * @param manifestValue
-	 *            The manifestValue to set
-	 */
-	public void setManifestValue(String manifestValue) {
-		this.manifestValue = manifestValue;
-	}
-
-
-
-	/**
-	 * Gets the warFile.
-	 * 
-	 * @return Returns a WARFile
-	 */
-	public WARFile getWarFile() {
-		return warFile;
-	}
-
-	/**
-	 * Sets the warFile.
-	 * 
-	 * @param warFile
-	 *            The warFile to set
-	 */
-	public void setWarFile(WARFile warFile) {
-		this.warFile = warFile;
-	}
-
-	public String toString() {
-		return getAbsolutePath();
-	}
-
-	public boolean equals(Object o) {
-		if (o instanceof RuntimeClasspathEntry)
-			return getAbsolutePath().equals(((RuntimeClasspathEntry) o).getAbsolutePath());
-		return false;
-	}
-
-	public int hashCode() {
-		return getAbsolutePath().hashCode();
-	}
-
-
-	/**
-	 * @see RuntimeClasspathEntry#isWebLib()
-	 */
-	public boolean isWebLib() {
-		return warFile != null;
-	}
-
-	/**
-	 * Gets the referencedArchive.
-	 * 
-	 * @return Returns a Archive
-	 */
-	public Archive getReferencedArchive() {
-		return referencedArchive;
-	}
-
-	/**
-	 * Sets the referencedArchive.
-	 * 
-	 * @param referencedArchive
-	 *            The referencedArchive to set
-	 */
-	public void setReferencedArchive(Archive referencedArchive) {
-		this.referencedArchive = referencedArchive;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java
deleted file mode 100644
index 8ee945038..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-
-/**
- * Object used for saving an archive with only a subset of its files. By default all files are
- * saved. Clients can create a custom filter and set it on a save strategy, and call
- * {@link Archive#save(SaveStrategy)}
- */
-public interface SaveFilter {
-	/**
-	 * Answer whether an element in the archive having the uri should be saved; the uri may be for a
-	 * file, a nested archive, or a loaded mof resource
-	 */
-	public boolean shouldSave(String uri, Archive anArchive);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilterImpl.java
deleted file mode 100644
index de041ecf4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilterImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-
-
-
-/**
- * Default filter which allows all elememts to save
- */
-public class SaveFilterImpl implements org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter {
-	/**
-	 * SaveFilterImpl constructor comment.
-	 */
-	public SaveFilterImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveFilter
-	 */
-	public boolean shouldSave(java.lang.String uri, Archive anArchive) {
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SelectedFilesFilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SelectedFilesFilterImpl.java
deleted file mode 100644
index 4b81f724d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SelectedFilesFilterImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-
-
-/**
- * Insert the type's description here. Creation date: (03/23/01 11:04:52 AM)
- * 
- * @author: Administrator
- */
-public class SelectedFilesFilterImpl extends SaveFilterImpl {
-	/** Set of file uris to be saved */
-	protected Set selectedFileNames;
-
-	/**
-	 * SelectedFilesFilterImpl constructor comment.
-	 */
-	public SelectedFilesFilterImpl() {
-		super();
-	}
-
-	/**
-	 * Constructor with a preselected subset of the files in the archive to be saved; each element
-	 * in the list must be an instance of {@link com.ibm.etools.commonarchive.File}
-	 */
-	public SelectedFilesFilterImpl(List archiveFiles) {
-		super();
-		Set fileNames = new HashSet();
-		for (int i = 0; i < archiveFiles.size(); i++) {
-			File aFile = (File) archiveFiles.get(i);
-			fileNames.add(aFile.getURI());
-		}
-		setSelectedFileNames(fileNames);
-	}
-
-	/**
-	 * Parameter must be a set of valid uris in the archive
-	 */
-	public SelectedFilesFilterImpl(Set fileNames) {
-		super();
-		setSelectedFileNames(fileNames);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/23/01 11:19:01 AM)
-	 * 
-	 * @return java.util.Set
-	 */
-	public java.util.Set getSelectedFileNames() {
-		return selectedFileNames;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (03/23/01 11:19:01 AM)
-	 * 
-	 * @param newSelectedFileNames
-	 *            java.util.Set
-	 */
-	public void setSelectedFileNames(java.util.Set newSelectedFileNames) {
-		selectedFileNames = newSelectedFileNames;
-	}
-
-	public boolean shouldSave(java.lang.String uri, Archive anArchive) {
-		return getSelectedFileNames().contains(uri);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/AltResourceRegister.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/AltResourceRegister.java
deleted file mode 100644
index 253d7a181..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/AltResourceRegister.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public class AltResourceRegister {
-	protected static Set registeredURIs = new HashSet();
-
-	protected AltResourceRegister() {
-		//Default
-	}
-
-
-	/**
-	 * Registers an Archive relative path for the resource which can be copied up as an alt in an
-	 * EAR file. The uri should be in cananonical form and use the forward slash, eg,
-	 * "META-INF/vendor-extensions.xmi"
-	 */
-	public static void registerURI(String uri) {
-		registeredURIs.add(uri);
-	}
-
-	public static void deRegisterURI(String uri) {
-		registeredURIs.remove(uri);
-	}
-
-	public static boolean isRegistered(String uri) {
-		return registeredURIs.contains(uri);
-	}
-
-	public static Set getRegisteredURIs() {
-		return Collections.unmodifiableSet(registeredURIs);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java
deleted file mode 100644
index ed346712b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @generated
- */
-public class ApplicationClientFileImpl extends ModuleFileImpl implements ApplicationClientFile {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ApplicationClient deploymentDescriptor = null;
-
-	public ApplicationClientFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.APPLICATION_CLIENT_FILE;
-	}
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-	public ApplicationClient getDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		ApplicationClient dd = this.getDeploymentDescriptorGen();
-		if (dd == null && canLazyInitialize()) {
-			try {
-				getImportStrategy().importMetaData();
-			} catch (Exception e) {
-				throw new DeploymentDescriptorLoadException(getDeploymentDescriptorUri(), e);
-			}
-		}
-
-		return this.getDeploymentDescriptorGen();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.impl.ModuleFileImpl
-	 */
-	public java.lang.String getDeploymentDescriptorUri() {
-		return J2EEConstants.APP_CLIENT_DD_URI;
-	}
-
-	/**
-	 * Return the DeployementDescriptor.
-	 */
-	public EObject getStandardDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		return getDeploymentDescriptor();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isApplicationClientFile() {
-		return true;
-	}
-
-	public boolean isDeploymentDescriptorSet() {
-		return deploymentDescriptor != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.impl.ModuleFileImpl
-	 */
-	public org.eclipse.emf.ecore.EObject makeDeploymentDescriptor(XMLResource resource) {
-		ApplicationClient aClient = ((ClientPackage) EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI)).getClientFactory().createApplicationClient();
-		resource.setID(aClient, J2EEConstants.APP_CLIENT_ID);
-		setDeploymentDescriptorGen(aClient);
-		resource.getContents().add(aClient);
-		return aClient;
-	}
-
-	public void setDeploymentDescriptor(ApplicationClient l) {
-		this.setDeploymentDescriptorGen(l);
-		replaceRoot(getMofResourceMakeIfNecessary(getDeploymentDescriptorUri()), l);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public ApplicationClient getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			InternalEObject oldDeploymentDescriptor = (InternalEObject)deploymentDescriptor;
-			deploymentDescriptor = (ApplicationClient)eResolveProxy(oldDeploymentDescriptor);
-			if (deploymentDescriptor != oldDeploymentDescriptor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-			}
-		}
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationClient basicGetDeploymentDescriptor() {
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDeploymentDescriptorGen(ApplicationClient newDeploymentDescriptor) {
-		ApplicationClient oldDeploymentDescriptor = deploymentDescriptor;
-		deploymentDescriptor = newDeploymentDescriptor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR:
-				if (resolve) return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((ApplicationClient)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((ApplicationClient)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR:
-				return deploymentDescriptor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopySessionUtility.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopySessionUtility.java
deleted file mode 100644
index c515a3838..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopySessionUtility.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopySession;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-/**
- * OverRide class to use the proper copying of XMLResource doctypes. Had to create this class Due to
- * the way it's handled in the copy commands of EtoolsCopyUtility
- * 
- * Creation date: (11/18/01 88888888:48 PM)
- * 
- * @author: Jared Jurkiewicz
- */
-public class ArchiveCopySessionUtility extends EtoolsCopySession {
-	public EObject copy(EObject aRefObject, String idSuffix) {
-		EObject copied = super.copy(aRefObject, idSuffix);
-		if (copied instanceof ContainerManagedEntity)
-			copyPrimKeyInfo((ContainerManagedEntity) aRefObject, (ContainerManagedEntity) copied);
-		return copied;
-	}
-
-	public EObject primCopy(EObject aRefObject, String idSuffix) {
-		EObject copied = super.primCopy(aRefObject, idSuffix);
-		if (copied instanceof ContainerManagedEntity)
-			copyPrimKeyInfo((ContainerManagedEntity) aRefObject, (ContainerManagedEntity) copied);
-		return copied;
-	}
-
-	public ArchiveCopySessionUtility(EtoolsCopyUtility aCopyUtility) {
-		super(aCopyUtility);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopySession#newInstance(Resource, String)
-	 */
-	public Resource newInstance(Resource aResource, String newUri) {
-		Resource copyResource = super.newInstance(aResource, newUri);
-
-		if (aResource instanceof XMLResource)
-			((XMLResource) copyResource).setVersionID(((XMLResource) aResource).getVersionID());
-		return copyResource;
-	}
-
-	public EObject getCopyIfFound(EObject anObject) {
-		EObject copiedObject = super.getCopyIfFound(anObject);
-		if ((anObject instanceof JavaClass) && (anObject == copiedObject)) {
-			copiedObject = newInstance(anObject);
-			URI uri = EcoreUtil.getURI(anObject);
-			((InternalEObject) copiedObject).eSetProxyURI(uri);
-		}
-		return copiedObject;
-	}
-
-	public EObject copyObject(EObject aRefObject, String idSuffix) {
-		EObject copied = super.copyObject(aRefObject, idSuffix);
-		if (copied instanceof ContainerManagedEntity)
-			copyPrimKeyInfo((ContainerManagedEntity) aRefObject, (ContainerManagedEntity) copied);
-		return copied;
-	}
-
-	public void copyPrimKeyInfo(ContainerManagedEntity source, ContainerManagedEntity copied) {
-		CMPAttribute primKeyField = source.getPrimKeyField();
-		if (primKeyField != null)
-			copied.setPrimKeyField(primKeyField);
-	}
-
-	/*
-	 * Super class override to handle unresolvable proxies (JavaClass)
-	 */
-
-	protected void copyReference(EReference aReference, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (aReference.isMany()) {
-			List value = (List) aRefObject.eGet(aReference);
-			if (value != null)
-				copyManyReference(aReference, value, aRefObject, idSuffix, copyRef);
-		} else if (aRefObject.eIsSet(aReference)) {
-			Object value = aRefObject.eGet(aReference);
-			if (value == null)
-				value = ((InternalEObject) aRefObject).eGet(aReference, false);
-			copySingleReference(aReference, (EObject) value, aRefObject, idSuffix, copyRef);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java
deleted file mode 100644
index ab9bc6009..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.util.Defaultable;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-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.J2EEConstants;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopySession;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-
-/**
- * Insert the type's description here. Creation date: (12/18/00 6:26:48 PM)
- * 
- * @author: Administrator
- */
-public class ArchiveCopyUtility extends EtoolsCopyUtility {
-	/**
-	 * ModuleFileCopyUtiltity constructor comment.
-	 */
-	public ArchiveCopyUtility() {
-		super();
-		setCopyAdapters(true);
-	}
-
-	/*
-	 * End of code pulled from EtoolsCopyUtility to over-ride the primCopy method.
-	 */
-
-	protected void addDeferredSingleReferenceCopy(EReference reference, EObject aValue, String idSuffix, EObject aCopyContainer) {
-		if (((Defaultable) aValue).isDefault())
-			return;
-		super.addDeferredSingleReferenceCopy(reference, aValue, idSuffix, aCopyContainer);
-	}
-
-	public ArchiveManifest copy(ArchiveManifest mf) {
-		try {
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			mf.write(out);
-			InputStream in = new ByteArrayInputStream(out.toByteArray());
-			return new ArchiveManifestImpl(in);
-		} catch (IOException iox) {
-			//This should almost never happen, unless there is an issure with memory allocation
-			throw new ArchiveRuntimeException(CommonArchiveResourceHandler.IOException_occurred_while_EXC_, iox); // = "IOException occurred while copying manifest"
-		}
-	}
-
-	public Archive copy(Archive anArchive) {
-
-		//First create a copy group and copy util; copy the archive and all its resources
-		CopyGroup copyGroup = new CopyGroup();
-		copyGroup.setPreserveIds(true);
-		prepareResourcesForCopy(anArchive, copyGroup);
-		copyGroup.add(anArchive);
-		this.copy(copyGroup);
-
-		Archive copiedArchive = (Archive) getCopy(anArchive);
-
-		finishCopy(anArchive, copiedArchive, copyGroup);
-		return copiedArchive;
-	}
-
-	public ModuleFile copy(ModuleFile aModuleFile) {
-		/**
-		 * Timing issue; if the resources containing the bindings, extensions, and dd have not yet
-		 * be loaded, force that before the copy occurs; otherwise, they will get loaded as the
-		 * accessors are invoked during copy. Because they will be loaded but not copied into the
-		 * new archive's context, then changes will not get saved. By forcing the load before the
-		 * copy commences, the loaded resources will also be copied to the new archive
-		 */
-		aModuleFile.getStandardDeploymentDescriptor();
-
-		/*
-		 * RLS-8/12/2002 Hack to fix botp defect "141640-failed to install .war file with
-		 * filter-mapping" The problem is that there is a transient field on the filter mapping
-		 * class for the servlet name the relationship to the servlet is lazily populated the first
-		 * time it is requested. If we don't trip it, then it won't get copied.
-		 */
-
-		if (aModuleFile.isWARFile()) {
-			List filterMappings = ((WARFile) aModuleFile).getDeploymentDescriptor().getFilterMappings();
-			for (int i = 0; i < filterMappings.size(); i++) {
-				((FilterMapping) filterMappings.get(i)).getServlet();
-			}
-		}
-		ModuleFile copied = (ModuleFile) copy((Archive) aModuleFile);
-
-		return copied;
-	}
-
-	/*
-	 * The following methods were pulled out of EtoolsCopyUtility so we can over-ride the
-	 * EtoolsCopySession object with our own such that doictypes do get preserved with XML
-	 * Resources.
-	 */
-	public void copy(CopyGroup aGroup) {
-		if (aGroup != null) {
-			EtoolsCopySession session = new ArchiveCopySessionUtility(this);
-			session.setPreserveIds(aGroup.getPreserveIds());
-			session.copy(aGroup);
-			session.flush();
-		}
-	}
-
-	public EObject copy(EObject aRefObject, String idSuffix) {
-		EtoolsCopySession session = new ArchiveCopySessionUtility(this);
-		EObject copied = session.copy(aRefObject, idSuffix);
-		session.flush();
-		return copied;
-	}
-
-	public Resource copy(Resource aResource, String newUri) {
-		EtoolsCopySession session = new ArchiveCopySessionUtility(this);
-		Resource copied = session.copy(aResource, newUri);
-		session.flush();
-		return copied;
-	}
-
-	protected void copyImportStrategyIfNecessary(ModuleFile aModuleFile, ModuleFile copy) {
-		if (!aModuleFile.isDeploymentDescriptorSet())
-			copy.setImportStrategy(aModuleFile.getImportStrategy().createImportStrategy(aModuleFile, copy));
-	}
-
-	public EObject copyObject(EObject aRefObject, String idSuffix) {
-		EtoolsCopySession session = new ArchiveCopySessionUtility(this);
-		EObject copied = session.copyObject(aRefObject, idSuffix);
-		session.flush();
-		return copied;
-	}
-
-	public static void createCopy(CopyGroup aGroup) {
-		ArchiveCopyUtility utility = new ArchiveCopyUtility();
-		utility.copy(aGroup);
-	}
-
-	protected void finishCopy(Archive source, Archive copy, CopyGroup group) {
-
-		copy.setLoadStrategy(getCommonarchiveFactory().createEmptyLoadStrategy());
-		copy.setExtraClasspath(source.getExtraClasspath());
-		copy.setXmlEncoding(source.getXmlEncoding());
-		if (source.isManifestSet()) {
-			copy.setManifest(copy(source.getManifest()));
-		} else {
-			try {
-				File manifestToCopy = source.getFile(J2EEConstants.MANIFEST_URI);
-				if (manifestToCopy != null) {
-					File copiedManifest = (File) getCopy(manifestToCopy);
-					copiedManifest.setLoadingContainer(manifestToCopy.getLoadingContainer());
-					copy.addCopy(copiedManifest);
-				}
-			} catch (FileNotFoundException e) {
-				//Ignore
-			} catch (DuplicateObjectException e) {
-				//Ignore
-			}
-		}
-		retrieveResourcesFromCopy(copy, group);
-
-		if (source.isModuleFile())
-			copyImportStrategyIfNecessary((ModuleFile) source, (ModuleFile) copy);
-
-		List files = source.getFiles();
-		for (int i = 0; i < files.size(); i++) {
-			File aFile = (File) files.get(i);
-			File copiedFile = (File) getCopy(aFile);
-			copiedFile.setLoadingContainer(aFile.getLoadingContainer());
-			if (aFile.isArchive())
-				finishNestedCopy((Archive) aFile, (Archive) copiedFile);
-		}
-		//Notification was suspended during copy; therefore we need to make sure the files
-		//In the archive get indexed
-		copy.rebuildFileIndex();
-	}
-
-	protected void finishNestedCopy(Archive source, Archive copy) {
-
-		CopyGroup group = new CopyGroup();
-		prepareResourcesForCopy(source, group);
-		copy(group);
-		finishCopy(source, copy, group);
-	}
-
-	private CommonarchiveFactory getCommonarchiveFactory() {
-		return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
-	}
-
-	protected void prepareResourcesForCopy(Archive anArchive, CopyGroup copyGroup) {
-		Iterator iter = anArchive.getLoadedMofResources().iterator();
-		while (iter.hasNext()) {
-			Resource resource = (Resource) iter.next();
-			if (!ArchiveUtil.isJavaResource(resource))
-				copyGroup.add(resource);
-		}
-	}
-
-	protected void retrieveResourcesFromCopy(Archive copiedArchive, CopyGroup copyGroup) {
-
-		List resources = copyGroup.getCopiedResources();
-		for (int i = 0; i < resources.size(); i++) {
-			Resource copiedResource = (Resource) resources.get(i);
-			copiedArchive.addOrReplaceMofResource(copiedResource);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java
deleted file mode 100644
index af0224e65..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java
+++ /dev/null
@@ -1,1452 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ArchiveTypeDiscriminatorRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ReopenException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntryImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.DirectorySaveStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipStreamSaveStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveFileDynamicClassLoader;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ClasspathUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-/**
- * @generated
- */
-public class ArchiveImpl extends ContainerImpl implements Archive {
-
-	/**
-	 * The cached value of the '{@link #getTypes() <em>Types</em>}' attribute list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getTypes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList types = null;
-
-	/** Our specialized manifest */
-	protected ArchiveManifest manifest;
-
-	/** Implementer for saving this archive */
-	protected SaveStrategy saveStrategy;
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	protected SaveFilter saveFilter;
-
-	/** Encoding to be used for all xmi resources and xml dds; defaults to UTF-8 */
-	protected String xmlEncoding = J2EEConstants.DEFAULT_XML_ENCODING;
-
-	/** Custom class loader used to load classes from the archive */
-	protected ClassLoader archiveClassLoader;
-
-	/**
-	 * path of the standard classpath format where the archive may look for classes not found in the
-	 * system classpath or in the archive - used for java reflection
-	 */
-	protected String extraClasspath;
-
-	protected ArchiveOptions options;
-
-	public ArchiveImpl() {
-		super();
-		getCommonArchiveFactory().archiveOpened(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.ARCHIVE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTypes() {
-		if (types == null) {
-			types = new EDataTypeUniqueEList(String.class, this, CommonarchivePackage.ARCHIVE__TYPES);
-		}
-		return types;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.ARCHIVE__TYPES:
-				return getTypes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.ARCHIVE__TYPES:
-				getTypes().clear();
-				getTypes().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.ARCHIVE__TYPES:
-				getTypes().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.ARCHIVE__TYPES:
-				return types != null && !types.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (types: ");
-		result.append(types);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public Archive addCopy(Archive anArchive) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException {
-		checkAddValid(anArchive);
-		Archive copy = getCommonArchiveFactory().copy(anArchive);
-		getFiles().add(copy);
-		return copy;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive Adds a copy of the parameter to this archive
-	 * @throws com.ibm.etools.archive.exception.DuplicateObjectException
-	 *             if the archive already contains a file with the specified uri
-	 */
-	public File addCopy(File aFile) throws DuplicateObjectException {
-		if (aFile.isReadOnlyDirectory()) {
-			addCopy((ReadOnlyDirectory) aFile);
-			return null;
-		}
-		checkAddValid(aFile);
-		File copy = copy(aFile);
-		getFiles().add(copy);
-		return copy;
-	}
-
-	/**
-	 * Get a flattened list from the directory, then addCopy the list
-	 * 
-	 * @throws com.ibm.etools.archive.exception.DuplicateObjectException
-	 *             if a file with a uri that equals one of the nested files in the directory exists
-	 * 
-	 * @return java.util.List the copied files that were added to the archive
-	 */
-	public java.util.List addCopy(ReadOnlyDirectory dir) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException {
-		return addCopyFiles(dir.getFilesRecursive());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public List addCopyFiles(java.util.List list) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException {
-		//Optimization - make sure the fileIndex is already built to speed up
-		// containsFile
-		getFiles();
-		List copyList = new ArrayList();
-		for (int i = 0; i < list.size(); i++) {
-			File aFile = (File) list.get(i);
-			checkAddValid(aFile);
-			copyList.add(copy(aFile));
-		}
-		getFiles().addAll(copyList);
-		return copyList;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void addOrReplaceMofResource(org.eclipse.emf.ecore.resource.Resource aResource) {
-		getLoadStrategy().addOrReplaceMofResource(aResource);
-	}
-
-	/**
-	 * @deprecated Use {@link #getDependentOpenArchives()}
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean canClose() {
-		return !getCommonArchiveFactory().getOpenArchivesDependingOn(this).isEmpty();
-	}
-
-	protected void checkAddValid(File aFile) throws DuplicateObjectException {
-		checkAddValid(aFile.getURI());
-	}
-
-	protected void checkAddValid(String aUri) throws DuplicateObjectException {
-		try {
-			File f = getFile(aUri);
-			if (f != null)
-				throw new DuplicateObjectException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.duplicate_file_EXC_, (new Object[]{getURI(), aUri})), f); // = "The archive named {0} already contains a file named {1}"
-		} catch (FileNotFoundException ok) {
-			//Ignore
-		}
-	}
-
-	protected void cleanupAfterTempSave(String aUri, java.io.File original, java.io.File destinationFile) throws SaveFailureException {
-
-		checkWriteable(original);
-		boolean deleteWorked = false;
-		if (original.isDirectory() && !isRenameable(original)) {
-			throw new SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.unable_replace_EXC_, (new Object[]{original.getAbsolutePath()}))); // = "Unable to replace original archive "
-		}
-
-		for (int i = 0; i < 10; i++) {
-			if (ArchiveUtil.delete(original)) {
-				deleteWorked = true;
-				break;
-			}
-			try {
-				// TODO Major hack here; the problem is that a previous call
-				// to close the source file may not yet have
-				//been reflected in the os/vm; therefore a subsequent call
-				// to delete fails. To get around this,
-				//wait for a bit and retry; if it continues to fail, then
-				// time out and throw an exception
-				Thread.sleep(250);
-			} catch (InterruptedException e) {
-				//Ignore
-			}
-		}
-		if (deleteWorked) {
-			for (int i = 0; i < 10; i++) {
-				if (destinationFile.renameTo(original))
-					return;
-				try {
-					Thread.sleep(250);
-				} catch (InterruptedException e) {
-					//Ignore
-				}
-			}
-		}
-		throw new SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.unable_replace_EXC_, (new Object[]{original.getAbsolutePath()}))); // = "Unable to replace original archive "
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void close() {
-		getLoadStrategy().close();
-		releaseClassLoader();
-		getCommonArchiveFactory().archiveClosed(this);
-		if (isIndexed()) {
-			List archives = getArchiveFiles();
-			for (int i = 0; i < archives.size(); i++) {
-				((Archive) archives.get(i)).close();
-			}
-		}
-	}
-
-	protected File copy(File aFile) {
-		File copy = null;
-		if (aFile.isArchive())
-			copy = getCommonArchiveFactory().copy((Archive) aFile);
-		else
-			copy = (File) EtoolsCopyUtility.createCopy(aFile);
-		return copy;
-	}
-
-	protected LoadStrategy createLoadStrategyForReopen(Archive parent) throws IOException {
-		LoadStrategy aLoadStrategy = null;
-		LooseArchive loose = getLoadStrategy().getLooseArchive();
-
-		if (loose != null) {
-			aLoadStrategy = getCommonArchiveFactory().createLoadStrategy(loose.getBinariesPath());
-			aLoadStrategy.setLooseArchive(loose);
-		} else if (parent == null)
-			aLoadStrategy = getCommonArchiveFactory().createLoadStrategy(getURI());
-		else
-			aLoadStrategy = getCommonArchiveFactory().createChildLoadStrategy(getURI(), parent.getLoadStrategy());
-
-		return aLoadStrategy;
-	}
-
-	protected RuntimeClasspathEntry createRuntimeClasspathEntry(String absolutePath) {
-		RuntimeClasspathEntry entry = new RuntimeClasspathEntryImpl();
-		entry.setAbsolutePath(absolutePath);
-		return entry;
-	}
-
-	/**
-	 * Convert all the classpath entries to absolute paths
-	 */
-	protected List createRuntimeClasspathEntries(String[] entries, String parentPath) {
-
-		List aList = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			String entry = entries[i];
-			/*
-			 * Added for loose module support - if the cananonicalized entry resolves to an archive
-			 * in the containing ear, then add the absolute path of that archive
-			 */
-			Archive dependentJar = resolveClasspathEntryInEAR(entry);
-			if (dependentJar != null) {
-				try {
-					RuntimeClasspathEntry runEntry = createRuntimeClasspathEntry(dependentJar.getBinariesPath(), entry);
-					runEntry.setReferencedArchive(dependentJar);
-					aList.add(runEntry);
-					continue;
-				} catch (FileNotFoundException shouldntHappenInRuntime) {
-					//Ignore
-				}
-			}
-			//Otherwise, compute the absolute path of the entry relative to
-			// this jar
-			java.io.File aFile = new java.io.File(entry);
-			String absPath = null;
-			if (aFile.isAbsolute())
-				absPath = aFile.getAbsolutePath();
-			else {
-				absPath = ArchiveUtil.getOSUri(parentPath, entry);
-				absPath = ClasspathUtil.normalizePath(absPath);
-			}
-			aList.add(createRuntimeClasspathEntry(absPath, entry));
-		}
-
-		return aList;
-	}
-
-	protected RuntimeClasspathEntry createRuntimeClasspathEntry(String absolutePath, String manifestValue) {
-		RuntimeClasspathEntry entry = createRuntimeClasspathEntry(absolutePath);
-		entry.setManifestValue(manifestValue);
-		return entry;
-	}
-
-	protected SaveStrategy createSaveStrategyForDirectory(java.io.File dir, int expansionFlags) {
-		return new DirectorySaveStrategyImpl(dir.getAbsolutePath(), expansionFlags);
-	}
-
-	protected SaveStrategy createSaveStrategyForDirectory(String aUri, int expansionFlags) {
-		return new DirectorySaveStrategyImpl(aUri, expansionFlags);
-	}
-
-	protected SaveStrategy createSaveStrategyForJar(java.io.File aFile) throws java.io.IOException {
-		if (aFile.exists() && aFile.isDirectory())
-			throw new IOException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_exist_as_dir_EXC_, (new Object[]{aFile.getAbsolutePath()})));// = "A file named {0} exists and is a directory"
-		java.io.File parent = aFile.getParentFile();
-		if (parent != null)
-			parent.mkdirs();
-		java.io.OutputStream out = new java.io.FileOutputStream(aFile);
-		return new ZipStreamSaveStrategyImpl(out);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void extract(int expansionFlags) throws SaveFailureException, ReopenException {
-		extractNoReopen(expansionFlags);
-		reopen();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void extractNoReopen(int expansionFlags) throws SaveFailureException {
-		String aUri = getURI();
-		java.io.File aDir = new java.io.File(aUri);
-		boolean inUse = getLoadStrategy().isUsing(aDir);
-
-		try {
-			java.io.File destinationDir = inUse ? ArchiveUtil.createTempDirectory(aUri, aDir.getCanonicalFile().getParentFile()) : aDir;
-			SaveStrategy aSaveStrategy = createSaveStrategyForDirectory(destinationDir, expansionFlags);
-			save(aSaveStrategy);
-			aSaveStrategy.close();
-			close();
-			if (inUse) {
-				cleanupAfterTempSave(aUri, aDir, destinationDir);
-			}
-		} catch (java.io.IOException ex) {
-			throw new SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.error_saving_EXC_, (new Object[]{uri})), ex); // = "Error saving "
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void extractTo(java.lang.String aUri, int expansionFlags) throws SaveFailureException {
-		java.io.File aDir = new java.io.File(aUri);
-		if (getLoadStrategy().isUsing(aDir))
-			throw new SaveFailureException(CommonArchiveResourceHandler.Extract_destination_is_the_EXC_); // = "Extract destination is the same path as source file"
-
-		try {
-			SaveStrategy aSaveStrategy = createSaveStrategyForDirectory(aDir, expansionFlags);
-			save(aSaveStrategy);
-			aSaveStrategy.close();
-		} catch (java.io.IOException ex) {
-			throw new SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.error_saving_EXC_, (new Object[]{aUri})), ex); // = "Error saving "
-		}
-
-	}
-
-	public java.util.List filterFilesByPrefix(String prefix) {
-		return filterFiles(prefix, null);
-	}
-
-	public java.util.List filterFiles(String prefix, String[] suffixes) {
-		List subset = new ArrayList();
-		List theFiles = getFiles();
-		for (int i = 0; i < theFiles.size(); i++) {
-			File aFile = (File) theFiles.get(i);
-			if (!aFile.isDirectoryEntry() && aFile.getURI().startsWith(prefix))
-				if (suffixes == null || hasSuffix(aFile.getURI(), suffixes))
-					subset.add(aFile);
-		}
-		return subset;
-	}
-
-	/**
-	 * @param uri
-	 * @param suffixes
-	 * @return
-	 */
-	private boolean hasSuffix(String aUri, String[] suffixes) {
-		for (int i = 0; i < suffixes.length; i++) {
-			if (aUri.endsWith(suffixes[i]))
-				return true;
-		}
-		return false;
-	}
-
-	public java.util.List filterFilesWithoutPrefix(String[] prefixes) {
-		List subset = new ArrayList();
-		List theFiles = getFiles();
-		for (int i = 0; i < theFiles.size(); i++) {
-			File aFile = (File) theFiles.get(i);
-			if (aFile.isDirectoryEntry())
-				continue;
-			boolean shouldAdd = true;
-			for (int j = 0; j < prefixes.length; j++) {
-				if (aFile.getURI().startsWith(prefixes[j])) {
-					shouldAdd = false;
-					break;
-				}
-			}
-			if (shouldAdd)
-				subset.add(aFile);
-		}
-		return subset;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.ClassLoader
-	 */
-	public java.lang.ClassLoader getArchiveClassLoader() {
-		if (archiveClassLoader == null)
-			initializeClassLoader();
-		return archiveClassLoader;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public java.util.List getArchiveFiles() {
-		List archives = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isArchive()) {
-				archives.add(aFile);
-			}
-		}
-		return archives;
-	}
-
-	/**
-	 * Parse the manifest class path and the extra class path, and instantiate a URL classloader,
-	 * with a parent of the archiveClassLoader
-	 */
-	protected ClassLoader getClassPathClassLoader(ClassLoader parentCl) {
-
-		List classPathComponents = new ArrayList();
-		if (getManifest() != null)
-			classPathComponents.addAll(Arrays.asList(getManifest().getClassPathTokenized()));
-		String extraCp = getExtraClasspath();
-		if (extraCp != null)
-			classPathComponents.addAll(Arrays.asList(ArchiveUtil.getTokens(extraCp, ";")));//$NON-NLS-1$
-
-		java.net.URL[] urlArray = ArchiveUtil.toLocalURLs(classPathComponents, getRootForRelativeDependentJars());
-		return new java.net.URLClassLoader(urlArray, parentCl);
-	}
-
-	public ResourceSet getResourceSet() {
-		return getLoadStrategy().getResourceSet();
-	}
-
-	/**
-	 * Helper method to determine the parent for the custom class loader used by this archive
-	 */
-	protected ClassLoader getDefaultClassLoader() {
-		ClassLoader pluginClassLoader = getClass().getClassLoader();
-		return pluginClassLoader == null ? ClassLoader.getSystemClassLoader() : pluginClassLoader;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public java.util.Set getDependentOpenArchives() {
-		return getCommonArchiveFactory().getOpenArchivesDependingOn(this);
-	}
-
-	/**
-	 * Convert all the classpath entries to absolute paths
-	 */
-	protected List getEntriesAsAbsolutePaths(String[] entries, String parentPath) {
-
-		List aList = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			String entry = entries[i];
-			/*
-			 * Added for loose module support - if the cananonicalized entry resolves to an archive
-			 * in the containing ear, then add the absolute path of that archive
-			 */
-			Archive dependentJar = resolveClasspathEntryInEAR(entry);
-			if (dependentJar != null) {
-				try {
-					aList.add(dependentJar.getAbsolutePath());
-					continue;
-				} catch (FileNotFoundException shouldntHappenInRuntime) {
-					//Ignore
-				}
-			}
-			//Otherwise, compute the absolute path of the entry relative to
-			// this jar
-			java.io.File aFile = new java.io.File(entry);
-			if (aFile.isAbsolute())
-				aList.add(aFile.getAbsolutePath());
-			else
-				aList.add(ArchiveUtil.getOSUri(parentPath, entry));
-		}
-
-		return aList;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getExtraClasspath() {
-		return extraClasspath;
-	}
-
-	/**
-	 * Used internally by the framework, specifically as an optimization when saving/exploding
-	 * archives with nested archives
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator getFilesForSave() throws IOException {
-		return getLoadStrategy().getFileIterator();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public java.io.InputStream getInputStream() throws java.io.FileNotFoundException, java.io.IOException {
-		if (getLoadingContainer() != null || getLoadStrategy() == null || getLoadStrategy().isDirectory())
-			return super.getInputStream();
-
-		//This archive was copied in; this operation is not supported for
-		// module files
-		if (isModuleFile() || !getOptions().isSaveLibrariesAsFiles())
-			throw new IOException("Undefined state of nested archive"); //$NON-NLS-1$
-
-		//We have to find the absolute path of the original archive from which
-		// this was copied,
-		//if it is known
-
-		List list = getFiles();
-
-		String absolutePath = null;
-		for (int i = 0; i < list.size(); i++) {
-			File aFile = (File) list.get(i);
-			if (aFile.isArchive())
-				continue;
-			absolutePath = aFile.getLoadingContainer().getAbsolutePath();
-		}
-
-		return new FileInputStream(absolutePath);
-	}
-
-	/**
-	 * @see LoadStrategy#getResourceInputStream(String)
-	 */
-	public InputStream getResourceInputStream(String aUri) throws IOException {
-		return getLoadStrategy().getResourceInputStream(aUri);
-	}
-
-	protected JavaJDKAdapterFactory getJavaAdapterFactory() {
-		return (JavaJDKAdapterFactory) EcoreUtil.getAdapterFactory(getLoadStrategy().getResourceSet().getAdapterFactories(), ReadAdaptor.TYPE_KEY);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive returns an immutable collection of the loaded
-	 *      resources in the resource set
-	 */
-	public Collection getLoadedMofResources() {
-		return getLoadStrategy().getLoadedMofResources();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 */
-	public ArchiveManifest getManifest() {
-		if (manifest == null) {
-			InputStream in = null;
-			try {
-				in = getInputStream(J2EEConstants.MANIFEST_URI);
-				makeManifest(in);
-			} catch (FileNotFoundException ex) {
-				makeManifest();
-			} catch (Resource.IOWrappedException ex) {
-				WrappedException wrapEx = new WrappedException((ex).getWrappedException());
-				if (ExtendedEcoreUtil.getFileNotFoundDetector().isFileNotFound(wrapEx))
-					makeManifest();
-				else
-					throw new ManifestException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.io_ex_manifest_EXC_, (new Object[]{getURI()})), ex); // = "An IOException occurred reading the manifest: "
-			} catch (IOException ex) {
-				throw new ManifestException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.io_ex_manifest_EXC_, (new Object[]{getURI()})), ex); // = "An IOException occurred reading the manifest: "
-			} finally {
-				if (in != null)
-					try {
-						in.close();
-					} catch (IOException iox) {
-						//Ignore
-					}
-			}
-		}
-		//This is a hack because of the fact that the manifest does not
-		// serialize correctly if
-		//The version is not set. In addition to saves, the serialization is
-		// used for copy
-		if (manifest.getManifestVersion() == null || manifest.getManifestVersion().equals("")) //$NON-NLS-1$
-			manifest.setManifestVersion("1.0");//$NON-NLS-1$
-		return manifest;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public org.eclipse.emf.ecore.resource.Resource getMofResource(java.lang.String aUri) throws FileNotFoundException, ResourceLoadException {
-		return getLoadStrategy().getMofResource(aUri);
-	}
-
-	protected Resource getMofResourceMakeIfNecessary(String aUri) {
-		if (getLoadStrategy() == null)
-			return null;
-		Resource resource = null;
-		try {
-			resource = getMofResource(aUri);
-		} catch (java.io.FileNotFoundException ex) {
-			try {
-				resource = makeMofResource(aUri);
-			} catch (DuplicateObjectException dox) {
-				//We just checked for this; it won't happen
-			}
-		}
-		return resource;
-	}
-
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions getOptions() {
-		if (options == null) {
-			options = new ArchiveOptions();
-		}
-		return options;
-	}
-
-	/**
-	 * When looking at the class path of this jar (from the manifest), some of the elements may have
-	 * a relative path, thus we need to determine the install location of this jar. If the absolute
-	 * path from which the archive was loaded, return the parent directory of that path; otherwise,
-	 * see if the containing archive has an absolute path; if neither work, default to the current
-	 * working directory
-	 */
-	public String getRootForRelativeDependentJars() {
-		String path = null;
-		Container theContainer = this;
-		while (theContainer != null && path == null) {
-			try {
-				path = theContainer.getAbsolutePath();
-			} catch (FileNotFoundException ex) {
-				//Ignore
-			}
-			theContainer = theContainer.getLoadingContainer();
-		}
-		if (path == null) {
-			path = System.getProperty("user.dir");//$NON-NLS-1$
-			if (path == null)
-				//At this point what else can we do?
-				return "";//$NON-NLS-1$
-			return new java.io.File(path).getAbsolutePath();
-		}
-		return new java.io.File(path).getParentFile().getAbsolutePath();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public java.lang.String[] getRuntimeClassPath() {
-
-		String absolutePath;
-		try {
-			absolutePath = getBinariesPath();
-		} catch (IOException ex) {
-			return new String[0];
-		}
-
-		List entries = new ArrayList();
-		entries.add(absolutePath);
-
-		String parentPath = new java.io.File(absolutePath).getParentFile().getAbsolutePath();
-		String[] mfEntries = getManifest().getClassPathTokenized();
-		entries.addAll(getEntriesAsAbsolutePaths(mfEntries, parentPath));
-
-		return (String[]) entries.toArray(new String[entries.size()]);
-	}
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter getSaveFilter() {
-		return saveFilter;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/04/00 3:31:32 PM)
-	 * 
-	 * @return com.ibm.etools.archive.SaveStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy getSaveStrategy() {
-		return saveStrategy;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getXmlEncoding() {
-		return xmlEncoding;
-	}
-
-	/**
-	 * The default is to do nothing; subclasses may override as necessary
-	 * 
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void initializeAfterOpen() {
-		//Default
-	}
-
-	public void initializeClassLoader() {
-		//Some load strategies may provide a mof context for which
-		//an alternate class loader is not necessary
-		if (!shouldUseJavaReflection())
-			return;
-		ClassLoader extraCl = null;
-		ClassLoader defaultCl = getDefaultClassLoader();
-		if (getContainer() == null || !getContainer().isEARFile())
-			extraCl = getClassPathClassLoader(defaultCl);
-		ClassLoader cl = createDynamicClassLoader(defaultCl, extraCl);
-		setArchiveClassLoader(cl);
-		JavaJDKAdapterFactory factory = getJavaAdapterFactory();
-		factory.setContextClassLoader(cl);
-		factory.flushAll();
-	}
-
-	public ClassLoader createDynamicClassLoader(ClassLoader parentCl, ClassLoader extraCl) {
-		return new ArchiveFileDynamicClassLoader(this, parentCl, extraCl);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isArchive() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean isDuplicate(java.lang.String aUri) {
-		return containsFile(aUri) || isMofResourceLoaded(aUri) || J2EEConstants.MANIFEST_URI.equals(aUri);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean isManifestSet() {
-		return manifest != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean isMofResourceLoaded(java.lang.String aUri) {
-		return getLoadStrategy().isMofResourceLoaded(aUri);
-	}
-
-	/**
-	 * By default just test the extension of the uri for one of the known archive types; subclasses
-	 * may which to override.
-	 * 
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean isNestedArchive(java.lang.String aUri) {
-		//110390.3 Error loading alt-bindings
-		/*
-		 * Don't infer that a folder which ends with .jar is an exploded archive; EAR file will do
-		 * that IF the folder is declared as a module in the EAR
-		 */
-		if (getLoadStrategy().isDirectory()) {
-			try {
-				String path = ArchiveUtil.getOSUri(getAbsolutePath(), aUri);
-				java.io.File ioFile = new java.io.File(path);
-				if (!ioFile.exists() || (ioFile.isDirectory() && aUri.startsWith(J2EEConstants.ALT_INF)))
-					return false;
-			} catch (IOException ex) {
-				return false;
-			}
-		}
-		return ArchiveTypeDiscriminatorRegistry.INSTANCE.isKnownArchiveType(aUri);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean isOpen() {
-		return getLoadStrategy() != null && getLoadStrategy().isOpen();
-	}
-
-	public ArchiveManifest makeManifest() {
-		ArchiveManifest mf = new ArchiveManifestImpl();
-		setManifest(mf);
-		return mf;
-	}
-
-	public ArchiveManifest makeManifest(InputStream in) throws IOException {
-		ArchiveManifest mf = new ArchiveManifestImpl(in);
-		setManifest(mf);
-		return mf;
-	}
-
-	public Resource makeMofResource(String aUri) throws DuplicateObjectException {
-		return makeMofResource(aUri, null);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive#makeMofResource(String, EList)
-	 */
-	public Resource makeMofResource(String aUri, EList extent) throws DuplicateObjectException {
-		if (isDuplicate(aUri))
-			throw new DuplicateObjectException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.duplicate_entry_EXC_, (new Object[]{aUri, getURI()}))); // = "A file or resource with uri {0} already exists in the archive named {1}"
-		return getLoadStrategy().makeMofResource(aUri, extent);
-	}
-
-	/**
-	 * @see Archive
-	 */
-	public Archive openNestedArchive(String aUri) throws OpenFailureException {
-		return getCommonArchiveFactory().openNestedArchive(aUri, this);
-	}
-
-	/**
-	 * @see Archive
-	 */
-	public Archive openNestedArchive(LooseArchive loose) throws OpenFailureException {
-		return getCommonArchiveFactory().openNestedArchive(loose, this);
-	}
-
-	/**
-	 * Set the value of the extra class path with no refresh of the class loader
-	 */
-	public void primSetExtraClasspath(java.lang.String newExtraClasspath) {
-		extraClasspath = newExtraClasspath;
-	}
-
-	/**
-	 * Remove references to the archive class loader to prevent gc problems or problems with temp
-	 * files not getting deleted
-	 */
-	public void releaseClassLoader() {
-		if (archiveClassLoader != null) {
-			setArchiveClassLoader(null);
-			getJavaAdapterFactory().setContextClassLoader(null);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void remove(File aFile) {
-		getFiles().remove(aFile);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void reopen() throws ReopenException {
-		reopen(null);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void reopen(Archive parent) throws ReopenException {
-		LoadStrategy aLoadStrategy = null;
-		try {
-			aLoadStrategy = createLoadStrategyForReopen(parent);
-		} catch (IOException ex) {
-			throw new ReopenException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.io_ex_reopen_EXC_, (new Object[]{getURI()})), ex); // = "IOException occurred while reopening "
-		}
-		//PQ54572
-		LoadStrategy current = getLoadStrategy();
-		if (current != null) {
-			aLoadStrategy.setResourceSet(current.primGetResourceSet());
-			/*
-			 * fixing problem with orphaned load strategy listening to the resource set
-			 */
-			current.setResourceSet(null);
-		}
-
-		setLoadStrategy(aLoadStrategy);
-		initializeClassLoader();
-		if (!isIndexed())
-			return;
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File f = (File) fileList.get(i);
-			f.setOriginalURI(f.getURI());
-			f.setLoadingContainer(this);
-			if (f.isArchive())
-				((Archive) f).reopen(this);
-		}
-		getCommonArchiveFactory().archiveOpened(this);
-	}
-
-	protected void replaceRoot(Resource aResource, EObject root) {
-		if (aResource == null)
-			return;
-		EList extent = aResource.getContents();
-		EObject existingRoot = null;
-		if (!extent.isEmpty()) {
-			existingRoot = (EObject) extent.get(0);
-			if (existingRoot == root)
-				return;
-			extent.remove(0);
-		}
-		if (root != null)
-			extent.add(0, root);
-	}
-
-	protected Archive resolveClasspathEntryInEAR(String entry) {
-		/*
-		 * Added to support runtime classpath for loose modules
-		 */
-		Container parent = getContainer();
-		if (parent == null || !parent.isEARFile())
-			return null;
-
-		String aUri = ArchiveUtil.deriveEARRelativeURI(entry, this);
-		if (aUri == null)
-			return null;
-
-		File aFile = null;
-		try {
-			aFile = parent.getFile(aUri);
-		} catch (FileNotFoundException ex) {
-			return null;
-		}
-
-		return aFile.isArchive() ? (Archive) aFile : null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void save() throws SaveFailureException, ReopenException {
-		saveAs(getURI());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void save(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy aStrategy) throws SaveFailureException {
-		setSaveStrategy(aStrategy);
-		SaveFilter existingFilter = aStrategy.getFilter();
-		boolean oldDelivery = eDeliver();
-		try {
-			if (getOptions().isReadOnly())
-				eSetDeliver(false);
-			aStrategy.setFilter(getSaveFilter());
-			aStrategy.save();
-			try {
-				aStrategy.finish();
-			} catch (java.io.IOException iox) {
-				throw new SaveFailureException(getURI(), iox);
-			}
-		} finally {
-			//We have to leave the file index if we are a directory because we
-			// might have
-			//open file handles to archives
-			if (getOptions().isReadOnly() && !getLoadStrategy().isDirectory()) {
-				files.clear();
-				//((BasicEList)files).setListImplementation(new ArrayList(0));
-				eSetDeliver(oldDelivery);
-				eAdapters().remove(getFileIndexAdapter());
-				fileIndexAdapter = null;
-				fileIndex = null;
-			}
-			setSaveStrategy(null);
-			aStrategy.setFilter(existingFilter);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void saveAs(String aUri) throws SaveFailureException, ReopenException {
-		saveAsNoReopen(aUri);
-		reopen();
-	}
-
-	/**
-	 * If we can rename it then we can delete it
-	 */
-	protected boolean isRenameable(java.io.File orig) {
-		java.io.File origCopy1 = null;
-		java.io.File origCopy2 = null;
-		try {
-			origCopy1 = orig.getCanonicalFile();
-			origCopy2 = orig.getCanonicalFile();
-		} catch (java.io.IOException ex) {
-			return false;
-		}
-		String name = null;
-		String baseName = "save.tmp"; //$NON-NLS-1$
-		try {
-			if (orig.getParent() != null)
-				baseName = new java.io.File(orig.getParent(), baseName).getCanonicalPath();
-		} catch (java.io.IOException ex) {
-			return false;
-		}
-
-		java.io.File temp = null;
-		int index = 0;
-		do {
-			name = baseName + index;
-			temp = new java.io.File(name);
-			index++;
-		} while (temp.exists());
-		return origCopy1.renameTo(temp) && temp.renameTo(origCopy2);
-	}
-
-	protected void checkWriteable(java.io.File dest) throws SaveFailureException {
-		List locked = ArchiveUtil.getWriteProtectedFiles(dest, null);
-		if (locked.isEmpty())
-			return;
-
-		StringBuffer msg = new StringBuffer();
-		msg.append("Cannot write to file: "); //$NON-NLS-1$
-		msg.append(dest.getAbsolutePath());
-		msg.append('\n');
-		msg.append("One or more files is write protected or locked:"); //$NON-NLS-1$
-		msg.append('\n');
-		for (int i = 0; i < locked.size(); i++) {
-			java.io.File aFile = (java.io.File) locked.get(i);
-			msg.append(aFile.getAbsolutePath());
-			msg.append('\n');
-		}
-		throw new SaveFailureException(msg.toString());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void saveAsNoReopen(String aUri) throws SaveFailureException {
-		java.io.File aFile = new java.io.File(aUri);
-		checkWriteable(aFile);
-		boolean fileExisted = aFile.exists();
-		//botp 142149
-		//boolean inUse = getLoadStrategy().isUsing(aFile);
-		SaveStrategy aSaveStrategy = null;
-		try {
-			try {
-				java.io.File destinationFile = fileExisted ? ArchiveUtil.createTempFile(aUri, aFile.getCanonicalFile().getParentFile()) : aFile;
-				aSaveStrategy = createSaveStrategyForJar(destinationFile);
-				save(aSaveStrategy);
-				aSaveStrategy.close();
-				this.close();
-				if (fileExisted) {
-					cleanupAfterTempSave(aUri, aFile, destinationFile);
-				}
-			} catch (java.io.IOException ex) {
-				throw new SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.error_saving_EXC_, (new Object[]{aUri})), ex); // = "Error saving "
-			}
-		} catch (SaveFailureException failure) {
-			try {
-				if (aSaveStrategy != null)
-					aSaveStrategy.close();
-			} catch (IOException weTried) {
-				//Ignore
-			}
-			if (!fileExisted)
-				aFile.delete();
-			throw failure;
-		}
-
-		setURI(aUri);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void saveNoReopen() throws SaveFailureException {
-		saveAsNoReopen(getURI());
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newArchiveClassLoader
-	 *            java.lang.ClassLoader
-	 */
-	public void setArchiveClassLoader(java.lang.ClassLoader newArchiveClassLoader) {
-		archiveClassLoader = newArchiveClassLoader;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newExtraClasspath
-	 *            java.lang.String
-	 */
-	public void setExtraClasspath(java.lang.String newExtraClasspath) {
-		primSetExtraClasspath(newExtraClasspath);
-		//Optimization - only re init if a cl exists; otherwise it will init on
-		// demand
-		if (archiveClassLoader != null)
-			initializeClassLoader();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 */
-	public void setManifest(ArchiveManifest newManifest) {
-		manifest = newManifest;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void setManifest(java.util.jar.Manifest aManifest) {
-		setManifest((ArchiveManifest) new org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl(aManifest));
-	}
-
-	/**
-	 * Sets the Class-path manifest entry, rebuilds the class loader, and refreshes any reflected
-	 * java classes
-	 */
-	public void setManifestClassPathAndRefresh(String classpath) {
-		ArchiveManifest mf = getManifest();
-		if (manifest == null) {
-			makeManifest();
-		}
-		mf.setClassPath(classpath);
-		//Optimization - only re init if a cl exists; otherwise it will init on
-		// demand
-		if (archiveClassLoader != null)
-			initializeClassLoader();
-	}
-
-	public void setOptions(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions newOptions) {
-		options = newOptions;
-	}
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	public void setSaveFilter(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter newSaveFilter) {
-		saveFilter = newSaveFilter;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/04/00 3:31:32 PM)
-	 * 
-	 * @param newSaveStrategy
-	 *            com.ibm.etools.archive.SaveStrategy
-	 */
-	public void setSaveStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy newSaveStrategy) {
-		saveStrategy = newSaveStrategy;
-		if (newSaveStrategy != null) {
-			newSaveStrategy.setArchive(this);
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newXmlEncoding
-	 *            java.lang.String
-	 */
-	public void setXmlEncoding(java.lang.String newXmlEncoding) {
-		xmlEncoding = newXmlEncoding;
-	}
-
-	/**
-	 * Determine whether java reflection should be set up for this archive
-	 */
-	public boolean shouldUseJavaReflection() {
-		return getOptions().useJavaReflection() && getLoadStrategy().isClassLoaderNeeded();
-	}
-
-	protected void throwResourceLoadException(String resourceUri, Exception ex) throws ResourceLoadException {
-		throw new ResourceLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.load_resource_EXC_, (new Object[]{resourceUri, getURI()})), ex); // = "Could not load resource "{0}" in archive "{1}""
-	}
-
-	public String getResourcesPath() throws FileNotFoundException {
-		return getLoadStrategy().getResourcesPath();
-	}
-
-	public String getBinariesPath() throws FileNotFoundException {
-		return getLoadStrategy().getBinariesPath();
-	}
-
-	protected RuntimeClasspathEntry[] emptyClasspath() {
-		return new RuntimeClasspathEntry[0];
-	}
-
-	protected String internalGetBinariesPath() {
-		try {
-			return getBinariesPath();
-		} catch (FileNotFoundException ex) {
-			return null;
-		}
-	}
-
-	/**
-	 * By default return just the contents of this archive
-	 */
-	public RuntimeClasspathEntry[] getLocalRuntimeClassPath() {
-
-		String absolutePath = internalGetBinariesPath();
-		if (absolutePath == null)
-			return emptyClasspath();
-		return new RuntimeClasspathEntry[]{createRuntimeClasspathEntry(absolutePath)};
-	}
-
-	protected RuntimeClasspathEntry[] getDependencyClassPathAtThisLevel() {
-		String absolutePath = internalGetBinariesPath();
-		if (absolutePath == null)
-			return emptyClasspath();
-		String parentPath = new java.io.File(absolutePath).getParentFile().getAbsolutePath();
-		String[] mfEntries = getManifest().getClassPathTokenized();
-		if (mfEntries.length == 0)
-			return emptyClasspath();
-		List entries = new ArrayList();
-		entries.addAll(createRuntimeClasspathEntries(mfEntries, parentPath));
-
-		return (RuntimeClasspathEntry[]) entries.toArray(new RuntimeClasspathEntry[entries.size()]);
-	}
-
-	public RuntimeClasspathEntry[] getFullRuntimeClassPath() {
-		return concat(getLocalRuntimeClassPath(), getDependencyClassPath());
-	}
-
-	protected RuntimeClasspathEntry[] concat(RuntimeClasspathEntry[] array1, RuntimeClasspathEntry[] array2) {
-		List temp = new ArrayList();
-		temp.addAll(Arrays.asList(array1));
-		temp.addAll(Arrays.asList(array2));
-		return (RuntimeClasspathEntry[]) temp.toArray(new RuntimeClasspathEntry[temp.size()]);
-	}
-
-	public RuntimeClasspathEntry[] getDependencyClassPath() {
-		List entries = new ArrayList();
-		Set visited = new HashSet();
-		Set processedEntries = new HashSet();
-		visited.add(this);
-		getDependencyClassPath(visited, entries, processedEntries, this);
-		return (RuntimeClasspathEntry[]) entries.toArray(new RuntimeClasspathEntry[entries.size()]);
-	}
-
-	protected void getDependencyClassPath(Set visitedArchives, List entries, Set processedEntries, Archive current) {
-
-		RuntimeClasspathEntry[] local = ((ArchiveImpl) current).getDependencyClassPathAtThisLevel();
-		for (int i = 0; i < local.length; i++) {
-			RuntimeClasspathEntry entry = local[i];
-			if (!processedEntries.contains(entry)) {
-				entries.add(entry);
-				processedEntries.add(entry);
-			}
-			Archive resolved = entry.getReferencedArchive();
-			if (resolved == null)
-				ClasspathUtil.processManifest(entry.getAbsolutePath(), entries, processedEntries);
-			else if (!visitedArchives.contains(resolved)) {
-				visitedArchives.add(resolved);
-				getDependencyClassPath(visitedArchives, entries, processedEntries, resolved);
-			}
-
-		}
-	}
-
-	protected EARFile getEARFile() {
-		Container parent = getContainer();
-		if (parent == null || !(parent instanceof EARFile))
-			return null;
-		return (EARFile) parent;
-	}
-
-	protected Archive getResolvedArchive(String mfValue, EARFile ear) {
-		String aUri = ArchiveUtil.deriveEARRelativeURI(mfValue, this);
-		if (aUri == null)
-			return null;
-		try {
-			return (Archive) ear.getFile(aUri);
-		} catch (FileNotFoundException ex) {
-			return null;
-		} catch (ClassCastException ex2) {
-			return null;
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive#hasClasspathVisibilityTo(Archive)
-	 */
-	public boolean hasClasspathVisibilityTo(Archive other) {
-		if (other == null)
-			return false;
-		EARFile ear = getEARFile();
-		if (ear == null)
-			return false;
-		Set visited = new HashSet();
-		return hasClasspathVisibilityTo(other, visited, ear);
-	}
-
-	public boolean hasClasspathVisibilityTo(Archive other, Set visited, EARFile ear) {
-		if (this == other)
-			return true;
-		if (visited.contains(this))
-			return false;
-		visited.add(this);
-		String[] mfEntries = getManifest().getClassPathTokenized();
-		for (int i = 0; i < mfEntries.length; i++) {
-			Archive anArchive = getResolvedArchive(mfEntries[i], ear);
-			if (anArchive != null && anArchive.hasClasspathVisibilityTo(other, visited, ear))
-				return true;
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.commonarchivecore.Archive#isType(java.lang.String)
-	 */
-	public boolean isType(String type) {
-
-		return (types != null && getTypes().contains(type));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java
deleted file mode 100644
index 71f5bcd72..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-
-/**
- * @generated
- */
-public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRef {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ClientModuleRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.CLIENT_MODULE_REF;
-	}
-
-	public ApplicationClient getApplicationClient() throws ArchiveWrappedException {
-		return (ApplicationClient) getDeploymentDescriptor();
-	}
-
-
-	/*
-	 * @see ModuleRef#isClient()
-	 */
-	public boolean isClient() {
-		return true;
-	}
-
-} //ClientModuleRefImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java
deleted file mode 100644
index 8a8b3efc4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java
+++ /dev/null
@@ -1,1083 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ArchiveTypeDiscriminatorRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ConnectorModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.AppClient12ImportStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.DirectoryArchiveLoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.DirectoryArchiveLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.Ear12ImportStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.EjbJar11ImportStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.NestedArchiveLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.NullLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.RarImportStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ReadOnlyDirectoryLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.TempZipFileLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.War22ImportStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.DeleteOnExitUtility;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-
-
-/**
- * @generated
- */
-public class CommonarchiveFactoryImpl extends EFactoryImpl implements CommonarchiveFactory {
-
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CommonarchiveFactory init() {
-		try {
-			CommonarchiveFactory theCommonarchiveFactory = (CommonarchiveFactory)EPackage.Registry.INSTANCE.getEFactory("commonarchive.xmi"); 
-			if (theCommonarchiveFactory != null) {
-				return theCommonarchiveFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new CommonarchiveFactoryImpl();
-	}
-
-	protected Map openArchives;
-	private static boolean delegateNeedsInit = true;
-	private CommonarchiveFactory delegate = null;
-
-	static {
-		initPrereqs();
-	}
-
-	/**
-	 *  
-	 */
-	public CommonarchiveFactoryImpl() {
-		super();
-		initDelegate();
-	}
-
-	/**
-	 *  
-	 */
-	private void initDelegate() {
-		if (delegateNeedsInit) {
-			delegateNeedsInit = false;
-			delegate = new CommonarchiveFactoryImpl() {
-
-				public ApplicationClientFile createApplicationClientFile() {
-					return createApplicationClientFileGen();
-				}
-
-
-				public ClientModuleRef createClientModuleRef() {
-					return createClientModuleRefGen();
-				}
-
-				public ConnectorModuleRef createConnectorModuleRef() {
-					return createConnectorModuleRefGen();
-				}
-
-				public EARFile createEARFile() {
-					return createEARFileGen();
-				}
-
-				public EJBJarFile createEJBJarFile() {
-					return createEJBJarFileGen();
-				}
-
-				public EJBModuleRef createEJBModuleRef() {
-					return createEJBModuleRefGen();
-				}
-
-				public RARFile createRARFile() {
-					return createRARFileGen();
-				}
-
-				public WARFile createWARFile() {
-					return createWARFileGen();
-				}
-
-				public WebModuleRef createWebModuleRef() {
-					return createWebModuleRefGen();
-				}
-			};
-		}
-
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case CommonarchivePackage.FILE: return createFile();
-			case CommonarchivePackage.ARCHIVE: return createArchive();
-			case CommonarchivePackage.EJB_JAR_FILE: return createEJBJarFile();
-			case CommonarchivePackage.WAR_FILE: return createWARFile();
-			case CommonarchivePackage.EAR_FILE: return createEARFile();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE: return createApplicationClientFile();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY: return createReadOnlyDirectory();
-			case CommonarchivePackage.RAR_FILE: return createRARFile();
-			case CommonarchivePackage.EJB_MODULE_REF: return createEJBModuleRef();
-			case CommonarchivePackage.WEB_MODULE_REF: return createWebModuleRef();
-			case CommonarchivePackage.CLIENT_MODULE_REF: return createClientModuleRef();
-			case CommonarchivePackage.CONNECTOR_MODULE_REF: return createConnectorModuleRef();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public void archiveClosed(Archive aClosedArchive) {
-		getOpenArchives().remove(aClosedArchive);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public void archiveOpened(Archive anOpenArchive) {
-		getOpenArchives().put(anOpenArchive, null);
-	}
-
-	/**
-	 * @deprecated Use {@link #getOpenArchivesDependingOn(Archive)}
-	 */
-	public boolean canClose(Archive anArchive) {
-		return !getOpenArchivesDependingOn(anArchive).isEmpty();
-	}
-
-	public void closeOpenArchives() {
-		if (getOpenArchives().isEmpty())
-			return;
-		List opened = new ArrayList(getOpenArchives().size());
-		Iterator it = getOpenArchives().keySet().iterator();
-		while (it.hasNext()) {
-			opened.add(it.next());
-		}
-		for (int i = 0; i < opened.size(); i++) {
-			Archive anArchive = (Archive) opened.get(i);
-			anArchive.close();
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public Archive copy(Archive anArchive) {
-		return new ArchiveCopyUtility().copy(anArchive);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public ModuleFile copy(ModuleFile aModuleFile) {
-		return new ArchiveCopyUtility().copy(aModuleFile);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public ApplicationClientFile createApplicationClientFileInitialized(java.lang.String uri) {
-		ApplicationClientFile clientFile = createApplicationClientFile();
-		initializeNewApplicationClientFile(clientFile, uri);
-		return clientFile;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public Archive createArchiveInitialized(java.lang.String uri) {
-		Archive anArchive = createArchive();
-		initializeNewArchive(anArchive, uri);
-		return anArchive;
-
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public Archive createArchiveInitialized(ArchiveOptions options, java.lang.String uri) {
-		Archive anArchive = createArchive();
-		initializeNewArchive(anArchive, uri, options);
-		return anArchive;
-
-	}
-
-	public LoadStrategy createChildLoadStrategy(String uri, LoadStrategy parent) throws java.io.IOException, java.io.FileNotFoundException {
-
-		LoadStrategy childStrategy = null;
-		if (parent.isDirectory()) {
-			String dirName = ((DirectoryArchiveLoadStrategy) parent).getDirectoryUri();
-			String qualifiedUri = ArchiveUtil.getOSUri(dirName, uri);
-			childStrategy = createLoadStrategy(qualifiedUri);
-		} else {
-			childStrategy = createNestedLoadStrategy(uri, parent);
-		}
-		return childStrategy;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EARFile createEARFileInitialized(java.lang.String uri) {
-		EARFile earFile = createEARFile();
-		initializeNewEARFile(earFile, uri);
-		return earFile;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EARFile createEARFileInitialized(ArchiveOptions options, java.lang.String uri) {
-		EARFile earFile = createEARFile();
-		initializeNewEARFile(earFile, uri, options);
-		return earFile;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile createEJBJarFileInitialized(java.lang.String uri) {
-		EJBJarFile ejbJarFile = createEJBJarFile();
-		initializeNewEJBJarFile(ejbJarFile, uri);
-		return ejbJarFile;
-
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile createEJBJarFileInitialized(ArchiveOptions options, java.lang.String uri) {
-		EJBJarFile ejbJarFile = createEJBJarFile();
-		initializeNewEJBJarFile(ejbJarFile, uri, options);
-		return ejbJarFile;
-
-	}
-
-	/**
-	 * Returns a NullLoadStrategyImpl; used for new archives
-	 */
-	public LoadStrategy createEmptyLoadStrategy() {
-		return new NullLoadStrategyImpl();
-	}
-
-	/**
-	 * Helper method to dynamically build a load strategy from the file system. Determines whether
-	 * the uri points to a jar file or directory and returns the appropriate strategy
-	 */
-	public LoadStrategy createLoadStrategy(String uri) throws FileNotFoundException, IOException {
-		String filename = uri.replace('/', java.io.File.separatorChar);
-		java.io.File file = new java.io.File(filename);
-		if (!file.exists()) {
-			throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
-		}
-		if (file.isDirectory()) {
-			return new DirectoryArchiveLoadStrategyImpl(uri);
-		}
-		return new org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl(file);
-	}
-
-	/**
-	 * Create a load strategy for a nested archive; by default will extract the nested archive to a
-	 * temp file for performance reasons. This is because random access to the zip entries in a
-	 * nested archive is not supported by the java.util.zip package, and if the archive's contents
-	 * are being modified, copied, etc, this is much faster. If a temp file can not be created, or
-	 * if the archive is opened read only (for runtime), then use a NestedArchiveLoadStrategy, which
-	 * retrieves the contents of a zip entry by sequentially searching a zip input stream
-	 */
-	public LoadStrategy createNestedLoadStrategy(String uri, LoadStrategy parent) {
-		LoadStrategy loadStrategy = null;
-		ArchiveOptions options = ((Archive) parent.getContainer()).getOptions();
-
-		if (!options.isReadOnly(uri))
-			loadStrategy = createTempZipFileStrategyIfPossible(uri, parent);
-
-		if (loadStrategy == null)
-			return new NestedArchiveLoadStrategyImpl(parent);
-		return loadStrategy;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public RARFile createRARFileInitialized(java.lang.String uri) {
-		RARFile rarFile = createRARFile();
-		initializeNewRARFile(rarFile, uri);
-		return rarFile;
-	}
-
-	public LoadStrategy createTempZipFileStrategyIfPossible(String uri, LoadStrategy parent) {
-
-		if (!ArchiveUtil.shouldUseTempDirectoryForRead())
-			return null;
-
-		try {
-			java.io.File tempFile = ArchiveUtil.createTempFile(uri);
-			DeleteOnExitUtility.markForDeletion(tempFile);
-			InputStream in = parent.getInputStream(uri);
-			OutputStream out = new FileOutputStream(tempFile);
-			ArchiveUtil.copy(in, out);
-			return new TempZipFileLoadStrategyImpl(tempFile);
-		} catch (IOException ex) {
-			ArchiveUtil.inform(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.make_temp_file_WARN_, (new Object[]{uri})) + ex.getLocalizedMessage()); // = "Warning: Unable to create temp file for {0}.  This will impact performance."
-		}
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public WARFile createWARFileInitialized(java.lang.String uri) {
-		WARFile warFile = createWARFile();
-		initializeNewWARFile(warFile, uri);
-		return warFile;
-	}
-
-	protected ArchiveOptions defaultOptions(LoadStrategy aLoadStrategy) {
-		ArchiveOptions options = new ArchiveOptions();
-		options.setLoadStrategy(aLoadStrategy);
-		return options;
-	}
-
-	public static CommonarchiveFactory getActiveFactory() {
-		CommonarchivePackage pkg = getPackage();
-		if (pkg != null)
-			return pkg.getCommonarchiveFactory();
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public java.lang.String[] getManifestClassPathValues(java.lang.String uri) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		String[] result = anArchive.getManifest().getClassPathTokenized();
-		anArchive.close();
-		return result;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/23/01 2:35:55 PM)
-	 * 
-	 * @return java.util.Map
-	 */
-	public java.util.Map getOpenArchives() {
-		if (openArchives == null)
-			openArchives = new WeakHashMap();
-		return openArchives;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public Set getOpenArchivesDependingOn(Archive anArchive) {
-		Set dependents = new HashSet();
-		Iterator opened = getOpenArchives().keySet().iterator();
-		while (opened.hasNext()) {
-			Archive openedArchive = (Archive) opened.next();
-			if (openedArchive == anArchive)
-				continue;
-			if (!openedArchive.isIndexed())
-				//**********Optimization***********
-				//If the file list has never been built for the archive, we don't want to trigger
-				// it now,
-				//and we are sure that the archive is not preventing the parameter from closing
-				continue;
-			List files = openedArchive.getFiles();
-			for (int i = 0; i < files.size(); i++) {
-				File aFile = (File) files.get(i);
-				if (aFile.getLoadingContainer() == anArchive) {
-					Archive outermost = openedArchive;
-					Container c = openedArchive.getContainer();
-					while (c != null && c.isArchive()) {
-						outermost = (Archive) c;
-						c = c.getContainer();
-					}
-					dependents.add(outermost);
-				}
-			}
-		}
-		//Elements from one of the children (e.g., a module file in an ear) may have been copied to
-		//another archive
-		List nestedArchives = anArchive.getArchiveFiles();
-		for (int i = 0; i < nestedArchives.size(); i++) {
-			dependents.addAll(getOpenArchivesDependingOn((Archive) nestedArchives.get(i)));
-		}
-		return dependents;
-	}
-
-	protected static void initPrereqs() {
-		org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit.invokePrereqInits(true);
-		ArchiveTypeDiscriminator disc = RootArchiveTypeDescriminatorImpl.singleton();
-		disc.addChild(Ear12ImportStrategyImpl.getDiscriminator());
-		disc.addChild(War22ImportStrategyImpl.getDiscriminator());
-		disc.addChild(AppClient12ImportStrategyImpl.getDiscriminator());
-		disc.addChild(RarImportStrategyImpl.getDiscriminator());
-		disc.addChild(RootEJBJarDescriminatorImpl.singleton());
-	}
-
-	public void initializeNewApplicationClientFile(ApplicationClientFile anArchive, String uri) {
-		initializeNewModuleFile(anArchive, uri);
-	}
-
-	public void initializeNewArchive(Archive anArchive, String uri) {
-		anArchive.setURI(uri);
-		anArchive.setSize(0);
-		anArchive.setLastModified(System.currentTimeMillis());
-		anArchive.setDirectoryEntry(false);
-		anArchive.setLoadStrategy(createEmptyLoadStrategy());
-	}
-
-	public void initializeNewEARFile(EARFile anArchive, String uri) {
-		initializeNewModuleFile(anArchive, uri);
-	}
-
-	public void initializeNewEJBJarFile(EJBJarFile anArchive, String uri) {
-		initializeNewModuleFile(anArchive, uri);
-	}
-
-	public void initializeNewModuleFile(ModuleFile anArchive, String uri) {
-		initializeNewArchive(anArchive, uri);
-		anArchive.makeDeploymentDescriptorResource();
-	}
-
-	public void initializeNewRARFile(RARFile anArchive, String uri) {
-		initializeNewModuleFile(anArchive, uri);
-	}
-
-	public void initializeNewWARFile(WARFile anArchive, String uri) {
-		initializeNewModuleFile(anArchive, uri);
-	}
-
-	public void initializeNewApplicationClientFile(ApplicationClientFile anArchive, String uri, ArchiveOptions options) {
-		initializeNewModuleFile(anArchive, uri, options);
-	}
-
-	public void initializeNewArchive(Archive anArchive, String uri, ArchiveOptions options) {
-		if (options.getLoadStrategy() == null) {
-			try {
-				options.setLoadStrategy(createEmptyLoadStrategy());
-			} catch (Exception ex) {
-				Logger.getLogger().logError(ex);
-			}
-		}
-
-		anArchive.setURI(uri);
-		anArchive.setSize(0);
-		anArchive.setLastModified(System.currentTimeMillis());
-		anArchive.setDirectoryEntry(false);
-		anArchive.setLoadStrategy(options.getLoadStrategy());
-		anArchive.setOptions(options);
-
-	}
-
-	public void initializeNewEARFile(EARFile anArchive, String uri, ArchiveOptions options) {
-		initializeNewModuleFile(anArchive, uri, options);
-	}
-
-	public void initializeNewEJBJarFile(EJBJarFile anArchive, String uri, ArchiveOptions options) {
-		initializeNewModuleFile(anArchive, uri, options);
-	}
-
-	public void initializeNewModuleFile(ModuleFile anArchive, String uri, ArchiveOptions options) {
-		initializeNewArchive(anArchive, uri, options);
-		anArchive.makeDeploymentDescriptorResource();
-	}
-
-	public void initializeNewRARFile(RARFile anArchive, String uri, ArchiveOptions options) {
-		initializeNewModuleFile(anArchive, uri, options);
-	}
-
-	public void initializeNewWARFile(WARFile anArchive, String uri, ArchiveOptions options) {
-		initializeNewModuleFile(anArchive, uri, options);
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public ApplicationClientFile openApplicationClientFile(ArchiveOptions options, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		ArchiveTypeDiscriminator disc = AppClient12ImportStrategyImpl.getDiscriminator();
-		return (ApplicationClientFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public ApplicationClientFile openApplicationClientFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		ArchiveTypeDiscriminator disc = AppClient12ImportStrategyImpl.getDiscriminator();
-		return (ApplicationClientFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public ApplicationClientFile openApplicationClientFile(String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		ArchiveTypeDiscriminator disc = AppClient12ImportStrategyImpl.getDiscriminator();
-		return (ApplicationClientFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public Archive openArchive(ArchiveOptions options, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		return openSpecificArchive(anArchive, RootArchiveTypeDescriminatorImpl.singleton());
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public Archive openArchive(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		return openSpecificArchive(anArchive, RootArchiveTypeDescriminatorImpl.singleton());
-	}
-
-	/**
-	 * openArchive(String uri) - open the archive by the passed name, setting up the appropriate
-	 * strategies. Name may be a path to a jar, a zip, or a directory return the appropriate Archive
-	 * type
-	 */
-	public Archive openArchive(java.lang.String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		return openSpecificArchive(anArchive, RootArchiveTypeDescriminatorImpl.singleton());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public Archive openArchive(String uri, String extraClassPath) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		anArchive.setExtraClasspath(extraClassPath);
-		return openSpecificArchive(anArchive, RootArchiveTypeDescriminatorImpl.singleton());
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EARFile openEARFile(ArchiveOptions options, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		ArchiveTypeDiscriminator disc = Ear12ImportStrategyImpl.getDiscriminator();
-		return (EARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EARFile openEARFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		ArchiveTypeDiscriminator disc = Ear12ImportStrategyImpl.getDiscriminator();
-		return (EARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EARFile openEARFile(String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		ArchiveTypeDiscriminator disc = Ear12ImportStrategyImpl.getDiscriminator();
-		return (EARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EJBJarFile openEJB11JarFile(ArchiveOptions options, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		ArchiveTypeDiscriminator disc = EjbJar11ImportStrategyImpl.getDiscriminator();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJB11JarFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		ArchiveTypeDiscriminator disc = EjbJar11ImportStrategyImpl.getDiscriminator();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJB11JarFile(String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		ArchiveTypeDiscriminator disc = EjbJar11ImportStrategyImpl.getDiscriminator();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public EJBJarFile openEJBJarFile(ArchiveOptions options, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		RootEJBJarDescriminatorImpl disc = (RootEJBJarDescriminatorImpl) RootEJBJarDescriminatorImpl.singleton();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJBJarFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		RootEJBJarDescriminatorImpl disc = (RootEJBJarDescriminatorImpl) RootEJBJarDescriminatorImpl.singleton();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJBJarFile(LoadStrategy aLoadStrategy, String uri, String extraClassPath) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		anArchive.setExtraClasspath(extraClassPath);
-		RootEJBJarDescriminatorImpl disc = (RootEJBJarDescriminatorImpl) RootEJBJarDescriminatorImpl.singleton();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJBJarFile(String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		RootEJBJarDescriminatorImpl disc = (RootEJBJarDescriminatorImpl) RootEJBJarDescriminatorImpl.singleton();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public EJBJarFile openEJBJarFile(String uri, String extraClassPath) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		anArchive.setExtraClasspath(extraClassPath);
-		RootEJBJarDescriminatorImpl disc = (RootEJBJarDescriminatorImpl) RootEJBJarDescriminatorImpl.singleton();
-		return (EJBJarFile) openSpecificArchive(anArchive, disc);
-	}
-
-	public Archive openNestedArchive(LooseArchive loose, Archive parent) throws OpenFailureException {
-		String uri = loose.getUri();
-		try {
-			if(loose.getBinariesPath() == null){
-				throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.open_nested_EXC_, (new Object[] {uri,parent.getURI()})), null); // = "Could not open the nested archive "{0}" in "{1}""
-			}
-			LoadStrategy childStrategy = createLoadStrategy(loose.getBinariesPath());
-			childStrategy.setLooseArchive(loose);
-			ArchiveOptions options = parent.getOptions().cloneWith(childStrategy, loose.getUri());
-			return primOpenArchive(options, uri);
-		} catch (IOException ex) {
-			throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.open_nested_EXC_, (new Object[]{uri, parent.getURI()})), ex); // = "Could not open the nested archive "{0}" in "{1}""
-		}
-	}
-
-	/**
-	 * @see CommonarchiveFactory
-	 */
-	public Archive openNestedArchive(String uri, Archive parent) throws OpenFailureException {
-		try {
-			LoadStrategy childStrategy = createChildLoadStrategy(uri, parent.getLoadStrategy());
-			ArchiveOptions options = parent.getOptions().cloneWith(childStrategy, uri);
-			if (options.shouldDiscriminateNestedArchives())
-				return openArchive(options, uri);
-			return primOpenArchive(options, uri);
-		} catch (IOException ex) {
-			throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.open_nested_EXC_, (new Object[]{uri, parent.getURI()})), ex); // = "Could not open the nested archive "{0}" in "{1}""
-		}
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public RARFile openRARFile(ArchiveOptions options, java.lang.String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		ArchiveTypeDiscriminator disc = RarImportStrategyImpl.getDiscriminator();
-		return (RARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public RARFile openRARFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		ArchiveTypeDiscriminator disc = RarImportStrategyImpl.getDiscriminator();
-		return (RARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public RARFile openRARFile(String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		ArchiveTypeDiscriminator disc = RarImportStrategyImpl.getDiscriminator();
-		return (RARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * openReadOnlyDirectory method comment.
-	 */
-	public ReadOnlyDirectory openReadOnlyDirectory(java.lang.String uri) throws java.io.IOException {
-		java.io.File aFile = new java.io.File(uri);
-		if (!aFile.exists())
-			throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.could_not_find_dir_EXC_, (new Object[]{uri}))); // = "Unable to open directory "
-		if (!aFile.isDirectory())
-			throw new IOException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.not_a_dir_EXC_, (new Object[]{uri}))); // = "Unable to open directory because file is not a directory :"
-		LoadStrategy strategy = new ReadOnlyDirectoryLoadStrategyImpl(uri);
-		ReadOnlyDirectory container = createReadOnlyDirectory();
-		container.setURI(uri);
-		container.setLoadStrategy(strategy);
-		container.setLastModified(aFile.lastModified());
-		return container;
-	}
-
-	/**
-	 * Take the primitive archive and run it through the list of discriminators to convert it to the
-	 * correct specialized type; after after conversion, tell the archive to initalize itself if
-	 * necessary.
-	 */
-	protected Archive openSpecificArchive(Archive anArchive, ArchiveTypeDiscriminator disc) throws OpenFailureException {
-		if (!disc.canImport(anArchive)) {
-			anArchive.close();
-			throw new OpenFailureException(disc.getUnableToOpenMessage());
-		}
-		Archive specificArchive = disc.openArchive(anArchive);
-		specificArchive.initializeAfterOpen();
-		return specificArchive;
-	}
-
-	/**
-	 * Special case for ejb jar files, because of the need to support non-compliant 1.0 jars
-	 */
-	protected Archive openSpecificArchive(Archive anArchive, RootEJBJarDescriminatorImpl disc) throws OpenFailureException {
-		Archive specific = openSpecificArchive(anArchive, (ArchiveTypeDiscriminator) disc);
-		if (specific == anArchive) {
-			//The discriminator failed to convert the archve to an ejb jar file
-			anArchive.close();
-			throw new OpenFailureException(disc.getUnableToOpenMessage());
-		}
-		return specific;
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public WARFile openWARFile(ArchiveOptions options, java.lang.String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(options, uri);
-		ArchiveTypeDiscriminator disc = War22ImportStrategyImpl.getDiscriminator();
-		return (WARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public WARFile openWARFile(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(aLoadStrategy, uri);
-		ArchiveTypeDiscriminator disc = War22ImportStrategyImpl.getDiscriminator();
-		return (WARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public WARFile openWARFile(String uri) throws OpenFailureException {
-		Archive anArchive = primOpenArchive(uri);
-		ArchiveTypeDiscriminator disc = War22ImportStrategyImpl.getDiscriminator();
-		return (WARFile) openSpecificArchive(anArchive, disc);
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public Archive primOpenArchive(ArchiveOptions options, String uri) throws OpenFailureException {
-		if (options.getLoadStrategy() == null) {
-			try {
-				options.setLoadStrategy(createLoadStrategy(uri));
-			} catch (IOException ex) {
-				throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.could_not_open_EXC_, (new Object[]{uri})), ex); // = "Could not open "
-			}
-		}
-		Archive anArchive = createArchive();
-		anArchive.setURI(uri);
-		anArchive.setOriginalURI(uri);
-		anArchive.setLoadStrategy(options.getLoadStrategy());
-		anArchive.setOptions(options);
-		ArchiveTypeDiscriminatorRegistry.getInstance().contributeTypes(anArchive);
-		return anArchive;
-	}
-
-	/**
-	 * open the archive, setting up the appropriate strategies, using the loadStrategy passed in;
-	 * URI still necessary so the archive has a name, but it will not be used for io.
-	 */
-	public Archive primOpenArchive(LoadStrategy aLoadStrategy, String uri) throws OpenFailureException {
-		return primOpenArchive(defaultOptions(aLoadStrategy), uri);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.CommonarchiveFactory
-	 */
-	public Archive primOpenArchive(String uri) throws OpenFailureException {
-		return primOpenArchive(new ArchiveOptions(), uri);
-	}
-
-	protected void setOpenArchives(java.util.Map newOpenArchives) {
-		openArchives = newOpenArchives;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WARFile createWARFileGen() {
-		WARFileImpl warFile = new WARFileImpl();
-		return warFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBJarFile createEJBJarFileGen() {
-		EJBJarFileImpl ejbJarFile = new EJBJarFileImpl();
-		return ejbJarFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ApplicationClientFile createApplicationClientFileGen() {
-		ApplicationClientFileImpl applicationClientFile = new ApplicationClientFileImpl();
-		return applicationClientFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EARFile createEARFileGen() {
-		EARFileImpl earFile = new EARFileImpl();
-		return earFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public RARFile createRARFileGen() {
-		RARFileImpl rarFile = new RARFileImpl();
-		return rarFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public File createFile() {
-		FileImpl file = new FileImpl();
-		return file;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ReadOnlyDirectory createReadOnlyDirectory() {
-		ReadOnlyDirectoryImpl readOnlyDirectory = new ReadOnlyDirectoryImpl();
-		return readOnlyDirectory;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CommonarchivePackage getCommonarchivePackage() {
-		return (CommonarchivePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static CommonarchivePackage getPackage() {
-		return CommonarchivePackage.eINSTANCE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBModuleRef createEJBModuleRefGen() {
-		EJBModuleRefImpl ejbModuleRef = new EJBModuleRefImpl();
-		return ejbModuleRef;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebModuleRef createWebModuleRefGen() {
-		WebModuleRefImpl webModuleRef = new WebModuleRefImpl();
-		return webModuleRef;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ClientModuleRef createClientModuleRefGen() {
-		ClientModuleRefImpl clientModuleRef = new ClientModuleRefImpl();
-		return clientModuleRef;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ConnectorModuleRef createConnectorModuleRefGen() {
-		ConnectorModuleRefImpl connectorModuleRef = new ConnectorModuleRefImpl();
-		return connectorModuleRef;
-	}
-
-	public ClientModuleRef createClientModuleRef(ApplicationClientFile clientFile) {
-		ClientModuleRef ref = createClientModuleRef();
-		ref.setModuleFile(clientFile);
-		return ref;
-	}
-
-	/*
-	 * @see CommonarchiveFactory#createConnectorModuleRef(RARFile)
-	 */
-	public ConnectorModuleRef createConnectorModuleRef(RARFile rarFile) {
-		ConnectorModuleRef ref = createConnectorModuleRef();
-		ref.setModuleFile(rarFile);
-		return ref;
-
-	}
-
-	/*
-	 * @see CommonarchiveFactory#createEJBModuleRef(EJBJarFile)
-	 */
-	public EJBModuleRef createEJBModuleRef(EJBJarFile ejbJarFile) {
-		EJBModuleRef ref = createEJBModuleRef();
-		ref.setModuleFile(ejbJarFile);
-		return ref;
-	}
-
-	/*
-	 * @see CommonarchiveFactory#createWebModuleRef(WARFile)
-	 */
-	public WebModuleRef createWebModuleRef(WARFile warFile) {
-		WebModuleRef ref = createWebModuleRef();
-		ref.setModuleFile(warFile);
-		return ref;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Archive createArchive() {
-		ArchiveImpl archive = new ArchiveImpl();
-		return archive;
-	}
-
-	public ApplicationClientFile createApplicationClientFile() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createApplicationClientFile();
-	}
-
-
-	public ClientModuleRef createClientModuleRef() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createClientModuleRef();
-	}
-
-	public ConnectorModuleRef createConnectorModuleRef() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createConnectorModuleRef();
-	}
-
-	public EARFile createEARFile() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createEARFile();
-	}
-
-	public EJBJarFile createEJBJarFile() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createEJBJarFile();
-	}
-
-	public EJBModuleRef createEJBModuleRef() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createEJBModuleRef();
-	}
-
-	public RARFile createRARFile() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createRARFile();
-	}
-
-	public WARFile createWARFile() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createWARFile();
-	}
-
-	public WebModuleRef createWebModuleRef() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory().createWebModuleRef();
-	}
-
-	/**
-	 * @return
-	 */
-	public CommonarchiveFactory getDelegate() {
-		return delegate;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java
deleted file mode 100644
index 9f1c75c05..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ConnectorModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * @lastgen class CommonarchivePackageImpl extends EPackageImpl implements CommonarchivePackage,
- *          EPackage {}
- */
-public class CommonarchivePackageImpl extends EPackageImpl implements CommonarchivePackage {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass fileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass archiveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbJarFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass warFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass earFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationClientFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass moduleFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass containerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass readOnlyDirectoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rarFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass moduleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbModuleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webModuleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass clientModuleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectorModuleRefEClass = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	private CommonarchivePackageImpl() {
-		super(eNS_URI, CommonarchiveFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static CommonarchivePackage init() {
-		if (isInited) return (CommonarchivePackage)EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI);
-
-		// Obtain or create and register package
-		CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CommonarchivePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CommonarchivePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		Webservice_clientPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		WebapplicationPackage.eINSTANCE.eClass();
-		EjbPackage.eINSTANCE.eClass();
-		JspPackage.eINSTANCE.eClass();
-		ApplicationPackage.eINSTANCE.eClass();
-		ClientPackage.eINSTANCE.eClass();
-		JcaPackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) instanceof LooseconfigPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) : LooseconfigPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theCommonarchivePackage.createPackageContents();
-		theLooseconfigPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theCommonarchivePackage.initializePackageContents();
-		theLooseconfigPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theCommonarchivePackage.freeze();
-
-		return theCommonarchivePackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getContainer() {
-		return containerEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContainer_Files() {
-		return (EReference)containerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWARFile() {
-		return warFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWARFile_DeploymentDescriptor() {
-		return (EReference)warFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getModuleFile() {
-		return moduleFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEARFile() {
-		return earFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEARFile_DeploymentDescriptor() {
-		return (EReference)earFileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEARFile_ModuleRefs() {
-		return (EReference)earFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getModuleRef() {
-		return moduleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getModuleRef_ModuleFile() {
-		return (EReference)moduleRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getModuleRef_EarFile() {
-		return (EReference)moduleRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getModuleRef_Module() {
-		return (EReference)moduleRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBModuleRef() {
-		return ejbModuleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebModuleRef() {
-		return webModuleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getClientModuleRef() {
-		return clientModuleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getConnectorModuleRef() {
-		return connectorModuleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getApplicationClientFile() {
-		return applicationClientFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplicationClientFile_DeploymentDescriptor() {
-		return (EReference)applicationClientFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBJarFile() {
-		return ejbJarFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJarFile_DeploymentDescriptor() {
-		return (EReference)ejbJarFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRARFile() {
-		return rarFileEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRARFile_DeploymentDescriptor() {
-		return (EReference)rarFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getArchive() {
-		return archiveEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getArchive_Types() {
-		return (EAttribute)archiveEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFile() {
-		return fileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_URI() {
-		return (EAttribute)fileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_LastModified() {
-		return (EAttribute)fileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_Size() {
-		return (EAttribute)fileEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFile_DirectoryEntry() {
-		return (EAttribute)fileEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_OriginalURI() {
-		return (EAttribute)fileEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFile_LoadingContainer() {
-		return (EReference)fileEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFile_Container() {
-		return (EReference)fileEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getReadOnlyDirectory() {
-		return readOnlyDirectoryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CommonarchiveFactory getCommonarchiveFactory() {
-		return (CommonarchiveFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		fileEClass = createEClass(FILE);
-		createEAttribute(fileEClass, FILE__URI);
-		createEAttribute(fileEClass, FILE__LAST_MODIFIED);
-		createEAttribute(fileEClass, FILE__SIZE);
-		createEAttribute(fileEClass, FILE__DIRECTORY_ENTRY);
-		createEAttribute(fileEClass, FILE__ORIGINAL_URI);
-		createEReference(fileEClass, FILE__LOADING_CONTAINER);
-		createEReference(fileEClass, FILE__CONTAINER);
-
-		archiveEClass = createEClass(ARCHIVE);
-		createEAttribute(archiveEClass, ARCHIVE__TYPES);
-
-		ejbJarFileEClass = createEClass(EJB_JAR_FILE);
-		createEReference(ejbJarFileEClass, EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR);
-
-		warFileEClass = createEClass(WAR_FILE);
-		createEReference(warFileEClass, WAR_FILE__DEPLOYMENT_DESCRIPTOR);
-
-		earFileEClass = createEClass(EAR_FILE);
-		createEReference(earFileEClass, EAR_FILE__MODULE_REFS);
-		createEReference(earFileEClass, EAR_FILE__DEPLOYMENT_DESCRIPTOR);
-
-		applicationClientFileEClass = createEClass(APPLICATION_CLIENT_FILE);
-		createEReference(applicationClientFileEClass, APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR);
-
-		moduleFileEClass = createEClass(MODULE_FILE);
-
-		containerEClass = createEClass(CONTAINER);
-		createEReference(containerEClass, CONTAINER__FILES);
-
-		readOnlyDirectoryEClass = createEClass(READ_ONLY_DIRECTORY);
-
-		rarFileEClass = createEClass(RAR_FILE);
-		createEReference(rarFileEClass, RAR_FILE__DEPLOYMENT_DESCRIPTOR);
-
-		moduleRefEClass = createEClass(MODULE_REF);
-		createEReference(moduleRefEClass, MODULE_REF__MODULE_FILE);
-		createEReference(moduleRefEClass, MODULE_REF__EAR_FILE);
-		createEReference(moduleRefEClass, MODULE_REF__MODULE);
-
-		ejbModuleRefEClass = createEClass(EJB_MODULE_REF);
-
-		webModuleRefEClass = createEClass(WEB_MODULE_REF);
-
-		clientModuleRefEClass = createEClass(CLIENT_MODULE_REF);
-
-		connectorModuleRefEClass = createEClass(CONNECTOR_MODULE_REF);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		LooseconfigPackage theLooseconfigPackage = (LooseconfigPackage)EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI);
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		EjbPackage theEjbPackage = (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-		WebapplicationPackage theWebapplicationPackage = (WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-		ApplicationPackage theApplicationPackage = (ApplicationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-		ClientPackage theClientPackage = (ClientPackage)EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI);
-		JcaPackage theJcaPackage = (JcaPackage)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theLooseconfigPackage);
-
-		// Add supertypes to classes
-		fileEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		archiveEClass.getESuperTypes().add(this.getContainer());
-		ejbJarFileEClass.getESuperTypes().add(this.getModuleFile());
-		warFileEClass.getESuperTypes().add(this.getModuleFile());
-		earFileEClass.getESuperTypes().add(this.getModuleFile());
-		applicationClientFileEClass.getESuperTypes().add(this.getModuleFile());
-		moduleFileEClass.getESuperTypes().add(this.getArchive());
-		containerEClass.getESuperTypes().add(this.getFile());
-		readOnlyDirectoryEClass.getESuperTypes().add(this.getContainer());
-		rarFileEClass.getESuperTypes().add(this.getModuleFile());
-		moduleRefEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		ejbModuleRefEClass.getESuperTypes().add(this.getModuleRef());
-		webModuleRefEClass.getESuperTypes().add(this.getModuleRef());
-		clientModuleRefEClass.getESuperTypes().add(this.getModuleRef());
-		connectorModuleRefEClass.getESuperTypes().add(this.getModuleRef());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFile_URI(), ecorePackage.getEString(), "URI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFile_LastModified(), ecorePackage.getELong(), "lastModified", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFile_Size(), ecorePackage.getELong(), "size", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFile_DirectoryEntry(), ecorePackage.getEBoolean(), "directoryEntry", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFile_OriginalURI(), ecorePackage.getEString(), "originalURI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFile_LoadingContainer(), this.getContainer(), null, "loadingContainer", null, 1, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFile_Container(), this.getContainer(), this.getContainer_Files(), "container", null, 0, 1, File.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(archiveEClass, Archive.class, "Archive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getArchive_Types(), ecorePackage.getEString(), "types", null, 0, -1, Archive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbJarFileEClass, EJBJarFile.class, "EJBJarFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEJBJarFile_DeploymentDescriptor(), theEjbPackage.getEJBJar(), null, "deploymentDescriptor", null, 1, 1, EJBJarFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(warFileEClass, WARFile.class, "WARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWARFile_DeploymentDescriptor(), theWebapplicationPackage.getWebApp(), null, "deploymentDescriptor", null, 1, 1, WARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(earFileEClass, EARFile.class, "EARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEARFile_ModuleRefs(), this.getModuleRef(), this.getModuleRef_EarFile(), "moduleRefs", null, 1, -1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEARFile_DeploymentDescriptor(), theApplicationPackage.getApplication(), null, "deploymentDescriptor", null, 1, 1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(applicationClientFileEClass, ApplicationClientFile.class, "ApplicationClientFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getApplicationClientFile_DeploymentDescriptor(), theClientPackage.getApplicationClient(), null, "deploymentDescriptor", null, 1, 1, ApplicationClientFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(moduleFileEClass, ModuleFile.class, "ModuleFile", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(containerEClass, Container.class, "Container", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getContainer_Files(), this.getFile(), this.getFile_Container(), "files", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(readOnlyDirectoryEClass, ReadOnlyDirectory.class, "ReadOnlyDirectory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(rarFileEClass, RARFile.class, "RARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRARFile_DeploymentDescriptor(), theJcaPackage.getConnector(), null, "deploymentDescriptor", null, 1, 1, RARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(moduleRefEClass, ModuleRef.class, "ModuleRef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getModuleRef_ModuleFile(), this.getModuleFile(), null, "moduleFile", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getModuleRef_EarFile(), this.getEARFile(), this.getEARFile_ModuleRefs(), "earFile", null, 1, 1, ModuleRef.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getModuleRef_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbModuleRefEClass, EJBModuleRef.class, "EJBModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(webModuleRefEClass, WebModuleRef.class, "WebModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(clientModuleRefEClass, ClientModuleRef.class, "ClientModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(connectorModuleRefEClass, ConnectorModuleRef.class, "ConnectorModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //CommonarchivePackageImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java
deleted file mode 100644
index 11e080644..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ConnectorModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.jca.Connector;
-
-/**
- * @generated
- */
-public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorModuleRef {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ConnectorModuleRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.CONNECTOR_MODULE_REF;
-	}
-
-	public Connector getConnector() throws ArchiveWrappedException {
-		return (Connector) getDeploymentDescriptor();
-	}
-
-	/*
-	 * @see ModuleRef#isConnector()
-	 */
-	public boolean isConnector() {
-		return true;
-	}
-
-} //ConnectorModuleRefImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java
deleted file mode 100644
index ea604989a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * @generated
- */
-public abstract class ContainerImpl extends FileImpl implements Container {
-
-
-	/**
-	 * Inner class which maintains the index for the domain's collection of nodes keyed by name.
-	 */
-	protected class FileNotificationAdapter extends AdapterImpl {
-		public boolean isAdapterForType(Object type) {
-			return (type == "FileNotificationAdapter");//$NON-NLS-1$
-		}
-
-		public void addIndexedFile(String newValue, Notifier notifier) {
-			fileIndex.put(newValue, notifier);
-			if (notifier.eAdapters() == null || !notifier.eAdapters().contains(this))
-				notifier.eAdapters().add(this);
-		}
-
-		public void removeIndexedFile(String oldValue, Notifier notifier) {
-			fileIndex.remove(oldValue);
-			notifier.eAdapters().remove(this);
-		}
-
-		public void notifyChanged(Notification notification) {
-			if (fileIndex == null || notification.getFeature() == null)
-				return;
-			//If the name changed, update the index
-			if (notification.getFeature().equals(CommonarchivePackage.eINSTANCE.getFile_URI()) && ((File) notification.getNotifier()).getContainer() == ContainerImpl.this) {
-				fileIndex.remove(notification.getOldValue());
-				fileIndex.put(notification.getNewValue(), notification.getNotifier());
-			}
-			//Handle adds and removes
-			if (notification.getFeature().equals(CommonarchivePackage.eINSTANCE.getContainer_Files()) && notification.getNotifier() == ContainerImpl.this) {
-				switch (notification.getEventType()) {
-					case Notification.ADD : {
-						File file = (File) notification.getNewValue();
-						addIndexedFile(file.getURI(), file);
-						break;
-					}
-					case Notification.REMOVE : {
-						removeIndexedFile(((File) notification.getOldValue()).getURI(), (File) notification.getOldValue());
-						break;
-					}
-					case Notification.ADD_MANY : {
-						filesAdded((List) notification.getNewValue());
-						break;
-					}
-					case Notification.REMOVE_MANY : {
-						filesRemoved((List) notification.getOldValue());
-						break;
-					}
-					case Notification.MOVE : {
-						break;
-					}
-					case Notification.SET : {
-						if (notification.getPosition() != Notification.NO_INDEX) { //This is now a
-																				   // replace in
-																				   // MOF2
-							File file = (File) notification.getNewValue();
-							removeIndexedFile(((File) notification.getOldValue()).getURI(), (File) notification.getOldValue());
-							addIndexedFile(file.getURI(), file);
-						}
-						break;
-					}
-				}
-			}
-		}
-
-		public void filesAdded(List newFiles) {
-			for (int i = 0; i < newFiles.size(); i++) {
-				File file = (File) newFiles.get(i);
-				addIndexedFile(file.getURI(), file);
-			}
-		}
-
-		public void filesRemoved(List oldFiles) {
-			for (int i = 0; i < oldFiles.size(); i++) {
-				File file = (File) oldFiles.get(i);
-				removeIndexedFile(file.getURI(), file);
-			}
-		}
-
-		public void rebuildFileIndex() {
-			removeAdaptersIfNecessary();
-			fileIndex = new HashMap();
-
-			// If the primary collection already has elements,
-			//'reflect them in the index...
-			if (getFiles().size() > 0) {
-				Iterator i = getFiles().iterator();
-				while (i.hasNext()) {
-					File file = (File) i.next();
-					addIndexedFile(file.getURI(), file);
-				}
-			}
-		}
-
-		public void removeAdaptersIfNecessary() {
-			if (fileIndex == null)
-				return;
-			Iterator iter = fileIndex.values().iterator();
-			while (iter.hasNext()) {
-				File aFile = (File) iter.next();
-				aFile.eAdapters().remove(this);
-			}
-		}
-	}
-
-	/** Implementer for loading entries in this container */
-	protected LoadStrategy loadStrategy;
-	/**
-	 * Index to provide fast lookup by name of files.
-	 */
-	protected Map fileIndex;
-	/**
-	 * An adapter which maintains the file index
-	 */
-	protected FileNotificationAdapter fileIndexAdapter;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList files = null;
-
-	public ContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.CONTAINER;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean containsFile(java.lang.String aUri) {
-		String key = aUri.startsWith("/") ? ArchiveUtil.truncateFromFrontIgnoreCase(aUri, "/") : aUri;//$NON-NLS-2$//$NON-NLS-1$
-		if (isIndexed())
-			return getFileIndex().containsKey(key);
-		return getLoadStrategy().contains(key);
-
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Container
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		return getLoadStrategy().getAbsolutePath();
-	}
-
-	public File getFile(String URI) throws java.io.FileNotFoundException {
-		if (!isIndexed()) {
-			getFiles();
-		}
-		File file = (File) getFileIndex().get(URI);
-		if (file == null) {
-			throw new java.io.FileNotFoundException(URI);
-		}
-		return file;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/05/00 7:20:21 PM)
-	 * 
-	 * @return java.util.Map
-	 */
-	protected java.util.Map getFileIndex() {
-		if (fileIndex == null)
-			getFileIndexAdapter().rebuildFileIndex();
-		return fileIndex;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/05/00 7:20:21 PM)
-	 * 
-	 * @return FileNotificationAdapter
-	 */
-	protected FileNotificationAdapter getFileIndexAdapter() {
-		if (fileIndexAdapter == null) {
-			fileIndexAdapter = new FileNotificationAdapter();
-			eAdapters().add(fileIndexAdapter);
-		}
-		return fileIndexAdapter;
-	}
-
-	/**
-	 * List is built on demand, by requesting from the load strategy.
-	 */
-	public EList getFiles() {
-		EList filesList = this.getFilesGen();
-		if (!isIndexed()) {
-			if (filesList.isEmpty() && getLoadStrategy() != null) {
-				filesList.addAll(getLoadStrategy().collectFiles());
-			}
-			//Causes the index to be built
-			getFileIndex();
-		}
-		return filesList;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive Looks for a file with the given uri, and returns an
-	 *      input stream; optimization: if the file list has not been built, goes directly to the
-	 *      loadStrategy.
-	 */
-	public java.io.InputStream getInputStream(java.lang.String aUri) throws java.io.IOException, java.io.FileNotFoundException {
-		if (isIndexed()) {
-			return getFile(aUri).getInputStream();
-		}
-		return primGetInputStream(aUri);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.LoadStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy getLoadStrategy() {
-		return loadStrategy;
-	}
-
-	public boolean isContainer() {
-		return true;
-	}
-
-	public boolean isIndexed() {
-		return fileIndex != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive Goes directly to the loadStrategy.
-	 */
-	public java.io.InputStream primGetInputStream(java.lang.String aUri) throws java.io.IOException, java.io.FileNotFoundException {
-		return getLoadStrategy().getInputStream(aUri);
-	}
-
-	public void rebuildFileIndex() {
-		getFileIndexAdapter().rebuildFileIndex();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newLoadStrategy
-	 *            com.ibm.etools.archive.LoadStrategy
-	 */
-	public void setLoadStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy newLoadStrategy) {
-
-		if (newLoadStrategy != null) {
-			newLoadStrategy.setContainer(this);
-			if (loadStrategy != null) {
-				newLoadStrategy.setRendererType(loadStrategy.getRendererType());
-				newLoadStrategy.setReadOnly(loadStrategy.isReadOnly());
-				loadStrategy.setContainer(null);
-				loadStrategy.close();
-			}
-		}
-		loadStrategy = newLoadStrategy;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getFilesGen() {
-		if (files == null) {
-			files = new EObjectContainmentWithInverseEList(File.class, this, CommonarchivePackage.CONTAINER__FILES, CommonarchivePackage.FILE__CONTAINER);
-		}
-		return files;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.CONTAINER__FILES:
-				return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.CONTAINER__FILES:
-				return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.CONTAINER__FILES:
-				return getFiles();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.CONTAINER__FILES:
-				getFiles().clear();
-				getFiles().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.CONTAINER__FILES:
-				getFiles().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.CONTAINER__FILES:
-				return files != null && !files.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	public void clearFiles() {
-		boolean oldDelivery = eDeliver();
-		files.clear();
-		eSetDeliver(oldDelivery);
-		if (isIndexed()) {
-			eAdapters().remove(fileIndexAdapter);
-			fileIndexAdapter = null;
-			fileIndex = null;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java
deleted file mode 100644
index 26b7f7ff8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.EmptyResourceException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ObjectNotFoundException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-/**
- * @generated
- */
-public class EARFileImpl extends ModuleFileImpl implements EARFile {
-
-	/**
-	 * Internal; clients should use {@link #getModuleRef(Module)}
-	 */
-	public ModuleFile getModuleFile(Module moduleDescriptor) {
-		ModuleRef ref = getModuleRef(moduleDescriptor);
-		return (ref == null) ? null : ref.getModuleFile();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public ModuleFile addCopy(ModuleFile aModuleFile) throws DuplicateObjectException {
-		Object result = primAddCopyRef(aModuleFile);
-		if (result instanceof ModuleRef)
-			return ((ModuleRef) result).getModuleFile();
-
-		return (ModuleFile) result;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Application deploymentDescriptor = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList moduleRefs = null;
-
-	public EARFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.EAR_FILE;
-	}
-
-	public Archive addCopy(Archive anArchive) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException {
-		if (anArchive.isModuleFile())
-			return addCopy((ModuleFile) anArchive);
-		Archive copy = super.addCopy(anArchive);
-		copy.initializeClassLoader();
-		return copy;
-	}
-
-	protected Object primAddCopyRef(ModuleFile aModuleFile) throws DuplicateObjectException {
-		//force this list to get initialized before the add
-		EList refs = getModuleRefs();
-
-		if (aModuleFile.isEARFile())
-			//If it's an ear then just treat it like any other archive
-			return (ModuleFile) super.addCopy(aModuleFile);
-		checkAddValid(aModuleFile);
-		ModuleFile copy = getCommonArchiveFactory().copy(aModuleFile);
-		Module newModule = createModuleForCopying(aModuleFile);
-		getFiles().add(copy);
-		copy.initializeClassLoader();
-		if (!copy.getURI().equals(newModule.getUri()))
-			copy.setURI(newModule.getUri());
-
-		getDeploymentDescriptor().getModules().add(newModule);
-		ModuleRef aRef = createModuleRef(newModule, copy);
-		refs.add(aRef);
-		return aRef;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public ModuleRef addCopyRef(ModuleFile aModuleFile) throws DuplicateObjectException {
-		Object result = primAddCopyRef(aModuleFile);
-		if (result instanceof ModuleRef)
-			return (ModuleRef) result;
-
-		return null;
-	}
-
-
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public SecurityRole addCopy(SecurityRole aRole, Module aModule) throws DuplicateObjectException {
-		EObject dd = null;
-		try {
-			dd = getDeploymentDescriptor(aModule);
-		} catch (Exception e) {
-			throw new DeploymentDescriptorLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dd_in_ear_load_EXC_, (new Object[]{aModule.getUri(), getURI()})), e); // = "Exception occurred loading deployment descriptor for module "{0}" in ear file "{1}""
-		}
-		String roleName = aRole.getRoleName();
-		SecurityRole copy = (SecurityRole) EtoolsCopyUtility.createCopy(aRole);
-		if (aModule.isEjbModule()) {
-			EJBJar ejbJar = (EJBJar) dd;
-			if (ejbJar.containsSecurityRole(roleName))
-				throw new DuplicateObjectException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dup_sec_role_module_EXC_, (new Object[]{aModule.getUri(), roleName})), ejbJar.getAssemblyDescriptor().getSecurityRoleNamed(roleName)); // = "Deployment descriptor for {0} already contains a security role named {1}"
-			getAssemblyDescriptorAddIfNecessary(ejbJar).getSecurityRoles().add(copy);
-		} else if (aModule.isWebModule()) {
-			WebApp webApp = (WebApp) dd;
-			if (webApp.containsSecurityRole(roleName))
-				throw new DuplicateObjectException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dup_sec_role_module_EXC_, (new Object[]{aModule.getUri(), roleName})), webApp.getSecurityRoleNamed(roleName));// = "Deployment descriptor for {0} already contains a security role named {1}"
-			webApp.getSecurityRoles().add(copy);
-		}
-		addCopyIfNotExists(aRole);
-		return copy;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public SecurityRole addCopyIfNotExists(SecurityRole aRole) {
-		Application dd = getDeploymentDescriptor();
-		SecurityRole copy = null;
-		if (!dd.containsSecurityRole(aRole.getRoleName())) {
-			copy = (SecurityRole) EtoolsCopyUtility.createCopy(aRole);
-			dd.getSecurityRoles().add(copy);
-		}
-		return copy;
-	}
-
-	protected void checkDuplicate(String aUri) throws DuplicateObjectException {
-		if (isDuplicate(aUri))
-			throw new DuplicateObjectException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dup_resource_EXC_, (new Object[]{aUri, getURI()}))); // = "Resource named "{0}" already exists in archive "{1}""
-	}
-
-
-	protected Module createModuleForCopying(ModuleFile aModuleFile) {
-		Module aModule = null;
-		if (aModuleFile.isWARFile()) {
-			aModule = getApplicationFactory().createWebModule();
-		} else if (aModuleFile.isEJBJarFile()) {
-			aModule = getApplicationFactory().createEjbModule();
-		} else if (aModuleFile.isApplicationClientFile()) {
-			aModule = getApplicationFactory().createJavaClientModule();
-		} else if (aModuleFile.isRARFile()) {
-			aModule = getApplicationFactory().createConnectorModule();
-		}
-		aModule.setUri(aModuleFile.getURI());
-		return aModule;
-	}
-
-	/**
-	 * Retrieves the deployment descriptor root element for the specified module. Takes into account
-	 * altDD indirection.
-	 * 
-	 * @return Only return null if an altDD is not defined.
-	 */
-	public EObject getAltDeploymentDescriptor(Module aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException {
-		// Look for altDD
-		String altDD = aModule.getAltDD();
-		if (ArchiveUtil.isNullOrEmpty(altDD))
-			return null;
-		if (!isMofResourceLoaded(altDD.trim()))
-			registerResourceFactory(aModule, altDD);
-		XMLResource ddRes = (XMLResource) getMofResource(altDD.trim());
-		if (!ddRes.isAlt()) {
-			ddRes.setIsAlt(true);
-			ddRes.setApplication(getDeploymentDescriptor());
-		}
-		return ArchiveUtil.getRoot(ddRes);
-
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public java.util.List getApplicationClientFiles() {
-		List clientFiles = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isApplicationClientFile()) {
-				clientFiles.add(aFile);
-			}
-		}
-		return clientFiles;
-	}
-
-	protected ApplicationFactory getApplicationFactory() {
-		return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory();
-	}
-
-	protected AssemblyDescriptor getAssemblyDescriptorAddIfNecessary(EJBJar ejbJar) {
-		AssemblyDescriptor ad = ejbJar.getAssemblyDescriptor();
-		if (ad == null) {
-			ad = ((EjbPackage) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createAssemblyDescriptor();
-			ejbJar.setAssemblyDescriptor(ad);
-		}
-		return ad;
-	}
-
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-	public Application getDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		Application dd = this.getDeploymentDescriptorGen();
-		if (dd == null && canLazyInitialize()) {
-			try {
-				getImportStrategy().importMetaData();
-			} catch (Exception e) {
-				throw new DeploymentDescriptorLoadException(getDeploymentDescriptorUri(), e);
-			}
-		}
-		return this.getDeploymentDescriptorGen();
-	}
-
-	/**
-	 * Retrieves the deployment descriptor root element for the specified module. Takes into account
-	 * altDD indirection.
-	 */
-	public Connector getDeploymentDescriptor(ConnectorModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException {
-		return (Connector) getDeploymentDescriptor((Module) aModule);
-	}
-
-	/**
-	 * Retrieves the deployment descriptor root element for the specified module. Takes into account
-	 * altDD indirection.
-	 */
-	public EJBJar getDeploymentDescriptor(EjbModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException {
-		return (EJBJar) getDeploymentDescriptor((Module) aModule);
-	}
-
-	/**
-	 * Retrieves the deployment descriptor root element for the specified module. Takes into account
-	 * altDD indirection.
-	 */
-	public ApplicationClient getDeploymentDescriptor(JavaClientModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException {
-		return (ApplicationClient) getDeploymentDescriptor((Module) aModule);
-	}
-
-	/**
-	 * Retrieves the deployment descriptor root element for the specified module. Takes into account
-	 * altDD indirection.
-	 */
-	public EObject getDeploymentDescriptor(Module aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException {
-		EObject dd = getAltDeploymentDescriptor(aModule);
-		if (dd == null)
-			dd = getModuleFile(aModule).getStandardDeploymentDescriptor();
-		return dd;
-	}
-
-	/**
-	 * Retrieves the deployment descriptor root element for the specified module. Takes into account
-	 * altDD indirection.
-	 */
-	public WebApp getDeploymentDescriptor(WebModule aModule) throws FileNotFoundException, ResourceLoadException, EmptyResourceException {
-		return (WebApp) getDeploymentDescriptor((Module) aModule);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.ModuleFile
-	 */
-	public java.lang.String getDeploymentDescriptorUri() {
-		return J2EEConstants.APPLICATION_DD_URI;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public java.util.List getEJBJarFiles() {
-		List ejbJarFiles = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isEJBJarFile()) {
-				ejbJarFiles.add(aFile);
-			}
-		}
-		return ejbJarFiles;
-	}
-
-	/**
-	 * Return an enterprise bean referenced by the EjbRef, if one exists. The ejb-link value of the
-	 * ref must equate to a named enterprise bean contained in the jar; otherwise return null.
-	 * Returns the first hit found; assumption that the ejb names are unique within the scope of the
-	 * ear file. This will likely be replaced with a better way for dereferencing ejb refs.
-	 * 
-	 * Can be used with ejb 1.1 references only.
-	 * 
-	 * @deprecated {@link#getEnterpiseBeanFromRef(EjbRef ref, String moduleUri )
-	 * @param EjbRef
-	 *            ref - An ejb reference
-	 * @return EnterpriseBean
-	 */
-	public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref) {
-		String link = ref.getLink();
-		if (link == null) {
-			return null;
-		}
-		List jarFiles = getEJBJarFiles();
-		for (int i = 0; i < jarFiles.size(); i++) {
-			EnterpriseBean bean = ((EJBJarFile) jarFiles.get(i)).getDeploymentDescriptor().getEnterpriseBeanNamed(link);
-			if (bean != null) {
-				return bean;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return an enterprise bean referenced by the EjbRef, if one exists. The ejb-link value of the
-	 * ref must equate to a named enterprise bean contained in the jar; otherwise return null.
-	 * Returns the first hit found; assumption that the ejb names are unique within the scope of the
-	 * ear file. This will likely be replaced with a better way for dereferencing ejb refs
-	 * 
-	 * Can be used with ejb 1.1 & ejb 2.0 references.
-	 * 
-	 * @param EjbRef
-	 *            ref - An ejb reference
-	 * @param String
-	 *            moduleUri - The module uri
-	 * @return EnterpriseBean
-	 */
-	public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref, String moduleUri) {
-		String link = ref.getLink();
-		if (link == null) {
-			return null;
-		}// if
-
-		if (link.indexOf('#') == -1) {
-			EnterpriseBean linkedEJB = null;
-			XMLResource res = (XMLResource) ref.eResource();
-			if (res instanceof EJBResource) {
-				//Must be in an EJB JAR to be here
-				EJBJar jar = ((EJBResource) res).getEJBJar();
-				if (jar != null)
-					linkedEJB = jar.getEnterpiseBeanFromRef(ref);
-			}
-			if (linkedEJB == null) {
-				List jarFiles = getEJBJarFiles();
-				for (int i = 0; i < jarFiles.size(); i++) {
-					linkedEJB = ((EJBJarFile) jarFiles.get(i)).getDeploymentDescriptor().getEnterpriseBeanNamed(link);
-					if (linkedEJB != null) {
-						return linkedEJB;
-					}// if
-				}// for
-			} else
-				return linkedEJB;
-		} else {
-			//Grab the ejb name and ejb jar name from the link
-			String ejbBeanName = link.substring(link.indexOf("#") + 1, link.length()); //$NON-NLS-1$
-			String ejbJarName = link.substring(0, link.indexOf("#")); //$NON-NLS-1$
-
-			if (ejbBeanName != null && ejbJarName != null) {
-				//Get the uri of the jar name.
-				String ejbJarUri = ArchiveUtil.deriveEARRelativeURI(ejbJarName, moduleUri);
-				if (ejbJarUri != null) {
-					try {
-						//Get the actual jar file
-						File aFile = getFile(ejbJarUri);
-						if (aFile == null || !aFile.isEJBJarFile())
-							return null;
-
-						EJBJarFile jarFile = (EJBJarFile) getFile(ejbJarUri);
-						List ejbs = jarFile.getDeploymentDescriptor().getEnterpriseBeans();
-						//Check if any of the beans in the list match the given ejb bean name give
-						// in
-						//the link
-						if (ejbs != null && !ejbs.isEmpty()) {
-							Iterator it = ejbs.iterator();
-							while (it.hasNext()) {
-								EnterpriseBean ejbBean = (EnterpriseBean) it.next();
-								if (ejbBean != null && ejbBean.getName().equals(ejbBeanName)) {
-									return ejbBean;
-								}// if
-							}// while
-						}// if
-					} catch (FileNotFoundException fe) {
-						return null;
-					}// try
-				}// if
-			}// if
-		}// if
-		return null;
-	}// getEnterpiseBeanFromRef
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public Module getModule(String aUri, String altDD) {
-		return getDeploymentDescriptor().getModule(aUri, altDD);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public ModuleRef getModuleRef(Module moduleDescriptor) {
-		List refs = getModuleRefs();
-		for (int i = 0; i < refs.size(); i++) {
-			ModuleRef ref = (ModuleRef) refs.get(i);
-			if (ref.getModule() == moduleDescriptor)
-				return ref;
-		}
-		return null;
-	}
-
-	/**
-	 * Return a filtered list of the archives
-	 */
-	public List getModuleFiles() {
-		List moduleFiles = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isModuleFile()) {
-				moduleFiles.add(aFile);
-			}
-		}
-		return moduleFiles;
-	}
-
-	protected ArchiveOptions getOptionsForOpening(String aUri) throws IOException {
-
-		LoadStrategy strategy = getCommonArchiveFactory().createChildLoadStrategy(aUri, getLoadStrategy());
-		return getOptions().cloneWith(strategy, aUri);
-	}
-
-	protected ArchiveOptions getOptionsForOpening(LooseArchive loose) throws IOException, OpenFailureException{
-		if(loose.getBinariesPath() == null){
-			throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.open_nested_EXC_, (new Object[] {loose.getUri(), getURI()})), null); // = "Could not open the nested archive "{0}" in "{1}""
-		}
-		LoadStrategy strategy = getCommonArchiveFactory().createLoadStrategy(loose.getBinariesPath());
-		strategy.setLooseArchive(loose);
-		return getOptions().cloneWith(strategy, loose.getUri());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public java.util.List getRARFiles() {
-		List rarFiles = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isRARFile()) {
-				rarFiles.add(aFile);
-			}
-		}
-		return rarFiles;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public EList getRolesFromAllModules() {
-		EList roleList = new org.eclipse.emf.common.util.BasicEList();
-		List modules = getDeploymentDescriptor().getModules();
-		for (int i = 0, n = modules.size(); i < n; i++) {
-			Module aModule = (Module) modules.get(i);
-			EList roles = getRolesFromModule(aModule);
-			for (int j = 0, m = roles.size(); j < m; j++) {
-				roleList.add(roles.get(j));
-			}
-		}
-		return roleList;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public EList getRolesFromModule(Module aModule) {
-		EList roleList = new org.eclipse.emf.common.util.BasicEList();
-		try {
-			if (aModule.isWebModule())
-				roleList = getDeploymentDescriptor((WebModule) aModule).getSecurityRoles();
-			else if (aModule.isEjbModule())
-				roleList = getAssemblyDescriptorAddIfNecessary(getDeploymentDescriptor((EjbModule) aModule)).getSecurityRoles();
-		} catch (Exception e) {
-			throw new DeploymentDescriptorLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dd_in_ear_load_EXC_, (new Object[]{aModule.getUri(), getURI()})), e); // = "Exception occurred loading deployment descriptor for module "{0}" in ear file "{1}""
-		}
-		return roleList;
-	}
-
-	/**
-	 * Return the DeployementDescriptor.
-	 */
-	public EObject getStandardDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		return getDeploymentDescriptor();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public java.util.List getWARFiles() {
-		List warFiles = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isWARFile()) {
-				warFiles.add(aFile);
-			}
-		}
-		return warFiles;
-	}
-
-	public void initializeAfterOpen() {
-		super.initializeAfterOpen();
-	}
-
-	public boolean isDeploymentDescriptorSet() {
-		return deploymentDescriptor != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isEARFile() {
-		return true;
-	}
-
-	/**
-	 * Return true if super returns true, or return whether the app dd contains a module having the
-	 * uri
-	 */
-	public boolean isNestedArchive(String aUri) {
-		if (super.isNestedArchive(aUri))
-			return true;
-		return getDeploymentDescriptor().getFirstModule(aUri) != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.impl.ModuleFileImpl
-	 */
-	public org.eclipse.emf.ecore.EObject makeDeploymentDescriptor(XMLResource resource) {
-		Application appl = ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createApplication();
-		resource.setID(appl, J2EEConstants.APPL_ID);
-		setDeploymentDescriptorGen(appl);
-		resource.getContents().add(appl);
-		return appl;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public Archive openNestedArchive(LooseArchive loose) throws OpenFailureException {
-
-		Module m = getDeploymentDescriptor().getFirstModule(loose.getUri());
-		if (m == null)
-			return super.openNestedArchive(loose);
-
-		try {
-			ArchiveOptions archiveOptions = getOptionsForOpening(loose);
-			return openNestedArchive(m, archiveOptions);
-		} catch (java.io.IOException ex) {
-			//Probably the file did not exist; silently fail, per request from WS runtime
-			//More than likely a failure is going to occur down the road when a ModuleFile for a
-			// Module
-			//in the dd is requested
-		}
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public Archive openNestedArchive(String aUri) throws OpenFailureException {
-
-		Module m = getDeploymentDescriptor().getFirstModule(aUri);
-		if (m == null)
-			return super.openNestedArchive(aUri);
-
-		try {
-			ArchiveOptions archiveOptions = getOptionsForOpening(aUri);
-			return openNestedArchive(m, archiveOptions);
-		} catch (java.io.IOException ex) {
-			//Probably the file did not exist; silently fail, per request from WS runtime
-			//More than likely a failure is going to occur down the road when a ModuleFile for a
-			// Module
-			//in the dd is requested
-		}
-		return null;
-	}
-
-	protected Archive openNestedArchive(Module m, ArchiveOptions archiveOptions) throws OpenFailureException {
-		String aUri = m.getUri();
-
-		try {
-			/*
-			 * Since we have a clue about the type of archive to open Use the appropriate open
-			 * method, so if a failure occurrs, we can get a more specific message
-			 */
-			if (m.isWebModule())
-				return getCommonArchiveFactory().openWARFile(archiveOptions, aUri);
-			else if (m.isEjbModule())
-				return getCommonArchiveFactory().openEJBJarFile(archiveOptions, aUri);
-			else if (m.isJavaModule())
-				return getCommonArchiveFactory().openApplicationClientFile(archiveOptions, aUri);
-			else if (m.isConnectorModule())
-				return getCommonArchiveFactory().openRARFile(archiveOptions, aUri);
-
-		} catch (OpenFailureException ex) {
-			throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.nested_open_fail_EXC_, (new Object[]{aUri, getURI()})), ex); // = "Unable to open module file "{0}" in EAR file "{1}""
-		}
-		//Should never reach the code below
-		return null;
-	}
-
-	/**
-	 * @see EARFile
-	 */
-	public void pushDownRole(SecurityRole role) {
-		if (role == null)
-			throw new IllegalArgumentException(CommonArchiveResourceHandler.Parameter_should_not_be_nu_EXC_); // = "Parameter should not be null"
-
-		List modules = getDeploymentDescriptor().getModules();
-		for (int i = 0; i < modules.size(); i++) {
-			Module m = (Module) modules.get(i);
-			pushDownRole(role, m);
-		}
-	}
-
-	/**
-	 * @see EARFile
-	 */
-	public void pushDownRole(SecurityRole role, Module aModule) {
-		try {
-			if (aModule.isWebModule()) {
-				WebApp dd = getDeploymentDescriptor((WebModule) aModule);
-				if (dd.getSecurityRoleNamed(role.getRoleName()) == null)
-					dd.getSecurityRoles().add(EtoolsCopyUtility.createCopy(role));
-			} else if (aModule.isEjbModule()) {
-				AssemblyDescriptor assembly = getAssemblyDescriptorAddIfNecessary(getDeploymentDescriptor((EjbModule) aModule));
-				if (assembly.getSecurityRoleNamed(role.getRoleName()) == null)
-					assembly.getSecurityRoles().add(EtoolsCopyUtility.createCopy(role));
-			}
-		} catch (Exception e) {
-			throw new DeploymentDescriptorLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dd_in_ear_load_EXC_, (new Object[]{aModule.getUri(), getURI()})), e); // = "Exception occurred loading deployment descriptor for module "{0}" in ear file "{1}""
-		}
-	}
-
-	/**
-	 * An alt-dd is about to be loaded; register the appropriate resource factory for the uri so it
-	 * will get loaded correctly.
-	 */
-	protected void registerResourceFactory(Module aModule, String aUri) {
-		org.eclipse.emf.ecore.resource.Resource.Factory factory = null;
-		if (aModule.isEjbModule())
-			factory = EJBJarResourceFactory.getRegisteredFactory();
-		else if (aModule.isWebModule())
-			factory = WebAppResourceFactory.getRegisteredFactory();
-		else if (aModule.isJavaModule())
-			factory = ApplicationClientResourceFactory.getRegisteredFactory();
-		else if (aModule.isConnectorModule())
-			factory = ConnectorResourceFactory.getRegisteredFactory();
-
-		if (factory != null) {
-			ResourceSet set = getResourceSet();
-			((FileNameResourceFactoryRegistry) set.getResourceFactoryRegistry()).registerLastFileSegment(aUri, factory);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public void remove(ModuleRef aModuleRef) {
-		if (aModuleRef == null)
-			return;
-		Module aModule = aModuleRef.getModule();
-
-		if (aModule != null)
-			getDeploymentDescriptor().getModules().remove(aModule);
-
-		getModuleRefs().remove(aModuleRef);
-		if (getModuleRefs(aModuleRef.getModuleFile()).isEmpty())
-			getFiles().remove(aModuleRef.getModuleFile());
-	}
-
-	/**
-	 * @see EARFile
-	 */
-	public List getModuleRefs(ModuleFile aModuleFile) {
-		List refs = getModuleRefs();
-		List result = new ArrayList(1);
-		for (int i = 0; i < refs.size(); i++) {
-			ModuleRef ref = (ModuleRef) refs.get(i);
-			if (ref.getModuleFile() == aModuleFile)
-				result.add(ref);
-		}
-		return result;
-	}
-
-	protected void renameRolesInModuleDDs(String existingRoleName, String newRoleName) {
-		List modules = getDeploymentDescriptor().getModules();
-		for (int i = 0; i < modules.size(); i++) {
-			Module m = (Module) modules.get(i);
-			try {
-				if (m.isEjbModule())
-					getDeploymentDescriptor((EjbModule) m).renameSecurityRole(existingRoleName, newRoleName);
-				else if (m.isWebModule())
-					getDeploymentDescriptor((WebModule) m).renameSecurityRole(existingRoleName, newRoleName);
-			} catch (Exception e) {
-				throw new DeploymentDescriptorLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dd_in_ear_load_EXC_, (new Object[]{m.getUri(), getURI()})), e); // = "Exception occurred loading deployment descriptor for module "{0}" in ear file "{1}""
-			}
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public void renameSecurityRole(String existingRoleName, String newRoleName) throws ObjectNotFoundException, DuplicateObjectException {
-		Application app = getDeploymentDescriptor();
-		SecurityRole aRole = app.getSecurityRoleNamed(existingRoleName);
-		if (aRole == null)
-			throw new ObjectNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.no_sec_role_EXC_, (new Object[]{getURI(), existingRoleName}))); // = ": EAR File deployment descriptor does not contain a security role named "
-		if (app.getSecurityRoleNamed(newRoleName) != null)
-			throw new DuplicateObjectException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dup_sec_role_EXC_, (new Object[]{getURI(), newRoleName})), app.getSecurityRoleNamed(newRoleName)); // = ": EAR File deployment descriptor already contains a security role named "
-
-		aRole.setRoleName(newRoleName);
-
-		renameRolesInModuleDDs(existingRoleName, newRoleName);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public void rollUpRoles() {
-		List modules = getDeploymentDescriptor().getModules();
-		for (int i = 0; i < modules.size(); i++) {
-			Module aModule = (Module) modules.get(i);
-			rollUpRoles(aModule);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EARFile
-	 */
-	public void rollUpRoles(Module aModule) {
-		List securityRoles = null;
-		try {
-			if (aModule.isWebModule())
-				securityRoles = getDeploymentDescriptor((WebModule) aModule).getSecurityRoles();
-			else if (aModule.isEjbModule())
-				securityRoles = getAssemblyDescriptorAddIfNecessary(getDeploymentDescriptor((EjbModule) aModule)).getSecurityRoles();
-		} catch (Exception e) {
-			throw new DeploymentDescriptorLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.dd_in_ear_load_EXC_, (new Object[]{aModule.getUri(), getURI()})), e); // = "Exception occurred loading deployment descriptor for module "{0}" in ear file "{1}""
-		}
-
-		if (securityRoles == null)
-			return;
-		for (int i = 0; i < securityRoles.size(); i++) {
-			addCopyIfNotExists((SecurityRole) securityRoles.get(i));
-		}
-	}
-
-	public void setDeploymentDescriptor(Application l) {
-		this.setDeploymentDescriptorGen(l);
-		replaceRoot(getMofResourceMakeIfNecessary(getDeploymentDescriptorUri()), l);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public Application getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			InternalEObject oldDeploymentDescriptor = (InternalEObject)deploymentDescriptor;
-			deploymentDescriptor = (Application)eResolveProxy(oldDeploymentDescriptor);
-			if (deploymentDescriptor != oldDeploymentDescriptor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-			}
-		}
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Application basicGetDeploymentDescriptor() {
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDeploymentDescriptorGen(Application newDeploymentDescriptor) {
-		Application oldDeploymentDescriptor = deploymentDescriptor;
-		deploymentDescriptor = newDeploymentDescriptor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS:
-				return ((InternalEList)getModuleRefs()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS:
-				return ((InternalEList)getModuleRefs()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS:
-				return getModuleRefs();
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				if (resolve) return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS:
-				getModuleRefs().clear();
-				getModuleRefs().addAll((Collection)newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((Application)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS:
-				getModuleRefs().clear();
-				return;
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((Application)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS:
-				return moduleRefs != null && !moduleRefs.isEmpty();
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				return deploymentDescriptor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getModuleRefsGen() {
-		if (moduleRefs == null) {
-			moduleRefs = new EObjectContainmentWithInverseEList(ModuleRef.class, this, CommonarchivePackage.EAR_FILE__MODULE_REFS, CommonarchivePackage.MODULE_REF__EAR_FILE);
-		}
-		return moduleRefs;
-	}
-
-	public EList getModuleRefs() {
-		EList refs = getModuleRefsGen();
-
-		if (refs.isEmpty())
-			initRefs(refs);
-
-		return refs;
-	}
-
-	public void initRefs(EList refs) {
-		List modules = getDeploymentDescriptor().getModules();
-		for (int i = 0; i < modules.size(); i++) {
-			Module module = (Module) modules.get(i);
-			refs.add(createModuleRef(module, null));
-		}
-	}
-
-	protected ModuleRef createModuleRef(Module aModule, ModuleFile aFile) {
-		ModuleRef newRef = null;
-
-		if (aModule.isEjbModule())
-			newRef = getCommonArchiveFactory().createEJBModuleRef();
-		else if (aModule.isWebModule())
-			newRef = getCommonArchiveFactory().createWebModuleRef();
-		else if (aModule.isConnectorModule())
-			newRef = getCommonArchiveFactory().createConnectorModuleRef();
-		else if (aModule.isJavaModule())
-			newRef = getCommonArchiveFactory().createClientModuleRef();
-
-		newRef.setModule(aModule);
-		newRef.setModuleFile(aFile);
-
-		return newRef;
-	}
-
-	/*
-	 * @see EARFile#getClientModuleRefs()
-	 */
-	public List getClientModuleRefs() {
-		List result = new ArrayList();
-		List refs = getModuleRefs();
-		for (int i = 0; i < refs.size(); i++) {
-			ModuleRef ref = (ModuleRef) refs.get(i);
-			if (ref.isClient())
-				result.add(ref);
-		}
-		return result;
-	}
-
-	/*
-	 * @see EARFile#getConnectorModuleRefs()
-	 */
-	public List getConnectorModuleRefs() {
-		List result = new ArrayList();
-		List refs = getModuleRefs();
-		for (int i = 0; i < refs.size(); i++) {
-			ModuleRef ref = (ModuleRef) refs.get(i);
-			if (ref.isConnector())
-				result.add(ref);
-		}
-		return result;
-	}
-
-	/*
-	 * @see EARFile#getEJBModuleRefs()
-	 */
-	public List getEJBModuleRefs() {
-		List result = new ArrayList();
-		List refs = getModuleRefs();
-		for (int i = 0; i < refs.size(); i++) {
-			ModuleRef ref = (ModuleRef) refs.get(i);
-			if (ref.isEJB())
-				result.add(ref);
-		}
-		return result;
-	}
-
-	/*
-	 * @see EARFile#getWebModuleRefs()
-	 */
-	public List getWebModuleRefs() {
-		List result = new ArrayList();
-		List refs = getModuleRefs();
-		for (int i = 0; i < refs.size(); i++) {
-			ModuleRef ref = (ModuleRef) refs.get(i);
-			if (ref.isWeb())
-				result.add(ref);
-		}
-		return result;
-	}
-
-	/*
-	 * @see EARFile#getFARFiles()
-	 */
-	public List getFARFiles() {
-		List farFiles = new ArrayList();
-		List fileList = getFiles();
-		for (int i = 0; i < fileList.size(); i++) {
-			File aFile = (File) fileList.get(i);
-			if (aFile.isFARFile()) {
-				farFiles.add(aFile);
-			}
-		}
-		return farFiles;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.commonarchive.EARFile#getArchivesOfType(java.lang.String)
-	 */
-	public List getArchivesOfType(String type) {
-		return Collections.EMPTY_LIST;
-	}
-
-	public Map getEJBReferences(boolean filterLinkedReferences, boolean filterNonLinkedReferences) throws ArchiveWrappedException {
-		if (!filterLinkedReferences || !filterNonLinkedReferences) {
-			Application app = getDeploymentDescriptor();
-			if (app != null) {
-				List modules = app.getModules();
-				Module module;
-				Map references = null;
-				for (int i = 0; i < modules.size(); i++) {
-					module = (Module) modules.get(i);
-					try {
-						references = collectEJBReferences(module, filterLinkedReferences, filterNonLinkedReferences, references);
-					} catch (ResourceLoadException e) {
-						throw new ArchiveWrappedException(e);
-					} catch (FileNotFoundException e) {
-						throw new ArchiveWrappedException(e);
-					} catch (EmptyResourceException e) {
-						throw new ArchiveWrappedException(e);
-					}
-				}
-				return references;
-			}
-		}
-		return Collections.EMPTY_MAP;
-	}
-
-	/**
-	 * @param module
-	 * @param filterLinkedReferences
-	 * @param filterNonLinkedReferences
-	 * @param references
-	 * @return
-	 */
-	private Map collectEJBReferences(Module module, boolean filterLinkedReferences, boolean filterNonLinkedReferences, Map references) throws ResourceLoadException, FileNotFoundException, EmptyResourceException {
-		Map myReferences = references;
-		List moduleReferences = getEJBReferneces(module);
-		if (moduleReferences != null && !moduleReferences.isEmpty()) {
-			EjbRef ref = null;
-			List filteredRefs = null;
-			String link = null;
-			for (int i = 0; i < moduleReferences.size(); i++) {
-				ref = (EjbRef) moduleReferences.get(i);
-				link = ref.getLink();
-				if ((link != null && link.length() > 0 && !filterLinkedReferences) || ((link == null || link.length() == 0) && !filterNonLinkedReferences)) {
-					if (filteredRefs == null)
-						filteredRefs = new ArrayList(moduleReferences.size());
-					filteredRefs.add(ref);
-				}
-			}
-			if (filteredRefs != null) {
-				if (myReferences == null)
-					myReferences = new HashMap();
-				myReferences.put(module, filteredRefs);
-			}
-		}
-		return myReferences;
-	}
-
-	/**
-	 * @param module
-	 * @return
-	 */
-	private List getEJBReferneces(Module module) throws ResourceLoadException, FileNotFoundException, EmptyResourceException {
-		if (module != null) {
-			if (module.isEjbModule()) {
-				EJBJar ejbJar = getDeploymentDescriptor((EjbModule) module);
-				return getEJBReferences(ejbJar);
-			} else if (module.isWebModule()) {
-				WebApp webApp = getDeploymentDescriptor((WebModule) module);
-				if (webApp != null)
-					return webApp.getEjbRefs();
-			} else if (module.isJavaModule()) {
-				ApplicationClient appClient = getDeploymentDescriptor((JavaClientModule) module);
-				if (appClient != null)
-					return appClient.getEjbReferences();
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @param ejbJar
-	 * @return
-	 */
-	private List getEJBReferences(EJBJar ejbJar) {
-		if (ejbJar != null) {
-			List ejbs = ejbJar.getEnterpriseBeans();
-			List refs = null;
-			EnterpriseBean ejb = null;
-			for (int i = 0; i < ejbs.size(); i++) {
-				ejb = (EnterpriseBean) ejbs.get(i);
-				if (refs == null)
-					refs = new ArrayList();
-				refs.addAll(ejb.getEjbRefs());
-			}
-			if (refs != null)
-				return refs;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java
deleted file mode 100644
index 71617ba5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-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.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @generated
- */
-public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EJBJar deploymentDescriptor = null;
-
-	public EJBJarFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.EJB_JAR_FILE;
-	}
-
-	/**
-	 * Used for tools performing selective import
-	 */
-	public List getAssociatedFiles(EnterpriseBean ejb) {
-
-		List classNames = new java.util.ArrayList();
-		List result = new ArrayList();
-		if (ejb.getVersionID() <= J2EEVersionConstants.EJB_1_1_ID) {
-			classNames.add(ejb.getHomeInterfaceName());
-			classNames.add(ejb.getRemoteInterfaceName());
-		} else if (ejb.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID) {
-			if (ejb.hasRemoteClient()) {
-				classNames.add(ejb.getHomeInterfaceName());
-				classNames.add(ejb.getRemoteInterfaceName());
-			}
-			if (ejb.hasLocalClient()) {
-				classNames.add(ejb.getLocalHomeInterfaceName());
-				classNames.add(ejb.getLocalInterfaceName());
-			}
-		}
-		classNames.add(ejb.getEjbClassName());
-
-		if (ejb.isEntity()) {
-			String className = ((Entity) ejb).getPrimaryKeyName();
-			if (!className.startsWith("java"))//$NON-NLS-1$
-				classNames.add(className);
-		}
-		for (int i = 0; i < classNames.size(); i++) {
-			String className = (String) classNames.get(i);
-			if (className == null)
-				continue;
-			String classUri = org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.classNameToUri(className);
-			String javaUri = org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.classNameToJavaUri(className);
-			try {
-				result.add(getFile(classUri));
-			} catch (java.io.FileNotFoundException iox) {
-				//Do nothing - the file does not exist in this jar file
-			}
-			try {
-				result.add(getFile(javaUri));
-			} catch (java.io.FileNotFoundException iox) {
-				//Do nothing - the file does not exist in this jar file
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-	public EJBJar getDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		EJBJar dd = this.getDeploymentDescriptorGen();
-		if (dd == null && canLazyInitialize()) {
-			try {
-				getImportStrategy().importMetaData();
-			} catch (DeploymentDescriptorLoadException ex) {
-				throw ex;
-			} catch (Exception e) {
-				throw new DeploymentDescriptorLoadException(getDeploymentDescriptorUri(), e);
-			}
-		}
-		return this.getDeploymentDescriptorGen();
-	}
-
-	public java.lang.String getDeploymentDescriptorUri() {
-		return J2EEConstants.EJBJAR_DD_URI;
-	}
-
-	/**
-	 * Return the DeployementDescriptor.
-	 */
-	public EObject getStandardDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		return getDeploymentDescriptor();
-	}
-
-	public boolean isDeploymentDescriptorSet() {
-		return deploymentDescriptor != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isEJBJarFile() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.EJBJarFile
-	 */
-	public boolean isImportedFrom10() {
-		return getImportStrategy() != null && getImportStrategy().isEJB10();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.impl.ModuleFileImpl
-	 */
-	public org.eclipse.emf.ecore.EObject makeDeploymentDescriptor(XMLResource resource) {
-		EJBJar ejbJar = ((EjbPackage) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createEJBJar();
-		resource.setID(ejbJar, J2EEConstants.EJBJAR_ID);
-		setDeploymentDescriptorGen(ejbJar);
-		resource.getContents().add(ejbJar);
-
-		return ejbJar;
-	}
-
-
-	public void setDeploymentDescriptor(EJBJar l) {
-		this.setDeploymentDescriptorGen(l);
-		replaceRoot(getMofResourceMakeIfNecessary(getDeploymentDescriptorUri()), l);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EJBJar getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			InternalEObject oldDeploymentDescriptor = (InternalEObject)deploymentDescriptor;
-			deploymentDescriptor = (EJBJar)eResolveProxy(oldDeploymentDescriptor);
-			if (deploymentDescriptor != oldDeploymentDescriptor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-			}
-		}
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBJar basicGetDeploymentDescriptor() {
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDeploymentDescriptorGen(EJBJar newDeploymentDescriptor) {
-		EJBJar oldDeploymentDescriptor = deploymentDescriptor;
-		deploymentDescriptor = newDeploymentDescriptor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				if (resolve) return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((EJBJar)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((EJBJar)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				return deploymentDescriptor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java
deleted file mode 100644
index 9f4ea24bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-
-/**
- * @generated
- */
-public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef {
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EJBModuleRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.EJB_MODULE_REF;
-	}
-
-	public EJBJar getEJBJar() throws ArchiveWrappedException {
-		return (EJBJar) getDeploymentDescriptor();
-	}
-
-	/*
-	 * @see ModuleRef#isEJB()
-	 */
-	public boolean isEJB() {
-		return true;
-	}
-
-} //EJBModuleRefImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java
deleted file mode 100644
index 74c06edae..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java
+++ /dev/null
@@ -1,653 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-
-/**
- * @generated
- */
-public class FileImpl extends J2EEEObjectImpl implements File {
-
-	/**
-	 * The default value of the '{@link #getURI() <em>URI</em>}' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #getURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String uri = URI_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLastModified() <em>Last Modified</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getLastModified()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final long LAST_MODIFIED_EDEFAULT = 0L;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected long lastModified = LAST_MODIFIED_EDEFAULT;
-	/**
-	 * This is true if the Last Modified attribute has been set.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean lastModifiedESet = false;
-
-	/**
-	 * The default value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final long SIZE_EDEFAULT = 0L;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected long size = SIZE_EDEFAULT;
-	/**
-	 * This is true if the Size attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean sizeESet = false;
-
-	/**
-	 * The default value of the '{@link #isDirectoryEntry() <em>Directory Entry</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #isDirectoryEntry()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DIRECTORY_ENTRY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDirectoryEntry() <em>Directory Entry</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #isDirectoryEntry()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean directoryEntry = DIRECTORY_ENTRY_EDEFAULT;
-
-	/**
-	 * This is true if the Directory Entry attribute has been set.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean directoryEntryESet = false;
-
-	/**
-	 * The default value of the '{@link #getOriginalURI() <em>Original URI</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getOriginalURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ORIGINAL_URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String originalURI = ORIGINAL_URI_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Container loadingContainer = null;
-
-	public FileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.FILE;
-	}
-
-	public CommonarchiveFactory getCommonArchiveFactory() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public java.lang.String getDirectoryURI() {
-		return ArchiveUtil.getFileNameParent(getURI());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public java.io.InputStream getInputStream() throws java.io.FileNotFoundException, java.io.IOException {
-		return getLoadingContainer().primGetInputStream(getOriginalURI());
-	}
-
-	public String getName() {
-		return ArchiveUtil.getFileNameTail(getURI());
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isApplicationClientFile() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isArchive() {
-		return false;
-	}
-
-	/**
-	 * isContainer method comment.
-	 */
-	public boolean isContainer() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isEARFile() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isEJBJarFile() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isModuleFile() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isRARFile() {
-		return false;
-	}
-
-	/**
-	 * isReadOnlyDirectory method comment.
-	 */
-	public boolean isReadOnlyDirectory() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isWARFile() {
-		return false;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getURI() {
-		return uri;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setURI(String newURI) {
-		String oldURI = uri;
-		uri = newURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__URI, oldURI, uri));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public long getLastModified() {
-		return lastModified;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLastModified(long newLastModified) {
-		long oldLastModified = lastModified;
-		lastModified = newLastModified;
-		boolean oldLastModifiedESet = lastModifiedESet;
-		lastModifiedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__LAST_MODIFIED, oldLastModified, lastModified, !oldLastModifiedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetLastModified() {
-		long oldLastModified = lastModified;
-		boolean oldLastModifiedESet = lastModifiedESet;
-		lastModified = LAST_MODIFIED_EDEFAULT;
-		lastModifiedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonarchivePackage.FILE__LAST_MODIFIED, oldLastModified, LAST_MODIFIED_EDEFAULT, oldLastModifiedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetLastModified() {
-		return lastModifiedESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public long getSize() {
-		return size;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSize(long newSize) {
-		long oldSize = size;
-		size = newSize;
-		boolean oldSizeESet = sizeESet;
-		sizeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__SIZE, oldSize, size, !oldSizeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSize() {
-		long oldSize = size;
-		boolean oldSizeESet = sizeESet;
-		size = SIZE_EDEFAULT;
-		sizeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonarchivePackage.FILE__SIZE, oldSize, SIZE_EDEFAULT, oldSizeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSize() {
-		return sizeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDirectoryEntry() {
-		return directoryEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDirectoryEntry(boolean newDirectoryEntry) {
-		boolean oldDirectoryEntry = directoryEntry;
-		directoryEntry = newDirectoryEntry;
-		boolean oldDirectoryEntryESet = directoryEntryESet;
-		directoryEntryESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__DIRECTORY_ENTRY, oldDirectoryEntry, directoryEntry, !oldDirectoryEntryESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDirectoryEntry() {
-		boolean oldDirectoryEntry = directoryEntry;
-		boolean oldDirectoryEntryESet = directoryEntryESet;
-		directoryEntry = DIRECTORY_ENTRY_EDEFAULT;
-		directoryEntryESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonarchivePackage.FILE__DIRECTORY_ENTRY, oldDirectoryEntry, DIRECTORY_ENTRY_EDEFAULT, oldDirectoryEntryESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDirectoryEntry() {
-		return directoryEntryESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getOriginalURI() {
-		return originalURI;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setOriginalURI(String newOriginalURI) {
-		String oldOriginalURI = originalURI;
-		originalURI = newOriginalURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__ORIGINAL_URI, oldOriginalURI, originalURI));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public Container getLoadingContainer() {
-		if (loadingContainer != null && loadingContainer.eIsProxy()) {
-			InternalEObject oldLoadingContainer = (InternalEObject)loadingContainer;
-			loadingContainer = (Container)eResolveProxy(oldLoadingContainer);
-			if (loadingContainer != oldLoadingContainer) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.FILE__LOADING_CONTAINER, oldLoadingContainer, loadingContainer));
-			}
-		}
-		return loadingContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Container basicGetLoadingContainer() {
-		return loadingContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLoadingContainer(Container newLoadingContainer) {
-		Container oldLoadingContainer = loadingContainer;
-		loadingContainer = newLoadingContainer;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__LOADING_CONTAINER, oldLoadingContainer, loadingContainer));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public Container getContainer() {
-		if (eContainerFeatureID != CommonarchivePackage.FILE__CONTAINER) return null;
-		return (Container)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(Container newContainer, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newContainer, CommonarchivePackage.FILE__CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setContainer(Container newContainer) {
-		if (newContainer != eInternalContainer() || (eContainerFeatureID != CommonarchivePackage.FILE__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, newContainer))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject)newContainer).eInverseAdd(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__CONTAINER, newContainer, newContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.FILE__CONTAINER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetContainer((Container)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.FILE__CONTAINER:
-				return basicSetContainer(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case CommonarchivePackage.FILE__CONTAINER:
-				return eInternalContainer().eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.FILE__URI:
-				return getURI();
-			case CommonarchivePackage.FILE__LAST_MODIFIED:
-				return new Long(getLastModified());
-			case CommonarchivePackage.FILE__SIZE:
-				return new Long(getSize());
-			case CommonarchivePackage.FILE__DIRECTORY_ENTRY:
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.FILE__ORIGINAL_URI:
-				return getOriginalURI();
-			case CommonarchivePackage.FILE__LOADING_CONTAINER:
-				if (resolve) return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.FILE__CONTAINER:
-				return getContainer();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.FILE__URI:
-				setURI((String)newValue);
-				return;
-			case CommonarchivePackage.FILE__LAST_MODIFIED:
-				setLastModified(((Long)newValue).longValue());
-				return;
-			case CommonarchivePackage.FILE__SIZE:
-				setSize(((Long)newValue).longValue());
-				return;
-			case CommonarchivePackage.FILE__DIRECTORY_ENTRY:
-				setDirectoryEntry(((Boolean)newValue).booleanValue());
-				return;
-			case CommonarchivePackage.FILE__ORIGINAL_URI:
-				setOriginalURI((String)newValue);
-				return;
-			case CommonarchivePackage.FILE__LOADING_CONTAINER:
-				setLoadingContainer((Container)newValue);
-				return;
-			case CommonarchivePackage.FILE__CONTAINER:
-				setContainer((Container)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.FILE__URI:
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.FILE__LAST_MODIFIED:
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.FILE__SIZE:
-				unsetSize();
-				return;
-			case CommonarchivePackage.FILE__DIRECTORY_ENTRY:
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.FILE__ORIGINAL_URI:
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.FILE__LOADING_CONTAINER:
-				setLoadingContainer((Container)null);
-				return;
-			case CommonarchivePackage.FILE__CONTAINER:
-				setContainer((Container)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.FILE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.FILE__LAST_MODIFIED:
-				return isSetLastModified();
-			case CommonarchivePackage.FILE__SIZE:
-				return isSetSize();
-			case CommonarchivePackage.FILE__DIRECTORY_ENTRY:
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.FILE__ORIGINAL_URI:
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.FILE__LOADING_CONTAINER:
-				return loadingContainer != null;
-			case CommonarchivePackage.FILE__CONTAINER:
-				return getContainer() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (URI: ");
-		result.append(uri);
-		result.append(", lastModified: ");
-		if (lastModifiedESet) result.append(lastModified); else result.append("<unset>");
-		result.append(", size: ");
-		if (sizeESet) result.append(size); else result.append("<unset>");
-		result.append(", directoryEntry: ");
-		if (directoryEntryESet) result.append(directoryEntry); else result.append("<unset>");
-		result.append(", originalURI: ");
-		result.append(originalURI);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * @see File#isFARFile()
-	 */
-	public boolean isFARFile() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java
deleted file mode 100644
index 32b040f23..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ExportStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @generated
- */
-public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile {
-
-	/** Implementer for extracting meta-data from this archive into the root object */
-	protected ImportStrategy importStrategy;
-	/** Implementer for adding meta-data to an about-to-be-exported archive */
-	protected ExportStrategy exportStrategy;
-
-	public ModuleFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.MODULE_FILE;
-	}
-
-	protected boolean canLazyInitialize() {
-		return getImportStrategy() != null;
-	}
-
-	public Resource getDeploymentDescriptorResource() throws java.io.FileNotFoundException, ResourceLoadException {
-		return getMofResource(getDeploymentDescriptorUri());
-	}
-
-	/**
-	 * Subclasses must override
-	 */
-	public abstract String getDeploymentDescriptorUri();
-
-	/**
-	 * @see com.ibm.etools.commonarchive.ModuleFile
-	 */
-	public EARFile getEARFile() {
-		Container aContainer = getContainer();
-		if (aContainer == null || !aContainer.isEARFile()) {
-			return null;
-		}
-		return ((EARFile) aContainer);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.ExportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ExportStrategy getExportStrategy() {
-		return exportStrategy;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy getImportStrategy() {
-		return importStrategy;
-	}
-
-	/**
-	 * Returns the specification version of the module file, or empty string if unknown version. For
-	 * example, "2.0"
-	 * 
-	 * @deprecated, Use getDeploymentDescriptorResource().getModuleVersionID();
-	 */
-	public String getSpecVersion() {
-		float ver = getSpecVersionID();
-		Float specVersion = new Float(ver / 10);
-		return specVersion.toString();
-	}
-
-	/**
-	 * Return the version ID of the module For example, "20"
-	 * 
-	 * @return int
-	 */
-	public int getSpecVersionID() {
-		try {
-			return ((XMLResource) getDeploymentDescriptorResource()).getModuleVersionID();
-		} catch (Exception e) {
-			throw new ArchiveRuntimeException(e);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.ModuleFile
-	 */
-	public abstract boolean isDeploymentDescriptorSet();
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isModuleFile() {
-		return true;
-	}
-
-
-
-	/**
-	 * subclasses must override
-	 */
-	public abstract EObject makeDeploymentDescriptor(XMLResource resource);
-
-	public Resource makeDeploymentDescriptorResource() {
-		XMLResource resource = null;
-		try {
-			resource = (XMLResource) makeMofResource(getDeploymentDescriptorUri());
-		} catch (DuplicateObjectException ex) {
-			try {
-				return getDeploymentDescriptorResource();
-			} catch (java.io.FileNotFoundException fnfEx) {
-				//Ignore
-			}
-		}
-		makeDeploymentDescriptor(resource);
-		return resource;
-	}
-
-	public void save(SaveStrategy aSaveStrategy) throws SaveFailureException {
-		setSaveStrategy(aSaveStrategy);
-		if (getExportStrategy() != null)
-			getExportStrategy().preSave(aSaveStrategy);
-		super.save(aSaveStrategy);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newExportStrategy
-	 *            com.ibm.etools.archive.ExportStrategy
-	 */
-	public void setExportStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ExportStrategy newExportStrategy) {
-		exportStrategy = newExportStrategy;
-		if (newExportStrategy != null) {
-			newExportStrategy.setArchive(this);
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newImportStrategy
-	 *            com.ibm.etools.archive.ImportStrategy
-	 */
-	public void setImportStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy newImportStrategy) {
-		importStrategy = newImportStrategy;
-		if (newImportStrategy != null) {
-			newImportStrategy.setArchive(this);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.commonarchive.ModuleFile#setJ2EEVersion(int)
-	 */
-	public void setJ2EEVersion(int versionID) {
-		try {
-			((XMLResource) getDeploymentDescriptorResource()).setVersionID(versionID);
-		} catch (ResourceLoadException e) {
-			throw e;
-		} catch (FileNotFoundException e) {
-			throw new ArchiveRuntimeException(e);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java
deleted file mode 100644
index 05380ddd6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.NoModuleFileException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-/**
- * @generated
- */
-public abstract class ModuleRefImpl extends J2EEEObjectImpl implements ModuleRef {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ModuleFile moduleFile = null;
-	/**
-	 * The cached value of the '{@link #getModule() <em>Module</em>}' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getModule()
-	 * @ordered
-	 */
-	protected Module module = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ModuleRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.MODULE_REF;
-	}
-
-	protected CommonarchiveFactory getCommonArchiveFactory() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory();
-	}
-
-	/**
-	 * The default is to do nothing; subclasses should override if necessary
-	 */
-	protected void buildComponentList(EList list) {
-		//Default
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public ModuleFile getModuleFileGen() {
-		if (moduleFile != null && moduleFile.eIsProxy()) {
-			InternalEObject oldModuleFile = (InternalEObject)moduleFile;
-			moduleFile = (ModuleFile)eResolveProxy(oldModuleFile);
-			if (moduleFile != oldModuleFile) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.MODULE_REF__MODULE_FILE, oldModuleFile, moduleFile));
-			}
-		}
-		return moduleFile;
-	}
-
-	public ModuleFile getModuleFile() {
-		if (moduleFile == null)
-			initModuleFileFromEAR();
-		return moduleFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModuleFile basicGetModuleFile() {
-		return moduleFile;
-	}
-
-	protected void initModuleFileFromEAR() {
-		checkEARFile();
-		ModuleFile aFile = null;
-		try {
-			aFile = (ModuleFile) getEarFile().getFile(module.getUri());
-		} catch (FileNotFoundException ex) {
-			//Ignore
-		} catch (ClassCastException ex) {
-			//Ignore
-		}
-		checkType(module, aFile);
-		setModuleFile(aFile);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setModuleFile(ModuleFile newModuleFile) {
-		ModuleFile oldModuleFile = moduleFile;
-		moduleFile = newModuleFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.MODULE_REF__MODULE_FILE, oldModuleFile, moduleFile));
-	}
-
-	public boolean usesAltDD() {
-		if (module == null)
-			return false;
-		return !ArchiveUtil.isNullOrEmpty(module.getAltDD());
-	}
-
-	public EObject getAltDeploymentDescriptor() throws ArchiveWrappedException {
-		if (getEarFile() == null)
-			return null;
-		try {
-			return getEarFile().getAltDeploymentDescriptor(getModule());
-		} catch (Exception ex) {
-			throw new ArchiveWrappedException(ex);
-		}
-	}
-
-	/*
-	 * @see ModuleRef#getDeploymentDescriptor()
-	 */
-	public EObject getDeploymentDescriptor() throws ArchiveWrappedException {
-		if (getEarFile() == null)
-			return getStandardDeploymentDescriptor();
-		try {
-			return getEarFile().getDeploymentDescriptor(getModule());
-		} catch (Exception ex) {
-			throw new ArchiveWrappedException(ex);
-		}
-	}
-
-	/*
-	 * @see ModuleRef#getEARFile()
-	 */
-	public EObject getStandardDeploymentDescriptor() {
-		if (getModuleFile() == null)
-			return null;
-		return getModuleFile().getStandardDeploymentDescriptor();
-	}
-
-
-	/*
-	 * @see ModuleRef#setURI(String)
-	 */
-	public void setURI(String uri) {
-		if (getModuleFile() != null)
-			getModuleFile().setURI(uri);
-
-		if (getModule() != null)
-			getModule().setUri(uri);
-	}
-
-	/*
-	 * @see ModuleRef#isClient()
-	 */
-	public boolean isClient() {
-		return false;
-	}
-
-	/*
-	 * @see ModuleRef#isConnector()
-	 */
-	public boolean isConnector() {
-		return false;
-	}
-
-	/*
-	 * @see ModuleRef#isEJB()
-	 */
-	public boolean isEJB() {
-		return false;
-	}
-
-	/*
-	 * @see ModuleRef#isWeb()
-	 */
-	public boolean isWeb() {
-		return false;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EARFile getEarFile() {
-		if (eContainerFeatureID != CommonarchivePackage.MODULE_REF__EAR_FILE) return null;
-		return (EARFile)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEarFile(EARFile newEarFile, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newEarFile, CommonarchivePackage.MODULE_REF__EAR_FILE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEarFile(EARFile newEarFile) {
-		if (newEarFile != eInternalContainer() || (eContainerFeatureID != CommonarchivePackage.MODULE_REF__EAR_FILE && newEarFile != null)) {
-			if (EcoreUtil.isAncestor(this, newEarFile))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEarFile != null)
-				msgs = ((InternalEObject)newEarFile).eInverseAdd(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs);
-			msgs = basicSetEarFile(newEarFile, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.MODULE_REF__EAR_FILE, newEarFile, newEarFile));
-	}
-
-	public Module getModule() {
-		if (module != null && module.eIsProxy()) {
-			Module oldModule = module;
-			module = (Module) EcoreUtil.resolve(module, this);
-			if (module != oldModule) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.MODULE_REF__MODULE, oldModule, module));
-			}
-		}
-		return module;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Module basicGetModule() {
-		return module;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setModule(Module newModule) {
-		Module oldModule = module;
-		module = newModule;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.MODULE_REF__MODULE, oldModule, module));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetEarFile((EARFile)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				return basicSetEarFile(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				return eInternalContainer().eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.MODULE_REF__MODULE_FILE:
-				if (resolve) return getModuleFile();
-				return basicGetModuleFile();
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				return getEarFile();
-			case CommonarchivePackage.MODULE_REF__MODULE:
-				if (resolve) return getModule();
-				return basicGetModule();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.MODULE_REF__MODULE_FILE:
-				setModuleFile((ModuleFile)newValue);
-				return;
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				setEarFile((EARFile)newValue);
-				return;
-			case CommonarchivePackage.MODULE_REF__MODULE:
-				setModule((Module)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.MODULE_REF__MODULE_FILE:
-				setModuleFile((ModuleFile)null);
-				return;
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				setEarFile((EARFile)null);
-				return;
-			case CommonarchivePackage.MODULE_REF__MODULE:
-				setModule((Module)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.MODULE_REF__MODULE_FILE:
-				return moduleFile != null;
-			case CommonarchivePackage.MODULE_REF__EAR_FILE:
-				return getEarFile() != null;
-			case CommonarchivePackage.MODULE_REF__MODULE:
-				return module != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * Return an input stream from the "resources path" of either the ModuleFile, if the module does
-	 * not use alt-dd, or from the altRoot of the module, found in the resources path of the EAR
-	 * 
-	 * @see LoadStrategy#getResourceInputStream(String)
-	 */
-	public InputStream getResourceInputStream(String uri) throws IOException {
-		if (usesAltDD())
-			return getAltResourceInputStream(uri);
-		return getLocalResourceInputStream(uri);
-	}
-
-	public InputStream getLocalResourceInputStream(String uri) throws IOException {
-		checkModuleFile();
-		return moduleFile.getResourceInputStream(uri);
-	}
-
-	public InputStream getAltResourceInputStream(String uri) throws IOException {
-		checkEARFile();
-		return getEarFile().getResourceInputStream(uri);
-	}
-
-	/*
-	 * @see ModuleRef#getUri()
-	 */
-	public String getUri() {
-		if (module != null)
-			return module.getUri();
-		if (moduleFile != null)
-			return moduleFile.getURI();
-
-		return null;
-	}
-
-	/**
-	 * @see ModuleRef#getAltMofResource(String)
-	 */
-	public Resource getAltMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
-		checkEARFile();
-		return getEarFile().getMofResource(uri);
-	}
-
-	/**
-	 * @see ModuleRef#getLocalMofResource(String)
-	 */
-	public Resource getLocalMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
-		checkModuleFile();
-		return moduleFile.getMofResource(uri);
-	}
-
-	/**
-	 * @see ModuleRef#getMofResource(String)
-	 */
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
-		if (usesAltDD())
-			return getAltMofResource(uri);
-		return getLocalMofResource(uri);
-	}
-
-	/**
-	 * @see ModuleRef#makeAltMofResource(String)
-	 */
-	public Resource makeAltMofResource(String uri) throws DuplicateObjectException {
-		checkEARFile();
-		return getEarFile().makeMofResource(uri);
-	}
-
-	protected void checkEARFile() {
-		if (getEarFile() == null)
-			throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.Module_not_in_EAR, new Object[]{getUri()})); 
-	}
-
-	/**
-	 * @see ModuleRef#makeLocalMofResource(String)
-	 */
-	public Resource makeLocalMofResource(String uri) throws DuplicateObjectException {
-		checkModuleFile();
-		return moduleFile.makeMofResource(uri);
-
-	}
-
-	protected void checkModuleFile() {
-		getModuleFile();
-		if (moduleFile == null)
-			throw new NoModuleFileException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.Module_file_does_not_exist_2, new Object[]{getUri()})); 
-	}
-
-	protected void checkType(Module moduleDescriptor, File aFile) {
-		if (aFile == null) {
-			String message = CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.A_file_does_not_exist_for_module, new Object[]{moduleDescriptor.getUri()}); 
-			throw new NoModuleFileException(message);
-		}
-		//Added for defect 113929
-		boolean isValid = true;
-		String type = CommonArchiveResourceHandler.Module_file; 
-		if (moduleDescriptor.isWebModule() && !aFile.isWARFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.A_WAR_file; 
-		} else if (moduleDescriptor.isEjbModule() && !aFile.isEJBJarFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.An_EJB_JAR_file; 
-		} else if (moduleDescriptor.isJavaModule() && !aFile.isApplicationClientFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.An_Application_Client_JAR_file; 
-		} else if (moduleDescriptor.isConnectorModule() && !aFile.isRARFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.A_RAR_file; 
-		} else if (!aFile.isModuleFile())
-			isValid = false;
-
-		if (isValid)
-			return;
-
-		String earUri = ""; //$NON-NLS-1$
-		if (getEarFile() != null)
-			earUri = getEarFile().getURI();
-		String message = CommonArchiveResourceHandler.getString("File_not_correct_type", new Object[]{aFile.getURI(), earUri, type}); //$NON-NLS-1$
-		throw new ArchiveRuntimeException(message);
-	}
-
-
-	/**
-	 * @see ModuleRef#makeMofResource(String)
-	 */
-	public Resource makeMofResource(String uri) throws DuplicateObjectException {
-		if (usesAltDD())
-			return makeAltMofResource(uri);
-		return makeLocalMofResource(uri);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java
deleted file mode 100644
index 4ace59ce8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ConnectorDirectorySaveStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.RarFileDynamicClassLoader;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * @generated
- */
-public class RARFileImpl extends ModuleFileImpl implements RARFile {
-
-	/**
-	 * The cached value of the '{@link #getDeploymentDescriptor() <em>Deployment Descriptor</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getDeploymentDescriptor()
-	 * @generated
-	 * @ordered
-	 */
-	protected Connector deploymentDescriptor = null;
-
-	public RARFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.RAR_FILE;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public File addCopyClass(File aFile) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException {
-		if (aFile.isReadOnlyDirectory())
-			throw new IllegalArgumentException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.add_copy_class_dir_EXC_, (new Object[]{aFile.getURI()}))); // = "Method addCopyClass not supported for directories :"
-		return addCopyFileAddingPrefix(aFile, ArchiveConstants.WEBAPP_CLASSES_URI);
-	}
-
-	protected File addCopyFileAddingPrefix(File aFile, String uriPrefix) throws DuplicateObjectException {
-		String swizzledUri = aFile.getURI();
-		if (!swizzledUri.startsWith(uriPrefix)) {
-			swizzledUri = ArchiveUtil.concatUri(uriPrefix, swizzledUri, '/');
-		}
-		checkAddValid(swizzledUri);
-		File copy = copy(aFile);
-		copy.setURI(swizzledUri);
-		getFiles().add(copy);
-		return copy;
-	}
-
-	protected SaveStrategy createSaveStrategyForConnectorDirectory(java.io.File dir, int expansionFlags) {
-		return new ConnectorDirectorySaveStrategyImpl(dir.getAbsolutePath(), expansionFlags);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public void extractToConnectorDirectory(java.lang.String aUri, int expansionFlags) throws SaveFailureException {
-		java.io.File aDir = new java.io.File(aUri);
-		if (getLoadStrategy().isUsing(aDir))
-			throw new SaveFailureException(CommonArchiveResourceHandler.Extract_destination_is_the_EXC_); // = "Extract destination is the same path as source file"
-
-		try {
-			SaveStrategy aSaveStrategy = createSaveStrategyForConnectorDirectory(aDir, expansionFlags);
-			save(aSaveStrategy);
-			aSaveStrategy.close();
-		} catch (java.io.IOException ex) {
-			throw new SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.error_saving_EXC_, (new Object[]{uri})), ex); // = "Error saving "
-		}
-
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.RARFile
-	 */
-	public java.util.List getClasses() {
-		return filterFilesByPrefix(ArchiveConstants.RAR_CLASSES_URI);
-	}
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-	public Connector getDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		Connector dd = deploymentDescriptor;
-		if (dd == null && canLazyInitialize())
-			try {
-				getImportStrategy().importMetaData();
-			} catch (Exception e) {
-				throw new DeploymentDescriptorLoadException(getDeploymentDescriptorUri(), e);
-			}
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Connector basicGetDeploymentDescriptor() {
-		return deploymentDescriptor;
-	}
-
-	public String getDeploymentDescriptorUri() {
-		return J2EEConstants.RAR_DD_URI;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public java.util.List getResources() {
-		String[] prefixes = {J2EEConstants.META_INF, J2EEConstants.WEB_INF};
-		return filterFilesWithoutPrefix(prefixes);
-	}
-
-	/**
-	 * Return the DeployementDescriptor.
-	 */
-	public EObject getStandardDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		return getDeploymentDescriptor();
-	}
-
-	public boolean isDeploymentDescriptorSet() {
-		return deploymentDescriptor != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isRARFile() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.impl.ModuleFileImpl
-	 */
-	public org.eclipse.emf.ecore.EObject makeDeploymentDescriptor(XMLResource resource) {
-		JcaPackage p = (JcaPackage) EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-		JcaFactory fct = p.getJcaFactory();
-		Connector connector = fct.createConnector();
-		setDeploymentDescriptor(connector);
-		resource.getContents().add(connector);
-		return connector;
-	}
-
-
-	public void setDeploymentDescriptor(Connector l) {
-		deploymentDescriptor = l;
-		replaceRoot(getMofResourceMakeIfNecessary(getDeploymentDescriptorUri()), l);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				if (resolve) return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((Connector)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((Connector)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				return deploymentDescriptor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	public ClassLoader createDynamicClassLoader(ClassLoader parentCl, ClassLoader extraCl) {
-		return new RarFileDynamicClassLoader(this, parentCl, extraCl);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java
deleted file mode 100644
index 9103d8fcf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-
-/**
- * @generated
- */
-public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDirectory {
-
-	public ReadOnlyDirectoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.READ_ONLY_DIRECTORY;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public boolean containsFile(java.lang.String aUri) {
-		getFiles();
-		return getFileIndex().containsKey(aUri);
-	}
-
-	/**
-	 * containsFileInRootOrSubdirectory method comment.
-	 */
-	public boolean containsFileInSelfOrSubdirectory(java.lang.String aUri) {
-		return getLoadStrategy().contains(aUri);
-	}
-
-	/**
-	 * getFileInSelfOrSubdirectory method comment.
-	 */
-	public File getFileInSelfOrSubdirectory(java.lang.String aUri) throws java.io.FileNotFoundException {
-		if (!containsFileInSelfOrSubdirectory(aUri))
-			throw new java.io.FileNotFoundException(aUri);
-
-		if (containsFile(aUri))
-			return getFile(aUri);
-
-		List subdirs = getReadOnlyDirectories();
-		for (int i = 0; i < subdirs.size(); i++) {
-			ReadOnlyDirectory subdir = (ReadOnlyDirectory) subdirs.get(i);
-			if (subdir.containsFileInSelfOrSubdirectory(aUri))
-				return subdir.getFileInSelfOrSubdirectory(aUri);
-		}
-		throw new java.io.FileNotFoundException(aUri);
-	}
-
-	/**
-	 * Returns a flat list of all the files contained in this directory and subdirectories, with the
-	 * directories filtered out, as the list would appear in an archive
-	 */
-	public java.util.List getFilesRecursive() {
-		List allFiles = new ArrayList();
-		List filesList = getFiles();
-		for (int i = 0; i < filesList.size(); i++) {
-			File aFile = (File) filesList.get(i);
-			if (aFile.isReadOnlyDirectory())
-				allFiles.addAll(((ReadOnlyDirectory) aFile).getFilesRecursive());
-			else
-				allFiles.add(aFile);
-		}
-		return allFiles;
-	}
-
-	/**
-	 * Return a filtered list on the files with just the instances of ReadOnlyDirectory
-	 */
-	public List getReadOnlyDirectories() {
-		List filtered = new ArrayList();
-		List filesList = getFiles();
-		for (int i = 0; i < filesList.size(); i++) {
-			File aFile = (File) filesList.get(i);
-			if (aFile.isReadOnlyDirectory())
-				filtered.add(aFile);
-		}
-		return filtered;
-	}
-
-	/**
-	 * isReadOnlyDirectory method comment.
-	 */
-	public boolean isReadOnlyDirectory() {
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RootArchiveTypeDescriminatorImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RootArchiveTypeDescriminatorImpl.java
deleted file mode 100644
index 26356725e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RootArchiveTypeDescriminatorImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy;
-
-
-/**
- * Insert the type's description here. Creation date: (12/04/00 5:24:44 PM)
- * 
- * @author: Administrator
- */
-public class RootArchiveTypeDescriminatorImpl extends org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl implements org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator {
-	protected static ArchiveTypeDiscriminatorImpl singleton;
-
-	/**
-	 * CommonArchiveFactoryDescriminator constructor comment.
-	 */
-	public RootArchiveTypeDescriminatorImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public boolean canImport(Archive anArchive) {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public Archive convert(Archive anArchive) {
-		return anArchive;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator This never gets called for this
-	 *      implementer.
-	 */
-	public Archive createConvertedArchive() {
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator This never gets called for this
-	 *      implementer.
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy() {
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator This never gets called for this
-	 *      implementer.
-	 */
-	public ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return null;
-	}
-
-	/**
-	 * @return null This method should not get called at this level
-	 * 
-	 * @see ArchiveTypeDescriminator#getUnableToOpenMessage()
-	 */
-	public java.lang.String getUnableToOpenMessage() {
-		return "";//$NON-NLS-1$
-	}
-
-	public static ArchiveTypeDiscriminator singleton() {
-		if (singleton == null) {
-			singleton = new RootArchiveTypeDescriminatorImpl();
-		}
-		return singleton;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RootEJBJarDescriminatorImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RootEJBJarDescriminatorImpl.java
deleted file mode 100644
index ed9acc836..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RootEJBJarDescriminatorImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.EjbJar11ImportStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy;
-
-
-/**
- * Insert the type's description here. Creation date: (12/04/00 5:24:44 PM)
- * 
- * @author: Administrator
- */
-public class RootEJBJarDescriminatorImpl extends org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl implements org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator {
-	protected static ArchiveTypeDiscriminatorImpl singleton;
-
-	/**
-	 * CommonArchiveFactoryDescriminator constructor comment.
-	 */
-	public RootEJBJarDescriminatorImpl() {
-		super();
-		initialize();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public boolean canImport(Archive anArchive) {
-		java.util.List theChildren = getChildren();
-		for (int i = 0; i < theChildren.size(); i++) {
-			ArchiveTypeDiscriminator child = (ArchiveTypeDiscriminator) theChildren.get(i);
-			if (child.canImport(anArchive))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-	 */
-	public Archive convert(Archive anArchive) {
-		return anArchive;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator This never gets called for this
-	 *      implementer.
-	 */
-	public Archive createConvertedArchive() {
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator This never gets called for this
-	 *      implementer.
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy() {
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator This never gets called for this
-	 *      implementer.
-	 */
-	public ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return null;
-	}
-
-	/**
-	 * @return null This method should not get called at this level
-	 * 
-	 * @see ArchiveTypeDescriminator#getUnableToOpenMessage()
-	 */
-	public java.lang.String getUnableToOpenMessage() {
-		StringBuffer message = new StringBuffer();
-		java.util.List theChildren = getChildren();
-		for (int i = 0; i < theChildren.size(); i++) {
-			ArchiveTypeDiscriminator child = (ArchiveTypeDiscriminator) theChildren.get(i);
-			message.append(child.getUnableToOpenMessage());
-			message.append('\n');
-		}
-		return message.toString();
-	}
-
-	public void initialize() {
-		addChild(EjbJar11ImportStrategyImpl.getDiscriminator());
-	}
-
-	/**
-	 * @see ArchiveTypeDiscriminator#openArchive(Archive)
-	 */
-	public Archive openArchive(Archive anArchive) throws OpenFailureException {
-		Archive result = super.openArchive(anArchive);
-		if (result == anArchive)
-			//Couldn't convert
-			return null;
-		return result;
-	}
-
-	public static ArchiveTypeDiscriminator singleton() {
-		if (singleton == null) {
-			singleton = new RootEJBJarDescriminatorImpl();
-		}
-		return singleton;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java
deleted file mode 100644
index ad4d9e90f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.WarFileDynamicClassLoader;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * @generated
- */
-public class WARFileImpl extends ModuleFileImpl implements WARFile {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected WebApp deploymentDescriptor = null;
-	protected List sourceFiles;
-
-	public WARFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.WAR_FILE;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public File addCopyClass(File aFile) throws DuplicateObjectException {
-		if (aFile.isReadOnlyDirectory())
-			throw new IllegalArgumentException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.add_copy_class_dir_EXC_, (new Object[]{aFile.getURI()}))); // = "Method addCopyClass not supported for directories :"
-		return addCopyFileAddingPrefix(aFile, ArchiveConstants.WEBAPP_CLASSES_URI);
-	}
-
-	protected File addCopyFileAddingPrefix(File aFile, String uriPrefix) throws DuplicateObjectException {
-		String swizzledUri = aFile.getURI();
-		if (!swizzledUri.startsWith(uriPrefix)) {
-			swizzledUri = ArchiveUtil.concatUri(uriPrefix, swizzledUri, '/');
-		}
-		checkAddValid(swizzledUri);
-		File copy = copy(aFile);
-		copy.setURI(swizzledUri);
-		getFiles().add(copy);
-		return copy;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public File addCopyLib(File aFile) throws DuplicateObjectException {
-		if (aFile.isReadOnlyDirectory())
-			throw new IllegalArgumentException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.add_copy_lib_dir_EXC_, (new Object[]{aFile.getURI()}))); // = "Method addCopyLib not supported for directories :"
-		return addCopyFileAddingPrefix(aFile, ArchiveConstants.WEBAPP_LIB_URI);
-	}
-
-	protected RuntimeClasspathEntry createLibClasspathEntry(String libPath) {
-		RuntimeClasspathEntry entry = createRuntimeClasspathEntry(libPath);
-		entry.setWarFile(this);
-		return entry;
-	}
-
-	/**
-	 * Used internally for building the runtime class path
-	 * 
-	 * @return List of Strings, the absolute paths of all file entries (no directories)
-	 */
-	protected List getAllFileEntriesRecursive(java.io.File aFile, List aList) {
-		if (!aFile.exists())
-			return aList;
-		//modified for botp 126140 05.29.02
-		String name = aFile.getName();
-		if (name.regionMatches(true, name.length() - 4, ".jar", 0, 4)) {//$NON-NLS-1$
-			aList.add(aFile.getAbsolutePath());
-		} else if (aFile.isDirectory()) {
-			java.io.File[] children = aFile.listFiles();
-			for (int i = 0; i < children.length; i++) {
-				getAllFileEntriesRecursive(children[i], aList);
-			}
-		}
-		return aList;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public java.util.List getClasses() {
-		return filterFilesByPrefix(ArchiveConstants.WEBAPP_CLASSES_URI);
-	}
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-	public WebApp getDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		WebApp dd = this.getDeploymentDescriptorGen();
-		if (dd == null && canLazyInitialize())
-			try {
-				getImportStrategy().importMetaData();
-			} catch (Exception e) {
-				throw new DeploymentDescriptorLoadException(getDeploymentDescriptorUri(), e);
-			}
-		return this.getDeploymentDescriptorGen();
-	}
-
-	public String getDeploymentDescriptorUri() {
-		return J2EEConstants.WEBAPP_DD_URI;
-	}
-
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public java.util.List getLibs() {
-		return filterFilesByPrefix(ArchiveConstants.WEBAPP_LIB_URI);
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public List getLibArchives() {
-		return filterFiles(ArchiveConstants.WEBAPP_LIB_URI, new String[]{"jar", "zip"}); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public java.util.List getResources() {
-		String[] prefixes = {J2EEConstants.META_INF, J2EEConstants.WEB_INF};
-		return filterFilesWithoutPrefix(prefixes);
-	}
-
-	/**
-	 * Overridden from superclass to include the claseses and libs of a WARFile There also is an
-	 * assumption that this is an exploded war file The following is what should be returned:
-	 * 
-	 * 1) WAR directory + /WEB-INF/classes 2) all JAR files contained in [WAR directory +
-	 * /WEB-INF/lib] 3) WAR directory
-	 */
-	public RuntimeClasspathEntry[] getLocalRuntimeClassPath() {
-
-		String absolutePath;
-		try {
-			absolutePath = getLoadStrategy().getBinariesPath();
-		} catch (IOException ex) {
-			return new RuntimeClasspathEntry[0];
-		}
-
-		List entries = new ArrayList();
-
-		if (getLoadStrategy().isDirectory()) {
-			String classesPath = ArchiveUtil.getOSUri(absolutePath, ArchiveConstants.WEBAPP_CLASSES_URI);
-			entries.add(createRuntimeClasspathEntry(classesPath));
-			addWebLibs(absolutePath, entries);
-		}
-
-		entries.add(createRuntimeClasspathEntry(absolutePath));
-		return (RuntimeClasspathEntry[]) entries.toArray(new RuntimeClasspathEntry[entries.size()]);
-	}
-
-	protected RuntimeClasspathEntry[] getDependencyClassPathAtThisLevel() {
-
-		String absolutePath = internalGetBinariesPath();
-		if (absolutePath == null)
-			return emptyClasspath();
-		RuntimeClasspathEntry[] mfEntries = super.getDependencyClassPathAtThisLevel();
-		List entries = new ArrayList();
-		entries.addAll(Arrays.asList(mfEntries));
-
-		return (RuntimeClasspathEntry[]) entries.toArray(new RuntimeClasspathEntry[entries.size()]);
-	}
-
-	protected void addWebLibs(String absolutePath, List entries) {
-		/*******************************************************************************************
-		 * Optimization*********** We could have used the helper getlibs here; however, that could
-		 * drag down performance as the full file list would have to get built, and this is runtime;
-		 * if the classes portion is huge then building the file list would be slow; moreover, we
-		 * would then have to clear the index from this war file. therefore, we'll do a little extra
-		 * work to get the libs
-		 ******************************************************************************************/
-		java.io.File aFile = new java.io.File(ArchiveUtil.getOSUri(absolutePath, ArchiveConstants.WEBAPP_LIB_URI));
-		List libs = getAllFileEntriesRecursive(aFile, new ArrayList());
-		for (int i = 0; i < libs.size(); i++) {
-			String libPath = (String) libs.get(i);
-			entries.add(createLibClasspathEntry(libPath));
-		}
-		addLooseLibsToRuntimeClasspath(entries);
-	}
-
-	protected void addLooseLibsToRuntimeClasspath(List entries) {
-		LooseWARFile loose = (LooseWARFile) getLoadStrategy().getLooseArchive();
-		if (loose == null)
-			return;
-
-		List looseLibs = loose.getLooseLibs();
-		for (int i = 0; i < looseLibs.size(); i++) {
-			LooseLibrary lib = (LooseLibrary) looseLibs.get(i);
-			entries.add(createLibClasspathEntry(lib.getBinariesPath()));
-		}
-	}
-
-	protected List calculateSourceCandidateFiles() {
-		List filesList = getFiles();
-		List retFiles = new Vector();
-		for (Iterator iter = filesList.iterator(); iter.hasNext();) {
-			File file = (File) iter.next();
-			String aUri = file.getURI();
-			if (aUri.startsWith(J2EEConstants.WEB_INF) && !aUri.startsWith(ArchiveConstants.WEBAPP_LIB_URI))
-				retFiles.add(file);
-		}
-		return retFiles;
-	}
-
-	protected List getSourceCandidateFiles() {
-		if (sourceFiles == null) {
-			sourceFiles = calculateSourceCandidateFiles();
-		}
-		return sourceFiles;
-	}
-
-	protected String makeRelative(String pathString, String relToPathString) {
-
-		if (pathString.startsWith(relToPathString))
-			return ArchiveUtil.truncateFromFrontIgnoreCase(pathString, relToPathString);
-
-		return pathString;
-	}
-
-	/**
-	 * Return the source file that matches the output file passed in
-	 * 
-	 * @param aClassFile
-	 *            The .class file or other output file to find the source for
-	 * @return String The matching source. Null if there is no matching source found
-	 */
-	public File getSourceFile(File aClassFile) {
-		List sourceFilesList = getSourceCandidateFiles();
-		String classURI = aClassFile.getURI();
-		String convertedClassURI = classURI;
-		if (classURI.endsWith(".class")) //$NON-NLS-1$
-			convertedClassURI = ArchiveUtil.classUriToJavaUri(aClassFile.getURI());
-		else 
-			return null;
-		convertedClassURI = makeRelative(convertedClassURI, ArchiveConstants.WEBAPP_CLASSES_URI);
-		int bestLength = 32767;
-		File bestMatch = null;
-		File file = null;
-		String aUri = null;
-		for (Iterator iter = sourceFilesList.iterator(); iter.hasNext();) {
-			file = (File) iter.next();
-			aUri = file.getURI();
-			if (aUri.endsWith(convertedClassURI) && !aUri.equals(classURI)) {
-				int excessLength = aUri.length() - convertedClassURI.length();
-				if (excessLength < bestLength) {
-					bestMatch = file;
-					bestLength = excessLength;
-				}
-			}
-		}
-		return bestMatch;
-	}
-
-	/**
-	 * Return the DeployementDescriptor.
-	 */
-	public EObject getStandardDeploymentDescriptor() throws DeploymentDescriptorLoadException {
-		return getDeploymentDescriptor();
-	}
-
-	public boolean isDeploymentDescriptorSet() {
-		return deploymentDescriptor != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.File
-	 */
-	public boolean isWARFile() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.impl.ModuleFileImpl
-	 */
-	public org.eclipse.emf.ecore.EObject makeDeploymentDescriptor(XMLResource resource) {
-		WebApp webApp = ((WebapplicationPackage) EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI)).getWebapplicationFactory().createWebApp();
-		resource.setID(webApp, J2EEConstants.WEBAPP_ID);
-		setDeploymentDescriptorGen(webApp);
-		resource.getContents().add(webApp);
-		return webApp;
-	}
-
-	public void setDeploymentDescriptor(WebApp l) {
-		this.setDeploymentDescriptorGen(l);
-		replaceRoot(getMofResourceMakeIfNecessary(getDeploymentDescriptorUri()), l);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public WebApp getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			InternalEObject oldDeploymentDescriptor = (InternalEObject)deploymentDescriptor;
-			deploymentDescriptor = (WebApp)eResolveProxy(oldDeploymentDescriptor);
-			if (deploymentDescriptor != oldDeploymentDescriptor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-			}
-		}
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebApp basicGetDeploymentDescriptor() {
-		return deploymentDescriptor;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDeploymentDescriptorGen(WebApp newDeploymentDescriptor) {
-		WebApp oldDeploymentDescriptor = deploymentDescriptor;
-		deploymentDescriptor = newDeploymentDescriptor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				if (resolve) return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				setDeploymentDescriptor((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR:
-				return deploymentDescriptor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	public ClassLoader createDynamicClassLoader(ClassLoader parentCl, ClassLoader extraCl) {
-		return new WarFileDynamicClassLoader(this, parentCl, extraCl);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java
deleted file mode 100644
index 2e346702a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @generated
- */
-public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef {
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected WebModuleRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.Literals.WEB_MODULE_REF;
-	}
-
-	/*
-	 * @see WebModuleRef#getWebApp()
-	 */
-	public WebApp getWebApp() throws ArchiveWrappedException {
-		return (WebApp) getDeploymentDescriptor();
-	}
-
-	/*
-	 * @see ModuleRef#isWeb()
-	 */
-	public boolean isWeb() {
-		return true;
-	}
-
-} //WebModuleRefImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/AppClient12ExportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/AppClient12ExportStrategyImpl.java
deleted file mode 100644
index 64e591654..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/AppClient12ExportStrategyImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-
-/**
- * Concrete implementer that knows how to export meta-data for a 1.2 Application Client
- */
-public class AppClient12ExportStrategyImpl extends ExportStrategyImpl {
-	/**
-	 * AppClient12ExportStrategy constructor comment.
-	 */
-	public AppClient12ExportStrategyImpl() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/AppClient12ImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/AppClient12ImportStrategyImpl.java
deleted file mode 100644
index c5236f291..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/AppClient12ImportStrategyImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-/**
- * Concrete implementer that knows how to import meta-data for a 1.2 Application Client
- */
-public class AppClient12ImportStrategyImpl extends XmlBasedImportStrategyImpl {
-
-	public static class Discriminator extends ArchiveTypeDiscriminatorImpl {
-		public boolean canImport(Archive anArchive) {
-			return anArchive.containsFile(J2EEConstants.APP_CLIENT_DD_URI);
-		}
-
-		/**
-		 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-		 */
-		public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-			return new AppClient12ImportStrategyImpl();
-		}
-
-		public String getUnableToOpenMessage() {
-			return getXmlDDMessage(CommonArchiveResourceHandler.Application_Client_Jar_Fil, J2EEConstants.APP_CLIENT_DD_URI); // = "Application Client Jar File"
-		}
-
-		public Archive createConvertedArchive() {
-			return getArchiveFactory().createApplicationClientFile();
-		}
-	}
-
-	protected static Discriminator discriminator;
-
-	/**
-	 * AppClient22ImportStrategy constructor comment.
-	 */
-	public AppClient12ImportStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return getDiscriminator().createImportStrategy(old, newArchive);
-	}
-
-	public ApplicationClientFile getApplicationClientFile() {
-		return (ApplicationClientFile) getArchive();
-	}
-
-	public static ArchiveTypeDiscriminator getDiscriminator() {
-		if (discriminator == null) {
-			discriminator = new Discriminator();
-		}
-		return discriminator;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public void importMetaData() throws Exception {
-		loadDeploymentDescriptor();
-	}
-
-	public void loadDeploymentDescriptor() throws Exception {
-		ApplicationClient client = null;
-
-		client = (ApplicationClient) primLoadDeploymentDescriptor();
-
-		getApplicationClientFile().setDeploymentDescriptor(client);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ArchiveStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ArchiveStrategy.java
deleted file mode 100644
index 263ad14aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ArchiveStrategy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-
-/**
- * Represents a supertype for all the archive strategies.
- */
-public interface ArchiveStrategy {
-	public Archive getArchive();
-
-	public void setArchive(Archive archive);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ArchiveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ArchiveStrategyImpl.java
deleted file mode 100644
index 8352490c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ArchiveStrategyImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-
-/**
- * This an abstract type off which any implementers of the archive strategy can subclass.
- */
-public abstract class ArchiveStrategyImpl implements ArchiveStrategy {
-	protected Archive archive;
-
-	/**
-	 * ArchiveStrategy constructor comment.
-	 */
-	public ArchiveStrategyImpl() {
-		super();
-	}
-
-	public Archive getArchive() {
-		return archive;
-	}
-
-	public void setArchive(Archive newArchive) {
-		archive = newArchive;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ConnectorDirectorySaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ConnectorDirectorySaveStrategyImpl.java
deleted file mode 100644
index 2eb2eb6b2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ConnectorDirectorySaveStrategyImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveURIConverterImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-/**
- * Implementer that knows how to save an archives contents to a directory on the local file system
- */
-public class ConnectorDirectorySaveStrategyImpl extends SaveStrategyImpl implements SaveStrategy {
-	protected String directoryName;
-	protected URIConverter uriConverter;
-	/** Indicates which type of archives should be expanded */
-	protected int expansionFlags;
-
-	/**
-	 * DirectoryDumpStrategy constructor comment.
-	 */
-	public ConnectorDirectorySaveStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * DirectoryDumpStrategy constructor comment.
-	 */
-	public ConnectorDirectorySaveStrategyImpl(String dirName, int flags) {
-		super();
-		setDirectoryName(dirName);
-		setExpansionFlags(flags);
-		initialize();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected SaveStrategy createNestedDirectoryStrategy(Archive anArchive) {
-		String uri = org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.getOSUri(getDirectoryName(), "");//$NON-NLS-1$
-		return new ConnectorDirectorySaveStrategyImpl(uri, getExpansionFlags());
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected SaveStrategy createNestedSaveStrategy(Archive anArchive) throws IOException {
-		if (shouldExpand(anArchive))
-			return createNestedDirectoryStrategy(anArchive);
-		return createNestedZipStrategy(anArchive);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected SaveStrategy createNestedZipStrategy(Archive anArchive) throws IOException {
-		OutputStream out = getUriConverter().createOutputStream(URI.createURI(anArchive.getURI()));
-		return new ZipStreamSaveStrategyImpl(out);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/15/00 2:26:37 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getDirectoryName() {
-		return directoryName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 10:18:21 AM)
-	 * 
-	 * @return int
-	 */
-	public int getExpansionFlags() {
-		return expansionFlags;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected java.io.OutputStream getOutputStreamForResource(Resource aResource) throws java.io.IOException {
-		return getUriConverter().createOutputStream(aResource.getURI());
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/08/00 4:50:32 PM)
-	 * 
-	 * @return org.eclipse.emf.ecore.resource.URIConverter
-	 */
-	public org.eclipse.emf.ecore.resource.URIConverter getUriConverter() {
-		return uriConverter;
-	}
-
-	public void initialize() {
-		ArchiveURIConverterImpl converter = new ArchiveURIConverterImpl(getArchive(), getDirectoryName());
-		converter.setOutputFilepath(getDirectoryName());
-		setUriConverter(converter);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public boolean isDirectory() {
-		return true;
-	}
-
-	protected void mkdirs(String directoryPath) {
-		File aDirectory = new File(getDirectoryName() + File.separatorChar + directoryPath);
-		aDirectory.mkdirs();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public void save(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest aManifest) throws SaveFailureException {
-		try {
-			OutputStream out = getUriConverter().createOutputStream(URI.createURI(J2EEConstants.MANIFEST_URI));
-			aManifest.write(out);
-			out.close();
-		} catch (IOException iox) {
-			throw new SaveFailureException(J2EEConstants.MANIFEST_URI, iox);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	public void save(org.eclipse.jst.j2ee.commonarchivecore.internal.File aFile, InputStream in) throws SaveFailureException {
-		String entryName = aFile.getURI();
-		if (aFile.isDirectoryEntry())
-			mkdirs(entryName);
-		else {
-			try {
-				OutputStream out = getUriConverter().createOutputStream(URI.createURI(entryName));
-				org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.copy(in, out);
-			} catch (IOException iox) {
-				throw new SaveFailureException(aFile.getURI(), iox);
-			}
-		}
-	}
-
-	protected void saveMofResource(org.eclipse.emf.ecore.resource.Resource aResource, OutputStream os) throws IOException {
-		super.saveMofResource(aResource, os);
-		os.close();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/15/00 2:26:37 PM)
-	 * 
-	 * @param newDirectoryName
-	 *            java.lang.String
-	 */
-	public void setDirectoryName(java.lang.String newDirectoryName) {
-		directoryName = newDirectoryName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 10:18:21 AM)
-	 * 
-	 * @param newExpansionFlags
-	 *            int
-	 */
-	public void setExpansionFlags(int newExpansionFlags) {
-		expansionFlags = newExpansionFlags;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/08/00 4:50:32 PM)
-	 * 
-	 * @param newUriConverter
-	 *            org.eclipse.emf.ecore.resource.URIConverter
-	 */
-	public void setUriConverter(org.eclipse.emf.ecore.resource.URIConverter newUriConverter) {
-		uriConverter = newUriConverter;
-	}
-
-	protected boolean shouldExpand(Archive anArchive) {
-
-		int flag = 0;
-
-		if (anArchive.isWARFile())
-			flag = Archive.EXPAND_WAR_FILES;
-		else if (anArchive.isEARFile())
-			flag = Archive.EXPAND_EAR_FILES;
-		else if (anArchive.isEJBJarFile())
-			flag = Archive.EXPAND_EJBJAR_FILES;
-		else if (anArchive.isRARFile())
-			flag = Archive.EXPAND_RAR_FILES;
-		else if (anArchive.isApplicationClientFile())
-			flag = Archive.EXPAND_APPCLIENT_FILES;
-		else
-			flag = Archive.EXPAND_ARCHIVES;
-
-		return (getExpansionFlags() & flag) != 0;
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategy.java
deleted file mode 100644
index b6549c3e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-/**
- * Specialized load strategy that reads entries in an archive from a directory on the file system
- */
-public interface DirectoryArchiveLoadStrategy extends LoadStrategy {
-	public String getDirectoryUri();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java
deleted file mode 100644
index 6e8668651..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister;
-
-
-/**
- * Load strategy used for reading expanding archives; typically in a running server this would be an
- * EAR or WAR, although it can be any Archive
- */
-public class DirectoryArchiveLoadStrategyImpl extends DirectoryLoadStrategyImpl {
-
-
-
-	public DirectoryArchiveLoadStrategyImpl(String aDirectoryUri) {
-		super(aDirectoryUri);
-	}
-
-	protected void addDirectory(java.io.File aFile, java.util.List aList) {
-		addFiles(aFile, aList);
-	}
-
-	protected java.io.File getDirectoryForList() {
-		return new java.io.File(getDirectoryUri());
-	}
-
-
-
-	public LooseArchive getLooseArchive() {
-		if (looseArchive == null && getContainer().isEARFile()) {
-			String osString = ArchiveUtil.getOSUri(getContainer().getURI());
-			setLooseArchive(LooseConfigRegister.singleton().findLooseApplication(osString));
-		}
-		return looseArchive;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
deleted file mode 100644
index 474788c74..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-
-/**
- * Implementer that knows how to read files from the local file system and treat them as file
- * entries in an archive
- * 
- * @see DirectoryArchiveLoadStrategy
- */
-public abstract class DirectoryLoadStrategyImpl extends LoadStrategyImpl implements DirectoryArchiveLoadStrategy {
-	/**
-	 * The root uri from which all relative files entries are loaded; must point to a valid local
-	 * directory
-	 */
-	static boolean IS_AIX = "AIX".equals(System.getProperty("os.name")); //$NON-NLS-1$ //$NON-NLS-2$
-	protected String directoryUri;
-	/**
-	 * Used internally; the directory uri with the system dependent file separator replaced by a
-	 * forward slash
-	 */
-	protected String directoryUriAsZipString;
-	protected static char SEPARATOR_CHAR = java.io.File.separatorChar;
-
-	public DirectoryLoadStrategyImpl(String aDirectoryUri) {
-		super();
-		setDirectoryUri(aDirectoryUri);
-		String normalized = null;
-		try {
-			normalized = new File(aDirectoryUri).getCanonicalPath();
-		} catch (IOException iox) {
-			normalized = aDirectoryUri;
-		}
-		setDirectoryUriAsZipString(normalized.replace(SEPARATOR_CHAR, '/'));
-
-	}
-
-	protected abstract void addDirectory(java.io.File aFile, List aList);
-
-	protected void addFile(java.io.File aFile, List aList) {
-
-		String uri = getURIFrom(aFile);
-		if (collectedLooseArchiveFiles.containsKey(uri))
-			return;
-
-		org.eclipse.jst.j2ee.commonarchivecore.internal.File cFile = createFile(uri);
-		cFile.setSize(aFile.length());
-		cFile.setLastModified(aFile.lastModified());
-		aList.add(cFile);
-	}
-
-	protected void addFiles(java.io.File aDirectory, List aList) {
-
-		String[] fileNames = aDirectory.list();
-		if (fileNames == null)
-			return;
-		for (int i = 0; i < fileNames.length; i++) {
-			String fileName = ArchiveUtil.concatUri(aDirectory.getPath(), fileNames[i], SEPARATOR_CHAR);
-			if (fileNames[i] == null || (IS_AIX && ".backup".equals(fileNames[i]))) //$NON-NLS-1$
-				continue;
-			java.io.File aFile = new java.io.File(fileName);
-			if (!aFile.exists())
-				continue;
-			//This could occur on some windows machines, eg C:\pagefile.sys
-			//throw new RuntimeException("Error scanning directory structure");
-			if (aFile.isDirectory() && !isArchive(getURIFrom(aFile))) {
-				addDirectory(aFile, aList);
-			} else {
-				addFile(aFile, aList);
-			}
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	protected boolean primContains(java.lang.String uri) {
-		return new java.io.File(getFileNameFrom(uri)).exists();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		return new java.io.File(getDirectoryUri()).getAbsolutePath();
-	}
-
-	protected abstract java.io.File getDirectoryForList();
-
-	public java.lang.String getDirectoryUri() {
-		return directoryUri;
-	}
-
-	public java.lang.String getDirectoryUriAsZipString() {
-		return directoryUriAsZipString;
-	}
-
-	/**
-	 * Returns an OS filename from a relative uri
-	 */
-	// TODO Fix the type casing in v6.0
-	protected String getFileNameFrom(String uri) {
-		LooseArchive aLooseArchive = getLooseArchive();
-		if (aLooseArchive != null) {
-			String result = null;
-			switch (aLooseArchive.eClass().getClassifierID()) {
-				case LooseconfigPackage.LOOSE_APPLICATION :
-					result = getURIFromLooseArchivesIfAvailable(((LooseApplication) aLooseArchive).getLooseArchives(), uri);
-					break;
-				case LooseconfigPackage.LOOSE_WAR_FILE :
-					result = getURIFromLooseArchivesIfAvailable(((LooseWARFile) aLooseArchive).getLooseLibs(), uri);
-
-					break;
-			}
-			if (result != null)
-				return result;
-		}
-		String name = uri;
-		if (SEPARATOR_CHAR != '/')
-			name = name.replace('/', SEPARATOR_CHAR);
-		return getDirectoryUri() + SEPARATOR_CHAR + name;
-	}
-
-	private String getURIFromLooseArchivesIfAvailable(List looseArchives, String uri) {
-
-		for (Iterator iter = looseArchives.iterator(); iter.hasNext();) {
-			LooseArchive looseArchiveElement = (LooseArchive) iter.next();
-			if (uri.equals(looseArchiveElement.getUri()))
-				return looseArchiveElement.getBinariesPath();
-		}
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.util.List getFiles() {
-		List list = new ArrayList();
-		java.io.File directory = getDirectoryForList();
-		addFiles(directory, list);
-		return list;
-	}
-	
-	public java.util.List getFiles(String subfolderPath) {
-		List list = new ArrayList();
-		java.io.File containerDirectory = getDirectoryForList();
-		java.io.File subfolder = new java.io.File(containerDirectory, subfolderPath);
-		addFiles(subfolder, list);
-		return list;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.io.InputStream getInputStream(java.lang.String uri) throws IOException, FileNotFoundException {
-		return new FileInputStream(getFileNameFrom(uri));
-	}
-
-	/**
-	 * Returns a relative uri from the java.io.File, to be used for a file entry; the separator will
-	 * be the zip standard (forward slash ("/")).
-	 */
-
-	protected String getURIFrom(File aFile) {
-		String name = ""; //$NON-NLS-1$
-		String relative = null;
-		String root = getDirectoryUriAsZipString();
-		try {
-			name = aFile.getCanonicalPath();
-			relative = makeRelative(name, root);
-		} catch (IOException iox) {
-			name = null;
-		}
-		if (relative == null) {
-			name = aFile.getAbsolutePath();
-			relative = makeRelative(name, root);
-		}
-		if (relative == null) {
-			name = aFile.getPath();
-			root = replaceSeparators(getDirectoryUri());
-			relative = makeRelative(name, root);
-		}
-		return relative;
-	}
-
-	private String replaceSeparators(String path) {
-		if (File.separatorChar != '/')
-			return path.replace(File.separatorChar, '/');
-		return path;
-	}
-
-	private String makeRelative(String fileName, String root) {
-		if (fileName == null || root == null)
-			return null;
-		String name = null;
-		for (; root.endsWith("/"); root = ArchiveUtil.truncateIgnoreCase(root, "/")); //$NON-NLS-1$ //$NON-NLS-2$
-		name = replaceSeparators(fileName);
-		if (name.startsWith(root))
-			name = name.substring(root.length() + 1);
-		else
-			name = null;
-		return name;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public boolean isDirectory() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public boolean isUsing(java.io.File aSystemFile) {
-		java.io.File dir = new java.io.File(getDirectoryUri());
-		return dir.equals(aSystemFile);
-	}
-
-	public void setDirectoryUri(java.lang.String newDirectoryUri) {
-		directoryUri = newDirectoryUri;
-	}
-
-	public void setDirectoryUriAsZipString(java.lang.String newDirectoryUriAsZipString) {
-		directoryUriAsZipString = newDirectoryUriAsZipString;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectorySaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectorySaveStrategyImpl.java
deleted file mode 100644
index b404f5d37..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectorySaveStrategyImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveURIConverterImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-/**
- * Implementer that knows how to save an archives contents to a directory on the local file system
- */
-public class DirectorySaveStrategyImpl extends SaveStrategyImpl implements SaveStrategy {
-	protected String directoryName;
-	protected URIConverter uriConverter;
-	/** Indicates which type of archives should be expanded */
-	protected int expansionFlags;
-
-	/**
-	 * DirectoryDumpStrategy constructor comment.
-	 */
-	public DirectorySaveStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * DirectoryDumpStrategy constructor comment.
-	 */
-	public DirectorySaveStrategyImpl(String dirName, int flags) {
-		super();
-		setDirectoryName(dirName);
-		setExpansionFlags(flags);
-		initialize();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected SaveStrategy createNestedDirectoryStrategy(Archive anArchive) {
-		String uri = org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.getOSUri(getDirectoryName(), anArchive.getURI());
-		return new DirectorySaveStrategyImpl(uri, getExpansionFlags());
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected SaveStrategy createNestedSaveStrategy(Archive anArchive) throws IOException {
-		if (shouldExpand(anArchive))
-			return createNestedDirectoryStrategy(anArchive);
-		return createNestedZipStrategy(anArchive);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected SaveStrategy createNestedZipStrategy(Archive anArchive) throws IOException {
-		OutputStream out = getUriConverter().createOutputStream(URI.createURI(anArchive.getURI()));
-		return new ZipStreamSaveStrategyImpl(out);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/15/00 2:26:37 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getDirectoryName() {
-		return directoryName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 10:18:21 AM)
-	 * 
-	 * @return int
-	 */
-	public int getExpansionFlags() {
-		return expansionFlags;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected java.io.OutputStream getOutputStreamForResource(Resource aResource) throws java.io.IOException {
-		return getUriConverter().createOutputStream(aResource.getURI());
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/08/00 4:50:32 PM)
-	 * 
-	 * @return org.eclipse.emf.ecore.resource.URIConverter
-	 */
-	public org.eclipse.emf.ecore.resource.URIConverter getUriConverter() {
-		return uriConverter;
-	}
-
-	public void initialize() {
-		ArchiveURIConverterImpl converter = new ArchiveURIConverterImpl(getArchive(), getDirectoryName());
-		converter.setOutputFilepath(getDirectoryName());
-		setUriConverter(converter);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public boolean isDirectory() {
-		return true;
-	}
-
-	protected void mkdirs(String directoryPath) {
-		File aDirectory = new File(getDirectoryName() + File.separatorChar + directoryPath);
-		aDirectory.mkdirs();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public void save(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest aManifest) throws SaveFailureException {
-		try {
-			OutputStream out = getUriConverter().createOutputStream(URI.createURI(J2EEConstants.MANIFEST_URI));
-			aManifest.write(out);
-			out.close();
-			if (getArchive().getOptions().isReadOnly())
-				setTimestampAfterSaving(J2EEConstants.MANIFEST_URI);
-		} catch (IOException iox) {
-			throw new SaveFailureException(J2EEConstants.MANIFEST_URI, iox);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	public void save(org.eclipse.jst.j2ee.commonarchivecore.internal.File aFile, InputStream in) throws SaveFailureException {
-		String entryName = aFile.getURI();
-		if (aFile.isDirectoryEntry())
-			mkdirs(entryName);
-		else {
-			try {
-				OutputStream out = getUriConverter().createOutputStream(URI.createURI(entryName));
-				ArchiveUtil.copy(in, out);
-				setTimestampAfterSaving(aFile);
-			} catch (IOException iox) {
-				throw new SaveFailureException(aFile.getURI(), iox);
-			}
-		}
-	}
-
-	protected void saveMofResource(org.eclipse.emf.ecore.resource.Resource aResource, OutputStream os) throws IOException {
-		super.saveMofResource(aResource, os);
-		os.close();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/15/00 2:26:37 PM)
-	 * 
-	 * @param newDirectoryName
-	 *            java.lang.String
-	 */
-	public void setDirectoryName(java.lang.String newDirectoryName) {
-		directoryName = newDirectoryName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 10:18:21 AM)
-	 * 
-	 * @param newExpansionFlags
-	 *            int
-	 */
-	public void setExpansionFlags(int newExpansionFlags) {
-		expansionFlags = newExpansionFlags;
-	}
-
-	protected void setTimestampAfterSaving(org.eclipse.jst.j2ee.commonarchivecore.internal.File aFile) {
-		long lastMod = aFile.getLastModified();
-		if (lastMod == 0)
-			return;
-		String absPath = ArchiveUtil.getOSUri(getDirectoryName(), aFile.getURI());
-		File ioFile = new File(absPath);
-		ioFile.setLastModified(lastMod);
-	}
-
-	protected void setTimestampAfterSaving(String uri) {
-		org.eclipse.jst.j2ee.commonarchivecore.internal.File aFile = null;
-		try {
-			aFile = getArchive().getFile(uri);
-		} catch (FileNotFoundException mustBeANewEntry) {
-			return;
-		}
-		setTimestampAfterSaving(aFile);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/08/00 4:50:32 PM)
-	 * 
-	 * @param newUriConverter
-	 *            org.eclipse.emf.ecore.resource.URIConverter
-	 */
-	public void setUriConverter(org.eclipse.emf.ecore.resource.URIConverter newUriConverter) {
-		uriConverter = newUriConverter;
-	}
-
-	protected boolean shouldExpand(Archive anArchive) {
-
-		int flag = 0;
-
-		if (anArchive.isWARFile())
-			flag = Archive.EXPAND_WAR_FILES;
-		else if (anArchive.isEARFile())
-			flag = Archive.EXPAND_EAR_FILES;
-		else if (anArchive.isRARFile())
-			flag = Archive.EXPAND_RAR_FILES;
-		else if (anArchive.isEJBJarFile())
-			flag = Archive.EXPAND_EJBJAR_FILES;
-		else if (anArchive.isApplicationClientFile())
-			flag = Archive.EXPAND_APPCLIENT_FILES;
-		else
-			flag = Archive.EXPAND_ARCHIVES;
-
-		return (getExpansionFlags() & flag) != 0;
-
-	}
-
-	protected boolean shouldIterateOver(Archive anArchive) {
-		return super.shouldIterateOver(anArchive) || shouldExpand(anArchive);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/Ear12ExportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/Ear12ExportStrategyImpl.java
deleted file mode 100644
index cb02d1979..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/Ear12ExportStrategyImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-
-/**
- * Concrete implementer that knows how to export meta-data for a 1.2 Application
- */
-public class Ear12ExportStrategyImpl extends ExportStrategyImpl {
-	/**
-	 * Ear12ExportStrategy constructor comment.
-	 */
-	public Ear12ExportStrategyImpl() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/Ear12ImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/Ear12ImportStrategyImpl.java
deleted file mode 100644
index 441d56c32..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/Ear12ImportStrategyImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-/**
- * Concrete implementer that knows how to import meta-data for a 1.2 Application Client
- */
-public class Ear12ImportStrategyImpl extends XmlBasedImportStrategyImpl {
-
-	public static class Discriminator extends ArchiveTypeDiscriminatorImpl {
-		public Archive createConvertedArchive() {
-			return getArchiveFactory().createEARFile();
-		}
-
-		public boolean canImport(Archive anArchive) {
-			return anArchive.containsFile(J2EEConstants.APPLICATION_DD_URI);
-		}
-
-		/**
-		 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-		 */
-		public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-			return new Ear12ImportStrategyImpl();
-		}
-
-		public String getUnableToOpenMessage() {
-			return getXmlDDMessage(CommonArchiveResourceHandler.EAR_File, J2EEConstants.APPLICATION_DD_URI); // = "EAR File"
-		}
-	}
-
-	protected static Discriminator discriminator;
-
-	/**
-	 * Ear12ImportStrategy constructor comment.
-	 */
-	public Ear12ImportStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return getDiscriminator().createImportStrategy(old, newArchive);
-	}
-
-	public static ArchiveTypeDiscriminator getDiscriminator() {
-		if (discriminator == null) {
-			discriminator = new Discriminator();
-		}
-		return discriminator;
-	}
-
-	public EARFile getEARFile() {
-		return (EARFile) getArchive();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public void importMetaData() throws Exception {
-		loadDeploymentDescriptor();
-	}
-
-	public void loadDeploymentDescriptor() throws Exception {
-		Application appl = null;
-
-		appl = (Application) primLoadDeploymentDescriptor();
-
-		getEARFile().setDeploymentDescriptor(appl);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/EjbJar11ExportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/EjbJar11ExportStrategyImpl.java
deleted file mode 100644
index cc944cfc5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/EjbJar11ExportStrategyImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-
-/**
- * Concrete implementer that knows how to export meta-data for a 1.1 Ejb Jar
- */
-public class EjbJar11ExportStrategyImpl extends ExportStrategyImpl {
-	/**
-	 * EjbJar11ExportStrategy constructor comment.
-	 */
-	public EjbJar11ExportStrategyImpl() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/EjbJar11ImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/EjbJar11ImportStrategyImpl.java
deleted file mode 100644
index 5da26c119..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/EjbJar11ImportStrategyImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-/**
- * Concrete implementer that knows how to import meta-data for a 1.1 Ejb Jar
- */
-public class EjbJar11ImportStrategyImpl extends XmlBasedImportStrategyImpl {
-
-	public static class Discriminator extends ArchiveTypeDiscriminatorImpl {
-		public boolean canImport(Archive anArchive) {
-			return anArchive.containsFile(J2EEConstants.EJBJAR_DD_URI);
-		}
-
-		/**
-		 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-		 */
-		public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-			return new EjbJar11ImportStrategyImpl();
-		}
-
-		public String getUnableToOpenMessage() {
-			return getXmlDDMessage(CommonArchiveResourceHandler.EJB_Jar_File, J2EEConstants.EJBJAR_DD_URI); // = "EJB Jar File"
-		}
-
-		public Archive createConvertedArchive() {
-			return getArchiveFactory().createEJBJarFile();
-		}
-	}
-
-	protected static Discriminator discriminator;
-
-	/**
-	 * EjbJar11ImportStrategy constructor comment.
-	 */
-	public EjbJar11ImportStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return getDiscriminator().createImportStrategy(old, newArchive);
-	}
-
-	public static ArchiveTypeDiscriminator getDiscriminator() {
-		if (discriminator == null) {
-			discriminator = new Discriminator();
-		}
-		return discriminator;
-	}
-
-	public EJBJarFile getEJBJarFile() {
-		return (EJBJarFile) getArchive();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public void importMetaData() throws Exception {
-		loadDeploymentDescriptor();
-	}
-
-	public void loadDeploymentDescriptor() throws Exception {
-		EJBJar ejbJar = null;
-
-		ejbJar = (EJBJar) primLoadDeploymentDescriptor();
-		getEJBJarFile().setDeploymentDescriptor(ejbJar);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ExportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ExportStrategyImpl.java
deleted file mode 100644
index fd875ea3c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ExportStrategyImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ExportStrategy;
-
-
-/**
- * Abstract implementer off which other export strategies can subclass
- * 
- * @see ExportStrategy
- */
-public abstract class ExportStrategyImpl extends ArchiveStrategyImpl implements ExportStrategy {
-	/** The list of files already saved by this strategy during invokation of preSave() */
-	protected Set savedFiles;
-
-	public ExportStrategyImpl() {
-		super();
-	}
-
-	public java.util.Set getSavedFiles() {
-		if (savedFiles == null)
-			savedFiles = new HashSet();
-		return savedFiles;
-	}
-
-	public boolean hasSaved(String uri) {
-		return savedFiles != null && getSavedFiles().contains(uri);
-	}
-
-	/**
-	 * The default is to do nothing; subclasses may wish to override; typical operations would be to
-	 * add extra elements to the outgoing archive, using SaveStrategy#save(File,
-	 * java.io.InputStream)
-	 */
-	public void preSave(SaveStrategy aSaveStrategy) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException {
-		//Default
-	}
-
-	/**
-	 * The file with the given uri has just been saved; add this to the list of saved files
-	 */
-	protected void saved(String uri) {
-		getSavedFiles().add(uri);
-	}
-
-	public void setSavedFiles(java.util.Set newSavedFiles) {
-		savedFiles = newSavedFiles;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ImportStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ImportStrategy.java
deleted file mode 100644
index b1d85cc32..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ImportStrategy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-
-/**
- * ImportStrategy knows how to interpret the information in an archive, usually in deployment
- * descriptors, to build up a model of the contained objects.
- */
-public interface ImportStrategy extends ArchiveStrategy {
-	/**
-	 * Helper method used for copying archives; create a new instance of this kind of strategy
-	 */
-	public ImportStrategy createImportStrategy(Archive old, Archive newArchive);
-
-	/**
-	 * Do whatever is necessary to bring in metadata from the archive and set the deployment
-	 * descriptors to the standard form that the apis can recognize
-	 */
-	public void importMetaData() throws Exception;
-
-	public boolean isEJB10();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ImportStrategyImpl.java
deleted file mode 100644
index 17461739a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ImportStrategyImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-
-
-/**
- * Abstract implementation off which other import strategies can subclass
- * 
- * @see ImportStrategy
- */
-public abstract class ImportStrategyImpl extends ArchiveStrategyImpl implements ImportStrategy {
-	/**
-	 * ArchiveImportStrategy constructor comment.
-	 */
-	public ImportStrategyImpl() {
-		super();
-	}
-
-	public static CommonarchiveFactory getArchiveFactory() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public boolean isEJB10() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
deleted file mode 100644
index 015dcb192..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-
-
-/**
- * LoadStrategy knows how to load or read the contents of a container. This provides a delegation
- * model for reading in the contents of an archive file. Clients can implement this interface, and
- * "plug in" to an instance of an archive. Examples might include reading from a zip file, from an
- * input stream, from the local file system, or from a workbench.
- */
-public interface LoadStrategy {
-	public void addOrReplaceMofResource(Resource aResource);
-
-	/**
-	 * Release any resources being held by this object
-	 */
-	public void close();
-
-	public boolean contains(String uri);
-
-	/**
-	 * Return the absolute path of this strategy, if it exists; cases where it might not exist is if
-	 * the load strategy is "virtual", e.g., a jar within a jar
-	 */
-	public String getAbsolutePath() throws FileNotFoundException;
-
-	/**
-	 * Return the absolute path of the root from which meta resources get loaded
-	 */
-	public String getResourcesPath() throws FileNotFoundException;
-
-	/**
-	 * Return the absolute path of the root from which classes and properties are loaded
-	 */
-	public String getBinariesPath() throws FileNotFoundException;
-
-
-	public Container getContainer();
-
-	public ResourceSet getResourceSet();
-
-	public ResourceSet primGetResourceSet();
-
-	/**
-	 * Used internally; clients should not need to call
-	 */
-	public FileIterator getFileIterator() throws IOException;
-
-	/**
-	 * Used by an archive to obtain a list of it's files, which is usually deferred until the first
-	 * time it is invoked, as an optimization.
-	 */
-	public List collectFiles();
-
-	/**
-	 * Returns an input stream on an entry named by the parameter
-	 */
-	public InputStream getInputStream(String uri) throws IOException, FileNotFoundException;
-
-	/**
-	 * Returns an input stream on an entry named by the parameter, from the "resources path" of the
-	 * loose archive if it exists, Otherwise the default behavior is the same as
-	 * {@link #getInputStream(String)}
-	 */
-	public InputStream getResourceInputStream(String uri) throws IOException;
-
-	public Collection getLoadedMofResources();
-
-	public Resource getExistingMofResource(String uri);
-
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException;
-
-	/**
-	 * An archive uses a custom class loader for java reflection within a mof resourceSet;
-	 * implementers of LoadStrategy may supply a mof resourceSet for which this class loader is not
-	 * necessary, or could even cause breakage; this test gives the strategy the chance to "opt out"
-	 * of the class loading game
-	 */
-	public boolean isClassLoaderNeeded();
-
-	/**
-	 * Returns whether this archive is reading files from a directory on the file system
-	 */
-	public boolean isDirectory();
-
-	public boolean isMofResourceLoaded(String uri);
-
-	/**
-	 * Returns whether resources can be read by this strategy
-	 */
-	public boolean isOpen();
-
-	/**
-	 * Is the parameter in use by this strategy? Needed for when the archive is saved to the same
-	 * location from which it was read
-	 */
-	public boolean isUsing(java.io.File aSystemFile);
-
-	/**
-	 * Used for optimizations, where the contents of the archive have not been changed; instead of
-	 * iterating each file in the archive, we may be able to bulk save the whole thing
-	 */
-	public boolean requiresIterationOnSave();
-
-	public Resource makeMofResource(String uri, EList extent);
-
-	public void setContainer(Container aContainer);
-
-	public void setResourceSet(ResourceSet aResourceSet);
-
-	public LooseArchive getLooseArchive();
-
-	public void setLooseArchive(LooseArchive aLooseArchive);
-	
-	public java.util.List getFiles(String subfolderPath);
-	
-	public boolean isReadOnly();
-
-	public void setReadOnly(boolean readOnly);
-
-	public int getRendererType();
-
-	public void setRendererType(int i);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
deleted file mode 100644
index 4986be9eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResouceFactorySaxRegistry;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryDomRegistry;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveURIConverterImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIteratorImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-/**
- * Abstact implementer off which and load strategy may subclass
- * 
- * @see LoadStrategy
- */
-public abstract class LoadStrategyImpl extends AdapterImpl implements LoadStrategy {
-
-	/** flag to indicate whether underlying resources have been closed */
-	protected boolean isOpen = true;
-
-	/** The archive or directory to which this strategy belongs */
-	protected Container container;
-
-	/** ResourceSet used for mof/xmi resources */
-	protected ResourceSet resourceSet;
-
-	protected LooseArchive looseArchive;
-
-	protected Map collectedLooseArchiveFiles = Collections.EMPTY_MAP;
-
-	protected boolean readOnly = false;
-
-	private int rendererType;
-
-	public LoadStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see Archive
-	 */
-	public void addOrReplaceMofResource(Resource aResource) {
-		Resource existingResource = getResourceSet().getResource(aResource.getURI(), false);
-		if (existingResource != null)
-			getResourceSet().getResources().remove(existingResource);
-		getResourceSet().getResources().add(aResource);
-	}
-
-	protected void updateModificationTracking(Resource res) {
-		boolean trackingMods = res.isTrackingModification();
-		boolean isReadOnly = (container != null) ? ((Archive) container).getOptions().isReadOnly() : false;
-		boolean shouldTrackMods = !(isReadOnly || ArchiveUtil.isJavaResource(res) || ArchiveUtil.isRegisteredURIMapping(res));
-		if (shouldTrackMods && !trackingMods)
-			res.setTrackingModification(true);
-	}
-
-	/**
-	 * Release any resources being held by this object and set the state to closed. Subclasses
-	 * should override as necessary
-	 */
-	public void close() {
-		setIsOpen(false);
-        if(resourceSet != null && resourceSet.eAdapters().contains(this))
-        	resourceSet.eAdapters().remove(this);
-
-	}
-
-	protected abstract boolean primContains(String uri);
-
-	/**
-	 * @see LoadStrategy
-	 */
-	public boolean contains(String uri) {
-		if (containsUsingLooseArchive(uri))
-			return true;
-		return primContains(uri);
-	}
-
-	/*
-	 * Try the resources path first; if that false, see if we have a child loose archive with the
-	 * uri
-	 */
-	protected boolean containsUsingLooseArchive(String uri) {
-		if (getLooseArchive() == null)
-			return false;
-
-		LooseArchive loose = getLooseArchive();
-		if (loose.getResourcesPath() == null)
-			return false;
-
-		java.io.File aFile = new java.io.File(loose.getResourcesPath(), uri);
-		if (aFile.exists())
-			return true;
-
-		return LooseConfigRegister.singleton().findFirstLooseChild(uri, loose) != null;
-	}
-
-	protected File createDirectory(String uri){
-		File aFile = null;
-		aFile = getArchiveFactory().createFile();
-		aFile.setDirectoryEntry(true);
-		aFile.setURI(uri);
-		aFile.setOriginalURI(uri);
-		aFile.setLoadingContainer(getContainer());
-		return aFile;
-	}
-	
-	protected File createFile(String uri) {
-		File aFile = null;
-		if (isArchive(uri))
-			aFile = openNestedArchive(uri);
-		if (aFile == null) {
-			aFile = getArchiveFactory().createFile();
-			aFile.setURI(uri);
-			aFile.setOriginalURI(uri);
-		}
-		aFile.setLoadingContainer(getContainer());
-		return aFile;
-	}
-
-	protected void finalize() throws Throwable {
-		if(isOpen){
-			close();
-		}
-	}
-
-	/**
-	 * @see LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws FileNotFoundException {
-		throw new FileNotFoundException(CommonArchiveResourceHandler.Absolute_path_unknown_EXC_); // = "Absolute path unknown"
-	}
-
-	public String getResourcesPath() throws FileNotFoundException {
-		return getLooseArchive() == null ? getAbsolutePath() : getLooseArchive().getResourcesPath();
-	}
-
-	protected String primGetResourcesPath() {
-		return getLooseArchive() == null ? null : getLooseArchive().getResourcesPath();
-	}
-
-	public String getBinariesPath() throws FileNotFoundException {
-		return getLooseArchive() == null ? getAbsolutePath() : getLooseArchive().getBinariesPath();
-	}
-
-	public CommonarchiveFactory getArchiveFactory() {
-		return CommonArchiveFactoryRegistry.INSTANCE.getCommonArchiveFactory();
-	}
-
-	public Container getContainer() {
-		return container;
-	}
-
-	public ResourceSet primGetResourceSet() {
-		return resourceSet;
-	}
-
-	/**
-	 * 
-	 * Should we iterate all the files in the archive as part of saving, or can we treat the archive
-	 * as one big file during save? The following rules apply, iterating the files if: 1) If the
-	 * archive is a module file and it is NOT read-only 2) If the load strategy is a directory 3) If
-	 * the archive is a utility JAR, and the files list has never been initialized, or if the
-	 * loading containers for all the files are the same AND not directories, AND the
-	 * {@link ArchiveOptions#isSaveLibrariesAsFiles()}of the archive is true.
-	 * 
-	 * @see com.ibm.etools.archive.LoadStrategy#requiresIterationOnSave()
-	 */
-	public boolean requiresIterationOnSave() {
-		if (!getContainer().isArchive() || isDirectory())
-			return true;
-		Archive anArchive = (Archive) getContainer();
-		//We should leave utility JARs intact, unless were told not to
-		//The manifest may have been signed
-		if (anArchive.isModuleFile())
-			return !anArchive.getOptions().isReadOnly();
-		else if (anArchive.getOptions().isSaveLibrariesAsFiles() && anArchive.getLoadingContainer() != null) {
-			if (anArchive.isIndexed()) {
-				List files = anArchive.getFiles();
-				File aFile = null;
-				Container firstContainer = null;
-				Container lContainer = null;
-				for (int i = 0; i < files.size(); i++) {
-					aFile = (File) files.get(i);
-					if (i == 0) {
-						firstContainer = aFile.getLoadingContainer();
-						if (firstContainer.getLoadStrategy().isDirectory())
-							return true;
-					}
-					lContainer = aFile.getLoadingContainer();
-					if (lContainer != firstContainer)
-						return true;
-				}
-			}
-			return false;
-		} else
-			return true;
-	}
-
-	public ResourceSet getResourceSet() {
-		if (resourceSet == null) {
-			initializeResourceSet();
-			resourceSet.eAdapters().add(this);
-		}
-		return resourceSet;
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		switch (msg.getEventType()) {
-			case Notification.ADD :
-				updateModificationTracking((Resource) msg.getNewValue());
-				break;
-			case Notification.ADD_MANY :
-				List list = (List) msg.getNewValue();
-				for (int i = 0; i < list.size(); i++) {
-					updateModificationTracking((Resource) list.get(i));
-				}
-			default :
-				break;
-		}
-	}
-
-	/**
-	 * Used internally; clients should not need to call
-	 */
-	public FileIterator getFileIterator() throws IOException {
-		return new FileIteratorImpl(getContainer().getFiles());
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public abstract List getFiles();
-
-	public List collectFiles() {
-		//The loose archives need to be read first
-		collectFilesFromLooseArchives();
-		List files = getFiles();
-		files.addAll(collectedLooseArchiveFiles.values());
-		collectedLooseArchiveFiles = Collections.EMPTY_MAP;
-		return files;
-	}
-
-	protected void collectFilesFromLooseArchives() {
-		if (!canHaveLooseChildren() || getLooseArchive() == null) {
-			collectedLooseArchiveFiles = Collections.EMPTY_MAP;
-			return;
-		}
-
-		collectedLooseArchiveFiles = new HashMap();
-		List children = LooseConfigRegister.singleton().getLooseChildren(getLooseArchive());
-
-		for (int i = 0; i < children.size(); i++) {
-			LooseArchive loose = (LooseArchive) children.get(i);
-			String uri = loose.getUri();
-			if (!collectedLooseArchiveFiles.containsKey(uri)) {
-				Archive archive = openNestedArchive(loose);
-				if (archive != null) {
-					collectedLooseArchiveFiles.put(uri, archive);
-					archive.setLoadingContainer(getContainer());
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public abstract InputStream getInputStream(String uri) throws IOException, FileNotFoundException;
-
-	public InputStream getResourceInputStream(String uri) throws IOException {
-		return getResourceSet().getURIConverter().createInputStream(URI.createURI(uri));
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive returns an immutable collection of the loaded
-	 *      resources in the resource set
-	 */
-	public Collection getLoadedMofResources() {
-		Collection resources = getResourceSet().getResources();
-		if (resources.isEmpty())
-			return Collections.EMPTY_LIST;
-
-		List result = new ArrayList(resources.size());
-		Iterator iter = resources.iterator();
-		while (iter.hasNext()) {
-			Resource res = (Resource) iter.next();
-			if (res.isLoaded())
-				result.add(res);
-		}
-		return result;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
-		try {
-			return getResourceSet().getResource(URI.createURI(uri), true);
-		} catch (WrappedException wrapEx) {
-			if ((ExtendedEcoreUtil.getFileNotFoundDetector().isFileNotFound(wrapEx))) {
-				FileNotFoundException fileNotFoundEx = ExtendedEcoreUtil.getInnerFileNotFoundException(wrapEx);
-				throw fileNotFoundEx;
-			}
-			throwResourceLoadException(uri, wrapEx);
-			return null; //never happens - compiler expects it though
-		}
-	}
-
-	protected void initializeResourceSet() {
-		//Not the best design here, because a load strategy should only know
-		// about
-		//container; however, this method will only get called when the
-		// container
-		//is an archive
-		Archive archive = (Archive) getContainer();
-		URIConverter converter = new ArchiveURIConverterImpl(archive, primGetResourcesPath());
-		ResourceSet rs = new ResourceSetImpl();
-		Resource.Factory.Registry reg = createResourceFactoryRegistry();
-		rs.setResourceFactoryRegistry(reg);
-		setResourceSet(rs);
-		rs.setURIConverter(converter);
-		if (archive.shouldUseJavaReflection()) {
-			rs.getAdapterFactories().add(new JavaJDKAdapterFactory());
-			archive.initializeClassLoader();
-		}
-	}
-
-	protected Resource.Factory.Registry createResourceFactoryRegistry() {
-		if (isReadOnly())
-			return new J2EEResouceFactorySaxRegistry();
-
-		Resource.Factory.Registry registry = null;
-		switch (getRendererType()) {
-			case ArchiveOptions.SAX :
-				registry = new J2EEResouceFactorySaxRegistry();
-				break;
-			case ArchiveOptions.DOM :
-				registry = new J2EEResourceFactoryDomRegistry();
-				break;
-			case ArchiveOptions.DEFAULT :
-			default :
-				registry = new J2EEResourceFactoryRegistry();
-				break;
-		}
-		return registry;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getRendererType() {
-		return rendererType;
-	}
-
-	protected boolean isArchive(String uri) {
-		return ((Archive) getContainer()).isNestedArchive(uri);
-	}
-
-	/**
-	 * An archive uses a custom class loader for java reflection within a mof resourceSet;
-	 * implementers of LoadStrategy may supply a mof resourceSet for which this class loader is not
-	 * necessary, or could even cause breakage; this test gives the strategy the chance to "opt out"
-	 * of the class loading game
-	 */
-	public boolean isClassLoaderNeeded() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy The default is false
-	 */
-	public boolean isDirectory() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy#getExistingMofResource(String)
-	 */
-	public Resource getExistingMofResource(String uri) {
-		return getResourceSet().getResource(URI.createURI(uri), false);
-	}
-
-	public boolean isMofResourceLoaded(java.lang.String uri) {
-		Resource res = getExistingMofResource(uri);
-		return res != null && res.isLoaded();
-	}
-
-	public boolean isOpen() {
-		return isOpen;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy return false by default; subclasses should override
-	 *      if necessary
-	 */
-	public boolean isUsing(java.io.File aSystemFile) {
-		return false;
-	}
-
-	public Resource makeMofResource(String uri, EList extent) {
-		Resource existing = getExistingMofResource(uri);
-		if (existing != null)
-			return existing;
-		return getResourceSet().createResource(URI.createURI(uri));
-	}
-
-	protected Archive openNestedArchive(String uri) {
-
-		try {
-			return ((Archive) getContainer()).openNestedArchive(uri);
-		} catch (OpenFailureException e) {
-			//Caught an exception trying to open the nested archive
-			Logger.getLogger().logError(e);
-			return null;
-		}
-
-	}
-
-	protected Archive openNestedArchive(LooseArchive loose) {
-
-		try {
-			return ((Archive) getContainer()).openNestedArchive(loose);
-		} catch (OpenFailureException e) {
-			//Caught an exception trying to open the nested archive
-			Logger.getLogger().logError(e);
-			return null;
-		}
-
-	}
-
-	public void setContainer(Container newContainer) {
-		container = newContainer;
-	}
-
-	public void setResourceSet(org.eclipse.emf.ecore.resource.ResourceSet newResourceSet) {
-		// fixes problem in reopen
-		if (resourceSet != newResourceSet) {
-
-			// remove adapter from old resource set
-			if (resourceSet != null)
-				resourceSet.eAdapters().remove(this);
-
-			// add as adapter to new resource set if necessary
-			if (newResourceSet != null && !newResourceSet.eAdapters().contains(this))
-				newResourceSet.eAdapters().add(this);
-
-			resourceSet = newResourceSet;
-		} // no need to update if old set equals new set (by reference)
-	}
-
-	protected void setIsOpen(boolean newIsOpen) {
-		isOpen = newIsOpen;
-	}
-
-	protected void throwResourceLoadException(String resourceUri, Exception ex) throws ResourceLoadException {
-		throw new ResourceLoadException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.load_resource_EXC_, (new Object[]{resourceUri, getContainer().getURI()})), ex); // = "Could not load resource "{0}" in archive "{1}""
-	}
-
-	/**
-	 * Gets the looseArchive.
-	 * 
-	 * @return Returns a LooseArchive
-	 */
-	public LooseArchive getLooseArchive() {
-		return looseArchive;
-	}
-
-	/**
-	 * Sets the looseArchive.
-	 * 
-	 * @param looseArchive
-	 *            The looseArchive to set
-	 */
-	public void setLooseArchive(LooseArchive looseArchive) {
-		this.looseArchive = looseArchive;
-		checkLoosePathsValid();
-	}
-
-	/*
-	 * Added to support WAS runtime; throw an ArchiveRuntimeException if one of the paths in the
-	 * loose config does not point to an existing file
-	 */
-	protected void checkLoosePathsValid() {
-		if (looseArchive == null)
-			return;
-
-		String path = looseArchive.getBinariesPath();
-		if (path != null) {
-			java.io.File ioFile = new java.io.File(path);
-			if (!ioFile.exists())
-				throw new ArchiveRuntimeException("Invalid binaries path: " + path); //$NON-NLS-1$
-		}
-		path = looseArchive.getResourcesPath();
-		if (path != null) {
-			java.io.File ioFile = new java.io.File(path);
-			if (!ioFile.exists())
-				throw new ArchiveRuntimeException("Invalid resources path: " + path); //$NON-NLS-1$
-		}
-	}
-
-	protected boolean canHaveLooseChildren() {
-		return container.isEARFile() || container.isWARFile();
-	}
-
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	public void setReadOnly(boolean readOnly) {
-		this.readOnly = readOnly;
-	}
-
-	/**
-	 * @param rendererType
-	 *            The rendererType to set.
-	 */
-	public void setRendererType(int rendererType) {
-		this.rendererType = rendererType;
-	}
-	
-	public java.util.List getFiles(String subfolderPath) {
-		List subset = new ArrayList();
-		List theFiles = getFiles();
-		for (int i = 0; i < theFiles.size(); i++) {
-			File aFile = (File)theFiles.get(i);
-			if (aFile.getURI().startsWith(subfolderPath))	
-				subset.add(aFile);
-		}
-		return subset;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/NestedArchiveLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/NestedArchiveLoadStrategyImpl.java
deleted file mode 100644
index def55bcd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/NestedArchiveLoadStrategyImpl.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.NestedJarException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.NestedArchiveIterator;
-
-
-/**
- * Load strategy used as a last resort to read entries from jars inside of jars. It is a last resort
- * because of the poor perfomance involved, as the contents of the zip entries are not cached, and
- * sequential scan searches will cause the zip stream to be inflated on each search. Whenever
- * possible,
- * 
- * @link {TempFileLoadStrategy} should be used.
- */
-public class NestedArchiveLoadStrategyImpl extends LoadStrategyImpl {
-	/**
-	 * Index to improve lookup performance - not used if in Runtime to reduce footprint
-	 */
-	protected Map urisToPositions;
-	protected LoadStrategy parent;
-
-	/**
-	 * NestedArchiveLoadStrategyImpl constructor comment.
-	 */
-	public NestedArchiveLoadStrategyImpl(LoadStrategy parentStrategy) {
-		super();
-		setParent(parentStrategy);
-	}
-
-	protected void buildIndex() {
-		Map map = new HashMap();
-		try {
-			ZipInputStream zis = getZipInputStream();
-			ZipEntry entry = null;
-			long position = 0;
-			while ((entry = zis.getNextEntry()) != null) {
-				position++;
-				map.put(entry.getName(), new Long(position));
-			}
-		} catch (IOException iox) {
-			throwNestedJarException(iox);
-		}
-		setUrisToPositions(map);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	protected boolean primContains(String uri) {
-		if (usingIndex())
-			return containsUsingIndex(uri);
-		return containsSequentially(uri);
-	}
-
-
-	protected boolean containsSequentially(String uri) {
-		ZipInputStream zis = null;
-		try {
-			zis = getZipInputStreamSkippedTo(uri);
-			return zis != null;
-		} catch (IOException ex) {
-			return false;
-		} finally {
-			if (zis != null) {
-				try {
-					zis.close();
-				} catch (IOException ioe) {
-					//Ignore
-				}
-			}
-		}
-	}
-
-
-	protected boolean containsUsingIndex(String uri) {
-		return getUrisToPositions().containsKey(uri);
-	}
-
-
-	/**
-	 * Used internally; clients should not need to call
-	 */
-	public FileIterator getFileIterator() throws IOException {
-		if (((Archive) getContainer()).getOptions().isReadOnly())
-			return new NestedArchiveIterator(getContainer().getFiles(), getZipInputStream());
-		return super.getFileIterator();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.util.List getFiles() {
-		List list = new ArrayList(500);
-		ZipInputStream zis = null;
-		try {
-			zis = getZipInputStream();
-			ZipEntry entry = zis.getNextEntry();
-			while (entry != null) {
-				if (!entry.isDirectory()) {
-					File aFile = createFile(entry.getName());
-					aFile.setSize(entry.getSize());
-					aFile.setLastModified(entry.getTime());
-					list.add(aFile);
-				}
-				entry = zis.getNextEntry();
-			}
-		} catch (IOException iox) {
-			throwNestedJarException(iox);
-		} finally {
-			if (zis != null) {
-				try {
-					zis.close();
-				} catch (IOException iox) {
-					//Ignore
-				}
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.io.InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
-		if (usingIndex())
-			return getInputStreamUsingIndex(uri);
-		return getInputStreamSequentially(uri);
-	}
-
-	protected java.io.InputStream getInputStreamSequentially(String uri) throws IOException, FileNotFoundException {
-		return new java.io.BufferedInputStream(getZipInputStreamSkippedTo(uri));
-	}
-
-	protected java.io.InputStream getInputStreamUsingIndex(String uri) throws IOException, FileNotFoundException {
-		Long position = (Long) getUrisToPositions().get(uri);
-		if (position == null)
-			throw new FileNotFoundException();
-		ZipInputStream zis = getZipInputStream();
-		long pos = position.longValue();
-		for (long i = 0; i < pos; i++) {
-			zis.getNextEntry();
-		}
-		return new java.io.BufferedInputStream(zis);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/07/00 6:12:36 PM)
-	 * 
-	 * @return com.ibm.etools.archive.LoadStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy getParent() {
-		return parent;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/07/00 4:38:21 PM)
-	 * 
-	 * @return java.util.Map
-	 */
-	public java.util.Map getUrisToPositions() {
-		if (usingIndex() && urisToPositions == null)
-			buildIndex();
-		return urisToPositions;
-	}
-
-	protected ZipInputStream getZipInputStream() throws IOException, FileNotFoundException {
-		String uri = getContainer().getURI();
-		InputStream in = getParent().getInputStream(uri);
-		return new ZipInputStream(in);
-	}
-
-	protected ZipInputStream getZipInputStreamSkippedTo(String uri) throws IOException, FileNotFoundException {
-		if (uri == null)
-			throw new NullPointerException(CommonArchiveResourceHandler.Null_uri_EXC_); // = "Null uri"
-		ZipInputStream zis = null;
-		ZipEntry entry = null;
-		try {
-			zis = getZipInputStream();
-			entry = zis.getNextEntry();
-			while (entry != null) {
-				if (uri.equals(entry.getName()))
-					return zis;
-				entry = zis.getNextEntry();
-			}
-		} finally {
-			// entry was not found so close the stream
-			if (entry == null && zis != null) {
-				try {
-					zis.close();
-				} catch (IOException ioe) {
-					//Ignore
-				}
-			}
-		}
-		throw new FileNotFoundException(uri);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/07/00 6:12:36 PM)
-	 * 
-	 * @param newParent
-	 *            com.ibm.etools.archive.LoadStrategy
-	 */
-	public void setParent(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy newParent) {
-		parent = newParent;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/07/00 4:38:21 PM)
-	 * 
-	 * @param newUrisToPositions
-	 *            java.util.Map
-	 */
-	public void setUrisToPositions(java.util.Map newUrisToPositions) {
-		urisToPositions = newUrisToPositions;
-	}
-
-	/**
-	 * An exception was caught reading the nested jar; throws a runtime exception
-	 */
-	protected void throwNestedJarException(Exception caughtException) {
-		throw new NestedJarException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.nested_jar_EXC_, (new Object[]{getContainer().getURI(), getParent().getContainer().getURI()})), caughtException);// = "An error occurred reading {0} from {1}"
-	}
-
-	/**
-	 * Don't use the index in the runtime environment; reduce footprint
-	 */
-	public boolean usingIndex() {
-		return false;
-		//return !com.ibm.etools.archive.util.ArchiveUtil.isRuntime();
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/NullLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/NullLoadStrategyImpl.java
deleted file mode 100644
index 5ef61c3f4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/NullLoadStrategyImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * No-op implementer used for new archive instances, which have their contents added and copied from
- * other sources
- */
-public class NullLoadStrategyImpl extends LoadStrategyImpl {
-	protected static List emptyList = new ArrayList(0);
-
-	/**
-	 * NullLoadStrategy constructor comment.
-	 */
-	public NullLoadStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public boolean contains(String uri) {
-		return false;
-	}
-
-	protected boolean primContains(String uri) {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.util.List getFiles() {
-		return emptyList;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.io.InputStream getInputStream(String uri) throws java.io.IOException, java.io.FileNotFoundException {
-		throw new java.io.FileNotFoundException(uri);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/RarExportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/RarExportStrategyImpl.java
deleted file mode 100644
index 87e77e3b1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/RarExportStrategyImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-
-/**
- * Concrete implementer that knows how to export meta-data for a J2C Resource Adapter
- */
-public class RarExportStrategyImpl extends ExportStrategyImpl {
-	/**
-	 * RarExportStrategy constructor comment.
-	 */
-	public RarExportStrategyImpl() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/RarImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/RarImportStrategyImpl.java
deleted file mode 100644
index 5a8dc180f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/RarImportStrategyImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.jca.Connector;
-
-
-/**
- * Concrete implementer that knows how to import meta-data for a J2C Resource Adapter
- */
-public class RarImportStrategyImpl extends XmlBasedImportStrategyImpl {
-
-	public static class Discriminator extends ArchiveTypeDiscriminatorImpl {
-		public boolean canImport(Archive anArchive) {
-			return anArchive.containsFile(J2EEConstants.RAR_DD_URI);
-		}
-
-		/**
-		 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-		 */
-		public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-			return new RarImportStrategyImpl();
-		}
-
-		public String getUnableToOpenMessage() {
-			return getXmlDDMessage(CommonArchiveResourceHandler.RAR_File, J2EEConstants.RAR_DD_URI); // = "RAR File"
-		}
-
-		public Archive createConvertedArchive() {
-			return getArchiveFactory().createRARFile();
-		}
-	}
-
-	protected static Discriminator discriminator;
-
-	/**
-	 * RarImportStrategy constructor comment.
-	 */
-	public RarImportStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return getDiscriminator().createImportStrategy(old, newArchive);
-	}
-
-	public static ArchiveTypeDiscriminator getDiscriminator() {
-		if (discriminator == null) {
-			discriminator = new Discriminator();
-			// Connectors use their own special entity resolver for now...
-			J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.CONNECTOR_SYSTEMID_1_0, "connector_1_0.dtd"); //$NON-NLS-1$
-		}
-		return discriminator;
-	}
-
-	public RARFile getRARFile() {
-		return (RARFile) getArchive();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public void importMetaData() throws Exception {
-		loadDeploymentDescriptor();
-	}
-
-	public void loadDeploymentDescriptor() throws Exception {
-		Connector connector = null;
-
-		connector = (Connector) primLoadDeploymentDescriptor();
-		getRARFile().setDeploymentDescriptor(connector);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ReadOnlyDirectoryLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ReadOnlyDirectoryLoadStrategyImpl.java
deleted file mode 100644
index cf08edb88..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ReadOnlyDirectoryLoadStrategyImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-
-public class ReadOnlyDirectoryLoadStrategyImpl extends DirectoryLoadStrategyImpl {
-	protected java.io.File subdirectory;
-
-	/**
-	 * ReadOnlyDirectoryLoadStrategy constructor comment.
-	 */
-	public ReadOnlyDirectoryLoadStrategyImpl(String aDirectoryUri) {
-		super(aDirectoryUri);
-	}
-
-	/**
-	 * ReadOnlyDirectoryLoadStrategy constructor comment.
-	 */
-	public ReadOnlyDirectoryLoadStrategyImpl(String rootDirectoryUri, java.io.File subdir) {
-		super(rootDirectoryUri);
-		setSubdirectory(subdir);
-	}
-
-	/**
-	 * addDirectory method comment.
-	 */
-	protected void addDirectory(java.io.File aFile, java.util.List aList) {
-		ReadOnlyDirectory dir = getArchiveFactory().createReadOnlyDirectory();
-		dir.setLastModified(aFile.lastModified());
-		dir.setURI(getURIFrom(aFile));
-		dir.setLoadingContainer(getContainer());
-		dir.setLoadStrategy(new ReadOnlyDirectoryLoadStrategyImpl(getDirectoryUri(), aFile));
-		aList.add(dir);
-
-	}
-
-	public boolean contains(java.lang.String uri) {
-		return super.contains(uri) && (getSubdirectory() == null || subdirectoryContains(uri));
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		java.io.File subdir = getSubdirectory();
-		if (subdir == null) {
-			return super.getAbsolutePath();
-		}
-		return subdir.getAbsolutePath();
-	}
-
-	/**
-	 * getDirectoryForList method comment.
-	 */
-	protected java.io.File getDirectoryForList() {
-		if (getSubdirectory() != null)
-			return getSubdirectory();
-		return new java.io.File(getDirectoryUri());
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (01/08/01 1:10:47 PM)
-	 * 
-	 * @return java.io.File
-	 */
-	protected java.io.File getSubdirectory() {
-		return subdirectory;
-	}
-
-	/**
-	 * Always return false, because we want to treat the entries in a file system directory as basic
-	 * files
-	 */
-	protected boolean isArchive(String uri) {
-		return false;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (01/08/01 1:10:47 PM)
-	 * 
-	 * @param newSubdirectory
-	 *            java.io.File
-	 */
-	protected void setSubdirectory(java.io.File newSubdirectory) {
-		subdirectory = newSubdirectory;
-	}
-
-	protected boolean subdirectoryContains(String uri) {
-		if (getSubdirectory() == null)
-			return false;
-		java.io.File aFile = new java.io.File(getFileNameFrom(uri)).getParentFile();
-		boolean contains = false;
-		while (aFile != null && !contains) {
-			if (getSubdirectory().equals(aFile)) {
-				contains = true;
-			} else {
-				aFile = aFile.getParentFile();
-			}
-		}
-		return contains;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/SaveStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/SaveStrategy.java
deleted file mode 100644
index d3bce2cb3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/SaveStrategy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-
-
-/**
- * Knows how to export the contents of an archive file. This provides a delegation model saving the
- * archive. Examples might include exporting to a zip output stream, to the file system, or into a
- * workbench.
- */
-public interface SaveStrategy extends ArchiveStrategy {
-	/**
-	 * Close and release any resources being held by this object
-	 */
-	public void close() throws java.io.IOException;
-
-	/**
-	 * Notify resources if necessary that save is complete for this archive, being careful not to
-	 * close any resources that a parent archive might still be using
-	 */
-	public void finish() throws java.io.IOException;
-
-	public SaveFilter getFilter();
-
-	/**
-	 * Returns whether this archive is saving files to a directory on the file system
-	 */
-	public boolean isDirectory();
-
-	public void save() throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-
-	public void save(ArchiveManifest aManifest) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-
-	public void save(File aFile, FileIterator iterator) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-
-	public void save(File aFile, java.io.InputStream in) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-
-	public void saveMofResource(Resource aResource) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-
-	public void setFilter(SaveFilter aFilter);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/SaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/SaveStrategyImpl.java
deleted file mode 100644
index bd998054a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/SaveStrategyImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilterImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-
-
-/**
- * Abstract implementer off which any save strategy can subclass
- * 
- * @see com.ibm.etools.archive.SaveStrategy
- */
-
-public abstract class SaveStrategyImpl extends ArchiveStrategyImpl implements SaveStrategy {
-	protected SaveFilter filter;
-
-	/**
-	 * SaveStrategyImpl constructor comment.
-	 */
-	public SaveStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * The default is to do nothing - subclasses should override as necessary
-	 */
-	public void close() throws java.io.IOException {
-		//Default
-	}
-
-	protected abstract SaveStrategy createNestedSaveStrategy(Archive anArchive) throws java.io.IOException;
-
-	/**
-	 * The default is to do nothing - subclasses should override as necessary
-	 */
-	public void finish() throws java.io.IOException {
-		//Default
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/28/01 4:11:28 PM)
-	 * 
-	 * @return com.ibm.etools.archive.SaveFilter
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter getFilter() {
-		if (filter == null)
-			filter = new SaveFilterImpl();
-		return filter;
-	}
-
-	protected abstract OutputStream getOutputStreamForResource(Resource aResource) throws java.io.IOException;
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public boolean isDirectory() {
-		return false;
-	}
-
-	protected boolean isLoadedResourceOrManifest(File aFile) {
-		return getArchive().isMofResourceLoaded(aFile.getURI()) || aFile.getURI().equals(J2EEConstants.MANIFEST_URI);
-	}
-
-	public void save() throws SaveFailureException {
-
-		saveManifest();
-		saveMofResources();
-		saveFiles();
-
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public void save(Archive anArchive) throws SaveFailureException {
-		SaveStrategy strat = null;
-		try {
-			strat = createNestedSaveStrategy(anArchive);
-		} catch (java.io.IOException iox) {
-			throw new SaveFailureException(anArchive.getURI(), iox);
-		}
-		anArchive.save(strat);
-
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public void save(File aFile, FileIterator iterator) throws SaveFailureException {
-		if (aFile.isArchive() && shouldIterateOver((Archive) aFile))
-			save((Archive) aFile);
-		else {
-			InputStream in = null;
-			if (!aFile.isDirectoryEntry()) {
-				try {
-					in = iterator.getInputStream(aFile);
-				} catch (IOException ex) {
-					throw new SaveFailureException(aFile.getURI(), ex);
-				}
-			}
-			save(aFile, in);
-		}
-	}
-
-	public abstract void save(File aFile, InputStream in) throws SaveFailureException;
-
-	protected void saveFiles() throws SaveFailureException {
-		try {
-			FileIterator iterator = getArchive().getFilesForSave();
-			while (iterator.hasNext()) {
-				File aFile = iterator.next();
-				if (shouldSave(aFile))
-					save(aFile, iterator);
-			}
-		} catch (IOException iox) {
-			throw new SaveFailureException(CommonArchiveResourceHandler.Error_occurred_iterating_f_EXC_, iox); // = "Error occurred iterating files"
-		}
-	}
-
-	protected void saveManifest() throws SaveFailureException {
-		if (!shouldSave(J2EEConstants.MANIFEST_URI))
-			return;
-		ArchiveManifest mf = getArchive().getManifest();
-		if (mf.getManifestVersion() == null || mf.getManifestVersion().equals(""))//$NON-NLS-1$
-			mf.setManifestVersion("1.0");//$NON-NLS-1$
-		save(mf);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public void saveMofResource(org.eclipse.emf.ecore.resource.Resource aResource) throws SaveFailureException {
-		if (!shouldSave(aResource))
-			return;
-		setEncoding(aResource);
-		try {
-			boolean wasModified = aResource.isModified();
-			OutputStream os = getOutputStreamForResource(aResource);
-			saveMofResource(aResource, os);
-			aResource.setModified(wasModified);
-		} catch (Exception e) {
-			throw new SaveFailureException(aResource.getURI().toString(), e);
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	protected void saveMofResource(org.eclipse.emf.ecore.resource.Resource aResource, OutputStream os) throws IOException {
-		aResource.save(os, Collections.EMPTY_MAP);
-	}
-
-	protected void saveMofResources() throws SaveFailureException {
-		Iterator iterator = getArchive().getLoadedMofResources().iterator();
-		//We have to go through this process because java resources could get added during the
-		//process of iterating and saving, and adding to a collection while iterating causes a
-		// failure
-		List xmiResources = new ArrayList();
-		//We will save the xmi resources first, then the xml resources. This way the
-		//any necessary id's for referenced objects will have been generated prior to save
-		List xmlResources = new ArrayList();
-		Resource res = null;
-		while (iterator.hasNext()) {
-			res = (Resource) iterator.next();
-			//		We don't want to save the java reflection resources or uri mapped resources
-			if (!ArchiveUtil.isJavaResource(res) && !ArchiveUtil.isRegisteredURIMapping(res) && !ArchiveUtil.isPlatformMetaResource(res)) {
-				Revisit.revisit();
-				//For now, always use the mof5 format
-				if (res instanceof CompatibilityXMIResource)
-					((CompatibilityXMIResource) res).setFormat(CompatibilityXMIResource.FORMAT_MOF5);
-				if (res instanceof TranslatorResource)
-					xmlResources.add(res);
-				else {
-					xmiResources.add(res);
-				}
-			}
-		}
-		basicSaveMofResources(xmiResources);
-		basicSaveMofResources(xmlResources);
-	}
-
-	protected void basicSaveMofResources(List resources) throws SaveFailureException {
-		Resource res = null;
-		for (int i = 0; i < resources.size(); i++) {
-			res = (Resource) resources.get(i);
-			saveMofResource(res);
-
-		}
-	}
-
-	protected void setEncoding(Resource aResource) {
-		if (aResource instanceof org.eclipse.emf.ecore.xmi.XMLResource)
-			((org.eclipse.emf.ecore.xmi.XMLResource) aResource).setEncoding(archive.getXmlEncoding());
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (02/28/01 4:11:28 PM)
-	 * 
-	 * @param newFilter
-	 *            com.ibm.etools.archive.SaveFilter
-	 */
-	public void setFilter(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter newFilter) {
-		filter = newFilter;
-	}
-
-	/**
-	 * Answer whether the nested archive needs to be saved one file at a time, or if we can bulk
-	 * save it from the original
-	 */
-	protected boolean shouldIterateOver(Archive anArchive) {
-		return anArchive.getLoadStrategy().requiresIterationOnSave();
-	}
-
-	protected boolean shouldSave(File aFile) {
-		boolean loaded = isLoadedResourceOrManifest(aFile);
-		if (loaded) {
-			Resource res = archive.getLoadStrategy().getExistingMofResource(aFile.getURI());
-			if (res == null)
-				return false;
-			//must be manifest
-			return !shouldSave(res);
-		}
-
-		if (getArchive().isModuleFile()) {
-			ModuleFile m = (ModuleFile) getArchive();
-			if (m.getExportStrategy() != null && m.getExportStrategy().hasSaved(aFile.getURI()))
-				return false;
-		}
-		return shouldSave(aFile.getURI());
-	}
-
-	protected boolean shouldSave(Resource res) {
-		if (!res.isModified() && getArchive().getOptions().saveOnlyDirtyMofResources())
-			return false;
-
-		return shouldSave(res.getURI().toString());
-	}
-
-
-	/**
-	 * This is the one method through which all elements of an archive (file, nested archive, mof
-	 * resource, or manifest) will be tested before saving. Subclasses can override to do something
-	 * more specific
-	 */
-	protected boolean shouldSave(String uri) {
-		return getFilter().shouldSave(uri, getArchive());
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/TempZipFileLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/TempZipFileLoadStrategyImpl.java
deleted file mode 100644
index 2ada33124..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/TempZipFileLoadStrategyImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.DeleteOnExitUtility;
-
-
-/**
- * Used as an optimization for reading jars within jars. Reading from a ZipFile is much faster than
- * from a ZipInputStream, therefore, when possible, it makes sense to copy the nested jar to a temp
- * file. It is the responsibility of the caller to ensure that the temp file gets deleted on normal
- * system exit, using the helper method on java.io.File. This strategy will also delete the file
- * when closed or finalized.
- */
-public class TempZipFileLoadStrategyImpl extends ZipFileLoadStrategyImpl {
-	/**
-	 * TemporaryZipFileLoadStrategyImpl constructor comment.
-	 */
-	public TempZipFileLoadStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * TemporaryZipFileLoadStrategyImpl constructor comment.
-	 * 
-	 * @param file
-	 *            java.io.File
-	 * @throws java.io.IOException
-	 *             The exception description.
-	 */
-	public TempZipFileLoadStrategyImpl(java.io.File file) throws java.io.IOException {
-		super(file);
-	}
-
-	public void close() {
-		super.close();
-		File file = getFile();
-		file.delete();
-		DeleteOnExitUtility.fileHasBeenDeleted(file);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		throw new FileNotFoundException(CommonArchiveResourceHandler.Absolute_path_unknown_EXC_); // = "Absolute path unknown"
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/War22ExportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/War22ExportStrategyImpl.java
deleted file mode 100644
index 2120efce9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/War22ExportStrategyImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-
-/**
- * Concrete implementer that knows how to export meta-data for a 2.2 Web app
- */
-public class War22ExportStrategyImpl extends ExportStrategyImpl {
-	/**
-	 * War22ExportStrategy constructor comment.
-	 */
-	public War22ExportStrategyImpl() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/War22ImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/War22ImportStrategyImpl.java
deleted file mode 100644
index f45d65de9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/War22ImportStrategyImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * Concrete implementer that knows how to import meta-data for a 2.2 Web app
- */
-public class War22ImportStrategyImpl extends XmlBasedImportStrategyImpl {
-
-	public static class Discriminator extends ArchiveTypeDiscriminatorImpl {
-		public boolean canImport(Archive anArchive) {
-			return anArchive.containsFile(J2EEConstants.WEBAPP_DD_URI);
-		}
-
-		/**
-		 * @see com.ibm.etools.archive.ArchiveTypeDiscriminator
-		 */
-		public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-			return new War22ImportStrategyImpl();
-		}
-
-		public String getUnableToOpenMessage() {
-			return getXmlDDMessage(CommonArchiveResourceHandler.WAR_File, J2EEConstants.WEBAPP_DD_URI); // = "WAR File"
-		}
-
-		public Archive createConvertedArchive() {
-			return getArchiveFactory().createWARFile();
-		}
-	}
-
-	protected static Discriminator discriminator;
-
-	/**
-	 * War22ImportStrategy constructor comment.
-	 */
-	public War22ImportStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-		return getDiscriminator().createImportStrategy(old, newArchive);
-	}
-
-	public static ArchiveTypeDiscriminator getDiscriminator() {
-		if (discriminator == null) {
-			discriminator = new Discriminator();
-		}
-		return discriminator;
-	}
-
-	public WARFile getWARFile() {
-		return (WARFile) getArchive();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ImportStrategy
-	 */
-	public void importMetaData() throws Exception {
-		loadDeploymentDescriptor();
-	}
-
-	public void loadDeploymentDescriptor() throws Exception {
-
-		WebApp webapp = null;
-		webapp = (WebApp) primLoadDeploymentDescriptor();
-
-		getWARFile().setDeploymentDescriptor(webapp);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/XmlBasedImportStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/XmlBasedImportStrategyImpl.java
deleted file mode 100644
index f36bfe0e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/XmlBasedImportStrategyImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * Abstract implementer for archives that use xml deployment descriptors
- */
-public abstract class XmlBasedImportStrategyImpl extends ImportStrategyImpl {
-	/**
-	 * XmlBasedImportStrategy constructor comment.
-	 */
-	public XmlBasedImportStrategyImpl() {
-		super();
-	}
-
-	public ModuleFile getModuleFile() {
-		return (ModuleFile) getArchive();
-	}
-
-	protected EObject primLoadDeploymentDescriptor() throws Exception {
-		Resource resource = null;
-
-		resource = getModuleFile().getDeploymentDescriptorResource();
-		EObject root = null;
-
-		root = ArchiveUtil.getRoot(resource);
-
-		return root;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipFileLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipFileLoadStrategyImpl.java
deleted file mode 100644
index 5f9c188d8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipFileLoadStrategyImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-
-
-/**
- * Implementer that knows how to read files from a zip/jar file on the local file system
- * 
- * @see LoadStrategy
- */
-
-public class ZipFileLoadStrategyImpl extends LoadStrategyImpl {
-	protected java.io.File file;
-	protected ZipFile zipFile;
-
-	/**
-	 * ZipFileLoadStrategy constructor comment.
-	 */
-	public ZipFileLoadStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * ZipFileLoadStrategy constructor comment.
-	 */
-	public ZipFileLoadStrategyImpl(java.io.File file) throws IOException {
-		super();
-		setFile(file);
-		setZipFile(new ZipFile(file));
-	}
-
-	public void close() {
-		super.close();
-		try {
-			getZipFile().close();
-		} catch (Throwable t) {
-			//Ignore
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	protected boolean primContains(java.lang.String uri) {
-		return getZipFile().getEntry(uri) != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		return getFile().getAbsolutePath();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/20/00 4:40:14 PM)
-	 * 
-	 * @return java.io.File
-	 */
-	public java.io.File getFile() {
-		return file;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.util.List getFiles() {
-		List list = new ArrayList();
-		Enumeration entries = getZipFile().entries();
-		while (entries.hasMoreElements()) {
-			ZipEntry entry = (ZipEntry) entries.nextElement();
-			if (!entry.isDirectory()){
-				if(!collectedLooseArchiveFiles.containsKey(entry.getName())) {
-					File aFile = createFile(entry.getName());
-					aFile.setSize(entry.getSize());
-					aFile.setLastModified(entry.getTime());
-					list.add(aFile);
-				}
-			} else {
-				File aFile = createDirectory(entry.getName());
-				aFile.setDirectoryEntry(true);
-				aFile.setSize(entry.getSize());
-				aFile.setLastModified(entry.getTime());
-				list.add(aFile);
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.io.InputStream getInputStream(java.lang.String uri) throws IOException, FileNotFoundException {
-		try {
-			ZipEntry entry = getZipFile().getEntry(uri);
-			if (entry == null)
-				throw new FileNotFoundException(uri);
-
-			return new java.io.BufferedInputStream(getZipFile().getInputStream(entry));
-		} catch (IllegalStateException zipClosed) {
-			throw new IOException(zipClosed.toString());
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/01/00 11:28:12 AM)
-	 * 
-	 * @return java.util.zip.ZipFile
-	 */
-	public java.util.zip.ZipFile getZipFile() {
-		return zipFile;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public boolean isUsing(java.io.File aSystemFile) {
-		return getFile() != null && getFile().equals(aSystemFile);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/20/00 4:40:14 PM)
-	 * 
-	 * @param newFile
-	 *            java.io.File
-	 */
-	public void setFile(java.io.File newFile) {
-		file = newFile;
-	}
-
-
-	/**
-	 * Insert the method's description here. Creation date: (11/01/00 11:28:12 AM)
-	 * 
-	 * @param newZipFile
-	 *            java.util.zip.ZipFile
-	 */
-	public void setZipFile(java.util.zip.ZipFile newZipFile) {
-		zipFile = newZipFile;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipStreamSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipStreamSaveStrategyImpl.java
deleted file mode 100644
index 9fee0c8bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipStreamSaveStrategyImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityURIConverter;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-
-
-/**
- * This is a concrete implentation of SaveStrategy. All the contents of the archive, including xmi
- * resources, will be output to a ZipOutputStream. The output stream should be passed in by the
- * client.
- */
-public class ZipStreamSaveStrategyImpl extends SaveStrategyImpl implements SaveStrategy {
-	protected OutputStream destinationStream;
-	/** Used internally */
-	protected ZipOutputStream zipOutputStream;
-
-	/**
-	 * Wraps a new zip output stream around the parameter
-	 */
-	public ZipStreamSaveStrategyImpl(OutputStream out) {
-		setDestinationStream(out);
-		setZipOutputStream(new ZipOutputStream(out));
-	}
-
-	public void close() throws IOException {
-		getDestinationStream().close();
-	}
-
-	protected SaveStrategy createNestedSaveStrategy(Archive anArchive) {
-		return new ZipStreamSaveStrategyImpl(getZipOutputStream());
-	}
-
-	public void finish() throws IOException {
-		getZipOutputStream().finish();
-		//If this is not nested, close the stream to free up the resource
-		//otherwise, don't close it because the parent may not be done
-		if (!(getDestinationStream() instanceof ZipOutputStream))
-			getDestinationStream().close();
-	}
-
-	/**
-	 * @return java.io.OutputStream
-	 */
-	public java.io.OutputStream getDestinationStream() {
-		return destinationStream;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.SaveStrategyImpl
-	 */
-	protected java.io.OutputStream getOutputStreamForResource(Resource aResource) throws java.io.IOException {
-		return getZipOutputStream();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy#saveMofResource(Resource)
-	 */
-	public void saveMofResource(Resource aResource, OutputStream out) throws IOException {
-		Revisit.revisit();
-		URI uri = aResource.getURI();
-		//Ensure container relative URI
-		URIConverter conv = getArchive().getResourceSet().getURIConverter();
-		if (conv instanceof CompatibilityURIConverter)
-			uri = ((CompatibilityURIConverter) conv).deNormalize(uri);
-		ZipEntry entry = new ZipEntry(uri.toString());
-		zipOutputStream.putNextEntry(entry);
-		super.saveMofResource(aResource, out);
-		zipOutputStream.closeEntry();
-	}
-
-	/**
-	 * @return java.util.zip.ZipOutputStream
-	 */
-	protected java.util.zip.ZipOutputStream getZipOutputStream() {
-		return zipOutputStream;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.SaveStrategy
-	 */
-	public void save(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest aManifest) throws SaveFailureException {
-		try {
-			ZipEntry entry = new ZipEntry(J2EEConstants.MANIFEST_URI);
-			getZipOutputStream().putNextEntry(entry);
-			aManifest.write(getZipOutputStream());
-			getZipOutputStream().closeEntry();
-		} catch (IOException iox) {
-			throw new SaveFailureException(J2EEConstants.MANIFEST_URI, iox);
-		}
-	}
-
-	public void save(Archive anArchive) throws SaveFailureException {
-		try {
-			ZipEntry entry = new ZipEntry(anArchive.getURI());
-			getZipOutputStream().putNextEntry(entry);
-			super.save(anArchive);
-			getZipOutputStream().closeEntry();
-		} catch (IOException iox) {
-			throw new SaveFailureException(anArchive.getURI(), iox);
-		}
-	}
-
-	public void save(File aFile, InputStream in) throws SaveFailureException {
-		try {
-			String entryName = aFile.getURI();
-			if (aFile.isDirectoryEntry() && !entryName.endsWith("/"))//$NON-NLS-1$
-				entryName = entryName + '/';
-			ZipEntry entry = new ZipEntry(entryName);
-			if (aFile.getLastModified() > 0)
-				entry.setTime(aFile.getLastModified());
-			getZipOutputStream().putNextEntry(entry);
-			if (!aFile.isDirectoryEntry()) {
-				org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.copy(in, getZipOutputStream());
-			}
-			getZipOutputStream().closeEntry();
-		} catch (IOException iox) {
-			throw new SaveFailureException(aFile.getURI(), iox);
-		}
-	}
-
-	/**
-	 * @param newDestinationStream
-	 *            java.io.OutputStream
-	 */
-	public void setDestinationStream(java.io.OutputStream newDestinationStream) {
-		destinationStream = newDestinationStream;
-	}
-
-	/**
-	 * @param newZipOutputStream
-	 *            java.util.zip.ZipOutputStream
-	 */
-	protected void setZipOutputStream(java.util.zip.ZipOutputStream newZipOutputStream) {
-		zipOutputStream = newZipOutputStream;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveFileDynamicClassLoader.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveFileDynamicClassLoader.java
deleted file mode 100644
index eb945c277..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveFileDynamicClassLoader.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-
-
-/**
- * Class loader which loads a given set of classes stored in byte arrays. (Assumption: System
- * classes and those in the set are the only classes needed to resolve each one)
- */
-
-public class ArchiveFileDynamicClassLoader extends ClassLoader {
-	protected Archive archive = null;
-	protected ClassLoader extraClassLoader;
-	protected boolean inEARFile;
-	private static final String URL_PROTOCOL = "archive";
-	private ArchiveURLStreamHandler handler;
-
-	public ArchiveFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		super(parentCl);
-		setArchive(anArchive);
-		setExtraClassLoader(extraCl);
-		inEARFile = anArchive.getContainer() != null && anArchive.getContainer().isEARFile();
-		handler = new ArchiveURLStreamHandler();
-	}
-
-	/**
-	 * Loads a specified class. This gets called only after the parent class loader has had it's
-	 * chance, based on the Java2 delegation model
-	 */
-	protected Class findClass(String name) throws ClassNotFoundException {
-
-		Class result;
-		// Load class bytes from current set of class byte[]'s
-		byte[] bytes = getClassBytesFor(name);
-
-		if (bytes != null) {
-			result = defineClass(name, bytes, 0, bytes.length);
-			if (result == null) {
-				throw new ClassNotFoundException(name);
-			} // endif
-		} else {
-			throw new ClassNotFoundException(name);
-		} // endif
-		return result;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/00 9:59:57 PM)
-	 * 
-	 * @return com.ibm.etools.commonarchive.Archive
-	 */
-	public Archive getArchive() {
-		return archive;
-	}
-
-	private byte[] getData(File file) {
-		if (null != file) {
-			try {
-				return ArchiveUtil.inputStreamToBytes(file.getInputStream());
-			} catch (FileNotFoundException e) {
-				return null;
-			} catch (IOException e) {
-				throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.io_ex_loading_EXC_, (new Object[]{file.getName()})), e); // = "An IO exception occurred loading "			}
-			}
-		}
-		return null;
-	}
-
-	protected byte[] getClassBytesFor(String className) {
-		if (className == null)
-			return null;
-		// Change the class name to a jar entry name
-		String jarEntryName = ArchiveUtil.classNameToUri(className);
-		return getData(getFile(jarEntryName));
-	}
-
-	protected EARFile getEARFile() {
-		return (EARFile) getArchive().getContainer();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/21/00 6:58:05 PM)
-	 * 
-	 * @return java.lang.ClassLoader
-	 */
-	public java.lang.ClassLoader getExtraClassLoader() {
-		return extraClassLoader;
-	}
-
-	/**
-	 * Used for dynamic class loading in dependent jars in ears; the set is used to terminate a
-	 * cycle if one exists; the cycle is invalid, but you never know what people might try...
-	 */
-	protected synchronized Class loadClass(String name, Set visitedArchives) throws ClassNotFoundException {
-		if (visitedArchives.contains(getArchive()))
-			throw new ClassNotFoundException(name);
-		visitedArchives.add(getArchive());
-		try {
-			return super.loadClass(name, false);
-		} catch (ClassNotFoundException ex) {
-			return loadClassInDependentJarInEAR(name, visitedArchives);
-		}
-	}
-
-	protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
-		try {
-			return super.loadClass(name, resolve);
-		} catch (ClassNotFoundException ex) {
-			Class c = loadClassInDependentJar(name);
-			if (c != null && resolve)
-				resolveClass(c);
-			return c;
-		}
-	}
-
-	protected Class loadClassInDependentJar(String name) throws ClassNotFoundException {
-
-		if (inEARFile) {
-			return loadClassInDependentJarInEAR(name);
-		} else if (getExtraClassLoader() != null) {
-			return getExtraClassLoader().loadClass(name);
-		}
-		throw new ClassNotFoundException(name);
-	}
-
-	protected Class loadClassInDependentJarInEAR(String name, Set visitedArchives) throws ClassNotFoundException {
-		Object obj = getResourceInDependentJarInEAR(name, visitedArchives, CLASS_TYPE);
-		if (obj == null) {
-			throw new ClassNotFoundException(name);
-		}
-		return (Class) obj;
-	}
-
-	protected Class loadClassInDependentJarInEAR(String name) throws ClassNotFoundException {
-		Object obj = getResourceInDependentJarInEAR(name, CLASS_TYPE);
-		if (obj == null) {
-			throw new ClassNotFoundException(name);
-		}
-		return (Class) obj;
-	}
-
-	protected File getFileFromDependentJar(String name) {
-		Object obj = getResourceInDependentJarInEAR(name, FILE_TYPE);
-		if (obj != null) {
-			return (File) obj;
-		}
-		return null;
-	}
-
-	protected static final int CLASS_TYPE = 0;
-	protected static final int FILE_TYPE = 1;
-
-	protected Object getResourceInDependentJarInEAR(String name, int type) {
-		Set visitedArchives = new HashSet(5);
-		visitedArchives.add(getArchive());
-		return getResourceInDependentJarInEAR(name, visitedArchives, type);
-	}
-
-	protected Object getResourceInDependentJarInEAR(String name, Set visitedArchives, int type) {
-		String[] classpath = archive.getManifest().getClassPathTokenized();
-		for (int i = 0; i < classpath.length; i++) {
-			try {
-				String uri = ArchiveUtil.deriveEARRelativeURI(classpath[i], archive);
-				if (uri == null)
-					continue;
-				File jarFile = getEARFile().getFile(uri);
-				if (jarFile.isArchive()) {
-					Archive dep = (Archive) jarFile;
-					switch (type) {
-						case CLASS_TYPE :
-							try {
-								return ((ArchiveFileDynamicClassLoader) dep.getArchiveClassLoader()).loadClass(name, visitedArchives);
-							} catch (ClassNotFoundException noDice) {
-								continue;
-							}
-						case FILE_TYPE :
-							try {
-								return dep.getFile(name);
-							} catch (FileNotFoundException noDice) {
-								continue;
-							}
-					}
-				}
-			} catch (java.io.FileNotFoundException depJarNotInEAR) {
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/00 9:59:57 PM)
-	 * 
-	 * @param newArchive
-	 *            com.ibm.etools.commonarchive.Archive
-	 */
-	public void setArchive(Archive newArchive) {
-		archive = newArchive;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/21/00 6:58:05 PM)
-	 * 
-	 * @param newExtraClassLoader
-	 *            java.lang.ClassLoader
-	 */
-	public void setExtraClassLoader(java.lang.ClassLoader newExtraClassLoader) {
-		extraClassLoader = newExtraClassLoader;
-	}
-
-	public InputStream getResourceAsStream(String name) {
-		try {
-			File file = getFile(name);
-			if (null != file) {
-				return file.getInputStream();
-			}
-		} catch (IOException e) {
-			throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.io_ex_loading_EXC_, (new Object[]{name})), e); // = "An IO exception occurred loading "
-		}
-		return null;
-	}
-
-	protected File getFileFromArchive(String name) {
-		try {
-			return getArchive().getFile(name);
-		} catch (FileNotFoundException e) {
-		}
-		return null;
-	}
-
-
-
-	protected File getFile(String name) {
-		File file = getFileFromArchive(name);
-		if (file == null) {
-			file = getFileFromDependentJar(name);
-		}
-		return file;
-	}
-
-	protected URL findResource(String name) {
-		if (getFile(name) != null) {
-			try {
-				return new URL(null, URL_PROTOCOL + "://" + name, handler);
-			} catch (MalformedURLException e) {
-				e.printStackTrace();
-				throw new RuntimeException(e);
-			}
-		}
-		return null;
-	}
-
-	private class ArchiveURLStreamHandler extends URLStreamHandler {
-		public ArchiveURLStreamHandler() {
-		}
-
-		protected URLConnection openConnection(URL url) throws IOException {
-			return new ArchiveURLConnection(url);
-		}
-	}
-
-	private class ArchiveURLConnection extends URLConnection {
-		private String resourceName;
-
-		protected ArchiveURLConnection(URL url) {
-			super(url);
-			resourceName = url.toString().substring(URL_PROTOCOL.length() + 3);
-		}
-
-		public void connect() throws IOException {
-		}
-
-		public InputStream getInputStream() throws IOException {
-			return getResourceAsStream(resourceName);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveUtil.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveUtil.java
deleted file mode 100644
index dabc96014..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveUtil.java
+++ /dev/null
@@ -1,874 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.URIMappingRegistryImpl;
-import org.eclipse.jem.java.JavaURL;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.EmptyResourceException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveURIConverterImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.xml.GeneralXmlDocumentReader;
-import org.eclipse.jst.j2ee.internal.xml.XmlDocumentReader;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * This is a utility class to hold helper methods common to multiple classes in the archive support
- * packages
- */
-public class ArchiveUtil {
-	public static final String DOT_CLASS = ".class"; //$NON-NLS-1$
-
-	public static final String DOT_JAVA = ".java"; //$NON-NLS-1$
-
-	public static final String DOT_SQLJ = ".sqlj"; //$NON-NLS-1$
-	
-	public static final String DOT_JSP = ".jsp"; //$NON-NLS-1$
-
-	protected static boolean isRuntime = false;
-
-	/**
-	 * Flag to indicate whether the temp directory should be used for extracting nested jars for
-	 * read; defaults to true
-	 */
-	protected static boolean shouldUseTempDirectoryForRead = true;
-
-	/**
-	 * Settable name for the temp directory; must resolve to a valid file on the file system; if not
-	 * specified, defaults to the system temp directory
-	 */
-	protected static String tempDirectoryName;
-
-	protected static java.io.File tempDirectory;
-
-	public static String classNameToJavaUri(String className) {
-		return className.replace('.', '/').concat(DOT_JAVA);
-	}
-
-	public static String classNameToUri(String className) {
-		return className.replace('.', '/').concat(DOT_CLASS);
-	}
-
-	/**
-	 * For a given uri of a .class file, derive the uri of the .java file; takes into consideration
-	 * inner classes by splitting on the first occurrence of '$'
-	 * 
-	 * @return String a uri or null if the input is null or doesn't end with ".class"
-	 */
-	public static String classUriToJavaUri(String classUri) {
-		if (classUri == null || !classUri.endsWith(DOT_CLASS))
-			return null;
-
-		String truncated = truncateIgnoreCase(classUri, DOT_CLASS);
-		StringTokenizer tok = new StringTokenizer(truncated, "$"); //$NON-NLS-1$
-		return tok.nextToken().concat(DOT_JAVA);
-	}
-
-	/**
-	 * Concatenates the two strings with a separator, if necessary
-	 */
-	public static String concatUri(String directoryname, String filename, char separator) {
-		String uri = directoryname;
-		if (!directoryname.endsWith(separator + "") && !filename.startsWith(separator + "")) //$NON-NLS-2$//$NON-NLS-1$
-			uri = uri + separator;
-		return uri + filename;
-	}
-
-	/**
-	 * Copy all the data from the input stream to the output stream up until the first end of file
-	 * character, and close the two streams
-	 */
-	public static void copy(InputStream in, OutputStream out) throws IOException {
-		byte[] buffer = new byte[1024];
-		try {
-			int n = in.read(buffer);
-			while (n > 0) {
-				out.write(buffer, 0, n);
-				n = in.read(buffer);
-			}
-		} finally {
-			if (!(in instanceof ZipInputStream))
-				in.close();
-			if (!(out instanceof ZipOutputStream))
-				out.close();
-		}
-	}
-
-	public static File createTempDirectory(String baseName, File parentDirectory) throws IOException {
-
-		File tempFile = createTempFile(baseName, parentDirectory);
-		tempFile.delete();
-		tempFile.mkdir();
-		return tempFile;
-	}
-
-	public static File createTempFile(String baseName) throws IOException {
-		return createTempFile(baseName, getTempDirectory());
-	}
-
-	public static File createTempFile(String baseName, File directory) throws IOException {
-		String fileName = getFileNameTail(baseName);
-		if (fileName.length() < 3) {
-			fileName = "WSTMP" + fileName; //$NON-NLS-1$
-		}
-		File tempFile = File.createTempFile(fileName, null, directory);
-		return tempFile;
-	}
-
-	/**
-	 * deletes a file from the file system; for directories, recurse the subdirectories and delete
-	 * them as well
-	 * 
-	 * @return true if successful; false if any file or sub file could not be deleted
-	 */
-	public static boolean delete(File aFile) {
-		if (aFile == null)
-			return true;
-		if (aFile.isDirectory()) {
-			File[] files = aFile.listFiles();
-			if (files != null) {
-				for (int i = 0; i < files.length; i++) {
-					if (!delete(files[i]))
-						return false;
-				}
-			}
-		}
-		return aFile.delete();
-	}
-
-	/**
-	 * returns a list of all files, recursive, that can't be written
-	 */
-	public static List getWriteProtectedFiles(File aFile, List aList) {
-		if (aList == null)
-			aList = new ArrayList();
-		if (aFile.exists() && !aFile.canWrite())
-			aList.add(aFile);
-		if (aFile.isDirectory()) {
-			File[] files = aFile.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				getWriteProtectedFiles(files[i], aList);
-			}
-		}
-		return aList;
-	}
-
-	/**
-	 * Leverage the java.io.File apis to resolve things like "./xxx" and "../xxx" into uris of
-	 * entries in the ear file
-	 * 
-	 * @param classpathEntry -
-	 *            a classpath entry from the manifest of
-	 * @anArchive
-	 * @param anArchive -
-	 *            the archive to which the dependent jar is relative
-	 * 
-	 * @return a cananonicalized relative uri of an entry in an ear file representing the dependent
-	 *         jar
-	 */
-	public static String deriveEARRelativeURI(String classpathEntry, Archive anArchive) {
-		return deriveEARRelativeURI(classpathEntry, anArchive.getURI());
-	}
-
-	/**
-	 * Leverage the java.io.File apis to resolve things like "./xxx" and "../xxx" into uris of
-	 * entries in the ear file
-	 * 
-	 * @param classpathEntry -
-	 *            a classpath entry from the manifest of an archive
-	 * @param String -
-	 *            the uri of the archive to which the dependent jar is relative
-	 * 
-	 * @return a cananonicalized relative uri of an entry in an ear file representing the dependent
-	 *         jar
-	 */
-	public static String deriveEARRelativeURI(String classpathEntry, String archiveUri) {
-		try {
-			String parent = getFileNameParent(archiveUri);
-			if (parent == null || parent.equals("")) //$NON-NLS-1$
-				parent = "."; //$NON-NLS-1$
-			String workingDir = new java.io.File(".").getCanonicalPath(); //$NON-NLS-1$
-
-			String resolvedPath = new java.io.File(parent, classpathEntry).getCanonicalPath();
-			if (!resolvedPath.startsWith(workingDir))
-				return null;
-			if (resolvedPath.equals(workingDir))
-				return null;
-			int start = workingDir.endsWith(java.io.File.separator) ? workingDir.length() : workingDir.length() + 1;
-			return resolvedPath.substring(start, resolvedPath.length()).replace(java.io.File.separatorChar, '/');
-		} catch (java.io.IOException ex) {
-			//getCanonicalPath could throw this
-			return null;
-		}
-	}
-
-	/**
-	 * Return "" if there is no extension
-	 */
-	public static String getFileNameExtension(String uri) {
-
-		if (uri != null) {
-			int index = uri.lastIndexOf("."); //$NON-NLS-1$
-			if (index != -1)
-				return uri.substring(index + 1);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the directory from the uri, or the truncation of the segment after the last
-	 * occurrence of a separator
-	 */
-	public static String getFileNameParent(String uri) {
-		if (uri==null)
-			return ""; //$NON-NLS-1$
-		String tempURI = uri.replace('\\', '/');
-		while (tempURI.endsWith("/")) //$NON-NLS-1$
-			tempURI = tempURI.substring(0, tempURI.length() - 1);
-		int lastIndex = tempURI.lastIndexOf('/');
-		if (lastIndex == -1)
-			return ""; //$NON-NLS-1$
-		else if (lastIndex == 0)
-			return "/"; //$NON-NLS-1$
-		return uri.substring(0, lastIndex);
-	}
-
-	/**
-	 * Returns the filename from the uri, or the segment after the last occurrence of a separator
-	 */
-	public static String getFileNameTail(String uri) {
-		String tempURI = uri.replace('\\', '/');
-		while (tempURI.endsWith("/")) //$NON-NLS-1$
-			tempURI = tempURI.substring(0, tempURI.length() - 1);
-		int lastIndex = tempURI.lastIndexOf('/');
-		if (lastIndex == -1)
-			return uri;
-		return uri.substring(lastIndex + 1, tempURI.length());
-	}
-
-	/**
-	 * For the given object in the deployment descriptor, return the owning module file; for
-	 * example, retrieve the EJBJarFile that owns the EJBJar. This works even for alts
-	 */
-	public static ModuleFile getModuleFile(EObject ddObject) {
-		Resource res = ddObject.eResource();
-		if (res == null)
-			return null;
-
-		Archive archive = getArchive(res);
-		if (archive == null || !archive.isModuleFile())
-			return null;
-
-		if (!(res instanceof XMLResource))
-			return null;
-
-		XMLResource xmlRes = (XMLResource) res;
-		if (xmlRes.isAlt())
-			return getModuleFileUsingAltDD((EARFile) archive, res);
-
-		return (ModuleFile) archive;
-	}
-
-	protected static ModuleFile getModuleFileUsingAltDD(EARFile ear, Resource res) {
-		if (res == null)
-			return null;
-
-		String uri = res.getURI().toString();
-		Module m = ear.getDeploymentDescriptor().getModuleHavingAltDD(uri);
-		if (m == null)
-			return null;
-		ModuleRef ref = ear.getModuleRef(m);
-		if (ref == null)
-			return null;
-
-		return ref.getModuleFile();
-	}
-
-	public static String getModuleFileTypeName(int moduleType) {
-		switch (moduleType) {
-			case XMLResource.APPLICATION_TYPE :
-				return CommonArchiveResourceHandler.A_Application_file; 
-			case XMLResource.APP_CLIENT_TYPE :
-				return CommonArchiveResourceHandler.An_Application_Client_JAR_file; 
-			case XMLResource.EJB_TYPE :
-				return CommonArchiveResourceHandler.An_EJB_JAR_file; 
-			case XMLResource.WEB_APP_TYPE :
-				return CommonArchiveResourceHandler.A_WAR_file; 
-			case XMLResource.RAR_TYPE :
-				return CommonArchiveResourceHandler.A_RAR_file; 
-		}
-		return null;
-	}
-
-	/**
-	 * For the given resource, return the owning module file; for example, retrieve the EJBJarFile
-	 * that owns the EJBJar. In the case of alts, this returns the EARFile and not the module file.
-	 * This method is internal; clients should use {@link #getModuleFile(EObject)}
-	 */
-	public static Archive getArchive(Resource res) {
-		if (res == null)
-			return null;
-
-		ResourceSet set = res.getResourceSet();
-		if (set == null)
-			return null;
-
-		URIConverter conv = set.getURIConverter();
-		if (conv == null || !(conv instanceof ArchiveURIConverterImpl))
-			return null;
-
-		return ((ArchiveURIConverterImpl) conv).getArchive();
-	}
-
-	/**
-	 * Concatenates the two strings and ensures the correct separator is used in the path
-	 */
-	public static String getOSUri(String uri) {
-		char sep = File.separatorChar;
-		if (sep != '/')
-			return uri.replace('/', sep);
-		return uri.replace('\\', sep);
-	}
-
-	/**
-	 * Concatenates the two strings and ensures the correct separator is used in the path
-	 */
-	public static String getOSUri(String directoryname, String filename) {
-		String osDirName = getOSUri(directoryname);
-		String osFileName = getOSUri(filename);
-		return concatUri(osDirName, osFileName, File.separatorChar);
-	}
-
-	/**
-	 * Returns the first element in the extent of the resource
-	 * 
-	 * @throws EmptyResourceException -
-	 *             thrown if the extent is empty
-	 */
-	public static EObject getRoot(Resource aResource) throws EmptyResourceException {
-		EList extent = aResource.getContents();
-		if (extent.size() < 1) {
-			throw new EmptyResourceException(aResource.getURI().toString());
-		}
-		return (EObject) extent.get(0);
-	}
-
-	public static java.io.File getTempDirectory() {
-		return tempDirectory;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 1:16:48 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public static java.lang.String getTempDirectoryName() {
-		return tempDirectoryName;
-	}
-
-	public static String[] getTokens(String aString) {
-		return getTokens(aString, null);
-	}
-
-	public static String[] getTokens(String aString, String delimiter) {
-
-		StringTokenizer tok = (delimiter == null) ? new StringTokenizer(aString) : new StringTokenizer(aString, delimiter);
-		int size = tok.countTokens();
-		String[] tokens = new String[size];
-		for (int i = 0; i < size && tok.hasMoreTokens(); i++) {
-			tokens[i] = tok.nextToken();
-		}
-		return tokens;
-	}
-
-	/**
-	 * getValueIgnoreKeyCase method comment.
-	 */
-	public static java.lang.String getValueIgnoreKeyCase(java.lang.String key, java.util.jar.Attributes attr) {
-		Iterator keysAndValues = attr.entrySet().iterator();
-		while (keysAndValues.hasNext()) {
-			Map.Entry entry = (Map.Entry) keysAndValues.next();
-			String entryKey = entry.getKey().toString();
-			if (entryKey.equalsIgnoreCase(key))
-				return entry.getValue() == null ? null : entry.getValue().toString();
-		}
-		return null;
-	}
-
-	public static void inform(String message) {
-		org.eclipse.jem.util.logger.proxy.Logger.getLogger().logInfo(message);
-	}
-
-	/**
-	 * Read all the data from the input stream up until the first end of file character, add this
-	 * data to a byte array, and close the input stream; returns the byte array
-	 */
-	public static byte[] inputStreamToBytes(InputStream in) throws IOException {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		copy(in, out);
-		return out.toByteArray();
-	}
-
-	public static boolean isJavaResource(Resource aResource) {
-		return JavaURL.isJavaURL(aResource.getURI().toString());
-	}
-
-	public static boolean isRegisteredURIMapping(Resource res) {
-		return URIMappingRegistryImpl.INSTANCE.getURI(res.getURI()) != res.getURI();
-	}
-
-	public static boolean isPlatformMetaResource(Resource res) {
-		URI uri = res.getURI();
-		return "platform".equals(uri.scheme()) && "meta".equals(uri.segment(0)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.trim().length() == 0;
-	}
-
-	public static boolean isRuntime() {
-		return isRuntime;
-	}
-
-	/**
-	 * Is it within the spec for the JAR or module file to reference the archive via the Manifest
-	 * Class-Path?
-	 */
-	public static boolean isValidDependency(Archive referencedJAR, Archive referencingJAR) {
-		//No other modules should reference wars
-		if (referencedJAR.isWARFile())
-			return false;
-
-		if (referencedJAR == referencingJAR)
-			return false;
-
-		//Clients can reference all but the WARs, which we've already covered
-		// above; WARs and EJB JARs
-		//can reference all but WARs, above, or ApplicationClients
-		return referencingJAR.isApplicationClientFile() || !referencedJAR.isApplicationClientFile();
-	}
-
-	/**
-	 * Loads a properties file with the given uri from the given archive
-	 * 
-	 * @throws FileNotFoundException
-	 *             if the file does not exist in the archive
-	 * @throws IOException
-	 *             if an IO exception occurs reading the properties
-	 */
-	public static Properties loadProperties(Archive archive, String uri) throws FileNotFoundException, IOException {
-		InputStream in = null;
-		try {
-			in = archive.getInputStream(uri);
-			Properties p = new Properties();
-			p.load(in);
-			return p;
-		} finally {
-			if (in != null)
-				in.close();
-		}
-	}
-
-	public static void setIsRuntime(boolean aBoolean) {
-		isRuntime = aBoolean;
-	}
-
-	/**
-	 *  
-	 */
-	public static void setShouldUseTempDirectoryForRead(boolean value) {
-		shouldUseTempDirectoryForRead = value;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 1:26:28 PM)
-	 * 
-	 * @param newTempDirectory
-	 *            java.io.File
-	 */
-	public static void setTempDirectory(java.io.File newTempDirectory) {
-		tempDirectory = newTempDirectory;
-		tempDirectoryName = newTempDirectory.getAbsolutePath();
-	}
-
-	/**
-	 * Sets the temp directory to the specified path; creates it and sets it to be deleted on exit
-	 * if it does not exist.
-	 * 
-	 * @param newTempDirectoryName
-	 *            java.lang.String
-	 * @throws ArchiveException
-	 *             thrown if the directory does not exist and can not be created
-	 */
-	public static void setTempDirectoryName(java.lang.String newTempDirectoryName) throws ArchiveException {
-		java.io.File dir = new java.io.File(newTempDirectoryName);
-		if (!dir.exists()) {
-			dir.mkdirs();
-			if (!dir.exists())
-				throw new ArchiveException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.make_temp_dir_EXC_, (new Object[]{newTempDirectoryName}))); // = "Unable to make temp directory: "
-			DeleteOnExitUtility.markForDeletion(dir);
-		}
-		setTempDirectory(dir);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/19/00 1:08:20 PM)
-	 * 
-	 * @return boolean
-	 */
-	public static boolean shouldUseTempDirectoryForRead() {
-		return shouldUseTempDirectoryForRead;
-	}
-
-	/**
-	 * Convert the list of string elements to an array of file URLs; if an entry is relative, make
-	 * it relative to the uri root
-	 */
-	public static java.net.URL[] toLocalURLs(List entries, String uriRoot) {
-		List urls = new ArrayList();
-		for (int i = 0; i < entries.size(); i++) {
-			String pathEntry = (String) entries.get(i);
-			java.io.File aFile = new java.io.File(pathEntry);
-			if (!aFile.isAbsolute()) {
-				pathEntry = getOSUri(uriRoot, pathEntry);
-				aFile = new java.io.File(pathEntry);
-			}
-			if (!aFile.exists()) {
-				//inform("Classpath element " + pathEntry + " does not
-				// exist");
-				continue;
-			}
-			if (aFile.isDirectory()) {
-				if (!pathEntry.endsWith(java.io.File.separator)) {
-					pathEntry = pathEntry + java.io.File.separatorChar;
-				}
-			} else {
-				ZipFile zip = null;
-				try {
-					zip = new ZipFile(aFile);
-				} catch (Exception ex) {
-					inform(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.invalid_classpath_WARN_, (new Object[]{pathEntry}))); // = "Classpath element "{0}" is not a directory or a Zip file"
-					continue;
-				} finally {
-					if (zip != null)
-						try {
-							zip.close();
-						} catch (IOException ignore) {
-							//Ignore
-						}
-				}
-			}
-			try {
-				aFile = new java.io.File(pathEntry);
-				java.net.URL aUrl = aFile.toURL(); 
-				urls.add(aUrl);
-			} catch (java.net.MalformedURLException ex) {
-				inform(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.invalid_cp_file_WARN_, (new Object[]{pathEntry}))); // = "Classpath element "{0}" does not point to a local file"
-			}
-		}
-		java.net.URL[] urlArray = new java.net.URL[urls.size()];
-		return (java.net.URL[]) urls.toArray(urlArray);
-	}
-
-	/**
-	 * Return a substring of the first parameter, starting at the end of the prefix
-	 */
-	public static String truncateFromFrontIgnoreCase(String aString, String leadingSubString) {
-		if (!aString.toLowerCase().startsWith(leadingSubString.toLowerCase()))
-			return aString;
-		return aString.substring(leadingSubString.length(), aString.length());
-	}
-
-	/**
-	 * Return a substring of the first parameter, up to the last index of the second
-	 */
-	public static String truncateIgnoreCase(String aString, String trailingSubString) {
-		int index = aString.toLowerCase().lastIndexOf(trailingSubString.toLowerCase());
-		if (index != -1)
-			return aString.substring(0, index);
-		return aString;
-	}
-
-	public static String uriToClassName(String uri) {
-		return truncateIgnoreCase(uri.replace('/', '.'), DOT_CLASS);
-	}
-
-	public static boolean isJ2EE13FastCheck(ModuleFile moduleFile) {
-		if (moduleFile == null)
-			return false;
-		else if (moduleFile.isRARFile())
-			return true;
-		InputStream in = null;
-		String uri = moduleFile.getDeploymentDescriptorUri();
-		try {
-			in = moduleFile.getInputStream(uri);
-
-			DocumentType docType = XmlDocumentReader.readDocumentType(in, uri);
-			if (docType == null)
-				return false;
-			String[] ids = getJ2EE13PublicAndSystemIdFor(moduleFile);
-			if (ids == null)
-				return false;
-			return ids[0].equals(docType.getPublicId()) && ids[1].equals(docType.getSystemId());
-		} catch (IOException ex) {
-			return false;
-		} finally {
-			try {
-				if (in != null)
-					in.close();
-			} catch (IOException ex) {
-				//Ignore
-			}
-		}
-
-	}
-
-	protected static String[] getJ2EE13PublicAndSystemIdFor(ModuleFile moduleFile) {
-		if (moduleFile.isEARFile())
-			return new String[]{J2EEConstants.APPLICATION_PUBLICID_1_3, J2EEConstants.APPLICATION_SYSTEMID_1_3};
-		else if (moduleFile.isEJBJarFile())
-			return new String[]{J2EEConstants.EJBJAR_PUBLICID_2_0, J2EEConstants.EJBJAR_SYSTEMID_2_0};
-		else if (moduleFile.isApplicationClientFile())
-			return new String[]{J2EEConstants.APP_CLIENT_PUBLICID_1_3, J2EEConstants.APP_CLIENT_SYSTEMID_1_3};
-		else if (moduleFile.isWARFile())
-			return new String[]{J2EEConstants.WEBAPP_PUBLICID_2_3, J2EEConstants.WEBAPP_SYSTEMID_2_3};
-		else if (moduleFile.isRARFile())
-			return new String[]{J2EEConstants.CONNECTOR_PUBLICID_1_0, J2EEConstants.CONNECTOR_SYSTEMID_1_0};
-		else
-			return null;
-	}
-
-	//TODO doing the parse with SAX would be faster
-	public static int getFastSpecVersion(ModuleFile moduleFile) {
-		InputStream in = null;
-		String uri = moduleFile.getDeploymentDescriptorUri();
-		try {
-			in = moduleFile.getInputStream(uri);
-
-			DocumentType docType = null;
-
-			InputSource source = new InputSource(in);
-			GeneralXmlDocumentReader aReader = new XmlDocumentReader(source);
-			aReader.setValidate(false);
-			Document aDocument = aReader.parseDocument();
-			if (aDocument != null) {
-				docType = aDocument.getDoctype();
-			}
-			int version = -1;
-			if (null != docType) {
-				String publicID = docType.getPublicId();
-				String systemID = docType.getSystemId();
-				if (publicID != null && systemID != null) {
-					version = lookupVersion(moduleFile, publicID, systemID);
-				}
-			}
-			if (version == -1) {
-				String schemaName = null;
-				String versionString = null;
-				if (aDocument != null) {
-					if (null == docType) {
-						NamedNodeMap map = aDocument.getDocumentElement().getAttributes();
-						if (null != map) {
-							Node schemaNode = map.getNamedItem("xsi:schemaLocation"); //$NON-NLS-1$
-							if (null != schemaNode) {
-								schemaName = schemaNode.getNodeValue();
-							}
-							Node versionNode = map.getNamedItem("version");//$NON-NLS-1$
-							if (null != versionNode) {
-								versionString = versionNode.getNodeValue();
-							}
-						}
-					}
-				}
-				if (null != schemaName) {
-					version = lookupVersion(moduleFile, schemaName);
-				}
-				if (version == -1) {
-					version = parseVersionString(moduleFile, versionString);
-				}
-			}
-
-			return version;
-		} catch (IOException ex) {
-			return -1;
-		} finally {
-			try {
-				if (in != null)
-					in.close();
-			} catch (IOException ex) {
-				//Ignore
-			}
-		}
-	}
-
-	private static int parseVersionString(ModuleFile moduleFile, String versionAttr) {
-		int version = -1;
-		if (moduleFile.isEARFile()) {
-			if (null == versionAttr) {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_1_2_TEXT)) {
-				version = J2EEVersionConstants.J2EE_1_2_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_1_3_TEXT)) {
-				version = J2EEVersionConstants.J2EE_1_3_ID;
-			} else {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			}
-		} else if (moduleFile.isEJBJarFile()) {
-			if (null == versionAttr) {
-				version = J2EEVersionConstants.EJB_2_1_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_1_1_TEXT)) {
-				version = J2EEVersionConstants.EJB_1_1_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_2_0_TEXT)) {
-				version = J2EEVersionConstants.EJB_2_0_ID;
-			} else {
-				version = J2EEVersionConstants.EJB_2_1_ID;
-			}
-		} else if (moduleFile.isApplicationClientFile()) {
-			if (null == versionAttr) {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_1_2_TEXT)) {
-				version = J2EEVersionConstants.J2EE_1_2_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_1_3_TEXT)) {
-				version = J2EEVersionConstants.J2EE_1_3_ID;
-			} else {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			}
-		} else if (moduleFile.isWARFile()) {
-			if (null == versionAttr) {
-				version = J2EEVersionConstants.WEB_2_4_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_2_2_TEXT)) {
-				version = J2EEVersionConstants.WEB_2_2_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_2_3_TEXT)) {
-				version = J2EEVersionConstants.WEB_2_3_ID;
-			} else {
-				version = J2EEVersionConstants.WEB_2_4_ID;
-			}
-		} else if (moduleFile.isRARFile()) {
-			if (null == versionAttr) {
-				version = J2EEVersionConstants.JCA_1_5_ID;
-			} else if (versionAttr.equals(J2EEVersionConstants.VERSION_1_0_TEXT)) {
-				version = J2EEVersionConstants.JCA_1_0_ID;
-			} else {
-				version = J2EEVersionConstants.JCA_1_5_ID;
-			}
-		}
-		return version;
-
-	}
-
-	private static int lookupVersion(ModuleFile moduleFile, String schemaName) {
-		int version = -1;
-		if (moduleFile.isEARFile()) {
-			if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_1_4)) {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			}
-		} else if (moduleFile.isEJBJarFile()) {
-			if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_2_1_NS)) != -1) {
-				version = J2EEVersionConstants.EJB_2_1_ID;
-			}
-		} else if (moduleFile.isApplicationClientFile()) {
-			if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_1_4)) {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			}
-		} else if (moduleFile.isWARFile()) {
-			if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_2_4)) {
-				version = J2EEVersionConstants.WEB_2_4_ID;
-			}
-		} else if (moduleFile.isRARFile()) {
-			if (schemaName.equals(J2EEConstants.CONNECTOR_SCHEMA_1_5)) {
-				version = J2EEVersionConstants.JCA_1_5_ID;
-			}
-		}
-		return version;
-	}
-
-	private static int lookupVersion(ModuleFile moduleFile, String publicID, String systemID) {
-		int version = -1;
-		if (moduleFile.isEARFile()) {
-			if (publicID.equals(J2EEConstants.APPLICATION_PUBLICID_1_3) && (systemID.equals(J2EEConstants.APPLICATION_SYSTEMID_1_3)||systemID.equals(J2EEConstants.APPLICATION_ALT_SYSTEMID_1_3))) {
-				version = J2EEVersionConstants.J2EE_1_3_ID;
-			} else if (publicID.equals(J2EEConstants.APPLICATION_PUBLICID_1_2) && (systemID.equals(J2EEConstants.APPLICATION_SYSTEMID_1_2)||systemID.equals(J2EEConstants.APPLICATION_ALT_SYSTEMID_1_2))) {
-				version = J2EEVersionConstants.J2EE_1_2_ID;
-			} else {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			}
-		} else if (moduleFile.isEJBJarFile()) {
-			if (publicID.equals(J2EEConstants.EJBJAR_PUBLICID_2_0) && (systemID.equals(J2EEConstants.EJBJAR_SYSTEMID_2_0)||systemID.equals(J2EEConstants.EJBJAR_ALT_SYSTEMID_2_0))) {
-				version = J2EEVersionConstants.EJB_2_0_ID;
-			} else if (publicID.equals(J2EEConstants.EJBJAR_PUBLICID_1_1) && (systemID.equals(J2EEConstants.EJBJAR_SYSTEMID_1_1)||systemID.equals(J2EEConstants.EJBJAR_ALT_SYSTEMID_1_1))) {
-				version = J2EEVersionConstants.EJB_1_1_ID;
-			} else {
-				version = J2EEVersionConstants.EJB_2_1_ID;
-			}
-		} else if (moduleFile.isApplicationClientFile()) {
-			if (publicID.equals(J2EEConstants.APP_CLIENT_PUBLICID_1_3) && (systemID.equals(J2EEConstants.APP_CLIENT_SYSTEMID_1_3)||systemID.equals(J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_3))) {
-				version = J2EEVersionConstants.J2EE_1_3_ID;
-			} else if (publicID.equals(J2EEConstants.APP_CLIENT_PUBLICID_1_2) && (systemID.equals(J2EEConstants.APP_CLIENT_SYSTEMID_1_2)||systemID.equals(J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_2))) {
-				version = J2EEVersionConstants.J2EE_1_2_ID;
-			} else {
-				version = J2EEVersionConstants.J2EE_1_4_ID;
-			}
-		} else if (moduleFile.isWARFile()) {
-			if (publicID.equals(J2EEConstants.WEBAPP_PUBLICID_2_3) && (systemID.equals(J2EEConstants.WEBAPP_SYSTEMID_2_3)||systemID.equals(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_3))) {
-				version = J2EEVersionConstants.WEB_2_3_ID;
-			} else if (publicID.equals(J2EEConstants.WEBAPP_PUBLICID_2_2) && (systemID.equals(J2EEConstants.WEBAPP_SYSTEMID_2_2)||systemID.equals(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_2))) {
-				version = J2EEVersionConstants.WEB_2_2_ID;
-			} else {
-				version = J2EEVersionConstants.WEB_2_4_ID;
-			}
-		} else if (moduleFile.isRARFile()) {
-			if (publicID.equals(J2EEConstants.CONNECTOR_PUBLICID_1_0) && (systemID.equals(J2EEConstants.CONNECTOR_SYSTEMID_1_0)||systemID.equals(J2EEConstants.CONNECTOR_ALT_SYSTEMID_1_0))) {
-				version = J2EEVersionConstants.JCA_1_0_ID;
-			} else {
-				version = J2EEVersionConstants.JCA_1_5_ID;
-			}
-		}
-		return version;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ClasspathUtil.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ClasspathUtil.java
deleted file mode 100644
index 43ebb20d8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ClasspathUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntryImpl;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class ClasspathUtil {
-
-	public static void processManifest(String inPath, List rtClasspath, Set processedPaths) {
-		ArrayList paths = getManifestPaths(inPath);
-		for (int i = 0; i < paths.size(); i++) {
-			RuntimeClasspathEntry entry = (RuntimeClasspathEntry) paths.get(i);
-			if (!processedPaths.contains(entry)) {
-				processedPaths.add(entry);
-				rtClasspath.add(entry);
-				processManifest(entry.getAbsolutePath(), rtClasspath, processedPaths);
-			}
-		}
-	}
-
-	protected static RuntimeClasspathEntry createRuntimeClasspathEntry(String absolutePath, String manifestValue) {
-		RuntimeClasspathEntry entry = new RuntimeClasspathEntryImpl();
-		entry.setAbsolutePath(absolutePath);
-		entry.setManifestValue(manifestValue);
-		return entry;
-	}
-
-	protected static ArrayList getManifestPaths(String path) {
-		ArrayList manifestPaths = new ArrayList();
-		File f = new File(path);
-		if (f.exists()) {
-			if (f.isDirectory()) {
-				File manifestFile = new File(path + File.separator + "META-INF" + File.separator + "MANIFEST.MF"); //$NON-NLS-1$ //$NON-NLS-2$
-				if (manifestFile.exists()) {
-					FileInputStream inputStream = null;
-					try {
-						inputStream = new FileInputStream(manifestFile);
-						Manifest manifest = new Manifest(inputStream);
-						manifestPaths = getManifestClassPaths(manifest, f.getParent());
-					} catch (IOException e) {
-						//Ignore
-					} finally {
-						if (null != inputStream) {
-							try {
-								inputStream.close();
-							} catch (IOException ex) {
-								Logger.getLogger().logError(ex);
-							}
-						}
-					}
-				}
-			} else {
-				JarFile jarFile = null;
-				try {
-					jarFile = new JarFile(f);
-					Manifest manifest = jarFile.getManifest();
-					if (manifest != null)
-						manifestPaths = getManifestClassPaths(manifest, f.getParent());
-				} catch (IOException e) {
-					//Ignore
-				} finally {
-					if (jarFile != null)
-						try {
-							jarFile.close();
-						} catch (IOException ex) {
-							//Ignore
-						}
-				}
-			}
-		}
-		return manifestPaths;
-	}
-
-	protected static ArrayList getManifestClassPaths(Manifest manifest, String archivePath) {
-		ArrayList pathList = new ArrayList();
-		Attributes main = manifest.getMainAttributes();
-		String classPath = main.getValue(Attributes.Name.CLASS_PATH);
-		if (classPath != null) {
-			StringTokenizer st = new StringTokenizer(classPath, " "); //$NON-NLS-1$
-			while (st.hasMoreTokens()) {
-				String token = st.nextToken();
-				String path = archivePath + File.separator + token;
-				path = normalizePath(path);
-				if (new File(path).exists()) {
-					pathList.add(createRuntimeClasspathEntry(path, token));
-				}
-			}
-		}
-		return pathList;
-	}
-
-	public static String normalizePath(String path) {
-		File f = new File(path);
-		try {
-			f = f.getCanonicalFile();
-		} catch (Exception ex) {
-			//Ignore
-		}
-		return f.getPath();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java
deleted file mode 100644
index 6d7578cd7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ConnectorModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-
-
-public class CommonarchiveAdapterFactory extends AdapterFactoryImpl {
-	protected static CommonarchivePackage modelPackage;
-
-	public CommonarchiveAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI);
-		}
-	}
-
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject) type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected CommonarchiveSwitch sw = new CommonarchiveSwitch() {
-		public Object caseContainer(Container object) {
-			return createContainerAdapter();
-		}
-
-		public Object caseWARFile(WARFile object) {
-			return createWARFileAdapter();
-		}
-
-		public Object caseModuleFile(ModuleFile object) {
-			return createModuleFileAdapter();
-		}
-
-		public Object caseEARFile(EARFile object) {
-			return createEARFileAdapter();
-		}
-
-		public Object caseApplicationClientFile(ApplicationClientFile object) {
-			return createApplicationClientFileAdapter();
-		}
-
-		public Object caseEJBJarFile(EJBJarFile object) {
-			return createEJBJarFileAdapter();
-		}
-
-		public Object caseRARFile(RARFile object) {
-			return createRARFileAdapter();
-		}
-
-		public Object caseArchive(Archive object) {
-			return createArchiveAdapter();
-		}
-
-		public Object caseFile(File object) {
-			return createFileAdapter();
-		}
-
-		public Object caseReadOnlyDirectory(ReadOnlyDirectory object) {
-			return createReadOnlyDirectoryAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter) sw.doSwitch((EObject) target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases. It's useful to
-	 * ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createContainerAdapter() {
-		return null;
-	}
-
-	public Adapter createEJBComponentAdapter() {
-		return null;
-	}
-
-	public Adapter createModuleComponentAdapter() {
-		return null;
-	}
-
-	public Adapter createServletComponentAdapter() {
-		return null;
-	}
-
-	public Adapter createWARFileAdapter() {
-		return null;
-	}
-
-	public Adapter createModuleFileAdapter() {
-		return null;
-	}
-
-	public Adapter createEARFileAdapter() {
-		return null;
-	}
-
-	public Adapter createApplicationClientFileAdapter() {
-		return null;
-	}
-
-	public Adapter createEJBJarFileAdapter() {
-		return null;
-	}
-
-	public Adapter createRARFileAdapter() {
-		return null;
-	}
-
-	public Adapter createArchiveAdapter() {
-		return null;
-	}
-
-	public Adapter createFileAdapter() {
-		return null;
-	}
-
-	public Adapter createEJBClientJarFileAdapter() {
-		return null;
-	}
-
-	public Adapter createReadOnlyDirectoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createModuleRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBModuleRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebModuleRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createClientModuleRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createConnectorModuleRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc --> This default
-	 * implementation returns null. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CommonarchiveSwitch modelSwitch =
-		new CommonarchiveSwitch() {
-			public Object caseFile(File object) {
-				return createFileAdapter();
-			}
-			public Object caseArchive(Archive object) {
-				return createArchiveAdapter();
-			}
-			public Object caseEJBJarFile(EJBJarFile object) {
-				return createEJBJarFileAdapter();
-			}
-			public Object caseWARFile(WARFile object) {
-				return createWARFileAdapter();
-			}
-			public Object caseEARFile(EARFile object) {
-				return createEARFileAdapter();
-			}
-			public Object caseApplicationClientFile(ApplicationClientFile object) {
-				return createApplicationClientFileAdapter();
-			}
-			public Object caseModuleFile(ModuleFile object) {
-				return createModuleFileAdapter();
-			}
-			public Object caseContainer(Container object) {
-				return createContainerAdapter();
-			}
-			public Object caseReadOnlyDirectory(ReadOnlyDirectory object) {
-				return createReadOnlyDirectoryAdapter();
-			}
-			public Object caseRARFile(RARFile object) {
-				return createRARFileAdapter();
-			}
-			public Object caseModuleRef(ModuleRef object) {
-				return createModuleRefAdapter();
-			}
-			public Object caseEJBModuleRef(EJBModuleRef object) {
-				return createEJBModuleRefAdapter();
-			}
-			public Object caseWebModuleRef(WebModuleRef object) {
-				return createWebModuleRefAdapter();
-			}
-			public Object caseClientModuleRef(ClientModuleRef object) {
-				return createClientModuleRefAdapter();
-			}
-			public Object caseConnectorModuleRef(ConnectorModuleRef object) {
-				return createConnectorModuleRefAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases. It's useful to
-	 * ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createContainerAdapterGen() {
-
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWARFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createModuleFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createApplicationClientFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEARFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBJarFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRARFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createArchiveAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createReadOnlyDirectoryAdapterGen() {
-		return null;
-	}
-
-} //CommonarchiveAdapterFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java
deleted file mode 100644
index f241a093a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ConnectorModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-
-
-public class CommonarchiveSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static CommonarchivePackage modelPackage;
-
-	protected static CommonarchiveFactory factory;
-
-	public CommonarchiveSwitch() {
-		factory = (CommonarchiveFactory) CommonarchiveFactoryImpl.getPackage().getEFactoryInstance();
-		modelPackage = CommonarchiveFactoryImpl.getPackage();
-	}
-
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() != modelPackage)
-			return defaultCase(theEObject);
-
-		switch (theEClass.getClassifierID()) {
-			case CommonarchivePackage.WAR_FILE : {
-				WARFile castedObject = (WARFile) theEObject;
-				Object result = caseWARFile(castedObject);
-				if (result == null)
-					result = caseModuleFile(castedObject);
-				if (result == null)
-					result = caseArchive(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.EAR_FILE : {
-				EARFile castedObject = (EARFile) theEObject;
-				Object result = caseEARFile(castedObject);
-				if (result == null)
-					result = caseModuleFile(castedObject);
-				if (result == null)
-					result = caseArchive(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE : {
-				ApplicationClientFile castedObject = (ApplicationClientFile) theEObject;
-				Object result = caseApplicationClientFile(castedObject);
-				if (result == null)
-					result = caseModuleFile(castedObject);
-				if (result == null)
-					result = caseArchive(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.EJB_JAR_FILE : {
-				EJBJarFile castedObject = (EJBJarFile) theEObject;
-				Object result = caseEJBJarFile(castedObject);
-				if (result == null)
-					result = caseModuleFile(castedObject);
-				if (result == null)
-					result = caseArchive(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.RAR_FILE : {
-				RARFile castedObject = (RARFile) theEObject;
-				Object result = caseRARFile(castedObject);
-				if (result == null)
-					result = caseModuleFile(castedObject);
-				if (result == null)
-					result = caseArchive(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.ARCHIVE : {
-				Archive castedObject = (Archive) theEObject;
-				Object result = caseArchive(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.FILE : {
-				File castedObject = (File) theEObject;
-				Object result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.READ_ONLY_DIRECTORY : {
-				ReadOnlyDirectory castedObject = (ReadOnlyDirectory) theEObject;
-				Object result = caseReadOnlyDirectory(castedObject);
-				if (result == null)
-					result = caseContainer(castedObject);
-				if (result == null)
-					result = caseFile(castedObject);
-				if (result == null)
-					result = defaultCase(theEObject);
-				return result;
-			}
-			default :
-				return defaultCase(theEObject);
-		}
-	} // doSwitch
-
-	public Object caseContainer(Container object) {
-		return null;
-	}
-
-	public Object caseWARFile(WARFile object) {
-		return null;
-	}
-
-	public Object caseModuleFile(ModuleFile object) {
-		return null;
-	}
-
-	public Object caseEARFile(EARFile object) {
-		return null;
-	}
-
-	public Object caseApplicationClientFile(ApplicationClientFile object) {
-		return null;
-	}
-
-	public Object caseEJBJarFile(EJBJarFile object) {
-		return null;
-	}
-
-	public Object caseRARFile(RARFile object) {
-		return null;
-	}
-
-	public Object caseArchive(Archive object) {
-		return null;
-	}
-
-	public Object caseFile(File object) {
-		return null;
-	}
-
-	public Object caseReadOnlyDirectory(ReadOnlyDirectory object) {
-		return null;
-	}
-
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseModuleRef(ModuleRef object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEJBModuleRef(EJBModuleRef object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseWebModuleRef(WebModuleRef object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseClientModuleRef(ClientModuleRef object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseConnectorModuleRef(ConnectorModuleRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitchGen(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case CommonarchivePackage.FILE: {
-				File file = (File)theEObject;
-				Object result = caseFile(file);
-				if (result == null) result = caseJ2EEEObject(file);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.ARCHIVE: {
-				Archive archive = (Archive)theEObject;
-				Object result = caseArchive(archive);
-				if (result == null) result = caseContainer(archive);
-				if (result == null) result = caseFile(archive);
-				if (result == null) result = caseJ2EEEObject(archive);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.EJB_JAR_FILE: {
-				EJBJarFile ejbJarFile = (EJBJarFile)theEObject;
-				Object result = caseEJBJarFile(ejbJarFile);
-				if (result == null) result = caseModuleFile(ejbJarFile);
-				if (result == null) result = caseArchive(ejbJarFile);
-				if (result == null) result = caseContainer(ejbJarFile);
-				if (result == null) result = caseFile(ejbJarFile);
-				if (result == null) result = caseJ2EEEObject(ejbJarFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.WAR_FILE: {
-				WARFile warFile = (WARFile)theEObject;
-				Object result = caseWARFile(warFile);
-				if (result == null) result = caseModuleFile(warFile);
-				if (result == null) result = caseArchive(warFile);
-				if (result == null) result = caseContainer(warFile);
-				if (result == null) result = caseFile(warFile);
-				if (result == null) result = caseJ2EEEObject(warFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.EAR_FILE: {
-				EARFile earFile = (EARFile)theEObject;
-				Object result = caseEARFile(earFile);
-				if (result == null) result = caseModuleFile(earFile);
-				if (result == null) result = caseArchive(earFile);
-				if (result == null) result = caseContainer(earFile);
-				if (result == null) result = caseFile(earFile);
-				if (result == null) result = caseJ2EEEObject(earFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE: {
-				ApplicationClientFile applicationClientFile = (ApplicationClientFile)theEObject;
-				Object result = caseApplicationClientFile(applicationClientFile);
-				if (result == null) result = caseModuleFile(applicationClientFile);
-				if (result == null) result = caseArchive(applicationClientFile);
-				if (result == null) result = caseContainer(applicationClientFile);
-				if (result == null) result = caseFile(applicationClientFile);
-				if (result == null) result = caseJ2EEEObject(applicationClientFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.MODULE_FILE: {
-				ModuleFile moduleFile = (ModuleFile)theEObject;
-				Object result = caseModuleFile(moduleFile);
-				if (result == null) result = caseArchive(moduleFile);
-				if (result == null) result = caseContainer(moduleFile);
-				if (result == null) result = caseFile(moduleFile);
-				if (result == null) result = caseJ2EEEObject(moduleFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.CONTAINER: {
-				Container container = (Container)theEObject;
-				Object result = caseContainer(container);
-				if (result == null) result = caseFile(container);
-				if (result == null) result = caseJ2EEEObject(container);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.READ_ONLY_DIRECTORY: {
-				ReadOnlyDirectory readOnlyDirectory = (ReadOnlyDirectory)theEObject;
-				Object result = caseReadOnlyDirectory(readOnlyDirectory);
-				if (result == null) result = caseContainer(readOnlyDirectory);
-				if (result == null) result = caseFile(readOnlyDirectory);
-				if (result == null) result = caseJ2EEEObject(readOnlyDirectory);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.RAR_FILE: {
-				RARFile rarFile = (RARFile)theEObject;
-				Object result = caseRARFile(rarFile);
-				if (result == null) result = caseModuleFile(rarFile);
-				if (result == null) result = caseArchive(rarFile);
-				if (result == null) result = caseContainer(rarFile);
-				if (result == null) result = caseFile(rarFile);
-				if (result == null) result = caseJ2EEEObject(rarFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.MODULE_REF: {
-				ModuleRef moduleRef = (ModuleRef)theEObject;
-				Object result = caseModuleRef(moduleRef);
-				if (result == null) result = caseJ2EEEObject(moduleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.EJB_MODULE_REF: {
-				EJBModuleRef ejbModuleRef = (EJBModuleRef)theEObject;
-				Object result = caseEJBModuleRef(ejbModuleRef);
-				if (result == null) result = caseModuleRef(ejbModuleRef);
-				if (result == null) result = caseJ2EEEObject(ejbModuleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.WEB_MODULE_REF: {
-				WebModuleRef webModuleRef = (WebModuleRef)theEObject;
-				Object result = caseWebModuleRef(webModuleRef);
-				if (result == null) result = caseModuleRef(webModuleRef);
-				if (result == null) result = caseJ2EEEObject(webModuleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.CLIENT_MODULE_REF: {
-				ClientModuleRef clientModuleRef = (ClientModuleRef)theEObject;
-				Object result = caseClientModuleRef(clientModuleRef);
-				if (result == null) result = caseModuleRef(clientModuleRef);
-				if (result == null) result = caseJ2EEEObject(clientModuleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonarchivePackage.CONNECTOR_MODULE_REF: {
-				ConnectorModuleRef connectorModuleRef = (ConnectorModuleRef)theEObject;
-				Object result = caseConnectorModuleRef(connectorModuleRef);
-				if (result == null) result = caseModuleRef(connectorModuleRef);
-				if (result == null) result = caseJ2EEEObject(connectorModuleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseContainerGen(Container object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseWARFileGen(WARFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseModuleFileGen(ModuleFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseApplicationClientFileGen(ApplicationClientFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEARFileGen(EARFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEJBJarFileGen(EJBJarFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseRARFileGen(RARFile object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseArchiveGen(Archive object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseFileGen(File object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseReadOnlyDirectoryGen(ReadOnlyDirectory object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object defaultCaseGen(EObject object) {
-		return null;
-	}
-
-} //CommonarchiveSwitch
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/DeleteOnExitUtility.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/DeleteOnExitUtility.java
deleted file mode 100644
index e92f063c9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/DeleteOnExitUtility.java
+++ /dev/null
@@ -1,116 +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.commonarchivecore.internal.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-
-/**
- * @author jsholl
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class DeleteOnExitUtility {
-
-	private static Set tempFilesToDelete;
-	private static boolean initialized = false;
-	private static int cleanupCount = 0;
-	private static final int CLEANUP_THRESHOLD = 10000;
-
-	public static void markForDeletion(File file) {
-		if (!initialized) {
-			initialized = true;
-			try {
-				Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-					public void run() {
-						if (tempFilesToDelete != null) {
-							synchronized (tempFilesToDelete) {
-								Iterator iterator = tempFilesToDelete.iterator();
-								File file = null;
-								while (iterator.hasNext()) {
-									try {
-										file = (File) iterator.next();
-										if (file.exists()) {
-											file.delete();
-										}
-									} catch (SecurityException e) {
-									}
-								}
-							}
-						}
-					}
-				}));
-				tempFilesToDelete = new HashSet();
-			} catch (SecurityException e) {
-			}
-		}
-		if (tempFilesToDelete != null) {
-			synchronized (tempFilesToDelete) {
-				cleanupCount++;
-				tempFilesToDelete.add(file);
-			}
-			if (cleanupCount > CLEANUP_THRESHOLD) {
-				runCleanup();
-			}
-		}
-	}
-
-	public static void fileHasBeenDeleted(File file) {
-		if (tempFilesToDelete != null) {
-			synchronized (tempFilesToDelete) {
-				cleanupCount++;
-				try {
-					if (!file.exists()) {
-						tempFilesToDelete.remove(file);
-					}
-				} catch (SecurityException e) {
-				}
-			}
-			if (cleanupCount > CLEANUP_THRESHOLD) {
-				runCleanup();
-			}
-		}
-	}
-
-	public static void runCleanup() {
-		if (tempFilesToDelete != null) {
-			synchronized (tempFilesToDelete) {
-				cleanupCount = 0;
-				List filesToRemove = null;
-				Iterator iterator = tempFilesToDelete.iterator();
-				File file = null;
-				while (iterator.hasNext()) {
-					try {
-						file = (File) iterator.next();
-						if (!file.exists()) {
-							if (filesToRemove == null) {
-								filesToRemove = new ArrayList();
-							}
-							filesToRemove.add(file);
-						}
-					} catch (SecurityException e) {
-					}
-				}
-				if (filesToRemove != null) {
-					tempFilesToDelete.removeAll(filesToRemove);
-				}
-			}
-		}
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/EARFileUtil.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/EARFileUtil.java
deleted file mode 100644
index c22e9599b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/EARFileUtil.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-public class EARFileUtil {
-
-	/**
-	 * Constructor for EARFileUtil.
-	 */
-	private EARFileUtil() {
-		super();
-	}
-
-	/**
-	 * Returns a list of all module files which are a spec level too high for the EAR file. If the
-	 * EAR is 1.3, returns an empty list. Otherwise returns any J2EE 1.3 modules.
-	 */
-	public static List getIncompatible13ModuleFiles(EARFile earFile) {
-		if (isJ2EE13(earFile))
-			return Collections.EMPTY_LIST;
-
-		List moduleFiles = earFile.getModuleFiles();
-		List result = new ArrayList();
-		for (int i = 0; i < moduleFiles.size(); i++) {
-			ModuleFile aModuleFile = (ModuleFile) moduleFiles.get(i);
-			if (isJ2EE13(aModuleFile))
-				result.add(aModuleFile);
-		}
-		return result;
-	}
-
-	/**
-	 * Returns a list of all module files which are a spec level too high for the EAR file. If the
-	 * EAR is 1.4, returns an empty list. Otherwise returns any J2EE 1.4 modules.
-	 */
-	public static List getIncompatible14ModuleFiles(EARFile earFile) {
-		if (isJ2EE14(earFile))
-			return Collections.EMPTY_LIST;
-
-		List moduleFiles = earFile.getModuleFiles();
-		List result = new ArrayList();
-		for (int i = 0; i < moduleFiles.size(); i++) {
-			ModuleFile aModuleFile = (ModuleFile) moduleFiles.get(i);
-			if (isJ2EE14(aModuleFile))
-				result.add(aModuleFile);
-		}
-		return result;
-	}
-
-	public static boolean isJ2EE13(ModuleFile aModuleFile) {
-		try {
-			XMLResource xmlResource = (XMLResource) aModuleFile.getDeploymentDescriptorResource();
-			return xmlResource.getJ2EEVersionID() == J2EEVersionConstants.J2EE_1_3_ID;
-		} catch (FileNotFoundException ex) {
-			return false;
-		}
-	}
-
-	public static boolean isJ2EE14(ModuleFile aModuleFile) {
-		try {
-			XMLResource xmlResource = (XMLResource) aModuleFile.getDeploymentDescriptorResource();
-			return xmlResource.getJ2EEVersionID() == J2EEVersionConstants.J2EE_1_4_ID;
-		} catch (FileNotFoundException ex) {
-			return false;
-		}
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/FileDups.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/FileDups.java
deleted file mode 100644
index 4caed6ce9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/FileDups.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Insert the type's description here. Creation date: (4/11/2001 10:28:44 AM)
- * 
- * @author: Administrator
- */
-public class FileDups {
-	private static int sFiles = 0;
-	private static int sDups = 0;
-	private static int sJARs = 0;
-	private static String[] excludedEntryNames = new String[]{"com/ibm/ivj/ejb/runtime/_CopyHelper_Stub.class", //$NON-NLS-1$
-				"org/omg/stub/javax/ejb/_HomeHandle_Stub.class", //$NON-NLS-1$
-				"org/omg/stub/javax/ejb/_Handle_Stub.class", //$NON-NLS-1$
-				"org/omg/stub/javax/ejb/_EJBObject_Stub.class", //$NON-NLS-1$
-				"org/omg/stub/javax/ejb/_EJBHome_Stub.class", //$NON-NLS-1$
-				"org/omg/stub/java/lang/_Cloneable_Stub.class", //$NON-NLS-1$
-				"com/ibm/websphere/csi/_TransactionalObject_Stub.class", //$NON-NLS-1$
-				"com/ibm/websphere/csi/_CSIServant_Stub.class", //$NON-NLS-1$
-				"com/ibm/ejs/container/_EJSWrapper_Tie.class", //$NON-NLS-1$
-				"com/ibm/ejs/container/_EJSWrapper_Stub.class" //$NON-NLS-1$
-	};
-	private static HashSet excluded = new HashSet(Arrays.asList(excludedEntryNames));
-
-	private static void addEntry(String entry, Map map, String jarName) {
-		sFiles++;
-
-		Object current = map.get(entry);
-		if (current == null) {
-			// This is the first time the entry is found
-			map.put(entry, jarName);
-		} else if (current instanceof String) {
-			// There is one other entry
-			map.remove(entry);
-
-			String other = (String) current;
-			LinkedList list = new LinkedList();
-			list.addFirst(other);
-			list.addFirst(jarName);
-			map.put(entry, list);
-
-			sDups++;
-		} else {
-			// There are more than one other instances
-			LinkedList list = (LinkedList) current;
-			list.addFirst(jarName);
-
-			sDups++;
-		}
-	}
-
-	/**
-	 * Starts the application.
-	 * 
-	 * @param args
-	 *            an array of command-line arguments
-	 */
-	public static void main(java.lang.String[] args) {
-		if (args.length != 1) {
-			StringBuffer sb = new StringBuffer();
-			sb.append("FileDups utility\r\n\r\n"); //$NON-NLS-1$
-			sb.append("Synopsis:\r\n"); //$NON-NLS-1$
-			sb.append("Analyzes JAR and ZIP files in a directory for duplicate entries with the same name.  This excludes all entries in the \"META-INF\" directory of the archive.  This does not check timestamps or size.\r\n\r\n"); //$NON-NLS-1$
-			sb.append("Usage: FileDups dirName\r\n"); //$NON-NLS-1$
-			System.out.println(sb.toString());
-			return;
-		}
-
-		TreeMap map = new TreeMap();
-
-		try {
-			for (int i = 0; i < args.length; i++) {
-				File root = new File(args[i]);
-				processDirectory(root, map);
-			}
-
-			TreeMap outputMap = new TreeMap();
-
-			Set set = map.entrySet();
-			Iterator it = set.iterator();
-			while (it.hasNext()) {
-				Map.Entry me = (Map.Entry) it.next();
-				Object o = me.getValue();
-				if (o instanceof LinkedList) {
-					StringBuffer jars = new StringBuffer();
-
-					LinkedList list = (LinkedList) o;
-					Iterator entryIter = list.iterator();
-					while (entryIter.hasNext()) {
-						jars.append(entryIter.next());
-						jars.append("\r\n"); //$NON-NLS-1$
-					}
-
-					LinkedList outputList = (LinkedList) outputMap.get(jars.toString());
-					if (outputList == null) {
-						outputList = new LinkedList();
-						outputMap.put(jars.toString(), outputList);
-					}
-					outputList.addFirst(me.getKey());
-				}
-			}
-
-			Set outSet = outputMap.entrySet();
-			it = outSet.iterator();
-			while (it.hasNext()) {
-				Map.Entry me = (Map.Entry) it.next();
-				String jars = (String) me.getKey();
-				StringTokenizer tokens = new StringTokenizer(jars, "\r\n"); //$NON-NLS-1$
-
-				while (tokens.hasMoreTokens()) {
-					System.out.println(tokens.nextToken());
-				}
-
-				LinkedList list = (LinkedList) me.getValue();
-				Iterator entryIter = list.iterator();
-				while (entryIter.hasNext()) {
-					System.out.println("    " + (String) entryIter.next()); //$NON-NLS-1$
-				}
-			}
-
-			System.out.println("\r\nSearched " + sJARs + " jars, found " + sDups + " dups in " + sFiles + " files."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		} catch (Exception x) {
-			x.printStackTrace();
-		}
-	}
-
-	private static void processDirectory(File root, Map map) throws java.io.IOException {
-		File[] files = root.listFiles();
-		for (int i = 0; i < files.length; i++) {
-			File f = files[i];
-			if (f.isDirectory())
-				processDirectory(f, map);
-			else {
-				String name = f.getName().toLowerCase();
-				if (name.endsWith(".zip") || name.endsWith(".jar")) //$NON-NLS-1$ //$NON-NLS-2$
-				{
-					processFile(f, map);
-				}
-			}
-		}
-	}
-
-	private static void processFile(File file, Map map) throws java.io.IOException {
-		HashSet filesInFile = new HashSet();
-
-		sJARs++;
-		ZipFile zip = null;
-		try {
-			zip = new ZipFile(file);
-			Enumeration eNum = zip.entries();
-			while (eNum.hasMoreElements()) {
-				ZipEntry entry = (ZipEntry) eNum.nextElement();
-				String name = entry.getName();
-				if (!name.startsWith("META-INF") && !excluded.contains(name)) //$NON-NLS-1$
-					filesInFile.add(name);
-			}
-		} catch (Exception x) {
-			System.out.println("*Error searching in " + file.getAbsolutePath()); //$NON-NLS-1$
-		} finally {
-			try {
-				if (zip != null)
-					zip.close();
-			} catch (java.io.IOException ignored) {
-				//Ignore
-			}
-		}
-
-		// Now add the packages to the map
-		String filename = file.getPath();
-
-		Iterator it = filesInFile.iterator();
-		while (it.hasNext()) {
-			String entryName = (String) it.next();
-			addEntry(entryName, map, filename);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ObjectInputStreamCustomResolver.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ObjectInputStreamCustomResolver.java
deleted file mode 100644
index 76cef83c1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ObjectInputStreamCustomResolver.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectStreamClass;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Array;
-
-public class ObjectInputStreamCustomResolver extends java.io.ObjectInputStream {
-	private ClassLoader cl;
-
-	/**
-	 * Constructor
-	 */
-
-	public ObjectInputStreamCustomResolver(InputStream is, ClassLoader loader) throws IOException, StreamCorruptedException {
-
-		super(is);
-
-		if (loader != null)
-			cl = loader;
-
-	}
-
-	/**
-	 * Gets the java type class given a signature letter.
-	 */
-
-	private Class getType(char type) {
-
-		switch (type) {
-			case 'B' :
-				return byte.class;
-			case 'C' :
-				return char.class;
-			case 'D' :
-				return double.class;
-			case 'F' :
-				return float.class;
-			case 'I' :
-				return int.class;
-			case 'J' :
-				return long.class;
-			case 'S' :
-				return short.class;
-			case 'Z' :
-				return boolean.class;
-			default :
-				return null;
-		}
-
-	}
-
-	/**
-	 * This overrides the default resolveClass() method to use a custom class loader.
-	 */
-
-	protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
-
-		String className = classDesc.getName();
-
-		//UtilsTrace.trace(" ObjectInputStreamCustomResolver: Resolving " + className);
-
-		// Handle arrays of classes differently
-
-		if (className.startsWith("[")) {//$NON-NLS-1$
-
-			Class component = null;
-			int dimNum;
-
-			for (dimNum = 1; className.charAt(dimNum) == '['; dimNum++)
-
-			if (className.charAt(dimNum) == 'L') {
-				component = cl.loadClass(className.substring(dimNum + 1, className.length() - 1));
-			} else {
-				if (className.length() != dimNum + 1)
-					throw new ClassNotFoundException(className); // malformed
-				component = getType(className.charAt(dimNum));
-			}
-
-			int dimensions[] = new int[dimNum];
-			for (int i = 0; i < dimNum; i++)
-				dimensions[i] = 0;
-
-			return Array.newInstance(component, dimensions).getClass();
-
-		}
-		return cl.loadClass(className);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/RarFileDynamicClassLoader.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/RarFileDynamicClassLoader.java
deleted file mode 100644
index c7a26abbe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/RarFileDynamicClassLoader.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-
-
-public class RarFileDynamicClassLoader extends ArchiveFileDynamicClassLoader {
-
-	public RarFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		super(anArchive, parentCl, extraCl);
-	}
-
-	protected File getFile(String name) {
-		List children = getRarFile().getArchiveFiles();
-		for (int i = 0; i < children.size(); i++) {
-			try {
-				return ((Archive) children.get(i)).getFile(name);
-			} catch (java.io.FileNotFoundException ex) {
-				continue;
-			}
-		}
-		return getFileFromDependentJar(name);
-	}
-
-	private RARFile getRarFile() {
-		return (RARFile) getArchive();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/WarFileDynamicClassLoader.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/WarFileDynamicClassLoader.java
deleted file mode 100644
index e59c6a234..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/WarFileDynamicClassLoader.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 23, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.commonarchivecore.internal.util;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-
-
-/**
- * @author dfholttp
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WarFileDynamicClassLoader extends ArchiveFileDynamicClassLoader {
-
-	private boolean allowLoadingFromWAR = true;
-
-	public WarFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		super(anArchive, parentCl, extraCl);
-		allowLoadingFromWAR = anArchive.getOptions().getClassLoadingMode() == ArchiveOptions.LOAD_MODE_COMPAT;
-	}
-
-	protected File getFile(String name) {
-		//search classes directory first, then war, then nested archives.
-		//search classes directory
-		String swizzledName = ArchiveUtil.concatUri(ArchiveConstants.WEBAPP_CLASSES_URI, name, '/');
-		try {
-			return getWarFile().getFile(swizzledName);
-		} catch (java.io.FileNotFoundException ex) {
-		}
-		//search war if running with compatibility
-		if (allowLoadingFromWAR) {
-			File file = getFileFromArchive(name);
-			if (file != null) {
-				return file;
-			}
-		}
-		//search nested archives
-		List children = getWarFile().getLibs();
-		for (int i = 0; i < children.size(); i++) {
-			try {
-				return ((Archive) children.get(i)).getFile(name);
-			} catch (java.io.FileNotFoundException ex) {
-				continue;
-			}
-		}
-		//finally search jars in ear
-		return getFileFromDependentJar(name);
-	}
-
-	private WARFile getWarFile() {
-		return (WARFile) getArchive();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseApplication.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseApplication.java
deleted file mode 100644
index e32caabdf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @generated
- */
-public interface LooseApplication extends LooseArchive {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of LooseArchives references
-	 */
-	EList getLooseArchives();
-
-} //LooseApplication
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseArchive.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseArchive.java
deleted file mode 100644
index 0e17a4b05..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseArchive.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * @generated
- */
-public interface LooseArchive extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the Uri attribute
-	 */
-	String getUri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the Uri attribute
-	 */
-	void setUri(String value);
-
-	boolean isEAR();
-
-	boolean isWAR();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the BinariesPath attribute
-	 */
-	String getBinariesPath();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the BinariesPath attribute
-	 */
-	void setBinariesPath(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the ResourcesPath attribute
-	 */
-	String getResourcesPath();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the ResourcesPath attribute
-	 */
-	void setResourcesPath(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The LooseApp reference
-	 */
-	LooseApplication getLooseApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the LooseApp reference
-	 */
-	void setLooseApp(LooseApplication value);
-
-	boolean isModule();
-
-} //LooseArchive
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfigRegister.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfigRegister.java
deleted file mode 100644
index 17c670796..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfigRegister.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-
-
-/**
- * Used internally for loose module support
- */
-public class LooseConfigRegister {
-
-	/**
-	 * The system property used to specify the absolute path to the loose config document;
-	 * "was.loose.config"
-	 */
-	public static final String LOOSE_CONFIG_PROPERTY = "was.loose.config"; //$NON-NLS-1$
-
-	protected static LooseConfigRegister singleton;
-
-	protected LooseConfiguration looseConfiguration;
-
-	protected ResourceSet resourceSet;
-
-	/** Have we previously loaded or tried to load the loose configuration? */
-	protected boolean loadAttempted = false;
-
-	private Map looseEarMap;
-
-	/**
-	 * Constructor for LooseConfigRegister.
-	 */
-	protected LooseConfigRegister() {
-		super();
-		initialize();
-	}
-
-	public static LooseConfigRegister singleton() {
-		if (singleton == null)
-			singleton = new LooseConfigRegister();
-
-		return singleton;
-	}
-
-	/**
-	 * Searches for the ear file in the fluffed LooseConfiguration object, and attempts to load the
-	 * LooseApplication on demand from the existing mappings if it is not already loaded.
-	 * 
-	 * @param earFileURI
-	 * @return
-	 */
-	public LooseApplication findLooseApplication(String earFileURI) {
-		// System.out.println(getClass().getName() + ".findLooseApplication(String
-		// earFileURI=\""+earFileURI+"\")");
-		if (getLooseConfiguration() != null) {
-			List apps = getLooseConfiguration().getApplications();
-			for (int i = 0; i < apps.size(); i++) {
-				LooseApplication app = (LooseApplication) apps.get(i);
-				// System.out.println(getClass().getName() + ".findLooseApplication():
-				// app["+i+"].getURI()=\""+app.getUri()+"\"" );
-				if (app.getUri().equals(earFileURI))
-					return app;
-			}
-		}
-		// System.out.println(getClass().getName() + ".findLooseApplication(): did not find loaded
-		// LooseApplication, loading new value." );
-		if (getDocumentURI() == null || getDocumentURI().trim().length() == 0) {
-			URI looseConfig = (URI) getLooseEarMap().get(earFileURI);
-			// System.out.println(getClass().getName() + ".findLooseApplication(): looseConfig URI
-			// from map \""+looseConfig+"\"");
-			LooseApplication application = loadLooseApplication(looseConfig);
-			// System.out.println(getClass().getName() + ".findLooseApplication():
-			// looseApplication="+application);
-			if (application != null) {
-				List modules = application.getLooseArchives();
-				// System.out.println(getClass().getName() + ".findLooseApplication():
-				// looseApplication contains " + modules.size() + " modules.");
-				for (int i = 0; i < modules.size(); i++)
-					// System.out.println(getClass().getName() + ".findLooseApplication():
-					// modules.get("+i+"):"+ modules.get(i));
-					getLooseConfiguration().getApplications().add(application);
-				return application;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param earFileURI
-	 *            The containing EAR -- the absolute file system URI will be determined
-	 *            automatically
-	 * @param looseApplicationResource
-	 *            The absolute file system URI of a document containing a LooseApplication as its
-	 *            root
-	 */
-	public void addLooseMapping(Container container, String looseApplicationResource) {
-		if (container != null)
-			addLooseMapping(ArchiveUtil.getOSUri(container.getURI()), looseApplicationResource);
-	}
-
-	/**
-	 * @param earFileURI
-	 *            The absolute file system URI of the EAR file of the given mapping
-	 * @param looseApplicationResource
-	 *            The absolute file system URI of a document containing a LooseApplication as its
-	 *            root
-	 */
-	public void addLooseMapping(String earFileURI, String looseApplicationResource) {
-		if (earFileURI != null) {
-			// System.out.println(getClass().getName() + ".addLooseMapping(String
-			// earFileURI=\""+earFileURI+"\", String
-			// looseApplicationResource=\""+looseApplicationResource+"\")");
-			if (getLooseEarMap().containsKey(earFileURI)) {
-				// System.out.println(getClass().getName() + ".addLooseMapping(): Found existing key
-				// with same earFileURI, looking for loaded app.");
-				LooseApplication app = findLooseApplicationIfLoaded(earFileURI);
-				// System.out.println(getClass().getName() + ".addLooseMapping(): Loaded app=" +
-				// app);
-				if (app != null) {
-					Resource res = loadLooseApplicationResource(URI.createURI(looseApplicationResource));
-					// System.out.println(getClass().getName() + ".addLooseMapping(): clearing
-					// resource:" + res);
-					res.unload();
-					removeLooseApplication(app);
-				}
-			}
-			getLooseEarMap().put(earFileURI, URI.createURI(looseApplicationResource));
-		}
-	}
-
-	/**
-	 * @param earFileURI
-	 * @return
-	 */
-	public LooseApplication findLooseApplicationIfLoaded(String earFileURI) {
-		// System.out.println(getClass().getName() + ".findLooseApplicationIfLoaded(String
-		// earFileURI=\""+earFileURI+"\")");
-		if (getLooseConfiguration() != null) {
-			List apps = getLooseConfiguration().getApplications();
-			for (int i = 0; i < apps.size(); i++) {
-				LooseApplication app = (LooseApplication) apps.get(i);
-				// System.out.println(getClass().getName() + ".findLooseApplicationIfLoaded():
-				// app["+i+"].getURI()=\""+app.getUri()+"\"" );
-				if (app.getUri().equals(earFileURI))
-					return app;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Allows adding LooseApplications dynmically.
-	 * 
-	 * @param application
-	 *            An application created and persisted by an external entity
-	 */
-	public void addLooseApplication(LooseApplication application) {
-		getLooseConfiguration().getApplications().add(application);
-	}
-
-	/**
-	 * Allows removing LooseApplications dynmically.
-	 * 
-	 * @param application
-	 *            An application created and persisted by an external entity
-	 */
-	public void removeLooseApplication(LooseApplication application) {
-		// System.out.println(getClass().getName() + ".removeLooseApplication(LooseApplication
-		// application=\""+application+"\")");
-		getLooseConfiguration().getApplications().remove(application);
-	}
-
-	/**
-	 * @param earFileURI
-	 *            The absolute file system URI of the EAR file of the given mapping
-	 */
-	public void removeLooseMapping(String earFileURI) {
-		// System.out.println(getClass().getName() + ".removeLooseMapping(String
-		// earFileURI=\""+earFileURI+"\")");
-		if (earFileURI != null)
-			getLooseEarMap().remove(earFileURI);
-	}
-
-	public LooseModule findLooseModule(LooseApplication app, String uri, String altDD) {
-		List archives = app.getLooseArchives();
-		for (int i = 0; i < archives.size(); i++) {
-			LooseArchive element = (LooseArchive) archives.get(i);
-			if (!element.isModule())
-				continue;
-
-			if (StringUtil.stringsEqual(uri, element.getUri()) && StringUtil.stringsEqual(altDD, ((LooseModule) element).getAltDD()))
-				return (LooseModule) element;
-		}
-		return null;
-	}
-
-	public LooseModule findLooseModule(Module m, EARFile ear) {
-		LooseApplication app = findLooseApplication(ear.getURI());
-		return app == null ? null : findLooseModule(app, m.getUri(), m.getAltDD());
-	}
-
-	/**
-	 * Clears the loose configuration; the next time it is requested it will be reloaded;
-	 */
-	public void flush() {
-		loadAttempted = false;
-		looseConfiguration = null;
-		resourceSet = new ResourceSetImpl();
-	}
-
-	protected void initialize() {
-		resourceSet = new ResourceSetImpl();
-	}
-
-	protected void loadLooseConfiguration() {
-		Resource res = loadLooseConfigurationResource();
-		if (res != null && !res.getContents().isEmpty())
-			setLooseConfiguration((LooseConfiguration) res.getContents().get(0));
-		else
-			/*
-			 * if the document is empty then fluff up a LooseConfiguration object
-			 */
-			setLooseConfiguration(LooseconfigFactory.eINSTANCE.createLooseConfiguration());
-		loadAttempted = true;
-	}
-
-	protected Resource loadLooseConfigurationResource() {
-		String uri = getDocumentURI();
-		if (ArchiveUtil.isNullOrEmpty(uri))
-			return null;
-		try {
-			return resourceSet.getResource(URI.createURI(uri), true);
-		} catch (Exception ex) {
-			throw new ArchiveRuntimeException("Exception occurred loading loose configuration", ex); //$NON-NLS-1$
-		}
-	}
-
-	protected LooseApplication loadLooseApplication(URI looseAppURI) {
-		Resource res = loadLooseApplicationResource(looseAppURI);
-		if (res != null && !res.getContents().isEmpty())
-			return (LooseApplication) res.getContents().get(0);
-		return null;
-	}
-
-	protected Resource loadLooseApplicationResource(URI looseConfigURI) {
-		if (looseConfigURI == null)
-			return null;
-		try {
-			return resourceSet.getResource(looseConfigURI, true);
-		} catch (Exception ex) {
-			throw new ArchiveRuntimeException("Exception occurred loading loose application", ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Gets the looseConfiguration. Basic accessor with no initialization
-	 * 
-	 * @return Returns a LooseConfiguration
-	 */
-	public LooseConfiguration primGetLooseConfiguration() {
-		return looseConfiguration;
-	}
-
-	/** The value of the loose config property */
-	protected String getDocumentURI() {
-		return System.getProperty(LOOSE_CONFIG_PROPERTY);
-	}
-
-	/**
-	 * Gets the looseConfiguration. Tries to load it using the system property was.loose.config, if
-	 * necessary.
-	 * 
-	 * @return Returns a LooseConfiguration or null
-	 */
-	public LooseConfiguration getLooseConfiguration() {
-		if (looseConfiguration == null && !loadAttempted)
-			loadLooseConfiguration();
-		return looseConfiguration;
-	}
-
-	/**
-	 * Assumption: the parameter must be a type that can have children, e.g., LooseWAR or
-	 * LooseApplication
-	 */
-	public List getLooseChildren(LooseArchive loose) {
-		if (loose != null) {
-			if (loose.isEAR())
-				return ((LooseApplication) loose).getLooseArchives();
-			else if (loose.isWAR())
-				return ((LooseWARFile) loose).getLooseLibs();
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Assumption: the parameter must be a type that can have children, e.g., LooseWAR or
-	 * LooseApplication
-	 */
-	public LooseArchive findFirstLooseChild(String uri, LooseArchive loose) {
-		List children = getLooseChildren(loose);
-		for (int i = 0; i < children.size(); i++) {
-			LooseArchive child = (LooseArchive) children.get(i);
-			if (StringUtil.stringsEqual(uri, child.getUri()))
-				return loose;
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the looseConfiguration.
-	 * 
-	 * @param looseConfiguration
-	 *            The looseConfiguration to set
-	 */
-	public void setLooseConfiguration(LooseConfiguration config) {
-		looseConfiguration = config;
-	}
-
-	/**
-	 * Have we previously loaded or tried to load the loose configuration?
-	 * 
-	 * @return Returns a boolean
-	 */
-	public boolean getLoadAttempted() {
-		return loadAttempted;
-	}
-
-	/**
-	 * @return Returns the looseEarMap.
-	 */
-	public Map getLooseEarMap() {
-		if (looseEarMap == null)
-			looseEarMap = new HashMap();
-		return looseEarMap;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfiguration.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfiguration.java
deleted file mode 100644
index 54564e130..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * @generated
- */
-public interface LooseConfiguration extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of Applications references
-	 */
-	EList getApplications();
-
-} //LooseConfiguration
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseLibrary.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseLibrary.java
deleted file mode 100644
index 8c1ffd0e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseLibrary.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-/**
- * @generated
- */
-public interface LooseLibrary extends LooseArchive {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The LooseWAR reference
-	 */
-	LooseWARFile getLooseWAR();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the LooseWAR reference
-	 */
-	void setLooseWAR(LooseWARFile value);
-
-} //LooseLibrary
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseModule.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseModule.java
deleted file mode 100644
index 84e2f1578..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-/**
- * @generated
- */
-public interface LooseModule extends LooseArchive {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the AltDD attribute
-	 */
-	String getAltDD();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the AltDD attribute
-	 */
-	void setAltDD(String value);
-
-} //LooseModule
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseWARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseWARFile.java
deleted file mode 100644
index a7002db05..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseWARFile.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @generated
- */
-public interface LooseWARFile extends LooseModule {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of LooseLibs references
-	 */
-	EList getLooseLibs();
-
-} //LooseWARFile
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigFactory.java
deleted file mode 100644
index 2c08c0996..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LooseconfigFactory.java,v 1.3 2006/07/14 15:07:11 jlanuti Exp $
- */
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.LooseconfigPackage
- * @generated
- */
-public interface LooseconfigFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	LooseconfigFactory eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Loose Application</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Loose Application</em>'.
-	 * @generated
-	 */
-	LooseApplication createLooseApplication();
-
-	/**
-	 * Returns a new object of class '<em>Loose Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Loose Library</em>'.
-	 * @generated
-	 */
-	LooseLibrary createLooseLibrary();
-
-	/**
-	 * Returns a new object of class '<em>Loose Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Loose Module</em>'.
-	 * @generated
-	 */
-	LooseModule createLooseModule();
-
-	/**
-	 * Returns a new object of class '<em>Loose Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Loose Configuration</em>'.
-	 * @generated
-	 */
-	LooseConfiguration createLooseConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Loose WAR File</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Loose WAR File</em>'.
-	 * @generated
-	 */
-	LooseWARFile createLooseWARFile();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	LooseconfigPackage getLooseconfigPackage();
-
-} //LooseconfigFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigPackage.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigPackage.java
deleted file mode 100644
index 531198b78..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigPackage.java
+++ /dev/null
@@ -1,727 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LooseconfigPackage.java,v 1.3 2006/07/14 15:07:10 jlanuti Exp $
- */
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.LooseconfigFactory
- * @model kind="package"
- * @generated
- */
-public interface LooseconfigPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "looseconfig";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "commonarchive.looseconfig.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.commonarchivecore.looseconfig";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	LooseconfigPackage eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseArchiveImpl <em>Loose Archive</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseArchiveImpl
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseArchive()
-	 * @generated
-	 */
-	int LOOSE_ARCHIVE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_ARCHIVE__URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Binaries Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_ARCHIVE__BINARIES_PATH = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Resources Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_ARCHIVE__RESOURCES_PATH = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Loose App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_ARCHIVE__LOOSE_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Loose Archive</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_ARCHIVE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseApplicationImpl <em>Loose Application</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseApplicationImpl
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseApplication()
-	 * @generated
-	 */
-	int LOOSE_APPLICATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION__URI = LOOSE_ARCHIVE__URI;
-
-	/**
-	 * The feature id for the '<em><b>Binaries Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION__BINARIES_PATH = LOOSE_ARCHIVE__BINARIES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Resources Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION__RESOURCES_PATH = LOOSE_ARCHIVE__RESOURCES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Loose App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION__LOOSE_APP = LOOSE_ARCHIVE__LOOSE_APP;
-
-	/**
-	 * The feature id for the '<em><b>Loose Archives</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION__LOOSE_ARCHIVES = LOOSE_ARCHIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Loose Application</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION_FEATURE_COUNT = LOOSE_ARCHIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseLibraryImpl <em>Loose Library</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseLibraryImpl
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseLibrary()
-	 * @generated
-	 */
-	int LOOSE_LIBRARY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY__URI = LOOSE_ARCHIVE__URI;
-
-	/**
-	 * The feature id for the '<em><b>Binaries Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY__BINARIES_PATH = LOOSE_ARCHIVE__BINARIES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Resources Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY__RESOURCES_PATH = LOOSE_ARCHIVE__RESOURCES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Loose App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY__LOOSE_APP = LOOSE_ARCHIVE__LOOSE_APP;
-
-	/**
-	 * The feature id for the '<em><b>Loose WAR</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY__LOOSE_WAR = LOOSE_ARCHIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Loose Library</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY_FEATURE_COUNT = LOOSE_ARCHIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseModuleImpl <em>Loose Module</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseModuleImpl
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseModule()
-	 * @generated
-	 */
-	int LOOSE_MODULE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE__URI = LOOSE_ARCHIVE__URI;
-
-	/**
-	 * The feature id for the '<em><b>Binaries Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE__BINARIES_PATH = LOOSE_ARCHIVE__BINARIES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Resources Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE__RESOURCES_PATH = LOOSE_ARCHIVE__RESOURCES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Loose App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE__LOOSE_APP = LOOSE_ARCHIVE__LOOSE_APP;
-
-	/**
-	 * The feature id for the '<em><b>Alt DD</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE__ALT_DD = LOOSE_ARCHIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Loose Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE_FEATURE_COUNT = LOOSE_ARCHIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseConfigurationImpl <em>Loose Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseConfigurationImpl
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseConfiguration()
-	 * @generated
-	 */
-	int LOOSE_CONFIGURATION = 4;
-
-	/**
-	 * The feature id for the '<em><b>Applications</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_CONFIGURATION__APPLICATIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Loose Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_CONFIGURATION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseWARFileImpl <em>Loose WAR File</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseWARFileImpl
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseWARFile()
-	 * @generated
-	 */
-	int LOOSE_WAR_FILE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE__URI = LOOSE_MODULE__URI;
-
-	/**
-	 * The feature id for the '<em><b>Binaries Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE__BINARIES_PATH = LOOSE_MODULE__BINARIES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Resources Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE__RESOURCES_PATH = LOOSE_MODULE__RESOURCES_PATH;
-
-	/**
-	 * The feature id for the '<em><b>Loose App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE__LOOSE_APP = LOOSE_MODULE__LOOSE_APP;
-
-	/**
-	 * The feature id for the '<em><b>Alt DD</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE__ALT_DD = LOOSE_MODULE__ALT_DD;
-
-	/**
-	 * The feature id for the '<em><b>Loose Libs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE__LOOSE_LIBS = LOOSE_MODULE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Loose WAR File</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_WAR_FILE_FEATURE_COUNT = LOOSE_MODULE_FEATURE_COUNT + 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication <em>Loose Application</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loose Application</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication
-	 * @generated
-	 */
-	EClass getLooseApplication();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication#getLooseArchives <em>Loose Archives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Loose Archives</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication#getLooseArchives()
-	 * @see #getLooseApplication()
-	 * @generated
-	 */
-	EReference getLooseApplication_LooseArchives();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive <em>Loose Archive</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loose Archive</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive
-	 * @generated
-	 */
-	EClass getLooseArchive();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getUri <em>Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Uri</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getUri()
-	 * @see #getLooseArchive()
-	 * @generated
-	 */
-	EAttribute getLooseArchive_Uri();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getBinariesPath <em>Binaries Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Binaries Path</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getBinariesPath()
-	 * @see #getLooseArchive()
-	 * @generated
-	 */
-	EAttribute getLooseArchive_BinariesPath();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getResourcesPath <em>Resources Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resources Path</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getResourcesPath()
-	 * @see #getLooseArchive()
-	 * @generated
-	 */
-	EAttribute getLooseArchive_ResourcesPath();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getLooseApp <em>Loose App</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Loose App</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive#getLooseApp()
-	 * @see #getLooseArchive()
-	 * @generated
-	 */
-	EReference getLooseArchive_LooseApp();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary <em>Loose Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loose Library</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary
-	 * @generated
-	 */
-	EClass getLooseLibrary();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary#getLooseWAR <em>Loose WAR</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Loose WAR</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary#getLooseWAR()
-	 * @see #getLooseLibrary()
-	 * @generated
-	 */
-	EReference getLooseLibrary_LooseWAR();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule <em>Loose Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loose Module</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule
-	 * @generated
-	 */
-	EClass getLooseModule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule#getAltDD <em>Alt DD</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alt DD</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule#getAltDD()
-	 * @see #getLooseModule()
-	 * @generated
-	 */
-	EAttribute getLooseModule_AltDD();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration <em>Loose Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loose Configuration</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration
-	 * @generated
-	 */
-	EClass getLooseConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration#getApplications <em>Applications</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Applications</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration#getApplications()
-	 * @see #getLooseConfiguration()
-	 * @generated
-	 */
-	EReference getLooseConfiguration_Applications();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile <em>Loose WAR File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loose WAR File</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile
-	 * @generated
-	 */
-	EClass getLooseWARFile();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile#getLooseLibs <em>Loose Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Loose Libs</em>'.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile#getLooseLibs()
-	 * @see #getLooseWARFile()
-	 * @generated
-	 */
-	EReference getLooseWARFile_LooseLibs();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	LooseconfigFactory getLooseconfigFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseApplicationImpl <em>Loose Application</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseApplicationImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseApplication()
-		 * @generated
-		 */
-		EClass LOOSE_APPLICATION = eINSTANCE.getLooseApplication();
-
-		/**
-		 * The meta object literal for the '<em><b>Loose Archives</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOSE_APPLICATION__LOOSE_ARCHIVES = eINSTANCE.getLooseApplication_LooseArchives();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseArchiveImpl <em>Loose Archive</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseArchiveImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseArchive()
-		 * @generated
-		 */
-		EClass LOOSE_ARCHIVE = eINSTANCE.getLooseArchive();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOOSE_ARCHIVE__URI = eINSTANCE.getLooseArchive_Uri();
-
-		/**
-		 * The meta object literal for the '<em><b>Binaries Path</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOOSE_ARCHIVE__BINARIES_PATH = eINSTANCE.getLooseArchive_BinariesPath();
-
-		/**
-		 * The meta object literal for the '<em><b>Resources Path</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOOSE_ARCHIVE__RESOURCES_PATH = eINSTANCE.getLooseArchive_ResourcesPath();
-
-		/**
-		 * The meta object literal for the '<em><b>Loose App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOSE_ARCHIVE__LOOSE_APP = eINSTANCE.getLooseArchive_LooseApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseLibraryImpl <em>Loose Library</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseLibraryImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseLibrary()
-		 * @generated
-		 */
-		EClass LOOSE_LIBRARY = eINSTANCE.getLooseLibrary();
-
-		/**
-		 * The meta object literal for the '<em><b>Loose WAR</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOSE_LIBRARY__LOOSE_WAR = eINSTANCE.getLooseLibrary_LooseWAR();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseModuleImpl <em>Loose Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseModuleImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseModule()
-		 * @generated
-		 */
-		EClass LOOSE_MODULE = eINSTANCE.getLooseModule();
-
-		/**
-		 * The meta object literal for the '<em><b>Alt DD</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOOSE_MODULE__ALT_DD = eINSTANCE.getLooseModule_AltDD();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseConfigurationImpl <em>Loose Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseConfigurationImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseConfiguration()
-		 * @generated
-		 */
-		EClass LOOSE_CONFIGURATION = eINSTANCE.getLooseConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Applications</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOSE_CONFIGURATION__APPLICATIONS = eINSTANCE.getLooseConfiguration_Applications();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseWARFileImpl <em>Loose WAR File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseWARFileImpl
-		 * @see org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl#getLooseWARFile()
-		 * @generated
-		 */
-		EClass LOOSE_WAR_FILE = eINSTANCE.getLooseWARFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Loose Libs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOSE_WAR_FILE__LOOSE_LIBS = eINSTANCE.getLooseWARFile_LooseLibs();
-
-	}
-
-} //LooseconfigPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseApplicationImpl.java
deleted file mode 100644
index a89df469e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseApplicationImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-/**
- * @generated
- */
-public class LooseApplicationImpl extends LooseArchiveImpl implements LooseApplication {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList looseArchives = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LooseApplicationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return LooseconfigPackage.Literals.LOOSE_APPLICATION;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getLooseArchives() {
-		if (looseArchives == null) {
-			looseArchives = new EObjectContainmentWithInverseEList(LooseArchive.class, this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP);
-		}
-		return looseArchives;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES:
-				return ((InternalEList)getLooseArchives()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES:
-				return ((InternalEList)getLooseArchives()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES:
-				return getLooseArchives();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES:
-				getLooseArchives().clear();
-				getLooseArchives().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES:
-				getLooseArchives().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES:
-				return looseArchives != null && !looseArchives.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	public boolean isEAR() {
-		return true;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseArchiveImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseArchiveImpl.java
deleted file mode 100644
index cb25a76a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseArchiveImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-/**
- * @generated
- */
-public abstract class LooseArchiveImpl extends J2EEEObjectImpl implements LooseArchive {
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String uri = URI_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getBinariesPath() <em>Binaries Path</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getBinariesPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BINARIES_PATH_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String binariesPath = BINARIES_PATH_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getResourcesPath() <em>Resources Path</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getResourcesPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESOURCES_PATH_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String resourcesPath = RESOURCES_PATH_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LooseArchiveImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return LooseconfigPackage.Literals.LOOSE_ARCHIVE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_ARCHIVE__URI, oldUri, uri));
-	}
-
-	public boolean isEAR() {
-		return false;
-	}
-
-	public boolean isWAR() {
-		return false;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getBinariesPath() {
-		return binariesPath;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setBinariesPath(String newBinariesPath) {
-		String oldBinariesPath = binariesPath;
-		binariesPath = newBinariesPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH, oldBinariesPath, binariesPath));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getResourcesPath() {
-		return resourcesPath;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setResourcesPath(String newResourcesPath) {
-		String oldResourcesPath = resourcesPath;
-		resourcesPath = newResourcesPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH, oldResourcesPath, resourcesPath));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public LooseApplication getLooseApp() {
-		if (eContainerFeatureID != LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP) return null;
-		return (LooseApplication)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLooseApp(LooseApplication newLooseApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newLooseApp, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLooseApp(LooseApplication newLooseApp) {
-		if (newLooseApp != eInternalContainer() || (eContainerFeatureID != LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP && newLooseApp != null)) {
-			if (EcoreUtil.isAncestor(this, newLooseApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newLooseApp != null)
-				msgs = ((InternalEObject)newLooseApp).eInverseAdd(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs);
-			msgs = basicSetLooseApp(newLooseApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, newLooseApp, newLooseApp));
-	}
-
-	public boolean isModule() {
-		return false;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetLooseApp((LooseApplication)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				return basicSetLooseApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				return eInternalContainer().eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__URI:
-				return getUri();
-			case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH:
-				return getBinariesPath();
-			case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH:
-				return getResourcesPath();
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				return getLooseApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__URI:
-				setUri((String)newValue);
-				return;
-			case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH:
-				setBinariesPath((String)newValue);
-				return;
-			case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH:
-				setResourcesPath((String)newValue);
-				return;
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				setLooseApp((LooseApplication)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH:
-				setBinariesPath(BINARIES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH:
-				setResourcesPath(RESOURCES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				setLooseApp((LooseApplication)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_ARCHIVE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH:
-				return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath);
-			case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH:
-				return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath);
-			case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP:
-				return getLooseApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uri: ");
-		result.append(uri);
-		result.append(", binariesPath: ");
-		result.append(binariesPath);
-		result.append(", resourcesPath: ");
-		result.append(resourcesPath);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LooseArchiveImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseConfigurationImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseConfigurationImpl.java
deleted file mode 100644
index a3df27678..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseConfigurationImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-/**
- * @generated
- */
-public class LooseConfigurationImpl extends J2EEEObjectImpl implements LooseConfiguration {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList applications = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LooseConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return LooseconfigPackage.Literals.LOOSE_CONFIGURATION;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getApplications() {
-		if (applications == null) {
-			applications = new EObjectContainmentEList(LooseApplication.class, this, LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS);
-		}
-		return applications;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS:
-				return ((InternalEList)getApplications()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS:
-				return getApplications();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS:
-				getApplications().clear();
-				getApplications().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS:
-				getApplications().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS:
-				return applications != null && !applications.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LooseConfigurationImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseLibraryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseLibraryImpl.java
deleted file mode 100644
index cfb3250c0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseLibraryImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-/**
- * @generated
- */
-public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LooseLibraryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return LooseconfigPackage.Literals.LOOSE_LIBRARY;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public LooseWARFile getLooseWAR() {
-		if (eContainerFeatureID != LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR) return null;
-		return (LooseWARFile)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLooseWAR(LooseWARFile newLooseWAR, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newLooseWAR, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLooseWAR(LooseWARFile newLooseWAR) {
-		if (newLooseWAR != eInternalContainer() || (eContainerFeatureID != LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR && newLooseWAR != null)) {
-			if (EcoreUtil.isAncestor(this, newLooseWAR))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newLooseWAR != null)
-				msgs = ((InternalEObject)newLooseWAR).eInverseAdd(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.class, msgs);
-			msgs = basicSetLooseWAR(newLooseWAR, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, newLooseWAR, newLooseWAR));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetLooseWAR((LooseWARFile)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				return basicSetLooseWAR(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				return eInternalContainer().eInverseRemove(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				return getLooseWAR();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				setLooseWAR((LooseWARFile)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				setLooseWAR((LooseWARFile)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR:
-				return getLooseWAR() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LooseLibraryImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseModuleImpl.java
deleted file mode 100644
index 5a181a609..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseModuleImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-/**
- * @generated
- */
-public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule {
-	/**
-	 * The default value of the '{@link #getAltDD() <em>Alt DD</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getAltDD()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALT_DD_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String altDD = ALT_DD_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LooseModuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return LooseconfigPackage.Literals.LOOSE_MODULE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getAltDD() {
-		return altDD;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAltDD(String newAltDD) {
-		String oldAltDD = altDD;
-		altDD = newAltDD;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_MODULE__ALT_DD, oldAltDD, altDD));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD:
-				return getAltDD();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD:
-				setAltDD((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD:
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (altDD: ");
-		result.append(altDD);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LooseModuleImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseWARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseWARFileImpl.java
deleted file mode 100644
index b257c8fe3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseWARFileImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-/**
- * @generated
- */
-public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList looseLibs = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LooseWARFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return LooseconfigPackage.Literals.LOOSE_WAR_FILE;
-	}
-
-	public boolean isWAR() {
-		return true;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getLooseLibs() {
-		if (looseLibs == null) {
-			looseLibs = new EObjectContainmentWithInverseEList(LooseLibrary.class, this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR);
-		}
-		return looseLibs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS:
-				return ((InternalEList)getLooseLibs()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS:
-				return ((InternalEList)getLooseLibs()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS:
-				return getLooseLibs();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS:
-				getLooseLibs().clear();
-				getLooseLibs().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS:
-				getLooseLibs().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS:
-				return looseLibs != null && !looseLibs.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LooseWARFileImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigFactoryImpl.java
deleted file mode 100644
index 11fe7db3a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigFactoryImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-
-public class LooseconfigFactoryImpl extends EFactoryImpl implements LooseconfigFactory, EFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LooseconfigFactory init() {
-		try {
-			LooseconfigFactory theLooseconfigFactory = (LooseconfigFactory)EPackage.Registry.INSTANCE.getEFactory("commonarchive.looseconfig.xmi"); 
-			if (theLooseconfigFactory != null) {
-				return theLooseconfigFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new LooseconfigFactoryImpl();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseconfigFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case LooseconfigPackage.LOOSE_APPLICATION: return createLooseApplication();
-			case LooseconfigPackage.LOOSE_LIBRARY: return createLooseLibrary();
-			case LooseconfigPackage.LOOSE_MODULE: return createLooseModule();
-			case LooseconfigPackage.LOOSE_CONFIGURATION: return createLooseConfiguration();
-			case LooseconfigPackage.LOOSE_WAR_FILE: return createLooseWARFile();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseApplication createLooseApplication() {
-		LooseApplicationImpl looseApplication = new LooseApplicationImpl();
-		return looseApplication;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseLibrary createLooseLibrary() {
-		LooseLibraryImpl looseLibrary = new LooseLibraryImpl();
-		return looseLibrary;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseWARFile createLooseWARFile() {
-		LooseWARFileImpl looseWARFile = new LooseWARFileImpl();
-		return looseWARFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseModule createLooseModule() {
-		LooseModuleImpl looseModule = new LooseModuleImpl();
-		return looseModule;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseConfiguration createLooseConfiguration() {
-		LooseConfigurationImpl looseConfiguration = new LooseConfigurationImpl();
-		return looseConfiguration;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseconfigPackage getLooseconfigPackage() {
-		return (LooseconfigPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static LooseconfigPackage getPackage() {
-		return LooseconfigPackage.eINSTANCE;
-	}
-
-} //LooseconfigFactoryImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java
deleted file mode 100644
index 44b7a91ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * @lastgen class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage,
- *          EPackage {}
- */
-public class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass looseApplicationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass looseArchiveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass looseLibraryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass looseModuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass looseConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass looseWARFileEClass = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	private LooseconfigPackageImpl() {
-		super(eNS_URI, LooseconfigFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static LooseconfigPackage init() {
-		if (isInited) return (LooseconfigPackage)EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI);
-
-		// Obtain or create and register package
-		LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LooseconfigPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LooseconfigPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		Webservice_clientPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		WebapplicationPackage.eINSTANCE.eClass();
-		EjbPackage.eINSTANCE.eClass();
-		JspPackage.eINSTANCE.eClass();
-		ApplicationPackage.eINSTANCE.eClass();
-		ClientPackage.eINSTANCE.eClass();
-		JcaPackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) instanceof CommonarchivePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) : CommonarchivePackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theLooseconfigPackage.createPackageContents();
-		theCommonarchivePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theLooseconfigPackage.initializePackageContents();
-		theCommonarchivePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theLooseconfigPackage.freeze();
-
-		return theLooseconfigPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLooseApplication() {
-		return looseApplicationEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLooseApplication_LooseArchives() {
-		return (EReference)looseApplicationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLooseArchive() {
-		return looseArchiveEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLooseArchive_Uri() {
-		return (EAttribute)looseArchiveEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLooseArchive_BinariesPath() {
-		return (EAttribute)looseArchiveEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLooseArchive_ResourcesPath() {
-		return (EAttribute)looseArchiveEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLooseArchive_LooseApp() {
-		return (EReference)looseArchiveEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLooseLibrary() {
-		return looseLibraryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLooseLibrary_LooseWAR() {
-		return (EReference)looseLibraryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLooseWARFile() {
-		return looseWARFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLooseWARFile_LooseLibs() {
-		return (EReference)looseWARFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLooseModule() {
-		return looseModuleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLooseModule_AltDD() {
-		return (EAttribute)looseModuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLooseConfiguration() {
-		return looseConfigurationEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLooseConfiguration_Applications() {
-		return (EReference)looseConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseconfigFactory getLooseconfigFactory() {
-		return (LooseconfigFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		looseApplicationEClass = createEClass(LOOSE_APPLICATION);
-		createEReference(looseApplicationEClass, LOOSE_APPLICATION__LOOSE_ARCHIVES);
-
-		looseArchiveEClass = createEClass(LOOSE_ARCHIVE);
-		createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__URI);
-		createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__BINARIES_PATH);
-		createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__RESOURCES_PATH);
-		createEReference(looseArchiveEClass, LOOSE_ARCHIVE__LOOSE_APP);
-
-		looseLibraryEClass = createEClass(LOOSE_LIBRARY);
-		createEReference(looseLibraryEClass, LOOSE_LIBRARY__LOOSE_WAR);
-
-		looseModuleEClass = createEClass(LOOSE_MODULE);
-		createEAttribute(looseModuleEClass, LOOSE_MODULE__ALT_DD);
-
-		looseConfigurationEClass = createEClass(LOOSE_CONFIGURATION);
-		createEReference(looseConfigurationEClass, LOOSE_CONFIGURATION__APPLICATIONS);
-
-		looseWARFileEClass = createEClass(LOOSE_WAR_FILE);
-		createEReference(looseWARFileEClass, LOOSE_WAR_FILE__LOOSE_LIBS);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		looseApplicationEClass.getESuperTypes().add(this.getLooseArchive());
-		looseArchiveEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		looseLibraryEClass.getESuperTypes().add(this.getLooseArchive());
-		looseModuleEClass.getESuperTypes().add(this.getLooseArchive());
-		looseConfigurationEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		looseWARFileEClass.getESuperTypes().add(this.getLooseModule());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(looseApplicationEClass, LooseApplication.class, "LooseApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLooseApplication_LooseArchives(), this.getLooseArchive(), this.getLooseArchive_LooseApp(), "looseArchives", null, 0, -1, LooseApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(looseArchiveEClass, LooseArchive.class, "LooseArchive", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLooseArchive_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLooseArchive_BinariesPath(), ecorePackage.getEString(), "binariesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLooseArchive_ResourcesPath(), ecorePackage.getEString(), "resourcesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLooseArchive_LooseApp(), this.getLooseApplication(), this.getLooseApplication_LooseArchives(), "looseApp", null, 0, 1, LooseArchive.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(looseArchiveEClass, ecorePackage.getEBoolean(), "isModule", 0, 1);
-
-		initEClass(looseLibraryEClass, LooseLibrary.class, "LooseLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLooseLibrary_LooseWAR(), this.getLooseWARFile(), this.getLooseWARFile_LooseLibs(), "looseWAR", null, 0, 1, LooseLibrary.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(looseModuleEClass, LooseModule.class, "LooseModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLooseModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, LooseModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(looseConfigurationEClass, LooseConfiguration.class, "LooseConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLooseConfiguration_Applications(), this.getLooseApplication(), null, "applications", null, 0, -1, LooseConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(looseWARFileEClass, LooseWARFile.class, "LooseWARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLooseWARFile_LooseLibs(), this.getLooseLibrary(), this.getLooseLibrary_LooseWAR(), "looseLibs", null, 0, -1, LooseWARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-	}
-
-} //LooseconfigPackageImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigAdapterFactory.java
deleted file mode 100644
index a2538aa98..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigAdapterFactory.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.util;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-
-/**
- * @lastgen class LooseconfigAdapterFactory extends AdapterFactoryImpl {}
- */
-public class LooseconfigAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected static LooseconfigPackage modelPackage;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseconfigAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = LooseconfigPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LooseconfigSwitch modelSwitch =
-		new LooseconfigSwitch() {
-			public Object caseLooseApplication(LooseApplication object) {
-				return createLooseApplicationAdapter();
-			}
-			public Object caseLooseArchive(LooseArchive object) {
-				return createLooseArchiveAdapter();
-			}
-			public Object caseLooseLibrary(LooseLibrary object) {
-				return createLooseLibraryAdapter();
-			}
-			public Object caseLooseModule(LooseModule object) {
-				return createLooseModuleAdapter();
-			}
-			public Object caseLooseConfiguration(LooseConfiguration object) {
-				return createLooseConfigurationAdapter();
-			}
-			public Object caseLooseWARFile(LooseWARFile object) {
-				return createLooseWARFileAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases. It's useful to
-	 * ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLooseApplicationAdapter() {
-
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLooseArchiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLooseLibraryAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLooseWARFileAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc --> This default
-	 * implementation returns null. <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLooseModuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLooseConfigurationAdapter() {
-		return null;
-	}
-
-} //LooseconfigAdapterFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigSwitch.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigSwitch.java
deleted file mode 100644
index 2ebc6fc9a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigSwitch.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.util;
-
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-
-
-/**
- * @lastgen class LooseconfigSwitch {}
- */
-public class LooseconfigSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static LooseconfigPackage modelPackage;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LooseconfigSwitch() {
-		if (modelPackage == null) {
-			modelPackage = LooseconfigPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case LooseconfigPackage.LOOSE_APPLICATION: {
-				LooseApplication looseApplication = (LooseApplication)theEObject;
-				Object result = caseLooseApplication(looseApplication);
-				if (result == null) result = caseLooseArchive(looseApplication);
-				if (result == null) result = caseJ2EEEObject(looseApplication);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LooseconfigPackage.LOOSE_ARCHIVE: {
-				LooseArchive looseArchive = (LooseArchive)theEObject;
-				Object result = caseLooseArchive(looseArchive);
-				if (result == null) result = caseJ2EEEObject(looseArchive);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LooseconfigPackage.LOOSE_LIBRARY: {
-				LooseLibrary looseLibrary = (LooseLibrary)theEObject;
-				Object result = caseLooseLibrary(looseLibrary);
-				if (result == null) result = caseLooseArchive(looseLibrary);
-				if (result == null) result = caseJ2EEEObject(looseLibrary);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LooseconfigPackage.LOOSE_MODULE: {
-				LooseModule looseModule = (LooseModule)theEObject;
-				Object result = caseLooseModule(looseModule);
-				if (result == null) result = caseLooseArchive(looseModule);
-				if (result == null) result = caseJ2EEEObject(looseModule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LooseconfigPackage.LOOSE_CONFIGURATION: {
-				LooseConfiguration looseConfiguration = (LooseConfiguration)theEObject;
-				Object result = caseLooseConfiguration(looseConfiguration);
-				if (result == null) result = caseJ2EEEObject(looseConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case LooseconfigPackage.LOOSE_WAR_FILE: {
-				LooseWARFile looseWARFile = (LooseWARFile)theEObject;
-				Object result = caseLooseWARFile(looseWARFile);
-				if (result == null) result = caseLooseModule(looseWARFile);
-				if (result == null) result = caseLooseArchive(looseWARFile);
-				if (result == null) result = caseJ2EEEObject(looseWARFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseLooseApplication(LooseApplication object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseLooseArchive(LooseArchive object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseLooseLibrary(LooseLibrary object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseLooseWARFile(LooseWARFile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseLooseModule(LooseModule object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseLooseConfiguration(LooseConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //LooseconfigSwitch
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/component.xml b/plugins/org.eclipse.jst.j2ee.core/component.xml
deleted file mode 100644
index 3fa448186..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/component.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.jst.j2ee.core">
-	<description url=""></description>
-	<component-depends unrestricted="true"></component-depends>
-	<plugin id="org.eclipse.jst.j2ee.core" fragment="false" />
-	<package name="org.eclipse.jst.j2ee.webservice.wsclient" api="false">
-		<type name="ComponentScopedRefs"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="Handler"  implement="false" subclass="false" instantiate="false"/>
-		<type name="PortComponentRef"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ServiceRef"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="Webservice_clientFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="WebServicesClient"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="WebServicesResource"  implement="false" subclass="false" instantiate="false"/>
-	</package>
-	<package name="org.eclipse.jst.j2ee.application" api="false" >
-		<type name="Application"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="ApplicationFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ApplicationResource"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ConnectorModule"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="EjbModule"  implement="false" subclass="false" instantiate="false"/>
-		<type name="JavaClientModule"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Module"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="WebModule"  implement="false" subclass="false" instantiate="false"/>
-	</package>
-	<package name="org.eclipse.jst.j2ee.webservice.wsdd"></package>
-	<package name="org.eclipse.jst.j2ee.jsp" api="false" >
-		<type name="JSPConfig"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="JspFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="JSPPropertyGroup"  implement="false" subclass="false" instantiate="false"/>
-		<type name="TagLibRefType"  implement="false" subclass="false" instantiate="false"/>		
-	</package>
-	<package name="org.eclipse.jst.j2ee.client" api="false" >
-		<type name="ApplicationClient"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="ApplicationClientResource"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ClientFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ResAuthApplicationType"  implement="false" subclass="false" instantiate="false"/>		
-	</package>
-	<package name="org.eclipse.jst.j2ee.webapplication" api="false">
-		<type name="AuthConstraint"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="AuthMethodKind"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ContextParam"  implement="false" subclass="false" instantiate="false"/>
-		<type name="DispatcherType"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="ErrorCodeErrorPage"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ErrorPage"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ExceptionTypeErrorPage"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Filter"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="FilterMapping"  implement="false" subclass="false" instantiate="false"/>
-		<type name="FormLoginConfig"  implement="false" subclass="false" instantiate="false"/>
-		<type name="HTTPMethodType"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="HTTPMethodTypeEnum"  implement="false" subclass="false" instantiate="false"/>
-		<type name="InitParam"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="JSPType"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="LocalEncodingMapping"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="LocalEncodingMappingList"  implement="false" subclass="false" instantiate="false"/>
-		<type name="LoginConfig"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MimeMapping"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="ResAuthServletType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="RoleNameType"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="SecurityConstraint"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Servlet"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ServletMapping"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ServletType"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="SessionConfig"  implement="false" subclass="false" instantiate="false"/>
-		<type name="TagLibRef"  implement="false" subclass="false" instantiate="false"/>
-		<type name="TransportGuaranteeType"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="URLPatternType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="UserDataConstraint"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="WebApp"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="WebapplicationFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="WebAppResource"  implement="false" subclass="false" instantiate="false"/>
-		<type name="WebResourceCollection"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="WebType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="WelcomeFile"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="WelcomeFileList"  implement="false" subclass="false" instantiate="false"/>
-	</package>
-	<package name="org.eclipse.jst.j2ee.webservice"></package>
-	<package name="org.eclipse.jst.j2ee.common" api="false">
-		<type name="CommonFactory"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="CompatibilityDescriptionGroup"  implement="false" subclass="false" instantiate="false"/>
-		<type name="DeploymentExtension"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Description"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="DescriptionGroup"  implement="false" subclass="false" instantiate="false"/>
-		<type name="DisplayName"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="EJBLocalRef"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="EjbRef"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="EjbRefType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EnvEntry"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EnvEntryType"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="ExtensibleType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="IconType"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Identity"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="JNDIEnvRefsGroup"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="Listener"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MessageDestination"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MessageDestinationRef"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="MessageDestinationUsageType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ParamValue"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="QName"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ResAuthTypeBase"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ResourceEnvRef"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ResourceRef"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="ResSharingScopeType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="RunAsSpecifiedIdentity"  implement="false" subclass="false" instantiate="false"/>
-		<type name="SecurityIdentity"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="SecurityRole"  implement="false" subclass="false" instantiate="false"/>
-		<type name="SecurityRoleRef"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="UseCallerIdentity"  implement="false" subclass="false" instantiate="false"/>
-	</package>
-	<package name="org.eclipse.jst.j2ee.webservice.jaxrpcmap">
-		<type name="JaxrpcmapResourceFactory" reference="false" implement="false" subclass="false" instantiate="false"/>
-	</package>
-	<package name="org.eclipse.jst.j2ee.webservice.wscommon"></package>
-	<package name="org.eclipse.jst.j2ee.jca" api="false" >
-		<type name="ActivationSpec"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="AdminObject"  implement="false" subclass="false" instantiate="false"/>
-		<type name="AuthenticationMechanism"  implement="false" subclass="false" instantiate="false"/>
-		<type name="AuthenticationMechanismType"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="ConfigProperty"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ConnectionDefinition"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Connector"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ConnectorResource"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="InboundResourceAdapter"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="JcaFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="License"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MessageAdapter"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="MessageListener"  implement="false" subclass="false" instantiate="false"/>
-		<type name="OutboundResourceAdapter"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="RequiredConfigPropertyType"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ResourceAdapter"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="SecurityPermission"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="TransactionSupportKind"  implement="false" subclass="false" instantiate="false"/>
-	</package>
-	<package name="org.eclipse.jst.j2ee.ejb" api="false">
-		<type name="AcknowledgeMode"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="ActivationConfig"  implement="false" subclass="false" instantiate="false"/>
-		<type name="ActivationConfigProperty"  implement="false" subclass="false" instantiate="false"/>
-		<type name="AssemblyDescriptor"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="CMPAttribute"  implement="false" subclass="false" instantiate="false"/>
-		<type name="CMRField"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="CommonRelationship"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="CommonRelationshipRole"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="ContainerManagedEntity"  implement="false" subclass="false" instantiate="false"/>
-		<type name="DestinationType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EJBExtensionFilter"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="EjbFactory"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EJBJar"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="EJBMethodCategory"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="EjbMethodElementComparator"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="EjbMethodElementHelper"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EJBRelation"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EJBRelationshipRole"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="EJBResource"  implement="false" subclass="false" instantiate="false"/>
-		<type name="EnterpriseBean"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Entity"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="ExcludeList"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="IRoleShapeStrategy"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="MessageDriven"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="MessageDrivenDestination"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MethodElement"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MethodElementKind"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="MethodPermission"  implement="false" subclass="false" instantiate="false"/>
-		<type name="MethodTransaction"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="MultiplicityKind"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Query"  implement="false" subclass="false" instantiate="false"/>
-		<type name="QueryMethod"  implement="false" subclass="false" instantiate="false"/>
-		<type name="Relationships"  implement="false" subclass="false" instantiate="false"/>		
-		<type name="ReturnTypeMapping"  implement="false" subclass="false" instantiate="false"/>
-		<type name="RoleSource"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="Session"  implement="false" subclass="false" instantiate="false"/>
-    	<type name="SessionType"  implement="false" subclass="false" instantiate="false"/>	
-		<type name="SubscriptionDurabilityKind"  implement="false" subclass="false" instantiate="false"/>
-		<type name="TransactionAttributeType"  implement="false" subclass="false" instantiate="false"/>
-		<type name="TransactionType"  implement="false" subclass="false" instantiate="false"/>		
-	</package>
-</component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation.properties
deleted file mode 100644
index 9dd19953a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# This properties file holds all the externalized strings for the Application Client project
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/applicationclientvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-
-
-ERROR_APPLICATIONCLIENT_INVALID_APPCLIENT_FILE=CHKJ1000E: Validation failed because the application client file is not valid. Ensure that the deployment descriptor is valid.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: Validation failed:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: Unresolvable EJB references in {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: The application client project has an invalid deployment descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: The URI, {0}, does not match anything in the application client file.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: The deployment descriptor could not be loaded due to an unknown syntax error. The bad section starts at line {0}, column {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: The deployment descriptor could not be loaded due to an unknown syntax error. The bad section starts at line {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: The deployment descriptor could not be loaded due to an unknown syntax error. There is no information available to help identify the bad section.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: Validation cannot complete because the deployment descriptor cannot be opened.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E Duplicate resource environment reference "{0}" in application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E Document type version "{0}" for application-client.xml in project "{1}" needs to be version "{2}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E Duplicate enterprise bean reference "{0}" in application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E The Main-Class attribute must be defined in the application client module.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation.properties
deleted file mode 100644
index 05e4e4a9d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation.properties
+++ /dev/null
@@ -1,141 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# This properties file hold all the externalised strings for eTools 
-# EAR Validation project
-#
-# Messages should be according to the format at 
-#   http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-#     MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-#     CHKW (IBM WebSphere Validation)
-#
-# Message numbers are four digit numbers, from '0000' to '9999', inclusive.
-# Message numbers are filled to the left with '0', to a width of 4.
-#
-# Valid message type codes are:
-#     I (Informational)
-#     W (Warning)
-#     E (Error)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/earvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-# 29-June-2001:
-#  This file has been tested using the ProcessMsgFile tool, written by 
-#  Hany Salem and owned by Dennis Hebert.  Any future changes should 
-#  also be verified using this tool.  Please contact Dennis 
-#  (hebert@us.ibm.com or T/L 543-2520) for more information.
-#
-# --------------------------------
-#NOTAMSG
-validator.name=EAR Validator
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: EAR Validation failed: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: The EAR project {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Duplicate security role named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: A module has been defined with no URI.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: The URI, {0}, does not match anything in the EAR file.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: The deployment descriptor could not be loaded. The start of the bad section is at line {0}, column {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: The deployment descriptor could not be loaded. The start of the bad section is at line {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: The deployment descriptor could not be loaded.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: Cannot open the deployment descriptor. Validation cannot complete.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E The URI {0} contains a space. This is not recommended because it cannot be referenced from a manifest file.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E The module {0} has duplicate uri in EAR: {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Same context root "{0}" exists in Web modules "{1}" and "{2}".
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E The module {0} has empty <alt-dd> tag in EAR {1}.  The tag should be removed or the value should be valid.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =The project {0} in Enterprise Application project {1} has duplicate utility JAR URI {2}.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E The project {0} in Enterprise Application project {1} has duplicate module name {2}.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E The module {0} in Enterprise Application project {1} has same name as utility JAR URI.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E The module {0} in Enterprise Application project {1} has same name as utility JAR project name.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E An error occurred validating the MANIFEST.MF file in archive {0}.
-MANIFEST_LINE_END_ERROR_=IWAE0015E The MANIFEST.MF file in archive {0} does not end with a newline.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E Line {0} in the MANIFEST.MF file in archive {1} exceeds the specification limit of 72 bytes.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E The module {0} has a wrong default extension (.jar for EJB modules and .war for Web modules).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E Document type version "{0}" for application.xml in project "{1}" needs to be version "{2}".
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E The deployment descriptor of module {0} could not be loaded. The bad section starts at line {1}, column {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E The deployment descriptor of module {0} could not be loaded. The bad section starts at line {1}
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E The deployment descriptor of module {0} could not be loaded.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E The interfaces of the linked enterprise bean {0} do not match those in EJB ref {1} in module {2}.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: Meta folder {0} must exist in project {1}.
-WARNING_FILE_MISSING=IWAJ0001W: {0} must exist in project {1}.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W The module {0} has alt-dd {1}, but the resource does not exist in EAR {2}.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W The Manifest Class-Path in archive {0} contains an entry that cannot be resolved in the EAR: {1}.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W The Manifest Class-Path for archive {0} contains an entry, {1}, that is not resolvable to a file or module in the Enterprise Application: {2}.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W The Manifest Class-Path in module {0} contains an entry, {1}, that resolves to archive {2}.  This dependency does not comply with the J2EE specification.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W EAR Validation cannot run on closed project: {0}. Open the project, and try again.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W The project {0} for module or utility JAR {1} in enterprise application project {2} does not exist in the workspace.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W The web module {0} in enterprise application project {1} is not a J2EE Web project.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W The IBM extensions file in enterprise application project {0} contains deprecated absolute paths.  Use the application editor to clean up the file.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W The context root for Web module: {0} in enterprise application project: {1} does not match the context root in web project settings of {2}.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W The application client module {0} in enterprise application project:{1} is not an application client project.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W The EJB module {0} in enterprise application project {1} is not an EJB project.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W The module {0} in enterprise application project {1} has not been configured as a J2EE module dependency. 
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E The case of the manifest file name "{0}" in archive {1} in incorrect.  File name must be "META-INF/MANIFEST.MF", case sensitive.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W Project utility JAR URI {0} collides with an existing file in project {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E The application extension in EAR project: {0} is missing module extension for module project: {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=The target server of the module project "{0}" does not match the target server of the containing enterprise application project "{1}"
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=The module project "{0}" with no target server belongs to an enterprise application project "{1}" that has a target server
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=The ear project "{0}" with no target server has module project "{1}" that has a target server
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=The J2EE 1.4 specification EAR project "{0}" has an incompatible target server "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=The J2EE 1.4 specification module project "{0}" has an incompatible target server "{1}".
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E The module "{0}" is at an incompatible J2EE specification level than that of the "{1}" Enterprise Application.
-MESSAGE_INCOMPATIBLE_13_SPEC_WARNING_=IWAE0008E The module "{0}" is J2EE v1.3 specification level, which is incompatible in the v1.2 EAR.
-MESSAGE_INCOMPATIBLE_14_SPEC_WARNING_=The module "{0}" is J2EE v1.4 specification level, which is incompatible in the v1.3 EAR.
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E An internal error has occurred running validation on project:{0}, check the log file for details
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator.properties
deleted file mode 100644
index bc3703429..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator.properties
+++ /dev/null
@@ -1,1532 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-#     *************************************************************************
-#     * Code oriented instructions:
-#     *
-#     * In the string, you may see the following special sequences:
-#     * a) {n}  where n is a number. These are replaceable parameters.
-#     * b) ''  In .properties files, in order to see one apostrophe (') in the final
-#     *    string, sometimes two apostrophes must be entered in the string. In the translated
-#     *    string, if there is at least one {n} in the string, then to show one apostrophe
-#     *    to the user, put two apostrophes in the string. If there are no {n} in the string,
-#     *    then put one apostrophe.
-#     *    For example, say that you want the user to read "George's file". 
-#     *        GEORGE=George's file was on the desk.
-#     *        GEORGE2=George''s file and {0} were on the desk.
-#     *    GEORGE uses one apostrophe because there are no {n} and GEORGE2
-#     *    uses two apostrophes because there is a {n}.
-#     * c) '' text '' where text can be any word(s). The text between the double
-#     *    apostrophes should not be translated. 
-#     * d) <text> where text can be any word(s). The text between the angle
-#     *    brackets should NOT be translated.
-#     * e) "text" where text can be any word(s). The text between the quotation 
-#     *    marks should NOT be translated.
-#     *    
-#     *************************************************************************
-#     * Other instructions
-#     * a) Do not translate any text that is on a line which begins with a comment 
-#     *    symbol (#).
-#     * b) Do not translate these words: 
-#     *        schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
-#     * c) Please return the .properties files using the same directory structure.
-#     *    This is necessary because two of the files have the same name.
-#     *
-#     *************************************************************************
-# Any other comments to the translators are on lines which start like this:  # 2TC:
-#
-# Version 1.42
-#
-
-#
-# Begin EJB Validator strings.
-#
-# The purpose of
-# IDs:
-#    STATUS=Status message
-#    LOC=Text description of a location (identifies the source of the problem when no line number is available)
-#    CHKJ=EJB validation message
-#
-
-#
-# Start of status messages
-#
-STATUS_VALIDATING=Validating {0}.
-
-LOC_CLASS=Class: {0}
-LOC_FIELD=Field: {0}, Class: {1}
-LOC_METHOD=Method: {0}, Class: {1}
-LOC_BEAN=Enterprise bean: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Enterprise bean: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=<method> element: {0}
-LOC_METHODPERMISSION=<method-permission> element: {0}
-LOC_METHODTRANSACTION=<container-transaction> element: {0}
-LOC_EJBRELATION=<ejb-relation>: {0}
-LOC_EJBRELATIONSHIPROLE=<ejb-relationship-role>: {0}, <ejb-relation>: {1}
-#
-# end of status messages
-#
-
-#
-# Start of validation messages
-#
-# All unique error ids follow this format:
-#
-#    CHKJnnnn[s]
-#
-# where
-#    - CHKJ is the four character unique component prefix
-#    - nnnn is the numerical id, unique within EJB Validator
-#    - [s] is the severity indicator: E (error), W (warning), or I (information).
-#
-# nnnn ranges from 2000 - 2999
-#    2000 - 2099 Messages on a class
-#    2100 - 2199 Messages which are specific to Websphere or WSA (i.e., not mentioned in EJB specification, such as associations & finders)
-#    2200 - 2399 Messages on a field
-#    2400 - 2799 Messages on a method
-#    2800 - 2899 Messages on the deployment descriptor
-#    2900 - 2999 Miscellaneous
-#
-
-# 
-# Messages common across EJB specifications
-#
-CHKJ2900=CHKJ2900I: Internal error when running EJB validator. Read the log for details.
-CHKJ2852=CHKJ2852W: Internal error while validating {0}. The bean being validated was {1}.
-CHKJ2433=CHKJ2433W: Cannot validate {0} because {1} cannot be reflected. Check the classpath.
-CHKJ2907=CHKJ2907E: Type {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2905=CHKJ2905W: The EJB Validator did not run because ejb-jar.xml could not be loaded. Run the XML validator for more information.
-CHKJ2041=CHKJ2041I: Permanent classes and interfaces should be in a named package. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0} should throw {1} for {2} or there may be compile errors in the deployment code.
-CHKJ2456.m=CHKJ2456W: This method should throw {0} for {1} or there may be compile errors in the deployment code.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: The {0} key class must implement the {1} method. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: This class should implement a matching ejbPostCreate method for {0}. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: This class should implement a matching ejbPostCreate method for this method. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: This class must not implement javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: Bean-managed transaction stateful session beans do not need to implement javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: The {1} bean class should not implement the {0} ejbFind method. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: The {0} bean class should not implement an ejbFind method. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} must be either a create method or a find method. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: The method must be either a create method or a find method. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: The {0} bean class must have a public constructor that takes no arguments. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: The {0} bean class must have a public constructor that takes no arguments. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} should not declare the finalize() method. (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} should not declare the finalize() method. (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: The {0} bean class must contain at least one ejbCreate method. (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: The {0} bean class must contain at least one ejbFindByPrimaryKey method. (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: The {0} home interface must contain at least one create method. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: The {0} home interface must contain one findByPrimaryKey method. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: This type must be an interface. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: The {0} bean class must implement {1}. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: The {0} bean class must implement {1}. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: The {0} bean class cannot be abstract. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: The {0} bean class cannot be abstract. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: The {0} bean class cannot be final. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: The {0} bean class cannot be final. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: Interface must extend {0}. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: The {0} key class must be serializable at runtime. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: The {0} key class must be public. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: The {0} key class must define a public default constructor. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: {0} bean class must be public. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: {0} bean class must be public. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0} must have a matching method in the {1} bean class. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: This method must have a matching method in the {0} bean class. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0} must have a matching method in the {1} bean class. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: This method must have a matching method in the {0} bean class. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} must not exist. Only create() may exist (EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: This method must not exist. Only create() may exist (EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} must not exist. Only ejbCreate() may exist (EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: This method must not exist. Only ejbCreate() may exist (EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: Bean class {1} must implement a matching ejbCreate method for {0}. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: Bean class {0} must implement a matching ejbCreate method for this method. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: Bean class {1} must implement a matching ejbCreate method for {0}. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: Bean class {0} must implement a matching ejbCreate method for this method. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: {0} will not be called unless a matching ejbCreate method is defined. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: This method will not be called unless a matching ejbCreate method is defined. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0} cannot be called without the matching create method on the home interface {1}. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: This method cannot be called without the matching create method on the home interface {0}. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0} must have a matching ejbFind method in the {1} bean class. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: This method must have a matching ejbFind method in the {0} bean class. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: Bean class {0} must declare at least one container managed field. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: The setEntityContext(EntityContext ic) method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: The unsetEntityContext() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: The ejbActivate() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: The ejbPassivate() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: The ejbRemove() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: The ejbLoad() method must exist. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: The ejbStore() method must exist. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" must not be passed as a method argument or result. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Both ends of the role must use the same number of attributes.
-CHKJ2101.ejb11=CHKJ2101E: Both ends of the role must use the same type.
-CHKJ2102.eh.ejb11=CHKJ2102E: Either a finder descriptor, or a matching custom finder method on the {0} class, must be defined.
-CHKJ2103.ejb11=CHKJ2103E: In component inheritance, the {0} bean class must inherit {1}. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: In component inheritance, the {0} home interface must not inherit {1}. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: In component inheritance, the {0} remote interface must inherit {1}. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0} must use {1} as its <prim-key-class> (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: The {0} static field should be final. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: This static field should be final. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} must not be transient. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: The field must not be transient. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: The field type of field {0} is invalid for a CMP bean. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: The field type is invalid for a CMP bean. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} must be public. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: The field must be public. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: The primary key field named {0} must be public. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: The primary key field must be public. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} must be a <cmp-field> of {1} and a field of bean class {2}. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: This field must be a <cmp-field> of {0} and a field of bean class {1}. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: Key field {0} must be the same type as the primary key, {1}. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on method {0}. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on method {0}. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException on {0}. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Deprecated use of a java.rmi.RemoteException. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} must return void. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: This method must return void. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} must return the {1} remote interface type.  (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: This create method must return the {0} remote interface type.  (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} must return the {1} remote interface type.  (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: This create method must return the {0} remote interface type.  (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} must return {1} or a collection thereof. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: The method must return {0} or a collection thereof. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: The order and types of the arguments in {0} must match the order and types of the fields in the {1} key class. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: The order and types of the arguments must match the order and types of the fields in the {0} key class. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} should return the primary key type {1}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: The method should return the primary key type {0}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} should return either {1} or a collection thereof.  (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: This method should return either {0} or a collection thereof.  (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: The method must be public. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} must be public. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: This method must be public. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} must not be final. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: This method must not be final. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} must not be static. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: This method must not be static. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: The name of {0} must not start with "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: The name of the method must not start with "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: The name of {0} must not start with "ejb". (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: The name of the method must not start with "ejb". (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: The return type must be serializable at runtime.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: The return type must be serializable at runtime.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: The return type must be serializable at runtime.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: The return type must be serializable at runtime.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: The return type must be serializable at runtime.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: The return type of {0} must be serializable at runtime.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: The return type must be serializable at runtime.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: Argument {1} of {0} must be serializable at runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: Argument {0} must be serializable at runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} must throw {1}. (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: The method must throw {0}. (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: The return type of {0} must match the return type, {1}, of the matching method in the {2} bean class. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: The return type must match the return type, {0}, of the matching method in the {1} bean class. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} must return void. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: This method must return void. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} must be a create method. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: This method must be a create method. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} must be thrown by {0}''s corresponding method on the {2} home interface. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} must be thrown by the corresponding method on the {1} home interface. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} must be thrown by {0}''s corresponding method on the {2} home interface. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} must be thrown by the corresponding method on the {1} home interface. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: {0}''s corresponding method on the {1} remote interface must throw {2}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: The corresponding method on the {0} remote interface must throw {1}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: {0}''s corresponding method on the {1} remote interface must throw {2}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: The corresponding method on the {0} remote interface must throw {1}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: The value of the <ejb-name> element must be specified. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: <ejb-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Unknown class specified in the <ejb-class> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: <home> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Unknown interface specified in the <home> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: <remote> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Unknown interface specified in the <remote> element. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: The value of the <reentrant> element must be either "True" or "False". (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: The value of the <session-type> element must be either "Stateful" or "Stateless". (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: The value of the <transaction-type> element must be either "Container" or "Bean". (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: The value of the <persistence-type> element must be either "Container" or "Bean".  (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: <prim-key-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Unknown class specified in the <prim-key-class> element.  (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0} cannot be located on bean class {1}. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> must specify a <field-name>. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: Bean class {0} must specify at least one of its fields as a <cmp-field>. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <ejb-name>, in <method>, should specify a known enterprise bean. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: The security role ref must be defined only once.
-CHKJ2822.ejb11=CHKJ2822W: <security-role-ref> element for bean {0} should define the <role-name> element. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: <security-role-ref> element should define the <role-link> element. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: <security-role-ref> element refers to unknown role {0}. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: <security-role> element in ejb-jar.xml should define the <role-name> element. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: The security-role name must be unique. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: Cannot use a <role-link> element without <security-role> elements. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: Cannot use a <primkey-field> element without a primitive primary key. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: Key class {0} does not map to any fields in enterprise bean {1}. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: The type of the {0} field cannot be reflected. Check the classpath.
-CHKJ2831.ejb11=CHKJ2831W: {0} must be declared in a <cmp-field> element. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: Home {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: Remote {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: Bean {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Bean {0} is a {1} type. Update the <ejb-ref-type> element of the <ejb-ref> element. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Bean {0} uses home {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: Bean {0} uses remote {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: It is recommended that all references to enterprise beans be organized in the "ejb" subcontext. (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: The <env-entry-name> element, of the <env-entry> element, is invalid. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: The <env-entry-type> element, of the <env-entry> element, is invalid. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: The {0} name, in the <env-entry-name> element, can be used only once in the bean. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: <method-params> is ignored when <method-name> is "*". (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: No methods, on {0}, match this <method>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: At least one <method> should be set in a <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: At least one <role-name> should be set in a <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: No methods can be found for this <method-permission>. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: No methods can be found for this <container-transaction>. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: Cannot validate component inheritance of {0} because {1}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2850.ejb11=CHKJ2850W: Cannot validate <method> because {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2851.ejb11=CHKJ2851W: Cannot validate {0} because {1}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2852.ejb11=CHKJ2852W: Throwable caught while validating the ejb-jar.xml. The bean being validated was {0}.
-CHKJ2853.ejb11=CHKJ2853W: Throwable caught while validating the ibm-ejb-jar-ext.xmi. The bean being validated was {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: An enterprise bean cannot be reflected properly. Run the XML validator for more information.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} must be unique within the ejb-jar.xml file (EJB 1.1: 16.5).
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} must exist in every EAR file that contains this EJB module (EJB 1.1: 16.5, 17.4).
-
-
-# EJB_METHOD_BEAN_NULL=CHKJ2434W: Validation of this method was terminated because the bean class cannot be found. Check the spelling of the bean class'' name in the ejb-jar.xml file.
-# EJB_METHOD_HOME_NULL=CHKJ2435W: Validation of this method was terminated because the home interface cannot be found. Check the spelling of the home interface''s name in the ejb-jar.xml file.
-# EJB_METHOD_REMOTE_NULL=CHKJ2436W: Validation of this method was terminated because the remote interface cannot be found. Check the spelling of the remote interface''s name in the ejb-jar.xml file.
-# EJB_METHOD_NULL=CHKJ2437W: Validation of this method was terminated because the enterprise bean cannot be found.
-# EJB_METHOD_KEY_NULL=CHKJ2438W: Validation of this method was terminated because the primary key cannot be found. Check the spelling of the key class'' name in the ejb-jar.xml file.
-# EJB_REMOTE_NULL=CHKJ2904E: Validation of {0} was terminated because the remote interface cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_NULL=CHKJ2903E: Validation was terminated because the enterprise bean cannot be found.
-# EJB_NOTREFLECTED_JAVACLASS=CHKJ2907E: Cannot validate because the {0} type cannot be reflected. Ensure that it, and all of its dependencies, are included in the classpath.
-# EJB_FIELD_CANNOT_REFLECT=CHKJ2208W: Type {0} of field {1} cannot be reflected. Ensure that {0}, and all of its dependencies, are included in the classpath.
-# EJB_FIELD_BEAN_NULL=CHKJ2209W: Validation of this field was terminated because the bean class cannot be found. Check the spelling of the bean class'' name in the ejb-jar.xml file.
-# EJB_FIELD_HOME_NULL=CHKJ2210W: Validation of this field was terminated because the home interface cannot be found. Check the spelling of the home interface''s name in the ejb-jar.xml file.
-# EJB_FIELD_REMOTE_NULL=CHKJ2211W: Validation of this field was terminated because the remote interface cannot be found. Check the spelling of the remote interface''s name in the ejb-jar.xml file.
-# EJB_FIELD_NULL=CHKJ2212W: Validation of this field was terminated because the enterprise bean cannot be found.
-# EJB_FIELD_KEY_NULL=CHKJ2213W: Validation of this field was terminated because the primary key cannot be found. Check the spelling of the key class'' name in the ejb-jar.xml file.
-# EJB_HAS_MULTIPLE_PK_METHODS=CHKJ2000W: The {0} home interface must contain only one findByPrimaryKey method. (EJB 1.1: 9.2.8)
-# EJB_HOME_NULL=CHKJ2901E: Validation of {0} was terminated because the home interface cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_KEY_NULL=CHKJ2902E: Validation of {0} was terminated because the key class cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_BEAN_NULL=CHKJ2900E: Validation of {0} was terminated because the bean class cannot be found. Check the spelling of its name in the ejb-jar.xml file.
-# EJB_BMP_NOFIELDS=CHKJ2042W: To have a primary key, the {0} bean class must declare at least one field. (EJB 1.1: 9.1.5.1)
-# EJB_DD_CANNOT_OPEN_DD=CHKJ2821E: Cannot open the deployment descriptor. Validation cannot complete.
-# EJB_DD_METHTRANSACTION_NO_TRANSACTION=CHKJ2848W: At least one <trans-attribute> must be set in a <container-transaction>. (EJB 1.1: 11.4.1)
-
-#
-# end of messages for the EJB 1.1 specification
-#
-
-#
-# Messages for EJB 2.0 specification
-#
-CHKJ2828.ejb20=CHKJ2828E: Cannot use a <primkey-field> without a primitive primary key (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: Key class {0} does not map to any fields in enterprise bean {1}. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: The <env-entry-name> element, of the <env-entry> element, is invalid. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: The <env-entry-type> element, of the <env-entry> element, is invalid. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: The {0} name, in the <env-entry-name> element, can be used only once in the bean. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: The type of the {0} field cannot be reflected. Check the classpath.
-CHKJ2831.ejb20=CHKJ2831W: {0} must be declared in a <cmp-field> element. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: The value of the <ejb-name> element must be specified. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: The value of the <persistence-type> element must be either "Container" or "Bean".  (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: The value of the <reentrant> element must be either "True" or "False". (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: The value of the <session-type> element must be either "Stateful" or "Stateless". (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: The value of the <transaction-type> element must be either "Container" or "Bean". (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814W: <ejb-name>, in <method>, should specify a known enterprise bean. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: <method-params> is ignored when <method-name> is "*". (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: No methods, on {0}, match this <method>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: At least one <method> should be set in a <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: A <role-name> or an <unchecked> element should be set in a <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: No methods can be found for this <method-permission>. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: No methods can be found for this <container-transaction>. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: Bean class {0} must specify at least one of its fields as a <cmp-field>. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: Home {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=CHKJ2833I: Remote {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: Bean {0}, specified in the <ejb-ref> element, cannot be found in the EJB module. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: Bean {0} is a {1} type. Update the <ejb-ref-type> element of the <ejb-ref> element. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: Bean {0} uses home {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I: Bean {0} uses remote {1}. Update the <ejb-ref> element of the <ejb-ref> element. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: It is recommended that all references to enterprise beans be organized in the "ejb" subcontext. (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: The security role ref is defined more than once.
-CHKJ2822.ejb20=CHKJ2822W: <security-role-ref> element for bean {0} should define the <role-name> element. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: <security-role-ref> element should define the <role-link> element. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: <security-role-ref> element refers to unknown role {0}. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: <security-role> element in ejb-jar.xml should define the <role-name> element. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: The security-role name must be unique. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: Cannot use a <role-link> element without <security-role> elements. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: Cannot validate <method> because the {0} type cannot be reflected. Check the classpath.
-CHKJ2851.ejb20=CHKJ2851W: Cannot validate {0} because type {1} cannot be reflected. Check the classpath.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} must exist in every EAR file that contains this EJB module (EJB 2.0: 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: This class must not implement javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Bean-managed transaction stateful session beans need not implement javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: <ejb-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: The bean class, identified by the <ejb-class> element, cannot be found. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: <home> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Unknown interface specified in the <home> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: <remote> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Unknown interface specified in the <remote> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: <local-home> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Unknown interface specified in the <local-home> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: <local> interface {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Unknown interface specified in the <local> element. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: <prim-key-class> class {0}, or one of its supertypes, cannot be reflected. Check the classpath.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Unknown class specified in the <prim-key-class> element.  (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0} cannot be located on bean class {1}. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: In component inheritance, the {0} bean class must inherit {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: In component inheritance, the {0} home interface must not inherit {1}. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: In component inheritance, the {0} component interface must inherit {1}. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E:  Bean {0} must use {1} as its <prim-key-class> (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: Cannot validate component inheritance of {0} because the {1} type, or one of its dependencies, cannot be reflected. Check the classpath.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} must be unique within the ejb-jar.xml file (EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: This class must implement {0} (EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBHome (EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBHome (EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBHome (EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalHome (EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBObject (EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBObject (EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBObject (EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: This interface must extend javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" must not be passed as a method argument or result (EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" must not be passed as a method argument or result (EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" must not be passed as a method argument or result (EJB 2.0: 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: This class must be abstract (EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: This class must not be abstract (EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: This class must not be abstract (EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: This class must not be abstract (EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: This class must be public (EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: This class must not be final (EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: This class must be serializable (EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: This class must be public (EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: This class must not be abstract (EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: This class must be a legal Value Type in RMI-IIOP (EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: This class must be a legal Value Type in RMI-IIOP (EJB 2.0: 9.8, 12.2.12).
-
-
-###
-# methods which must exist
-###
-# public default constructor with no parameters
-CHKJ2050.constr.sb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: public {0} must exist (EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: This class must define {0} (EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) must exist (EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: At least one ejbCreate method must exist (EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: The ejbCreate() method must exist (EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: The ejbCreate() method must exist (EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: The ejbFindByPrimaryKey method must exist (EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: The setEntityContext(EntityContext) method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: The setEntityContext(EntityContext) method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: The unsetEntityContext() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: The unsetEntityContext() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: The ejbActivate() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: The ejbActivate() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: The ejbPassivate() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: The ejbPassivate() method must exist (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: The ejbPassivate() method must exist (EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: The ejbRemove() method must exist (EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: The ejbLoad() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: The ejbLoad() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: The ejbStore() method must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: The ejbStore() method must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: The create() method must exist (EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: The create() method must exist (EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: This interface must define at least one create method (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: This interface must define at least one create method (EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: At least one finder method must exist (EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: This interface must define at least one home method (EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: This class must define at least one ejbHome method (EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() must exist on this class (EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() must exist on this class (EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) must exist on this class (EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) must exist on this class (EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: An ejbSelect method must exist (EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey must exist (EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} must exist (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} must exist (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} must exist (EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: Application exception {1} on {0} must extend java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: Application exception {0} must extend java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: Application exception {1} on {0} must not extend java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: Application exception {0} must not extend java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {0} on {1} must be public (EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: This method must be public (EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} must not be final (EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: This method must not be final (EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} must not be static (EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: This method must not be static (EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} must be public (EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: This method must be public (EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} must not be final (EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: This method must not be final (EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} must not be static (EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: This method must not be static (EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} must return {1} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} must return {1} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} must return void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} must return void (EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: This method must return {0} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: This method must return {0} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: This method must return void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: This method must return void (EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} must throw javax.ejb.CreateException (EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: This method must throw javax.ejb.CreateException (EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} must not throw application exceptions (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: This method must not throw application exceptions (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} must not throw application exceptions (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: This method must not throw application exceptions (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} must not throw application exceptions (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: This method must not throw application exceptions (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-
-
-CHKJ2503.ejbCreate.sb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} must be public (EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} must be public (EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: This method must be public (EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: This method must be public (EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} must not be final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} must not be final (EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: This method must not be final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: This method must not be final (EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} must not be static (EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} must not be static (EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: This method must not be static (EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: This method must not be static (EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} must exist for {0} to be called (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} must exist for {0} to be called (EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} must exist for this method to be called (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} must exist for this method to be called (EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} must be public (EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} must be public.  (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: This method must be public (EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: This method must be public.  (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} must not be static (EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} must not be static (EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: This method must not be static (EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: This method must not be static (EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} must be public (EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: This method must be public (EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} must not be final (EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: This method must not be final (EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} must not be static (EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: This method must not be static (EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: {0} on method {1} must be serializable at runtime (EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} must return {1} or a collection thereof (EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: This method must return {0} or a collection thereof (EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} must not exist. The container provides this method implementation (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: This method must not exist. The container provides this method implementation (EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: This method must not exist. Only CMP beans may have ejbSelect methods  (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: This method must not exist. Only CMP beans may have ejbSelect methods  (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} must not exist. Only CMP beans may have ejbSelect methods (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: This method must not exist. Only CMP beans may have ejbSelect methods  (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() must not exist (EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} must not exist (EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: This method must not exist (EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: The name of method {0} must not start with "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: The name of method {0} must not start with "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: The name of method {0} must not start with "ejb" (EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: This method name must not start with "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: This method name must not start with "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: This method name must not start with "ejb" (EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} must be public (EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} must be public (EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} must be public (EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: This method must be public (EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: This method must be public (EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: This method must be public (EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} must not be final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} must not be final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} must not be final (EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: This method must not be final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: This method must not be final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: This method must not be final (EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} must not be static (EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} must not be static (EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} must not be static (EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: This method must not be static (EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: This method must not be static (EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: This method must not be static (EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} must be public (EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: This method must be public (EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} must not be final (EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: This method must not be final (EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} must not be static (EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: This method must not be static (EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} must return void (EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: This method must return void (EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} must be public (EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: This method must be public (EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} must be abstract (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: This method must be abstract (EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: This method must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: This method must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: The name of method {0} must not start with "create" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: This method name must not start with "create" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: The name of method {0} must not start with "find" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: This method name must not start with "find" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: The name of method {0} must not start with "remove" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: This method name must not start with "remove" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: This method must throw javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} must return {1} (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: This method must return {0} (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} must be the create() method (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} must be the create() method (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: This method must be the create() method (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: This method must be the create() method (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} must be the ejbCreate() method (EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: This method must be the ejbCreate() method (EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: The {0} matching method must exist on {1} (EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: The {1} matching method for {0} must exist on {2} (EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: The {0} method must exist on {1} (EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: This method must throw javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: This method must not throw ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} must return {1} or a collection thereof (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: This method must return {0} or a collection thereof (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} must exist on {2} for {0} (EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} must exist on {1} (EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: This method must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: This method must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} must throw java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: This method must throw java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: This method must not throw java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} must throw {1} for {2} (EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: This method must throw {0} for {1} (EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: {1} in method {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} must not expose the {1} type (EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} must not expose the {1} type (EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} must not expose the {1} type (EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: This method must not expose the {0} type (EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: This method must not expose the {0} type (EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: This method must not expose the {0} type (EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: This interface must follow RMI-IIOP rules for remote interfaces (EJB 2.0: 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: {0} in method {1} must be serializable at runtime (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: {0} in method {1} must be serializable at runtime (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: {0} in method {1} must be serializable at runtime (EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} must be serializable at runtime (EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: {1} in method {0} cannot be an argument or result type (EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} must not pass {1} as an argument or result (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} must not pass {1} as an argument or result (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: This method must not pass {0} as an argument or result (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: This method must not pass {0} as an argument or result (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} cannot be an argument or result type (EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} must not expose {1} (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: This method must not expose {0} (EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: This method must not be exposed (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} must be abstract (EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: This method must be abstract (EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} must be public (EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: This method must be public (EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} must throw javax.ejb.FinderException (EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: This method must throw javax.ejb.FinderException (EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} must return {1} or a collection thereof (EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: This method must return {0} or a collection thereof (EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: This method must be associated with a query element in ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: The {0} method needs {1} to exist on {2} (EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: The {0} method must exist on {1} (EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} must return {1} (EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: This method must return {0} (EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} must throw {1} (EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: This method must throw {0} (EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} is provided by the container (EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: This method is provided by the container (EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} must be findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: This method must be findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} must return {1} (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: This method must return {0} (EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: Transient field {0} should not be the {1} type (EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: A transient field should not be the {0} type (EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: Transient fields ({0}) are discouraged (EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: Transient fields are discouraged (EJB 2.0: 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0} must not be defined (EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} must not be defined (EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} must begin with a lowercase letter (EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} must begin with a lowercase letter (EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} must be declared as a <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} must be declared as a <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} must be declared as a <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} must be declared as a <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} should not be exposed (EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} should not be exposed (EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} must be either a primitive or a serializable type (EJB 2.0: 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} must be either a primitive or a serializable type (EJB 2.0: 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: Field {0} must be the {1} type (EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: This field must be the {0} type (EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: Field {0} must be public (EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: This field must be public (EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: Field {0} must be a <cmp-field> (EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: This field must be a <cmp-field> (EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: This bean must provide a <local-home> (EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: This bean must provide a <home> (EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: This bean must provide a <local> (EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: This bean must provide a <remote> (EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: This bean must provide either a <local-home> or a <home> (EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: This bean must provide either a <local> or a <remote> (EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: This bean must provide a <local-home> (EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: This bean must provide a <home> (EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: This bean must provide a <local> (EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: This bean must provide a <remote> (EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: This bean must provide either a <local-home> or a <home> (EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: This bean must provide either a <local> or a <remote> (EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: This bean must provide a <local-home> (EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: This bean must provide a <home> (EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: This bean must provide a <local> (EJB 2.0: 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: This bean must provide a <remote> (EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: This bean must provide either a <local-home> or a <home> (EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: This bean must provide either a <local> or a <remote> (EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} must be a valid Java identifier (EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} must be a valid Java identifier (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} must be unique within the ejb-jar.xml file (EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> must exist (EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: Reserved identifier {0} cannot be used as an <ejb-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: Reserved identifier {0} cannot be used as an <abstract-schema-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} must be a valid Java identifier and begin with a lowercase letter (EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} must be a valid Java identifier and begin with a lowercase letter (EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} must have a set method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} must have a get method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} must have a set method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} must have a get method (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} must be a Java primitive or a Java serializable type (EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} must be the {1} type or a collection thereof (EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: Dependent value class {0} cannot be a <cmr-field> (EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> must be unique in ejb-jar.xml (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> must be unique within an <ejb-relation> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: The value of the <multiplicity> element must be either "One" or "Many" (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> in role {0} must refer to an existing CMP bean (EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> must be used with a <multiplicity> of "One" (EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} must be defined on {1} (EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: This bean can have only unidirectional relationships to other beans (EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: The value of the <cmr-field-type> element must be either "java.util.Collection" or "java.util.Set" (EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: At least one <ejb-relationship-role> must define a <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} must exist (EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} must refer to a CMP bean (EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: The value of the <cmp-version> element must be either "1.x" or "2.x" (EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: Migrate this bean's datasource binding to a CMP Connection Factory binding.
-CHKJ2874.ejb20=CHKJ2874W: Migrate this EJB module's default datasource binding to a default CMP Connection Factory binding.
-
-CHKJ2886.ejb21=CHKJ2885E: Duplicate activation config: "{0}" exist in message driven bean: "{1}".
-CHKJ2887.ejb21=The activation config with name: "{0}" has invalid value: "{1}" for message driven bean: "{2}".
-CHKJ2890.ejb21=The message destination type: "{0}" and destination type activation config property value: "{1}" do not match  for bean: "{2}".
-
-###########################################################################
-#
-# 2TC: Do not translate anything in the following section. These strings
-#      are reserved for future use.
-#
-###########################################################################
-#
-# Ignore these messages for now; the EJB QL validator may take care of this.
-# If not, add this validation into the EJBJarVRule class.
-#
-#
-# Identification variables
-#
-# IWAD4927.ejb20=IWAD4927W: Identification variable {0} must be declared in the FROM clause (EJB 2.0: 11.2.6.2).
-# IWAD4928.ejb20=IWAD4928W: Reserved identifier {0} cannot be used as an identification variable (EJB 2.0: 11.2.6.2).
-# IWAD4929.ejb20=IWAD4929W: <abstract-schema-name> {0} cannot be used as an identification variable (EJB 2.0: 11.2.6.2).
-# IWAD4930.ejb20=IWAD4930W: <ejb-name> {0} cannot be used as an identification variable (EJB 2.0: 11.2.6.2).
-
-#
-# query statement
-#
-# IWAD4918.ejb20=IWAD4918W: This query must contain a SELECT clause (EJB 2.0: 11.1).
-# IWAD4919.ejb20=IWAD4919W: This query must contain a FROM clause (EJB 2.0: 11.1).
-# IWAD4920.ejb20=IWAD4920W: This query has a syntax error (EJB 2.0: 11.2).
-#
-
-
-# IWAD4808.ejb20=IWAD4808W: This bean must use container-managed transaction demarcation (EJB 2.0: 17.3.1, 17.3.3).
-# IWAD4809.ejb20=IWAD4809W: Specify a transaction attribute for this method (EJB 2.0: 17.4.1).
-# IWAD4810.ejb20=IWAD4810W: A transaction attribute must not exist for this method (EJB 2.0: 17.4.1).
-
-# IWAD4811.ejb20=IWAD4811W: At least one <method> must exist in a <container-transaction> (EJB 2.0: 17.4.1).
-# IWAD4900.ejb20=IWAD4900W: This <container-transaction> must reference only one bean (EJB 2.0: 17.4.1).
-# IWAD4901.ejb20=IWAD4901W: {0} must exist (EJB 2.0: 17.4.1)
-# IWAD4815.ejb20=IWAD4815W: No methods on {0} match this <method> (EJB 2.0: 17.4.1).
-# IWAD4817.ejb20=IWAD4817W: <trans-attribute> is unknown (EJB 2.0: 17.4.1).
-# IWAD4818.ejb20=IWAD4818W: Only one Style 1 <container-transaction> may exist for {0} (EJB 2.0: 17.4.1).
-# IWAD4819.ejb20=IWAD4819W: Only one Style 2 <container-transaction> may exist for {0} (EJB 2.0: 17.4.1).
-# IWAD4820.ejb20=IWAD4820W: At least one <method-param> must exist in a <method-params>.
-
-# IWAD4821.ejb20=IWAD4821W: <env-entry-value> must be a {0} (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4822.ejb20=IWAD4822W: <env-entry-name> must exist (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4823.ejb20=IWAD4823W: <env-entry-type> must exist (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4824.ejb20=IWAD4824W: <env-entry-name> must be unique within {0} (EJB 2.0: 20.2.1.2).
-# IWAD4825.ejb20=IWAD4825W: <env-entry-type> must be a legal type (EJB 2.0: 20.2.1.2, 22.5).
-# IWAD4826.ejb20=IWAD4826W: <env-entry-value> must be a String or a character (EJB 2.0: 20.2.1.2).
-
-# IWAD4828.ejb20=IWAD4828W: Conventionally this reference is located in the "ejb" subcontext (EJB 2.0: 20.3.1.1, 22.5).
-# IWAD4829.ejb20=IWAD4829W: This <env-entry> should be in an <ejb-ref> (EJB 2.0: 20.3.1.2).
-# IWAD4830.ejb20=IWAD4830W: This <env-entry> should be in an <ejb-local-ref> (EJB 2.0: 20.3.1.2).
-# IWAD4831.ejb20=IWAD4831W: <ejb-ref-type> must be {0} (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4832.ejb20=IWAD4832W: <ejb-ref> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4833.ejb20=IWAD4833W: <ejb-local-ref> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4834.ejb20=IWAD4834W: <home> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4835.ejb20=IWAD4835W: <local-home> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4836.ejb20=IWAD4836W: <remote> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4837.ejb20=IWAD4837W: <local-remote> must exist (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4838.ejb20=IWAD4838W: <ejb-ref> must be unique within {0} (EJB 2.0: 20.3.1.2).
-# IWAD4839.ejb20=IWAD4839W: <ejb-local-ref> must be unique within {0} (EJB 2.0: 20.3.1.2).
-# IWAD4840.ejb20=IWAD4840W: <home> {0} is not used by bean {1} (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4841.ejb20=IWAD4841W: <remote> {0} is not used by bean {1} (EJB 2.0: 20.3.1.2, 20.3.2).
-# IWAD4842.ejb20=IWAD4842W: <ejb-link> must exist (EJB 2.0: 20.3.1.2).
-
-# IWAD4843.ejb20=IWAD4843W: This <env-entry> must be a <resource-ref> (EJB 2.0: 20.4.1.2).
-# IWAD4844.ejb20=IWAD4844W: <res-ref-name> should not include the "java:com/env/" string (EJB 2.0: 20.4.1.2).
-# IWAD4845.ejb20=IWAD4845W: <res-auth> must be "Application" or "Container" (EJB 2.0: 20.4.1.2).
-# IWAD4846.ejb20=IWAD4846W: <res-sharing-scope> must be "Shareable" or "Unshareable" (EJB 2.0: 20.4.1.2).
-# IWAD4847.ejb20=IWAD4847W: <resource-ref> must be unique in bean {0} (EJB 2.0: 20.4.1.2).
-
-# IWAD4848.ejb20=IWAD4848W: Conventionally this is located in the "java:comp/env/jdbc" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-# IWAD4849.ejb20=IWAD4849W: Conventionally this is located in the "java:comp/env/jms" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-# IWAD4850.ejb20=IWAD4850W: Conventionally this is located in the "java:comp/env/mail" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-# IWAD4851.ejb20=IWAD4851W: Conventionally this is located in the "java:comp/env/url" subcontext (EJB 2.0: 20.4.1.3, 20.5.1.1).
-
-# IWAD4852.ejb20=IWAD4852W: This <env-entry> must be a <resource-env-ref> (EJB 2.0: 20.5.1.2).
-# IWAD4853.ejb20=IWAD4853W: <resource-env-ref-name> should not include the "java:comp/env" string (EJB 2.0: 20.5.1.2).
-# IWAD4854.ejb20=IWAD4854W: A JMS Destination value must be either javax.jms.Queue or javax.jms.Topic (EJB 2.0: 20.5.1.2).
-# IWAD4855.ejb20=IWAD4855W: <resource-env-ref-name> must be unique in bean {0} (EJB 2.0: 20.5.1.2).
-
-# IWAD4856.ejb20=IWAD4856W: A <role-name> must exist (EJB 2.0: 21.2.5.3).
-# IWAD4857.ejb20=IWAD4857W: <role-name> {0} must be unique within bean {1} (EJB 2.0: 21.2.5.3).
-# IWAD4858.ejb20=IWAD4858W: A <role-name> must exist (EJB 2.0: 21.3.1).
-# IWAD4859.ejb20=IWAD4859W: <role-name> {0} must be unique within bean {1} (EJB 2.0: 21.3.1).
-# IWAD4860.ejb20=IWAD4860W: Security roles must exist (EJB 2.0: 21.3.1).
-
-# IWAD4931.ejb20=IWAD4931W: At least one <method> must exist in a <method-permission> (EJB 2.0: 21.3.2).
-# IWAD4932.ejb20=IWAD4932W: {0} must exist (EJB 2.0: 21.3.2) (EJB 2.0: 17.4.1).
-# IWAD4933.ejb20=IWAD4933W: No methods on {0} match this <method> (EJB 2.0: 21.3.2).
-# IWAD4934.ejb20=IWAD4934W: At least one <method-param> must exist in a <method-params>.
-
-# IWAD4866.ejb20=IWAD4866W: A <role-link> must exist (EJB 2.0: 21.3.3).
-# IWAD4867.ejb20=IWAD4867W: This <role-link> must not exist (EJB 2.0: 21.3.3).
-# IWAD4868.ejb20=IWAD4868W: {0} must exist (EJB 2.0: 21.3.3).
-
-# IWAD4869.ejb20=IWAD4869W: <security-identity> must be either "use-caller-identity" or "run-as" (EJB 2.0: 21.3.4).
-# IWAD4870.ejb20=IWAD4870W: <security-identity> must be "run-as" (EJB 2.0: 21.3.4).
-# IWAD4871.ejb20=IWAD4871W: Security role {0} must exist (EJB 2.0: 21.3.4.1).
-
-# IWAD4875.ejb20=IWAD4875W: <session-type> must be either "Stateful" or "Stateless" (EJB 2.0: 22.2, 22.5).
-# IWAD4876.ejb20=IWAD4876W: <transaction-type> must be either "Bean" or "Container" (EJB 2.0: 22.2, 22.5).
-# IWAD4877.ejb20=IWAD4877W: <persistence-type> must be either "Bean" or "Container" (EJB 2.0: 22.2, 22.5).
-# IWAD4879.ejb20=IWAD4879W: At least one <cmp-field> must exist (EJB 2.0: 22.2, 22.5).
-
-# IWAD4880.ejb20=IWAD4880W: <acknowledge-mode> must be either "Auto-acknowledge" or "Dups-ok-acknowledge" (EJB 2.0: 22.5).
-# IWAD4881.ejb20=IWAD4881W: <cascade-delete> must not exist (EJB 2.0: 22.5).
-# IWAD4882.ejb20=IWAD4882W: <cmp-version> must be either "1.x" or "2.x" (EJB 2.0: 22.5).
-# IWAD4883.ejb20=IWAD4883W: <cmr-field-name> must exist on {0} (EJB 2.0: 22.5).
-# IWAD4884.ejb20=IWAD4884W: <cmr-field-type> must be the same type as {0} (EJB 2.0: 22.5).
-# IWAD4885.ejb20=IWAD4885W: <cmr-field-type> must be either java.util.Collection or java.util.Set (EJB 2.0: 22.5).
-
-# IWAD4886.ejb20=IWAD4886W: <cmr-field-name> must begin with a lowercase letter (EJB 2.0: 22.5).
-# IWAD4887.ejb20=IWAD4887W: <destination-type> must be either javax.jms.Queue or javax.jms.Topic (EJB 2.0: 22.5).
-# IWAD4889.ejb20=IWAD4889W: {0} must exist (EJB 2.0: 22.5).
-# IWAD4890.ejb20=IWAD4890W: <ejb-ref-name> must be unique in bean {0} (EJB 2.0: 22.5).
-# IWAD4891.ejb20=IWAD4891W: <ejb-ref-type> must be "Entity" or "Session" (EJB 2.0: 22.5).
-
-# IWAD4862.ejb20=IWAD4862W: <result-type-mapping> must be "Remote" (EJB 2.0: 10.5.7).
-###############################################################################
-#
-# 2TC: end of messages which should not be translated
-#
-###############################################################################
-
-#
-# end of messages for the EJB 2.0 specification
-#
-
-#
-# end of validation messages
-#
-
-#
-# End EJB Validation strings
-#
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation.properties
deleted file mode 100644
index cfeb2aa71..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#This properties file hold all the externalised strings for eTools J2EE Validation project
-# Validation project
-#
-# Messages should be according to the format at:
-#     http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-#     MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-#     CHKJ (IBM WebSphere Validation)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/erefvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-# 14-October-2001:
-#
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFNAME=CHKJ3009E: In module {1}, ''ejb-ref-name'' element in  ejb-ref: {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: In module {1}, ''ejb-ref-type'' element in ejb-ref: {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: In module {1}, ''ejb-ref-type'' element in ejb-ref: {0} is missing.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: In module {1}, Home interface is missing from ejb-ref: {0} element.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: In module {1}, Remote interface is missing from ejb-ref: {0} element.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' element {0} defines the ''role-link'' element but no ''security-role'' elements in the application descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: Duplicate ''resource-ref'' element named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W EJB link element {0} is unresolvable in module {1} and EAR {2}.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: Duplicate ''service-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: Duplicate ''security role-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: Duplicate ''ejb-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: Duplicate ''resource environment-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: Duplicate ''message destination-ref'' element named {0}.
-ERROR_EAR_MISSING_MESSSAGEDESTINATION=Message destination link ''{0}'' for message destination ref ''{1}'' is unresolvable in module ''{2}'' and EAR ''{3}''.
-ERROR_UNRESOLVED_MDB_MISSING_MESSAGE_DESTINATION=Message destination link ''{0}'' of MDB ''{1}'' is unresolvable in module ''{2}'' and EAR ''{3}''.
-ERROR_EAR_MISSING_EMPTY_MESSSAGEDESTINATION=Message destination link is empty for message destination ref ''{0}'' in module ''{1}'' and EAR ''{2}''.
-ERROR_MODULE_DD_FILE_NOT_FOUND=The deployment descriptor of the module ''{0}'' cannot be loaded.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/J2EEErrorMessageCustomizer.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/J2EEErrorMessageCustomizer.java
deleted file mode 100644
index a1aeae1b2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/J2EEErrorMessageCustomizer.java
+++ /dev/null
@@ -1,58 +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.core.internal.validation.xmlerrorcustomization;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ElementInformation;
-import org.eclipse.wst.xml.core.internal.validation.errorcustomization.IErrorMessageCustomizer;
-
-/**
- * A J2EE message customizer for the XML validator. This error customizer will
- * customize errors on application.xml.
- */
-public class J2EEErrorMessageCustomizer implements IErrorMessageCustomizer {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.IErrorMessageCustomizer#customizeMessage(org.eclipse.wst.xml.core.internal.validation.errorcustomization.ElementInformation, java.lang.String, java.lang.Object[])
-	 */
-	public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments) {
-		if ("cvc-complex-type.2.4.a".equals(errorKey) || "cvc-complex-type.2.4.b".equals(errorKey)) { //$NON-NLS-1$ //$NON-NLS-2$
-			if ("application".equals(elementInfo.getLocalname())) { //$NON-NLS-1$
-				boolean applicationHasModule = false;
-				for (Iterator i = elementInfo.getChildren().iterator(); i.hasNext();) {
-					ElementInformation child = (ElementInformation) i.next();
-					if ("module".equals(child.getLocalname())) { //$NON-NLS-1$
-						applicationHasModule = true;
-						break;
-					}
-				}
-				if (!applicationHasModule) {
-					return J2EEXMLCustomValidationMessages.J2EE_APPLICATION_ONE_OR_MORE_MODULES;
-				}
-			}
-			if ("ejb-jar".equals(elementInfo.getLocalname())) { //$NON-NLS-1$
-				boolean ejbHasBeans = false;
-				for (Iterator i = elementInfo.getChildren().iterator(); i.hasNext();) {
-					ElementInformation child = (ElementInformation) i.next();
-					if ("enterprise-beans".equals(child.getLocalname())) { //$NON-NLS-1$
-						ejbHasBeans = true;
-						break;
-					}
-				}
-				if (!ejbHasBeans) {
-					return J2EEXMLCustomValidationMessages.EJB_ONE_OR_MORE_BEANS;
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/J2EEXMLCustomValidationMessages.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/J2EEXMLCustomValidationMessages.java
deleted file mode 100644
index db6ce4ba1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/J2EEXMLCustomValidationMessages.java
+++ /dev/null
@@ -1,33 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- * 
- */
-package org.eclipse.jst.j2ee.core.internal.validation.xmlerrorcustomization;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML Validation
- */
-public class J2EEXMLCustomValidationMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.core.internal.validation.xmlerrorcustomization.j2eexmlcustomvalidation";//$NON-NLS-1$
-
-	public static String J2EE_APPLICATION_ONE_OR_MORE_MODULES;
-	public static String EJB_ONE_OR_MORE_BEANS;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, J2EEXMLCustomValidationMessages.class);
-	}
-
-	private J2EEXMLCustomValidationMessages() {
-		// cannot create new instance
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/j2eexmlcustomvalidation.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/j2eexmlcustomvalidation.properties
deleted file mode 100644
index 9e790426b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/core/internal/validation/xmlerrorcustomization/j2eexmlcustomvalidation.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- Constants for strings  
-
-J2EE_APPLICATION_ONE_OR_MORE_MODULES = A J2EE Enterprise Application must contain one or more modules.
-EJB_ONE_OR_MORE_BEANS=An EJB module must contain one or more enterprise beans.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ABMPHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ABMPHomeVRule.java
deleted file mode 100644
index 3862baa60..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ABMPHomeVRule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class ABMPHomeVRule extends AEntityHomeVRule {
-
-	public final void validateMatchingReturnTypeMatches(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method homeMethod, Method beanMethod, List[] methodsExtendedLists) {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, homeMethod, methodsExtendedLists, this);
-		if((methodType & FIND) != FIND) {
-			super.validateMatchingReturnTypeMatches(vc, bean, clazz, homeMethod, beanMethod, methodsExtendedLists);
-		}
-		else {
-			JavaHelpers homeRetType = homeMethod.getReturnType();
-			JavaHelpers beanRetType = beanMethod.getReturnType();
-			if (!ValidationRuleUtility.isAssignableFrom(homeRetType, beanRetType)) {
-				// emit the error only if it's a multi-finder. Single-finders are supposed to have different return types on the home & bean class.
-				boolean homeRetTypeIsRemote = ValidationRuleUtility.isAssignableFrom(homeRetType, bean.getRemoteInterface());
-				boolean homeRetTypeIsLocal =  ValidationRuleUtility.isAssignableFrom(homeRetType, bean.getLocalInterface());
-				boolean beanRetTypeIsKey = ValidationRuleUtility.isAssignableFrom(beanRetType, ((Entity)bean).getPrimaryKey());
-				if(!((homeRetTypeIsRemote || homeRetTypeIsLocal) && beanRetTypeIsKey)) {
-					String retTypeName = null;
-					if(beanRetTypeIsKey) {
-						if((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-							retTypeName = (bean.getRemoteInterface() == null) ? IEJBValidatorConstants.NULL_REMOTE : bean.getRemoteInterface().getJavaName();
-						}
-						else {
-							retTypeName = (bean.getLocalInterface() == null) ? IEJBValidatorConstants.NULL_LOCAL : bean.getLocalInterface().getJavaName();
-						}
-					}
-					else {
-						retTypeName = (beanRetType == null) ? "?" : beanRetType.getJavaName(); //$NON-NLS-1$
-					}
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2479, IEJBValidationContext.ERROR, bean, clazz, homeMethod, new String[] { retTypeName}, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ABeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ABeanClassVRule.java
deleted file mode 100644
index c09dbaa9f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ABeanClassVRule.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class ABeanClassVRule extends ATypeVRule implements IEJBType {
-	protected final static long[] BASE_TYPES = new long[]{ITypeConstants.JAVA_LANG_OBJECT};
-	protected final static int MESSAGE_REMOTE_EXCEPTION_SEVERITY = IEJBValidationContext.WARNING; // Deprecated use of RemoteException.
-	
-	public long[] getBaseTypes() {
-		return BASE_TYPES;
-	}
-	
-	public Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-		
-		return ((EnterpriseBean)parent).getEjbClass();
-	}
-	
-	public long getDefaultMethodType() {
-		return HELPER;
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!followAbstractRules(clazz)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2014, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		if(!followPublicRules(clazz)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2022, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if(!followFinalRules(clazz)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2015, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		validateAppendixB(vc, bean, clazz);
-	}
-	
-	public final static List getRemoteHomeMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[0];
-	}
-	
-	public final static List getLocalHomeMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[1];
-	}
-	
-	public final static List getRemoteComponentMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[2];
-	}
-	
-	public final static List getLocalComponentMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[3];
-	}
-	
-	public final static List getBeanClassMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[4];
-	}
-	
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// A bean class needs the following classes' extended methods:
-		//    1. remote home
-		//    2. local home
-		//    3. remote component
-		//    4. local component
-		//    5. bean class (when searching for a matching ejbPostCreate method).
-		// If a particular bean doesn't use a remote view or local view,
-		// then the corresponding entry in the array will be null. 
-		List[] result = new List[5];
-		JavaClass remoteHome = bean.getHomeInterface();
-		if(remoteHome != null) {
-			result[0] = remoteHome.getMethodsExtended();
-		}
-		else {
-			result[0] = null;
-		}
-		
-		JavaClass localHome = bean.getLocalHomeInterface();
-		if(localHome != null) {
-			result[1] = localHome.getMethodsExtended();
-		}
-		else {
-			result[1] = null;
-		}
-		
-		JavaClass remoteComponent = bean.getRemoteInterface();
-		if(remoteComponent != null) {
-			result[2] = remoteComponent.getMethodsExtended();
-		}
-		else {
-			result[2] = null;
-		}
-		
-		JavaClass localComponent = bean.getLocalInterface();
-		if(localComponent != null) {
-			result[3] = localComponent.getMethodsExtended();
-		}
-		else {
-			result[3] = null;
-		}
-		
-		JavaClass beanClass = bean.getEjbClass();
-		if(beanClass != null) {
-			result[4] = beanClass.getMethodsExtended();
-		}
-		else {
-			result[4] = null;
-		}
-		
-		return result;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a bean class' field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-	protected abstract boolean shouldBeFinal(JavaClass clazz);
-	protected abstract boolean shouldBePublic(JavaClass clazz);
-	protected abstract boolean shouldBeAbstract(JavaClass clazz);
-	protected abstract boolean shouldValidateTransientField();
-	protected abstract JavaHelpers getEjbCreateReturnType(EnterpriseBean bean, Method method) throws InvalidInputException;
-	protected abstract String getEjbCreateReturnTypeName(EnterpriseBean bean, Method method) throws InvalidInputException;
-	public abstract String getMatchingHomeMethodName(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList);
-	
-	public String getMatchingEjbHomeMethodName(IEJBValidationContext vc, Method method) {
-		// Section number stating this name convention?
-		String methodName = method.getName();
-		// Strip the "ejbHome" off, strip off the next character, and replace that character with a lowercase version of that character
-		StringBuffer buffer = new StringBuffer(Character.toLowerCase(methodName.charAt(0)));
-		buffer.append(method.getName().substring(8));
-		return buffer.toString();
-	}
-	
-	public String getMatchingEjbCreateMethodName(IEJBValidationContext vc, Method method) {
-		StringBuffer buffer = new StringBuffer(IMethodAndFieldConstants.PREFIX_C);
-		// Strip the "ejbC" off of "create" and replace with "c"
-		buffer.append(method.getName().substring(4));
-		return buffer.toString();
-	}
-
-	public String getMatchingEjbPostCreateMethodName(IEJBValidationContext vc, Method method) {
-		StringBuffer buffer = new StringBuffer(IMethodAndFieldConstants.PREFIX_C);
-		// Strip the "ejbPostC" off of "create" and replace with "c"
-		buffer.append(method.getName().substring(8));
-		return buffer.toString();
-	}
-	
-	
-	
-	public String getMatchingEjbFindMethodName(IEJBValidationContext vc, Method method) {
-		StringBuffer buffer = new StringBuffer(IMethodAndFieldConstants.PREFIX_F);
-		// Strip the "ejbF" off of "ejbFind" and replace with "f"
-		buffer.append(method.getName().substring(4));
-		return buffer.toString();
-	}
-	
-	public String getMatchingBusinessMethodName(IEJBValidationContext vc, Method method) {
-		return method.getName();
-	}
-	
-	/*
-	 * The given method is not supposed to have a matching method.
-	 */
-	public String getNoMatchingMethodName(IEJBValidationContext vc, Method method) {
-		return null; // not supposed to have a matching method
-	}
-
-	public final boolean followFinalRules(JavaClass clazz) {
-		if(shouldBeFinal(clazz)) {
-			return clazz.isFinal();
-		}
-		return !clazz.isFinal();
-	}
-	
-	public final boolean followPublicRules(JavaClass clazz) {
-		if(shouldBePublic(clazz)) {
-			return clazz.isPublic();
-		}
-		return !clazz.isPublic();
-	}
-	
-	public final boolean followAbstractRules(JavaClass clazz) {
-		if(shouldBeAbstract(clazz)) {
-			return clazz.isAbstract();
-		}
-		return !clazz.isAbstract();
-	}
-	
-	
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2421, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2422, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2423, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		JavaHelpers retType = getEjbCreateReturnType(bean, method);
-		if((retType == null) || (!ValidationRuleUtility.isAssignableFrom(method.getReturnType(), retType))) {
-			String retTypeName = (retType == null) ? getEjbCreateReturnTypeName(bean, method) : retType.getJavaName();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2424, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{retTypeName}, this);
-			vc.addMessage(message);
-		}
-
-		validateRMI_IIOPTypeRules(vc, bean, clazz, method, methodsExtendedLists, true);
-
-		if(validateEjbCreateMethodExceptions()) {
-			if(!followRemoteExceptionRules(bean, method)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_ejbCreate, IEJBValidationContext.WARNING, bean, clazz, method, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	public boolean validateEjbCreateMethodExceptions() {
-		return true;
-	}
-	
-	public void validateEjbPostCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2426, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2427, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2428, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(!method.isVoid()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2505_ejbPostCreate, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(!followRemoteExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_ejbPostCreate, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public final void validateEjbHomeMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2431, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2439, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		validateRMI_IIOPTypeRules(vc, bean, clazz, method, methodsExtendedLists, true);
-
-		if(!followRemoteExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_ejbHome, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		// "ejbHome" is 7 characters
-		// method will follow the convention, "ejbHome" + Char.toUpper(0) + substring(1), so reverse that convention here
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(Character.toLowerCase(method.getName().charAt(7))); // put the character back into lower-case
-		buffer.append(method.getName().substring(8)); // substring starts at the character following "ejbHome" and the first character -- substring is 0 indexed
-		String methodToMatchName = buffer.toString();
-		
-		Method matchingRemoteHomeMethod = ValidationRuleUtility.getMethod(method, methodToMatchName, getRemoteHomeMethodsExtended(methodsExtendedLists));
-		if(matchingRemoteHomeMethod != null) {
-			return;
-		}
-		
-		Method matchingLocalHomeMethod = ValidationRuleUtility.getMethod(method, methodToMatchName, getLocalHomeMethodsExtended(methodsExtendedLists));
-		if(matchingLocalHomeMethod != null) {
-			return;
-		}
-		
-		IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2430, IEJBValidationContext.INFO, bean, clazz, method, new String[]{methodToMatchName}, this);
-		vc.addMessage(message);
-	}
-	
-	public final void validateBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// IWAD4048 = Business methods must not start with "ejb". Read section 7.10.4 of the EJB 2.0 specification.
-		// IWAD4201 = This method name must not start with "ejb". Read section 10.6.8 of the EJB 2.0 specification.
-		// IWAD4317 = The method name must not start with "ejb". Read section 12.2.7 of the EJB 2.0 specification.
-		if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_EJB)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2411, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4049 = This method must be public. Read section 7.10.4 of the EJB 2.0 specification.
-		// IWAD4202 = This method must be public. Read section 10.6.8 of the EJB 2.0 specification.
-		// IWAD4318 = The method must be public. Read section 12.2.7 of the EJB 2.0 specification.
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2441, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4050 = This method must not be final. Read section 7.10.4 of the EJB 2.0 specification.
-		// IWAD4203 = This method must not be final. Read section 10.6.8 of the EJB 2.0 specification.
-		// IWAD4319 = The method must not be final. Read section 12.2.7 of the EJB 2.0 specification.
-		if(method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2442, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4051 = This method must not be static. Read section 7.10.4 of the EJB 2.0 specification.
-		// IWAD4204 = This method must not be static. Read section 10.6.8 of the EJB 2.0 specification.
-		// IWAD4320 = The method must not be static. Read section 12.2.7 of the EJB 2.0 specification.
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2443, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4052 = {0} must be a legal RMI-IIOP type. Read section 7.10.4 of the EJB 2.0 specification.
-		// IWAD4205 = {0} must be a legal RMI-IIOP type. Read section 10.6.8 of the EJB 2.0 specification.
-		// IWAD4321 = {0} must be a legal type for RMI-IIOP. Read section 12.2.7 of the EJB 2.0 specification.
-		validateRMI_IIOPTypeRules(vc, bean, clazz, method, methodsExtendedLists, true);
-		
-		// IWAD4053 = This method cannot throw java.rmi.RemoteException. Read section 7.10.4, 18.3.8, 18.6 of the EJB 2.0 specification.
-		// IWAD4206 = This method must not throw java.rmi.RemoteException. Read section 10.6.8, 18.3.8, 18.6 of the EJB 2.0 specification.
-		// IWAD4322 = This method must not throw java.rmi.RemoteException. Read section 12.2.7, 18.3.8, 18.6 of the EJB 2.0 specification.
-		if(!followRemoteExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_bus, getMessageRemoteExceptionSeverity(), bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		validateMatchingComponentMethod(vc, bean, clazz, method, methodsExtendedLists);
-	}
-
-	public void validateEjbRemoveMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// IWAD4402 = This method must be public. Read section 15.7.5 of the EJB 2.0 specification.
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2492, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4403 = This method must not be final. Read section 15.7.5 of the EJB 2.0 specification.
-		if(method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2493, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4404 = This method must not be static. Read section 15.7.5 of the EJB 2.0 specification.
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2494, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	
-		// IWAD4405 = This method must return void. Read section 15.7.5 of the EJB 2.0 specification.
-		if(!method.isVoid()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2505_ejbRemove, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/*
-	 * @see IClassVRule#validate(IEJBValidationContext, JavaClass, Field)
-	 */
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// IWAD4024 = A transient field should not be the {0} type. Read section 7.4.1 of the EJB 2.0 specification.
-		// IWAD4025 = Transient fields are discouraged. Read section 7.4.1 of the EJB 2.0 specification.
-		// IWAD4115 = {0} must not be defined in this class. Read section 10.3.1 of the EJB 2.0 specification.
-		// IWAD4259 = <cmp-field> field must be the {0} type. Read section 11.2.1 of the EJB 2.0 specification.
-		// IWAD4260 = <cmr-field> field must be the {0} type. Read section 11.2.1 of the EJB 2.0 specification.
-		if(shouldValidateTransientField()) {
-			validateTransientField(vc, bean, clazz, field);
-		}
-	}
-	
-	public void validateTransientField(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// By default do nothing
-	}
-	
-	public long getFieldType(EnterpriseBean bean, JavaClass clazz, Field field) {
-		if(field == null) {
-			return EXCLUDED_FIELD;
-		}
-		else if(field.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID)) {
-			return SERIALVERSIONUID;
-		}
-		else {
-			return OTHER_FIELD;
-		}	
-	}
-
-	public void validateMatchingMethodExceptions(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, JavaClass matchingClazz, Method matchingMethod) {
-		// Every exception thrown on the bean class' method must be thrown on the component/home method
-		/* Don't check for this here - let the home & component do it.
-		Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, method, matchingMethod);
-		Iterator eiterator = exceptions.iterator();
-		while(eiterator.hasNext()) {
-		}
-		*/
-		
-		// Every exception thrown by the component/home method should be thrown or there may be compile errors
-		Set exceptions = ValidationRuleUtility.getNotSubsetSubtypeExceptions(bean, matchingMethod, method);
-		Iterator eiterator = exceptions.iterator();
-		while(eiterator.hasNext()) {
-			JavaClass exception = (JavaClass)eiterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2456, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{exception.getJavaName(), matchingClazz.getJavaName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public final void validateMatchingHomeMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		Method remoteMethod = ValidationRuleUtility.getMethod(method, getMatchingHomeMethodName(vc, bean, clazz, method, methodsExtendedLists), getRemoteHomeMethodsExtended(methodsExtendedLists));
-		if(remoteMethod != null) {
-			validateMatchingMethodExceptions(vc, bean, clazz, method, bean.getHomeInterface(), remoteMethod);
-		}
-		
-		Method localMethod = ValidationRuleUtility.getMethod(method, getMatchingHomeMethodName(vc, bean, clazz, method, methodsExtendedLists), getLocalHomeMethodsExtended(methodsExtendedLists));
-		if(localMethod != null) {
-			validateMatchingMethodExceptions(vc, bean, clazz, method, bean.getLocalHomeInterface(), localMethod);
-		}
-	}
-	
-	public final void validateMatchingComponentMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		Method remoteMethod = ValidationRuleUtility.getMethod(method, method.getName(), getRemoteComponentMethodsExtended(methodsExtendedLists));
-		if(remoteMethod != null) {
-			validateMatchingMethodExceptions(vc, bean, clazz, method, bean.getRemoteInterface(), remoteMethod);
-		}
-		
-		Method localMethod = ValidationRuleUtility.getMethod(method, method.getName(), getLocalComponentMethodsExtended(methodsExtendedLists));
-		if(localMethod != null) {
-			validateMatchingMethodExceptions(vc, bean, clazz, method, bean.getLocalInterface(), localMethod);
-		}
-	}
-
-	protected void validateAppendixB(IEJBValidationContext vc, EnterpriseBean bean, JavaClass thisEjbObject) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		if(bean == null) {
-			return;
-		}
-		EnterpriseBean supertype = getSuperType(bean);
-		JavaClass parentEjbObject = null;
-		if (supertype != null) {
-			parentEjbObject = supertype.getEjbClass();
-
-			// EJBObject a Xchild of parent EJBObject (X = child, grandchild, great-grandchild, etc.)
-			try {
-				ValidationRuleUtility.isValidType(thisEjbObject);
-				ValidationRuleUtility.isValidType(parentEjbObject);
-				if (!ValidationRuleUtility.isAssignableFrom(thisEjbObject, parentEjbObject)) {
-					String[] msgParm = new String[] { thisEjbObject.getQualifiedName(), parentEjbObject.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2103, IEJBValidationContext.ERROR, bean, thisEjbObject, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { e.getJavaClass().getQualifiedName(), bean.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2849, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-	public final boolean followRemoteExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException, ValidationCancelledException {
-		// must not throw RemoteException
-		return ValidationRuleUtility.doesNotThrowRemoteException(bean, method);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ACMPHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ACMPHomeVRule.java
deleted file mode 100644
index 573438dc4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ACMPHomeVRule.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- */
-public abstract class ACMPHomeVRule extends AEntityHomeVRule {
-
-	public final void validateFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validateFindMethod(vc, bean, clazz, method);
-		
-		// Check that this method is associated with a query element in ejb-jar.xml
-		// findByPrimaryKey does not need a query element (10.5.6)
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedList, this);
-		if((methodType & IMethodAndFieldConstants.FINDBYPRIMARYKEY) == IMethodAndFieldConstants.FINDBYPRIMARYKEY) {
-			return;
-		}
-		
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		if(!ValidationRuleUtility.isAssociatedWithQuery(cmp, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2495, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-
-	public boolean findMatchingMethod(long methodType) {
-		if((methodType & FIND) == IMethodAndFieldConstants.FIND) {
-			return false;
-		}
-		return super.findMatchingMethod(methodType);
-	}
-	
-
-	/**
-	 * @see org.eclipse.wst.validation.internal.provisional.core.core.ejb.ejb20.rules.impl.AHomeVRule#returnsComponentInterfaceOrCollection(IEJBValidationContext, EnterpriseBean, JavaClass, Method)
-	 */
-	protected boolean returnsComponentInterfaceOrCollection(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException {
-		if(returnsComponentInterface(vc, bean, clazz, method)) {
-			return true;
-		}
-		
-		JavaHelpers returnParm = method.getReturnType();
-		JavaHelpers javaUtilCollection = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION, bean);
-		if(ValidationRuleUtility.isAssignableFrom(returnParm, javaUtilCollection)) {
-			return true;
-		}
-		
-		return false;
-	}
-
-	public final void validateMatchingReturnTypeMatches(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method homeMethod, Method beanMethod, List[] methodsExtendedList) {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, homeMethod, methodsExtendedList, this);
-		if((methodType & FIND) != FIND) {
-			super.validateMatchingReturnTypeMatches(vc, bean, clazz, homeMethod, beanMethod, methodsExtendedList);
-		}
-		// do not validate the return type of find methods because there should not be an implementation on the bean class
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AComponentVRule.java
deleted file mode 100644
index ba2aecead..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AComponentVRule.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class AComponentVRule extends AInterfaceTypeVRule {
-	public Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-
-		if((isRemote() & REMOTE) == REMOTE) {
-			return ((EnterpriseBean)parent).getRemoteInterface();
-		}
-		return ((EnterpriseBean)parent).getLocalInterface();
-	}
-	
-	public long getDefaultMethodType() {
-		return BUSINESS;
-	}
-	
-	public long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!followRMI_IIOPInheritanceRules(bean, clazz)) {
-			// IWAD4057 = {0} must follow RMI-IIOP rules for remote interfaces. Read section 7.10.5 of the EJB 2.0 specification.
-			// IWAD4210 = {0} must follow RMI-IIOP rules for remote interfaces. Read section 10.6.9 of the EJB 2.0 specification.
-			// IWAD4326 = {0} must follow RMI-IIOP rules for remote interfaces. Read section 12.2.8 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2468, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		validateAppendixB(vc, bean, clazz);
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validate(vc, bean, clazz, method, methodsExtendedLists); // check application exceptions
-		
-		if(isEJBInterfaceMethod(bean, method)) {
-			// IWAD4021 = {0} is provided by the container. Read section 6.5 of the EJB 2.0 specification.
-			// IWAD4110 = {0} is provided by the container. Read section 9.9 of the EJB 2.0 specification.
-			// IWAD4112 = {0} is provided by the container. Read section 9.10 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2469, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		Method match = ValidationRuleUtility.getMethod(method, method.getName(), getBeanClassMethodsExtended(methodsExtendedLists));
-		if(match == null) {
-			// IWAD4058 = {0} must exist on {1}. Read section 7.10.5 of the EJB 2.0 specificiation.
-			// IWAD4070 = {0} must exist on {1}. Read section 7.10.7 of the EJB 2.0 specification.
-			// IWAD4327 = {0} must exist on {1}. Read section 12.2.8 of the EJB 2.0 specification.
-			// IWAD4354 = {0} must exist on {1}. Read section 12.2.10 of the EJB 2.0 specification.
-			// IWAD4211 = {0} must exist on {1}. Read section 10.6.9 of the EJB 2.0 specification.
-			// IWAD4227 = {0} must exist on {1}. Read section 10.6.11 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2023, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{method.getMethodElementSignature(), bean.getEjbClass().getJavaName()}, this);
-			vc.addMessage(message);
-		}
-		else {
-			if(!ValidationRuleUtility.isAssignableFrom(method.getReturnType(), match.getReturnType())) {
-				// IWAD4212 = This method must return the same type as {0}. Read section 10.6.9 of the EJB 2.0 specification.
-				// IWAD4228 = This method must return the same type as {0}. Read section 10.6.11 of the EJB 2.0 specification.
-				// IWAD4328 = This method must return the same type as {0} on {1}. Read section 12.2.8 of the EJB 2.0 specification.
-				// IWAD4355 = This method must return {0}. Read section 12.2.10 of the EJB 2.0 specification.
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2470, IEJBValidationContext.ERROR, bean, clazz, method, new String[]{match.getReturnType().getJavaName()}, this);
-				vc.addMessage(message);
-			}
-			
-			Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, match, method);
-			Iterator eiterator = exceptions.iterator();
-			while(eiterator.hasNext()) {
-				JavaClass exception = (JavaClass)eiterator.next();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2471, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{exception.getJavaName(), match.getMethodElementSignature()}, this);
-				vc.addMessage(message);
-			}
-		}
-		
-		if(!followRemoteExceptionRules(bean, method)) {
-			// IWAD4056 = This method must throw java.rmi.RemoteException. Read section 7.10.5 of the EJB 2.0 specification.
-			// IWAD4069 = This method must not throw java.rmi.RemoteException. Read section 7.10.7, 18.3.8, 18.6 of the EJB 2.0 specification.
-			// IWAD4325 = This method must throw java.rmi.RemoteException. Read section 12.2.8 of the EJB 2.0 specification.
-			// IWAD4353 = This method must not throw java.rmi.RemoteException. Read section 12.2.10, 18.3.8, 18.6 of the EJB 2.0 specification.
-			// IWAD4209 = This method must throw java.rmi.RemoteException. Read section 10.6.9 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_bus, getMessageRemoteExceptionSeverity(), bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		// IWAD4055 = {0} must be a legal type for RMI-IIOP. Read section 7.10.5 of the EJB 2.0 specification.
-		// IWAD4208 = {0} must be a legal type for RMI-IIOP. Read section 10.6.9 of the EJB 2.0 specification.
-		// IWAD4324 = {0} must be a legal type for RMI-IIOP. Read section 12.2.8 of the EJB 2.0 specification.
-		validateRMI_IIOPTypeRules(vc, bean, clazz, method, methodsExtendedLists, true);
-		
-		JavaHelpers oe = getOverExposedLocalType(bean, clazz, method);
-		if(oe != null) {
-			// IWAD4059 = This method must not expose the {0} type. Read section 7.10.5 of the EJB 2.0 specification.
-			// IWAD4107 = This method must not expose the {0} type. Read section 9.7.2 of the EJB 2.0 specification.
-			// IWAD4330 = This method must not expose the {0} type. Read section 12.2.8 of the EJB 2.0 specification.
-			// IWAD4128 = This method must not expose the {0} type. Read section 10.3.1, 10.3.10.1 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2472, IEJBValidationContext.INFO, bean, clazz, method, new String[]{oe.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	protected void validateAppendixB(IEJBValidationContext vc, EnterpriseBean bean, JavaClass thisComponent) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		if(bean == null) {
-			return;
-		}
-		EnterpriseBean supertype = getSuperType(bean);
-		JavaClass parentComponent = null;
-		if (supertype != null) {
-			parentComponent = getComponentInterface(supertype);
-
-			if(parentComponent == null) {
-				// child uses either local, or remote, but not both interfaces
-				return;
-			}
-			
-			// Component a Xchild of parent Component
-			try {
-				ValidationRuleUtility.isValidType(thisComponent);
-				ValidationRuleUtility.isValidType(parentComponent);
-				if (!ValidationRuleUtility.isAssignableFrom(thisComponent, parentComponent)) {
-					String[] msgParm = new String[] { thisComponent.getQualifiedName(), parentComponent.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2105, IEJBValidationContext.ERROR, bean, thisComponent, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { e.getJavaClass().getQualifiedName(), bean.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2849, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-		
-//		validateAppendixB(vc, supertype, parentComponent);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AEntityBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AEntityBeanClassVRule.java
deleted file mode 100644
index 1f1219447..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AEntityBeanClassVRule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- */
-public abstract class AEntityBeanClassVRule extends ABeanClassVRule {
-	private static final String missingMethodTemplate = "{0}({1})"; //$NON-NLS-1$
-	
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws ValidationCancelledException, ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedList);
-		
-		validateMatchingEjbPostCreateMethod(vc, bean, clazz, method, methodsExtendedList);
-	}
-	
-	public final void validateMatchingEjbPostCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		String matchingMethodName = IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE + method.getName().substring(9); // "ejbCreate" is 9 characters long, so strip off characters 0..8 inclusive
-		Method ejbPostCreateMethod = ValidationRuleUtility.getMethod(method, matchingMethodName, getBeanClassMethodsExtended(methodsExtendedLists));
-		if(ejbPostCreateMethod == null) {
-			String missingMethod = MessageFormat.format(missingMethodTemplate, new String[]{matchingMethodName, ValidationRuleUtility.getParmsAsString(method)});
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2050_ejbPostCreate, IEJBValidationContext.ERROR, bean, clazz, method, new String[]{missingMethod}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AEntityHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AEntityHomeVRule.java
deleted file mode 100644
index 254ca2065..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AEntityHomeVRule.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-
-public abstract class AEntityHomeVRule extends AHomeVRule {
-	/**
-	 * If the type of the method isn't listed in the KNOWN_METHODS, what type of method is it
-	 * considered to be?
-	 */
-	public long getDefaultMethodType() {
-		return HOME;
-	}
-
-	public final void validateFindByPrimaryKeyMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, ValidationException {
-		JavaClass key = ((Entity)bean).getPrimaryKey();
-		JavaParameter[] parms = method.listParametersWithoutReturn();
-		if((parms.length != 1) || (!ValidationRuleUtility.isAssignableFrom(key, parms[0].getJavaType()))) {
-			String keyName = (key == null) ? IEJBValidatorConstants.NULL_PRIMARY_KEY : key.getJavaName();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2475, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{keyName}, this);
-			vc.addMessage(message);
-		}
-	}
-
-	public void validateFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.followsFinderExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2477, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!ValidationRuleUtility.followsObjectNotFoundExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2478, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY)) {
-			validateFindByPrimaryKeyMethod(vc, bean, clazz, method);
-			if(!returnsComponentInterface(vc, bean, clazz, method)) {
-				JavaClass componentInterface = getComponentInterface(bean);
-				String className = null;
-				if(componentInterface != null) {
-					className = componentInterface.getJavaName();
-				}
-				else {
-					if((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-						className = IEJBValidatorConstants.NULL_REMOTE;
-					}
-					else {
-						className = IEJBValidatorConstants.NULL_LOCAL;
-					}
-				}
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2479, IEJBValidationContext.ERROR, bean, clazz, method, new String[]{className}, this);
-				vc.addMessage(message);
-			}
-		}
-		else {
-			if(!returnsComponentInterfaceOrCollection(vc, bean, clazz, method)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2403, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{getComponentInterface(bean).getName()}, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	public void validateHomeMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, ValidationException {
-		// IWAD4350 = The return type must match the return type of {0}. Read section 12.2.9 of the EJB 2.0 specification.
-		// The above check is done in the "validate(vc, bean, clazz, method) method.
-		if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_CREATE)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2462, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		else if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_FIND)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2463, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		else if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_REMOVE)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2464, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java
deleted file mode 100644
index 09dfc454d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class AHomeVRule extends AInterfaceTypeVRule {
-	public Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-
-		if((isRemote() & REMOTE) == REMOTE) {
-			return ((EnterpriseBean)parent).getHomeInterface();
-		}
-		return ((EnterpriseBean)parent).getLocalHomeInterface();
-	}
-	
-	public void validateFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// By default, do nothing.
-		// Let the entity rules override this method, and the session don't do anything
-		// because validateMethodMustNotExist does what the sessions need.		
-	}
-	
-	public boolean followsCreateExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException, ValidationCancelledException {
-		return ValidationRuleUtility.throwsCreateException(bean, method);
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.isLegalRMI_IIOPInheritance(clazz)) {
-			// IWAD4334 = {0} must follow RMI-IIOP rules for remote interfaces. Read section 12.2.9 of the EJB 2.0 specification.
-			// IWAD4217 = {0} must follow RMI-IIOP rules for remote interfaces. Read section 10.6.10 of the EJB 2.0 specification.
-			// IWAD4062 = {0} must follow RMI-IIOP rules for remote interfaces. Read section 7.10.6 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2461, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		validateAppendixB(vc, bean, clazz);
-	}
-	
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validate(vc, bean, clazz, method, methodsExtendedLists); // check application exceptions
-		
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		String nameOfMethodToFind = method.getName();
-		boolean validateReturnTypeMatches = false;
-		if((methodType & CREATE) == CREATE) {
-			validateCreateMethod(vc, bean, clazz, method);
-			
-			StringBuffer buffer = new StringBuffer(IMethodAndFieldConstants.PREFIX_EJBC);
-			// Strip the "c" off of "create" and replace with "ejbC"
-			buffer.append(method.getName().substring(1));
-			nameOfMethodToFind = buffer.toString();
-		}
-		else if((methodType & FIND) == FIND) {
-			validateFindMethod(vc, bean, clazz, method);
-			StringBuffer buffer = new StringBuffer(IMethodAndFieldConstants.PREFIX_EJBF);
-			// Strip the "f" off of "find" and replace with "ejbF"
-			buffer.append(method.getName().substring(1));
-			nameOfMethodToFind = buffer.toString();
-			
-			validateReturnTypeMatches = true;
-		}
-		else if((methodType & HOME) == HOME) {
-			// remove is a special method. See 9.5.3 for an example
-	
-			validateHomeMethod(vc, bean, clazz, method);
-			
-			// Section number stating this name convention?
-			String methodName = method.getName();
-			StringBuffer buffer = new StringBuffer(IMethodAndFieldConstants.PREFIX_EJBHOME);
-			buffer.append(Character.toUpperCase(methodName.charAt(0)));
-			buffer.append(method.getName().substring(1));
-			nameOfMethodToFind = buffer.toString();
-			
-			validateReturnTypeMatches = true;
-		}
-		else {
-			// Method shouldn't be here. ATypeVRule will catch.
-			return;
-		}
-		
-		if(!followRemoteExceptionRules(bean, method)) {
-			IMethodType mType = MethodUtility.getUtility().getMethodType(bean, clazz, method, methodsExtendedLists, this);
-			if(mType == null) {
-				// should never happen...
-				Logger logger = vc.getMsgLogger();
-				if(logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("AHomeVRule - validate method which must not exist"); //$NON-NLS-1$
-					entry.setText("Method type is null: " + clazz.getQualifiedName() + "::" + method.getName() ); //$NON-NLS-1$  //$NON-NLS-2$
-					logger.write(Level.FINEST, entry);
-				}
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, mType.getMessageId_messageRemoteException(), getMessageRemoteExceptionSeverity(), bean, clazz, method, this);
-				vc.addMessage(message);
-			}
-		}
-
-		validateRMI_IIOPTypeRules(vc, bean, clazz, method, methodsExtendedLists, ((methodType & FIND) != FIND)); // do not check that the return type of a find method is serializable. If it's Collection or Set it won't be serializable, and if it doesn't return Collection, Set, or the component interface then the return type will be flagged.
-		
-		JavaHelpers local = getOverExposedLocalType(bean, clazz, method);
-		if(local != null) {
-			// IWAD4023 = {0} cannot be an argument or result type. Read section 6.7.2 of the EJB 2.0 specification.
-			// IWAD4225 = This method must not expose the {0} type. Read section 10.6.10 of the EJB 2.0 specification.
-			// IWAD4351 = This method must not expose the {0} type. Read section 12.2.9 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2466, IEJBValidationContext.INFO, bean, clazz, method, new String[]{local.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-		
-		if(findMatchingMethod(methodType)) {
-			validateMatchingBeanMethod(vc, bean, clazz, method, nameOfMethodToFind, validateReturnTypeMatches, methodsExtendedLists);
-		}
-	}
-	
-	public boolean findMatchingMethod(long methodType) {
-		return true;
-	}
-	
-	public final void validateMatchingBeanMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, String nameOfMethodToFind, boolean validateReturnTypeMatches, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		Method match = ValidationRuleUtility.getMethod(method, nameOfMethodToFind, getBeanClassMethodsExtended(methodsExtendedLists));
-		if(match == null) {
-			IMethodType mType = MethodUtility.getUtility().getMethodType(bean, clazz, method, methodsExtendedLists, this);
-			if(mType == null) {
-				// oops
-				Logger logger = vc.getMsgLogger();
-				if(logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("AHomeVRule - validate method"); //$NON-NLS-1$
-					entry.setText("Method type is null: " + bean.getName() + "::" + clazz.getJavaName() + "::" + method.getMethodElementSignature()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					logger.write(Level.FINEST, entry);
-				}
-			}
-			else {
-				JavaClass beanClass = bean.getEjbClass();
-				String beanClassName = (beanClass == null) ? IEJBValidatorConstants.NULL_BEAN_CLASS : beanClass.getJavaName();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, mType.getMessageId_messageMissingMatching(), IEJBValidationContext.WARNING, bean, clazz, method, new String[]{nameOfMethodToFind, beanClassName}, this);
-				vc.addMessage(message);
-			}
-		}
-		else {
-			if(validateReturnTypeMatches) {
-				validateMatchingReturnTypeMatches(vc, bean, clazz, method, match, methodsExtendedLists);
-			}
-
-			Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, match, method);
-			Iterator eiterator = exceptions.iterator();
-			while(eiterator.hasNext()) {
-				JavaClass exception = (JavaClass)eiterator.next();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2465, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{exception.getJavaName(), match.getMethodElementSignature()}, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	public void validateMatchingReturnTypeMatches(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method homeMethod, Method beanMethod, List[] methodsExtendedMethod) {
-		if(!ValidationRuleUtility.isAssignableFrom(homeMethod.getReturnType(), beanMethod.getReturnType())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2402, IEJBValidationContext.ERROR, bean, clazz, homeMethod, new String[]{beanMethod.getReturnType().getJavaName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void validateCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!followsCreateExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2467, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!returnsComponentInterface(vc, bean, clazz, method)) {
-			JavaClass componentInterface = getComponentInterface(bean);
-			String className = null;
-			if(componentInterface != null) {
-				className = componentInterface.getJavaName();
-			}
-			else {
-				if((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-					className = IEJBValidatorConstants.NULL_REMOTE;
-				}
-				else {
-					className = IEJBValidatorConstants.NULL_LOCAL;
-				}
-			}
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2402, IEJBValidationContext.ERROR, bean, clazz, method, new String[]{className}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void validateHomeMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, ValidationException {
-		// IWAD4350 = The return type must match the return type of {0}. Read section 12.2.9 of the EJB 2.0 specification.
-		// The above check is done in the "validate(vc, bean, clazz, method) method.
-	}
-
-	protected boolean returnsComponentInterface(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException {
-		JavaClass componentInterface = getComponentInterface(bean);
-		return ValidationRuleUtility.isAssignableFrom(method.getReturnType(), componentInterface);
-	}
-	
-	protected boolean returnsComponentInterfaceOrCollection(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException {
-		if(returnsComponentInterface(vc, bean, clazz, method)) {
-			return true;
-		}
-		
-		JavaHelpers returnParm = method.getReturnType();
-		JavaHelpers javaUtilEnumeration = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_ENUMERATION, bean);
-		if(ValidationRuleUtility.isAssignableFrom(returnParm, javaUtilEnumeration)) {
-			return true;
-		}
-		
-		JavaHelpers javaUtilCollection = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION, bean);
-		if(ValidationRuleUtility.isAssignableFrom(returnParm, javaUtilCollection)) {
-			return true;
-		}
-		
-		return false;
-	}
-
-	protected void validateAppendixB(IEJBValidationContext vc, EnterpriseBean bean, JavaClass thisHome) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		
-		if(bean == null) {
-			// bean has no supertype
-			return;
-		}
-		EnterpriseBean supertype = getSuperType(bean);
-		JavaClass parentHome = null;
-		if (supertype != null) {
-			// check this CMP's supertype
-			parentHome = getHomeInterface(supertype);
-
-			if(parentHome == null) {
-				// child uses either local, or remote, but not both interfaces
-				return;
-			}
-			
-			// Home a Xchild of parent Home
-			// In our EJB component inheritance structure, while it is legal for
-			// a home to inherit from another home, (section B.2), it is not legal
-			// for WSA component inheritance structure. 
-			try {
-				ValidationRuleUtility.isValidType(thisHome);
-				ValidationRuleUtility.isValidType(parentHome);
-				if (ValidationRuleUtility.isAssignableFrom(thisHome, parentHome)) {
-					String[] msgParm = new String[] { thisHome.getQualifiedName(), parentHome.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2104, IEJBValidationContext.ERROR, bean, thisHome, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { e.getJavaClass().getQualifiedName(), bean.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2849, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-		
-//		validateAppendixB(vc, supertype, parentHome);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AInterfaceTypeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AInterfaceTypeVRule.java
deleted file mode 100644
index 3526bd066..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AInterfaceTypeVRule.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/*
- * This class is a hack around the Java lack of support for multiple inheritance.
- * All if statements which object-oriented programming would normally replace
- * are contained in this class.
- */
-public abstract class AInterfaceTypeVRule extends ATypeVRule implements IEJBInterfaceType {
-	public final static List getBeanClassMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[0];
-	}
-	
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		// A home or component class needs the following classes' extended methods:
-		//    1. bean class
-		JavaClass beanClass = bean.getEjbClass();
-		if(beanClass == null) {
-			throw new InvalidInputException();
-		}
-		List[] result = new List[1];
-		result[0] = beanClass.getMethodsExtended();
-		return result;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a home or component's field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		//Default
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		validateApplicationExceptionRules(vc, bean, clazz, method);
-	}
-	
-	public final boolean isEJBInterfaceMethod(EnterpriseBean bean, Method method) throws InvalidInputException {
-		long[] superTypes = getSupertypes();
-		for(int i=0; i<superTypes.length; i++) {
-			if(ClassUtility.getUtility().isClassType(bean, method.getJavaClass(), superTypes[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public final JavaHelpers getOverExposedLocalType(EnterpriseBean bean, JavaClass clazz, Method method) {
-		if((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-			// need to check that the method doesn't expose any of the local types of the bean
-			JavaParameter[] parms = method.listParametersWithoutReturn();
-			if(parms != null) {
-				for(int i=0; i<parms.length; i++) {
-					JavaParameter parm = parms[i];
-					if(ValidationRuleUtility.isLocalType(bean, parm.getJavaType())) {
-						return parm.getJavaType();
-					}
-				}
-			}
-			
-			// Now check the return type
-			JavaHelpers parm = method.getReturnType();
-			if(ValidationRuleUtility.isLocalType(bean, parm)) {
-				return parm;
-			}
-			
-			return null;
-		}
-		return null;
-	}
-	
-	public long getFieldType(EnterpriseBean bean, JavaClass clazz, Field field) {
-		if(field == null) {
-			return EXCLUDED_FIELD;
-		}
-		else if(field.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID)) {
-			return SERIALVERSIONUID;
-		}
-		else {
-			return OTHER_FIELD;
-		}	
-	}
-	
-	public void validateApplicationExceptionRules(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException  {
-		List exceptions = method.getJavaExceptions();
-		if(exceptions.size() == 0) {
-			return;
-		}
-		
-		// IWAD4419 = {0} must be a subclass of java.lang.Exception. Read section 18.1.1, 18.2.1 of the EJB 2.0 specification.
-		Iterator iterator = exceptions.iterator();
-		try {
-			JavaHelpers javaLangException = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_EXCEPTION, bean);
-			JavaHelpers javaLangRuntimeException = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_RUNTIMEEXCEPTION, bean);
-			
-			while(iterator.hasNext()) {
-				JavaClass exception = (JavaClass)iterator.next();
-				
-				if(!ValidationRuleUtility.isApplicationException(exception, bean)) {
-					continue;
-				}
-				
-				if(!ValidationRuleUtility.isAssignableFrom(exception, javaLangException)) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2404, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{exception.getName()}, this);
-					vc.addMessage(message);
-					
-					// no point checking the rest
-					continue;
-				}
-				
-				// IWAD4420 = {0} must not be a subclass of java.lang.RuntimeException. Read section 18.1.1, 18.2.1 of the EJB 2.0 specification.
-				if(ValidationRuleUtility.isAssignableFrom(exception, javaLangRuntimeException)) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2416, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{exception.getName()}, this);
-					vc.addMessage(message);
-				}
-			}
-			return;
-		}
-		catch(InvalidInputException exc) {
-			// vc.addMessage("Cannot validate exceptions because the {0} type cannot be reflected. Check the classpath.");
-			// Don't add any message other than the "cannot validate" message.
-			return;
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AKeyClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AKeyClassVRule.java
deleted file mode 100644
index 958407488..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AKeyClassVRule.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.List;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class AKeyClassVRule extends ATypeVRule {
-	protected final static long[] BASE_TYPES = new long[]{ITypeConstants.JAVA_LANG_OBJECT};
-	
-	public long[] getBaseTypes() {
-		return BASE_TYPES;
-	}
-	
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a key class' method is defined on another class 
-		// of the bean.
-		return null;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a key class' field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-	/*
-	 * @see IClassVRule#validate(IEJBValidationContext, EnterpriseBean, JavaClass)
-	 */
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// CHKJ2108 = {0} must be a legal Value Type in RMI-IIOP. Read section 9.8 of the EJB 2.0 specification.
-		// CHKJ2241 = {0} must be a legal Value Type in RMI-IIOP. Read section 10.6.13 of the EJB 2.0 specification.
-		// CHKJ2376 = {0} must be a legal Value Type in RMI-IIOP. Read section 12.2.12 of the EJB 2.0 specification.
-		if(!ValidationRuleUtility.isLegalRMI_IIOPType(bean, clazz)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2019, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public long getFieldType(EnterpriseBean bean, JavaClass clazz, Field field) {
-		if(field == null) {
-			return EXCLUDED_FIELD;
-		}
-		else if(field.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID)) {
-			return SERIALVERSIONUID;
-		}
-		else {
-			return OTHER_FIELD;
-		}	
-	}
-	
-	public long getDefaultMethodType() {
-		return NO_METHODS;
-	}
-
-	public final boolean followRemoteExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException, ValidationCancelledException {
-		// Doesn't matter if the key class throws RemoteException or not
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ASessionBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ASessionBeanClassVRule.java
deleted file mode 100644
index e1b947510..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ASessionBeanClassVRule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- */
-public abstract class ASessionBeanClassVRule extends ABeanClassVRule {
-	public final void validateTransientField(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(field.isTransient()) {
-			// IWAD4025 = Transient fields are discouraged. Read section 7.4.1 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2453, IEJBValidationContext.INFO, bean, clazz, field, this);		
-			vc.addMessage(message);
-			
-			JavaHelpers javaxEjbSessionContext = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONCONTEXT, bean);
-			JavaHelpers javaxTransactionUsertransaction = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_TRANSACTION_USERTRANSACTION, bean);
-			if(ValidationRuleUtility.isAssignableFrom(ValidationRuleUtility.getType(field), javaxEjbSessionContext) ||
-				ValidationRuleUtility.isAssignableFrom(ValidationRuleUtility.getType(field), javaxTransactionUsertransaction) ||
-				ValidationRuleUtility.isLocalType(bean, ValidationRuleUtility.getType(field)) ||
-				ValidationRuleUtility.isJNDINamingContext(field))
-			{
-				// IWAD4024 = A transient field should not be the {0} type. Read section 7.4.1 of the EJB 2.0 specification.
-				message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2452, IEJBValidationContext.WARNING, bean, clazz, field, this);		
-				vc.addMessage(message);
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ASessionHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ASessionHomeVRule.java
deleted file mode 100644
index 4959ef332..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ASessionHomeVRule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/**
- */
-public abstract class ASessionHomeVRule extends AHomeVRule {
-	/**
-	 * If the type of the method isn't listed in the KNOWN_METHODS, what type of method is it
-	 * considered to be?
-	 */
-	public long getDefaultMethodType() {
-		// If it's not a create method, then it shouldn't be there.
-		return EXCLUDED_METHOD;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AStatelessHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AStatelessHomeVRule.java
deleted file mode 100644
index 3bf8b84cc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AStatelessHomeVRule.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class AStatelessHomeVRule extends ASessionHomeVRule {
-	public void validateCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// The create method must be a create() method.
-		if((method.listParametersWithoutReturn().length != 0) || (!IMethodAndFieldConstants.METHODNAME_CREATE.equals(method.getName()))) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2476, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		else {
-			super.validateCreateMethod(vc, bean, clazz, method);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ATypeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ATypeVRule.java
deleted file mode 100644
index 58ce95ac5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ATypeVRule.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 1.0
- * @author
- */
-public abstract class ATypeVRule extends AValidationRule implements IClassVRule, IEJBType {
-	private static final int NO_FIELDS = 0;
-
-	private long _methodList = NO_METHODS;
-	private long _fieldList = NO_FIELDS;
-
-	public final void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationException {
-		vc.subtask(IEJBValidatorConstants.STATUS_VALIDATING, new String[]{((JavaClass) target).getJavaName()});
-
-		Logger logger = vc.getMsgLogger();
-		if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-			LogEntry entry = vc.getLogEntry();
-			entry.setSourceID("EJB20Validator - validate"); //$NON-NLS-1$
-			entry.setText(getClass().getName() + "::validate(" + targetParent + ", " + target); //$NON-NLS-1$ //$NON-NLS-2$
-			logger.write(Level.FINEST, entry);
-		}
-
-		try {
-			vc.terminateIfCancelled();
-
-			EnterpriseBean bean = (EnterpriseBean) targetParent;
-			JavaClass clazz = (JavaClass) target;
-
-			try {
-				//clean up old reflection error on the clazz that is getting validated
-				vc.removeMessages(clazz);
-				// Check that all of the types in the bean reflected correctly,
-				// and that the types' parents reflected correctly too.
-				ValidationRuleUtility.isValidTypeHierarchy(bean, clazz);
-			} catch (InvalidInputException exc) {
-				reflectionError(vc, bean, clazz);
-				return;
-			}
-
-			if (ValidationRuleUtility.isUnnamedPackage(clazz.getJavaPackage())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2041, IEJBValidationContext.INFO, bean, clazz, this);
-				vc.addMessage(message);
-			}
-
-			try {
-				validate(vc, bean, clazz);
-				vc.terminateIfCancelled();
-
-				List[] methodsExtendedList = getMethodsExtended(vc, bean, clazz);
-				validate(vc, bean, clazz, clazz.listMethodExtended(), methodsExtendedList);
-				vc.terminateIfCancelled();
-
-				List[] fieldsExtendedList = getFieldsExtended(vc, bean, clazz);
-				validate(vc, bean, clazz, clazz.listFieldExtended(), fieldsExtendedList);
-				vc.terminateIfCancelled();
-
-				validateSupertypes(vc, bean, clazz);
-				vc.terminateIfCancelled();
-
-				validateMethodsWhichMustExist(vc, bean, clazz);
-				vc.terminateIfCancelled();
-			} catch (InvalidInputException exc) {
-				reflectionError(vc, bean, clazz);
-				return;
-			}
-		} catch (ValidationCancelledException exc) {
-			// remove any existing messages since they may be faulty
-		}
-	}
-
-	protected final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field[] fields, List[] fieldsExtendedLists) throws ValidationException {
-		try {
-			vc.terminateIfCancelled();
-
-			Field field = null;
-			for (int i = 0; i < fields.length; i++) {
-				vc.terminateIfCancelled();
-				field = fields[i];
-				if (field == null) {
-					Logger logger = vc.getMsgLogger();
-					if (logger != null && logger.isLoggingLevel(Level.FINE)) {
-						LogEntry entry = vc.getLogEntry();
-						entry.setSourceID("EJB20Validator - validate fields"); //$NON-NLS-1$
-						entry.setText("A field is null on " + clazz.getQualifiedName()); //$NON-NLS-1$
-						logger.write(Level.FINE, entry);
-					}
-					continue;
-				}
-				try {
-					Logger logger = vc.getMsgLogger();
-					if (logger.isLoggingLevel(Level.FINEST)) {
-						LogEntry entry = vc.getLogEntry();
-						entry.setSourceID("EJB20Validator - validate fields"); //$NON-NLS-1$
-						entry.setText("Validating field " + field.getName() + "on clazz " + clazz + " and isValid returns " + isValid(bean, clazz, field)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						logger.write(Level.FINEST, entry);
-					}
-
-					if (isValid(bean, clazz, field)) {
-						register(vc, bean, clazz, field, fieldsExtendedLists);
-						validate(vc, bean, clazz, field, fieldsExtendedLists);
-					}
-				} catch (InvalidInputException e) {
-					reflectionWarning(vc, bean, clazz, field, e);
-				}
-			}
-			vc.terminateIfCancelled();
-		} catch (ValidationCancelledException exc) {
-			// remove any existing messages since they may be faulty
-		}
-
-	}
-
-	protected final boolean isValid(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws InvalidInputException {
-		if (isOwnedByBase(bean, method)) {
-			return false;
-		}
-
-		return ((getMethodType(bean, clazz, method, methodsExtendedLists) & EXCLUDED_METHOD) != EXCLUDED_METHOD);
-	}
-
-	protected final boolean isOwnedByBase(EnterpriseBean bean, Field field) throws InvalidInputException {
-		if (field == null) {
-			return false;
-		}
-
-		long[] baseTypes = getBaseTypes();
-		if (baseTypes == null) {
-			// no parents
-			return false;
-		}
-
-		for (int i = 0; i < baseTypes.length; i++) {
-			if (ClassUtility.getUtility().isClassType(bean, field.getJavaClass(), baseTypes[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected final boolean isOwnedByBase(EnterpriseBean bean, Method method) throws InvalidInputException {
-		if (method == null) {
-			return false;
-		}
-
-		long[] baseTypes = getBaseTypes();
-		if (baseTypes == null) {
-			// no parents
-			return false;
-		}
-
-		for (int i = 0; i < baseTypes.length; i++) {
-			if (ClassUtility.getUtility().isClassType(bean, method.getJavaClass(), baseTypes[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected final boolean isValid(EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		if (isOwnedByBase(bean, field)) {
-			return false;
-		}
-
-		return ((getFieldType(bean, clazz, field) & EXCLUDED_FIELD) != EXCLUDED_FIELD);
-	}
-
-	protected final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method[] methods, List[] methodsExtendedLists) throws ValidationException {
-		try {
-			vc.terminateIfCancelled();
-
-			Method method = null;
-			for (int i = 0; i < methods.length; i++) {
-				vc.terminateIfCancelled();
-				method = methods[i];
-				if (method == null) {
-					// No point adding a validation message, because the user can't do anything.
-					// Log this condition.
-					Logger logger = vc.getMsgLogger();
-					if (logger != null && logger.isLoggingLevel(Level.FINE)) {
-						LogEntry entry = vc.getLogEntry();
-						entry.setSourceID("EJB20Validator - validate methods"); //$NON-NLS-1$
-						entry.setText("On " + clazz.getQualifiedName() + ", there is a null method."); //$NON-NLS-1$ //$NON-NLS-2$
-						logger.write(Level.FINE, entry);
-					}
-					continue;
-				}
-				try {
-					Logger logger = vc.getMsgLogger();
-					if (logger.isLoggingLevel(Level.FINEST)) {
-						LogEntry entry = vc.getLogEntry();
-						entry.setSourceID("EJB20Validator - validate methods"); //$NON-NLS-1$
-						entry.setText("Validating method " + method.getMethodElementSignature() + " on clazz " + clazz + " and isValid returns " + isValid(bean, clazz, method, methodsExtendedLists)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						logger.write(Level.FINEST, entry);
-					}
-
-					if (isValid(bean, clazz, method, methodsExtendedLists)) {
-						register(vc, bean, clazz, method, methodsExtendedLists);
-						if (isMethodAllowedToExist(bean, clazz, method, methodsExtendedLists)) {
-							validate(vc, bean, clazz, method, methodsExtendedLists);
-						} else {
-							validateMethodWhichMustNotExist(vc, bean, clazz, method, methodsExtendedLists);
-						}
-					} else {
-						if (!isOwnedByBase(bean, method)) {
-							if ((MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this) & EXCLUDED_METHOD) == EXCLUDED_METHOD) {
-								// unidentified method excluded
-								IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2502, IEJBValidationContext.INFO, bean, clazz, method, new String[]{method.getName()}, this);
-								vc.addMessage(message);
-							}
-						}
-					}
-				} catch (InvalidInputException e) {
-					reflectionWarning(vc, bean, clazz, method, e);
-				}
-
-			}
-			vc.terminateIfCancelled();
-		} catch (ValidationCancelledException exc) {
-			// remove any existing messages since they may be faulty
-		}
-
-	}
-
-	public final void register(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtendedList) throws InvalidInputException, ValidationCancelledException, ValidationException {
-		_fieldList = (_fieldList | getFieldType(bean, clazz, field));
-	}
-
-	private boolean isDefaultConstructor(long methodType) {
-		return ((methodType & IMethodAndFieldConstants.CONSTRUCTOR_NOPARM) == IMethodAndFieldConstants.CONSTRUCTOR_NOPARM);
-	}
-
-	private boolean doesPublicDefaultConstructorExist() {
-		if ((_methodList & IMethodAndFieldConstants.CONSTRUCTOR_NOPARM) == IMethodAndFieldConstants.CONSTRUCTOR_NOPARM) {
-			return true;
-		}
-
-		return false;
-	}
-
-	private boolean isDefaultConstructorInsertedByCompiler() {
-		// If the default constructor is not in the list, and if there are no constructors,
-		// the Java compiler will insert a default constructor.
-		if ((_methodList & IMethodAndFieldConstants.CONSTRUCTOR) == IMethodAndFieldConstants.CONSTRUCTOR) {
-			// There is a constructor, so return false.
-			return false;
-		}
-
-		return true;
-	}
-
-	protected final boolean isMethodAllowedToExist(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		long[] methods = getMethodsWhichMustNotExist();
-		if (methods != null) {
-			for (int i = 0; i < methods.length; i++) {
-				long methodType = methods[i];
-				long existingMethodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-				if ((existingMethodType & methodType) == methodType) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/*
-	 * @see IValidationRule#reset()
-	 */
-	public void validateMethodsWhichMustExist(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException, ValidationCancelledException, ValidationException {
-		long[] methods = getMethodsWhichMustExist();
-		if (methods != null) {
-			for (int i = 0; i < methods.length; i++) {
-				long methodType = methods[i];
-				boolean emitWarning = false;
-				if (isDefaultConstructor(methodType)) {
-					if (!doesPublicDefaultConstructorExist() && !isDefaultConstructorInsertedByCompiler()) {
-						emitWarning = true;
-					}
-				} else {
-					emitWarning = !exists(methodType);
-				}
-
-				if (emitWarning) {
-					// IWAD4041 = This class must define a public constructor which takes no
-					// parameters. Read section 7.10.1 of the EJB 2.0 specification.
-					// IWAD4142 = {0} must exist. Read section 10.5.2 of the EJB 2.0 specification.
-					// IWAD4173 = {0} must exist. Read section 10.6.2 of the EJB 2.0 specification.
-					// IWAD4271 = {0} must exist. Read section 12.1.4.1 of the EJB 2.0
-					// specification.
-					// IWAD4290 = {0} must exist. Read section 12.2.2 of the EJB 2.0 specification.
-					// IWAD4388 = {0} must exist. Read section 15.7.2 of the EJB 2.0 specification.
-					IMethodType mType = MethodUtility.getUtility().getMethodType(methodType);
-					if (mType == null) {
-						// ummmm....oops. This case should never happen.
-						Logger logger = vc.getMsgLogger();
-						if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-							LogEntry entry = vc.getLogEntry();
-							entry.setSourceID("EJB20Validator - validate methods which must exist"); //$NON-NLS-1$
-							entry.setText("Method type is null: " + methodType); //$NON-NLS-1$
-							logger.write(Level.FINEST, entry);
-						}
-						continue;
-					}
-
-					IMessage message = MessageUtility.getUtility().getMessage(vc, mType.getMessageId_messageMissing(), IEJBValidationContext.WARNING, bean, clazz, new String[]{mType.getMethodName(bean, clazz, null)}, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-
-	public final void validateMethodWhichMustNotExist(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws InvalidInputException, ValidationCancelledException, ValidationException {
-		IMethodType mType = MethodUtility.getUtility().getMethodType(bean, clazz, method, methodsExtendedLists, this);
-		if (mType == null) {
-			// what happened?
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-				LogEntry entry = vc.getLogEntry();
-				entry.setSourceID("EJB20Validator - validate method which must not exist"); //$NON-NLS-1$
-				entry.setText("Method type is null: " + MethodUtility.getUtility().getMethodType(bean, clazz, method, methodsExtendedLists, this)); //$NON-NLS-1$
-				logger.write(Level.FINEST, entry);
-			}
-			return;
-		}
-
-
-		IMessage message = MessageUtility.getUtility().getMessage(vc, mType.getMessageId_messageExists(), IEJBValidationContext.INFO, bean, clazz, method, new String[]{mType.getMethodName(bean, clazz, method)}, this);
-		vc.addMessage(message);
-	}
-
-	public abstract long getFieldType(EnterpriseBean bean, JavaClass clazz, Field field);
-
-	public abstract long[] getBaseTypes();
-
-	public abstract int getMessageRemoteExceptionSeverity(); // is a missing (or present)
-															 // RemoteException a warning or an
-															 // error? See ILocalType and
-															 // IRemoteType.
-
-	public final long getMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) {
-		if (method == null) {
-			return EXCLUDED_METHOD;
-		}
-		long id = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedList, this);
-		if ((id & CLINIT) == CLINIT) {
-			return EXCLUDED_METHOD;
-		}
-		return id;
-	}
-
-	public final void register(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws InvalidInputException, ValidationCancelledException, ValidationException {
-		_methodList = (_methodList | MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedList, this));
-	}
-
-	public final void validateSupertypes(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException, ValidationCancelledException, ValidationException {
-		validateShouldBeSuperTypes(vc, bean, clazz);
-		validateShouldNotBeSuperTypes(vc, bean, clazz);
-	}
-
-	/**
-	 * @param vc
-	 * @param bean
-	 * @param clazz
-	 * @throws InvalidInputException
-	 */
-	protected void validateShouldNotBeSuperTypes(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		long[] types;
-		// Test for types which can be supertypes, though it's either not recommended or should be
-		// coded with caution
-		types = getShouldNotBeSupertypes();
-		if (types != null) {
-			for (int i = 0; i < types.length; i++) {
-				JavaHelpers superType = ClassUtility.getUtility().getSupertype(bean, types[i]);
-				if (superType == null) {
-					// no supertype
-					continue;
-				}
-
-				if (ValidationRuleUtility.isAssignableFrom(clazz, superType)) {
-					// IWAD4179 = Because this class implements {0}, "this" must not be passed as a
-					// method argument or result. Read section 10.6.2 of the EJB 2.0 specification.
-					// IWAD4292 = Because {0} implements {1}, "this" must not be passed as a method
-					// argument or result. Read section 12.2.2 of the EJB 2.0 specification.
-					// IWAD4043 = Because {0} implements {1}, "this" must not be passed as a method
-					// argument or result. Read section 7.10.2 of the EJB 2.0 specification.
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2040, IEJBValidationContext.INFO, bean, clazz, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param vc
-	 * @param bean
-	 * @param clazz
-	 * @throws InvalidInputException
-	 */
-	protected void validateShouldBeSuperTypes(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		long[] types = getSupertypes();
-		if (types != null) {
-			for (int i = 0; i < types.length; i++) {
-				JavaHelpers superType = ClassUtility.getUtility().getSupertype(bean, types[i]);
-				if (superType == null) {
-					// no supertype
-					continue;
-				}
-
-				if (!ValidationRuleUtility.isAssignableFrom(clazz, superType)) {
-					// IWAD4026 = This class must implement javax.ejb.SessionBean. Read section
-					// 7.5.1, 7.10.2 of the EJB 2.0 specification.
-					// IWAD4379 = This class must implement javax.ejb.MessageDrivenBean. Read
-					// section 15.4.1, 15.7.2 of the EJB 2.0 specification.
-					// IWAD4380 = This class must implement javax.jms.MessageListener. Read section
-					// 15.4.1, 15.7.2 of the EJB 2.0 specification.
-					// IWAD4170 = This class must implement java.ejb.EntityBean. Read section 10.6.2
-					// of the EJB 2.0 specification.
-					// IWAD4286 = This class must implement java.ejb.EntityBean. Read section 12.2.2
-					// of the EJB 2.0 specification.
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2017, IEJBValidationContext.ERROR, bean, clazz, new String[]{superType.getJavaName()}, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-
-	public void reset() {
-		super.reset();
-		_methodList = NO_METHODS;
-		_fieldList = NO_FIELDS;
-	}
-
-	protected final void reflectionError(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz)  {
-		IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.ERROR, bean, clazz, new String[]{clazz.getQualifiedName()}, this);
-		vc.addMessage(message);
-	}
-
-	protected final void reflectionWarning(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, InvalidInputException exc)  {
-		vc.removeMessages(field);
-		vc.removeMessages(clazz, field.getName());
-		IMessage message = getReflectionWarning(vc, exc, bean, clazz, field);
-		vc.addMessage(message);
-	}
-
-	protected final void reflectionWarning(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, InvalidInputException exc)  {
-		vc.removeMessages(method);
-		vc.removeMessages(clazz, method.getSignature());
-		IMessage message = getReflectionWarning(vc, exc, bean, clazz, method);
-		vc.addMessage(message);
-	}
-
-	protected final IMessage getReflectionWarning(IEJBValidationContext vc, InvalidInputException exc, EnterpriseBean bean, JavaClass clazz, EObject fieldOrMethod) {
-		if (exc == null) {
-			return null;
-		}
-
-		JavaClass badClazz = exc.getJavaClass();
-		String typeName = (badClazz == null) ? "?" : badClazz.getQualifiedName(); //$NON-NLS-1$
-		IMessage message = null;
-
-		if (fieldOrMethod instanceof Field) {
-			String name = ((Field) fieldOrMethod).getName();
-			message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2433, IEJBValidationContext.WARNING, bean, clazz, (Field) fieldOrMethod, new String[]{name, typeName}, this);
-		} else if (fieldOrMethod instanceof Method) {
-			String name = ((Method) fieldOrMethod).getMethodElementSignature();
-			message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2433, IEJBValidationContext.WARNING, bean, clazz, (Method) fieldOrMethod, new String[]{name, typeName}, this);
-		} else {
-			String name = ((XMIResource) fieldOrMethod.eResource()).getID(fieldOrMethod);
-			message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2433, IEJBValidationContext.WARNING, bean, clazz, new String[]{name, typeName}, this);
-		}
-		if (badClazz == null) {
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-				LogEntry entry = vc.getLogEntry();
-				entry.setSourceID("getMessageId(IEJBValidationContext, InvalidInputException, boolean)"); //$NON-NLS-1$
-				entry.setText("InvalidInputException thrown on unknown class"); //$NON-NLS-1$
-				entry.setTargetException(exc);
-				logger.write(Level.FINEST, entry);
-			}
-		}
-
-		return message;
-	}
-
-
-	public final JavaClass getComponentInterface(EnterpriseBean bean) {
-		if ((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-			return bean.getRemoteInterface();
-		}
-		return bean.getLocalInterface();
-	}
-
-	public final boolean exists(long methodType) {
-		return ((_methodList & methodType) == methodType);
-	}
-
-	public final JavaClass getHomeInterface(EnterpriseBean bean) {
-		if ((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-			return bean.getHomeInterface();
-		}
-		return bean.getLocalHomeInterface();
-	}
-
-	public boolean followRemoteExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException, ValidationCancelledException {
-		if ((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-			// must throw RemoteException or one of its parents (IOException or Exception)
-			return ValidationRuleUtility.throwsRemoteExceptionOrParent(bean, method);
-		} else if ((isRemote() & IEJBType.LOCAL) == IEJBType.LOCAL) {
-			// must not throw RemoteException
-			return ValidationRuleUtility.doesNotThrowRemoteException(bean, method);
-		}
-
-		return true;
-	}
-
-	public final void validateRMI_IIOPTypeRules(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList, boolean checkReturnType) throws InvalidInputException {
-		if ((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-			JavaParameter[] parms = method.listParametersWithoutReturn();
-
-			for (int i = 0; i < parms.length; i++) {
-				JavaParameter parm = parms[i];
-				if (!ValidationRuleUtility.isLegalRMI_IIOPType(bean, parm.getJavaType())) {
-					IMethodType mt = MethodUtility.getUtility().getMethodType(bean, clazz, method, methodsExtendedList, this);
-					if (mt == null) {
-						// log
-					} else {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, mt.getMessageId_messageRMI_IIOPParm(), IEJBValidationContext.INFO, bean, clazz, method, new String[]{parm.getJavaType().getJavaName()}, this); // Can't
-																																																								  // use
-																																																								  // the
-																																																								  // name
-																																																								  // of
-																																																								  // the
-																																																								  // field,
-																																																								  // because
-																																																								  // when
-																																																								  // it's
-																																																								  // the
-																																																								  // return
-																																																								  // type
-																																																								  // of
-																																																								  // the
-																																																								  // method,
-																																																								  // it's
-																																																								  // confusing
-																																																								  // to
-																																																								  // see
-																																																								  // "result"
-																																																								  // as
-																																																								  // the
-																																																								  // name
-																																																								  // of
-																																																								  // the
-																																																								  // field.
-						vc.addMessage(message);
-					}
-				}
-			}
-
-			if (checkReturnType) {
-				if (!ValidationRuleUtility.isLegalRMI_IIOPType(bean, method.getReturnType())) {
-					IMethodType mt = MethodUtility.getUtility().getMethodType(bean, clazz, method, methodsExtendedList, this);
-					if (mt == null) {
-						// log
-					} else {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, mt.getMessageId_messageRMI_IIOPParm(), IEJBValidationContext.INFO, bean, clazz, method, new String[]{method.getReturnType().getJavaName()}, this); // Can't
-																																																									  // use
-																																																									  // the
-																																																									  // name
-																																																									  // of
-																																																									  // the
-																																																									  // field,
-																																																									  // because
-																																																									  // when
-																																																									  // it's
-																																																									  // the
-																																																									  // return
-																																																									  // type
-																																																									  // of
-																																																									  // the
-																																																									  // method,
-																																																									  // it's
-																																																									  // confusing
-																																																									  // to
-																																																									  // see
-																																																									  // "result"
-																																																									  // as
-																																																									  // the
-																																																									  // name
-																																																									  // of
-																																																									  // the
-																																																									  // field.
-						vc.addMessage(message);
-					}
-				}
-			}
-		} else {
-			// don't need to check
-			return;
-		}
-	}
-
-	public final boolean followRMI_IIOPInheritanceRules(EnterpriseBean bean, JavaClass clazz) {
-		if ((isRemote() & IEJBType.REMOTE) == IEJBType.REMOTE) {
-			return ValidationRuleUtility.isLegalRMI_IIOPInheritance(clazz);
-		}
-		return true;
-	}
-
-	public void validateSerialVersionUID(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) {
-		/*
-		 * For now, do nothing. In future, check if the field is public & static?
-		 */
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateBean.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateBean.java
deleted file mode 100644
index 7a3a3adac..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateBean.java
+++ /dev/null
@@ -1,673 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * Performs validation common to session and entity beans.
- */
-public abstract class AValidateBean extends AValidateEJB {
-	protected HashSet componentParents = null; // The JavaClass instances which are parents of this JavaClass instance, if this JavaClass instance is part of a component inheritance hierarchy.
-	
-	public AValidateBean() {
-		componentParents = new HashSet();
-	}
-	
-	public void reset() {
-		super.reset();
-		componentParents.clear();
-	}
-	
-	protected void buildComponentParents(EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-		EnterpriseBean supertype = getSuperType(bean);
-		if (supertype == null) {
-			return;
-		}
-
-		// check this CMP's supertype
-		JavaClass thisEjbObject = bean.getEjbClass();
-		JavaClass parentEjbObject = supertype.getEjbClass();
-
-		// EJBObject a Xchild of parent EJBObject (X = child, grandchild, great-grandchild, etc.)
-		if (ValidationRuleUtility.isAssignableFrom(thisEjbObject, parentEjbObject)) {
-			componentParents.add(parentEjbObject);
-		}
-		buildComponentParents(supertype);
-	}
-
-	public final Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-
-		return ((EnterpriseBean)parent).getEjbClass();
-	}
-	
-	public final static List getRemoteHomeMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[0];
-	}
-	
-	public final static List getRemoteComponentMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[1];
-	}
-	
-	public final static List getBeanClassMethodsExtended(List[] methodsExtendedList) {
-		return methodsExtendedList[2];
-	}
-	
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// A bean class needs the following classes' extended methods:
-		//    1. home
-		//    2. remote
-		//    3. bean class (when searching for a matching ejbPostCreate method).
-		// If a particular bean doesn't use a remote view or local view,
-		// then the corresponding entry in the array will be null. 
-		List[] result = new List[3];
-		JavaClass remoteHome = bean.getHomeInterface();
-		if(remoteHome != null) {
-			result[0] = remoteHome.getMethodsExtended();
-		}
-		else {
-			result[0] = null;
-		}
-		
-		JavaClass remoteComponent = bean.getRemoteInterface();
-		if(remoteComponent != null) {
-			result[1] = remoteComponent.getMethodsExtended();
-		}
-		else {
-			result[1] = null;
-		}
-		
-		JavaClass beanClass = bean.getEjbClass();
-		if(beanClass != null) {
-			result[2] = beanClass.getMethodsExtended();
-		}
-		else {
-			result[2] = null;
-		}
-		
-		return result;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a bean class' field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-
-	
-	/**
-	 * For the check that the ejbCreate method has a matching create method on the home,
-	 * this method, given the bean method, returns the corresponding home method.
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - Each create method must be named "create", and it must match one of 
-	 *     the ejbCreate methods defined in the session bean class. The matching 
-	 *     ejbCreate method must have the same number and types of arguments. 
-	 *     (Note that the return type is different.)
-	 *   - All the exceptions defined in the throws clause of an ejbCreate method 
-	 *     of the session bean class must be defined in the throws clause of the 
-	 *     matching create method of the home interface.
-	 *...
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - Each create method must be named "create", and it must match one of the 
-	 *     ejbCreate methods defined in the enterprise Bean class. The matching 
-	 *     ejbCreate method must have the same number and types of its arguments. 
-	 *     (Note that the return type is different.)
-	 *   - All the exceptions defined in the throws clause of the matching ejbCreate 
-	 *     and ejbPostCreate methods of the enterprise Bean class must be included in 
-	 *     the throws clause of the matching create method of the home interface 
-	 *     (i.e the set of exceptions defined for the create method must be a superset
-	 *     of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-	 */
-	public final Method getMatchingHomeCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		
-		if (method == null) {
-			return null;
-		}
-
-		if (bean == null) {
-			return null;
-		}
-
-		JavaClass homeIntf = bean.getHomeInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, homeIntf);
-
-		// check only the current class, not the parents in this case.
-		// This method is used in the component inheritance hierarchy tests.
-		return ValidationRuleUtility.getMethod(method, IMethodAndFieldConstants.METHODNAME_CREATE, homeIntf.getMethods());
-	}
-	
-	/**
-	 * For the check that the ejbCreate method has a matching create method on the home,
-	 * this method, given the bean method, returns the corresponding home method.
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - Each create method must be named "create", and it must match one of 
-	 *     the ejbCreate methods defined in the session bean class. The matching 
-	 *     ejbCreate method must have the same number and types of arguments. 
-	 *     (Note that the return type is different.)
-	 *   - All the exceptions defined in the throws clause of an ejbCreate method 
-	 *     of the session bean class must be defined in the throws clause of the 
-	 *     matching create method of the home interface.
-	 *...
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - Each create method must be named "create", and it must match one of the 
-	 *     ejbCreate methods defined in the enterprise Bean class. The matching 
-	 *     ejbCreate method must have the same number and types of its arguments. 
-	 *     (Note that the return type is different.)
-	 *   - All the exceptions defined in the throws clause of the matching ejbCreate 
-	 *     and ejbPostCreate methods of the enterprise Bean class must be included in 
-	 *     the throws clause of the matching create method of the home interface 
-	 *     (i.e the set of exceptions defined for the create method must be a superset
-	 *     of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-	 */
-	public Method getMatchingHomeCreateMethodExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc. terminateIfCancelled();
-		if (method == null) {
-			return null;
-		}
-
-		if (bean == null) {
-			return null;
-		}
-
-		JavaClass homeIntf = bean.getHomeInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, homeIntf);
-
-		return ValidationRuleUtility.getMethodExtended(homeIntf, method, IMethodAndFieldConstants.METHODNAME_CREATE);
-	}
-	
-	/**
-	 * Return the name of the parent which the bean must implement.
-	 * For entity beans, it's javax.ejb.EntityBean.
-	 * For session beans, it's javax.ejb.SessionBean.
-	 */
-	protected abstract String getParentName();
-	
-	/**
-	 * Returns true if the method passed in is a business method.
-	 *
-	 * Although the EJB 1.1 spec implies that all non-framework methods are business methods,
-	 * developers may create methods on the bean which are meant for internal use only. This
-	 * method (isBusinessMethod) separates the "internal helper" methods from the business
-	 * methods by checking if a corresponding method exists on the remote interface. If it
-	 * does, consider this a business method. 
-	 */
-	public boolean isBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		if (method == null) {
-			return false;
-		}
-		String name = method.getName();
-
-		if (isFrameworkMethod(name)) {
-			return false;
-		}
-
-		if (method.isConstructor()) {
-			return false;
-		}
-
-		// Check if there's a matching method on the remote interface.
-		if (bean == null) {
-			return false;
-		}
-
-		JavaClass remoteInterface = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remoteInterface);
-		Method remoteInterfaceMethod = ValidationRuleUtility.getMethodExtended(remoteInterface, name, method.listParametersWithoutReturn());
-		if ((remoteInterfaceMethod == null) || (ValidationRuleUtility.isEJBObjectMethod(bean, remoteInterfaceMethod))) {
-			// no matching method
-			// filter out methods from javax.ejb.EJBObject
-			return false;
-		}
-
-		return true;
-	}
-	
-	/**
-	 * Return true if the method passed in is inherited from a parent in a
-	 * component inheritance hierarchy.
-	 */
-	protected boolean isComponentInherited(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method meth) throws InvalidInputException {
-		if (componentParents == null) {
-			// Not part of a component inheritance hierarchy
-			return false;
-		}
-
-		return (componentParents.contains(meth.getContainingJavaClass()));
-	}
-	
-	public boolean isFrameworkMethod(String name) {
-		if (name == null) {
-			return false;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBACTIVATE)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBPASSIVATE)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBREMOVE)) {
-			return true;
-		}
-		else if (name.startsWith(IMethodAndFieldConstants.PREFIX_EJBFIND)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBCREATE)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_FINALIZE)) {
-			return true;
-		}
-		return false;
-
-	}
-	
-	/**
-	 * Return true if the field can, and should, be validated.
-	 * Filter out faulty fields (i.e., null), and fields which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtendedList) throws InvalidInputException {
-		if (super.isValid(vc, bean, clazz, field, fieldsExtendedList)) {
-			// exclude root object methods
-			if (ValidationRuleUtility.isJavaLangObjectField(bean, field)) {
-				return false;
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Return true if the method can, and should, be validated.
-	 * Filter out faulty methods (i.e., null), and methods which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected final boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws InvalidInputException {
-		if (super.isValid(vc, bean, clazz, method, methodsExtendedList)) {
-			// exclude root object methods
-			if (ValidationRuleUtility.isJavaLangObjectMethod(bean, method)) {
-				return false;
-			}
-			else if (method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBCREATE)) {
-				return isValidEjbCreateMethod(vc, bean, clazz, method, methodsExtendedList);
-			}
-			else if (method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE)) {
-				return isValidEjbCreateMethod(vc, bean, clazz, method, methodsExtendedList);
-			}
-			else {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Return true if the ejbCreate method passed in is not inherited 
-	 * from a parent in a component inheritance hierarchy, or is inherited,
-	 * but is also defined on this bean's home interface.
-	 *
-	 * This method is used to exclude ejbCreate methods which are inherited
-	 * from a parent in a component inheritance hierarchy, and are not
-	 * exposed anywhere on this bean class instance itself. (i.e., inherited,
-	 * but never used.) Since we generate the code for these methods, we
-	 * should not flag them as warnings.
-	 */
-	protected final boolean isValidEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method meth, List[] methodsExtendedLists) throws InvalidInputException {
-		boolean isValid = true;
-		boolean isComp = isComponentInherited(vc, bean, clazz, meth);
-		if (isComp) {
-			Method homeMeth = getMatchingHomeCreateMethod(vc, bean, clazz, meth, methodsExtendedLists);
-			if (homeMeth == null) {
-				isValid = false;
-			}
-		}
-
-		return isValid;
-	}
-	
-	/**
-	 * 18.1.2 Programming restrictions
-	 *...
-	 *    - An enterprise Bean must not use read/write static fields. Using read-only static fields is
-	 *   allowed. Therefore, it is recommended that all static fields in the enterprise bean class be
-	 *   declared as final.
-	 *...
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		//super.primValidate(ejbMethod);
-
-		vc.terminateIfCancelled();
-
-		validateStaticField(vc, bean, clazz, field);
-	}
-	
-	/**
-	 * 6.10.4 Business methods
-	 * The session bean class may define zero or more business methods whose signatures must follow these rules:
-	 * 		- The method names can be arbitrary, but they must not start with "ejb" to avoid conflicts with the callback methods used by the EJB architecture.
-	 *
-	 * 9.2.6 Business methods
-	 *   - The entity bean class may define zero or more business methods whose signatures 
-	 *     must follow these rules:
-	 *        - The method names can be arbitrary, but they must not start with 'ejb' to 
-	 *          avoid conflicts with the callback methods used by the EJB architecture.
-	 */
-	public void validateBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// The method names can be arbitrary, but they must not start with "ejb" to avoid conflicts with the callback methods used by the EJB architecture.
-		if (method.getName().startsWith(IMethodAndFieldConstants.PREFIX_EJB)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2411, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// Section 6.10.5 (session), 9.2.7 (entity), declare that all exceptions declared
-		// on the ejbCreate, ejbPostCreate methods must be defined in the throws clause of
-		// the matching create of the remote interface.
-
-		JavaClass remote = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remote);
-
-		Method remoteMethod = ValidationRuleUtility.getMethodExtended(remote, method, method.getName());
-		if (remoteMethod == null) {
-			// Then this method shouldn't have been called; unless the method exists on the remote, this bean method isn't a business method.
-			return;
-		}
-		
-		Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, method, remoteMethod);
-		if (exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while (iterator.hasNext()) {
-				JavaClass exc = (JavaClass) iterator.next();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2432, IEJBValidationContext.ERROR, bean, clazz, method, new String[] { remote.getQualifiedName(), exc.getQualifiedName()}, this);
-				vc.addMessage(message);
-			}
-		}
-		
-		validateMatchingMethodExceptions(vc, bean, clazz, method, bean.getRemoteInterface(), remoteMethod);
-	}
-	
-	/**
-	 * 6.10.2 Session bean class
-	 * The following are the requirements for session bean class:
-	 * 		- The class must implement, directly or indirectly, the javax.ejb.SessionBean 
-	 *        interface.
-	 * 		- The class must be defined as public, must not be final, and must not 
-	 *        be abstract.
-	 * 		- The class may, but is not required to, implement the session bean's 
-	 *        remote interface [4] .
-	 * 		- If the class is a stateful session bean, it may optionally implement 
-	 *        the javax.ejb.SessionSynchronization interface.
-	 * 		- The session bean class may have superclasses and/or superinterfaces. If the 
-	 *        session bean has superclasses, then the business methods, the ejbCreate methods, 
-	 *        the methods of the SessionBean interface, and the methods of the optional 
-	 *        SessionSynchronization interface may be defined in the session bean class, 
-	 *        or in any of its superclasses.
-	 *
-	 *...
-	 * 9.2.2 Enterprise bean class
-	 *   - The following are the requirements for an entity bean class:
-	 *      - The class must implement, directly or indirectly, the javax.ejb.EntityBean interface.
-	 *      - The class must be defined as public and must not be abstract.
-	 *      - The class must not be defined as final.
-	 *...
-	 *   - The class may, but is not required to, implement the entity bean's remote interface [9]. 
-	 *     If the class implements the entity bean's remote interface, the class must provide no-op 
-	 *     implementations of the methods defined in the javax.ejb.EJBObject interface. The container 
-	 *     will never invoke these methods on the bean instances at runtime.
-	 *   - A no-op implementation of these methods is required to avoid 
-	 *     defining the entity bean class as abstract.
-	 *   - The entity bean class must implement the business methods, and the 
-	 *     ejbCreate, ejbPostCreate, and ejbFind<METHOD> methods as described 
-	 *     later in this section.
-	 *   - The entity bean class may have superclasses and/or superinterfaces. 
-	 *     If the entity bean has superclasses, the business methods, the 
-	 *     ejbCreate and ejbPostCreate methods, the finder methods, and the
-	 *     methods of the EntityBean interface may be implemented in the 
-	 *     enterprise bean class or in any of its superclasses.
-	 *   - The entity bean class is allowed to implement other methods (for 
-	 *     example helper methods invoked internally by the business methods) 
-	 *     in addition to the methods required by the EJB specification.
-	 *...
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		buildComponentParents(bean);
-
-		// The class must implement, directly or indirectly, the javax.ejb.EntityBean (for entity beans), 
-		// or the javax.ejb.SessionBean (for session beans), interface.
-		if (!ValidationRuleUtility.isAssignableFrom(clazz, ValidationRuleUtility.getType(getParentName(), bean))) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2013, IEJBValidationContext.ERROR, bean, clazz, new String[] {clazz.getQualifiedName(), getParentName()}, this);
-			vc.addMessage(message);
-		}
-
-		// For both entity and session beans, the class must be public.
-		if (!clazz.isPublic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2022, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-
-		// For both entity and session beans, the class must not be abstract.
-		if (clazz.isAbstract()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2014, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-
-		// For both entity and session beans, the class must not be final.
-		if (clazz.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2015, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-
-		if (ValidationRuleUtility.isUnnamedPackage(clazz.getJavaPackage())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2041, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		validateAppendixB(vc, bean, clazz);
-	}
-	
-	/**
-	 * 9.2.3 ejbCreate methods
-	 *   - The entity bean class may define zero or more ejbCreate(...) methods whose signatures 
-	 *     must follow these rules:
-	 *       - The method name must be ejbCreate.
-	 *       - The method must be declared as public.
-	 *       - The method must not be declared as final or static.
-	 *       - The return type must be the entity bean's primary key type.
-	 *       - The method argument and return value types must be legal types for RMI-IIOP.
-	 *       - The throws clause may define arbitrary application specific exceptions, 
-	 *         including the javax.ejb.CreateException.
-	 *       - Compatibility Note: EJB 1.0 allowed the ejbCreate method to throw the 
-	 *         java.rmi.RemoteException to indicate a non-application exception. This 
-	 *         practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant enterprise bean 
-	 *         should throw the javax.ejb.EJBException or another java.lang.RuntimeException
-	 *         to indicate non-application exceptions to the Container (see Section 12.2.2).
-	 *   - The entity object created by the ejbCreate method must have a unique primary key. 
-	 *     This means that the primary key must be different from the primary keys of all 
-	 *     the existing entity objects within the same home. The ejbCreate method should 
-	 *     throw the DuplicateKeyException on an attempt to create an entity object with 
-	 *     a duplicate primary key. However, it is legal to reuse the primary key of a
-	 *     previously removed entity object.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - Each create method must be named "create", and it must match one of the 
-	 *     ejbCreate methods defined in the enterprise Bean class. The matching 
-	 *     ejbCreate method must have the same number and types of its arguments. 
-	 *     (Note that the return type is different.)
-	 *   - All the exceptions defined in the throws clause of the matching ejbCreate 
-	 *     and ejbPostCreate methods of the enterprise Bean class must be included in 
-	 *     the throws clause of the matching create method of the home interface 
-	 *     (i.e the set of exceptions defined for the create method must be a superset
-	 *     of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-	 *...
-	 *
-	 * 9.4.2 ejbCreate, ejbPostCreate
-	 *...
-	 *   - The ejbCreate(...) methods must be defined to return the primary key class type. 
-	 *     The implementation of the ejbCreate(...) methods should be coded to return a null. 
-	 *     The returned value is ignored by the Container.
-	 *...
-	 */
-	public void validateEjbCreateMethod_homeDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		// The method which calls this method must have already tested that the method name is ejbCreate.
-		if (method == null) {
-			return;
-		}
-
-		Method createMethod = getMatchingHomeCreateMethodExtended(vc, bean, clazz, method);
-		if (createMethod == null) {
-			// Can't check the exceptions of a method which doesn't exist.
-			return;
-		}
-
-		// Whether this is from a component inheritance or not, if the method exists on the
-		// home, check that the method follows the spec.
-
-		// Section 6.10.6 (session), 9.2.8 (entity), declare that all exceptions declared
-		// on the ejbCreate, ejbPostCreate methods must be defined in the throws clause of
-		// the matching create of the home interface.
-		Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, method, createMethod);
-		if (exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while (iterator.hasNext()) {
-				JavaClass exc = (JavaClass) iterator.next();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2420, IEJBValidationContext.ERROR, bean, clazz, method, new String[] { exc.getQualifiedName(), bean.getHomeInterface().getQualifiedName()}, this);
-				vc.addMessage(message);
-			}
-		}
-
-	}
-	
-	public void validateHelperMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		//Default
-	}
-	
-	public void validateNoRemoteException(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, String messagePrefix) throws InvalidInputException {
-		// EJB 2.0 added "throws InvalidInputException" above
-		if (method == null) {
-			return;
-		}
-
-		if(!ValidationRuleUtility.doesNotThrowRemoteException(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, messagePrefix, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-	}
-	
-	/**
-	 * 18.1.2 Programming restrictions
-	 *...
-	 *    - An enterprise Bean must not use read/write static fields. Using read-only static fields is
-	 *   allowed. Therefore, it is recommended that all static fields in the enterprise bean class be
-	 *   declared as final.
-	 *...
-	 */
-	protected void validateStaticField(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		if (field == null) {
-			return;
-		}
-
-		// An enterprise Bean must not use read/write static fields. Using read-only static fields is
-		// allowed. Therefore, it is recommended that all static fields in the enterprise bean class be
-		// declared as final.
-		if (field.isStatic() && !field.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2200, IEJBValidationContext.WARNING, bean, clazz, field, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void validateMatchingMethodExceptions(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, JavaClass matchingClazz, Method matchingMethod) {
-		// Every exception thrown on the bean class' method must be thrown on the component/home method
-		/* Don't check for this here - let the home & component do it.
-		Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, method, matchingMethod);
-		Iterator eiterator = exceptions.iterator();
-		while(eiterator.hasNext()) {
-		}
-		*/
-		
-		// Every exception thrown by the component/home method should be thrown or there may be compile errors
-		Set exceptions = ValidationRuleUtility.getNotSubsetSubtypeExceptions(bean, matchingMethod, method);
-		Iterator eiterator = exceptions.iterator();
-		while(eiterator.hasNext()) {
-			JavaClass exception = (JavaClass)eiterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2456, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{exception.getJavaName(), matchingClazz.getJavaName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	protected void validateAppendixB(IEJBValidationContext vc, EnterpriseBean bean, JavaClass thisEjbObject) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		if(bean == null) {
-			return;
-		}
-		EnterpriseBean supertype = getSuperType(bean);
-		JavaClass parentEjbObject = null;
-		if (supertype != null) {
-			parentEjbObject = supertype.getEjbClass();
-
-			// EJBObject a Xchild of parent EJBObject (X = child, grandchild, great-grandchild, etc.)
-			try {
-				ValidationRuleUtility.isValidType(thisEjbObject);
-				ValidationRuleUtility.isValidType(parentEjbObject);
-				if (!ValidationRuleUtility.isAssignableFrom(thisEjbObject, parentEjbObject)) {
-					String[] msgParm = new String[] { thisEjbObject.getQualifiedName(), parentEjbObject.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2103, IEJBValidationContext.ERROR, bean, thisEjbObject, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { e.getJavaClass().getQualifiedName(), bean.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2849, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-		
-//		validateAppendixB(vc, supertype, parentEjbObject);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java
deleted file mode 100644
index b0eec60e1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * Insert the type's description here.
- * Creation date: (1/5/01 11:51:09 AM)
- * @author: Administrator
- */
-public abstract class AValidateEJB extends AValidationRule {
-	private List roleMethodNames;
-	
-	public void reset() {
-		super.reset();
-		if(roleMethodNames != null) {
-			roleMethodNames.clear();
-			roleMethodNames = null; // in this case, clearing the list isn't enough, because it is legal to have zero role names. Must be null or we'll keep trying to reload the role names just because there are zero role names.
-		}
-	}
-	
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (9/5/2001 12:36:39 PM)
-	 * @return java.util.List
-	 */
-	protected List getRoleMethodNames(IEJBValidationContext vc, EnterpriseBean bean) {
-		try {
-			if (roleMethodNames == null && bean != null) {
-				roleMethodNames = getRoleMethodNamesExtended(bean);
-			}
-			return roleMethodNames;
-		}
-		catch (Throwable exc) {
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.FINER)) {
-				logger.write(Level.FINER, exc);
-			}
-			return Collections.EMPTY_LIST;
-		}
-	}
-	
-	protected boolean isEjbRelationshipRoleMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null)
-			return false;
-		List aRoleMethodNames = getRoleMethodNames(vc, bean);
-		if(aRoleMethodNames != null && !aRoleMethodNames.isEmpty())
-		  return aRoleMethodNames.contains(method.getName());
-		return false;
-	}
-	
-	/**
-	 * Return true if the field can, and should, be validated.
-	 * Filter out faulty fields (i.e., null), and fields which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtendedLists) throws InvalidInputException {
-		// The following call checks if the type reflected properly
-		ValidationRuleUtility.isValidType(ValidationRuleUtility.getType(field));
-
-		if (field.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID)) {
-			return false;
-		}
-
-		return true;
-	}
-	
-	/**
-	 * Return true if the method can, and should, be validated.
-	 * Filter out faulty methods (i.e., null), and methods which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws InvalidInputException {
-		if (method == null) {
-			throw new InvalidInputException();
-		}
-		return true;
-	}
-
-	/**
-	 * This method actually does the validation. Since many of the classes do
-	 * not validate fields now, implement this method as a no-op so that the
-	 * classes compile. 
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		//Default
-	}
-	
-	/**
-	 * This method actually does the validation.
-	 */
-	public abstract void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException;
-	
-	/**
-	 * This method does the actual checking (if ejbMethod exists).
-	 */
-	protected abstract void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException;
-	
-	protected abstract List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz);
-	protected abstract List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz);
-	
-	protected final void reflectionError(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz)  {
-		vc.removeMessages(clazz);
-	
-		IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.ERROR, bean, clazz, new String[]{clazz.getQualifiedName()}, this);
-		vc.addMessage(message);
-	}
-	
-	protected final void reflectionWarning(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, InvalidInputException e) {
-		// One of two cases where we care if the type is on this class or not (i.e., not leaving it up to MessageUtility)
-		String[] msgParm = null;
-		String javaClassName = (e.getJavaClass() == null) ? "?" : e.getJavaClass().getQualifiedName(); //$NON-NLS-1$
-		if(ValidationRuleUtility.onClass(clazz, field)) {
-			msgParm = new String[] {String.valueOf(field.getName()), String.valueOf(javaClassName)};
-		}
-		else {
-			msgParm = new String[] {javaClassName}; // MessageUtility will substitute in the name of the field
-		}
-		IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2433, IEJBValidationContext.WARNING, bean, clazz, field, msgParm, this);
-		vc.addMessage(message);
-	}
-	
-	protected final void reflectionWarning(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, InvalidInputException e) {
-		// One of two cases where we care if the type is on this class or not (i.e., not leaving it up to MessageUtility)
-		String[] msgParm = null;
-		String javaClassName = (e.getJavaClass() == null) ? "?" : e.getJavaClass().getQualifiedName(); //$NON-NLS-1$
-		if(ValidationRuleUtility.onClass(clazz, method)) {
-			msgParm = new String[] {method.getMethodElementSignature(), javaClassName};
-		}
-		else {
-			msgParm = new String[] {javaClassName}; // MessageUtility will substitute in the name of the field
-		}
-		IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2433, IEJBValidationContext.WARNING, bean, clazz, method, msgParm, this);
-		vc.addMessage(message);
-	}
-	
-	public final void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationException {
-		vc.terminateIfCancelled();
-		
-		EnterpriseBean bean = (EnterpriseBean)targetParent;
-		JavaClass clazz = (JavaClass)target;
-		
-		try {
-			// check if all of the types in the bean reflected properly
-			ValidationRuleUtility.isValidTypeHierarchy(bean, clazz);
-			
-			vc.subtask(IEJBValidatorConstants.STATUS_VALIDATING, new String[]{clazz.getQualifiedName()});
-			validateClass(vc, bean, clazz);
-			validateMethods(vc, bean, clazz);
-			validateFields(vc, bean, clazz);
-		}
-		catch(InvalidInputException e) {
-			reflectionError(vc, bean, clazz);
-			return;
-		}
-		catch(ValidationCancelledException e) {
-			throw e;
-		}
-	}
-
-	/**
-	 * This method should be called to avoid validating a Field more
-	 * than once.  This is not used for checking the existence of a field.
-	 */
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtendedList) throws InvalidInputException {
-		if (isValid(vc, bean, clazz, field, fieldsExtendedList)) {
-			primValidate(vc, bean, clazz, field);
-		}
-	}
-	
-	/**
-	 * This method should be called to avoid validating a Method more
-	 * than once.  This is not used for checking the existence of a method.
-	 */
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod, List[] methodsExtendedList) throws InvalidInputException {
-		if (isValid(vc, bean, clazz, ejbMethod, methodsExtendedList)) {
-			primValidate(vc, bean, clazz, ejbMethod);
-		}
-	}
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected final void validateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod, List[] methodsExtendedList) throws InvalidInputException {
-		if (isValid(vc, bean, clazz, ejbMethod, methodsExtendedList)) {
-			primValidateExistence(vc, bean, clazz, ejbMethod);
-		}
-	}
-	
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		//Default
-	}
-	
-	public final void validateFields(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz)  throws ValidationCancelledException, InvalidInputException, ValidationException {
-		vc.terminateIfCancelled();
-
-		// Whenever looping over an entire list, always use an 
-		// iterator instead of a for loop, for performance reasons. 
-		// If the list is an instance of a linked list, for example,
-		// the get(i) call can take  a long time. 
-		List fields = clazz.getFieldsExtended();
-		Iterator iterator = fields.iterator();
-		Field field = null;
-		List[] fieldsExtendedList = getFieldsExtended(vc, bean, clazz);
-		while (iterator.hasNext()) {
-			vc.terminateIfCancelled();
-			field = (Field) iterator.next();
-			if (field == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("AValidateEJB.validateFields()"); //$NON-NLS-1$
-					entry.setText("A field is null on " + clazz); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-			try {
-				validate(vc, bean, clazz, field, fieldsExtendedList);
-			}
-			catch (InvalidInputException e) {
-				reflectionWarning(vc, bean, clazz, field, e);
-			}
-		}
-		vc.terminateIfCancelled();
-	}
-	
-	/**
-	 * Verifies that a given method is RMI legal.
-	 * This means that their argument and return values must be of valid types 
-	 * for RMI/IIOP, and their throws clause must include the java.rmi.RemoteException.
-	 */
-	public final void validateLegalRMIMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		validateLegalRMIMethodWithoutExceptions(vc, bean, clazz, method);
-		validateLegalRMIMethodExceptions(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * Verifies that a given method is RMI legal.
-	 * This means that their argument and return values must be of valid types 
-	 * for RMI/IIOP, and their throws clause must include the java.rmi.RemoteException.
-	 */
-	public final void validateLegalRMIMethodArguments(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		if (method == null) {
-			return;
-		}
-
-		JavaParameter[] args = method.listParametersWithoutReturn();
-		for (int i = 0; i < args.length; i++) {
-			vc.terminateIfCancelled();
-
-			if (!ValidationRuleUtility.isLegalRMI_IIOPType(bean, args[i].getJavaType())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2413, IEJBValidationContext.INFO, bean, clazz, method, new String[]{args[i].getQualifiedName()}, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * Verifies that a given method is RMI legal.
-	 * This means that their argument and return values must be of valid types 
-	 * for RMI/IIOP, and their throws clause must include the java.rmi.RemoteException.
-	 */
-	public final void validateLegalRMIMethodExceptions(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		if (method == null) {
-			return;
-		}
-
-		if (!ValidationRuleUtility.throwsRemoteExceptionOrParent(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2414, IEJBValidationContext.ERROR, bean, clazz, method, new String[]{ITypeConstants.CLASSNAME_JAVA_RMI_REMOTEEXCEPTION}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Verifies that a given method is RMI legal, but doesn't check the exceptions.
-	 * This means that the method's argument and return values must be of valid types 
-	 * for RMI/IIOP.
-	 */
-	public final void validateLegalRMIMethodReturnType(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return;
-		}
-
-		if (!ValidationRuleUtility.isLegalRMI_IIOPType(bean, method.getReturnType())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2412, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Verifies that a given method is RMI legal, but doesn't check the exceptions.
-	 * This means that the method's argument and return values must be of valid types 
-	 * for RMI/IIOP.
-	 */
-	public final void validateLegalRMIMethodWithoutExceptions(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		validateLegalRMIMethodArguments(vc, bean, clazz, method);
-		validateLegalRMIMethodReturnType(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * Final check to see if required methods were detected.
-	 */
-	protected abstract void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException;
-	
-	public final void validateMethods(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz)  throws ValidationCancelledException, InvalidInputException, ValidationException {
-		vc.terminateIfCancelled();
-
-		// Whenever looping over an entire list, always use an 
-		// iterator instead of a for loop, for performance reasons. 
-		// If the list is an instance of a linked list, for example,
-		// the get(i) call can take  a long time. 
-		Method[] ejbMethods = clazz.listMethodExtended();
-		Method method = null;
-		List[] methodsExtendedList = getMethodsExtended(vc, bean, clazz);
-		for(int i=0; i<ejbMethods.length; i++) {
-			vc.terminateIfCancelled();
-			method = ejbMethods[i];
-			if (method == null) {
-				// No point adding a validation message, because the user can't do anything.
-				// Log this condition.
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("AValidateEJB.validateMethods()"); //$NON-NLS-1$
-					entry.setText("On " + clazz + ", there is a null method."); //$NON-NLS-1$  //$NON-NLS-2$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-			try {
-				validateExistence(vc, bean, clazz, method, methodsExtendedList);
-				validate(vc, bean, clazz, method, methodsExtendedList);
-			}
-			catch (InvalidInputException e) {
-				reflectionWarning(vc, bean, clazz, method, e);
-			}
-		}
-		validateMethodExists(vc, bean, clazz);
-		vc.terminateIfCancelled();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityBean.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityBean.java
deleted file mode 100644
index b6e4325a6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityBean.java
+++ /dev/null
@@ -1,582 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks entity bean classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- *
- * All 9.2.X sections describe BMP requirements.
- * If a CMP requirement is different than these, then the differences are
- * documented in 9.4.X sections.
- */
-public abstract class AValidateEntityBean extends AValidateBean {
-	protected final static String JAVAX_EJB_ENTITYBEAN = "javax.ejb.EntityBean"; //$NON-NLS-1$
-	protected final static String SETENTITYCONTEXT = "setEntityContext"; //$NON-NLS-1$
-	protected final static String UNSETENTITYCONTEXT = "unsetEntityContext"; //$NON-NLS-1$
-	protected final static String EJBLOAD = "ejbLoad"; //$NON-NLS-1$
-	protected final static String EJBSTORE = "ejbStore"; //$NON-NLS-1$
-	protected final static String JAVAX_EJB_ENTITYCONTEXT = "javax.ejb.EntityContext"; //$NON-NLS-1$
-	private boolean hasValidConstructor = false;
-	private boolean hasAConstructor = false;
-	private boolean hasSetEntityContext = false;
-	private boolean hasUnsetEntityContext = false;
-	private boolean hasEjbActivate = false;
-	private boolean hasEjbPassivate = false;
-	private boolean hasEjbRemove = false;
-	private boolean hasEjbLoad = false;
-	private boolean hasEjbStore = false;
-
-	/**
-	 * Given a bean's ejbFind method, return the matching find method from
-	 * the home, if it exists. If not, return null.
-	 */
-	public Method getMatchingHomeFindMethodExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return null;
-		}
-
-		if (bean == null) {
-			return null;
-		}
-
-		return ValidationRuleUtility.getMethodExtended(bean.getHomeInterface(), method, IMethodAndFieldConstants.PREFIX_FIND);
-	}
-	/**
-	 * getParentName method comment.
-	 */
-	protected String getParentName() {
-		return JAVAX_EJB_ENTITYBEAN;
-	}
-	
-	public boolean isFrameworkMethod(String name) {
-		if (name == null) {
-			return false;
-		}
-
-		if (super.isFrameworkMethod(name)) {
-			return true;
-		}
-		// check for entity-specific methods
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBLOAD)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBSTORE)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_SETENTITYCONTEXT)) {
-			return true;
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_UNSETENTITYCONTEXT)) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	/**
-	 * Checks that the methods in the entity bean class follow the EJB 1.1. specification,
-	 * and that there are no missing required methods.
-	 * Section: 9.2.2
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.primValidate(ejbMethod);
-
-		vc.terminateIfCancelled();
-
-		String name = ejbMethod.getName();
-		if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBCREATE))
-			validateEjbCreateMethod(vc, bean, clazz, ejbMethod);
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE))
-			validateEjbPostCreateMethod(vc, bean, clazz, ejbMethod);
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_FINALIZE))
-			validateFinalize(vc, bean, clazz, ejbMethod);
-		else if (name.startsWith(IMethodAndFieldConstants.PREFIX_EJBFIND))
-			validateEjbFindMethod(vc, bean, clazz, ejbMethod);
-		else if (isBusinessMethod(vc, bean, clazz, ejbMethod))
-			validateBusinessMethod(vc, bean, clazz, ejbMethod);
-		else
-			validateHelperMethod(vc, bean, clazz, ejbMethod);
-
-		vc.terminateIfCancelled();
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		vc.terminateIfCancelled();
-
-		String name = ejbMethod.getName();
-		if (!hasSetEntityContext && name.equals(IMethodAndFieldConstants.METHODNAME_SETENTITYCONTEXT)) {
-			JavaParameter[] params = ejbMethod.listParametersWithoutReturn();
-			if (params.length == 1) {
-				if (ValidationRuleUtility.isAssignableFrom(params[0].getJavaType(), ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_ENTITYCONTEXT, bean))) {
-					hasSetEntityContext = true;
-				}
-			}
-		}
-		else if (!hasUnsetEntityContext && name.equals(IMethodAndFieldConstants.METHODNAME_UNSETENTITYCONTEXT)) {
-			if (ejbMethod.listParametersWithoutReturn().length == 0) {
-				hasUnsetEntityContext = true;
-			}
-		}
-		else if (!hasEjbActivate && name.equals(IMethodAndFieldConstants.METHODNAME_EJBACTIVATE)) {
-			if (ejbMethod.listParametersWithoutReturn().length == 0) {
-				hasEjbActivate = true;
-			}
-		}
-		else if (!hasEjbPassivate && name.equals(IMethodAndFieldConstants.METHODNAME_EJBPASSIVATE)) {
-			if (ejbMethod.listParametersWithoutReturn().length == 0) {
-				hasEjbPassivate = true;
-			}
-		}
-		else if (!hasEjbRemove && name.equals(IMethodAndFieldConstants.METHODNAME_EJBREMOVE)) {
-			if (ejbMethod.listParametersWithoutReturn().length == 0) {
-				hasEjbRemove = true;
-			}
-		}
-		else if (!hasEjbLoad && name.equals(IMethodAndFieldConstants.METHODNAME_EJBLOAD)) {
-			if (ejbMethod.listParametersWithoutReturn().length == 0) {
-				hasEjbLoad = true;
-			}
-		}
-		else if (!hasEjbStore && name.equals(IMethodAndFieldConstants.METHODNAME_EJBSTORE)) {
-			if (ejbMethod.listParametersWithoutReturn().length == 0) {
-				hasEjbStore = true;
-			}
-		}
-		else if (!hasValidConstructor && ejbMethod.isConstructor()) {
-			hasAConstructor = true;
-			if (ValidationRuleUtility.isPublic(ejbMethod) && (ejbMethod.listParametersWithoutReturn().length == 0)) {
-				hasValidConstructor = true;
-			}
-		}
-
-		vc.terminateIfCancelled();
-
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.6
-	 */
-	public void validateBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		super.validateBusinessMethod(vc, bean, clazz, method); // make sure that name does not start with 'ejb'
-
-		// The method must be declared as public.
-		if (!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2408_bus, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method must not be declared as final or static.
-		if (method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2410_bus, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if (method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2409_bus, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method argument and return value types must be legal types for RMI-IIOP.
-		validateLegalRMIMethodWithoutExceptions(vc, bean, clazz, method);
-
-		// The throws clause may define arbitrary application specific exceptions.
-		// Compatibility Note: EJB 1.0 allowed the business methods to throw the 
-		// java.rmi.RemoteException to indicate a non-application exception. This 
-		// practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant enterprise bean 
-		// should throw the javax.ejb.EJBException or another java.lang.RuntimeException
-		// to indicate non-application exceptions to the Container (see Section 12.2.2).
-		validateBusinessMethodNoRemoteException(vc, bean, clazz, method);
-	}
-	
-	protected void validateBusinessMethodNoRemoteException(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// EJB 2.0 added "throws InvalidInputException" above
-		validateNoRemoteException(vc, bean, clazz, method, IMessagePrefixEjb11Constants.CHKJ2400_bus);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.2
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		// All of the above checks are performed by ValidateBean.
-		super.validateClass(vc, bean, clazz);
-
-		// Plus, check that at least one field exists on the bean.
-		verifyFieldExists(vc, bean, clazz);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.3, 9.2.8 and 9.4.2
-	 */
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		// The method which calls this method has already tested that the method name is ejbCreate.
-		if (method == null)
-			return;
-
-		// The method must be declared as public.
-		if (!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2408_ejbCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method must not be declared as final or static.
-		if (method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2410_ejbCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if (method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2409_ejbCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method argument and return value types must be legal types for RMI-IIOP.
-		// But if the bean uses java.lang.Object for a key, don't check if it's serializable.
-		if(ValidationRuleUtility.usesUnknownPrimaryKey(bean)) {
-			validateLegalRMIMethodArguments(vc, bean, clazz, method);
-		}
-		else {
-			validateLegalRMIMethodWithoutExceptions(vc, bean, clazz, method);
-		}	
-		
-		// The return type must be the entity bean's primary key type; unless this is
-		// a CMP, and an unkonwn primary key class is used. Read section 9.4.7.3.
-		validateEjbCreateMethod_keyDep(vc, bean, clazz, method);
-
-		// The throws clause may define arbitrary application specific exceptions, 
-		// including the javax.ejb.CreateException.
-		// Compatibility Note: EJB 1.0 allowed the ejbPostCreate method to throw 
-		// the java.rmi.RemoteException to indicate a non-application exception. 
-		// This practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant enterprise 
-		// bean should throw the javax.ejb.EJBException or another 
-		// java.lang.RuntimeException to indicate non-application exceptions to the 
-		// Container (see Section 12.2.2).
-		validateNoRemoteException(vc, bean, clazz, method, IMessagePrefixEjb11Constants.CHKJ2400_ejbCreate);
-
-		// Verify that there is a matching ejbPostCreate method for this ejbCreate method.
-		Method ejbPostCreateMethod = ValidationRuleUtility.getMethodExtended(clazz, IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE, method.listParametersWithoutReturn());
-		if (ejbPostCreateMethod == null) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2002, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// Check for a matching create method on the home, and that the exceptions on
-		// this method are a subset of the exceptions of the matching method on the home.
-		validateEjbCreateMethod_homeDep(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.3, 9.2.8 and 9.4.2
-	 */
-	public void validateEjbCreateMethod_keyDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		// The method which calls this method has already tested that the method name is ejbCreate.
-		if (method == null)
-			return;
-
-		// Unknown primary key class (section 9.4.7.3) is also validated by this
-		// check, because the primary key must be of type java.lang.Object, and
-		// the ejbCreate must return java.lang.Object.
-		JavaHelpers primaryKey = null;
-		if(ValidationRuleUtility.usesUnknownPrimaryKey(bean)) {
-			primaryKey = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, bean);
-		}
-		else {
-			primaryKey = ((Entity) bean).getPrimaryKey();
-		}
-
-		// The return type must be the entity bean's primary key type.
-		vc.terminateIfCancelled();
-		JavaHelpers parmType = method.getReturnType();
-
-		if (!ValidationRuleUtility.isAssignableFrom(parmType, primaryKey)) {
-			// if the parameter type is java.lang.Object, could be section 9.4.7.3
-			String keyName = (primaryKey == null) ? IEJBValidatorConstants.NULL_PRIMARY_KEY : primaryKey.getJavaName();
-			String[] msgParm = {keyName};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2406, IEJBValidationContext.WARNING, bean, clazz, method, msgParm, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.5, 9.4.6 and 9.4.7.3
-	 */
-	public void validateEjbFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// This method is a no-op so that the dependency classes don't have to implement it.
-		// (This method will never be called in a dependency class.)
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.5, 9.4.6 and 9.4.7.3
-	 */
-	public void validateEjbFindMethod_homeDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// All the exceptions defined in the throws clause of the matching ejbCreate 
-		// and ejbPostCreate methods of the enterprise Bean class must be included in 
-		// the throws clause of the matching create method of the home interface 
-		// (i.e the set of exceptions defined for the create method must be a superset
-		// of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-		JavaClass home = bean.getHomeInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, home);
-
-		String methodName = IMethodAndFieldConstants.PREFIX_F + method.getName().substring(4); // e.g. if the home method is named findX, then the bean method will be named ejbFindX
-		Method homeMethod = ValidationRuleUtility.getMethodExtended(home, method, methodName);
-		if (homeMethod == null) {
-			// Then this method shouldn't have been called; unless the method exists on the remote, this bean method isn't a business method.
-			return;
-		}
-		Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, method, homeMethod);
-		if (exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while (iterator.hasNext()) {
-				JavaClass exc = (JavaClass) iterator.next();
-				String[] msgParm = { exc.getQualifiedName(), home.getQualifiedName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2420, IEJBValidationContext.ERROR, bean, clazz, method, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * Checks that the ejbPostCreate method follows the EJB 1.1. specification.
-	 * Section: 9.2.4
-	*/
-	public void validateEjbPostCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		// The method which calls this method has already tested that the method name is ejbPostCreate.
-		if (method == null)
-			return;
-
-		// The method must be declared as public.
-		if (!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2408_ejbPostCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method must not be declared as final or static.
-		if (method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2410_ejbPostCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if (method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2409_ejbPostCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		vc.terminateIfCancelled();
-
-		// The return type must be void.
-		JavaHelpers parmType = method.getReturnType();
-		String returnTypeName = ((parmType == null) ? "" : parmType.getQualifiedName()); //$NON-NLS-1$
-		if (!returnTypeName.equals(ITypeConstants.VOID)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2418, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The throws clause may define arbitrary application specific exceptions, 
-		// including the javax.ejb.CreateException.
-		// Compatibility Note: EJB 1.0 allowed the ejbPostCreate method to throw 
-		// the java.rmi.RemoteException to indicate a non-application exception. 
-		// This practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant enterprise 
-		// bean should throw the javax.ejb.EJBException or another 
-		// java.lang.RuntimeException to indicate non-application exceptions to the 
-		// Container (see Section 12.2.2).
-		validateNoRemoteException(vc, bean, clazz, method, IMessagePrefixEjb11Constants.CHKJ2400_ejbPostCreate);
-
-		// Verify that the ejbPostCreate method has a matching ejbCreate method.
-		Method ejbCreateMethod = ValidationRuleUtility.getMethodExtended(clazz, IMethodAndFieldConstants.METHODNAME_EJBCREATE, method.listParametersWithoutReturn());
-		if (ejbCreateMethod == null) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2028, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		validateEjbPostCreateMethod_homeDep(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * Checks that the ejbPostCreate method follows the EJB 1.1. specification.
-	 * Section: 9.2.4
-	*/
-	public void validateEjbPostCreateMethod_homeDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		// The method which calls this method has already tested that the method name is ejbPostCreate.
-		if (method == null) {
-			return;
-		}
-
-		JavaClass homeIntf = bean.getHomeInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, homeIntf);
-
-		Method createMethod = getMatchingHomeCreateMethodExtended(vc, bean, clazz, method);
-		if (createMethod == null) {
-			// If the ejbCreate method is inherited from a component parent, it is likely
-			// that the corresponding create method does not exist on the home.
-			// Since our tools generate the component inheritance code, suppress this warning.
-
-			// ejbCreate methods which are inherited via component inheritance, but do not
-			// have a method on their immediate home, are filtered out via the isValid(Method) method.
-
-			// The validateEjbCreateMethod checks for a matching create method, but just in
-			// case the ejbCreate method is missing, check for it here too.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2029, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { homeIntf.getName()}, this);
-			vc.addMessage(message);
-
-			// Can't check the exceptions of a method which doesn't exist.
-			return;
-		}
-
-		// Whether this is from a component inheritance or not, if the method exists on the
-		// home, check that the method follows the spec.
-
-		// Section 6.10.6 (session), 9.2.8 (entity), declare that all exceptions declared
-		// on the ejbCreate, ejbPostCreate methods must be defined in the throws clause of
-		// the matching create of the home interface.
-		Set exceptions = ValidationRuleUtility.getNotSubsetExceptions(bean, method, createMethod);
-		if (exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while (iterator.hasNext()) {
-				JavaClass exc = (JavaClass) iterator.next();
-				String[] msgParm = { exc.getQualifiedName(), homeIntf.getQualifiedName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2420, IEJBValidationContext.ERROR, bean, clazz, method, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.2
-	 */
-	protected void validateFinalize(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-
-		// If it's "finalize()", the ejb bean shouldn't have the method.
-		if (method.listParametersWithoutReturn().length == 0) {
-			// This is a warning, not an error, because EJB 1.0 allowed the finalize() method to be called. EJB 1.1 (section 6.10.2) specifically prohibits it.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2007, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.2
-	 */
-	protected void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		final String[] modelObjectName = new String[] { clazz.getQualifiedName()};
-		if (!hasValidConstructor && hasAConstructor) {
-			// If a public constructor with no arguments does not exist explicitly,
-			// Java will insert one as long as there are no constructors defined in the
-			// class. If there is a constructor, Java does not insert a default constructor.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2006, IEJBValidationContext.ERROR, bean, clazz, modelObjectName, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasSetEntityContext) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2033, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasUnsetEntityContext) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2034, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasEjbActivate) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2035, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasEjbPassivate) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2036, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasEjbRemove) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2037, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasEjbLoad) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2038, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasEjbStore) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2039, IEJBValidationContext.WARNING, bean, clazz, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Check that at least one field exists on the bean class.
-	 */
-	public abstract void verifyFieldExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException;
-
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-		hasValidConstructor = false;
-		hasAConstructor = false;
-		hasSetEntityContext = false;
-		hasUnsetEntityContext = false;
-		hasEjbActivate = false;
-		hasEjbPassivate = false;
-		hasEjbRemove = false;
-		hasEjbLoad = false;
-		hasEjbStore = false;
-		
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityHome.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityHome.java
deleted file mode 100644
index e5173bfea..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityHome.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashSet;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks entity home classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section: 9.2.8
- */
-public abstract class AValidateEntityHome extends AValidateHome {
-	private HashSet findByPKMethods = null;
-
-	public AValidateEntityHome() {
-		findByPKMethods = new HashSet();
-	}
-
-	public void reset() {
-		super.reset();
-		findByPKMethods.clear();
-	}
-
-	protected void incrementFindByPrimaryKeyCount(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-
-		// Need to track number of findByPrimaryKey methods for the
-		// validateMethodExists() checks. Do not check only the current
-		// class, or a findByPrimaryKey which is inherited from a parent interface
-		// will not be detected.
-		if (method.getName().equals(IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY)) {
-			findByPKMethods.add(method);
-		}
-	}
-	
-	/**
-	 * This method returns true if the given method returns the remote interface,
-	 * and false otherwise.
-	 */
-	public boolean isSingleObjectFinder(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return false;
-		}
-
-		// The findByPrimaryKey method is always a single-object finder.
-		JavaClass remoteIntf = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remoteIntf);
-
-		if (!ValidationRuleUtility.isAssignableFrom(method.getReturnType(), remoteIntf)) {
-			return false;
-		}
-
-		// The method is a single-object finder.
-		return true;
-	}
-	
-	/**
-	 * This method checks that the entity home's methods comply with the EJB 1.1 specification.
-	 * Section: 9.2.8
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method hiMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		// super.primValidate(hiMethod);
-
-		vc.terminateIfCancelled();
-
-		String name = hiMethod.getName();
-
-		// Each method defined in the home interface must be one of the following:
-		//   - A create method.
-		//   - A finder method.
-		if (name.equals(IMethodAndFieldConstants.METHODNAME_CREATE))
-			validateCreateMethod(vc, bean, clazz, hiMethod);
-		else if (name.startsWith(IMethodAndFieldConstants.PREFIX_FIND))
-			validateFindMethod(vc, bean, clazz, hiMethod);
-		else {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2005, IEJBValidationContext.ERROR, bean, clazz, hiMethod, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		if (IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY.equals(ejbMethod.getName()))
-			incrementFindByPrimaryKeyCount(vc, bean, clazz, ejbMethod);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		super.validateClass(vc, bean, clazz);
-		// The superclass checks that the home extends javax.ejb.EJBHome,
-		// and that the interface inheritance complies with RMI-IIOP rules.
-	}
-	
-	/**
-	 * Checks that the create method on the entity home follows the EJB 1.1. specification.
-	 * Section: 9.2.8
-	 */
-	public void validateCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return;
-		}
-
-		// Each create method must be named "create", and it must match one of the 
-		// ejbCreate methods defined in the enterprise Bean class. The matching 
-		// ejbCreate method must have the same number and types of its arguments. 
-		// (Note that the return type is different.)
-		//
-		// All the exceptions defined in the throws clause of the matching ejbCreate 
-		// and ejbPostCreate methods of the enterprise Bean class must be included in 
-		// the throws clause of the matching create method of the home interface 
-		// (i.e the set of exceptions defined for the create method must be a superset
-		// of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-		validateCreateMethod_beanDep(vc, bean, clazz, method);
-
-		vc.terminateIfCancelled();
-
-		// The return type for a create method must be the entity bean's remote interface type.
-		validateCreateMethod_remoteDep(vc, bean, clazz, method);
-
-		// The throws clause of a create method must include the javax.ejb.CreateException.
-		if (!ValidationRuleUtility.throwsCreateException(bean, method)) {
-			String[] msgParm = { ITypeConstants.CLASSNAME_JAVAX_EJB_CREATEEXCEPTION };
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2414, IEJBValidationContext.ERROR, bean, clazz, method, msgParm, this);
-			vc.addMessage(message);
-		}
-
-		// The methods defined in this interface must follow the rules for RMI-IIOP. 
-		// This means that their argument and return types must be of valid types for 
-		// RMI-IIOP, and that their throws clause must include the java.rmi.RemoteException.
-		validateLegalRMIMethod(vc, bean, clazz, method);
-
-	}
-	
-	/**
-	 * Checks that the create method on the entity home follows the EJB 1.1. specification.
-	 * Section: 9.2.8
-	 */
-	public void validateCreateMethod_beanDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return;
-		}
-
-		// Each create method must be named "create", and it must match one of the 
-		// ejbCreate methods defined in the enterprise Bean class. The matching 
-		// ejbCreate method must have the same number and types of its arguments. 
-		// (Note that the return type is different.)
-		super.validateCreateMethod_beanDep(vc, bean, clazz, method);
-
-		//
-		// All the exceptions defined in the throws clause of the matching ejbCreate 
-		// and ejbPostCreate methods of the enterprise Bean class must be included in 
-		// the throws clause of the matching create method of the home interface 
-		// (i.e the set of exceptions defined for the create method must be a superset
-		// of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-		validateMatchingBeanPostCreateMethod(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * In addition to regular find rules, findByPrimaryKey needs to follow some other rules.
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	public void validateFindByPrimaryKeyMethod_keyDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return;
-		}
-
-		boolean hasValidFBPKMethod = false;
-		Entity entityBean = (Entity) bean; // bean is checked for null in AValidateEJB.validate() method, so don't need to check for it here.
-		JavaClass keyClass = entityBean.getPrimaryKey();
-		
-		ValidationRuleUtility.isValidTypeHierarchy(bean, keyClass);
-
-		vc.terminateIfCancelled();
-
-		// The method must declare the primary key class as the method argument.
-		// This check also validates case 9.4.7.3 (CMP unknown primary key class,
-		// which must be declared as java.lang.Object.)
-		JavaParameter[] parms = method.listParametersWithoutReturn();
-		if (parms.length == 1) {
-			JavaHelpers type = parms[0].getJavaType();
-			if (ValidationRuleUtility.isAssignableFrom(type, keyClass)) {
-				// check that it's a single-object finder
-				if (isSingleObjectFinder(vc, bean, clazz, method)) {
-					hasValidFBPKMethod = true;
-				}
-			}
-			else {
-				// check if it's java.lang.Object. If it is, this could be a case of 9.4.7.3.
-				if (ValidationRuleUtility.isSameType(type, ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, entityBean))) {
-					hasValidFBPKMethod = true;
-				}
-			}
-		}
-
-		if (!hasValidFBPKMethod) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2405, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { keyClass.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * In addition to regular find rules, findByPrimaryKey needs to follow some other rules.
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	public void validateFindByPrimaryKeyMethod_remoteDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (!isSingleObjectFinder(vc, bean, clazz, method)) {
-			String remoteIntfName = bean.getRemoteInterface().getName(); // Can assume that remote interface isn't null, or isSingleObjectFinder would have thrown an InvalidInputException.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2403, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { remoteIntfName }, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Checks that the finder method on the entity home class follows the EJB 1.1 specification.
-	 * Section: 9.2.8
-	 */
-	public void validateFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return;
-		}
-
-		// The return type for a find<METHOD> method must be the entity bean's remote 
-		// interface type (for a single-object finder), or a collection thereof (for a 
-		// multi-object finder).
-		//
-		// Whether or not the parameter is a type or an array of types, the following
-		// call will return the base type. i.e., if it's an array of "MyClass",
-		// the returnTypeName will be set to "MyClass", not an array type.
-		validateFindMethod_remoteDep(vc, bean, clazz, method);
-
-		// The throws clause of a finder method must include the javax.ejb.FinderException. 
-		if (!ValidationRuleUtility.throwsFinderException(bean, method)) {
-			String[] msgParm = { ITypeConstants.CLASSNAME_JAVAX_EJB_FINDEREXCEPTION };
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2414, IEJBValidationContext.ERROR, bean, clazz, method, msgParm, this);
-			vc.addMessage(message);
-		}
-
-		// The home interface must always include the findByPrimaryKey method, which is 
-		// always a single-object finder. The method must declare the primary key class 
-		// as the method argument.
-		boolean validateRMIParameters = true; // should the parameters be validated to see if they follow RMI-IIOP rules?
-		boolean validateRMIRetType = true; // should the return type be validated to see if it follows RMI-IIOP rules?
-		if (method.getName().equals(IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY)) {
-			// - The home interface must always include the findByPrimaryKey method, which is 
-			// always a single-object finder. The method must declare the primary key class 
-			// as the method argument.
-			//
-			// The findByPrimaryKey method is always a single-object finder.
-			// The call to validateFindByPrimaryKeyMethod_remoteDep is done in
-			// validateFindMethod_remoteDep(method);
-			//validateFindByPrimaryKeyMethod_remoteDep(method);
-
-			// The method must declare the primary key class as the method argument.
-			validateFindByPrimaryKeyMethod_keyDep(vc, bean, clazz, method);
-
-			if(ValidationRuleUtility.usesUnknownPrimaryKey(bean)) {
-				validateRMIParameters = false;
-			}
-		}
-					
-		// The methods defined in this interface must follow the rules for RMI-IIOP. 
-		// This means that their argument and return types must be of valid types for 
-		// RMI-IIOP, and that their throws clause must include the java.rmi.RemoteException.
-		// However, the return type of "Enumeration" or "Collection" is exempted from this
-		// check, because the spec states, in 9.1.8.2, that Enumeration or Collection must be returned
-		// for multi-object finders.
-		JavaHelpers retType = method.getReturnType();
-		validateRMIRetType = !((ValidationRuleUtility.isAssignableFrom(retType, ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_ENUMERATION, bean))) || 
-								(ValidationRuleUtility.isAssignableFrom(retType, ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION, bean))));
-		
-		if(validateRMIParameters) {
-			validateLegalRMIMethodArguments(vc, bean, clazz, method);
-		}
-		
-		if(validateRMIRetType) {
-			validateLegalRMIMethodReturnType(vc, bean, clazz, method);
-		}
-		
-		validateLegalRMIMethodExceptions(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * Checks that the finder method on the entity home class follows the EJB 1.1 specification.
-	 * Section: 9.2.8
-	 */
-	public void validateFindMethod_remoteDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return;
-		}
-
-		// The return type for a find<METHOD> method must be the entity bean's remote 
-		// interface type (for a single-object finder), or a collection thereof (for a 
-		// multi-object finder).
-		//
-		// Whether or not the parameter is a type or an array of types, the following
-		// call will return the base type. i.e., if it's an array of "MyClass",
-		// the returnTypeName will be set to "MyClass", not an array type.
-		JavaClass remoteIntf = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remoteIntf);
-
-		// Perform this check for all finders but the findByPrimaryKey method.
-		// The findByPrimaryKey method must return the remote interface, because the method is
-		// a single-object finder method; but other finders may return a Collection or Enumeration.
-		if (!method.getName().equals(IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY)) {
-			JavaHelpers returnType = method.getReturnType();
-			
-			if (! (ValidationRuleUtility.isAssignableFromCollection(returnType, bean) || 
-			       ValidationRuleUtility.isAssignableFromEnumeration(returnType, bean) || 
-			       ValidationRuleUtility.isAssignableFrom(returnType, remoteIntf))) {
-				String[] msgParm = { remoteIntf.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2403, IEJBValidationContext.WARNING, bean, clazz, method, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-
-		// The home interface must always include the findByPrimaryKey method, which is 
-		// always a single-object finder. The method must declare the primary key class 
-		// as the method argument.
-		if (method.getName().equals(IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY)) {
-			validateFindByPrimaryKeyMethod_remoteDep(vc, bean, clazz, method);
-		}
-	}
-
-	public void validateMatchingBeanCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		super.validateMatchingBeanCreateMethod(vc, bean, clazz, method);
-		JavaClass beanClass = bean.getEjbClass();
-		Method ejbCreateMethod = ValidationRuleUtility.getMethodExtended(beanClass, method, IMethodAndFieldConstants.METHODNAME_EJBCREATE);
-		if (ejbCreateMethod == null) {
-			// already reported in super
-			return;
-		}
-	}
-	
-	/**
-	 * Checks that the finder method on the entity home class follows the EJB 1.1 specification.
-	 * Section: 9.2.8
-	 */
-	public void validateMatchingBeanFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method homeMethod) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		if (homeMethod == null) {
-			return;
-		}
-
-		// Each finder method must be named "find<METHOD>" (e.g. findLargeAccounts), and it
-		// must match one of the ejbFind<METHOD> methods defined in the entity bean class 
-		// (e.g. ejbFindLargeAccounts). The matching ejbFind<METHOD> method must have the 
-		// same number and types of arguments. (Note that the return type may be different.)
-		String findMethodName = IMethodAndFieldConstants.PREFIX_EJBF + (homeMethod.getName()).substring(1); // e.g. if the home method is named findX, then the bean method will be named ejbFindX
-
-		JavaClass beanClass = bean.getEjbClass();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, beanClass);
-
-		Method beanMethod = ValidationRuleUtility.getMethodExtended(beanClass, homeMethod, findMethodName);
-		if (beanMethod == null) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2030, IEJBValidationContext.ERROR, bean, clazz, homeMethod, new String[] { beanClass.getName()}, this);
-			vc.addMessage(message);
-			return;
-		}
-
-		// Check if return types match
-		vc.terminateIfCancelled();
-		JavaHelpers homeRetType = homeMethod.getReturnType();
-		JavaHelpers beanRetType = beanMethod.getReturnType();
-		if (!ValidationRuleUtility.isAssignableFrom(homeRetType, beanRetType)) {
-			// emit the error only if it's a multi-finder. Single-finders are supposed to have different return types on the home & bean class.
-			boolean homeRetTypeIsRemote = ValidationRuleUtility.isAssignableFrom(homeRetType, bean.getRemoteInterface());
-			boolean beanRetTypeIsKey = ValidationRuleUtility.isAssignableFrom(beanRetType, ((Entity)bean).getPrimaryKey());
-			if(!(homeRetTypeIsRemote && beanRetTypeIsKey)) {
-				JavaHelpers retType = (beanRetTypeIsKey) ? bean.getRemoteInterface() : beanRetType; // if the bean class returns a key, the home must return the remote; if the bean class returns a Coll/Enum, the home must return the same
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2415, IEJBValidationContext.ERROR, bean, clazz, homeMethod, new String[] { retType.getJavaName(), beanClass.getName()}, this);
-				vc.addMessage(message);
-			}
-		}
-
-		// All the exceptions defined in the throws clause of an ejbFind method of the 
-		// entity bean class must be included in the throws clause of the matching find
-		// method of the home interface.
-		/*
-		// Don't check for the exceptions here - let the bean class do it. When the home
-		// changes, a "dependent" validation of the bean's checks should be done automatically.
-		// If it is checked in this method as well, there are duplicate messages on the task list.
-		HashSet exceptions = getNotSubsetExceptions(homeMethod, beanMethod);
-		if(exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while(iterator.hasNext()) {
-				JavaClass exc = (JavaClass)iterator.next();
-				String[] msgParm = {exc.getQualifiedName()};
-				addValidationMessage(IEJBValidationContext.ERROR, IMessagePrefixEjb11Constants.EJB_METHOD_THROW_NOTHI_EXCEP, msgParm, beanMethod, EJB_BEAN_GROUP);
-			}
-		}	
-		*/
-	}
-	
-	/**
-	 * Checks that the create method on the entity home has a matching ejbCreate and ejbPostCreate on the bean.
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	public void validateMatchingBeanPostCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method homeMethod) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		if (homeMethod == null) {
-			return;
-		}
-
-		// Each create method must be named "create", and it must match one of the 
-		// ejbCreate methods defined in the enterprise Bean class. The matching 
-		// ejbCreate method must have the same number and types of its arguments. 
-		// (Note that the return type is different.)
-		JavaClass beanClass = bean.getEjbClass();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, beanClass);
-
-		Method beanMethod = ValidationRuleUtility.getMethodExtended(beanClass, homeMethod, IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE);
-		if (beanMethod == null) {
-			// Let the bean class report this message. Otherwise, when the bean class reports it, this message looks like a duplicate.
-			/*
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2031, IEJBValidationContext.WARNING, bean, clazz, homeMethod, new String[] { beanClass.getName()}, this);
-			vc.addMessage(message);
-			*/
-			return;
-		}
-
-		// All the exceptions defined in the throws clause of the matching ejbCreate 
-		// and ejbPostCreate methods of the enterprise Bean class must be included in 
-		// the throws clause of the matching create method of the home interface 
-		// (i.e the set of exceptions defined for the create method must be a superset
-		// of the union of exceptions defined for the ejbCreate and ejbPostCreate methods)
-		/*
-		// Don't check for the exceptions here - let the bean class do it. When the home
-		// changes, a "dependent" validation of the bean's checks should be done automatically.
-		// If it is checked in this method as well, there are duplicate messages on the task list.
-		HashSet exceptions = getNotSubsetExceptions(homeMethod, beanMethod);
-		if(exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while(iterator.hasNext()) {
-				JavaClass exc = (JavaClass)iterator.next();
-				String[] msgParm = {exc.getQualifiedName()};
-				addValidationMessage(IEJBValidationContext.ERROR, IMessagePrefixEjb11Constants.EJB_METHOD_THROW_NOTHI_EXCEP, msgParm, beanMethod, EJB_BEAN_GROUP);
-			}
-		}
-		*/
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	protected void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		// - The home interface must always include the findByPrimaryKey method, which is 
-		// always a single-object finder. The method must declare the primary key class 
-		// as the method argument.
-		if (findByPKMethods.size() == 0) {
-			// must have one findByPrimaryKey method
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2011, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-		/*
-		// Not sure if this check is useful or not, because it is legal for a child home to declare a findByPrimaryKey,
-		// and also for a parent home to declare a findByPrimaryKey.
-		else if ( findByPKMethods.size() > 1 ) {
-			// if the home interface has multiple findByPrimaryKey methods (implied by 9.2.8)
-			Iterator iterator = findByPKMethods.iterator();
-			while(iterator.hasNext()) {
-				addValidationMessage(IEJBValidationContext.WARNING, IMessagePrefixEjb11Constants.EJB_HAS_MULTIPLE_PK_METHODS, (Method)iterator.next());
-			}
-		}
-		*/
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateHome.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateHome.java
deleted file mode 100644
index df303bd4d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateHome.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks home classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section: 6.8, 6.10.6 and 9.2.8
- */
-public abstract class AValidateHome extends AValidateEJB {
-	public final Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-
-		return ((EnterpriseBean)parent).getHomeInterface();
-	}
-
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// A home or component class needs the following classes' extended methods:
-		//    1. bean class
-		List[] result = new List[1];
-		JavaClass beanClass = bean.getEjbClass();
-		if(beanClass == null) {
-			result[0] = null;
-		}
-		else {
-			result[0] = beanClass.getMethodsExtended();
-		}
-		return result;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a home or component's field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-	/**
-	 * For the check that the ejbCreate method has a matching create method on the home,
-	 * this method, given the bean method, returns the corresponding home method.
-	 * EJB 1.1 specification
-	 * Section: 6.10.6 and 9.2.8
-	 */
-	public Method getMatchingBeanEjbCreateMethodExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (method == null) {
-			return null;
-		}
-
-		if (bean == null) {
-			return null;
-		}
-
-		return ValidationRuleUtility.getMethodExtended(bean.getEjbClass(), method, IMethodAndFieldConstants.METHODNAME_EJBCREATE);
-	}
-	
-	/**
-	 * Return true if the method can, and should, be validated.
-	 * Filter out faulty methods (i.e., null), and methods which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws InvalidInputException {
-		if (super.isValid(vc, bean, clazz, method, methodsExtendedList)) {
-			// Exclude root remote interface methods
-			if (ValidationRuleUtility.isEJBHomeMethod(bean, method)) {
-				return false;
-			}
-			else if (ValidationRuleUtility.isClinitMethod(bean, method)) {
-				return false;
-			}
-			else {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.10.6 and 9.2.8
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		// home interface must be an interface
-		if (!clazz.isInterface()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2012, IEJBValidationContext.ERROR, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		// home interface must inherit javax.ejb.EJBHome.class
-		if (!ValidationRuleUtility.isAssignableFrom(clazz, ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBHOME, bean))) {
-			String[] msgParm = { ITypeConstants.CLASSNAME_JAVAX_EJB_EJBHOME };
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2017, IEJBValidationContext.ERROR, bean, clazz, msgParm, this);
-			vc.addMessage(message);
-		}
-
-		if (ValidationRuleUtility.isUnnamedPackage(clazz.getJavaPackage())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2041, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		validateAppendixB(vc, bean, clazz);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.8 and 6.10.6
-	 */
-	protected void validateCreateMethod_beanDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (method == null) {
-			return;
-		}
-
-		// Each create method must be named "create", and it must match one of 
-		// the ejbCreate methods defined in the session bean class. The matching 
-		// ejbCreate method must have the same number and types of arguments. 
-		// (Note that the return type is different.)
-		// All the exceptions defined in the throws clause of an ejbCreate method 
-		// of the session bean class must be defined in the throws clause of the 
-		// matching create method of the home interface.
-		// The throws clause must include javax.ejb.CreateException.
-		validateMatchingBeanCreateMethod(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.8, 6.10.6 and 9.2.8
-	 */
-	protected void validateCreateMethod_remoteDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (method == null) {
-			return;
-		}
-
-		JavaClass remoteIntf = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remoteIntf);
-
-		// The return type for a create method must be the remote interface type.
-		if (!ValidationRuleUtility.isAssignableFrom(method.getReturnType(), remoteIntf)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2402, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { remoteIntf.getName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.10.6 and 9.2.8
-	 */
-	public void validateMatchingBeanCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		if (method == null) {
-			return;
-		}
-
-		// Each create method must be named "create", and it must match one of the 
-		// ejbCreate methods defined in the enterprise Bean class. The matching 
-		// ejbCreate method must have the same number and types of its arguments. 
-		// (Note that the return type is different.)
-		JavaClass beanClass = bean.getEjbClass();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, beanClass);
-
-		Method ejbCreateMethod = ValidationRuleUtility.getMethodExtended(beanClass, method, IMethodAndFieldConstants.METHODNAME_EJBCREATE);
-		if (ejbCreateMethod == null) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2026, IEJBValidationContext.ERROR, bean, clazz, method, new String[] { beanClass.getName()}, this);
-			vc.addMessage(message);
-			return;
-		}
-
-		// Section 6.10.6 (session), 9.2.8 (entity), declare that all exceptions declared
-		// on the ejbCreate, ejbPostCreate methods must be defined in the throws clause of
-		// the matching create of the home interface.
-		/*
-		// Don't check for the exceptions here - let the bean class do it. When the home
-		// changes, a "dependent" validation of the bean's checks should be done automatically.
-		// If it is checked in this method as well, there are duplicate messages on the task list.
-		HashSet exceptions = getNotSubsetExceptions(method, ejbCreateMethod);
-		if(exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while(iterator.hasNext()) {
-				JavaClass exc = (JavaClass)iterator.next();
-				String[] msgParm = {exc.getQualifiedName()};
-				addValidationMessage(IEJBValidationContext.ERROR, IMessagePrefixEjb11Constants.EJB_METHOD_THROW_NOTHI_EXCEP, msgParm, ejbCreateMethod, EJB_HOME_GROUP); // since we're adding the message to the bean class, we need to mark it like the bean class would; i.e., a home-dependent message
-			}
-		}
-		*/
-	}
-	
-	protected void validateAppendixB(IEJBValidationContext vc, EnterpriseBean bean, JavaClass thisHome) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		
-		if(bean == null) {
-			// bean has no supertype
-			return;
-		}
-		EnterpriseBean	supertype = getSuperType(bean);
-		JavaClass parentHome = null;
-		if (supertype != null) {
-			// check this CMP's supertype
-			parentHome = supertype.getHomeInterface();
-
-			// Home a Xchild of parent Home
-			// In our EJB component inheritance structure, while it is legal for
-			// a home to inherit from another home, (section B.2), it is not legal
-			// for WSA component inheritance structure. 
-			try {
-				ValidationRuleUtility.isValidType(thisHome);
-				ValidationRuleUtility.isValidType(parentHome);
-				if (ValidationRuleUtility.isAssignableFrom(thisHome, parentHome)) {
-					String[] msgParm = new String[] { thisHome.getQualifiedName(), parentHome.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2104, IEJBValidationContext.ERROR, bean, thisHome, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { e.getJavaClass().getQualifiedName(), bean.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2849, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateKeyClass.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateKeyClass.java
deleted file mode 100644
index c2bbb70b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateKeyClass.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks entity key classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section 9.2.9
-*/
-public abstract class AValidateKeyClass extends AValidateEJB {
-	public Object getTarget(Object parent, Object clazz) {
-		if (parent == null) {
-			return null;
-		}
-
-		return ((Entity) parent).getPrimaryKey();
-	}
-
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a key class' method is defined on another class 
-		// of the bean.
-		return null;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a key class' field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-	/**
-	 * Return true if the method can, and should, be validated.
-	 * Filter out faulty methods (i.e., null), and methods which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws InvalidInputException {
-		if (super.isValid(vc, bean, clazz, method, methodsExtendedList)) {
-			// exclude root object methods
-			if (!ValidationRuleUtility.isJavaLangObjectMethod(bean, method)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.9
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		validateLegalRMIType(vc, bean, clazz);
-
-		if (ValidationRuleUtility.isUnnamedPackage(clazz.getJavaPackage())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2041, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Verifies that a given class is a legal Value Type in RMI-IIOP.
-	 *
-	 * Java Remote MethodInvocation
-	 * Specification
-	 *
-	 * Revision 1.7, Java 2 SDK, Standard Edition, v1.3.0, December 1999
-	 *
-	 * Section: 2.6
-	 */
-	public final void validateLegalRMIType(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		ValidationRuleUtility.isValidType(clazz);
-
-		if (!ValidationRuleUtility.isLegalRMI_IIOPType(bean, clazz)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2019, IEJBValidationContext.INFO, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.9
-	 */
-	public void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		// The class must provide suitable implementation of the hashCode() and 
-		// equals(Object other) methods to simplify the management of the primary keys 
-		// by client code.
-		Method hashCodeMethod = ValidationRuleUtility.getMethodExtended(clazz, IMethodAndFieldConstants.METHODNAME_HASHCODE, new JavaHelpers[0]);
-		if ((hashCodeMethod == null) || ValidationRuleUtility.isJavaLangObjectMethod(bean, hashCodeMethod)) {
-			// EJB 1.0 did not require this method, so this is a warning instead of an error.
-			String[] msgParm = { clazz.getQualifiedName(), IMethodAndFieldConstants.METHODSIGNATURE_HASHCODE};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2001, IEJBValidationContext.WARNING, bean, clazz, msgParm, this);
-			vc.addMessage(message);
-		}
-
-		Method equalsMethod = ValidationRuleUtility.getMethodExtended(clazz, IMethodAndFieldConstants.METHODNAME_EQUALS, new JavaHelpers[]{ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, bean)});
-		if ((equalsMethod == null) || (ValidationRuleUtility.isJavaLangObjectMethod(bean, equalsMethod))) {
-			// EJB 1.0 did not require this method, so this is a warning instead of an error.
-			String[] msgParm = { clazz.getQualifiedName(), IMethodAndFieldConstants.METHODSIGNATURE_EQUALS };
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2001, IEJBValidationContext.WARNING, bean, clazz, msgParm, this);
-			vc.addMessage(message);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateRemote.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateRemote.java
deleted file mode 100644
index d1f3bd3ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateRemote.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks remote interface classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- * The checks for a session remote interface and an entity remote interface are the same
- * in EJB 1.1.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section: 6.10.5 and 9.2.7
- */
-public abstract class AValidateRemote extends AValidateEJB {
-	public final Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-
-		return ((EnterpriseBean)parent).getRemoteInterface();
-	}
-
-	public final List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz)  {
-		// A home or component class needs the following classes' extended methods:
-		//    1. bean class
-		List[] result = new List[1];
-		JavaClass beanClass = bean.getEjbClass();
-		if(beanClass == null) {
-			result[0] = null;
-		}
-		else {
-			result[0] = beanClass.getMethodsExtended();
-		}
-		return result;
-	}
-	
-	public final List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Never check that a home or component's field is defined on another class
-		// of the bean.
-		return null;
-	}
-	
-	/**
-	 * Return true if the method can, and should, be validated.
-	 * Filter out faulty methods (i.e., null), and methods which
-	 * belong to the base type, whatever that is. (e.g. java.lang.Object)
-	 */
-	protected boolean isValid(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws InvalidInputException {
-		if (super.isValid(vc, bean, clazz, method, methodsExtendedList)) {
-			// Exclude root remote interface methods 
-			if (ValidationRuleUtility.isEJBObjectMethod(bean, method)) {
-				return false;
-			}
-			else if (isEjbRelationshipRoleMethod(vc, bean, clazz, method)) {
-				return false;
-			}
-			else if (ValidationRuleUtility.isClinitMethod(bean, method)) {
-				return false;
-			}
-			else {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Check the remote interface's methods against the EJB 1.1 spec.
-	 * Section: 6.10.5 and 9.2.7
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method riMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		// super.validateExistence(riMethod);
-
-		vc.terminateIfCancelled();
-
-		// The methods defined in this interface must follow the rules for RMI/IIOP.
-		validateLegalRMIMethod(vc, bean, clazz, riMethod);
-
-		// For each method defined in the remote interface, there must be a matching
-		// method in the session bean's class. 
-		validateMethod_beanDep(vc, bean, clazz, riMethod);
-
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		//There are no required methods.
-	}
-	
-	/**
-	 * Check that the remote interface class definition follows the EJB 1.1 spec.
-	 *
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * URL: http://java.sun.com/products/ejb/docs.html
-	 * Section: 6.10.5 and 9.2.7
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		// It must be an interface, not a class.
-		if (!clazz.isInterface()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2012, IEJBValidationContext.ERROR, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		// The interface must extend the javax.ejb.EJBObject interface.
-		JavaHelpers javaxEjbObject = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBOBJECT, bean);
-		if (!ValidationRuleUtility.isAssignableFrom(clazz, javaxEjbObject)) {
-			String[] msgParm = { ITypeConstants.CLASSNAME_JAVAX_EJB_EJBOBJECT };
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2017, IEJBValidationContext.ERROR, bean, clazz, msgParm, this);
-			vc.addMessage(message);
-		}
-
-		if (ValidationRuleUtility.isUnnamedPackage(clazz.getJavaPackage())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2041, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-
-		validateAppendixB(vc, bean, clazz);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.10.5 and 9.2.7
-	 */
-	public void validateMatchingBeanMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method remoteMethod) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		if (remoteMethod == null) {
-			return;
-		}
-
-		JavaClass beanClass = bean.getEjbClass();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, beanClass);
-
-		Method beanMethod = ValidationRuleUtility.getMethodExtended(beanClass, remoteMethod, remoteMethod.getName());
-		if (beanMethod == null) {
-			String[] msgParm = { beanClass.getName()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2023, IEJBValidationContext.ERROR, bean, clazz, remoteMethod, msgParm, this);
-			vc.addMessage(message);
-			return;
-		}
-
-		ValidationRuleUtility.isValidType(ValidationRuleUtility.getType(remoteMethod.getReturnType()));
-
-		try {
-			ValidationRuleUtility.isValidType(ValidationRuleUtility.getType(beanMethod.getReturnType()));
-		}
-		catch (InvalidInputException e) {
-			// Let the validation of the bean class report the reflection warning.
-			// Don't do any validation based on that method.
-			return;
-		}
-
-		// Check if return types match
-		vc.terminateIfCancelled();
-		if (!ValidationRuleUtility.isAssignableFrom(remoteMethod.getReturnType(), beanMethod.getReturnType())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2415, IEJBValidationContext.ERROR, bean, clazz, remoteMethod, new String[] { beanMethod.getReturnType().getJavaName(), beanClass.getName()}, this);
-			vc.addMessage(message);
-		}
-
-
-		// Section 6.10.5 (session), 9.2.7 (entity), declare that all exceptions declared
-		// on the ejbCreate, ejbPostCreate methods must be defined in the throws clause of
-		// the matching create of the remote interface.
-		/*
-		// Don't check for the exceptions here - let the bean class do it. When the remote
-		// changes, a "dependent" validation of the bean's checks should be done automatically.
-		// If it is checked in this method as well, there are duplicate messages on the task list.
-		HashSet exceptions = getNotSubsetExceptions(remoteMethod, beanMethod);
-		if(exceptions.size() > 0) {
-			Iterator iterator = exceptions.iterator();
-			while(iterator.hasNext()) {
-				JavaClass exc = (JavaClass)iterator.next();
-				String[] msgParm = {exc.getQualifiedName()};
-				addValidationMessage(IEJBValidationContext.ERROR, IMessagePrefixEjb11Constants.EJB_METHOD_THROW_NOTRI_EXCEP, msgParm, beanMethod, EJB_BEAN_GROUP);
-			}
-		}	
-		*/
-	}
-	
-	/**
-	 * Check the remote interface's methods against the EJB 1.1 spec.
-	 * Section: 6.10.5 and 9.2.7
-	 */
-	public void validateMethod_beanDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method riMethod) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		// For each method defined in the remote interface, there must be a matching
-		// method in the session bean's class. 
-		validateMatchingBeanMethod(vc, bean, clazz, riMethod);
-	}
-	
-	/**
-	 * Final check to see if required methods were detected.
-	 */
-	protected void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		//There are no required methods.
-	}
-
-	protected void validateAppendixB(IEJBValidationContext vc, EnterpriseBean bean, JavaClass thisRemote) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		if(bean == null) {
-			return;
-		}
-		EnterpriseBean supertype = getSuperType(bean);
-		JavaClass parentRemote = null;
-		if (supertype != null) {
-			parentRemote = supertype.getRemoteInterface();
-
-			// Remote a Xchild of parent Remote
-			try {
-				ValidationRuleUtility.isValidType(thisRemote);
-				ValidationRuleUtility.isValidType(parentRemote);
-				if (!ValidationRuleUtility.isAssignableFrom(thisRemote, parentRemote)) {
-					String[] msgParm = new String[] { thisRemote.getQualifiedName(), parentRemote.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2105, IEJBValidationContext.ERROR, bean, thisRemote, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { e.getJavaClass().getQualifiedName(), bean.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2849, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidationRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidationRule.java
deleted file mode 100644
index 08d5d7b38..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidationRule.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-
-/**
- * @version 1.0
- * @author
- */
-public abstract class AValidationRule implements IValidationRule {
-
-    private Set _dependents = null;
-
-    protected EjbModuleExtensionHelper modHelper = null;
-
-    /*
-     * @see IValidationRule#addDependent(IValidationRule)
-     */
-    public void addDependent(IValidationRule rule) {
-        if (rule == null) { return; }
-
-        if (_dependents == null) {
-            _dependents = new HashSet();
-        }
-
-        _dependents.add(rule);
-    }
-
-    /*
-     * @see IValidationRule#getDependents()
-     */
-    public Set getDependents() {
-        return _dependents;
-    }
-
-    protected EjbModuleExtensionHelper getEjbExtensionHelper(Object context) {
-        return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(context);
-    }
-
-    /**
-     * @param EnterpriseBean
-     * @return EnterpriseBean return the super type of an EnterpriseBean by
-     *         loading the extnension plugin if extension plugin fails to load
-     *         return null
-     */
-    public final EnterpriseBean getSuperType(EnterpriseBean enterpriseBean) {
-        EnterpriseBean superType = null;
-        EjbModuleExtensionHelper aModHelper = getEjbExtensionHelper(enterpriseBean);
-        if (aModHelper != null) superType = aModHelper.getSuperType(enterpriseBean);
-        return superType;
-    }
-
-    /**
-     * @param EnterpriseBean
-     * @return String - super type file name return the super type file of an
-     *         EnterpriseBean by loading the extnension plugin if extension
-     *         plugin fails to load return null
-     */
-    public final String getEJBInheritanceFileName() {
-        String superTypeFileName = null;
-        // TODO MDE Revisit this after the drop
-        EjbModuleExtensionHelper aModHelper = getEjbExtensionHelper(null);
-        if (aModHelper != null) superTypeFileName = aModHelper.getEJBInheritanceFileName();
-        return superTypeFileName;
-    }
-
-    /**
-     * @param EnterpriseBean
-     * @return List - extended role names return the extended role method name
-     *         of an EnterpriseBean by loading the extnension plugin if
-     *         extension plugin fails to load return null
-     */
-    public final List getRoleMethodNamesExtended(EnterpriseBean enterpriseBean) {
-        List roleNameExtended = null;
-        EjbModuleExtensionHelper aModHelper = getEjbExtensionHelper(enterpriseBean);
-        if (aModHelper != null && enterpriseBean.isContainerManagedEntity())
-                roleNameExtended = aModHelper.getRoleMethodNamesExtended((ContainerManagedEntity) enterpriseBean);
-        return roleNameExtended;
-    }
-
-    /*
-     * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-     */
-    public void preValidate(IEJBValidationContext vc, Object targetParent, Object target)
-            throws ValidationCancelledException, ValidationException {
-        // By default, allocate nothing.
-    }
-
-    /*
-     * @see IValidationRule#postValidate(IEJBValidationContext, Object, Object)
-     */
-    public void postValidate(IEJBValidationContext vc, Object targetParent, Object target)
-            throws ValidationCancelledException, ValidationException {
-        // By default, assume that nothing was allocated in preValidate.
-    }
-
-    /*
-     * @see IValidationRule#reset()
-     */
-    public void reset() {
-        // By default, assume that nothing needs to be reset
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java
deleted file mode 100644
index 47f92a055..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Abstract class for EJB Validation rules
- */
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-
-/**
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public abstract class AbstractEJBValidationRuleFactory {
-
-    /**
-     * 
-     */
-    public AbstractEJBValidationRuleFactory() {
-		//Default
-    }
-
-    protected HashMap _ruleList = null;
-
-    public void release(IValidationRule rule) {
-    	if(rule == null) {
-    		return;
-    	}
-    	
-    	// Since we don't put a lock on the rule when it's checked out via getRule(Object),
-    	// there's nothing to do other than reset the rule to prepare it for reuse.
-    	rule.reset();
-    }
-
-    protected Iterator addDependentRuleToRuleList() {
-    	Iterator iterator = _ruleList.values().iterator();
-    	while(iterator.hasNext()) {
-    		IValidationRule rule = (IValidationRule)iterator.next();
-    		Object[] ids = rule.getDependsOn();
-    		if(ids == null) {
-    			continue;
-    		}
-    		
-    		for(int i=0; i<ids.length; i++) {
-    			IValidationRule dRule = (IValidationRule)_ruleList.get(ids[i]);
-    			if(dRule != null) {
-    				dRule.addDependent(rule);
-    			}
-    		}
-    	}
-    	return iterator;
-    }
-
-    protected void logAllDependentRules() {
-    	Iterator iterator;
-    	Logger logger = getMsgLogger();
-    	if (logger.isLoggingLevel(Level.FINEST)) {
-    		iterator = _ruleList.values().iterator();
-    		Iterator depIterator = null;
-    		while(iterator.hasNext()) {
-    			IValidationRule rule = (IValidationRule)iterator.next();
-    			Set dependents = rule.getDependents();
-    			StringBuffer buffer = new StringBuffer();
-    			buffer.append("list of dependents for rule:"); //$NON-NLS-1$
-    			buffer.append(rule.getClass().getName());
-    			buffer.append("\n"); //$NON-NLS-1$
-    			if(dependents != null) {
-    				depIterator = dependents.iterator();
-    				while(depIterator.hasNext()) {
-    					IValidationRule dRule = (IValidationRule)depIterator.next();
-    					buffer.append("\t"); //$NON-NLS-1$
-    					buffer.append(dRule.getClass().getName());
-    					buffer.append("\n"); //$NON-NLS-1$
-    				}
-    			}
-    			buffer.append("\n"); //$NON-NLS-1$
-    			logger.write(Level.FINEST, buffer.toString());
-    		}
-    	}
-    }
-
-    /**
-     * @return
-     */
-    protected abstract Logger getMsgLogger();
-
-    protected EJBJar getEJBJar(IEJBValidationContext vc) {
-    	return (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-    }
-
-    /**
-     * This method will return the identified IValidationRule.
-     * If the ruleid is not registered, or if there is a problem
-     * instantiating the IValidationRule, then null will be returned.
-     */
-    public IValidationRule getRule(IEJBValidationContext vc, Object ruleId) {
-    	// To avoid loading a rule until it is needed, intialize
-    	// the list with a rule id as the key, and a String class name
-    	// as a value. When a rule is loaded, if the value is a String,
-    	// then the IValidationRule has not been instantiated. Create an
-    	// instance and store that in place of the String. If the value
-    	// is already an IValidationRule instance, return it.
-    	
-    	Object rule = _ruleList.get(ruleId);
-    	if(rule == null) {
-    		// No such ruleId registered.
-    		Logger logger = vc.getMsgLogger();
-    		if (logger != null && logger.isLoggingLevel(Level.FINE)) {
-    			logger.write(Level.FINE, "Cannot load rule from ruleId: " + ruleId); //$NON-NLS-1$
-    		}
-    		return null;
-    	}
-    	
-    	return (IValidationRule)rule;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidator.java
deleted file mode 100644
index 4b0a705d0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidator.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 24, 2003
- * 
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.model.internal.validation;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public abstract class AbstractEJBValidator extends J2EEValidator {
-	protected Map _validated = null;
-	/**
-	 *  
-	 */
-	public AbstractEJBValidator() {
-		super();
-		_validated = new HashMap();
-	}
-	
-	private Map getValidatedMap(){
-		if( _validated == null ){
-			_validated = new HashMap();
-		}
-		return _validated;
-	}
-	
-	protected void logMissingRule(IEJBValidationContext vc, Object ruleId) {
-		Logger logger = vc.getMsgLogger();
-		if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-			logger.write(Level.SEVERE, ruleId + " = null"); //$NON-NLS-1$
-		}
-		addInternalErrorMessage(vc);
-	}
-	protected void addInternalErrorMessage(IEJBValidationContext vc) {
-			addInternalErrorMessage(vc, null);
-	}
-	
-	protected void addInternalErrorMessage(IEJBValidationContext vc, Throwable exc) {
-		IMessage mssg = vc.getMessage();
-		mssg.setId(internalErrorMessage());
-		vc.addMessage(mssg);
-		if(exc != null) {
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-				logger.write(Level.SEVERE, exc);
-			}
-		}
-	}
-	
-	protected Map removeOldMessages(IEJBValidationContext vc,Map targets) throws ValidationException {
-			if(vc.getURIs() == null) {
-				// Full validation
-				vc.removeAllMessages(); // Remove messages from the EJBJar.
-				vc.loadModel(removeOldMessagesString(), new Object[]{vc.getReporter(), null}); // Remove messages from any EJB client JAR files or Java Utility JAR files.
-				return null;
-			}
-			preRemoveOldMessages(vc,targets); // Get the list of targets to be validated, and remove messages from all of them.
-
-			// Remove the messages from all of the changed files and their dependents.
-			vc.loadModel(removeOldMessagesString(), new Object[]{vc.getReporter(), targets});
-			return targets;
-		}
-	/**
-	 * @param vc
-	 * @param delta
-	 * @param targets
-	 */
-	protected void preRemoveOldMessages(IEJBValidationContext vc,Map targets) throws ValidationException {
-		//Default
-	}
-	/**
-	 * @return
-	 */
-	protected String removeOldMessagesString() {
-		return null;
-	}
-	/**
-	* @return
-	*/
-	private String internalErrorMessage() {
-			return null;
-		}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.validation.internal.core.core.IValidator#validate(org.eclipse.wst.validation.internal.core.core.IHelper,
-	 *      org.eclipse.wst.validation.internal.core.core.IReporter,
-	 *      org.eclipse.wst.validation.internal.core.core.IFileDelta[])
-	 */
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		//Default
-		super.validate(helper, reporter);
-	}
-	
-    public void run(IValidationRule rule, Object targetParent, Object target) throws ValidationException {
-    	if(isValidated(rule.getId(), targetParent, target)) {
-    		// Whether or not this is a full or incremental run, don't revalidate this target
-    		// if it has already been validated. (e.g. if a class is used by more than one bean,
-    		// and say one bean is stateless and one is stateful, and everything else about the
-    		// beans are identical, don't validate that class again.)
-    		return;
-    	}
-    	
-    	try {
-    		rule.preValidate(getValidationContext(), targetParent, target);
-    		rule.validate(getValidationContext(), targetParent, target);
-    		rule.postValidate(getValidationContext(), targetParent, target);
-    	}
-    	catch(ValidationCancelledException exc) {
-    		// Clean up the messages which are on the task list? Or is it nicer to leave them behind?
-    	}
-    	catch(ValidationException e) {
-    		throw e;
-    	}
-    	catch(Throwable exc) {
-    		addInternalErrorMessage(getValidationContext(), exc);
-    	}
-    	finally {
-    		setValidated(rule.getId(), targetParent, target);
-    		releaseRules(rule);
-    	}
-    }
-
-    /**
-     * @param rule
-     */
-    protected abstract void releaseRules(IValidationRule rule); 
-
-    private IEJBValidationContext _vc = null;
-
-    protected IEJBValidationContext getValidationContext() {
-    	return _vc;
-    }
-    protected void setValidationContext(IEJBValidationContext vc) {
-    	_vc = vc;
-    }
-	
-	/**
-	 *  This class is public only for the EJBHelper.
-	 */
-	public class TargetObject {
-		private Object _parent = null;
-		private Object _target = null;
-		
-		public TargetObject() {
-			//Default
-		}
-		
-		public Object getTargetParent() {
-			return _parent;
-		}
-		
-		public Object getTarget() {
-			return _target;
-		}
-		
-		public void setTargetParent(Object tp) {
-			_parent = tp;
-		}
-		
-		public void setTarget(Object t) {
-			_target = t;
-		}
-		
-		public int hashCode() {
-			int parent = (getTargetParent() == null) ? 0 : getTargetParent().hashCode();
-			int target = (getTarget() == null) ? 0 : getTarget().hashCode();
-			return parent + target;
-		}
-		
-		public boolean equals(Object o) {
-			if(o == null) {
-				return false;
-			}
-			
-			if(this == o) {
-				return true;
-			}
-			
-			if(!(o instanceof TargetObject)) {
-				return false;
-			}
-			
-			Object thisParent = this.getTargetParent();
-			Object oParent = ((TargetObject)o).getTargetParent();
-			Object thisTarget = this.getTarget();
-			Object oTarget = ((TargetObject)o).getTarget();
-			
-			if((thisParent == null) && (oParent == null)) {
-				// check target
-			}
-			else if((thisParent != null) && (oParent != null)) {
-				if(thisParent.equals(oParent)) {
-					// check target
-				}
-				else {
-					return false;
-				}
-			}
-			else {
-				return false;
-			}
-			
-			if((thisTarget == null) && (oTarget == null)) {
-				return true;
-			}
-			else if((thisTarget != null) && (oTarget != null)) {
-				return (thisTarget.equals(oTarget));
-			}
-			else {
-				return false;
-			}
-		}
-	}
-
-
-    public void setValidated(Object key, Object targetParent, Object target) {
-    	Set done = null;
-    	if(getValidatedMap().containsKey(key)) {
-    		done = (Set)getValidatedMap().get(key);
-    	}
-    	else {
-    		done = new HashSet();
-    	}
-    	
-    	done.add(getTargetObjectPool().getTargetObject(targetParent, target));
-    	getValidatedMap().put(key, done);
-    }
-
-
-	protected class TargetObjectPool {
-		private int _growSize = 0;
-		private Vector _pool = null;
-		
-		public TargetObjectPool(int initialSize) {
-			_growSize = initialSize;
-			_pool = new Vector(initialSize, _growSize);
-			grow();
-		}
-		
-		private void grow() {
-			for(int i=0; i<_growSize; i++) {
-				_pool.add(new TargetObject());
-			}
-		}
-		
-		public TargetObject getTargetObject(Object targetParent, Object target) {
-			if(_pool.size() <= 0) {
-				grow();
-			}
-			TargetObject obj = (TargetObject)_pool.remove(0);
-			obj.setTargetParent(targetParent);
-			obj.setTarget(target);
-			return obj;
-		}
-		
-		public void release(TargetObject obj) {
-			obj.setTargetParent(null);
-			obj.setTarget(null);
-			_pool.add(obj);
-		}
-	}
-	
-	protected abstract TargetObjectPool getTargetObjectPool();
-
-    public boolean isValidated(Object key, Object targetParent, Object target) {
-    	if(!getValidatedMap().containsKey(key)) {
-    		return false;
-    	}
-    
-    
-    	Set done = (Set)getValidatedMap().get(key);
-    	TargetObject temp = getTargetObjectPool().getTargetObject(targetParent, target);
-    	try {
-    		if(done.contains(temp)) {
-    			return true;
-    		}
-    		
-    		return false;
-    	}
-    	finally {
-    		getTargetObjectPool().release(temp);
-    	}
-    }
-    public void cleanup(IReporter reporter) {
-    	if( _validated != null ){
-	    	Iterator iterator = _validated.keySet().iterator();
-	    	while(iterator.hasNext()) {
-	    		Set done = (Set)_validated.get(iterator.next());
-	    		Iterator toIterator = done.iterator();
-	    		while(toIterator.hasNext()) {
-	    			TargetObject to = (TargetObject)toIterator.next();
-	    			getTargetObjectPool().release(to);
-	    		}
-	    		done.clear();
-	    	}
-	    	_validated.clear();
-	    	_validated = null;
-    	}
-    	setValidationContext(null);
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientMessageConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientMessageConstants.java
deleted file mode 100644
index 7e73b75a0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientMessageConstants.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-
-
-/**
- * Insert the type's description here.
- * Creation date: (4/9/2001 11:49:47 AM)
- * @author: Administrator
- */
-public interface ApplicationClientMessageConstants extends org.eclipse.jst.j2ee.model.internal.validation.J2EEMessageConstants {
-	public static final String APPCLIENT_MODEL_NAME = "APPLICATIONCLIENT_VALIDATION"; //$NON-NLS-1$
-	public static final String INVALID_DD = "INVALID_DD"; //$NON-NLS-1$
-	public static final String ERROR_EJB_REFS = "ERROR_EJB_REFS"; //$NON-NLS-1$
-	public static final String APPLICATIONCLIENT_VALIDATOR_ID = "APPLICATIONCLIENT_VALIDATOR"; //$NON-NLS-1$
-	public static final String ERROR_APPCLIENT_INVALID_APPCLIENT_FILE = "ERROR_APPLICATIONCLIENT_INVALID_APPCLIENT_FILE"; //$NON-NLS-1$
-	public static final String MESSAGE_APPCLIENT_MISSING_URI = "MESSAGE_APPCLIENT_MISSING_URI"; //$NON-NLS-1$
-	public static final String ERROR_APPCLIENT_VALIDATION_FAILED = "ERROR_APPCLIENT_VALIDATION_FAILED"; //$NON-NLS-1$
-	public static final String APPCLIENT_DD_PARSE_LINECOL = "APPCLIENT_DD_PARSE_LINECOL"; //$NON-NLS-1$
-	public static final String APPCLIENT_DD_PARSE_LINE = "APPCLIENT_DD_PARSE_LINE"; //$NON-NLS-1$
-	public static final String APPCLIENT_DD_CANNOT_OPEN_DD = "APPCLIENT_DD_CANNOT_OPEN_DD"; //$NON-NLS-1$
-	public static final String APPCLIENT_DD_PARSE_NOINFO = "APPCLIENT_DD_PARSE_NOINFO"; //$NON-NLS-1$
-	public static final String APPCLIENT_DUP_RES_ENV_REF_ERROR_ = "APPCLIENT_DUP_RES_ENV_REF_ERROR_"; //$NON-NLS-1$
-	public static final String APPCLIENT_DUP_EJB_REF_ERROR_ = "APPCLIENT_DUP_EJB_REF_ERROR_"; //$NON-NLS-1$
-	public static final String APPCLIENT_MAIN_CLASS_ERROR_ = "APPCLIENT_MAIN_CLASS_ERROR_"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientValidator.java
deleted file mode 100644
index bb5740614..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientValidator.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ValidateXmlCommand;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-
-/**
- * Validates the applicatin-client.xml
- */
-public class ApplicationClientValidator extends J2EEValidator implements ApplicationClientMessageConstants {
-	protected ApplicationClientFile appClientFile;
-	protected ApplicationClient appClientDD;
-	
-	/**
- 	 * ApplicationClientValidator constructor comment.
- 	 */
-	public ApplicationClientValidator() {
-		super();
-	}// ApplicationClientValidator
-	
-	/**
- 	 * <p>Answer the id of the resource bundle which is
- 	 * used by the receiver.</p>
- 	 */
-	public String getBaseName() {
-		return APLICATIONCLIENT_CATEGORY;
-	}// getBaseName
-	
-	/**
-	 *  XML Validator now handles validation of Deployment Descriptor
-	 * 
-	 * @throws ValidationException
-	 */
-	public void validate() throws ValidationException {
-	  validateMainClassInManifest();
-	}// validate
-
-	protected void validateMainClassInManifest() {
-
-		if (appClientFile != null && appClientFile.getManifest() != null) {
-			String mainClass = appClientFile.getManifest().getMainClass();
-			if (mainClass == null || mainClass.length() == 0) {
-				Object target = getManifestTarget();
-				addError(getBaseName(), APPCLIENT_MAIN_CLASS_ERROR_, new String[0], target);
-			}
-		}
-	}	
-	
-	protected Object getManifestTarget() {
-		return null;
-	}
-	/**
-	 * Does the validation.
-	 * 
-	 * @throws ValidationException
-	 */
-	public void validate(IValidationContext inHelper, IReporter inReporter)
-	  throws ValidationException {
-		
-		validateInJob(inHelper, inReporter);
-	}// validate
-	/**
-	 * Creates the validate xml command.
-	 * 
-	 * @return Command
-	 */	
-	public Command createValidateXMLCommand() {
-		Command cmd = new ValidateXmlCommand(appClientFile);
-		return cmd;
-	}// createValidateXMLCommand
-	
-	/**
-	 * Gets the appClientFile.
-	 * 
-	 * @return ApplicationClientFile
-	 */
-	public ApplicationClientFile getAppClientFile() {
-		return appClientFile;
-	}// getAppClientFile
-
-	/**
-	 * Sets the appClientFile.
-	 * 
-	 * @param ApplicatonClientFile appClientFile - The appClientFile to set
-	 */
-	public void setAppClientFile(ApplicationClientFile appClientFile) {
-		this.appClientFile = appClientFile;
-	}// setAppClientFile
-
-	/**
-	 * Gets the appClientDD.
-	 * 
-	 * @return ApplicationClient
-	 */
-	public ApplicationClient getAppClientDD() {
-		return appClientDD;
-	}// getAppClientDD
-
-	/**
-	 * Sets the appClientDD.
-	 * 
-	 * @param ApplicationClient appClientDD - The appClientDD to set
-	 */
-	public void setAppClientDD(ApplicationClient appClientDD) {
-		this.appClientDD = appClientDD;
-	}// setAppClientDD
-
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		return null;
-	}
-	
-	public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter) 
-	 		throws ValidationException {
-
-		try {
-			super.validateInJob(inHelper, inReporter);
-			_reporter.removeAllMessages(this, null); 
-			
-			setAppClientFile( (ApplicationClientFile) inHelper.loadModel(APPCLIENT_MODEL_NAME) );
-			if ( appClientFile != null ) {
-				setAppClientDD( appClientFile.getDeploymentDescriptor() );
-				validate();
-			} else {
-				IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_APPCLIENT_INVALID_APPCLIENT_FILE);
-				throw new ValidationException(errorMsg);
-			}// if
-		} catch (ValidationException ex) {
-			throw ex;
-		} catch (Exception e) {
-			IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_APPCLIENT_VALIDATION_FAILED);
-			throw new ValidationException(errorMsg, e);
-		}// try 
-		return status;
-	}
-	
-	public void cleanup(IReporter reporter) {
-		appClientDD = null;
-		appClientFile = null;
-		super.cleanup(reporter);
-	}	
-}// ApplicationClientValidator
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPBeanClassVRule.java
deleted file mode 100644
index 58607c92d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPBeanClassVRule.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class BMPBeanClassVRule extends AEntityBeanClassVRule implements IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_BMP_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_BMP_HOME, IValidationRuleList.EJB20_BMP_LOCALHOME, IValidationRuleList.EJB20_BMP_REMOTE, IValidationRuleList.EJB20_BMP_LOCAL, IValidationRuleList.EJB20_BMP_KEYCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".bb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_ENTITYBEAN};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = new long[]{LOCAL_COMPONENT_INTERFACE, REMOTE_COMPONENT_INTERFACE};
-	
-	private final boolean SHOULD_BE_ABSTRACT = false;
-	private final boolean SHOULD_BE_FINAL = false;
-	private final boolean SHOULD_BE_PUBLIC = true;
-	private final boolean SHOULD_VALIDATE_TRANSIENT_FIELD = false;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{CONSTRUCTOR_NOPARM, EJBFINDBYPRIMARYKEY, SETENTITYCONTEXT, UNSETENTITYCONTEXT_NOPARM, EJBACTIVATE_NOPARM, EJBPASSIVATE_NOPARM, EJBREMOVE_NOPARM, EJBLOAD_NOPARM, EJBSTORE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{FINALIZE_NOPARM};
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CONSTRUCTOR_NOPARM, CONSTRUCTOR, EJBCREATE, EJBPOSTCREATE, EJBHOME, FINALIZE_NOPARM, EJBFINDBYPRIMARYKEY, EJBFIND, SETENTITYCONTEXT, UNSETENTITYCONTEXT_NOPARM, EJBACTIVATE_NOPARM, EJBPASSIVATE_NOPARM, EJBREMOVE_NOPARM, EJBLOAD_NOPARM, EJBSTORE_NOPARM, FINALIZE_NOPARM, BUSINESS};
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbCreate, new String[]{CHKJ2050_ejbCreate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbFindByPrimaryKey, new String[]{CHKJ2050_ejbFindByPrimaryKey+EXT});
-		MESSAGE_IDS.put(CHKJ2050_setEntityContext, new String[]{CHKJ2050_setEntityContext+EXT});
-		MESSAGE_IDS.put(CHKJ2050_unsetEntityContext, new String[]{CHKJ2050_unsetEntityContext+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbActivate, new String[]{CHKJ2050_ejbActivate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPassivate, new String[]{CHKJ2050_ejbPassivate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbRemove, new String[]{CHKJ2050_ejbRemove+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbLoad, new String[]{CHKJ2050_ejbLoad+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbStore, new String[]{CHKJ2050_ejbStore+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbSelect, new String[]{CHKJ2050_ejbSelect+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbFind, new String[]{CHKJ2050_ejbFind+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPostCreate, new String[]{CHKJ2050_ejbPostCreate+EXT});
-
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103+SPEC});
-		
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2407, new String[]{CHKJ2407+BEXT, CHKJ2407+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2421, new String[]{CHKJ2421+BEXT, CHKJ2421+MEXT});
-		MESSAGE_IDS.put(CHKJ2422, new String[]{CHKJ2422+BEXT, CHKJ2422+MEXT});
-		MESSAGE_IDS.put(CHKJ2423, new String[]{CHKJ2423+BEXT, CHKJ2423+MEXT});
-		MESSAGE_IDS.put(CHKJ2424, new String[]{CHKJ2424+BEXT, CHKJ2424+MEXT});
-		MESSAGE_IDS.put(CHKJ2426, new String[]{CHKJ2426+BEXT, CHKJ2426+MEXT});
-		MESSAGE_IDS.put(CHKJ2427, new String[]{CHKJ2427+BEXT, CHKJ2427+MEXT});
-		MESSAGE_IDS.put(CHKJ2428, new String[]{CHKJ2428+BEXT, CHKJ2428+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2430, new String[]{CHKJ2430+BEXT, CHKJ2430+MEXT});
-		MESSAGE_IDS.put(CHKJ2431, new String[]{CHKJ2431+BEXT, CHKJ2431+MEXT});
-		MESSAGE_IDS.put(CHKJ2439, new String[]{CHKJ2439+BEXT, CHKJ2439+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2441, new String[]{CHKJ2441+BEXT, CHKJ2441+MEXT});
-		MESSAGE_IDS.put(CHKJ2442, new String[]{CHKJ2442+BEXT, CHKJ2442+MEXT});
-		MESSAGE_IDS.put(CHKJ2443, new String[]{CHKJ2443+BEXT, CHKJ2443+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2457, new String[]{CHKJ2457+BEXT, CHKJ2457+MEXT});
-		MESSAGE_IDS.put(CHKJ2458, new String[]{CHKJ2458+BEXT, CHKJ2458+MEXT});
-		MESSAGE_IDS.put(CHKJ2459, new String[]{CHKJ2459+BEXT, CHKJ2459+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2478, new String[]{CHKJ2478+BEXT, CHKJ2478+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2492, new String[]{CHKJ2492+BEXT, CHKJ2492+MEXT});
-		MESSAGE_IDS.put(CHKJ2493, new String[]{CHKJ2493+BEXT, CHKJ2493+MEXT});
-		MESSAGE_IDS.put(CHKJ2494, new String[]{CHKJ2494+BEXT, CHKJ2494+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_ejbCreate, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_ejbFind, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_finalize, new String[]{CHKJ2502_finalize+BEXT, CHKJ2502_finalize+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbCreate, new String[]{CHKJ2503_ejbCreate+BEXT, CHKJ2503_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbPostCreate, new String[]{CHKJ2503_ejbPostCreate+BEXT, CHKJ2503_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbHome, new String[]{CHKJ2503_ejbHome+BEXT, CHKJ2503_ejbHome+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbFind, new String[]{CHKJ2503_ejbFind+BEXT, CHKJ2503_ejbFind+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2505_ejbRemove, new String[]{CHKJ2505_ejbRemove+BEXT, CHKJ2505_ejbRemove+MEXT});
-		MESSAGE_IDS.put(CHKJ2505_ejbPostCreate, new String[]{CHKJ2505_ejbPostCreate+BEXT, CHKJ2505_ejbPostCreate+MEXT});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-	public final boolean shouldValidateTransientField() {
-		return SHOULD_VALIDATE_TRANSIENT_FIELD;
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-	public final boolean shouldBeAbstract(JavaClass clazz) {
-		return SHOULD_BE_ABSTRACT;
-	}
-	
-	public final boolean shouldBeFinal(JavaClass clazz) {
-		return SHOULD_BE_FINAL;
-	}
-	
-	public final boolean shouldBePublic(JavaClass clazz) {
-		return SHOULD_BE_PUBLIC;
-	}
-	public final int isRemote() {
-		return NEITHER;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	/*
-	 * @see ABeanClassVRule#followEjbCreateReturnTypeRules(Method)
-	 */
-	public final JavaHelpers getEjbCreateReturnType(EnterpriseBean bean, Method method) {
-		return ((Entity)bean).getPrimaryKey();
-	}
-	
-	public final String getEjbCreateReturnTypeName(EnterpriseBean bean, Method method) {
-		JavaHelpers retType = getEjbCreateReturnType(bean, method);
-		if(retType == null) {
-			return IEJBValidatorConstants.NULL_PRIMARY_KEY;
-		}
-		return retType.getJavaName();
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			validateEjbPostCreateMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & EJBFIND) == EJBFIND) {
-			validateEjbFindMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBHOME) == EJBHOME) {
-			validateEjbHomeMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			validateEjbRemoveMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			validateBusinessMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else {
-			// Method isn't supposed to be here. Let the validateMethodsWhichMustNotExist
-			// take care of it.
-		}
-	}
-	
-	public final String getMatchingHomeMethodName(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			return getMatchingEjbCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			return getMatchingEjbPostCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBFIND) == EJBFIND) {
-			return getMatchingEjbFindMethodName(vc, method);
-		}
-		else if((methodType & EJBHOME) == EJBHOME) {
-			return getMatchingEjbHomeMethodName(vc, method);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			return getNoMatchingMethodName(vc, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			return getMatchingBusinessMethodName(vc, method);
-		}
-		else {
-			// Method isn't supposed to be here.
-			return getNoMatchingMethodName(vc, method);
-		}
-	}
-	
-	public final void validateEjbFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// # ejbFind methods
-		// IWAD4502 = This method must not exist on this class. Read section 10.5.5 of the EJB 2.0 specification.
-		// IWAD4507 = The container provides the ejbFind method implementation. Read section 10.6.2 of the EJB 2.0 specification.
-		// covered by the "must not exist" code?
-		
-		// IWAD4305 = This method must be public. Read section 12.2.5 of the EJB 2.0 specification.
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2457, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		
-		// IWAD4306 = This method must not be final. Read section 12.2.5 of the EJB 2.0 specification.
-		if(method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2458, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		// IWAD4307 = This method must not be static. Read section 12.2.5 of the EJB 2.0 specification.
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2459, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		// IWAD4308 = {0} must be a legal type for RMI-IIOP. Read section 12.2.5 of the EJB 2.0 specification.
-		validateRMI_IIOPTypeRules(vc, bean, clazz, method, methodsExtendedLists, false); // do not check if the return type is serializable
-		
-		// IWAD4309 = This method must return {0} or a collection thereof. Read section 12.2.5 of the EJB 2.0 specification.
-		// IWAD4312 = This method must return {0}. Read section 12.2.5 of the EJB 2.0 specification.
-		JavaHelpers retType = ValidationRuleUtility.getType(method.getReturnType());
-		JavaHelpers key = ((Entity)bean).getPrimaryKey();
-		if(!(ValidationRuleUtility.isAssignableFromEnumeration(retType, bean) ||
-			  ValidationRuleUtility.isAssignableFromCollection(retType, bean) ||
-			  ValidationRuleUtility.isAssignableFrom(retType, key)
-		   )) {
-		   	String keyName = (key == null) ? IEJBValidatorConstants.NULL_PRIMARY_KEY : key.getJavaName();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2407, IEJBValidationContext.WARNING, bean, clazz, method, new String[]{keyName}, this);
-			vc.addMessage(message);
-		}
-		
-		if(!ValidationRuleUtility.followsObjectNotFoundExceptionRules(bean, method)) {
-			// IWAD4285 = This method must not throw javax.ejb.ObjectNotFoundException. Read section 12.1.8.4 of the EJB 2.0 specification.
-			// IWAD4168 = This method must not throw ObjectNotFoundException. Read section 10.5.8.4 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2478, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		// IWAD4310 = This method must not throw java.rmi.RemoteException. Read section 12.2.5, 18.3.8, 18.6 of the EJB 2.0 specification.
-		if(!followRemoteExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_ejbFind, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPKeyClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPKeyClassVRule.java
deleted file mode 100644
index b091a8f04..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPKeyClassVRule.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class BMPKeyClassVRule extends AKeyClassVRule implements IEJBType, IRemoteType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_BMP_KEYCLASS;
-	private static final Object[] DEPENDS_ON = null;
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".kb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	
-	private final long[] SUPERTYPES = null;
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{HASHCODE_NOPARM, EQUALS};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = null;
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, HASHCODE_NOPARM, EQUALS, CONSTRUCTOR, CONSTRUCTOR_NOPARM};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_hashCode, new String[]{CHKJ2050_hashCode+EXT});
-		MESSAGE_IDS.put(CHKJ2050_equals, new String[]{CHKJ2050_equals+EXT});
-
-		MESSAGE_IDS.put(CHKJ2019, new String[]{CHKJ2019+EXT});
-
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		// Key methods are not checked for RemoteException, but to be consistent with the other VRules...
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	public Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-		
-		return ((Entity)parent).getPrimaryKey();
-	}
-	
-	/*
-	 * @see IClassVRule#validate(IEJBValidationContext, EnterpriseBean, JavaClass, Method)
-	 */
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass parent, Method method, List[] methodExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// Do not perform any validation on the methods of this class (other than the
-		// validation performed in AKeyClassVRule's check for the existence of hashCode()
-		// and equals(Object)
-	}
-
-	/*
-	 * @see IClassVRule#validate(IEJBValidationContext, EnterpriseBean, JavaClass, Field)
-	 */
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// Do not perform any validation on the fields of the BMP key class
-		long fieldType = MethodUtility.getUtility().getFieldTypeId(bean, clazz, field, this);
-		if((fieldType & IMethodAndFieldConstants.SERIALVERSIONUID) == IMethodAndFieldConstants.SERIALVERSIONUID) {
-			validateSerialVersionUID(vc, bean, clazz, field);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPLocalComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPLocalComponentVRule.java
deleted file mode 100644
index 65af05ef2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPLocalComponentVRule.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class BMPLocalComponentVRule extends AComponentVRule implements IEJBType, ILocalType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_BMP_LOCAL;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_BMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".blc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private static final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALOBJECT};
-	private static final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	
-	private static final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-	
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT};
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	 
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	/*
-	 * @see IValidationRule#getDependsOn()
-	 */
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-
-	/*
-	 * @see IValidationRule#getId()
-	 */
-	public final Object getId() {
-		return ID;
-	}
-
-	/*
-	 * @see IValidationRule#getMessageIds()
-	 */
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPLocalHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPLocalHomeVRule.java
deleted file mode 100644
index c524194b9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPLocalHomeVRule.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class BMPLocalHomeVRule extends ABMPHomeVRule implements ILocalType, IEJBType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_BMP_LOCALHOME;
-	private static final Object[] DEPENDS_ON = new Object[] { IValidationRuleList.EJB20_BMP_BEANCLASS, IValidationRuleList.EJB20_BMP_KEYCLASS };
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".blh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[] { JAVAX_EJB_EJBLOCALHOME };
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[] { FINDBYPRIMARYKEY, FIND };
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = null;
-
-	private final long[] KNOWN_METHOD_TYPES = new long[] {CLINIT, CREATE, FINDBYPRIMARYKEY, FIND, HOME };
-
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2017, new String[] {CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_findByPrimaryKey, new String[] {CHKJ2050_findByPrimaryKey+EXT});
-		MESSAGE_IDS.put(CHKJ2050_find, new String[]{CHKJ2050_find+EXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[] { CHKJ2402+BEXT, CHKJ2402+MEXT });
-		MESSAGE_IDS.put(CHKJ2403, new String[] { CHKJ2403+BEXT, CHKJ2403+MEXT });
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2462, new String[] { CHKJ2462+BEXT, CHKJ2462+MEXT });
-		MESSAGE_IDS.put(CHKJ2463, new String[] { CHKJ2463+BEXT, CHKJ2463+MEXT });
-		MESSAGE_IDS.put(CHKJ2464, new String[] { CHKJ2464+BEXT, CHKJ2464+MEXT });
-		MESSAGE_IDS.put(CHKJ2465, new String[] { CHKJ2465+BEXT, CHKJ2465+MEXT });
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[] { CHKJ2467+BEXT, CHKJ2467+MEXT });
-
-		MESSAGE_IDS.put(CHKJ2475, new String[]{CHKJ2475+BEXT, CHKJ2475+MEXT});
-		MESSAGE_IDS.put(CHKJ2477, new String[] { CHKJ2477+BEXT, CHKJ2477+MEXT });
-		MESSAGE_IDS.put(CHKJ2478, new String[]{CHKJ2478+BEXT, CHKJ2478+MEXT});
-		MESSAGE_IDS.put(CHKJ2479, new String[] { CHKJ2479+BEXT, CHKJ2479+MEXT });
-
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_find, new String[]{CHKJ2500_find+BEXT, CHKJ2500_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[] { CHKJ2503_create+BEXT, CHKJ2503_create+MEXT });
-		MESSAGE_IDS.put(CHKJ2503_find, new String[] { CHKJ2503_find+BEXT, CHKJ2503_find+MEXT });
-		MESSAGE_IDS.put(CHKJ2503_home, new String[] { CHKJ2503_home+BEXT, CHKJ2503_home+MEXT });
-		MESSAGE_IDS.put(CHKJ2504_create, new String[] { CHKJ2504_create+BEXT, CHKJ2504_create+MEXT });
-		MESSAGE_IDS.put(CHKJ2504_find, new String[] { CHKJ2504_find+BEXT, CHKJ2504_find+MEXT });
-		MESSAGE_IDS.put(CHKJ2504_home, new String[] { CHKJ2504_home+BEXT, CHKJ2504_home+MEXT });
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-
-	public final Object getId() {
-		return ID;
-	}
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPRemoteComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPRemoteComponentVRule.java
deleted file mode 100644
index 696716769..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPRemoteComponentVRule.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class BMPRemoteComponentVRule extends AComponentVRule implements IRemoteType, IComponentType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_BMP_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_BMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".brc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_business+BEXT, CHKJ2500_business+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPRemoteHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPRemoteHomeVRule.java
deleted file mode 100644
index 1e3398752..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/BMPRemoteHomeVRule.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class BMPRemoteHomeVRule extends ABMPHomeVRule implements IRemoteType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_BMP_HOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_BMP_BEANCLASS, IValidationRuleList.EJB20_BMP_KEYCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".brh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{FINDBYPRIMARYKEY, FIND};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = null;
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE, FINDBYPRIMARYKEY, FIND, HOME};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_findByPrimaryKey, new String[]{CHKJ2050_findByPrimaryKey+EXT});
-		MESSAGE_IDS.put(CHKJ2050_find, new String[]{CHKJ2050_find+EXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+BEXT, CHKJ2402+MEXT});
-		MESSAGE_IDS.put(CHKJ2403, new String[]{CHKJ2403+BEXT, CHKJ2403+MEXT});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2462, new String[]{CHKJ2462+BEXT, CHKJ2462+MEXT});
-		MESSAGE_IDS.put(CHKJ2463, new String[]{CHKJ2463+BEXT, CHKJ2463+MEXT});
-		MESSAGE_IDS.put(CHKJ2464, new String[]{CHKJ2464+BEXT, CHKJ2464+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2475, new String[]{CHKJ2475+BEXT, CHKJ2475+MEXT});
-		MESSAGE_IDS.put(CHKJ2477, new String[]{CHKJ2477+BEXT, CHKJ2477+MEXT});
-		MESSAGE_IDS.put(CHKJ2478, new String[]{CHKJ2478+BEXT, CHKJ2478+MEXT});
-		MESSAGE_IDS.put(CHKJ2479, new String[]{CHKJ2479+BEXT, CHKJ2479+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_find, new String[]{CHKJ2500_find+BEXT, CHKJ2500_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_find, new String[]{CHKJ2503_find+BEXT, CHKJ2503_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_home, new String[]{CHKJ2503_home+BEXT, CHKJ2503_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_find, new String[]{CHKJ2504_find+BEXT, CHKJ2504_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_home, new String[]{CHKJ2504_home+BEXT, CHKJ2504_home+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java
deleted file mode 100644
index 0bc8c646e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.internal.impl.LocalModelledPersistentAttributeFilter;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class CMPBeanClassVRule extends AEntityBeanClassVRule implements IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_CMP_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_CMP_HOME, IValidationRuleList.EJB20_CMP_LOCALHOME, IValidationRuleList.EJB20_CMP_REMOTE, IValidationRuleList.EJB20_CMP_LOCAL, IValidationRuleList.EJB20_CMP_KEYCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".cb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_ENTITYBEAN};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = new long[]{LOCAL_COMPONENT_INTERFACE, REMOTE_COMPONENT_INTERFACE};
-	
-	private final boolean SHOULD_BE_ABSTRACT = true;
-	private final boolean SHOULD_BE_FINAL = false;
-	private final boolean SHOULD_BE_PUBLIC = true;
-	private final boolean SHOULD_VALIDATE_TRANSIENT_FIELD = false;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{CONSTRUCTOR_NOPARM, SETENTITYCONTEXT, UNSETENTITYCONTEXT_NOPARM, EJBACTIVATE_NOPARM, EJBPASSIVATE_NOPARM, EJBREMOVE_NOPARM, EJBLOAD_NOPARM, EJBSTORE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{EJBFIND, FINALIZE_NOPARM};
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CONSTRUCTOR_NOPARM, CONSTRUCTOR, EJBCREATE, EJBPOSTCREATE, EJBHOME, FINALIZE_NOPARM, EJBFIND, ACCESSOR, EJBFINDBYPRIMARYKEY, SETENTITYCONTEXT, UNSETENTITYCONTEXT_NOPARM, EJBACTIVATE_NOPARM, EJBPASSIVATE_NOPARM, EJBREMOVE_NOPARM, EJBLOAD_NOPARM, EJBSTORE_NOPARM, EJBSELECT, FINALIZE_NOPARM, BUSINESS};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		// Add these checks in the code later
-		MESSAGE_IDS.put(CHKJ2481, new String[]{CHKJ2481+BEXT, CHKJ2481+MEXT});
-		MESSAGE_IDS.put(CHKJ2482, new String[]{CHKJ2482+BEXT, CHKJ2482+MEXT});
-		MESSAGE_IDS.put(CHKJ2483, new String[]{CHKJ2483+BEXT, CHKJ2483+MEXT});
-		MESSAGE_IDS.put(CHKJ2484, new String[]{CHKJ2484+BEXT, CHKJ2484+MEXT});
-		MESSAGE_IDS.put(CHKJ2489, new String[]{CHKJ2489+BEXT, CHKJ2489+MEXT});
-		MESSAGE_IDS.put(CHKJ2205, new String[]{CHKJ2205+BEXT, CHKJ2205+MEXT});
-		MESSAGE_IDS.put(CHKJ2206, new String[]{CHKJ2206+BEXT, CHKJ2206+MEXT});
-		// end add later
-
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2050_acc, new String[]{CHKJ2050_acc+EXT});
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbCreate, new String[]{CHKJ2050_ejbCreate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbFindByPrimaryKey, new String[]{CHKJ2050_ejbFindByPrimaryKey+EXT});
-		MESSAGE_IDS.put(CHKJ2050_setEntityContext, new String[]{CHKJ2050_setEntityContext+EXT});
-		MESSAGE_IDS.put(CHKJ2050_unsetEntityContext, new String[]{CHKJ2050_unsetEntityContext+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbActivate, new String[]{CHKJ2050_ejbActivate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPassivate, new String[]{CHKJ2050_ejbPassivate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbRemove, new String[]{CHKJ2050_ejbRemove+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbLoad, new String[]{CHKJ2050_ejbLoad+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbStore, new String[]{CHKJ2050_ejbStore+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbSelect, new String[]{CHKJ2050_ejbSelect+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbFind, new String[]{CHKJ2050_ejbFind+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPostCreate, new String[]{CHKJ2050_ejbPostCreate+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2421, new String[]{CHKJ2421+BEXT, CHKJ2421+MEXT});
-		MESSAGE_IDS.put(CHKJ2422, new String[]{CHKJ2422+BEXT, CHKJ2422+MEXT});
-		MESSAGE_IDS.put(CHKJ2423, new String[]{CHKJ2423+BEXT, CHKJ2423+MEXT});
-		MESSAGE_IDS.put(CHKJ2424, new String[]{CHKJ2424+BEXT, CHKJ2424+MEXT});
-		MESSAGE_IDS.put(CHKJ2426, new String[]{CHKJ2426+BEXT, CHKJ2426+MEXT});
-		MESSAGE_IDS.put(CHKJ2427, new String[]{CHKJ2427+BEXT, CHKJ2427+MEXT});
-		MESSAGE_IDS.put(CHKJ2428, new String[]{CHKJ2428+BEXT, CHKJ2428+MEXT});
-		MESSAGE_IDS.put(CHKJ2430, new String[]{CHKJ2430+BEXT, CHKJ2430+MEXT});
-		MESSAGE_IDS.put(CHKJ2431, new String[]{CHKJ2431+BEXT, CHKJ2431+MEXT});
-		MESSAGE_IDS.put(CHKJ2439, new String[]{CHKJ2439+BEXT, CHKJ2439+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2441, new String[]{CHKJ2441+BEXT, CHKJ2441+MEXT});
-		MESSAGE_IDS.put(CHKJ2442, new String[]{CHKJ2442+BEXT, CHKJ2442+MEXT});
-		MESSAGE_IDS.put(CHKJ2443, new String[]{CHKJ2443+BEXT, CHKJ2443+MEXT});
-		MESSAGE_IDS.put(CHKJ2449, new String[]{CHKJ2449+BEXT, CHKJ2449+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2450, new String[]{CHKJ2450+BEXT, CHKJ2450+MEXT});
-		MESSAGE_IDS.put(CHKJ2454, new String[]{CHKJ2454+BEXT, CHKJ2454+MEXT});
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2478, new String[]{CHKJ2478+BEXT, CHKJ2478+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2480, new String[]{CHKJ2480+BEXT, CHKJ2480+MEXT});
-		MESSAGE_IDS.put(CHKJ2485, new String[]{CHKJ2485+BEXT, CHKJ2485+MEXT});
-		MESSAGE_IDS.put(CHKJ2486, new String[]{CHKJ2486+BEXT, CHKJ2486+MEXT});
-		MESSAGE_IDS.put(CHKJ2487, new String[]{CHKJ2487+BEXT, CHKJ2487+MEXT});
-		MESSAGE_IDS.put(CHKJ2488, new String[]{CHKJ2488+BEXT, CHKJ2488+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2492, new String[]{CHKJ2492+BEXT, CHKJ2492+MEXT});
-		MESSAGE_IDS.put(CHKJ2493, new String[]{CHKJ2493+BEXT, CHKJ2493+MEXT});
-		MESSAGE_IDS.put(CHKJ2494, new String[]{CHKJ2494+BEXT, CHKJ2494+MEXT});
-		MESSAGE_IDS.put(CHKJ2496, new String[]{CHKJ2496+BEXT, CHKJ2496+MEXT});
-		MESSAGE_IDS.put(CHKJ2497, new String[]{CHKJ2497+BEXT, CHKJ2497+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_ejbCreate, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_ejbFind, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_ejbHome, new String[]{CHKJ2500_ejbHome+BEXT, CHKJ2500_ejbHome+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_finalize, new String[]{CHKJ2502_finalize+BEXT, CHKJ2502_finalize+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_ejbFind, new String[]{CHKJ2502_ejbFind+BEXT, CHKJ2502_ejbFind+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbCreate, new String[]{CHKJ2503_ejbCreate+BEXT, CHKJ2503_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbPostCreate, new String[]{CHKJ2503_ejbPostCreate+BEXT, CHKJ2503_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbHome, new String[]{CHKJ2503_ejbHome+BEXT, CHKJ2503_ejbHome+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2505_ejbPostCreate, new String[]{CHKJ2505_ejbPostCreate+BEXT, CHKJ2505_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2505_ejbRemove, new String[]{CHKJ2505_ejbRemove+BEXT, CHKJ2505_ejbRemove+MEXT});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final boolean shouldValidateTransientField() {
-		return SHOULD_VALIDATE_TRANSIENT_FIELD;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final boolean shouldBeAbstract(JavaClass clazz) {
-		return SHOULD_BE_ABSTRACT;
-	}
-	
-	public final boolean shouldBeFinal(JavaClass clazz) {
-		return SHOULD_BE_FINAL;
-	}
-	
-	public final boolean shouldBePublic(JavaClass clazz) {
-		return SHOULD_BE_PUBLIC;
-	}
-
-	public final int isRemote() {
-		return NEITHER;
-	}
-
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	
-	public final JavaHelpers getEjbCreateReturnType(EnterpriseBean bean, Method method) {
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		if(ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-			try {
-				return ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, cmp);
-			}
-			catch(InvalidInputException e) {
-				// problems....
-				// let this fall through to the default (getPrimaryKey())
-			}
-		}
-		return ((Entity)bean).getPrimaryKey();
-	}
-	
-	public final String getEjbCreateReturnTypeName(EnterpriseBean bean, Method method) {
-		JavaHelpers retType = getEjbCreateReturnType(bean, method);
-		if(retType == null) {
-			return IEJBValidatorConstants.NULL_PRIMARY_KEY;
-		}
-		return retType.getJavaName();
-	}
-	
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validate(vc, bean, clazz);
-		
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		
-		// 10.3.1, container-managed persistent fields and container-managed relationship 
-		// fields must *not* be defined in the entity bean class. 
-		List cmrFields = cmp.getCMRFields();
-		Iterator iterator = cmrFields.iterator();
-		while(iterator.hasNext()) {
-			CMRField cmrField = (CMRField)iterator.next();
-			if((cmrField != null) && (!cmrField.isDerived())) {
-				validateCmrField(vc, cmp, clazz, cmrField);
-			}
-		}
-		
-		List cmpFields = cmp.getFilteredFeatures(LocalModelledPersistentAttributeFilter.singleton());
-		if(cmpFields != null && !cmpFields.isEmpty()) {
-		iterator = cmpFields.iterator();
-		while(iterator.hasNext()) {
-			CMPAttribute cmpField = (CMPAttribute)iterator.next();
-			if((cmpField != null) && (!cmpField.isDerived())) {
-				validateCmpField(vc, cmp, clazz, cmpField);
-			}
-		  }
-		}
-	}
-	
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedList);
-		
-		if(!ValidationRuleUtility.throwsCreateException(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2497, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public final void validateEjbSelectMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass parent, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// # ejbSelect<METHOD> checks
-		// IWAD4154 = {0} must exist. Read section 10.5.2 of the EJB 2.0 specification.
-		// IWAD4502 = This method must not exist on this class. Read section 10.5.5 of the EJB 2.0 specification.
-		// IWAD4197 = An ejbSelect method must exist. Read section 10.6.7 of the EJB 2.0 specification.
-		
-		JavaHelpers returnType = method.getReturnType();
-		JavaHelpers javaUtilCollection = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION, bean);
-		if(!ValidationRuleUtility.isAssignableFrom(returnType, bean.getLocalInterface()) &&
-			!ValidationRuleUtility.isAssignableFrom(returnType, javaUtilCollection) ) {
-			// IWAD4160 = Type {0} cannot be returned by a select method. Read section 10.5.7 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2486, IEJBValidationContext.INFO, bean, parent, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!ValidationRuleUtility.isPublic(method)) {
-			// IWAD4198 = This method must be public. Read section 10.6.7 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2487, IEJBValidationContext.INFO, bean, parent, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!method.isAbstract()) {
-			// IWAD4199 = This method must be abstract. Read section 10.6.7 of the EJB 2.0 specification.
-			// IWAD4158 = {0} must be abstract. Read section 10.5.7 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2485, IEJBValidationContext.INFO, bean, parent, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!ValidationRuleUtility.throwsFinderException(bean, method)) {
-			// IWAD4200 = This method must throw javax.ejb.FinderException. Read section 10.6.7 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2488, IEJBValidationContext.INFO, bean, parent, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!ValidationRuleUtility.followsObjectNotFoundExceptionRules(bean, method)) {
-			// IWAD4285 = This method must not throw javax.ejb.ObjectNotFoundException. Read section 12.1.8.4 of the EJB 2.0 specification.
-			// IWAD4168 = This method must not throw ObjectNotFoundException. Read section 10.5.8.4 of the EJB 2.0 specification.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2478, IEJBValidationContext.INFO, bean, parent, method, this);
-			vc.addMessage(message);
-		}
-		
-		// Check method is associated with a query element in ejb-jar.xml.
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		if(!ValidationRuleUtility.isAssociatedWithQuery(cmp, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2496, IEJBValidationContext.INFO, bean, parent, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	public void validateCmpField(IEJBValidationContext vc, ContainerManagedEntity cmp, JavaClass clazz, CMPAttribute attrib) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		String fieldName = attrib.getName();
-		if((fieldName == null) || (fieldName.equals(""))) { //$NON-NLS-1$
-			// let the EJBJarVRule report this
-			return;
-		}
-		
-		if(!Character.isLowerCase(fieldName.charAt(0))) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2480, IEJBValidationContext.INFO, cmp, clazz, attrib.getField(), this);
-			vc.addMessage(message);
-		}
-		
-		// Section 10.8.3
-		if(!ValidationRuleUtility.isUnknownPrimaryKey(attrib)) {
-			JavaClass ejbClass = cmp.getEjbClass();
-			Method getMethod = ValidationRuleUtility.getMethodExtended(ejbClass, attrib.getGetterName(), new JavaHelpers[0], attrib.getType());
-			if(getMethod == null) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2050_acc, IEJBValidationContext.ERROR, cmp, clazz, new String[]{attrib.getGetterName()}, this);
-				vc.addMessage(message);
-			}
-			else {
-				validateCMPAccessorMethod(vc, cmp, clazz, getMethod, attrib);
-			}
-			
-			JavaHelpers[] setMethodParms = new JavaHelpers[]{attrib.getType()};
-			Method setMethod = ValidationRuleUtility.getMethodExtended(ejbClass, attrib.getSetterName(), setMethodParms);
-			if(setMethod == null) {
-				String setterName = attrib.getSetterName() + "(" + ValidationRuleUtility.getParmsAsString(setMethodParms) + ")"; //$NON-NLS-1$  //$NON-NLS-2$
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2050_acc, IEJBValidationContext.ERROR, cmp, clazz, new String[]{setterName}, this);
-				vc.addMessage(message);
-			}
-			else {
-				validateCMPAccessorMethod(vc, cmp, clazz, setMethod, attrib);
-			}
-		}
-
-		Field field = attrib.getField();
-		if ((field != null) && (clazz.getFieldExtended(attrib.getName()) != null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2454, IEJBValidationContext.WARNING, cmp, clazz, field, new String[]{attrib.getName()}, this);
-			vc.addMessage(message);
-		}
-			
-	}
-	
-	public void validateCmrField(IEJBValidationContext vc, ContainerManagedEntity cmp, JavaClass clazz, CMRField cmrField) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		String fieldName = cmrField.getName();
-		if((fieldName == null) || (fieldName.equals(""))) { //$NON-NLS-1$
-			// let the EJBJarVRule report this
-			return;
-		}
-		
-		if(!Character.isLowerCase(fieldName.charAt(0))) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2480, IEJBValidationContext.INFO, cmp, clazz, cmrField.getField(), this);
-			vc.addMessage(message);
-		}
-		
-		JavaClass ejbClass = cmp.getEjbClass();
-		JavaHelpers localType = ValidationRuleUtility.getCMRFieldType(vc, cmp, clazz, cmrField);
-		if(localType == null) {
-			// user made a mistake in ejb-jar.xml by trying to create a relation
-			// to a CMP which doesn't have a local interface.
-			// Don't report an error here; let the DD validation report the error.
-			return;
-		}
-		Method getMethod = ValidationRuleUtility.getMethodExtended(ejbClass, cmrField.getGetterName(), new JavaHelpers[0], localType);
-		if(getMethod == null) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2050_acc, IEJBValidationContext.ERROR, cmp, clazz, new String[]{cmrField.getGetterName()}, this);
-			vc.addMessage(message);
-		}
-		else {
-			validateCMRAccessorMethod(vc, cmp, clazz, getMethod, cmrField);
-		}
-		
-		JavaHelpers[] setMethodParms = new JavaHelpers[]{localType};
-		Method setMethod = ValidationRuleUtility.getMethodExtended(ejbClass, cmrField.getSetterName(), setMethodParms);
-		if(setMethod == null) {
-			String setterName = cmrField.getSetterName() + "(" + ValidationRuleUtility.getParmsAsString(setMethodParms) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2050_acc, IEJBValidationContext.ERROR, cmp, clazz, new String[]{setterName}, this);
-			vc.addMessage(message);
-		}
-		else {
-			validateCMRAccessorMethod(vc, cmp, clazz, setMethod, cmrField);
-		}
-		
-		Field field = cmrField.getField();
-		if ((field != null) && (clazz.getFieldExtended(cmrField.getName()) != null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2454, IEJBValidationContext.WARNING, cmp, clazz, field, new String[]{cmrField.getName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	protected void validateCMRAccessorMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, CMRField field) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2449, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-				 
-		if(!method.isAbstract()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2450, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	protected void validateCMPAccessorMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, CMPAttribute field) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2449, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-				 
-		if(!method.isAbstract()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2450, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			validateEjbPostCreateMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & EJBHOME) == EJBHOME) {
-			validateEjbHomeMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			validateEjbRemoveMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & ACCESSOR) == ACCESSOR) {
-			// This has already been validated in the validate(vc, bean, clazz) method
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			validateBusinessMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else {
-			// Method isn't supposed to be here. Let the validateMethodsWhichMustNotExist
-			// take care of it.
-		}
-	}
-
-	public String getMatchingHomeMethodName(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedList) {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedList, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			return getMatchingEjbCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			return getMatchingEjbPostCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBHOME) == EJBHOME) {
-			return getMatchingEjbHomeMethodName(vc, method);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			return getNoMatchingMethodName(vc, method);
-		}
-		else if((methodType & ACCESSOR) == ACCESSOR) {
-			// This has already been validated in the validate(vc, bean, clazz) method
-			return getNoMatchingMethodName(vc, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			return getMatchingBusinessMethodName(vc, method);
-		}
-		else {
-			// Method isn't supposed to be here. 
-			return getNoMatchingMethodName(vc, method);
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPKeyClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPKeyClassVRule.java
deleted file mode 100644
index dceab8b06..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPKeyClassVRule.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-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.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class CMPKeyClassVRule extends AKeyClassVRule implements IEJBType, IRemoteType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_CMP_KEYCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_CMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".kc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = null;
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{HASHCODE_NOPARM, EQUALS, CONSTRUCTOR_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = null;
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, HASHCODE_NOPARM, EQUALS, CONSTRUCTOR_NOPARM, CONSTRUCTOR};
-
-	private Set _keyFields = null;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_hashCode, new String[]{CHKJ2050_hashCode+EXT});
-		MESSAGE_IDS.put(CHKJ2050_equals, new String[]{CHKJ2050_equals+EXT});
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-
-		MESSAGE_IDS.put(CHKJ2019, new String[]{CHKJ2019+EXT});
-
-		MESSAGE_IDS.put(CHKJ2205, new String[]{CHKJ2205+BEXT, CHKJ2205+MEXT});
-		MESSAGE_IDS.put(CHKJ2206, new String[]{CHKJ2206+BEXT, CHKJ2206+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2829, new String[]{CHKJ2829+SPEC});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		// Key methods are not checked for RemoteException, but to be consistent with the other VRules...
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-		
-		ContainerManagedEntity cmp = (ContainerManagedEntity)parent;
-		if(ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-			return null; // do not validate a primitive primary key
-		}
-		
-		return cmp.getPrimaryKey();
-	}
-	
-
-	/*
-	 * @see IClassVRule#validate(IEJBValidationContext, EnterpriseBean, JavaClass, Method)
-	 */
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// Nothing to do.
-	}
-	
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validate(vc, bean, clazz);
-
-		// IWAD4251 = This class must be public. Read section 10.8.2 of the EJB 2.0 specification.
-		if(!clazz.isPublic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2022, IEJBValidationContext.INFO, bean, clazz, this);
-			vc.addMessage(message);
-		}
-		
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		if(!ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-			// primary key must map to at least one field on the bean 
-			// But if it's an unknown key, there's no point checking java.lang.Object
-			List primKeyFields = cmp.getKeyAttributes();
-			if ((primKeyFields == null) || (primKeyFields.size() == 0)) {
-				JavaClass primaryKey = cmp.getPrimaryKey(); // don't need to check ValidationRuleUtility.isValidType(primaryKey), because it's already been called in the validateDeploymentDescriptor method
-				String beanName = (cmp.getName() == null) ? "null" : cmp.getName(); //$NON-NLS-1$
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2829, IEJBValidationContext.ERROR, cmp, primaryKey, new String[] { primaryKey.getName(), beanName }, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-	private Set getKeyFields(ContainerManagedEntity cmp) {
-		if(_keyFields == null) {
-			// Know that the traversal of the fields and methods is done sequentially.
-			// i.e., that a class is validated according to one bean at at time.
-			// Thus, we can cache the key field information to speed up subsequent calls.
-			List fields = cmp.getKeyAttributes();
-			Iterator iterator = fields.iterator();
-			_keyFields = new HashSet();
-			while(iterator.hasNext()) {
-				CMPAttribute attrib = (CMPAttribute)iterator.next();
-				_keyFields.add(attrib.getName());
-			}
-		}
-		return _keyFields;
-	}
-	
-	/*
-	 * @see IClassVRule#validate(IEJBValidationContext, EnterpriseBean, JavaClass, Field)
-	 */
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		long fieldType = MethodUtility.getUtility().getFieldTypeId(bean, clazz, field, this);
-		if((fieldType & IMethodAndFieldConstants.SERIALVERSIONUID) == IMethodAndFieldConstants.SERIALVERSIONUID) {
-			validateSerialVersionUID(vc, bean, clazz, field);
-		}
-		else {
-			// IWAD4253 = This field must be public. Read section 10.8.1 of the EJB 2.0 specification.
-			if(!ValidationRuleUtility.isPublic(field)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2205, IEJBValidationContext.WARNING, bean, clazz, field, this);
-				vc.addMessage(message);
-			}
-			
-			Set keyFields = getKeyFields((ContainerManagedEntity)bean);
-			if(!keyFields.contains(field.getName())) {
-				// IWAD4254 = This field is not a <cmp-field>. Read section 10.8.1 of the EJB 2.0 specification.
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2206, IEJBValidationContext.WARNING, bean, clazz, field, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	/*
-	 * @see IValidationRule#reset()
-	 */
-	public void reset() {
-		super.reset();
-		if(_keyFields != null) {
-			_keyFields.clear();
-			_keyFields = null; // in this case, clearing the Set isn't enough.
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPLocalComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPLocalComponentVRule.java
deleted file mode 100644
index 7dcace187..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPLocalComponentVRule.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class CMPLocalComponentVRule extends AComponentVRule implements IComponentType, ILocalType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_CMP_LOCAL;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_CMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".clc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{EJBSELECT};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, EJBSELECT}; // Must know EJBSELECT to check that it's not exposed on this interface
-
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-		MESSAGE_IDS.put(CHKJ2474, new String[]{CHKJ2474+BEXT, CHKJ2474+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_ejbSelect, new String[]{CHKJ2502_ejbSelect+BEXT, CHKJ2502_ejbSelect+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPLocalHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPLocalHomeVRule.java
deleted file mode 100644
index 79aee23ac..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPLocalHomeVRule.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class CMPLocalHomeVRule extends ACMPHomeVRule implements ILocalType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_CMP_LOCALHOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_CMP_BEANCLASS, IValidationRuleList.EJB20_CMP_KEYCLASS, IValidationRuleList.EJB20_EJBEXT};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".clh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{FINDBYPRIMARYKEY, FIND};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{EJBSELECT};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE, FINDBYPRIMARYKEY, FIND, HOME, EJBSELECT}; // Must know EJBSELECT to check that it's not exposed on this interface
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_findByPrimaryKey, new String[]{CHKJ2050_findByPrimaryKey+EXT});
-		MESSAGE_IDS.put(CHKJ2050_find, new String[]{CHKJ2050_find+EXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+BEXT, CHKJ2402+MEXT});
-		MESSAGE_IDS.put(CHKJ2403, new String[]{CHKJ2403+BEXT, CHKJ2403+MEXT});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2462, new String[]{CHKJ2462+BEXT, CHKJ2462+MEXT});
-		MESSAGE_IDS.put(CHKJ2463, new String[]{CHKJ2463+BEXT, CHKJ2463+MEXT});
-		MESSAGE_IDS.put(CHKJ2464, new String[]{CHKJ2464+BEXT, CHKJ2464+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2475, new String[]{CHKJ2475+BEXT, CHKJ2475+MEXT});
-		MESSAGE_IDS.put(CHKJ2477, new String[]{CHKJ2477+BEXT, CHKJ2477+MEXT});
-		MESSAGE_IDS.put(CHKJ2478, new String[]{CHKJ2478+BEXT, CHKJ2478+MEXT});
-		MESSAGE_IDS.put(CHKJ2479, new String[]{CHKJ2479+BEXT, CHKJ2479+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2495, new String[]{CHKJ2495+BEXT, CHKJ2495+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_find, new String[]{CHKJ2500_find+BEXT, CHKJ2500_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_ejbSelect, new String[]{CHKJ2502_ejbSelect+BEXT, CHKJ2502_ejbSelect+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_find, new String[]{CHKJ2503_find+BEXT, CHKJ2503_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_home, new String[]{CHKJ2503_home+BEXT, CHKJ2503_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_find, new String[]{CHKJ2504_find+BEXT, CHKJ2504_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_home, new String[]{CHKJ2504_home+BEXT, CHKJ2504_home+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPRemoteComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPRemoteComponentVRule.java
deleted file mode 100644
index 87155b480..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPRemoteComponentVRule.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class CMPRemoteComponentVRule extends AComponentVRule implements IRemoteType, IComponentType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_CMP_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_CMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".crc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{EJBSELECT};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, EJBSELECT}; // Must know EJBSELECT to check that it's not exposed on this interface
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-		MESSAGE_IDS.put(CHKJ2473, new String[]{CHKJ2473+BEXT, CHKJ2473+MEXT});
-		MESSAGE_IDS.put(CHKJ2474, new String[]{CHKJ2474+BEXT, CHKJ2474+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_business+BEXT, CHKJ2500_business+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_ejbSelect, new String[]{CHKJ2502_ejbSelect+BEXT, CHKJ2502_ejbSelect+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validate(vc, bean, clazz);
-		
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		
-		// 10.3.1, container-managed persistent fields and container-managed relationship 
-		// fields must *not* be defined in the entity bean class. 
-		List cmrFields = cmp.getCMRFields();
-		Iterator iterator = cmrFields.iterator();
-		while(iterator.hasNext()) {
-			CMRField cmrField = (CMRField)iterator.next();
-			if((cmrField != null) && (!cmrField.isDerived())) {
-
-				JavaHelpers localType = ValidationRuleUtility.getCMRFieldType(vc, cmp, clazz, cmrField);
-				if(localType == null) {
-					// user made a mistake in ejb-jar.xml by trying to create a relation
-					// to a CMP which doesn't have a local interface.
-					// Don't report an error here; let the DD validation report the error.
-					continue;
-				}
-
-				// Cannot expose get/set methods of CMR fields on the remote home or interface
-				Method remoteGetMethod = ValidationRuleUtility.getMethodExtended(clazz, cmrField.getGetterName(), new JavaHelpers[0], localType);
-				if(remoteGetMethod != null) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2473, IEJBValidationContext.WARNING, cmp, clazz, remoteGetMethod, new String[]{cmrField.getGetterName()}, this);
-					vc.addMessage(message);
-				}
-
-				JavaHelpers[] setMethodParms = new JavaHelpers[]{localType};
-				Method remoteSetMethod = ValidationRuleUtility.getMethodExtended(clazz, cmrField.getSetterName(), setMethodParms);
-				if(remoteSetMethod != null) {
-					String setterName = cmrField.getSetterName() + "(" + ValidationRuleUtility.getParmsAsString(setMethodParms) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2473, IEJBValidationContext.WARNING, cmp, clazz, remoteSetMethod, new String[]{setterName}, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPRemoteHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPRemoteHomeVRule.java
deleted file mode 100644
index f40ec25d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPRemoteHomeVRule.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class CMPRemoteHomeVRule extends ACMPHomeVRule implements IRemoteType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_CMP_HOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_CMP_BEANCLASS, IValidationRuleList.EJB20_CMP_KEYCLASS, IValidationRuleList.EJB20_EJBEXT};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".crh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{FINDBYPRIMARYKEY, FIND};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{EJBSELECT};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE, FINDBYPRIMARYKEY, FIND, HOME, EJBSELECT}; // Must know EJBSELECT to check that it's not exposed on this interface
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_findByPrimaryKey, new String[]{CHKJ2050_findByPrimaryKey+EXT});
-		MESSAGE_IDS.put(CHKJ2050_find, new String[]{CHKJ2050_find+EXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+BEXT, CHKJ2402+MEXT});
-		MESSAGE_IDS.put(CHKJ2403, new String[]{CHKJ2403+BEXT, CHKJ2403+MEXT});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2462, new String[]{CHKJ2462+BEXT, CHKJ2462+MEXT});
-		MESSAGE_IDS.put(CHKJ2463, new String[]{CHKJ2463+BEXT, CHKJ2463+MEXT});
-		MESSAGE_IDS.put(CHKJ2464, new String[]{CHKJ2464+BEXT, CHKJ2464+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2475, new String[]{CHKJ2475+BEXT, CHKJ2475+MEXT});
-		MESSAGE_IDS.put(CHKJ2477, new String[]{CHKJ2477+BEXT, CHKJ2477+MEXT});
-		MESSAGE_IDS.put(CHKJ2478, new String[]{CHKJ2478+BEXT, CHKJ2478+MEXT});
-		MESSAGE_IDS.put(CHKJ2479, new String[]{CHKJ2479+BEXT, CHKJ2479+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2495, new String[]{CHKJ2495+BEXT, CHKJ2495+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_find, new String[]{CHKJ2500_find+BEXT, CHKJ2500_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_ejbSelect, new String[]{CHKJ2502_ejbSelect+BEXT, CHKJ2502_ejbSelect+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_find, new String[]{CHKJ2503_find+BEXT, CHKJ2503_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_home, new String[]{CHKJ2503_home+BEXT, CHKJ2503_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_find, new String[]{CHKJ2504_find+BEXT, CHKJ2504_find+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_home, new String[]{CHKJ2504_home+BEXT, CHKJ2504_home+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ClassUtility.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ClassUtility.java
deleted file mode 100644
index 976d51c25..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ClassUtility.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.Arrays;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-public final class ClassUtility {
-	public static long supertype_counter = 0x1; // used by IMethodAndFieldConstants.java
-	private long[] _classTypeIndex;
-	private AClassType[] _classNames;
-	
-	private abstract class AClassType {
-		public abstract String getName(EnterpriseBean bean) throws InvalidInputException;
-		public abstract long getId();
-
-		public JavaHelpers getClass(EnterpriseBean bean) throws InvalidInputException {
-			return ValidationRuleUtility.getType(getName(bean), bean);
-		}
-		
-		/**
-		 * Is this class type equal to the clazz parameter.
-		 */
-		public boolean equals(EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-			if(clazz == null) {
-				return false;
-			}
-			
-			JavaHelpers thisClass = getClass(bean);
-			if(thisClass == null) {
-				return false;
-			}
-			
-			return clazz.equals(thisClass);
-		}
-	}
-	
-	private static ClassUtility _inst = null;
-	
-	private ClassUtility() {
-		buildTypeList();
-	}
-	
-	public static ClassUtility getUtility() {
-		if(_inst == null) {
-			_inst = new ClassUtility();
-		}
-		return _inst;
-	}
-
-	/**
-	 * Return true if the clazz is the same as the class, identified by the "type"
-	 * parameter, in the bean.
-	 */
-	public boolean isClassType(EnterpriseBean bean, JavaClass clazz, long type) throws InvalidInputException {
-		AClassType ct = getClassType(type);
-		if(ct == null) {
-			// Unknown type
-			return false;
-		}
-		
-		return ct.equals(bean, clazz);
-	}
-
-	public String getClassName(EnterpriseBean bean, long type) throws InvalidInputException {
-		AClassType ct = getClassType(type);
-		if(ct == null) {
-			return null;
-		}
-		
-		return ct.getName(bean);
-	}
-
-	public AClassType getClassType(long type) {
-		int index = Arrays.binarySearch(_classTypeIndex, type);
-		if(index > _classNames.length) {
-			return null;
-		}
-		
-		if(index < 0) {
-			return null;
-		}
-		
-		if(_classNames[index].getId() != type) {
-			return null;
-		}
-		
-		return _classNames[index];
-	}
-
-	public JavaHelpers getSupertype(EnterpriseBean bean, long type) throws InvalidInputException {
-		AClassType ct = getClassType(type);
-		if(ct == null) {
-			// No supertype
-			return null;
-		}
-		
-		return ct.getClass(bean);
-	}
-	
-	private void buildTypeList() {
-		int typeCount = 12; // This is the number of identifiable classes in ITypeConstants
-		_classTypeIndex = new long[typeCount];
-		_classNames = new AClassType[typeCount];
-		int count = 0;
-		
-		// The index of the type in the long[] is equal to the
-		// index of the IMethodType in the IMethodType[]. By using
-		// this technique instead of a HashMap, we don't need to
-		// create an Integer every time we need to locate the 
-		// IMethodType.
-		_classTypeIndex[count] = ITypeConstants.LOCAL_COMPONENT_INTERFACE;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				JavaHelpers clazz = getClass(bean);
-				if(clazz == null) {
-					return null;
-				}
-				return clazz.getQualifiedName();
-			}
-			
-			public long getId() {
-				return ITypeConstants.LOCAL_COMPONENT_INTERFACE;
-			}
-			
-			public JavaHelpers getClass(EnterpriseBean bean) {
-				if(bean == null) {
-					return null;
-				}
-				
-				if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface())) {
-					JavaClass result = bean.getLocalInterface();
-					try {
-						ValidationRuleUtility.isValidTypeHierarchy(bean, result);
-					}
-					catch(InvalidInputException e) {
-						return null;
-					}
-					return result;
-				}
-				
-				return null;
-			}
-		};
-		
-		_classTypeIndex[count] = ITypeConstants.REMOTE_COMPONENT_INTERFACE;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				JavaHelpers clazz = getClass(bean);
-				if(clazz == null) {
-					return null;
-				}
-				return clazz.getQualifiedName();
-			}
-			
-			public long getId() {
-				return ITypeConstants.REMOTE_COMPONENT_INTERFACE;
-			}
-			
-			public JavaHelpers getClass(EnterpriseBean bean) {
-				if(bean == null) {
-					return null;
-				}
-				
-				if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface())) {
-					JavaClass result = bean.getRemoteInterface();
-					try {
-						ValidationRuleUtility.isValidTypeHierarchy(bean, result);
-					}
-					catch(InvalidInputException e) {
-						return null;
-					}
-					return result;
-				}
-				
-				return null;
-			}
-		};
-		
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_ENTITYBEAN;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_ENTITYBEAN;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_ENTITYBEAN;
-			}
-		};
-	
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_EJBLOCALHOME;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_EJBLOCALHOME;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_EJBLOCALHOME;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_EJBLOCALOBJECT;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_EJBLOCALOBJECT;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_EJBLOCALOBJECT;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_EJBHOME;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_EJBHOME;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_EJBHOME;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_EJBOBJECT;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_EJBOBJECT;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_EJBOBJECT;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVA_LANG_OBJECT;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVA_LANG_OBJECT;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_MESSAGEDRIVENBEAN;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_MESSAGEDRIVENBEAN;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_MESSAGEDRIVENBEAN;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_JMS_MESSAGELISTENER;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_JMS_MESSAGELISTENER;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_JMS_MESSAGELISTENER;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_SESSIONBEAN;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONBEAN;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_SESSIONBEAN;
-			}
-		};
-
-		_classTypeIndex[count] = ITypeConstants.JAVAX_EJB_SESSIONSYNCHRONIZATION;
-		_classNames[count++] = new AClassType() {
-			public String getName(EnterpriseBean bean) {
-				return ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION;
-			}
-			
-			public long getId() {
-				return ITypeConstants.JAVAX_EJB_SESSIONSYNCHRONIZATION;
-			}
-		};
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorMessageConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorMessageConstants.java
deleted file mode 100644
index 890d48215..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorMessageConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-/**
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public interface ConnectorMessageConstants extends J2EEMessageConstants {
-	public static final String DOCTYPE_1_3 = "1.0";  //$NON-NLS-1$
-	public static final String DOCTYPE_1_4 = "1.5"; //$NON-NLS-1$
-	public static final String CONNECTOR_MODEL_NAME = "CONNECTOR_VALIDATION"; //$NON-NLS-1$
-	public static final String CONNECTOR_INVALID_DOC_TYPE_ERROR_ = "CONNECTOR_INVALID_DOC_TYPE_ERROR_"; //$NON-NLS-1$
-	public static final String ERROR_INVALID_CONNECTOR_FILE = "ERROR_INVALID_CONNECTOR_FILE"; //$NON-NLS-1$
-	public static final String ERROR_CONNECTOR_VALIDATION_FAILED = "ERROR_CONNECTOR_VALIDATION_FAILED"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorValidator.java
deleted file mode 100644
index 18e436842..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorValidator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class ConnectorValidator extends J2EEValidator implements ConnectorMessageConstants {
-	protected RARFile rarFile;
-	protected Connector connectorDD;
-	/**
-	 * 
-	 */
-	public ConnectorValidator() {
-		super();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.model.validation.J2EEValidator#getBaseName()
-	 */
-	public String getBaseName() {
-		return "rarvalidation"; //$NON-NLS-1$
-	}
-	/**
-	 * @return Returns the connectorDD.
-	 */
-	protected Connector getConnectorDD() {
-		return connectorDD;
-	}
-
-	/**
-	 * @param connectorDD The connectorDD to set.
-	 */
-	protected void setConnectorDD(Connector connectorDD) {
-		this.connectorDD = connectorDD;
-	}
-
-	/**
-	 * @return Returns the rarFile.
-	 */
-	protected RARFile getRarFile() {
-		return rarFile;
-	}
-
-	/**
-	 * @param rarFile The rarFile to set.
-	 */
-	protected void setRarFile(RARFile rarFile) {
-		this.rarFile = rarFile;
-	}
-		
-	/**
-	 * Does the validation.
-	 * 
-	 * @throws ValidationException
-	 */
-	public void validate(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-		validateInJob(inHelper, inReporter);		
-	}	
-
-	protected void validateJ2EE14DocType() {
-	
-		if ( getConnectorDD().getVersionID() < J2EEVersionConstants.JCA_1_5_ID) {
-			String[] params = new String[3];
-			params[0] = DOCTYPE_1_4;
-			//params[1] = helper.getProject().getName();
-			params[2] = DOCTYPE_1_3;
-			addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-		} else if (getConnectorDD().getVersionID() != J2EEVersionConstants.JCA_1_0_ID) {
-			String[] params = new String[3];
-			params[0] = DOCTYPE_1_3;
-			//params[1] = helper.getProject().getName();
-			params[2] = DOCTYPE_1_4;
-			addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-		}// if
-	}// validateDocTypeVsNature
-	
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		return null;
-	}
-	
-	public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException{
-	
-		super.validateInJob(helper, reporter);
-		
-		// First remove all previous msg. for this project
-		_reporter.removeAllMessages(this, null); // Note the WarHelper will return web.xml with a null object as well
-	
-		try {
-			setRarFile((RARFile) helper.loadModel(CONNECTOR_MODEL_NAME));
-			if (rarFile != null) {
-				setConnectorDD( rarFile.getDeploymentDescriptor() );
-				//validateJ2EE14DocType();
-			} else {
-				IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_INVALID_CONNECTOR_FILE);
-				throw new ValidationException(errorMsg);
-			}
-	
-		} catch (ValidationException ex) {
-			throw ex;
-		} catch (Exception e) {
-			IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_CONNECTOR_VALIDATION_FAILED);
-			throw new ValidationException(errorMsg, e);
-		}
-		return status;		
-	}
-
-	public void cleanup(IReporter reporter) {
-		rarFile = null;
-		connectorDD = null;
-		super.cleanup(reporter);
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/DuplicatesTable.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/DuplicatesTable.java
deleted file mode 100644
index cb1c63878..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/DuplicatesTable.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * In some places in the code, it is necessary to find out if there
- * are duplicates in a list, and if there are, to register a validation
- * message against the duplicates. This class is used to make finding
- * the duplicates easier.
- */
-public class DuplicatesTable extends java.util.HashMap {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3189901849555229718L;
-	protected static final Boolean UNIQUE = Boolean.FALSE;
-	protected static final Boolean DUPLICATE = Boolean.TRUE;
-	protected Map _duplicates = null;
-
-	/**
-	 * Add an object to this table; if the object is a duplicate, it will be
-	 * marked to a duplicate instead of being added twice to the table.
-	 */
-	public void add(Object o) {
-		// Build up hashtable to check for duplicate elements.
-		Object key = get(o);
-		if (key == null) {
-			put(o, UNIQUE);
-		}
-		else {
-			saveDuplicate(o);
-			put(o, DUPLICATE);
-		}
-	}
-
-	protected void saveDuplicate(Object o) {
-		// The given object has been marked a duplicate.
-		// Given that the HashMap can store only one object with the key, 
-		// duplicates are overwritten. This method stores the duplicates
-		// elsewhere in a List.
-		if (_duplicates == null) {
-			_duplicates = new HashMap();
-		}
-
-		List dupList = (List) _duplicates.get(o);
-		if (dupList == null) {
-			dupList = new ArrayList();
-		}
-
-		dupList.add(o);
-		_duplicates.put(o, dupList);
-	}
-
-	/**
-	 * If there are duplicates in this table, return true; else, return false.
-	 */
-	public boolean containsDuplicates() {
-		return containsValue(DUPLICATE);
-	}
-	
-	/**
-	 * If there are unique elements in this table, return true; else, return false.
-	 */
-	public boolean containsUniques() {
-		return containsValue(UNIQUE);
-	}
-	
-	/**
-	 * If there are duplicates in this table, return a set of the duplicates.
-	 * Otherwise, return an empty set.
-	 */
-	public List getDuplicates() {
-		if (!containsDuplicates()) {
-			return Collections.EMPTY_LIST;
-		}
-
-		// Else, get the duplicate elements from the list
-		return getElements(DUPLICATE);
-	}
-	
-	/**
-	 * If there are duplicates in this table, return a list of the duplicates.
-	 * Otherwise, return an empty list.
-	 */
-	private List getElements(Boolean type) {
-		if (type == null) {
-			return Collections.EMPTY_LIST;
-		}
-
-		// Else, get the duplicate elements from the list
-		Set keys = keySet();
-		if (keys == null) {
-			return Collections.EMPTY_LIST;
-		}
-
-		List elements = new ArrayList();
-		Iterator iterator = keys.iterator();
-		while (iterator.hasNext()) {
-			Object key = iterator.next();
-			Object value = get(key);
-			if (value == type) {
-				elements.add(key);
-			}
-		}
-
-		if (type == DUPLICATE) {
-			// Also add the elements from the "duplicates" list.
-			if (_duplicates != null) {
-				iterator = _duplicates.values().iterator();
-				while (iterator.hasNext()) {
-					List dupList = (List) iterator.next();
-					elements.addAll(dupList);
-				}
-			}
-		}
-
-		return elements;
-	}
-	
-	/**
-	 * If there are unique elements in this table, return a set of the unique elements.
-	 * Otherwise, return an empty set.
-	 */
-	public List getUniques() {
-		if (!containsUniques()) {
-			return Collections.EMPTY_LIST;
-		}
-
-		// Else, get the unique elements from the list
-		return getElements(UNIQUE);
-	}
-
-	public void clear() {
-		super.clear();
-		if(_duplicates != null) {
-			_duplicates.clear();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EARValidationMessageResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EARValidationMessageResourceHandler.java
deleted file mode 100644
index 4c914f36a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EARValidationMessageResourceHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class EARValidationMessageResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "earvalidation";//$NON-NLS-1$
-
-	private EARValidationMessageResourceHandler() {
-		// Do not instantiate
-	}
-
-
-	public static String ERROR_EAR_VALIDATION_FAILED;
-	public static String ERROR_EAR_INVALID_EAR_FILE;
-	public static String ERROR_EAR_DUPLICATE_ROLES;
-	public static String MESSAGE_EAR_NO_MODULE_URI;
-	public static String MESSAGE_EAR_MISSING_URI;
-	public static String EAR_DD_PARSE_LINECOL;
-	public static String EAR_DD_PARSE_LINE;
-	public static String EAR_DD_PARSE_NOINFO;
-	public static String EAR_DD_CANNOT_OPEN_DD;
-	public static String URI_CONTAINS_SPACES_ERROR_;
-	public static String MESSAGE_EAR_DUPLICATE_URI_ERROR_;
-	public static String MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_;
-	public static String MESSAGE_EMPTY_ALT_DD_ERROR_;
-	public static String DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_;
-	public static String DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_;
-	public static String MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_;
-	public static String MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_;
-	public static String ERROR_READING_MANIFEST_ERROR_;
-	public static String MANIFEST_LINE_END_ERROR_;
-	public static String MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_;
-	public static String INVALID_URI_FOR_MODULE_ERROR_;
-	public static String EAR_INVALID_DOC_TYPE_ERROR_;
-	public static String MODULE_DD_PARSE_LINECOL_ERROR_;
-	public static String MODULE_DD_PARSE_LINE_ERROR_;
-	public static String MODULE_DD_PARSE_NOINFO_ERROR_;
-	public static String EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_;
-	public static String WARNING_METAFOLDER_MISSING;
-	public static String WARNING_FILE_MISSING;
-	public static String MESSAGE_INVALID_ALT_DD_WARN_;
-	public static String INVALID_MANIFEST_CLASSPATH_ONE_WARN_;
-	public static String INVALID_MANIFEST_CLASSPATH_TWO_WARN_;
-	public static String INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_;
-	public static String PROJECT_IS_CLOSED_WARN_;
-	public static String PROJECT_DOES_NOT_EXIST_WARN_;
-	public static String MISSING_WEBNATURE_FORMODULE_WARN_;
-	public static String DEPRECATED_ABSPATHS_WARN_;
-	public static String INVALID_CONTEXTROOT_WEBMODULE_WARN_;
-	public static String MISSING_CLIENTNATURE_FORMODULE_WARN_;
-	public static String MISSING_EJBNATURE_FORMODULE_WARN_;
-	public static String MISSING_PROJECT_FORMODULE_WARN_;
-	public static String INVALID_CASE_FOR_MANIFEST_ERROR_;
-	public static String URI_ALREADY_EXISTS_IN_EAR_WARN_;
-	public static String MISSING_MODULE_EXTENSION_ERROR_;
-	public static String PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR;
-	public static String NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET;
-	public static String NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS;
-	public static String INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL;
-	public static String INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL;
-	public static String MESSAGE_INCOMPATIBLE_SPEC_WARNING_;
-	public static String MESSAGE_INCOMPATIBLE_13_SPEC_WARNING_;
-	public static String MESSAGE_INCOMPATIBLE_14_SPEC_WARNING_;
-	public static String EAR_VALIDATION_INTERNAL_ERROR_UI_;
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EARValidationMessageResourceHandler.class);
-	}	
-	
-	/**
-	 *   String message;
-      ...
-      // no args
-      message = EARValidationMessageResourceHandler.key_one;
-      ...
-      // bind one arg
-      message = NLS.bind(EARValidationMessageResourceHandler.key_two, "example usage"); //$NON-NLS-1$
-
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java
deleted file mode 100644
index 5c2ea98da..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * Validate the WebSphere-specific implementation of non-spec features, such
- * as component inheritance.
- */
-public class EJBExt20VRule extends AValidationRule implements IMessagePrefixEjb20Constants {
-	private static final Map MESSAGE_IDS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS, IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE, IValidationRuleList.EJB20_STATELESS_SESSION_HOME, IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL, IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME, IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS, IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE, IValidationRuleList.EJB20_STATEFUL_SESSION_HOME, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME, IValidationRuleList.EJB20_CMP_BEANCLASS, IValidationRuleList.EJB20_CMP_REMOTE, IValidationRuleList.EJB20_CMP_HOME, IValidationRuleList.EJB20_CMP_LOCAL, IValidationRuleList.EJB20_CMP_LOCALHOME, IValidationRuleList.EJB20_CMP_KEYCLASS, IValidationRuleList.EJB20_BMP_BEANCLASS, IValidationRuleList.EJB20_BMP_REMOTE, IValidationRuleList.EJB20_BMP_HOME, IValidationRuleList.EJB20_BMP_LOCAL, IValidationRuleList.EJB20_BMP_LOCALHOME, IValidationRuleList.EJB20_BMP_KEYCLASS, IValidationRuleList.EJB20_MESSAGE_BEANCLASS, IValidationRuleList.EJB20_EJBJAR};
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2106, new String[]{CHKJ2106+SPEC});
-		MESSAGE_IDS.put(CHKJ2849, new String[]{CHKJ2849+SPEC});
-		MESSAGE_IDS.put(CHKJ2852, new String[]{CHKJ2852});
-	}
-	
-	public Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public Object getId() {
-		return IValidationRuleList.EJB20_EJBEXT;
-	}
-	
-	public Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-
-	public Object getTarget(Object parent, Object clazz) {
-		return null;
-	}
-
-	/**
-	 * If the bean components (home interface, remote interface, bean class, and primary
-	 * key) can all be found and reflected, return true. Let the DDValidator
-	 * report the error message against the bean if one of these types doesn't reflect.
-	 */
-	public boolean areBeanComponentsReflected(EnterpriseBean bean) {
-		// Don't need to check if the bean is null, because this method will
-		// not be called if it is.
-		try {
-			ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getEjbClass());
-		}
-		catch (InvalidInputException exc) {
-			return false;
-		}
-		
-		if(bean instanceof MessageDriven) {
-			// don't need to check the rest
-			return true;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getHomeInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			return false;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getRemoteInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			return false;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getLocalHomeInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			return false;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getLocalInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			return false;
-		}
-
-		if (bean.isEntity()) {
-			JavaClass primaryKey = ((Entity) bean).getPrimaryKey();
-			try {
-				if(((Entity)bean).eIsSet(EjbPackage.eINSTANCE.getEntity_PrimaryKey())) {
-					ValidationRuleUtility.isValidTypeHierarchy(bean, primaryKey);
-				}
-			}
-			catch (InvalidInputException exc) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		Logger logger = vc.getMsgLogger();
-		if(logger != null && logger.isLoggingLevel(Level.FINEST)) {
-			LogEntry entry = vc.getLogEntry();
-			entry.setSourceID("EJB20Validator - validate"); //$NON-NLS-1$
-			entry.setText(getClass().getName() + "::validate(" + targetParent + ", " + target); //$NON-NLS-1$ //$NON-NLS-2$
-			logger.write(Level.FINEST, entry);
-		}
-		
-		EJBJar ejbJar = null;
-		if(targetParent == null) {
-			ejbJar = (EJBJar)target;
-			validate(vc, ejbJar);
-		}
-		else {
-			// running as a dependent
-			ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-			EnterpriseBean bean = (EnterpriseBean)targetParent;
-			validate(vc, ejbJar, bean);
-		}
-	}
-	
-	/*
-	 * @see IValidationRule#validate(IEJBValidationContext, Object, Object)
-	 */
-	public void validate(IEJBValidationContext vc, EJBJar ejbJar) throws ValidationCancelledException, ValidationException {
-		List enterpriseBeans = ejbJar.getEnterpriseBeans();
-		Iterator iterator = enterpriseBeans.iterator();
-		EnterpriseBean bean = null;
-		while(iterator.hasNext()) {
-			bean = (EnterpriseBean)iterator.next();
-			if(bean == null) {
-				// If bean isn't valid, don't perform any of the other
-				// validation checks on it. Let DDValidator output the error message.
-				continue;
-			}
-			validate(vc, ejbJar, bean);
-		}
-	}
-	
-	public void validate(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) throws ValidationCancelledException, ValidationException {
-		try {
-			// Check if the class exists, etc.
-			if(!areBeanComponentsReflected(bean)) {
-				// Something didn't reflect properly, so don't continue with the
-				// rest of the checks. Some metadata will be nonsense.
-				return;
-			}
-			
-			// Component inheritance is now checked in each VRule instead of here.
-			// This was necessary for incremental validation; if one class changed
-			// in the bean, and the bean was a member of component inheritance, then
-			// messages were added multiple times onto the classes which had not changed.
-			// In order to avoid multiple messages, only the component inheritance of
-			// the class which changed should be revalidated when the class changes.
-			validateAppendixB(vc, ejbJar, bean); // validate the key class since that message is registered against ejb-jar.xml
-		}
-		catch(ValidationCancelledException e) {
-			throw e;
-		}
-		/* unreachable catch block
-		catch(ValidationException exc) {
-			// If there's a problem, proceed with the next bean.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[]{ArchiveConstants.EJBJAR_EXTENSIONS_SHORT_NAME, beanName}, this);
-			vc.addMessage(message);
-			if(logger.isLoggingLevel(Level.FINER)) {
-				logger.write(Level.FINER, exc);
-			}
-		}
-		*/
-		catch(Throwable exc) {
-			// If there's a problem, proceed with the next bean.
-			String superTypeName = getEJBInheritanceFileName();
-			if(superTypeName == null)
-			  superTypeName = "unknown super type"; //$NON-NLS-1$
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[]{superTypeName, bean.getName()}, this);
-			vc.addMessage(message);
-			Logger logger = vc.getMsgLogger();
-			if(logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-				logger.write(Level.SEVERE, exc);
-			}
-		}
-	}
-	
-	protected void validateAppendixB(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// The Java inheritance structure must match the EJB inheritance structure.
-		// e.g. if EJB B is a child of EJB A, then class B must be a child of class A.
-		// B could be a grandchild (or great-grandchild or ...) of A.
-		if(bean == null) {
-			return;
-		}
-		if(!bean.isEntity()) {
-			return;
-		}
-		JavaClass thisKey = ((Entity)bean).getPrimaryKey();
-		EnterpriseBean supertype = getSuperType(bean);
-		JavaClass parentKey = null;
-		if (supertype != null) {
-			// check this CMP's supertype
-			// Key a Xchild of parent Key
-			// In WSA EJB component inheritance, the root EJB must define the key.
-			// The key is the same for all child EJBs.
-			if (supertype instanceof Entity) {
-				parentKey = ((Entity) supertype).getPrimaryKey();
-
-				if ((thisKey == null) || (parentKey == null) || !thisKey.equals(parentKey)) {
-					String[] msgParm = new String[] { bean.getName(), parentKey.getQualifiedName()};
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2106, IEJBValidationContext.ERROR, bean, msgParm, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-		
-//		validateAppendixB(vc, supertype, parentKey);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar11VRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar11VRule.java
deleted file mode 100644
index a5f564dee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar11VRule.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-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.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This class checks ejb-jar.xml for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * 15.2.5.3 Declaration of security roles referenced from the bean's code
- * The Bean Provider is responsible for declaring in the security-role-ref elements of the deploy-ment
- * descriptor all the security role names used in the enterprise bean code. Declaring the security roles
- * references in the code allows the Application Assembler or Deployer to link the names of the security
- * roles used in the code to the security roles defined for an assembled application through the secu-rity-
- * role elements.
- * The Bean Provider must declare each security role referenced in the code using the secu-rity-
- * role-ref element as follows:
- *      Declare the name of the security role using the role-name element. The name must be the
- * security role name that is used as a parameter to the isCallerInRole(String role-Name)
- * method.
- *      Optional: Provide a description of the security role in the description element.
- * A security role reference, including the name defined by the role-name element, is scoped to the ses-sion
- * or entity bean element whose declaration contains the security-role-ref element.
- * The following example illustrates how an enterprise bean's references to security roles are declared in
- * the deployment descriptor.
- *    ...
- *    <enterprise-beans>
- *       ...
- *       <entity>
- *          <ejb-name>AardvarkPayroll</ejb-name>
- *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
- *          ...
- *          <security-role-ref>
- *             <description>
- *                 This security role should be assigned to the
- *                 employees of the payroll department who are
- *                 allowed to update employees' salaries.
- *             </description>
- *             <role-name>payroll</role-name>
- *          </security-role-ref>
- *          ...
- *       </entity>
- *       ...
- *    </enterprise-beans>
- *    ...
- *
- * The deployment descriptor above indicates that the enterprise bean AardvarkPayroll makes the
- * security check using isCallerInRole("payroll") in its business method.
- *
- *
- * 15.3.3 Linking security role references to security roles
- * If the Application Assembler defines the security-role elements in the deployment descriptor, he
- * or she is also responsible for linking all the security role references declared in the secu-rity-
- * role-ref elements to the security roles defined in the security-role elements.
- * The Application Assembler links each security role reference to a security role using the role-link
- * element. The value of the role-link element must be the name of one of the security roles defined in
- * a security-role element.
- * A role-link element must be used even if the value of role-name is the same as the value of the
- * role-link reference.
- * The following deployment descriptor example shows how to link the security role reference named
- * payroll to the security role named payroll-department.
- *    ...
- *    <enterprise-beans>
- *       ...
- *       <entity>
- *          <ejb-name>AardvarkPayroll</ejb-name>
- *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
- *          ...
- *          <security-role-ref>
- *             <description>
- *                This role should be assigned to the
- *                employees of the payroll department.
- *                Members of this role have access to
- *                anyone's payroll record.
- *
- *                The role has been linked to the
- *                payroll-department role.
- *             </description>
- *             <role-name>payroll</role-name>
- *             <role-link>payroll-department</role-link>
- *          </security-role-ref>
- *          ...
- *       </entity>
- *       ...
- *    </enterprise-beans>
- *    ...
- */
-public class EJBJar11VRule extends AValidationRule implements IMessagePrefixEjb11Constants {
-	private DuplicatesTable _ejbName = null;
-	private static final Object ID = IValidationRuleList.EJB11_EJBJAR;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_SESSION_BEANCLASS, IValidationRuleList.EJB11_SESSION_REMOTE, IValidationRuleList.EJB11_SESSION_HOME, IValidationRuleList.EJB11_CMP_BEANCLASS, IValidationRuleList.EJB11_CMP_REMOTE, IValidationRuleList.EJB11_CMP_HOME, IValidationRuleList.EJB11_CMP_KEYCLASS, IValidationRuleList.EJB11_BMP_BEANCLASS, IValidationRuleList.EJB11_BMP_REMOTE, IValidationRuleList.EJB11_BMP_HOME, IValidationRuleList.EJB11_BMP_KEYCLASS, IValidationRuleList.EJB11_EJBEXT};
-	
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2814, new String[]{CHKJ2814 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2825, new String[]{CHKJ2825 + SPEC});
-		MESSAGE_IDS.put(CHKJ2826, new String[]{CHKJ2826 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2842, new String[]{CHKJ2842 + SPEC});
-		MESSAGE_IDS.put(CHKJ2843, new String[]{CHKJ2843 + SPEC});
-		MESSAGE_IDS.put(CHKJ2844, new String[]{CHKJ2844 + SPEC});
-		MESSAGE_IDS.put(CHKJ2845, new String[]{CHKJ2845 + SPEC});
-		MESSAGE_IDS.put(CHKJ2846, new String[]{CHKJ2846 + SPEC});
-		MESSAGE_IDS.put(CHKJ2847, new String[]{CHKJ2847 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2850, new String[]{CHKJ2850 + SPEC});
-		MESSAGE_IDS.put(CHKJ2852, new String[]{CHKJ2852});
-
-		MESSAGE_IDS.put(CHKJ2875, new String[]{CHKJ2875 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2895, new String[]{CHKJ2895 + SPEC});
-	}
-	
-	public EJBJar11VRule() {
-		_ejbName = new DuplicatesTable();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public Object getTarget(Object parent, Object target) {
-		return null;
-	}
-
-	/**
-	 * 15.3.1 Security roles
-	 * The Application Assembler can define one or more security roles in 
-	 * the deployment descriptor. The Application Assembler then assigns 
-	 * groups of methods of the enterprise beans' home and remote interfaces
-	 * to the security roles to define the security view of the application.
-	 * Because the Application Assembler does not, in general, know the 
-	 * security environment of the operational environment, the security 
-	 * roles are meant to be logical roles (or actors), each representing 
-	 * a type of user that should have the same access rights to the 
-	 * application. The Deployer then assigns user groups and/or user 
-	 * accounts defined in the operational environment to the security roles 
-	 * defined by the Application Assembler.
-	 *    Defining the security roles in the deployment descriptor is optional [17]
-	 * for the Application Assembler.  Their omission in the deployment 
-	 * descriptor means that the Application Assembler chose not to pass any 
-	 * security deployment related instructions to the Deployer in the 
-	 * deployment descriptor. The Application Assembler is responsible for 
-	 * the following:
-	 *    - Define each security role using a security-role element.
-	 *    - Use the role-name element to define the name of the security role.
-	 *    - Optionally, use the description element to provide a description of 
-	 *      a security role.
-	 * The security roles defined by the security-role elements are scoped to 
-	 * the ejb-jar file level, and apply to all the enterprise beans in the 
-	 * ejb-jar file.
-	 * [17] If the Application Assembler does not define security roles in the 
-	 * deployment descriptor, the Deployer will have to define security
-	 * roles at deployment time.
-	 *...
-	*/
-	protected void validateAssemblyDescriptorElement(IEJBValidationContext vc, EJBJar ejbJar) {
-		vc.terminateIfCancelled();
-
-		// Validate the security roles, if they're defined in the assembly-descriptor.
-		if (ejbJar == null) {
-			// nothing to validate
-			return;
-		}
-
-		/**
-		 * Need to build up a list of duplicate role names, but the validation message
-		 * needs to be registered against the duplicate SecurityRole instance.
-		 * (Without the instance, we cannot get line numbers.)
-		 *
-		 * This class wrappers the SecurityRol instance so that the wrapper's
-		 * implemention of equals compares the names, but the validation message will
-		 * still be able to get the ref from the duplicate name.
-		 */
-		class RoleWrapper {
-			private SecurityRole _role = null;
-
-			public RoleWrapper(SecurityRole role) {
-				_role = role;
-			}
-
-			public boolean equals(Object o) {
-				if (o instanceof RoleWrapper) {
-					RoleWrapper other = (RoleWrapper) o;
-					return _role.getRoleName().equals(other.getRole().getRoleName());
-				}
-				return false;
-			}
-
-			public SecurityRole getRole() {
-				return _role;
-			}
-		}
-
-		AssemblyDescriptor assemblyDescriptor = ejbJar.getAssemblyDescriptor();
-		if (assemblyDescriptor == null) {
-			// nothing to validate
-			return;
-		}
-
-		List roles = assemblyDescriptor.getSecurityRoles();
-		if (roles != null) {
-			DuplicatesTable roleNames = new DuplicatesTable();
-			SecurityRole role = null;
-			Iterator roleIt = roles.iterator();
-			while (roleIt.hasNext()) {
-				vc.terminateIfCancelled();
-				// Check that the role-name element has been set
-				role = (SecurityRole) roleIt.next();
-				if (role == null) {
-					// role-name not set
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2825, IEJBValidationContext.WARNING, ejbJar, this);
-					vc.addMessage(message);
-				}
-				else if ((!role.eIsSet(CommonPackage.eINSTANCE.getSecurityRole_RoleName())) || (role.getRoleName().equals(""))) { //$NON-NLS-1$
-					// role-name not set
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2825, IEJBValidationContext.WARNING, role, this);
-					vc.addMessage(message);
-				}
-				else {
-					// Build up hashtable to check for duplicate role-names.
-					roleNames.add(new RoleWrapper(role));
-				}
-			}
-
-			// Check that there are no duplicate role-names. (15.3.1)
-			if (roleNames.containsDuplicates()) {
-				List duplicates = roleNames.getDuplicates();
-				Iterator iterator = duplicates.iterator();
-				while (iterator.hasNext()) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2826, IEJBValidationContext.WARNING, ((RoleWrapper) iterator.next()).getRole(), this);
-					vc.addMessage(message);
-				}
-			}
-			roleNames.clear();
-		}
-
-		List methTrans = assemblyDescriptor.getMethodTransactions();
-		MethodTransaction mt = null;
-		Iterator iterator = methTrans.iterator();
-		while (iterator.hasNext()) {
-			vc.terminateIfCancelled();
-
-			try {
-				mt = (MethodTransaction) iterator.next();
-			}
-			catch (Throwable exc) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINER)) {
-					logger.write(Level.FINER, exc);
-				}
-				mt = null;
-			}
-
-			if (mt == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("DDValidator.validateAssemblyDescriptorElement"); //$NON-NLS-1$
-					entry.setText("mt is null"); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-
-			boolean hasValidMethod = validateMethodElements(vc, ejbJar, mt.getMethodElements());
-			if (!hasValidMethod) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2847, IEJBValidationContext.WARNING, mt, this);
-				vc.addMessage(message);
-			}
-		}
-
-		List methodPermissions = assemblyDescriptor.getMethodPermissions();
-		iterator = methodPermissions.iterator();
-		while (iterator.hasNext()) {
-			MethodPermission mp = (MethodPermission) iterator.next();
-
-			boolean hasValidMethod = validateMethodElements(vc, ejbJar, mp.getMethodElements());
-			if (!hasValidMethod) {
-				// 15.3.2, p. 229, a <method-permission> must have at least one method listed (and that method must be found)
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2846, IEJBValidationContext.WARNING, mp, this);
-				vc.addMessage(message);
-			}
-
-			// at least one security-role must be defined
-			List mproles = mp.getRoles();
-			if ((mproles == null) || (mproles.size() == 0)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2845, IEJBValidationContext.WARNING, mp, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * This validateDeploymentDescriptor is called if the EJBJar could load, which means
-	 * that the syntax of the JAR is (mostly) correct.
-	 *
-	 * EJB spec 1.1, section C.4, "Added the requirement for the Bean Provider to specify whether the
-	 * enterprise bean uses a bean-managed or container-managed transaction."
-	 */
-	public void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationException {
-		EJBJar ejbJar = (EJBJar) target;
-		List enterpriseBeans = ejbJar.getEnterpriseBeans();
-		Iterator iterator = enterpriseBeans.iterator();
-		EnterpriseBean bean = null;
-		String beanName = null;
-		while (iterator.hasNext()) {
-			try {
-				bean = (EnterpriseBean) iterator.next();
-				register(vc, ejbJar, bean);
-
-				Object id = IValidationRuleList.EJB11_ENTERPRISEBEAN;
-				IValidationRule vRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-				if (vRule == null) {
-					// This has already been logged by the AbstractEJBValidationRuleFactory, so just
-					// need to add "Cannot validate" to the task list.
-					continue;
-				}
-				try {
-					vRule.preValidate(vc, ejbJar, bean);
-					vRule.validate(vc, ejbJar, bean);
-					vRule.postValidate(vc, ejbJar, bean);
-				}
-				catch (ValidationCancelledException exc) {
-					// Clean up the messages which are on the task list? Or is it nicer to leave them behind?
-				}
-				catch(ValidationException e) {
-					throw e;
-				}
-				catch (Throwable exc) {
-					addInternalErrorMessage(vc, exc);
-				}
-				finally {
-					EJBValidationRuleFactory.getFactory().release(vRule);
-				}
-			}
-			catch(ValidationCancelledException e) {
-				throw e;
-			}
-			catch (ValidationException e) {
-				throw e;
-			}
-			catch (Throwable exc) {
-				// If there's a problem, proceed with the next bean.
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[] { J2EEConstants.EJBJAR_DD_SHORT_NAME, beanName }, this);
-				vc.addMessage(message);
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-					logger.write(Level.SEVERE, exc);
-				}
-			}
-		}
-
-		// Since the assembly descriptor is not specific to a bean, validate it once, after all bean processing is complete.
-		validateAssemblyDescriptorElement(vc, ejbJar);
-		validateUniqueEjbNames(vc, ejbJar);
-		validateClientJAR(vc, ejbJar);
-	}
-	
-	public void reset() {
-		super.reset();
-		_ejbName.clear();
-	}
-	
-	protected void register(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// To check if every bean name is unique, need to build a list
-		_ejbName.add(new EjbNameWrapper(bean));
-	}
-
-	private void addInternalErrorMessage(IEJBValidationContext vc, Throwable exc) {
-		IMessage mssg = vc.getMessage();
-		mssg.setId(IEJBValidatorMessageConstants.CHKJ2900);
-		vc.addMessage(mssg);
-
-		if(exc != null) {
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-				logger.write(Level.SEVERE, exc);
-			}
-		}
-	}
-	
-	public void validateUniqueEjbNames(IEJBValidationContext vc, EJBJar ejbJar) {
-		List names = _ejbName.getDuplicates();
-		if(names.size() == 0) {
-			return;
-		}
-		
-		Iterator iterator = names.iterator();
-		while(iterator.hasNext()) {
-			EjbNameWrapper wrapper = (EjbNameWrapper)iterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2895, IEJBValidationContext.WARNING, wrapper.getBean(), new String[]{wrapper.getBean().getName()}, this);
-			vc.addMessage(message);
-		}
-	}
-
-	protected void validateClientJAR(IEJBValidationContext vc, EJBJar ejbJar) {
-		String clientJARName = ejbJar.getEjbClientJar();
-		if(clientJARName == null) {
-			// No client JAR specified; everything's okay.
-			return;
-		}
-		
-		Boolean exists = (Boolean)vc.loadModel(EJBValidatorModelEnum.EJB_CLIENTJAR, new Object[]{clientJARName});
-		if(exists == null) {
-			// Helper doesn't support load model. WAS?
-			// Can't perform this check, so just return.
-			return;
-		}
-		
-		if(!exists.booleanValue()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2875, IEJBValidationContext.ERROR, ejbJar, new String[]{clientJARName}, this);
-			vc.addMessage(message);
-		}
-	}
-
-	/**
-	 * Both section 11.4.1 and 15.3.2 need the <method> element. Also refer
-	 * to 16.5 for syntax.
-	 *
-	 * Return true if at least one of the methods referenced by this list of 
-	 * MethodElement can be found.
-	*/
-	protected boolean validateMethodElements(IEJBValidationContext vc, EJBJar ejbJar, List elements) {
-		if ((elements == null) || (elements.size() == 0)) {
-			return false;
-		}
-
-		boolean hasValidMethod = false;
-		Iterator iterator = elements.iterator();
-		while (iterator.hasNext()) {
-			vc.terminateIfCancelled();
-			MethodElement element = (MethodElement) iterator.next();
-
-			EnterpriseBean bean = element.getEnterpriseBean();
-			if (bean == null) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2814, IEJBValidationContext.WARNING, element, this);
-				vc.addMessage(message);
-				continue;
-			}
-
-			if (element.getName() != null) {
-				// Do not attempt to access the methods on the home or remote interface if there'
-				// been a problem locating or reflecting those types
-				boolean reflected = true;
-				try {
-					ValidationRuleUtility.isValidType(bean.getHomeInterface());
-				}
-				catch (InvalidInputException e) {
-					reflected = false;
-					String className = (e.getJavaClass() == null) ? IEJBValidatorConstants.NULL_HOME : e.getJavaClass().getQualifiedName();
-					String[] msgParm = { className };
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2850, IEJBValidationContext.WARNING, bean, msgParm, this);
-					vc.addMessage(message);
-				}
-				try {
-					ValidationRuleUtility.isValidType(bean.getRemoteInterface());
-				}
-				catch (InvalidInputException e) {
-					reflected = false;
-					String className = (e.getJavaClass() == null) ? IEJBValidatorConstants.NULL_REMOTE : e.getJavaClass().getQualifiedName();
-					String[] msgParm = { className };
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2850, IEJBValidationContext.WARNING, bean, msgParm, this);
-					vc.addMessage(message);
-				}
-				
-				if(reflected) {
-					// The "element.getMethods()" has a null pointer exception when it attempts to retrieve the methods from the home/remote interface,
-					// if either of the interfaces don't exist.
-					String name = element.getName();
-
-					Method[] methods = element.getMethods(); // get all methods which will be retrieved for the given method-permission
-					boolean hasMethods = ((methods != null) && (methods.length > 0));
-
-					if (!hasMethods) {
-						// warning
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2843, IEJBValidationContext.WARNING, element, new String[] { bean.getName()}, this);
-						vc.addMessage(message);
-					}
-					else {
-						hasValidMethod = true; // a <method-permission> must have at least one method (15.3.2, p.229)
-						if (name.equals("*")) { //$NON-NLS-1$
-							List params = element.getMethodParams();
-							if ((params != null) && (params.size() > 0)) {
-								// warning
-								IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2842, IEJBValidationContext.WARNING, element, this);
-								vc.addMessage(message);
-							}
-						}
-					}
-				}
-			}
-			else {
-				// error
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2844, IEJBValidationContext.WARNING, element, this);
-				vc.addMessage(message);
-			}
-		}
-
-		return hasValidMethod;
-	}
-	
-	/**
-	 * Need to build up a list of duplicate EJB names, but the validation message
-	 * needs to be registered against the duplicate EnterpriseBean instance.
-	 * (Without the instance, we cannot get line numbers.)
-	 *
-	 * This class wrappers the EnterpriseBean instance so that the wrapper's
-	 * implemention of equals compares the names, but the validation message will
-	 * still be able to get the ref from the duplicate name.
-	 */
-	class EjbNameWrapper {
-		private EnterpriseBean _bean = null;
-
-		public EjbNameWrapper(EnterpriseBean bean) {
-			_bean = bean;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof EjbNameWrapper) {
-				EjbNameWrapper other = (EjbNameWrapper)o;
-				if((_bean.getName() == null) && (other.getBean().getName() == null)) {
-					return true;
-				}
-				else if(_bean.getName() == null) {
-					return false;
-				}
-				else if(other.getBean().getName() == null) {
-					return false;
-				}
-				return _bean.getName().equals(other.getBean().getName());
-			}
-			return false;
-		}
-		
-		public int hashCode() {
-			if((getBean() != null) && (getBean().getName() != null)) {
-				return getBean().getName().hashCode();
-			}
-			return super.hashCode();
-		}
-
-		public EnterpriseBean getBean() {
-			return _bean;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar20VRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar20VRule.java
deleted file mode 100644
index 1d8726b85..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar20VRule.java
+++ /dev/null
@@ -1,879 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-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.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * @version 	1.0
- * @author
- */
-public class EJBJar20VRule extends AValidationRule implements IMessagePrefixEjb20Constants {
-	private static final Map MESSAGE_IDS;
-	private DuplicatesTable _ejbName = null;
-	private DuplicatesTable _asName = null;
-	private DuplicatesTable _relationshipName = null;
-	private DuplicatesTable _relationshipRoleName = null;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS, IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE, IValidationRuleList.EJB20_STATELESS_SESSION_HOME, IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL, IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME, IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS, IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE, IValidationRuleList.EJB20_STATEFUL_SESSION_HOME, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME, IValidationRuleList.EJB20_CMP_BEANCLASS, IValidationRuleList.EJB20_CMP_REMOTE, IValidationRuleList.EJB20_CMP_HOME, IValidationRuleList.EJB20_CMP_LOCAL, IValidationRuleList.EJB20_CMP_LOCALHOME, IValidationRuleList.EJB20_CMP_KEYCLASS, IValidationRuleList.EJB20_BMP_BEANCLASS, IValidationRuleList.EJB20_BMP_REMOTE, IValidationRuleList.EJB20_BMP_HOME, IValidationRuleList.EJB20_BMP_LOCAL, IValidationRuleList.EJB20_BMP_LOCALHOME, IValidationRuleList.EJB20_BMP_KEYCLASS, IValidationRuleList.EJB20_MESSAGE_BEANCLASS, IValidationRuleList.EJB20_EJBEXT};
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2800_NAMED, new String[]{CHKJ2800_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2800_UNNAMED, new String[]{CHKJ2800_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2802_NAMED, new String[]{CHKJ2802_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2802_UNNAMED, new String[]{CHKJ2802_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2803_NAMED, new String[]{CHKJ2803_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2803_UNNAMED, new String[]{CHKJ2803_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2804_NAMED, new String[]{CHKJ2804_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2804_UNNAMED, new String[]{CHKJ2804_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2805_NAMED, new String[]{CHKJ2805_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2805_UNNAMED, new String[]{CHKJ2805_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2806, new String[]{CHKJ2806+SPEC});
-		MESSAGE_IDS.put(CHKJ2807, new String[]{CHKJ2807+SPEC});
-		MESSAGE_IDS.put(CHKJ2808, new String[]{CHKJ2808+SPEC});
-		MESSAGE_IDS.put(CHKJ2809, new String[]{CHKJ2809+SPEC});
-		MESSAGE_IDS.put(CHKJ2810_NAMED, new String[]{CHKJ2810_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2810_UNNAMED, new String[]{CHKJ2810_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2811_NAMED, new String[]{CHKJ2811_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2814, new String[]{CHKJ2814+SPEC});
-		MESSAGE_IDS.put(CHKJ2816, new String[]{CHKJ2816+SPEC});
-		MESSAGE_IDS.put(CHKJ2817, new String[]{CHKJ2817+SPEC});
-		MESSAGE_IDS.put(CHKJ2818, new String[]{CHKJ2818+SPEC});
-		MESSAGE_IDS.put(CHKJ2820, new String[]{CHKJ2820+SPEC});
-		MESSAGE_IDS.put(CHKJ2821, new String[]{CHKJ2821+SPEC});
-		MESSAGE_IDS.put(CHKJ2822, new String[]{CHKJ2822+SPEC});
-		MESSAGE_IDS.put(CHKJ2823, new String[]{CHKJ2823+SPEC});
-		MESSAGE_IDS.put(CHKJ2824, new String[]{CHKJ2824+SPEC});
-		MESSAGE_IDS.put(CHKJ2825, new String[]{CHKJ2825+SPEC});
-		MESSAGE_IDS.put(CHKJ2826, new String[]{CHKJ2826+SPEC});
-		MESSAGE_IDS.put(CHKJ2827, new String[]{CHKJ2827+SPEC});
-		MESSAGE_IDS.put(CHKJ2828, new String[]{CHKJ2828+SPEC});
-		MESSAGE_IDS.put(CHKJ2829, new String[]{CHKJ2829+SPEC});
-		MESSAGE_IDS.put(CHKJ2830, new String[]{CHKJ2830+SPEC});
-		MESSAGE_IDS.put(CHKJ2831, new String[]{CHKJ2831+SPEC});
-		MESSAGE_IDS.put(CHKJ2832, new String[]{CHKJ2832+SPEC});
-		MESSAGE_IDS.put(CHKJ2833, new String[]{CHKJ2833+SPEC});
-		MESSAGE_IDS.put(CHKJ2834, new String[]{CHKJ2834+SPEC});
-		MESSAGE_IDS.put(CHKJ2835, new String[]{CHKJ2835+SPEC});
-		MESSAGE_IDS.put(CHKJ2836, new String[]{CHKJ2836+SPEC});
-		MESSAGE_IDS.put(CHKJ2837, new String[]{CHKJ2837+SPEC});
-		MESSAGE_IDS.put(CHKJ2838, new String[]{CHKJ2838+SPEC});
-		MESSAGE_IDS.put(CHKJ2839, new String[]{CHKJ2839+SPEC});
-		MESSAGE_IDS.put(CHKJ2841, new String[]{CHKJ2841+SPEC});
-		MESSAGE_IDS.put(CHKJ2842, new String[]{CHKJ2842+SPEC});
-		MESSAGE_IDS.put(CHKJ2843, new String[]{CHKJ2843+SPEC});
-		MESSAGE_IDS.put(CHKJ2844, new String[]{CHKJ2844+SPEC});
-		MESSAGE_IDS.put(CHKJ2845, new String[]{CHKJ2845+SPEC});
-		MESSAGE_IDS.put(CHKJ2846, new String[]{CHKJ2846+SPEC});
-		MESSAGE_IDS.put(CHKJ2847, new String[]{CHKJ2847+SPEC});
-		MESSAGE_IDS.put(CHKJ2848, new String[]{CHKJ2848+SPEC});
-		MESSAGE_IDS.put(CHKJ2850, new String[]{CHKJ2850+SPEC});
-		MESSAGE_IDS.put(CHKJ2854, new String[]{CHKJ2854+SPEC});
-		MESSAGE_IDS.put(CHKJ2855, new String[]{CHKJ2855+SPEC});
-		MESSAGE_IDS.put(CHKJ2856, new String[]{CHKJ2856+SPEC});
-		MESSAGE_IDS.put(CHKJ2857, new String[]{CHKJ2857+SPEC});
-		MESSAGE_IDS.put(CHKJ2858, new String[]{CHKJ2858+SPEC});
-		MESSAGE_IDS.put(CHKJ2859, new String[]{CHKJ2859+SPEC});
-		MESSAGE_IDS.put(CHKJ2860, new String[]{CHKJ2860+SPEC});
-		MESSAGE_IDS.put(CHKJ2866, new String[]{CHKJ2866+SPEC});
-		MESSAGE_IDS.put(CHKJ2867, new String[]{CHKJ2867+SPEC});
-		MESSAGE_IDS.put(CHKJ2868, new String[]{CHKJ2868+SPEC});
-		MESSAGE_IDS.put(CHKJ2869, new String[]{CHKJ2869+SPEC});
-		MESSAGE_IDS.put(CHKJ2871, new String[]{CHKJ2871+SPEC});
-		MESSAGE_IDS.put(CHKJ2872, new String[]{CHKJ2872+SPEC});
-		MESSAGE_IDS.put(CHKJ2873, new String[]{CHKJ2873+SPEC});
-		MESSAGE_IDS.put(CHKJ2874, new String[]{CHKJ2874+SPEC});
-		MESSAGE_IDS.put(CHKJ2875, new String[]{CHKJ2875 + SPEC});
-		MESSAGE_IDS.put(CHKJ2895, new String[]{CHKJ2895+SPEC});
-		MESSAGE_IDS.put(CHKJ2852, new String[]{CHKJ2852});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public EJBJar20VRule() {
-		_ejbName = new DuplicatesTable();
-		_asName = new DuplicatesTable();
-		_relationshipName = new DuplicatesTable();
-		_relationshipRoleName = new DuplicatesTable();
-	}
-	
-	public Object[] getDependsOn() {
-		// EJBJar doesn't depend on anything else
-		return DEPENDS_ON;
-	}
-
-	public Object getId() {
-		return IValidationRuleList.EJB20_EJBJAR;
-	}
-
-	public Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-
-	public Object getTarget(Object parent, Object clazz) {
-		// Since this rule doesn't depend on another rule, this
-		// method (which is called on a dependent rule) will never
-		// be called.
-		return null;
-	}
-
-	/*
-	 * @see IValidationRule#reset()
-	 */
-	public void reset() {
-		super.reset();
-		_ejbName.clear();
-		_asName.clear();
-		_relationshipName.clear();
-		_relationshipRoleName.clear();
-	}
-
-	protected void addInternalErrorMessage(IEJBValidationContext vc, Throwable exc) {
-		IMessage mssg = vc.getMessage();
-		mssg.setId(IEJBValidatorMessageConstants.CHKJ2900);
-		vc.addMessage(mssg);
-
-		if(exc != null) {
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-				logger.write(Level.SEVERE, exc);
-			}
-		}
-	}
-	
-	protected void logMissingRule(IEJBValidationContext vc, Object ruleId) {
-		log(vc, ruleId + " = null"); //$NON-NLS-1$
-		addInternalErrorMessage(vc, null);
-	}
-	
-	protected void log(IEJBValidationContext vc, String message) {
-		Logger logger = vc.getMsgLogger();
-		if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-			logger.write(Level.SEVERE, message);
-		}
-	}
-	
-	/*
-	 * @see IValidationRule#validate(IEJBValidationContext, Object, Object)
-		 */
-	public void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		Logger logger = vc.getMsgLogger();
-		if(logger != null && logger.isLoggingLevel(Level.FINEST)) {
-			LogEntry entry = vc.getLogEntry();
-			entry.setSourceID("EJBJar20VRule - validate"); //$NON-NLS-1$
-			entry.setText(getClass().getName() + "::validate(" + targetParent + ", " + target); //$NON-NLS-1$ //$NON-NLS-2$
-			logger.write(Level.FINEST, entry);
-		}
-		
-		EJBJar ejbJar = (EJBJar) target;
-		List beans = ejbJar.getEnterpriseBeans();
-		Iterator iterator = beans.iterator();
-		EnterpriseBean bean = null;
-		while (iterator.hasNext()) {
-			try {
-				bean = (EnterpriseBean) iterator.next();
-
-				register(vc, ejbJar, bean);
-	
-				Object id = null;			
-				switch(bean.getVersionID()) {
-					case J2EEVersionConstants.EJB_1_0_ID:
-					case J2EEVersionConstants.EJB_1_1_ID:
-						id = IValidationRuleList.EJB11_ENTERPRISEBEAN;
-						break;
-					case J2EEVersionConstants.EJB_2_0_ID:
-					case J2EEVersionConstants.EJB_2_1_ID: 
-						id = IValidationRuleList.EJB20_ENTERPRISEBEAN;
-						break; 
-					default:
-						// What version is it then?
-						if(bean instanceof ContainerManagedEntity) {
-							validateCMPVersionElement(vc, ejbJar, (ContainerManagedEntity)bean);
-						}
-						else {
-							// log
-							log(vc, "!bean.isVersion1_X() && !bean.isVersion2_X()"); //$NON-NLS-1$
-						}
-						continue;
-				}				 
-				
-				IValidationRule vRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-				if(vRule == null) {
-					logMissingRule(vc, id);
-					continue;
-				}
-				try {
-					vRule.preValidate(vc, ejbJar, bean);
-					vRule.validate(vc, ejbJar, bean);
-					vRule.postValidate(vc, ejbJar, bean);
-				}
-				catch(ValidationCancelledException exc) {
-					// Clean up the messages which are on the task list? Or is it nicer to leave them behind?
-					throw exc;
-				}
-				catch(ValidationException e) {
-					throw e;
-				}
-				catch(Throwable exc) {
-					addInternalErrorMessage(vc, exc);
-				}
-				finally {
-					EJBValidationRuleFactory.getFactory().release(vRule);
-				}
-				
-			}
-			catch(ValidationCancelledException e) {
-				throw e;
-			}
-			catch(ValidationException exc) {
-				// something goes wrong, just proceed with the next bean
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[]{J2EEConstants.EJBJAR_DD_SHORT_NAME, bean.getName()}, this);
-				vc.addMessage(message);
-				if (logger.isLoggingLevel(Level.SEVERE)) {
-					logger.write(Level.SEVERE, exc);
-				}
-			}
-			catch (Throwable exc) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[]{J2EEConstants.EJBJAR_DD_SHORT_NAME, bean.getName()}, this);
-				vc.addMessage(message);
-				if (logger.isLoggingLevel(Level.SEVERE)) {
-					logger.write(Level.SEVERE, exc);
-				}
-			}
-		}
-
-		// Since the assembly descriptor is not specific to a bean, validate it once, after all bean processing is complete.
-		validateAssemblyDescriptorElement(vc, ejbJar);
-		//TODO The Datasource validation will be done by the extensions
-		validateUniqueEjbNames(vc, ejbJar);
-		validateUniqueAbstractSchemaNames(vc, ejbJar);
-		validateRelationships(vc, ejbJar);
-		validateClientJAR(vc, ejbJar);
-	}
-	
-	protected void register(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// To check if every bean name is unique, need to build a list
-		_ejbName.add(new EjbNameWrapper(bean));
-		
-		if((bean instanceof ContainerManagedEntity) && bean.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID) {
-			// To check if every bean name is unique, need to build a list
-			_asName.add(new ASNameWrapper((ContainerManagedEntity)bean));
-		}
-	}
-
-	protected void validateCMPVersionElement(IEJBValidationContext vc, EJBJar ejbJar, ContainerManagedEntity cmp) {
-		if(cmp.eIsSet(EjbPackage.eINSTANCE.getContainerManagedEntity_Version())) {
-			String version = cmp.getVersion();
-			if(! (ContainerManagedEntity.VERSION_1_X.equals(version) || ContainerManagedEntity.VERSION_2_X.equals(version))) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2872, IEJBValidationContext.ERROR, cmp, this);
-				vc.addMessage(message);
-			}			
-		}
-	}
-	
-		
-
-	protected void validateAssemblyDescriptorElement(IEJBValidationContext vc, EJBJar ejbJar) {
-		vc.terminateIfCancelled();
-
-		// Validate the security roles, if they're defined in the assembly-descriptor.
-		if (ejbJar == null) {
-			// nothing to validate
-			return;
-		}
-
-		/**
-		 * Need to build up a list of duplicate role names, but the validation message
-		 * needs to be registered against the duplicate SecurityRole instance.
-		 * (Without the instance, we cannot get line numbers.)
-		 *
-		 * This class wrappers the SecurityRol instance so that the wrapper's
-		 * implemention of equals compares the names, but the validation message will
-		 * still be able to get the ref from the duplicate name.
-		 */
-		class RoleWrapper {
-			private SecurityRole _role = null;
-
-			public RoleWrapper(SecurityRole role) {
-				_role = role;
-			}
-
-			public boolean equals(Object o) {
-				if (o instanceof RoleWrapper) {
-					RoleWrapper other = (RoleWrapper) o;
-					return _role.getRoleName().equals(other.getRole().getRoleName());
-				}
-				return false;
-			}
-
-			public SecurityRole getRole() {
-				return _role;
-			}
-		}
-
-		AssemblyDescriptor assemblyDescriptor = ejbJar.getAssemblyDescriptor();
-		if (assemblyDescriptor == null) {
-			// nothing to validate
-			return;
-		}
-
-		List roles = assemblyDescriptor.getSecurityRoles();
-		if (roles != null) {
-			DuplicatesTable roleNames = new DuplicatesTable();
-			SecurityRole role = null;
-			Iterator roleIt = roles.iterator();
-			while (roleIt.hasNext()) {
-				vc.terminateIfCancelled();
-				// Check that the role-name element has been set
-				role = (SecurityRole) roleIt.next();
-				if ((role == null) || (!role.eIsSet(CommonPackage.eINSTANCE.getSecurityRole_RoleName())) || (role.getRoleName().equals(""))) { //$NON-NLS-1$
-					// role-name not set
-					if(role == null) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2825, IEJBValidationContext.WARNING, role, this);
-						vc.addMessage(message);
-					}
-					else {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2825, IEJBValidationContext.WARNING, assemblyDescriptor, this);
-						vc.addMessage(message);
-					}
-				}
-				else {
-					// Build up hashtable to check for duplicate role-names.
-					roleNames.add(new RoleWrapper(role));
-				}
-			}
-
-			// Check that there are no duplicate role-names. (15.3.1)
-			if (roleNames.containsDuplicates()) {
-				List duplicates = roleNames.getDuplicates();
-				Iterator iterator = duplicates.iterator();
-				while (iterator.hasNext()) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2826, IEJBValidationContext.WARNING, ((RoleWrapper) iterator.next()).getRole(), this);
-					vc.addMessage(message);
-				}
-			}
-			roleNames.clear();
-		}
-
-		List methTrans = assemblyDescriptor.getMethodTransactions();
-		MethodTransaction mt = null;
-		Iterator iterator = methTrans.iterator();
-		while (iterator.hasNext()) {
-			vc.terminateIfCancelled();
-
-			try {
-				mt = (MethodTransaction) iterator.next();
-			}
-			catch (Throwable exc) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINER)) {
-					logger.write(Level.FINER, exc);
-				}
-				mt = null;
-			}
-
-			if (mt == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("EJBJar20VRule.validateAssemblyDescriptorElement"); //$NON-NLS-1$
-					entry.setText("mt is null"); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-
-			boolean hasValidMethod = validateMethodElements(vc, ejbJar, mt.getMethodElements());
-			if (!hasValidMethod) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2847, IEJBValidationContext.WARNING, mt, this);
-				vc.addMessage(message);
-			}
-		}
-
-		List methodPermissions = assemblyDescriptor.getMethodPermissions();
-		iterator = methodPermissions.iterator();
-		while (iterator.hasNext()) {
-			MethodPermission mp = (MethodPermission) iterator.next();
-
-			boolean hasValidMethod = validateMethodElements(vc, ejbJar, mp.getMethodElements());
-			if (!hasValidMethod) {
-				// 15.3.2, p. 229, a <method-permission> must have at least one method listed (and that method must be found)
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2846, IEJBValidationContext.WARNING, mp, this);
-				vc.addMessage(message);
-			}
-
-			// at least one security-role must be defined
-			List mproles = mp.getRoles();
-			if (((mproles == null) || (mproles.size() == 0)) && (!mp.isSetUnchecked())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2845, IEJBValidationContext.WARNING, mp, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-	protected void validateUniqueAbstractSchemaNames(IEJBValidationContext vc, EJBJar ejbJar) {
-		List names = _asName.getDuplicates();
-		if(names.size() == 0) {
-			return;
-		}
-		
-		Iterator iterator = names.iterator();
-		while(iterator.hasNext()) {
-			ASNameWrapper wrapper = (ASNameWrapper)iterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2854, IEJBValidationContext.ERROR, wrapper.getBean(), new String[]{wrapper.getBean().getAbstractSchemaName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	protected void validateUniqueEjbNames(IEJBValidationContext vc, EJBJar ejbJar) {
-		List names = _ejbName.getDuplicates();
-		if(names.size() == 0) {
-			return;
-		}
-		
-		Iterator iterator = names.iterator();
-		while(iterator.hasNext()) {
-			EjbNameWrapper wrapper = (EjbNameWrapper)iterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2895, IEJBValidationContext.WARNING, wrapper.getBean(), new String[]{wrapper.getBean().getName()}, this);
-			vc.addMessage(message);
-		}
-	}
-
-	protected void validateRelationships(IEJBValidationContext vc, EJBJar ejbJar) {
-		Relationships relationships = ejbJar.getRelationshipList();
-		if(relationships == null) {
-			return;
-		}
-		
-		List ejbRelationList = relationships.getEjbRelations();
-		Iterator iterator = ejbRelationList.iterator();
-		while(iterator.hasNext()) {
-			EJBRelation relation = (EJBRelation)iterator.next();
-			
-			_relationshipName.add(new EJBRelationNameWrapper(relation));
-			
-			boolean atLeastOneCmrFieldExists = false;
-			List roles = relation.getRelationshipRoles();
-			Iterator roleIterator = roles.iterator();
-			while(roleIterator.hasNext()) {
-				EJBRelationshipRole role = (EJBRelationshipRole)roleIterator.next();
-				
-				_relationshipRoleName.add(new EJBRelationshipRoleNameWrapper(role));
-
-				boolean validMultiplicity = role.isSetMultiplicity();
-				if(!validMultiplicity) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2818, IEJBValidationContext.INFO, role, this);
-					vc.addMessage(message);
-				}
-	
-				// 10.3.4.2 
-				// The cascade-delete element can only be specified for an ejb-relationship-role
-				// element contained in an ejb-relation element if the *other* ejb-relationship-role
-				// element in the same ejb-relation element specifies a multiplicity of One.
-				EJBRelationshipRole oppositeRole = role.getOpposite();
-				if(role.isSetCascadeDelete()) {
-					boolean isOtherMultiplicityOne = ((oppositeRole.isSetMultiplicity()) && (oppositeRole.getMultiplicity().getValue() == MultiplicityKind.ONE));
-					if(!isOtherMultiplicityOne) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2848, IEJBValidationContext.INFO, role, this);
-						vc.addMessage(message);
-					}
-				}
-				
-				CMRField cmrField = role.getCmrField();
-				if(cmrField != null) {
-					atLeastOneCmrFieldExists = true;
-					if(cmrField.eIsSet(EjbPackage.eINSTANCE.getCMRField_CollectionType())) {
-						String cmrFieldType = cmrField.getCollectionTypeName();
-						if((!ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION.equals(cmrFieldType)) &&
-							(!ITypeConstants.CLASSNAME_JAVA_UTIL_SET.equals(cmrFieldType))) {
-							// CHKJ2868: The value of the <cmr-field-type> element must be either "java.util.Collection" or "java.util.Set" (EJB 2.0: 10.3.13, 22.5).
-							IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2868, IEJBValidationContext.INFO, role, this);
-							vc.addMessage(message);
-						}
-					}
-				}
-				
-				RoleSource sourceRoleSource = role.getSource();
-				if(sourceRoleSource == null) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2821, IEJBValidationContext.INFO, role, new String[]{role.getName()}, this);
-					vc.addMessage(message);
-					continue;
-				}
-
-				Entity sourceEntity = sourceRoleSource.getEntityBean();
-				if(sourceEntity == null) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2821, IEJBValidationContext.INFO, role, new String[]{role.getName()}, this);
-					vc.addMessage(message);
-				}
-				else if(sourceEntity.isContainerManagedEntity()) {
-					// CHKJ2866: <cmr-field> {0} must be defined on {1} (EJB 2.0: 22.5).
-					if(cmrField != null) {
-						ContainerManagedEntity cmp = (ContainerManagedEntity)sourceEntity;
-						List cmrFields = cmp.getCMRFields();
-						boolean found_cmrField = false;
-						if((cmrFields != null) && (cmrFields.size() > 0)) {
-							found_cmrField = cmrFields.contains(cmrField);
-						}
-						
-						if(!found_cmrField) {
-							IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2866, IEJBValidationContext.INFO, role, new String[]{cmrField.getName(), sourceEntity.getName()}, this);
-							vc.addMessage(message);
-						}
-					}
-				}
-				else {
-					// CHKJ2871: <ejb-name> {0} must refer to a CMP bean (EJB 2.0: 10.3.2, 10.3.13).
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2871, IEJBValidationContext.INFO, role, new String[]{sourceEntity.getName()}, this);
-					vc.addMessage(message);
-				}
-				
-				if( oppositeRole == null )
-					continue;
-				RoleSource oppositeRoleSource = oppositeRole.getSource();
-				if(oppositeRoleSource == null) {
-					// Do not emit an error message - when we iterate to the role where
-					// this is the source, this error will be detected.
-					continue;
-				}
-
-				Entity targetEntity = oppositeRoleSource.getEntityBean();
-				if(targetEntity == null) {
-					// Do not emit an error message - when we iterate to the role where
-					// this is the source, this error will be detected.
-				}
-				else if(targetEntity.getLocalInterface() == null) {
-					// Does the target of this role have a local interface?
-					// CHKJ2867: This bean can have only unidirectional relationships to other beans (EJB 2.0: 10.3.2).
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2867, IEJBValidationContext.INFO, oppositeRole, this);
-					vc.addMessage(message);
-				}
-			}
-			
-			// Verify unique role names within the <ejb-relation>
-			validateUniqueRelationshipRoleNames(vc, ejbJar);
-			_relationshipRoleName.clear();
-			
-			if(!atLeastOneCmrFieldExists) {
-				// CHKJ2869I: At least one <ejb-relationship-role> must define a <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2869, IEJBValidationContext.INFO, relation, this);
-				vc.addMessage(message);
-			}
-		}
-		
-		validateUniqueRelationNames(vc, ejbJar);
-	}
-	
-	protected void validateUniqueRelationNames(IEJBValidationContext vc, EJBJar ejbJar) {
-		List names = _relationshipName.getDuplicates();
-		if(names.size() == 0) {
-			return;
-		}
-		
-		Iterator iterator = names.iterator();
-		while(iterator.hasNext()) {
-			EJBRelationNameWrapper wrapper = (EJBRelationNameWrapper)iterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2816, IEJBValidationContext.INFO, wrapper.getRelation(), new String[]{wrapper.getRelation().getName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	protected void validateUniqueRelationshipRoleNames(IEJBValidationContext vc, EJBJar ejbJar) {
-		List names = _relationshipRoleName.getDuplicates();
-		if(names.size() == 0) {
-			return;
-		}
-		
-		Iterator iterator = names.iterator();
-		while(iterator.hasNext()) {
-			EJBRelationshipRoleNameWrapper wrapper = (EJBRelationshipRoleNameWrapper)iterator.next();
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2817, IEJBValidationContext.INFO, wrapper.getRelationshipRole(), new String[]{wrapper.getRelationshipRole().getName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Both section 11.4.1 and 15.3.2 need the <method> element. Also refer
-	 * to 16.5 for syntax.
-	 *
-	 * Return true if at least one of the methods referenced by this list of 
-	 * MethodElement can be found.
-	*/
-	protected boolean validateMethodElements(IEJBValidationContext vc, EJBJar ejbJar, List elements) {
-		if ((elements == null) || (elements.size() == 0)) {
-			return false;
-		}
-
-		boolean hasValidMethod = false;
-		Iterator iterator = elements.iterator();
-		while (iterator.hasNext()) {
-			vc.terminateIfCancelled();
-			MethodElement element = (MethodElement) iterator.next();
-
-			EnterpriseBean bean = element.getEnterpriseBean();
-			if (bean == null) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2814, IEJBValidationContext.WARNING, element, this);
-				vc.addMessage(message);
-				continue;
-			}
-
-			if (element.getName() != null) {
-				String name = element.getName();
-
-				Method[] methods = element.getMethods(); // get all methods which will be retrieved for the given method-permission
-				boolean hasMethods = ((methods != null) && (methods.length > 0));
-
-				if (!hasMethods) {
-					// warning
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2843, IEJBValidationContext.WARNING, element, new String[] { bean.getName()}, this);
-					vc.addMessage(message);
-				}
-				else {
-					hasValidMethod = true; // a <method-permission> must have at least one method (15.3.2, p.229)
-					if (name.equals("*")) { //$NON-NLS-1$
-						List params = element.getMethodParams();
-						if ((params != null) && (params.size() > 0)) {
-							// warning
-							IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2842, IEJBValidationContext.WARNING, element, this);
-							vc.addMessage(message);
-						}
-					}
-				}
-			}
-			else {
-				// error
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2844, IEJBValidationContext.WARNING, element, this);
-				vc.addMessage(message);
-			}
-		}
-
-		return hasValidMethod;
-	}
-
-	protected void validateClientJAR(IEJBValidationContext vc, EJBJar ejbJar) {
-		String clientJARName = ejbJar.getEjbClientJar();
-		if(clientJARName == null) {
-			// No client JAR specified; everything's okay.
-			return;
-		}
-		
-		Boolean exists = (Boolean)vc.loadModel(EJBValidatorModelEnum.EJB_CLIENTJAR, new Object[]{clientJARName});
-		if(exists == null) {
-			// Helper doesn't support load model. WAS?
-			// Can't perform this check, so just return.
-			return;
-		}
-		
-		if(!exists.booleanValue()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2875, IEJBValidationContext.ERROR, ejbJar, new String[]{clientJARName}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	class ASNameWrapper {
-		private ContainerManagedEntity _bean = null;
-
-		public ASNameWrapper(ContainerManagedEntity bean) {
-			_bean = bean;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof ASNameWrapper) {
-				ASNameWrapper other = (ASNameWrapper)o;
-				if((_bean.getAbstractSchemaName() == null) && (other.getBean().getAbstractSchemaName() == null)) {
-					return true;
-				}
-				else if(_bean.getAbstractSchemaName() == null) {
-					return false;
-				}
-				else if(other.getBean().getAbstractSchemaName() == null) {
-					return false;
-				}
-				return _bean.getAbstractSchemaName().equals(other.getBean().getAbstractSchemaName());
-			}
-			return false;
-		}
-
-		public int hashCode() {
-			if((getBean() != null) && (getBean().getAbstractSchemaName() != null)) {
-				return getBean().getAbstractSchemaName().hashCode();
-			}
-			return super.hashCode();
-		}
-
-		public ContainerManagedEntity getBean() {
-			return _bean;
-		}
-	}
-
-	/**
-	 * Need to build up a list of duplicate EJB names, but the validation message
-	 * needs to be registered against the duplicate EnterpriseBean instance.
-	 * (Without the instance, we cannot get line numbers.)
-	 *
-	 * This class wrappers the EnterpriseBean instance so that the wrapper's
-	 * implemention of equals compares the names, but the validation message will
-	 * still be able to get the ref from the duplicate name.
-	 */
-	class EjbNameWrapper {
-		private EnterpriseBean _bean = null;
-
-		public EjbNameWrapper(EnterpriseBean bean) {
-			_bean = bean;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof EjbNameWrapper) {
-				EjbNameWrapper other = (EjbNameWrapper)o;
-				if((_bean.getName() == null) && (other.getBean().getName() == null)) {
-					return true;
-				}
-				else if(_bean.getName() == null) {
-					return false;
-				}
-				else if(other.getBean().getName() == null) {
-					return false;
-				}
-				return _bean.getName().equals(other.getBean().getName());
-			}
-			return false;
-		}
-		
-		public int hashCode() {
-			if((getBean() != null) && (getBean().getName() != null)) {
-				return getBean().getName().hashCode();
-			}
-			return super.hashCode();
-		}
-
-		public EnterpriseBean getBean() {
-			return _bean;
-		}
-	}
-
-	/**
-	 * Need to build up a list of duplicate relation names, but the validation message
-	 * needs to be registered against the duplicate EnterpriseBean instance.
-	 * (Without the instance, we cannot get line numbers.)
-	 *
-	 * This class wrappers the EnterpriseBean instance so that the wrapper's
-	 * implemention of equals compares the names, but the validation message will
-	 * still be able to get the ref from the duplicate name.
-	 */
-	class EJBRelationNameWrapper {
-		private EJBRelation _relation = null;
-
-		public EJBRelationNameWrapper(EJBRelation rel) {
-			_relation = rel;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof EJBRelationNameWrapper) {
-				EJBRelationNameWrapper other = (EJBRelationNameWrapper)o;
-				if((_relation.getName() == null) && (other.getRelation().getName() == null)) {
-					return true;
-				}
-				else if(_relation.getName() == null) {
-					return false;
-				}
-				else if(other.getRelation().getName() == null) {
-					return false;
-				}
-				return _relation.getName().equals(other.getRelation().getName());
-			}
-			return false;
-		}
-		
-		public int hashCode() {
-			if((getRelation() != null) && (getRelation().getName() != null)) {
-				return getRelation().getName().hashCode();
-			}
-			return super.hashCode();
-		}
-
-		public EJBRelation getRelation() {
-			return _relation;
-		}
-	}
-
-	/**
-	 * Need to build up a list of duplicate relation names, but the validation message
-	 * needs to be registered against the duplicate EnterpriseBean instance.
-	 * (Without the instance, we cannot get line numbers.)
-	 *
-	 * This class wrappers the EnterpriseBean instance so that the wrapper's
-	 * implemention of equals compares the names, but the validation message will
-	 * still be able to get the ref from the duplicate name.
-	 */
-	class EJBRelationshipRoleNameWrapper {
-		private EJBRelationshipRole _relationshipRole = null;
-
-		public EJBRelationshipRoleNameWrapper(EJBRelationshipRole role) {
-			_relationshipRole = role;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof EJBRelationshipRoleNameWrapper) {
-				EJBRelationshipRoleNameWrapper other = (EJBRelationshipRoleNameWrapper)o;
-				if((_relationshipRole.getRoleName() == null) && (other.getRelationshipRole().getRoleName() == null)) {
-					return true;
-				}
-				else if(_relationshipRole.getRoleName() == null) {
-					return false;
-				}
-				else if(other.getRelationshipRole().getRoleName() == null) {
-					return false;
-				}
-				return _relationshipRole.getRoleName().equals(other.getRelationshipRole().getRoleName());
-			}
-			return false;
-		}
-		
-		public int hashCode() {
-			if((getRelationshipRole() != null) && (getRelationshipRole().getRoleName() != null)) {
-				return getRelationshipRole().getRoleName().hashCode();
-			}
-			return super.hashCode();
-		}
-
-		public EJBRelationshipRole getRelationshipRole() {
-			return _relationshipRole;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationContext.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationContext.java
deleted file mode 100644
index 4f8ccdf10..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationContext.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.MessageFilter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * @version 	1.0
- * @author
- */
-public class EJBValidationContext implements IEJBValidationContext {
-	private IValidator _validator = null;
-	private IValidationContext _helper = null;
-	private IReporter _reporter = null;
-	private LogEntry logEntry = null;
-//	private IMessage _message = null;
-	
-	public EJBValidationContext(IValidator v, IValidationContext h, IReporter r) {
-		setValidator(v);
-		setHelper(h);
-		setReporter(r);
-	}
-	
-	public IValidator getValidator() {
-		return _validator;
-	}
-	
-	public void setValidator(IValidator v) {
-		_validator = v;
-	}
-	
-	public IValidationContext getHelper() {
-		return _helper;
-	}
-	
-	public void setHelper(IValidationContext h) {
-		_helper = h;
-	}
-	
-	public IReporter getReporter() {
-		return _reporter;
-	}
-	
-	public void setReporter(IReporter r) {
-		_reporter = r;
-	}
-	
- 	/*
- 	 * Returns an empty Message which can be reused.
- 	 */
- 	public IMessage getMessage() {
- 		IMessage message = new Message();
- 		message.setBundleName(IEJBValidatorConstants.BUNDLE_NAME);
- 		return message;
- 		/*
- 		if(_message == null) {
- 			_message = new Message();
- 		}
- 		
- 		reset(_message);
- 		_message.setBundleName(IEJBValidatorConstants.BUNDLE_NAME);
- 		
-		return _message;
-		*/
-	}
-	
-		/**
-	 * If, for performance reasons, an IMessage is reused instead of creating
-	 * a new one each time, this method resets the internal fields to the default.
-	 * 
-	 * This method should really be on the IMessage implementation itself, but
-	 * this'll do for now.
-	 */
-	protected void reset(IMessage message) {
-		message.setId(null);
-		message.setParams(null);
-		message.setSeverity(MessageFilter.ANY_SEVERITY);
-		message.setTargetObject(null);
-		message.setBundleName(null);
-		message.setGroupName(null);
-		message.setLineNo(IMessage.LINENO_UNSET);
-		message.setOffset(IMessage.OFFSET_UNSET);
-		message.setLength(IMessage.OFFSET_UNSET);
-	}
-	
-	
-	
-	public Logger getMsgLogger() {
-		return Logger.getLogger(IEJBValidatorConstants.J2EE_CORE_PLUGIN);
-	}
-	
-	public LogEntry getLogEntry() {
-	    if(logEntry == null)
-	        logEntry = new LogEntry(IEJBValidatorConstants.BUNDLE_NAME);
-		return logEntry;
-	}
-
-	public Object loadModel(String symbolicName) {
-		return getHelper().loadModel(symbolicName);
-	}
-	
-	public Object loadModel(String symbolicName, Object[] parms) {
-		return getHelper().loadModel(symbolicName, parms);
-	}
-	
-	public void removeAllMessages() {
-		getReporter().removeAllMessages(getValidator());
-	}
-	
-	public void removeMessages(Object target) {
-		getReporter().removeAllMessages(getValidator(), target);
-	}
-	
-	public void removeMessages(Object target, String groupIdentifier) {
-		getReporter().removeMessageSubset(getValidator(), target, groupIdentifier);
-	}
-	
-	public void addMessage(IMessage message) {
-		if(message == null) {
-			return;
-		}
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId) {
-		IMessage message = new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId);
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId, String[] parms) {
-		IMessage message = new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId,parms);
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId, Object target) {
-		IMessage message =  new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId,null,target);
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId, String[] parms, Object target) {
-		IMessage message =  new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId,parms,target);
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId, Object target, String groupName) {
-		/**
-		 * 11/28/05 Commenting the following line to get rid of Warning message
-		 * Quite possibly the getRoporter().addMessage needs to be used.
-		 * 
-		 */
-		
-		//IMessage message =  new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId,null,target,groupName);
-	}
-	
-	public void addMessage(int severity, String messageId, String[] parms, Object target, String groupName) {
-		IMessage message = new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId,parms,target,groupName);
-		getReporter().addMessage(getValidator(), message);
-	}
-
-	public void terminateIfCancelled() throws ValidationCancelledException {
-		if(getReporter().isCancelled()) {
-			throw new ValidationCancelledException();
-		}
-	}
-
-	public void subtask(String messageId) {
-		subtask(messageId, null);
-	}
-	
-	public void subtask(String messageId, String[] parms) {
-		if((messageId == null) || (messageId.equals(""))) { //$NON-NLS-1$
-			return;
-		}
-		IMessage message = getMessage();
-		message.setId(messageId);
-		message.setParams(parms);
-		getReporter().displaySubtask(getValidator(), message);
-	}
-
-	public String[] getURIs() {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationRuleFactory.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationRuleFactory.java
deleted file mode 100644
index 610ab0322..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationRuleFactory.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-/**
- * Core EJB Validation rules
- */
-public class EJBValidationRuleFactory extends AbstractEJBValidationRuleFactory {
-	private static EJBValidationRuleFactory _inst = null;
-	private Logger logger = null;
-	
-	public EJBValidationRuleFactory() {
-		createRuleList();
-	}
-	
-	public static EJBValidationRuleFactory getFactory() {
-		if(_inst == null) {
-			_inst = new EJBValidationRuleFactory();
-		}
-		return _inst;
-	}
-	protected Logger getMsgLogger(){
-	    if(logger == null)
-	        logger = Logger.getLogger(IEJBValidatorConstants.J2EE_CORE_PLUGIN);
-	    return logger;
-	}
-	private void createRuleList() {
-		_ruleList = new HashMap();
-
-		_ruleList.put(IValidationRuleList.EJB11_EJBJAR, new org.eclipse.jst.j2ee.model.internal.validation.EJBJar11VRule());
-		_ruleList.put(IValidationRuleList.EJB20_EJBJAR, new org.eclipse.jst.j2ee.model.internal.validation.EJBJar20VRule());
-	
-		_ruleList.put(IValidationRuleList.EJB11_ENTERPRISEBEAN, new org.eclipse.jst.j2ee.model.internal.validation.EnterpriseBean11VRule());
-		_ruleList.put(IValidationRuleList.EJB20_ENTERPRISEBEAN, new org.eclipse.jst.j2ee.model.internal.validation.EnterpriseBean20VRule());
-		
-		_ruleList.put(IValidationRuleList.EJB11_SESSION_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateSessionBean());
-		_ruleList.put(IValidationRuleList.EJB11_SESSION_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.ValidateSessionRemote());
-		_ruleList.put(IValidationRuleList.EJB11_SESSION_HOME, new org.eclipse.jst.j2ee.model.internal.validation.ValidateSessionHome());
-		
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_HOME, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionLocalHomeVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_HOME, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionLocalHomeVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB11_CMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateCMPBean());
-		_ruleList.put(IValidationRuleList.EJB11_CMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.ValidateCMPRemote());
-		_ruleList.put(IValidationRuleList.EJB11_CMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateCMPKey());
-		
-		_ruleList.put(IValidationRuleList.EJB20_CMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.CMPBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.CMPRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_HOME, new org.eclipse.jst.j2ee.model.internal.validation.CMPRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.CMPLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.CMPLocalHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.CMPKeyClassVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB11_BMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPBean());
-		_ruleList.put(IValidationRuleList.EJB11_BMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPRemote());
-		_ruleList.put(IValidationRuleList.EJB11_BMP_HOME, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPHome());
-		_ruleList.put(IValidationRuleList.EJB11_BMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPKey());
-
-		_ruleList.put(IValidationRuleList.EJB20_BMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.BMPBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.BMPRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_HOME, new org.eclipse.jst.j2ee.model.internal.validation.BMPRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.BMPLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.BMPLocalHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.BMPKeyClassVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB20_MESSAGE_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.MessageDrivenBeanClassVRule());
-		
-		addDependentRuleToRuleList();
-		logAllDependentRules();
-	}
-	
-	/**
-	 * If the IFileDelta represents a static load model (i.e., the file name is always the same),
-	 * then return the Integer which loads that model. Otherwise return null.
-	 */
-	public  Object getRuleId(IEJBValidationContext vc, String fileName) {
-		if(fileName == null) {
-			Logger aLogger = vc.getMsgLogger();
-			if (aLogger != null && aLogger.isLoggingLevel(Level.FINE)) {
-				aLogger.write(Level.FINE, "Cannot load rule from fileName: " + fileName); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		EJBJar ejbJar = getEJBJar(vc);
-
-		if(fileName.endsWith(J2EEConstants.EJBJAR_DD_SHORT_NAME)) {
-			if(ejbJar.getVersionID() == J2EEVersionConstants.EJB_1_1_ID) {
-				return IValidationRuleList.EJB11_EJBJAR;
-			}
-			return IValidationRuleList.EJB20_EJBJAR;
-		}
-		return null; // must be a JavaClass
-	}
-	
-	/**
-	 * If the IFileDelta represents a dynamic load model (i.e., the file name can be changed by the
-	 * user), then return the Integer which loads that model. Return null if no such model exists.
-	 */
-	public final Object getRuleId(IEJBValidationContext vc, JavaClass clazz, EnterpriseBean bean) {
-		// Return the rule id which will validate the JavaClass as the 
-		// type which it is used as by the EnterpriseBean.
-		if((clazz == null) || (bean == null)) {
-			Logger aLogger = vc.getMsgLogger();
-			if (aLogger != null && aLogger.isLoggingLevel(Level.FINE)) {
-				aLogger.write(Level.FINE, "Cannot load rule because either bean (" + bean + ") or class (" + clazz + ") is null"); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-			}
-			return null;
-		}
-		
-		boolean isStatelessSession = (bean.isSession() && ValidationRuleUtility.isStateless(bean));
-		boolean isStatefulSession = (bean.isSession() && ValidationRuleUtility.isStateful(bean));
-		
-		if(bean.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID) {
-			if(clazz.equals(bean.getEjbClass())) {
-				if(isStatelessSession) {
-						return IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS;
-				}
-				else if(isStatefulSession) {
-						return IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_BEANCLASS;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_BEANCLASS;
-				}
-				else if(bean.isMessageDriven()) {
-					return IValidationRuleList.EJB20_MESSAGE_BEANCLASS;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger != null && aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getEjbClass()"); //$NON-NLS-1$
-					}
-					
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getRemoteInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_REMOTE;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_REMOTE;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getRemoteInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getHomeInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_HOME;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_HOME;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_HOME;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_HOME;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getHomeInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getLocalHomeInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_LOCALHOME;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_LOCALHOME;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getLocalHomeInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getLocalInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_LOCAL;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_LOCAL;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getLocalInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(bean instanceof Entity) {
-				if(clazz.equals(((Entity)bean).getPrimaryKey())) {
-					if(bean.isContainerManagedEntity()) {
-						ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-						// If it's a primitive primary key, it's exempt from these checks.
-						if(ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-							return null;
-						}
-						else if(ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-							return null;
-						}
-						return IValidationRuleList.EJB20_CMP_KEYCLASS;
-					}
-					else if(bean.isBeanManagedEntity()) {
-						return IValidationRuleList.EJB20_BMP_KEYCLASS;
-					}
-					else {
-						Logger aLogger = vc.getMsgLogger();
-						if (aLogger.isLoggingLevel(Level.FINE)) {
-							aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(((Entity)bean).getPrimaryKey()"); //$NON-NLS-1$
-						}
-						return null;
-					}
-				}
-			}
-			
-			Logger aLogger = vc.getMsgLogger();
-			if (aLogger.isLoggingLevel(Level.FINE)) {
-				aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X()"); //$NON-NLS-1$
-			}
-			return null;
-		}
-		else if(bean.getVersionID() <= J2EEVersionConstants.EJB_1_1_ID) {
-			if(clazz.equals(bean.getEjbClass())) {
-				if(bean.isSession()) {
-						return IValidationRuleList.EJB11_SESSION_BEANCLASS;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB11_CMP_BEANCLASS;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB11_BMP_BEANCLASS;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(bean.getEjbClass()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getRemoteInterface())) {
-				if(bean.isSession()) {
-					return IValidationRuleList.EJB11_SESSION_REMOTE;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB11_CMP_REMOTE;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB11_BMP_REMOTE;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(bean.getRemoteInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getHomeInterface())) {
-				if(bean.isSession()) {
-					return IValidationRuleList.EJB11_SESSION_HOME;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB11_CMP_HOME;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB11_BMP_HOME;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(bean.getHomeInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(bean instanceof Entity) {
-				if(clazz.equals(((Entity)bean).getPrimaryKey())) {
-					if(bean.isContainerManagedEntity()) {
-						ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-						// If it's a primitive primary key, it's exempt from these checks.
-						if(ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-							return null;
-						}
-						else if(ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-							return null;
-						}
-						return IValidationRuleList.EJB11_CMP_KEYCLASS;
-					}
-					else if(bean.isBeanManagedEntity()) {
-						return IValidationRuleList.EJB11_BMP_KEYCLASS;
-					}
-					else {
-						Logger aLogger = vc.getMsgLogger();
-						if (aLogger.isLoggingLevel(Level.FINE)) {
-							aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(((Entity)bean).getPrimaryKey()"); //$NON-NLS-1$
-						}
-						return null;
-					}
-				}
-			}
-		}
-		
-		Logger aLogger = vc.getMsgLogger();
-		if (aLogger.isLoggingLevel(Level.FINE)) {
-			aLogger.write(Level.FINE, "Cannot load rule: !bean.isVersion1_X() && !bean.isVersion2_X()"); //$NON-NLS-1$
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java
deleted file mode 100644
index 104358354..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-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 java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-/**
- * @version 	1.0
- * @author
- */
-public class EJBValidator extends AbstractEJBValidator {
-	private static EJBValidator _inst = null;
-	private static TargetObjectPool _targetObjectPoolSingleton = null;
-	private LogEntry logEntry = null;
-	
-	
-	public EJBValidator() {
-		_inst = this;
-	}
-	
-	public static EJBValidator getValidator() {
-		return _inst;
-	}
-	
-	private LogEntry getLogEntry(){
-	    if(logEntry == null)
-	        logEntry = new LogEntry(IEJBValidatorConstants.BUNDLE_NAME);
-	    return logEntry;
-	}
-	
-	public String getBaseName() {
-		return "ejbvalidator"; //$NON-NLS-1$
-	}
-
-	public void commonValidate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		long start = System.currentTimeMillis();
-		Logger logger = Logger.getLogger(IEJBValidatorConstants.J2EE_CORE_PLUGIN);
-		if (logger != null && logger.isLoggingLevel(Level.FINER)) {
-			long end = System.currentTimeMillis();
-			LogEntry entry = getLogEntry();
-			entry.setSourceID("EJBValidator::validate"); //$NON-NLS-1$
-			entry.setText("validate took " + (end - start) + " milliseconds."); //$NON-NLS-1$  //$NON-NLS-2$
-			logger.write(Level.FINER, entry);
-		}
-		try {
-			EJBValidationContext vc = new EJBValidationContext(this, helper, reporter);
-			setValidationContext(vc);
-			if (isFullValidate(vc)) {
-				fullValidate(vc);
-			} else {
-				incrementalValidate(vc);
-			}
-			if (logger != null && logger.isLoggingLevel(Level.FINER)) {
-				long end = System.currentTimeMillis();
-				LogEntry entry = getLogEntry();
-				entry.setSourceID("EJBValidator::validate"); //$NON-NLS-1$
-				entry.setText("validate took " + (end - start) + " milliseconds."); //$NON-NLS-1$  //$NON-NLS-2$
-				logger.write(Level.FINER, entry);
-			}
-		} finally {
-
-		}
-	}	
-	
-	
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		commonValidate(helper, reporter);
-	}
-	/*
-	 * @see IValidator#validate(IValidationContext, IReporter, IFileDelta[])
-	 */
-	public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException {
-		commonValidate(helper, reporter);
-		return status;
-	}
-	
-	public boolean isFullValidate(IEJBValidationContext vc) {
-		String[] fileURIs = vc.getURIs();
-		if(fileURIs == null) {
-			return true;
-		}
-		if(fileURIs.length == 0) {
-			return true;
-		}
-		
-		for(int i=0; i<fileURIs.length; i++) {
-			String uri = fileURIs[i];
-			if(uri.endsWith(J2EEConstants.EJBJAR_DD_SHORT_NAME)) {
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	public void runDependents(IEJBValidationContext vc, IValidationRule rule, Object targetParent, Object target) throws ValidationException {
-		// If a class is being run only because it depends on a rule which has changed,
-		// i.e., it's a dependent, then we don't want to run its dependents because the
-		// class itself hasn't changed.
-		Set dependents = rule.getDependents();
-		if(dependents == null) {
-			return;
-		}
-		
-		Iterator iterator = dependents.iterator();
-		while(iterator.hasNext()) {
-			try {
-				IValidationRule dRule = (IValidationRule)iterator.next();
-				Object dRuleTarget = dRule.getTarget(targetParent, target);
-				if(dRuleTarget != null) {
-					run(dRule, targetParent, dRuleTarget); // false=not full validation
-				}
-			}
-			catch(ValidationCancelledException e) {
-				throw e;
-			}
-			catch(ValidationException e) {
-				throw e;
-			}
-			catch(Throwable exc) {
-				addInternalErrorMessage(getValidationContext(), exc);
-			}
-			finally {
-				EJBValidationRuleFactory.getFactory().release(rule);
-			}
-		}
-	}
-	
-	protected String internalErrorMessage() {
-		return IEJBValidatorMessageConstants.CHKJ2900;
-	}
-	
-	
-	
-	protected void logMissingRule(IEJBValidationContext vc, Object ruleId) {
-		Logger logger = vc.getMsgLogger();
-		if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-			logger.write(Level.SEVERE, ruleId + " = null"); //$NON-NLS-1$
-		}
-		addInternalErrorMessage(vc);
-	}
-	
-	protected void preRemoveOldMessages(IEJBValidationContext vc, Map targets) throws ValidationException {
-		List validatedClasses = new ArrayList();
-		
-		try {	
-			String[] uris = vc.getURIs();
-			for(int i=0; i<uris.length; i++) {
-				String uriInst = uris[i];
-				if((uriInst == null) || (uriInst.length() == 0)) {
-					continue;
-				}
-				
-				Object id = EJBValidationRuleFactory.getFactory().getRuleId(vc, uriInst);
-				if(id == null) {
-					Object[] clazzAndBean = (Object[])vc.loadModel(uriInst, null); // Don't need a second parameter, but can't cast a RefObject to an Object[], so use the second load method.
-					if(clazzAndBean == null) {
-						// Log, add "Cannot validate" to task list, and return.
-						logMissingRule(vc, id);
-						continue;
-					}
-	
-					// In the clazzAndBean object array, the first entry is the JavaClass,
-					// and the rest of the entries are the EnterpriseBean instances which 
-					// use the JavaClass.
-					JavaClass clazz = (JavaClass)clazzAndBean[0];
-					List beans = (List)clazzAndBean[1];
-
-					// The validatedClass set keeps track of JavaClasses 
-					// that have changed, and this set is used to determine 
-					// whose children need to be found and validated. 
-					// Validation is performed after all of the changed files 
-					// are validated so that all of the children of all of
-					// the changed files can be searched for at once. Searching
-					// once on a group produces performance savings because
-					// the type hierarchy method takes a non-trivial amount
-					// of time when there's a large group of deltas.
-					validatedClasses.add(clazz);
-
-					if((beans == null) || (beans.size() == 0)) {
-						// The JavaClass itself is not part of an enterprise bean, but one of its children may be.
-					}
-					else {
-						Iterator iterator = beans.iterator();
-						while(iterator.hasNext()) {
-							EnterpriseBean bean = (EnterpriseBean)iterator.next();
-							id = EJBValidationRuleFactory.getFactory().getRuleId(vc, clazz, bean);
-		
-							IValidationRule clazzRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-							if(clazzRule == null) {
-								// This has already been logged by the AbstractEJBValidationRuleFactory (if it's
-								// an error - this is expected if the key is a primitive primary key).
-								continue;
-							}
-		
-							setValidated(clazzRule.getId(), bean, clazz);
-						}
-					}
-					
-				}
-				else {
-					EJBJar ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-					if(ejbJar == null) {
-						// Log, add "Cannot validate" to task list, and return.
-						continue;
-					}
-					
-					IValidationRule ejbExtRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-					if(ejbExtRule == null) {
-						// This has already been logged by the AbstractEJBValidationRuleFactory, so just
-						// need to add "Cannot validate" to the task list.
-						continue;
-					}
-					
-					setValidated(ejbExtRule.getId(), null, ejbJar);
-				}
-			} // end for
-			
-			// Always validate ejb-jar.xml, because a change to one of the files it references
-			// may mean that it needs to be revalidated.	
-			EJBJar ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-			if(ejbJar != null) {
-				Object id = EJBValidationRuleFactory.getFactory().getRuleId(vc, J2EEConstants.EJBJAR_DD_SHORT_NAME);
-				if(id == null) {
-					// Log, add "Cannot validate" to task list, and return.
-					logMissingRule(vc, id);
-				}
-				else {
-					IValidationRule ejbJarRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-					if(ejbJarRule == null) {
-						logMissingRule(vc, id);
-					}
-					setValidated(ejbJarRule.getId(), null, ejbJar);
-				}
-			}
-			
-			if(validatedClasses.size() > 0) {
-				// Check the children of the changed classes.
-				// This check must be done before the dependents, because
-				// the dependents of the children classes must be checked
-				// as well.
-
-				// Class never validated before, so check its children
-				for (int vC = 0; vC<validatedClasses.size(); vC++) {
-					List beans = (List)vc.loadModel(EJBValidatorModelEnum.EJB, new Object[]{validatedClasses.get(vC)});
-					if((beans == null) || (beans.size() == 0)) {
-						// The class is not a member of an enterprise bean.
-						continue;
-					}
-					Set rootValidatedClass = new HashSet();
-					rootValidatedClass.add(validatedClasses.get(vC));
-					JavaClass[] children = (JavaClass[])vc.loadModel(EJBValidatorModelEnum.CHILDREN, new Object[]{vc.getReporter(), rootValidatedClass});
-					if((children != null) && (children.length > 0)) {
-						Iterator bciterator = null;
-						Object id = null;
-						for(int c=0; c<children.length; c++) {
-							JavaClass child = children[c];
-							beans = (List)vc.loadModel(EJBValidatorModelEnum.EJB, new Object[]{child});
-							// The child is not a member of an enterprise bean.
-							if((beans == null) || (beans.size() == 0))
-								continue;
-							bciterator = beans.iterator();
-							while(bciterator.hasNext()) {
-								EnterpriseBean bean = (EnterpriseBean)bciterator.next();
-								id = EJBValidationRuleFactory.getFactory().getRuleId(vc, child, bean);
-								IValidationRule clazzRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-								// This has already been logged by the AbstractEJBValidationRuleFactory, so just need to add "Cannot validate" to the task list.
-								if(clazzRule == null)
-									continue;
-								setValidated(clazzRule.getId(), bean, child);
-							}
-						}
-					}
-				}
-				validatedClasses.clear(); // Don't need this cache any more; free the memory.
-			}
-			
-			// Now, validate the dependents.
-			targets.putAll(_validated);
-			Iterator iterator = targets.keySet().iterator();
-			while(iterator.hasNext()) {
-				Object id = iterator.next();
-				IValidationRule rule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-				if(rule == null) {
-					continue;
-				}
-				
-				Set contexts = (Set)targets.get(id);
-				if(contexts == null) {
-					continue;
-				}
-				
-				Iterator cIterator = contexts.iterator();
-				while(cIterator.hasNext()) {
-					TargetObject to = (TargetObject)cIterator.next();
-					Object targetParent = to.getTargetParent();
-					Object target = to.getTarget();
-					Set dependents = rule.getDependents();
-					if(dependents == null) {
-						continue;
-					}
-					
-					Iterator dIterator = dependents.iterator();
-					while(dIterator.hasNext()) {
-						try {
-							IValidationRule dRule = (IValidationRule)dIterator.next();
-							Object dRuleTarget = dRule.getTarget(targetParent, target);
-							if(dRuleTarget != null) {
-								setValidated(dRule.getId(), targetParent, dRuleTarget);
-							}
-						}
-						catch(ValidationCancelledException e) {
-							throw e;
-						}
-						catch(Throwable exc) {
-							addInternalErrorMessage(getValidationContext(), exc);
-						}
-						finally {
-							EJBValidationRuleFactory.getFactory().release(rule);
-						}
-					}
-				}
-			}
-		}
-		finally {
-			// No matter what, clear the temporary caches.
-			targets.clear();
-			validatedClasses.clear();
-			
-			// Now put the "validated" results in "done", because they weren't
-			// really validated; it was just a tracking mechanism.
-			targets.putAll(_validated);
-			_validated.clear(); // Clear the "validated" cache because the targets weren't really validated; they were just tracked.
-		}
-	}
-	
-	protected String removeOldMessagesString() {
-		return EJBValidatorModelEnum.REMOVE_OLD_MESSAGES;
-	}
-	
-	public void fullValidate(IEJBValidationContext vc) throws ValidationException {
-		removeOldMessages(vc,null); // null == no IFileDelta, null = don't track targets
-		
-
-		EJBJar ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-		if(ejbJar == null) {
-			// Log, add "Cannot validate" to task list, and return.
-			// EJBProjectResources will already have logged the problem.
-			
-			IMessage mssg = vc.getMessage();
-			mssg.setId(IEJBValidatorMessageConstants.CHKJ2905);
-			vc.addMessage(mssg);
-			return;
-		}
-		
-		Object id = EJBValidationRuleFactory.getFactory().getRuleId(vc, J2EEConstants.EJBJAR_DD_SHORT_NAME);
-		if(id == null) {
-			// Log, add "Cannot validate" to task list, and return.
-			logMissingRule(vc, J2EEConstants.EJBJAR_DD_SHORT_NAME);
-			return;
-		}
-		IValidationRule ejbJarRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-		if(ejbJarRule == null) {
-			logMissingRule(vc, id);
-			return;
-		}
-		run(ejbJarRule, null, ejbJar); // true= full validation
-
-		List beans = ejbJar.getEnterpriseBeans();
-		Iterator iterator = beans.iterator();
-		id = null;
-
-		while(iterator.hasNext()) {
-			EnterpriseBean bean = (EnterpriseBean)iterator.next();
-			JavaClass[] classes = getJavaClass(bean);
-			for(int i=0; i<classes.length; i++) {
-				JavaClass clazz = classes[i];
-				id = EJBValidationRuleFactory.getFactory().getRuleId(vc, clazz, bean);
-		
-				IValidationRule clazzRule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-				if(clazzRule == null) {
-					// This has already been logged by the AbstractEJBValidationRuleFactory (if it's
-					// an error - this is expected if the key is a primitive primary key).
-					continue;
-				}
-		
-				run(clazzRule, bean, clazz); // true = full validation
-			}
-		}
-	}
-	
-	protected JavaClass[] getJavaClass(EnterpriseBean bean) {
-		int count = 0;
-		JavaClass[] classes = new JavaClass[6];
-		
-		JavaClass ejbClass = bean.getEjbClass();
-		if((ejbClass != null) && (ejbClass.isExistingType())) {
-			classes[count++] = ejbClass;
-		}
-		
-		JavaClass remoteClass = bean.getRemoteInterface();
-		if((remoteClass != null) && (remoteClass.isExistingType())) {
-			classes[count++] = remoteClass;
-		}
-		
-		JavaClass localClass = bean.getLocalInterface();
-		if((localClass != null) && (localClass.isExistingType())) {
-			classes[count++] = localClass;
-		}
-		
-		JavaClass homeClass = bean.getHomeInterface();
-		if((homeClass != null) && (homeClass.isExistingType())) {
-			classes[count++] = homeClass;
-		}
-		
-		JavaClass localHomeClass = bean.getLocalHomeInterface();
-		if((localHomeClass != null) && (localHomeClass.isExistingType())) {
-			classes[count++] = localHomeClass;
-		}
-		
-		if(bean instanceof Entity) {
-			JavaClass key = ((Entity)bean).getPrimaryKey();
-			if((key != null) && (key.isExistingType())) {
-				classes[count++] = key;
-			}
-		}
-
-		if(count == 6) {
-			return classes;
-		}
-		
-		JavaClass[] result = new JavaClass[count];
-		System.arraycopy(classes, 0, result, 0, count);
-		return result;		
-	}
-	
-	public void incrementalValidate(IEJBValidationContext vc) throws ValidationException {
-		Map targets = new HashMap();
-		try {
-			removeOldMessages(vc,targets);
-			
-			Iterator iterator = targets.keySet().iterator();
-			while(iterator.hasNext()) {
-				Object id = iterator.next();
-				IValidationRule rule = EJBValidationRuleFactory.getFactory().getRule(vc, id);
-				if(rule == null) {
-					continue;
-				}
-				
-				Set contexts = (Set)targets.get(id);
-				if(contexts == null) {
-					continue;
-				}
-				
-				Iterator cIterator = contexts.iterator();
-				while(cIterator.hasNext()) {
-					TargetObject to = (TargetObject)cIterator.next();
-					run(rule, to.getTargetParent(), to.getTarget());
-				}
-			}
-		}
-		finally {
-			targets.clear();
-			targets = null;
-		}
-	}
-	
-	protected TargetObjectPool getTargetObjectPool() {
-		if(_targetObjectPoolSingleton == null) {
-			_targetObjectPoolSingleton = new TargetObjectPool(100);
-		}
-		return _targetObjectPoolSingleton;
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.model.validation.AbstractEJBValidator#releaseRules(org.eclipse.jst.j2ee.internal.model.validation.ejb.IValidationRule)
-     */
-    protected void releaseRules(IValidationRule rule) {
-        EJBValidationRuleFactory.getFactory().release(rule);
-        
-    }
-
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public void cleanup(IReporter reporter){
-		if( reporter instanceof WorkbenchReporter ){
-			WorkbenchReporter wbReporter = (WorkbenchReporter)reporter;
-			IProject project = wbReporter.getProject();
-			HashMap helperMap = ValidationRuleUtility.getHelperMap(project);
-			helperMap.clear();
-			ValidationRuleUtility.projectHelperMap.remove( helperMap );
-			helperMap = null;
-		}
-		super.cleanup(reporter);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidatorModelEnum.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidatorModelEnum.java
deleted file mode 100644
index 68824609b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidatorModelEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-/**
- * This interface contains the symbolic names of the models which the
- * EJBValidator needs, and the IValidationContext that is used in the EJBValidator's
- * validate method must support these symbolic names.
- */
-public interface EJBValidatorModelEnum {
-	   public final static String EJB_MODEL = "EJB_MODEL"; // return an EJBJar object //$NON-NLS-1$
-	   public final static String EJB_FILE = "EJB_FILE"; // return a ModuleFile object (either EJBJarFile or EARFile) //$NON-NLS-1$
-	   public final static String EJB = "EJB"; // Given a JavaClass instance, return a java.util.List of EnterpriseBean instances that use that JavaClass as part of the bean. //$NON-NLS-1$
-	   public final static String CHILDREN = "children"; // Given a JavaClass instance, return a JavaClass[] of the JavaClasses that inherit or extend the instance. //$NON-NLS-1$
-	   //The EJB_BINDING symbols is WAS specific and need to be moved to WAS Ext layer
-	   public final static String EJB_BINDING = "EJB_BINDING"; // return the EJBJarBinding for the EJBJar //$NON-NLS-1$
-	   public final static String EJB_CLIENTJAR = "EJB_CLIENTJAR"; // If the EJB uses a client JAR, given the name of the JAR, this method returns a Boolean.TRUE if the client JAR can be found and loaded successfully. If it can't be found and loaded, return Boolean.FALSE. //$NON-NLS-1$
-	   public final static String REMOVE_OLD_MESSAGES = "REMOVE_OLD_MESSAGES"; // Remove all Messages registered against the given Objects in the array. //$NON-NLS-1$
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ERefValidationMessageResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ERefValidationMessageResourceHandler.java
deleted file mode 100644
index b94e081b6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ERefValidationMessageResourceHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class ERefValidationMessageResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "erefvalidation";//$NON-NLS-1$
-
-	private ERefValidationMessageResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String ERROR_EAR_MISSING_EREFNAME;
-	public static String ERROR_EAR_INVALID_EREFTYPE;
-	public static String ERROR_EAR_MISSING_EREFTYPE;
-	public static String ERROR_EAR_MISSING_EREFHOME;
-	public static String ERROR_EAR_MISSING_EREFREMOTE;
-	public static String ERROR_EAR_MISSING_EJB_ROLE;
-	public static String ERROR_EAR_DUPLICATE_RESREF;
-	public static String UNRESOLVED_EJB_REF_WARN_;
-	public static String ERROR_EAR_DUPLICATE_SERVICEREF;
-	public static String ERROR_EAR_DUPLICATE_SECURITYROLEREF;
-	public static String ERROR_EAR_DUPLICATE_EJBREF;
-	public static String ERROR_EAR_DUPLICATE_RESENVREF;
-	public static String ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF;
-	public static String ERROR_EAR_MISSING_MESSSAGEDESTINATION;
-	public static String ERROR_UNRESOLVED_MDB_MISSING_MESSAGE_DESTINATION;
-	public static String ERROR_EAR_MISSING_EMPTY_MESSSAGEDESTINATION;
-
-	
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ERefValidationMessageResourceHandler.class);
-	}	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java
deleted file mode 100644
index 056ab446f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java
+++ /dev/null
@@ -1,965 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-import java.io.FileNotFoundException;
-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.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientImpl;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.internal.impl.EjbRefImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ValidateXmlCommand;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.NoModuleFileException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (12/6/2000 11:08:55 AM)
- * @author: Administrator
- */
-public class EarValidator extends J2EEValidator  {
-	public static final String RES_REF_GROUP_NAME = "RES_REF_GROUP_NAME"; //$NON-NLS-1$
-	public static final String RES_ENV_REF_GROUP_NAME = "RES_ENV_REF_GROUP_NAME"; //$NON-NLS-1$
-	public static final String SERVICE_REF_GROUP_NAME = "SERVICE_REF_GROUP_NAME"; //$NON-NLS-1$
-	public static final String EJB_REF_GROUP_NAME = "EJB_REF_GROUP_NAME"; //$NON-NLS-1$
-	public static final String SEC_ROLE_REF_GROUP_NAME = "SEC_ROLE_REF_GROUP_NAME"; //$NON-NLS-1$
-	public static final String MESSAGE_REF_GROUP_NAME = "MESSAGE_REF_GROUP_NAME"; //$NON-NLS-1$
-	public static final String MESSAGE_DESTINATION_REF_GROUP_NAME = "MESSAGE_DESTINATION_REF_GROUP_NAME"; //$NON-NLS-1$	
-	public static final String MESSAGE_DESTINATION_MDB_REF_GROUP_NAME = "MESSAGE_DESTINATION_MDB_REF_GROUP_NAME"; //$NON-NLS-1$
-	
-	protected EARFile earFile;
-	protected Application appDD;
-	
-	/**
-	 * RelationshipMapValidator constructor comment.
-	 */
-	public EarValidator() {
-		super();
-	}// EarValidator
-
-	/**
-	 * Creates the validateXML command.
-	 * 
-	 * @return Command
-	 */
-	public Command createValidateXMLCommand() {
-		Command cmd = new ValidateXmlCommand(earFile);
-		return cmd;
-	}// createValidateXMLCommand
-	
-	/**
-	 * <p>Answer the id of the resource bundle which is
-	 * used by the receiver.</p>
-	 * 
-	 * @return String
-	 */
-	public String getBaseName() {
-		return EAR_CATEGORY;
-	}// getBaseName
-	
-	/**
-	 * XML Validation now handles validation of Deployment Descriptor
-	 * 
-	 * @throws ValidationException
-	 */
-	public void validate() throws ValidationException {
-	  validateModules(appDD.getModules());
-	  validateSecurity();
-	  validateRefs();
-	  validateWebContexts();
-	  validateSpecLevel();
-	  validateMessageDestinations();
-	}// validate
-	
-	/**
-	 * Does the validation
-	 */
-	public void validate(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-		validateInJob( inHelper, inReporter );
-	}
-	
-	public IStatus  validateInJob( IValidationContext inHelper, IReporter inReporter ) throws ValidationException {
-				
-		inReporter.removeAllMessages(this);
-		super.validateInJob(inHelper, inReporter );
-		try {
-			earFile = (EARFile) _helper.loadModel(J2EEConstants.EAR_MODEL_NAME);
-			if (earFile != null) {
-				appDD = earFile.getDeploymentDescriptor();
-				if (appDD != null && appDD.eResource() != null && appDD.eResource().isLoaded())
-					validate();
-				else {
-					String msg = NLS.bind(EARValidationMessageResourceHandler.EAR_DD_CANNOT_OPEN_DD, new String[] { getResourceName()});
-					IMessage errorMsg = new LocalizedMessage(IMessage.HIGH_SEVERITY, msg);
-					status = WTPCommonPlugin.createErrorStatus(errorMsg.getText());
-					throw new ValidationException(errorMsg);
-				}
-			} else {
-				String msg = NLS.bind(EARValidationMessageResourceHandler.ERROR_EAR_INVALID_EAR_FILE, new String[] { getResourceName()});
-				IMessage errorMsg = new LocalizedMessage(IMessage.HIGH_SEVERITY, msg);
-				throw new ValidationException(errorMsg);
-			} // if
-		} catch (ValidationException ex) {
-			throw ex;
-		} catch (Exception e) {
-			String[] param = new String[1];
-			if (earFile != null)
-				param[0] = earFile.getName();
-			Logger.getLogger().logError(e);
-			String msg = NLS.bind(EARValidationMessageResourceHandler.EAR_VALIDATION_INTERNAL_ERROR_UI_, param );			
-			IMessage errorMsg = new LocalizedMessage(IMessage.HIGH_SEVERITY, msg );
-			throw new ValidationException(errorMsg, e);
-		} // try 
-		return status;
-	} // validate
-
-	
-	/**
-	 * Gets the resource name
-	 * 
-	 * @return String
-	 */
-	protected String getResourceName() {
-		return earFile.getURI();
-	}// getResourceName
-	
-	/**
-	 * validate for duplicates in EAR Roles
-	 * 
-	 * @param EList earRoleList - List of ear roles.
-	 */
-	public void validateEarRoles(EList earRoleList) {
-		Set s = new HashSet(earRoleList.size());
-		for (int i = 0; i < earRoleList.size(); i++) {
-			SecurityRole securityRole = (SecurityRole) earRoleList.get(i);
-			if (!(s.add(securityRole.getRoleName()))) {
-				String roleName = securityRole.getRoleName();
-				String[] params = new String[1];
-				params[0] = roleName;
-				String msg = NLS.bind(EARValidationMessageResourceHandler.ERROR_EAR_DUPLICATE_ROLES, params); 
-				addLocalizedWarning( msg, appDD );
-			}// if
-		}// for
-	}// validateEarRoles
-	
-	/**
-	 * validateRefs(WebApp) - validate EJB  references
-	 * 
-	 * @param EjbRef eref - An ejb ref.
-	 * @param Sting uri - The uri of the module.
-	 */
-	public void validateEJBRefMandatoryElements(List ejbRefs, String uri) {
-	 for(int i = 0; i < ejbRefs.size(); i++) {
-	  EjbRef eref = (EjbRef) ejbRefs.get(i);
-	  String refName = eref.getName();
-	  String[] params = new String[2];
-	  params[0] = refName;
-	  params[1] = uri;
-	  
-	  if ((eref.getName().trim() == null) || (eref.getName().trim().length() == 0)) {
-		addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFNAME, params);
-	  }// if
-	  if (eref.isSetType())
-	    {if(eref.getType() == null ) 
-		  addWarning(EREF_CATEGORY, ERROR_EAR_INVALID_EREFTYPE, params);}
-	  else 
-	  	 addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFTYPE, params);
-	  // if
-	  if ((eref.getHome() == null) || (eref.getHome().trim().length() == 0)) {
-		addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFHOME, params);
-	  }// if
-	  if ((eref.getRemote() == null) || (eref.getRemote().trim().length() == 0)) {
-		addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFREMOTE, params);
-	  }
-	 }
-	}
-	
-	/**
-	 * Compare the ejb interfaces to check if they are similar.
-	 * 
-	 * @param EjbRef eref - The ejb reference.
-	 * @param EnterpriseBean ejb - The enterprise bean
-	 */
-	public boolean isSimilarEJBInterface(EjbRef eref, EnterpriseBean ejb) {
-		
-		if( eref.isLocal() ) {
-			if( ejb.getLocalHomeInterfaceName() == null ||
-				ejb.getLocalInterfaceName() == null || 
-				((EJBLocalRef)eref).getLocalHome() == null  || 
-				((EJBLocalRef)eref).getLocal() == null ) {
-				return false;
-			}// if
-			
-			boolean isHomeLocalOk = ejb.getLocalHomeInterfaceName().equals(((EJBLocalRef)eref).getLocalHome());
-			boolean isRemoteLocalOk =  ejb.getLocalInterfaceName().equals(((EJBLocalRef)eref).getLocal());
-		 	return isHomeLocalOk && isRemoteLocalOk;
-		}// if
-		
-		if( ejb.getHomeInterfaceName() == null ||
-			ejb.getRemoteInterfaceName() == null || 
-			eref.getHome() == null  || 
-			eref.getRemote() == null ) {
-			return false;
-		}// if
-		
-		boolean isHomeOk = ejb.getHomeInterfaceName().equals( eref.getHome() );
-		boolean isRemoteOk = ejb.getRemoteInterfaceName().equals( eref.getRemote() );
-		
-		return isHomeOk && isRemoteOk;
-	}// isSimilarEJBInterface
-		
-	/**
-	 * validate for duplicates in EAR Roles
-	 * 
-	 * @param List ejbRefs - List of ejb refs.
-	 * @param String uri - The uri of the module.
-	 */
-	public void validateEJBRefs(List ejbRefs, String uri) {
-	  for (int i = 0; i < ejbRefs.size(); i++) {
-	  	  EjbRef eref = (EjbRef) ejbRefs.get(i);
-		  if( eref != null && eref.getLink() != null && eref.getLink().length() > 0) {
-		  	EnterpriseBean ejb = earFile.getEnterpiseBeanFromRef( eref, uri );
-		  	if( ejb == null ) {
-		  		String[] params = new String[3];
-				params[0] = eref.getName();
-				params[1] = uri;
-				params[2] = earFile.getName();
-				String msg = NLS.bind(ERefValidationMessageResourceHandler.UNRESOLVED_EJB_REF_WARN_, params);
-		  		addLocalizedWarning(msg, null);
-		  	} else {
-		  		if( !isSimilarEJBInterface( eref, ejb ) ) {
-		  			String[] params = new String[3];
-					params[0] = ejb.getName();
-					params[1] = eref.getName();
-					params[2] = uri;
-					String msg = NLS.bind(EARValidationMessageResourceHandler.EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_, params);					
-		  			addLocalizedError( msg, appDD);
-		  		}
-		  	}
-		  }
-	  }
-	}
-	
-	/**
-	 * validate the existance of the EJB Roles in the EAR Roles and duplicates ib EJB Roles
-	 * 
-	 * @param EList earRoleList - List of ear roles.
-	 * @param EList ejbRoles - List of ejb roles.
-	 */
-	public void validateEJBRolesWithEARRoles(EList earRoleList, EList ejbRoles) {
-	  for (int i = 0; i < ejbRoles.size(); i++) {
-		if (!(earRoleList.contains(ejbRoles.get(i)))) {
-		  String[] params = new String[1];
-		  params[0] = ((SecurityRole) (ejbRoles.get(i))).getRoleName();		          
-		  addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EJB_ROLE, params);
-		}// if
-	  }// for
-	}// validateEJBRolesWithEARRoles
-	
-	/**
-	 * For each module, make sure its archive exists
-	 *(a very expensive, but more meaningful test would be to also make sure they can be loaded)
-	 * 
-	 * @param EList modulesList - List of modules
-	 */
-	public void validateModules(EList modulesList) {
-//		String errorString = ""; //$NON-NLS-1$
-		IMessage msg = new LocalizedMessage(IMessage.NORMAL_SEVERITY, "Validating Modules");
-		_reporter.displaySubtask( this, msg );
-		
-		
-		HashSet duplicateURI = new HashSet();
-	
-		for (int i = 0; i < modulesList.size(); i++) {
-			Module m = (Module) modulesList.get(i);
-			String filename = m.getUri();
-			if ((filename == null) || (filename.length() == 0)) {
-				addLocalizedError(EARValidationMessageResourceHandler.MESSAGE_EAR_NO_MODULE_URI, null);
-			} else {
-				//check if the URI has any spaces
-				if(  filename.indexOf( " " ) != -1) { //$NON-NLS-1$
-					String[] params = new String[1];
-					params[0] = filename;
-					String msg1 = NLS.bind(EARValidationMessageResourceHandler.URI_CONTAINS_SPACES_ERROR_, params);
-					addLocalizedError(msg1, appDD);
-				}// if
-			}// if
-			String altDD = m.getAltDD();
-			if (altDD != null)
-				altDD = altDD.trim();
-			validateAltDD(m, altDD);
-			String key = altDD == null ? filename + altDD : filename;
-			if (!duplicateURI.add(key)) {
-				String[] params = new String[2];
-				params[0] = m.getUri();
-				params[1] = earFile.getName();
-				String tmp = NLS.bind(EARValidationMessageResourceHandler.MESSAGE_EAR_DUPLICATE_URI_ERROR_, params);
-				addLocalizedError(tmp, appDD);
-			}// if
-	
-		}// for
-	
-	}// validateModules
-	
-	/**
-	 * Validate the alt dd
-	 * 
-	 * @param Module m - A module.
-	 * @param String altDD - An altDD
-	 */
-	protected void validateAltDD(Module m, String altDD) {
-		//isDuplicate will test if it is a file or a loaded resource
-		if ("".equals(altDD)) { //$NON-NLS-1$
-			String[] params = new String[2];
-			params[0] = m.getUri();
-			params[1] = earFile.getName();
-			String tmp = NLS.bind(EARValidationMessageResourceHandler.MESSAGE_EMPTY_ALT_DD_ERROR_, params);
-			addLocalizedError(tmp, appDD);
-		} else if (altDD != null && !earFile.isDuplicate(altDD)) {
-			String[] params = new String[3];
-			params[0] = m.getUri();
-			params[1] = altDD;
-			params[2] = earFile.getName();
-			String tmp = NLS.bind(EARValidationMessageResourceHandler.MESSAGE_INVALID_ALT_DD_WARN_, params);			
-			addLocalizedWarning(tmp, appDD);
-		}// if
-	}// validateAltDD
-	
-	/**
-	 * validate EJB and resource references
-	 */
-	public void validateRefs() {
-		
-		IMessage msg = new LocalizedMessage(IMessage.NORMAL_SEVERITY, "Validating Refs");
-		_reporter.displaySubtask( this, msg );
-		
-		
-		List moduleList = earFile.getModuleRefs();
-		for (int i = 0; i < moduleList.size(); i++) {
-			
-			ModuleRef ref = (ModuleRef) moduleList.get(i);
-			try {
-				if(ref.isWeb()) {
-					validateWebAppRefs(ref);				}  
-				else if( ref.isEJB() ) {
-				    validateEJBModuleRefs(ref);
-				} else if(ref.isClient())
-					validateAppClientRefs(ref);
-			} catch (ArchiveWrappedException ex) {
-				Exception nested = ex.getNestedException();
-				if (!(nested instanceof NoModuleFileException)) {
-					//Logger.getLogger().logError(ex);
-					String[] params = new String[1];
-					params[0] = ref.getUri();
-					addError(EREF_CATEGORY, ERROR_MODULE_DD_FILE_NOT_FOUND, params);					
-				}
-				//otherwise ignore it; there are other validations for this
-			} 
-			
-		}
-	}	
-	
-	/**
-	 * @param ref
-	 */
-	private void validateAppClientRefs(ModuleRef ref) throws ArchiveWrappedException {
-		ApplicationClient appClient = (ApplicationClientImpl)ref.getDeploymentDescriptor();
-		List ejbRefs = new ArrayList();
-	    ejbRefs.addAll(appClient.getEjbReferences());
-		validateEJBRefMandatoryElements(ejbRefs, ref.getUri());
-		validateEJBRefs(ejbRefs, ref.getUri());
-		if (appClient != null && appClient.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) {
-			Set allRefs = new HashSet();
-			List resourceRefs = appClient.getResourceRefs();
-			List resourceEnvRefs = appClient.getResourceEnvRefs();
-			List serviceRefs = appClient.getServiceRefs();
-			    
-			validateDuplicateEJBRefs(allRefs,ejbRefs);
-			validateDuplicateResourceRefs(allRefs,resourceRefs);
-			validateDuplicateResourceEnvRefs(allRefs,resourceEnvRefs);
-			validateDuplicateServiceRefs(allRefs,serviceRefs);
-		}
-		
-	}
-
-	/**
-	 * @param ref
-	 * @throws ArchiveWrappedException
-	 */
-	private void validateWebAppRefs(ModuleRef ref) throws ArchiveWrappedException {
-		WebApp webApp = (WebApp)ref.getDeploymentDescriptor();
-		List ejbRefs = new ArrayList();
-	    ejbRefs.addAll(webApp.getEjbRefs());
-	    ejbRefs.addAll(webApp.getEjbLocalRefs());
-		validateEJBRefMandatoryElements(ejbRefs, ref.getUri());
-		validateEJBRefs(ejbRefs, ref.getUri());
-		if (webApp != null && webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID) {
-			Set allRefs = new HashSet();
-			List resourceRefs = webApp.getResourceRefs();
-			List resourceEnvRefs = webApp.getResourceEnvRefs();
-			List serviceRefs = webApp.getServiceRefs();
-			
-			validateDuplicateEJBRefs(allRefs,ejbRefs);
-			validateDuplicateResourceRefs(allRefs,resourceRefs);
-			validateDuplicateResourceEnvRefs(allRefs,resourceEnvRefs);
-			validateDuplicateServiceRefs(allRefs,serviceRefs);
-		}
-	}
-	/**
-	 * @param ref
-	 * @throws ArchiveWrappedException
-	 */
-	private void validateEJBModuleRefs(ModuleRef ref) throws ArchiveWrappedException {
-		EJBJar ejbJar = (EJBJar)ref.getDeploymentDescriptor();
-		if( ejbJar != null ) {
-			List ejbCollection = ejbJar.getEnterpriseBeans();			
-			if( ejbCollection != null || !ejbCollection.isEmpty() ) {
-				Resource res = ejbJar.eResource();
-				cleanUpAllRefSubTaskMessages(res);
-				Iterator iterator = ejbCollection.iterator();	
-				while( iterator.hasNext() ) {
-					EnterpriseBean ejbBean = (EnterpriseBean)iterator.next();
-					if( ejbBean != null ) {
-					    List ejbRefs = new ArrayList();
-					    ejbRefs.addAll(ejbBean.getEjbRefs());
-					    ejbRefs.addAll(ejbBean.getEjbLocalRefs());
-						validateEJBRefMandatoryElements(ejbRefs, ref.getUri());
-						validateEJBRefs(ejbRefs, ref.getUri());
-						if(ejbJar.getVersionID() <= J2EEVersionConstants.EJB_2_0_ID) {
-							Set allRefs = new HashSet();
-							List resourceRefs = ejbBean.getResourceRefs();
-							List resourceEnvRefs = ejbBean.getResourceEnvRefs();
-							List secRoleRefs = ejbBean.getSecurityRoleRefs();
-							List serviceRefs = ejbBean.getServiceRefs();
-							List messageDestRefs = ejbBean.getMessageDestinationRefs();
-							    
-							validateDuplicateEJBRefs(allRefs,ejbRefs);
-							validateDuplicateResourceRefs(allRefs,resourceRefs);
-							validateDuplicateResourceEnvRefs(allRefs,resourceEnvRefs);
-							validateDuplicateSecurityRoleRefs(allRefs,secRoleRefs);
-							validateDuplicateServiceRefs(allRefs,serviceRefs);
-							validateDuplicateMessageDestRefs(allRefs,messageDestRefs);
-					   }
-					}
-				}
-			}
-		}
-	 
-	}
-
-	/**
-	 * @param allRefs
-	 * @param serviceRefs
-	 */
-	private void validateDuplicateServiceRefs(Set allRefs, List serviceRefs) {
-		if (!serviceRefs.isEmpty()) {
-			ServiceRef firstRef = (ServiceRef)(serviceRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < serviceRefs.size(); refNo++) {
-			ServiceRef ref = (ServiceRef) (serviceRefs.get(refNo));
-			String refName = ref.getServiceRefName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_SERVICEREF, parms,ref,SERVICE_REF_GROUP_NAME);
-		}
-	  }
-	}
-
-	/**
-	 * @param allRefs
-	 * @param secRoleRefs
-	 */
-	private void validateDuplicateSecurityRoleRefs(Set allRefs, List secRoleRefs) {
-		if (!secRoleRefs.isEmpty()) {
-			SecurityRoleRef firstRef = (SecurityRoleRef)(secRoleRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < secRoleRefs.size(); refNo++) {
-			SecurityRoleRef ref = (SecurityRoleRef) (secRoleRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_SECURITYROLEREF, parms,ref,SEC_ROLE_REF_GROUP_NAME);
-		}
-	  }
-	}
-
-	/**
-	 * @param allRefs
-	 * @param resourceEnvRefs
-	 */
-	private void validateDuplicateResourceEnvRefs(Set allRefs, List resourceEnvRefs) {
-		if (!resourceEnvRefs.isEmpty()) {
-			ResourceEnvRef firstRef = (ResourceEnvRef)(resourceEnvRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < resourceEnvRefs.size(); refNo++) {
-			ResourceEnvRef ref = (ResourceEnvRef) (resourceEnvRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_RESENVREF, parms,ref,RES_ENV_REF_GROUP_NAME);
-		}
-	  }
-	}
-
-	/**
-	 * @param allRefs
-	 * @param resourceRefs
-	 */
-	private void validateDuplicateResourceRefs(Set allRefs, List resourceRefs) {
-		if (!resourceRefs.isEmpty()) {
-			ResourceRef firstRef = (ResourceRef)(resourceRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < resourceRefs.size(); refNo++) {
-			ResourceRef ref = (ResourceRef) (resourceRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_RESREF, parms,ref,RES_REF_GROUP_NAME);
-		}
-	  }
-	}
-	/**
-	 * @param allRefs
-	 * @param ejbRefs
-	 */
-	protected void validateDuplicateEJBRefs(Set allRefs, List ejbRefs) {
-		if (!ejbRefs.isEmpty()) {
-			EjbRef firstRef = (EjbRef)(ejbRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < ejbRefs.size(); refNo++) {
-			EjbRef ref = (EjbRefImpl) (ejbRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_EJBREF, parms, ref, EJB_REF_GROUP_NAME);
-		 }
-		}
-	}
-	
-	/**
-	 * @param allRefs
-	 * @param ejbRefs
-	 */
-	protected void validateDuplicateMessageDestRefs(Set allRefs, List messageDestRefs) {
-		if (!messageDestRefs.isEmpty()) {
-			MessageDestinationRef firstRef = (MessageDestinationRef)(messageDestRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < messageDestRefs.size(); refNo++) {
-			MessageDestinationRef ref = (MessageDestinationRef) (messageDestRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF, parms,ref, MESSAGE_REF_GROUP_NAME);
-		 }
-		}
-	}
-
-	/**
-	 * @param firstRef
-	 */
-	protected void cleanUpSubTaskMessages(EObject ref) {
-		//No Op - subclass overrides 
-	}
-	
-	protected void cleanUpAllRefSubTaskMessages(Resource res) {
-		//No Op - subclass overrides 
-	}
-
-	/**
-	 * Ejb refs to the running list of ejb refs.
-	 * 
-	 * @param List currentRefs - List of current ejb refs to be added.
-	 * @param List ejbRefs - collection of running ejbrefs
-	 */
-	public void addEJBRefs( List currentRefs, List ejbRefs ) {		
-		if( currentRefs == null || ejbRefs == null )
-			return;
-		
-		ejbRefs.addAll( currentRefs );									
-	}// addEJBRefs
-
-	/**
-	 * validate security constraints, roles, and security role refs.
-	 */
-	public void validateSecurity() {
-		EList earRoleList = appDD.getSecurityRoles();
-		if (!earRoleList.isEmpty())
-			validateEarRoles(earRoleList);
-		EList moduleList = appDD.getModules();
-		if (!moduleList.isEmpty()) {
-	
-			for (int i = 0; i < moduleList.size(); i++) {
-				Module m = (Module) moduleList.get(i);
-				if (m.isEjbModule()) {
-					EList ejbRoles = m.getApplication().getSecurityRoles();
-					if (!ejbRoles.isEmpty())
-						validateEJBRolesWithEARRoles(earRoleList, ejbRoles);
-				}// if
-				if (m.isWebModule()) {
-					EList webRoles = m.getApplication().getSecurityRoles();
-					if (!webRoles.isEmpty())
-						validateWEBRolesWithEARRoles(earRoleList, webRoles);
-				}// if
-			}// for
-		}// if
-	}// validateSecurity
-	
-	/**
-	 * Validates an ear for duplicate web contexts.
-	 */
-	public void validateWebContexts() {
-		
-		EList moduleList = appDD.getModules();
-	  	Map visitedWebContext = new HashMap();
-	  	
-	  	if( !moduleList.isEmpty() ) {		
-			Iterator iterator = moduleList.iterator();		
-			while( iterator.hasNext() ) {
-		  		Module module = (Module)iterator.next();
-		  		if( module.isWebModule() ) {
-		  			
-		  			WebModule webModule = (WebModule)module;
-			  			
-			  		if( webModule != null ) {
-			  			if( visitedWebContext.containsKey( webModule.getContextRoot() ) ) {
-			  				WebModule tempWebModule = (WebModule)visitedWebContext.get( webModule.getContextRoot() );
-							String[] params = new String[3];
-							params[0] = webModule.getContextRoot();
-							params[1] = webModule.getUri();
-							params[2] = tempWebModule.getUri();
-							String tmp = NLS.bind(EARValidationMessageResourceHandler.MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_, params);
-							
-			  				addLocalizedError(tmp, appDD);
-			  			} else {
-			  				visitedWebContext.put( webModule.getContextRoot(), webModule );
-			  			}// if
-			  				
-			  		}// if
-		  			
-		  		}// if
-			}// while
-	  	}// if
-	}// validateWebContexts
-	
-	
-	/**
-	 * Checks if the modules are a spec level too high for the EAR file.
-	 */
-	private void validateSpecLevel() {
-		int earVersion = getVersionID(earFile);
-		List modules = earFile.getModuleFiles();
-		
-		if( !modules.isEmpty() ) {
-			Iterator iterator = modules.iterator();
-			ModuleFile moduleFile = null;
-			while (iterator.hasNext()) {
-		  		moduleFile = (ModuleFile)iterator.next();
-		  		if (moduleFile != null && getVersionID(moduleFile) > earVersion) {
-			  		String[] params = new String[] {moduleFile.getURI(), earFile.getName()};
-			  		String tmp = NLS.bind(EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_, params);
-					addLocalizedWarning(tmp, appDD);
-		  		}
-			}		  			
-		}
-	}
-	
-	/**
-	 * @param moduleFile
-	 * @return
-	 */
-	private int getVersionID(ModuleFile moduleFile) {
-		XMLResource res = null;
-		try {
-			res = (XMLResource) moduleFile.getDeploymentDescriptorResource();
-		} catch (ResourceLoadException e) {
-			//Ignore
-		} catch (FileNotFoundException e) {	
-			//Ignore
-		}
-		if (res != null)
-			return res.getJ2EEVersionID();
-		return -1;
-	}
-	
-	
-	private void validateMessageDestinations() {
-		 validateMessageDestinationRefs();
-		 validateMDBMessageDestinations();
-	}
-	private void validateMDBMessageDestinations() {
-		List moduleList = earFile.getModuleRefs();
-	
-		for (int i = 0; i < moduleList.size(); i++) {
-			ModuleRef ref = (ModuleRef) moduleList.get(i);
-			try {
-				 if( ref.isEJB() ) {
-					EJBJar ejbJar = (EJBJar)ref.getDeploymentDescriptor();
-					if( ejbJar != null ) {
-						removeAllMessages(ejbJar,MESSAGE_DESTINATION_MDB_REF_GROUP_NAME);
-						List ejbCollection = ejbJar.getEnterpriseBeans();			
-						if( ejbCollection != null || !ejbCollection.isEmpty() ) {
-						    Iterator iterator = ejbCollection.iterator();	
-							while( iterator.hasNext() ) {
-								EnterpriseBean ejbBean = (EnterpriseBean)iterator.next();
-								if( ejbBean != null ) {
-									if (ejbBean.isMessageDriven()) {
-										MessageDriven messageDrivenBean = (MessageDriven)ejbBean;
-										if (messageDrivenBean.getVersionID() < J2EEVersionConstants.EJB_2_1_ID) continue;
-										String link = messageDrivenBean.getLink();
-										if (link != null && !isExistMessageDestinationLink(link, ref)) {
-											String[] params = new String[4];
-											params[0] = link;
-											params[1] = messageDrivenBean.getName();
-											params[2] = ref.getUri();
-											params[3] = earFile.getName();
-											addError(EREF_CATEGORY, ERROR_UNRESOLVED_MDB_MISSING_MESSAGE_DESTINATION, params,messageDrivenBean, MESSAGE_DESTINATION_MDB_REF_GROUP_NAME);
-										}
-										
-									}
-								}
-							}
-						}
-					}
-				 }
-			} catch (ArchiveWrappedException ex) {
-				Exception nested = ex.getNestedException();
-				if (!(nested instanceof NoModuleFileException)) {
-					String[] params = new String[1];
-					params[0] = ref.getUri();
-					addError(EREF_CATEGORY, ERROR_MODULE_DD_FILE_NOT_FOUND, params);
-				}
-			} 
-			
-		}
-	}
-	
-
-	private void validateMessageDestinationRefs() {
-		List moduleList = earFile.getModuleRefs();
-		for (int i = 0; i < moduleList.size(); i++) {
-			ModuleRef ref = (ModuleRef) moduleList.get(i);
-			validateMessageDestinationRefs(ref);
-		}
-	}
-	/**
-	 * 
-	 */
-	private void validateMessageDestinationRefs(ModuleRef moduleRef) {
-		List destinationsRefs = getMessageDestinationRefs(moduleRef);
-		clearUpSubTaskMessageDestinationMessages(destinationsRefs);
-		for (int refNo = 0; refNo < destinationsRefs.size(); refNo++) {
-			MessageDestinationRef ref = (MessageDestinationRef) (destinationsRefs.get(refNo));
-			String link =  ref.getLink() ;
-			if (link == null) continue; // dont validate if the link is null
-			if ( link.length()== 0) { // empty link is an error
-				String[] params = new String[3];
-				params[0] = ref.getName();
-				params[1] = moduleRef.getUri();
-				params[2] = earFile.getName();
-				
-				addError(EREF_CATEGORY, ERROR_EAR_MISSING_EMPTY_MESSSAGEDESTINATION, params,ref, MESSAGE_DESTINATION_REF_GROUP_NAME);
-			} else if (!isExistMessageDestinationLink(link, moduleRef)) {
-				String[] params = new String[4];
-				params[0] = link;
-				params[1] = ref.getName();
-				params[2] = moduleRef.getUri();
-				params[3] = earFile.getName();
-				
-				addError(EREF_CATEGORY, ERROR_EAR_MISSING_MESSSAGEDESTINATION, params,ref, MESSAGE_DESTINATION_REF_GROUP_NAME);
-			}
-		}	
-	}
-	
-	
-	private void clearUpSubTaskMessageDestinationMessages(List destinationsRefs) {
-		for (int refNo = 0; refNo < destinationsRefs.size(); refNo++) {
-			MessageDestinationRef ref = (MessageDestinationRef) (destinationsRefs.get(refNo));
-			removeAllMessages(ref,MESSAGE_DESTINATION_REF_GROUP_NAME);
-		}
-	}
-	
-	protected void removeAllMessages(EObject eObject, String groupName) {
-		
-	}
-	
-	/**
-	 * @param ref
-	 * @return
-	 */
-	private boolean isExistMessageDestinationLink(String link, ModuleRef moduleRef) {
-		if (link == null) return false;
-		int index = link.indexOf('#');
-		String destinationName;
-		if (index == -1) {
-			destinationName = link;
-		} else {
-			String moduleName = link.substring(0,index);
-			destinationName = link.substring(index+1);
-			moduleRef = getModuleRefByName(moduleName);
-			if (moduleRef == null) return false;
-			
-		}
-		List destinations = getMessageDestinations(moduleRef);
-		for (int i = 0; i < destinations.size(); i++) {
-			MessageDestination messageDestination = (MessageDestination) (destinations.get(i));
-			if (destinationName.equals(messageDestination.getName())) return true;
-		}
-		return false;
-	}
-	
-	private ModuleRef getModuleRefByName(String moduleName) {
-		List moduleList = earFile.getModuleRefs();
-		for (int i = 0; i < moduleList.size(); i++) {
-			ModuleRef ref = (ModuleRef) moduleList.get(i);
-			Module module = ref.getModule();
-			if (moduleName.equals(module.getUri())) {
-				return ref;
-			}
-		}
-		return null;
-	}	
-	
-	private List getMessageDestinationRefs(ModuleRef ref) {
-		List destinationRefs = new ArrayList();
-		
-		try {
-			if(ref.isWeb()) {
-				WebApp webApp = (WebApp)ref.getDeploymentDescriptor();
-				destinationRefs.addAll(webApp.getMessageDestinationRefs());
-			} else if( ref.isEJB() ) {
-				EJBJar ejbJar = (EJBJar)ref.getDeploymentDescriptor();
-				destinationRefs.addAll(getEJBMessageDestinationRefs(ejbJar));
-			} else if(ref.isClient()) {
-				ApplicationClient appClient = (ApplicationClientImpl)ref.getDeploymentDescriptor();
-				destinationRefs.addAll(appClient.getMessageDestinationRefs());
-			}
-		} catch (ArchiveWrappedException ex) {
-			Exception nested = ex.getNestedException();
-			if (!(nested instanceof NoModuleFileException)) {
-				String[] params = new String[1];
-				params[0] = ref.getUri();
-				addError(EREF_CATEGORY, ERROR_MODULE_DD_FILE_NOT_FOUND, params);
-			}
-		} 
-			
-		
-		return destinationRefs;
-	}
-	
-	private List getEJBMessageDestinationRefs(EJBJar ejbJar) {
-		List ejbMessageDestinationRefs = new ArrayList();
-		if( ejbJar != null ) {
-			List ejbCollection = ejbJar.getEnterpriseBeans();			
-			if( ejbCollection != null || !ejbCollection.isEmpty() ) {
-			    Iterator iterator = ejbCollection.iterator();	
-				while( iterator.hasNext() ) {
-					EnterpriseBean ejbBean = (EnterpriseBean)iterator.next();
-					if( ejbBean != null ) {
-						ejbMessageDestinationRefs.addAll(ejbBean.getMessageDestinationRefs());
-					}
-				}
-			}
-		}
-		return ejbMessageDestinationRefs;
-	}
-	
-	private List getMessageDestinations(ModuleRef ref) {
-		List destinations = new ArrayList();
-		try {
-			if(ref.isWeb()) {
-				WebApp webApp = (WebApp)ref.getDeploymentDescriptor();
-				destinations.addAll(webApp.getMessageDestinations());
-			} else if( ref.isEJB() ) {
-				EJBJar ejbJar = (EJBJar)ref.getDeploymentDescriptor();
-				if (ejbJar != null && ejbJar.getAssemblyDescriptor() != null)
-					destinations.addAll(ejbJar.getAssemblyDescriptor().getMessageDestinations());
-			} else if(ref.isClient()) {
-				ApplicationClient appClient = (ApplicationClientImpl)ref.getDeploymentDescriptor();
-				destinations.addAll(appClient.getMessageDestinations());
-			}
-		} catch (ArchiveWrappedException ex) {
-			Exception nested = ex.getNestedException();
-			if (!(nested instanceof NoModuleFileException)) 
-				Logger.getLogger().logError(ex);
-		}
-		return destinations;
-	}
-
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		_helper = helper;
-		return null;
-	}
-	
-	public void cleanup(IReporter reporter) {
-		earFile = null;
-		appDD = null;
-		super.cleanup(reporter);
-	}	
-
-}// EarValidator
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean11VRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean11VRule.java
deleted file mode 100644
index 62e8d02c6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean11VRule.java
+++ /dev/null
@@ -1,1067 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-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.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This class checks ejb-jar.xml for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * 15.2.5.3 Declaration of security roles referenced from the bean's code
- * The Bean Provider is responsible for declaring in the security-role-ref elements of the deploy-ment
- * descriptor all the security role names used in the enterprise bean code. Declaring the security roles
- * references in the code allows the Application Assembler or Deployer to link the names of the security
- * roles used in the code to the security roles defined for an assembled application through the secu-rity-
- * role elements.
- * The Bean Provider must declare each security role referenced in the code using the secu-rity-
- * role-ref element as follows:
- *      Declare the name of the security role using the role-name element. The name must be the
- * security role name that is used as a parameter to the isCallerInRole(String role-Name)
- * method.
- *      Optional: Provide a description of the security role in the description element.
- * A security role reference, including the name defined by the role-name element, is scoped to the ses-sion
- * or entity bean element whose declaration contains the security-role-ref element.
- * The following example illustrates how an enterprise bean's references to security roles are declared in
- * the deployment descriptor.
- *    ...
- *    <enterprise-beans>
- *       ...
- *       <entity>
- *          <ejb-name>AardvarkPayroll</ejb-name>
- *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
- *          ...
- *          <security-role-ref>
- *             <description>
- *                 This security role should be assigned to the
- *                 employees of the payroll department who are
- *                 allowed to update employees' salaries.
- *             </description>
- *             <role-name>payroll</role-name>
- *          </security-role-ref>
- *          ...
- *       </entity>
- *       ...
- *    </enterprise-beans>
- *    ...
- *
- * The deployment descriptor above indicates that the enterprise bean AardvarkPayroll makes the
- * security check using isCallerInRole("payroll") in its business method.
- *
- *
- * 15.3.3 Linking security role references to security roles
- * If the Application Assembler defines the security-role elements in the deployment descriptor, he
- * or she is also responsible for linking all the security role references declared in the secu-rity-
- * role-ref elements to the security roles defined in the security-role elements.
- * The Application Assembler links each security role reference to a security role using the role-link
- * element. The value of the role-link element must be the name of one of the security roles defined in
- * a security-role element.
- * A role-link element must be used even if the value of role-name is the same as the value of the
- * role-link reference.
- * The following deployment descriptor example shows how to link the security role reference named
- * payroll to the security role named payroll-department.
- *    ...
- *    <enterprise-beans>
- *       ...
- *       <entity>
- *          <ejb-name>AardvarkPayroll</ejb-name>
- *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
- *          ...
- *          <security-role-ref>
- *             <description>
- *                This role should be assigned to the
- *                employees of the payroll department.
- *                Members of this role have access to
- *                anyone's payroll record.
- *
- *                The role has been linked to the
- *                payroll-department role.
- *             </description>
- *             <role-name>payroll</role-name>
- *             <role-link>payroll-department</role-link>
- *          </security-role-ref>
- *          ...
- *       </entity>
- *       ...
- *    </enterprise-beans>
- *    ...
- */
-public class EnterpriseBean11VRule extends AValidationRule implements IMessagePrefixEjb11Constants {
-	private static final Object ID = IValidationRuleList.EJB11_ENTERPRISEBEAN;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_SESSION_BEANCLASS, IValidationRuleList.EJB11_SESSION_HOME, IValidationRuleList.EJB11_SESSION_REMOTE, IValidationRuleList.EJB11_BMP_BEANCLASS, IValidationRuleList.EJB11_BMP_HOME, IValidationRuleList.EJB11_BMP_KEYCLASS, IValidationRuleList.EJB11_BMP_REMOTE, IValidationRuleList.EJB11_CMP_BEANCLASS, IValidationRuleList.EJB11_CMP_HOME, IValidationRuleList.EJB11_CMP_KEYCLASS, IValidationRuleList.EJB11_CMP_REMOTE};
-	private static final Map MESSAGE_IDS;
-
-	private List _securityRoles = null;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2801, new String[]{CHKJ2801 + SPEC});
-		MESSAGE_IDS.put(CHKJ2802_NAMED, new String[]{CHKJ2802_NAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2802_UNNAMED, new String[]{CHKJ2802_UNNAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2803_NAMED, new String[]{CHKJ2803_NAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2803_UNNAMED, new String[]{CHKJ2803_UNNAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2804_NAMED, new String[]{CHKJ2804_NAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2804_UNNAMED, new String[]{CHKJ2804_UNNAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2806, new String[]{CHKJ2806 + SPEC});
-		MESSAGE_IDS.put(CHKJ2807, new String[]{CHKJ2807 + SPEC});
-		MESSAGE_IDS.put(CHKJ2808, new String[]{CHKJ2808 + SPEC});
-		MESSAGE_IDS.put(CHKJ2809, new String[]{CHKJ2809 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2810_NAMED, new String[]{CHKJ2810_NAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2810_UNNAMED, new String[]{CHKJ2810_UNNAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2811_NAMED, new String[]{CHKJ2811_NAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2811_UNNAMED, new String[]{CHKJ2811_UNNAMED + SPEC});
-		MESSAGE_IDS.put(CHKJ2812, new String[]{CHKJ2812 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2820, new String[]{CHKJ2820 + SPEC});
-		MESSAGE_IDS.put(CHKJ2822, new String[]{CHKJ2822 + SPEC});
-		MESSAGE_IDS.put(CHKJ2823, new String[]{CHKJ2823 + SPEC});
-		MESSAGE_IDS.put(CHKJ2824, new String[]{CHKJ2824 + SPEC});
-		MESSAGE_IDS.put(CHKJ2827, new String[]{CHKJ2827 + SPEC});
-		MESSAGE_IDS.put(CHKJ2828, new String[]{CHKJ2828 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2830, new String[]{CHKJ2830 + SPEC});
-		MESSAGE_IDS.put(CHKJ2831, new String[]{CHKJ2831 + SPEC});
-		MESSAGE_IDS.put(CHKJ2832, new String[]{CHKJ2832 + SPEC});
-		MESSAGE_IDS.put(CHKJ2833, new String[]{CHKJ2833 + SPEC});
-		MESSAGE_IDS.put(CHKJ2834, new String[]{CHKJ2834 + SPEC});
-		MESSAGE_IDS.put(CHKJ2835, new String[]{CHKJ2835 + SPEC});
-		MESSAGE_IDS.put(CHKJ2836, new String[]{CHKJ2836 + SPEC});
-		MESSAGE_IDS.put(CHKJ2837, new String[]{CHKJ2837 + SPEC});
-		MESSAGE_IDS.put(CHKJ2838, new String[]{CHKJ2838 + SPEC});
-		MESSAGE_IDS.put(CHKJ2839, new String[]{CHKJ2839 + SPEC});
-		
-		MESSAGE_IDS.put(CHKJ2840, new String[]{CHKJ2840 + SPEC});
-		MESSAGE_IDS.put(CHKJ2841, new String[]{CHKJ2841 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-		MESSAGE_IDS.put(CHKJ2852, new String[]{CHKJ2852});
-		
-		MESSAGE_IDS.put(CHKJ2908, new String[]{CHKJ2908 + SPEC});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public Object getTarget(Object parent, Object clazz) {
-		// If called as a dependent, parent will be this EnterpriseBean.
-		return parent;
-	}
-
-	/**
-	 * 6.5.3 The optional SessionSynchronization interface
-	 *...
-	 * Only a stateful Session bean with container-managed transaction demarcation may 
-	 * implement the SessionSynchronization interface.
-	 *...
-	 * There is no need for a Session bean with bean-managed transaction to rely on the 
-	 * synchronization call backs because the bean is in control of the commit the bean 
-	 * knows when the transaction is about to be committed and it knows the outcome of the 
-	 * transaction commit.
-	 *...
-	 */
-	public boolean isValidSessionTypeElement(Session session) {
-		// check syntax
-		if (!session.isSetSessionType()) {
-			return false;
-		}
-
-		if (session.getSessionType().getValue() == SessionType.STATEFUL) {
-			return true;
-		}
-
-		if (session.getSessionType().getValue() == SessionType.STATELESS) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	public boolean isValidTransactionTypeElement(Session sessionBean) {
-		if (!sessionBean.isSetTransactionType()) {
-			return false;
-		}
-
-		if (sessionBean.getTransactionType().getValue() == TransactionType.BEAN) {
-			return true;
-		}
-
-		if (sessionBean.getTransactionType().getValue() == TransactionType.CONTAINER) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	
-	/**
-	 * If the bean components (home interface, remote interface, bean class, and primary
-	 * key) can all be found and reflected, return true. Else, add a validation error
-	 * against the bean, and return false.
-	 */
-	public boolean validateBeanComponents(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		boolean isValid = true;
-		// Don't need to check if the bean is null, because this method will
-		// not be called if it is.
-		try {
-			ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getEjbClass());
-		}
-		catch (InvalidInputException exc) {
-			if (bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_EjbClass())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2802_NAMED, IEJBValidationContext.ERROR, bean, new String[] { bean.getEjbClass().getQualifiedName()}, this);
-				vc.addMessage(message);
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2802_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-			isValid = false;
-		}
-
-		try {
-			ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getHomeInterface());
-		}
-		catch (InvalidInputException exc) {
-			if (bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2803_NAMED, IEJBValidationContext.ERROR, bean, new String[] { bean.getHomeInterfaceName()}, this);
-				vc.addMessage(message);
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2803_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-			isValid = false;
-		}
-
-		try {
-			ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getRemoteInterface());
-		}
-		catch (InvalidInputException exc) {
-			if (bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2804_NAMED, IEJBValidationContext.ERROR, bean, new String[] { bean.getRemoteInterfaceName()}, this);
-				vc.addMessage(message);
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2804_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-			isValid = false;
-		}
-
-		if (bean.isEntity()) {
-			JavaClass primaryKey = ((Entity) bean).getPrimaryKey();
-			try {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, primaryKey);
-			}
-			catch (InvalidInputException exc) {
-				if (((Entity) bean).eIsSet(EjbPackage.eINSTANCE.getEntity_PrimaryKey())) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2810_NAMED, IEJBValidationContext.ERROR, bean, new String[] { ((Entity) bean).getPrimaryKeyName()}, this);
-					vc.addMessage(message);
-				}
-				else {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2810_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-					vc.addMessage(message);
-				}
-				isValid = false;
-			}
-		}
-		return isValid;
-	}
-	
-	public void validateCMPFieldElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean instanceof ContainerManagedEntity) {
-			// check syntax of tag is okay
-			ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-			List fields = cmp.getPersistentAttributes();
-			if ((fields == null) || (fields.size() == 0)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2812, IEJBValidationContext.ERROR, bean, new String[] { bean.getEjbClassName()}, this);
-				vc.addMessage(message);
-				return;
-			}
-
-			boolean mapsToMultipleFields = !ValidationRuleUtility.isPrimitivePrimaryKey((ContainerManagedEntity) bean);
-			Iterator iterator = fields.iterator();
-			Field field = null;
-			List fieldNames = new ArrayList(fields.size());
-			while (iterator.hasNext()) {
-				CMPAttribute attrib = (CMPAttribute) iterator.next();
-				if (attrib == null) {
-					Logger logger = vc.getMsgLogger();
-					if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-						LogEntry entry = vc.getLogEntry();
-						entry.setSourceID("DDValidator.validateCMPFieldElement(EnterpriseBean)"); //$NON-NLS-1$
-						entry.setText("CMPAttribute is null."); //$NON-NLS-1$
-						logger.write(Level.FINEST, entry);
-					}
-					continue;
-				}
-
-				field = attrib.getField();
-				if (field == null) {
-					if (attrib.getName() != null) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2811_NAMED, IEJBValidationContext.ERROR, bean, new String[] { attrib.getName(), bean.getEjbClassName()}, this);
-						vc.addMessage(message);
-					}
-					else {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2811_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-						vc.addMessage(message);
-					}
-					continue;
-				}
-				else if (field.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID)) {
-					// not a customer-entered field
-					continue;
-				}
-
-				fieldNames.add(field.getName());
-
-				try {
-					// If the field is not a valid type
-					ValidationRuleUtility.isValidType(ValidationRuleUtility.getType(field));
-				}
-				catch (InvalidInputException exc) {
-					// field not identified
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2830, IEJBValidationContext.WARNING, bean, new String[] { field.getName()}, this);
-					vc.addMessage(message);
-				}
-			}
-
-			// 9.4.7.2
-			if (mapsToMultipleFields && !ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-				List primKeyFields = cmp.getPrimaryKey().getFieldsExtended();
-
-				// (9.4.7.1 is validated in validatePrimKeyClassElement(bean)
-				// check if the primary key class' fields exist in the container-managed fields
-				iterator = primKeyFields.iterator();
-
-				while (iterator.hasNext()) {
-					Field keyField = (Field) iterator.next();
-					if ((keyField.getName() != null) && (keyField.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID))) {
-						// not a customer-entered field
-						continue;
-					}
-
-					if (!fieldNames.contains(keyField.getName())) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2831, IEJBValidationContext.WARNING, bean, new String[] { keyField.getName()}, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-
-		}
-	}
-	
-	/**
-	 * This validateDeploymentDescriptor is called if the EJBJar could load, which means
-	 * that the syntax of the JAR is (mostly) correct.
-	 *
-	 * EJB spec 1.1, section C.4, "Added the requirement for the Bean Provider to specify whether the
-	 * enterprise bean uses a bean-managed or container-managed transaction."
-	 */
-	public void validate(IEJBValidationContext vc, Object targetParent, Object target) {
-		EJBJar ejbJar = null;
-		if(targetParent instanceof EnterpriseBean) {
-			// running as a dependent
-			ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-		}
-		else {
-			ejbJar = (EJBJar)targetParent;
-		}
-		EnterpriseBean bean = (EnterpriseBean)target;
-		
-		validate(vc, ejbJar, bean);
-	}
-		
-	public void validate(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2908, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-
-			// If bean isn't valid, don't perform any of the other
-			// validation checks on it.
-			return;
-		}
-
-		try {
-			// Check if the class exists, etc.
-			boolean reflected = validateBeanComponents(vc, ejbJar, bean); // assume everything will reflect properly
-
-			validateEnterpriseTypeElement(vc, ejbJar, bean);
-			validateEJBNameElement(vc, ejbJar, bean);
-			validateReentrantElement(vc, ejbJar, bean);
-			validateSessionTypeElement(vc, ejbJar, bean);
-			validateTransactionTypeElement(vc, ejbJar, bean);
-			validatePersistenceTypeElement(vc, ejbJar, bean);
-			validateEnvironmentEntries(vc, ejbJar, bean);
-
-			if (!reflected) {
-				// Something didn't reflect properly, so don't continue with the
-				// rest of the checks. Some metadata will be nonsense.
-				return;
-			}
-
-			if (bean.isContainerManagedEntity()) {
-				ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-				if (cmp.getPrimKeyField() != null && !cmp.getPrimKeyField().eIsProxy()) {
-					// Don't validate the fields if it's neither a primitive primary key nor a compound primary key.
-					// If the user was attempting a primitive primary key, but did a typo in ejb-jar.xml,
-					// the user will see a lot of strange messages logged against the fields in the primitive primary key.
-					validateCMPFieldElement(vc, ejbJar, bean);
-				}
-			}
-
-			validatePrimKeyClassElement(vc, ejbJar, bean);
-			validateEJBRef(vc, ejbJar, bean);
-			validateSecurityRoleRefElement(vc, ejbJar, bean);
-		}
-		catch(ValidationCancelledException e) {
-			throw e;
-		}
-		/* unreachable catch block
-		catch(ValidationException exc) {
-			// If there's a problem, proceed with the next bean.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[] { bean.getName() }, this);
-			vc.addMessage(message);
-			MsgLogger logger = vc.getMsgLogger();
-			if (logger.isLoggingLevel(Level.FINER)) {
-				logger.write(Level.FINER, exc);
-			}
-		}
-		*/
-		catch (Throwable exc) {
-			// If there's a problem, proceed with the next bean.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[] { bean.getName() }, this);
-			vc.addMessage(message);
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-				logger.write(Level.SEVERE, exc);
-			}
-		}
-	}
-	
-	public void validateEJBNameElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		String name = bean.getName();
-		if ((name == null) || (name.equals(""))) { //$NON-NLS-1$
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2801, IEJBValidationContext.ERROR, bean, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Validate section 14.3 of the EJB 1.1 specification.
-	 *
-	 * 14.3 EJB References
-	 *   14.3.1 Bean Provider's responsibilities
-	 *     14.3.1.1 EJB reference programming interfaces
-	 *     14.3.1.2 Declaration of EJB references in deployment descriptor
-	 *   14.3.2 Application Assembler's responsibilities
-	 *   14.3.3 Deployer's responsibility
-	 *   14.3.4 Container Provider's responsibility
-	 */
-	public void validateEJBRef(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		List ejbRefs = bean.getEjbRefs();
-		if ((ejbRefs == null) || (ejbRefs.size() == 0)) {
-			return;
-		}
-
-		Iterator iterator = ejbRefs.iterator();
-		EjbRef ref = null;
-		while (iterator.hasNext()) {
-			ref = (EjbRef) iterator.next();
-			if (ref == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("DDValidator.validateEJBRef(EnterpriseBean)"); //$NON-NLS-1$
-					entry.setText("EjbRef is null in " + bean.getName()); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-			// 14.3.1.1
-			// Info mssg. "EJB spec recommends that all references to other enterprise beans be organized in the ejb subcontext of the bean's environment"
-			EnterpriseBean namedEjb = null;
-			if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Link())) {
-				// Load the EJB identified by the reference, if it exists.
-				namedEjb = ejbJar.getEnterpiseBeanFromRef(ref);
-				if (namedEjb != null) {
-					// if it's null, let the EAR validator report it
-					Integer ejbType = new Integer(ref.getType().getValue());
-					boolean wrongType = false; // is the EJB, identified by ejb-link, of the type specified in the ejb-ref-type element?
-					String type = (namedEjb instanceof Session) ? "Session" : "Entity"; //$NON-NLS-1$  //$NON-NLS-2$
-					if (ejbType == null) {
-						// Neither session nor entity?
-						wrongType = true;
-					}
-					else if (ejbType.intValue() == EjbRefType.SESSION) {
-						if (!(namedEjb instanceof Session)) {
-							wrongType = true;
-						}
-					}
-					else if (ejbType.intValue() == EjbRefType.ENTITY) {
-						if (!(namedEjb instanceof Entity)) {
-							wrongType = true;
-						}
-					}
-					else {
-						wrongType = true;
-					}
-					if (wrongType) {
-						String[] parms = { namedEjb.getName(), type };
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2835, IEJBValidationContext.INFO, bean, parms, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-
-			// 14.3.1.2, 14.3.2, 14.3.4
-			// Check that ejb-ref-name, ejb-ref-type, home, and remote have been defined, and exist
-			validateHomeRef(vc, ejbJar, ref, namedEjb);
-			validateRemoteRef(vc, ejbJar, ref, namedEjb);
-
-			// 14.3.1.1
-			// Info mssg. "EJB spec recommends that all references to other enterprise beans be organized in the ejb subcontext of the bean's environment"
-			if (ref.getName() != null) {
-				// If ejb name isn't set, that error would have been caught by one of the validateRef methods
-				// Don't duplicate that effort here.
-				String ejbName = ref.getName();
-				if (!ejbName.startsWith("ejb/")) { //$NON-NLS-1$
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2838, IEJBValidationContext.INFO, bean, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-	
-	public void validateEnterpriseTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// Attempt in vain to validate the enterprise type element here, because 
-		// if it's not specified, there's a syntax error, and the 
-		// validateDeploymentDescriptor(IReporter, IValidationContext) would have been 
-		// called instead.
-		/*
-		if(! (bean.isSession() || bean.isEntity() )) {
-			// no tag specified
-			String beanName = (bean.getName() == null) ? "" : bean.getName();
-			addValidationMessage(IEJBValidationContext.ERROR, IMessagePrefixEjb11Constants.EJB_DD_INVALID_ENTERPRISETYPE, new String[]{beanName}, bean);
-		}
-		*/
-	}
-	
-	/**
-	 * Validate section 14.3 of the EJB 1.1 specification.
-	 *
-	 * 14.2.1.2 Declaration of environment entries
-	 */
-	public void validateEnvironmentEntries(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		List envEntries = bean.getEnvironmentProperties();
-		if ((envEntries == null) || (envEntries.size() == 0)) {
-			return;
-		}
-
-		EnvEntry envEntry = null;
-		Iterator iterator = envEntries.iterator();
-		DuplicatesTable envNames = new DuplicatesTable();
-		while (iterator.hasNext()) {
-			envEntry = (EnvEntry) iterator.next();
-			if (envEntry == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("DDValidator.validateEnvironmentEntries(EnterpriseBean)"); //$NON-NLS-1$
-					entry.setText("EjbEntry is null in " + bean.getName()); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-
-			if (envEntry.getName() != null) {
-				envNames.add(envEntry.getName());
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2839, IEJBValidationContext.WARNING, bean, this);
-				vc.addMessage(message);
-			}
-
-			if (envEntry.isSetType()) {
-				// 14.2.1.2; type must be one of these types: String, Integer, Boolean, Double, Byte, Short, Long, and Float.
-				int type = envEntry.getType().getValue();
-				if (!((type == EnvEntryType.BOOLEAN) || (type == EnvEntryType.BYTE) || (type == EnvEntryType.DOUBLE) || (type == EnvEntryType.FLOAT) || (type == EnvEntryType.INTEGER) || (type == EnvEntryType.LONG) || (type == EnvEntryType.SHORT) || (type == EnvEntryType.STRING))) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2840, IEJBValidationContext.WARNING, bean, this);
-					vc.addMessage(message);
-				}
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2840, IEJBValidationContext.WARNING, bean, this);
-				vc.addMessage(message);
-			}
-		}
-
-		if (envNames.containsDuplicates()) {
-			Iterator dups = envNames.getDuplicates().iterator();
-			while (dups.hasNext()) {
-				String name = (String) dups.next();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2841, IEJBValidationContext.WARNING, bean, new String[] { name }, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * If the metadata from the EjbRef is not valid, add a validation message.
-	 *
-	 * @parm EjbRef The <ejb-ref> element this method validates.
-	 * @parm EnterpriseBean If the <ejb-ref> uses an <ejb-link>, this is the enterprise bean identified by that link. If the link doesn't exist, or if the user has identified a bean which doesn't exist, this parameter will be null.
-	 */
-	protected void validateHomeRef(IEJBValidationContext vc, EJBJar ejbJar, EjbRef ref, EnterpriseBean namedEjb) {
-		boolean validType = true;
-		EnterpriseBean bean = (EnterpriseBean)ref.eContainer();
-		if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Home())) {
-			try {
-				String homeName = ref.getHome();
-				JavaHelpers type = ValidationRuleUtility.getType(homeName, bean);
-				// Check that the home specified in the <home> element of the <ejb-ref> element
-				// exists.
-				ValidationRuleUtility.isValidType(type);
-
-				if (namedEjb != null) {
-					// Check that the home specified in the <home> element
-					// is assignable to the home used by the named EJB in the
-					// <ejb-link> element.
-					JavaClass intfType = namedEjb.getHomeInterface();
-					ValidationRuleUtility.isValidType(intfType);
-
-					// Make sure that the identified home/remote interface in the ejb-ref
-					// is of the same type as the one used by the bean.
-					if (!ValidationRuleUtility.isAssignableFrom(type.getWrapper(), intfType)) {
-						String[] parms = { namedEjb.getName(), intfType.getName()};
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2836, IEJBValidationContext.INFO, bean, parms, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-			catch (InvalidInputException exc) {
-				validType = false;
-			}
-		}
-		else {
-			validType = false;
-		}
-
-		if (!validType) {
-			String[] parms = { ref.getHome()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2832, IEJBValidationContext.INFO, bean, parms, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void validatePersistenceTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// Attempt in vain to validate the persistence type element here, because 
-		// if it's not specified, there's a syntax error, and the 
-		// validateDeploymentDescriptor(IReporter, IValidationContext) would have been 
-		// called instead.
-		if (bean.isEntity()) {
-			// check syntax
-			Entity entityBean = (Entity) bean;
-			if (!(entityBean.isContainerManagedEntity() || entityBean.isBeanManagedEntity())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2809, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	/**
-	 * If the primary key class reflected properly, return true. Else, return false.
-	 */
-	public void validatePrimKeyClassElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isEntity()) {
-			// check syntax
-			if (bean instanceof ContainerManagedEntity) {
-				ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-				JavaClass clas = cmp.getPrimaryKey();
-				if (clas != null && !clas.eIsProxy() && !isValidPrimKeyField(cmp,clas)) {
-					// 9.4.7.1
-					// user has specified both a prim-key-class and a primkey-field
-					// can't use the CMPAttribute's field's name, because the primitive primary key returned is null
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2828, IEJBValidationContext.ERROR, bean, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * If the primary key is specified in the xml, answer whether it is the same as the derived primaryKeyAttribute
-	 */
-	public static boolean isValidPrimKeyField(ContainerManagedEntity cmp, JavaClass clas) {
-		return cmp.getPrimaryKeyName().equals(clas.getJavaName()); 
-	}
-	
-	public void validateReentrantElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isEntity()) {
-			// check syntax
-			Entity entity = (Entity) bean;
-			if (!entity.isSetReentrant()) {
-				// Can only test if the reentrant attribute is set, because the model defaults it
-				// to some boolean value if it isn't set.
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2806, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * If the metadata from the EjbRef is not valid, add a validation message.
-	 *
-	 * @parm EjbRef The ref whose home this method checks.
-	 * @parm EnterpriseBean If the EjbRef uses an <ejb-link> element, this is the enterprise bean identified by that element. It may be null, if the user has made a mistake.
-	 */
-	protected void validateRemoteRef(IEJBValidationContext vc, EJBJar ejbJar, EjbRef ref, EnterpriseBean namedEjb) {
-		boolean validType = true;
-		EnterpriseBean bean = (EnterpriseBean)ref.eContainer();
-		if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Remote())) {
-			try {
-				String remoteName = ref.getRemote();
-				JavaHelpers type = ValidationRuleUtility.getType(remoteName, bean);
-				// Check that the home specified in the <home> element of the <ejb-ref> element
-				// exists.
-				ValidationRuleUtility.isValidType(type);
-
-				if (namedEjb != null) {
-					// Check that the home specified in the <home> element
-					// is assignable to the home used by the named EJB in the
-					// <ejb-link> element.
-					JavaClass intfType = namedEjb.getRemoteInterface();
-					ValidationRuleUtility.isValidType(intfType);
-
-					// Make sure that the identified home/remote interface in the ejb-ref
-					// is of the same type as the one used by the bean.
-					if (!ValidationRuleUtility.isAssignableFrom(type.getWrapper(), intfType)) {
-						String[] parms = { namedEjb.getName(), intfType.getName()};
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2837, IEJBValidationContext.INFO, bean, parms, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-			catch (InvalidInputException exc) {
-				validType = false;
-			}
-		}
-		else {
-			validType = false;
-		}
-
-		if (!validType) {
-			String[] parms = { ref.getRemote()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2833, IEJBValidationContext.INFO, bean, parms, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * 15.2.5.3 Declaration of security roles referenced from the bean's code
-	 * The Bean Provider is responsible for declaring in the security-role-ref 
-	 * elements of the deployment descriptor all the security role names used 
-	 * in the enterprise bean code. Declaring the security roles references in
-	 * the code allows the Application Assembler or Deployer to link the names 
-	 * of the security roles used in the code to the security roles defined for 
-	 * an assembled application through the security-role elements.
-	 * The Bean Provider must declare each security role referenced in the code
-	 * using the security-role-ref element as follows:
-	 *      Declare the name of the security role using the role-name element. 
-	 * The name must be the security role name that is used as a parameter to 
-	 * the isCallerInRole(String role-Name) method.
-	 *      Optional: Provide a description of the security role in the 
-	 * description element. A security role reference, including the name defined 
-	 * by the role-name element, is scoped to the session or entity bean element 
-	 * whose declaration contains the security-role-ref element. The following 
-	 * example illustrates how an enterprise bean's references to security roles 
-	 * are declared in the deployment descriptor.
-	 *    ...
-	 *    <enterprise-beans>
-	 *       ...
-	 *       <entity>
-	 *          <ejb-name>AardvarkPayroll</ejb-name>
-	 *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
-	 *          ...
-	 *          <security-role-ref>
-	 *             <description>
-	 *                 This security role should be assigned to the
-	 *                 employees of the payroll department who are
-	 *                 allowed to update employees' salaries.
-	 *             </description>
-	 *             <role-name>payroll</role-name>
-	 *          </security-role-ref>
-	 *          ...
-	 *       </entity>
-	 *       ...
-	 *    </enterprise-beans>
-	 *    ...
-	 *
-	 * The deployment descriptor above indicates that the enterprise bean 
-	 * AardvarkPayroll makes the security check using isCallerInRole("payroll")
-	 * in its business method.
-	 *
-	 *
-	 * 15.3.3 Linking security role references to security roles
-	 * If the Application Assembler defines the security-role elements in the 
-	 * deployment descriptor, he or she is also responsible for linking all the 
-	 * security role references declared in the security-role-ref elements to the 
-	 * security roles defined in the security-role elements. The Application 
-	 * Assembler links each security role reference to a security role using the 
-	 * role-link element. The value of the role-link element must be the name of 
-	 * one of the security roles defined in a security-role element.
-	 * A role-link element must be used even if the value of role-name is the 
-	 * same as the value of the role-link reference.
-	 * The following deployment descriptor example shows how to link the security 
-	 * role reference named payroll to the security role named payroll-department.
-	 *    ...
-	 *    <enterprise-beans>
-	 *       ...
-	 *       <entity>
-	 *          <ejb-name>AardvarkPayroll</ejb-name>
-	 *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
-	 *          ...
-	 *          <security-role-ref>
-	 *             <description>
-	 *                This role should be assigned to the
-	 *                employees of the payroll department.
-	 *                Members of this role have access to
-	 *                anyone's payroll record.
-	 *
-	 *                The role has been linked to the
-	 *                payroll-department role.
-	 *             </description>
-	 *             <role-name>payroll</role-name>
-	 *             <role-link>payroll-department</role-link>
-	 *          </security-role-ref>
-	 *          ...
-	 *       </entity>
-	 *       ...
-	 *    </enterprise-beans>
-	 *    ...
-	 *
-	 */
-	public void validateSecurityRoleRefElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		/**
-		 * Need to build up a list of duplicate role names, but the validation message
-		 * needs to be registered against the duplicate SecurityRoleRef instance.
-		 * (Without the instance, we cannot get line numbers.)
-		 *
-		 * This class wrappers the SecurityRolRef instance so that the wrapper's
-		 * implemention of equals compares the names, but the validation message will
-		 * still be able to get the ref from the duplicate name.
-		 */
-		class RoleRefWrapper {
-			private SecurityRoleRef _ref = null;
-
-			public RoleRefWrapper(SecurityRoleRef ref) {
-				_ref = ref;
-			}
-
-			public boolean equals(Object o) {
-				if (o instanceof RoleRefWrapper) {
-					RoleRefWrapper other = (RoleRefWrapper) o;
-					return _ref.getName().equals(other.getRoleRef().getName());
-				}
-				return false;
-			}
-
-			public SecurityRoleRef getRoleRef() {
-				return _ref;
-			}
-		}
-
-		boolean areSRolesDefined = ((_securityRoles != null) && (_securityRoles.size() > 0));
-
-		List securityRoleRefs = bean.getSecurityRoleRefs();
-		if ((securityRoleRefs != null) && (securityRoleRefs.size() != 0)) {
-			// Check that each security role ref refers to a security role,
-			// if security roles are defined in the assembly descriptor,
-			// and that each referenced security role exists.
-			DuplicatesTable roleRefNames = new DuplicatesTable();
-			for (int i = 0; i < securityRoleRefs.size(); i++) {
-				SecurityRoleRef ref = (SecurityRoleRef) securityRoleRefs.get(i);
-
-				// Check that the role name is set (15.2.5.3)
-				String roleName = ref.getName();
-				if ((roleName == null) || (roleName.equals(""))) { //$NON-NLS-1$
-					roleName = ""; //$NON-NLS-1$
-					String beanName = (bean.getName() == null) ? "" : bean.getName(); //$NON-NLS-1$
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2822, IEJBValidationContext.WARNING, ref, new String[] { beanName }, this);
-					vc.addMessage(message);
-				}
-				else {
-					// Build up the list of names, to check for duplicates
-					roleRefNames.add(new RoleRefWrapper(ref));
-				}
-
-				// Check that the role link is set (15.3.3)
-				String roleLink = ref.getLink();
-				boolean isLinkDefined = ((ref.eIsSet(CommonPackage.eINSTANCE.getSecurityRoleRef_Link())) && (roleLink != null) && (!roleLink.equals(""))); //$NON-NLS-1$
-
-				if ((areSRolesDefined) && (!isLinkDefined)) {
-					// must have role link defined (15.3.3)
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2823, IEJBValidationContext.WARNING, ref, this);
-					vc.addMessage(message);
-				}
-				else if ((!areSRolesDefined) && (isLinkDefined)) {
-					// must not have role link defined (15.2.5.3)
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2827, IEJBValidationContext.WARNING, ref, this);
-					vc.addMessage(message);
-				}
-				else if (areSRolesDefined && isLinkDefined) {
-					// check that the role listed in the link exists. (15.3.3)
-					Iterator iterator = _securityRoles.iterator();
-					boolean roleExists = false;
-					while(iterator.hasNext()) {
-						SecurityRole role = (SecurityRole)iterator.next();
-						if(role.getRoleName().equals(roleLink)) {
-							roleExists = true;
-							break;
-						}
-					}
-					if (!roleExists) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2824, IEJBValidationContext.WARNING, ref, new String[] { roleName }, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-
-			// Check for duplicates
-			// Check that there are no duplicate role-names. (15.3.1)
-			if (roleRefNames.containsDuplicates()) {
-				List duplicates = roleRefNames.getDuplicates();
-				Iterator iterator = duplicates.iterator();
-				while (iterator.hasNext()) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2820, IEJBValidationContext.WARNING, ((RoleRefWrapper) iterator.next()).getRoleRef(), this);
-					vc.addMessage(message);
-				}
-			}
-			roleRefNames.clear();
-		}
-	}
-	
-	/**
-	 * 6.5.3 The optional SessionSynchronization interface
-	 *...
-	 * Only a stateful Session bean with container-managed transaction demarcation may 
-	 * implement the SessionSynchronization interface.
-	 *...
-	 * There is no need for a Session bean with bean-managed transaction to rely on the 
-	 * synchronization call backs because the bean is in control of the commit the bean 
-	 * knows when the transaction is about to be committed and it knows the outcome of the 
-	 * transaction commit.
-	 *...
-	 */
-	public void validateSessionTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isSession()) {
-			Session session = (Session) bean;
-
-			// check syntax
-			boolean isValidSess = isValidSessionTypeElement(session);
-			if (!isValidSess) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2807, IEJBValidationContext.ERROR, session, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	public void validateTransactionTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isSession()) {
-			// check syntax
-			Session sessionBean = (Session) bean;
-			if (!isValidTransactionTypeElement(sessionBean)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2808, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/*
-	 * @see IValidationRule#reset()
-	 */
-	public void reset() {
-		super.reset();
-		_securityRoles = null;
-	}
-
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-
-		EJBJar ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-		if(ejbJar == null) {
-			return;
-		}
-		
-		if(ejbJar.getAssemblyDescriptor() == null) {
-			return;
-		}
-		_securityRoles = ejbJar.getAssemblyDescriptor().getSecurityRoles();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean20VRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean20VRule.java
deleted file mode 100644
index 58262df3e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean20VRule.java
+++ /dev/null
@@ -1,1258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-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.logging.Level;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-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.ejb.internal.util.MDBActivationConfigModelUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public class EnterpriseBean20VRule extends AValidationRule implements IMessagePrefixEjb20Constants {
-	private List _securityRoles = null;
-	private static final Map MESSAGE_IDS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_BMP_BEANCLASS, IValidationRuleList.EJB20_BMP_HOME, IValidationRuleList.EJB20_BMP_KEYCLASS, IValidationRuleList.EJB20_BMP_LOCAL, IValidationRuleList.EJB20_BMP_LOCALHOME, IValidationRuleList.EJB20_BMP_REMOTE, IValidationRuleList.EJB20_CMP_BEANCLASS, IValidationRuleList.EJB20_CMP_HOME, IValidationRuleList.EJB20_CMP_KEYCLASS, IValidationRuleList.EJB20_CMP_LOCAL, IValidationRuleList.EJB20_CMP_LOCALHOME, IValidationRuleList.EJB20_CMP_REMOTE, IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS, IValidationRuleList.EJB20_STATEFUL_SESSION_HOME, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME, IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE, IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS, IValidationRuleList.EJB20_STATELESS_SESSION_HOME, IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL, IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME, IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE};
-	private static String JMS_MESSAGING_TYPE = "javax.jms.MessageListener";
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2800_NAMED, new String[]{CHKJ2800_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2800_UNNAMED, new String[]{CHKJ2800_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2801, new String[]{CHKJ2801+SPEC});
-		MESSAGE_IDS.put(CHKJ2802_NAMED, new String[]{CHKJ2802_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2802_UNNAMED, new String[]{CHKJ2802_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2803_NAMED, new String[]{CHKJ2803_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2803_UNNAMED, new String[]{CHKJ2803_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2804_NAMED, new String[]{CHKJ2804_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2804_UNNAMED, new String[]{CHKJ2804_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2805_NAMED, new String[]{CHKJ2805_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2805_UNNAMED, new String[]{CHKJ2805_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2806, new String[]{CHKJ2806+SPEC});
-		MESSAGE_IDS.put(CHKJ2807, new String[]{CHKJ2807+SPEC});
-		MESSAGE_IDS.put(CHKJ2808, new String[]{CHKJ2808+SPEC});
-		MESSAGE_IDS.put(CHKJ2809, new String[]{CHKJ2809+SPEC});
-		MESSAGE_IDS.put(CHKJ2810_NAMED, new String[]{CHKJ2810_NAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2810_UNNAMED, new String[]{CHKJ2810_UNNAMED+SPEC});
-		MESSAGE_IDS.put(CHKJ2813, new String[]{CHKJ2813+SPEC});
-		MESSAGE_IDS.put(CHKJ2820, new String[]{CHKJ2820+SPEC});
-		MESSAGE_IDS.put(CHKJ2822, new String[]{CHKJ2822+SPEC});
-		MESSAGE_IDS.put(CHKJ2823, new String[]{CHKJ2823+SPEC});
-		MESSAGE_IDS.put(CHKJ2824, new String[]{CHKJ2824+SPEC});
-		MESSAGE_IDS.put(CHKJ2825, new String[]{CHKJ2825+SPEC});
-		MESSAGE_IDS.put(CHKJ2826, new String[]{CHKJ2826+SPEC});
-		MESSAGE_IDS.put(CHKJ2827, new String[]{CHKJ2827+SPEC});
-		MESSAGE_IDS.put(CHKJ2828, new String[]{CHKJ2828+SPEC});
-		MESSAGE_IDS.put(CHKJ2830, new String[]{CHKJ2830+SPEC});
-		MESSAGE_IDS.put(CHKJ2831, new String[]{CHKJ2831+SPEC});
-		MESSAGE_IDS.put(CHKJ2832, new String[]{CHKJ2832+SPEC});
-		MESSAGE_IDS.put(CHKJ2833, new String[]{CHKJ2833+SPEC});
-		MESSAGE_IDS.put(CHKJ2834, new String[]{CHKJ2834+SPEC});
-		MESSAGE_IDS.put(CHKJ2835, new String[]{CHKJ2835+SPEC});
-		MESSAGE_IDS.put(CHKJ2836, new String[]{CHKJ2836+SPEC});
-		MESSAGE_IDS.put(CHKJ2837, new String[]{CHKJ2837+SPEC});
-		MESSAGE_IDS.put(CHKJ2838, new String[]{CHKJ2838+SPEC});
-		MESSAGE_IDS.put(CHKJ2839, new String[]{CHKJ2839+SPEC});
-		MESSAGE_IDS.put(CHKJ2840, new String[]{CHKJ2840+SPEC});
-		MESSAGE_IDS.put(CHKJ2841, new String[]{CHKJ2841+SPEC});
-		MESSAGE_IDS.put(CHKJ2845, new String[]{CHKJ2845+SPEC});
-		MESSAGE_IDS.put(CHKJ2846, new String[]{CHKJ2846+SPEC});
-		MESSAGE_IDS.put(CHKJ2847, new String[]{CHKJ2847+SPEC});
-		MESSAGE_IDS.put(CHKJ2852, new String[]{CHKJ2852});
-		MESSAGE_IDS.put(CHKJ2854, new String[]{CHKJ2854+SPEC});
-		MESSAGE_IDS.put(CHKJ2855, new String[]{CHKJ2855+SPEC});
-		MESSAGE_IDS.put(CHKJ2856, new String[]{CHKJ2856+SPEC});
-		MESSAGE_IDS.put(CHKJ2857, new String[]{CHKJ2857+SPEC});
-		MESSAGE_IDS.put(CHKJ2858, new String[]{CHKJ2858+SPEC});
-		MESSAGE_IDS.put(CHKJ2859, new String[]{CHKJ2859+SPEC});
-		MESSAGE_IDS.put(CHKJ2860, new String[]{CHKJ2860+SPEC});
-		MESSAGE_IDS.put(CHKJ2880, new String[]{"CHKJ2880.s"+SPEC, "CHKJ2880.b"+SPEC, "CHKJ2880.c"+SPEC}); // special case; need diff spec number for each type of bean //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		MESSAGE_IDS.put(CHKJ2881, new String[]{"CHKJ2881.s"+SPEC, "CHKJ2881.b"+SPEC, "CHKJ2881.c"+SPEC}); // special case; need diff spec number for each type of bean //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		MESSAGE_IDS.put(CHKJ2882, new String[]{"CHKJ2882.s"+SPEC, "CHKJ2882.b"+SPEC, "CHKJ2882.c"+SPEC}); // special case; need diff spec number for each type of bean //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		MESSAGE_IDS.put(CHKJ2883, new String[]{"CHKJ2883.s"+SPEC, "CHKJ2883.b"+SPEC, "CHKJ2883.c"+SPEC}); // special case; need diff spec number for each type of bean //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		MESSAGE_IDS.put(CHKJ2884, new String[]{"CHKJ2884.s"+SPEC, "CHKJ2884.b"+SPEC, "CHKJ2884.c"+SPEC}); // special case; need diff spec number for each type of bean //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		MESSAGE_IDS.put(CHKJ2885, new String[]{"CHKJ2885.s"+SPEC, "CHKJ2885.b"+SPEC, "CHKJ2885.c"+SPEC}); // special case; need diff spec number for each type of bean //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public Object[] getDependsOn() {
-		// EJBJar doesn't depend on anything else
-		return DEPENDS_ON;
-	}
-
-	public Object getId() {
-		return IValidationRuleList.EJB20_ENTERPRISEBEAN;
-	}
-
-	public Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-
-	public Object getTarget(Object parent, Object clazz) {
-		return parent; // The parent will be an EnterpriseBean.
-	}
-
-	/*
-	 * @see IValidationRule#validate(IEJBValidationContext, Object, Object)
-		 */
-	public void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		Logger logger = vc.getMsgLogger();
-		if(logger != null && logger.isLoggingLevel(Level.FINEST)) {
-			LogEntry entry = vc.getLogEntry();
-			entry.setSourceID("EnterpriseBean20VRule - validate"); //$NON-NLS-1$
-			entry.setText(getClass().getName() + "::validate(" + targetParent + ", " + target); //$NON-NLS-1$ //$NON-NLS-2$
-			logger.write(Level.FINEST, entry);
-		}
-		
-		EJBJar ejbJar = null;
-		if(targetParent instanceof EnterpriseBean) {
-			// running as a dependent
-			ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-		}
-		else {
-			ejbJar = (EJBJar)targetParent;
-		}
-		EnterpriseBean bean = (EnterpriseBean)target;
-		
-		validate(vc, ejbJar, bean);
-	}
-			
-		
-	public void validate(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) throws ValidationCancelledException, ValidationException {
-		Logger logger = vc.getMsgLogger();
-		try {
-			// Check if the bean parts are reflected. Some rules can be validated
-			// whether or not the bean is reflected.
-			boolean reflected = validateBeanComponentsReflected(vc, ejbJar, bean);
-
-			// These rules can be validated whether or not the bean is reflected.
-			validateEJBNameElement(vc, ejbJar, bean);
-			validateReentrantElement(vc, ejbJar, bean);
-			validateSessionTypeElement(vc, ejbJar, bean);
-			validateTransactionTypeElement(vc, ejbJar, bean);
-			validatePersistenceTypeElement(vc, ejbJar, bean);
-			validateEnvironmentEntries(vc, ejbJar, bean);
-
-			// The rest of the rules cannot be validated because the bean isn't reflected.
-			if (!reflected) {
-				return;
-			}
-			
-			validateLocalPairs(vc, ejbJar, bean);
-			validateRemotePairs(vc, ejbJar, bean);
-			validateLocalOrRemote(vc, ejbJar, bean);
-
-			if (bean.isContainerManagedEntity()) {
-				ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-				if((cmp.getPrimKeyField() != null) && !cmp.getPrimKeyField().eIsProxy()) {
-					// Don't validate the fields if it's neither a primitive primary key nor a compound primary key.
-					// If the user was attempting a primitive primary key, but did a typo in ejb-jar.xml,
-					// the user will see a lot of strange messages logged against the fields in the primitive primary key.
-					validateCMPFieldElement(vc, ejbJar, cmp);
-				}
-				validateAbstractSchemaNameElement(vc, ejbJar, cmp);
-				validateJavaIdentifier(vc, ejbJar, cmp);
-			}
-			if(bean.isMessageDriven() && bean.getVersionID() == J2EEVersionConstants.EJB_2_1_ID) {
-				validateActivationConfiguration(vc, (MessageDriven)bean);
-			}
-			validatePrimKeyClassElement(vc, ejbJar, bean);
-			validateEJBRef(vc, ejbJar, bean);
-		}
-		catch(ValidationCancelledException e) {
-			throw e;
-		}
-		catch (Throwable exc) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2852, IEJBValidationContext.WARNING, bean, new String[]{J2EEConstants.EJBJAR_DD_SHORT_NAME, bean.getName()}, this);
-			vc.addMessage(message);
-			if (logger != null && logger.isLoggingLevel(Level.SEVERE)) {
-				logger.write(Level.SEVERE, exc);
-			}
-		}
-	}
-
-	/**
-	 * If the bean components (home interface, remote interface, bean class, and primary
-	 * key) can all be found and reflected, return true. Let the DDValidator
-	 * report the error message against the bean if one of these types doesn't reflect.
-	 */
-	public boolean validateBeanComponentsReflected(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// Don't need to check if the bean is null, because this method will
-		// not be called if it is.
-		boolean isValid = true;
-		try {
-			ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getEjbClass());
-		}
-		catch (InvalidInputException exc) {
-			IMessage message = null;
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_EjbClass())) {
-				message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2802_NAMED, IEJBValidationContext.ERROR, bean, new String[]{bean.getEjbClassName()}, this);
-			}
-			else {
-				message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2802_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-			}
-			vc.addMessage(message);
-			isValid = false;
-		}
-		
-		if(bean instanceof MessageDriven) {
-			// don't need to check the rest
-			return isValid;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getHomeInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			IMessage message = null;
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface())) {
-				message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2803_NAMED, IEJBValidationContext.ERROR, bean, new String[]{bean.getHomeInterfaceName()}, this);
-			}
-			else {
-				message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2803_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-			}
-			vc.addMessage(message);
-			isValid = false;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getRemoteInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			IMessage message = null;
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface())) {
-				message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2804_NAMED, IEJBValidationContext.ERROR, bean, new String[]{bean.getRemoteInterfaceName()}, this);
-			}
-			else {
-				message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2804_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-			}
-			vc.addMessage(message);
-			isValid = false;
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getLocalHomeInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2805_NAMED, IEJBValidationContext.ERROR, bean, new String[]{bean.getLocalHomeInterfaceName()}, this);
-				vc.addMessage(message);
-				isValid = false;
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2805_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-				isValid = false;
-			}
-		}
-
-		try {
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface())) {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, bean.getLocalInterface());
-			}
-		}
-		catch (InvalidInputException exc) {
-			IMessage message = null;
-			if(bean.eIsSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface())) {
-				message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2800_NAMED, IEJBValidationContext.ERROR, bean, new String[]{bean.getLocalInterfaceName()}, this);
-			}
-			else {
-				message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2800_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-			}
-			vc.addMessage(message);
-			isValid = false;
-		}
-
-		if (bean.isEntity()) {
-			JavaClass primaryKey = ((Entity) bean).getPrimaryKey();
-			try {
-				ValidationRuleUtility.isValidTypeHierarchy(bean, primaryKey);
-			}
-			catch (InvalidInputException exc) {
-				IMessage message = null;
-				if(((Entity)bean).eIsSet(EjbPackage.eINSTANCE.getEntity_PrimaryKey())) {
-					message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2810_NAMED, IEJBValidationContext.ERROR, bean, new String[]{((Entity)bean).getPrimaryKeyName()}, this);
-				}
-				else {
-					message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2810_UNNAMED, IEJBValidationContext.ERROR, bean, this);
-				}
-				vc.addMessage(message);
-				isValid = false;
-			}
-		}
-
-		return isValid;
-	}
-
-	public void validateCMPFieldElement(IEJBValidationContext vc, EJBJar ejbJar, ContainerManagedEntity cmp) {
-		// check syntax of tag is okay
-		List fields = cmp.getPersistentAttributes();
-		if ((fields == null) || (fields.size() == 0)) {
-			// unlike EJB 1.1 CMPs, this is legal.
-			return;
-		}
-
-		boolean mapsToMultipleFields = !ValidationRuleUtility.isPrimitivePrimaryKey(cmp);
-		Iterator iterator = fields.iterator();
-//		Field field = null;
-		List fieldNames = new ArrayList(fields.size());
-		while (iterator.hasNext()) {
-			CMPAttribute attrib = (CMPAttribute) iterator.next();
-			if (attrib == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("DDValidator.validateCMPFieldElement(EnterpriseBean)"); //$NON-NLS-1$
-					entry.setText("CMPAttribute is null."); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-
-			fieldNames.add(attrib.getName());
-
-			JavaHelpers fieldType = attrib.getType();
-			try {
-				// If the field is not a valid type
-				ValidationRuleUtility.isValidType(fieldType);
-			}
-			catch (InvalidInputException exc) {
-				// field not identified
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2830, IEJBValidationContext.WARNING, cmp, new String[] { attrib.getName()}, this);
-				vc.addMessage(message);
-				continue; // if you can't reflect it, then you can't validate it
-			}
-			
-			try {
-				if(!fieldType.isPrimitive() && 
-				   !ValidationRuleUtility.isSerializable(fieldType, cmp)) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2855, IEJBValidationContext.INFO, cmp, new String[] { attrib.getName()}, this);
-					vc.addMessage(message);
-				}
-			}
-			catch(InvalidInputException e) {
-				String[] msgParm = (e.getJavaClass() == null) ? new String[]{} : new String[]{e.getJavaClass().getQualifiedName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.WARNING, cmp, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-
-		// 9.4.7.2
-		if (mapsToMultipleFields && !ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-			List primKeyFields = cmp.getPrimaryKey().getFieldsExtended();
-
-			// (9.4.7.1 is validated in validatePrimKeyClassElement(bean)
-			// check if the primary key class' fields exist in the container-managed fields
-			iterator = primKeyFields.iterator();
-
-			while (iterator.hasNext()) {
-				Field keyField = (Field) iterator.next();
-				if ((keyField.getName() != null) && (keyField.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID))) {
-					// not a customer-entered field
-					continue;
-				}
-
-				if (!fieldNames.contains(keyField.getName())) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2831, IEJBValidationContext.WARNING, cmp, new String[] { keyField.getName()}, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-
-	public void validateCMRFieldElement(IEJBValidationContext vc, EJBJar ejbJar, ContainerManagedEntity cmp) {
-		if (cmp == null)
-			return; 
-		switch(cmp.getVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID:
-			case J2EEVersionConstants.EJB_1_1_ID:
-				break;
-			case J2EEVersionConstants.EJB_2_0_ID:
-			case J2EEVersionConstants.EJB_2_1_ID: default:
-				List fields = cmp.getCMRFields();
-				Iterator iterator = fields.iterator();
-				while(iterator.hasNext()) {
-					CMRField field = (CMRField)iterator.next();
-					String fieldName = field.getName();
-					if((fieldName == null) || (fieldName.equals(""))) { //$NON-NLS-1$
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2857, IEJBValidationContext.INFO, cmp, new String[] { field.getName()}, this);
-						vc.addMessage(message);
-						continue; // don't look for the get methods
-					}
-					if(!ValidationRuleUtility.isValidJavaIdentifier(fieldName)) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2857, IEJBValidationContext.INFO, cmp, new String[] { field.getName()}, this);
-						vc.addMessage(message);
-					}
-					
-					try {
-						JavaHelpers fieldType = field.getType();
-						if(!ValidationRuleUtility.isAssignableFrom(fieldType, cmp.getLocalInterface()) &&
-						    !ValidationRuleUtility.isAssignableFromCollection(fieldType, cmp) &&
-						    !ValidationRuleUtility.isAssignableFromSet(fieldType, cmp)) {
-							IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2856, IEJBValidationContext.INFO, cmp, new String[] { field.getName()}, this);
-							vc.addMessage(message);
-						}
-					}
-					catch(InvalidInputException e) {
-						String[] msgParm = (e.getJavaClass() == null) ? new String[]{} : new String[]{e.getJavaClass().getQualifiedName()};
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.WARNING, cmp, msgParm, this);
-						vc.addMessage(message);
-					}
-				}
-				break;
-		}
-	}
-	
-	public void validateEJBNameElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		String name = bean.getName();
-		if ((name == null) || (name.equals(""))) { //$NON-NLS-1$
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2801, IEJBValidationContext.ERROR, bean, this);
-			vc.addMessage(message);
-		}
-		
-		if(bean.isContainerManagedEntity() && bean.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID) {		
-			if(!ValidationRuleUtility.isValidJavaIdentifier(name)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2813, IEJBValidationContext.WARNING, bean, this);
-				vc.addMessage(message);
-			}
-	
-			// p. 466
-			// "The name for an entity bean with cmp-version 2.x must conform
-			// to the lexical rules for an NMTOKEN. The name for an entity bean with
-			// cmp-version 2.x must not be a reserved literal in EJB QL.
-			if(ValidationRuleUtility.isReservedWord(name)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2859, IEJBValidationContext.INFO, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	public void validateAbstractSchemaNameElement(IEJBValidationContext vc, EJBJar ejbJar, ContainerManagedEntity cmp) {
-		if (cmp == null)
-			return; 
-		switch(cmp.getVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID:
-			case J2EEVersionConstants.EJB_1_1_ID:
-				break;
-			case J2EEVersionConstants.EJB_2_0_ID:
-			case J2EEVersionConstants.EJB_2_1_ID: default:
-
-				String name = cmp.getAbstractSchemaName();
-				if(!ValidationRuleUtility.isValidJavaIdentifier(name)) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2858, IEJBValidationContext.WARNING, cmp, this);
-					vc.addMessage(message);
-				}
-				
-				// Check that the name is not a reserved word
-				if(ValidationRuleUtility.isReservedWord(name)) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2860, IEJBValidationContext.INFO, cmp, this);
-					vc.addMessage(message);
-				}
-				break;			
-		}
-	}
-	
-	public void validateJavaIdentifier(IEJBValidationContext vc, EJBJar ejbJar, ContainerManagedEntity cmp) {
-		/*
-		 * Don't duplicate the EJB QL validator's function.
-		List queries = cmp.getQueries();
-		Iterator iterator = queries.iterator();
-		Query query = (Query)iterator.next();
-		*/
-	}
-	
-
-	/**
-	 * Validate section 14.3 of the EJB 1.1 specification.
-	 *
-	 * 14.3 EJB References
-	 *   14.3.1 Bean Provider's responsibilities
-	 *     14.3.1.1 EJB reference programming interfaces
-	 *     14.3.1.2 Declaration of EJB references in deployment descriptor
-	 *   14.3.2 Application Assembler's responsibilities
-	 *   14.3.3 Deployer's responsibility
-	 *   14.3.4 Container Provider's responsibility
-	 */
-	public void validateEJBRef(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		List ejbRefs = bean.getEjbRefs();
-		if ((ejbRefs == null) || (ejbRefs.size() == 0)) {
-			return;
-		}
-
-		Iterator iterator = ejbRefs.iterator();
-		EjbRef ref = null;
-		while (iterator.hasNext()) {
-			ref = (EjbRef) iterator.next();
-			if (ref == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("DDValidator.validateEJBRef(EnterpriseBean)"); //$NON-NLS-1$
-					entry.setText("EjbRef is null in " + bean.getName()); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-			// 14.3.1.1
-			// Info mssg. "EJB spec recommends that all references to other enterprise beans be organized in the ejb subcontext of the bean's environment"
-			EnterpriseBean namedEjb = null;
-			if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Link())) {
-				// Load the EJB identified by the reference, if it exists.
-				namedEjb = ejbJar.getEnterpiseBeanFromRef(ref);
-				if (namedEjb != null) {
-					// if the named EJB is null it could be in another EJBJar
-					Integer ejbType = new Integer(ref.getType().getValue());
-					boolean wrongType = false; // is the EJB, identified by ejb-link, of the type specified in the ejb-ref-type element?
-					String type = (namedEjb instanceof Session) ? "Session" : "Entity"; //$NON-NLS-1$ //$NON-NLS-2$
-					if (ejbType == null) {
-						// Neither session nor entity?
-						wrongType = true;
-					}
-					else if (ejbType.intValue() == EjbRefType.SESSION) {
-						if (!(namedEjb instanceof Session)) {
-							wrongType = true;
-						}
-					}
-					else if (ejbType.intValue() == EjbRefType.ENTITY) {
-						if (!(namedEjb instanceof Entity)) {
-							wrongType = true;
-						}
-					}
-					else {
-						wrongType = true;
-					}
-					if (wrongType) {
-						String[] parms = { namedEjb.getName(), type };
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2835, IEJBValidationContext.INFO, bean, parms, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-
-			// 14.3.1.2, 14.3.2, 14.3.4
-			// Check that ejb-ref-name, ejb-ref-type, home, and remote have been defined, and exist
-			validateHomeRef(vc, ejbJar, ref, namedEjb);
-			validateRemoteRef(vc, ejbJar, ref, namedEjb);
-
-			// 14.3.1.1
-			// Info mssg. "EJB spec recommends that all references to other enterprise beans be organized in the ejb subcontext of the bean's environment"
-			if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Name())) {
-				// If ejb name isn't set, that error would have been caught by one of the validateRef methods
-				// Don't duplicate that effort here.
-				String ejbName = ref.getName();
-				if (!ejbName.startsWith("ejb/")) { //$NON-NLS-1$
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2838, IEJBValidationContext.INFO, bean, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Validate section 14.3 of the EJB 1.1 specification.
-	 *
-	 * 14.2.1.2 Declaration of environment entries
-	 */
-	public void validateEnvironmentEntries(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		List envEntries = bean.getEnvironmentProperties();
-		if ((envEntries == null) || (envEntries.size() == 0)) {
-			return;
-		}
-
-		EnvEntry envEntry = null;
-		Iterator iterator = envEntries.iterator();
-		DuplicatesTable envNames = new DuplicatesTable();
-		while (iterator.hasNext()) {
-			envEntry = (EnvEntry) iterator.next();
-			if (envEntry == null) {
-				Logger logger = vc.getMsgLogger();
-				if (logger != null && logger.isLoggingLevel(Level.FINEST)) {
-					LogEntry entry = vc.getLogEntry();
-					entry.setSourceID("DDValidator.validateEnvironmentEntries(EnterpriseBean)"); //$NON-NLS-1$
-					entry.setText("EjbEntry is null in " + bean.getName()); //$NON-NLS-1$
-					logger.write(Level.FINEST, entry);
-				}
-				continue;
-			}
-
-			if (envEntry.getName() != null) {
-				envNames.add(envEntry.getName());
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2839, IEJBValidationContext.WARNING, bean, this);
-				vc.addMessage(message);
-			}
-
-			if (envEntry.isSetType()) {
-				// 14.2.1.2; type must be one of these types: String, Integer, Boolean, Double, Byte, Short, Long, and Float.
-				int type = envEntry.getType().getValue();
-				if (!((type == EnvEntryType.BOOLEAN) || (type == EnvEntryType.BYTE) || (type == EnvEntryType.DOUBLE) || (type == EnvEntryType.FLOAT) || (type == EnvEntryType.INTEGER) || (type == EnvEntryType.LONG) || (type == EnvEntryType.SHORT) || (type == EnvEntryType.STRING) || (type == EnvEntryType.CHARACTER))) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2840, IEJBValidationContext.WARNING, bean, this);
-					vc.addMessage(message);
-				}
-			}
-			else {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2840, IEJBValidationContext.WARNING, bean, this);
-				vc.addMessage(message);
-			}
-		}
-
-		if (envNames.containsDuplicates()) {
-			Iterator dups = envNames.getDuplicates().iterator();
-			while (dups.hasNext()) {
-				String name = (String) dups.next();
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2841, IEJBValidationContext.WARNING, bean, new String[] { name }, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-	/**
-	 * If the metadata from the EjbRef is not valid, add a validation message.
-	 *
-	 * @parm EjbRef The <ejb-ref> element this method validates.
-	 * @parm EnterpriseBean If the <ejb-ref> uses an <ejb-link>, this is the enterprise bean identified by that link. If the link doesn't exist, or if the user has identified a bean which doesn't exist, this parameter will be null.
-	 */
-	protected void validateHomeRef(IEJBValidationContext vc, EJBJar ejbJar, EjbRef ref, EnterpriseBean namedEjb) {
-		boolean validType = true;
-		EnterpriseBean bean = (EnterpriseBean)ref.eContainer();
-		if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Home())) {
-			try {
-				String homeName = ref.getHome();
-				JavaHelpers type = ValidationRuleUtility.getType(homeName, bean);
-				// Check that the home specified in the <home> element of the <ejb-ref> element
-				// exists.
-				ValidationRuleUtility.isValidType(type);
-
-				if (namedEjb != null) {
-					// Check that the home specified in the <home> element
-					// is assignable to the home used by the named EJB in the
-					// <ejb-link> element.
-					JavaClass intfType = namedEjb.getHomeInterface();
-					ValidationRuleUtility.isValidType(intfType);
-
-					// Make sure that the identified home/remote interface in the ejb-ref
-					// is of the same type as the one used by the bean.
-					if (!ValidationRuleUtility.isAssignableFrom(type, intfType)) {
-						String[] parms = { namedEjb.getName(), intfType.getName()};
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2836, IEJBValidationContext.INFO, bean, parms, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-			catch (InvalidInputException exc) {
-				validType = false;
-			}
-		}
-		else {
-			validType = false;
-		}
-
-		if (!validType) {
-			String[] parms = { ref.getHome()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2832, IEJBValidationContext.INFO, bean, parms, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * If the bean provides a local view, both parts of the view must exist.
-	 * If this method is being called, then all parts of the bean are reflected.
-	 */
-	protected void validateLocalPairs(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if(bean instanceof MessageDriven) {
-			// Message driven beans don't use local or remote views
-			return;
-		}
-		
-		JavaClass local = bean.getLocalInterface();
-		JavaClass localHome = bean.getLocalHomeInterface();
-		if((local != null ) && (localHome == null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2880, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-		}
-		else if((local == null) && (localHome != null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2882, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-		}
-		// otherwise either both are set or both are unset, and that's fine.
-	}
-
-	/**
-	 * If the bean provides a remote view, both parts of the view must exist.
-	 * If this method is being called, then all parts of the bean are reflected.
-	 */
-	protected void validateRemotePairs(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if(bean instanceof MessageDriven) {
-			// Message driven beans don't use local or remote views
-			return;
-		}
-		
-		JavaClass remote = bean.getRemoteInterface();
-		JavaClass home = bean.getHomeInterface();
-		if((remote != null) && (home == null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2881, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-		}
-		else if((remote == null) && (home != null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2883, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-		}
-		// otherwise either both are set or both are unset, and that's fine.
-	}
-
-	/**
-	 * The bean must provide either a local view, or a remote view, or both.
-	 */
-	protected void validateLocalOrRemote(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if(bean instanceof MessageDriven) {
-			// Message driven beans don't use local or remote views
-			return;
-		}
-		
-		JavaClass local = bean.getLocalInterface();
-		JavaClass localHome = bean.getLocalHomeInterface();
-		JavaClass remote = bean.getRemoteInterface();
-		JavaClass remoteHome = bean.getHomeInterface();
-
-		if((localHome == null) && (remoteHome == null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2884, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-		}
-
-		if((local == null) && (remote == null)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2885, IEJBValidationContext.WARNING, bean, this);
-			vc.addMessage(message);
-		}
-	}
-
-	public void validatePersistenceTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		// Attempt in vain to validate the persistence type element here, because 
-		// if it's not specified, there's a syntax error, and the 
-		// validateDeploymentDescriptor(IReporter, IValidationContext) would have been 
-		// called instead.
-		if (bean.isEntity()) {
-			// check syntax
-			Entity entityBean = (Entity) bean;
-			if (!(entityBean.isContainerManagedEntity() || entityBean.isBeanManagedEntity())) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2809, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-	/**
-	 * If the primary key class reflected properly, return true. Else, return false.
-	 */
-	public void validatePrimKeyClassElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isEntity()) {
-			// check syntax
-			if (bean instanceof ContainerManagedEntity) {
-				ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-				CMPAttribute attr = cmp.getPrimKeyField();
-				if((attr != null) && !attr.eIsProxy() && !isValidPrimKeyField(cmp,attr))  {
-					// 9.4.7.1
-					// user has specified both a prim-key-class and a primkey-field
-					// can't use the CMPAttribute's field's name, because the primitive primary key returned is null
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2828, IEJBValidationContext.ERROR, bean, this);
-					vc.addMessage(message);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * If the prim key is specified in the xml, answer whether it is the same as the derived primaryKeyAttribute
-	 */
-	public boolean isValidPrimKeyField(ContainerManagedEntity cmp, CMPAttribute attr) {
-		return cmp.getPrimaryKeyName().equals(attr.getType().getJavaName()); 
-	}
-
-	public void validateReentrantElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isEntity()) {
-			// check syntax
-			Entity entity = (Entity) bean;
-			if (!entity.eIsSet(EjbPackage.eINSTANCE.getEntity_Reentrant())) {
-				// Can only test if the reentrant attribute is set, because the model defaults it
-				// to some boolean value if it isn't set.
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2806, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-	/**
-	 * If the metadata from the EjbRef is not valid, add a validation message.
-	 *
-	 * @parm EjbRef The ref whose home this method checks.
-	 * @parm EnterpriseBean If the EjbRef uses an <ejb-link> element, this is the enterprise bean identified by that element. It may be null, if the user has made a mistake.
-	 */
-	protected void validateRemoteRef(IEJBValidationContext vc, EJBJar ejbJar, EjbRef ref, EnterpriseBean namedEjb) {
-		boolean validType = true;
-		EnterpriseBean bean = (EnterpriseBean)ref.eContainer();
-		if (ref.eIsSet(CommonPackage.eINSTANCE.getEjbRef_Remote())) {
-			try {
-				String remoteName = ref.getRemote();
-				JavaHelpers type = ValidationRuleUtility.getType(remoteName, bean);
-				// Check that the home specified in the <home> element of the <ejb-ref> element
-				// exists.
-				ValidationRuleUtility.isValidType(type);
-
-				if (namedEjb != null) {
-					// Check that the home specified in the <home> element
-					// is assignable to the home used by the named EJB in the
-					// <ejb-link> element.
-					JavaClass intfType = namedEjb.getRemoteInterface();
-					ValidationRuleUtility.isValidType(intfType);
-
-					// Make sure that the identified home/remote interface in the ejb-ref
-					// is of the same type as the one used by the bean.
-					if (!ValidationRuleUtility.isAssignableFrom(type, intfType)) {
-						String[] parms = { namedEjb.getName(), intfType.getName()};
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2837, IEJBValidationContext.INFO, bean, parms, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-			catch (InvalidInputException exc) {
-				validType = false;
-			}
-		}
-		else {
-			validType = false;
-		}
-
-		if (!validType) {
-			String[] parms = { ref.getRemote()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2833, IEJBValidationContext.INFO, bean, parms, this);
-			vc.addMessage(message);
-		}
-	}
-
-	/**
-	 * 15.2.5.3 Declaration of security roles referenced from the bean's code
-	 * The Bean Provider is responsible for declaring in the security-role-ref 
-	 * elements of the deployment descriptor all the security role names used 
-	 * in the enterprise bean code. Declaring the security roles references in
-	 * the code allows the Application Assembler or Deployer to link the names 
-	 * of the security roles used in the code to the security roles defined for 
-	 * an assembled application through the security-role elements.
-	 * The Bean Provider must declare each security role referenced in the code
-	 * using the security-role-ref element as follows:
-	 *      Declare the name of the security role using the role-name element. 
-	 * The name must be the security role name that is used as a parameter to 
-	 * the isCallerInRole(String role-Name) method.
-	 *      Optional: Provide a description of the security role in the 
-	 * description element. A security role reference, including the name defined 
-	 * by the role-name element, is scoped to the session or entity bean element 
-	 * whose declaration contains the security-role-ref element. The following 
-	 * example illustrates how an enterprise bean's references to security roles 
-	 * are declared in the deployment descriptor.
-	 *    ...
-	 *    <enterprise-beans>
-	 *       ...
-	 *       <entity>
-	 *          <ejb-name>AardvarkPayroll</ejb-name>
-	 *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
-	 *          ...
-	 *          <security-role-ref>
-	 *             <description>
-	 *                 This security role should be assigned to the
-	 *                 employees of the payroll department who are
-	 *                 allowed to update employees' salaries.
-	 *             </description>
-	 *             <role-name>payroll</role-name>
-	 *          </security-role-ref>
-	 *          ...
-	 *       </entity>
-	 *       ...
-	 *    </enterprise-beans>
-	 *    ...
-	 *
-	 * The deployment descriptor above indicates that the enterprise bean 
-	 * AardvarkPayroll makes the security check using isCallerInRole("payroll")
-	 * in its business method.
-	 *
-	 *
-	 * 15.3.3 Linking security role references to security roles
-	 * If the Application Assembler defines the security-role elements in the 
-	 * deployment descriptor, he or she is also responsible for linking all the 
-	 * security role references declared in the security-role-ref elements to the 
-	 * security roles defined in the security-role elements. The Application 
-	 * Assembler links each security role reference to a security role using the 
-	 * role-link element. The value of the role-link element must be the name of 
-	 * one of the security roles defined in a security-role element.
-	 * A role-link element must be used even if the value of role-name is the 
-	 * same as the value of the role-link reference.
-	 * The following deployment descriptor example shows how to link the security 
-	 * role reference named payroll to the security role named payroll-department.
-	 *    ...
-	 *    <enterprise-beans>
-	 *       ...
-	 *       <entity>
-	 *          <ejb-name>AardvarkPayroll</ejb-name>
-	 *          <ejb-class>com.aardvark.payroll.PayrollBean</ejb-class>
-	 *          ...
-	 *          <security-role-ref>
-	 *             <description>
-	 *                This role should be assigned to the
-	 *                employees of the payroll department.
-	 *                Members of this role have access to
-	 *                anyone's payroll record.
-	 *
-	 *                The role has been linked to the
-	 *                payroll-department role.
-	 *             </description>
-	 *             <role-name>payroll</role-name>
-	 *             <role-link>payroll-department</role-link>
-	 *          </security-role-ref>
-	 *          ...
-	 *       </entity>
-	 *       ...
-	 *    </enterprise-beans>
-	 *    ...
-	 *
-	 */
-	public void validateSecurityRoleRefElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean == null) {
-			return;
-		}
-
-		/**
-		 * Need to build up a list of duplicate role names, but the validation message
-		 * needs to be registered against the duplicate SecurityRoleRef instance.
-		 * (Without the instance, we cannot get line numbers.)
-		 *
-		 * This class wrappers the SecurityRoleRef instance so that the wrapper's
-		 * implemention of equals compares the names, but the validation message will
-		 * still be able to get the ref from the duplicate name.
-		 */
-		class RoleRefWrapper {
-			private SecurityRoleRef _ref = null;
-
-			public RoleRefWrapper(SecurityRoleRef ref) {
-				_ref = ref;
-			}
-
-			public boolean equals(Object o) {
-				if (o instanceof RoleRefWrapper) {
-					RoleRefWrapper other = (RoleRefWrapper) o;
-					return _ref.getName().equals(other.getRoleRef().getName());
-				}
-				return false;
-			}
-
-			public SecurityRoleRef getRoleRef() {
-				return _ref;
-			}
-		}
-
-		boolean areSRolesDefined = ((_securityRoles != null) && (_securityRoles.size() > 0));
-
-		List securityRoleRefs = bean.getSecurityRoleRefs();
-		if ((securityRoleRefs != null) && (securityRoleRefs.size() != 0)) {
-			// Check that each security role ref refers to a security role,
-			// if security roles are defined in the assembly descriptor,
-			// and that each referenced security role exists.
-			DuplicatesTable roleRefNames = new DuplicatesTable();
-			for (int i = 0; i < securityRoleRefs.size(); i++) {
-				SecurityRoleRef ref = (SecurityRoleRef) securityRoleRefs.get(i);
-
-				// Check that the role name is set (15.2.5.3)
-				String roleName = ref.getName();
-				if ((roleName == null) || (roleName.equals(""))) { //$NON-NLS-1$
-					roleName = ""; //$NON-NLS-1$
-					String beanName = (bean.getName() == null) ? "" : bean.getName(); //$NON-NLS-1$
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2822, IEJBValidationContext.WARNING, ref, new String[] { beanName }, this);
-					vc.addMessage(message);
-				}
-				else {
-					// Build up the list of names, to check for duplicates
-					roleRefNames.add(new RoleRefWrapper(ref));
-				}
-
-				// Check that the role link is set (15.3.3)
-				String roleLink = ref.getLink();
-				boolean isLinkDefined = ((ref.eIsSet(CommonPackage.eINSTANCE.getSecurityRoleRef_Link())) && (roleLink != null) && (!roleLink.equals(""))); //$NON-NLS-1$
-
-				if ((areSRolesDefined) && (!isLinkDefined)) {
-					// must have role link defined (15.3.3)
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2823, IEJBValidationContext.WARNING, ref, this);
-					vc.addMessage(message);
-				}
-				else if ((!areSRolesDefined) && (isLinkDefined)) {
-					// must not have role link defined (15.2.5.3)
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2827, IEJBValidationContext.WARNING, ref, this);
-					vc.addMessage(message);
-				}
-				else if (areSRolesDefined && isLinkDefined) {
-					// check that the role listed in the link exists. (15.3.3)
-					Iterator iterator = _securityRoles.iterator();
-					boolean roleExists = false;
-					while(iterator.hasNext()) {
-						SecurityRole role = (SecurityRole)iterator.next();
-						if(role.getRoleName().equals(roleLink)) {
-							roleExists = true;
-							break;
-						}
-					}
-					if (!roleExists) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2824, IEJBValidationContext.WARNING, ref, new String[] { roleName }, this);
-						vc.addMessage(message);
-					}
-				}
-			}
-
-			// Check for duplicates
-			// Check that there are no duplicate role-names. (15.3.1)
-			if (roleRefNames.containsDuplicates()) {
-				List duplicates = roleRefNames.getDuplicates();
-				Iterator iterator = duplicates.iterator();
-				while (iterator.hasNext()) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2820, IEJBValidationContext.WARNING, ((RoleRefWrapper) iterator.next()).getRoleRef(), this);
-					vc.addMessage(message);
-				}
-			}
-			roleRefNames.clear();
-		}
-	}
-
-	/**
-	 * 6.5.3 The optional SessionSynchronization interface
-	 *...
-	 * Only a stateful Session bean with container-managed transaction demarcation may 
-	 * implement the SessionSynchronization interface.
-	 *...
-	 * There is no need for a Session bean with bean-managed transaction to rely on the 
-	 * synchronization call backs because the bean is in control of the commit the bean 
-	 * knows when the transaction is about to be committed and it knows the outcome of the 
-	 * transaction commit.
-	 *...
-	 */
-	public void validateSessionTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isSession()) {
-			Session session = (Session) bean;
-
-			// check syntax
-			boolean isValidSess = ValidationRuleUtility.isValidSessionTypeElement(session);
-			if (!isValidSess) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2807, IEJBValidationContext.ERROR, session, this);
-				vc.addMessage(message);
-			}
-
-		}
-	}
-	public void validateTransactionTypeElement(IEJBValidationContext vc, EJBJar ejbJar, EnterpriseBean bean) {
-		if (bean.isSession()) {
-			// check syntax
-			Session sessionBean = (Session) bean;
-			if (!ValidationRuleUtility.isValidTransactionTypeElement(sessionBean)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2808, IEJBValidationContext.ERROR, bean, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/*
-	 * @see IValidationRule#reset()
-	 */
-	public void reset() {
-		super.reset();
-		_securityRoles = null;
-	}
-
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-
-		EJBJar ejbJar = (EJBJar)vc.loadModel(EJBValidatorModelEnum.EJB_MODEL);
-		if(ejbJar == null) {
-			return;
-		}
-		
-		if(ejbJar.getAssemblyDescriptor() == null) {
-			return;
-		}
-		_securityRoles = ejbJar.getAssemblyDescriptor().getSecurityRoles();
-	}
-
-	/**
-	 * Need to build up a list of duplicate EJB names, but the validation message
-	 * needs to be registered against the duplicate EnterpriseBean instance.
-	 * (Without the instance, we cannot get line numbers.)
-	 *
-	 * This class wrappers the EnterpriseBean instance so that the wrapper's
-	 * implemention of equals compares the names, but the validation message will
-	 * still be able to get the ref from the duplicate name.
-	 */
-	class EjbNameWrapper {
-		private EnterpriseBean _bean = null;
-
-		public EjbNameWrapper(EnterpriseBean bean) {
-			_bean = bean;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof EnterpriseBean) {
-				EnterpriseBean other = (EnterpriseBean) o;
-				return _bean.getName().equals(other.getName());
-			}
-			return false;
-		}
-
-		public EnterpriseBean getBean() {
-			return _bean;
-		}
-	}
-
-	class ASNameWrapper {
-		private ContainerManagedEntity _bean = null;
-
-		public ASNameWrapper(ContainerManagedEntity bean) {
-			_bean = bean;
-		}
-
-		public boolean equals(Object o) {
-			if (o instanceof ContainerManagedEntity) {
-				ContainerManagedEntity other = (ContainerManagedEntity) o;
-				return _bean.getAbstractSchemaName().equals(other.getAbstractSchemaName());
-			}
-			return false;
-		}
-
-		public EnterpriseBean getBean() {
-			return _bean;
-		}
-	}
-	/**
-	 * @param driven
-	 */
-	private void validateActivationConfiguration(IEJBValidationContext vc, MessageDriven bean) {
-		ActivationConfig config  = bean.getActivationConfig();
-		if(config != null) {
-			List configProperties = config.getConfigProperties();
-			if(configProperties != null && !configProperties.isEmpty()) {
-				HashSet namePropertySet = new HashSet();
-				for(int i = 0; i < configProperties.size(); i++) {
-					ActivationConfigProperty property = (ActivationConfigProperty)configProperties.get(i);
-					boolean doesNotExists = namePropertySet.add(property.getName());
-					if(!doesNotExists) {
-						IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2886, IMessage.HIGH_SEVERITY, bean, bean.getEjbJar(),new String[] {property.getName(),bean.getName()},this);
-						vc.addMessage(message);
-					}
-				if(isJMSMDB(bean)) {
-					validationAckModeActivationConfig(vc, bean, property);
-					validateDestinationTypeActivationConfig(vc, bean, property);
-					validateDurabilityActivationConfig(vc, bean, configProperties, property);
-				   }
-				}
-			}
-	  }
-	}
-	
-	private boolean isJMSMDB(MessageDriven bean) {
-		return bean.getMessagingType() == null || bean.getMessagingType().getQualifiedName().equals(JMS_MESSAGING_TYPE);
-	}
-	
-	private void validationAckModeActivationConfig(IEJBValidationContext vc, MessageDriven bean, ActivationConfigProperty property) {
-		if(property.getName().equals(MDBActivationConfigModelUtil.ackModeKey) && !Arrays.asList(MDBActivationConfigModelUtil.ackModeValues).contains(property.getValue())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2887, IMessage.HIGH_SEVERITY, bean, bean.getEjbJar(),new String[] {property.getName(),property.getValue(),bean.getName()},this);
-			vc.addMessage(message);
-		}
-	}
-
-	/**
-	 * @param vc
-	 * @param bean
-	 * @param property
-	 */
-	private void validateDestinationTypeActivationConfig(IEJBValidationContext vc, MessageDriven bean, ActivationConfigProperty property) {
-		if(property.getName().equals(MDBActivationConfigModelUtil.destinationTypeKey) && !Arrays.asList(MDBActivationConfigModelUtil.destinationTypeValues).contains(property.getValue())) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2887, IMessage.HIGH_SEVERITY, bean, bean.getEjbJar(),new String[] {property.getName(),property.getValue(),bean.getName()},this);
-			vc.addMessage(message);
-		}
-		JavaClass messageDestination = bean.getMessageDestination();
-		if(messageDestination != null && messageDestination.getQualifiedName() != null && (property.getName().equals(MDBActivationConfigModelUtil.destinationTypeKey) && !(messageDestination.getQualifiedName().equals(property.getValue())))) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2890, IMessage.HIGH_SEVERITY, bean, bean.getEjbJar(),new String[] {messageDestination.getQualifiedName(),property.getValue(),bean.getName()},this);
-			vc.addMessage(message);
-		}
-	}
-	/**
-	 * @param vc
-	 * @param bean
-	 * @param configProperties
-	 * @param property
-	 */
-	private void validateDurabilityActivationConfig(IEJBValidationContext vc, MessageDriven bean, List configProperties, ActivationConfigProperty property) {
-		if(property.getName().equals(MDBActivationConfigModelUtil.durabilityKey) && !Arrays.asList(MDBActivationConfigModelUtil.durabilityValue).contains(property.getValue())) {
-		        IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2887, IMessage.HIGH_SEVERITY, bean, bean.getEjbJar(),new String[] {property.getName(),property.getValue(),bean.getName()},this);
-				vc.addMessage(message);
-		}
-      }	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IClassVRule.java
deleted file mode 100644
index c1814237d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IClassVRule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.List;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IClassVRule extends IValidationRule {
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException;
-
-	// Because calling JavaClass::getMethodsExtended() is an expensive call, need to call it once
-	// per class instead of multiple times per class. However, each class in the bean needs different
-	// lists:
-	//   1. Key class needs no lists.
-	//   2. Home interface (remote & local) needs the bean class' getMethodsExtended list.
-	//   3. Component interface (remote & local) needs the bean class' getMethodsExtended list.
-	//   4. Bean class needs the remote home, local home, remote component, and local component's getMethodsExtended list.
-	// Given that the lists are different depending on the class implementation, add a List[] as a final parameter, and each
-	// implementation can figure out what the List[] needs to be populated with, if anything. (i.e., the
-	// key class will probably pass in a null instead of an empty List.)
-	// 
-	// Similar reasoning for the List[] of getFieldsExtended().
-	public List[] getMethodsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException;
-	public List[] getFieldsExtended(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException;
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtended) throws ValidationCancelledException, InvalidInputException, ValidationException;
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtended) throws ValidationCancelledException, InvalidInputException, ValidationException;
-	
-	public void register(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtended) throws ValidationCancelledException, InvalidInputException, ValidationException;
-	public void register(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field, List[] fieldsExtended) throws ValidationCancelledException, InvalidInputException, ValidationException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IComponentType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IComponentType.java
deleted file mode 100644
index aed0fb8d8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IComponentType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IComponentType extends IEJBInterfaceType {
-	public JavaClass getHomeInterface(EnterpriseBean bean);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBInterfaceType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBInterfaceType.java
deleted file mode 100644
index ee43c0f77..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBInterfaceType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
- 
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IEJBInterfaceType extends IEJBType {
-	public boolean isEJBInterfaceMethod(EnterpriseBean bean, Method method) throws InvalidInputException, ValidationCancelledException;
-	public JavaHelpers getOverExposedLocalType(EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException, ValidationCancelledException;
-	public void validateApplicationExceptionRules(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException, ValidationCancelledException;
-	public void validateRMI_IIOPTypeRules(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists, boolean checkReturnType) throws InvalidInputException, ValidationCancelledException;
-	public boolean followRemoteExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException, ValidationCancelledException;
-	public boolean followRMI_IIOPInheritanceRules(EnterpriseBean bean, JavaClass clazz) throws InvalidInputException, ValidationCancelledException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBType.java
deleted file mode 100644
index e7dd49300..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IEJBType extends ITypeConstants, IMethodAndFieldConstants {
-	public static int REMOTE = 0x1;
-	public static int LOCAL = 0x2;
-	public static int NEITHER = 0x4;
-	
-	public long[] getSupertypes();
-	public long[] getShouldNotBeSupertypes();
-	
-	/**
-	 * If the name of the method does not match one of the method names which this
-	 * rule validates, what type should the method be considered? (e.g. home or business).
-	 */
-	public long getDefaultMethodType();
-	public long[] getKnownMethodTypes();
-
-	public long[] getMethodsWhichMustExist();
-	public long[] getMethodsWhichMustNotExist();
-	
-	public int isRemote();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidationContext.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidationContext.java
deleted file mode 100644
index a56d66f59..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidationContext.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-public interface IEJBValidationContext extends IValidationContext {
-	public static final int ERROR = IMessage.HIGH_SEVERITY;
-	public static final int WARNING = IMessage.NORMAL_SEVERITY;
-	public static final int INFO = IMessage.LOW_SEVERITY;
-	
-	
-	public IValidator getValidator();
-	public IValidationContext getHelper();
-	public IReporter getReporter();
-	
-	public IMessage getMessage(); // returns an empty IMessage which can be reused
-	public Logger getMsgLogger();
-	
-	public void terminateIfCancelled() throws ValidationCancelledException;
-	
-	public LogEntry getLogEntry();
-	
-	public Object loadModel(String symbolicName);
-	public Object loadModel(String symbolicName, Object[] parms);
-	
-	public void removeAllMessages();
-	public void removeMessages(Object target);
-	public void removeMessages(Object target, String groupIdentifier);
-	
-	public void addMessage(IMessage message);
-	public void addMessage(int severity, String messageId);
-	public void addMessage(int severity, String messageId, String[] parms);
-	public void addMessage(int severity, String messageId, Object target);
-	public void addMessage(int severity, String messageId, String[] parms, Object target);
-	public void addMessage(int severity, String messageId, Object target, String groupName);
-	public void addMessage(int severity, String messageId, String[] parms, Object target, String groupName);
-	
-	public void subtask(String messageId);
-	public void subtask(String messageId, String[] parms);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidatorConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidatorConstants.java
deleted file mode 100644
index 90f88fd76..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidatorConstants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-public interface IEJBValidatorConstants {
-	// Name of .properties file
-	public static final String BUNDLE_NAME = "ejbvalidator"; //$NON-NLS-1$
-	
-	// Name of logger
-	public static final String LOGNAME = "EJBValidatorLog"; //$NON-NLS-1$
-	
-	// Status constants which do not require a message prefix (e.g. ABCD0000E)
-	public static final String STATUS_VALIDATING = "STATUS_VALIDATING"; //$NON-NLS-1$
-	
-	public static final String NULL_PRIMARY_KEY = "<primary-key>"; // when a key class name needs to be displayed, but that class is null, display this instead //$NON-NLS-1$
-	public static final String NULL_BEAN_CLASS = "<ejb-class>"; // when a bean class name needs to be displayed, but that class is null, display this instead //$NON-NLS-1$
-	public static final String NULL_LOCAL_HOME = "<local-home>"; // when a local-home class name needs to be displayed, but that class is null, display this instead //$NON-NLS-1$
-	public static final String NULL_LOCAL = "<local>"; // when a local class name needs to be displayed, but that class is null, display this instead //$NON-NLS-1$
-	public static final String NULL_HOME = "<home>"; // when a home class name needs to be displayed, but that class is null, display this instead //$NON-NLS-1$
-	public static final String NULL_REMOTE = "<remote>"; // when a remote class name needs to be displayed, but that class is null, display this instead //$NON-NLS-1$
-	
-	// We use a string here because this interface is shipped with WAS, but
-	// J2EECorePlugin is not. Therefore having the J2EECorePlugin.PLUGIN_ID 
-	// dependency works fine in the tooling env, but will result in NoClassDefFound in WAS	
-	public static final String J2EE_CORE_PLUGIN = "org.eclipse.jst.j2ee.internal.core"; // $NON-NLS-1$ //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidatorMessageConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidatorMessageConstants.java
deleted file mode 100644
index 2cdedbab8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidatorMessageConstants.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/**
- * This interface holds the message constants that are common across
- * specifications. (e.g. internal error messages, checks that are the same.)
- */
-public interface IEJBValidatorMessageConstants {
-	// Constants used in message ids
-	static final String ON_BASE = ".i"; // String to be registered against a base type, not the JavaClass being validated. (Inherited method.) //$NON-NLS-1$
-	static final String ON_THIS = ".m"; // String to be registered against the JavaClass being validated. (Method impl on JavaClass itself.) //$NON-NLS-1$
-
-	// Internal errors and such
-	static final String CHKJ2041 = "CHKJ2041"; // unnamed package (Java Language Specification) //$NON-NLS-1$
-	static final String CHKJ2433 = "CHKJ2433"; // cannot reflect //$NON-NLS-1$
-	static final String CHKJ2456 = "CHKJ2456"; // Should throw X or there may be compile errors in the deploy code. //$NON-NLS-1$
-	static final String CHKJ2852 = "CHKJ2852"; // Throwable caught while validating ejb-jar.xml //$NON-NLS-1$
-	static final String CHKJ2900 = "CHKJ2900"; // Internal error while running EJB validator //$NON-NLS-1$
-	static final String CHKJ2905 = "CHKJ2905"; // EJB Validator could not run because ejb-jar.xml could not be loaded. //$NON-NLS-1$
-	static final String CHKJ2907 = "CHKJ2907"; // Type X, or one of its supertypes, cannot be reflected. Check the classpath. //$NON-NLS-1$
-
-	// Specification rules
-	static final String CHKJ2003E = "CHKJ2003E"; // implement javax.ejb.SessionSynchronization (can be error or info depending on context) //$NON-NLS-1$
-	static final String CHKJ2003I = "CHKJ2003I"; // implement javax.ejb.SessionSynchronization (can be error or info depending on context) //$NON-NLS-1$
-
-	static final String CHKJ2014 = "CHKJ2014"; // class must be, or must not be, abstract //$NON-NLS-1$
-	static final String CHKJ2015 = "CHKJ2015"; // class must be, or must not be, final //$NON-NLS-1$
-	static final String CHKJ2017 = "CHKJ2017"; // class/interface must extend/implement X //$NON-NLS-1$
-	static final String CHKJ2019 = "CHKJ2019"; // key class must be serializable/a legal value type in RMI-IIOP //$NON-NLS-1$
-
-	static final String CHKJ2022 = "CHKJ2022"; // class must be public //$NON-NLS-1$
-	static final String CHKJ2023 = "CHKJ2023"; // a matching method (for this component method) must exist on the bean class //$NON-NLS-1$
-
-	static final String CHKJ2040 = "CHKJ2040"; // "this" must not be passed as a method argument or result //$NON-NLS-1$
-
-	static final String CHKJ2103 = "CHKJ2103"; // In component inheritance, the bean class must inherit X. //$NON-NLS-1$
-	static final String CHKJ2104 = "CHKJ2104"; // In component inheritance, the home class must not inherit X. //$NON-NLS-1$
-	static final String CHKJ2105 = "CHKJ2105"; // In component inheritance, the component interface must extend X. //$NON-NLS-1$
-	static final String CHKJ2106 = "CHKJ2106"; // In component inheritance, the bean must use X as its primary key. //$NON-NLS-1$
-
-	static final String CHKJ2205 = "CHKJ2205"; // primary key field X must be public //$NON-NLS-1$
-	static final String CHKJ2206 = "CHKJ2206"; // primary key field X must be a <cmp-field> (and in EJB 1.1, also a field of the bean class) //$NON-NLS-1$
-
-	static final String CHKJ2402 = "CHKJ2402"; // The create method must return the remote interface type //$NON-NLS-1$
-	static final String CHKJ2403 = "CHKJ2403"; // The finder method must return X or a collection thereof. //$NON-NLS-1$
-	static final String CHKJ2407 = "CHKJ2407"; // The ejbFind method must return X or a collection thereof. //$NON-NLS-1$
-
-	static final String CHKJ2411 = "CHKJ2411"; // The name of the method must not start with "ejb". //$NON-NLS-1$
-
-	static final String CHKJ2801 = "CHKJ2801"; // missing <ejb-name> //$NON-NLS-1$
-	static final String CHKJ2802_NAMED = "CHKJ2802.named";// <ejb-class> cannot be reflected //$NON-NLS-1$
-	static final String CHKJ2802_UNNAMED = "CHKJ2802.unnamed";// unknown <ejb-class> //$NON-NLS-1$
-	static final String CHKJ2803_NAMED = "CHKJ2803.named";// <home> cannot be reflected //$NON-NLS-1$
-	static final String CHKJ2803_UNNAMED = "CHKJ2803.unnamed";// unknown <home> //$NON-NLS-1$
-	static final String CHKJ2804_NAMED = "CHKJ2804.named";// <remote> cannot be reflected //$NON-NLS-1$
-	static final String CHKJ2804_UNNAMED = "CHKJ2804.unnamed";// unknown <remote> //$NON-NLS-1$
-	static final String CHKJ2806 = "CHKJ2806";// <reentrant> must be either "True" or "False" //$NON-NLS-1$
-	static final String CHKJ2807 = "CHKJ2807"; // <session-type> must be either "Stateful" or "Stateless" //$NON-NLS-1$
-	static final String CHKJ2808 = "CHKJ2808"; // <transaction-type> must be either "Bean" or "Container" //$NON-NLS-1$
-	static final String CHKJ2809 = "CHKJ2809"; // <persistence-type> must be either "Bean" or "Container" //$NON-NLS-1$
-
-	static final String CHKJ2810_NAMED = "CHKJ2810.named";// <prim-key-class> cannot be reflected //$NON-NLS-1$
-	static final String CHKJ2810_UNNAMED = "CHKJ2810.unnamed";// unknown <prim-key-class> //$NON-NLS-1$
-	static final String CHKJ2811_NAMED = "CHKJ2811.named";// <field-name> must exist on the bean class //$NON-NLS-1$
-	static final String CHKJ2811_UNNAMED = "CHKJ2811.unnamed";// <field-name> must exist //$NON-NLS-1$
-	static final String CHKJ2812 = "CHKJ2812"; // Bean class must specify at least one of its fields as a <cmp-field> //$NON-NLS-1$
-	static final String CHKJ2814 = "CHKJ2814"; // <method>'s <ejb-name> should specify a known enterprise bean //$NON-NLS-1$
-
-	static final String CHKJ2820 = "CHKJ2820"; // <security-role-ref> must be unique. //$NON-NLS-1$
-	static final String CHKJ2822 = "CHKJ2822"; // <security-role-ref> must define a <role-name> //$NON-NLS-1$
-	static final String CHKJ2823 = "CHKJ2823"; // <security-role-ref> should define a <role-link> //$NON-NLS-1$
-	static final String CHKJ2824 = "CHKJ2824"; // <security-role-ref> must identify a known <security-role> //$NON-NLS-1$
-	static final String CHKJ2825 = "CHKJ2825"; // <security-role> should define the <role-name> element. //$NON-NLS-1$
-	static final String CHKJ2826 = "CHKJ2826"; // <security-role> name should be unique. //$NON-NLS-1$
-	static final String CHKJ2827 = "CHKJ2827"; // Cannot use a <role-link> without <security-role> elements. //$NON-NLS-1$
-	static final String CHKJ2828 = "CHKJ2828"; // Cannot use a <primkey-field> element without a primitive primary key. //$NON-NLS-1$
-	static final String CHKJ2829 = "CHKJ2829"; // Every field in the primary key must exist on the bean class. //$NON-NLS-1$
-
-	static final String CHKJ2830 = "CHKJ2830"; // The type of the field cannot be reflected. //$NON-NLS-1$
-	static final String CHKJ2831 = "CHKJ2831"; // X must be declared as a <cmp-field> element. //$NON-NLS-1$
-	static final String CHKJ2832 = "CHKJ2832"; // <ejb-ref>'s home cannot be found in the EJB module. //$NON-NLS-1$
-	static final String CHKJ2833 = "CHKJ2833"; // <ejb-ref>'s remote cannot be found in the EJB module. //$NON-NLS-1$
-	static final String CHKJ2834 = "CHKJ2834"; // <ejb-ref>'s bean cannot be found in the EJB module. //$NON-NLS-1$
-	static final String CHKJ2835 = "CHKJ2835"; // Bean X is a Y type. Update the <ejb-ref-type> element. //$NON-NLS-1$
-	static final String CHKJ2836 = "CHKJ2836"; // Bean X uses home Y. Update the <ejb-ref> element. //$NON-NLS-1$
-	static final String CHKJ2837 = "CHKJ2837"; // Bean X uses remote Y. Update the <ejb-ref> element. //$NON-NLS-1$
-	static final String CHKJ2838 = "CHKJ2838"; // It is recommended that all references to enterprise beans be organized in the "ejb" subcontext. //$NON-NLS-1$
-	static final String CHKJ2839 = "CHKJ2839"; // <env-entry-name> of the <env-entry> element must exist. //$NON-NLS-1$
-
-	static final String CHKJ2840 = "CHKJ2840"; // <env-entry-type> of the <env-entry> element must exist. //$NON-NLS-1$
-	static final String CHKJ2841 = "CHKJ2841"; // The X name, in the <env-entry> element, must be unique in the bean. //$NON-NLS-1$
-	static final String CHKJ2842 = "CHKJ2842"; // <method-params> is ignored when <method-name> is "*" //$NON-NLS-1$
-	static final String CHKJ2843 = "CHKJ2843"; // <method> X must exist on bean Y. //$NON-NLS-1$
-	static final String CHKJ2844 = "CHKJ2844"; // At least one <method> should exist in a <method-permission>. //$NON-NLS-1$
-	static final String CHKJ2845 = "CHKJ2845"; // At least one <role-name> should exist in a <method-permission>. //$NON-NLS-1$
-	static final String CHKJ2846 = "CHKJ2846"; // No methods can be found for this <method-permission> //$NON-NLS-1$
-	static final String CHKJ2847 = "CHKJ2847"; // No methods can be found for this <container-transaction> //$NON-NLS-1$
-	static final String CHKJ2849 = "CHKJ2849"; // Cannot validate component inheritance of X because Y cannot be reflected. //$NON-NLS-1$
-	
-	static final String CHKJ2875 = "CHKJ2875"; // EJB Client JAR must exist and be in the same EAR as this EJB JAR. //$NON-NLS-1$
-
-	static final String CHKJ2850 = "CHKJ2850"; // Cannot validate <method> because X, or one of its supertypes, cannot be reflected. //$NON-NLS-1$
-
-	static final String CHKJ2895 = "CHKJ2895"; // duplicate <ejb-name> //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IFieldType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IFieldType.java
deleted file mode 100644
index c96f7013f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IFieldType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-public abstract interface IFieldType {
-	public static final String NO_MESSAGE_PREFIX = ""; // For the two getMessageId_X methods, if the method never requires that particular message, return this message prefix instead //$NON-NLS-1$
-	
-	public long getId();
-	
-	public boolean isFieldType(EnterpriseBean bean, JavaClass clazz, Field field);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IHomeType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IHomeType.java
deleted file mode 100644
index 4c6594295..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IHomeType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IHomeType extends IEJBInterfaceType {
-	public JavaClass getComponentInterface(EnterpriseBean bean);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ILocalType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ILocalType.java
deleted file mode 100644
index afa0a0723..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ILocalType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface ILocalType {
-	public int IS_REMOTE = IEJBType.LOCAL;
-	public int MESSAGE_REMOTE_EXCEPTION_SEVERITY = IEJBValidationContext.WARNING; // If a method throws a RemoteException when it shouldn't, that's a deprecated use, hence a warning.
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb11Constants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb11Constants.java
deleted file mode 100644
index 0d823f8f2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb11Constants.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-/**
- * This interface holds the message constants that are specific
- * to the EJB 1.1 specification.
- */
-public interface IMessagePrefixEjb11Constants extends IEJBValidatorMessageConstants {
-	/*package*/ static final String SPEC = ".ejb11"; // EJB specification being validated //$NON-NLS-1$
-	
-	
-	/*package*/ static final String CHKJ2001 = "CHKJ2001"; // The key class must implement the X method.  //$NON-NLS-1$
-	/*package*/ static final String CHKJ2002 = "CHKJ2002"; // This class should implement a matching ejbPostCreate method for this method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2004 = "CHKJ2004"; // The bean class should not implement the ejbFind method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2005 = "CHKJ2005"; // The method must be either a create method or a find method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2006 = "CHKJ2006"; // The bean class must have a public constructor that takes no arguments. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2007 = "CHKJ2007"; // The bean class should not declare the finalize() method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2008 = "CHKJ2008"; // The bean class must contain at least one ejbCreate method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2009 = "CHKJ2009"; // The bean class must contain at least one ejbFindByPrimaryKey method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2010 = "CHKJ2010"; // The home interface must contain at least one create method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2011 = "CHKJ2011"; // The home interface must contain at least one findByPrimaryKey method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2012 = "CHKJ2012"; // This type must be an interface. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2013 = "CHKJ2013"; // The bean class must implement X. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2020 = "CHKJ2020"; // The key class must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2021 = "CHKJ2021"; // The key class must define a public default constructor. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2024 = "CHKJ2024"; // X must not exist. Only create() may exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2025 = "CHKJ2025"; // X must not exist. Only ejbCreate() may exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2026 = "CHKJ2026"; // The bean class must implement a matching ejbCreate method for this method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2028 = "CHKJ2028"; // This method will not be called unless a matching ejbCreate method is defined. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2029 = "CHKJ2029"; // This method will not be called unless a matching create method is defined on the home. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2030 = "CHKJ2030"; // This method must have a matching ejbFind method in the bean class. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2032 = "CHKJ2032"; // Bean class X must declare at least one container managed field. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2033 = "CHKJ2033"; // The setEntityContext method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2034 = "CHKJ2034"; // The unsetEntityContext method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2035 = "CHKJ2035"; // The ejbActivate method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2036 = "CHKJ2036"; // The ejbPassivate method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2037 = "CHKJ2037"; // The ejbRemove method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2038 = "CHKJ2038"; // The ejbLoad method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2039 = "CHKJ2039"; // The ejbStore method must exist. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2100 = "CHKJ2100"; // Both ends of the role must use the same number of attributes. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2101 = "CHKJ2101"; // Both ends of the role must use the same type. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2102 = "CHKJ2102"; // Either a finder descriptor, or a matching custom finder method, must be defined. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2200 = "CHKJ2200"; // The static field must be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2201 = "CHKJ2201"; // The field must not be transient. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2202 = "CHKJ2202"; // The field type is invalid for a <cmp-field>. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2203 = "CHKJ2203"; // The field must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2207 = "CHKJ2207"; // Field X on bean Y must be the same type as the <primkey-field>. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2400_bus = "CHKJ2400.bus"; // Deprecated use of RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2400_ejbCreate = "CHKJ2400.ejbCreate"; // Deprecated use of RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2400_ejbFind = "CHKJ2400.ejbFind"; // Deprecated use of RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2400_ejbPostCreate = "CHKJ2400.ejbPostCreate"; // Deprecated use of RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2401 = "CHKJ2401"; // This method must return void. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2405 = "CHKJ2405"; // findByPrimaryKey must have the <prim-key-class> as its argument. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2406 = "CHKJ2406"; // This method should return the primary key type. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2408_bus = "CHKJ2408.bus"; // This method must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2408_ejbCreate = "CHKJ2408.ejbCreate"; // This method must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2408_ejbFind = "CHKJ2408.ejbFind"; // This method must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2408_ejbPostCreate = "CHKJ2408.ejbPostCreate"; // This method must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2409_bus = "CHKJ2409.bus"; // This method must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2409_ejbCreate = "CHKJ2409.ejbCreate"; //This method must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2409_ejbFind = "CHKJ2409.ejbFind"; // This method must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2409_ejbPostCreate = "CHKJ2409.ejbPostCreate"; // This method must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2410_bus = "CHKJ2410.bus"; // This method must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2410_ejbCreate = "CHKJ2410.ejbCreate"; // This method must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2410_ejbFind = "CHKJ2410.ejbFind"; // This method must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2410_ejbPostCreate = "CHKJ2410.ejbPostCreate"; // This method must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2412 = "CHKJ2412"; // The return type of this method must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2413 = "CHKJ2413"; // The argument must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2414 = "CHKJ2414"; // This method must throw exception X. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2415 = "CHKJ2415"; // The return type must match the return type of the matching method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2418 = "CHKJ2418"; // This method must return void. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2419 = "CHKJ2419"; // This method must be a create method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2420 = "CHKJ2420"; // X must be thrown by the corresponding method on the home interface. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2432 = "CHKJ2432"; // X must be thrown by the corresponding method on the remote interface. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2908 = "CHKJ2908"; // An enterprise bean cannot be reflected. Run the XML validator. //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb20Constants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb20Constants.java
deleted file mode 100644
index 8c11d3566..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb20Constants.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-/**
- * This interface holds the message constants that are specific to the
- * EJB 2.0 specification (e.g. MDB-only messages).
- */
-public interface IMessagePrefixEjb20Constants extends IEJBValidatorMessageConstants {
-	/*package*/ static final String SPEC = ".ejb20"; // EJB specification being validated //$NON-NLS-1$
-	/*package*/ static final String ON_BASE_SPEC = ON_BASE + SPEC; 
-	/*package*/ static final String ON_THIS_SPEC = ON_THIS + SPEC;
-	/*package*/ static final String CHKJ = null; // Placeholder for a message id when the id hasn't been created in the .properties file
-	
-	/*package*/ static final String CHKJ2018 = "CHKJ2018"; // This dependent value class must be serializable. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2043 = "CHKJ2043"; // This dependent value class must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2044 = "CHKJ2044"; // This dependent value class must not be abstract. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2050_acc = "CHKJ2050.acc"; // An accessor method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_constr = "CHKJ2050.constr"; // A public default constructor must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_create = "CHKJ2050.create"; // A create method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbActivate = "CHKJ2050.ejbActivate"; // The ejbActivate method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbCreate = "CHKJ2050.ejbCreate"; // An ejbCreate method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbFind = "CHKJ2050.ejbFind"; // An ejbFind method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbFindByPrimaryKey = "CHKJ2050.ejbFindByPrimaryKey"; // An ejbFindByPrimaryKey method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbHome = "CHKJ2050.ejbHome"; // An ejbHome method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbLoad = "CHKJ2050.ejbLoad"; // An ejbLoad method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbPassivate = "CHKJ2050.ejbPassivate"; // An ejbPassivate method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbPostCreate = "CHKJ2050.ejbPostCreate"; // An ejbPostCreate method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbRemove = "CHKJ2050.ejbRemove"; // An ejbRemove method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbSelect = "CHKJ2050.ejbSelect"; // An ejbSelect method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_ejbStore = "CHKJ2050.ejbStore"; // An ejbStore method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_equals = "CHKJ2050.equals"; // An equals method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_find = "CHKJ2050.find"; // An find method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_findByPrimaryKey = "CHKJ2050.findByPrimaryKey"; // An findByPrimaryKey method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_hashCode = "CHKJ2050.hashCode"; // An hashCode method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_home = "CHKJ2050.home"; // An home method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_onMessage = "CHKJ2050.onMessage"; // An onMessage method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_setEntityContext = "CHKJ2050.setEntityContext"; // An setEntityContext method must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2050_unsetEntityContext = "CHKJ2050.unsetEntityContext"; // An unsetEntityContext method must exist. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2404 = "CHKJ2404"; // Application exception X must extend java.lang.Exception. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2416 = "CHKJ2416"; // Application exception X must not extend java.lang.RuntimeException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2421 = "CHKJ2421"; // ejbCreate must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2422 = "CHKJ2422"; // ejbCreate must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2423 = "CHKJ2423"; // ejbCreate must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2424 = "CHKJ2424"; // ejbCreate must return void. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2426 = "CHKJ2426"; // ejbPostCreate must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2427 = "CHKJ2427"; // ejbPostCreate must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2428 = "CHKJ2428"; // ejbPostCreate must not be static. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2430 = "CHKJ2430"; // X must exist for this ejbHome method to be called. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2431 = "CHKJ2431"; // ejbHome must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2439 = "CHKJ2439"; // ejbHome must not be static. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2441 = "CHKJ2441"; // business method must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2442 = "CHKJ2442"; // business method must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2443 = "CHKJ2443"; // business method must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2445 = "CHKJ2445"; // onMessage must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2446 = "CHKJ2446"; // onMessage must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2447 = "CHKJ2447"; // onMessage must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2449 = "CHKJ2449"; // accessor method must be public. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2450 = "CHKJ2450"; // accessor method must be abstract //$NON-NLS-1$
-	/*package*/ static final String CHKJ2452 = "CHKJ2452"; // A transient field should not be the {0} type. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2453 = "CHKJ2453"; // Transient fields are discouraged. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2454 = "CHKJ2454"; // CMR and CMP fields must not be defined on the bean class. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2457 = "CHKJ2457"; // ejbFind must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2458 = "CHKJ2458"; // ejbFind must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2459 = "CHKJ2459"; // ejbFind must not be static. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2461 = "CHKJ2461"; // This interface must follow RMI-IIOP rules for interfaces. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2462 = "CHKJ2462"; // The method name must not start with "create". //$NON-NLS-1$
-	/*package*/ static final String CHKJ2463 = "CHKJ2463"; // The method name must not start with "find". //$NON-NLS-1$
-	/*package*/ static final String CHKJ2464 = "CHKJ2464"; // The method name must not start with "remove" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2465 = "CHKJ2465"; // home method X must throw Y for Z. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2466 = "CHKJ2466"; // remote home method X must not expose the Y type. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2467 = "CHKJ2467"; // This method must throw CreateException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2468 = "CHKJ2468"; // This interface must follow RMI-IIOP rules for remote interfaces. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2469 = "CHKJ2469"; // This method (EJBObject or EJBLocalObject) is provided by the container. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2470 = "CHKJ2470"; // This component matching method must return X. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2471 = "CHKJ2471"; // This component matching method must throw X. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2472 = "CHKJ2472"; // This method must not pass X as an argument or result type. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2473 = "CHKJ2473"; // This (CMR) method must not be exposed. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2474 = "CHKJ2474"; // This method must not expose X. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2475 = "CHKJ2475"; // findByPrimaryKey's argument must be the primary key. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2476 = "CHKJ2476"; // This method must be the create/ejbCreate method. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2477 = "CHKJ2477"; // This method must throw FinderException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2478 = "CHKJ2478"; // This method must not throw ObjectNotFoundException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2479 = "CHKJ2479"; // findByPrimaryKey must return X. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2480 = "CHKJ2480"; // CMP/CMR field name must begin with a lowercase letter. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2481 = "CHKJ2481"; // field X must be a <cmp-field> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2482 = "CHKJ2482"; // field X must be a <cmr-field> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2483 = "CHKJ2483"; // CMP/CMR field should not be exposed //$NON-NLS-1$
-	/*package*/ static final String CHKJ2484 = "CHKJ2484"; // CMP/CMR field must be either a primitive or a serializable type. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2485 = "CHKJ2485"; // ejbSelect method must be abstract. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2486 = "CHKJ2486"; // ejbSelect must return X or a collection thereof. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2487 = "CHKJ2487"; // ejbSelect must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2488 = "CHKJ2488"; // ejbSelect must throw FinderException //$NON-NLS-1$
-	/*package*/ static final String CHKJ2489 = "CHKJ2489"; // Field must be the primary key type. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2490 = "CHKJ2490"; // This method must not be exposed. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2492 = "CHKJ2492"; // ejbRemove must be public. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2493 = "CHKJ2493"; // ejbRemove must not be final. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2494 = "CHKJ2494"; // ejbRemove must not be static. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2495 = "CHKJ2495"; // This find method must be associated with a query element in ejb-jar.xml. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2496 = "CHKJ2496"; // This ejbSelect method must be associated with a query element in ejb-jar.xml. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2497 = "CHKJ2497"; // ejbCreate must throw CreateException. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2500_ejbCreate = "CHKJ2500.ejbCreate"; // X must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2500_ejbHome = "CHKJ2500.ejbHome"; // X must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2500_ejbFind = "CHKJ2500.ejbFind"; // X must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2500_business = "CHKJ2500.bus"; // X must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2500_home = "CHKJ2500.home"; // X must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2500_create = "CHKJ2500.create"; // X must be serializable at runtime. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2500_find = "CHKJ2500.find"; // X must be serializable at runtime. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2501_ejbCreate = "CHKJ2501.ejbCreate"; // ejbCreate must not throw application exceptions. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2501_ejbRemove = "CHKJ2501.ejbRemove"; // ejbRemove must not throw application exceptions. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2501_onMessage = "CHKJ2501.onMessage"; // ejbRemove must not throw application exceptions. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2502_ejbFind = "CHKJ2502.ejbFind"; // ejbFind must not exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2502_ejbSelect = "CHKJ2502.ejbSelect"; // ejbSelect must not exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2502_finalize = "CHKJ2502.finalize"; // finalize must not exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2502 = "CHKJ2502"; // This method must not exist.  //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2503_bus = "CHKJ2503.bus"; // The business method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_create = "CHKJ2503.create"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_ejbCreate = "CHKJ2503.ejbCreate"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_ejbFind = "CHKJ2503.ejbFind"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_ejbHome = "CHKJ2503.ejbHome"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_ejbPostCreate = "CHKJ2503.ejbPostCreate"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_find = "CHKJ2503.find"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_home = "CHKJ2503.home"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2503_onMessage = "CHKJ2503.onMessage"; // This method must throw/not throw RemoteException. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2504_business = "CHKJ2504.business"; // The matching method must exist on the bean class. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2504_create = "CHKJ2504.create"; // The matching method must exist on the bean class. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2504_find = "CHKJ2504.find"; // The matching method must exist on the bean class. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2504_home = "CHKJ2504.home"; // The matching method must exist on the bean class. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2505_ejbPostCreate = "CHKJ2505.ejbPostCreate"; // This method must return void. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2505_onMessage = "CHKJ2505.onMessage"; // This method must return void. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2505_ejbRemove = "CHKJ2505.ejbRemove"; // This method must return void. //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2800_NAMED = "CHKJ2800.named"; // <local> cannot be reflected. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2800_UNNAMED = "CHKJ2800.unnamed"; // <local> must exist. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2805_NAMED = "CHKJ2805.named"; // <local-home> cannot be reflected //$NON-NLS-1$
-	/*package*/ static final String CHKJ2805_UNNAMED = "CHKJ2805.unnamed"; // <local-home> must exist. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2813 = "CHKJ2813"; // <ejb-name> X must be a valid Java identifier. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2816 = "CHKJ2816"; // <ejb-relation-name> must be unique in ejb-jar.xml. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2817 = "CHKJ2817"; // <ejb-relationship-role-name> must be unique within an <ejb-relation> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2818 = "CHKJ2818"; // The value of the <multiplicity> element must be either "One" or "Many" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2819 = "CHKJ2819"; // <abstract-schema-name> {0} must be a valid Java identifier //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2821 = "CHKJ2821"; // <relationship-role-source> {0} must exist in the module //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2848 = "CHKJ2848"; // <cascade-delete> must be used with a <multiplicity> of "One" //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2854 = "CHKJ2854"; // <abstract-schema-name> {0} must be unique within the ejb-jar.xml file //$NON-NLS-1$
-	/*package*/ static final String CHKJ2855 = "CHKJ2855"; // <cmp-field> {0} must be a Java primitive or a Java serializable type //$NON-NLS-1$
-	/*package*/ static final String CHKJ2856 = "CHKJ2856"; // <cmr-field> {0} must be the {1} type or a collection thereof //$NON-NLS-1$
-	/*package*/ static final String CHKJ2857 = "CHKJ2857"; // <cmr-field> {0} must be a valid Java identifier and begin with a lowercase letter //$NON-NLS-1$
-	/*package*/ static final String CHKJ2858 = "CHKJ2858"; // <abstract-schema-name> must exist //$NON-NLS-1$
-	/*package*/ static final String CHKJ2859 = "CHKJ2859"; // Reserved identifier {0} cannot be used as an <ejb-name> //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2860 = "CHKJ2860"; // Reserved identifier {0} cannot be used as an <abstract-schema-name> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2866 = "CHKJ2866"; // <cmr-field> {0} must be defined on {1} //$NON-NLS-1$
-	/*package*/ static final String CHKJ2867 = "CHKJ2867"; // This bean can have only unidirectional relationships to other beans //$NON-NLS-1$
-	/*package*/ static final String CHKJ2868 = "CHKJ2868"; // The value of the <cmr-field-type> element must be either "java.util.Collection" or "java.util.Set" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2869 = "CHKJ2869"; // At least one <ejb-relationship-role> must define a <cmr-field> //$NON-NLS-1$
-
-	/*package*/ static final String CHKJ2870 = "CHKJ2870"; // <ejb-name> {0} must exist //$NON-NLS-1$
-	/*package*/ static final String CHKJ2871 = "CHKJ2871"; // <ejb-name> {0} must refer to a CMP bean //$NON-NLS-1$
-	/*package*/ static final String CHKJ2872 = "CHKJ2872"; // The value of the <cmp-version> element must be either "1.x" or "2.x" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2873 = "CHKJ2873"; // Migrate this bean's datasource binding to a CMP Connection Factory binding. //$NON-NLS-1$
-	/*package*/ static final String CHKJ2874 = "CHKJ2874"; // Migrate this EJB module's default datasource binding to a default CMP Connection Factory binding. //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2880 = "CHKJ2880"; // This bean must provide a <local-home> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2881 = "CHKJ2881"; // This bean must provide a <home> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2882 = "CHKJ2882"; // This bean must provide a <local> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2883 = "CHKJ2883"; // This bean must provide a <remote> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2884 = "CHKJ2884"; // This bean must provide either a <local-home> or a <home> //$NON-NLS-1$
-	/*package*/ static final String CHKJ2885 = "CHKJ2885"; // This bean must provide either a <local> or a <remote> //$NON-NLS-1$
-	
-	/*package*/ static final String CHKJ2886 = "CHKJ2886.ejb21"; // Duplicate activation config: "{0}" exist in message drvien bean: "{1}" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2887 = "CHKJ2887.ejb21"; // The activation config with name : "{0}" has invalid value : "1" for message drvien bean: "{2}" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2888 = "CHKJ2888.ejb21"; // The activation config: "{0}" can only exist for a destination type: "{1}" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2889 = "CHKJ2889.ejb21"; // The message destination is not set for bean: "{0}" //$NON-NLS-1$
-	/*package*/ static final String CHKJ2890 = "CHKJ2890.ejb21"; // The message destination type "{0}" and destination type activation config property value "{1}" do not match  for bean: "{2}" //$NON-NLS-1$	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMethodAndFieldConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMethodAndFieldConstants.java
deleted file mode 100644
index 4476f1fdd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMethodAndFieldConstants.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-public interface IMethodAndFieldConstants {
-	public static final long NO_METHODS = 0x0;
-	public static final long EXCLUDED_METHOD = ValidationRuleUtility.method_and_field_counter; // 0x1 (1)
-	public static final long EXCLUDED_FIELD = (ValidationRuleUtility.method_and_field_counter <<= 1); // 0x2 (2)
-	public static final long OTHER_FIELD = (ValidationRuleUtility.method_and_field_counter <<= 1); // 0x4 (4)
-	
-	public static final long ACCESSOR = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x8 (8)
-	public static final long BUSINESS = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x10 (16)
-
-	public static final long CLINIT = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x20 (32)
-	public static final long CONSTRUCTOR = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x40 (64)
-	public static final long CONSTRUCTOR_NOPARM =  CONSTRUCTOR | (ValidationRuleUtility.method_and_field_counter <<= 1); // 0x40|0x80 (192)
-	public static final long CREATE = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x100 (256)
-	public static final long CREATE_NOPARM = CREATE | (ValidationRuleUtility.method_and_field_counter <<= 1);  //0x100|0x200 (768)
-	
-	public static final long EJBACTIVATE_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x400 (1024)
-	public static final long EJBCREATE = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x800 (2048)
-	public static final long EJBCREATE_NOPARM = EJBCREATE | (ValidationRuleUtility.method_and_field_counter <<= 1);//0x800|0x1000 (6144)
-	public static final long EJBFIND = (ValidationRuleUtility.method_and_field_counter <<= 1);  //0x2000 (8192)
-	public static final long EJBFINDBYPRIMARYKEY = EJBFIND | (ValidationRuleUtility.method_and_field_counter <<= 1); //0x2000|0x4000 (24576)
-	public static final long EJBHOME = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x8000 (32768)
-	public static final long EJBLOAD_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x10000 (65536)
-	public static final long EJBPASSIVATE_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x20000 (131,072)
-	public static final long EJBPOSTCREATE = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x40000 (262,144)
-	public static final long EJBREMOVE_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x80000 (524,288)
-	public static final long EJBSELECT = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x100000 (1,048,576)
-	public static final long EJBSTORE_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1);//0x200000 (2,097,152)
-	public static final long EQUALS = (ValidationRuleUtility.method_and_field_counter <<= 1);  //0x400000 (4,194,304)
-	
-	public static final long FIND = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x800000 (8,388,608)
-	public static final long FINDBYPRIMARYKEY = FIND | (ValidationRuleUtility.method_and_field_counter <<= 1); //0x1000000 (25,165,824)
-	public static final long FINALIZE_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x2000000 (33,554,432)
-	
-	public static final long HASHCODE_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x4000000 (67,108,864)
-	public static final long HELPER = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x8000000 (134,217,728)
-	public static final long HOME = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x10000000 (268,435,456)
-	
-	public static final long ONMESSAGE = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x20000000 (536,870,912)
-	
-	public static final long SERIALVERSIONUID = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x40000000 (1,073,741,824)
-	public static final long SETSESSIONCONTEXT = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x80000000 (2,147,483,648)
-	public static final long SETENTITYCONTEXT = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x100000000 (4,294,967,296)
-	
-	public static final long UNSETENTITYCONTEXT_NOPARM = (ValidationRuleUtility.method_and_field_counter <<= 1); //0x200000000 (8,589,934,592)
-	
-
-	// prefixes of some method names
-	/*package*/ static final String PREFIX_C = "c"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_EJB = "ejb"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_EJBC = "ejbC"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_EJBF = "ejbF"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_EJBFIND = "ejbFind"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_EJBHOME = "ejbHome"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_EJBSELECT = "ejbSelect"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_F = "f"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_FIND = "find"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_GET = "get"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_SELECT = "select"; //$NON-NLS-1$
-	/*package*/ static final String PREFIX_SET = "set"; //$NON-NLS-1$
-
-	// method names	
-	/*package*/ static final String METHODNAME_CREATE = "create"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBACTIVATE = "ejbActivate"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBCREATE = "ejbCreate"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBFINDBYPRIMARYKEY = "ejbFindByPrimaryKey"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBLOAD = "ejbLoad"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBPASSIVATE = "ejbPassivate"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBPOSTCREATE = "ejbPostCreate"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBREMOVE = "ejbRemove"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EJBSTORE = "ejbStore"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_EQUALS = "equals"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_FINALIZE = "finalize"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_FINDBYPRIMARYKEY = "findByPrimaryKey"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_HASHCODE = "hashCode"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_ONMESSAGE = "onMessage"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_REMOVE = "remove"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_SETSESSIONCONTEXT = "setSessionContext"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_SETENTITYCONTEXT = "setEntityContext"; //$NON-NLS-1$
-	/*package*/ static final String METHODNAME_UNSETENTITYCONTEXT = "unsetEntityContext"; //$NON-NLS-1$
-	
-	// field names
-	/*package*/ static final String FIELDNAME_SERIALVERSIONUID = "serialVersionUID"; //$NON-NLS-1$
-	
-	// For substitution into strings
-	/*package*/ static final String METHODSIGNATURE_EQUALS = "equals(java.lang.Object)"; //$NON-NLS-1$
-	/*package*/ static final String METHODSIGNATURE_HASHCODE = "hashCode()"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMethodType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMethodType.java
deleted file mode 100644
index fd031affe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMethodType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
- 
-import java.util.List;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-public abstract interface IMethodType {
-	public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method);
-
-	public long getId();
-	
-	/**
-	 * Return true if this method type is a default type for an enterprise bean's class.
-	 * For example, if the method on the home is neither a create nor a find method, then
-	 * it is assumed to be the default type, a home method.
-	 */
-	public boolean isDefaultType();
-	
-	public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists);
-
-	public String getMessageId_messageMissing(); // required method is missing
-	public String getMessageId_messageExists(); // method should not exist
-	public String getMessageId_messageRemoteException(); // method throws (or doesn't throw) RemoteException
-	public String getMessageId_messageMissingMatching(); // method is missing its matching method on the bean class
-	public String getMessageId_messageRMI_IIOPParm(); // parameter or return type is not a legal RMI-IIOP type
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IRemoteType.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IRemoteType.java
deleted file mode 100644
index 5db5385ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IRemoteType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IRemoteType {
-	public int IS_REMOTE = IEJBType.REMOTE;
-	public int MESSAGE_REMOTE_EXCEPTION_SEVERITY = IEJBValidationContext.ERROR; // If a method does not throw an exception when it should, RMIC blows up, hence this situation is an error.
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ITypeConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ITypeConstants.java
deleted file mode 100644
index 608ef1fc0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ITypeConstants.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-public interface ITypeConstants {
-	public static long NO_SUPERTYPE = 0x0;
-	
-	public static long LOCAL_COMPONENT_INTERFACE = ClassUtility.supertype_counter; // 0x1 (1)
-	public static long REMOTE_COMPONENT_INTERFACE = (ClassUtility.supertype_counter <<= 1); // 0x2 (2)
-	
-	public static long JAVAX_EJB_ENTITYBEAN = (ClassUtility.supertype_counter <<= 1); // 0x4 (4)
-	public static long JAVAX_EJB_EJBLOCALHOME = (ClassUtility.supertype_counter <<= 1); //0x8 (8)
-	public static long JAVAX_EJB_EJBLOCALOBJECT = (ClassUtility.supertype_counter <<= 1);//0x10 (16)
-	public static long JAVAX_EJB_EJBHOME = (ClassUtility.supertype_counter <<= 1); //0x20 (32)
-	public static long JAVAX_EJB_EJBOBJECT = (ClassUtility.supertype_counter <<= 1); //0x40 (64)
-	
-	public static long JAVA_LANG_OBJECT = (ClassUtility.supertype_counter <<= 1);//0x80 (128)
-	
-	public static long JAVAX_EJB_MESSAGEDRIVENBEAN = (ClassUtility.supertype_counter <<= 1); //0x100 (256)
-	public static long JAVAX_JMS_MESSAGELISTENER = (ClassUtility.supertype_counter <<= 1);  //0x200 (512)
-	
-	public static long JAVAX_EJB_SESSIONBEAN = (ClassUtility.supertype_counter <<= 1); //0x400 (1024)
-	public static long JAVAX_EJB_SESSIONSYNCHRONIZATION = (ClassUtility.supertype_counter <<= 1); // 0x800 (2048)
-	
-	// primitive types
-	/*package*/ static final String VOID = "void"; //$NON-NLS-1$
-	
-	// class and interface types
-	/*package*/ static final String CLASSNAME_JAVA_IO_IOEXCEPTION = "java.io.IOException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_IO_SERIALIZABLE = "java.io.Serializable"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_LANG_OBJECT = "java.lang.Object"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_LANG_EXCEPTION = "java.lang.Exception"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_LANG_RUNTIMEEXCEPTION = "java.lang.RuntimeException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_RMI_REMOTE = "java.rmi.Remote"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_RMI_REMOTEEXCEPTION = "java.rmi.RemoteException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_UTIL_COLLECTION = "java.util.Collection"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_UTIL_ENUMERATION = "java.util.Enumeration"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVA_UTIL_SET = "java.util.Set"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_CREATEEXCEPTION = "javax.ejb.CreateException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_ENTITYBEAN = "javax.ejb.EntityBean"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_EJBEXCEPTION = "javax.ejb.EJBException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_EJBHOME = "javax.ejb.EJBHome"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_EJBLOCALHOME = "javax.ejb.EJBLocalHome"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_EJBOBJECT = "javax.ejb.EJBObject"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_EJBLOCALOBJECT = "javax.ejb.EJBLocalObject"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_ENTITYCONTEXT = "javax.ejb.EntityContext"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_FINDEREXCEPTION = "javax.ejb.FinderException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_MESSAGEDRIVENBEAN = "javax.ejb.MessageDrivenBean"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_OBJECTNOTFOUNDEXCEPTION = "javax.ejb.ObjectNotFoundException"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_SESSIONBEAN = "javax.ejb.SessionBean"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_SESSIONCONTEXT = "javax.ejb.SessionContext"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION = "javax.ejb.SessionSynchronization"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_JMS_MESSAGE = "javax.jms.Message"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_JMS_MESSAGELISTENER = "javax.jms.MessageListener"; //$NON-NLS-1$
-	/*package*/ static final String CLASSNAME_JAVAX_TRANSACTION_USERTRANSACTION = "javax.transaction.UserTransaction"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationRule.java
deleted file mode 100644
index e54a185df..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationRule.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.wst.validation.internal.core.ValidationException;
-
-
-public interface IValidationRule {
-	/**
-	 * Returns the id of this rule. Given this id, this rule can be loaded from
-	 * the AbstractEJBValidationRuleFactory.
-	 */
-	public Object getId();
-	
-	/**
-	 * Returns the ids of the rules which this rule depends on. (That is,
-	 * if one of these rules runs, then this rule needs to be run.)
-	 */
-	public Object[] getDependsOn();
-	
-	/**
-	 * Add a validation rule which needs to be notified when this rule is run.
-	 */
-	public void addDependent(IValidationRule rule);
-	
-	/**
-	 * Return a collection of the IValidationRules which depend on this rule.
-	 */
-	public Set getDependents();
-	
-	/**
-	 * Given the target's parent and the changed target, return the target which 
-	 * this rule should validate. For example, if a bean class changes, then the 
-	 * target parent would be the EnterpriseBean, and this rule could return
-	 * the home interface, or the component interface, or the key class, etc.
-	 */
-	public Object getTarget(Object targetParent, Object target);
-
-	/**
-	 * If any information needs to be calculated before the validate method is called,
-	 * then that information should be calculated here. This cached information should
-	 * be cleaned up in the postValidate method.
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException;
-	
-	/**
-	 * Validate the target object. Report all messages, load models, etc.
-	 * through the IValidtionContext parameter.
-	 */
-	public void validate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException;
-	
-	/**
-	 * This method cleans up any resources calculated or cached in the preValidate method.
-	 * This method is called after the validate method has completed.
-	 */
-	public void postValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException;
-	
-	/**
-	 * To enable this rule for reuse, reset any stored values (which were calculated 
-	 * during validation) to the default value.
-	 */
-	public void reset();
-	
-	/**
-	 * Return a mapping of CHKJ message id to the message id in the resource bundle.
-	 */
-	public Map getMessageIds();
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationRuleList.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationRuleList.java
deleted file mode 100644
index 29c390be6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationRuleList.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-public interface IValidationRuleList {
-	public static final Object EJB11_EJBJAR = new Integer(1); // EJB 1.1 projects
-	public static final Object EJB11_EJBEXT = new Integer(2); // EJB 1.1 projects
-	public static final Object EJB20_EJBJAR = new Integer(3); // EJB 2.0 projects
-	public static final Object EJB20_EJBEXT = new Integer(4); // EJB 2.0 projects
-	
-	public static final Object EJB11_ENTERPRISEBEAN = new Integer(5); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB20_ENTERPRISEBEAN = new Integer(6); // EJB 2.0 projects
-	
-	public static final Object EJB11_SESSION_BEANCLASS = new Integer(7); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_SESSION_REMOTE = new Integer(8); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_SESSION_HOME = new Integer(9); // EJB 1.1 or EJB 2.0 projects
-	
-	public static final Object EJB11_CMP_BEANCLASS = new Integer(10); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_CMP_REMOTE = new Integer(11); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_CMP_HOME = new Integer(12); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_CMP_KEYCLASS = new Integer(13); // EJB 1.1 or EJB 2.0 projects
-
-	public static final Object EJB11_BMP_BEANCLASS = new Integer(14); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_BMP_REMOTE = new Integer(15); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_BMP_HOME = new Integer(16); // EJB 1.1 or EJB 2.0 projects
-	public static final Object EJB11_BMP_KEYCLASS = new Integer(17); // EJB 1.1 or EJB 2.0 projects
-
-	public static final Object EJB20_STATELESS_SESSION_BEANCLASS = new Integer(18); // EJB 2.0 projects
-	public static final Object EJB20_STATELESS_SESSION_REMOTE = new Integer(19); // EJB 2.0 projects
-	public static final Object EJB20_STATELESS_SESSION_HOME = new Integer(20); // EJB 2.0 projects
-	public static final Object EJB20_STATELESS_SESSION_LOCAL = new Integer(21); // EJB 2.0 projects
-	public static final Object EJB20_STATELESS_SESSION_LOCALHOME = new Integer(22); // EJB 2.0 projects
-	
-	public static final Object EJB20_STATEFUL_SESSION_BEANCLASS = new Integer(23); // EJB 2.0 projects
-	public static final Object EJB20_STATEFUL_SESSION_REMOTE = new Integer(24); // EJB 2.0 projects
-	public static final Object EJB20_STATEFUL_SESSION_HOME = new Integer(25); // EJB 2.0 projects
-	public static final Object EJB20_STATEFUL_SESSION_LOCAL = new Integer(26); // EJB 2.0 projects
-	public static final Object EJB20_STATEFUL_SESSION_LOCALHOME = new Integer(27); // EJB 2.0 projects
-	
-	public static final Object EJB20_CMP_BEANCLASS = new Integer(28); // EJB 2.0 projects
-	public static final Object EJB20_CMP_REMOTE = new Integer(29); // EJB 2.0 projects
-	public static final Object EJB20_CMP_HOME = new Integer(30); // EJB 2.0 projects
-	public static final Object EJB20_CMP_LOCAL = new Integer(31); // EJB 2.0 projects
-	public static final Object EJB20_CMP_LOCALHOME = new Integer(32); // EJB 2.0 projects
-	public static final Object EJB20_CMP_KEYCLASS = new Integer(33); // EJB 2.0 projects
-
-	public static final Object EJB20_BMP_BEANCLASS = new Integer(34); // EJB 2.0 projects
-	public static final Object EJB20_BMP_REMOTE = new Integer(35); // EJB 2.0 projects
-	public static final Object EJB20_BMP_HOME = new Integer(36); // EJB 2.0 projects
-	public static final Object EJB20_BMP_LOCAL = new Integer(37); // EJB 2.0 projects
-	public static final Object EJB20_BMP_LOCALHOME = new Integer(38); // EJB 2.0 projects
-	public static final Object EJB20_BMP_KEYCLASS = new Integer(39); // EJB 2.0 projects
-
-	public static final Object EJB20_MESSAGE_BEANCLASS = new Integer(40); // EJB 2.0 projects
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/InvalidInputException.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/InvalidInputException.java
deleted file mode 100644
index 51c673a23..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/InvalidInputException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * This exception is thrown when either a type cannot be reflected
- * or when expected input (e.g. the remote interface) is null.
- */
-public class InvalidInputException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7811046448684869845L;
-	private JavaClass _class = null;
-	
-	/**
-	 * This constructor should be used only when there is no information
-	 * available to identify what is invalid.
-	 */
-	public InvalidInputException() {
-		this(null);
-	}
-	
-	/**
-	 * This constructor is used when the given type cannot be reflected.
-	 */
-	public InvalidInputException(JavaClass clazz) {
-		_class = clazz;
-	}
-	
-	public JavaClass getJavaClass() {
-		return _class;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEMessageConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEMessageConstants.java
deleted file mode 100644
index 6715687c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEMessageConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/**
- * Message key constants for J2EE validators.
- */
-public interface J2EEMessageConstants {
-	public static final String EREF_CATEGORY = "erefvalidation"; //$NON-NLS-1$
-	public static final String WAR_CATEGORY = "warvalidation"; //$NON-NLS-1$
-	public static final String EAR_CATEGORY = "earvalidation"; //$NON-NLS-1$
-	public static final String EJBJAR_CATEGORY = "ejbjarvalidation"; //$NON-NLS-1$
-	public static final String APLICATIONCLIENT_CATEGORY = "applicationclientvalidation"; //$NON-NLS-1$
-	public static final String VALIDATOR_NAME = "validator.name"; //$NON-NLS-1$
-	public static final String ERROR_EAR_MISSING_EREFNAME = "ERROR_EAR_MISSING_EREFNAME"; //$NON-NLS-1$
-	public static final String ERROR_EAR_MISSING_EREFTYPE = "ERROR_EAR_MISSING_EREFTYPE"; //$NON-NLS-1$
-	public static final String ERROR_EAR_INVALID_EREFTYPE = "ERROR_EAR_INVALID_EREFTYPE"; //$NON-NLS-1$
-	public static final String ERROR_EAR_MISSING_EREFHOME = "ERROR_EAR_MISSING_EREFHOME"; //$NON-NLS-1$
-	public static final String ERROR_EAR_MISSING_EREFREMOTE = "ERROR_EAR_MISSING_EREFREMOTE"; //$NON-NLS-1$
-	public static final String ERROR_EAR_MISSING_EJB_ROLE = "ERROR_EAR_MISSING_EJB_ROLE"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_RESREF = "ERROR_EAR_DUPLICATE_RESREF"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_SERVICEREF = "ERROR_EAR_DUPLICATE_SERVICEREF"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_SECURITYROLEREF = "ERROR_EAR_DUPLICATE_SECURITYROLEREF"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_EJBREF = "ERROR_EAR_DUPLICATE_EJBREF"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_RESENVREF = "ERROR_EAR_DUPLICATE_RESENVREF"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF = "ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF"; //$NON-NLS-1$
-	public static final String ERROR_EAR_MISSING_MESSSAGEDESTINATION = "ERROR_EAR_MISSING_MESSSAGEDESTINATION"; //$NON-NLS-1$	
-	public static final String ERROR_EAR_MISSING_EMPTY_MESSSAGEDESTINATION = "ERROR_EAR_MISSING_EMPTY_MESSSAGEDESTINATION"; //$NON-NLS-1$	
-	public static final String ERROR_UNRESOLVED_MDB_MISSING_MESSAGE_DESTINATION = "ERROR_UNRESOLVED_MDB_MISSING_MESSAGE_DESTINATION";//$NON-NLS-1$
-	public static final String ERROR_MODULE_DD_FILE_NOT_FOUND = "ERROR_MODULE_DD_FILE_NOT_FOUND";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidationResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidationResourceHandler.java
deleted file mode 100644
index c35b84637..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidationResourceHandler.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-
-public class J2EEValidationResourceHandler {
-	private static java.util.Hashtable handlers = new java.util.Hashtable();
-	protected ClassLoader resourceClassLoader;
-	protected java.util.Locale locale = null;
-	protected String bundleName = null;
-	protected java.util.ResourceBundle bundle = null;
-/**
- * ResourceHandler constructor.  This constructor uses the default locale.
- *
- */
-public J2EEValidationResourceHandler() {
-	super();
-}
-/**
- * ResourceHandler constructor.
- *
- * @param The Locale object containing the locale to be used to locate the resource bundle.
- */
-public J2EEValidationResourceHandler(Locale locale) {
-	super();
-	setLocale(locale);
-}
-/**
- * Getter for the resource bundle property.  This property is lazily initialized using the
- * locale property; so that property must be set before calling this method.
- *
- * @return The ResourceBundle object containing the messages to be handled by this instance.
- */
-public java.util.ResourceBundle getBundle() {
-	if (this.bundle == null) {
-		try {
-			if (getResourceClassLoader() == null)
-				this.bundle = java.util.ResourceBundle.getBundle(getBundleName(),getLocale());
-			else
-				this.bundle = java.util.ResourceBundle.getBundle(getBundleName(),getLocale(), getResourceClassLoader());
-		} catch (MissingResourceException e) {
-			System.out.println("Exception retrieving bundle: " + getBundleName() +//$NON-NLS-1$
-				" using locale: " + getLocale().toString());//$NON-NLS-1$
-			e.printStackTrace();
-		} // endtry
-	} // endif
-	return this.bundle;
-}
-
-/**
- * Insert the method's description here.
- * Creation date: (1/5/01 2:26:24 PM)
- * @return java.lang.String
- */
-public java.lang.String getBundleName() {
-	return bundleName;
-}
-/**
- * Get the message with the specified key.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- */
-
-public static String getExternalizedMessage(String fileName, String key, Class aClass) {
-	
-	return getHandler(fileName, aClass).getMessage(key);
-	
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified Object array.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg The Object array containing the substitution values for the message.
- * @return The message string.
- */
-public static String getExternalizedMessage(String fileName, String key, Class aClass, Object arg[]) {
-	
-	return getHandler(fileName, aClass).getMessage(key, arg);
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified Object array.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg The Object array containing the substitution values for the message.
- * @return The message string.
- */
-public static String getExternalizedMessage(String fileName, String key, Class aClass, Object arg[], Locale locale) {
-	
-	return getHandler(fileName, aClass, locale).getMessage(key, arg);
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String argument.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @return The message string.
- */
-public static String getExternalizedMessage(String fileName, String key, Class aClass, String arg1) {
-	
-	return getHandler(fileName, aClass).getMessage(key, arg1);
-
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @return The message string.
- */
-
-public static String getExternalizedMessage(String fileName, String key, Class aClass, String arg1, String arg2) {
-	
-	return getHandler(fileName, aClass).getMessage(key, arg1, arg2);
-
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @param arg3 The argument containing the substitution values for the message variable 3.
- * @return The message string.
- */
-
-public static String getExternalizedMessage(String fileName, String key, Class aClass, String arg1, String arg2, String arg3) {
-	
-	return getHandler(fileName, aClass).getMessage(key, arg1, arg2, arg3);
-	
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @param arg3 The argument containing the substitution values for the message variable 3.
- * @param arg4 The argument containing the substitution values for the message variable 4.
- * @return The message string.
- */
-
-public static String getExternalizedMessage(String fileName, String key, Class aClass, String arg1, String arg2, String arg3, String arg4) {
-
-	return getHandler(fileName, aClass).getMessage(key, arg1, arg2, arg3, arg4);
-
-}
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @param arg3 The argument containing the substitution values for the message variable 3.
- * @param arg4 The argument containing the substitution values for the message variable 4.
- * @param arg4 The argument containing the substitution values for the message variable 4.
- * @param arg5 The argument containing the substitution values for the message variable 5.
- * @return The message string.
- */
-
-public static String getExternalizedMessage(String fileName, String key, Class aClass,
-						 String arg1, 
-						 String arg2, 
-						 String arg3, 
-						 String arg4, 
-						 String arg5) {
-	
-	return getHandler(fileName, aClass).getMessage(key,
-						 arg1, 
-						 arg2, 
-						 arg3, 
-						 arg4, 
-						 arg5);
-	
-}
-/**
- * Get the message with the specified key.
- *
- * @param fileName The name of the property file that contains the message.
- * @param key The key for the message to be retrieved.
- */
-
-public static String getExternalizedMessage(String fileName, String key, Class aClass, Locale locale) {
-	
-	return getHandler(fileName, aClass, locale).getMessage(key);
-	
-}
-/**
- * Get the static instance of this class that corresponds to the passed property file.
- *
- * @return The resource handler object which can be used to obtain messages.
- */
-public static J2EEValidationResourceHandler getHandler(String fileName, Class aClass) {
-	return getHandler(fileName,aClass,Locale.getDefault());
-}
-/**
- * Get the static instance of this class that corresponds to the passed property file.
- *
- * @return The resource handler object which can be used to obtain messages.
- */
-public static J2EEValidationResourceHandler getHandler(String fileName, Class aClass, Locale locale) {
-	String handlerKey = getHandlerKey(fileName, locale);
-	if (handlers.get(handlerKey) == null) {
-		J2EEValidationResourceHandler temp = new J2EEValidationResourceHandler(locale);
-		temp.setResourceClassLoader(aClass.getClassLoader());
-		temp.setBundleName(fileName);
-		handlers.put(handlerKey,temp);
-	}
-	
-	return (J2EEValidationResourceHandler)(handlers.get(handlerKey));
-}
-  private static String getHandlerKey(String _baseName, Locale locale) {
-	StringBuffer localeName = new StringBuffer("_").append(locale.toString());//$NON-NLS-1$
-	if (locale.toString().equals(""))//$NON-NLS-1$
-	  localeName.setLength(0);
-	return _baseName + localeName.toString();
-  }      
-/**
- * Insert the method's description here.
- * Creation date: (1/26/2001 1:04:50 PM)
- * @return java.lang.ClassLoader
- */
-public java.lang.ClassLoader getResourceClassLoader() {
-	return resourceClassLoader;
-}
-/**
- * Insert the method's description here.
- * Creation date: (1/26/2001 1:04:50 PM)
- * @param newResourceClassLoader java.lang.ClassLoader
- */
-public void setResourceClassLoader(java.lang.ClassLoader newResourceClassLoader) {
-	resourceClassLoader = newResourceClassLoader;
-}
-
-/**
- * Setter for the locale property.
- *
- * @param The locale.
- */
-public void setLocale(Locale locale) {
-	this.locale = locale;
-}
-
-/**
- * Insert the method's description here.
- * Creation date: (1/5/01 2:26:24 PM)
- * @param newBundleName java.lang.String
- */
-public void setBundleName(java.lang.String newBundleName) {
-	bundleName = newBundleName;
-}
-
-
-/**
- * Getter for the locale property.
- *
- * @return The locale.
- */
-public Locale getLocale() {
-	if (locale == null)
-		locale = Locale.getDefault();
-	return locale;
-}
-
-/**
- * Get the message with the specified key.
- *
- * @param key The key for the message to be retrieved.
- */
-
-public String getMessage(String key) {
-	String temp = null;
-	try {
-		temp = getBundle().getString(key);
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-}
-
-/**
- * Get the message template with the specified key, and format the message using
- * the specified Object array.
- *
- * @param key The key for the message to be retrieved.
- * @param arg The Object array containing the substitution values for the message.
- * @return The message string.
- */
-public String getMessage(String key, Object arg[]) {
-	String temp = null;
-	try {
-		temp = MessageFormat.format(getBundle().getString(key), arg);
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-}
-
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String argument.
- *
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @return The message string.
- */
-public String getMessage(String key, String arg1) {
-
-	String temp = null;
-	try {
-		if (arg1 != null) {
-			Object msgobj[] = new Object[1];
-			msgobj[0] = arg1;
-			temp = getMessage(key, msgobj);
-		} 
-		else {
-			temp = getMessage(key);
-		}
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-}
-
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @return The message string.
- */
-
-public String getMessage(String key, String arg1, String arg2) {
-	String temp = null;
-	try {
-		if ((arg1 != null) && (arg2 != null)) {
-			Object msgobj[] = new Object[2];
-			msgobj[0] = arg1;
-			msgobj[1] = arg2;
-			temp = getMessage(key, msgobj);
-		} 
-		else {
-			temp = getMessage(key);
-		}
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-
-}
-
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @param arg3 The argument containing the substitution values for the message variable 3.
- * @return The message string.
- */
-
-public String getMessage(String key, String arg1, String arg2, String arg3) {
-	String temp = null;
-	try {
-		if ((arg1 != null) && (arg2 != null) && (arg3 != null)) {
-			Object msgobj[] = new Object[3];
-			msgobj[0] = arg1;
-			msgobj[1] = arg2;
-			msgobj[2] = arg3;
-			temp = getMessage(key, msgobj);
-		} 
-		else {
-			temp = getMessage(key);
-		}
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-	
-}
-
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @param arg3 The argument containing the substitution values for the message variable 3.
- * @param arg4 The argument containing the substitution values for the message variable 4.
- * @return The message string.
- */
-
-public String getMessage(String key, String arg1, String arg2, String arg3, String arg4) {
-	String temp = null;
-	try {
-		if ((arg1 != null) && (arg2 != null) && (arg3 != null) && (arg4 != null)) {
-			Object msgobj[] = new Object[4];
-			msgobj[0] = arg1;
-			msgobj[1] = arg2;
-			msgobj[2] = arg3;
-			msgobj[3] = arg4;
-			temp = getMessage(key, msgobj);
-		} 
-		else {
-			temp = getMessage(key);
-		}
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-}
-
-/**
- * Get the message template with the specified key, and format the message using
- * the specified String arguments.
- *
- * @param key The key for the message to be retrieved.
- * @param arg1 The argument containing the substitution values for the message variable 1.
- * @param arg2 The argument containing the substitution values for the message variable 2.
- * @param arg3 The argument containing the substitution values for the message variable 3.
- * @param arg4 The argument containing the substitution values for the message variable 4.
- * @param arg4 The argument containing the substitution values for the message variable 4.
- * @param arg5 The argument containing the substitution values for the message variable 5.
- * @return The message string.
- */
-
-public String getMessage(String key,
-						 String arg1, 
-						 String arg2, 
-						 String arg3, 
-						 String arg4, 
-						 String arg5) {
-
-	String temp = null;
-	try {
-		if ((arg1 != null) && (arg2 != null) && (arg3 != null) && 
-				(arg4 != null) && (arg5 != null) ) {
-			Object msgobj[] = new Object[5];
-			msgobj[0] = arg1;
-			msgobj[1] = arg2;
-			msgobj[2] = arg3;
-			msgobj[3] = arg4;
-			msgobj[4] = arg5;
-			temp = getMessage(key, msgobj);
-		} 
-		else {
-			temp = getMessage(key);
-		}
-	}
-	catch (MissingResourceException ex) {
-		System.out.println("Resource Exception: " + ex);//$NON-NLS-1$
-		temp = "<<Key: " + key + " not found in resource: " + getBundleName() + ">>";//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-	return temp;
-	
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java
deleted file mode 100644
index 6a43e7f01..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.internal.impl.ResourceRefImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.SecurityRoleImpl;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-
-/**
- * Insert the type's description here. Creation date: (3/9/2001 3:34:39 PM)
- * 
- * @author: Administrator
- */
-public abstract class J2EEValidator implements IValidatorJob, J2EEMessageConstants {
-	protected IReporter _reporter;
-	protected IValidationContext _helper;
-	protected IStatus status = OK_STATUS;
-
-
-	public J2EEValidator() {
-		initialize();
-	}
-
-	/**
-	 * <p>
-	 * Create am <em>error</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addError(String msgId) {
-		addError(getBaseName(), msgId, null);
-	}
-
-	/**
-	 * <p>
-	 * Create am <em>error</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addError(String msgId, String[] msgArgs) {
-		addError(getBaseName(), msgId, msgArgs);
-	}
-
-	/**
-	 * <p>
-	 * Create am <em>error</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addError(String msgCategory, String msgId) {
-		addError(msgCategory, msgId, null);
-	}
-
-	/**
-	 * <p>
-	 * Create an <em>error</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require one or more arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addError(String bundleName, String msgId, String[] msgArgs) {
-		this.addError(bundleName, msgId, msgArgs, null);
-	}
-
-	/**
-	 * <p>
-	 * Create an <em>error</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require one or more arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addError(String bundleName, String msgId, String[] msgArgs, Object target) {
-		_reporter.addMessage(this, new Message(bundleName, IMessage.HIGH_SEVERITY, msgId, msgArgs, target));
-	}
-
-	public void addError(String bundleName, String msgId, String[] msgArgs, Object target, String groupName) {
-		IMessage message = new Message(bundleName, IMessage.HIGH_SEVERITY, msgId, msgArgs, target);
-		message.setGroupName(groupName);
-		_reporter.addMessage(this, message);
-	}
-
-	public void addError(String bundleName, String msgId, String[] msgArgs, Object target, String groupName, int lineNumber) {
-		IMessage message = new Message(bundleName, IMessage.HIGH_SEVERITY, msgId, msgArgs, target);
-		message.setLineNo(lineNumber);
-		message.setGroupName(groupName);
-
-		_reporter.addMessage(this, message);
-
-	}
-
-	public void addLocalizedError(String msg, Object target) {
-		_reporter.addMessage(this, new LocalizedMessage(IMessage.HIGH_SEVERITY, msg, target));
-	}
-	
-	public void addLocalizedError(String msg, Object target, int lineNumber) {
-		addLocalizedError( msg, target, null, lineNumber );
-	}
-	
-	public void addLocalizedError(String msg, Object target, String groupName, int lineNumber) {
-		IMessage message = new LocalizedMessage(IMessage.HIGH_SEVERITY, msg, target);
-		message.setGroupName( groupName );
-		message.setLineNo(lineNumber);
-		_reporter.addMessage(this, message);
-	}	
-	
-	public void addLocalizedError(String msg, Object target, String groupName) {
-		IMessage message = new LocalizedMessage(IMessage.HIGH_SEVERITY, msg, target);
-		message.setGroupName( groupName );
-		_reporter.addMessage(this, message);
-	}
-	
-	/**
-	 * <p>
-	 * Create an <em>informational</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addInfo(String msgId) {
-		addInfo(getBaseName(), msgId, null);
-	}
-
-	/**
-	 * <p>
-	 * Create an <em>informational</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addInfo(String msgId, String[] msgArgs) {
-		addInfo(getBaseName(), msgId, msgArgs);
-	}
-
-	/**
-	 * <p>
-	 * Create an <em>informational</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addInfo(String msgCategory, String msgId) {
-		addInfo(msgCategory, msgId, null);
-	}
-
-	/**
-	 * <p>
-	 * Create an <em>informational</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require one or more arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addInfo(String bundleName, String msgId, String[] msgArgs) {
-		addInfo(bundleName, msgId, msgArgs, null);
-	}
-
-	/**
-	 * <p>
-	 * Create an <em>informational</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require one or more arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addInfo(String bundleName, String msgId, String[] msgArgs, Object target) {
-		_reporter.addMessage(this, new Message(bundleName, IMessage.LOW_SEVERITY, msgId, msgArgs, target));
-	}
-
-	public void addLocalizedInfo(String msg, Object target) {
-		_reporter.addMessage(this, new LocalizedMessage(IMessage.LOW_SEVERITY, msg, target));
-	}	
-	
-	/**
-	 * <p>
-	 * Create a <em>warning</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addWarning(String msgId) {
-		addWarning(getBaseName(), msgId, null);
-	}
-
-	/**
-	 * <p>
-	 * Create a <em>warning</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addWarning(String msgId, String[] msgArgs) {
-		addWarning(getBaseName(), msgId, msgArgs);
-	}
-
-	/**
-	 * <p>
-	 * Create a <em>warning</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require no arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 */
-
-	public void addWarning(String msgCategory, String msgId) {
-		addWarning(msgCategory, msgId, null);
-	}
-
-	/**
-	 * <p>
-	 * Create a <em>warning</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require one or more arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addWarning(String bundleName, String msgId, String[] msgArgs) {
-		addWarning(bundleName, msgId, msgArgs, null);
-	}
-
-	/**
-	 * <p>
-	 * Create a <em>warning</em> message and route it to the cached reporter. This form of
-	 * <code>addError</code> is for messages which require one or more arguments.
-	 * </p>
-	 * 
-	 * @param msgCategory
-	 *            The base name of the message bundle to use.
-	 * @param msgId
-	 *            The ID of the message to be created.
-	 * @param msgArgs
-	 *            The parameters for the message.
-	 */
-
-	public void addWarning(String bundleName, String msgId, String[] msgArgs, Object target) {
-		_reporter.addMessage(this, new Message(bundleName, IMessage.NORMAL_SEVERITY, msgId, msgArgs, target));
-	}
-
-	public void addWarning(String bundleName, String msgId, String[] msgArgs, Object target, String groupName) {
-		IMessage message = new Message(bundleName, IMessage.NORMAL_SEVERITY, msgId, msgArgs, target);
-		message.setGroupName(groupName);
-		_reporter.addMessage(this, message);
-	}
-
-	public void addLocalizedWarning(String msg, Object target) {
-		_reporter.addMessage(this, new LocalizedMessage(IMessage.NORMAL_SEVERITY, msg, target));
-	}
-	public void addLocalizedWarning(String msg, Object target, String groupName) {
-		IMessage message = new LocalizedMessage(IMessage.NORMAL_SEVERITY, msg, target);
-		message.setGroupName(groupName);
-		_reporter.addMessage(this, message);
-	}	
-	
-	/**
-	 * Perform any resource cleanup once validation is complete.
-	 * @deprecated Use cleanup(IReporter reporter)
-	 */
-	public void cleanup() {
-		_reporter = null;
-	}
-
-	/**
-	 * Perform any resource cleanup once validation is complete. If cleanup will take some time, the
-	 * IValidator should report subtask information to the user through the IReporter parameter. The
-	 * AReporter parameter will not be null.
-	 */
-	public void cleanup(IReporter reporter) {
-		_reporter = null;
-	}
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI. The ValidationBuilder
-	 * uses this string as input to the IProgressMonitor. i.e., At some point during the validation
-	 * process, the Validation Builder will output this string: "{0} is validating {1}.", where {0}
-	 * is the string that this method returns, and {1} is the name of the current resource.
-	 */
-	public String[] get1Param(String string1) {
-		String[] parms = new String[1];
-		parms[0] = string1;
-		return parms;
-	}
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI. The ValidationBuilder
-	 * uses this string as input to the IProgressMonitor. i.e., At some point during the validation
-	 * process, the Validation Builder will output this string: "{0} is validating {1}.", where {0}
-	 * is the string that this method returns, and {1} is the name of the current resource.
-	 */
-	public String[] get2Param(String string1, String string2) {
-		String[] parms = new String[2];
-		parms[0] = string1;
-		parms[1] = string2;
-		return parms;
-	}
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI. The ValidationBuilder
-	 * uses this string as input to the IProgressMonitor. i.e., At some point during the validation
-	 * process, the Validation Builder will output this string: "{0} is validating {1}.", where {0}
-	 * is the string that this method returns, and {1} is the name of the current resource.
-	 */
-	public String[] get3Param(String string1, String string2, String string3) {
-		String[] parms = new String[2];
-		parms[0] = string1;
-		parms[1] = string2;
-		parms[2] = string3;
-		return parms;
-	}
-
-	/**
-	 * <p>
-	 * Answer the id of the resource bundle which is used by the receiver.
-	 * </p>
-	 */
-
-	public abstract String getBaseName();
-
-	/**
-	 * Returns a localized message from a resource bundle.
-	 * 
-	 * @param msgCategory
-	 *            The baseName of the resource bundle (filename minus any locale suffix)
-	 * @param msgId
-	 *            The key of the message to lookup from the bundle.
-	 * @param msgArgs
-	 *            An array of arguments that will be substituted into any message arguments in the
-	 *            message's value.
-	 * @param locale
-	 *            The locale to retrieve the message text from.
-	 */
-	public String getMessage(String msgCategory, String msgId, String[] msgArgs, Locale locale) {
-		return J2EEValidationResourceHandler.getExternalizedMessage(msgCategory, msgId, getClass(), msgArgs, locale);
-	}
-
-	/**
-	 * Returns a localized message from a resource bundle.
-	 * 
-	 * @param msgCategory
-	 *            The baseName of the resource bundle (filename minus any locale suffix)
-	 * @param msgId
-	 *            The key of the message to lookup from the bundle.
-	 * @param locale
-	 *            The locale to retrieve the message text from.
-	 */
-	public String getMessage(String msgCategory, String msgId, Locale locale) {
-		return J2EEValidationResourceHandler.getExternalizedMessage(msgCategory, msgId, getClass(), locale);
-	}
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI. The ValidationBuilder
-	 * uses this string as input to the IProgressMonitor. i.e., At some point during the validation
-	 * process, the Validation Builder will output this string: "{0} is validating {1}.", where {0}
-	 * is the string that this method returns, and {1} is the name of the current resource.
-	 */
-	public String getName() {
-		return getName(Locale.getDefault());
-	}
-
-	/**
-	 * <p>
-	 * Returns the name of the Validator, as it should be displayed in the UI. The ValidationBuilder
-	 * uses this string as input to the IProgressMonitor. i.e., At some point during the validation
-	 * process, the Validation Builder will output this string:
-	 * </p>
-	 * 
-	 * <pre>
-	 *      &quot;{0} is validating {1}.&quot;,
-	 * </pre>
-	 * 
-	 * <p>
-	 * where
-	 * </p>
-	 * 
-	 * <pre>
-	 *      {0} is the string that this method returns,
-	 * </pre>
-	 * 
-	 * <p>
-	 * and
-	 * </p>
-	 * 
-	 * <pre>
-	 *      {1} is the name of the current resource.
-	 * </pre>
-	 * 
-	 * @param locale
-	 *            The locale from which to retrieve the name text.
-	 */
-
-	public String getName(Locale locale) {
-		return getMessage(getBaseName(), VALIDATOR_NAME, locale);
-	}
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI. The ValidationBuilder
-	 * uses this string as input to the IProgressMonitor. i.e., At some point during the validation
-	 * process, the Validation Builder will output this string: "{0} is validating {1}.", where {0}
-	 * is the string that this method returns, and {1} is the name of the current resource.
-	 */
-	public String[] getParam1(String string1) {
-		String[] parms = new String[1];
-		parms[0] = string1;
-		return parms;
-	}
-
-	protected void initialize() {
-		// Default
-	}
-
-	/**
-	 * This is the method which performs the validation on the MOF model. <br>
-	 * <br>
-	 * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
-	 * may be null, if a full build is desired. <br>
-	 * <br>
-	 * <code>helper</code> loads a EObject. The EObject is the root of the MOF model about to be
-	 * validated. When this object is traversed, you can reach every element in the MOF model which
-	 * needs to be validated. <br>
-	 * <br>
-	 * <code>reporter</code> is an instance of an IReporter interface, which is used for
-	 * interaction with the user. <br>
-	 * <br>
-	 * <code>changedFiles</code> is an array of file names which have changed since the last
-	 * validation. If <code>changedFiles</code> is null, or if it is an empty array, then a full
-	 * build is performed. Otherwise, validation on just the files listed in the Vector is
-	 * performed.
-	 */
-	
-	public void validate(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-		  _helper = inHelper;
-		  _reporter = inReporter;
-		  if ((inHelper == null) || (inReporter == null)) {
-			return;
-		  }		
-	}
-	
-	public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-
-		_helper = inHelper;
-		_reporter = inReporter;
-		status = OK_STATUS;
-		return status;
-	}
-
-	/**
-	 * Validate EJB references.
-	 */
-	protected void validateEJBRefManadatoryElements(EjbRef eref, String ownerName) {
-		String[] parms = new String[2];
-		parms[0] = eref.getName();
-		parms[1] = ownerName;
-
-		if ((eref.getName() == null) || (eref.getName().trim().length() == 0))
-			addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFNAME, parms, eref);
-		if (eref.isSetType()) {
-			if (eref.getType() == null)
-				addWarning(EREF_CATEGORY, ERROR_EAR_INVALID_EREFTYPE, parms);
-		} else
-			addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFTYPE, parms);
-
-		String refHome = eref.getHome();
-		if ((refHome == null) || (refHome.trim().length() == 0))
-			addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFHOME, parms, eref);
-
-		if ((eref.getRemote() == null) || (eref.getRemote().trim().length() == 0))
-			addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFREMOTE, parms, eref);
-	}
-
-	/**
-	 * Validate for duplicates in EAR Roles.
-	 */
-	protected void validateResourceRefs(List resourceRefs) {
-
-		int numRefs = resourceRefs.size();
-		Set refSet = new HashSet(numRefs);
-
-		for (int refNo = 0; refNo < numRefs; refNo++) {
-			String refName = ((ResourceRefImpl) (resourceRefs.get(refNo))).getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(refSet.add(refName)))
-				addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_RESREF, parms, resourceRefs.get(refNo));
-		}
-	}
-
-	/**
-	 * Validate the existance of Web Roles within the EAR Roles and duplicates in Web Roles.
-	 */
-	protected void validateWEBRolesWithEARRoles(EList earRoleList, EList warRoles) {
-		int numRoles = warRoles.size();
-
-		// TFB This implementation requires a 'small' list of warRoles.
-		// If 'warRoles' gets too big then another implementation
-		// will be necessary.
-
-		for (int roleNo = 0; roleNo < numRoles; roleNo++) {
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createErrorStatus(msg);
-			}
-			
-			SecurityRoleImpl nextRole = (SecurityRoleImpl) (warRoles.get(roleNo));
-			String[] parms = new String[1];
-			parms[0] = nextRole.getRoleName();
-			if (!(earRoleList.contains(nextRole)))
-				addWarning(WAR_CATEGORY, ERROR_EAR_MISSING_EJB_ROLE, parms, nextRole);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MessageDrivenBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MessageDrivenBeanClassVRule.java
deleted file mode 100644
index 8a24f775b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MessageDrivenBeanClassVRule.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class MessageDrivenBeanClassVRule extends ABeanClassVRule implements IEJBType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_MESSAGE_BEANCLASS;
-	private static final Object[] DEPENDS_ON = null;
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".mb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_MESSAGEDRIVENBEAN, JAVAX_JMS_MESSAGELISTENER};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final boolean SHOULD_VALIDATE_TRANSIENT_FIELD = false;
-	private final boolean SHOULD_BE_ABSTRACT = false;
-	private final int IS_REMOTE = NEITHER;
-	
-	private final boolean SHOULD_BE_FINAL = false;
-	private final boolean SHOULD_BE_PUBLIC = true;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{ONMESSAGE, CONSTRUCTOR_NOPARM, EJBCREATE_NOPARM, EJBREMOVE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{FINALIZE_NOPARM};
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, ONMESSAGE, CONSTRUCTOR_NOPARM, CONSTRUCTOR, EJBCREATE_NOPARM, EJBCREATE, EJBREMOVE_NOPARM, FINALIZE_NOPARM};
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_onMessage, new String[]{CHKJ2050_onMessage+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbCreate, new String[]{CHKJ2050_ejbCreate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_setEntityContext, new String[]{CHKJ2050_setEntityContext+EXT});
-		MESSAGE_IDS.put(CHKJ2050_unsetEntityContext, new String[]{CHKJ2050_unsetEntityContext+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbActivate, new String[]{CHKJ2050_ejbActivate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPassivate, new String[]{CHKJ2050_ejbPassivate+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbRemove, new String[]{CHKJ2050_ejbRemove+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbLoad, new String[]{CHKJ2050_ejbLoad+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbStore, new String[]{CHKJ2050_ejbStore+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103+SPEC});
-		MESSAGE_IDS.put(CHKJ2421, new String[]{CHKJ2421+BEXT, CHKJ2421+MEXT});
-		MESSAGE_IDS.put(CHKJ2422, new String[]{CHKJ2422+BEXT, CHKJ2422+MEXT});
-		MESSAGE_IDS.put(CHKJ2423, new String[]{CHKJ2423+BEXT, CHKJ2423+MEXT});
-		MESSAGE_IDS.put(CHKJ2424, new String[]{CHKJ2424+BEXT, CHKJ2424+MEXT});
-		MESSAGE_IDS.put(CHKJ2426, new String[]{CHKJ2426+BEXT, CHKJ2426+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2427, new String[]{CHKJ2427+BEXT, CHKJ2427+MEXT});
-		MESSAGE_IDS.put(CHKJ2428, new String[]{CHKJ2428+BEXT, CHKJ2428+MEXT});
-		MESSAGE_IDS.put(CHKJ2431, new String[]{CHKJ2431+BEXT, CHKJ2431+MEXT});
-		MESSAGE_IDS.put(CHKJ2439, new String[]{CHKJ2439+BEXT, CHKJ2439+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2445, new String[]{CHKJ2445+BEXT, CHKJ2445+MEXT});
-		MESSAGE_IDS.put(CHKJ2446, new String[]{CHKJ2446+BEXT, CHKJ2446+MEXT});
-		MESSAGE_IDS.put(CHKJ2447, new String[]{CHKJ2447+BEXT, CHKJ2447+MEXT});
-		MESSAGE_IDS.put(CHKJ2501_ejbCreate, new String[]{CHKJ2501_ejbCreate+BEXT, CHKJ2501_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2501_ejbRemove, new String[]{CHKJ2501_ejbRemove+BEXT, CHKJ2501_ejbRemove+MEXT});
-		MESSAGE_IDS.put(CHKJ2501_onMessage, new String[]{CHKJ2501_onMessage+BEXT, CHKJ2501_onMessage+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2492, new String[]{CHKJ2492+BEXT, CHKJ2492+MEXT});
-		MESSAGE_IDS.put(CHKJ2493, new String[]{CHKJ2493+BEXT, CHKJ2493+MEXT});
-		MESSAGE_IDS.put(CHKJ2494, new String[]{CHKJ2494+BEXT, CHKJ2494+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2502_finalize, new String[]{CHKJ2502_finalize+BEXT, CHKJ2502_finalize+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_onMessage, new String[]{CHKJ2503_onMessage+BEXT, CHKJ2503_onMessage+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2505_ejbRemove, new String[]{CHKJ2505_ejbRemove+BEXT, CHKJ2505_ejbRemove+MEXT});
-		MESSAGE_IDS.put(CHKJ2505_onMessage, new String[]{CHKJ2505_onMessage+BEXT, CHKJ2505_onMessage+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final boolean shouldValidateTransientField() {
-		return SHOULD_VALIDATE_TRANSIENT_FIELD;
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final boolean followEjbCreateReturnTypeRules(EnterpriseBean bean, Method method) {
-		return method.isVoid();
-	}
-
-	public final boolean shouldBeAbstract(JavaClass clazz) {
-		return SHOULD_BE_ABSTRACT;
-	}
-	
-	public final boolean shouldBeFinal(JavaClass clazz) {
-		return SHOULD_BE_FINAL;
-	}
-	
-	public final boolean shouldBePublic(JavaClass clazz) {
-		return SHOULD_BE_PUBLIC;
-	}
-	
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final JavaHelpers getEjbCreateReturnType(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ValidationRuleUtility.getType(ITypeConstants.VOID, bean);
-	}
-	
-	public final String getEjbCreateReturnTypeName(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ITypeConstants.VOID;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	public final void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & ONMESSAGE) == ONMESSAGE) {
-			validateOnMessageMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & EJBCREATE) == EJBCREATE) {
-			validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			validateEjbRemoveMethod(vc, bean, clazz, method);
-		}
-		else {
-			// Method isn't supposed to be here. Let the validateMethodsWhichMustNotExist
-			// take care of it.
-		}
-	}
-	
-	public String getMatchingHomeMethodName(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		return getNoMatchingMethodName(vc, method);
-	}
-
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		
-		if(ValidationRuleUtility.throwsApplicationException(method, bean)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2501_ejbCreate, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void validateEjbRemoveMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validateEjbRemoveMethod(vc, bean, clazz, method);
-		
-		if(ValidationRuleUtility.throwsApplicationException(method, bean)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2501_ejbRemove, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-
-	public boolean validateEjbCreateMethodExceptions() {
-		// Don't check for CreateException
-		return false;
-	}
-	
-	/**
-	 * @param vc
-	 * @param bean
-	 * @param clazz
-	 * @throws InvalidInputException
-	 */
-	protected void validateShouldBeSuperTypes(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		if((bean.getVersionID() == J2EEVersionConstants.EJB_2_0_ID) || (bean.getVersionID() == J2EEVersionConstants.EJB_2_1_ID)){		
-			JavaClass jclass = ((MessageDriven)bean).getMessagingType();
-			if( jclass != null ){
-				if (jclass.getQualifiedName().equals(ITypeConstants.CLASSNAME_JAVAX_JMS_MESSAGELISTENER)){
-					super.validateShouldBeSuperTypes(vc,bean,clazz);
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.model.validation.ejb.ejb20rules.impl.ATypeVRule#validateMethodsWhichMustExist(org.eclipse.jst.j2ee.internal.model.validation.IValidationContext, org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean, org.eclipse.jem.java.JavaClass)
-     */
-    public void validateMethodsWhichMustExist(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException,
-            ValidationCancelledException, ValidationException {
-    	if((bean.getVersionID() == J2EEVersionConstants.EJB_2_0_ID) || (bean.getVersionID() == J2EEVersionConstants.EJB_2_1_ID)){		
-			JavaClass jclass = ((MessageDriven)bean).getMessagingType();
-			if( jclass != null ){
-				if (jclass.getQualifiedName().equals(ITypeConstants.CLASSNAME_JAVAX_JMS_MESSAGELISTENER)){
-				    super.validateMethodsWhichMustExist(vc, bean, clazz);
-				}
-			}
-		}
-      
-    }
-	public void validateOnMessageMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// IWAD4396 = This method must be public. Read section 15.7.4 of the EJB 2.0 specification.
-		if(!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2445, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4397 = This method must not be final. Read section 15.7.4 of the EJB 2.0 specification.
-		if(method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2446, IEJBValidationContext.WARNING, bean, clazz, method, this);		
-			vc.addMessage(message);
-		}
-		
-		// IWAD4398 = This method must not be static. Read section 15.7.4 of the EJB 2.0 specification.
-		if(method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2447, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		// IWAD4399 = This method must return void. Read section 15.7.4 of the EJB 2.0 specification.
-		// IWAD4400 = This method must not throw application exceptions. Read section 15.7.4 of the EJB 2.0 specification.
-		if(!method.isVoid()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2505_onMessage, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(ValidationRuleUtility.throwsApplicationException(method, bean)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2501_onMessage, IEJBValidationContext.INFO, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		
-		if(!followRemoteExceptionRules(bean, method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2503_onMessage, IEJBValidationContext.WARNING, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MessageUtility.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MessageUtility.java
deleted file mode 100644
index 4ae32f131..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MessageUtility.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class MessageUtility {
-	public static final String NO_MESSAGE_ID = ""; //$NON-NLS-1$
-	
-	private static MessageUtility inst = null;
-
-	private MessageUtility() {
-		//Default
-	}
-	
-	public static MessageUtility getUtility() {
-		if(inst == null) {
-			inst = new MessageUtility();
-		}
-		return inst;
-	}
-	
-	public static String getGroupName(Object targetParent) {
-		if(targetParent == null) {
-			// No context to associate the message with
-			return null;
-		}
-		
-		// So far, the only target parent which is used as a group name is the EnterpriseBean
-		if(targetParent instanceof EnterpriseBean) {
-			EnterpriseBean bean = (EnterpriseBean)targetParent;
-			if(bean == null) {
-				return null;
-			}
-			
-			if(bean.getName() != null) {
-				return bean.getName();
-			}
-			return ((XMIResource)bean.eResource()).getID(bean);
-		}
-		
-		return null;
-	}
-	
-	protected String getMessageId(Object messageNumber, EnterpriseBean bean, IValidationRule rule) {
-		if(messageNumber == null) {
-			return NO_MESSAGE_ID;
-		}
-		
-		Map ids = rule.getMessageIds();
-		if((ids == null) || (ids.size() == 0)) {
-			return messageNumber.toString();
-		}
-		
-		int index = -1;
-
-		String[] result = (String[])ids.get(messageNumber);
-		if(result == null) {
-			return messageNumber.toString();
-		}
-		else if(result.length == 1) {
-			if(result[0].equals("")) { //$NON-NLS-1$
-				return messageNumber.toString();
-			}
-			return result[0];
-		}
-		else {
-			// By convention, this is the order of the entries in the String[]
-			if(bean.isSession()) {
-				index = 0;
-			}
-			else if(bean.isContainerManagedEntity()) {
-				index = 1;
-			}
-			else if(bean.isBeanManagedEntity()) {
-				index = 2;
-			}
-			else if(bean.isMessageDriven()) {
-				index = 3;
-			}
-			else {
-				// what the heck is it?
-				return messageNumber.toString();
-			}
-	
-			if((result.length <= index) || (result[index].equals(""))) { //$NON-NLS-1$
-				return messageNumber.toString();
-			}
-			
-			return result[index];
-		}
-	}
-	
-	/*
-	 * Use this method when the message is not registered on a method.
-	 */	
-	protected String getMessageId(Object messageNumber, IValidationRule rule) {
-		if(messageNumber == null) {
-			return NO_MESSAGE_ID;
-		}
-		
-		Map ids = rule.getMessageIds();
-		if((ids == null) || (ids.size() == 0)) {
-			return messageNumber.toString();
-		}
-		
-		String[] result = (String[])ids.get(messageNumber);
-		if((result == null) || (result.length == 0) || (result[0].equals(""))) { //$NON-NLS-1$
-			return messageNumber.toString();
-		}
-		return result[0];
-	}
-	
-	/*
-	 * Use this method when the message is registered on a method.
-	 */
-	protected String getMessageId(Object messageNumber, IValidationRule rule, boolean isMethodOnClass) {
-		if(messageNumber == null) {
-			return NO_MESSAGE_ID;
-		}
-		
-		Map ids = rule.getMessageIds();
-		if((ids == null) || (ids.size() == 0)) {
-			return messageNumber.toString();
-		}
-		
-		String[] messages = (String[])ids.get(messageNumber);
-		String result = null;
-		if(messages != null) {
-			if(isMethodOnClass && messages.length == 2) {
-				result = messages[1];
-			}
-			else if (messages.length >= 1) {
-				result = messages[0];
-			}
-		}
-		
-		if((result == null) || (result.equals(""))) { //$NON-NLS-1$
-			return messageNumber.toString();
-		}
-		
-		return result;
-	}
-	
-	protected IMessage getMessage(IEJBValidationContext vc, int severity, String id, String[] parms, Object target, String groupName) {
-		IMessage message = vc.getMessage();
-		message.setSeverity(severity);
-		message.setId(id);
-		message.setParams(parms);
-		message.setTargetObject(target);
-		message.setGroupName(groupName);
-		return message;
-	}
-	
-	/** 
-	 * For use only by the DD VRules.
-	 */
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EJBJar target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, SecurityRole target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, SecurityRoleRef target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, MethodElement target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, MethodTransaction target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, MethodPermission target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EJBRelationshipRole target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, CommonRelationshipRole target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EJBRelation target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, AssemblyDescriptor target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, null);
-	}
-
-	/** 
-	 * For use only by the DD VRules.
-	 */
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EJBJar target, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, parms, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, MethodElement target, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, parms, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EJBRelationshipRole target, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, parms, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, SecurityRoleRef target, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, parms, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EJBRelation target, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, parms, target, null);
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, Object target, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, target, getGroupName(bean));
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, Object target, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, parms, target, getGroupName(bean));
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, IValidationRule rule) {
-		String id = getMessageId(messageNumber, bean, rule);
-		return getMessage(vc, severity, id, null, bean, getGroupName(bean));
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, String[] parms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, bean, rule);
-		return getMessage(vc, severity, id, parms, bean, getGroupName(bean));
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, JavaClass clazz, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, null, clazz, getGroupName(bean));
-	}
-
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, JavaClass clazz, String[] additionalParms, IValidationRule rule) {
-		String id = getMessageId(messageNumber, rule);
-		return getMessage(vc, severity, id, additionalParms, clazz, getGroupName(bean));
-	}
-	
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, JavaClass clazz, Method method, IValidationRule rule) {
-		if(method == null) {
-			return getMessage(vc, messageNumber, severity, bean, clazz, rule);
-		}
-		
-		return getMessage(vc, messageNumber, severity, null, clazz, method, method.getMethodElementSignature(), ValidationRuleUtility.onClass(clazz, method), getGroupName(bean), rule);
-	}
-		
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, JavaClass clazz, Method method, String[] additionalParms, IValidationRule rule) {
-		if(method == null) {
-			return getMessage(vc, messageNumber, severity, bean, clazz, additionalParms, rule);
-		}
-		
-		return getMessage(vc, messageNumber, severity, additionalParms, clazz, method, method.getMethodElementSignature(), ValidationRuleUtility.onClass(clazz, method), getGroupName(bean), rule);
-	}
-		
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, JavaClass clazz, Field field, IValidationRule rule) {
-		if(field == null) {
-			return getMessage(vc, messageNumber, severity, bean, clazz, rule);
-		}
-		
-		return getMessage(vc, messageNumber, severity, null, clazz, field, field.getName(), ValidationRuleUtility.onClass(clazz, field), getGroupName(bean), rule);
-	}
-		
-	public IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, EnterpriseBean bean, JavaClass clazz, Field field, String[] additionalParms, IValidationRule rule) {
-		if(field == null) {
-			return getMessage(vc, messageNumber, severity, bean, clazz, additionalParms, rule);
-		}
-		
-		return getMessage(vc, messageNumber, severity, additionalParms, clazz, field, field.getName(), ValidationRuleUtility.onClass(clazz, field), getGroupName(bean), rule);
-	}
-	
-	protected IMessage getMessage(IEJBValidationContext vc, Object messageNumber, int severity, String[] additionalParms, JavaClass clazz, EObject fieldOrMethod, String fieldOrMethodName, boolean isMethodOnClass, String groupName, IValidationRule rule) {
-		if(fieldOrMethod == null) {
-			String id = getMessageId(messageNumber, rule);
-			return getMessage(vc, severity, id, additionalParms, clazz, groupName);
-		}
-		
-		String[] parms = null;
-		EObject target = null;
-		if(isMethodOnClass) {
-			// leave parms null since no parms are needed
-			target = fieldOrMethod;
-			parms = additionalParms;
-		}
-		else {
-			if(additionalParms == null) {
-				parms = new String[]{fieldOrMethodName};
-			}
-			else {
-				parms = new String[additionalParms.length + 1];
-				parms[0] = fieldOrMethodName;
-				System.arraycopy(additionalParms, 0, parms, 1, additionalParms.length);
-			}
-			target = clazz;
-		}
-
-		String id = getMessageId(messageNumber, rule, isMethodOnClass);
-		return getMessage(vc, severity, id, parms, target, groupName);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MethodUtility.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MethodUtility.java
deleted file mode 100644
index 85408bd36..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/MethodUtility.java
+++ /dev/null
@@ -1,2149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-
-
-public final class MethodUtility {
-	private static MethodUtility _inst = null;
-	private long[] _methodTypeIndex;
-	private IMethodType[] _methodTypes;
-	private long[] _fieldTypeIndex;
-	private IFieldType[] _fieldTypes;
-	
-	private MethodUtility() {
-		buildTypeList();
-	}
-	
-	public static MethodUtility getUtility() {
-		if(_inst == null) {
-			_inst = new MethodUtility();
-		}
-		return _inst;
-	}
-	
-	protected IMethodType[] getMethodTypes() {
-		return _methodTypes;
-	}
-
-	public IFieldType getFieldType(long type) {
-		int index = Arrays.binarySearch(_fieldTypeIndex, type);
-		if(index > _fieldTypes.length) {
-			return null;
-		}
-		
-		if(index < 0) {
-			return null;
-		}
-		
-		if(_fieldTypes[index].getId() != type) {
-			return null;
-		}
-		
-		return _fieldTypes[index];
-	}
-
-	public IMethodType getMethodType(long type) {
-		int index = Arrays.binarySearch(_methodTypeIndex, type);
-		if(index > _methodTypes.length) {
-			return null;
-		}
-		
-		if(index < 0) {
-			return null;
-		}
-		
-		if(_methodTypes[index].getId() != type) {
-			return null;
-		}
-		
-		return _methodTypes[index];
-	}
-	
-	public long getMethodTypeId(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists, IEJBType rule) {
-		IMethodType mType = getMethodType(bean, clazz, method, methodsExtendedLists, rule);
-		if(mType == null) {
-			return rule.getDefaultMethodType();
-		}
-		
-		return mType.getId();
-	}
-
-	public long getFieldTypeId(EnterpriseBean bean, JavaClass clazz, Field field, IEJBType rule) {
-		IFieldType mType = getFieldType(bean, clazz, field, rule);
-		if(mType == null) {
-			return IMethodAndFieldConstants.EXCLUDED_FIELD;
-		}
-		
-		return mType.getId();
-	}
-	
-	public IFieldType getFieldType(EnterpriseBean bean, JavaClass clazz, Field field, IEJBType rule) {
-		IFieldType[] knownFieldTypes = _fieldTypes;
-		if(knownFieldTypes == null) {
-			return null;
-		}
-		
-		for(int i=0; i<knownFieldTypes.length; i++) {
-			IFieldType mt = knownFieldTypes[i];
-			if(mt == null) {
-				continue;
-			}
-			
-			if(mt.isFieldType(bean, clazz, field)) {
-				return mt;
-			}
-		}
-		
-		// If it's not one of the recognized methods, which dynamically-named
-		// method type is it?
-		return null;
-	}
-	
-	public IMethodType getMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists, IEJBType rule) {
-		long[] knownMethodTypes = rule.getKnownMethodTypes();
-		if(knownMethodTypes == null) {
-			return null;
-		}
-		
-		for(int i=0; i<knownMethodTypes.length; i++) {
-			IMethodType mt = getMethodType(knownMethodTypes[i]);
-			if(mt == null) {
-				continue;
-			}
-			
-			if(mt.isDefaultType()) {
-				continue;
-			}
-			
-			if(mt.isMethodType(bean, clazz, method, methodsExtendedLists)) {
-				return mt;
-			}
-		}
-		
-		// If it's not one of the recognized methods, which dynamically-named
-		// method type is it?
-		return getMethodType(rule.getDefaultMethodType());
-	}
-	
-	private void buildTypeList() {
-		int typeCount = 29; // This is the number of identifiable methods in IMethodAndFieldConstants
-		_methodTypeIndex = new long[typeCount];
-		_methodTypes = new IMethodType[typeCount];
-		int count = 0;
-		
-		int fieldTypeCount = 1; // This is the number of identifiable fields in IMethodAndFieldConstants
-		_fieldTypeIndex = new long[fieldTypeCount];
-		_fieldTypes = new IFieldType[fieldTypeCount];
-		int fieldCount = 0;
-		
-		// The index of the type in the long[] is equal to the
-		// index of the IMethodType in the IMethodType[]. By using
-		// this technique instead of a HashMap, we don't need to
-		// create an Integer every time we need to locate the 
-		// IMethodType.
-		_methodTypeIndex[count] = IMethodAndFieldConstants.ACCESSOR;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.ACCESSOR;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return ""; // this method will never be called //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_acc;
-			}
-			
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method exists
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ACCESSOR::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ACCESSOR::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ACCESSOR::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ACCESSOR::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				return false;
-			}
-			
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-		
-		_methodTypeIndex[count] = IMethodAndFieldConstants.BUSINESS;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.BUSINESS;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				if(method == null) {
-					return ""; //$NON-NLS-1$
-				}
-				return method.getName();
-			}
-			
-			public String getMessageId_messageMissing() {
-				// Never check to see if a business method is missing
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "BUSINESS::getMessageId_messageMissing"; //$NON-NLS-1$
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if a business method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "BUSINESS::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_bus;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2504_business;
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_business;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				// It's a business method if it's exposed on the component interface.
-				// HACK ... depends on the fact that ABeanClassVRule, and its subtypes, are the only classes that will ever have a BUSINESS method.
-				if(ValidationRuleUtility.getMethod(method, method.getName(), ABeanClassVRule.getRemoteComponentMethodsExtended(methodsExtendedLists)) != null) {
-					return true;
-				}
-				
-				if(ValidationRuleUtility.getMethod(method, method.getName(), ABeanClassVRule.getRemoteComponentMethodsExtended(methodsExtendedLists)) != null) {
-					return true;
-				}
-				
-				// internal helper method
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-		
-		_methodTypeIndex[count] = IMethodAndFieldConstants.CLINIT;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.CLINIT;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "clinit"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				// Never check to see if <clinit> is missing
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CLINIT::getMessageId_messageMissing"; //$NON-NLS-1$
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CLINIT::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CLINIT::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CLINIT::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CLINIT::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals("<clinit>")) { //$NON-NLS-1$
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-		
-		// Be careful to keep the order of these declarations the same as they are in 
-		// IMethodAndFieldConstants. Each method type is an ascending number, and if they
-		// go out of order, the binary search can't find the method type.
-		_methodTypeIndex[count] = IMethodAndFieldConstants.CONSTRUCTOR;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.CONSTRUCTOR;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return clazz.getName();
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_constr;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.isConstructor()) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.CONSTRUCTOR_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.CONSTRUCTOR_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return clazz.getName() + "()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_constr;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR_NOPARM::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR_NOPARM::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR_NOPARM::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CONSTRUCTOR_NOPARM::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.isConstructor()) {
-					// This class must define a public constructor which takes no parameters. Read section 7.10.1 of the EJB 2.0 specification.
-					if(ValidationRuleUtility.isPublic(method)) {
-						if(method.getParameters().size() == 0) {
-							return true;
-						}
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.CREATE;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.CREATE;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "create"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_create;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CREATE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_create;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2504_create;
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_create;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_CREATE)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-		
-		_methodTypeIndex[count] = IMethodAndFieldConstants.CREATE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.CREATE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "create()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_create;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "CREATE_NOPARM::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_create;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				return IMessagePrefixEjb20Constants.CHKJ2504_create;
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_create;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_CREATE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-		
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBACTIVATE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBACTIVATE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbActivate()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbActivate;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBACTIVATE_NOPARM::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBACTIVATE_NOPARM::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBACTIVATE_NOPARM::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBACTIVATE_NOPARM::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBACTIVATE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBCREATE;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBCREATE;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbCreate"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbCreate;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBCREATE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_ejbCreate;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBCREATE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_ejbCreate;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_EJBCREATE)) {
-					return true;
-				}
-		
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBCREATE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBCREATE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbCreate()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbCreate;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBCREATE_NOPARM::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_ejbCreate;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBCREATE_NOPARM::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBCREATE_NOPARM::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_EJBCREATE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBFIND;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBFIND;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				if(method == null) {
-					return "ejbFind"; //$NON-NLS-1$
-				}
-				return method.getName();
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbFind;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-				return IMessagePrefixEjb20Constants.CHKJ2502_ejbFind;
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_ejbFind;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBFIND::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_ejbFind;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_EJBFIND)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBFINDBYPRIMARYKEY;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBFINDBYPRIMARYKEY;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				StringBuffer buffer = new StringBuffer("ejbFindByPrimaryKey("); //$NON-NLS-1$
-				String pkName = ""; //$NON-NLS-1$
-				if(bean instanceof Entity) {
-					JavaClass pk = ((Entity)bean).getPrimaryKey();
-					pkName = ((pk == null) ? IEJBValidatorConstants.NULL_PRIMARY_KEY : pk.getQualifiedName());
-				}
-				buffer.append(pkName);
-				buffer.append(")"); //$NON-NLS-1$
-				return buffer.toString();
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbFindByPrimaryKey;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBFINDBYPRIMARYKEY::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_ejbFind;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBFINDBYPRIMARYKEY::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBFINDBYPRIMARYKEY::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_EJBFIND)) {
-					if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBFINDBYPRIMARYKEY)) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBHOME;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBHOME;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				if(method == null) {
-					return "ejbHome"; //$NON-NLS-1$
-				}
-				return method.getName();
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbHome;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBHOME::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_ejbHome;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBHOME::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_ejbHome;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_EJBHOME)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBLOAD_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBLOAD_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbLoad()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbLoad;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBLOAD::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBLOAD::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBLOAD::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBLOAD::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBLOAD)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBPASSIVATE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBPASSIVATE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbPassivate()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbPassivate;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPASSIVATE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPASSIVATE::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPASSIVATE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPASSIVATE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBPASSIVATE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBPOSTCREATE;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBPOSTCREATE;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbPostCreate"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				// Can only dynamically check if ejbPostCreate is missing, 
-				// based on what type of ejbCreate methods exist.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPOSTCREATE::getMessageId_messageMissing"; //$NON-NLS-1$
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPOSTCREATE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				return IMessagePrefixEjb20Constants.CHKJ2503_ejbPostCreate;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPOSTCREATE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBPOSTCREATE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_EJBPOSTCREATE)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBREMOVE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBREMOVE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbRemove()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbRemove;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBREMOVE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBREMOVE::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBREMOVE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBREMOVE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBREMOVE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBSELECT;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBSELECT;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				if(method == null) {
-					return "ejbSelect"; //$NON-NLS-1$
-				}
-				return method.getName();
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbSelect;
-			}
-	
-			public String getMessageId_messageExists() {
-				return IMessagePrefixEjb20Constants.CHKJ2502_ejbSelect;
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSELECT::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSELECT::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSELECT::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_EJBSELECT)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EJBSTORE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EJBSTORE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "ejbStore()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_ejbStore;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSTORE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSTORE::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSTORE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EJBSTORE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_EJBSTORE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.EQUALS;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.EQUALS;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "equals(Object)"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_equals;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EQUALS::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EQUALS::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EQUALS::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "EQUALS::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_EQUALS)) {
-					JavaParameter[] parm = method.listParametersWithoutReturn();
-					if(parm.length == 1) {
-						try {
-							JavaHelpers object = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, bean);
-							JavaHelpers parmType = parm[0].getJavaType();
-							
-							if(object.equals(parmType)) {
-								return true;
-							}
-						}
-						catch(InvalidInputException e) {
-							return false;
-						}
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.FIND;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.FIND;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				if(method == null) {
-					return "find"; //$NON-NLS-1$
-				}
-				return method.getName();
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_find;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "FIND::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_find;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				return IMessagePrefixEjb20Constants.CHKJ2504_find;
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_find;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_FIND)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.FINDBYPRIMARYKEY;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.FINDBYPRIMARYKEY;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "findByPrimaryKey"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_findByPrimaryKey;
-			}
-	
-			public String getMessageId_messageExists() {
-				return IMessagePrefixEjb20Constants.CHKJ2500_find;
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_find;
-			} 
-			
-			public String getMessageId_messageMissingMatching() {
-				return IMessagePrefixEjb20Constants.CHKJ2504_find;
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				return IMessagePrefixEjb20Constants.CHKJ2500_find;
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().startsWith(IMethodAndFieldConstants.PREFIX_FIND)) {
-					if(method.getName().startsWith(IMethodAndFieldConstants.METHODNAME_FINDBYPRIMARYKEY)) {
-						return true;
-					}
-				}
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.FINALIZE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.FINALIZE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "finalize()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				// Never check to see if finalize is missing
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "FINALIZE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-				return IMessagePrefixEjb20Constants.CHKJ2502_finalize;
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "FINALIZE::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "FINALIZE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "FINALIZE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_FINALIZE)) {
-					if(method.listParametersWithoutReturn().length ==0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.HASHCODE_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.HASHCODE_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "hashCode()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_hashCode;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "HASHCODE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "HASHCODE::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "HASHCODE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "HASHCODE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_HASHCODE)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-		
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.HOME;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.HOME;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "home"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_home;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "HOME::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-				return IMessagePrefixEjb20Constants.CHKJ2503_home;
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				return IMessagePrefixEjb20Constants.CHKJ2504_home;
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-				return IMessagePrefixEjb20Constants.CHKJ2500_home;
-			}
-			
-			public boolean isDefaultType() {
-				return true;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				return true;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.ONMESSAGE;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.ONMESSAGE;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "onMessage"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_onMessage;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ONMESSAGE::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ONMESSAGE::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ONMESSAGE::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "ONMESSAGE::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_ONMESSAGE)) {
-					JavaParameter[] parms = method.listParametersWithoutReturn();
-					if(parms.length == 1) {
-						try {
-							JavaHelpers jmsMessage = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_JMS_MESSAGE, bean);
-							JavaHelpers parmType = parms[0].getJavaType();
-							
-							if(jmsMessage.equals(parmType)) {
-								return true;
-							}
-						}
-						catch(InvalidInputException e) {
-							return false;
-						}
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.SETENTITYCONTEXT;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.SETENTITYCONTEXT;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "setEntityContext"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_setEntityContext;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "SETENTITYCONTEXT::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "SETENTITYCONTEXT::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "SETENTITYCONTEXT::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "SETENTITYCONTEXT::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_SETENTITYCONTEXT)) {
-					JavaParameter[] parm = method.listParametersWithoutReturn();
-					if(parm.length == 1) {
-						try {
-							JavaHelpers entityContext = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_ENTITYCONTEXT, bean);
-							JavaHelpers parmType = parm[0].getJavaType();
-							
-							if(entityContext.equals(parmType)) {
-								return true;
-							}
-						}
-						catch(InvalidInputException e) {
-							return false;
-						}
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_methodTypeIndex[count] = IMethodAndFieldConstants.UNSETENTITYCONTEXT_NOPARM;
-		_methodTypes[count++] = new IMethodType() {
-			public long getId() {
-				return IMethodAndFieldConstants.UNSETENTITYCONTEXT_NOPARM;
-			}
-			
-			public String getMethodName(EnterpriseBean bean, JavaClass clazz, Method method) {
-				return "unsetEntityContext()"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissing() {
-				return IMessagePrefixEjb20Constants.CHKJ2050_unsetEntityContext;
-			}
-	
-			public String getMessageId_messageExists() {
-				// Never statically check to see if this method is present
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "UNSETENTITYCONTEXT::getMessageId_messageExists"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRemoteException() {
-				// Don't need to know if this method throws a RemoteException.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "UNSETENTITYCONTEXT::getMessageId_messageRemoteException"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageMissingMatching() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "UNSETENTITYCONTEXT::getMessageId_messageMissingMatching"; //$NON-NLS-1$
-			}
-			
-			public String getMessageId_messageRMI_IIOPParm() {
-				// This method doesn't need a matching method.
-//				return NO_MESSAGE_PREFIX;
-				// Because it's difficult to find out which method has been called unexpectedly,
-				// instead of returning the same string for all NO_MESSAGE_PREFIX cases,
-				// instead return a message id which uniquely identifies which method was called.
-				return "UNSETENTITYCONTEXT::getMessageId_messageRMI_IIOPParm"; //$NON-NLS-1$
-			}
-			
-			public boolean isDefaultType() {
-				return false;
-			}
-	
-			public boolean isMethodType(EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-				if(method == null) {
-					return false;
-				}
-				
-				if(method.getName().equals(IMethodAndFieldConstants.METHODNAME_UNSETENTITYCONTEXT)) {
-					if(method.listParametersWithoutReturn().length == 0) {
-						return true;
-					}
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-		_fieldTypeIndex[fieldCount] = IMethodAndFieldConstants.SERIALVERSIONUID;
-		_fieldTypes[fieldCount++] = new IFieldType() {
-			public long getId() {
-				return IMethodAndFieldConstants.SERIALVERSIONUID;
-			}
-			
-			public boolean isFieldType(EnterpriseBean bean, JavaClass clazz, Field field) {
-				if(field == null) {
-					return false;
-				}
-				
-				if(field.getName().equals(IMethodAndFieldConstants.FIELDNAME_SERIALVERSIONUID)) {
-					return true;
-				}
-				
-				return false;
-			}
-
-			public String toString() {
-				return String.valueOf(getId());
-			}
-		};
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/RoleHelper.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/RoleHelper.java
deleted file mode 100644
index aa446a876..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/RoleHelper.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-
-
-/**
- * This class is a copy of org.eclipse.jst.j2ee.internal.ejb.codegen.helpers.RoleHelper.
- * org.eclipse.jst.j2ee.internal.ejb.codegen.helpers.RoleHelper cannot be used
- * directly by the EJB Validator (to calculate role method names) because
- * it uses classes which are not used by WebSphere. Until the long-term
- * fix can be put in, this class will be used.
- */
-public class RoleHelper {
-	static final String KEY_GETTER_NAME_PATTERN = "get{0}Key";//$NON-NLS-1$
-	static final String KEY_SETTER_NAME_PATTERN = "privateSet{0}Key";//$NON-NLS-1$
-	static final String LINK_GETTER_NAME_PATTERN = "get{0}Link";//$NON-NLS-1$
-	static final String ADD_NAME_PREFIX = "add";//$NON-NLS-1$
-	static final String GETTER_NAME_PREFIX = "get"; //$NON-NLS-1$
-	static final String REMOVE_NAME_PREFIX = "remove";//$NON-NLS-1$
-	static final String SECONDARY_ADD_NAME_PREFIX = "secondaryAdd";//$NON-NLS-1$
-	static final String SECONDARY_REMOVE_NAME_PREFIX = "secondaryRemove";//$NON-NLS-1$
-	static final String SECONDARY_SETTER_NAME_PREFIX = "secondarySet";//$NON-NLS-1$
-	static final String SETTER_NAME_PREFIX = "set"; //$NON-NLS-1$
-	protected EjbModuleExtensionHelper modHelper;
-/**
- * RoleHelper constructor comment.
- */
-public RoleHelper() {
-	super();
-}
-/**
- * Collect the names of the methods that were added to the bean class
- * for a particular role.
- */
-public static void collectRoleMethodNames(CommonRelationshipRole aRole, List aList) {
-	if (aRole == null || aList == null) return;
-	aList.add(getLinkGetterName(aRole));
-	if (aRole.isForward()) {
-		aList.add(getKeyGetterName(aRole));
-		aList.add(getKeySetterName(aRole));
-	}
-	if (aRole.isNavigable())
-		aList.add(getGetterName(aRole));
-	if (!isMany(aRole)) {
-		try {
-			if(aRole.getOppositeAsCommonRole() != null) {
-				if (!aRole.getOppositeAsCommonRole().isKey())
-					aList.add(getSetterName(aRole));
-				if (!aRole.isKey()) {
-					aList.add(getSecondarySetterName(aRole));
-				}
-			}
-		}
-		catch(NullPointerException exc) {
-			// If a NullPointerException is caught, assume that the role isn't a key.
-			// Just continue.
-		}
-	} else {
-		aList.add(getSecondaryAddName(aRole));
-		aList.add(getSecondaryRemoveName(aRole));
-		if (aRole.isNavigable()) {
-			try {
-				if(aRole.getOppositeAsCommonRole() != null) {
-					if (!aRole.getOppositeAsCommonRole().isKey()) {
-						aList.add(getAddName(aRole));
-					}
-				}
-			}
-			catch(NullPointerException exc) {
-				// If a NullPointerException is thrown, just assume that the opposite isn't a key.
-			}
-			if (aRole.getOppositeAsCommonRole() != null && !aRole.getOppositeAsCommonRole().isRequired())
-				aList.add(getRemoveName(aRole));
-		}
-	}
-}
-/**
- * Return aString where the first character is uppercased.
- */
-public static final String firstAsUppercase(String aString) {
-	if (aString != null && aString.length() >0 && !Character.isUpperCase(aString.charAt(0))) {
-		char[] chars = aString.toCharArray();
-		chars[0] = Character.toUpperCase(chars[0]);
-		return String.valueOf(chars);
-	}
-	return aString;
-}
-protected static String format(String pattern, String[] replacements) {
-	return java.text.MessageFormat.format(pattern, replacements);
-}
-/**
- * Return the add method name for @aRole.
- * It will be in the format "add{aRole name}".
- * For example, a role named "department" would return
- * addDepartment.
- */
-public static String getAddName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return ADD_NAME_PREFIX + arg;
-}
-/**
- * Return the getter method name for @aRole.
- * It will be in the format "get{aRole name}".
- * For example, a role named "department" would return
- * getDepartment.
- */
-public static String getGetterName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return GETTER_NAME_PREFIX + arg;
-}
-/**
- * Return the key getter method name for @aRole.
- * It will be in the format "get{aRole name}Key".
- * For example, a role named "department" would return
- * getDepartmentKey.
- */
-public static String getKeyGetterName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return format(KEY_GETTER_NAME_PATTERN, new String[]{arg});
-}
-/**
- * Return the key setter method name for @aRole.
- * It will be in the format "privateSet{aRole name}Key".
- * For example, a role named "department" would return
- * privateSetDepartmentKey.
- */
-public static String getKeySetterName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return format(KEY_SETTER_NAME_PATTERN, new String[]{arg});
-}
-/**
- * Return the link getter method name for @aRole.
- * It will be in the format "get{aRole name}Link".
- * For example, a role named "department" would return
- * getDepartmentLink.
- */
-public static String getLinkGetterName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return format(LINK_GETTER_NAME_PATTERN, new String[]{arg});
-}
-/**
- * Return the remove method name for @aRole.
- * It will be in the format "remove{aRole name}".
- * For example, a role named "department" would return
- * removeDepartment.
- */
-public static String getRemoveName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return REMOVE_NAME_PREFIX + arg;
-}
-/**
- * Return the secondary add method name for @aRole.
- * It will be in the format "secondaryAdd{aRole name}".
- * For example, a role named "department" would return
- * secondaryAddDepartment.
- */
-public static String getSecondaryAddName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return SECONDARY_ADD_NAME_PREFIX + arg;
-}
-/**
- * Return the secondary remove method name for @aRole.
- * It will be in the format "secondaryRemove{aRole name}".
- * For example, a role named "department" would return
- * secondaryRemoveDepartment.
- */
-public static String getSecondaryRemoveName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return SECONDARY_REMOVE_NAME_PREFIX + arg;
-}
-/**
- * Return the secondary setter method name for @aRole.
- * It will be in the format "secondarySet{aRole name}".
- * For example, a role named "department" would return
- * secondarySetDepartment.
- */
-public static String getSecondarySetterName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return SECONDARY_SETTER_NAME_PREFIX + arg;
-}
-/**
- * Return the setter method name for @aRole.
- * It will be in the format "set{aRole name}".
- * For example, a role named "department" would return
- * setDepartment.
- */
-public static String getSetterName(CommonRelationshipRole aRole) {
-	if (aRole == null) return null;
-	String arg = firstAsUppercase(aRole.getName());
-	return SETTER_NAME_PREFIX + arg;
-}
-/**
- * Return true if the multiplicity is many.
- */
-public static boolean isMany(CommonRelationshipRole aRole) {
-	return aRole != null && aRole.isMany();
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionBeanClassVRule.java
deleted file mode 100644
index 128f00c44..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionBeanClassVRule.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatefulSessionBeanClassVRule extends ASessionBeanClassVRule implements IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATEFUL_SESSION_HOME, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME, IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL, IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".sb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	private static final String SMSSGID = ".sfb"; //$NON-NLS-1$
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_SESSIONBEAN};
-	
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = new long[]{LOCAL_COMPONENT_INTERFACE, REMOTE_COMPONENT_INTERFACE};
-	private final boolean SHOULD_BE_ABSTRACT = false;
-	private final boolean SHOULD_BE_FINAL = false;
-	private final boolean SHOULD_BE_PUBLIC = true;
-	private final boolean SHOULD_VALIDATE_TRANSIENT_FIELD = true;
-	
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{EJBCREATE, CONSTRUCTOR_NOPARM, EJBREMOVE_NOPARM, EJBPASSIVATE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{FINALIZE_NOPARM};
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CONSTRUCTOR_NOPARM, CONSTRUCTOR, EJBCREATE, EJBCREATE_NOPARM, EJBREMOVE_NOPARM, EJBACTIVATE_NOPARM, EJBPASSIVATE_NOPARM, FINALIZE_NOPARM, BUSINESS};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2003I, new String[]{CHKJ2003I+SPEC});
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbCreate, new String[]{CHKJ2050_ejbCreate + SMSSGID + SPEC}); // special case (stateful message differs from stateless message)
-		MESSAGE_IDS.put(CHKJ2050_ejbRemove, new String[]{CHKJ2050_ejbRemove+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPassivate, new String[]{CHKJ2050_ejbPassivate+EXT});
-
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2421, new String[]{CHKJ2421+BEXT, CHKJ2421+MEXT});
-		MESSAGE_IDS.put(CHKJ2422, new String[]{CHKJ2422+BEXT, CHKJ2422+MEXT});
-		MESSAGE_IDS.put(CHKJ2423, new String[]{CHKJ2423+BEXT, CHKJ2423+MEXT});
-		MESSAGE_IDS.put(CHKJ2424, new String[]{CHKJ2424+BEXT, CHKJ2424+MEXT});
-		MESSAGE_IDS.put(CHKJ2426, new String[]{CHKJ2426+BEXT, CHKJ2426+MEXT});
-		MESSAGE_IDS.put(CHKJ2427, new String[]{CHKJ2427+BEXT, CHKJ2427+MEXT});
-		MESSAGE_IDS.put(CHKJ2428, new String[]{CHKJ2428+BEXT, CHKJ2428+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2431, new String[]{CHKJ2431+BEXT, CHKJ2431+MEXT});
-		MESSAGE_IDS.put(CHKJ2439, new String[]{CHKJ2439+BEXT, CHKJ2439+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2441, new String[]{CHKJ2441+BEXT, CHKJ2441+MEXT});
-		MESSAGE_IDS.put(CHKJ2442, new String[]{CHKJ2442+BEXT, CHKJ2442+MEXT});
-		MESSAGE_IDS.put(CHKJ2443, new String[]{CHKJ2443+BEXT, CHKJ2443+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2452, new String[]{CHKJ2452+BEXT, CHKJ2452+MEXT});
-		MESSAGE_IDS.put(CHKJ2453, new String[]{CHKJ2453+BEXT, CHKJ2453+MEXT});
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2493, new String[]{CHKJ2493+BEXT, CHKJ2493+MEXT});
-		MESSAGE_IDS.put(CHKJ2494, new String[]{CHKJ2494+BEXT, CHKJ2494+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_ejbCreate, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_business+BEXT, CHKJ2500_business+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_finalize, new String[]{CHKJ2502_finalize+BEXT, CHKJ2502_finalize+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbCreate, new String[]{CHKJ2503_ejbCreate+BEXT, CHKJ2503_ejbCreate+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2505_ejbRemove, new String[]{CHKJ2505_ejbRemove+BEXT, CHKJ2505_ejbRemove+MEXT});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final boolean shouldValidateTransientField() {
-		return SHOULD_VALIDATE_TRANSIENT_FIELD;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final boolean shouldBeAbstract(JavaClass clazz) {
-		return SHOULD_BE_ABSTRACT;
-	}
-	
-	public final boolean shouldBeFinal(JavaClass clazz) {
-		return SHOULD_BE_FINAL;
-	}
-	
-	public final boolean shouldBePublic(JavaClass clazz) {
-		return SHOULD_BE_PUBLIC;
-	}
-
-	public final int isRemote() {
-		return NEITHER;
-	}
-
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-	
-	public final JavaHelpers getEjbCreateReturnType(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ValidationRuleUtility.getType(ITypeConstants.VOID, bean);
-	}
-
-	public final String getEjbCreateReturnTypeName(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ITypeConstants.VOID;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			validateEjbPostCreateMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			validateEjbRemoveMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			validateBusinessMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else {
-			// Method isn't supposed to be here. Let the validateMethodsWhichMustNotExist
-			// take care of it.
-		}
-	}
-
-	public String getMatchingHomeMethodName(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			return getMatchingEjbCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			return getMatchingEjbPostCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			return getNoMatchingMethodName(vc, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			return getMatchingBusinessMethodName(vc, method);
-		}
-		else {
-			// Method isn't supposed to be here. 
-			return getNoMatchingMethodName(vc, method);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.validation.internal.core.core.ejb.ejb20.rules.IClassVRule#validate(org.eclipse.wst.validation.internal.core.core.ejb.IValidationContext, org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean, org.eclipse.jem.internal.java.JavaClass)
-	 */
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		super.validate(vc, bean, clazz);
-		Session session = (Session)bean;
-		boolean isBeanManagedStateful = (ValidationRuleUtility.isValidTransactionTypeElement(session) && ValidationRuleUtility.isBeanManagedSession(session) && ValidationRuleUtility.isStateful(session));
-
-		if (isBeanManagedStateful) {
-			/*
-			 * 6.5.3 The optional SessionSynchronization interface
-			 *...
-			 * Only a stateful Session bean with container-managed transaction demarcation may 
-			 * implement the SessionSynchronization interface.
-			 *...
-			 * There is no need for a Session bean with bean-managed transaction to rely on the 
-			 * synchronization call backs because the bean is in control of the commit the bean 
-			 * knows when the transaction is about to be committed and it knows the outcome of the 
-			 * transaction commit.
-			 *...
-			 */
-			try {
-				JavaHelpers ss = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION, bean);
-				if (ValidationRuleUtility.isAssignableFrom(bean.getEjbClass(), ss)) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2003I, IEJBValidationContext.INFO, bean, bean.getEjbClass(), this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { ValidationRuleUtility.getQualifiedName(bean.getEjbClass()), ValidationRuleUtility.getQualifiedName(e.getJavaClass())};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionLocalComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionLocalComponentVRule.java
deleted file mode 100644
index c08a32fcf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionLocalComponentVRule.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatefulSessionLocalComponentVRule extends AComponentVRule implements ILocalType, IComponentType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".slc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionLocalHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionLocalHomeVRule.java
deleted file mode 100644
index 476d0ba7c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionLocalHomeVRule.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatefulSessionLocalHomeVRule extends ASessionHomeVRule implements ILocalType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".slh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	private static final String SFMSSGID = ".sflh"; //$NON-NLS-1$
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{CREATE};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_create, new String[]{CHKJ2050_create+EXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+SFMSSGID+ON_BASE+SPEC, CHKJ2402+SFMSSGID+ON_THIS+SPEC}); // special case (diff string than stateless bean)
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2502, new String[]{CHKJ2502+BEXT, CHKJ2502+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionRemoteComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionRemoteComponentVRule.java
deleted file mode 100644
index e97d380a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionRemoteComponentVRule.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatefulSessionRemoteComponentVRule extends AComponentVRule implements IRemoteType, IComponentType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".src"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_business+BEXT, CHKJ2500_business+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionRemoteHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionRemoteHomeVRule.java
deleted file mode 100644
index df034061c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatefulSessionRemoteHomeVRule.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatefulSessionRemoteHomeVRule extends ASessionHomeVRule implements IRemoteType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATEFUL_SESSION_HOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".srh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	private static final String SFMSSGID = ".sfrh"; //$NON-NLS-1$
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{CREATE};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_create, new String[]{CHKJ2050_create+EXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+SFMSSGID+ON_BASE+SPEC, CHKJ2402+SFMSSGID+ON_THIS+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2502, new String[]{CHKJ2502+BEXT, CHKJ2502+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionBeanClassVRule.java
deleted file mode 100644
index 621a11199..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionBeanClassVRule.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatelessSessionBeanClassVRule extends ASessionBeanClassVRule implements IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_HOME, IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME, IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE, IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".sb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	private static final String SMSSGID = ".ssb"; //$NON-NLS-1$
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_SESSIONBEAN};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = new long[]{LOCAL_COMPONENT_INTERFACE, REMOTE_COMPONENT_INTERFACE};
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{EJBCREATE_NOPARM, CONSTRUCTOR_NOPARM, EJBREMOVE_NOPARM, EJBPASSIVATE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{FINALIZE_NOPARM};
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CONSTRUCTOR_NOPARM, EJBCREATE_NOPARM, CONSTRUCTOR, EJBREMOVE_NOPARM, EJBACTIVATE_NOPARM, EJBPASSIVATE_NOPARM, FINALIZE_NOPARM, BUSINESS};
-
-	private final boolean SHOULD_BE_ABSTRACT = false;
-	private final boolean SHOULD_BE_FINAL = false;
-	private final boolean SHOULD_BE_PUBLIC = true;
-	private final boolean SHOULD_VALIDATE_TRANSIENT_FIELD = true;
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2003E, new String[]{CHKJ2003E+SPEC});
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_constr, new String[]{CHKJ2050_constr+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbCreate, new String[]{CHKJ2050_ejbCreate+SMSSGID+SPEC});
-		MESSAGE_IDS.put(CHKJ2050_ejbRemove, new String[]{CHKJ2050_ejbRemove+EXT});
-		MESSAGE_IDS.put(CHKJ2050_ejbPassivate, new String[]{CHKJ2050_ejbPassivate+EXT});
-
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103+SPEC});
-
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2421, new String[]{CHKJ2421+BEXT, CHKJ2421+MEXT});
-		MESSAGE_IDS.put(CHKJ2422, new String[]{CHKJ2422+BEXT, CHKJ2422+MEXT});
-		MESSAGE_IDS.put(CHKJ2423, new String[]{CHKJ2423+BEXT, CHKJ2423+MEXT});
-		MESSAGE_IDS.put(CHKJ2424, new String[]{CHKJ2424+BEXT, CHKJ2424+MEXT});
-		MESSAGE_IDS.put(CHKJ2426, new String[]{CHKJ2426+BEXT, CHKJ2426+MEXT});
-		MESSAGE_IDS.put(CHKJ2427, new String[]{CHKJ2427+BEXT, CHKJ2427+MEXT});
-		MESSAGE_IDS.put(CHKJ2428, new String[]{CHKJ2428+BEXT, CHKJ2428+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2431, new String[]{CHKJ2431+BEXT, CHKJ2431+MEXT});
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2439, new String[]{CHKJ2439+BEXT, CHKJ2439+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2441, new String[]{CHKJ2441+BEXT, CHKJ2441+MEXT});
-		MESSAGE_IDS.put(CHKJ2442, new String[]{CHKJ2442+BEXT, CHKJ2442+MEXT});
-		MESSAGE_IDS.put(CHKJ2443, new String[]{CHKJ2443+BEXT, CHKJ2443+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2452, new String[]{CHKJ2452+BEXT, CHKJ2452+MEXT});
-		MESSAGE_IDS.put(CHKJ2453, new String[]{CHKJ2453+BEXT, CHKJ2453+MEXT});
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2476, new String[]{CHKJ2476+SMSSGID + ON_BASE+SPEC, CHKJ2476+SMSSGID+ON_THIS+SPEC});
-		MESSAGE_IDS.put(CHKJ2492, new String[]{CHKJ2492+BEXT, CHKJ2492+MEXT});
-		MESSAGE_IDS.put(CHKJ2493, new String[]{CHKJ2493+BEXT, CHKJ2493+MEXT});
-		MESSAGE_IDS.put(CHKJ2494, new String[]{CHKJ2494+BEXT, CHKJ2494+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_ejbCreate, new String[]{CHKJ2500_ejbCreate+BEXT, CHKJ2500_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_business+BEXT, CHKJ2500_business+MEXT});
-		MESSAGE_IDS.put(CHKJ2502_finalize, new String[]{CHKJ2502_finalize+BEXT, CHKJ2502_finalize+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_ejbCreate, new String[]{CHKJ2503_ejbCreate+BEXT, CHKJ2503_ejbCreate+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2505_ejbRemove, new String[]{CHKJ2505_ejbRemove+BEXT, CHKJ2505_ejbRemove+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final boolean shouldValidateTransientField() {
-		return SHOULD_VALIDATE_TRANSIENT_FIELD;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final boolean shouldBeAbstract(JavaClass clazz) {
-		return SHOULD_BE_ABSTRACT;
-	}
-	
-	public final boolean shouldBeFinal(JavaClass clazz) {
-		return SHOULD_BE_FINAL;
-	}
-	
-	public final boolean shouldBePublic(JavaClass clazz) {
-		return SHOULD_BE_PUBLIC;
-	}
-
-	public final int isRemote() {
-		return NEITHER;
-	}
-
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final JavaHelpers getEjbCreateReturnType(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ValidationRuleUtility.getType(ITypeConstants.VOID, bean);
-	}
-
-	public final String getEjbCreateReturnTypeName(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ITypeConstants.VOID;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-	
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			validateEjbPostCreateMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			validateEjbRemoveMethod(vc, bean, clazz, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			validateBusinessMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-		else {
-			// Method isn't supposed to be here. Let the validateMethodsWhichMustNotExist
-			// take care of it.
-		}
-	}
-
-	public String getMatchingHomeMethodName(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) {
-		long methodType = MethodUtility.getUtility().getMethodTypeId(bean, clazz, method, methodsExtendedLists, this);
-		
-		if((methodType & EJBCREATE) == EJBCREATE) {
-			return getMatchingEjbCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBPOSTCREATE) == EJBPOSTCREATE) {
-			return getMatchingEjbPostCreateMethodName(vc, method);
-		}
-		else if((methodType & EJBREMOVE_NOPARM) == EJBREMOVE_NOPARM) {
-			return getNoMatchingMethodName(vc, method);
-		}
-		else if((methodType & BUSINESS) == BUSINESS) {
-			return getMatchingBusinessMethodName(vc, method);
-		}
-		else {
-			// Method isn't supposed to be here. 
-			return getNoMatchingMethodName(vc, method);
-		}
-	}
-	
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		if((method.listParametersWithoutReturn().length != 0) || (!IMethodAndFieldConstants.METHODNAME_EJBCREATE.equals(method.getName()))) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb20Constants.CHKJ2476, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-		else {
-			super.validateEjbCreateMethod(vc, bean, clazz, method, methodsExtendedLists);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.validation.internal.core.core.ejb.ejb20.rules.IClassVRule#validate(org.eclipse.wst.validation.internal.core.core.ejb.IValidationContext, org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean, org.eclipse.jem.internal.java.JavaClass)
-	 */
-	public void validate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws ValidationCancelledException, InvalidInputException, ValidationException {
-		// TODO Auto-generated method stub
-		super.validate(vc, bean, clazz);
-		/*
-		 * 6.5.3 The optional SessionSynchronization interface
-		 *...
-		 * Only a stateful Session bean with container-managed transaction demarcation may 
-		 * implement the SessionSynchronization interface.
-		 *...
-		 * There is no need for a Session bean with bean-managed transaction to rely on the 
-		 * synchronization call backs because the bean is in control of the commit the bean 
-		 * knows when the transaction is about to be committed and it knows the outcome of the 
-		 * transaction commit.
-		 *...
-		 */
-		try {
-			JavaHelpers ss = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION, bean);
-			if (ValidationRuleUtility.isAssignableFrom(bean.getEjbClass(), ss)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2003E, IEJBValidationContext.ERROR, bean, bean.getEjbClass(), this);
-				vc.addMessage(message);
-			}
-		}
-		catch (InvalidInputException e) {
-			String[] msgParm = { ValidationRuleUtility.getQualifiedName(bean.getEjbClass()), ValidationRuleUtility.getQualifiedName(e.getJavaClass())};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.WARNING, bean, msgParm, this);
-			vc.addMessage(message);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionLocalComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionLocalComponentVRule.java
deleted file mode 100644
index c8cc3d9ab..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionLocalComponentVRule.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatelessSessionLocalComponentVRule extends AComponentVRule implements ILocalType, IComponentType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".slc"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionLocalHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionLocalHomeVRule.java
deleted file mode 100644
index ebb83b446..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionLocalHomeVRule.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatelessSessionLocalHomeVRule extends AStatelessHomeVRule implements ILocalType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".slh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	private static final String SMSSGID = ".sslh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBLOCALHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{CREATE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE_NOPARM, CREATE, FINALIZE_NOPARM};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_create, new String[]{CHKJ2050_create+SMSSGID+SPEC});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+SMSSGID+ON_BASE+SPEC, CHKJ2402+SMSSGID+ON_THIS+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2476, new String[]{CHKJ2476+BEXT, CHKJ2476+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2502, new String[]{CHKJ2502+BEXT, CHKJ2502+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionRemoteComponentVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionRemoteComponentVRule.java
deleted file mode 100644
index ebfd6fde6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionRemoteComponentVRule.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatelessSessionRemoteComponentVRule extends AComponentVRule implements IRemoteType, IComponentType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-
-	private static final String MSSGID = ".src"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBOBJECT};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-
-	private final long[] METHODS_WHICH_MUST_EXIST = null;
-	private static final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2468, new String[]{CHKJ2468+BEXT, CHKJ2468+MEXT});
-		MESSAGE_IDS.put(CHKJ2469, new String[]{CHKJ2469+BEXT, CHKJ2469+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2470, new String[]{CHKJ2470+BEXT, CHKJ2470+MEXT});
-		MESSAGE_IDS.put(CHKJ2471, new String[]{CHKJ2471+BEXT, CHKJ2471+MEXT});
-		MESSAGE_IDS.put(CHKJ2472, new String[]{CHKJ2472+BEXT, CHKJ2472+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2500_business, new String[]{CHKJ2500_business+BEXT, CHKJ2500_business+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_bus, new String[]{CHKJ2503_bus+BEXT, CHKJ2503_bus+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionRemoteHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionRemoteHomeVRule.java
deleted file mode 100644
index f25b17f4e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/StatelessSessionRemoteHomeVRule.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public final class StatelessSessionRemoteHomeVRule extends AStatelessHomeVRule implements IRemoteType, IHomeType, IMessagePrefixEjb20Constants {
-	private static final Object ID = IValidationRuleList.EJB20_STATELESS_SESSION_HOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	private static final String MSSGID = ".srh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE_SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS_SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	private static final String SMSSGID = ".ssrh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-
-	private final long[] SUPERTYPES = new long[]{JAVAX_EJB_EJBHOME};
-	private final long[] SHOULD_NOT_BE_SUPERTYPES = null;
-	private final long[] METHODS_WHICH_MUST_EXIST = new long[]{CREATE_NOPARM};
-	private final long[] METHODS_WHICH_MUST_NOT_EXIST = new long[]{};
-
-	private final long[] KNOWN_METHOD_TYPES = new long[]{CLINIT, CREATE_NOPARM, CREATE, FINALIZE_NOPARM};
-
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2050_create, new String[]{CHKJ2050_create+SMSSGID+SPEC});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104+SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+SMSSGID+ON_BASE+SPEC, CHKJ2402+SMSSGID+ON_THIS+SPEC});
-		MESSAGE_IDS.put(CHKJ2404, new String[]{CHKJ2404+ON_BASE_SPEC, CHKJ2404+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2416, new String[]{CHKJ2416+ON_BASE_SPEC, CHKJ2416+ON_THIS_SPEC}); // special case (shared by all types)
-
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-
-		MESSAGE_IDS.put(CHKJ2461, new String[]{CHKJ2461+BEXT, CHKJ2461+MEXT});
-		MESSAGE_IDS.put(CHKJ2465, new String[]{CHKJ2465+BEXT, CHKJ2465+MEXT});
-		MESSAGE_IDS.put(CHKJ2466, new String[]{CHKJ2466+BEXT, CHKJ2466+MEXT});
-		MESSAGE_IDS.put(CHKJ2467, new String[]{CHKJ2467+BEXT, CHKJ2467+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2476, new String[]{CHKJ2476+BEXT, CHKJ2476+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2500_create, new String[]{CHKJ2500_create+BEXT, CHKJ2500_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2500_home, new String[]{CHKJ2500_home+BEXT, CHKJ2500_home+MEXT});
-		MESSAGE_IDS.put(CHKJ2502, new String[]{CHKJ2502+BEXT, CHKJ2502+MEXT});
-		MESSAGE_IDS.put(CHKJ2503_create, new String[]{CHKJ2503_create+BEXT, CHKJ2503_create+MEXT});
-		MESSAGE_IDS.put(CHKJ2504_create, new String[]{CHKJ2504_create+BEXT, CHKJ2504_create+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final long[] getBaseTypes() {
-		return getSupertypes();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final int getMessageRemoteExceptionSeverity() {
-		return MESSAGE_REMOTE_EXCEPTION_SEVERITY;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public final long[] getSupertypes() {
-		return SUPERTYPES;
-	}
-	
-	public final long[] getShouldNotBeSupertypes() {
-		return SHOULD_NOT_BE_SUPERTYPES;
-	}
-
-	public final int isRemote() {
-		return IS_REMOTE;
-	}
-	
-	public final long[] getMethodsWhichMustExist() {
-		return METHODS_WHICH_MUST_EXIST;
-	}
-	
-	public final long[] getMethodsWhichMustNotExist() {
-		return METHODS_WHICH_MUST_NOT_EXIST;
-	}
-
-	public final long[] getKnownMethodTypes() {
-		return KNOWN_METHOD_TYPES;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPBean.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPBean.java
deleted file mode 100644
index 85cba0dc0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPBean.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks entity bean classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- *
- * All 9.2.X sections describe BMP requirements.
- * If a CMP requirement is different than these, then the differences are
- * documented in 9.4.X sections.
- */
-public class ValidateBMPBean extends AValidateEntityBean implements IMessagePrefixEjb11Constants {
-	private static final String MSSGID = ".eb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private static final Object ID = IValidationRuleList.EJB11_BMP_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_BMP_HOME, IValidationRuleList.EJB11_BMP_REMOTE, IValidationRuleList.EJB11_BMP_KEYCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	boolean hasPKMethod = false;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2002, new String[]{CHKJ2002+BEXT, CHKJ2002+MEXT});
-		MESSAGE_IDS.put(CHKJ2006, new String[]{CHKJ2006+EXT});
-		MESSAGE_IDS.put(CHKJ2007, new String[]{CHKJ2007+EXT});
-		MESSAGE_IDS.put(CHKJ2009, new String[]{CHKJ2009+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2013, new String[]{CHKJ2013+EXT});
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-		MESSAGE_IDS.put(CHKJ2028, new String[]{CHKJ2028+BEXT, CHKJ2028+MEXT});
-		MESSAGE_IDS.put(CHKJ2029, new String[]{CHKJ2029+BEXT, CHKJ2029+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2033, new String[]{CHKJ2033+EXT});
-		MESSAGE_IDS.put(CHKJ2034, new String[]{CHKJ2034+EXT});
-		MESSAGE_IDS.put(CHKJ2035, new String[]{CHKJ2035+EXT});
-		MESSAGE_IDS.put(CHKJ2036, new String[]{CHKJ2036+EXT});
-		MESSAGE_IDS.put(CHKJ2037, new String[]{CHKJ2037+EXT});
-		MESSAGE_IDS.put(CHKJ2038, new String[]{CHKJ2038+EXT});
-		MESSAGE_IDS.put(CHKJ2039, new String[]{CHKJ2039+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103 + SPEC});
-		MESSAGE_IDS.put(CHKJ2200, new String[]{CHKJ2200+ON_BASE+SPEC, CHKJ2200+ON_THIS+SPEC}); // CHKJ2200 is a special case. It's shared by all bean types.
-		
-		MESSAGE_IDS.put(CHKJ2400_bus, new String[]{CHKJ2400_bus+BEXT, CHKJ2400_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbCreate, new String[]{CHKJ2400_ejbCreate+BEXT, CHKJ2400_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbFind, new String[]{CHKJ2400_ejbFind+BEXT, CHKJ2400_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbPostCreate, new String[]{CHKJ2400_ejbPostCreate+BEXT, CHKJ2400_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2406, new String[]{CHKJ2406+BEXT, CHKJ2406+MEXT});
-		MESSAGE_IDS.put(CHKJ2407, new String[]{CHKJ2407+BEXT, CHKJ2407+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_bus, new String[]{CHKJ2408_bus+BEXT, CHKJ2408_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_ejbCreate, new String[]{CHKJ2408_ejbCreate+BEXT, CHKJ2408_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_ejbFind, new String[]{CHKJ2408_ejbFind+BEXT, CHKJ2408_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_ejbPostCreate, new String[]{CHKJ2408_ejbPostCreate+BEXT, CHKJ2408_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_bus, new String[]{CHKJ2409_bus+BEXT, CHKJ2409_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbCreate, new String[]{CHKJ2409_ejbCreate+BEXT, CHKJ2409_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbFind, new String[]{CHKJ2409_ejbFind+BEXT, CHKJ2409_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbPostCreate, new String[]{CHKJ2409_ejbPostCreate+BEXT, CHKJ2409_ejbPostCreate+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2410_bus, new String[]{CHKJ2410_bus+BEXT, CHKJ2410_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbCreate, new String[]{CHKJ2410_ejbCreate+BEXT, CHKJ2410_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbFind, new String[]{CHKJ2410_ejbFind+BEXT, CHKJ2410_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbPostCreate, new String[]{CHKJ2410_ejbPostCreate+BEXT, CHKJ2410_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2418, new String[]{CHKJ2418+BEXT, CHKJ2418+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2420, new String[]{CHKJ2420+BEXT, CHKJ2420+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2432, new String[]{CHKJ2432+BEXT, CHKJ2432+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-	
-	protected void incrementFindByPrimaryKeyCount(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-		hasPKMethod = true;
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		super.primValidateExistence(vc, bean, clazz, ejbMethod);
-
-		// BMPs must implement ejbFindByPrimaryKey. If it isn't implemented, validateMethodExists() will
-		// output an error. (hasPKMethod = true implies implemented, otherwise not implemented)
-		if (!hasPKMethod && IMethodAndFieldConstants.METHODNAME_EJBFINDBYPRIMARYKEY.equals(ejbMethod.getName())) {
-			incrementFindByPrimaryKeyCount(vc, bean, clazz, ejbMethod);
-		}
-		vc.terminateIfCancelled();
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.6
-	 */
-	public void validateBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// Perform common BMP/CMP business method checks
-		super.validateBusinessMethod(vc, bean, clazz, method);
-
-		// No specific BMP business method checks.
-		// All of the points in 9.2.6 are common to both BMPs & CMPs.
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.2
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		// All of the above checks are performed by the parent.
-		super.validateClass(vc, bean, clazz);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.5
-	 */
-	public void validateEjbFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// A finder method name must start with the prefix "ejbFind" 
-		// (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
-		// The method which calls this method performs the above check.
-
-		// Every entity bean must define the ejbFindByPrimaryKey method. The result type for 
-		// this method must be the primary key type (i.e. the ejbFindByPrimaryKey method must 
-		// be a single-object finder).
-		if (method == null) {
-			return;
-		}
-
-		vc.terminateIfCancelled();
-		// A finder method must be declared as public.
-		if (!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2408_ejbFind, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method must not be declared as final or static.
-		if (method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2410_ejbFind, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if (method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2409_ejbFind, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method argument types must be legal types for RMI-IIOP.
-		validateLegalRMIMethodArguments(vc, bean, clazz, method);
-
-		// The return type of a finder method must be the entity bean's primary key type, 
-		// or a collection of primary keys (see Section Subsection 9.1.8).
-		validateEjbFindMethod_key(vc, bean, clazz, method);
-
-		// Compatibility Note: EJB 1.0 allowed the finder methods to throw the 
-		// java.rmi.RemoteException to indicate a non-application exception. 
-		// This practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant enterprise bean 
-		// should throw the javax.ejb.EJBException or another java.lang.RuntimeException
-		// to indicate non-application exceptions to the Container (see Section 12.2.2).
-		validateNoRemoteException(vc, bean, clazz, method, IMessagePrefixEjb11Constants.CHKJ2400_ejbFind);
-
-		validateEjbFindMethod_homeDep(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.5
-	 */
-	public void validateEjbFindMethod_key(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (method == null) {
-			return;
-		}
-		// The return type of a finder method must be the entity bean's primary key type, 
-		// or a collection of primary keys (see Section Subsection 9.1.8).
-		vc.terminateIfCancelled();
-
-		JavaHelpers returnType = method.getReturnType();
-
-		JavaClass primaryKey = ((Entity) bean).getPrimaryKey();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, primaryKey);
-
-		if( !(ValidationRuleUtility.isAssignableFrom(returnType, primaryKey) ||
-			  ValidationRuleUtility.isAssignableFromCollection(returnType, bean) ||
-			  ValidationRuleUtility.isAssignableFromEnumeration(returnType, bean)
-		   )) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2407, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { primaryKey.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * Checks that the ejbPostCreate method follows the EJB 1.1. specification.
-	 * Section: 9.2.4
-	*/
-	public void validateEjbPostCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// Perform common BMP/CMP ejbPostCreate method checks
-		super.validateEjbPostCreateMethod(vc, bean, clazz, method);
-
-		// No specific BMP ejbPostCreate method checks.
-		// All of the points in 9.2.4 are common to both BMPs & CMPs.
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.5
-	 */
-	public void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		super.validateMethodExists(vc, bean, clazz);
-
-		if (!hasPKMethod) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2009, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	public void verifyFieldExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		/*
-		// Plus, check that at least one field exists on the bean.
-		List fields = getFields();
-		if((fields == null) || (fields.size() == 0)) {
-			addValidationMessage(IEJBValidationContext.WARNING, IMessagePrefixEjb11Constants.EJB_BMP_NOFIELDS, new String[] {getModelObjectName()}, getModelObject());
-			return;
-		}
-		*/
-	}
-	
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-		hasPKMethod = false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPHome.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPHome.java
deleted file mode 100644
index 222d6439b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPHome.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * This class checks bean managed entity home classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section: 9.2.8
- */
-public class ValidateBMPHome extends AValidateEntityHome implements IMessagePrefixEjb11Constants {
-	private static final String MSSGID = ".eh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-	
-	private static final Object ID = IValidationRuleList.EJB11_BMP_HOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_BMP_BEANCLASS, IValidationRuleList.EJB11_BMP_KEYCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2005, new String[]{CHKJ2005+BEXT, CHKJ2005+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2011, new String[]{CHKJ2011+EXT});
-		MESSAGE_IDS.put(CHKJ2012, new String[]{CHKJ2012+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2026, new String[]{CHKJ2026+BEXT, CHKJ2026+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2030, new String[]{CHKJ2030+BEXT, CHKJ2030+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104 + SPEC});
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+BEXT, CHKJ2402+MEXT});
-		MESSAGE_IDS.put(CHKJ2403, new String[]{CHKJ2403+BEXT, CHKJ2403+MEXT});
-		MESSAGE_IDS.put(CHKJ2405, new String[]{CHKJ2405+BEXT, CHKJ2405+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2415, new String[]{CHKJ2415+BEXT, CHKJ2415+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	public void validateFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		super.validateFindMethod(vc, bean, clazz, method);
-
-		if (method == null) {
-			return;
-		}
-
-		// The verifyMatchingBeanFindMethod checks for the two following requirements:
-		// 
-		// Each finder method must be named "find<METHOD>" (e.g. findLargeAccounts), and it
-		// must match one of the ejbFind<METHOD> methods defined in the entity bean class 
-		// (e.g. ejbFindLargeAccounts). The matching ejbFind<METHOD> method must have the 
-		// same number and types of arguments. (Note that the return type may be different.)
-		// 
-		// All the exceptions defined in the throws clause of an ejbFind method of the 
-		// entity bean class must be included in the throws clause of the matching find
-		// method of the home interface.
-		validateFindMethod_beanDep(vc, bean, clazz, method);
-
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.8
-	 */
-	public void validateFindMethod_beanDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (method == null) {
-			return;
-		}
-
-		// The verifyMatchingBeanFindMethod checks for the two following requirements:
-		// 
-		// Each finder method must be named "find<METHOD>" (e.g. findLargeAccounts), and it
-		// must match one of the ejbFind<METHOD> methods defined in the entity bean class 
-		// (e.g. ejbFindLargeAccounts). The matching ejbFind<METHOD> method must have the 
-		// same number and types of arguments. (Note that the return type may be different.)
-		// 
-		// All the exceptions defined in the throws clause of an ejbFind method of the 
-		// entity bean class must be included in the throws clause of the matching find
-		// method of the home interface.
-		validateMatchingBeanFindMethod(vc, bean, clazz, method);
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPKey.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPKey.java
deleted file mode 100644
index 10c4adf1b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPKey.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * Validate a BMP key.
- */
-public class ValidateBMPKey extends AValidateKeyClass implements IMessagePrefixEjb11Constants {
-	private static final String MSSGID = ".eb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-
-	private static final Object ID = IValidationRuleList.EJB11_BMP_KEYCLASS;
-	private static final Object[] DEPENDS_ON = null;
-	private static final Map MESSAGE_IDS;
-
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2001, new String[]{CHKJ2001+EXT});
-
-		MESSAGE_IDS.put(CHKJ2019, new String[]{CHKJ2019+EXT});
-
-//Don't use that AValidateEJB method		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+EXT});
-//Don't use that AValidateEJB method		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+EXT});
-//Don't use that AValidateEJB method		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+EXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-
-	public final Object getId() {
-		return ID;
-	}
-
-	/**
-	 * This method actually does the validation.
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.primValidate(ejbMethod);
-
-		//Nothing to do.
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		// Nothing to do
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPRemote.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPRemote.java
deleted file mode 100644
index 8ad649d92..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPRemote.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * Validates the remote interface of a BMP bean.
- */
-public class ValidateBMPRemote extends AValidateRemote  implements IMessagePrefixEjb11Constants {
-	private static final String MSSGID = ".er"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_BMP_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_BMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2012, new String[]{CHKJ2012+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2415, new String[]{CHKJ2415+BEXT, CHKJ2415+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java
deleted file mode 100644
index f5bfa8792..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This class checks entity bean classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- *
- *
- * All 9.2.X sections describe BMP requirements.
- * If a CMP requirement is different than these, then the differences are
- * documented in 9.4.X sections.
- */
-public class ValidateCMPBean extends AValidateEntityBean implements IMessagePrefixEjb11Constants {
-	private List _containerManagedFields = null;
-
-	private static final String MSSGID = ".eb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_CMP_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_CMP_HOME, IValidationRuleList.EJB11_CMP_REMOTE};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2002, new String[]{CHKJ2002+BEXT, CHKJ2002+MEXT});
-		MESSAGE_IDS.put(CHKJ2004, new String[]{CHKJ2004+BEXT, CHKJ2004+MEXT});
-		MESSAGE_IDS.put(CHKJ2006, new String[]{CHKJ2006+EXT});
-		MESSAGE_IDS.put(CHKJ2007, new String[]{CHKJ2007+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2013, new String[]{CHKJ2013+EXT});
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-		MESSAGE_IDS.put(CHKJ2028, new String[]{CHKJ2028+BEXT, CHKJ2028+MEXT});
-		MESSAGE_IDS.put(CHKJ2029, new String[]{CHKJ2029+BEXT, CHKJ2029+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2032, new String[]{CHKJ2032+EXT});
-		MESSAGE_IDS.put(CHKJ2033, new String[]{CHKJ2033+EXT});
-		MESSAGE_IDS.put(CHKJ2034, new String[]{CHKJ2034+EXT});
-		MESSAGE_IDS.put(CHKJ2035, new String[]{CHKJ2035+EXT});
-		MESSAGE_IDS.put(CHKJ2036, new String[]{CHKJ2036+EXT});
-		MESSAGE_IDS.put(CHKJ2037, new String[]{CHKJ2037+EXT});
-		MESSAGE_IDS.put(CHKJ2038, new String[]{CHKJ2038+EXT});
-		MESSAGE_IDS.put(CHKJ2039, new String[]{CHKJ2039+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103 + SPEC});
-		MESSAGE_IDS.put(CHKJ2200, new String[]{CHKJ2200+ON_BASE+SPEC, CHKJ2200+ON_THIS+SPEC}); // CHKJ2200 is a special case. It's shared by all bean types.
-		MESSAGE_IDS.put(CHKJ2201, new String[]{CHKJ2201+BEXT, CHKJ2201+MEXT});
-		MESSAGE_IDS.put(CHKJ2202, new String[]{CHKJ2202+BEXT, CHKJ2202+MEXT});
-		MESSAGE_IDS.put(CHKJ2203, new String[]{CHKJ2203+BEXT, CHKJ2203+MEXT});
-		MESSAGE_IDS.put(CHKJ2207, new String[]{CHKJ2207+EXT, CHKJ2207+EXT}); // special case where the message id is the same regardless of whether or not the method is inherited
-		
-		MESSAGE_IDS.put(CHKJ2400_bus, new String[]{CHKJ2400_bus+BEXT, CHKJ2400_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbCreate, new String[]{CHKJ2400_ejbCreate+BEXT, CHKJ2400_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbFind, new String[]{CHKJ2400_ejbFind+BEXT, CHKJ2400_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbPostCreate, new String[]{CHKJ2400_ejbPostCreate+BEXT, CHKJ2400_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2406, new String[]{CHKJ2406+BEXT, CHKJ2406+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_bus, new String[]{CHKJ2408_bus+BEXT, CHKJ2408_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_ejbCreate, new String[]{CHKJ2408_ejbCreate+BEXT, CHKJ2408_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_ejbPostCreate, new String[]{CHKJ2408_ejbPostCreate+BEXT, CHKJ2408_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_bus, new String[]{CHKJ2409_bus+BEXT, CHKJ2409_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbCreate, new String[]{CHKJ2409_ejbCreate+BEXT, CHKJ2409_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbFind, new String[]{CHKJ2409_ejbFind+BEXT, CHKJ2409_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbPostCreate, new String[]{CHKJ2409_ejbPostCreate+BEXT, CHKJ2409_ejbPostCreate+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2410_bus, new String[]{CHKJ2410_bus+BEXT, CHKJ2410_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbCreate, new String[]{CHKJ2410_ejbCreate+BEXT, CHKJ2410_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbFind, new String[]{CHKJ2410_ejbFind+BEXT, CHKJ2410_ejbFind+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbPostCreate, new String[]{CHKJ2410_ejbPostCreate+BEXT, CHKJ2410_ejbPostCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2418, new String[]{CHKJ2418+BEXT, CHKJ2418+MEXT});
-		MESSAGE_IDS.put(CHKJ2420, new String[]{CHKJ2420+BEXT, CHKJ2420+MEXT});
-		MESSAGE_IDS.put(CHKJ2432, new String[]{CHKJ2432+BEXT, CHKJ2432+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public void reset() {
-		super.reset();
-		_containerManagedFields = null;
-	}
-
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	protected List getContainerManagedFields() {
-		return _containerManagedFields;
-	}
-	
-	protected boolean hasContainerManagedField() {
-		return (getContainerManagedFields() != null && getContainerManagedFields().size() > 0);
-	}
-	
-	public boolean isContainerManagedField(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) {
-		if (field == null) {
-			return false;
-		}
-		return getContainerManagedFields() != null && getContainerManagedFields().contains(field.getName());
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.1
-	 * 
-	 * Return true if the field is the enterprise bean's home interface.
-	 */
-	protected boolean isContainerManagedHome_homeDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		if (field == null) {
-			return false;
-		}
-
-		if (bean == null) {
-			return false;
-		}
-
-		JavaClass homeIntf = bean.getHomeInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, homeIntf);
-
-		return ValidationRuleUtility.isAssignableFrom(ValidationRuleUtility.getType(field), homeIntf);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.1
-	 *
-	 * Return true if the field is the enterprise bean's remote interface.
-	 */
-	protected boolean isContainerManagedRemote_remoteDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		if (field == null) {
-			return false;
-		}
-
-		if (bean == null) {
-			return false;
-		}
-
-		JavaClass remoteIntf = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remoteIntf);
-
-		return ValidationRuleUtility.isAssignableFrom(ValidationRuleUtility.getType(field), remoteIntf);
-	}
-	
-	private List loadContainerManagedFields(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// The validation in this class, of the fields, is performed against the
-		// container-managed fields, not the fields of this class directly.
-		if (bean == null) {
-			return Collections.EMPTY_LIST;
-		}
-
-		List fields = null;
-		try {
-			List cmpAttributes = ((ContainerManagedEntity) bean).getPersistentAttributes();
-			if (cmpAttributes != null && !cmpAttributes.isEmpty()) {
-				fields = new ArrayList(cmpAttributes.size());
-				for (int i = 0; i < cmpAttributes.size(); i++)
-					fields.add(((CMPAttribute) cmpAttributes.get(i)).getName());
-			}
-		}
-		catch (Throwable exc) {
-			Logger logger = vc.getMsgLogger();
-			if (logger != null && logger.isLoggingLevel(Level.FINER)) {
-				logger.write(Level.FINER, exc);
-			}
-			fields = Collections.EMPTY_LIST;
-		}
-		return fields;
-	}
-
-	/**
-	 * EJB 1.1 specification
-	 * Section: 18.1.2
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		super.primValidate(vc, bean, clazz, field);
-
-		vc.terminateIfCancelled();
-
-		validateContainerManagedField(vc, bean, clazz, field);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.6
-	 */
-	public void validateBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// Perform common BMP/CMP business method checks
-		if (!isEjbRelationshipRoleMethod(vc, bean, clazz, method))
-			super.validateBusinessMethod(vc, bean, clazz, method);
-
-		// No specific CMP business method checks.
-		// All of the points in 9.2.6 are common to both BMPs & CMPs.
-	}
-	
-	protected void validateBusinessMethodNoRemoteException(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (!isEjbRelationshipRoleMethod(vc, bean, clazz, method))
-			super.validateBusinessMethodNoRemoteException(vc, bean, clazz, method); // EJB 2.0 added "throws InvalidInputException above"
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.2.2
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		// All of the above checks are performed by the parent.
-		super.validateClass(vc, bean, clazz);
-
-		validatePrimitivePrimaryKey(vc, bean, clazz); // if this class uses a primitive primary key, the type of the key must be the same as the type of the field
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.1
-	 */
-	protected void validateContainerManagedField(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		if (isContainerManagedField(vc, bean, clazz, field)) {
-			if (field == null) {
-				return;
-			}
-
-			vc.terminateIfCancelled();
-
-			if (!ValidationRuleUtility.isPublic(field)) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2203, IEJBValidationContext.ERROR, bean, clazz, field, this);
-				vc.addMessage(message);
-			}
-
-			if (field.isTransient()) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2201, IEJBValidationContext.ERROR, bean, clazz, field, this);
-				vc.addMessage(message);
-			}
-
-			// Check if it's a reference to the home or remote interface.
-			validateContainerManagedField_dependent(vc, bean, clazz, field);
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.1
-	 *
-	 * Return true if the field is either the enterprise bean's remote interface, 
-	 * or the enterprise bean's home interface.
-	 */
-	protected void validateContainerManagedField_dependent(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		if (field == null) {
-			return;
-		}
-
-		JavaHelpers fieldType = ValidationRuleUtility.getType(field);
-
-		if (!ValidationRuleUtility.isSerializable(fieldType, bean)) {
-			// If it were primitive, it would be serializable, so two checks were done in that one line of code.
-			// 
-			// Check if it's the enterprise bean's remote or home interface
-			vc.terminateIfCancelled();
-			if (!(isContainerManagedHome_homeDep(vc, bean, clazz, field)) || (isContainerManagedRemote_remoteDep(vc, bean, clazz, field))) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2202, IEJBValidationContext.WARNING, bean, clazz, field, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.6
-	 */
-	public void validateEjbFindMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (method == null) {
-			throw new InvalidInputException();
-		}
-
-		// Only BMPs implement finder methods.
-		IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2004, IEJBValidationContext.WARNING, bean, clazz, method, new String[] { clazz.getQualifiedName()}, this);
-		vc.addMessage(message);
-	}
-	
-	/**
-	 * Checks that the ejbPostCreate method follows the EJB 1.1. specification.
-	 * Section: 9.2.4 and 9.4.2
-	*/
-	public void validateEjbPostCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// Perform common BMP/CMP ejbPostCreate method checks
-		super.validateEjbPostCreateMethod(vc, bean, clazz, method);
-
-		// No specific CMP ejbPostCreateMethod checks.
-		// All of the points in 9.2.4 are common to both BMPs & CMPs.
-	}
-	
-	protected void validatePrimitivePrimaryKey(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		ContainerManagedEntity cmp = (ContainerManagedEntity) bean; // bean is checked for null in AValidateEJB.validate() method, so don't need to check for it here.
-
-		if (ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-			// primitive primary key
-
-			// primary key that maps to a single field in the entity bean class
-			// The field's type must be the primary key type.
-			CMPAttribute keyAttribute = cmp.getPrimKeyField();
-			Field keyField = (keyAttribute == null) ? null : keyAttribute.getField();
-			JavaClass primaryKey = cmp.getPrimaryKey();
-			if ((keyField == null) || !ValidationRuleUtility.isAssignableFrom((JavaHelpers)keyField.getEType(), primaryKey)) {
-				String[] msgParm = { keyAttribute.getName(), primaryKey.getName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2207, IEJBValidationContext.ERROR, bean, clazz, keyField, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * Check that at least one field exists on the bean.
-	 */
-	public void verifyFieldExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		if (!hasContainerManagedField()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2032, IEJBValidationContext.WARNING, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-		_containerManagedFields = loadContainerManagedFields(vc, (EnterpriseBean)targetParent, (JavaClass)target);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPKey.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPKey.java
deleted file mode 100644
index 185b8a232..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPKey.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-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.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks entity bean classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- *
- *
- * All 9.2.X sections describe BMP requirements. (And the bulk of those
- * are implemented in ValidateKeyClass.)
- * If a CMP requirement is different than these, then the differences are
- * documented in 9.4.X sections.
- */
-public class ValidateCMPKey extends AValidateKeyClass implements IMessagePrefixEjb11Constants {
-	private boolean hasAConstructor = false;
-	private boolean hasDefaultConstructor = false;
-	private Set _beanFieldNames = new HashSet();
-
-	private static final String MSSGID = ".eb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_CMP_KEYCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_CMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2001, new String[]{CHKJ2001+EXT});
-
-		MESSAGE_IDS.put(CHKJ2019, new String[]{CHKJ2019+EXT});
-
-		MESSAGE_IDS.put(CHKJ2020, new String[]{CHKJ2020+EXT});
-		MESSAGE_IDS.put(CHKJ2021, new String[]{CHKJ2021+EXT});
-
-		MESSAGE_IDS.put(CHKJ2205, new String[]{CHKJ2205+BEXT, CHKJ2205+MEXT});
-		MESSAGE_IDS.put(CHKJ2206, new String[]{CHKJ2206+BEXT, CHKJ2206+MEXT}); // special case where the id is the same regardless of whether the method is inherited or not
-		
-//AValidateEJB method not used		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-//AValidateEJB method not used		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-//AValidateEJB method not used		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2829, new String[]{CHKJ2829 + SPEC});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public void reset() {
-		super.reset();
-		_beanFieldNames.clear();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public Object getTarget(Object parent, Object clazz) {
-		if(parent == null) {
-			return null;
-		}
-		
-		ContainerManagedEntity cmp = (ContainerManagedEntity)parent;
-		if(ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-			return null; // do not validate a primitive primary key
-		}
-		
-		return cmp.getPrimaryKey();
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	/*
-	 * EJB 1.1 specification
-	 * Section: 9.4.7.1 and 9.4.7.2
-	 */
-	protected void buildFieldNameList(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) {
-		// Build up the list of field names to be used in the field validation.
-		vc.terminateIfCancelled();
-
-		ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-		if (cmp == null) {
-			// Let the class validation throw the exception
-			return;
-		}
-
-		if (!ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-			List attributes = cmp.getPersistentAttributes();
-			CMPAttribute attribute = null;
-			Iterator iterator = attributes.iterator();
-			while (iterator.hasNext()) {
-				attribute = (CMPAttribute) iterator.next();
-				try {
-					// These are different fields than the ones validated by this
-					// valImpl class, so don't need to worry about duplicate reflection
-					// warnings logged against the same object.
-					ValidationRuleUtility.isValidType(attribute.getType());
-					_beanFieldNames.add(attribute.getName());
-				}
-				catch (InvalidInputException e) {
-					//TODO (Dan) Change to use the attribute directly and not the field.
-					reflectionWarning(vc, bean, clazz , attribute.getField(), e);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * This method actually does the validation.
-	 *
-	 * EJB 1.1 specification
-	 * Section: 9.4.7.2
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Field field) throws InvalidInputException {
-		// All fields in the primary key class must be declared as public.
-		if (!ValidationRuleUtility.isPublic(field)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2205, IEJBValidationContext.WARNING, bean, clazz, field, this);
-			vc.addMessage(message);
-		}
-
-		// The names of the fields in the primary key class must be a subset of the names of the container-managed
-		// fields. (This allows the container to extract the primary key fields from an instance's container-managed
-		// fields, and vice versa.)
-		ContainerManagedEntity cmp = (ContainerManagedEntity) bean;
-		// Don't need to check if cmp is null, because this method is called only by validateFields(),
-		// and validateFields() won't call this method if the bean is null.
-
-		if (!_beanFieldNames.contains(field.getName())) {
-			JavaClass ejbClass = cmp.getEjbClass();
-			ValidationRuleUtility.isValidType(ejbClass);
-			String[] msgParm = { cmp.getName(), cmp.getEjbClass().getName()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2206, IEJBValidationContext.WARNING, bean, clazz, field, msgParm, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * This method actually does the validation.
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		// super.primValidate(ejbMethod);
-
-		//Nothing to do.
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		if (ejbMethod.isConstructor()) {
-			// These booleans are used in the validateMethodExists() checks.
-			hasAConstructor = true;
-			if (ValidationRuleUtility.isPublic(ejbMethod) && (ejbMethod.listParametersWithoutReturn().length == 0)) {
-				hasDefaultConstructor = true;
-			}
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.7.2
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		super.validateClass(vc, bean, clazz);
-
-		vc.terminateIfCancelled();
-
-		// The primary key class must be public
-		if (!clazz.isPublic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2020, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-
-		buildFieldNameList(vc, bean, clazz);
-
-		// Doesn't make sense to check for cmp key attributes if it's not a valid prim key field.
-		// primary key must map to at least one field on the bean 
-		ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-		if(!ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-			// primary key must map to at least one field on the bean 
-			// But if it's an unknown key, there's no point checking java.lang.Object
-			List primKeyFields = cmp.getKeyAttributes();
-			if ((primKeyFields == null) || (primKeyFields.size() == 0)) {
-				JavaClass primaryKey = cmp.getPrimaryKey(); // don't need to check MOFHelper.isValidType(primaryKey), because it's already been called in the validateDeploymentDescriptor method
-				String beanName = (cmp.getName() == null) ? "null" : cmp.getName(); //$NON-NLS-1$
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2829, IEJBValidationContext.ERROR, bean, primaryKey, new String[] { primaryKey.getName(), beanName }, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 9.4.7.2
-	 */
-	public void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		super.validateMethodExists(vc, bean, clazz);
-
-		// If the class has no constructors defined, Java inserts a public constructor with no arguments.
-		// But if the class has at least one constructor defined, Java will not insert a constructor.
-		if (!hasDefaultConstructor && hasAConstructor) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2021, IEJBValidationContext.ERROR, bean, clazz, new String[] { clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-		hasAConstructor = false;
-		hasDefaultConstructor = false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPRemote.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPRemote.java
deleted file mode 100644
index 2a5ed9c3b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPRemote.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * Validates the remote interface of a CMP bean.
- */
-public class ValidateCMPRemote extends AValidateRemote implements IMessagePrefixEjb11Constants {
-	private static final String MSSGID = ".er"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_CMP_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_CMP_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2012, new String[]{CHKJ2012+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2415, new String[]{CHKJ2415+BEXT, CHKJ2415+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionBean.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionBean.java
deleted file mode 100644
index 2a787beae..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionBean.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks Session home interface classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section: 6.8, 6.10.2, 6.10.3 and 6.10.4
- */
-public class ValidateSessionBean extends AValidateBean implements IMessagePrefixEjb11Constants {
-	private boolean hasValidConstructor = false;
-	private boolean hasAConstructor = false;
-	private boolean hasDefaultCreateMethod = false;
-	private Set createMethods = null;
-
-	private static final String MSSGID = ".sb"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_SESSION_BEANCLASS;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_SESSION_HOME, IValidationRuleList.EJB11_SESSION_REMOTE};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-
-		MESSAGE_IDS.put(CHKJ2003I, new String[]{CHKJ2003I + SPEC});
-		MESSAGE_IDS.put(CHKJ2003E, new String[]{CHKJ2003E + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2006, new String[]{CHKJ2006+EXT});
-		MESSAGE_IDS.put(CHKJ2007, new String[]{CHKJ2007+EXT});
-		MESSAGE_IDS.put(CHKJ2008, new String[]{CHKJ2008+EXT});
-
-		MESSAGE_IDS.put(CHKJ2013, new String[]{CHKJ2013+EXT});
-		MESSAGE_IDS.put(CHKJ2014, new String[]{CHKJ2014+EXT});
-		MESSAGE_IDS.put(CHKJ2015, new String[]{CHKJ2015+EXT});
-
-		MESSAGE_IDS.put(CHKJ2022, new String[]{CHKJ2022+EXT});
-		MESSAGE_IDS.put(CHKJ2025, new String[]{CHKJ2025+BEXT, CHKJ2025+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2040, new String[]{CHKJ2040+EXT});
-
-		MESSAGE_IDS.put(CHKJ2103, new String[]{CHKJ2103 + SPEC});
-		MESSAGE_IDS.put(CHKJ2200, new String[]{CHKJ2200+ON_BASE+SPEC, CHKJ2200+ON_THIS+SPEC}); // CHKJ2200 is a special case. It's shared by all bean types.
-
-		MESSAGE_IDS.put(CHKJ2400_bus, new String[]{CHKJ2400_bus+BEXT, CHKJ2400_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2400_ejbCreate, new String[]{CHKJ2400_ejbCreate+BEXT, CHKJ2400_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2401, new String[]{CHKJ2401+BEXT, CHKJ2401+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_bus, new String[]{CHKJ2408_bus+BEXT, CHKJ2408_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2408_ejbCreate, new String[]{CHKJ2408_ejbCreate+BEXT, CHKJ2408_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_bus, new String[]{CHKJ2409_bus+BEXT, CHKJ2409_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2409_ejbCreate, new String[]{CHKJ2409_ejbCreate+BEXT, CHKJ2409_ejbCreate+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2410_bus, new String[]{CHKJ2410_bus+BEXT, CHKJ2410_bus+MEXT});
-		MESSAGE_IDS.put(CHKJ2410_ejbCreate, new String[]{CHKJ2410_ejbCreate+BEXT, CHKJ2410_ejbCreate+MEXT});
-		MESSAGE_IDS.put(CHKJ2411, new String[]{CHKJ2411+BEXT, CHKJ2411+MEXT});
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2420, new String[]{CHKJ2420+BEXT, CHKJ2420+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2432, new String[]{CHKJ2432+BEXT, CHKJ2432+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2456, new String[]{CHKJ2456+ON_BASE, CHKJ2456+ON_THIS}); // special case (shared by all types)
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public void reset() {
-		super.reset();
-		createMethods.clear();
-	}
-
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public ValidateSessionBean() {
-		createMethods = new HashSet();
-	}
-	
-	protected final String getParentName() {
-		return ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONBEAN;
-	}
-	
-	protected boolean hasCreateMethod() {
-		if (hasDefaultCreateMethod == true)
-			return true;
-		if (createMethods.size() > 0)
-			return true;
-		return false;
-	}
-
-	protected void incrementCreateMethodCount(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-
-		if ((method.listParametersWithoutReturn().length == 0) && (!hasDefaultCreateMethod)) {
-			hasDefaultCreateMethod = true;
-		}
-		else {
-			// add it to the list, for reporting extraneous create methods, for stateless session beans (section 6.8)
-			createMethods.add(method);
-		}
-	}
-
-	public boolean isFrameworkMethod(String name) {
-		if (super.isFrameworkMethod(name)) {
-			return true;
-		}
-
-		// check for session-specific methods
-		if (name.equals(IMethodAndFieldConstants.METHODNAME_SETSESSIONCONTEXT)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check that the ejbCreate methods and business methods follow the EJB 1.1 spec.
-	 * Section: 6.8, 6.10.2, 6.10.3 and 6.10.4
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		// super.primValidate(ejbMethod);
-
-		vc.terminateIfCancelled();
-
-		String name = ejbMethod.getName();
-		if (name.equals(IMethodAndFieldConstants.METHODNAME_EJBCREATE)) {
-			validateEjbCreateMethod(vc, bean, clazz, ejbMethod);
-		}
-		else if (name.equals(IMethodAndFieldConstants.METHODNAME_FINALIZE)) {
-			validateFinalizeMethod(vc, bean, clazz, ejbMethod);
-		}
-		else if (ejbMethod.isConstructor()) {
-			validateConstructor(vc, bean, clazz, ejbMethod);
-		}
-		else if (isBusinessMethod(vc, bean, clazz, ejbMethod)) {
-			validateBusinessMethod(vc, bean, clazz, ejbMethod);
-		}
-		else if (!isFrameworkMethod(name)) {
-			validateHelperMethod(vc, bean, clazz, ejbMethod);
-		}
-
-		vc.terminateIfCancelled();
-
-	}
-	
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		if (IMethodAndFieldConstants.METHODNAME_EJBCREATE.equals(ejbMethod.getName()))
-			incrementCreateMethodCount(vc, bean, clazz, ejbMethod);
-		else if (ejbMethod.isConstructor())
-			validateConstructor(vc, bean, clazz, ejbMethod);
-	}
-	
-	/**
-	 * Test that the supplied business method follows the EJB 1.1 spec rules.
-	 * Section: 6.10.4
-	 */
-	public void validateBusinessMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		super.validateBusinessMethod(vc, bean, clazz, method); // check method name does not start with 'ejb'	
-
-		// The method arguments and return value types must be legal types for RMI/IIOP.
-		validateLegalRMIMethodWithoutExceptions(vc, bean, clazz, method);
-
-		// The rest of the checks are performed in the validateMethod method.
-		validateBusinessModifiersAndExceptions(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * Check that the session bean class definition follows the EJB 1.1 spec.
-	 *
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * URL: http://java.sun.com/products/ejb/docs.html
-	 * Section: 6.10.2
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		super.validateClass(vc, bean, clazz);
-		// super.validateClass() performs the following checks:
-		// 		- The class must implement, directly or indirectly, the javax.ejb.SessionBean 
-		//        interface.
-		//   	- The class must be defined as public, must not be final, and must not 
-		//        be abstract.
-
-		// If the class is a stateful session bean, it may optionally implement 
-		// the javax.ejb.SessionSynchronization interface.
-
-		Session session = (Session)bean;
-		boolean isStateless = ValidationRuleUtility.isStateless(bean);
-		boolean isBeanManagedStateful = (ValidationRuleUtility.isBeanManagedSession(session) && ValidationRuleUtility.isStateful(session));
-
-		if (isStateless) {
-			/*
-			 * EJB 1.1 specification
-			 * Section: 6.5.3
-			 */
-			try {
-				if (ValidationRuleUtility.isAssignableFrom(bean.getEjbClass(), ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION, bean))) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2003E, IEJBValidationContext.ERROR, bean, bean.getEjbClass(), this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String beanClassName = (bean.getEjbClass() == null) ? IEJBValidatorConstants.NULL_BEAN_CLASS : bean.getEjbClass().getJavaName();
-				String eClass = (e.getJavaClass() == null) ? ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION : e.getJavaClass().getJavaName(); // Since only getType throws InvalidInputException, this cannot have been thrown because of the bean class
-				String[] msgParm = { beanClassName, eClass };
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2433, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-		else if (isBeanManagedStateful) {
-			/*
-			 * EJB 1.1 specification
-			 * Section: 6.5.3
-			 */
-			try {
-				if (ValidationRuleUtility.isAssignableFrom(bean.getEjbClass(), ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION, bean))) {
-					IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2003I, IEJBValidationContext.INFO, bean, bean.getEjbClass(), this);
-					vc.addMessage(message);
-				}
-			}
-			catch (InvalidInputException e) {
-				String[] msgParm = { bean.getEjbClass().getQualifiedName(), e.getJavaClass().getQualifiedName()};
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2907, IEJBValidationContext.WARNING, bean, msgParm, this);
-				vc.addMessage(message);
-			}
-		}
-
-		// The session bean class may have superclasses and/or superinterfaces. If the 
-		// session bean has superclasses, then the business methods, the ejbCreate methods, 
-		// the methods of the SessionBean interface, and the methods of the optional 
-		// SessionSynchronization interface may be defined in the session bean class, 
-		// or in any of its superclasses.
-		//  - this is taken care of by the EJB MOF model. When asked if a JavaClass has a method,
-		//    the model checks the class' parents too.
-
-		// The class may, but is not required to, implement the session bean's 
-		// remote interface [4] .
-		// [4] If the session bean class does implement the remote interface, care must 
-		// be taken to avoid passing of this as a method argument or result. This 
-		// potential error can be avoided by choosing not to implement the remote 
-		// interface in the session bean class.
-		validateClass_remoteDep(vc, bean, clazz);
-	}
-	
-	/**
-	 * Check that the session bean class definition follows the EJB 1.1 spec.
-	 *
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * URL: http://java.sun.com/products/ejb/docs.html
-	 * Section: 6.10.2
-	 */
-	public void validateClass_remoteDep(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		// The class may, but is not required to, implement the session bean's 
-		// remote interface [4] .
-		// [4] If the session bean class does implement the remote interface, care must 
-		// be taken to avoid passing of this as a method argument or result. This 
-		// potential error can be avoided by choosing not to implement the remote 
-		// interface in the session bean class.
-		JavaClass remote = bean.getRemoteInterface();
-		ValidationRuleUtility.isValidTypeHierarchy(bean, remote);
-		if (ValidationRuleUtility.isAssignableFrom(clazz, remote)) {
-			String[] msgParm = {clazz.getQualifiedName(), remote.getQualifiedName()};
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IEJBValidatorMessageConstants.CHKJ2040, IEJBValidationContext.INFO, bean, clazz, msgParm, this);
-			vc.addMessage(message);
-		}
-
-	}
-	
-	protected void validateConstructor(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-
-		hasAConstructor = true;
-		if (!hasValidConstructor && ValidationRuleUtility.isPublic(method) && (method.listParametersWithoutReturn().length == 0)) {
-			hasValidConstructor = true;
-		}
-	}
-	
-	/**
-	 * Test that the supplied ejbCreate method follows the EJB 1.1 spec rules.
-	 * Section: 6.10.3
-	 */
-	public void validateEjbCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		vc.terminateIfCancelled();
-
-		// The method which calls this method has already tested that the method name is ejbCreate.
-		if (method == null) {
-			return;
-		}
-
-		// The return type must be void.
-		JavaHelpers parmType = method.getReturnType();
-		String returnTypeName = ((parmType == null) ? "" : parmType.getQualifiedName()); //$NON-NLS-1$
-
-		if (!returnTypeName.equals(ITypeConstants.VOID)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2401, IEJBValidationContext.ERROR, bean, clazz, method, new String[] {clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-
-		// The method arguments must be legal types for RMI/IIOP.
-		validateLegalRMIMethodArguments(vc, bean, clazz, method);
-
-		validateEjbCreateModifiersAndExceptions(vc, bean, clazz, method);
-
-		validateEjbCreateMethod_homeDep(vc, bean, clazz, method);
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.10.2
-	 */
-	protected void validateFinalizeMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-
-		if (method.listParametersWithoutReturn().length == 0) {
-			// This is a warning, not an error, because EJB 1.0 allowed the finalize() method to be called. EJB 1.1 (section 6.10.2) specifically prohibits it.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2007, IEJBValidationContext.WARNING, bean, clazz, method, new String[] {clazz.getQualifiedName()}, this);
-			vc.addMessage(message);
-		}
-	}
-	
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.8, 6.10.2 and 6.10.3
-	 */
-	protected void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		final String[] modelObjectName = new String[] { clazz.getQualifiedName()};
-		if (!hasValidConstructor && hasAConstructor) {
-			// If a public constructor with no arguments does not exist explicitly,
-			// Java will insert one as long as there are no constructors defined in the
-			// class. If there is a constructor, Java does not insert a default constructor.
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2006, IEJBValidationContext.ERROR, bean, clazz, modelObjectName, this);
-			vc.addMessage(message);
-		}
-
-		if (!hasCreateMethod()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2008, IEJBValidationContext.ERROR, bean, clazz, modelObjectName, this);
-			vc.addMessage(message);
-		}
-
-		// The session bean class must define a single ejbCreate method that takes 
-		// no arguments.
-		if (ValidationRuleUtility.isStateless(bean) && (createMethods.size() > 0)) {
-			Iterator iterator = createMethods.iterator();
-			while (iterator.hasNext()) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2025, IEJBValidationContext.ERROR, bean, clazz, (Method) iterator.next(), modelObjectName, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	
-	/**
-	 * Test that the supplied method follows the EJB 1.1 spec rules.
-	 *
-	 * ejbCreate and business methods follow some of the same rules. This method checks those rules.
-	 * (Part of sections 6.10.3 and 6.10.4)
-	 */
-	public void validateBusinessModifiersAndExceptions(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// EJB 2.0 added "throws InvalidInputException" above
-		vc.terminateIfCancelled();
-		if (method == null)
-			return;
-
-		// The method must be declared as public.
-		if (!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2408_bus, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method must not be declared as final or static.
-		if (method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2410_bus, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if (method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2409_bus, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The throws clause may define arbitrary application exceptions, possibly 
-		// including the javax.ejb.CreateException. 
-		// Compatibility Note: EJB 1.0 allowed the business methods to throw the java.rmi.RemoteException 
-		// to indicate a non-application exception. This practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant
-		// enterprise bean should throw the javax.ejb.EJBException or another RuntimeException to
-		// indicate non-application exceptions to the Container (see Section 12.2.2).
-		validateNoRemoteException(vc, bean, clazz, method, IMessagePrefixEjb11Constants.CHKJ2400_bus);
-	}
-
-	public void validateEjbCreateModifiersAndExceptions(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		// EJB 2.0 added "throws InvalidInputException" above
-		vc.terminateIfCancelled();
-		if (method == null)
-			return;
-
-		// The method must be declared as public.
-		if (!ValidationRuleUtility.isPublic(method)) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2408_ejbCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The method must not be declared as final or static.
-		if (method.isStatic()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2410_ejbCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		if (method.isFinal()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2409_ejbCreate, IEJBValidationContext.ERROR, bean, clazz, method, this);
-			vc.addMessage(message);
-		}
-
-		// The throws clause may define arbitrary application exceptions, possibly 
-		// including the javax.ejb.CreateException. 
-		// Compatibility Note: EJB 1.0 allowed the business methods to throw the java.rmi.RemoteException 
-		// to indicate a non-application exception. This practice is deprecated in EJB 1.1 -- an EJB 1.1 compliant
-		// enterprise bean should throw the javax.ejb.EJBException or another RuntimeException to
-		// indicate non-application exceptions to the Container (see Section 12.2.2).
-		validateNoRemoteException(vc, bean, clazz, method, IMessagePrefixEjb11Constants.CHKJ2400_ejbCreate);
-	}
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-		hasValidConstructor = false;
-		hasAConstructor = false;
-		hasDefaultCreateMethod = false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionHome.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionHome.java
deleted file mode 100644
index 528a43805..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionHome.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-/**
- * This class checks Session home interface classes for errors or potential errors.
- * If any problems are found, an error, warning, or info marker is added to the task list.
- *
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * URL: http://java.sun.com/products/ejb/docs.html
- * Section: 6.8 and 6.10.6
- *
- */
-public class ValidateSessionHome extends AValidateHome implements IMessagePrefixEjb11Constants {
-	private boolean hasDefaultCreateMethod = false;
-	private Set createMethods = null;
-
-	private static final String MSSGID = ".sh"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_SESSION_HOME;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_SESSION_BEANCLASS, IValidationRuleList.EJB11_SESSION_REMOTE};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2005, new String[]{CHKJ2005+BEXT, CHKJ2005+MEXT});
-		MESSAGE_IDS.put(CHKJ2010, new String[]{CHKJ2010+EXT});
-		
-		MESSAGE_IDS.put(CHKJ2011, new String[]{CHKJ2011+EXT});
-		MESSAGE_IDS.put(CHKJ2012, new String[]{CHKJ2012+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2024, new String[]{CHKJ2024+BEXT, CHKJ2024+MEXT});
-		MESSAGE_IDS.put(CHKJ2026, new String[]{CHKJ2026+BEXT, CHKJ2026+MEXT});
-		
-		MESSAGE_IDS.put(CHKJ2104, new String[]{CHKJ2104 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2402, new String[]{CHKJ2402+BEXT, CHKJ2402+MEXT});
-		MESSAGE_IDS.put(CHKJ2403, new String[]{CHKJ2403+BEXT, CHKJ2403+MEXT});
-		MESSAGE_IDS.put(CHKJ2405, new String[]{CHKJ2405+BEXT, CHKJ2405+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2415, new String[]{CHKJ2415+BEXT, CHKJ2415+MEXT});
-		MESSAGE_IDS.put(CHKJ2419, new String[]{CHKJ2419+BEXT, CHKJ2419+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public void reset() {
-		super.reset();
-		createMethods.clear();
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-
-	public ValidateSessionHome() {
-		createMethods = new HashSet();
-	}
-
-	protected boolean hasCreateMethod() {
-		if (hasDefaultCreateMethod == true)
-			return true;
-		if (createMethods.size() > 0)
-			return true;
-		return false;
-	}
-
-	protected void incrementCreateMethodCount(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		if (method == null) {
-			return;
-		}
-
-		if ((method.listParametersWithoutReturn().length == 0) && (!hasDefaultCreateMethod)) {
-			hasDefaultCreateMethod = true;
-		}
-		else {
-			// add it to the list, for reporting extraneous create methods, for stateless session beans (section 6.8)
-			createMethods.add(method);
-		}
-	}
-
-	/**
-	 * Check the session home interface's methods follow the EJB 1.1 spec.
-	 * 
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * URL: http://java.sun.com/products/ejb/docs.html
-	 * Section: 6.8 and 6.10.6
-	 */
-	public void primValidate(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method hiMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		// super.primValidate(hiMethod);
-
-		vc.terminateIfCancelled();
-
-		String name = hiMethod.getName();
-		// Home interface should only declare create methods
-		if (name.equals(IMethodAndFieldConstants.METHODNAME_CREATE)) {
-			validateCreateMethod(vc, bean, clazz, hiMethod);
-		}
-		else {
-			// Home interface should only declare create methods
-			// (No methods other than create methods are listed in section 6.10.6,
-			// but other sections of the spec, e.g. 9.2.2, explicitly list each type
-			// of method which can be on a class/interface.)
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2419, IEJBValidationContext.ERROR, bean, clazz, hiMethod, this);
-			vc.addMessage(message);
-		}
-
-		vc.terminateIfCancelled();
-	}
-
-	/**
-	 * Checks to see if @ejbMethod is one of the required methods.
-	 */
-	protected void primValidateExistence(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method ejbMethod) throws InvalidInputException {
-		// Can't invoke an abstract method
-		//super.validateExistence(ejbMethod);
-
-		if (IMethodAndFieldConstants.METHODNAME_CREATE.equals(ejbMethod.getName()))
-			incrementCreateMethodCount(vc, bean, clazz, ejbMethod);
-	}
-	
-	/**
-	 * Check that the session home class definition follows the EJB 1.1 spec.
-	 *
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * URL: http://java.sun.com/products/ejb/docs.html
-	 * Section: 6.10.6
-	 */
-	public void validateClass(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		vc.terminateIfCancelled();
-		// Both of the above checks are performed by the ValidateHome class's validateClass method.
-		super.validateClass(vc, bean, clazz);
-	}
-
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.8 and 6.10.6
-	 */
-	protected void validateCreateMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) throws InvalidInputException {
-		if (method == null) {
-			return;
-		}
-
-		// The methods defined in this interface must follow the rules for RMI/IIOP. 
-		// This means that their argument and return values must be of valid types 
-		// for RMI/IIOP, and that their throws clause must include the java.rmi.RemoteException.
-		validateLegalRMIMethod(vc, bean, clazz, method);
-
-		// Each create method must be named "create", and it must match one of 
-		// the ejbCreate methods defined in the session bean class. The matching 
-		// ejbCreate method must have the same number and types of arguments. 
-		// (Note that the return type is different.)
-		// All the exceptions defined in the throws clause of an ejbCreate method 
-		// of the session bean class must be defined in the throws clause of the 
-		// matching create method of the home interface.
-		// The throws clause must include javax.ejb.CreateException.
-		validateCreateMethod_beanDep(vc, bean, clazz, method);
-
-		// The throws clause must include javax.ejb.CreateException.
-		if (!ValidationRuleUtility.throwsCreateException(bean, method)) {
-			String[] msgParm = { ITypeConstants.CLASSNAME_JAVAX_EJB_CREATEEXCEPTION };
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2414, IEJBValidationContext.ERROR, bean, clazz, method, msgParm, this);
-			vc.addMessage(message);
-		}
-
-		// Perform the checks which depend on another class in the enterprise bean.
-		validateCreateMethod_remoteDep(vc, bean, clazz, method);
-	}
-
-	/**
-	 * EJB 1.1 specification
-	 * Section: 6.8 and 6.10.6
-	 */
-	protected void validateMethodExists(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz) throws InvalidInputException {
-		final String[] modelObjectName = new String[] { clazz.getQualifiedName()};
-
-		// A session bean's home must define one or more create methods.
-		if (!hasCreateMethod()) {
-			IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2010, IEJBValidationContext.ERROR, bean, clazz, modelObjectName, this);
-			vc.addMessage(message);
-		}
-
-		// The home interface of a stateless session bean must have one create 
-		// method that takes no arguments and returns the session bean's remote 
-		// interface. There can be no other create methods in the home interface. 
-		if (ValidationRuleUtility.isStateless(bean) && (createMethods.size() > 0)) {
-			Iterator iterator = createMethods.iterator();
-			while (iterator.hasNext()) {
-				IMessage message = MessageUtility.getUtility().getMessage(vc, IMessagePrefixEjb11Constants.CHKJ2024, IEJBValidationContext.ERROR, bean, clazz, (Method) iterator.next(), modelObjectName, this);
-				vc.addMessage(message);
-			}
-		}
-	}
-	/*
-	 * @see IValidationRule#preValidate(IEJBValidationContext, Object, Object)
-	 */
-	public void preValidate(IEJBValidationContext vc, Object targetParent, Object target) throws ValidationCancelledException, ValidationException {
-		super.preValidate(vc, targetParent, target);
-		hasDefaultCreateMethod = false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionRemote.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionRemote.java
deleted file mode 100644
index 68220649d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionRemote.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-
-/**
- * Validates the remote interface of a Session bean.
- */
-public class ValidateSessionRemote extends AValidateRemote implements IMessagePrefixEjb11Constants {
-	private static final String MSSGID = ".sr"; // In messages, to identify which message version belongs to the BMP bean class, this id is used. //$NON-NLS-1$
-	private static final String EXT = MSSGID + SPEC; // Extension to be used on non-method, non-field messages
-	private static final String BEXT = MSSGID + ON_BASE + SPEC; // Extension to be used on a method/field message when the method/field is inherited from a base type
-	private static final String MEXT = MSSGID + ON_THIS + SPEC; // Extension to be used on a method/field message when the method/field is implemented on the current type
-
-	private static final Object ID = IValidationRuleList.EJB11_SESSION_REMOTE;
-	private static final Object[] DEPENDS_ON = new Object[]{IValidationRuleList.EJB11_SESSION_BEANCLASS};
-	private static final Map MESSAGE_IDS;
-	
-	static {
-		MESSAGE_IDS = new HashMap();
-		
-		MESSAGE_IDS.put(CHKJ2012, new String[]{CHKJ2012+EXT});
-		MESSAGE_IDS.put(CHKJ2017, new String[]{CHKJ2017+EXT});
-
-		MESSAGE_IDS.put(CHKJ2023, new String[]{CHKJ2023+BEXT, CHKJ2023+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2105, new String[]{CHKJ2105 + SPEC});
-
-		MESSAGE_IDS.put(CHKJ2412, new String[]{CHKJ2412+BEXT, CHKJ2412+MEXT});
-		MESSAGE_IDS.put(CHKJ2413, new String[]{CHKJ2413+BEXT, CHKJ2413+MEXT});
-		MESSAGE_IDS.put(CHKJ2414, new String[]{CHKJ2414+BEXT, CHKJ2414+MEXT});
-		MESSAGE_IDS.put(CHKJ2415, new String[]{CHKJ2415+BEXT, CHKJ2415+MEXT});
-
-		MESSAGE_IDS.put(CHKJ2041, new String[]{CHKJ2041}); // special case. Shared by all types.
-		MESSAGE_IDS.put(CHKJ2433, new String[]{CHKJ2433});
-		MESSAGE_IDS.put(CHKJ2907, new String[]{CHKJ2907});
-	}
-	
-	public final Map getMessageIds() {
-		return MESSAGE_IDS;
-	}
-	
-	public final Object[] getDependsOn() {
-		return DEPENDS_ON;
-	}
-	
-	public final Object getId() {
-		return ID;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationCancelledException.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationCancelledException.java
deleted file mode 100644
index 1b9d6146c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationCancelledException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-/**
- * This exception should be thrown if the user cancels validation.
- */
-public class ValidationCancelledException extends RuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7065655347030103289L;
-
-	public ValidationCancelledException() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java
deleted file mode 100644
index eac49077b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java
+++ /dev/null
@@ -1,1627 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.ejb.internal.impl.LocalModelledPersistentAttributeFilter;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-/**
- * @version 	1.0
- * @author
- */
-public final class ValidationRuleUtility {
-	public static long method_and_field_counter = 0x1; // used by IMethodAndFieldConstants.java
-	private static final String[] _reservedWords = new String[]{"SELECT", "FROM", "WHERE", "DISTINCT", "OBJECT", "NULL", "TRUE", "FALSE", "NOT", "AND", "OR", "BETWEEN", "LIKE", "IN", "AS", "UNKNOWN", "EMPTY", "MEMBER", "OF", "IS"}; //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$
-	private static final String COMMA = ", "; //$NON-NLS-1$
-
-	private static LogEntry logEntry = null;
-	private static Logger logger = null;
-	
-	public static HashMap helperMap = null;
-	public static Map projectHelperMap =   Collections.synchronizedMap( new HashMap() );
-	private static HashSet commonClassNames = null;
-	
-	public static JavaClass getCMRFieldType(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, CMRField field) {
-		CommonRelationshipRole role = field.getRole();
-		if(!role.isMany()) {
-			ContainerManagedEntity cmp = role.getTypeEntity();
-			if(cmp == null) {
-				return null;
-			}
-			
-			JavaClass local = cmp.getLocalInterface();
-			// If the user has made a mistake in ejb-jar.xml, and they are trying to make
-			// a relationship to a cmp which does not have a local interface, an InvalidInputException
-			// will be thrown. Let the DD validation catch that error; just return
-			// when this happens.
-			try {
-				ValidationRuleUtility.isValidTypeHierarchy(cmp, local);
-			}
-			catch(InvalidInputException e) {
-				return null;
-			}
-			return local;
-		}
-			// <cmr-field-type> is either a java.util.Collection or a java.util.Set (p. 464)
-			return field.getCollectionType();
-	}
-
-	
-
-	
-	public static final boolean followsFinderExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return ValidationRuleUtility.throwsFinderException(bean, method);
-	}
-
-	public static final boolean followsObjectNotFoundExceptionRules(EnterpriseBean bean, Method method) throws InvalidInputException {
-		JavaHelpers javaUtilEnumeration = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_ENUMERATION, bean);
-		if(ValidationRuleUtility.isAssignableFrom(method.getReturnType(), javaUtilEnumeration)) {
-			// Only single object finder and select methods may throw this exception
-			return !ValidationRuleUtility.throwsObjectNotFoundException(bean, method);
-		}
-		
-		JavaHelpers javaUtilCollection = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION, bean);
-		if(ValidationRuleUtility.isAssignableFrom(method.getReturnType(), javaUtilCollection)) {
-			// Only single object finder and select methods may throw this exception
-			return !ValidationRuleUtility.throwsObjectNotFoundException(bean, method);
-		}
-		
-		// It's a single finder/select method, so it can throw the exception, though it is not required to.
-		return true;
-	}
-
-	/**
-	 * If it exists, return the Method from the method list which has the given
-	 * name and parameter types (in the same order as the array elements).
-	 *
-	 * This method is a duplicate of getMethodExtended(String, String[]).
-	 * For performance reasons, the code was duplicated instead of converting the
-	 * JavaParameter[] into a String[].
-	 */
-	private static Method getMethod(String name, JavaParameter[] parameterTypes, List methodList) {
-		if(methodList == null) {
-			return null;
-		}
-		
-		Method method = null;
-		JavaParameter[] params = null;
-		boolean found = false;
-	
-		Iterator iterator = methodList.iterator();
-		while(iterator.hasNext()) {
-			method = (Method)iterator.next();
-			
-			if (method.getName().equals(name)) {
-				params = method.listParametersWithoutReturn();
-				
-				if (params.length == parameterTypes.length) {
-					found = true; //Maybe; we need more info
-					
-					for (int j = 0; j < params.length; j++) {
-						//if any one of the parameters doesn't match then flip back to false
-						JavaHelpers parm = ((JavaHelpers)params[j].getEType());
-						JavaHelpers type = ((JavaHelpers)parameterTypes[j].getEType());
-						if(!isSameType(parm, type)) {
-							found = false;
-							break;
-						}
-					}
-					
-					if (found) {
-						return method;
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	private static Method getMethod(String name, JavaHelpers[] parameterTypes, List methodList) {
-		if(methodList == null) {
-			return null;
-		}
-		
-		Method method = null;
-		JavaParameter[] params = null;
-		boolean found = false;
-	
-		Iterator iterator = methodList.iterator();
-		while(iterator.hasNext()) {
-			method = (Method)iterator.next();
-			
-			if (method.getName().equals(name)) {
-				params = method.listParametersWithoutReturn();
-				
-				if (params.length == parameterTypes.length) {
-					found = true; //Maybe; we need more info
-					
-					for (int j = 0; j < params.length; j++) {
-						//if any one of the parameters doesn't match then flip back to false
-						JavaHelpers parm = ((JavaHelpers)params[j].getEType());
-						JavaHelpers type = parameterTypes[j];
-						if(!isSameType(parm, type)) {
-							found = false;
-							break;
-						}
-					}
-					
-					if (found) {
-						return method;
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * From JavaClass clazz, return a method, named methodNameToFind,
-	 * which has exactly the same arguments as methodToMatch.
-	 *
-	 * If no method exists with that name and argument list, return null.
-	 * 
-	 * This method does not check the exceptions or return type.
-	 */
-	public static Method getMethod(Method methodToMatch, String methodNameToFind, List methodsExtendedList) {
-		if(methodsExtendedList == null) {
-			// It is not invalid to call this method with a null List. A null List
-			// means that a type whose methods need to be searched doesn't exist,
-			// such as searching a local view, but the bean has only a remote view.
-			return null;
-		}
-		return getMethod(methodNameToFind, methodToMatch.listParametersWithoutReturn(), methodsExtendedList);
-	}
-	
-	/**
-	 * From JavaClass clazz, return a method, named methodNameToFind,
-	 * which has exactly the same arguments as methodToMatch.
-	 *
-	 * If no method exists with that name and argument list, return null.
-	 * 
-	 * This method does not check the exceptions or return type.
-	 */
-	public static Method getMethodExtended(JavaClass clazz, Method methodToMatch, String methodNameToFind) throws InvalidInputException {
-		if ((clazz == null) || (methodToMatch == null) || (methodNameToFind == null)) {
-			return null;
-		}
-
-		return getMethodExtended(clazz, methodNameToFind, methodToMatch.listParametersWithoutReturn());
-	}
-	
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 *
-	 * This method is a duplicate of getMethodExtended(String, String[]).
-	 * For performance reasons, the code was duplicated instead of converting the
-	 * JavaParameter[] into a String[].
-	 */
-	public static Method getMethodExtended(JavaClass clazz, String methodName, JavaParameter[] parameterTypes) {
-		if (clazz.isInterface()) {
-			// Check the current class first. If the method has been overriden,
-			// don't want to return the parent's method instead of the child's.
-			return getMethodInterfaceExtended(clazz, methodName, parameterTypes);
-		}
-		// Check the current class first. If the method has been overriden,
-		// don't want to return the parent's method instead of the child's.
-		Method method = null;
-		List methods = null;
-		do {
-			methods = clazz.getMethods();
-			method = getMethod(methodName, parameterTypes, methods);
-			if (method != null) {
-				return method;
-			}
-
-			// else, search the parent	
-			clazz = clazz.getSupertype();
-		}
-		while ((method == null) && (clazz != null));
-
-		return null;
-	}
-	
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 *
-	 * This method is a duplicate of getMethodExtended(String, JavaParameter[]).
-	 * For performance reasons, the code was duplicated instead of converting the
-	 * JavaHelpers[] into a JavaParameter[].
-	 */
-	public static Method getMethodExtended(JavaClass clazz, String methodName, JavaHelpers[] parameterTypes) {
-		return getMethodExtended(clazz, methodName, parameterTypes, null);
-	}
-	
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 *
-	 * This method is a duplicate of getMethodExtended(String, JavaParameter[]).
-	 * For performance reasons, the code was duplicated instead of converting the
-	 * JavaHelpers[] into a JavaParameter[].
-	 * 
-	 * If retType is null it means that the return type of the method doesn't need to be checked.
-	 * Otherwise, check that the return type matches too.
-	 */
-	public static Method getMethodExtended(JavaClass clazz, String methodName, JavaHelpers[] parameterTypes, JavaHelpers retType) {
-		if (clazz.isInterface()) {
-			// Check the current class first. If the method has been overriden,
-			// don't want to return the parent's method instead of the child's.
-			return getMethodInterfaceExtended(clazz, methodName, parameterTypes);
-		}
-		// Check the current class first. If the method has been overriden,
-		// don't want to return the parent's method instead of the child's.
-		Method method = null;
-		List methods = null;
-		do {
-			methods = clazz.getMethods();
-			method = getMethod(methodName, parameterTypes, methods);
-			if (method != null) {
-				if(retType != null) {
-					JavaHelpers methRetType = method.getReturnType();
-					if(isAssignableFrom(methRetType, retType)) {
-						return method;
-					}
-				}
-				else {
-					return method;
-				}
-			}
-
-			// else, search the parent	
-			clazz = clazz.getSupertype();
-		}
-		while ((method == null) && (clazz != null));
-
-		return null;
-	}
-	
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 *
-	 * This method is a duplicate of getMethodInterfaceExtended(String, String[], JavaClass).
-	 * For performance reasons, the code was duplicated instead of converting the
-	 * JavaParameter[] into a String[].
-	 */
-	public static Method getMethodInterfaceExtended(JavaClass clazz, String methodName, JavaParameter[] parameterTypes) {
-		if (clazz == null) {
-			return null;
-		}
-
-		// Check the current class first. If the method has been overriden,
-		// don't want to return the parent's method instead of the child's.
-		Method method = getMethod(methodName, parameterTypes, clazz.getMethods());
-		if (method != null) {
-			return method;
-		}
-		// check parents
-		List classesToCheck = clazz.getImplementsInterfaces();
-		Iterator clazzIterator = classesToCheck.iterator();
-		while (clazzIterator.hasNext()) {
-			clazz = (JavaClass) clazzIterator.next();
-			method = getMethodInterfaceExtended(clazz, methodName, parameterTypes);
-			if (method != null) {
-				return method;
-			}
-		}
-
-		return null;
-	}
-	
-	public static Method getMethodInterfaceExtended(JavaClass clazz, String methodName, JavaHelpers[] parameterTypes) {
-		if (clazz == null) {
-			return null;
-		}
-
-		// Check the current class first. If the method has been overriden,
-		// don't want to return the parent's method instead of the child's.
-		Method method = getMethod(methodName, parameterTypes, clazz.getMethods());
-		if (method != null) {
-			return method;
-		}
-		// check parents
-		List classesToCheck = clazz.getImplementsInterfaces();
-		Iterator clazzIterator = classesToCheck.iterator();
-		while (clazzIterator.hasNext()) {
-			clazz = (JavaClass) clazzIterator.next();
-			method = getMethodInterfaceExtended(clazz, methodName, parameterTypes);
-			if (method != null) {
-				return method;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Return an array of the exceptions thrown by method but not methodToMatch.
-	 * If there are no such exceptions, return null. (Check the list of exceptions
-	 * in the method for each exception, or a parent of the exception.)
-	 */
-	public static final Set getNotSubsetExceptions(EnterpriseBean bean, Method method, Method methodToMatch) {
-		if((methodToMatch == null) || (method == null)) {
-			return Collections.EMPTY_SET;
-		}
-		
-		// All the exceptions defined in the throws clause of a method of the 
-		// entity bean class must be included in the throws clause of the matching 
-		// method of the home interface.
-		//
-		// Section 12.2.2
-		// [15] A checked exception is one that is not a subclass of java.lang.RuntimeException
-		// "Note that the javax.ejb.EJBException is a subclass of the java.lang.RuntimeException,
-		// and therefore it does not have to be listed in the throws clauses of the business
-		// methods."
-		HashSet exceptions = new HashSet();
-		List methToMatchExceptions = methodToMatch.getJavaExceptions();
-		List foundMethExceptions = method.getJavaExceptions();
-		for( int i = 0; i < foundMethExceptions.size(); i++ ) {
-			JavaClass exc = (JavaClass)foundMethExceptions.get(i);
-			if ( !isRuntimeException(exc, bean) && !isRemoteException(exc, bean) && !isExceptionInList(exc, methToMatchExceptions) ) {
-				exceptions.add(exc);
-			}
-		}
-	
-		return exceptions;
-	}
-	
-	/**
-	 * Return an array of the exceptions thrown by method but not methodToMatch.
-	 * If there are no such exceptions, return null. (Check the list of exceptions
-	 * in the method for each exception, or a child of the exception.)
-	 */
-	public static final Set getNotSubsetSubtypeExceptions(EnterpriseBean bean, Method method, Method methodToMatch) {
-		if((methodToMatch == null) || (method == null)) {
-			return Collections.EMPTY_SET;
-		}
-		
-		// All the exceptions defined in the throws clause of a method of the 
-		// entity bean class must be included in the throws clause of the matching 
-		// method of the home interface.
-		//
-		// Section 12.2.2
-		// [15] A checked exception is one that is not a subclass of java.lang.RuntimeException
-		// "Note that the javax.ejb.EJBException is a subclass of the java.lang.RuntimeException,
-		// and therefore it does not have to be listed in the throws clauses of the business
-		// methods."
-		HashSet exceptions = new HashSet();
-		List methToMatchExceptions = methodToMatch.getJavaExceptions();
-		List foundMethExceptions = method.getJavaExceptions();
-		for( int i = 0; i < foundMethExceptions.size(); i++ ) {
-			JavaClass exc = (JavaClass)foundMethExceptions.get(i);
-			if ( !isRuntimeException(exc, bean) && !isRemoteException(exc, bean) && !isSubtypeExceptionInList(exc, methToMatchExceptions) ) {
-				exceptions.add(exc);
-			}
-		}
-	
-		return exceptions;
-	}
-	
-	/**
-	 * 	Exclude root home interface methods 
-	 */
-	public static boolean isEJBHomeMethod(EnterpriseBean bean, Method method) {
-		return isSameType(bean, method.getContainingJavaClass(), ITypeConstants.CLASSNAME_JAVAX_EJB_EJBHOME);
-	}
-	
-	/**
-	 * 	Exclude root remote interface methods 
-	 */
-	public static boolean isEJBObjectMethod(EnterpriseBean bean, Method method) {
-		return isSameType(bean, method.getContainingJavaClass(), ITypeConstants.CLASSNAME_JAVAX_EJB_EJBOBJECT);
-	}
-	
-	/**
-	 * Return true if the exception, or a parent of the exception, is in the list of exceptions.
-	 */	
-	public static final boolean isExceptionInList(JavaClass exc, List exceptionList) {
-	       if((exc == null) || (exceptionList == null)) {
-	              return false;
-	       }
-	       
-	       if(!exc.isExistingType()) {
-	              return false;
-	       }
-	       
-	       Iterator iterator = exceptionList.iterator();
-	       while(iterator.hasNext()) {
-	              JavaClass exception = (JavaClass)iterator.next();
-	              if(isAssignableFrom(exc, exception)) {
-	                     // If there is a reflection problem, do not swallow the exception or a
-	                     // faulty message may appear. (i.e., "exc" is not thrown by "foo" when it
-	                     // really is but one of foo's exceptions wasn't reflected.
-	                     return true;
-	              }
-	       }
-	       return false;
-	}
-	
-	/**
-	 * Return true if the exception, or a child of the exception, is in the list of exceptions.
-	 */	
-	public static final boolean isSubtypeExceptionInList(JavaClass exc, List exceptionList) {
-	       if((exc == null) || (exceptionList == null)) {
-	              return false;
-	       }
-	       
-	       if(!exc.isExistingType()) {
-	              return false;
-	       }
-	       
-	       Iterator iterator = exceptionList.iterator();
-	       while(iterator.hasNext()) {
-	              JavaClass exception = (JavaClass)iterator.next();
-	              if(isAssignableFrom(exception, exc)) {
-	                     // If there is a reflection problem, do not swallow the exception or a
-	                     // faulty message may appear. (i.e., "exc" is not thrown by "foo" when it
-	                     // really is but one of foo's exceptions wasn't reflected.
-	                     return true;
-	              }
-	       }
-	       return false;
-	}
-
-	/**
-	 * Often, for validation messages, the validation message contains
-	 * the name of a class. But, sometimes, the validation message is
-	 * being generated because a class is null when it shouldn't be.
-	 * This method is a helper method which makes the construction of
-	 * the validation message a little less cluttered (i.e., instead
-	 * of checking if the class is null before constructing the
-	 * message, just call this method.)
-	 */
-	public static final String getQualifiedName(JavaHelpers helper) {
-		if(helper == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return helper.getJavaName();
-	}
-
-	/**
-	 * Return the method's parameters in a displayable format. e.g., if
-	 * the method signature is "public Integer foo(String a, String b, String c)"
-	 * then this method returns "String, String, String".
-	 */	
-	public static final String getParmsAsString(Method method) {
-		if(method == null) {
-			return ""; //$NON-NLS-1$
-		}
-		
-		return getParmsAsString(method.listParametersWithoutReturn());
-	}
-	
-	/**
-	 * Return the parameters in a displayable format. 
-	 * @see getParmsAsString(Method)
-	 */
-	public static final String getParmsAsString(JavaParameter[] parm) {
-		if(parm.length == 0) {
-			return ""; //$NON-NLS-1$
-		}
-		
-		StringBuffer buffer = new StringBuffer();
-		for(int i=0; i<parm.length; i++) {
-			JavaHelpers type = parm[i].getJavaType();
-			buffer.append(((type == null) ? "null" : type.getJavaName())); //$NON-NLS-1$
-			buffer.append(COMMA);
-		}
-		return buffer.substring(0, buffer.length() - 2); // since "COMMA" is 2 char long, and the last COMMA isn't needed at the end, return everything up to but excluding the last COMMA
-	}
-
-	/**
-	 * Return the parameters in a displayable format. 
-	 * @see getParmsAsString(Method)
-	 */
-	public static final String getParmsAsString(JavaHelpers[] parm) {
-		if(parm.length == 0) {
-			return ""; //$NON-NLS-1$
-		}
-		
-		StringBuffer buffer = new StringBuffer();
-		for(int i=0; i<parm.length; i++) {
-			JavaHelpers type = parm[i];
-			buffer.append(((type == null) ? "null" : type.getJavaName())); //$NON-NLS-1$
-			buffer.append(COMMA);
-		}
-		return buffer.substring(0, buffer.length() - 2); // since "COMMA" is 2 char long, and the last COMMA isn't needed at the end, return everything up to but excluding the last COMMA
-	}
-	
-	/**
-	 * Returns the name of the type, e.g. "com.ibm.foo.MyFoo"
-	 * If the type is an array, the array type will be returned.
-	 * e.g. if the type is java.lang.String[], java.lang.String[] will
-	 * be returned, not the java.lang.String type.
-	 */
-	public static final JavaHelpers getType(EClassifier classifier) {
-		if(classifier == null) {
-			return null;
-		}
-	
-		JavaHelpers type = ((JavaHelpers)classifier);
-	
-		return type;
-	}
-
-	 /**
-     * javaClassName must be fully qualified
-     */
-    public static JavaHelpers getType(String javaClassName, EnterpriseBean ejb) throws InvalidInputException {
-		if ((javaClassName == null) || (javaClassName.equals("") || (ejb == null))) //$NON-NLS-1$
-			throw new InvalidInputException();
-
-		Resource resource = ejb.eResource();
-		if (resource == null) {
-			throw new InvalidInputException();
-		}
-
-		JavaHelpers helper = null;
-		if(commonClassNames == null || commonClassNames.isEmpty()) {
-			initializeCommonClassNames();
-		}
-		if (commonClassNames.contains(javaClassName)) {
-			ResourceSet rSet = resource.getResourceSet();
-			ResourceSet set = resource == null ? null : resource.getResourceSet();
-			IProject project = null;
-			if (set instanceof ProjectResourceSet){
-				project = ((ProjectResourceSet) set).getProject();
-			}
-			
-			//helperMap = getHelperMap(rSet);
-			//Object obj = getHelperMap(rSet).get(javaClassName);
-			Object obj = getHelperMap(project).get(javaClassName);
-			if (obj != null) 
-				return (JavaHelpers) obj;
-			 else {
-				helper = getType(javaClassName,rSet);
-				//getHelperMap(rSet).put(javaClassName, helper);
-				getHelperMap(project).put(javaClassName, helper);
-			}
-		} else
-			helper = getType(javaClassName, resource.getResourceSet());
-		return helper;
-	}
-   
-	  protected static HashMap getHelperMap(IProject  project){
-		HashMap mapHelper = (HashMap)projectHelperMap.get( project ); 
-		if( mapHelper == null ){
-			mapHelper =  new HashMap();
-			projectHelperMap.put(project, mapHelper);
-		}
-		helperMap = mapHelper;
-		return mapHelper;
-	}    
-    
-	private static void initializeCommonClassNames() {
-		if(commonClassNames == null)
-			commonClassNames = new HashSet();
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_IO_IOEXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_IO_SERIALIZABLE);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_LANG_EXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_LANG_RUNTIMEEXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_RMI_REMOTE);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_RMI_REMOTEEXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_UTIL_ENUMERATION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVA_UTIL_SET);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_CREATEEXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_ENTITYBEAN);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBEXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBHOME);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBLOCALHOME);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBOBJECT);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBLOCALOBJECT);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_ENTITYCONTEXT);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_FINDEREXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_MESSAGEDRIVENBEAN);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_OBJECTNOTFOUNDEXCEPTION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONBEAN);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONCONTEXT);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_EJB_SESSIONSYNCHRONIZATION);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_JMS_MESSAGE);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_JMS_MESSAGELISTENER);
-		commonClassNames.add(ITypeConstants.CLASSNAME_JAVAX_TRANSACTION_USERTRANSACTION);
-	}
-	
-	/**
-	 * javaClassName must be fully qualified
-	 */
-	public static JavaHelpers getType(String javaClassName, ResourceSet resourceSet) throws InvalidInputException {
-		return getType(javaClassName, resourceSet, true);
-	}
-	
-	/**
-	 * javaClassName must be fully qualified
-	 */
-	public static JavaHelpers getType(String javaClassName, ResourceSet resourceSet, boolean throwExcIfNotValid) throws InvalidInputException {
-		if((javaClassName == null)  || (javaClassName.equals("") || (resourceSet == null))) { //$NON-NLS-1$
-			Logger aLogger = getMsgLogger();
-			if(aLogger.isLoggingLevel(Level.FINEST)) {
-				LogEntry entry = getLogEntry();
-				entry.setSourceID("ValidationRuleUtility.getType(String, ResourceSet, boolean)"); //$NON-NLS-1$
-				String text = "invalid parameter; javaClassName = {0} and resourceSet = {1}";
-				//entry.setText("invalid parameter; javaClassName = {0} and resourceSet = {1}"); //$NON-NLS-1$
-				//entry.setTokens(new String[]{javaClassName, String.valueOf(resourceSet)});
-				String result = MessageFormat.format(text,
-						 new String[]{javaClassName, String.valueOf(resourceSet)});
-				entry.setText(result);
-				
-				entry.appendStackTrace();
-				aLogger.write(Level.FINEST, entry);
-			}
-			throw new InvalidInputException();
-		}
-	
-		// If the class doesn't exist, it will be reflected
-		JavaHelpers helper = JavaRefFactory.eINSTANCE.reflectType(javaClassName, resourceSet);
-		if(throwExcIfNotValid) {
-			isValidType(helper); // check that the type has been reflected properly
-		}
-		
-		return helper;
-	}
-	
-	/**
-     * @return
-     */
-    private static LogEntry getLogEntry() {
-		if(logEntry == null) {
-		    logEntry = new LogEntry(IEJBValidatorConstants.BUNDLE_NAME);
-		}
-		logEntry.reset(); // reset the values so that we're not logging stale data
-		return logEntry;
-    }
-
-    /**
-     * @return
-     */
-    private static Logger getMsgLogger() {
-        if(logger == null)
-            logger = J2EECorePlugin.getPlugin().getMsgLogger();
-        return logger;
-    }
-
-    public static final JavaHelpers getType(Field field) {
-		if(field == null) {
-			return null;
-		}
-		
-		return (JavaHelpers)field.getEType();
-	}
-	
-	/**
-	 * Return true if the JavaClass passed in has the Method defined
-	 * on it. Return false if the Method is defined on a supertype or 
-	 * is not defined on the class at all.
-	 */
-	public static final boolean onClass(JavaClass clazz, Method method) {
-		if((clazz == null) || (method == null)) {
-			return false;
-		}
-		
-		return clazz.equals(method.getJavaClass()); 
-	}
-	
-	/**
-	 * Return true if the JavaClass passed in has the Field defined
-	 * on it. Return false if the Field is defined on a supertype or 
-	 * is not defined on the class at all.
-	 */
-	public static final boolean onClass(JavaClass clazz, Field field) {
-		if((clazz == null) || (field == null)) {
-			return false;
-		}
-		
-		return clazz.equals(field.getJavaClass()); 
-	}
-	
-	public static final boolean isApplicationException(JavaClass exception, EnterpriseBean bean) {
-		if(exception == null) {
-			return false;
-		}
-		
-		// Exempt EJBException from the application exception check because it'll drive users crazy to see 
-		// it flagged as an application exception.
-		try {
-			if(ValidationRuleUtility.isSameType(exception, getType(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBEXCEPTION, bean))) {
-				return false;
-			}
-		}
-		catch(InvalidInputException e) {
-			// logged in getType()
-			// if EJBException can't be found, then there's probably a system JAR missing
-		}
-		
-		// 18.1.1 Application exceptions
-		// An application exception is an exception defined in the throws clause of a method of the enterprise
-		// Bean's home and component interfaces, other than the java.rmi.RemoteException.
-		return !isRemoteException(exception, bean);
-	}
-	
-	public static final boolean isRemoteMethod(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method) {
-		try {
-			JavaHelpers javaRmiRemote = ValidationRuleUtility.getType(ITypeConstants.CLASSNAME_JAVA_RMI_REMOTE, bean);
-			if(isAssignableFrom(clazz, javaRmiRemote)) {
-				return true;
-			}
-		}
-		catch(InvalidInputException e) {
-			return false;
-		}
-		
-		return false;
-	}
-	
-	public static final boolean isReservedWord(String name) {
-		if(name == null) {
-			return false;
-		}
-		
-		String upperName = name.toUpperCase();
-		for(int i=0; i<_reservedWords.length; i++) {
-			if(upperName.equals(_reservedWords[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public static final boolean isRuntimeException(JavaClass clazz, EnterpriseBean bean) {
-		if(clazz == null) {
-			return false;
-		}
-		
-		try {
-			JavaHelpers runtimeExc = getType(ITypeConstants.CLASSNAME_JAVA_LANG_RUNTIMEEXCEPTION, bean);
-			return isException(clazz, runtimeExc.getWrapper());
-		}
-		catch(InvalidInputException e) {
-			return false;
-		}
-	}
-	
-	public static final boolean isRemoteException(JavaClass clazz, EnterpriseBean bean) {
-		if(clazz == null) {
-			return false;
-		}
-		
-		try {
-			JavaHelpers remoteExc = getType(ITypeConstants.CLASSNAME_JAVA_RMI_REMOTEEXCEPTION, bean);
-			return isException(clazz, remoteExc.getWrapper());
-		}
-		catch(InvalidInputException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Return true if the clazz is an instance of the exception.
-	 */	
-	public static final boolean isException(JavaClass clazz, JavaClass exception) {
-		if((clazz == null) || (exception == null)) {
-			return false;
-		}
-		
-		return isAssignableFrom(clazz, exception);
-	}
-	
-	/**
-	 * Return true if the type is either java.util.Collection, or a type which inherits/extends java.util.Collection.
-	 * The bean is needed to retrieve the java.util.Collection type.
-	 */
-	public static boolean isAssignableFromCollection(JavaHelpers type, EnterpriseBean bean) throws InvalidInputException {
-		JavaHelpers javaUtilCollection = getType(ITypeConstants.CLASSNAME_JAVA_UTIL_COLLECTION, bean);
-		return isAssignableFrom(type, javaUtilCollection);
-	}
-	
-	/**
-	 * Return true if the type is either java.util.Enumeration, or a type which inherits/extends java.util.Enumeration.
-	 * The bean is needed to retrieve the java.util.Enumeration type.
-	 */
-	public static boolean isAssignableFromEnumeration(JavaHelpers type, EnterpriseBean bean) throws InvalidInputException {
-		JavaHelpers javaUtilEnumeration = getType(ITypeConstants.CLASSNAME_JAVA_UTIL_ENUMERATION, bean);
-		return isAssignableFrom(type, javaUtilEnumeration);
-	}
-	
-	/**
-	 * Return true if the type is either java.util.Set, or a type which inherits/extends java.util.Set.
-	 * The bean is needed to retrieve the java.util.Set type.
-	 */
-	public static boolean isAssignableFromSet(JavaHelpers type, EnterpriseBean bean) throws InvalidInputException {
-		JavaHelpers javaUtilSet = getType(ITypeConstants.CLASSNAME_JAVA_UTIL_SET, bean);
-		return isAssignableFrom(type, javaUtilSet);
-	}
-	
-	/**
-	 * Returns true if the type is either the compare type, or inherits/extends the compare type.
-	 */
-	public static boolean isAssignableFrom(JavaHelpers type, JavaHelpers compareType) {
-		if((type == null) || (compareType == null)) {
-			return false;
-		}
-	
-		if(type.isPrimitive() || compareType.isPrimitive()) {
-			if(type.isPrimitive() && compareType.isPrimitive()) {
-				return type.getPrimitive().equals(compareType.getPrimitive());
-			}
-			return false;
-		}
-		else if(type.isArray() && compareType.isArray()) {
-			JavaClass classType = type.getWrapper();
-			JavaClass classCompareType = compareType.getWrapper();
-			if((classType == null) || (compareType == null)) {
-				return false;
-			}
-			JavaHelpers finalType = ((ArrayType)classType).getFinalComponentType();
-			JavaHelpers finalCompareType = ((ArrayType)classCompareType).getFinalComponentType();
-			return isAssignableFrom(finalType, finalCompareType);
-		}
-		else {
-			return compareType.getWrapper().isAssignableFrom(type.getWrapper());
-		}
-	}
-
-	/**
-	 * Return true if the given method is associated with a query element in ejb-jar.xml.
-	 */
-	public static final boolean isAssociatedWithQuery(ContainerManagedEntity cmp, Method method) {
-		// Check method is associated with a query element in ejb-jar.xml.
-		List queries = cmp.getQueries();
-		Iterator iterator = queries.iterator();
-		boolean found = false;
-		while(iterator.hasNext()) {
-			Query query = (Query)iterator.next();
-			QueryMethod queryMethod = query.getQueryMethod();
-			if(queryMethod == null) {
-				// Let the EJBJarVRule report this
-				continue;
-			}
-			
-			if((queryMethod.getName() == null) || queryMethod.getName().equals("")) { //$NON-NLS-1$
-				// Let the EJBJarVRule report this
-				continue;
-			}
-			
-			if(queryMethod.getName().equals(method.getName())) {
-				found = true;
-				break;
-			}
-		}
-		
-		return found;
-	}
-	
-	public static final boolean isBeanManagedSession(EnterpriseBean bean) {
-		if(bean == null) {
-			return false;
-		}
-		
-		if(bean.isEntity()) {
-			return false;
-		}
-	
-		return (((Session)bean).getTransactionType().getValue() == TransactionType.BEAN);
-	}
-	
-	/**
-	 * Return true if this method is the static initializer used for interfaces ("<clinit>")
-	 */
-	public static boolean isClinitMethod(EnterpriseBean bean, Method method) {
-		if (method == null) {
-			return false;
-		}
-
-		return method.getName().equals("<clinit>"); //$NON-NLS-1$
-	}
-
-	public static final boolean isJNDINamingContext(Field field) {
-		return true;
-	}
-	
-	/**
-	 * Return true if the field is defined on java.lang.Object.
-	 */
-	public static boolean isJavaLangObjectField(EnterpriseBean bean, Field field) {
-		return isSameType(bean, field.getContainingJavaClass(), ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT);
-	}
-	
-	/**
-	 * Return true if the method is defined on named class.
-	 */
-	public static boolean isOwnedBy(EnterpriseBean bean, Method method, String className) {
-		return isSameType(bean, method.getContainingJavaClass(), className);
-	}
-	
-	/**
-	 * Return true if given class is the same as the named class.
-	 */
-	public static boolean isSameType(EnterpriseBean bean, JavaClass owner, String className) {
-		try {
-			JavaHelpers helper = getType(className, bean);
-			if(helper == null) {
-				return false;
-			}
-			
-			JavaClass object = helper.getWrapper();
-			
-			return isSameType(owner, object);
-		}
-		catch(InvalidInputException e) {
-			return false;
-		}
-	}
-	
-	/**
-	 * Return true if given class is the same as the named class.
-	 */
-	public static boolean isSameType(JavaHelpers owner, JavaHelpers object) {
-		if(owner == null) {
-			return false;
-		}
-		
-		if(object == null) {
-			return false;
-		}
-		
-		if(owner.isPrimitive() && object.isPrimitive()) {
-			// Both are JavaDataType
-			return owner.getPrimitive().equals(object.getPrimitive());
-		}
-		else if(owner.isArray() && object.isArray()) {
-			// Both are ArrayType
-			ArrayType ownerArray = (ArrayType)owner;
-			ArrayType objectArray = (ArrayType)object;
-			return isSameType(ownerArray.getFinalComponentType(), objectArray.getFinalComponentType());
-		}
-		else if((owner.getWrapper() != null) && (object.getWrapper() != null)) {
-			// Both are JavaClass
-			return owner.getWrapper().equals(object.getWrapper());
-		}
-		else {
-			// mismatching JavaHelpers type
-			return false;
-		}
-	}
-	
-	/**
-	 * Return true if the method is defined on java.lang.Object.
-	 */
-	public static boolean isJavaLangObjectMethod(EnterpriseBean bean, Method method) {
-		return isSameType(bean, method.getContainingJavaClass(), ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT);
-	}
-	
-	public static final boolean isLegalRMI_IIOPInheritance(JavaClass clazz) {
-		return true;
-	}
-	
-	public static final boolean isLegalRMI_IIOPType(EnterpriseBean bean, JavaHelpers helper) throws InvalidInputException {
-		if(helper == null) {
-			return false;
-		}
-	
-		return isSerializable(helper, bean);
-	}
-	
-	public static final boolean isLocalType(EnterpriseBean bean, JavaHelpers type) {
-		try {
-			if(isSameType(type, getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, bean))) {
-				// If there's an undefined primary key (java.lang.Object), don't flag it as a local type.
-				return false;
-			}
-		}
-		catch(InvalidInputException e) {
-			// Let the DD validation report this.
-			return false;
-		}
-		
-		if(isAssignableFrom(bean.getLocalInterface(), type)) {
-			return true;
-		}
-		
-		if(isAssignableFrom(bean.getLocalHomeInterface(), type)) {
-			return true;
-		}
-		
-		// Bit of a performance hack here.
-		// Don't want to load and parse the entire EJBJar just to check if
-		// this type is local, so assume that if the extends 
-		// javax.ejb.EJBLocalHome or javax.ejb.EJBLocalObject, then it's local.
-		try {
-			JavaHelpers ejbLocalHome = getType(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBLOCALHOME, bean);
-			if(isAssignableFrom(ejbLocalHome, type)) {
-				return true;
-			}
-		}
-		catch(InvalidInputException exc) {
-			// ignore and try other type
-		}
-		
-		try {
-			JavaHelpers ejbLocalObject = getType(ITypeConstants.CLASSNAME_JAVAX_EJB_EJBLOCALOBJECT, bean);
-			if(isAssignableFrom(ejbLocalObject, type)) {
-				return true;
-			}
-		}
-		catch(InvalidInputException exc) {
-			// ignore
-		}
-		
-		return false;
-	}
-	
-
-	
-	public static final boolean usesUnknownPrimaryKey(EnterpriseBean bean) {
-		if(bean.isContainerManagedEntity()) {
-			return usesUnknownPrimaryKey((ContainerManagedEntity)bean);
-		}
-		return false;
-	}
-	
-	public static final boolean usesUnknownPrimaryKey(ContainerManagedEntity cmp) {
-		if(cmp == null) {
-			return false;
-		}
-		
-		try {
-			if(isSameType(cmp.getPrimaryKey(), getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, cmp))) {
-				return true;
-			}
-		}
-		catch(InvalidInputException e) {
-			// If java.lang.Object can't be found, there's bigger problems than validating
-			// it mistakenly
-			return false;
-		}
-
-		if(cmp.getVersionID() == J2EEVersionConstants.EJB_2_0_ID) {
-			List cmpFields = cmp.getFilteredFeatures(LocalModelledPersistentAttributeFilter.singleton());
-			if(cmpFields != null && !cmpFields.isEmpty()) {
-			Iterator iterator = cmpFields.iterator();
-			while(iterator.hasNext()) {
-				CMPAttribute attrib = (CMPAttribute)iterator.next();
-				if(isUnknownPrimaryKey(attrib)) {
-					return true;
-				}
-			}
-		  }
-		}
-		return false;
-	}
-	
-	public static final boolean isUnidirectionalRelationship(IEJBValidationContext vc, EJBRelationshipRole role) {
-		// Page 131 of EJB 2.0:
-		// A unidirectional relationship is implemented with a cmr-field on the entity bean instance from which
-		// navigation can take place, and no related cmr-field on the entity bean instance that is the target of the
-		// relationship. Unidirectional relationships are typically used when the Bean Provider wishes to restrict
-		// the visibility of a relationship.
-		Entity sourceEntity = role.getSource().getEntityBean();
-		if(sourceEntity == null) {
-			return false;
-		}
-		
-		if(!sourceEntity.isContainerManagedEntity()) {
-			return false;
-		}
-		
-		CMRField sourceCMRField = role.getCmrField();
-		if(sourceCMRField == null) {
-			return false;
-		}
-		
-		EJBRelationshipRole opposite = role.getOpposite();
-		if(opposite == null) {
-			return false;
-		}
-		
-		CMRField oppositeCMRField = opposite.getCmrField();
-		if(oppositeCMRField != null) {
-			return false;
-		}
-		
-		return true;
-		
-	}
-	
-	
-	
-	public static final boolean isUnknownPrimaryKey(CMPAttribute attrib) {
-		if(attrib == null) {
-			return false;
-		}
-		
-		// Section 10.8.3
-		// By definition, the deployer's generated CMP field's name is defined in the 
-		// ContainerManagedEntity.WAS_GENERATED_STRING_FIELD constant.
-		return ContainerManagedEntity.WAS_GENERATED_STRING_FIELD.equals(attrib.getName());
-	}
-	
-	public static final boolean isPrimitivePrimaryKey(ContainerManagedEntity cmp) {
-		if(cmp == null) {
-			return false;
-		}
-	
-		if((cmp.getPrimKeyField() != null) && !cmp.getPrimKeyField().eIsProxy()) {
-			return true;
-		}
-	
-		return false;
-	}
-	
-	public static final boolean isPublic(Field field) {
-		if ( field == null )
-			return false;
-
-		return (JavaVisibilityKind.PUBLIC_LITERAL == field.getJavaVisibility());
-	}
-
-	public static final boolean isPublic( Method method ) {
-		if ( method == null )
-			return false;
-
-		return (JavaVisibilityKind.PUBLIC_LITERAL == method.getJavaVisibility());
-	}
-
-	/**
-	 * Verifies that a given Class type is serializable.
-	 *
-	 * RMI 1.3 specification
-	 * 2.6 Parameter Passing in Remote Method Invocation
-	 * An argument to, or a return value from, a remote object can be any object that
-	 * is serializable. This includes primitive types, remote objects, and non-remote
-	 * objects that implement the java.io.Serializable interface.
-	 */
-	public static final boolean isSerializable(JavaHelpers cl, EnterpriseBean bean) throws InvalidInputException {
-		if(cl == null) {
-			// assume it's void
-			return true;
-		}
-	
-		// Check if the type reflected properly
-		isValidType(cl);
-		
-		if ( cl.isPrimitive() ) {
-			// JavaHelpers is a JavaDataType
-			return true;
-		}
-		else if(cl.isArray()) {
-			ArrayType array = (ArrayType)cl;
-			if(array.isPrimitiveArray()) {
-				return true;
-			}
-			// else, not primitive, so check its contents
-			cl = array.getFinalComponentType();
-		}
-	
-		JavaHelpers remote = getType(ITypeConstants.CLASSNAME_JAVA_RMI_REMOTE, bean);
-		if(isAssignableFrom(cl, remote)) {
-			return true;
-		}
-		
-		JavaHelpers serial = getType(ITypeConstants.CLASSNAME_JAVA_IO_SERIALIZABLE, bean);
-		return isAssignableFrom(cl, serial);
-	}
-	
-	public static final boolean isStateful(EnterpriseBean bean) {
-		if(bean == null) {
-			return false;
-		}
-		
-		if(bean.isEntity()) {
-			return false;
-		}
-	
-		return (((Session)bean).getSessionType().getValue() == SessionType.STATEFUL);
-	}
-	
-	public static final boolean isStateless(EnterpriseBean bean) {
-		if(bean == null) {
-			return false;
-		}
-		
-		if(bean.isEntity()) {
-			return false;
-		}
-	
-		return (((Session)bean).getSessionType().getValue() == SessionType.STATELESS);
-	}
-		
-	public static boolean isUnnamedPackage(JavaPackage pkg) {
-		if(pkg == null) {
-			return true;
-		}
-		
-		String pkgName = pkg.getName();
-		return ((pkgName == null) || (pkgName.equals(""))); //$NON-NLS-1$
-	}
-	
-	public static final boolean isValidJavaIdentifier(String name) {
-		if(name == null) {
-			return false;
-		}
-		
-		char[] nameChar = name.toCharArray();
-		if(nameChar.length < 1) {
-			return false;
-		}
-		
-		if(!Character.isJavaIdentifierStart(nameChar[0])) {
-			return false;
-		}
-		boolean isValidJavaIdentifier = true;
-		for(int i=1; i<nameChar.length; i++) {
-			if(!Character.isJavaIdentifierPart(nameChar[i])) {
-				isValidJavaIdentifier = false;
-				break;
-			}
-		}
-		return isValidJavaIdentifier;
-	}
-	
-	/**
-	 * 6.5.3 The optional SessionSynchronization interface
-	 *...
-	 * Only a stateful Session bean with container-managed transaction demarcation may 
-	 * implement the SessionSynchronization interface.
-	 *...
-	 * There is no need for a Session bean with bean-managed transaction to rely on the 
-	 * synchronization call backs because the bean is in control of the commit the bean 
-	 * knows when the transaction is about to be committed and it knows the outcome of the 
-	 * transaction commit.
-	 *...
-	 */
-	public static final boolean isValidSessionTypeElement(Session session) {
-		if(session == null) {
-			return false;
-		}
-		
-		// check syntax
-		if(!session.isSetSessionType()) {
-			return false;
-		}
-		
-		if(session.getSessionType() == null) {
-			return false;
-		}
-		
-		if(session.getSessionType().getValue() == SessionType.STATEFUL) {
-			return true;
-		}
-		
-		if(session.getSessionType().getValue() == SessionType.STATELESS) {
-			return true;
-		}
-	
-		return false;
-	}
-	
-	public static final boolean isValidTransactionTypeElement(Session sessionBean) {
-		if(sessionBean == null) {
-			return false;
-		}
-		
-		if(!sessionBean.isSetTransactionType()) {
-			return false;
-		}
-		
-		if(sessionBean.getTransactionType() == null) {
-			return false;
-		}
-		
-		if(sessionBean.getTransactionType().getValue() == TransactionType.BEAN) {
-			return true;
-		}
-		
-		if(sessionBean.getTransactionType().getValue() == TransactionType.CONTAINER) {
-			return true;
-		}
-	
-		return false;	
-	}
-	
-	/**
-	 * If the type is not reflected properly, throw an InvalidInputException.
-	 */
-	public static final void isValidType(JavaHelpers type) throws InvalidInputException {
-		if(type == null) {
-			// Cheating here. Should technically access the MsgLogger from the IEJBValidationContext
-			// type, but when I started changing this method and the isValidTypeHierarchy method,
-			// I ended up changing 42 files because these two methods are called directly or
-			// indirectly from almost everywhere. That was too much change, so I cheated.
-			Logger aLogger = getMsgLogger();
-			if(aLogger.isLoggingLevel(Level.FINEST)) {
-				LogEntry entry = getLogEntry();
-				entry.setSourceID("ValidationRuleUtility.isValidType"); //$NON-NLS-1$
-				entry.setText("type is null"); //$NON-NLS-1$
-				entry.appendStackTrace();
-				aLogger.write(Level.FINEST, entry);
-			}
-			throw new InvalidInputException();
-		}
-	
-		if(type.getWrapper() != null) {
-			// check if the type reflected properly. If there's any compile errors, or references to unresolved
-			// classes, can output some mistaken error messages.
-			// e.g. class is not serializable
-			JavaClass wrapper = type.getWrapper();
-			if(type.isArray()) {
-				ArrayType array = (ArrayType)type;
-				isValidType(array.getFinalComponentType());
-			}
-			else {
-				if(!wrapper.isExistingType()) {
-					Logger aLogger = getMsgLogger();
-					if(aLogger.isLoggingLevel(Level.FINEST)) {
-						LogEntry entry = getLogEntry();
-						entry.setSourceID("ValidationRuleUtility.isValidType"); //$NON-NLS-1$
-						entry.setText("!wrapper.isExistingType(); type is " + wrapper.getJavaName()); //$NON-NLS-1$ 
-						aLogger.write(Level.FINEST, entry);
-					}
-					throw new InvalidInputException(wrapper);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * If the type is not reflected properly, throw an InvalidInputException.
-	 * This method, unlike isValidType, also checks every interface and class
-	 * parent of the passed-in type.
-	 */
-	public static final void isValidTypeHierarchy(EnterpriseBean bean, JavaHelpers type) throws InvalidInputException {
-		if(type == null) {
-			// Cheating here. Should technically access the MsgLogger from the IEJBValidationContext
-			// type, but when I started changing this method and the isValidType method,
-			// I ended up changing 42 files because these two methods are called directly or
-			// indirectly from almost everywhere. That was too much change, so I cheated.
-			Logger aLogger = getMsgLogger();
-			if(aLogger.isLoggingLevel(Level.FINEST)) {
-				LogEntry entry = getLogEntry();
-				entry.setSourceID("ValidationRuleUtility.isValidTypeHierarchy"); //$NON-NLS-1$
-				entry.setText("type is null"); //$NON-NLS-1$
-				entry.appendStackTrace();
-				aLogger.write(Level.FINEST, entry);
-			}
-			throw new InvalidInputException();
-		}
-	
-		// First, check this helper itself.
-		isValidType(type);
-		JavaHelpers javaLangObject = getType(ITypeConstants.CLASSNAME_JAVA_LANG_OBJECT, bean);
-		if(isSameType(type, javaLangObject)) {
-			return;
-		}
-		
-		// If this helper exists, and is not java.lang.Object, then check every supertype.
-		JavaClass classType = type.getWrapper();
-		if(classType == null) {
-			Logger aLogger = getMsgLogger();
-			if(aLogger.isLoggingLevel(Level.FINEST)) {
-				LogEntry entry = getLogEntry();
-				entry.setSourceID("ValidationRuleUtility.isValidTypeHierarchy"); //$NON-NLS-1$
-				entry.setText("type.getWrapper() returns null; type is " + type.getJavaName()); //$NON-NLS-1$
-				aLogger.write(Level.FINEST, entry);
-			}
-			throw new InvalidInputException();
-		}
-	
-		// Check the superclass. Since type is not java.lang.Object, there is at least
-		// the java.lang.Object superclass.
-		if(!classType.isInterface()) {
-			JavaClass superType = classType.getSupertype();
-			isValidTypeHierarchy(bean, superType);
-		}
-	
-		// Check the superinterfaces, if they exist.
-		List superInterfaces = classType.getImplementsInterfaces();
-		if(superInterfaces != null) {
-			Iterator iterator = superInterfaces.iterator();
-			while(iterator.hasNext()) {
-				JavaClass superIntf = (JavaClass)iterator.next();
-				isValidTypeHierarchy(bean, superIntf);
-			}
-		}
-	}
-	
-	/**
-	 * RMI 1.3 page 6 section 2.4.1, 
-	 *    A remote method declaration must include the exception java.rmi.RemoteException (or one
-	 *    of its upserclasses such as java.io.IOException or java.lang.Exception) in its throws
-	 *    clause, in addition to any application-specific exceptions (note that application 
-	 *    specific exceptions do not have to extend java.rmi.RemoteException).
-	 */
-	public static final boolean throwsRemoteExceptionOrParent(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return throwsExceptionOrParent(bean, method, ITypeConstants.CLASSNAME_JAVA_RMI_REMOTEEXCEPTION);
-	}
-
-	/**
-	 * Convenience method which checks if RemoteException (exactly, not Exception or IOException)
-	 * is in the method signature.
-	 */	
-	public static final boolean doesNotThrowRemoteException(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return !throwsException(bean, method, ITypeConstants.CLASSNAME_JAVA_RMI_REMOTEEXCEPTION);
-	}
-	
-	public static final boolean throwsObjectNotFoundException(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return throwsException(bean, method, ITypeConstants.CLASSNAME_JAVAX_EJB_OBJECTNOTFOUNDEXCEPTION);
-	}
-	
-	public static final boolean throwsFinderException(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return throwsException(bean, method, ITypeConstants.CLASSNAME_JAVAX_EJB_FINDEREXCEPTION);
-	}
-	
-	public static final boolean throwsCreateException(EnterpriseBean bean, Method method) throws InvalidInputException {
-		return throwsException(bean, method, ITypeConstants.CLASSNAME_JAVAX_EJB_CREATEEXCEPTION);
-	}
-	
-	public static final boolean throwsApplicationException(Method method, EnterpriseBean bean) {
-		List exceptions = method.getJavaExceptions();
-		if(exceptions.size() == 0) {
-			return false;
-		}
-		
-		// CHKJ2419 = {0} must be a subclass of java.lang.Exception. Read section 18.1.1, 18.2.1 of the EJB 2.0 specification.
-		Iterator iterator = exceptions.iterator();
-		while(iterator.hasNext()) {
-			JavaClass exception = (JavaClass)iterator.next();
-			
-			if(isApplicationException(exception, bean)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return true if the given method throws the named exception or a class which extends the named exception.
-	 */	
-	public static final boolean throwsException(EnterpriseBean bean, Method method, String exceptionName) throws InvalidInputException {
-		if(method == null) {
-			return false;
-		}
-		
-		List exceptions = method.getJavaExceptions();
-		Iterator iterator = exceptions.iterator();
-		JavaClass exception = getType(exceptionName, bean).getWrapper();
-		while(iterator.hasNext()) {
-			JavaClass exc = (JavaClass)iterator.next();
-			if(isAssignableFrom(exc, exception)) {
-				return true;
-			}
-		}
-		
-		return false;
-	}
-
-	/**
-	 * Return true if the method returns the named exception, an exception which extends the named exception, or one of the parents of the named exception (e.g. java.lang.Exception).
-	 * Use this method if it needs to be detected that an exception can be thrown either directly or through something generic like java.lang.Exception.
-	 */
-	public static final boolean throwsExceptionOrParent(EnterpriseBean bean, Method method, String exceptionName) throws InvalidInputException {
-		if(method == null) {
-			return false;
-		}
-		
-		JavaClass exception = getType(exceptionName, bean).getWrapper();
-
-		List exceptions = method.getJavaExceptions();
-		Iterator iterator = exceptions.iterator();
-		while(iterator.hasNext()) {
-			JavaClass exc = (JavaClass)iterator.next();
-			if(isAssignableFrom(exc, exception)) {
-				// Assignable from the named exception, e.g. RemoteException or a child of RemoteException
-				return true;
-			}
-			
-			if(isAssignableFrom(exception, exc)) {
-				// The named exception is assignable from the method exception, e.g. java.lang.Exception
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	public static final boolean usesCollectionClass(EnterpriseBean bean, Method method) {
-		if((bean == null) || (method == null)) {
-			return false;
-		}
-		
-		JavaParameter[] parms = method.listParametersWithoutReturn();
-		if(parms != null) {
-			for(int i=0; i<parms.length; i++) {
-				JavaParameter parm = parms[i];
-				try {
-					if(isAssignableFromCollection(parm.getJavaType(), bean)) {
-						return true;
-					}
-				}
-				catch(InvalidInputException e) {
-					// ignore and test next parm
-					continue;
-				}
-			}
-		}
-		
-		// Now check the return type
-		try {
-			if(isAssignableFromCollection(method.getReturnType(), bean)) {
-				return true;
-			}
-		}
-		catch(InvalidInputException e) {
-			// ignore
-		}
-			
-		return false;
-	}
-
-	public static final boolean usesLocalTypes(EnterpriseBean bean, Method method) {
-		if((bean == null) || (method == null)) {
-			return false;
-		}
-		
-		JavaParameter[] parms = method.listParametersWithoutReturn();
-		if(parms != null) {
-			for(int i=0; i<parms.length; i++) {
-				JavaParameter parm = parms[i];
-				if(isLocalType(bean, parm.getJavaType())) {
-					return true;
-				}
-			}
-		}
-
-		// Now check the return type
-		if(isLocalType(bean, method.getReturnType())) {
-			return true;
-		}
-			
-		return false;
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARMessageConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARMessageConstants.java
deleted file mode 100644
index d42c0054c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARMessageConstants.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-
-
-
-/**
- * Message key constants for WAR validation.
- */
-public interface WARMessageConstants extends org.eclipse.jst.j2ee.model.internal.validation.J2EEMessageConstants {
-	public static final String WAR_VALIDATOR_ID = "WAR_VALIDATOR"; //$NON-NLS-1$
-	public static final String WAR_MODEL_NAME = "WAR_VALIDATION"; //$NON-NLS-1$
-	public static final String ERROR_WAR_VALIDATION_FAILED = "ERROR_WAR_VALIDATION_FAILED"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_SMALL_ICON = "MESSAGE_WAR_VALIDATION_SMALL_ICON"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_LARGE_ICON = "MESSAGE_WAR_VALIDATION_LARGE_ICON"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING = "MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_MISSING_JSP = "MESSAGE_WAR_VALIDATION_MISSING_JSP"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_MISSING_TLD = "MESSAGE_WAR_VALIDATION_MISSING_TLD"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE = "MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE = "MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE"; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_URL = "MESSAGE_WAR_VALIDATION_INVALID_URL" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING = "MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET = "MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF = "MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT = "MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY = "MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_EMPTY_ENTRY = "MESSAGE_WAR_VALIDATION_EMPTY_ENTRY" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE = "MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME = "MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD = "MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT = "MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF = "MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF" ; //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE = "MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE = "MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD = "MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN = "MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22 = "MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23 = "MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22 = "MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23 = "MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER = "MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER" ;	 //$NON-NLS-1$
-	public static final String MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING = "MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING" ; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_ROLES = "ERROR_EAR_DUPLICATE_ROLES"; //$NON-NLS-1$
-	public static final String ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION = "ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION"; //$NON-NLS-1$
-	public static final String ERROR_INVALID_WAR_FILE = "ERROR_INVALID_WAR_FILE"; //$NON-NLS-1$
-	public static final String WAR_DD_PARSE_LINECOL = "WAR_DD_PARSE_LINECOL"; //$NON-NLS-1$
-	public static final String WAR_DD_PARSE_LINE = "WAR_DD_PARSE_LINE"; //$NON-NLS-1$
-	public static final String WAR_DD_CANNOT_OPEN_DD = "WAR_DD_CANNOT_OPEN_DD"; //$NON-NLS-1$
-	public static final String WAR_DD_PARSE_NOINFO = "WAR_DD_PARSE_NOINFO"; //$NON-NLS-1$
-	public static String ERROR_EAR_INVALID_CONTEXT_ROOT = "ERROR_EAR_INVALID_CONTEXT_ROOT"; //$NON-NLS-1$
-	public static String MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE = "MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE"; //$NON-NLS-1$
-	public static String MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY = "MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY"; //$NON-NLS-1$
-	public static String MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE	 = "MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE"; //$NON-NLS-1$
-	public static String MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT = "MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT"; //$NON-NLS-1$		
-	public static String MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE = "MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE"; //$NON-NLS-1$		
-	public static String MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT = "MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT";  //$NON-NLS-1$
-	public static String MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE = "MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE";  //$NON-NLS-1$
-	//J2EE 14 Messages
-	public static String MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN = "MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN"; //$NON-NLS-1$
-	
-	
-	
-	}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARValidationResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARValidationResourceHandler.java
deleted file mode 100644
index a549380d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARValidationResourceHandler.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WARValidationResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "warvalidation";//$NON-NLS-1$
-
-	private WARValidationResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String ERROR_WAR_VALIDATION_FAILED;
-	public static String ERROR_EAR_DUPLICATE_ROLES;
-	public static String MESSAGE_WAR_VALIDATION_MISSING_JSP;
-	public static String MESSAGE_WAR_VALIDATION_SMALL_ICON;
-	public static String MESSAGE_WAR_VALIDATION_LARGE_ICON;
-	public static String MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING;
-	public static String MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE;
-	public static String MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE;
-	public static String MESSAGE_WAR_VALIDATION_MISSING_TLD;
-	public static String ERROR_INVALID_WAR_FILE;
-	public static String MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE;
-	public static String WAR_DD_PARSE_LINECOL;
-	public static String WAR_DD_PARSE_LINE;
-	public static String WAR_DD_PARSE_NOINFO;
-	public static String WAR_DD_CANNOT_OPEN_DD;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_URL;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF;
-	public static String ERROR_EAR_INVALID_CONTEXT_ROOT;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD;
-	public static String MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN;
-	public static String MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22;
-	public static String MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23;
-	public static String MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22;
-	public static String MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE;
-	public static String MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING;
-	public static String MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET;
-	public static String MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT;
-	public static String MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY;
-	public static String MESSAGE_WAR_VALIDATION_EMPTY_ENTRY;
-	public static String MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER;
-	public static String MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF;
-	public static String ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY;
-	public static String MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT;
-	public static String MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT;
-	public static String MSG_SERVER_TARGET_MISMATCH;
-	public static String MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN;
-	public static String MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE;
-	public static String ERROR_EAR_MISSING_EJB_ROLE;
-	public static String of_Type_Security_Role_Name_6;
-	public static String Web_Archive_Validator_8;
-	public static String of_Type_Role_Name_19;
-	public static String of_Type_Parameter_Name_25;
-	public static String of_Type_Parameter_Value_26;
-	public static String of_Type_Parameter_Name_32;
-	public static String of_Type_Parameter_Value_33;
-	public static String of_Type_Parameter_Name_39;
-	public static String of_Type_Parameter_Value_40;
-	public static String of_Type_ejb_ref_name_44;
-	public static String of_Type_Error_Location_47;
-	public static String of_Type_Error_Location_49;
-	public static String of_Type_Mime_Extension_54;
-	public static String of_Type_Mime_Type_55;
-	public static String of_Type_Mime_Extension___56;
-	public static String of_Type_Web_Resource_Collection_64;
-	public static String of_Type_Filter_Name_66;
-	public static String Invalid_URL_70;
-	public static String Invalid_URL_75;
-	public static String of_Type_Servlet_Name_77;
-	public static String of_Type_Taglib_80;
-	public static String of_Type_TagLib___81;
-	public static String of_Type_Web_Resource_Name_84;
-	public static String of_Type_Welcome_File_Name__87;
-	public static String of_Type_Env_Entry_Name___88;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WARValidationResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java
deleted file mode 100644
index b7dbc9826..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java
+++ /dev/null
@@ -1,1427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.internal.impl.EJBLocalRefImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.EjbRefImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.ResourceRefImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.internal.ResourceConstants;
-import org.eclipse.wst.validation.internal.ResourceHandler;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-// import org.eclipse.jst.j2ee.internal.plugin.nls.ResourceHandler;
-
-public class WarValidator extends J2EEValidator implements WARMessageConstants {
-	protected WARFile warFile;
-	protected WebApp webDD;
-	private Hashtable httpMethods = null;
-
-	// Optional child validators
-	// protected WebExtValidator webExtValidator;
-	// protected WebBndValidator webBndValidator;
-
-
-	/**
-	 * RelationshipMapValidator constructor comment.
-	 */
-	public WarValidator() {
-		super();
-	}
-
-	/**
-	 * Will construct a HashTable of roles, and check for duplicates and null entries
-	 * 
-	 * @return java.util.Hashtable
-	 * @param roles
-	 *            org.eclipse.emf.common.util.EList
-	 */
-	public Hashtable getAndValidateSecurityRoles(EList roles) {
-
-		Hashtable secRoles = new Hashtable();
-		if (roles.isEmpty())
-			return (secRoles);
-
-		Iterator sRoles = roles.iterator();
-
-		while (sRoles.hasNext()) {
-			
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			SecurityRole role = (SecurityRole) sRoles.next();
-
-
-			String name = role.getRoleName();
-			if (name != null)
-				name = name.trim();
-			if (name == null || name.equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Security_Role_Name_6;
-				addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, role);
-				continue;
-			}
-			if (secRoles.get(name) != null) { // Check for dups
-
-				String[] parms = new String[1];
-				parms[0] = name;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, role);
-				continue;
-			}
-			secRoles.put(name, "Yea"); //$NON-NLS-1$
-		}
-
-
-		return secRoles;
-	}
-
-	/**
-	 * <p>
-	 * Answer the id of the resource bundle which is used by the receiver.
-	 * </p>
-	 */
-	public String getBaseName() {
-		return WAR_CATEGORY;
-	}
-
-	// Messaging helpers ...
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI.
-	 * 
-	 * @see J2EEValidator#getName
-	 */
-
-	public String getName() {
-		return WARValidationResourceHandler.Web_Archive_Validator_8;
-	}
-
-	// Messaging helpers ...
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in the UI.
-	 * 
-	 * @see J2EEValidator#getName
-	 */
-
-	public String getName(Locale locale) {
-		return getMessage(null, "webArchiveValidator.name", locale); //$NON-NLS-1$
-	}
-
-	/**
-	 * This is a utility function used by the validateSecurityConstraints.
-	 * 
-	 * @return boolean
-	 */
-	protected boolean isHttpMethod(String method) {
-
-
-		if (httpMethods == null) { // Need to construct the Hashtable, once
-			String[] mList = {"GET", "PUT", "HEAD", "TRACE", "POST", "DELETE", "OPTIONS"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-
-			httpMethods = new Hashtable();
-			for (int i = 0; i < mList.length; i++)
-				httpMethods.put(mList[i], "bla"); //$NON-NLS-1$
-		}
-		String compare = method.trim();
-		return (httpMethods.get(compare) != null);
-	}
-
-	/**
-	 * WAR validation is driven by 3 prong approach: o XML/DTD validation (this is now handled by
-	 * the XML Validator) o Consistent web.xml data entry validation beyond DTD e.g., duplicate
-	 * entries, null entries etc. This is also driven by this validator. o web.xml reference to
-	 * resources in the "file system". This will not be provided by this validator. In the workbench
-	 * this function is already provided by the link builder.
-	 * 
-	 */
-	public void validate() throws ValidationException {
-		validateMimeMapping();
-		validateContextParameters();
-		validateTagLibs();
-		validateServletMappings(webDD.getServletMappings());
-		validateWelcomeFileList(webDD.getFileList());
-		validateErrorPages(webDD.getErrorPages());
-		validateSecurityAndServlets();
-		validateFilters(webDD.getFilters());
-		validateFilterMappings(webDD.getFilterMappings());
-		validateRefs();
-		validateLoginConfig(webDD.getLoginConfig());
-		validateEnvironmentEntries(webDD.getEnvironmentProperties());
-		validateOther();
-		validate14();
-	}
-
-	/**
-	 * 
-	 */
-	private void validate14() {
-		int versionId = webDD.getVersionID();
-		if (versionId == J2EEVersionConstants.WEB_2_4_ID) {
-			validateUrlPattern();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void validateUrlPattern() {
-		List servletMappings = webDD.getServletMappings();
-		for (int i = 0; i < servletMappings.size(); i++) {
-			ServletMapping mapping = (ServletMapping) servletMappings.get(i);
-			String urlPattern = mapping.getUrlPattern();
-			int newLineChar = urlPattern.indexOf(Character.LINE_SEPARATOR);
-			if (newLineChar != -1) {
-				String[] parms = new String[2];
-				parms[0] = urlPattern;
-				parms[1] = mapping.getServlet().getDisplayName();
-				addError(WAR_CATEGORY, MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN, parms, mapping);
-			}
-		}
-
-	}
-
-	/**
-	 * This is the method which performs the validation on the MOF model. <br>
-	 * <br>
-	 * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
-	 * may be null, if a full build is desired. <br>
-	 * <br>
-	 * <code>helper</code> loads a EObject. The EObject is the root of the MOF model about to be
-	 * validated. When this object is traversed, you can reach every element in the MOF model which
-	 * needs to be validated. <br>
-	 * <br>
-	 * <code>reporter</code> is an instance of an IReporter interface, which is used for
-	 * interaction with the user. <br>
-	 * <br>
-	 * <code>changedFiles</code> is an array of file names which have changed since the last
-	 * validation. If <code>changedFiles</code> is null, or if it is an empty array, then a full
-	 * build is performed. Otherwise, validation on just the files listed in the Vector is
-	 * performed.
-	 */
-	public void validate(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-		validateInJob(inHelper, inReporter);
-	}
-	
-	
-	public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-		status = super.validateInJob(inHelper, inReporter);
-		
-
-		// First remove all previous msg. for this project
-		_reporter.removeAllMessages(this, null); // Note the WarHelper will return web.xml with a
-													// null object as well
-
-		if( !_reporter.isCancelled()){
-			
-			warFile = (WARFile) _helper.loadModel(WAR_MODEL_NAME);
-			
-			try {
-				if (warFile != null) {
-					webDD = warFile.getDeploymentDescriptor();
-					validate();
-				} else {
-					IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_INVALID_WAR_FILE);
-					status = WTPCommonPlugin.createErrorStatus( errorMsg.getText( getClass().getClassLoader() ));
-					throw new ValidationException(errorMsg);
-				}
-	
-			} catch (ValidationException ex) {
-				throw ex;
-			} catch (Exception e) {
-				String[] parms = new String[1];
-				parms[0] = e.toString();
-				IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_WAR_VALIDATION_FAILED, parms);
-				status = WTPCommonPlugin.createErrorStatus(errorMsg.getText( getClass().getClassLoader() ));
-				throw new ValidationException(errorMsg, e);
-			}
-		}else{
-			String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-			status = WTPCommonPlugin.createCancelStatus(msg);
-		}
-		return status;
-	}
-
-	/**
-	 * This validator can be used for validation when the reporter and helper have been supplied via
-	 * the constructor.
-	 */
-	public void validate(Object aWarFile) throws ValidationException {
-
-		try {
-			warFile = (WARFile) aWarFile;
-			webDD = warFile.getDeploymentDescriptor();
-
-			validate();
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			String[] parms = new String[1];
-			parms[0] = e.toString();
-			IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_WAR_VALIDATION_FAILED, parms);
-			throw new ValidationException(errorMsg);
-		}
-	}
-
-	/**
-	 * The auth-constraint element indicates the user roles that should be permitted access to this
-	 * resource collection. The role used here must appear in a security-role-ref element. <!ELEMENT
-	 * auth-constraint (description?, role-name*)> The role-name element contains the name of a
-	 * security role. <!ELEMENT role-name (#PCDATA)> Creation date: (7/6/2001 3:39:34 PM)
-	 * 
-	 * @param authConstraint
-	 *            org.eclipse.jst.j2ee.internal.webapplication.AuthConstraint
-	 */
-	public void validateAuthConstraint(AuthConstraint authConstraint, Hashtable secRoles) {
-
-		EList roleList = authConstraint.getRoles();
-
-		if (roleList != null && !roleList.isEmpty()) {
-			Iterator authRoles = roleList.iterator();
-			Hashtable remember = new Hashtable();
-			while (authRoles.hasNext()) {
-				String role = (String) authRoles.next();
-				if (role == null || role.trim().equals("")) { //$NON-NLS-1$
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_Role_Name_19;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, authConstraint);
-					continue;
-				}
-				if (remember.get(role.trim()) != null) {
-					String[] parms = new String[1];
-					parms[0] = role;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, authConstraint);
-					continue;
-				}
-				remember.put(role.trim(), "Yea"); //$NON-NLS-1$
-				validateAuthSecRole("", role, secRoles, authConstraint); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/5/2001 2:20:02 PM)
-	 */
-	public void validateContextParameters() {
-
-		// we must verify that every param-name is unique;
-		// param-name appears in context parameters, filter
-		// and servlets. We must check each.
-		Hashtable remember = new Hashtable();
-
-		// check context parameters - each param-name should be unique within the web application
-		Iterator cparams = webDD.getContexts().iterator();
-		while (cparams.hasNext()) {
-			
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			ContextParam context = (ContextParam) cparams.next();
-
-			String name = context.getParamName();
-			if (name != null)
-				name = name.trim();
-
-			if (name == null || name.equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Parameter_Name_25;
-
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, context);
-				continue;
-			}
-			// if (remember.get(name + value) != null) { // Check for dups
-			if (remember.get(name) != null) { // Check for dups
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Parameter_Name_25 + ": " + name; //$NON-NLS-1$
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, context);
-				continue;
-			}
-			// remember.put(name + value, "Yea");
-			remember.put(name, "Yea"); //$NON-NLS-1$
-		}
-
-
-		// check servlet init-param - each param-name should be unique within a servlet
-		Iterator servlets = webDD.getServlets().iterator();
-		while (servlets.hasNext()) {
-			Servlet nextServlet = (Servlet) servlets.next();
-			Iterator params = nextServlet.getParams().iterator();
-			remember.clear();
-			while (params.hasNext()) {
-				InitParam initParam = (InitParam) params.next();
-				String name = initParam.getParamName();
-
-				if (name != null)
-					name = name.trim();
-
-				if (name == null || name.equals("")) { //$NON-NLS-1$ 
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_Parameter_Name_32;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, initParam);
-					continue;
-				}
-				if (remember.get(name) != null) { // Check for dups
-
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_Parameter_Name_25 + ": " + name; //$NON-NLS-1$
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, initParam);
-					continue;
-				}
-				remember.put(name, "Yea"); //$NON-NLS-1$
-			}
-		}
-
-		// check filter init-param - each param-name should be unique within a filter
-		Iterator filters = webDD.getFilters().iterator();
-		while (filters.hasNext()) {
-			Filter nextFilter = (Filter) filters.next();
-			Iterator params = nextFilter.getInitParams().iterator();
-			remember.clear();
-			while (params.hasNext()) {
-				InitParam initParam = (InitParam) params.next();
-				String name = initParam.getParamName();
-
-				if (name != null)
-					name = name.trim();
-
-				if (name == null || name.equals("")) { //$NON-NLS-1$ 
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_Parameter_Name_39;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, initParam);
-					continue;
-				}
-				if (remember.get(name) != null) { // Check for dups
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_Parameter_Name_25 + ": " + name;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, initParam);
-					continue;
-				}
-				remember.put(name, "Yea"); //$NON-NLS-1$
-			}
-		}
-
-	}
-
-	/**
-	 * Validate EJB references.
-	 */
-
-	public void validateEJBRefs(EjbRefImpl eref) {
-		// try {
-
-		EARFile earFile = warFile.getEARFile();
-		EnterpriseBean eb = null;
-
-		if (earFile != null)
-			eb = earFile.getEnterpiseBeanFromRef(eref, warFile.getURI());
-
-		if (!(eb == null)) {
-			List ejbRefs = eb.getEjbRefs();
-
-			int numRefs = ejbRefs.size();
-
-			Set refSet = new HashSet(numRefs);
-
-			for (int refNo = 0; refNo < numRefs; refNo++) {
-				String nextName = ((EjbRefImpl) (ejbRefs.get(refNo))).getName();
-
-				String[] parms = new String[1];
-				parms[0] = eb.getName();
-				if (!(refSet.add(nextName))) {
-					addWarning(WAR_CATEGORY, ERROR_EAR_DUPLICATE_ROLES, parms, ejbRefs.get(refNo));
-				}
-			}
-		}
-
-		// } catch (UncontainedModuleFileException ue) {
-		// String[] parms = new String[1];
-		// parms[0] = warFile.getName();
-		// addError(EREF_CATEGORY, ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION, parms);
-		// }
-	}
-
-	/**
-	 * validate for duplicates in EAR Roles
-	 */
-
-	public void validateEJBRefs(List ejbRefs) {
-		int numRefs = ejbRefs.size();
-		Hashtable remember = new Hashtable();
-		for (int refNo = 0; refNo < numRefs; refNo++) {
-			EjbRefImpl eref = (EjbRefImpl) ejbRefs.get(refNo);
-			if (eref.isSetType()) {
-				String type = eref.getType().getName();
-				if (type == null) {
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE, null, eref); // Type
-																										// must
-																										// be
-																										// of
-																										// ENTITY
-																										// or
-																										// FOO
-				}
-			}
-			if (eref.getName() != null) {
-				String name = eref.getName();
-				name = name.trim();
-
-				if (name.equals("")) { //$NON-NLS-1$
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_ejb_ref_name_44;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, eref);
-					continue;
-				}
-				if (remember.get(name) != null) { // check for duplicates
-					String[] parms = new String[1];
-					parms[0] = name;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF, parms, eref);
-					continue;
-				}
-				remember.put(name, "Yea"); //$NON-NLS-1$
-			} else {
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_ejb_ref_name_44;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, eref);
-				continue;
-			}
-
-
-			validateEJBRefs(eref);
-			validateEJBRefManadatoryElements(eref, webDD.getDisplayName());
-		}
-	}
-
-
-	/**
-	 * validate for duplicates in EAR Roles
-	 */
-
-	public void validateEJBLocalRefs(List ejbRefs) {
-		int numRefs = ejbRefs.size();
-		Hashtable remember = new Hashtable();
-		for (int refNo = 0; refNo < numRefs; refNo++) {
-			EJBLocalRefImpl eref = (EJBLocalRefImpl) ejbRefs.get(refNo);
-			if (eref.isSetType()) {
-				String type = eref.getType().getName();
-				if (type == null) {
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE, null, eref); // Type
-																										// must
-																										// be
-																										// of
-																										// ENTITY
-																										// or
-																										// FOO
-				}
-			}
-			if (eref.getName() != null) {
-				String name = eref.getName();
-				name = name.trim();
-
-				if (name.equals("")) { //$NON-NLS-1$
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_ejb_ref_name_44;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, eref);
-					continue;
-				}
-				if (remember.get(name) != null) { // check for duplicates
-					String[] parms = new String[1];
-					parms[0] = name;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF, parms, eref);
-					continue;
-				}
-				remember.put(name, "Yea"); //$NON-NLS-1$
-			} else {
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_ejb_ref_name_44;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, eref);
-				continue;
-			}
-
-
-			// validateEJBRefs(eref);
-			// validateEJBRefManadatoryElements(eref, webDD.getDisplayName());
-		}
-	}
-
-	/**
-	 * Link build should verify location of exception class
-	 */
-
-	public void validateErrorPages(EList errorPageList) {
-		Iterator errorPages = errorPageList.iterator();
-
-		if (errorPageList == null || errorPageList.isEmpty())
-			return;
-
-		while (errorPages.hasNext()) {
-			
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			ErrorPage nextPage = (ErrorPage) errorPages.next();
-			String location = nextPage.getLocation();
-			if (location == null || location.equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Error_Location_47;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, nextPage);
-			}
-			if (!location.startsWith("/")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Error_Location_49;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE, parms, nextPage);
-			}
-
-
-			// check for valid HTTP error code - must be an Integer, 3 digits, and the starting
-			// digit must be a 1,2,3,4, or 5.
-			if (nextPage.isErrorCode()) {
-				ErrorCodeErrorPage ecep = (ErrorCodeErrorPage) nextPage;
-				String errorCode = ecep.getErrorCode();
-
-				boolean valid = false;
-				if (errorCode.length() == 3) {
-					try {
-						Integer tempInt = new Integer(errorCode);
-						// ok, it's a valid 3-digit integer
-						int code = tempInt.intValue();
-						if (code >= 100 && code < 600) {
-							// valid HTTP status code - starting digit must be between 1-5
-							valid = true;
-						}
-					} catch (NumberFormatException exc) {
-						// Ignore
-					}
-				}
-				if (!valid) {
-					String[] parms = new String[1];
-					parms[0] = errorCode;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE, parms, ecep);
-				}
-
-			}
-
-			// If exception-type... the specified class must be or inherit from java.lang.Throwable
-			else if (nextPage.isExceptionType()) {
-				ExceptionTypeErrorPage etep = (ExceptionTypeErrorPage) nextPage;
-				JavaClass javaType = etep.getExceptionType();
-				String exceptionType = "java.lang.Throwable";//$NON-NLS-1$
-				String specifiedClassName = etep.getExceptionTypeName();
-				if (javaType != null) {
-					ResourceSet lookupSet = javaType.eResource().getResourceSet();
-					if (lookupSet != null) {
-						if (!javaType.inheritsFrom(JavaRefFactory.eINSTANCE.reflectType(exceptionType, lookupSet).getWrapper())) {
-							String[] parms = new String[1];
-							parms[0] = specifiedClassName;
-							addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE, parms, etep);
-						}
-					}
-				} else {
-					String[] parms = new String[1];
-					parms[0] = "";//$NON-NLS-1$
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE, parms, etep);
-				}
-				// TBD
-			} else { // Error Code
-				// TBD
-			}
-
-			// TBD remember location/code/exception dups
-		}
-
-	}
-
-	/**
-	 * Validate the loginConfig section is correct
-	 */
-	public void validateLoginConfig(LoginConfig loginConfig) {
-		// com.ibm.etools.validate.ValidatorManager.setResourceUtilClass(com.ibm.etools.validate.ui.UIResourceUtil.class);
-
-		if (loginConfig != null) {
-			String auth = loginConfig.getAuthMethod().getName();
-
-			if (auth == null) {
-				String[] parms = new String[0];
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD, parms, loginConfig);
-			}
-			// Give a warning if form elements are supplied but FORM auth method is not used
-			else if (!auth.equals("FORM")) { //$NON-NLS-1$
-				FormLoginConfig cfg = loginConfig.getFormLoginConfig();
-				if (cfg != null) {
-					String[] parms = new String[1];
-					parms[0] = auth;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN, parms, loginConfig);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Validate the loginConfig section is correct
-	 */
-	public void validateEnvironmentEntries(EList envEntries) {
-		if (envEntries.isEmpty())
-			return;
-
-		// boolean isVersion22 = warFile.getDeploymentDescriptor().isVersion2_2Descriptor();
-		Iterator entries = envEntries.iterator();
-		Hashtable remember = new Hashtable();
-
-		while (entries.hasNext()) {
-			EnvEntry entry = (EnvEntry) entries.next();
-			if (entry.getType().getName() == null) {
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY, null, entry);
-			}
-
-			// check for duplicate env-entry-name's
-			String name = entry.getName();
-			if (name != null) {
-				if (remember.get(name) != null) { // Check for dups
-					String[] parms = new String[1];
-					parms[0] = WARValidationResourceHandler.of_Type_Env_Entry_Name___88 + ": " + name;
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, entry);
-				} else {
-					remember.put(name, "Yea"); //$NON-NLS-1$
-				}
-			}
-		}
-
-	}
-
-
-	/**
-	 * Insert the method's description here. Creation date: (7/5/2001 12:11:23 PM)
-	 */
-	public void validateMimeMapping() {
-
-		if (webDD.getMimeMappings().isEmpty())
-			return;
-
-		Iterator mimes = webDD.getMimeMappings().iterator();
-		Hashtable remember = new Hashtable();
-
-		while (mimes.hasNext()) {
-			
-			if( _reporter.isCancelled()){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);				
-			}
-			MimeMapping mimeMap = (MimeMapping) mimes.next();
-
-			String ext = mimeMap.getExtension();
-			String mtype = mimeMap.getMimeType();
-			if (ext != null)
-				ext = ext.trim();
-			if (mtype != null)
-				mtype = mtype.trim();
-
-			if (ext == null || ext.equals("") || mtype == null || mtype.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-				String[] parms = new String[1];
-				if (ext == null || ext.trim().equals("")) //$NON-NLS-1$
-					parms[0] = WARValidationResourceHandler.of_Type_Mime_Extension_54;
-				else
-					parms[0] = WARValidationResourceHandler.of_Type_Mime_Type_55;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, mimeMap);
-				continue;
-			}
-			if (remember.get(ext) != null) { // Check for dups
-
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Mime_Extension___56 + ": " + ext;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, mimeMap);
-				continue;
-			}
-			remember.put(ext, "Yea"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/5/2001 11:46:58 AM)
-	 */
-	public void validateOther() {
-
-		SessionConfig sessionCfg = webDD.getSessionConfig();
-		if (sessionCfg != null) {
-			int timeout = sessionCfg.getSessionTimeout();
-			if (timeout == 0) {
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT, null, sessionCfg);
-			}
-		}
-
-
-
-	}
-
-	/**
-	 * validateRefs(WebApp) - validate EJB and resource references - details tbd
-	 */
-
-	public void validateRefs() {
-		EList ejbRefs = webDD.getEjbRefs();
-
-		if (!ejbRefs.isEmpty())
-			validateEJBRefs(ejbRefs);
-
-
-		EList ejblocalRefs = webDD.getEjbLocalRefs();
-
-		if (!ejblocalRefs.isEmpty())
-			validateEJBLocalRefs(ejblocalRefs);
-
-
-		EList resourceRefs = webDD.getResourceRefs();
-
-		if (!resourceRefs.isEmpty()) {
-			// validateResourceRefs(resourceRefs); // we want to do additional checks here
-
-			int numRefs = resourceRefs.size();
-			Set refSet = new HashSet(numRefs);
-			boolean isVersion22 = warFile.getDeploymentDescriptor().getVersionID() <= J2EEVersionConstants.WEB_2_2_ID;
-
-			for (int refNo = 0; refNo < numRefs; refNo++) {
-				
-				if( _reporter.isCancelled() ){
-					String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-					status = WTPCommonPlugin.createCancelStatus(msg);
-				}
-				
-				ResourceRefImpl ref = (ResourceRefImpl) (resourceRefs.get(refNo));
-				String auth = ref.getAuth().getName();
-
-				// Check: a res-auth element containing Container or Application must be supplied
-				if (auth == null || !ref.isSetAuth()) {
-					String[] parms = new String[1];
-					parms[0] = ref.getName();
-					String msgId = isVersion22 ? MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22 : MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23;
-					addError(WAR_CATEGORY, msgId, parms, ref);
-					
-				} else if (isVersion22 && auth.equals("Application")) { //$NON-NLS-1$
-					String[] parms = new String[1];
-					parms[0] = ref.getName();
-					addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22, parms, ref);
-				} else if (!isVersion22 && auth.equals("SERVLET")) { //$NON-NLS-1$
-					String[] parms = new String[1];
-					parms[0] = ref.getName();
-					addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23, parms, ref);
-				}
-
-				// validate res-sharing-scope is allowable value
-				String sharingScope = ref.getResSharingScope().getName();
-				if (!isVersion22) {
-					if (sharingScope == null || !ref.isSetResSharingScope()) {
-						String[] parms = new String[0];
-						addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE, parms, ref);
-					}
-				}
-
-				String refName = ref.getName();
-				String[] parms = new String[1];
-				parms[0] = refName;
-				if (!(refSet.add(refName))){
-					addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_RESREF, parms, ref);
-				}
-			}
-		}
-
-	}
-
-
-	/**
-	 * Insert the method's description here. Creation date: (7/6/2001 4:11:09 PM)
-	 * 
-	 * @return boolean
-	 * @param role
-	 *            java.lang.String
-	 * @param defineRoles
-	 *            java.util.Hashtable
-	 * 
-	 * The auth-constraint only needs to have role-name specified. <auth-constraint> <description></description>
-	 * <role-name>guest</role-name> </auth-constraint>
-	 * 
-	 */
-	protected void validateAuthSecRole(String link, String role, Hashtable definedRoles, EObject targetObject) {
-		String rName = role;
-		String lName = link;
-		// boolean validRole = true;
-		// boolean validLink = true;
-
-		if (rName != null)
-			rName = rName.trim();
-		if (lName != null)
-			lName = lName.trim();
-
-		if (rName != null) {
-			if (!rName.equals("*") && !rName.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$	
-				if (definedRoles.get(rName) == null && definedRoles.get(lName) == null) {
-					String[] parms = new String[1];
-					parms[0] = rName;
-					addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME, parms, targetObject);
-				}
-			}
-		}
-	}
-
-
-
-	/**
-	 * Insert the method's description here. Creation date: (7/6/2001 4:11:09 PM)
-	 * 
-	 * @return boolean
-	 * @param role
-	 *            java.lang.String
-	 * @param defineRoles
-	 *            java.util.Hashtable
-	 * 
-	 * 
-	 * the security-role-ref must have a non-null role-name and the role-link must contain the name
-	 * of a role specified in the security-role section <security-role-ref> <role-name>MyName</role-name>
-	 * <role-link>ExistingRole</role-link> </security-role-ref>
-	 * 
-	 * 
-	 */
-	protected void validateSecRole(String link, String role, Hashtable definedRoles, EObject targetObject) {
-		String rName = role;
-		String lName = link;
-		// boolean validRole = true;
-		// boolean validLink = true;
-
-		if (rName != null)
-			rName = rName.trim();
-		if (lName != null)
-			lName = lName.trim();
-
-
-		// the security role-name cannot be null
-		if ((rName == null || rName.equals(""))) { //$NON-NLS-1$
-			String[] parms = new String[1];
-			parms[0] = rName;
-			addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME, parms, targetObject);
-		}
-
-		if (rName == null || !rName.equals("*")) { //$NON-NLS-1$		
-			// check that security role-link matches a defines security role
-			if (lName != null && definedRoles.get(lName) == null) {
-
-				String[] parms = new String[1];
-				parms[0] = lName;
-				addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE, parms, targetObject);
-			}
-		}
-	}
-
-	/**
-	 * validateSecurity(WebApp) - validate security constraints, roles, and security role refs -
-	 * details tbd
-	 */
-
-	public void validateSecurityAndServlets() {
-
-
-		EList webRoles = webDD.getSecurityRoles();
-
-		// Validate security roles
-		Hashtable secRoles = getAndValidateSecurityRoles(webRoles);
-
-		// Validate Servlets/JSPs and their role ref.
-		validateServlets(webDD.getServlets(), secRoles);
-
-		validateSecurityConstraints(webDD.getConstraints(), secRoles);
-
-		// try {
-		if (!(webRoles.isEmpty())) {
-			EARFile module = warFile.getEARFile();
-			if (module != null) {
-				EList earRoleList = module.getDeploymentDescriptor().getSecurityRoles();
-				validateWEBRolesWithEARRoles(earRoleList, webRoles);
-			}
-		}
-		// } catch (UncontainedModuleFileException ue) {
-		// String[] parms = new String[1];
-		// parms[0] = warFile.getName();
-		// addError(EREF_CATEGORY, ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION, parms);
-		// }
-	}
-
-	/**
-	 * The security-constraint element is used to associate security constraints with one or more
-	 * web resource collections <!ELEMENT security-constraint (web-resource-collection+,
-	 * auth-constraint?, user-data-constraint?)>
-	 * 
-	 * @param constraints
-	 *            org.eclipse.emf.common.util.EList
-	 */
-	public void validateSecurityConstraints(EList constraints, Hashtable secRoles) {
-
-		if (constraints.isEmpty())
-			return;
-
-		Iterator constList = constraints.iterator();
-		while (constList.hasNext()) {
-			
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			SecurityConstraint constraint = (SecurityConstraint) constList.next();
-
-			EList webResourceList = constraint.getWebResourceCollections();
-			if (webResourceList == null || webResourceList.isEmpty()) {
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Web_Resource_Collection_64;
-				addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, constraint);
-				continue;
-			}
-			validateWebResourceCollections(webResourceList);
-
-			AuthConstraint authConstraint = constraint.getAuthConstraint();
-			if (authConstraint != null)
-				validateAuthConstraint(authConstraint, secRoles);
-
-			UserDataConstraint dataConstraint = constraint.getUserDataConstraint();
-			if (dataConstraint != null && dataConstraint.getTransportGuarantee() != null) {
-				// <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-				// The transport-guarantee element specifies that the communication
-				// between client and server should be NONE, INTEGRAL, or
-				// CONFIDENTIAL.
-
-				// EEnumLiteral transport = dataConstraint.getTransportGuarantee();
-				TransportGuaranteeType transport = dataConstraint.getTransportGuarantee();
-				if (transport == null || !dataConstraint.isSetTransportGuarantee()) {
-					addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT, new String[0], dataConstraint);
-				}
-			}
-		}
-	}
-
-	public void validateFilters(EList filterList) {
-		if (filterList.isEmpty())
-			return;
-
-		Iterator filters = filterList.iterator();
-
-		Hashtable remember = new Hashtable();
-
-		while (filters.hasNext()) {
-			
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			Filter nextFilter = (Filter) filters.next();
-			String name = nextFilter.getName();
-			if (name != null)
-				name = name.trim();
-
-			if (name == null || name.equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Filter_Name_66;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, nextFilter);
-				continue;
-			}
-			if (remember.get(name) != null) { // check for duplicates
-				String[] parms = new String[1];
-				parms[0] = name;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER, parms, nextFilter);
-				continue;
-			}
-			remember.put(name, "Yea"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * validateFilterMappings(Elist(Filters's)) - for each filter mapping, make sure the named
-	 * filter exists
-	 */
-	public void validateFilterMappings(EList filterMappingsList) {
-
-		if (filterMappingsList.isEmpty())
-			return;
-
-		Iterator filterMappings = filterMappingsList.iterator();
-		while (filterMappings.hasNext()) {
-			FilterMapping nextMapping = (FilterMapping) filterMappings.next();
-
-			// Mapping can be either servlet or url
-			if (nextMapping.getUrlPattern() != null) {
-				String[] parms = new String[1];
-				String url = nextMapping.getUrlPattern();
-				parms[0] = url;
-				if (url == null) {
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_URL, parms, nextMapping);
-					continue;
-				}
-				if (nextMapping.getFilter() == null || nextMapping.getFilter().equals("")) { //$NON-NLS-1$
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING, parms, nextMapping);
-					continue;
-				}
-
-				// Is is a valid URI notation ?
-				try {
-					if (url.equals(""))
-						throw new Exception(WARValidationResourceHandler.Invalid_URL_70);
-					// You can't use com.ibm.webtools.URI here...
-					// com.ibm.iwt.webtools.URI uri = new com.ibm.iwt.webtools.URI(url) ;
-				} catch (Exception e) {
-					parms = new String[1];
-					parms[0] = nextMapping.getUrlPattern();
-					addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_URL, parms, nextMapping);
-					continue;
-				}
-			} else if (nextMapping.getServletName() != null) {
-				String[] parms = new String[1];
-				String servletName = nextMapping.getServletName();
-				parms[0] = servletName;
-				if (nextMapping.getServlet() == null) {
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING, parms, nextMapping);
-					continue;
-				}
-				if (nextMapping.getFilter() == null || nextMapping.getFilter().equals("")) { //$NON-NLS-1$
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING, parms, nextMapping);
-					continue;
-				}
-			}
-			// else {
-			// // otherwise neither servlet-name or url-mapping is defined - this gets flagged by
-			// the xml validator
-			// // as this does not conform to the DTD
-			//		
-			// }
-
-
-		}
-
-	}
-
-
-
-	/**
-	 * validateServlets(Elist(Servlet's)) - for each servlet mapping, make sure the named servlet
-	 * exists
-	 */
-
-	public void validateServletMappings(EList servletMappingsList) {
-
-		if (servletMappingsList.isEmpty())
-			return;
-
-		Iterator servletMappings = servletMappingsList.iterator();
-
-		Hashtable remember = new Hashtable();
-		while (servletMappings.hasNext()) {
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			ServletMapping nextMapping = (ServletMapping) servletMappings.next();
-			String url = nextMapping.getUrlPattern();
-
-			// Check for null servlet, if the name is right the reflection
-			// has already resolved it.
-
-			if (url != null) { // check for duplicate first, no need to repeat earlier error,
-				url = url.trim();
-				if (remember.get(url) != null) {
-					String[] parms = new String[1];
-					parms[0] = nextMapping.getUrlPattern();
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING, parms, nextMapping);
-					continue;
-				}
-				remember.put(nextMapping.getUrlPattern(), "Yea"); //$NON-NLS-1$
-			}
-
-
-			if (url == null || nextMapping.getServlet() == null || nextMapping.getServlet().equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = url;
-				if (url == null)
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_URL, parms, nextMapping);
-				else
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING, parms, nextMapping);
-				continue;
-			}
-
-			// Is is a valid URI notation ?
-			try {
-				if (url.equals(""))
-					throw new Exception(WARValidationResourceHandler.Invalid_URL_75);
-
-				//
-				// The spec does not prohibit whitespace in the url-patterns
-				//	   
-				// // check to see if the string is a valid URL- has no white space
-				// char[] chars = url.toCharArray();
-				// int len = chars.length;
-				// for (int cnt = 0; cnt < chars.length; cnt++)
-				// {
-				// if (Character.isWhitespace(chars[cnt]))
-				// throw new Exception("Invalid URL") ;
-				// }
-				// You can't use com.ibm.webtools.URI here...
-				// com.ibm.iwt.webtools.URI uri = new com.ibm.iwt.webtools.URI(url) ;
-			} catch (Exception e) {
-				String[] parms = new String[1];
-				parms[0] = nextMapping.getUrlPattern();
-				addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_URL, parms, nextMapping);
-				continue;
-			}
-		}
-
-	}
-
-	/**
-	 * validateServlets(Elist(Servlet's)) - if it's a JSP, verify the file exists - validate
-	 * optional security role refs for existence of the security role
-	 */
-
-	public void validateServlets(EList servletList, Hashtable secRoles) {
-		if (servletList.isEmpty())
-			return;
-
-		Iterator servlets = servletList.iterator();
-
-		Hashtable remember = new Hashtable();
-
-		while (servlets.hasNext()) {
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			Servlet nextServlet = (Servlet) servlets.next();
-			String name = nextServlet.getServletName();
-			if (name != null)
-				name = name.trim();
-
-			if (name == null || name.equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Servlet_Name_77;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, nextServlet);
-				continue;
-			}
-			if (remember.get(name) != null) { // check for duplicates
-				String[] parms = new String[1];
-				parms[0] = name;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET, parms, nextServlet);
-				continue;
-			}
-			remember.put(name, "Yea"); //$NON-NLS-1$
-
-			// Validate servlet roles
-			EList rolesList = nextServlet.getSecurityRoleRefs();
-			if (!rolesList.isEmpty()) {
-				Iterator roles = rolesList.iterator();
-				while (roles.hasNext()) {
-					SecurityRoleRef role = (SecurityRoleRef) roles.next();
-					validateSecRole(role.getLink(), role.getName(), secRoles, role);
-				}
-			}
-
-			// if it's a JSP, the jsp-file attribute MUST be a full-path, according to the servlet
-			// 2.2 spec
-			if (nextServlet.getWebType() != null && nextServlet.getWebType().isJspType()) {
-				JSPType jspType = (JSPType) (nextServlet.getWebType());
-
-				String jspFileName = jspType.getJspFile();
-				if (jspFileName == null || !(jspFileName.length() > 0)) {
-					String[] parms = new String[2];
-					parms[0] = jspFileName;
-					parms[1] = name;
-					addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF, parms, nextServlet);
-				}
-			}
-
-			/* No need to check for the existence of JSPs or Servlets. the LinkBuilder will do this */
-
-		}
-	}
-
-	public void validateTagLibs() {
-
-		if (webDD.getTagLibs().isEmpty())
-			return;
-
-		Iterator tags = webDD.getTagLibs().iterator();
-		Hashtable remember = new Hashtable();
-
-		while (tags.hasNext()) {
-
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			TagLibRef taglib = (TagLibRef) tags.next(); // ClassCastException at runtime
-			String uri = taglib.getTaglibURI();
-
-			if (uri != null)
-				uri = uri.trim();
-
-			if (uri == null || uri.equals("")) { //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Taglib_80;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, taglib);
-				continue;
-			}
-			if (remember.get(uri) != null) { // Check for dups
-
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_TagLib___81 + ": " + uri;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, taglib);
-				continue;
-			}
-			remember.put(uri, "Yea"); //$NON-NLS-1$
-		}
-	}
-
-	public void validateWebResourceCollections(EList webResourceList) {
-
-
-		Iterator resourceList = webResourceList.iterator();
-		while (resourceList.hasNext()) { // Check the web resource collections
-			WebResourceCollection resource = (WebResourceCollection) resourceList.next();
-
-			String name = resource.getWebResourceName();
-			if (name != null)
-				name = name.trim();
-			if (name == null || name.equals("")) { // should have a name //$NON-NLS-1$
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Web_Resource_Name_84;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms, resource);
-			}
-
-			// Check that the http methods, if any is correct
-			EList httpList = resource.getHTTPs();
-			if (!httpList.isEmpty()) {
-				Iterator https = httpList.iterator();
-				while (https.hasNext()) {
-					HTTPMethodType httpMethod = (HTTPMethodType) https.next();
-					String method = httpMethod.getHttpMethod();
-
-					if (method == null || !isHttpMethod(method)) {
-						String[] parms = new String[1];
-						parms[0] = method;
-						addError(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD, parms, httpMethod);
-					}
-
-
-				}
-			}
-		}
-	}
-
-	/**
-	 * validateWelcomeFileList(WelcomeFileList) - walk through the files and verify they exist
-	 */
-
-	public void validateWelcomeFileList(WelcomeFileList fileList) {
-		if (fileList == null)
-			return;
-
-		Iterator files = fileList.getFile().iterator();
-
-		Hashtable remember = new Hashtable();
-		while (files.hasNext()) {
-			
-			if( _reporter.isCancelled() ){
-				String msg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED);			
-				status = WTPCommonPlugin.createCancelStatus(msg);
-			}
-			
-			WelcomeFile nextFile = (WelcomeFile) files.next();
-			String fileName = nextFile.getWelcomeFile();
-
-			if ((fileName == null) || (fileName.length() == 0)) {
-				String[] parms = new String[0];
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE, parms, nextFile);
-			} else if ((fileName.startsWith("/")) || (fileName.endsWith("/"))) { //$NON-NLS-1$ //$NON-NLS-2$
-				String[] parms = new String[0];
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE, parms, nextFile);
-			}
-			fileName = fileName.trim();
-			if (remember.get(fileName) != null) {
-				String[] parms = new String[1];
-				parms[0] = WARValidationResourceHandler.of_Type_Welcome_File_Name__87 + ": " + fileName;
-				addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms, nextFile);
-				continue;
-			}
-			remember.put(fileName, "Yea"); //$NON-NLS-1$
-		}
-	}
-
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		_helper = helper;
-		return null;
-	}
-	
-	public void cleanup(IReporter reporter) {
-		warFile = null;
-		webDD = null;
-		httpMethods = null;
-		super.cleanup( reporter );
-	}		
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation.properties
deleted file mode 100644
index 3b8ccad52..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E Document type version "{0}" for rar.xml in project "{1}" needs to be version "{2}".
-ERROR_INVALID_CONNECTOR_FILE="Invalid RAR File".
-ERROR_CONNECTOR_VALIDATION_FAILED="RAR Validation failed".
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation.properties
deleted file mode 100644
index f556fc4f2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation.properties
+++ /dev/null
@@ -1,258 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#This properties file hold all the externalised strings for eTools WAR Validation project
-# Validation project
-#
-# Messages should be according to the format at:
-#     http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-#     MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-#     CHKJ (IBM WebSphere Validation)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/warvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-
-# 2-July-2001:
-#  This file has been tested using the ProcessMsgFile tool, written by
-#  Hany Salem and owned by Dennis Hebert.  Any future changes should
-#  also be verified using this tool.  Please contact Dennis
-#  (hebert@us.ibm.com or T/L 543-2520) for more information.
-#
-
-# --------------------------------
-ERROR_WAR_VALIDATION_FAILED=CHKJ3000E: WAR Validation Failed: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Duplicate security role named {0}.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: The JSP file, {0}, for the servlet \"{1}\" is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: The <small-icon> file, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: The <large-icon> file, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: The servlet mapping \"{0}\" refers to a servlet that is not defined.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Empty welcome file list entry.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Welcome file {0} is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: The Tag Library Descriptor File, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Missing or invalid WAR file.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: The filter mapping \"{0}\" refers to a filter that is not defined.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Welcome Files cannot begin or end with a /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Parsing Error: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Deployment Descriptor Parsing error.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Deployment Descriptor Parsing error.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: Cannot open the deployment descriptor. Validation cannot complete.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: The URL Mapping \"{0}\" is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Invalid Security role-link: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: Invalid HTTP method: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Invalid Transport Gurarantee.  Valid values are \"NONE\", \"INTEGRAL\", or \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: The jsp-file \"{0}\" referenced by servlet {1} must be a full absolute path.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Web Project: {0} is mapped to an invalid Context root: {1} in EAR Project: {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: The Location of the Error Page Must Begin with a /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Invalid Security role-name: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: Invalid auth method.  Valid values are: \"BASIC\", \"DIGEST\", \"FORM\", or \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  Authentication method is {0}.  The form-login-config values will be ignored unless using FORM authentication method.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  Resource ref {0} must contain res-auth of "SERVLET" or "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  Resource ref {0} must contain res-auth of "Application" or "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" is not a valid value for.res-auth in a 2.2 level deployment descriptor.  Use \"SERVLET\" instead.
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" is not a valid value for.res-auth in a 2.2 level deployment descriptor.  Use \"Application\" instead.
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E:  Invalid Exception Type {0}.  The exception type must contain a fully qualified class name of a Java exception type.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: Duplicate URL mapping {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Duplicate Servlet Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Session Timeout is not valid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Duplicate Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Empty Entry {0}.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Duplicate Filter Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: Duplicate ejb-ref element named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: ERROR EAR UNCONTAINED MODULE FILE EXCEPTION
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: Unknown Error Code: {0}.  error-code must contain a valid HTTP status code.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: Invalid res-sharing-scope; valid values are \"Shareable\" or \"Unshareable\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Invalid Environment Entry Type. Valid values are \"java.lang.TYPE\", where TYPE is one of the following: Boolean, Byte, Character, String, Short, Integer, Long, Float, or Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Missing Web Library Project ({0}).  Check the properties of this project to fix this problem.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: The Web Library Project JAR ({0}) conflicts with an actual JAR in the WEB-INF/lib directory.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: The target server of the Web Library Project ({1}) does not match that of this Web Project ({0}).  Run validation on the Web Project if you think that is not the case.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=The URL pattern string "{0}" ends with a invalid carraige return for servlet {1}
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type must be 'Entity' or 'Session'.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' element {0} defines the ''role-link'' element but no ''security-role'' elements in the application descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=of Type Security Role Name
-Web_Archive_Validator_8=Web Archive Validator
-of_Type_Role_Name_19=of Type Role Name
-of_Type_Parameter_Name_25=of Type Parameter Name
-of_Type_Parameter_Value_26=of Type Parameter Value
-of_Type_Parameter_Name_32=of Type Parameter Name
-of_Type_Parameter_Value_33=of Type Parameter Value
-of_Type_Parameter_Name_39=of Type Parameter Name
-of_Type_Parameter_Value_40=of Type Parameter Value
-of_Type_ejb_ref_name_44=of Type ejb-ref-name
-of_Type_Error_Location_47=of Type Error Location
-of_Type_Error_Location_49=of Type Error Location
-of_Type_Mime_Extension_54=of Type Mime Extension
-of_Type_Mime_Type_55=of Type Mime Type
-of_Type_Mime_Extension___56=of Type Mime Extension:
-of_Type_Web_Resource_Collection_64=of Type Web Resource Collection
-of_Type_Filter_Name_66=of Type Filter Name
-Invalid_URL_70=Invalid URL
-Invalid_URL_75=Invalid URL
-of_Type_Servlet_Name_77=of Type Servlet Name
-of_Type_Taglib_80=of Type Taglib
-of_Type_TagLib___81=of Type TagLib:
-of_Type_Web_Resource_Name_84=of Type Web Resource Name
-of_Type_Welcome_File_Name__87=of Type Welcome File Name
-of_Type_Env_Entry_Name___88=of Type Environment Entry Name
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/AbstractJNDIBindingsHelper.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/AbstractJNDIBindingsHelper.java
deleted file mode 100644
index 8d3de51a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/AbstractJNDIBindingsHelper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005,2006 IBM Corporation
- * Licensed Material - Property of IBM. All rights reserved. 
- * US Government Users Restricted Rights - Use, duplication or disclosure  v1.0
- * restricted by GSA ADP Schedule Contract with IBM Corp. 
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.core.internal.bindings;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * Default implementation of {@link IJNDIBindingsHelper}. Clients should extend this class for their
- * implementations.
- * 
- */
-public class AbstractJNDIBindingsHelper implements IJNDIBindingsHelper {
-
-	/**
-	 * Default implementation returns <code>false</code>.
-	 */
-	public boolean appliesFor(IProject project) {
-		return false;
-	}
-
-	/**
-	 * Default implementation returns <code>false</code>.
-	 */
-	public boolean appliesFor(Archive archive) {
-		return false;
-	}
-
-	/**
-	 * Default implementation returns <code>object.toString()</code>.
-	 */
-	public String getJNDIName(Object object) {
-		return object.toString();
-	}
-
-	/**
-	 * Default implementation returns <code>bean.getName()</code>.
-	 */
-	public String getJNDIName(EnterpriseBean bean) {
-		return bean.getName();
-	}
-
-	/**
-	 * Default implementation returns <code>resourceRef.getName()</code>.
-	 */
-	public String getJNDINameForRef(EnterpriseBean bean, ResourceRef resourceRef) {
-		return resourceRef.getName();
-	}
-
-	/**
-	 * Default implementation returns <code>resourceEnvRef.getName()</code>.
-	 */
-	public String getJNDINameForRef(EnterpriseBean bean, ResourceEnvRef resourceEnvRef) {
-		return resourceEnvRef.getName();
-	}
-
-	/**
-	 * Default implementation returns <code>securityRoleRef.getName()</code>.
-	 */
-	public String getJNDINameForRef(EnterpriseBean bean, SecurityRoleRef securityRoleRef) {
-		return securityRoleRef.getName();
-	}
-
-	/**
-	 * Default implementation returns <code>resourceRef.getName()</code>.
-	 */
-	public String getJNDINameForRef(WebApp webApp, ResourceRef resourceRef) {
-		return resourceRef.getName();
-	}
-
-	/**
-	 * Default implementation returns <code>resourceEnvRef.getName()</code>.
-	 */
-	public String getJNDINameForRef(WebApp webApp, ResourceEnvRef resourceEnvRef) {
-		return resourceEnvRef.getName();
-	}
-
-	/**
-	 * Default implementation returns <code>((EJBJar) bean.eContainer()).getDisplayName()</code>.
-	 */
-	public String getJNDINameForDefaultDataSource(ContainerManagedEntity bean) {
-		return ((EJBJar) bean.eContainer()).getDisplayName();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java
deleted file mode 100644
index fa6a51264..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005,2006 IBM Corporation
- * Licensed Material - Property of IBM. All rights reserved. 
- * US Government Users Restricted Rights - Use, duplication or disclosure  v1.0
- * restricted by GSA ADP Schedule Contract with IBM Corp. 
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.core.internal.bindings;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * This is used to load jndi bindings from various J2EE artifacts. Clients should acquire
- * IBindingsHelper from the {@link JNDIBindingsHelperManager}.
- */
-public interface IJNDIBindingsHelper {
-
-	/**
-	 * Clients should not call this method. This method is used by the
-	 * {@link JNDIBindingsHelperManager}.
-	 * 
-	 * @param project
-	 * @return true if this {@link IJNDIBindingsHelper} can be used to load bindings for specified
-	 *         project.
-	 */
-	public boolean appliesFor(IProject project);
-
-	/**
-	 * Clients should not call this method. This method is used by the
-	 * {@link JNDIBindingsHelperManager}.
-	 * 
-	 * @param project
-	 * @return true if this {@link IJNDIBindingsHelper} can be used to load bindings for specified
-	 *         archive.
-	 */
-	public boolean appliesFor(Archive archive);
-
-	/**
-	 * Returns the specified bean's JNDI name.
-	 * 
-	 * @param bean
-	 * @return the specified bean's JNDI name.
-	 */
-	public String getJNDIName(EnterpriseBean bean);
-
-	/**
-	 * Returns the JNDI name for the specified CMP's default datasource.
-	 * 
-	 * @param bean
-	 * @return the JNDI name for the specified CMP's default datasource.
-	 */
-	public String getJNDINameForDefaultDataSource(ContainerManagedEntity bean);
-
-	/**
-	 * Returns the specified bean's resource reference's JNDI name.
-	 * 
-	 * @param bean
-	 * @param resourceRef
-	 * @return the specified bean's resource reference's JNDI name.
-	 */
-	public String getJNDINameForRef(EnterpriseBean bean, ResourceRef resourceRef);
-
-	/**
-	 * Returns the specified bean's resource environment reference's JNDI name.
-	 * 
-	 * @param bean
-	 * @param resourceEnvRef
-	 * @return the specified bean's resource environment reference's JNDI name.
-	 */
-	public String getJNDINameForRef(EnterpriseBean bean, ResourceEnvRef resourceEnvRef);
-
-	/**
-	 * Returns the specified bean's security role referenc's JNDI name.
-	 * 
-	 * @param bean
-	 * @param securityRoleRef
-	 * @return the specified bean's security role referenc's JNDI name.
-	 */
-	public String getJNDINameForRef(EnterpriseBean bean, SecurityRoleRef securityRoleRef);
-
-	/**
-	 * Reuturns the specified web application's resource reference's JNDI name.
-	 * 
-	 * @param webApp
-	 * @param resourceRef
-	 * @return the specified web application's resource reference's JNDI name.
-	 */
-	public String getJNDINameForRef(WebApp webApp, ResourceRef resourceRef);
-
-	/**
-	 * Returns the specified web application's resource environment reference's JNDI name.
-	 * 
-	 * @param webApp
-	 * @param resourceEnvRef
-	 * @return the specified web application's resource environment reference's JNDI name.
-	 */
-	public String getJNDINameForRef(WebApp webApp, ResourceEnvRef resourceEnvRef);
-
-	/**
-	 * Returns the specified Object's JNDI name. This method should only be used if none of the
-	 * others apply, as it will likely be inefficient due to instanceof checks.
-	 * 
-	 * @param obj
-	 * @return the specified Object's JNDI name.
-	 */
-	public String getJNDIName(Object obj);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/JNDIBindingsHelperManager.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/JNDIBindingsHelperManager.java
deleted file mode 100644
index 7a8538797..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/JNDIBindingsHelperManager.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005,2006 IBM Corporation
- * Licensed Material - Property of IBM. All rights reserved. 
- * US Government Users Restricted Rights - Use, duplication or disclosure  v1.0
- * restricted by GSA ADP Schedule Contract with IBM Corp. 
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.core.internal.bindings;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
-
-/**
- * This class is not intended to be subclasses
- * 
- */
-public class JNDIBindingsHelperManager {
-
-	private List allHelpers;
-	private IJNDIBindingsHelper defaultHelper;
-	private static final int TYPE_PROJECT = 0;
-	private static final int TYPE_ARCHIVE = 1;
-
-	private static JNDIBindingsHelperManager instance = null;
-
-	/**
-	 * Returns the singleton instance.
-	 * 
-	 * @return the singleton instance.
-	 */
-	public static JNDIBindingsHelperManager getInstance() {
-		if (instance == null) {
-			instance = new JNDIBindingsHelperManager();
-		}
-		return instance;
-	}
-
-	/**
-	 * Returns an array of bindings helpers applicable for the specified project. If no registered
-	 * bindings helpers apply, the returned array will contain a default bindings helper.
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public IJNDIBindingsHelper[] getBindingsHelpers(IProject project) {
-		return getBindingsHelpers(TYPE_PROJECT, project);
-	}
-
-	/**
-	 * Returns an array of bindings helpers applicable for the specified archive. If no registered
-	 * bindings helpers apply, the returned array will contain a default bindings helper.
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public IJNDIBindingsHelper[] getBindingsHelpers(Archive archive) {
-		return getBindingsHelpers(TYPE_ARCHIVE, archive);
-	}
-
-	private IJNDIBindingsHelper[] getBindingsHelpers(int type, Object obj) {
-		List helpers = getHelpers();
-		List appliesHelpers = new ArrayList();
-		IJNDIBindingsHelper helper = null;
-		for (int i = 0; i < helpers.size(); i++) {
-			helper = (IJNDIBindingsHelper) helpers.get(i);
-			if ((TYPE_PROJECT == type && helper.appliesFor((IProject) obj)) || (TYPE_ARCHIVE == type && helper.appliesFor((Archive) obj))) {
-				appliesHelpers.add(helper);
-			}
-		}
-		if (appliesHelpers.size() == 0) {
-			appliesHelpers.add(getDefaultHelper());
-		}
-
-		IJNDIBindingsHelper[] helpersArray = new IJNDIBindingsHelper[appliesHelpers.size()];
-		for (int i = 0; i < helpersArray.length; i++) {
-			helpersArray[i] = (IJNDIBindingsHelper) appliesHelpers.get(i);
-		}
-
-		return helpersArray;
-	}
-
-	private IJNDIBindingsHelper getDefaultHelper() {
-		if (null == defaultHelper) {
-			defaultHelper = new AbstractJNDIBindingsHelper() {
-				public boolean appliesFor(IProject project) {
-					return true;
-				}
-
-				public boolean appliesFor(Archive archive) {
-					return true;
-				}
-			};
-		}
-		return defaultHelper;
-	}
-
-	private List getHelpers() {
-		if (null == allHelpers) {
-			BindingsHelperRegistry registry = new BindingsHelperRegistry();
-			registry.readRegistry();
-			allHelpers = registry.getHelpers();
-		}
-		return allHelpers;
-	}
-
-
-	protected String TAG_J2EE_BINDINGS_HELPER = "jndiBindingsHelpers"; //$NON-NLS-1$
-
-	private class BindingsHelperRegistry extends RegistryReader {
-
-		private String ATT_CLASS = "class"; //$NON-NLS-1$
-		private String TAG_BINDINGS_HELPER = "jndiBindingsHelper"; //$NON-NLS-1$
-
-		private List helpers = new ArrayList();
-
-		private BindingsHelperRegistry() {
-			super(J2EECorePlugin.PLUGIN_ID, TAG_J2EE_BINDINGS_HELPER);
-		}
-
-		public boolean readElement(IConfigurationElement element) {
-			if (TAG_BINDINGS_HELPER.equals(element.getName())) {
-				try {
-					addHelper((IJNDIBindingsHelper) element.createExecutableExtension(ATT_CLASS));
-				} catch (CoreException e) {
-					e.printStackTrace();
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
-
-		public List getHelpers() {
-			return helpers;
-		}
-
-		private void addHelper(IJNDIBindingsHelper helper) {
-			helpers.add(helper);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/Assert.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/Assert.java
deleted file mode 100644
index a797956b3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/Assert.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.core.internal.plugin;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code.
- * The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p>
- */
-public final class Assert {
-	/* This class is not intended to be instantiated. */
-	private Assert() {
-		// not allowed
-	}
-
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression) {
-		return isLegal(expression, ""); //$NON-NLS-1$
-	}
-
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression, String message) {
-		if (!expression)
-			throw new IllegalArgumentException(message);
-		return expression;
-	}
-
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * 
-	 * @param object the value to test
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object) {
-		isNotNull(object, ""); //$NON-NLS-1$
-	}
-
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param object the value to test
-	 * @param message the message to include in the exception
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object, String message) {
-		if (object == null)
-			throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
-	}
-
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression) {
-		return isTrue(expression, ""); //$NON-NLS-1$
-	}
-
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression, String message) {
-		if (!expression)
-			throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
-		return expression;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/AssertionFailedException.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/AssertionFailedException.java
deleted file mode 100644
index b349e1cc6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/AssertionFailedException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.core.internal.plugin;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch 
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
-/* package */
-class AssertionFailedException extends RuntimeException {
-	/**
-	 * All serializable objects should have a stable serialVersionUID
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/** Constructs a new exception with the given message.
-	 */
-	public AssertionFailedException(String detail) {
-		super(detail);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/EclipseEJBModelExtenderProvider.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/EclipseEJBModelExtenderProvider.java
deleted file mode 100644
index 764522d05..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/EclipseEJBModelExtenderProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- * 
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.core.internal.plugin;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderProvider;
-import org.eclipse.wst.common.frameworks.internal.enablement.Identifiable;
-import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-
-/**
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class EclipseEJBModelExtenderProvider extends RegistryReader implements IEJBModelExtenderProvider {
-
-    private SortedSet extensionHelpers;
-    
-    /*
-     * static final String EXTENSION_NAME = "e"; //$NON-NLS-1$ static final
-     * String ELEMENT_J2EEMODULE_EXTENSION = "j2eeModuleExtensionHelper";
-     * //$NON-NLS-1$ static final String MODULE_EXTENSION_CLASS =
-     * "extensionClass"; //$NON-NLS-1$
-     */
-
-    private static EclipseEJBModelExtenderProvider INSTANCE = null;
-
-    public static class Descriptor implements Identifiable {
-
-        public static final String EJB_MODEL_EXTENDER = "ejbModelExtender"; //$NON-NLS-1$
-
-        public static final String ATT_ID = "id"; //$NON-NLS-1$
- 
-        public static final String ATT_EJB_EXTENSION_CLASS = "extensionClass"; //$NON-NLS-1$
-
-        private static int loadOrderCounter = 0;
-
-        private final String id;
-
-        private final int loadOrder;
-
-        private IConfigurationElement element;
-
-        private EjbModuleExtensionHelper instance;
-
-        public Descriptor(IConfigurationElement element) {
-            Assert.isLegal(EJB_MODEL_EXTENDER.equals(element.getName()),
-                    "Invalid IConfigurationElement used to create EclipseEJBModelExtenderProvider.Descriptor."); //$NON-NLS-1$
-            this.element = element;
-            this.id = this.element.getAttribute(ATT_ID);
-            this.loadOrder = loadOrderCounter++;
-        }
-
-        public String getID() {
-            return this.id;
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getLoadOrder()
-         */
-        public int getLoadOrder() {
-            return loadOrder;
-        }
-
-        public EjbModuleExtensionHelper getInstance() {
-            try {
-                if (instance == null)
-                        instance = (EjbModuleExtensionHelper) element
-                                .createExecutableExtension(ATT_EJB_EXTENSION_CLASS);
-            } catch (CoreException e) {
-                Logger.getLogger().logError(e);
-            }
-            return instance;
-        }
-    }
-
-    protected EclipseEJBModelExtenderProvider() {
-        super(J2EECorePlugin.PLUGIN_ID, Descriptor.EJB_MODEL_EXTENDER);
-    }
-
-    public static EclipseEJBModelExtenderProvider getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new EclipseEJBModelExtenderProvider();
-            INSTANCE.readRegistry();
-        }
-        return INSTANCE;
-    }
-
-    /**
-     * readElement() - parse and deal w/ an extension like: <earModuleExtension
-     * extensionClass = "com.ibm.etools.web.plugin.WebModuleExtensionImpl"/>
-     */
-    public boolean readElement(IConfigurationElement element) {
-        if (!element.getName().equals(Descriptor.EJB_MODEL_EXTENDER)) return false;
-
-        addModuleExtension(new Descriptor(element));
-        return true;
-    }
-
-    /**
-     * @param descriptor
-     */
-    private void addModuleExtension(Descriptor descriptor) {
-        getExtensionHelpers().add(descriptor);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider#getEJBModuleExtension(java.lang.Object)
-     */
-    public EjbModuleExtensionHelper getEJBModuleExtension(Object context) {
-        //IProject project = null; // TODO MDE Get the project using Project Utilities (add depend to emf.workbench ?)
-    	if (getExtensionHelpers().isEmpty())
-    		return null;
-        Descriptor descriptor = (Descriptor) getExtensionHelpers().first();
-        if(descriptor != null)
-            return descriptor.getInstance();
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider#hasEJBModuleExtension(java.lang.Object)
-     */
-    public boolean hasEJBModuleExtension(Object context) {
-        return false;
-    }
-
-    /**
-     * @return Returns the extensionHelpers.
-     */
-    protected SortedSet getExtensionHelpers() { 
-        if (extensionHelpers == null) extensionHelpers = new TreeSet(IdentifiableComparator.getInstance());
-        return extensionHelpers;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/J2EECorePlugin.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/J2EECorePlugin.java
deleted file mode 100644
index 2ecb95761..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/J2EECorePlugin.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.core.internal.plugin;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.DefaultPluginTraceRenderer;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.osgi.framework.BundleContext;
-
-/*
- * Created on Nov 25, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class J2EECorePlugin extends Plugin {
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.core"; //$NON-NLS-1$
-	private static J2EECorePlugin inst = null;
-	protected static Logger logger = null;
-	/**
-	 * @param descriptor
-	 */
-	public J2EECorePlugin() {
-		super();
-		if (inst==null) inst = this;
-	}
-	
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		IEJBModelExtenderManager.INSTANCE.setProvider(EclipseEJBModelExtenderProvider.getInstance());
-	}
-	
-	public static J2EECorePlugin getPlugin(){
-		return inst;
-	}
-	
-	public static String getPluginID() {
-		return PLUGIN_ID;
-	}
-	
-	public Logger getMsgLogger() {
-		if (logger == null) {
-			logger = Logger.getLogger(getPluginID());
-			setRenderer(logger);
-		}
-		return logger;
-	}
-	
-	/**
-	 * @param aLogger
-	 */
-	protected void setRenderer(Logger aLogger) {
-		new DefaultPluginTraceRenderer(aLogger);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/application.ecore b/plugins/org.eclipse.jst.j2ee.core/model/application.ecore
deleted file mode 100644
index 8f9a7f482..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/application.ecore
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="application"
-    nsURI="application.xmi" nsPrefix="org.eclipse.jst.j2ee.application">
-  <eClassifiers xsi:type="ecore:EClass" name="Application" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The applicationType defines the structure of the&#xD;&#xA;application."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 &#xD;&#xA;The required value for the version is 1.4."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityRoles" upperBound="-1"
-        eType="ecore:EClass common.ecore#//SecurityRole" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains the definitions of security roles which are&#xD;&#xA;global to the application. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modules" lowerBound="1"
-        upperBound="-1" eType="#//Module" containment="true" eOpposite="#//Module/application">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The application deployment descriptor must have one&#xD;&#xA;        module element for each J2EE module in the&#xD;&#xA;        application package. A module element is defined&#xD;&#xA;        by moduleType definition."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Module" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The module element represents a single J2EE module and contains an ejb, java, or web element, which indicates the module type and contains a path to the module file, and an optional alt-dd element, which specifies an optional URI to the post-assembly version of the deployment descriptor. The application deployment descriptor must have one module element for each J2EE module in the application package.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the URI of a module, relative to the top level of the application package.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="altDD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alt-dd element specifies an optional URI to the post-assembly version of the deployment descriptor file for a particular J2EE module. The URI must specify the full pathname of the deployment descriptor file relative to the application's root directory. If alt-dd is not specified, the deployer must read the deployment descriptor from the default location and file name required by the respective component specification.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="application" eType="#//Application"
-        transient="true" eOpposite="#//Application/modules"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WebModule" eSuperTypes="#//Module">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Contains the web-uri and context-root of a web application module.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextRoot" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The context-root element specifies the context root of a web application&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaClientModule" eSuperTypes="#//Module">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="specifies the URI of a java application client module, relative to the top level of the application package.&#xD;&#xA;"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EjbModule" eSuperTypes="#//Module">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies the URI of a ejb-jar, relative to the top level of the application package.&#xD;&#xA;"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConnectorModule" eSuperTypes="#//Module">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies the URI of a resource adapter archive file, relative to the top level of the application package."/>
-    </eAnnotations>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/client.ecore b/plugins/org.eclipse.jst.j2ee.core/model/client.ecore
deleted file mode 100644
index fc5cc858b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/client.ecore
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="client"
-    nsURI="client.xmi" nsPrefix="org.eclipse.jst.j2ee.client">
-  <eClassifiers xsi:type="ecore:EClass" name="ApplicationClient" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The application-client element is the root element of an application client deployment descriptor.  The application client deployment descriptor describes the EJB components and external resources referenced by the application client.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The required value for the version is 1.4."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceRefs" upperBound="-1"
-        eType="ecore:EClass common.ecore#//ResourceRef" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains declarations of the application clients's references to an external resources."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="environmentProps" upperBound="-1"
-        eType="ecore:EClass common.ecore#//EnvEntry" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The env-entry element contains the declaration of an application client's environment entries. Each declaration consists of an optional description, the name of the environment entry, and an optional value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbReferences" upperBound="-1"
-        eType="ecore:EClass common.ecore#//EjbRef" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains a list of ejb-ref elements used for the declaration of a reference to an enterprise&#xD;&#xA;bean's home. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceEnvRefs" upperBound="-1"
-        eType="ecore:EClass common.ecore#//ResourceEnvRef" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The resource-env-ref element contains a declaration of an application client's reference to an administered object associated with a resource in the application client's environment.  It consists of an optional&#xD;&#xA;description, the resource environment reference name, and an indication of the resource environment reference type expected by the application client code.&#xD;&#xA;&#xD;&#xA;Used in: application-client&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;&lt;resource-env-ref>&#xD;&#xA;    &lt;resource-env-ref-name>jms/StockQueue&lt;/resource-env-ref-name>&#xD;&#xA;    &lt;resource-env-ref-type>javax.jms.Queue&lt;/resource-env-ref-type>&#xD;&#xA;&lt;/resource-env-ref>&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="callbackHandler" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A class provided by the application.  The class must have a no args constructor and must implement the javax.security.auth.callback.CallbackHandler interface.  The class will be instantiated by the application client container and used by the container to collect authentication information from the user."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRefs" upperBound="-1"
-        eType="ecore:EClass wsclient.ecore#//ServiceRef" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageDestinationRefs"
-        upperBound="-1" eType="ecore:EClass common.ecore#//MessageDestinationRef"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The message-destination-ref-name element specifies the&#xD;&#xA;    name of a message destination reference; its value is&#xD;&#xA;    the message destination reference name used in the&#xD;&#xA;    application client code. The name is a JNDI name&#xD;&#xA;    relative to the java:comp/env context and must be unique&#xD;&#xA;    within an application client."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageDestinations" upperBound="-1"
-        eType="ecore:EClass common.ecore#//MessageDestination" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ResAuthApplicationType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Application=0&#xD;&#xA;Container=1"/>
-    </eAnnotations>
-    <eLiterals name="Application"/>
-    <eLiterals name="Container" value="1"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/common.ecore b/plugins/org.eclipse.jst.j2ee.core/model/common.ecore
deleted file mode 100644
index 760b37566..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/common.ecore
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="common"
-    nsURI="common.xmi" nsPrefix="org.eclipse.jst.j2ee.common">
-  <eClassifiers xsi:type="ecore:EClass" name="EjbRef" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The ejb-refType is used by ejb-ref elements for the&#xD;&#xA;declaration of a reference to an enterprise bean's home. The&#xD;&#xA;declaration consists of:&#xD;&#xA;&#xD;&#xA;    - an optional description&#xD;&#xA;    - the EJB reference name used in the code of&#xD;&#xA;      the Deployment Component that's referencing the enterprise&#xD;&#xA;      bean&#xD;&#xA;    - the expected type of the referenced enterprise bean&#xD;&#xA;    - the expected home and remote interfaces of the referenced&#xD;&#xA;      enterprise bean&#xD;&#xA;    - optional ejb-link information, used to specify the&#xD;&#xA;      referenced enterprise bean"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ejb-ref-name element contains the name of an EJB reference. This is the JNDI name that the servlet code uses to get a reference to the enterprise bean.&#xD;&#xA;Example: &lt;ejb-ref-name>ejb/Payroll&lt;/ejb-ref-name>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//EjbRefType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ejb-ref-type element contains the expected type of the referenced enterprise bean. The ejb-ref-type element must be one of the following:&#xD;&#xA;&lt;ejb-ref-type>Entity&lt;/ejb-ref-type>&#xD;&#xA;&lt;ejb-ref-type>Session&lt;/ejb-ref-type>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="home" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The home element contains the fully-qualified name of the enterprise bean’s home interface.&#xD;&#xA;Example: &lt;home>com.aardvark.payroll.PayrollHome&lt;/home>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remote" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remote element contains the fully-qualified name of the enterprise bean’s remote interface."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="link" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ejb-link element is used in the ejb-ref element to specify that an EJB reference is linked to an enterprise bean in the encompassing J2EE Application package. The value of the ejb-link element must be the ejb-name of an enterprise bean in the same J2EE Application package. &#xD;&#xA;Example: &lt;ejb-link>EmployeeRecord&lt;/ejb-link>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EnvEntry" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The env-entryType is used to declare an application's&#xD;&#xA;environment entry. The declaration consists of an optional&#xD;&#xA;description, the name of the environment entry, and an&#xD;&#xA;optional value.  If a value is not specified, one must be&#xD;&#xA;supplied during deployment.&#xD;&#xA;&#xD;&#xA;It is used by env-entry elements."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The env-entry-name element contains the name of a&#xD;&#xA;        Deployment Component's environment entry.  The name&#xD;&#xA;        is a JNDI name relative to the java:comp/env&#xD;&#xA;        context.  The name must be unique within a&#xD;&#xA;        Deployment Component. The uniqueness&#xD;&#xA;        constraints must be defined within the declared&#xD;&#xA;        context.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;        &lt;env-entry-name>minAmount&lt;/env-entry-name>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The env-entry-value designates the value of a&#xD;&#xA;        Deployment Component's environment entry. The value&#xD;&#xA;        must be a String that is valid for the&#xD;&#xA;        constructor of the specified type that takes a&#xD;&#xA;        single String parameter, or for java.lang.Character,&#xD;&#xA;        a single character.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;        &lt;env-entry-value>100.00&lt;/env-entry-value>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//EnvEntryType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The env-entry-type element contains the fully-qualified Java type of the environment entry value that is expected by the application client’s code. The following are the legal values of env-entry-type: java.lang.Bool-ean, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte, java.lang.Short, java.lang.Long, and java.lang.Float. &#xD;&#xA;Example: &lt;env-entry-type>java.lang.Boolean&lt;/env-entry-type>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceRef" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The resource-refType contains a declaration of a&#xD;&#xA;Deployment Component's reference to an external resource. It&#xD;&#xA;consists of an optional description, the resource manager&#xD;&#xA;connection factory reference name, the indication of the&#xD;&#xA;resource manager connection factory type expected by the&#xD;&#xA;Deployment Component code, the type of authentication&#xD;&#xA;(Application or Container), and an optional specification of&#xD;&#xA;the shareability of connections obtained from the resource&#xD;&#xA;(Shareable or Unshareable).&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;&lt;resource-ref>&#xD;&#xA;    &lt;res-ref-name>jdbc/EmployeeAppDB&lt;/res-ref-name>&#xD;&#xA;    &lt;res-type>javax.sql.DataSource&lt;/res-type>&#xD;&#xA;    &lt;res-auth>Container&lt;/res-auth>&#xD;&#xA;    &lt;res-sharing-scope>Shareable&lt;/res-sharing-scope>&#xD;&#xA;&lt;/resource-ref>"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The res-ref-name element specifies the name of a&#xD;&#xA;        resource manager connection factory reference.&#xD;&#xA;        The name is a JNDI name relative to the&#xD;&#xA;        java:comp/env context.&#xD;&#xA;        The name must be unique within a Deployment File."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The res-type element specifies the type of the data&#xD;&#xA;        source. The type is specified by the fully qualified&#xD;&#xA;        Java language class or interface&#xD;&#xA;        expected to be implemented by the data source."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="auth" eType="#//ResAuthTypeBase"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The res-auth element specifies whether the enterprise bean code signs on programmatically to the resource manager, or whether the Container will sign on to the resource manager on behalf of the bean. In the latter case, the Container uses information that is supplied by the Deployer.  The value of this element must be one of the two following:&#xD;&#xA;&lt;res-auth>Application&lt;/res-auth>&#xD;&#xA;&lt;res-auth>Container&lt;/res-auth>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="link" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resSharingScope" eType="#//ResSharingScopeType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The res-sharing-scope element specifies whether connections obtained&#xD;&#xA;through the given resource manager connection factory reference can be&#xD;&#xA;shared. The value of this element, if specified, must be one of the&#xD;&#xA;two following:  Shareable, Unshareable&#xD;&#xA;&#xD;&#xA;The default value is Shareable.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="EnvEntryType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.3 added Character&#xD;&#xA;String=0&#xD;&#xA;Integer=1&#xD;&#xA;Boolean=2&#xD;&#xA;Double=3&#xD;&#xA;Byte=4&#xD;&#xA;Short=5&#xD;&#xA;Long=6&#xD;&#xA;Float=7&#xD;&#xA;Character=8"/>
-    </eAnnotations>
-    <eLiterals name="String"/>
-    <eLiterals name="Integer" value="1"/>
-    <eLiterals name="Boolean" value="2"/>
-    <eLiterals name="Double" value="3"/>
-    <eLiterals name="Byte" value="4"/>
-    <eLiterals name="Short" value="5"/>
-    <eLiterals name="Long" value="6"/>
-    <eLiterals name="Float" value="7"/>
-    <eLiterals name="Character" value="8"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SecurityRoleRef" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The security-role-refType contains the declaration of a&#xD;&#xA;security role reference in a component's or a&#xD;&#xA;Deployment Component's code. The declaration consists of an&#xD;&#xA;optional description, the security role name used in the&#xD;&#xA;code, and an optional link to a security role. If the&#xD;&#xA;security role is not specified, the Deployer must choose an&#xD;&#xA;appropriate security role."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the role-name element must be the String used&#xD;&#xA;        as the parameter to the&#xD;&#xA;        EJBContext.isCallerInRole(String roleName) method or the&#xD;&#xA;        HttpServletRequest.isUserInRole(String role) method."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="link" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The role-link element is a reference to a defined&#xD;&#xA;        security role. The role-link element must contain&#xD;&#xA;        the name of one of the security roles defined in the&#xD;&#xA;        security-role elements.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ResAuthTypeBase">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="CONTAINER=0&#xD;&#xA;Container=1&#xD;&#xA;Application=2&#xD;&#xA;SERVLET=3&#xD;&#xA;"/>
-    </eAnnotations>
-    <eLiterals name="Container"/>
-    <eLiterals name="Application" value="1"/>
-    <eLiterals name="SERVLET" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="EjbRefType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Session=0&#xD;&#xA;Entity=1"/>
-    </eAnnotations>
-    <eLiterals name="Session"/>
-    <eLiterals name="Entity" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SecurityRole" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The security-roleType contains the definition of a security&#xD;&#xA;role. The definition consists of an optional description of the&#xD;&#xA;security role, and the security role name.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;    &lt;security-role>&#xD;&#xA;    &lt;description>&#xD;&#xA;        This role includes all employees who are authorized&#xD;&#xA;        to access the employee service application.&#xD;&#xA;    &lt;/description>&#xD;&#xA;    &lt;role-name>employee&lt;/role-name>&#xD;&#xA;    &lt;/security-role>"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated See descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The role-name element contains the name of a role. This element must contain a non-empty string.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceEnvRef" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The resource-env-refType is used to define&#xD;&#xA;resource-env-type elements.  It contains a declaration of a&#xD;&#xA;Deployment Component's reference to an administered object&#xD;&#xA;associated with a resource in the Deployment Component's&#xD;&#xA;environment.  It consists of an optional description, the&#xD;&#xA;resource environment reference name, and an indication of&#xD;&#xA;the resource environment reference type expected by the&#xD;&#xA;Deployment Component code.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;&lt;resource-env-ref>&#xD;&#xA;    &lt;resource-env-ref-name>jms/StockQueue&#xD;&#xA;    &lt;/resource-env-ref-name>&#xD;&#xA;    &lt;resource-env-ref-type>javax.jms.Queue&#xD;&#xA;    &lt;/resource-env-ref-type>&#xD;&#xA;&lt;/resource-env-ref>"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the resource env ref.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The resource-env-ref-name element specifies the name&#xD;&#xA;        of a resource environment reference; its value is&#xD;&#xA;        the environment entry name used in&#xD;&#xA;        the Deployment Component code.  The name is a JNDI&#xD;&#xA;        name relative to the java:comp/env context and must&#xD;&#xA;        be unique within a Deployment Component."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The resource-env-ref-type element specifies the type&#xD;&#xA;        of a resource environment reference.  It is the&#xD;&#xA;        fully qualified name of a Java language class or&#xD;&#xA;        interface."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ResSharingScopeType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Shareable=0&#xD;&#xA;Unshareable=1"/>
-    </eAnnotations>
-    <eLiterals name="Shareable"/>
-    <eLiterals name="Unshareable" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBLocalRef" eSuperTypes="#//EjbRef">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.3&#xD;&#xA;The ejb-local-refType is used by ejb-local-ref elements for&#xD;&#xA;the declaration of a reference to an enterprise bean's local&#xD;&#xA;home. The declaration consists of:&#xD;&#xA;&#xD;&#xA;    - an optional description&#xD;&#xA;    - the EJB reference name used in the code of the Deployment&#xD;&#xA;      Component that's referencing the enterprise bean&#xD;&#xA;    - the expected type of the referenced enterprise bean&#xD;&#xA;    - the expected local home and local interfaces of the&#xD;&#xA;      referenced enterprise bean&#xD;&#xA;    - optional ejb-link information, used to specify the&#xD;&#xA;      referenced enterprise bean"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="localHome" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="local" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RunAsSpecifiedIdentity" eSuperTypes="#//SecurityIdentity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It    contains an optional description and a specification of the security identity to be used.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="identity" eType="#//Identity"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Optional specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Identity" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the run as identity.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The role-name element contains the name of a security role.&#xD;&#xA;&#xD;&#xA;The name must conform to the lexical rules for an NMTOKEN."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IconType" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The icon type contains small-icon and large-icon elements&#xD;&#xA;that specify the file names for small and large GIF or&#xD;&#xA;JPEG icon images used to represent the parent element in a&#xD;&#xA;GUI tool.&#xD;&#xA;&#xD;&#xA;The xml:lang attribute defines the language that the&#xD;&#xA;icon file names are provided in. Its value is &quot;en&quot; (English)&#xD;&#xA;by default."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="smallIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The small-icon element contains the name of a file&#xD;&#xA;        containing a small (16 x 16) icon image. The file&#xD;&#xA;        name is a relative path within the Deployment&#xD;&#xA;        Component's Deployment File.&#xD;&#xA;&#xD;&#xA;        The image may be either in the JPEG or GIF format.&#xD;&#xA;        The icon can be used by tools.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;        &lt;small-icon>employee-service-icon16x16.jpg&lt;/small-icon>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="largeIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The large-icon element contains the name of a file&#xD;&#xA;        containing a large&#xD;&#xA;        (32 x 32) icon image. The file name is a relative&#xD;&#xA;        path within the Deployment Component's Deployment&#xD;&#xA;        File.&#xD;&#xA;&#xD;&#xA;        The image may be either in the JPEG or GIF format.&#xD;&#xA;        The icon can be used by tools.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;        &lt;large-icon>employee-service-icon32x32.jpg&lt;/large-icon>&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DisplayName" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The display-name type contains a short name that is intended&#xD;&#xA;to be displayed by tools. It is used by display-name&#xD;&#xA;elements.  The display name need not be unique.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;...&#xD;&#xA;   &lt;display-name xml:lang=&quot;en&quot;>Employee Self Service&lt;/display-name>&#xD;&#xA;&#xD;&#xA;The value of the xml:lang attribute is &quot;en&quot; (English) by default."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageDestinationRef" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The message-destination-ref element contains a declaration&#xD;&#xA;of Deployment Component's reference to a message destination&#xD;&#xA;associated with a resource in Deployment Component's&#xD;&#xA;environment. It consists of:&#xD;&#xA;&#xD;&#xA;        - an optional description&#xD;&#xA;        - the message destination reference name&#xD;&#xA;        - the message destination type&#xD;&#xA;        - a specification as to whether the&#xD;&#xA;          destination is used for&#xD;&#xA;          consuming or producing messages, or both&#xD;&#xA;        - a link to the message destination&#xD;&#xA;&#xD;&#xA;Examples:&#xD;&#xA;&#xD;&#xA;&lt;message-destination-ref>&#xD;&#xA;        &lt;message-destination-ref-name>jms/StockQueue&#xD;&#xA;        &lt;/message-destination-ref-name>&#xD;&#xA;        &lt;message-destination-type>javax.jms.Queue&#xD;&#xA;        &lt;/message-destination-type>&#xD;&#xA;        &lt;message-destination-usage>Consumes&#xD;&#xA;        &lt;/message-destination-usage>&#xD;&#xA;        &lt;message-destination-link>CorporateStocks&#xD;&#xA;        &lt;/message-destination-link>&#xD;&#xA;&lt;/message-destination-ref>"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usage" eType="#//MessageDestinationUsageType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="link" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageDestination" eSuperTypes="#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The message-destinationType specifies a message&#xD;&#xA;destination. The logical destination described by this&#xD;&#xA;element is mapped to a physical destination by the Deployer.&#xD;&#xA;&#xD;&#xA;The message destination element contains:&#xD;&#xA;&#xD;&#xA;        - an optional description&#xD;&#xA;        - an optional display-name&#xD;&#xA;        - an optional icon&#xD;&#xA;        - a message destination name which must be unique&#xD;&#xA;          among message destination names within the same&#xD;&#xA;          Deployment File.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;&lt;message-destination>&#xD;&#xA;        &lt;message-destination-name>CorporateStocks&#xD;&#xA;        &lt;/message-destination-name>&#xD;&#xA;&lt;/message-destination>"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The message-destination-name element specifies a&#xD;&#xA;        name for a message destination.  This name must be&#xD;&#xA;        unique among the names of message destinations&#xD;&#xA;        within the Deployment File."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ParamValue" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;This type is a general type that can be used to declare&#xD;&#xA;parameter/value lists."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The param-name element contains the name of a parameter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The param-value element contains the value of a parameter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescriptionGroup" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;This group keeps the usage of the contained description related&#xD;&#xA;elements consistent across J2EE deployment descriptors."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="icons" upperBound="-1"
-        eType="#//IconType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="displayNames" upperBound="-1"
-        eType="#//DisplayName" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JNDIEnvRefsGroup" abstract="true" eSuperTypes="#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;This group keeps the usage of the contained JNDI environment&#xD;&#xA;reference elements consistent across J2EE deployment descriptors."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="environmentProperties"
-        upperBound="-1" eType="#//EnvEntry" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceRefs" upperBound="-1"
-        eType="#//ResourceRef" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbRefs" upperBound="-1"
-        eType="#//EjbRef" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceEnvRefs" upperBound="-1"
-        eType="#//ResourceEnvRef" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A list of enterprise bean references to an administered object associated with a resource in the enterprise bean's environment. It consists of an optional description, the resource environment reference name, and an indication of the resource environment reference type expected by the enterprise bean code.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbLocalRefs" upperBound="-1"
-        eType="#//EJBLocalRef" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageDestinationRefs"
-        upperBound="-1" eType="#//MessageDestinationRef" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRefs" upperBound="-1"
-        eType="ecore:EClass wsclient.ecore#//ServiceRef" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SecurityIdentity" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It&#xD;&#xA;contains an optional description and a specification of the security identity to be used.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UseCallerIdentity" eSuperTypes="#//SecurityIdentity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The use-caller-identity element specifies that the caller's security identity be used as the security identity for the execution of the enterprise bean's methods.&#xD;&#xA;"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Description" eSuperTypes="#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The description type is used by a description element to&#xD;&#xA;provide text describing the parent element.  The elements&#xD;&#xA;that use this type should include any information that the&#xD;&#xA;Deployment Component's Deployment File file producer wants&#xD;&#xA;to provide to the consumer of the Deployment Component's&#xD;&#xA;Deployment File (i.e., to the Deployer). Typically, the&#xD;&#xA;tools used by such a Deployment File consumer will display&#xD;&#xA;the description when processing the parent element that&#xD;&#xA;contains the description.&#xD;&#xA;&#xD;&#xA;The lang attribute defines the language that the&#xD;&#xA;description is provided in. The default value is &quot;en&quot; (English)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="MessageDestinationUsageType">
-    <eLiterals name="Consumes"/>
-    <eLiterals name="Produces" value="1"/>
-    <eLiterals name="ConsumesProduces" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="QName" eSuperTypes="#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="localPart" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="combinedQName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="internalPrefixOrNsURI"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Listener" eSuperTypes="#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 moved from webapp&#xD;&#xA;&#xD;&#xA;Declares a class in the application must be registered as a web application listener bean."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listenerClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The listener-class element declares a class in the application must be registered as a web application listener bean."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompatibilityDescriptionGroup" eSuperTypes="#//DescriptionGroup">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="smallIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="largeIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="J2EEEObject"/>
-  <eClassifiers xsi:type="ecore:EClass" name="J2EEEAttribute" eSuperTypes="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/commonArchive.genmodel b/plugins/org.eclipse.jst.j2ee.core/model/commonArchive.genmodel
deleted file mode 100644
index 7ee553d8d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/commonArchive.genmodel
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jst.j2ee.core/commonArchive"
-    editDirectory="/org.eclipse.jst.j2ee.core.edit/src" editorDirectory="/org.eclipse.jst.j2ee.core.editor/src"
-    modelPluginID="org.eclipse.jst.j2ee.core" modelName="CommonArchive" editPluginClass="org.eclipse.j2ee.commonarchivecore.provider.CommonArchiveEditPlugin"
-    editorPluginClass="org.eclipse.j2ee.commonarchivecore.presentation.CommonArchiveEditorPlugin"
-    importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore j2ee.genmodel#//wsclient j2ee.genmodel#//common j2ee.genmodel#//webapplication j2ee.genmodel#//ejb j2ee.genmodel#//jsp j2ee.genmodel#//application j2ee.genmodel#//client j2ee.genmodel#//jca ../../org.eclipse.jem/model/javaModel.genmodel#//java">
-  <foreignModel>..\rose\commonArchive.mdl</foreignModel>
-  <foreignModel>WORKSPACE_ROOT</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Commonarchive" basePackage="org.eclipse.jst.j2ee" interfacePackageSuffix="internal"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="commonarchivecore.ecore#/">
-    <genClasses ecoreClass="commonarchivecore.ecore#//File">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/lastModified"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/size"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/directoryEntry"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/originalURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//File/loadingContainer"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//File/container"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//Archive">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//Archive/types"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//EJBJarFile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EJBJarFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//WARFile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//WARFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//EARFile">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EARFile/moduleRefs"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EARFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ApplicationClientFile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ApplicationClientFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ModuleFile"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//Container">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//Container/files"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ReadOnlyDirectory"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//RARFile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//RARFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ModuleRef">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/moduleFile"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/earFile"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/module"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//EJBModuleRef"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//WebModuleRef"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ClientModuleRef"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ConnectorModuleRef"/>
-    <nestedGenPackages prefix="Looseconfig" basePackage="org.eclipse.jst.j2ee.commonarchivecore"
-        interfacePackageSuffix="internal" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util"
-        ecorePackage="commonarchivecore.ecore#//looseconfig">
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseApplication">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseApplication/looseArchives"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseArchive">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/uri"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/binariesPath"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/resourcesPath"/>
-        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseArchive/looseApp"/>
-        <genOperations ecoreOperation="commonarchivecore.ecore#//looseconfig/LooseArchive/isModule"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseLibrary">
-        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseLibrary/looseWAR"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseModule">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseModule/altDD"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseConfiguration">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseConfiguration/applications"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseWARFile">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseWARFile/looseLibs"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/commonarchivecore.ecore b/plugins/org.eclipse.jst.j2ee.core/model/commonarchivecore.ecore
deleted file mode 100644
index 82b41693c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/commonarchivecore.ecore
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="commonarchivecore"
-    nsURI="commonarchive.xmi" nsPrefix="org.eclipse.jst.j2ee.commonarchivecore">
-  <eClassifiers xsi:type="ecore:EClass" name="File" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="URI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastModified" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="directoryEntry" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loadingContainer" lowerBound="1"
-        eType="#//Container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//Container"
-        transient="true" eOpposite="#//Container/files"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Archive" eSuperTypes="#//Container">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="types" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBJarFile" eSuperTypes="#//ModuleFile">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deploymentDescriptor" lowerBound="1"
-        eType="ecore:EClass ejb.ecore#//EJBJar"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WARFile" eSuperTypes="#//ModuleFile">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deploymentDescriptor" lowerBound="1"
-        eType="ecore:EClass webapplication.ecore#//WebApp"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EARFile" eSuperTypes="#//ModuleFile">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="moduleRefs" lowerBound="1"
-        upperBound="-1" eType="#//ModuleRef" containment="true" eOpposite="#//ModuleRef/earFile"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deploymentDescriptor" lowerBound="1"
-        eType="ecore:EClass application.ecore#//Application"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ApplicationClientFile" eSuperTypes="#//ModuleFile">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deploymentDescriptor" lowerBound="1"
-        eType="ecore:EClass client.ecore#//ApplicationClient"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModuleFile" abstract="true" eSuperTypes="#//Archive"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Container" abstract="true" eSuperTypes="#//File">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="files" upperBound="-1"
-        eType="#//File" containment="true" eOpposite="#//File/container"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReadOnlyDirectory" eSuperTypes="#//Container"/>
-  <eClassifiers xsi:type="ecore:EClass" name="RARFile" eSuperTypes="#//ModuleFile">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deploymentDescriptor" lowerBound="1"
-        eType="ecore:EClass jca.ecore#//Connector"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModuleRef" abstract="true" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="moduleFile" lowerBound="1"
-        eType="#//ModuleFile"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="earFile" lowerBound="1"
-        eType="#//EARFile" transient="true" eOpposite="#//EARFile/moduleRefs"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="module" lowerBound="1"
-        eType="ecore:EClass application.ecore#//Module"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBModuleRef" eSuperTypes="#//ModuleRef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="WebModuleRef" eSuperTypes="#//ModuleRef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ClientModuleRef" eSuperTypes="#//ModuleRef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ConnectorModuleRef" eSuperTypes="#//ModuleRef"/>
-  <eSubpackages name="looseconfig" nsURI="commonarchive.looseconfig.xmi" nsPrefix="org.eclipse.jst.j2ee.commonarchivecore.looseconfig">
-    <eClassifiers xsi:type="ecore:EClass" name="LooseApplication" eSuperTypes="#//looseconfig/LooseArchive">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="looseArchives" upperBound="-1"
-          eType="#//looseconfig/LooseArchive" containment="true" eOpposite="#//looseconfig/LooseArchive/looseApp"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LooseArchive" abstract="true" eSuperTypes="common.ecore#//J2EEEObject">
-      <eOperations name="isModule" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="binariesPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourcesPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="looseApp" eType="#//looseconfig/LooseApplication"
-          transient="true" eOpposite="#//looseconfig/LooseApplication/looseArchives"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LooseLibrary" eSuperTypes="#//looseconfig/LooseArchive">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="looseWAR" eType="#//looseconfig/LooseWARFile"
-          transient="true" eOpposite="#//looseconfig/LooseWARFile/looseLibs"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LooseModule" eSuperTypes="#//looseconfig/LooseArchive">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="altDD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LooseConfiguration" eSuperTypes="common.ecore#//J2EEEObject">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="applications" upperBound="-1"
-          eType="#//looseconfig/LooseApplication" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LooseWARFile" eSuperTypes="#//looseconfig/LooseModule">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="looseLibs" upperBound="-1"
-          eType="#//looseconfig/LooseLibrary" containment="true" eOpposite="#//looseconfig/LooseLibrary/looseWAR"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/ejb.ecore b/plugins/org.eclipse.jst.j2ee.core/model/ejb.ecore
deleted file mode 100644
index 7eecb13c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/ejb.ecore
+++ /dev/null
@@ -1,586 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ejb"
-    nsURI="ejb.xmi" nsPrefix="org.eclipse.jst.j2ee.ejb">
-  <eClassifiers xsi:type="ecore:EClass" name="ContainerManagedEntity" eSuperTypes="#//Entity">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="2.x">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the version of an entity bean with container-managed persistence.&#xD;&#xA;&#xD;&#xA;@invariant The cmp-version element must be one of the two following: 1.x , 2.x&#xD;&#xA;@default 2.x&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractSchemaName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The abstract-schema-name element specifies the name of the abstract schema type of an entity bean with cmp-version 2.x. It is used in EJB QL queries.&#xD;&#xA;&#xD;&#xA;For example, the abstract-schema-name for an entity bean whose local interface is com.acme.commerce.Order might be Order.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="persistentAttributes" upperBound="-1"
-        eType="#//CMPAttribute" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="keyAttributes" upperBound="-1"
-        eType="#//CMPAttribute"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="queries" upperBound="-1"
-        eType="#//Query" containment="true" eOpposite="#//Query/entity">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 moved from CME&#xD;&#xA;The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.&#xD;&#xA;&#xD;&#xA;@invariant see description&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="CMPAttribute" upperBound="-1"
-        eType="#//CMPAttribute"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="primKeyField" eType="#//CMPAttribute"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPermission" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The method-permission element specifies that one or more security roles are allowed to invoke one or more enterprise bean methods. The method-permission element consists of an optional description, a list of security role names, and a list of method elements.  The security roles used in the method-permission element must be defined in the security-role element of the deployment descriptor, and the methods must be methods defined in the enterprise bean's remote and/or home interfaces."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unchecked" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assemblyDescriptor" lowerBound="1"
-        eType="#//AssemblyDescriptor" transient="true" eOpposite="#//AssemblyDescriptor/methodPermissions"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roles" lowerBound="1" upperBound="-1"
-        eType="ecore:EClass common.ecore#//SecurityRole"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodElements" lowerBound="1"
-        upperBound="-1" eType="#//MethodElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AssemblyDescriptor" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The assembly-descriptor element contains application-assembly information.  The application-assembly information consists of the following parts: the definition of security roles, the definition of method permissions, and the definition of transaction attributes for enterprise beans with container-managed transaction demarcation. All the parts are optional in the sense that they are omitted if the lists represented by them are empty. Providing an assembly-descriptor in the deployment descriptor is optional for the ejb-jar file producer."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPermissions" upperBound="-1"
-        eType="#//MethodPermission" containment="true" eOpposite="#//MethodPermission/assemblyDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodTransactions" upperBound="-1"
-        eType="#//MethodTransaction" containment="true" eOpposite="#//MethodTransaction/assemblyDescriptor">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies how the container must manage transaction scopes for the enterprise bean's method invocations.  The element consists of an optional description, a list of method elements, and a transaction attribute.The transaction attribute is to be applied to all the specified methods."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbJar" eType="#//EJBJar"
-        transient="true" eOpposite="#//EJBJar/assemblyDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityRoles" upperBound="-1"
-        eType="ecore:EClass common.ecore#//SecurityRole" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="excludeList" eType="#//ExcludeList"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageDestinations" upperBound="-1"
-        eType="ecore:EClass common.ecore#//MessageDestination" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodTransaction" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies how the container must manage transaction scopes for the enterprise bean's method invocations.  It consists of an optional description, a list of method elements, and a transaction attribute.The transaction attribute is to be applied to all the specified methods."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionAttribute" eType="#//TransactionAttributeType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The trans-attribute element specifies how the container must manage the transaction boundaries when delegating a method invocation to an enterprise bean's business method.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assemblyDescriptor" lowerBound="1"
-        eType="#//AssemblyDescriptor" transient="true" eOpposite="#//AssemblyDescriptor/methodTransactions"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodElements" lowerBound="1"
-        upperBound="-1" eType="#//MethodElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Session" eSuperTypes="#//EnterpriseBean">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The session-beanType declares an session bean. The&#xD;&#xA;declaration consists of:&#xD;&#xA;&#xD;&#xA;    - an optional description&#xD;&#xA;    - an optional display name&#xD;&#xA;    - an optional icon element that contains a small and a large&#xD;&#xA;      icon file name&#xD;&#xA;    - a name assigned to the enterprise bean&#xD;&#xA;      in the deployment description&#xD;&#xA;    - the names of the session bean's remote home and&#xD;&#xA;      remote interfaces, if any&#xD;&#xA;    - the names of the session bean's local home and&#xD;&#xA;      local interfaces, if any&#xD;&#xA;    - the name of the session bean's web service endpoint&#xD;&#xA;      interface, if any&#xD;&#xA;    - the session bean's implementation class&#xD;&#xA;    - the session bean's state management type&#xD;&#xA;    - the session bean's transaction management type&#xD;&#xA;    - an optional declaration of the bean's&#xD;&#xA;      environment entries&#xD;&#xA;    - an optional declaration of the bean's EJB references&#xD;&#xA;    - an optional declaration of the bean's local&#xD;&#xA;      EJB references&#xD;&#xA;    - an optional declaration of the bean's web&#xD;&#xA;      service references&#xD;&#xA;    - an optional declaration of the security role&#xD;&#xA;      references&#xD;&#xA;    - an optional declaration of the security identity&#xD;&#xA;      to be used for the execution of the bean's methods&#xD;&#xA;    - an optional declaration of the bean's resource&#xD;&#xA;      manager connection factory references&#xD;&#xA;    - an optional declaration of the bean's resource&#xD;&#xA;      environment references.&#xD;&#xA;    - an optional declaration of the bean's message&#xD;&#xA;      destination references&#xD;&#xA;&#xD;&#xA;The elements that are optional are &quot;optional&quot; in the sense&#xD;&#xA;that they are omitted when if lists represented by them are&#xD;&#xA;empty.&#xD;&#xA;&#xD;&#xA;Either both the local-home and the local elements or both&#xD;&#xA;the home and the remote elements must be specified for the&#xD;&#xA;session bean.&#xD;&#xA;&#xD;&#xA;The service-endpoint element may only be specified if the&#xD;&#xA;bean is a stateless session bean."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionType" eType="#//TransactionType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The transaction-type element specifies an enterprise bean's transaction management type.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sessionType" eType="#//SessionType"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceEndpoint" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The service-endpoint element contains the&#xD;&#xA;        fully-qualified name of the enterprise bean's web&#xD;&#xA;        service endpoint interface. The service-endpoint&#xD;&#xA;        element may only be specified for a stateless&#xD;&#xA;        session bean. The specified interface must be a&#xD;&#xA;        valid JAX-RPC service endpoint interface."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Entity" eSuperTypes="#//EnterpriseBean">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity bean’s home and remote interfaces, if any; the names of the entity bean’s local home and local interface, if any; the entity bean’s implementation class; the entity bean’s persistence management type; the entity bean’s primary key class name; an indication of the entity bean’s reentrancy; an optional specification of the entity bean’s cmp-version; an optional specification of the entity bean’s abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the bean’s environment entries; an optional declaration of the bean’s EJB references; an optional declaration of the bean’s local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean’s methods; an optional declaration of the bean’s resource manager connection factory references; an optional declaration of the bean’s resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.&#xD;&#xA;The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entity’s persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entity’s persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.&#xD;&#xA;The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.&#xD;&#xA;The optional local-home and local elements must be specified if the entity bean has a local home and local interface.&#xD;&#xA;The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.&#xD;&#xA;The other elements that are optional are &quot;optional&quot; in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if&#xD;&#xA;the entity’s persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entity’s persistence-type is Bean."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reentrant" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The reentrant element specifies whether an entity bean is reentrant or not.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The primkey-field element is used to specify the name of the primary key field for an entity with container-managed persistence.  The primkey-field must be one of the fields declared in the cmp-field&#xD;&#xA;element, and the type of the field must be the same as the primary key type.  The primkey-field element is not used if the primary key maps to multiple container-managed fields (i.e. the key is a compound key). In this case, the fields of the primary key class must be public, and their names must correspond to the field names of the entity bean class that comprise the key.&#xD;&#xA;Examples:&lt;prim-key-class>java.lang.String&lt;/prim-key-class>&#xD;&#xA;&#x9;&lt;prim-key-class>com.wombat.empl.EmployeeID&lt;/prim-key-class>&#xD;&#xA;&#x9;&lt;prim-key-class>java.lang.Object&lt;/prim-key-class>&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EnterpriseBean" abstract="true" eSuperTypes="common.ecore#//JNDIEnvRefsGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="EnterpriseJavaBean is a class.  It can have instances, someone could write an &#xD;&#xA;instance document containing Departments and Employees.  It also has &#xD;&#xA;attributes, operations, and associations.  These are actually derived/filtered &#xD;&#xA;from its implementation classes and interfaces.  For mapping and browsing &#xD;&#xA;purposes, though, you would like the EJB to appear as a class.  &#xD;&#xA;&#xD;&#xA;In this light, even Session Beans can have associations and properties &#xD;&#xA;implemented by their bean.  For example, it would be meaningful to describe &#xD;&#xA;associations from a Session to the Entities which it uses to perform its work.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityRoleRefs" upperBound="-1"
-        eType="ecore:EClass common.ecore#//SecurityRoleRef" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="homeInterface" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="remoteInterface" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbJar" lowerBound="1"
-        eType="#//EJBJar" transient="true" eOpposite="#//EJBJar/enterpriseBeans"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityIdentity" eType="ecore:EClass common.ecore#//SecurityIdentity"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It&#xD;&#xA;contains an optional description and a specification of the security identity to be used."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localHomeInterface" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localInterface" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TransactionAttributeType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="NotSupported=1&#xD;&#xA;Supports=2&#xD;&#xA;Required=3&#xD;&#xA;RequiresNew=4&#xD;&#xA;Mandatory=5&#xD;&#xA;Never=6&#xD;&#xA;"/>
-    </eAnnotations>
-    <eLiterals name="NotSupported"/>
-    <eLiterals name="Supports" value="1"/>
-    <eLiterals name="Required" value="2"/>
-    <eLiterals name="RequiresNew" value="3"/>
-    <eLiterals name="Mandatory" value="4"/>
-    <eLiterals name="Never" value="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TransactionType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Bean=1&#xD;&#xA;Container=2"/>
-    </eAnnotations>
-    <eLiterals name="Bean"/>
-    <eLiterals name="Container" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="SessionType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Stateful=1&#xD;&#xA;Stateless=2"/>
-    </eAnnotations>
-    <eLiterals name="Stateful"/>
-    <eLiterals name="Stateless" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBMethodCategory" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBJar" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file&#xD;&#xA;name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ejbClientJar" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The optional ejb-client-jar element specifies a JAR file that contains the class files necessary for a client program to access the enterprise beans in the ejb-jar file. The Deployer should make the ejb-client JAR file accessible to the client's class-loader.  Example:&lt;ejb-client-jar>employee_service_client.jar&lt;/ejb-client-jar>&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The version specifies the version of the&#xD;&#xA;    EJB specification that the instance document must&#xD;&#xA;    comply with. This information enables deployment tools&#xD;&#xA;    to validate a particular EJB Deployment&#xD;&#xA;    Descriptor with respect to a specific version of the EJB&#xD;&#xA;    schema."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assemblyDescriptor" eType="#//AssemblyDescriptor"
-        containment="true" eOpposite="#//AssemblyDescriptor/ejbJar"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="enterpriseBeans" lowerBound="1"
-        upperBound="-1" eType="#//EnterpriseBean" containment="true" eOpposite="#//EnterpriseBean/ejbJar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The enterprise-beans element contains the declarations of one or more enterprise beans."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="relationshipList" eType="#//Relationships"
-        containment="true" eOpposite="#//Relationships/ejbJar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The relationships collection describes the relationships in which container managed persistence entity beans and dependent objects participate. The relationships element contains an optional description; a list of ejb-entity-ref elements (references to entity beans that participate in container managed relationships but whose abstract persistence schemas are not included in the ejb-jar file);&#xD;&#xA;and a list of ejb-relation elements, which specify the container managed relationships."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodElement" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The method element is used to denote a method of an enterprise bean's&#xD;&#xA;home or remote interface, or a set of methods. The ejb-name element&#xD;&#xA;must be the name of one of the enterprise beans in declared in the&#xD;&#xA;deployment descriptor; the optional method-intf element allows to&#xD;&#xA;distinguish between a method with the same signature that is defined in&#xD;&#xA;both the home and remote interface; the method-name element specifies&#xD;&#xA;the method name; and the optional method-params elements identify a&#xD;&#xA;single method among multiple methods with an overloaded method name.&#xD;&#xA;&#xD;&#xA;There are three possible styles of the method element syntax:&#xD;&#xA;&#xD;&#xA;1. &#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&lt;ejb-name>EJBNAME&lt;/ejb-name>&#xD;&#xA;   &#x9;&#x9;&lt;method-name>*&lt;/method-name>&#xD;&#xA;&#x9;&lt;/method>&#xD;&#xA;&#xD;&#xA;   This style is used to refer to all the methods of the specified&#xD;&#xA;   enterprise bean's home and remote interfaces.&#xD;&#xA;&#xD;&#xA;2. &#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&lt;ejb-name>EJBNAME&lt;/ejb-name>&#xD;&#xA;   &#x9;&#x9;&lt;method-name>METHOD&lt;/method-name>&#xD;&#xA;&#x9;&lt;/method>>&#xD;&#xA;&#xD;&#xA;   This style is used to refer to the specified method of the&#xD;&#xA;   specified enterprise bean. If there are multiple methods with&#xD;&#xA;   the same overloaded name, the element of this style refers to&#xD;&#xA;   all the methods with the overloaded name.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;3. &#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&lt;ejb-name>EJBNAME&lt;/ejb-name>&#xD;&#xA;   &#x9;&#x9;&lt;method-name>METHOD&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&lt;method-params>&#xD;&#xA;   &#x9;&#x9;&#x9;&lt;method-param>PARAM-1&lt;/method-param>&#xD;&#xA;   &#x9;&#x9;&#x9;&lt;method-param>PARAM-2&lt;/method-param>&#xD;&#xA;          &#x9;&#x9;&#x9;...&#xD;&#xA;   &#x9;&#x9;&#x9;&lt;method-param>PARAM-n&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&lt;/method-params>&#xD;&#xA;&#x9;&lt;method>&#x9;&#xD;&#xA;&#xD;&#xA;   This style is used to refer to a single method within a set of&#xD;&#xA;   methods with an overloaded name. PARAM-1 through PARAM-n are the&#xD;&#xA;   fully-qualified Java types of the method's input parameters (if&#xD;&#xA;   the method has no input arguments, the method-params element&#xD;&#xA;   contains no method-param elements). Arrays are specified by the&#xD;&#xA;   array element's type, followed by one or more pair of square&#xD;&#xA;   brackets (e.g. int[][]).&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Used in: method-permission and container-transaction&#xD;&#xA;&#xD;&#xA;Examples:&#xD;&#xA;&#xD;&#xA;    Style 1: The following method element refers to all the methods of&#xD;&#xA;&#x9;&#x9;the EmployeeService bean's home and remote interfaces:&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;ejb-name>EmployeeService&lt;/ejb-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-name>*&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&lt;/method>&#xD;&#xA;&#xD;&#xA;&#x9;Style 2: The following method element refers to all the create&#xD;&#xA;&#x9;&#x9;methods of the EmployeeService bean's home interface:&#xD;&#xA;&#xD;&#xA;    &#x9;&#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;ejb-name>EmployeeService&lt;/ejb-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-name>create&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&lt;/method>&#xD;&#xA;&#xD;&#xA;&#x9;Style 3: The following method element refers to the&#xD;&#xA;&#x9;&#x9;create(String firstName, String LastName) method of the&#xD;&#xA;&#x9; &#x9;EmployeeService bean's home interface.&#xD;&#xA;&#xD;&#xA;    &#x9;&#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;ejb-name>EmployeeService&lt;/ejb-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-name>create&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-params>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>java.lang.String&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>java.lang.String&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;/method-params>&#xD;&#xA;&#x9;&#x9;&lt;/method>&#xD;&#xA;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;The following example illustrates a Style 3 element with&#xD;&#xA;&#x9;more complex parameter types. The method&#xD;&#xA;&#x9;&#x9;&#x9;foobar(char s, int i, int[] iar, mypackage.MyClass mycl,&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;mypackage.MyClass[][] myclaar)&#xD;&#xA;        would be specified as:&#xD;&#xA;&#xD;&#xA;    &#x9;&#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;ejb-name>EmployeeService&lt;/ejb-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-name>foobar&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-params>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>char&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>int&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>int[]&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>mypackage.MyClass&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>mypackage.MyClass[][]&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;/method-params>&#xD;&#xA;&#x9;&#x9;&lt;/method>&#xD;&#xA;&#xD;&#xA;&#x9;The optional method-intf element can be used when it becomes&#xD;&#xA;   necessary to differentiate between a method defined in the home&#xD;&#xA;   interface and a method with the same name and signature that is&#xD;&#xA;   defined in the remote interface.&#xD;&#xA;&#xD;&#xA;&#x9;For example, the method element&#xD;&#xA;&#xD;&#xA;   &#x9;&#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;ejb-name>EmployeeService&lt;/ejb-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-intf>Remote&lt;/method-intf>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-name>create&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-params>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>java.lang.String&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>java.lang.String&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;/method-params>&#xD;&#xA;&#x9;&#x9;&lt;/method>&#xD;&#xA;&#xD;&#xA;&#x9;can be used to differentiate the create(String, String) method&#xD;&#xA;   defined in the remote interface from the create(String, String)&#xD;&#xA;   method defined in the home interface, which would be defined as&#xD;&#xA;&#xD;&#xA;   &#x9;&#x9;&lt;method>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;ejb-name>EmployeeService&lt;/ejb-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-intf>Home&lt;/method-intf>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-name>create&lt;/method-name>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;method-params>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>java.lang.String&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&lt;method-param>java.lang.String&lt;/method-param>&#xD;&#xA;&#x9;&#x9;&#x9;&lt;/method-params>&#xD;&#xA;&#x9;&#x9;&lt;/method>&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The method-name element contains a name of an enterprise bean method,&#xD;&#xA;or the asterisk (*) character. The asterisk is used when the element&#xD;&#xA;denotes all the methods of an enterprise bean's remote and home&#xD;&#xA;interfaces.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parms" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The method-params element contains a list of the fully-qualified Java type names of the method parameters.  In the current implementation this is a space delimitted String.  A null string indicates a generic method element that can apply to multiple methods with the same name.  An empty string indicates a method with zero parameters.  In future implementations (post V5), this field will be deprecated and migrated to use the multi-valued params field and the isZeroParams flag.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//MethodElementKind"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="enterpriseBean" lowerBound="1"
-        eType="#//EnterpriseBean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="MethodElementKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 added ServiceEndpoint&#xD;&#xA;Unspecified=0&#xD;&#xA;Remote=1&#xD;&#xA;Home=2&#xD;&#xA;Local=3&#xD;&#xA;LocalHome=4&#xD;&#xA;ServiceEndpoint=5"/>
-    </eAnnotations>
-    <eLiterals name="Unspecified"/>
-    <eLiterals name="Remote" value="1"/>
-    <eLiterals name="Home" value="2"/>
-    <eLiterals name="Local" value="3"/>
-    <eLiterals name="LocalHome" value="4"/>
-    <eLiterals name="ServiceEndpoint" value="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CMPAttribute" eSuperTypes="common.ecore#//J2EEEAttribute">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the cmr field.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Relationships" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The relationships describes the relationships in which entity beans with container managed persistence participate. The relationships element contains an optional description; and a list of ejb-relation elements, which specify the container managed relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the collection of relationships.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbJar" lowerBound="1"
-        eType="#//EJBJar" transient="true" eOpposite="#//EJBJar/relationshipList"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ejbRelations" upperBound="-1"
-        eType="#//EJBRelation" containment="true" eOpposite="#//EJBRelation/relationshipList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A list of ejb-relation elements, which specify the container managed relationships."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query&#xD;&#xA;is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the query.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ejbQL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains the EJB QL query string that defines a finder or select query. This element is defined within the scope of a query element whose contents specify the finder or the select method that uses the query. The content must be a valid EJB QL query string for the entity bean for which the query is specified. The ejb-ql element must be specified for all queries that are expressible in EJB QL.&#xD;&#xA;&#xD;&#xA;@invariant The value must be a valid EJB QL query string for the entity bean or dependent object class for which the query is specified.&#xD;&#xA;@invariant The ejb-ql element must be specified for all queries that are expressible in EJB QL.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&lt;query>&#xD;&#xA;&lt;query-method>&#xD;&#xA;&lt;method-name>ejbSelectPendingLineitems&lt;/method-name>&#xD;&#xA;&lt;method-params/>&#xD;&#xA;&lt;/query-method>&#xD;&#xA;&lt;ejb-ql>SELECT ENTITY(l)&#xD;&#xA;FROM LineItems l&#xD;&#xA;WHERE l.shipped is FALSE&#xD;&#xA;&lt;/ejb-ql>&#xD;&#xA;&lt;/query>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnTypeMapping" eType="#//ReturnTypeMapping"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The return-type-mapping element is used in the query element to specify whether an abstract schema type that is returned by a query for a select method is to be mapped to an EJBLocalObject or EJBObject type.  The value of the return-type-mapping element, if specified must be one of the following."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="queryMethod" lowerBound="1"
-        eType="#//QueryMethod" containment="true" eOpposite="#//QueryMethod/query">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The query-method element is used to specify the method (DB/SR/CM-&quot;on the home&quot;) for a finder or&#xD;&#xA;select query.&#xD;&#xA;&#xD;&#xA;The method-name element specifies the name of a finder or select&#xD;&#xA;method in the entity bean's implementation class or a select method in&#xD;&#xA;the dependent object class.&#xD;&#xA;&#xD;&#xA;Each method-param must be defined for a query-method using the&#xD;&#xA;method-params element.&#xD;&#xA;&#xD;&#xA;Used in: query&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&lt;query>&#xD;&#xA;  &lt;description>Method finds large orders&lt;/description>&#xD;&#xA;  &lt;query-method>&#xD;&#xA;    &lt;method-name>findLargeOrders&lt;/method-name>&#xD;&#xA;    &lt;method-params>&lt;/method-params>&#xD;&#xA;  &lt;/query-method>&#xD;&#xA;  &lt;ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &amp;gt; 1000&lt;/ejb-ql>&#xD;&#xA;&lt;/query>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entity" eType="#//ContainerManagedEntity"
-        transient="true" eOpposite="#//ContainerManagedEntity/queries"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBRelation" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.3&#xD;&#xA;The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.&#xD;&#xA;&#xD;&#xA;@invariant The name of the relationship, if specified, is unique within the ejb-jar file.&#xD;&#xA;@invariant self.relationshipRoles.size == 2&#xD;&#xA;@invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name&#xD;&#xA;&#xD;&#xA;@migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension&#xD;&#xA;@migration EJB1.1 added optional attribute, description:String&#xD;&#xA;@migration EJB1.1 added optional attribute, name:String (May have been inherited from RefBaseObject previously)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the ejb relation.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the relationship. If specified, must be unique within the ejb-jar file.&#xD;&#xA;@invariant self.name unique within Set&lt;collect(ejbJar.ejbRelations.name)>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="relationshipList" eType="#//Relationships"
-        transient="true" eOpposite="#//Relationships/ejbRelations"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="relationshipRoles" lowerBound="2"
-        upperBound="2" eType="#//EJBRelationshipRole" containment="true" eOpposite="#//EJBRelationshipRole/relationship">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A collection containing exactly two relationship roles.&#xD;&#xA;&#xD;&#xA;@migration EJB1.1 Containment used to be by reference on relation--now by value.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBRelationshipRole" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.3&#xD;&#xA;The ejb-relationship-role element describes a role within a relationship.&#xD;&#xA;There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is &quot;not aware&quot; of the relationship.&#xD;&#xA;&#xD;&#xA;@invariant multiplicity != null&#xD;&#xA;@invariant roleSource != null&#xD;&#xA;@invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. &#xD;&#xA;@invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&lt;ejb-relation>&#xD;&#xA;  &lt;ejb-relation-name>Product-LineItem&lt;/ejb-relation-name>&#xD;&#xA;  &lt;ejb-relationship-role>&#xD;&#xA;    &lt;ejb-relationship-role-name>product-has-lineitems&lt;/ejb-relationship-role-name>&#xD;&#xA;    &lt;multiplicity>One&lt;/multiplicity>&#xD;&#xA;    &lt;relationship-role-source>&#xD;&#xA;      &lt;ejb-name>ProductEJB&lt;/ejb-name>&#xD;&#xA;    &lt;/relationship-role-source>&#xD;&#xA;  &lt;/ejb-relationship-role>&#xD;&#xA;..."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;The description is used by the ejb-jar file producer to provide text describing the ejb relationship role.&#xD;&#xA;&#xD;&#xA;The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines a name for a role that is unique within an ejb-relation. Different relationships can use the same name for a role.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" eType="#//MultiplicityKind"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the multiplicity of the role that participates in a relation.&#xD;&#xA;&#xD;&#xA;The multiplicity element must be one of the two following:&#xD;&#xA;     One&#xD;&#xA;     Many&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies that, within a particular relationship, the lifetime of one or more entity beans is dependent upon the lifetime of another entity bean. The cascade-delete element can Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="relationship" lowerBound="1"
-        eType="#//EJBRelation" transient="true" eOpposite="#//EJBRelation/relationshipRoles"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//RoleSource" containment="true" eOpposite="#//RoleSource/role">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.&#xD;&#xA;@migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that may not be sufficient, as this can now refer to dependent class names or ejb refs"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cmrField" lowerBound="1"
-        eType="#//CMRField" containment="true" eOpposite="#//CMRField/role">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A declaration of the CMRField, if any, by means of which the other side of the relationship is accessed from the perspective of the role source&#xD;&#xA;&#xD;&#xA;@migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSource" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.&#xD;&#xA;@invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="role" lowerBound="1" eType="#//EJBRelationshipRole"
-        transient="true" eOpposite="#//EJBRelationshipRole/source"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityBean" lowerBound="1"
-        eType="#//ContainerManagedEntity"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CMRField" eSuperTypes="#//CMPAttribute">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.3&#xD;&#xA;Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).&#xD;&#xA;&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="role" eType="#//EJBRelationshipRole"
-        transient="true" eOpposite="#//EJBRelationshipRole/cmrField"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="collectionType" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageDriven" eSuperTypes="#//EnterpriseBean">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The message-driven element declares a message-driven&#xD;&#xA;bean. The declaration consists of:&#xD;&#xA;&#xD;&#xA;    - an optional description&#xD;&#xA;    - an optional display name&#xD;&#xA;    - an optional icon element that contains a small and a large&#xD;&#xA;      icon file name.&#xD;&#xA;    - a name assigned to the enterprise bean in&#xD;&#xA;      the deployment descriptor&#xD;&#xA;    - the message-driven bean's implementation class&#xD;&#xA;    - an optional declaration of the bean's messaging&#xD;&#xA;      type&#xD;&#xA;    - the message-driven bean's transaction management type&#xD;&#xA;    - an optional declaration of the bean's&#xD;&#xA;      message-destination-type&#xD;&#xA;    - an optional declaration of the bean's&#xD;&#xA;      message-destination-link&#xD;&#xA;    - an optional declaration of the message-driven bean's&#xD;&#xA;      activation configuration properties&#xD;&#xA;    - an optional declaration of the bean's environment&#xD;&#xA;      entries&#xD;&#xA;    - an optional declaration of the bean's EJB references&#xD;&#xA;    - an optional declaration of the bean's local EJB&#xD;&#xA;      references&#xD;&#xA;    - an optional declaration of the bean's web service&#xD;&#xA;      references&#xD;&#xA;    - an optional declaration of the security&#xD;&#xA;      identity to be used for the execution of the bean's&#xD;&#xA;      methods&#xD;&#xA;    - an optional declaration of the bean's&#xD;&#xA;      resource manager connection factory&#xD;&#xA;      references&#xD;&#xA;    - an optional declaration of the bean's resource&#xD;&#xA;      environment references.&#xD;&#xA;    - an optional declaration of the bean's message&#xD;&#xA;      destination references"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionType" eType="#//TransactionType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The transaction-type element specifies an enterprise bean's transaction management type.&#xD;&#xA;&#xD;&#xA;The transaction-type element must be one of the two following: Bean, Container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageSelector" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The message-selector element is used to specify the JMS message&#xD;&#xA;selector to be used in determining which messages a message-driven&#xD;&#xA;bean is to receive.&#xD;&#xA;&#xD;&#xA;Example value: &#xD;&#xA;JMSType = `car' AND color = `blue' AND weight > 2500&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="acknowledgeMode" eType="#//AcknowledgeMode"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="an optional declaration of the acknowledgment mode for the message-driven bean if bean-managed transaction demarcation is used (ie. self.transactionType = Bean)&#xD;&#xA;&#xD;&#xA;The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the onMessage message of a message-driven bean that uses bean managed transaction demarcation.&#xD;&#xA;&#xD;&#xA;The acknowledge-mode must be one of the two following:  Auto-acknowledge, Dups-ok-acknowledge&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="link" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=" - an optional declaration of the bean's&#xD;&#xA;&#x9;      message-destination-link&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="destination" eType="#//MessageDrivenDestination"
-        containment="true" eOpposite="#//MessageDrivenDestination/bean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes activationConfig&#xD;&#xA;An optional declaration of the intended destination type of the message-driven bean"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activationConfig" eType="#//ActivationConfig"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageDestination" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messagingType" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The messaging-type element specifies the message&#xD;&#xA;        listener interface of the message-driven bean. If&#xD;&#xA;        the messaging-type element is not specified, it is&#xD;&#xA;        assumed to be javax.jms.MessageListener."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageDrivenDestination" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The message-driven-destination element provides advice to the Deployer as to whether a message-driven bean is intended for a Queue or a Topic. The declaration consists of: the type of the message-driven bean's intended destination and an optional declaration of whether a durable or non-durable subscription should be used if the destination-type is javax.jms.Topic."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//DestinationType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The destination-type element specifies the type of the JMS destination. The type is specified by the Java interface expected to be implemented by the destination.&#xD;&#xA;&#xD;&#xA;The destination-type element must be one of the two following: javax.jms.Queue, javax.jms.Topic"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subscriptionDurability"
-        eType="#//SubscriptionDurabilityKind" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The subscription-durability element specifies whether a JMS topic subscription is intended to be durable or nondurable.&#xD;&#xA;&#xD;&#xA;The subscription-durability element must be one of the two following:  Durable, NonDurable&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bean" lowerBound="1" eType="#//MessageDriven"
-        transient="true" eOpposite="#//MessageDriven/destination"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="AcknowledgeMode">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Auto-acknowledge=0&#xD;&#xA;Dups-ok-acknowledge=1"/>
-    </eAnnotations>
-    <eLiterals name="AutoAcknowledge"/>
-    <eLiterals name="DupsOkAcknowledge" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="SubscriptionDurabilityKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Durable=0&#xD;&#xA;NonDurable=1"/>
-    </eAnnotations>
-    <eLiterals name="Durable"/>
-    <eLiterals name="NonDurable" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ReturnTypeMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Local=0&#xD;&#xA;Remote=1"/>
-    </eAnnotations>
-    <eLiterals name="Local"/>
-    <eLiterals name="Remote" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExcludeList" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.&#xD;&#xA;&#xD;&#xA;If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodElements" lowerBound="1"
-        upperBound="-1" eType="#//MethodElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="DestinationType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Queue=0&#xD;&#xA;Topic=1"/>
-    </eAnnotations>
-    <eLiterals name="Queue"/>
-    <eLiterals name="Topic" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="QueryMethod" eSuperTypes="#//MethodElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="query" lowerBound="1" eType="#//Query"
-        transient="true" eOpposite="#//Query/queryMethod"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="MultiplicityKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="One=0&#xD;&#xA;Many=1"/>
-    </eAnnotations>
-    <eLiterals name="One"/>
-    <eLiterals name="Many" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivationConfigProperty" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The activation-config-propertyType contains a name/value&#xD;&#xA;configuration property pair for a message-driven bean.&#xD;&#xA;&#xD;&#xA;The properties that are recognized for a particular&#xD;&#xA;message-driven bean are determined by the messaging type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The activation-config-property-value element&#xD;&#xA;        contains the value for an activation configuration&#xD;&#xA;        property of a message-driven bean."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The activation-config-property-name element contains&#xD;&#xA;        the name for an activation configuration property of&#xD;&#xA;        a message-driven bean.&#xD;&#xA;&#xD;&#xA;        For JMS message-driven beans, the following property&#xD;&#xA;        names are recognized: acknowledgeMode,&#xD;&#xA;        messageSelector, destinationType, subscriptionDurability"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivationConfig" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The activation-configType defines information about the&#xD;&#xA;expected configuration properties of the message-driven bean&#xD;&#xA;in its operational environment. This may include information&#xD;&#xA;about message acknowledgement, message selector, expected&#xD;&#xA;destination type, etc.&#xD;&#xA;&#xD;&#xA;The configuration information is expressed in terms of&#xD;&#xA;name/value configuration properties.&#xD;&#xA;&#xD;&#xA;The properties that are recognized for a particular&#xD;&#xA;message-driven bean are determined by the messaging type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="configProperties" lowerBound="1"
-        upperBound="-1" eType="#//ActivationConfigProperty" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/j2ee.genmodel b/plugins/org.eclipse.jst.j2ee.core/model/j2ee.genmodel
deleted file mode 100644
index cc972b435..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/j2ee.genmodel
+++ /dev/null
@@ -1,900 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jst.j2ee.core/mofj2ee"
-    modelPluginID="org.eclipse.jst.j2ee.core" modelName="J2ee" testsDirectory="/org.eclipse.jst.j2ee.core.tests/mofj2eeTests"
-    importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java">
-  <foreignModel>..\rose\j2ee.mdl</foreignModel>
-  <foreignModel>WORKSPACE_ROOT</foreignModel>
-  <foreignModel>D:\work\M5</foreignModel>
-  <genPackages prefix="Client" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="client.ecore#/">
-    <genEnums ecoreEnum="client.ecore#//ResAuthApplicationType">
-      <genEnumLiterals ecoreEnumLiteral="client.ecore#//ResAuthApplicationType/Application"/>
-      <genEnumLiterals ecoreEnumLiteral="client.ecore#//ResAuthApplicationType/Container"/>
-    </genEnums>
-    <genClasses ecoreClass="client.ecore#//ApplicationClient">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute client.ecore#//ApplicationClient/version"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/resourceRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/environmentProps"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/ejbReferences"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/resourceEnvRefs"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/callbackHandler"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/serviceRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/messageDestinationRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference client.ecore#//ApplicationClient/messageDestinations"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Application" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="application.ecore#/">
-    <genClasses ecoreClass="application.ecore#//Application">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//Application/version"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference application.ecore#//Application/securityRoles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference application.ecore#//Application/modules"/>
-    </genClasses>
-    <genClasses ecoreClass="application.ecore#//Module">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//Module/uri"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//Module/altDD"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference application.ecore#//Module/application"/>
-    </genClasses>
-    <genClasses ecoreClass="application.ecore#//WebModule">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//WebModule/contextRoot"/>
-    </genClasses>
-    <genClasses ecoreClass="application.ecore#//JavaClientModule"/>
-    <genClasses ecoreClass="application.ecore#//EjbModule"/>
-    <genClasses ecoreClass="application.ecore#//ConnectorModule"/>
-    <nestedGenPackages prefix="Application" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-        classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="application.ecore#/">
-      <genClasses ecoreClass="application.ecore#//Application" labelFeature="#//common/CompatibilityDescriptionGroup/displayName">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//Application/version"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference application.ecore#//Application/securityRoles"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference application.ecore#//Application/modules"/>
-      </genClasses>
-      <genClasses ecoreClass="application.ecore#//Module" labelFeature="#//application/application/Module/uri">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//Module/uri"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//Module/altDD"/>
-        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference application.ecore#//Module/application"/>
-      </genClasses>
-      <genClasses ecoreClass="application.ecore#//WebModule" labelFeature="#//application/application/Module/uri">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute application.ecore#//WebModule/contextRoot"/>
-      </genClasses>
-      <genClasses ecoreClass="application.ecore#//JavaClientModule" labelFeature="#//application/application/Module/uri"/>
-      <genClasses ecoreClass="application.ecore#//EjbModule" labelFeature="#//application/application/Module/uri"/>
-      <genClasses ecoreClass="application.ecore#//ConnectorModule" labelFeature="#//application/application/Module/uri"/>
-    </nestedGenPackages>
-  </genPackages>
-  <genPackages prefix="Common" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="common.ecore#/">
-    <genEnums ecoreEnum="common.ecore#//EnvEntryType">
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/String"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Integer"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Boolean"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Double"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Byte"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Short"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Long"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Float"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EnvEntryType/Character"/>
-    </genEnums>
-    <genEnums ecoreEnum="common.ecore#//ResAuthTypeBase">
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//ResAuthTypeBase/Container"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//ResAuthTypeBase/Application"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//ResAuthTypeBase/SERVLET"/>
-    </genEnums>
-    <genEnums ecoreEnum="common.ecore#//EjbRefType">
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EjbRefType/Session"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//EjbRefType/Entity"/>
-    </genEnums>
-    <genEnums ecoreEnum="common.ecore#//ResSharingScopeType">
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//ResSharingScopeType/Shareable"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//ResSharingScopeType/Unshareable"/>
-    </genEnums>
-    <genEnums ecoreEnum="common.ecore#//MessageDestinationUsageType">
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//MessageDestinationUsageType/Consumes"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//MessageDestinationUsageType/Produces"/>
-      <genEnumLiterals ecoreEnumLiteral="common.ecore#//MessageDestinationUsageType/ConsumesProduces"/>
-    </genEnums>
-    <genClasses ecoreClass="common.ecore#//EjbRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EjbRef/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EjbRef/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EjbRef/home"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EjbRef/remote"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EjbRef/link"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EjbRef/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//EjbRef/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//EnvEntry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EnvEntry/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EnvEntry/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EnvEntry/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EnvEntry/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//EnvEntry/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//ResourceRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceRef/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceRef/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceRef/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceRef/auth"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceRef/link"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceRef/resSharingScope"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//ResourceRef/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//SecurityRoleRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//SecurityRoleRef/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//SecurityRoleRef/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//SecurityRoleRef/link"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//SecurityRoleRef/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//SecurityRole">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//SecurityRole/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//SecurityRole/roleName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//SecurityRole/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//ResourceEnvRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceEnvRef/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ResourceEnvRef/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference common.ecore#//ResourceEnvRef/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//ResourceEnvRef/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//EJBLocalRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EJBLocalRef/localHome"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//EJBLocalRef/local"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//RunAsSpecifiedIdentity">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//RunAsSpecifiedIdentity/identity"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//Identity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//Identity/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//Identity/roleName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//Identity/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//IconType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//IconType/smallIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//IconType/largeIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//IconType/lang"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//DisplayName">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//DisplayName/lang"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//DisplayName/value"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//MessageDestinationRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//MessageDestinationRef/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//MessageDestinationRef/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//MessageDestinationRef/usage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//MessageDestinationRef/link"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//MessageDestinationRef/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//MessageDestination">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//MessageDestination/name"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//ParamValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ParamValue/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ParamValue/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//ParamValue/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//ParamValue/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//DescriptionGroup">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//DescriptionGroup/icons"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//DescriptionGroup/displayNames"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//DescriptionGroup/descriptions"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="common.ecore#//JNDIEnvRefsGroup">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/environmentProperties"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/resourceRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/ejbRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/resourceEnvRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/ejbLocalRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/messageDestinationRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//JNDIEnvRefsGroup/serviceRefs"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//SecurityIdentity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//SecurityIdentity/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//SecurityIdentity/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//UseCallerIdentity"/>
-    <genClasses ecoreClass="common.ecore#//Description">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//Description/lang"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//Description/value"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//QName">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//QName/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//QName/localPart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//QName/combinedQName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//QName/internalPrefixOrNsURI"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//Listener">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference common.ecore#//Listener/listenerClass"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//CompatibilityDescriptionGroup">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//CompatibilityDescriptionGroup/smallIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//CompatibilityDescriptionGroup/largeIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//CompatibilityDescriptionGroup/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//CompatibilityDescriptionGroup/displayName"/>
-    </genClasses>
-    <genClasses ecoreClass="common.ecore#//J2EEEObject"/>
-    <genClasses ecoreClass="common.ecore#//J2EEEAttribute"/>
-  </genPackages>
-  <genPackages prefix="Ejb" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="ejb.ecore#/">
-    <genEnums ecoreEnum="ejb.ecore#//TransactionAttributeType">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionAttributeType/NotSupported"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionAttributeType/Supports"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionAttributeType/Required"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionAttributeType/RequiresNew"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionAttributeType/Mandatory"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionAttributeType/Never"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//TransactionType">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionType/Bean"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//TransactionType/Container"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//SessionType">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//SessionType/Stateful"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//SessionType/Stateless"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//MethodElementKind">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MethodElementKind/Unspecified"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MethodElementKind/Remote"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MethodElementKind/Home"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MethodElementKind/Local"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MethodElementKind/LocalHome"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MethodElementKind/ServiceEndpoint"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//AcknowledgeMode">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//AcknowledgeMode/AutoAcknowledge"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//AcknowledgeMode/DupsOkAcknowledge"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//SubscriptionDurabilityKind">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//SubscriptionDurabilityKind/Durable"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//SubscriptionDurabilityKind/NonDurable"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//ReturnTypeMapping">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//ReturnTypeMapping/Local"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//ReturnTypeMapping/Remote"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//DestinationType">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//DestinationType/Queue"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//DestinationType/Topic"/>
-    </genEnums>
-    <genEnums ecoreEnum="ejb.ecore#//MultiplicityKind">
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MultiplicityKind/One"/>
-      <genEnumLiterals ecoreEnumLiteral="ejb.ecore#//MultiplicityKind/Many"/>
-    </genEnums>
-    <genClasses ecoreClass="ejb.ecore#//ContainerManagedEntity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//ContainerManagedEntity/version"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//ContainerManagedEntity/abstractSchemaName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//ContainerManagedEntity/persistentAttributes"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//ContainerManagedEntity/keyAttributes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//ContainerManagedEntity/queries"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//ContainerManagedEntity/CMPAttribute"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//ContainerManagedEntity/primKeyField"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//MethodPermission">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodPermission/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodPermission/unchecked"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MethodPermission/assemblyDescriptor"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MethodPermission/roles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MethodPermission/methodElements"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MethodPermission/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//AssemblyDescriptor">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//AssemblyDescriptor/methodPermissions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//AssemblyDescriptor/methodTransactions"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//AssemblyDescriptor/ejbJar"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//AssemblyDescriptor/securityRoles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//AssemblyDescriptor/excludeList"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//AssemblyDescriptor/messageDestinations"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//MethodTransaction">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodTransaction/transactionAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodTransaction/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MethodTransaction/assemblyDescriptor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MethodTransaction/methodElements"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MethodTransaction/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//Session">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Session/transactionType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Session/sessionType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//Session/serviceEndpoint"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//Entity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Entity/reentrant"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//Entity/primaryKey"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ejb.ecore#//EnterpriseBean">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EnterpriseBean/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/securityRoleRefs"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/ejbClass"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/homeInterface"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/remoteInterface"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/ejbJar"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/securityIdentity"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/localHomeInterface"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EnterpriseBean/localInterface"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//EJBMethodCategory"/>
-    <genClasses ecoreClass="ejb.ecore#//EJBJar">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBJar/ejbClientJar"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBJar/version"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBJar/assemblyDescriptor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBJar/enterpriseBeans"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBJar/relationshipList"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//MethodElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodElement/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodElement/parms"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodElement/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MethodElement/description"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MethodElement/enterpriseBean"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MethodElement/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//CMPAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//CMPAttribute/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//CMPAttribute/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//Relationships">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Relationships/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//Relationships/ejbJar"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//Relationships/ejbRelations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//Relationships/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//Query">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Query/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Query/ejbQL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//Query/returnTypeMapping"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//Query/queryMethod"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//Query/entity"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//Query/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//EJBRelation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBRelation/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBRelation/name"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelation/relationshipList"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelation/relationshipRoles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelation/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//EJBRelationshipRole">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBRelationshipRole/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBRelationshipRole/roleName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBRelationshipRole/multiplicity"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//EJBRelationshipRole/cascadeDelete"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelationshipRole/relationship"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelationshipRole/source"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelationshipRole/cmrField"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//EJBRelationshipRole/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//RoleSource">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//RoleSource/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//RoleSource/role"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//RoleSource/entityBean"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//RoleSource/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//CMRField">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//CMRField/role"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//CMRField/collectionType"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//MessageDriven">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MessageDriven/transactionType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MessageDriven/messageSelector"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MessageDriven/acknowledgeMode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MessageDriven/link"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MessageDriven/destination"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//MessageDriven/activationConfig"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MessageDriven/messageDestination"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MessageDriven/messagingType"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//MessageDrivenDestination">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MessageDrivenDestination/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//MessageDrivenDestination/subscriptionDurability"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//MessageDrivenDestination/bean"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//ExcludeList">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//ExcludeList/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//ExcludeList/methodElements"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//ExcludeList/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//QueryMethod">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ejb.ecore#//QueryMethod/query"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//ActivationConfigProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//ActivationConfigProperty/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ejb.ecore#//ActivationConfigProperty/name"/>
-    </genClasses>
-    <genClasses ecoreClass="ejb.ecore#//ActivationConfig">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//ActivationConfig/configProperties"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ejb.ecore#//ActivationConfig/descriptions"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Taglib" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      interfacePackageSuffix="internal" metaDataPackageSuffix="internal" classPackageSuffix="internal.impl"
-      utilityPackageSuffix="internal.util" ecorePackage="taglib.ecore#/">
-    <genEnums ecoreEnum="taglib.ecore#//BodyContentType">
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//BodyContentType/tagdependent"/>
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//BodyContentType/JSP"/>
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//BodyContentType/empty"/>
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//BodyContentType/scriptless"/>
-    </genEnums>
-    <genEnums ecoreEnum="taglib.ecore#//JSPScriptingVariableScope">
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//JSPScriptingVariableScope/NESTED"/>
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//JSPScriptingVariableScope/AT_BEGIN"/>
-      <genEnumLiterals ecoreEnumLiteral="taglib.ecore#//JSPScriptingVariableScope/AT_END"/>
-    </genEnums>
-    <genClasses ecoreClass="taglib.ecore#//TagLib">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagLib/tagLibVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagLib/jspVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagLib/shortName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagLib/uri"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TagLib/tags"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TagLib/validator"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TagLib/listeners"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TagLib/functions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TagLib/taglibExtensions"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//JSPTag">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTag/bodyContent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTag/example"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTag/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTag/dynamicAttributes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//JSPTag/attributes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//JSPTag/variables"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference taglib.ecore#//JSPTag/tagClass"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference taglib.ecore#//JSPTag/teiClass"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//JSPTagAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTagAttribute/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTagAttribute/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTagAttribute/rtExprValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPTagAttribute/fragment"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference taglib.ecore#//JSPTagAttribute/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//JSPTagAttribute/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//Validator">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference taglib.ecore#//Validator/validatorClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//Validator/initParams"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//Validator/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//JSPVariable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPVariable/nameGiven"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPVariable/nameFromAttribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPVariable/declare"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//JSPVariable/scope"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference taglib.ecore#//JSPVariable/variableClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//JSPVariable/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//Function">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//Function/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//Function/signature"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//Function/example"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference taglib.ecore#//Function/functionClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//Function/functionExtensions"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//TagFile">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagFile/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagFile/path"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TagFile/example"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TagFile/tagExtensions"/>
-    </genClasses>
-    <genClasses ecoreClass="taglib.ecore#//TldExtension">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//TldExtension/namespace"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference taglib.ecore#//TldExtension/extensionElements"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="taglib.ecore#//ExtensibleType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//ExtensibleType/value"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Webapplication" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="webapplication.ecore#/">
-    <genEnums ecoreEnum="webapplication.ecore#//ResAuthServletType">
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//ResAuthServletType/CONTAINER"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//ResAuthServletType/SERVLET"/>
-    </genEnums>
-    <genEnums ecoreEnum="webapplication.ecore#//HTTPMethodTypeEnum">
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/GET"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/POST"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/PUT"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/DELETE"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/HEAD"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/OPTIONS"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//HTTPMethodTypeEnum/TRACE"/>
-    </genEnums>
-    <genEnums ecoreEnum="webapplication.ecore#//TransportGuaranteeType">
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//TransportGuaranteeType/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//TransportGuaranteeType/INTEGRAL"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//TransportGuaranteeType/CONFIDENTIAL"/>
-    </genEnums>
-    <genEnums ecoreEnum="webapplication.ecore#//DispatcherType">
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//DispatcherType/FORWARD"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//DispatcherType/INCLUDE"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//DispatcherType/REQUEST"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//DispatcherType/ERROR"/>
-    </genEnums>
-    <genEnums ecoreEnum="webapplication.ecore#//AuthMethodKind">
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//AuthMethodKind/UNSPECIFIED"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//AuthMethodKind/BASIC"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//AuthMethodKind/DIGEST"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//AuthMethodKind/FORM"/>
-      <genEnumLiterals ecoreEnumLiteral="webapplication.ecore#//AuthMethodKind/CLIENT_CERT"/>
-    </genEnums>
-    <genClasses ecoreClass="webapplication.ecore#//WebApp">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WebApp/distributable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WebApp/version"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/contexts"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/errorPages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/fileList"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/tagLibs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/constraints"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/loginConfig"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/mimeMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/sessionConfig"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/servletMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/servlets"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/securityRoles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/filters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/filterMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/listeners"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/contextParams"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/jspConfig"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/messageDestinations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebApp/localEncodingMappingList"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//ContextParam">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ContextParam/paramName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ContextParam/paramValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ContextParam/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//ContextParam/webApp"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//Servlet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//Servlet/servletName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//Servlet/loadOnStartup"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//Servlet/webApp"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Servlet/webType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Servlet/params"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Servlet/securityRoleRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Servlet/runAs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Servlet/initParams"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//ServletMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ServletMapping/urlPattern"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ServletMapping/name"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//ServletMapping/webApp"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//ServletMapping/servlet"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//SessionConfig">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//SessionConfig/sessionTimeout"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//SessionConfig/webApp"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//MimeMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//MimeMapping/extension"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//MimeMapping/mimeType"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//MimeMapping/webApp"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//WelcomeFileList">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//WelcomeFileList/webApp"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WelcomeFileList/file"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//ErrorPage">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ErrorPage/location"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//ErrorPage/webApp"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//TagLibRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//TagLibRef/taglibURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//TagLibRef/taglibLocation"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//TagLibRef/webApp"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//SecurityConstraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//SecurityConstraint/displayName"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//SecurityConstraint/webApp"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//SecurityConstraint/webResourceCollections"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//SecurityConstraint/authConstraint"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//SecurityConstraint/userDataConstraint"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//SecurityConstraint/displayNames"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//WebResourceCollection">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WebResourceCollection/webResourceName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WebResourceCollection/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WebResourceCollection/urlPattern"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WebResourceCollection/httpMethod"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//WebResourceCollection/secConstraint"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebResourceCollection/URLs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebResourceCollection/descriptions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//WebResourceCollection/HTTPs"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//AuthConstraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//AuthConstraint/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//AuthConstraint/roles"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//AuthConstraint/secConstraint"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//AuthConstraint/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//UserDataConstraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//UserDataConstraint/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//UserDataConstraint/transportGuarantee"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//UserDataConstraint/secConstraint"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//UserDataConstraint/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//LoginConfig">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//LoginConfig/authMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//LoginConfig/realmName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//LoginConfig/authorizationMethod"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//LoginConfig/webApp"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//LoginConfig/formLoginConfig"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//FormLoginConfig">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//FormLoginConfig/formLoginPage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//FormLoginConfig/formErrorPage"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//FormLoginConfig/loginConfig"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//InitParam">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//InitParam/paramName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//InitParam/paramValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//InitParam/description"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="webapplication.ecore#//WebType"/>
-    <genClasses ecoreClass="webapplication.ecore#//ServletType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ServletType/className"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//JSPType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//JSPType/jspFile"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//URLPatternType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//URLPatternType/urlPattern"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//URLPatternType/resCollection"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//RoleNameType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//RoleNameType/roleName"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//WelcomeFile">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//WelcomeFile/welcomeFile"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//WelcomeFile/fileList"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//ExceptionTypeErrorPage">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//ExceptionTypeErrorPage/exceptionType"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//ErrorCodeErrorPage">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//ErrorCodeErrorPage/errorCode"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//FilterMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//FilterMapping/urlPattern"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//FilterMapping/dispatcherType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//FilterMapping/filter"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//FilterMapping/servlet"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//Filter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//Filter/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Filter/initParams"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webapplication.ecore#//Filter/filterClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//Filter/initParamValues"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//LocalEncodingMappingList">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webapplication.ecore#//LocalEncodingMappingList/localEncodingMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//LocalEncodingMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//LocalEncodingMapping/locale"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//LocalEncodingMapping/encoding"/>
-    </genClasses>
-    <genClasses ecoreClass="webapplication.ecore#//HTTPMethodType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webapplication.ecore#//HTTPMethodType/httpMethod"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Jca" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="jca.ecore#/">
-    <genEnums ecoreEnum="jca.ecore#//AuthenticationMechanismType">
-      <genEnumLiterals ecoreEnumLiteral="jca.ecore#//AuthenticationMechanismType/BasicPassword"/>
-      <genEnumLiterals ecoreEnumLiteral="jca.ecore#//AuthenticationMechanismType/Kerbv5"/>
-    </genEnums>
-    <genEnums ecoreEnum="jca.ecore#//TransactionSupportKind">
-      <genEnumLiterals ecoreEnumLiteral="jca.ecore#//TransactionSupportKind/NoTransaction"/>
-      <genEnumLiterals ecoreEnumLiteral="jca.ecore#//TransactionSupportKind/LocalTransaction"/>
-      <genEnumLiterals ecoreEnumLiteral="jca.ecore#//TransactionSupportKind/XATransaction"/>
-    </genEnums>
-    <genClasses ecoreClass="jca.ecore#//Connector">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//Connector/vendorName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//Connector/specVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//Connector/eisType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//Connector/version"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//Connector/license"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//Connector/resourceAdapter"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//ResourceAdapter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/managedConnectionFactoryClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/connectionFactoryInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/connectionFactoryImplClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/connectionInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/connectionImplClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/transactionSupport"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/reauthenticationSupport"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ResourceAdapter/resourceAdapterClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ResourceAdapter/securityPermissions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ResourceAdapter/authenticationMechanisms"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ResourceAdapter/configProperties"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ResourceAdapter/outboundResourceAdapter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ResourceAdapter/inboundResourceAdapter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ResourceAdapter/adminObjects"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//AuthenticationMechanism">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AuthenticationMechanism/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AuthenticationMechanism/authenticationMechanism"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AuthenticationMechanism/authenticationMechanismType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AuthenticationMechanism/credentialInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AuthenticationMechanism/customAuthMechType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//AuthenticationMechanism/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//ConfigProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConfigProperty/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConfigProperty/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConfigProperty/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConfigProperty/value"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ConfigProperty/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//SecurityPermission">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//SecurityPermission/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//SecurityPermission/specification"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//SecurityPermission/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//License">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//License/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//License/required"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//License/descriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//InboundResourceAdapter">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//InboundResourceAdapter/messageAdapter"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//OutboundResourceAdapter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//OutboundResourceAdapter/reauthenticationSupport"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//OutboundResourceAdapter/transactionSupport"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//OutboundResourceAdapter/connectionDefinitions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//OutboundResourceAdapter/authenticationMechanisms"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//MessageAdapter">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//MessageAdapter/messageListeners"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//ConnectionDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConnectionDefinition/managedConnectionFactoryClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConnectionDefinition/connectionFactoryInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConnectionDefinition/connectionFactoryImplClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConnectionDefinition/connectionInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ConnectionDefinition/connectionImplClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ConnectionDefinition/configProperties"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//AdminObject">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AdminObject/adminObjectInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//AdminObject/adminObjectClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//AdminObject/configProperties"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//MessageListener">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//MessageListener/messageListenerType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//MessageListener/activationSpec"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//ActivationSpec">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//ActivationSpec/activationSpecClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//ActivationSpec/requiredConfigProperties"/>
-    </genClasses>
-    <genClasses ecoreClass="jca.ecore#//RequiredConfigPropertyType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jca.ecore#//RequiredConfigPropertyType/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jca.ecore#//RequiredConfigPropertyType/descriptions"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Webservice_client" basePackage="org.eclipse.jst.j2ee.webservice"
-      disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util"
-      ecorePackage="wsclient.ecore#/">
-    <genClasses ecoreClass="wsclient.ecore#//ServiceRef">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsclient.ecore#//ServiceRef/serviceInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//ServiceRef/serviceRefName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//ServiceRef/wsdlFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//ServiceRef/jaxrpcMappingFile"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//ServiceRef/portComponentRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//ServiceRef/handlers"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//ServiceRef/serviceQname"/>
-    </genClasses>
-    <genClasses ecoreClass="wsclient.ecore#//PortComponentRef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//PortComponentRef/portComponentLink"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsclient.ecore#//PortComponentRef/serviceEndpointInterface"/>
-    </genClasses>
-    <genClasses ecoreClass="wsclient.ecore#//Handler">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//Handler/handlerName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//Handler/soapRoles"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//Handler/portNames"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsclient.ecore#//Handler/handlerClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//Handler/initParams"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//Handler/soapHeaders"/>
-    </genClasses>
-    <genClasses ecoreClass="wsclient.ecore#//WebServicesClient">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//WebServicesClient/componentScopedRefs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//WebServicesClient/serviceRefs"/>
-    </genClasses>
-    <genClasses ecoreClass="wsclient.ecore#//ComponentScopedRefs">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsclient.ecore#//ComponentScopedRefs/componentName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsclient.ecore#//ComponentScopedRefs/serviceRefs"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Jsp" basePackage="org.eclipse.jst.j2ee" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="jsp.ecore#/">
-    <genClasses ecoreClass="jsp.ecore#//JSPConfig">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jsp.ecore#//JSPConfig/tagLibs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jsp.ecore#//JSPConfig/propertyGroups"/>
-    </genClasses>
-    <genClasses ecoreClass="jsp.ecore#//JSPPropertyGroup">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/urlPattern"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/elIgnored"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/pageEncoding"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/scriptingInvalid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/isXML"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/includePreludes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//JSPPropertyGroup/includeCodas"/>
-    </genClasses>
-    <genClasses ecoreClass="jsp.ecore#//TagLibRefType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//TagLibRefType/taglibURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsp.ecore#//TagLibRefType/taglibLocation"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Wscommon" basePackage="org.eclipse.jst.j2ee.webservice" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="wscommon.ecore#/">
-    <genClasses ecoreClass="wscommon.ecore#//InitParam">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wscommon.ecore#//InitParam/paramName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wscommon.ecore#//InitParam/paramValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wscommon.ecore#//InitParam/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wscommon.ecore#//InitParam/descriptionTypes"/>
-    </genClasses>
-    <genClasses ecoreClass="wscommon.ecore#//SOAPHeader"/>
-    <genClasses ecoreClass="wscommon.ecore#//SOAPRole">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wscommon.ecore#//SOAPRole/soapRole"/>
-    </genClasses>
-    <genClasses ecoreClass="wscommon.ecore#//PortName">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wscommon.ecore#//PortName/portName"/>
-    </genClasses>
-    <genClasses ecoreClass="wscommon.ecore#//DescriptionType"/>
-    <genClasses ecoreClass="wscommon.ecore#//DisplayNameType"/>
-  </genPackages>
-  <genPackages prefix="Wsdd" basePackage="org.eclipse.jst.j2ee.webservice" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="wsdd.ecore#/">
-    <genClasses ecoreClass="wsdd.ecore#//WebServices">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServices/webServiceDescriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//WebServiceDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/jaxrpcMappingFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/webServiceDescriptionName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/wsdlFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/smallIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/largeIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/displayName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/portComponents"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/descriptionType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/displayNameType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/iconType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//PortComponent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/portComponentName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/serviceEndpointInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/smallIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/largeIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/displayName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/wsdlPort"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/serviceImplBean"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/handlers"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/descriptionType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/displayNameType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/iconType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//WSDLPort"/>
-    <genClasses ecoreClass="wsdd.ecore#//ServiceImplBean">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//ServiceImplBean/eEJBLink"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//ServiceImplBean/eServletLink"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//ServiceImplBean/beanLink"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//ServletLink">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//ServletLink/servletLink"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//EJBLink">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//EJBLink/ejbLink"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//Handler">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/handlerName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/handlerClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/initParams"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/soapHeaders"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/soapRoles"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//BeanLink"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/jaxrpcmap.ecore b/plugins/org.eclipse.jst.j2ee.core/model/jaxrpcmap.ecore
deleted file mode 100644
index f2ebf10f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/jaxrpcmap.ecore
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="jaxrpcmap"
-    nsURI="jaxrpcmap.xmi" nsPrefix="org.eclipse.jst.j2ee.webservice.jaxrpcmap">
-  <eClassifiers xsi:type="ecore:EClass" name="JavaWSDLMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The element describes the Java mapping to a known WSDL document.It contains the mapping between package names and XML namespaces, &#xD;&#xA;WSDL root types and Java artifacts, and the set of mappings for services."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="packageMappings" lowerBound="1"
-        upperBound="-1" eType="#//PackageMapping" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaXMLTypeMappings" upperBound="-1"
-        eType="#//JavaXMLTypeMapping" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionMappings" upperBound="-1"
-        eType="#//ExceptionMapping" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceMappings" upperBound="-1"
-        eType="#//InterfaceMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PackageMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The package-mapping indicates the mapping between java-package-name and XML namespace in the WSDL document.&#xD;&#xA;&#xD;&#xA;Used in: java-wsdl-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The package-type indicates the Java package name. It must be a fully qualified name.&#xD;&#xA;&#xD;&#xA;Used in: package-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaXMLTypeMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The java-xml-type-mapping element contains a class-type that is the fully qualified name of the Java class, QName of the XML root type, the WSDL type scope the QName applies to and the set of variable &#xD;&#xA;mappings for each public variable within the Java class.&#xD;&#xA;&#xD;&#xA;Used in: java-wsdl-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The class-type element is the fully qualified class name of a Java class.&#xD;&#xA;&#xD;&#xA;Used in: java-xml-type-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qnameScope" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The qname-scope elements scopes the reference of a QName to the WSDL element type it applies to. The value of qname-scope may be simpleType, complexType, or element.&#xD;&#xA;&#xD;&#xA;Used in: java-xml-type-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="anonymousTypeQname" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rootTypeQname" lowerBound="1"
-        eType="#//RootTypeQname" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variableMappings" upperBound="-1"
-        eType="#//VariableMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExceptionMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The exception-mapping element defines the mapping between the service specific exception types and the wsdl faults.&#xD;&#xA;&#xD;&#xA;This element should be interpreted with respect to the&#xD;&#xA;mapping between a method and an operation which provides the mapping context.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-method-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exceptionType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The exception-type element defines Java type of the exception. It may be a service specific exception.&#xD;&#xA;&#xD;&#xA;It must be a fully qualified class name.&#xD;&#xA;&#xD;&#xA;Used in: exception-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlMessagePartName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlMessage" lowerBound="1"
-        eType="#//WSDLMessage" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="constructorParameterOrder"
-        eType="#//ConstructorParameterOrder" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceInterfaceMapping" eSuperTypes="#//InterfaceMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The service-interface-mapping element defines how a Java type for the service interface maps to a WSDL service.&#xD;&#xA;&#xD;&#xA;Used in: java-wsdl-mapping&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The service-interface element defines the Java type for the service. For static services, it is javax.xml.rpc.Service interface. For generated service, it would be the generated interface name.&#xD;&#xA;&#xD;&#xA;The name must be a fully qualified class name.&#xD;&#xA;&#xD;&#xA;Used in: service-interface-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlServiceName" lowerBound="1"
-        eType="#//WSDLServiceName" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="portMappings" upperBound="-1"
-        eType="#//PortMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceEndpointInterfaceMapping" eSuperTypes="#//InterfaceMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The service-endpoint-interface-mapping defines a tuple&#xD;&#xA;to specify Service Endpoint Interfaces to WSDL port types and WSDL bindings.&#xD;&#xA;&#xD;&#xA;An interface may be mapped to a port-type and binding multiple times. This happens rarely.&#xD;&#xA;&#xD;&#xA;Used in: java-wsdl-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceEndpointInterface"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The service-endpoint-interface element defines the Java type for the endpoint interface. The name must be a fully qualified class name.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-interface-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlPortType" lowerBound="1"
-        eType="#//WSDLPortType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlBinding" lowerBound="1"
-        eType="#//WSDLBinding" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceEndpointMethodMappings"
-        upperBound="-1" eType="#//ServiceEndpointMethodMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RootTypeQname" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The root-type-qname identifies the WSDL QName of an XML type.&#xD;&#xA;&#xD;&#xA;Used in: java-xml-type-mapping"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VariableMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The variable-mapping element defines the correlation between a Java class data member or JavaBeans property to an XML element name of an XML root type. If the data-member element is present, the Java variable name is a public data member.  If data-member&#xD;&#xA;is not present, the Java variable name is a JavaBeans property.&#xD;&#xA;&#xD;&#xA;Used in: java-xml-type-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVariableName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The java-variable-name defines the name of a public data member or  JavaBeans property within a Java class. &#xD;&#xA;&#xD;&#xA;Used in: variable-mapping&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlElementName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The xml-element-name element defines name attribute value of a WSDL element within a root type.&#xD;&#xA;&#xD;&#xA;Used in: variable-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataMember" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlAttributeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlWildcard" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLMessage" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The wsdl-message  element defines a WSDL message by a QNAME.&#xD;&#xA;&#xD;&#xA;Used in: wsdl-message-mapping, wsdl-return-value-mapping"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstructorParameterOrder" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The constructor-parameter-order element defines the order that complexType element values are applied to a Java exception constructor. Element names are specified for each parameter of the constructor, including element names of inherited types if necessary.&#xD;&#xA;&#xD;&#xA;Used in: exception-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementNames" lowerBound="1"
-        upperBound="-1" eType="#//ElementName" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ElementName" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The element-name element defines the name of a complexType element name attribute value.&#xD;&#xA;&#xD;&#xA;Used in: constructor-parameter-order"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLServiceName" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The wsdl-service-name element defines the wsdl service name by a QNAME which uniquely identifies  the service.&#xD;&#xA;&#xD;&#xA;Used in: service-interface-mapping"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The port-mapping defines the mapping of the WSDL port name attribute to the Java name used to generate the Generated Service Interface method get&lt;java-name>.&#xD;&#xA;&#xD;&#xA;Used in: service-interface-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The port-name is the attribute value of a name attribute of a WSDL port element.&#xD;&#xA;&#xD;&#xA;Used in: port-mapping&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaPortName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The java-port-name element is the string to use as the port name in Java.  It is used in generating the Generated Service Interface method&#xD;&#xA;get&lt;java-port-name>.&#xD;&#xA;&#xD;&#xA;Used in: port-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLPortType" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The wsdl-port-type element defines the wsdl port type&#xD;&#xA;by a QNAME which uniquely identifies  the port type.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-interface-mapping"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLBinding" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The wsdl-binding element defines the wsdl binding&#xD;&#xA;by a QNAME which uniquely identifies  the binding.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-interface-mapping"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceEndpointMethodMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The service-endpoint-method-mapping element defines the mapping of Java methods to operations (which are not uniquely qualified by qnames).&#xD;&#xA;&#xD;&#xA;The wsdl-operation should be interpreted with respect to the portType and binding in which this definition is embedded within. See the definitions for service-endpoint-interface-mapping and &#xD;&#xA;service-interface-mapping to acquire the proper context. The wrapped-element indicator should only be specified when a WSDL message wraps an element type.  The wsdl-return-value-mapping is not specified for one-way operations.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-interface-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaMethodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The java-method-name element defines the name of a Java method within an interface.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-method-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlOperation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The wsdl-operation element defines an operation within a WSDL document. It must be interpreted with respect to a port type.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-method-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wrappedElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodParamPartsMappings"
-        upperBound="-1" eType="#//MethodParamPartsMapping" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlReturnValueMapping"
-        eType="#//WSDLReturnValueMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLOperation" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlOperation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodParamPartsMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The method-param-parts-mapping element defines the mapping between a Java method parameters and a wsdl-message.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-method-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramPosition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The param-position element defines the position of a parameter within a Java method.  It must be an integer starting from 0.&#xD;&#xA;&#xD;&#xA;Used in: method-param-parts-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The param-type element defines the Java type of a parameter within a Java method. It must be defined by a fully qualified name of a class.&#xD;&#xA;&#xD;&#xA;Used in: method-param-parts-mapping&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlMessageMapping" lowerBound="1"
-        eType="#//WSDLMessageMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLReturnValueMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The wsdl-return-value-mapping  element defines the mapping for the method's return value. It defines the mapping to a specific message and its part.  Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely &#xD;&#xA;identified with their names. The wsdl-message-part-name is not&#xD;&#xA;specified if there is no return value or OUT parameters.&#xD;&#xA;&#xD;&#xA;Used in: service-endpoint-method-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodReturnValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The method-return-value  element defines a fully qualified class name or void type for the method's return value type.&#xD;&#xA;&#xD;&#xA;Used in: wsdl-return-value-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlMessagePartName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element&#xD;&#xA;name of the element type.&#xD;&#xA;&#xD;&#xA;Used in: wsdl-message-mapping, wsdl-return-value-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlMessage" lowerBound="1"
-        eType="#//WSDLMessage" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLMessageMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The wsdl-message-mapping element defines the mapping to a specific message and its part. Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely &#xD;&#xA;identified with their names.&#xD;&#xA;&#xD;&#xA;The parameter-mode is defined by the mapping to indicate whether the mapping will be IN, OUT, or INOUT..  The presence of the soap-header&#xD;&#xA;element indicates that the parameter is mapped to a soap header only. When absent, it means that the wsdl-message is mapped to a Java parameter. The soap headers are interpreted in the order they are&#xD;&#xA;provided in the mapping.&#xD;&#xA;&#xD;&#xA;Used in: method-param-parts-mapping"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlMessagePartName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element&#xD;&#xA;name of the element type.&#xD;&#xA;&#xD;&#xA;Used in: wsdl-message-mapping, wsdl-return-value-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterMode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The parameter-mode  element defines the mode of the parameter. It can have only three values, IN, OUT, INOUT.&#xD;&#xA;&#xD;&#xA;Used in: wsdl-message-mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapHeader" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlMessage" lowerBound="1"
-        eType="#//WSDLMessage" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLMessagePartName" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlMessagePartName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InterfaceMapping" eSuperTypes="common.ecore#//J2EEEObject"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/jca.ecore b/plugins/org.eclipse.jst.j2ee.core/model/jca.ecore
deleted file mode 100644
index 817e33b6c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/jca.ecore
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="jca"
-    nsURI="jca.xmi" nsPrefix="org.eclipse.jst.j2ee.jca">
-  <eClassifiers xsi:type="ecore:EClass" name="Connector" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vendorName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the name of resource adapter provider vendor.&#xD;&#xA;Example: Wombat Corp."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the version of the connector architecture specification that is supported by this resource adapter. This information enables deployer to configure the resource adapter to support deployment and runtime requirements of the corresponding connector architecture specification.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="eisType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains information about the type of the EIS. For example, the type of an EIS can be product name of EIS independent of any version info.&#xD;&#xA;&#xD;&#xA;This helps in identifying EIS instances that can be used with&#xD;&#xA;this resource adapter.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies a string-based version of the resource adapter from the resource adapter provider.&#xD;&#xA;&#xD;&#xA;Example: 1.5"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="license" eType="#//License"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies licensing requirements for the resource adapter module. This element specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of&#xD;&#xA;connection restrictions)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceAdapter" lowerBound="1"
-        eType="#//ResourceAdapter" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceAdapter" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies information about the resource adapter. The information includes fully-qualified names of class/interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional&#xD;&#xA;required security permissions.&#xD;&#xA;&#xD;&#xA;If there is no authentication-mechanism specified as part of&#xD;&#xA;resource adapter element then the resource adapter does not&#xD;&#xA;support any standard security authentication mechanisms as part&#xD;&#xA;of security contract. The application server ignores the security&#xD;&#xA;part of the system contracts in this case.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="managedConnectionFactoryClass"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.managedConnectionFactoryClass&#xD;&#xA;Specifies the fully qualified name of the Java class that implements the javax.resource.spi.Managed-ConnectionFactory interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionFactoryInterface"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionFactoryInterface&#xD;&#xA;Specifies the fully-qualified name of the ConnectionFactory interface supported by the resource adapter.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionFactoryImplClass"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionFactoryImplClass&#xD;&#xA;Specifies the fully-qualified name of the ConnectionFactory class that implements resource adapter specific ConnectionFactory interface."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionInterface"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionImplClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionImplClass&#xD;&#xA;Specifies the fully-qualified name of the Connection interface supported by the resource adapter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionSupport" eType="#//TransactionSupportKind"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.transactionSupport&#xD;&#xA;The transaction-support element specifies the level of transaction&#xD;&#xA;support provided by the resource adapter.&#xD;&#xA;The value of transaction-support must be one of the following:&#xD;&#xA;  NoTransaction&#xD;&#xA;  LocalTransaction&#xD;&#xA;  XATransaction"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reauthenticationSupport"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes outboundResourceAdapter.reauthenticationSupport&#xD;&#xA;Specifies whether the resource adapter implementation supports re-authentication of existing Managed-Connection instance. Note that this information is for the resource adapter implementation and not for the underlying EIS instance."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceAdapterClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element resourceadapter-class specifies the&#xD;&#xA;        fully qualified name of a Java class that implements&#xD;&#xA;        the javax.resource.spi.ResourceAdapter&#xD;&#xA;        interface. This Java class is provided as part of&#xD;&#xA;        resource adapter's implementation of connector&#xD;&#xA;        architecture specified contracts. The implementation&#xD;&#xA;        of this class is required to be a JavaBean."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityPermissions" upperBound="-1"
-        eType="#//SecurityPermission" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="authenticationMechanisms"
-        upperBound="-1" eType="#//AuthenticationMechanism" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="configProperties" upperBound="-1"
-        eType="#//ConfigProperty" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outboundResourceAdapter"
-        eType="#//OutboundResourceAdapter" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The connectionfactory-interface element content must be&#xD;&#xA;        unique in the outbound-resourceadapter. Multiple connection-definitions&#xD;&#xA;        can not use the same connectionfactory-type."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inboundResourceAdapter"
-        eType="#//InboundResourceAdapter" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="adminObjects" upperBound="-1"
-        eType="#//AdminObject" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuthenticationMechanism" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.&#xD;&#xA;&#xD;&#xA;Note that BasicPassword mechanism type should support the&#xD;&#xA;javax.resource.spi.security.PasswordCredential interface.&#xD;&#xA;The Kerbv5 mechanism type should support the&#xD;&#xA;javax.resource.spi.security.GenericCredential interface.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authenticationMechanism"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authenticationMechanismType"
-        eType="#//AuthenticationMechanismType" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated See authenticationMechanism&#xD;&#xA;&#xD;&#xA;The authentication-mechanism-type specifies type of an authentication mechanism.&#xD;&#xA;&#xD;&#xA;The example values are:&#xD;&#xA;  - BasicPassword&#xD;&#xA;  - Kerbv5&#xD;&#xA;&#xD;&#xA;Any additional security mechanisms are outside the scope of the&#xD;&#xA;Connector architecture specification.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="credentialInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the interface that the resource adapter implementation supports for the representation of the credentials. This element should be used by application server to find out the Credential interface it should use as part of the security contract.&#xD;&#xA;&#xD;&#xA;The possible values are:&#xD;&#xA;   javax.resource.spi.security.PasswordCredential&#xD;&#xA;   javax.resource.spi.security.GenericCredential&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customAuthMechType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated&#xD;&#xA;This is an internal variable used to store the AthenticationMechanismType when it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType is set to 'Custom' in those cases.  This attribute should not be used by runtime.  It is only used by the writer to write back out the custom AuthenticationMechanismType string in the case of custom AuthenticationMechanismType's.  &#xD;&#xA;This variable is internal, used only by the reader/writer classes, and can change or disappear without notice.  "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="AuthenticationMechanismType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;BasicPassword=0&#xD;&#xA;Kerbv5=1"/>
-    </eAnnotations>
-    <eLiterals name="BasicPassword"/>
-    <eLiterals name="Kerbv5" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigProperty" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The config property contains a declaration of a single&#xD;&#xA;configuration property for a ManagedConnectionFactory instance.&#xD;&#xA;&#xD;&#xA;Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).&#xD;&#xA;&#xD;&#xA;The declaration consists of an optional description, name, type&#xD;&#xA;and an optional value of the configuration property. If the resource&#xD;&#xA;adapter provider does not specify a value than the deployer is&#xD;&#xA;responsible for providing a valid value for a configuration property.&#xD;&#xA;&#xD;&#xA;Any bounds or well-defined values of properties should be described in the description.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains the name of a configuration property.&#xD;&#xA;&#xD;&#xA;The connector architecture defines a set of well-defined properties all of type java.lang.String. These are as follows:&#xD;&#xA;&#xD;&#xA;     ServerName&#xD;&#xA;     PortNumber&#xD;&#xA;     UserName&#xD;&#xA;     Password&#xD;&#xA;     ConnectionURL&#xD;&#xA;&#xD;&#xA;A resource adapter provider can extend this property set to include properties specific to the resource adapter and its underlying EIS.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains the fully qualified Java type of a configuration property as required by ManagedConnection-Factory instance.&#xD;&#xA;&#xD;&#xA;The following are the legal values of config-property-type:&#xD;&#xA;   java.lang.Boolean, java.lang.String, java.lang.Integer,&#xD;&#xA;   java.lang.Double, java.lang.Byte, java.lang.Short,&#xD;&#xA;   java.lang.Long, java.lang.Float, java.lang.Character"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element config-property-value contains the value&#xD;&#xA;        of a configuration entry. Note, it is possible for a&#xD;&#xA;        resource adapter deployer to override this&#xD;&#xA;        configuration information during deployment.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;        &lt;config-property-value>WombatServer&lt;/config-property-value>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SecurityPermission" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies a security permission that is required by the resource adapter code.&#xD;&#xA;&#xD;&#xA;The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element permission-spec specifies a security permission based on the Security policy file syntax. &#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="License" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specifies licensing requirements for the resource adapter module. Specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated Replaced with descriptions&#xD;&#xA;The description is used to provide text describing the license."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TransactionSupportKind">
-    <eLiterals name="NoTransaction"/>
-    <eLiterals name="LocalTransaction" value="1"/>
-    <eLiterals name="XATransaction" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InboundResourceAdapter" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The inbound-resourceadapterType specifies information&#xD;&#xA;about an inbound resource adapter. This contains information&#xD;&#xA;specific to the implementation of the resource adapter&#xD;&#xA;library as specified through the messageadapter element."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageAdapter" eType="#//MessageAdapter"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The messagelistener-type element content must be&#xD;&#xA;        unique in the messageadapter. Several messagelisteners&#xD;&#xA;        can not use the same messagelistener-type."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutboundResourceAdapter" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The outbound-resourceadapterType specifies information about&#xD;&#xA;an outbound resource adapter. The information includes fully&#xD;&#xA;qualified names of classes/interfaces required as part of&#xD;&#xA;the connector architecture specified contracts for&#xD;&#xA;connection management, level of transaction support&#xD;&#xA;provided, one or more authentication mechanisms supported&#xD;&#xA;and additional required security permissions.&#xD;&#xA;&#xD;&#xA;If there is no authentication-mechanism specified as part of&#xD;&#xA;resource adapter element then the resource adapter does not&#xD;&#xA;support any standard security authentication mechanisms as&#xD;&#xA;part of security contract. The application server ignores&#xD;&#xA;the security part of the system contracts in this case."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reauthenticationSupport"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element reauthentication-support specifies&#xD;&#xA;        whether the resource adapter implementation supports&#xD;&#xA;        re-authentication of existing Managed- Connection&#xD;&#xA;        instance. Note that this information is for the&#xD;&#xA;        resource adapter implementation and not for the&#xD;&#xA;        underlying EIS instance. This element must have&#xD;&#xA;        either a &quot;true&quot; or &quot;false&quot; value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transactionSupport" eType="#//TransactionSupportKind"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connectionDefinitions"
-        upperBound="-1" eType="#//ConnectionDefinition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="authenticationMechanisms"
-        upperBound="-1" eType="#//AuthenticationMechanism" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageAdapter" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The messageadapterType specifies information about the&#xD;&#xA;messaging capabilities of the resource adapter. This&#xD;&#xA;contains information specific to the implementation of the&#xD;&#xA;resource adapter library as specified through the&#xD;&#xA;messagelistener element."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageListeners" lowerBound="1"
-        upperBound="-1" eType="#//MessageListener" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConnectionDefinition" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The connection-definitionType defines a set of connection&#xD;&#xA;interfaces and classes pertaining to a particular connection&#xD;&#xA;type. This also includes configurable properties for&#xD;&#xA;ManagedConnectionFactory instances that may be produced out&#xD;&#xA;of this set."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="managedConnectionFactoryClass"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element managedconnectionfactory-class specifies&#xD;&#xA;        the fully qualified name of the Java class that&#xD;&#xA;        implements the&#xD;&#xA;        javax.resource.spi.ManagedConnectionFactory interface.&#xD;&#xA;        This Java class is provided as part of resource&#xD;&#xA;        adapter's implementation of connector architecture&#xD;&#xA;        specified contracts. The implementation of this&#xD;&#xA;        class is required to be a JavaBean.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;        &lt;managedconnectionfactory-class>&#xD;&#xA;            com.wombat.ManagedConnectionFactoryImpl&#xD;&#xA;        &lt;/managedconnectionfactory-class>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionFactoryInterface"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element connectionfactory-interface specifies&#xD;&#xA;        the fully qualified name of the ConnectionFactory&#xD;&#xA;        interface supported by the resource adapter.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;        &lt;connectionfactory-interface>com.wombat.ConnectionFactory&#xD;&#xA;        &lt;/connectionfactory-interface>&#xD;&#xA;&#xD;&#xA;        OR&#xD;&#xA;&#xD;&#xA;        &lt;connectionfactory-interface>javax.resource.cci.ConnectionFactory&#xD;&#xA;        &lt;/connectionfactory-interface>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionFactoryImplClass"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element connectionfactory-impl-class specifies&#xD;&#xA;        the fully qualified name of the ConnectionFactory&#xD;&#xA;        class that implements resource adapter&#xD;&#xA;        specific ConnectionFactory interface.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;        &lt;connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl&#xD;&#xA;        &lt;/connectionfactory-impl-class>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The connection-interface element specifies the fully&#xD;&#xA;        qualified name of the Connection interface supported&#xD;&#xA;        by the resource adapter.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;            &lt;connection-interface>javax.resource.cci.Connection&#xD;&#xA;            &lt;/connection-interface>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectionImplClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The connection-impl-classType specifies the fully&#xD;&#xA;        qualified name of the Connection class that&#xD;&#xA;        implements resource adapter specific Connection&#xD;&#xA;        interface.  It is used by the connection-impl-class&#xD;&#xA;        elements.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;            &lt;connection-impl-class>com.wombat.ConnectionImpl&#xD;&#xA;            &lt;/connection-impl-class>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="configProperties" upperBound="-1"
-        eType="#//ConfigProperty" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AdminObject" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The adminobjectType specifies information about an&#xD;&#xA;administered object.  Administered objects are specific to a&#xD;&#xA;messaging style or message provider.  This contains&#xD;&#xA;information on the Java type of the interface implemented by&#xD;&#xA;an administered object, its Java class name and its&#xD;&#xA;configuration properties."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="adminObjectInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element adminobject-interface specifies the&#xD;&#xA;        fully qualified name of the Java type of the&#xD;&#xA;        interface implemented by an administered object.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;          &lt;adminobject-interface>javax.jms.Destination&#xD;&#xA;          &lt;/adminobject-interface>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="adminObjectClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element adminobject-class specifies the fully&#xD;&#xA;        qualified Java class name of an administered object.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;            &lt;adminobject-class>com.wombat.DestinationImpl&#xD;&#xA;            &lt;/adminobject-class>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="configProperties" upperBound="-1"
-        eType="#//ConfigProperty" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageListener" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The messagelistenerType specifies information about a&#xD;&#xA;specific message listener supported by the messaging&#xD;&#xA;resource adapter. It contains information on the Java type&#xD;&#xA;of the message listener interface and an activation&#xD;&#xA;specification."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageListenerType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element messagelistener-type specifies the fully&#xD;&#xA;        qualified name of the Java type of a message&#xD;&#xA;        listener interface.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;          &lt;messagelistener-type>javax.jms.MessageListener&#xD;&#xA;          &lt;/messagelistener-type>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activationSpec" lowerBound="1"
-        eType="#//ActivationSpec" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivationSpec" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The activationspecType specifies an activation&#xD;&#xA;specification.  The information includes fully qualified&#xD;&#xA;Java class name of an activation specification and a set of&#xD;&#xA;required configuration property names."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activationSpecClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The element activationspec-class specifies the fully&#xD;&#xA;        qualified Java class name of the activation&#xD;&#xA;        specification class. This class must implement the&#xD;&#xA;        javax.resource.spi.ActivationSpec interface. The&#xD;&#xA;        implementation of this class is required to be a&#xD;&#xA;        JavaBean.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;            &lt;activationspec-class>com.wombat.ActivationSpecImpl&#xD;&#xA;            &lt;/activationspec-class>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="requiredConfigProperties"
-        upperBound="-1" eType="#//RequiredConfigPropertyType" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RequiredConfigPropertyType" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The required-config-propertyType contains a declaration&#xD;&#xA;of a single configuration property used for specifying a&#xD;&#xA;required configuration property name. It is used&#xD;&#xA;by required-config-property elements.&#xD;&#xA;&#xD;&#xA;Example:&#xD;&#xA;&#xD;&#xA;&lt;required-config-property>Destination&lt;/required-config-property>"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/jsp.ecore b/plugins/org.eclipse.jst.j2ee.core/model/jsp.ecore
deleted file mode 100644
index bca048c08..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/jsp.ecore
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="jsp"
-    nsURI="jsp.xmi" nsPrefix="org.eclipse.jst.j2ee.jsp">
-  <eClassifiers xsi:type="ecore:EClass" name="JSPConfig" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The jsp-configType is used to provide global configuration&#xD;&#xA;information for the JSP files in a web application. It has&#xD;&#xA;two subelements, taglib and jsp-property-group."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tagLibs" upperBound="-1"
-        eType="#//TagLibRefType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="propertyGroups" upperBound="-1"
-        eType="#//JSPPropertyGroup" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JSPPropertyGroup" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The jsp-property-groupType is used to group a number of&#xD;&#xA;files so they can be given global property information.&#xD;&#xA;All files so described are deemed to be JSP files. The&#xD;&#xA;following additional properties can be described:&#xD;&#xA;&#xD;&#xA;- Control enabling of EL evaluation. - Control enabling&#xD;&#xA;of Scripting elements. - Indicate pageEncoding&#xD;&#xA;information. - Indicating that a resource is a JSP&#xD;&#xA;document - Prelude and Coda automatic includes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="urlPattern" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elIgnored" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Can be used to easily set the isELIgnored&#xD;&#xA;&#x9;property of a group of JSP pages. By default,&#xD;&#xA;&#x9;the EL evaluation is enabled for Web&#xD;&#xA;&#x9;Applications using a Servlet 2.4 or greater&#xD;&#xA;&#x9;web.xml, and disabled otherwise."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageEncoding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The valid values of page-encoding are those of&#xD;&#xA;&#x9;the pageEncoding page directive. It is a&#xD;&#xA;&#x9;translation-time error to name different&#xD;&#xA;&#x9;encodings in the pageEncoding attribute of the&#xD;&#xA;&#x9;page directive of a JSP page and in a JSP&#xD;&#xA;&#x9;configuration element matching the page. It is&#xD;&#xA;&#x9;also a translation-time error to name different&#xD;&#xA;&#x9;encodings in the prolog of a document in XML&#xD;&#xA;&#x9;syntax and in a JSP configuration element&#xD;&#xA;&#x9;matching the document. It is legal to name the&#xD;&#xA;&#x9;same encoding through mulitple mechanisms."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scriptingInvalid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Can be used to easily disable scripting in a&#xD;&#xA;&#x9;group of JSP pages. By default, scripting is&#xD;&#xA;&#x9;enabled."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isXML" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If true, denotes that the group of resources&#xD;&#xA;&#x9;that match the URL pattern are JSP documents,&#xD;&#xA;&#x9;and thus must be interpreted as XML documents.&#xD;&#xA;&#x9;If false, the resources are assumed to not be&#xD;&#xA;&#x9;JSP documents, unless there is another property&#xD;&#xA;&#x9;group that indicates otherwise."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includePreludes" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The include-prelude element is a&#xD;&#xA;&#x9;context-relative path that must correspond to&#xD;&#xA;&#x9;an element in the Web Application. When the&#xD;&#xA;&#x9;element is present, the given path will be&#xD;&#xA;&#x9;automatically included (as in an include&#xD;&#xA;&#x9;directive) at the beginning of each JSP page in&#xD;&#xA;&#x9;this jsp-property-group."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeCodas" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The include-coda element is a context-relative&#xD;&#xA;&#x9;path that must correspond to an element in the&#xD;&#xA;&#x9;Web Application. When the element is present,&#xD;&#xA;&#x9;the given path will be automatically included&#xD;&#xA;&#x9;(as in an include directive) at the end of each&#xD;&#xA;&#x9;JSP page in this jsp-property-group."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TagLibRefType" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;A taglib can be used to provide information on a tag&#xD;&#xA;library that is used by a JSP page within the Web&#xD;&#xA;Application."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taglibURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=" A taglib-uri element describes a URI identifying a&#xD;&#xA;        tag library used in the web application.  The body&#xD;&#xA;        of the taglib-uri element may be either an&#xD;&#xA;        absolute URI specification, or a relative URI.&#xD;&#xA;        There should be no entries in web.xml with the&#xD;&#xA;        same taglib-uri value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taglibLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="the taglib-location element contains the location&#xD;&#xA;        (as a resource relative to the root of the web&#xD;&#xA;        application) where to find the Tag Library&#xD;&#xA;        Description file for the tag library."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/taglib.ecore b/plugins/org.eclipse.jst.j2ee.core/model/taglib.ecore
deleted file mode 100644
index 8cc84d52a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/taglib.ecore
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="taglib"
-    nsURI="taglib.xmi" nsPrefix="org.eclipse.jst.j2ee.taglib">
-  <eClassifiers xsi:type="ecore:EClass" name="TagLib" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The taglib tag is the document root, it defines:&#xD;&#xA;&#xD;&#xA;description     a simple string describing the &quot;use&quot; of this taglib,&#xD;&#xA;                should be user discernable&#xD;&#xA;&#xD;&#xA;display-name    the display-name element contains a&#xD;&#xA;                short name that is intended to be displayed&#xD;&#xA;                by tools&#xD;&#xA;&#xD;&#xA;icon            optional icon that can be used by tools&#xD;&#xA;&#xD;&#xA;tlib-version    the version of the tag library implementation&#xD;&#xA;&#xD;&#xA;short-name      a simple default short name that could be&#xD;&#xA;                used by a JSP authoring tool to create&#xD;&#xA;                names with a mnemonic value; for example,&#xD;&#xA;                the it may be used as the prefered prefix&#xD;&#xA;                value in taglib directives&#xD;&#xA;&#xD;&#xA;uri             a uri uniquely identifying this taglib&#xD;&#xA;&#xD;&#xA;validator       optional TagLibraryValidator information&#xD;&#xA;&#xD;&#xA;listener        optional event listener specification&#xD;&#xA;&#xD;&#xA;tag             one or more tags in the tag library&#xD;&#xA;&#xD;&#xA;tag-file        one or more tag files in the tag library&#xD;&#xA;&#xD;&#xA;function        zero or more EL functions defined in this&#xD;&#xA;                tag library&#xD;&#xA;&#xD;&#xA;taglib-extension zero or more extensions that provide extra&#xD;&#xA;&#x9;&#x9;information about this taglib, for tool&#xD;&#xA;&#x9;&#x9;consumption"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tagLibVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes this version number of the tag library (dewey decimal).&#xD;&#xA;@regexp [0-9]*{ &quot;.&quot;[0-9] }0..3"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jspVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the JSP version (number) this tag library requires in order to function (dewey decimal).  Default is 1.2&#xD;&#xA;@regexp [0-9]*{ &quot;.&quot;[0-9] }0..3"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the short-name element is a name that could be used by a JSP authoring tool to create names with a mnemonic value; for example, it may be used as the prefered prefix value in taglib directives. Do not use white space, and do not start with digits or underscore."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the uri element is a public URI that uniquely identifies the exact semantics of this taglibrary."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tags" lowerBound="1" upperBound="-1"
-        eType="#//JSPTag" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="validator" eType="#//Validator"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listeners" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Listener" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="functions" upperBound="-1"
-        eType="#//Function" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="taglibExtensions" upperBound="-1"
-        eType="#//TldExtension" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JSPTag" eSuperTypes="common.ecore#//DescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The tag element defines an action in this tag library. The tag element has one attribute, id.&#xD;&#xA;The tag element may have several subelements defining:&#xD;&#xA;name -- The unique action name&#xD;&#xA;tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag&#xD;&#xA;tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo&#xD;&#xA;body-content -- The body content type&#xD;&#xA;display-name -- A short name that is intended to be displayed by tools&#xD;&#xA;small-icon -- Optional small-icon that can be used by tools&#xD;&#xA;large-icon -- Optional large-icon that can be used by tools&#xD;&#xA;description -- Optional tag-specific information&#xD;&#xA;variable -- Optional scripting variable information&#xD;&#xA;attribute -- All attributes of this action&#xD;&#xA;example -- Optional informal description of an example of a use of this action.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bodyContent" eType="#//BodyContentType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a hint as to the content of the body of this tag. Primarily intended for use by page composition tools.There are currently three values specified:&#xD;&#xA;&#xD;&#xA;tagdependent - The body of the tag is interpreted by the tag implementation itself, and is most likely in a&#x9;&#x9;different &quot;langage&quot;, e.g embedded SQL statements.&#xD;&#xA;&#xD;&#xA;JSP - The body of the tag contains nested JSP syntax&#xD;&#xA;&#xD;&#xA;empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::=  tagdependent | JSP | empty"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="example" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The example element provides an informal description of an example of the use of a tag."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dynamicAttributes" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-        eType="#//JSPTagAttribute" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"
-        eType="#//JSPVariable" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variable element provides information on the scripting variables defined by this tag.&#xD;&#xA;It is a (translation time) error for an action that has one or more variable subelements to have a TagExtraInfo class that returns a non-null object.&#xD;&#xA;The subelements of variable are of the form:&#xD;&#xA;name-given -- The variable name as a constant&#xD;&#xA;name-from-attribute -- The name of an attribute whose (translation time) value will give the name of the variable. One of name-given or namefrom-attribute is required.&#xD;&#xA;variable-class -- Name of the class of the variable. java.lang.String is default.&#xD;&#xA;declare -- Whether the variable is declared or not. True is the default.&#xD;&#xA;scope -- The scope of the scripting variable defined. NESTED is default.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tagClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag that implements the request time semantics for this tag. This element is required.&#xD;&#xA;@regexp fully qualified Java class name&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="teiClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The tei-class element indicates the subclass of javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated at translation time. This element is optional.&#xD;&#xA;@regexp fully qualified Java class name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JSPTagAttribute" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The attribute tag defines an attribute for the nesting tag"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the canonical name of a tag or attribute being defined (required)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines if the nesting attribute is required or optional."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rtExprValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines if the nesting attribute can have scriptlet expressions asa value, i.e the value of the attribute may be dynamically calculatedat request time, as opposed to a static value determined at translationtime. (optional)&#xD;&#xA;Default = false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fragment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the type element describes the Java type of the attributes value.&#xD;&#xA;For static values (those determined at translation time) the type is always java.lang.String."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="BodyContentType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4, added TAGDEPENDENT,EMPTY,scriptless,SCRIPTLESS&#xD;&#xA;Provides a hint as to the content of the body of this tag.&#xD;&#xA;Primarily intended for use by page composition tools.&#xD;&#xA;&#xD;&#xA;There are currently four values specified:&#xD;&#xA;&#xD;&#xA;tagdependent    The body of the tag is interpreted by the tag&#xD;&#xA;                implementation itself, and is most likely&#xD;&#xA;                in a different &quot;langage&quot;, e.g embedded SQL&#xD;&#xA;                statements.&#xD;&#xA;&#xD;&#xA;JSP             The body of the tag contains nested JSP&#xD;&#xA;                syntax.&#xD;&#xA;&#xD;&#xA;empty           The body must be empty&#xD;&#xA;&#xD;&#xA;scriptless      The body accepts only template text, EL&#xD;&#xA;                Expressions, and JSP action elements.  No&#xD;&#xA;                scripting elements are allowed.&#xD;&#xA;JSP=0&#xD;&#xA;empty=1&#xD;&#xA;tagdependent=2&#xD;&#xA;TAGDEPENDENT=3&#xD;&#xA;EMPTY=4&#xD;&#xA;scriptless=5&#xD;&#xA;SCRIPTLESS=6"/>
-    </eAnnotations>
-    <eLiterals name="tagdependent"/>
-    <eLiterals name="JSP" value="1"/>
-    <eLiterals name="empty" value="2"/>
-    <eLiterals name="scriptless" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Validator" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="validatorClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="defines the TagLibraryValidator class that can be&#xD;&#xA;used to validate the conformance of a JSP page to using this tag library."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initParams" upperBound="-1"
-        eType="ecore:EClass webapplication.ecore#//InitParam" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JSPVariable" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nameGiven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name-given element provides the name for the scripting variable.&#xD;&#xA;&#xD;&#xA;One of name-given or name-from-attribute is required."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nameFromAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of an attribute whose (translation-time) value will give the name of the variable."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="declare" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the declare element indicates whether the scripting variable is to be defined or not. See TagExtraInfo for details.&#xD;&#xA;This element is optional and is the default is true.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scope" eType="#//JSPScriptingVariableScope"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variableClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="JSPScriptingVariableScope">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="NESTED=0&#xD;&#xA;AT_BEGIN=1&#xD;&#xA;AT_END=2"/>
-    </eAnnotations>
-    <eLiterals name="NESTED"/>
-    <eLiterals name="AT_BEGIN" value="1"/>
-    <eLiterals name="AT_END" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Function" eSuperTypes="common.ecore#//DescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The function element is used to provide information on each&#xD;&#xA;function in the tag library that is to be exposed to the EL.&#xD;&#xA;&#xD;&#xA;The function element may have several subelements defining:&#xD;&#xA;&#xD;&#xA;description         Optional tag-specific information&#xD;&#xA;&#xD;&#xA;display-name        A short name that is intended to be&#xD;&#xA;                    displayed by tools&#xD;&#xA;&#xD;&#xA;icon                Optional icon element that can be used&#xD;&#xA;                    by tools&#xD;&#xA;&#xD;&#xA;name                A unique name for this function&#xD;&#xA;&#xD;&#xA;function-class      Provides the name of the Java class that&#xD;&#xA;                    implements the function&#xD;&#xA;&#xD;&#xA;function-signature  Provides the signature, as in the Java&#xD;&#xA;                    Language Specification, of the Java&#xD;&#xA;                    method that is to be used to implement&#xD;&#xA;                    the function.&#xD;&#xA;&#xD;&#xA;example             Optional informal description of an&#xD;&#xA;                    example of a use of this function"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="signature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides the signature, as in the Java Language&#xD;&#xA;        Specification, of the static Java method that is&#xD;&#xA;        to be used to implement the function.&#xD;&#xA;&#xD;&#xA;        Example:&#xD;&#xA;&#xD;&#xA;        java.lang.String nickName( java.lang.String, int )"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="example" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The example element contains an informal description&#xD;&#xA;        of an example of the use of this function."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="functionClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides the fully-qualified class name of the Java&#xD;&#xA;        class containing the static method that implements&#xD;&#xA;        the function."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="functionExtensions" upperBound="-1"
-        eType="#//TldExtension" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TagFile" eSuperTypes="common.ecore#//DescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4&#xD;&#xA;Defines an action in this tag library that is implemented&#xD;&#xA;as a .tag file.&#xD;&#xA;&#xD;&#xA;The tag-file element has two required subelements:&#xD;&#xA;&#xD;&#xA;name    The unique action name&#xD;&#xA;&#xD;&#xA;path    Where to find the .tag file implementing this&#xD;&#xA;        action, relative to the root of the web application or&#xD;&#xA;&#x9;the root of the JAR file for a tag library packaged in&#xD;&#xA;&#x9;a JAR.  This must begin with /WEB-INF/tags if the .tag&#xD;&#xA;&#x9;file resides in the WAR, or /META-INF/tags if the .tag&#xD;&#xA;&#x9;file resides in a JAR."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="example" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tagExtensions" upperBound="-1"
-        eType="#//TldExtension" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TldExtension" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionElements" lowerBound="1"
-        upperBound="-1" eType="#//ExtensibleType" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtensibleType" abstract="true" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/webapplication.ecore b/plugins/org.eclipse.jst.j2ee.core/model/webapplication.ecore
deleted file mode 100644
index 43d60acef..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/webapplication.ecore
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="webapplication"
-    nsURI="webapplication.xmi" nsPrefix="org.eclipse.jst.j2ee.webapplication">
-  <eClassifiers xsi:type="ecore:EClass" name="WebApp" eSuperTypes="common.ecore#//JNDIEnvRefsGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The web-app element is the root of the deployment descriptor for&#xD;&#xA;a web application."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="distributable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The distributable element, by its presence in a web application deployment descriptor, indicates that this web application is programmed appropriately to be deployed into a distributed servlet container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contexts" upperBound="-1"
-        eType="#//ContextParam" containment="true" eOpposite="#//ContextParam/webApp">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated see contextParams"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="errorPages" upperBound="-1"
-        eType="#//ErrorPage" containment="true" eOpposite="#//ErrorPage/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fileList" eType="#//WelcomeFileList"
-        containment="true" eOpposite="#//WelcomeFileList/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tagLibs" upperBound="-1"
-        eType="#//TagLibRef" containment="true" eOpposite="#//TagLibRef/webApp">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated See jsp::TagLibRef&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
-        eType="#//SecurityConstraint" containment="true" eOpposite="#//SecurityConstraint/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loginConfig" eType="#//LoginConfig"
-        containment="true" eOpposite="#//LoginConfig/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mimeMappings" upperBound="-1"
-        eType="#//MimeMapping" containment="true" eOpposite="#//MimeMapping/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sessionConfig" eType="#//SessionConfig"
-        containment="true" eOpposite="#//SessionConfig/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="servletMappings" upperBound="-1"
-        eType="#//ServletMapping" containment="true" eOpposite="#//ServletMapping/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="servlets" upperBound="-1"
-        eType="#//Servlet" containment="true" eOpposite="#//Servlet/webApp"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityRoles" upperBound="-1"
-        eType="ecore:EClass common.ecore#//SecurityRole" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="filters" upperBound="-1"
-        eType="#//Filter" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="filterMappings" upperBound="-1"
-        eType="#//FilterMapping" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Filter mappings defined for the web app"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listeners" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Listener" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The listeners collection contains deployment properties for a web application listener beans in the web app."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contextParams" upperBound="-1"
-        eType="ecore:EClass common.ecore#//ParamValue" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="jspConfig" eType="ecore:EClass jsp.ecore#//JSPConfig"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="messageDestinations" upperBound="-1"
-        eType="ecore:EClass common.ecore#//MessageDestination" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localEncodingMappingList"
-        eType="#//LocalEncodingMappingList" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContextParam" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 deprecated&#xD;&#xA;The context-param element contains the declaration of a web application's servlet context initialization parameters."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated&#xD;&#xA;The param-name element contains the name of a parameter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated&#xD;&#xA;The param-value element contains the value of a parameter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/contexts"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Servlet" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="servletName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The servlet-name element contains the canonical name of the servlet."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadOnStartup" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The load-on-startup element indicates that this servlet should be loaded on the startup of the web application. The optional contents of these element must be a positive integer indicating the order in which the servlet should be loaded. Lower integers are loaded before higher integers. If no value is specified, or if the value specified is not a positive integer, the container is free to load it at any time in the startup sequence.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/servlets"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webType" lowerBound="1"
-        eType="#//WebType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
-        eType="#//InitParam" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes initParams"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="securityRoleRefs" upperBound="-1"
-        eType="ecore:EClass common.ecore#//SecurityRoleRef" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="runAs" eType="ecore:EClass common.ecore#//RunAsSpecifiedIdentity"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If defined for a servlet, overrides the security identity used to call an EJB by that servlet in this web application. The role-name is one of the security roles already defined for this web application."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initParams" upperBound="-1"
-        eType="ecore:EClass common.ecore#//ParamValue" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServletMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The servlet-mapping element defines a mapping between a servlet and a url pattern"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="urlPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The url-pattern element contains the url pattern of the mapping. Must follow the rules specified in Section 10 of the Servlet API Specification."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The servlet-name element contains the canonical name of the&#xD;&#xA;servlet. Each servlet name is unique within the web&#xD;&#xA;application."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/servletMappings"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="servlet" lowerBound="1"
-        eType="#//Servlet"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SessionConfig" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The session-config element defines the session parameters for this web application."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sessionTimeout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The session-timeout element defines the default&#xD;&#xA;        session timeout interval for all sessions created&#xD;&#xA;        in this web application. The specified timeout&#xD;&#xA;        must be expressed in a whole number of minutes.&#xD;&#xA;        If the timeout is 0 or less, the container ensures&#xD;&#xA;        the default behaviour of sessions is never to time&#xD;&#xA;        out. If this element is not specified, the container&#xD;&#xA;        must set its default timeout period."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/sessionConfig"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MimeMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The mime-mapping element defines a mapping between an extension and a mime type.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The extension element contains a string describing an extension. example: &quot;txt&quot;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The mime-type element contains a defined mime type. example: &quot;text/plain&quot;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/mimeMappings"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WelcomeFileList" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The welcome-file-list contains an ordered list of welcome files elements."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/fileList"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="file" upperBound="-1" eType="#//WelcomeFile"
-        containment="true" eOpposite="#//WelcomeFile/fileList"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ErrorPage" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The location element contains the location of the resource in the web application"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/errorPages"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TagLibRef" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 deprecated, becomes jsp::TagLibRef&#xD;&#xA;The taglib element is used to describe a JSP tag library."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taglibURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated See jsp::TagLibRef&#xD;&#xA;&#xD;&#xA;The taglib-uri element describes a URI, relative to the location of the web.xml document, identifying a Tag Library used in the Web Application."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taglibLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated See jsp::TagLibRef&#xD;&#xA;&#xD;&#xA;The taglib-location element contains the location (as a resource relative to the root of the web application) where to find the Tag Libary Description file for the tag library."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/tagLibs"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SecurityConstraint" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The security-constraint element is used to associate security constraints with one or more web resource collections"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes displayNames"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/constraints"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webResourceCollections"
-        lowerBound="1" upperBound="-1" eType="#//WebResourceCollection" containment="true"
-        eOpposite="#//WebResourceCollection/secConstraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="authConstraint" eType="#//AuthConstraint"
-        containment="true" eOpposite="#//AuthConstraint/secConstraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="userDataConstraint" eType="#//UserDataConstraint"
-        containment="true" eOpposite="#//UserDataConstraint/secConstraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="displayNames" upperBound="-1"
-        eType="ecore:EClass common.ecore#//DisplayName" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WebResourceCollection" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="webResourceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The web-resource-name contains the name of this web resource collection"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="urlPattern" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="httpMethod" upperBound="-1"
-        eType="#//HTTPMethodTypeEnum">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secConstraint" eType="#//SecurityConstraint"
-        transient="true" eOpposite="#//SecurityConstraint/webResourceCollections"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="URLs" upperBound="-1" eType="#//URLPatternType"
-        containment="true" eOpposite="#//URLPatternType/resCollection">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes urlPattern"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="HTTPs" upperBound="-1"
-        eType="#//HTTPMethodType" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes httpMethod"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuthConstraint" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The auth-constraintType indicates the user roles that&#xD;&#xA;should be permitted access to this resource&#xD;&#xA;collection. The role-name used here must either correspond&#xD;&#xA;to the role-name of one of the security-role elements&#xD;&#xA;defined for this web application, or be the specially&#xD;&#xA;reserved role-name &quot;*&quot; that is a compact syntax for&#xD;&#xA;indicating all roles in the web application. If both &quot;*&quot;&#xD;&#xA;and rolenames appear, the container interprets this as all&#xD;&#xA;roles.  If no roles are defined, no user is allowed access&#xD;&#xA;to the portion of the web application described by the&#xD;&#xA;containing security-constraint.  The container matches&#xD;&#xA;role names case sensitively when determining access."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;A description of the auth constraint."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roles" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A list of role names for the auth constraint.  Each element specifies the name of a security role (a String).&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secConstraint" eType="#//SecurityConstraint"
-        transient="true" eOpposite="#//SecurityConstraint/authConstraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UserDataConstraint" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The user-data-constraint element is used to indicate how data communicated between the client and container should be protected"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes descriptions&#xD;&#xA;A description for the user data constraint."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transportGuarantee" eType="#//TransportGuaranteeType"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The transport-guarantee element specifies that the communication between client and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the application does not require any&#xD;&#xA;transport guarantees. A value of INTEGRAL means that the application requires that the data sent between the client and server be sent in such a way that it can't be changed in transit. CONFIDENTIAL means that the application requires that the data be transmitted in a fashion that prevents other entities from observing the contents of the transmission. In most cases, the presence of the INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secConstraint" eType="#//SecurityConstraint"
-        transient="true" eOpposite="#//SecurityConstraint/userDataConstraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptions" upperBound="-1"
-        eType="ecore:EClass common.ecore#//Description" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LoginConfig" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login&#xD;&#xA;mechanism."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authMethod" eType="#//AuthMethodKind"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4  deprecated, becomes initParamValues&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;The auth-method element is used to configure the authentication mechanism for the web application. As a prerequisite to gaining access to any web resources which are protected by an authorization constraint, a user must have authenticated using the configured mechanism. Legal values for this element are &quot;BASIC&quot;, &quot;DIGEST&quot;, &quot;FORM&quot;, or &quot;CLIENT-CERT&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="realmName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The realm name element specifies the realm name to use in HTTP Basic authorization"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authorizationMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webApp" eType="#//WebApp"
-        transient="true" eOpposite="#//WebApp/loginConfig"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="formLoginConfig" eType="#//FormLoginConfig"
-        containment="true" eOpposite="#//FormLoginConfig/loginConfig"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FormLoginConfig" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The form-login-config element specifies the login and error pages that should be used in form based login. If form based authentication is not used, these elements are ignored."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="formLoginPage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The form-login-page element defines the location in the web app where the page that can be used for login can be found"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="formErrorPage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The form-error-page element defines the location in the web app where the error page that is displayed when login is not successful can be found"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loginConfig" eType="#//LoginConfig"
-        transient="true" eOpposite="#//LoginConfig/formLoginConfig"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InitParam" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 deprecated&#xD;&#xA;The init-param element contains a name/value pair as an initialization param of the servlet"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@deprecated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ResAuthServletType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="CONTAINER=0&#xD;&#xA;SERVLET=1&#xD;&#xA;"/>
-    </eAnnotations>
-    <eLiterals name="CONTAINER"/>
-    <eLiterals name="SERVLET" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WebType" abstract="true" eSuperTypes="common.ecore#//J2EEEObject"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ServletType" eSuperTypes="#//WebType">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JSPType" eSuperTypes="#//WebType">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jspFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The jsp-file element contains the full path to a JSP file within the web application.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="URLPatternType" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="urlPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resCollection" eType="#//WebResourceCollection"
-        transient="true" eOpposite="#//WebResourceCollection/URLs"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="HTTPMethodTypeEnum">
-    <eLiterals name="GET">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The http-method contains an HTTP method (GET | POST |...)"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="POST" value="1"/>
-    <eLiterals name="PUT" value="2"/>
-    <eLiterals name="DELETE" value="3"/>
-    <eLiterals name="HEAD" value="4"/>
-    <eLiterals name="OPTIONS" value="5"/>
-    <eLiterals name="TRACE" value="6"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleNameType" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WelcomeFile" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The welcome-file element contains file name to use as a default welcome file, such as index.html&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="welcomeFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fileList" eType="#//WelcomeFileList"
-        transient="true" eOpposite="#//WelcomeFileList/file"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TransportGuaranteeType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="NONE=1&#xD;&#xA;INTEGRAL=2&#xD;&#xA;CONFIDENTIAL=3"/>
-    </eAnnotations>
-    <eLiterals name="NONE"/>
-    <eLiterals name="INTEGRAL" value="1"/>
-    <eLiterals name="CONFIDENTIAL" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExceptionTypeErrorPage" eSuperTypes="#//ErrorPage">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionType" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The exception type contains a fully qualified class name of a Java exception type."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ErrorCodeErrorPage" eSuperTypes="#//ErrorPage">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The error-code contains an HTTP error code, ex: 404&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FilterMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the &lt;filtername> sub-elements of one of the &lt;filter> declarations in the deployment descriptor.&#xD;&#xA;&#xD;&#xA;@invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="urlPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The url-pattern element contains the url pattern of the mapping. Must follow the rules specified in Section 10 of the Servlet API Specification."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dispatcherType" upperBound="4"
-        eType="#//DispatcherType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="filter" lowerBound="1"
-        eType="#//Filter">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The filter being mapped"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="servlet" eType="#//Servlet">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An optional servlet that is mapped by a filter mapping.  servletName is used to resolve the servlet reference."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Filter" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The logical name of the filter. This name is used to map the filter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initParams" upperBound="-1"
-        eType="#//InitParam" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4 deprecated, becomes initParamValues&#xD;&#xA;The init-params contain a name/value pairs as initialization params for the filter&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="filterClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The fully qualified classname of the filter."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initParamValues" upperBound="-1"
-        eType="ecore:EClass common.ecore#//ParamValue" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="@version J2EE1.4&#xD;&#xA;The init-param element contains a name/value pair as&#xD;&#xA;        an initialization param of a servlet filter"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="DispatcherType">
-    <eLiterals name="FORWARD"/>
-    <eLiterals name="INCLUDE" value="1"/>
-    <eLiterals name="REQUEST" value="2"/>
-    <eLiterals name="ERROR" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LocalEncodingMappingList" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localEncodingMappings"
-        lowerBound="1" upperBound="-1" eType="#//LocalEncodingMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LocalEncodingMapping" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locale" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encoding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPMethodType" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="httpMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="AuthMethodKind">
-    <eLiterals name="UNSPECIFIED"/>
-    <eLiterals name="BASIC" value="1"/>
-    <eLiterals name="DIGEST" value="2"/>
-    <eLiterals name="FORM" value="3"/>
-    <eLiterals name="CLIENT_CERT" value="4"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/webservice-j2ee.genmodel b/plugins/org.eclipse.jst.j2ee.core/model/webservice-j2ee.genmodel
deleted file mode 100644
index dad0c5027..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/webservice-j2ee.genmodel
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jst.j2ee.core/webservices"
-    modelPluginID="org.eclipse.jst.j2ee.core" modelName="Webservice-j2ee" importerID="org.eclipse.emf.importer.rose"
-    usedGenPackages="j2ee.genmodel#//client j2ee.genmodel#//application j2ee.genmodel#//common j2ee.genmodel#//ejb j2ee.genmodel#//webapplication j2ee.genmodel#//wsclient j2ee.genmodel#//jsp j2ee.genmodel#//wscommon j2ee.genmodel#//wsdd ../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java">
-  <foreignModel>..\rose\webservice-j2ee.mdl</foreignModel>
-  <foreignModel>WORKSPACE_ROOT</foreignModel>
-  <foreignModel>D:\work\M5</foreignModel>
-  <genPackages prefix="Jaxrpcmap" basePackage="org.eclipse.jst.j2ee.webservice" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="jaxrpcmap.ecore#/">
-    <genClasses ecoreClass="jaxrpcmap.ecore#//JavaWSDLMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//JavaWSDLMapping/id"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//JavaWSDLMapping/packageMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//JavaWSDLMapping/javaXMLTypeMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//JavaWSDLMapping/exceptionMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//JavaWSDLMapping/interfaceMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//PackageMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//PackageMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//PackageMapping/packageType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//PackageMapping/namespaceURI"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//JavaXMLTypeMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//JavaXMLTypeMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//JavaXMLTypeMapping/classType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//JavaXMLTypeMapping/qnameScope"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//JavaXMLTypeMapping/anonymousTypeQname"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//JavaXMLTypeMapping/rootTypeQname"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//JavaXMLTypeMapping/variableMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//ExceptionMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ExceptionMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ExceptionMapping/exceptionType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ExceptionMapping/wsdlMessagePartName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ExceptionMapping/wsdlMessage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ExceptionMapping/constructorParameterOrder"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//ServiceInterfaceMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceInterfaceMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceInterfaceMapping/serviceInterface"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceInterfaceMapping/wsdlServiceName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceInterfaceMapping/portMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//ServiceEndpointInterfaceMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceEndpointInterfaceMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceEndpointInterfaceMapping/serviceEndpointInterface"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceEndpointInterfaceMapping/wsdlPortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceEndpointInterfaceMapping/wsdlBinding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceEndpointInterfaceMapping/serviceEndpointMethodMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//RootTypeQname"/>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//VariableMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//VariableMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//VariableMapping/javaVariableName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//VariableMapping/xmlElementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//VariableMapping/dataMember"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//VariableMapping/xmlAttributeName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//VariableMapping/xmlWildcard"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLMessage"/>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//ConstructorParameterOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ConstructorParameterOrder/id"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ConstructorParameterOrder/elementNames"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//ElementName">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ElementName/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ElementName/text"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLServiceName"/>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//PortMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//PortMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//PortMapping/portName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//PortMapping/javaPortName"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLPortType"/>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLBinding"/>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//ServiceEndpointMethodMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceEndpointMethodMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceEndpointMethodMapping/javaMethodName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceEndpointMethodMapping/wsdlOperation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//ServiceEndpointMethodMapping/wrappedElement"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceEndpointMethodMapping/methodParamPartsMappings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//ServiceEndpointMethodMapping/wsdlReturnValueMapping"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLOperation/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLOperation/wsdlOperation"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//MethodParamPartsMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//MethodParamPartsMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//MethodParamPartsMapping/paramPosition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//MethodParamPartsMapping/paramType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//MethodParamPartsMapping/wsdlMessageMapping"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLReturnValueMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLReturnValueMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLReturnValueMapping/methodReturnValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLReturnValueMapping/wsdlMessagePartName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//WSDLReturnValueMapping/wsdlMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLMessageMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLMessageMapping/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLMessageMapping/wsdlMessagePartName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLMessageMapping/parameterMode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLMessageMapping/soapHeader"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jaxrpcmap.ecore#//WSDLMessageMapping/wsdlMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//WSDLMessagePartName">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLMessagePartName/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jaxrpcmap.ecore#//WSDLMessagePartName/wsdlMessagePartName"/>
-    </genClasses>
-    <genClasses ecoreClass="jaxrpcmap.ecore#//InterfaceMapping"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/wsclient.ecore b/plugins/org.eclipse.jst.j2ee.core/model/wsclient.ecore
deleted file mode 100644
index b367f8451..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/wsclient.ecore
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wsclient"
-    nsURI="webservice_client.xmi" nsPrefix="org.eclipse.jst.j2ee.webservice.wsclient">
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceRef" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The service-ref element declares a reference to a Web&#xD;&#xA;    service. It contains optional description, display name and&#xD;&#xA;    icons, a declaration of the required Service interface,&#xD;&#xA;    an optional WSDL document location, an optional set&#xD;&#xA;    of JAX-RPC mappings, an optional QName for the service element,&#xD;&#xA;    an optional set of Service Endpoint Interfaces to be resolved&#xD;&#xA;    by the container to a WSDL port, and an optional set of handlers."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceInterface" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The service-interface element declares the fully qualified class&#xD;&#xA;        name of the JAX-RPC Service interface the client depends on.&#xD;&#xA;        In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC&#xD;&#xA;        generated Service Interface class may also be specified."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceRefName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The service-ref-name element declares logical name that the&#xD;&#xA;        components in the module use to look up the Web service. It&#xD;&#xA;        is recommended that all service reference names start with&#xD;&#xA;        &quot;service/&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=" The wsdl-file element contains the URI location of a WSDL file. The&#xD;&#xA;        location is relative to the root of the module."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jaxrpcMappingFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The jaxrpc-mapping-file element contains the name of a file that&#xD;&#xA;        describes the JAX-RPC mapping between the Java interaces used by&#xD;&#xA;        the application and the WSDL description in the wsdl-file.  The&#xD;&#xA;        file name is a relative path within the module file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="portComponentRefs" upperBound="-1"
-        eType="#//PortComponentRef" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The port-component-ref element declares a client dependency&#xD;&#xA;        on the container for resolving a Service Endpoint Interface&#xD;&#xA;        to a WSDL port. It optionally associates the Service Endpoint&#xD;&#xA;        Interface with a particular port-component. This is only used&#xD;&#xA;        by the container for a Service.getPort(Class) method call."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
-        eType="#//Handler" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=" Declares the handler for a port-component. Handlers can access the&#xD;&#xA;        init-param name/value pairs using the HandlerInfo interface. If&#xD;&#xA;        port-name is not specified, the handler is assumed to be associated&#xD;&#xA;        with all ports of the service."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceQname" lowerBound="1"
-        eType="ecore:EClass common.ecore#//QName" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortComponentRef" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The port-component-ref element declares a client dependency&#xD;&#xA;    on the container for resolving a Service Endpoint Interface&#xD;&#xA;    to a WSDL port. It optionally associates the Service Endpoint&#xD;&#xA;    Interface with a particular port-component. This is only used&#xD;&#xA;    by the container for a Service.getPort(Class) method call."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portComponentLink" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The port-component-link element links a port-component-ref to a&#xD;&#xA;        specific port-component required to be made available by a service&#xD;&#xA;        reference.&#xD;&#xA;&#xD;&#xA;        The value of a port-component-link must be the port-component-name&#xD;&#xA;        of a port-component in the same module or another module in the same&#xD;&#xA;        application unit. The syntax for specification follows the syntax&#xD;&#xA;        defined for ejb-link in the EJB 2.0 specification."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceEndpointInterface"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The service-endpoint-interface element defines a fully qualified&#xD;&#xA;        Java class that represents the Service Endpoint Interface of a&#xD;&#xA;        WSDL port."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Handler" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Declares the handler for a port-component. Handlers can access the&#xD;&#xA;    init-param name/value pairs using the HandlerInfo interface. If&#xD;&#xA;    port-name is not specified, the handler is assumed to be associated&#xD;&#xA;    with all ports of the service.&#xD;&#xA;&#xD;&#xA;    Used in: service-ref"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="handlerName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the name of the handler. The name must be unique within the module."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapRoles" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The soap-role element contains a SOAP actor definition that the Handler will play as a role."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portNames" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The port-name element defines the WSDL port-name that a handler should be associated with."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="handlerClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines a fully qualified class name for the handler implementation."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initParams" upperBound="-1"
-        eType="ecore:EClass common.ecore#//ParamValue" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="soapHeaders" upperBound="-1"
-        eType="ecore:EClass common.ecore#//QName" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WebServicesClient" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 deprecated"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentScopedRefs" upperBound="-1"
-        eType="#//ComponentScopedRefs" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRefs" upperBound="-1"
-        eType="#//ServiceRef" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentScopedRefs" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@version J2EE1.4 deprecated"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="componentName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceRefs" lowerBound="1"
-        upperBound="-1" eType="#//ServiceRef" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/wscommon.ecore b/plugins/org.eclipse.jst.j2ee.core/model/wscommon.ecore
deleted file mode 100644
index 47e17489c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/wscommon.ecore
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wscommon"
-    nsURI="wscommon.xmi" nsPrefix="org.eclipse.jst.j2ee.webservice.wscommon">
-  <eClassifiers xsi:type="ecore:EClass" name="InitParam" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="paramValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptionTypes" upperBound="-1"
-        eType="#//DescriptionType" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeader" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Defines the QName of a SOAP header that will be processed by the handler.&#xD;&#xA;"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPRole" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The soap-role element contains a SOAP actor definition that the Handler will play as a role.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapRole" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortName" eSuperTypes="common.ecore#//J2EEEObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescriptionType" eSuperTypes="common.ecore#//Description"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DisplayNameType" eSuperTypes="common.ecore#//DisplayName"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/model/wsdd.ecore b/plugins/org.eclipse.jst.j2ee.core/model/wsdd.ecore
deleted file mode 100644
index 9328e34de..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/model/wsdd.ecore
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wsdd"
-    nsURI="wsdd.xmi" nsPrefix="org.eclipse.jst.j2ee.webservice.wsdd">
-  <eClassifiers xsi:type="ecore:EClass" name="WebServices" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The webservices element is the root element for the web services deployment descriptor.  It specifies the set of Web service descriptions that are to be deployed into the J2EE Application Server and the dependencies they have on container resources and services.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="webServiceDescriptions"
-        lowerBound="1" upperBound="-1" eType="#//WebServiceDescription" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WebServiceDescription" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The webservice-description element defines a WSDL document file and the set of Port components associated with the WSDL ports defined in the WSDL document.  There may be multiple webservice-descriptions defined within a module.&#xD;&#xA;&#xD;&#xA;All WSDL file ports must have a corresponding port-component element defined.&#xD;&#xA;&#xD;&#xA;Used in: webservices&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jaxrpcMappingFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The jaxrpc-mapping-file element contains the name of a file that describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="webServiceDescriptionName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The webservice-description-name identifies the collection of port-components associated with a WSDL file and JAX-RPC mapping. The name must be unique within the deployment descriptor.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The wsdl-file element contains the name of a WSDL file in the module. The file name is a relative path within the module.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="smallIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="largeIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="portComponents" lowerBound="1"
-        upperBound="-1" eType="#//PortComponent" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptionType" eType="ecore:EClass wscommon.ecore#//DescriptionType"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="displayNameType" eType="ecore:EClass wscommon.ecore#//DisplayNameType"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="iconType" eType="ecore:EClass common.ecore#//IconType"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortComponent" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The port-component element associates a WSDL port with a Web service interface and implementation.  It defines the name of the port as a component, optional description, optional display name, optional iconic representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portComponentName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The port-component-name element specifies a port component's name. This name is assigned by the module producer to name the service implementation bean in the module's deployment descriptor. The name must be unique among the port component names defined in the same module.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceEndpointInterface"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The service-endpoint-interface element contains the fully-qualified name of the port component's Service Endpoint Interface.&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="smallIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="largeIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wsdlPort" lowerBound="1"
-        eType="#//WSDLPort" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceImplBean" lowerBound="1"
-        eType="#//ServiceImplBean" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
-        eType="#//Handler" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptionType" eType="ecore:EClass wscommon.ecore#//DescriptionType"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="displayNameType" eType="ecore:EClass wscommon.ecore#//DisplayNameType"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="iconType" eType="ecore:EClass common.ecore#//IconType"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLPort" eSuperTypes="common.ecore#//QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Defines the name space and local name part of the WSDL port QName.&#xD;&#xA;"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceImplBean" eSuperTypes="common.ecore#//J2EEEObject">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The service-impl-bean element defines the Web service implementation.A service implementation can be an EJB bean class or JAX-RPC web component. Existing EJB implementations are exposed as a Web service using an ejb-link.&#xD;&#xA;&#xD;&#xA;Used in: port-component&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eEJBLink" eType="#//EJBLink"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eServletLink" eType="#//ServletLink"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="beanLink" eType="#//BeanLink"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServletLink" eSuperTypes="#//BeanLink">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The servlet-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a JAX-RPC Service Endpoint.&#xD;&#xA;&#xD;&#xA;The value of the servlet-link element must be the servlet-name of a JAX-RPC Service Endpoint in the same WAR file.&#xD;&#xA;&#xD;&#xA;Used in: service-impl-bean&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="servletLink" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EJBLink" eSuperTypes="#//BeanLink">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The ejb-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a Web Service Endpoint.&#xD;&#xA;&#xD;&#xA;The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file.&#xD;&#xA;&#xD;&#xA;Used in: service-impl-bean&#xD;&#xA;&#xD;&#xA;Examples:&#xD;&#xA;&lt;ejb-link>EmployeeRecord&lt;/ejb-link>&#xD;&#xA;&#x9;&lt;ejb-link>../products/product.jar#ProductEJB&lt;/ejb-link>&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ejbLink" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Handler" eSuperTypes="common.ecore#//CompatibilityDescriptionGroup">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Declares the handler for a port-component. Handlers can access the init-param name/value pairs using the HandlerInfo interface.&#xD;&#xA;&#xD;&#xA;Used in: port-component&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="handlerName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="handlerClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initParams" upperBound="-1"
-        eType="ecore:EClass wscommon.ecore#//InitParam" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="soapHeaders" upperBound="-1"
-        eType="ecore:EClass wscommon.ecore#//SOAPHeader" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="soapRoles" upperBound="-1"
-        eType="ecore:EClass wscommon.ecore#//SOAPRole" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BeanLink" eSuperTypes="common.ecore#//J2EEEObject"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb.properties
deleted file mode 100644
index 165ded3e3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Ejb_provider_plugin_prob=Ejb provider plugin startup - Problem initializing plugin
-Ejbext_provider_plugin_prob=Ejbext provider plugin startup - Problem initializing plugin
-EJB_UI_STARTUP=EJB UI STARTUP
-EJB_Path__=EJB Path:
-Size__=Size:
-Edit_the_bean_class=Edit the bean class
-EJB_Tree=EJB Tree
-EJB_Jar_Components=EJB JAR Components
-EJB_Models=EJB Models
-EJB_Features=EJB Features
-Exception_loading_plugin=Exception loading plugin
-Create=Create
-Create_Attribute...=Create Attribute...
-createAttribute=createAttribute
-Edit=Edit
-Add_To_Key=Add To Key
-delete=delete
-Unknown=Unknown
-Remove_From_Key=Remove From Key
-Delete=Delete
-Delete_Attribute...=Delete Attribute...
-additions=additions
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E Cannot reflect JavaClass because its name is not set for
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E The Java type named {0} could not be set for the {1} because its EJB is null.
-CMDS_Cannot_perform_INFO_=IWAE0070I Cannot perform the command request because the EJB is null for the command:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I Cannot add the feature to the key because the feature is null for the command:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I Cannot remove the feature from the key because the feature is null for the command:
-CMDS_Initializing_UI_=Initializing...
-CMDS_Generating_UI_=Generating...
-CMDS_Finishing_UI_=Finishing...
-CMDS_Analyzing_UI_=Analyzing...
-CMDS_Cancelled_WARNING_=Cancelled
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I Multiple EnterpriseBean Updates
-CMDS_CREATING_TASK_UI_=Creating bean named "{0}"
-CMDS_UPDATING_TASK_UI_=Updating bean named "{0}"
-CMDS_DELETING_TASK_UI_=Deleting bean named "{0}"
-CMDS_Updating_Metadata..._UI_=-- Updating Metadata...
-Updating=Updating
-New_key_attribute_added_wi=New key attribute added without attribute helper.
-Error_has_occurred=Error has occurred
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin.properties
deleted file mode 100644
index 953194431..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Could_not_find_root_object_ERROR_=IWAE0074E Could not find root object in resource: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E An error occurred while saving.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E Cannot run J2EEUIWorkingCopyManager operation because the Workspace tree is locked.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E Unable to save read-only file: {0}
-The_following_resources_ne_UI_=The following resources need to be saved but are currently shared, do you want to save now?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml.properties
deleted file mode 100644
index 889a7b93a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E RAR file support: DTD file not found: {0}
-io_ex_saving_EXC_=IWAE0079E IOException occurred saving {0}
-could_not_create_file_EXC_=IWAE0080E Could not create the file named {0}
-unsupported_encoding_EXC_=IWAE0081E {0} is not a supported encoding on this platform
-unsupported_type_EXC_=IWAE0082E Type is unrecognized or not yet supported: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E Could not parse xml because the resolved resource "{0}" could not be found in classpath
-must_be_boolean_EXC_=IWAE0084E Exception occurred reading {0}.  Value must be a boolean: String value = {1}
-must_be_int_EXC_=IWAE0085E Exception occurred reading {0}.  Value must be an integer: String value = {1}
-empty_collection_EXC_=IWAE0086E Empty collection for {0} in {1}
-missing_req_field_EXC_=IWAE0087E Missing required field {0} in {1}
-An_Exception_occurred_whil_EXC_=IWAE0088E An Exception occurred while writing xml
-Not_supported_in_this_rele_EXC_=IWAE0089E Not supported in this release
-RAR_file_support__IO_excep_EXC_=IWAE0090E RAR file support: IO exception in custom DTD resolver.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E An IO Exception occurred while writing xml
-Failure_occurred_reading_x_EXC_=IWAE0092E Failure occurred reading xml:
-Invalid_value_for__EXC_=IWAE0093E Invalid value for
-Valid_values_are___EXC_=IWAE0094E Valid values are:
-Key1=
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee.properties
deleted file mode 100644
index 497df93f3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Stack_trace_of_nested_exce=Stack trace of nested exception:
-ERROR=Error:
-WARNING=Warning:
-INFO=Info:
-DEFAULT_COMPLETED_STATUS_MSG=Migration was completed for {0}.
-DEFAULT_NOT_NEEDED_STATUS_MSG=Migration was not required for {0}.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=Migration was not possible for {0}.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E Error migrating {0}.
-REMOVED_LOCAL_CLIENT_MSG=Removed local client view for EJB {0}.
-REMOVED_ACCESS_INTENTS_MSG=Removed {0} 1.1 method access intent(s) from CMP bean {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Removed {0} 1.1 method isolation level(s) from CMP bean {1}.
-CONVERTED_FINDER_MSG=Converted finder descripter for {0} in CMP bean {1}.  Use the EJB editor to update the query EJB QL.
-UNNAMED_EJB=<Unnamed CMP bean>
-CONVERTED_QUERY_DESCRIPTION=Converted from IBM version 1.1 extensions.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=Migrated default Datasource binding to a default CMP Connection Factory binding for EJB JAR \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=Migrated default Datasource binding to a default CMP Connection Factory binding for EJB JAR.
-J2EE_VERSION_NULL_ERROR=Unable to get J2EE version of object because it is not contained by a document.
-J2EE_VERSION_PROXY_ERROR=Unable to get J2EE version of referenced object because the proxy cannot be resolved.  Check the ids in the deployment descriptor files.  HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Application.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Application.java
deleted file mode 100644
index 11f7c0c83..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Application.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-
-/**
- * The application element is the root element of a J2EE application deployment descriptor.
-
- * @since 1.0 */
-public interface Application extends CompatibilityDescriptionGroup {
-
-
-/**
- * @param name - String role name
- * @return if contains the role
- */
-public boolean containsSecurityRole(String name);
-/**
- * Returns the first module matching the specified uri and altDD
- * @param uri - String aURI
- * @param altDD - String altDD
- * @return the first module matching the specified uri and altDD
- */
-public Module getModule(String uri, String altDD);
-
-/**
- * Returns the first module matching the specified uri
- * @deprecated preferably use {@link #getModule(String, String)} or {@link #getFirstModule(String)}
- * There may be multiple modules with the same uri but different alt-dds
- *
- * @param uri - String uri
- * @return the first module matching the specified uri
- */
-public Module getModule(String uri);
-/**
- *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
- *
- * @return returns the j2ee version id
- * @throws IllegalStateException - When resource is proxy
- */
-
-public int getJ2EEVersionID() throws IllegalStateException ;
-/**
- * This returns the module version id.  Compare with J2EEVersionConstants to determine module level
- *
- * @return returns the module version id
- * @throws IllegalStateException - When resource is proxy
- */
-public int getVersionID() throws IllegalStateException ;
-
-/**
- * Returns the first module matching the specified uri
- *
- * @param uri - String uri path
- * @return the first module matching the specified uri
- */
-public Module getFirstModule(String uri);
-/**
- * Returns the first module where the alt dd matches the specified uri
- *
- * @param uri - String uri path
- * @return the first module where the alt dd matches the specified uri
- */
-public Module getModuleHavingAltDD(String uri);
-/**
- * @param name - String role name
- * @return security role with name
- */
-public SecurityRole getSecurityRoleNamed(String name);
-/**
- * Return boolean indicating if this Application was populated from an Applcation1.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- *
- */
-public boolean isVersion1_2Descriptor();
-/**
- * Return boolean indicating if this Application was populated from an Application1.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- *
- */
-public boolean isVersion1_3Descriptor();
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4 
-	 * The required value for the version is 1.4.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.j2ee.application.ApplicationPackage#getApplication_Version()
-	 * @model
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.application.Application#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoles references
-	 * Contains the definitions of security roles which are
-	 * global to the application. 
-	 */
-
-	EList getSecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Modules references
-	 */
-
-	EList getModules();
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java
deleted file mode 100644
index 2c52d09c7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * @generated
- * @since 1.0 */
-public interface ApplicationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationFactory eINSTANCE = org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Application value
-	 */
-	Application createApplication();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Module value
-	 */
-	Module createModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebModule value
-	 */
-	WebModule createWebModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaClientModule value
-	 */
-	JavaClientModule createJavaClientModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EjbModule value
-	 */
-	EjbModule createEjbModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ConnectorModule value
-	 */
-	ConnectorModule createConnectorModule();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ApplicationPackage getApplicationPackage();
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java
deleted file mode 100644
index 362d3bec1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	@since 1.0
- */
-public interface ApplicationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "application"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION__VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION__SECURITY_ROLES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION__MODULES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Application</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE__URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE__ALT_DD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE__APPLICATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__URI = ApplicationPackage.MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__ALT_DD = ApplicationPackage.MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__APPLICATION = ApplicationPackage.MODULE__APPLICATION;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__CONTEXT_ROOT = ApplicationPackage.MODULE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Web Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_MODULE_FEATURE_COUNT = ApplicationPackage.MODULE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLIENT_MODULE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLIENT_MODULE__URI = ApplicationPackage.MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLIENT_MODULE__ALT_DD = ApplicationPackage.MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLIENT_MODULE__APPLICATION = ApplicationPackage.MODULE__APPLICATION;
-
-	/**
-	 * The number of structural features of the '<em>Java Client Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLIENT_MODULE_FEATURE_COUNT = ApplicationPackage.MODULE_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE__URI = ApplicationPackage.MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE__ALT_DD = ApplicationPackage.MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE__APPLICATION = ApplicationPackage.MODULE__APPLICATION;
-
-	/**
-	 * The number of structural features of the '<em>Ejb Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_MODULE_FEATURE_COUNT = ApplicationPackage.MODULE_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE__URI = ApplicationPackage.MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE__ALT_DD = ApplicationPackage.MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE__APPLICATION = ApplicationPackage.MODULE__APPLICATION;
-
-
-	/**
-	 * The number of structural features of the '<em>Connector Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_MODULE_FEATURE_COUNT = ApplicationPackage.MODULE_FEATURE_COUNT + 0;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "application.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.application"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationPackage eINSTANCE = org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Application object
-	 */
-	EClass getApplication();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.application.Application#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.j2ee.application.Application#getVersion()
-	 * @see #getApplication()
-	 * @generated
-	 */
-	EAttribute getApplication_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplication_SecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplication_Modules();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Module object
-	 */
-	EClass getModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getModule_Uri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getModule_AltDD();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getModule_Application();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebModule object
-	 */
-	EClass getWebModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWebModule_ContextRoot();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JavaClientModule object
-	 */
-	EClass getJavaClientModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EjbModule object
-	 */
-	EClass getEjbModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ConnectorModule object
-	 */
-	EClass getConnectorModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	ApplicationFactory getApplicationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.application.internal.impl.ApplicationImpl <em>Application</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationImpl
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl#getApplication()
-		 * @generated
-		 */
-		EClass APPLICATION = eINSTANCE.getApplication();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION__VERSION = eINSTANCE.getApplication_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__SECURITY_ROLES = eINSTANCE.getApplication_SecurityRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Modules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION__MODULES = eINSTANCE.getApplication_Modules();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.application.internal.impl.ModuleImpl <em>Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ModuleImpl
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl#getModule()
-		 * @generated
-		 */
-		EClass MODULE = eINSTANCE.getModule();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__URI = eINSTANCE.getModule_Uri();
-
-		/**
-		 * The meta object literal for the '<em><b>Alt DD</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODULE__ALT_DD = eINSTANCE.getModule_AltDD();
-
-		/**
-		 * The meta object literal for the '<em><b>Application</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODULE__APPLICATION = eINSTANCE.getModule_Application();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.application.internal.impl.WebModuleImpl <em>Web Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.WebModuleImpl
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl#getWebModule()
-		 * @generated
-		 */
-		EClass WEB_MODULE = eINSTANCE.getWebModule();
-
-		/**
-		 * The meta object literal for the '<em><b>Context Root</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_MODULE__CONTEXT_ROOT = eINSTANCE.getWebModule_ContextRoot();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.application.internal.impl.JavaClientModuleImpl <em>Java Client Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.JavaClientModuleImpl
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl#getJavaClientModule()
-		 * @generated
-		 */
-		EClass JAVA_CLIENT_MODULE = eINSTANCE.getJavaClientModule();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.application.internal.impl.EjbModuleImpl <em>Ejb Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.EjbModuleImpl
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl#getEjbModule()
-		 * @generated
-		 */
-		EClass EJB_MODULE = eINSTANCE.getEjbModule();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.application.internal.impl.ConnectorModuleImpl <em>Connector Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ConnectorModuleImpl
-		 * @see org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl#getConnectorModule()
-		 * @generated
-		 */
-		EClass CONNECTOR_MODULE = eINSTANCE.getConnectorModule();
-
-	}
-
-} //ApplicationPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationResource.java
deleted file mode 100644
index 47eabe3d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationResource.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-/**
- * The represents the deployment descriptor of the EAR.
-
- * @since 1.0 */
-
-public interface ApplicationResource extends XMLResource {
-	
-	  /**
-	   * The application deployment descriptor 
-	   * @since 1.0
-	   * @return The deployment descriptor of the EAR, application deployment descriptor
-	   */
-	public Application getApplication() ;
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ConnectorModule.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ConnectorModule.java
deleted file mode 100644
index 47b1398c0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ConnectorModule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-
-/**
- * Specifies the URI of a resource adapter archive file, relative to the top level of the application package.
- * @generated
- * @since 1.0 */
-public interface ConnectorModule extends Module{
-	//ConnectorModule
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/EjbModule.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/EjbModule.java
deleted file mode 100644
index 1561e9e9b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/EjbModule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-
-/**
- * Specifies the URI of a ejb-jar, relative to the top level of the application package.
- * @generated
- * @since 1.0 */
-public interface EjbModule extends Module{
-	//EjbModule
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/JavaClientModule.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/JavaClientModule.java
deleted file mode 100644
index 3af9c1cc3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/JavaClientModule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-
-/**
- * specifies the URI of a java application client module, relative to the top level of the application package.
- * @generated
- * @since 1.0 */
-public interface JavaClientModule extends Module{
-	//JavaClientModule
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Module.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Module.java
deleted file mode 100644
index f1011d39c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Module.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The module element represents a single J2EE module and contains an ejb, java, or web element, which indicates the module type and contains a path to the module file, and an optional alt-dd element, which specifies an optional URI to the post-assembly version of the deployment descriptor. The application deployment descriptor must have one module element for each J2EE module in the application package.
- * @generated
- * @since 1.0 */
-public interface Module extends J2EEEObject {
-
-	/**
-	 * Returns boolean value if this Module represents a ConnectorModule
-	 * @return boolean value
-	 */
-	public boolean isConnectorModule();
-	
-	/**
-	 * Returns boolean value if this Module represents a EjbModule
-	 * @return boolean value
-	 */
-	public boolean isEjbModule();
-	
-	/**
-	 * Returns boolean value if this Module represents a JavaClientModule(ApplicationClient)
-	 * @return boolean value
-	 */
-	public boolean isJavaModule();
-	
-	/**
-	 * Returns boolean value if this Module represents a WebModule
-	 * @return boolean value
-	 */
-	public boolean isWebModule();
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Uri attribute
-	 * Specifies the URI of a module, relative to the top level of the application
-	 * package.
-
-	 */
-	String getUri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Uri attribute
-	 */
-	void setUri(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AltDD attribute
-	 * The alt-dd element specifies an optional URI to the post-assembly version of
-	 * the deployment descriptor file for a particular J2EE module. The URI must
-	 * specify the full pathname of the deployment descriptor file relative to the
-	 * application's root directory. If alt-dd is not specified, the deployer must
-	 * read the deployment descriptor from the default location and file name required 
-	 * by the respective component specification.
-
-	 */
-	String getAltDD();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the AltDD attribute
-	 */
-	void setAltDD(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Application reference
-	 */
-	Application getApplication();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Application reference
-	 */
-	void setApplication(Application value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/WebModule.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/WebModule.java
deleted file mode 100644
index fee8cee91..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/WebModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application;
-
-
-/**
- * Contains the web-uri and context-root of a web application module.
- * @generated
- * @since 1.0 */
-public interface WebModule extends Module {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ContextRoot attribute
-	 * The context-root element specifies the context root of a web application
-
-	 */
-	String getContextRoot();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ContextRoot attribute
-	 */
-	void setContextRoot(String value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationFactoryImpl.java
deleted file mode 100644
index d18cbee8b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationFactoryImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-
-/**
- * @generated
- */
-public class ApplicationFactoryImpl extends EFactoryImpl implements ApplicationFactory {
- 
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ApplicationFactory init() {
-		try {
-			ApplicationFactory theApplicationFactory = (ApplicationFactory)EPackage.Registry.INSTANCE.getEFactory("application.xmi"); 
-			if (theApplicationFactory != null) {
-				return theApplicationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ApplicationFactoryImpl();
-	}
-
-	public ApplicationFactoryImpl() {
-		super(); 	
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ApplicationPackage.APPLICATION: return createApplication();
-			case ApplicationPackage.MODULE: return createModule();
-			case ApplicationPackage.WEB_MODULE: return createWebModule();
-			case ApplicationPackage.JAVA_CLIENT_MODULE: return createJavaClientModule();
-			case ApplicationPackage.EJB_MODULE: return createEjbModule();
-			case ApplicationPackage.CONNECTOR_MODULE: return createConnectorModule();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-public static ApplicationFactory getActiveFactory() {
-	return (ApplicationFactory) getPackage().getEFactoryInstance();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Application createApplication() {
-		ApplicationImpl application = new ApplicationImpl();
-		return application;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Module createModule() {
-		ModuleImpl module = new ModuleImpl();
-		return module;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebModule createWebModule() {
-		WebModuleImpl webModule = new WebModuleImpl();
-		return webModule;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JavaClientModule createJavaClientModule() {
-		JavaClientModuleImpl javaClientModule = new JavaClientModuleImpl();
-		return javaClientModule;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EjbModule createEjbModule() {
-		EjbModuleImpl ejbModule = new EjbModuleImpl();
-		return ejbModule;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ConnectorModule createConnectorModule() {
-		ConnectorModuleImpl connectorModule = new ConnectorModuleImpl();
-		return connectorModule;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ApplicationPackage getApplicationPackage() {
-		return (ApplicationPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static ApplicationPackage getPackage() {
-		return ApplicationPackage.eINSTANCE;
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationImpl.java
deleted file mode 100644
index 6a08251ec..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationImpl.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-
-
-/**
- * The application element is the root element of a J2EE application deployment descriptor.
-
- */
-public class ApplicationImpl extends CompatibilityDescriptionGroupImpl implements Application {
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList modules = null;
-	public ApplicationImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.APPLICATION;
-	}
-
-/**
- * @see org.eclipse.jst.j2ee.internal.application.Application
- */
-public boolean containsSecurityRole(java.lang.String name) {
-	return getSecurityRoleNamed(name) != null;
-}
-public Module getModule(String uri) {
-	return getFirstModule(uri);
-}
-
-public Module getModule(String uri, String altDD) {
-	List allModules = getModules();
-	for (int i = 0; i < allModules.size(); i++) {
-		Module aModule = (Module) allModules.get(i);
-		if (StringUtil.stringsEqual(uri, aModule.getUri()) && StringUtil.stringsEqual(altDD, aModule.getAltDD()))
-			return aModule;
-	}
-	return null;
-}
-	/**
-	 * Gets the first module matching the specified uri
-	 * @param uri The uri of a module to find.
-	 * @return The first matching module or null if no module is found.
-	 */
-	public Module getFirstModule(String uri){
-		if (uri == null) return null;
-		java.util.Iterator allModules = getModules().iterator();
-		while (allModules.hasNext()){
-			Module aModule = (Module)allModules.next();
-			if(uri.equals(aModule.getUri())) return aModule;
-		}
-		return null;
-	}
-/**
- * @see org.eclipse.jst.j2ee.internal.application.Application
- */
-public Module getModuleHavingAltDD(java.lang.String uri) {
-	if (uri == null)
-		return null;
-	List aModules = getModules();
-	for (int i = 0; i < aModules.size(); i++) {
-		Module aModule = (Module) aModules.get(i);
-		if (uri.equals(aModule.getAltDD()))
-			return aModule;
-	}
-	return null;
-}
-public SecurityRole getSecurityRoleNamed(String roleName) {
-	java.util.List tempRoles = getSecurityRoles();
-	SecurityRole role;
-	for (int i = 0; i < tempRoles.size(); i++) {
-		role = (SecurityRole) tempRoles.get(i);
-		if (role.getRoleName().equals(roleName))
-			return role;
-	}
-	return null;
-}
-	
-/**
- * Return boolean indicating if this Application was populated from an Applcation1.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_2Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.APPLICATION_SYSTEMID_1_2);
-}
-/**
- * Return boolean indicating if this Application was populated from an Application1.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_3Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.APPLICATION_SYSTEMID_1_3);
-}
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	 */
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getJ2EEVersionID();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.APPLICATION__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the definitions of security roles which are
-	 * global to the application. 
-	 */
-	public EList getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, ApplicationPackage.APPLICATION__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getModules() {
-		if (modules == null) {
-			modules = new EObjectContainmentWithInverseEList(Module.class, this, ApplicationPackage.APPLICATION__MODULES, ApplicationPackage.MODULE__APPLICATION);
-		}
-		return modules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__MODULES:
-				return ((InternalEList)getModules()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-			case ApplicationPackage.APPLICATION__MODULES:
-				return ((InternalEList)getModules()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__VERSION:
-				return getVersion();
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return getSecurityRoles();
-			case ApplicationPackage.APPLICATION__MODULES:
-				return getModules();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__VERSION:
-				setVersion((String)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__MODULES:
-				getModules().clear();
-				getModules().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case ApplicationPackage.APPLICATION__MODULES:
-				getModules().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.APPLICATION__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case ApplicationPackage.APPLICATION__MODULES:
-				return modules != null && !modules.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java
deleted file mode 100644
index a8285c61d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class ApplicationPackageImpl extends EPackageImpl implements ApplicationPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass moduleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webModuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaClientModuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbModuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectorModuleEClass = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private ApplicationPackageImpl() {
-		super(eNS_URI, ApplicationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static ApplicationPackage init() {
-		if (isInited) return (ApplicationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ApplicationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theApplicationPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theApplicationPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theApplicationPackage.freeze();
-
-		return theApplicationPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getApplication() {
-		return applicationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplication_Version() {
-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplication_SecurityRoles() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplication_Modules() {
-		return (EReference)applicationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getModule() {
-		return moduleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getModule_Uri() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getModule_AltDD() {
-		return (EAttribute)moduleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getModule_Application() {
-		return (EReference)moduleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebModule() {
-		return webModuleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebModule_ContextRoot() {
-		return (EAttribute)webModuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJavaClientModule() {
-		return javaClientModuleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEjbModule() {
-		return ejbModuleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getConnectorModule() {
-		return connectorModuleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ApplicationFactory getApplicationFactory() {
-		return (ApplicationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		applicationEClass = createEClass(APPLICATION);
-		createEAttribute(applicationEClass, APPLICATION__VERSION);
-		createEReference(applicationEClass, APPLICATION__SECURITY_ROLES);
-		createEReference(applicationEClass, APPLICATION__MODULES);
-
-		moduleEClass = createEClass(MODULE);
-		createEAttribute(moduleEClass, MODULE__URI);
-		createEAttribute(moduleEClass, MODULE__ALT_DD);
-		createEReference(moduleEClass, MODULE__APPLICATION);
-
-		webModuleEClass = createEClass(WEB_MODULE);
-		createEAttribute(webModuleEClass, WEB_MODULE__CONTEXT_ROOT);
-
-		javaClientModuleEClass = createEClass(JAVA_CLIENT_MODULE);
-
-		ejbModuleEClass = createEClass(EJB_MODULE);
-
-		connectorModuleEClass = createEClass(CONNECTOR_MODULE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		ApplicationPackage theApplicationPackage_1 = (ApplicationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-
-		// Add supertypes to classes
-		applicationEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		moduleEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		webModuleEClass.getESuperTypes().add(theApplicationPackage_1.getModule());
-		javaClientModuleEClass.getESuperTypes().add(theApplicationPackage_1.getModule());
-		ejbModuleEClass.getESuperTypes().add(theApplicationPackage_1.getModule());
-		connectorModuleEClass.getESuperTypes().add(theApplicationPackage_1.getModule());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(applicationEClass, Application.class, "Application", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getApplication_Version(), ecorePackage.getEString(), "version", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplication_SecurityRoles(), theCommonPackage.getSecurityRole(), null, "securityRoles", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplication_Modules(), theApplicationPackage_1.getModule(), theApplicationPackage_1.getModule_Application(), "modules", null, 1, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(moduleEClass, Module.class, "Module", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getModule_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getModule_Application(), theApplicationPackage_1.getApplication(), theApplicationPackage_1.getApplication_Modules(), "application", null, 0, 1, Module.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(webModuleEClass, WebModule.class, "WebModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWebModule_ContextRoot(), ecorePackage.getEString(), "contextRoot", null, 0, 1, WebModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(javaClientModuleEClass, JavaClientModule.class, "JavaClientModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(ejbModuleEClass, EjbModule.class, "EjbModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(connectorModuleEClass, ConnectorModule.class, "ConnectorModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-	}
-
-} //ApplicationPackageImpl
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationResourceFactory.java
deleted file mode 100644
index 4eb91ed03..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationResourceFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class ApplicationResourceFactory extends TranslatorResourceFactory {
-
-	/**
-	 * Method registerDtds.
-	 */
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APPLICATION_SYSTEMID_1_2, "application_1_2.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APPLICATION_ALT_SYSTEMID_1_2, "application_1.2.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APPLICATION_SYSTEMID_1_3, "application_1_3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APPLICATION_ALT_SYSTEMID_1_3, "application_1.3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APPLICATION_SCHEMA_LOC_1_4, "application_1_4.xsd"); //$NON-NLS-1$
-		// moved to the web svcs J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1, "j2ee_web_services_client_1_1.xsd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.J2EE_1_4_XSD_SHORT_NAME, J2EEConstants.J2EE_1_4_XSD_SHORT_NAME); 
-	}
-
-	
-
-    /**
-     * @param aRendererFactory
-     */
-    public ApplicationResourceFactory() {
-        super(RendererFactory.getDefaultRendererFactory());
-    }
-	
-    /**
-     * @param aRendererFactory
-     */
-    public ApplicationResourceFactory(RendererFactory aRendererFactory) {
-        super(aRendererFactory);
-    }
-
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-     */
-    protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new ApplicationResourceImpl(uri, aRenderer);
-    }
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.APPLICATION_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationResourceImpl.java
deleted file mode 100644
index f6c469595..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationResourceImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.application.ApplicationTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-public class ApplicationResourceImpl extends XMLResourceImpl implements ApplicationResource {
-    /**
-     * @param uri
-     * @param aRenderer
-     */
-    public ApplicationResourceImpl(URI uri, Renderer aRenderer) {
-        super(uri, aRenderer);
-       
-    }
-
-    /**
-     * @param aRenderer
-     */
-    public ApplicationResourceImpl(Renderer aRenderer) {
-        super(aRenderer);
-    }
-	/**
-	* Return the first element in the EList.	 */
-	public Application getApplication() {
-		return (Application) getRootObject();
-	}
-
-
-	public int getType() {
-		return APPLICATION_TYPE;
-	}
-
-
-    public String getDoctype() {
-    	switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.APPLICATION_DOCTYPE;
-			default :
-				return null;
-		}
-		
-    }
-	/* App version is always the same as the J2EE version
-	 */
-	public int getJ2EEVersionID() {
-		return getModuleVersionID();
-	}
-    public Translator getRootTranslator() {
-		return ApplicationTranslator.INSTANCE;
-    }
-    
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.APPLICATION_SYSTEMID_1_2;
-	}
-	
-	public String getJ2EE_Alt_1_2_SystemID() {
-		return J2EEConstants.APPLICATION_ALT_SYSTEMID_1_2;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.APPLICATION_SYSTEMID_1_3;
-	}
-	
-	public String getJ2EE_Alt_1_3_SystemID() {
-		return J2EEConstants.APPLICATION_ALT_SYSTEMID_1_3;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.APPLICATION_PUBLICID_1_2;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.APPLICATION_PUBLICID_1_3;
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (J2EE_1_4_ID) :
-					super.setDoctypeValues(null, null);
-					break;
-				case (J2EE_1_3_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					break;
-				case (J2EE_1_2_ID) :
-					super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-			}
-		syncVersionOfRootObject();
-	}
-		/*
-		 * Based on the J2EE version, this will set the module version(Same as J2EE Version for Application)
-		 */
-		public void setJ2EEVersionID(int id) {
-		primSetVersionID(id);
-		switch (id) {
-					case (J2EE_1_4_ID) :
-						primSetDoctypeValues(null, null);
-						break;
-					case (J2EE_1_3_ID) :
-						primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-						break;
-					case (J2EE_1_2_ID) :
-						primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-				}
-		syncVersionOfRootObject();
-		}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		Application app = getApplication();
-		if (app == null)
-			return;
-		
-		String version = app.getVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			app.setVersion(newVersion);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ConnectorModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ConnectorModuleImpl.java
deleted file mode 100644
index 66969da9f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ConnectorModuleImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-
-/**
- * Specifies the URI of a resource adapter archive file, relative to the top level of the application package.
- * @generated
- */
-public class ConnectorModuleImpl extends ModuleImpl implements ConnectorModule {
-
-	public ConnectorModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.CONNECTOR_MODULE;
-	}
-
-public boolean isConnectorModule() {
-		return true;
-}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/EjbModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/EjbModuleImpl.java
deleted file mode 100644
index 23d35574a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/EjbModuleImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.EjbModule;
-
-/**
- * Specifies the URI of a ejb-jar, relative to the top level of the application package.
- * @generated
- */
-public class EjbModuleImpl extends ModuleImpl implements EjbModule {
-
-	public EjbModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.EJB_MODULE;
-	}
-
-public boolean isEjbModule() {
-	return true;
-}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/JavaClientModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/JavaClientModuleImpl.java
deleted file mode 100644
index 8c669da23..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/JavaClientModuleImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-
-/**
- * specifies the URI of a java application client module, relative to the top level of the application package.
- * @generated
- */
-public class JavaClientModuleImpl extends ModuleImpl implements JavaClientModule {
-
-	public JavaClientModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.JAVA_CLIENT_MODULE;
-	}
-
-public boolean isJavaModule() {
-	return true;
-}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ModuleImpl.java
deleted file mode 100644
index dd0500619..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ModuleImpl.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-
-/**
- * The module element represents a single J2EE module and contains an ejb, java, or web element, which indicates the module type and contains a path to the module file, and an optional alt-dd element, which specifies an optional URI to the post-assembly version of the deployment descriptor. The application deployment descriptor must have one module element for each J2EE module in the application package.
- * @generated
- */
-public class ModuleImpl extends J2EEEObjectImpl implements Module {
-
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	protected static final char FORWARD_SLASH = '/';
-	protected static final char BACKWARD_SLASH = '\\';
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String uri = URI_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAltDD() <em>Alt DD</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAltDD()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALT_DD_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String altDD = ALT_DD_EDEFAULT;
-	public ModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.MODULE;
-	}
-
-public boolean isConnectorModule() {
-	return false;
-}
-/* Returns false by default
- *
- */
-public boolean isEjbModule() {
-	return false;
-}
-/* 
- * Returns false by default
- */
-public boolean isJavaModule() {
-	return false;
-}
-/* 
- * Returns false by default
- */
-public boolean isWebModule() {
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the URI of a module, relative to the top level of the application package.
-
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__URI, oldUri, uri));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The alt-dd element specifies an optional URI to the post-assembly version of the deployment descriptor file for a particular J2EE module. The URI must specify the full pathname of the deployment descriptor file relative to the application's root directory. If alt-dd is not specified, the deployer must read the deployment descriptor from the default location and file name required by the respective component specification.
-
-	 */
-	public String getAltDD() {
-		return altDD;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAltDD(String newAltDD) {
-		String oldAltDD = altDD;
-		altDD = newAltDD;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__ALT_DD, oldAltDD, altDD));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Application getApplication() {
-		if (eContainerFeatureID != ApplicationPackage.MODULE__APPLICATION) return null;
-		return (Application)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetApplication(Application newApplication, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newApplication, ApplicationPackage.MODULE__APPLICATION, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setApplication(Application newApplication) {
-		if (newApplication != eInternalContainer() || (eContainerFeatureID != ApplicationPackage.MODULE__APPLICATION && newApplication != null)) {
-			if (EcoreUtil.isAncestor(this, newApplication))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newApplication != null)
-				msgs = ((InternalEObject)newApplication).eInverseAdd(this, ApplicationPackage.APPLICATION__MODULES, Application.class, msgs);
-			msgs = basicSetApplication(newApplication, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.MODULE__APPLICATION, newApplication, newApplication));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__APPLICATION:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetApplication((Application)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__APPLICATION:
-				return basicSetApplication(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case ApplicationPackage.MODULE__APPLICATION:
-				return eInternalContainer().eInverseRemove(this, ApplicationPackage.APPLICATION__MODULES, Application.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__URI:
-				return getUri();
-			case ApplicationPackage.MODULE__ALT_DD:
-				return getAltDD();
-			case ApplicationPackage.MODULE__APPLICATION:
-				return getApplication();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__URI:
-				setUri((String)newValue);
-				return;
-			case ApplicationPackage.MODULE__ALT_DD:
-				setAltDD((String)newValue);
-				return;
-			case ApplicationPackage.MODULE__APPLICATION:
-				setApplication((Application)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case ApplicationPackage.MODULE__ALT_DD:
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-			case ApplicationPackage.MODULE__APPLICATION:
-				setApplication((Application)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.MODULE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case ApplicationPackage.MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-			case ApplicationPackage.MODULE__APPLICATION:
-				return getApplication() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uri: ");
-		result.append(uri);
-		result.append(", altDD: ");
-		result.append(altDD);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/WebModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/WebModuleImpl.java
deleted file mode 100644
index f85a442ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/WebModuleImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.WebModule;
-
-
-/**
- * Contains the web-uri and context-root of a web application module.
- * @generated
- */
-public class WebModuleImpl extends ModuleImpl implements WebModule {
-
-	/**
-	 * The default value of the '{@link #getContextRoot() <em>Context Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextRoot()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTEXT_ROOT_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String contextRoot = CONTEXT_ROOT_EDEFAULT;
-	public WebModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.Literals.WEB_MODULE;
-	}
-
-public boolean isWebModule() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The context-root element specifies the context root of a web application
-
-	 */
-	public String getContextRoot() {
-		return contextRoot;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setContextRoot(String newContextRoot) {
-		String oldContextRoot = contextRoot;
-		contextRoot = newContextRoot;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.WEB_MODULE__CONTEXT_ROOT, oldContextRoot, contextRoot));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				return getContextRoot();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				setContextRoot((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				setContextRoot(CONTEXT_ROOT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				return CONTEXT_ROOT_EDEFAULT == null ? contextRoot != null : !CONTEXT_ROOT_EDEFAULT.equals(contextRoot);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (contextRoot: ");
-		result.append(contextRoot);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/util/ApplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/util/ApplicationAdapterFactory.java
deleted file mode 100644
index 29a8addd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/util/ApplicationAdapterFactory.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-public class ApplicationAdapterFactory extends AdapterFactoryImpl {
-	protected static ApplicationPackage modelPackage;
-
-	public ApplicationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (ApplicationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected ApplicationSwitch sw = new ApplicationSwitch() {
-		public Object caseApplication(Application object) {
-			return createApplicationAdapter();
-		}
-		public Object caseModule(Module object) {
-			return createModuleAdapter();
-		}
-		public Object caseWebModule(WebModule object) {
-			return createWebModuleAdapter();
-		}
-		public Object caseJavaClientModule(JavaClientModule object) {
-			return createJavaClientModuleAdapter();
-		}
-		public Object caseEjbModule(EjbModule object) {
-			return createEjbModuleAdapter();
-		}
-		public Object caseConnectorModule(ConnectorModule object) {
-			return createConnectorModuleAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)sw.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createApplicationAdapter() {
-		return null;
-	}
-
-	public Adapter createModuleAdapter() {
-		return null;
-	}
-
-	public Adapter createWebModuleAdapter() {
-		return null;
-	}
-
-	public Adapter createJavaClientModuleAdapter() {
-		return null;
-	}
-
-	public Adapter createEjbModuleAdapter() {
-		return null;
-	}
-
-	public Adapter createConnectorModuleAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ApplicationSwitch modelSwitch =
-		new ApplicationSwitch() {
-			public Object caseApplication(Application object) {
-				return createApplicationAdapter();
-			}
-			public Object caseModule(Module object) {
-				return createModuleAdapter();
-			}
-			public Object caseWebModule(WebModule object) {
-				return createWebModuleAdapter();
-			}
-			public Object caseJavaClientModule(JavaClientModule object) {
-				return createJavaClientModuleAdapter();
-			}
-			public Object caseEjbModule(EjbModule object) {
-				return createEjbModuleAdapter();
-			}
-			public Object caseConnectorModule(ConnectorModule object) {
-				return createConnectorModuleAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseApplication_Module(Module object) {
-				return createApplication_ModuleAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createApplicationAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createModuleAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebModuleAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJavaClientModuleAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEjbModuleAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createConnectorModuleAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.application.Module <em>Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.application.Module
-	 * @generated
-	 */
-	public Adapter createApplication_ModuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ApplicationAdapterFactory
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/util/ApplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/util/ApplicationSwitch.java
deleted file mode 100644
index f854a3d5d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/util/ApplicationSwitch.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.application.ApplicationPackage
- * @generated
- */
-public class ApplicationSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ApplicationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ApplicationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ApplicationPackage.APPLICATION: {
-				Application application = (Application)theEObject;
-				Object result = caseApplication(application);
-				if (result == null) result = caseCompatibilityDescriptionGroup(application);
-				if (result == null) result = caseDescriptionGroup(application);
-				if (result == null) result = caseJ2EEEObject(application);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.MODULE: {
-				Module module = (Module)theEObject;
-				Object result = caseModule(module);
-				if (result == null) result = caseJ2EEEObject(module);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.WEB_MODULE: {
-				WebModule webModule = (WebModule)theEObject;
-				Object result = caseWebModule(webModule);
-				if (result == null) result = caseApplication_Module(webModule);
-				if (result == null) result = caseJ2EEEObject(webModule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.JAVA_CLIENT_MODULE: {
-				JavaClientModule javaClientModule = (JavaClientModule)theEObject;
-				Object result = caseJavaClientModule(javaClientModule);
-				if (result == null) result = caseApplication_Module(javaClientModule);
-				if (result == null) result = caseJ2EEEObject(javaClientModule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.EJB_MODULE: {
-				EjbModule ejbModule = (EjbModule)theEObject;
-				Object result = caseEjbModule(ejbModule);
-				if (result == null) result = caseApplication_Module(ejbModule);
-				if (result == null) result = caseJ2EEEObject(ejbModule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ApplicationPackage.CONNECTOR_MODULE: {
-				ConnectorModule connectorModule = (ConnectorModule)theEObject;
-				Object result = caseConnectorModule(connectorModule);
-				if (result == null) result = caseApplication_Module(connectorModule);
-				if (result == null) result = caseJ2EEEObject(connectorModule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Application</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Application</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplication(Application object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModule(Module object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebModule(WebModule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java Client Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java Client Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJavaClientModule(JavaClientModule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Ejb Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Ejb Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEjbModule(EjbModule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Connector Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Connector Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConnectorModule(ConnectorModule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Module</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplication_Module(Module object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ApplicationSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/package.xml
deleted file mode 100644
index 5cfbab18a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>Enterprise Application model api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the j2ee Application module model api. Using this api the artifacts of an Application
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClient.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClient.java
deleted file mode 100644
index 2a21e9874..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClient.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * The application-client element is the root element of an application client deployment descriptor.  The application client deployment descriptor describes the EJB components and external resources referenced by the application client.
-
- * @since 1.0 */
-public interface ApplicationClient extends CompatibilityDescriptionGroup{
-
-/**
- * Returns the String name of the call back handler
- * @return the class name of the callback handler
- */
-public String getCallbackHandlerClassName();
-/**
- * Return boolean indicating if this Application Client was populated from an Application Client 1.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_2Descriptor();
-/**
- * Return boolean indicating if this Application client was populated from an Application Client 1.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_3Descriptor();
-/**
- * Return boolean indicating if this Application client was populated from an Application Client 1.4 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- * */
-public boolean isVersion1_4Descriptor();
-/**
- * The class must have a no args constructor 
- * and must implement the javax.security.auth.callback.CallbackHandler interface.
- * @param callbackHandlerClassName the name of the class of the CallbackHandler reference
- */
-public void setCallbackHandlerClassName(String callbackHandlerClassName);
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The required value for the version is 1.4.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.j2ee.client.ClientPackage#getApplicationClient_Version()
-	 * @model
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.client.ApplicationClient#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ResourceRefs references
-	 * Contains declarations of the application clients's references to an external
-	 * resources.
-	 */
-	EList getResourceRefs();
-
-	/**
-	 This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	 *
-	 * @return the int representing the app client module version
-	 * @throws IllegalStateException - when EMF resource is not loaded
-	 */
-	public int getVersionID() throws IllegalStateException ;
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 * @return the int representing the J2EE spec version.
-	 * @throws IllegalStateException - when EMF resource is not loaded
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of EnvironmentProps references
-	 * The env-entry element contains the declaration of an application client's
-	 * environment entries. Each declaration consists of an optional description, the
-	 * name of the environment entry, and an optional value.
-	 */
-	EList getEnvironmentProps();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of EjbReferences references
-	 * Contains a list of ejb-ref elements used for the declaration of a reference to
-	 * an enterprise
-	 * bean's home. 
-	 */
-	EList getEjbReferences();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ResourceEnvRefs references
-	 * The resource-env-ref element contains a declaration of an application client's
-	 * reference to an administered object associated with a resource in the
-	 * application client's environment.  It consists of an optional
-	 * description, the resource environment reference name, and an indication of the
-	 * resource environment reference type expected by the application client code.
-	 * 
-	 * Used in: application-client
-	 * 
-	 * Example:
-	 * 
-	 * <resource-env-ref>
-	 *     <resource-env-ref-name>jms//StockQueue<//resource-env-ref-name>
-	 *     <resource-env-ref-type>javax.jms.Queue<//resource-env-ref-type>
-	 * <//resource-env-ref>
-
-	 */
-	EList getResourceEnvRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The CallbackHandler reference
-	 * A class provided by the application.  The class must have a no args constructor 
-	 * and must implement the javax.security.auth.callback.CallbackHandler interface.  
-	 * The class will be instantiated by the application client container and used by
-	 * the container to collect authentication information from the user.
-	 */
-	JavaClass getCallbackHandler();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CallbackHandler reference
-	 */
-	void setCallbackHandler(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.client.ClientPackage#getApplicationClient_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef" containment="true"
-	 * @generated
-	 */
-	EList getServiceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The message-destination-ref-name element specifies the
-	 *     name of a message destination reference; its value is
-	 *     the message destination reference name used in the
-	 *     application client code. The name is a JNDI name
-	 *     relative to the java:comp/env context and must be unique
-	 *     within an application client.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.client.ClientPackage#getApplicationClient_MessageDestinationRefs()
-	 * @model type="org.eclipse.jst.j2ee.common.MessageDestinationRef" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.client.ClientPackage#getApplicationClient_MessageDestinations()
-	 * @model type="org.eclipse.jst.j2ee.common.MessageDestination" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinations();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClientResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClientResource.java
deleted file mode 100644
index 977143d1a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClientResource.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- * EMF Resource class the contrains App Client document
- *	@since 1.0
- */
-public interface ApplicationClientResource extends XMLResource {
-/**
- * Returns the one contained object in this resource's collection of root objects
- * @return ApplicationClient, the root object for the App Client document.
- */
-public ApplicationClient getApplicationClient() ;
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java
deleted file mode 100644
index 8f426bb72..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client;
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * @generated
- * @since 1.0 */
-public interface ClientFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ClientFactory eINSTANCE = org.eclipse.jst.j2ee.client.internal.impl.ClientFactoryImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ApplicationClient value
-	 */
-	ApplicationClient createApplicationClient();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 * @return ClientPackage value
-	 */
-	ClientPackage getClientPackage();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java
deleted file mode 100644
index 6ac2b0c9e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	@since 1.0
- */
-
-public interface ClientPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "client"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__RESOURCE_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__ENVIRONMENT_PROPS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__EJB_REFERENCES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__RESOURCE_ENV_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int APPLICATION_CLIENT__CALLBACK_HANDLER = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__SERVICE_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT__MESSAGE_DESTINATIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the '<em>Application Client</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPLICATION_CLIENT_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.client.ResAuthApplicationType <em>Res Auth Application Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.client.ResAuthApplicationType
-	 * @see org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl#getResAuthApplicationType()
-	 * @generated
-	 */
-	int RES_AUTH_APPLICATION_TYPE = 1;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "client.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.client"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ClientPackage eINSTANCE = org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ApplicationClient object
-	 */
-	EClass getApplicationClient();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.client.ApplicationClient#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.j2ee.client.ApplicationClient#getVersion()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EAttribute getApplicationClient_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplicationClient_ResourceRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplicationClient_EnvironmentProps();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplicationClient_EjbReferences();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplicationClient_ResourceEnvRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getApplicationClient_CallbackHandler();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.client.ApplicationClient#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.client.ApplicationClient#getServiceRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.client.ApplicationClient#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.client.ApplicationClient#getMessageDestinationRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.client.ApplicationClient#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.j2ee.client.ApplicationClient#getMessageDestinations()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_MessageDestinations();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.client.ResAuthApplicationType <em>Res Auth Application Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Res Auth Application Type</em>'.
-	 * @see org.eclipse.jst.j2ee.client.ResAuthApplicationType
-	 * @generated
-	 */
-	EEnum getResAuthApplicationType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	ClientFactory getClientFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientImpl <em>Application Client</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientImpl
-		 * @see org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl#getApplicationClient()
-		 * @generated
-		 */
-		EClass APPLICATION_CLIENT = eINSTANCE.getApplicationClient();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute APPLICATION_CLIENT__VERSION = eINSTANCE.getApplicationClient_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__RESOURCE_REFS = eINSTANCE.getApplicationClient_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Environment Props</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__ENVIRONMENT_PROPS = eINSTANCE.getApplicationClient_EnvironmentProps();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb References</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__EJB_REFERENCES = eINSTANCE.getApplicationClient_EjbReferences();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__RESOURCE_ENV_REFS = eINSTANCE.getApplicationClient_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Callback Handler</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__CALLBACK_HANDLER = eINSTANCE.getApplicationClient_CallbackHandler();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__SERVICE_REFS = eINSTANCE.getApplicationClient_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS = eINSTANCE.getApplicationClient_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destinations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference APPLICATION_CLIENT__MESSAGE_DESTINATIONS = eINSTANCE.getApplicationClient_MessageDestinations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.client.ResAuthApplicationType <em>Res Auth Application Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.client.ResAuthApplicationType
-		 * @see org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl#getResAuthApplicationType()
-		 * @generated
-		 */
-		EEnum RES_AUTH_APPLICATION_TYPE = eINSTANCE.getResAuthApplicationType();
-
-	}
-
-} //ClientPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ResAuthApplicationType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ResAuthApplicationType.java
deleted file mode 100644
index ee47c852b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ResAuthApplicationType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- *@since 1.0
- */
-
-public final class ResAuthApplicationType extends AbstractEnumerator{
-	/**
-	 * The '<em><b>Application</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #APPLICATION_LITERAL
-	 * @model name="Application"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int APPLICATION = 0;
-
-	/**
-	 * The '<em><b>Container</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER_LITERAL
-	 * @model name="Container"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTAINER = 1;
-
-	/**
-	 * The '<em><b>Application</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Application</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #APPLICATION
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthApplicationType APPLICATION_LITERAL = new ResAuthApplicationType(APPLICATION, "Application", "Application"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthApplicationType CONTAINER_LITERAL = new ResAuthApplicationType(CONTAINER, "Container", "Container"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Res Auth Application Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResAuthApplicationType[] VALUES_ARRAY =
-		new ResAuthApplicationType[] {
-			APPLICATION_LITERAL,
-			CONTAINER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Auth Application Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Auth Application Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthApplicationType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthApplicationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Application Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthApplicationType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthApplicationType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Application Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthApplicationType get(int value) {
-		switch (value) {
-			case APPLICATION: return APPLICATION_LITERAL;
-			case CONTAINER: return CONTAINER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResAuthApplicationType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResAuthApplicationType
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientImpl.java
deleted file mode 100644
index 6ad8477cc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientImpl.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-/**
- * The application-client element is the root element of an application client deployment descriptor.  The application client deployment descriptor describes the EJB components and external resources referenced by the application client.
-
- */
-public class ApplicationClientImpl extends CompatibilityDescriptionGroupImpl implements ApplicationClient {
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList resourceRefs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList environmentProps = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList ejbReferences = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList resourceEnvRefs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass callbackHandler = null;
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	public ApplicationClientImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ClientPackage.Literals.APPLICATION_CLIENT;
-	}
-
-/**
- * createClassRef - return a JavaURL reference to the named Java class
- */
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-public String getCallbackHandlerClassName() {
-	getCallbackHandler();
-	return (callbackHandler == null) ? null : callbackHandler.getQualifiedName();
-}
-/**
- * Return boolean indicating if this Application Client was populated from an Application Client 1.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_2Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.APP_CLIENT_SYSTEMID_1_2);
-}
-/**
- * Return boolean indicating if this Application client was populated from an Application Client 1.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_3Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.APP_CLIENT_SYSTEMID_1_3);
-}
-/**
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_4Descriptor() {
-	return version != null && J2EEConstants.J2EE_1_4_TEXT.equals(version);
-}
-public void setCallbackHandlerClassName(String callbackHandlerClassName) {
-	eSet(ClientPackage.eINSTANCE.getApplicationClient_CallbackHandler(), createClassRef(callbackHandlerClassName));
-}
-/**
- *This returns the module version id. Compare with J2EEVersionConstants to determine module level
- */
-public int getVersionID() throws IllegalStateException {
-	J2EEVersionResource res = (J2EEVersionResource) eResource();
-	if (res == null) throw new IllegalStateException();
-	return res.getModuleVersionID();
-}
-/**
- *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
- */
-public int getJ2EEVersionID() throws IllegalStateException {
-	J2EEVersionResource res = (J2EEVersionResource) eResource();
-	if (res == null) throw new IllegalStateException();
-	return res.getJ2EEVersionID();
-}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ClientPackage.APPLICATION_CLIENT__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains declarations of the application clients's references to an external
-	 * resources.
-	 */
-	public EList getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry element contains the declaration of an application client's
-	 * environment entries. Each declaration consists of an optional description, the
-	 * name of the environment entry, and an optional value.
-	 */
-	public EList getEnvironmentProps() {
-		if (environmentProps == null) {
-			environmentProps = new EObjectContainmentEList(EnvEntry.class, this, ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS);
-		}
-		return environmentProps;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains a list of ejb-ref elements used for the declaration of a reference to
-	 * an enterprise
-	 * bean's home. 
-	 */
-	public EList getEjbReferences() {
-		if (ejbReferences == null) {
-			ejbReferences = new EObjectContainmentEList(EjbRef.class, this, ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES);
-		}
-		return ejbReferences;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The resource-env-ref element contains a declaration of an application client's
-	 * reference to an administered object associated with a resource in the
-	 * application client's environment.  It consists of an optional
-	 * description, the resource environment reference name, and an indication of the
-	 * resource environment reference type expected by the application client code.
-	 * 
-	 * Used in: application-client
-	 * 
-	 * Example:
-	 * 
-	 * <resource-env-ref>
-	 *     <resource-env-ref-name>jms//StockQueue<//resource-env-ref-name>
-	 *     <resource-env-ref-type>javax.jms.Queue<//resource-env-ref-type>
-	 * <//resource-env-ref>
-
-	 */
-	public EList getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A class provided by the application.  The class must have a no args constructor and must implement the javax.security.auth.callback.CallbackHandler interface.  The class will be instantiated by the application client container and used by the container to collect authentication information from the user.
-	 */
-	public JavaClass getCallbackHandler() {
-		if (callbackHandler != null && callbackHandler.eIsProxy()) {
-			InternalEObject oldCallbackHandler = (InternalEObject)callbackHandler;
-			callbackHandler = (JavaClass)eResolveProxy(oldCallbackHandler);
-			if (callbackHandler != oldCallbackHandler) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ClientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER, oldCallbackHandler, callbackHandler));
-			}
-		}
-		return callbackHandler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetCallbackHandler() {
-		return callbackHandler;
-	}
-
-	/**
-	 */
-	public void setCallbackHandler(JavaClass newCallbackHandler) {
-		if ((callbackHandler == null || callbackHandler.getQualifiedName() == null)
-				&& (newCallbackHandler == null || newCallbackHandler.getQualifiedName() == null)) {
-			return;
-		}
-		JavaClass oldCallbackHandler = callbackHandler;
-		callbackHandler = newCallbackHandler;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ClientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER, oldCallbackHandler, callbackHandler));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, ClientPackage.APPLICATION_CLIENT__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS:
-				return ((InternalEList)getEnvironmentProps()).basicRemove(otherEnd, msgs);
-			case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES:
-				return ((InternalEList)getEjbReferences()).basicRemove(otherEnd, msgs);
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ClientPackage.APPLICATION_CLIENT__VERSION:
-				return getVersion();
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				return getResourceRefs();
-			case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS:
-				return getEnvironmentProps();
-			case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES:
-				return getEjbReferences();
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case ClientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				if (resolve) return getCallbackHandler();
-				return basicGetCallbackHandler();
-			case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				return getServiceRefs();
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ClientPackage.APPLICATION_CLIENT__VERSION:
-				setVersion((String)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS:
-				getEnvironmentProps().clear();
-				getEnvironmentProps().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES:
-				getEjbReferences().clear();
-				getEjbReferences().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				setCallbackHandler((JavaClass)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ClientPackage.APPLICATION_CLIENT__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS:
-				getEnvironmentProps().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES:
-				getEjbReferences().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				setCallbackHandler((JavaClass)null);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ClientPackage.APPLICATION_CLIENT__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS:
-				return environmentProps != null && !environmentProps.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES:
-				return ejbReferences != null && !ejbReferences.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
-				return callbackHandler != null;
-			case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientResourceFactory.java
deleted file mode 100644
index 9385b1720..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientResourceFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class ApplicationClientResourceFactory extends TranslatorResourceFactory {
-
-	/**
-	 * Method registerDtds.
-	 */
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APP_CLIENT_SYSTEMID_1_2, "application-client_1_2.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_2, "application-client_1.2.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APP_CLIENT_SYSTEMID_1_3, "application-client_1_3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_3, "application-client_1.3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.APP_CLIENT_SCHEMA_LOC_1_4, "application-client_1_4.xsd"); //$NON-NLS-1$	
-	}
-
-	/**
-	 * Constructor for ApplicationClientResourceFactory.
-	 */
-	public ApplicationClientResourceFactory() {
-		super(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	/**
-	 * Constructor for ApplicationClientResourceFactory.
-	 * @param aRendererFactory
-	 */
-	public ApplicationClientResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(URI, Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new ApplicationClientResourceImpl(uri, aRenderer);
-	}
-	
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.APP_CLIENT_DD_SHORT_NAME, new ApplicationClientResourceFactory(aRendererFactory));
-	}
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.APP_CLIENT_DD_SHORT_NAME, new ApplicationClientResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.APP_CLIENT_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientResourceImpl.java
deleted file mode 100644
index ece239b41..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ApplicationClientResourceImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.impl;
-
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.client.ApplicationClientTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ApplicationClientResourceImpl extends XMLResourceImpl implements ApplicationClientResource {
-	/**
-	 * Constructor for ApplicationClientResourceImpl.
-	 * @param uri
-	 * @param aRenderer
-	 */
-	public ApplicationClientResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * Constructor for ApplicationClientResourceImpl.
-	 * @param aRenderer
-	 */
-	public ApplicationClientResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public ApplicationClient getApplicationClient() {
-		return (ApplicationClient) getRootObject();
-	}
-
-	
-	public int getType() {
-		return APP_CLIENT_TYPE;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.APP_CLIENT_SYSTEMID_1_2;
-	}
-	
-	public String getJ2EE_Alt_1_2_SystemID() {
-		return J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_2;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.APP_CLIENT_SYSTEMID_1_3;
-	}
-	
-	public String getJ2EE_Alt_1_3_SystemID() {
-		return J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_3;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.APP_CLIENT_PUBLICID_1_2;
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.APP_CLIENT_PUBLICID_1_3;
-	}
-
-
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.APP_CLIENT_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return ApplicationClientTranslator.INSTANCE;
-	}
-
-	/* App client version is always the same as the J2EE version
-	 */
-	public int getJ2EEVersionID() {
-		return getModuleVersionID();
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (J2EE_1_4_ID) :
-					super.setDoctypeValues(null, null);
-					break;
-				case (J2EE_1_3_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					break;
-				case (J2EE_1_2_ID) :
-					super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-			}
-		syncVersionOfRootObject();
-	}
-		/*
-		 * Based on the J2EE version, this will set the module version(Same as J2EE Version for App client)
-		 */
-		public void setJ2EEVersionID(int id) {
-		primSetVersionID(id);
-		switch (id) {
-					case (J2EE_1_4_ID) :
-						primSetDoctypeValues(null, null);
-						break;
-					case (J2EE_1_3_ID) :
-						primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-						break;
-					case (J2EE_1_2_ID) :
-						primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-				}
-			syncVersionOfRootObject();
-		}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		ApplicationClient clt = getApplicationClient();
-		if (clt == null)
-			return;
-	
-		String version = clt.getVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			clt.setVersion(newVersion);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientFactoryImpl.java
deleted file mode 100644
index 66dee549c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientFactoryImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.ResAuthApplicationType;
-
-/**
- * @generated
- */
-public class ClientFactoryImpl extends EFactoryImpl implements ClientFactory {
- 
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ClientFactory init() {
-		try {
-			ClientFactory theClientFactory = (ClientFactory)EPackage.Registry.INSTANCE.getEFactory("client.xmi"); 
-			if (theClientFactory != null) {
-				return theClientFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ClientFactoryImpl();
-	}
-
-	public ClientFactoryImpl() {
-		super(); 		
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ClientPackage.APPLICATION_CLIENT: return createApplicationClient();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case ClientPackage.RES_AUTH_APPLICATION_TYPE:
-				return createResAuthApplicationTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case ClientPackage.RES_AUTH_APPLICATION_TYPE:
-				return convertResAuthApplicationTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-public static ClientFactory getActiveFactory() {
-	return (ClientFactory) getPackage().getEFactoryInstance();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ApplicationClient createApplicationClient() {
-		ApplicationClientImpl applicationClient = new ApplicationClientImpl();
-		return applicationClient;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResAuthApplicationType createResAuthApplicationTypeFromString(EDataType eDataType, String initialValue) {
-		ResAuthApplicationType result = ResAuthApplicationType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResAuthApplicationTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ClientPackage getClientPackage() {
-		return (ClientPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static ClientPackage getPackage() {
-		return ClientPackage.eINSTANCE;
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java
deleted file mode 100644
index cc5fab95d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.ResAuthApplicationType;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class ClientPackageImpl extends EPackageImpl implements ClientPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass applicationClientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resAuthApplicationTypeEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private ClientPackageImpl() {
-		super(eNS_URI, ClientFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static ClientPackage init() {
-		if (isInited) return (ClientPackage)EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ClientPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theClientPackage.freeze();
-
-		return theClientPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getApplicationClient() {
-		return applicationClientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getApplicationClient_Version() {
-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplicationClient_ResourceRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplicationClient_EnvironmentProps() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplicationClient_EjbReferences() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplicationClient_ResourceEnvRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getApplicationClient_CallbackHandler() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_ServiceRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_MessageDestinationRefs() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getApplicationClient_MessageDestinations() {
-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getResAuthApplicationType() {
-		return resAuthApplicationTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ClientFactory getClientFactory() {
-		return (ClientFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		applicationClientEClass = createEClass(APPLICATION_CLIENT);
-		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__VERSION);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__RESOURCE_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__ENVIRONMENT_PROPS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__EJB_REFERENCES);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__RESOURCE_ENV_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__CALLBACK_HANDLER);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__SERVICE_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS);
-		createEReference(applicationClientEClass, APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
-
-		// Create enums
-		resAuthApplicationTypeEEnum = createEEnum(RES_AUTH_APPLICATION_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		Webservice_clientPackage theWebservice_clientPackage = (Webservice_clientPackage)EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI);
-
-		// Add supertypes to classes
-		applicationClientEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(applicationClientEClass, ApplicationClient.class, "ApplicationClient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getApplicationClient_Version(), ecorePackage.getEString(), "version", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_ResourceRefs(), theCommonPackage.getResourceRef(), null, "resourceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_EnvironmentProps(), theCommonPackage.getEnvEntry(), null, "environmentProps", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_EjbReferences(), theCommonPackage.getEjbRef(), null, "ejbReferences", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_ResourceEnvRefs(), theCommonPackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_CallbackHandler(), theJavaRefPackage.getJavaClass(), null, "callbackHandler", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_ServiceRefs(), theWebservice_clientPackage.getServiceRef(), null, "serviceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_MessageDestinationRefs(), theCommonPackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getApplicationClient_MessageDestinations(), theCommonPackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(resAuthApplicationTypeEEnum, ResAuthApplicationType.class, "ResAuthApplicationType");
-		addEEnumLiteral(resAuthApplicationTypeEEnum, ResAuthApplicationType.APPLICATION_LITERAL);
-		addEEnumLiteral(resAuthApplicationTypeEEnum, ResAuthApplicationType.CONTAINER_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //ClientPackageImpl
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/util/ClientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/util/ClientAdapterFactory.java
deleted file mode 100644
index b40224791..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/util/ClientAdapterFactory.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-public class ClientAdapterFactory extends AdapterFactoryImpl {
-	protected static ClientPackage modelPackage;
-
-	public ClientAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (ClientPackage)EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected ClientSwitch sw = new ClientSwitch() {
-		public Object caseApplicationClient(ApplicationClient object) {
-			return createApplicationClientAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)sw.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createApplicationClientAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ClientSwitch modelSwitch =
-		new ClientSwitch() {
-			public Object caseApplicationClient(ApplicationClient object) {
-				return createApplicationClientAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createApplicationClientAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ClientAdapterFactory
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/util/ClientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/util/ClientSwitch.java
deleted file mode 100644
index 53b645c50..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/util/ClientSwitch.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.client.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.client.ClientPackage
- * @generated
- */
-public class ClientSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ClientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ClientSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ClientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ClientPackage.APPLICATION_CLIENT: {
-				ApplicationClient applicationClient = (ApplicationClient)theEObject;
-				Object result = caseApplicationClient(applicationClient);
-				if (result == null) result = caseCompatibilityDescriptionGroup(applicationClient);
-				if (result == null) result = caseDescriptionGroup(applicationClient);
-				if (result == null) result = caseJ2EEEObject(applicationClient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Application Client</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Application Client</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseApplicationClient(ApplicationClient object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ClientSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/package.xml
deleted file mode 100644
index 43d1f530c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-         This package includes the j2ee Application Client module model api. Using this api the artifacts of an Application Client app
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java
deleted file mode 100644
index b86061db7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.common.CommonPackage
- * @generated
- */
-public interface CommonFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonFactory eINSTANCE = org.eclipse.jst.j2ee.common.internal.impl.CommonFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Ejb Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ejb Ref</em>'.
-	 * @generated
-	 */
-	EjbRef createEjbRef();
-
-	/**
-	 * Returns a new object of class '<em>Env Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Env Entry</em>'.
-	 * @generated
-	 */
-	EnvEntry createEnvEntry();
-
-	/**
-	 * Returns a new object of class '<em>Resource Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Ref</em>'.
-	 * @generated
-	 */
-	ResourceRef createResourceRef();
-
-	/**
-	 * Returns a new object of class '<em>Security Role Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Role Ref</em>'.
-	 * @generated
-	 */
-	SecurityRoleRef createSecurityRoleRef();
-
-	/**
-	 * Returns a new object of class '<em>Security Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Role</em>'.
-	 * @generated
-	 */
-	SecurityRole createSecurityRole();
-
-	/**
-	 * Returns a new object of class '<em>Resource Env Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Env Ref</em>'.
-	 * @generated
-	 */
-	ResourceEnvRef createResourceEnvRef();
-
-	/**
-	 * Returns a new object of class '<em>EJB Local Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Local Ref</em>'.
-	 * @generated
-	 */
-	EJBLocalRef createEJBLocalRef();
-
-	/**
-	 * Returns a new object of class '<em>Run As Specified Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Run As Specified Identity</em>'.
-	 * @generated
-	 */
-	RunAsSpecifiedIdentity createRunAsSpecifiedIdentity();
-
-	/**
-	 * Returns a new object of class '<em>Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Identity</em>'.
-	 * @generated
-	 */
-	Identity createIdentity();
-
-	/**
-	 * Returns a new object of class '<em>Icon Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Icon Type</em>'.
-	 * @generated
-	 */
-	IconType createIconType();
-
-	/**
-	 * Returns a new object of class '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Display Name</em>'.
-	 * @generated
-	 */
-	DisplayName createDisplayName();
-
-	/**
-	 * Returns a new object of class '<em>Message Destination Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Destination Ref</em>'.
-	 * @generated
-	 */
-	MessageDestinationRef createMessageDestinationRef();
-
-	/**
-	 * Returns a new object of class '<em>Message Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Destination</em>'.
-	 * @generated
-	 */
-	MessageDestination createMessageDestination();
-
-	/**
-	 * Returns a new object of class '<em>Param Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Param Value</em>'.
-	 * @generated
-	 */
-	ParamValue createParamValue();
-
-	/**
-	 * Returns a new object of class '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description Group</em>'.
-	 * @generated
-	 */
-	DescriptionGroup createDescriptionGroup();
-
-	/**
-	 * Returns a new object of class '<em>Security Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Security Identity</em>'.
-	 * @generated
-	 */
-	SecurityIdentity createSecurityIdentity();
-
-	/**
-	 * Returns a new object of class '<em>Use Caller Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Use Caller Identity</em>'.
-	 * @generated
-	 */
-	UseCallerIdentity createUseCallerIdentity();
-
-	/**
-	 * Returns a new object of class '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description</em>'.
-	 * @generated
-	 */
-	Description createDescription();
-
-	/**
-	 * Returns a new object of class '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>QName</em>'.
-	 * @generated
-	 */
-	QName createQName();
-
-	/**
-	 * Returns a new object of class '<em>Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Listener</em>'.
-	 * @generated
-	 */
-	Listener createListener();
-
-	/**
-	 * Returns a new object of class '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Compatibility Description Group</em>'.
-	 * @generated
-	 */
-	CompatibilityDescriptionGroup createCompatibilityDescriptionGroup();
-
-	/**
-	 * Returns a new object of class '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>J2EEE Object</em>'.
-	 * @generated
-	 */
-	J2EEEObject createJ2EEEObject();
-
-	/**
-	 * Returns a new object of class '<em>J2EEE Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>J2EEE Attribute</em>'.
-	 * @generated
-	 */
-	J2EEEAttribute createJ2EEEAttribute();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	CommonPackage getCommonPackage();
-
-} //CommonFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java
deleted file mode 100644
index 228953e06..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java
+++ /dev/null
@@ -1,3242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	@since 1.0
- */
-public interface CommonPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "common"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF = 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE_REF = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RUN_AS_SPECIFIED_IDENTITY = 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_IDENTITY = 16;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USE_CALLER_IDENTITY = 17;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int IDENTITY = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF = 5;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl <em>Icon Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getIconType()
-	 * @generated
-	 */
-	int ICON_TYPE = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl <em>Display Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getDisplayName()
-	 * @generated
-	 */
-	int DISPLAY_NAME = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getMessageDestinationRef()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_REF = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationImpl <em>Message Destination</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getMessageDestination()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl <em>Param Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getParamValue()
-	 * @generated
-	 */
-	int PARAM_VALUE = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl <em>Description Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getDescriptionGroup()
-	 * @generated
-	 */
-	int DESCRIPTION_GROUP = 14;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl <em>Compatibility Description Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP = 21;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl <em>JNDI Env Refs Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	int JNDI_ENV_REFS_GROUP = 15;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl <em>Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getDescription()
-	 * @generated
-	 */
-	int DESCRIPTION = 18;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.QNameImpl <em>QName</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.QNameImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getQName()
-	 * @generated
-	 */
-	int QNAME = 19;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.ListenerImpl <em>Listener</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.ListenerImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getListener()
-	 * @generated
-	 */
-	int LISTENER = 20;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF_TYPE = 26;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY_TYPE = 24;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RES_AUTH_TYPE_BASE = 25;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RES_SHARING_SCOPE_TYPE = 27;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.MessageDestinationUsageType <em>Message Destination Usage Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationUsageType
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getMessageDestinationUsageType()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_USAGE_TYPE = 28;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "common.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.common"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonPackage eINSTANCE = org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl <em>J2EEE Object</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getJ2EEEObject()
-	 * @generated
-	 */
-	int J2EEE_OBJECT = 22;
-
-	/**
-	 * The number of structural features of the '<em>J2EEE Object</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_OBJECT_FEATURE_COUNT = 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__NAME = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__TYPE = J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__HOME = J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__REMOTE = J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__LINK = J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Ejb Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__NAME = J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__VALUE = J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__TYPE = J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Env Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__NAME = J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__TYPE = J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__AUTH = J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__LINK = J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__RES_SHARING_SCOPE = J2EEE_OBJECT_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Resource Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE_REF__NAME = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE_REF__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE_REF__LINK = J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Security Role Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE__ROLE_NAME = J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Security Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF__NAME = J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF__TYPE = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Resource Env Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF__NAME = EJB_REF__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF__TYPE = EJB_REF__TYPE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF__HOME = EJB_REF__HOME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF__REMOTE = EJB_REF__REMOTE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF__LINK = EJB_REF__LINK;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_LOCAL_REF__DESCRIPTION = EJB_REF__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__DESCRIPTIONS = EJB_REF__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Local Home</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__LOCAL_HOME = EJB_REF_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Local</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF__LOCAL = EJB_REF_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>EJB Local Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_LOCAL_REF_FEATURE_COUNT = EJB_REF_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_IDENTITY__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Security Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RUN_AS_SPECIFIED_IDENTITY__DESCRIPTION = SECURITY_IDENTITY__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUN_AS_SPECIFIED_IDENTITY__DESCRIPTIONS = SECURITY_IDENTITY__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RUN_AS_SPECIFIED_IDENTITY__IDENTITY = SECURITY_IDENTITY_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Run As Specified Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUN_AS_SPECIFIED_IDENTITY_FEATURE_COUNT = SECURITY_IDENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int IDENTITY__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int IDENTITY__ROLE_NAME = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDENTITY__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDENTITY_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_TYPE__SMALL_ICON = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_TYPE__LARGE_ICON = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_TYPE__LANG = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Icon Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_TYPE_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME__LANG = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME__VALUE = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Display Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__NAME = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__TYPE = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Usage</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__USAGE = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__LINK = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Message Destination Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_GROUP__ICONS = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_GROUP__DISPLAY_NAMES = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_GROUP__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Description Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_GROUP_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__ICONS = DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES = DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS = DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON = DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON = DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION = DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME = DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Compatibility Description Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT = DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__ICONS = COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__DISPLAY_NAMES = COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__DESCRIPTIONS = COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__SMALL_ICON = COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__LARGE_ICON = COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__DESCRIPTION = COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__DISPLAY_NAME = COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION__NAME = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Message Destination</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_FEATURE_COUNT = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__NAME = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__VALUE = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__DESCRIPTION = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__DESCRIPTIONS = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Param Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__ICONS = COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__DISPLAY_NAMES = COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__DESCRIPTIONS = COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__SMALL_ICON = COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__LARGE_ICON = COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__DESCRIPTION = COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__DISPLAY_NAME = COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Environment Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__RESOURCE_REFS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__EJB_REFS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP__SERVICE_REFS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>JNDI Env Refs Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JNDI_ENV_REFS_GROUP_FEATURE_COUNT = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USE_CALLER_IDENTITY__DESCRIPTION = SECURITY_IDENTITY__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CALLER_IDENTITY__DESCRIPTIONS = SECURITY_IDENTITY__DESCRIPTIONS;
-
-	/**
-	 * The number of structural features of the '<em>Use Caller Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CALLER_IDENTITY_FEATURE_COUNT = SECURITY_IDENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__LANG = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__VALUE = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME__NAMESPACE_URI = J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME__LOCAL_PART = J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME__COMBINED_QNAME = J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME__INTERNAL_PREFIX_OR_NS_URI = J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>QName</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME_FEATURE_COUNT = J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__ICONS = COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__DISPLAY_NAMES = COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__DESCRIPTIONS = COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__SMALL_ICON = COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__LARGE_ICON = COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__DESCRIPTION = COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__DISPLAY_NAME = COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Listener Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER__LISTENER_CLASS = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Listener</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER_FEATURE_COUNT = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.common.internal.impl.J2EEEAttributeImpl <em>J2EEE Attribute</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.J2EEEAttributeImpl
-	 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getJ2EEEAttribute()
-	 * @generated
-	 */
-	int J2EEE_ATTRIBUTE = 23;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__EANNOTATIONS = EcorePackage.EATTRIBUTE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__NAME = EcorePackage.EATTRIBUTE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__ORDERED = EcorePackage.EATTRIBUTE__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__MANY = EcorePackage.EATTRIBUTE__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__ETYPE = EcorePackage.EATTRIBUTE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__UNSETTABLE = EcorePackage.EATTRIBUTE__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__DERIVED = EcorePackage.EATTRIBUTE__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__ECONTAINING_CLASS = EcorePackage.EATTRIBUTE__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__ID = EcorePackage.EATTRIBUTE__ID;
-
-	/**
-	 * The feature id for the '<em><b>EAttribute Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE__EATTRIBUTE_TYPE = EcorePackage.EATTRIBUTE__EATTRIBUTE_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>J2EEE Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int J2EEE_ATTRIBUTE_FEATURE_COUNT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityRole object
-	 */
-	EClass getSecurityRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityRole_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityRole_RoleName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.SecurityRole#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.SecurityRole#getDescriptions()
-	 * @see #getSecurityRole()
-	 * @generated
-	 */
-	EReference getSecurityRole_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResourceRef object
-	 */
-	EClass getResourceRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceRef_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceRef_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceRef_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceRef_Auth();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceRef_Link();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceRef_ResSharingScope();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.ResourceRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ResourceRef#getDescriptions()
-	 * @see #getResourceRef()
-	 * @generated
-	 */
-	EReference getResourceRef_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EjbRef object
-	 */
-	EClass getEjbRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEjbRef_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEjbRef_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEjbRef_Home();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEjbRef_Remote();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEjbRef_Link();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEjbRef_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.EjbRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.EjbRef#getDescriptions()
-	 * @see #getEjbRef()
-	 * @generated
-	 */
-	EReference getEjbRef_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBLocalRef object
-	 */
-	EClass getEJBLocalRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.EJBLocalRef#getLocalHome <em>Local Home</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local Home</em>'.
-	 * @see org.eclipse.jst.j2ee.common.EJBLocalRef#getLocalHome()
-	 * @see #getEJBLocalRef()
-	 * @generated
-	 */
-	EAttribute getEJBLocalRef_LocalHome();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.EJBLocalRef#getLocal <em>Local</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local</em>'.
-	 * @see org.eclipse.jst.j2ee.common.EJBLocalRef#getLocal()
-	 * @see #getEJBLocalRef()
-	 * @generated
-	 */
-	EAttribute getEJBLocalRef_Local();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EnvEntry object
-	 */
-	EClass getEnvEntry();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEnvEntry_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEnvEntry_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEnvEntry_Value();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEnvEntry_Type();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.EnvEntry#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.EnvEntry#getDescriptions()
-	 * @see #getEnvEntry()
-	 * @generated
-	 */
-	EReference getEnvEntry_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityRoleRef object
-	 */
-	EClass getSecurityRoleRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityRoleRef_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityRoleRef_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityRoleRef_Link();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.SecurityRoleRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.SecurityRoleRef#getDescriptions()
-	 * @see #getSecurityRoleRef()
-	 * @generated
-	 */
-	EReference getSecurityRoleRef_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RunAsSpecifiedIdentity object
-	 */
-	EClass getRunAsSpecifiedIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRunAsSpecifiedIdentity_Identity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityIdentity object
-	 */
-	EClass getSecurityIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityIdentity_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.SecurityIdentity#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.SecurityIdentity#getDescriptions()
-	 * @see #getSecurityIdentity()
-	 * @generated
-	 */
-	EReference getSecurityIdentity_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return UseCallerIdentity object
-	 */
-	EClass getUseCallerIdentity();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.common.Description
-	 * @generated
-	 */
-	EClass getDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.Description#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.jst.j2ee.common.Description#getLang()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Lang();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.Description#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.common.Description#getValue()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>QName</em>'.
-	 * @see org.eclipse.jst.j2ee.common.QName
-	 * @generated
-	 */
-	EClass getQName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.QName#getNamespaceURI <em>Namespace URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Namespace URI</em>'.
-	 * @see org.eclipse.jst.j2ee.common.QName#getNamespaceURI()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_NamespaceURI();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.QName#getLocalPart <em>Local Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Local Part</em>'.
-	 * @see org.eclipse.jst.j2ee.common.QName#getLocalPart()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_LocalPart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.QName#getCombinedQName <em>Combined QName</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Combined QName</em>'.
-	 * @see org.eclipse.jst.j2ee.common.QName#getCombinedQName()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_CombinedQName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.QName#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Internal Prefix Or Ns URI</em>'.
-	 * @see org.eclipse.jst.j2ee.common.QName#getInternalPrefixOrNsURI()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_InternalPrefixOrNsURI();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.Listener <em>Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Listener</em>'.
-	 * @see org.eclipse.jst.j2ee.common.Listener
-	 * @generated
-	 */
-	EClass getListener();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.common.Listener#getListenerClass <em>Listener Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Listener Class</em>'.
-	 * @see org.eclipse.jst.j2ee.common.Listener#getListenerClass()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EReference getListener_ListenerClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Compatibility Description Group</em>'.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	EClass getCompatibilityDescriptionGroup();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getSmallIcon()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getLargeIcon()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDescription()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDisplayName()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_DisplayName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>J2EEE Object</em>'.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	EClass getJ2EEEObject();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.J2EEEAttribute <em>J2EEE Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>J2EEE Attribute</em>'.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEAttribute
-	 * @generated
-	 */
-	EClass getJ2EEEAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Identity object
-	 */
-	EClass getIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getIdentity_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getIdentity_RoleName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.Identity#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.Identity#getDescriptions()
-	 * @see #getIdentity()
-	 * @generated
-	 */
-	EReference getIdentity_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.IconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Icon Type</em>'.
-	 * @see org.eclipse.jst.j2ee.common.IconType
-	 * @generated
-	 */
-	EClass getIconType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.IconType#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.common.IconType#getSmallIcon()
-	 * @see #getIconType()
-	 * @generated
-	 */
-	EAttribute getIconType_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.IconType#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.common.IconType#getLargeIcon()
-	 * @see #getIconType()
-	 * @generated
-	 */
-	EAttribute getIconType_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.IconType#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.jst.j2ee.common.IconType#getLang()
-	 * @see #getIconType()
-	 * @generated
-	 */
-	EAttribute getIconType_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DisplayName
-	 * @generated
-	 */
-	EClass getDisplayName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.DisplayName#getLang <em>Lang</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DisplayName#getLang()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	EAttribute getDisplayName_Lang();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.DisplayName#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DisplayName#getValue()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	EAttribute getDisplayName_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef <em>Message Destination Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Destination Ref</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef
-	 * @generated
-	 */
-	EClass getMessageDestinationRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef#getName()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef#getType()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getUsage <em>Usage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Usage</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef#getUsage()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Usage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getLink <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Link</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef#getLink()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Link();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef#getDescriptions()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EReference getMessageDestinationRef_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.MessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Destination</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestination
-	 * @generated
-	 */
-	EClass getMessageDestination();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.MessageDestination#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestination#getName()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EAttribute getMessageDestination_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.ParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Param Value</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ParamValue
-	 * @generated
-	 */
-	EClass getParamValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.ParamValue#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ParamValue#getName()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.ParamValue#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ParamValue#getValue()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.common.ParamValue#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ParamValue#getDescription()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.ParamValue#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ParamValue#getDescriptions()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EReference getParamValue_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description Group</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	EClass getDescriptionGroup();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.DescriptionGroup#getIcons <em>Icons</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Icons</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup#getIcons()
-	 * @see #getDescriptionGroup()
-	 * @generated
-	 */
-	EReference getDescriptionGroup_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.DescriptionGroup#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup#getDisplayNames()
-	 * @see #getDescriptionGroup()
-	 * @generated
-	 */
-	EReference getDescriptionGroup_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.DescriptionGroup#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup#getDescriptions()
-	 * @see #getDescriptionGroup()
-	 * @generated
-	 */
-	EReference getDescriptionGroup_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JNDI Env Refs Group</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	EClass getJNDIEnvRefsGroup();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEnvironmentProperties <em>Environment Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Environment Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEnvironmentProperties()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_EnvironmentProperties();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getResourceRefs <em>Resource Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getResourceRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEjbRefs <em>Ejb Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEjbRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getResourceEnvRefs <em>Resource Env Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Env Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getResourceEnvRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEjbLocalRefs <em>Ejb Local Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ejb Local Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEjbLocalRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_EjbLocalRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getMessageDestinationRefs <em>Message Destination Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destination Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getMessageDestinationRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getServiceRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_ServiceRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResourceEnvRef object
-	 */
-	EClass getResourceEnvRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceEnvRef_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceEnvRef_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceEnvRef_Type();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.common.ResourceEnvRef#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.common.ResourceEnvRef#getDescriptions()
-	 * @see #getResourceEnvRef()
-	 * @generated
-	 */
-	EReference getResourceEnvRef_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EjbRefType object
-	 */
-	EEnum getEjbRefType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EnvEntryType object
-	 */
-	EEnum getEnvEntryType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResAuthTypeBase object
-	 */
-	EEnum getResAuthTypeBase();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResSharingScopeType object
-	 */
-	EEnum getResSharingScopeType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.common.MessageDestinationUsageType <em>Message Destination Usage Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Message Destination Usage Type</em>'.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationUsageType
-	 * @generated
-	 */
-	EEnum getMessageDestinationUsageType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	CommonFactory getCommonFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.EjbRefImpl <em>Ejb Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.EjbRefImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getEjbRef()
-		 * @generated
-		 */
-		EClass EJB_REF = eINSTANCE.getEjbRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__NAME = eINSTANCE.getEjbRef_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__TYPE = eINSTANCE.getEjbRef_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__HOME = eINSTANCE.getEjbRef_Home();
-
-		/**
-		 * The meta object literal for the '<em><b>Remote</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__REMOTE = eINSTANCE.getEjbRef_Remote();
-
-		/**
-		 * The meta object literal for the '<em><b>Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__LINK = eINSTANCE.getEjbRef_Link();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_REF__DESCRIPTION = eINSTANCE.getEjbRef_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_REF__DESCRIPTIONS = eINSTANCE.getEjbRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.EnvEntryImpl <em>Env Entry</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.EnvEntryImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getEnvEntry()
-		 * @generated
-		 */
-		EClass ENV_ENTRY = eINSTANCE.getEnvEntry();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__DESCRIPTION = eINSTANCE.getEnvEntry_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__NAME = eINSTANCE.getEnvEntry_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__VALUE = eINSTANCE.getEnvEntry_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENV_ENTRY__TYPE = eINSTANCE.getEnvEntry_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENV_ENTRY__DESCRIPTIONS = eINSTANCE.getEnvEntry_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.ResourceRefImpl <em>Resource Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.ResourceRefImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getResourceRef()
-		 * @generated
-		 */
-		EClass RESOURCE_REF = eINSTANCE.getResourceRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__DESCRIPTION = eINSTANCE.getResourceRef_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__NAME = eINSTANCE.getResourceRef_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__TYPE = eINSTANCE.getResourceRef_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Auth</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__AUTH = eINSTANCE.getResourceRef_Auth();
-
-		/**
-		 * The meta object literal for the '<em><b>Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__LINK = eINSTANCE.getResourceRef_Link();
-
-		/**
-		 * The meta object literal for the '<em><b>Res Sharing Scope</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_REF__RES_SHARING_SCOPE = eINSTANCE.getResourceRef_ResSharingScope();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_REF__DESCRIPTIONS = eINSTANCE.getResourceRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.SecurityRoleRefImpl <em>Security Role Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.SecurityRoleRefImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getSecurityRoleRef()
-		 * @generated
-		 */
-		EClass SECURITY_ROLE_REF = eINSTANCE.getSecurityRoleRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE_REF__NAME = eINSTANCE.getSecurityRoleRef_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE_REF__DESCRIPTION = eINSTANCE.getSecurityRoleRef_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE_REF__LINK = eINSTANCE.getSecurityRoleRef_Link();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_ROLE_REF__DESCRIPTIONS = eINSTANCE.getSecurityRoleRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.SecurityRoleImpl <em>Security Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.SecurityRoleImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getSecurityRole()
-		 * @generated
-		 */
-		EClass SECURITY_ROLE = eINSTANCE.getSecurityRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE__DESCRIPTION = eINSTANCE.getSecurityRole_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_ROLE__ROLE_NAME = eINSTANCE.getSecurityRole_RoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_ROLE__DESCRIPTIONS = eINSTANCE.getSecurityRole_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.ResourceEnvRefImpl <em>Resource Env Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.ResourceEnvRefImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getResourceEnvRef()
-		 * @generated
-		 */
-		EClass RESOURCE_ENV_REF = eINSTANCE.getResourceEnvRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ENV_REF__DESCRIPTION = eINSTANCE.getResourceEnvRef_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ENV_REF__NAME = eINSTANCE.getResourceEnvRef_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ENV_REF__TYPE = eINSTANCE.getResourceEnvRef_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ENV_REF__DESCRIPTIONS = eINSTANCE.getResourceEnvRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.EJBLocalRefImpl <em>EJB Local Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.EJBLocalRefImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getEJBLocalRef()
-		 * @generated
-		 */
-		EClass EJB_LOCAL_REF = eINSTANCE.getEJBLocalRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Home</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__LOCAL_HOME = eINSTANCE.getEJBLocalRef_LocalHome();
-
-		/**
-		 * The meta object literal for the '<em><b>Local</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LOCAL_REF__LOCAL = eINSTANCE.getEJBLocalRef_Local();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.RunAsSpecifiedIdentityImpl <em>Run As Specified Identity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.RunAsSpecifiedIdentityImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getRunAsSpecifiedIdentity()
-		 * @generated
-		 */
-		EClass RUN_AS_SPECIFIED_IDENTITY = eINSTANCE.getRunAsSpecifiedIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Identity</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RUN_AS_SPECIFIED_IDENTITY__IDENTITY = eINSTANCE.getRunAsSpecifiedIdentity_Identity();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.IdentityImpl <em>Identity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.IdentityImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getIdentity()
-		 * @generated
-		 */
-		EClass IDENTITY = eINSTANCE.getIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute IDENTITY__DESCRIPTION = eINSTANCE.getIdentity_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute IDENTITY__ROLE_NAME = eINSTANCE.getIdentity_RoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference IDENTITY__DESCRIPTIONS = eINSTANCE.getIdentity_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl <em>Icon Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getIconType()
-		 * @generated
-		 */
-		EClass ICON_TYPE = eINSTANCE.getIconType();
-
-		/**
-		 * The meta object literal for the '<em><b>Small Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON_TYPE__SMALL_ICON = eINSTANCE.getIconType_SmallIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Large Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON_TYPE__LARGE_ICON = eINSTANCE.getIconType_LargeIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ICON_TYPE__LANG = eINSTANCE.getIconType_Lang();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl <em>Display Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getDisplayName()
-		 * @generated
-		 */
-		EClass DISPLAY_NAME = eINSTANCE.getDisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISPLAY_NAME__LANG = eINSTANCE.getDisplayName_Lang();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISPLAY_NAME__VALUE = eINSTANCE.getDisplayName_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getMessageDestinationRef()
-		 * @generated
-		 */
-		EClass MESSAGE_DESTINATION_REF = eINSTANCE.getMessageDestinationRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__NAME = eINSTANCE.getMessageDestinationRef_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__TYPE = eINSTANCE.getMessageDestinationRef_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__USAGE = eINSTANCE.getMessageDestinationRef_Usage();
-
-		/**
-		 * The meta object literal for the '<em><b>Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION_REF__LINK = eINSTANCE.getMessageDestinationRef_Link();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DESTINATION_REF__DESCRIPTIONS = eINSTANCE.getMessageDestinationRef_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationImpl <em>Message Destination</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getMessageDestination()
-		 * @generated
-		 */
-		EClass MESSAGE_DESTINATION = eINSTANCE.getMessageDestination();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DESTINATION__NAME = eINSTANCE.getMessageDestination_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl <em>Param Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getParamValue()
-		 * @generated
-		 */
-		EClass PARAM_VALUE = eINSTANCE.getParamValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAM_VALUE__NAME = eINSTANCE.getParamValue_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAM_VALUE__VALUE = eINSTANCE.getParamValue_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PARAM_VALUE__DESCRIPTION = eINSTANCE.getParamValue_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARAM_VALUE__DESCRIPTIONS = eINSTANCE.getParamValue_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl <em>Description Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getDescriptionGroup()
-		 * @generated
-		 */
-		EClass DESCRIPTION_GROUP = eINSTANCE.getDescriptionGroup();
-
-		/**
-		 * The meta object literal for the '<em><b>Icons</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DESCRIPTION_GROUP__ICONS = eINSTANCE.getDescriptionGroup_Icons();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DESCRIPTION_GROUP__DISPLAY_NAMES = eINSTANCE.getDescriptionGroup_DisplayNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DESCRIPTION_GROUP__DESCRIPTIONS = eINSTANCE.getDescriptionGroup_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl <em>JNDI Env Refs Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getJNDIEnvRefsGroup()
-		 * @generated
-		 */
-		EClass JNDI_ENV_REFS_GROUP = eINSTANCE.getJNDIEnvRefsGroup();
-
-		/**
-		 * The meta object literal for the '<em><b>Environment Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES = eINSTANCE.getJNDIEnvRefsGroup_EnvironmentProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__RESOURCE_REFS = eINSTANCE.getJNDIEnvRefsGroup_ResourceRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__EJB_REFS = eINSTANCE.getJNDIEnvRefsGroup_EjbRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Env Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS = eINSTANCE.getJNDIEnvRefsGroup_ResourceEnvRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Local Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS = eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS = eINSTANCE.getJNDIEnvRefsGroup_MessageDestinationRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JNDI_ENV_REFS_GROUP__SERVICE_REFS = eINSTANCE.getJNDIEnvRefsGroup_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.SecurityIdentityImpl <em>Security Identity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.SecurityIdentityImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getSecurityIdentity()
-		 * @generated
-		 */
-		EClass SECURITY_IDENTITY = eINSTANCE.getSecurityIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_IDENTITY__DESCRIPTION = eINSTANCE.getSecurityIdentity_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_IDENTITY__DESCRIPTIONS = eINSTANCE.getSecurityIdentity_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.UseCallerIdentityImpl <em>Use Caller Identity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.UseCallerIdentityImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getUseCallerIdentity()
-		 * @generated
-		 */
-		EClass USE_CALLER_IDENTITY = eINSTANCE.getUseCallerIdentity();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl <em>Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getDescription()
-		 * @generated
-		 */
-		EClass DESCRIPTION = eINSTANCE.getDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTION__LANG = eINSTANCE.getDescription_Lang();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTION__VALUE = eINSTANCE.getDescription_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.QNameImpl <em>QName</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.QNameImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getQName()
-		 * @generated
-		 */
-		EClass QNAME = eINSTANCE.getQName();
-
-		/**
-		 * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QNAME__NAMESPACE_URI = eINSTANCE.getQName_NamespaceURI();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Part</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QNAME__LOCAL_PART = eINSTANCE.getQName_LocalPart();
-
-		/**
-		 * The meta object literal for the '<em><b>Combined QName</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QNAME__COMBINED_QNAME = eINSTANCE.getQName_CombinedQName();
-
-		/**
-		 * The meta object literal for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QNAME__INTERNAL_PREFIX_OR_NS_URI = eINSTANCE.getQName_InternalPrefixOrNsURI();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.ListenerImpl <em>Listener</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.ListenerImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getListener()
-		 * @generated
-		 */
-		EClass LISTENER = eINSTANCE.getListener();
-
-		/**
-		 * The meta object literal for the '<em><b>Listener Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LISTENER__LISTENER_CLASS = eINSTANCE.getListener_ListenerClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl <em>Compatibility Description Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getCompatibilityDescriptionGroup()
-		 * @generated
-		 */
-		EClass COMPATIBILITY_DESCRIPTION_GROUP = eINSTANCE.getCompatibilityDescriptionGroup();
-
-		/**
-		 * The meta object literal for the '<em><b>Small Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON = eINSTANCE.getCompatibilityDescriptionGroup_SmallIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Large Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON = eINSTANCE.getCompatibilityDescriptionGroup_LargeIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION = eINSTANCE.getCompatibilityDescriptionGroup_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME = eINSTANCE.getCompatibilityDescriptionGroup_DisplayName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl <em>J2EEE Object</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getJ2EEEObject()
-		 * @generated
-		 */
-		EClass J2EEE_OBJECT = eINSTANCE.getJ2EEEObject();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.internal.impl.J2EEEAttributeImpl <em>J2EEE Attribute</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.J2EEEAttributeImpl
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getJ2EEEAttribute()
-		 * @generated
-		 */
-		EClass J2EEE_ATTRIBUTE = eINSTANCE.getJ2EEEAttribute();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.EnvEntryType <em>Env Entry Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.EnvEntryType
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getEnvEntryType()
-		 * @generated
-		 */
-		EEnum ENV_ENTRY_TYPE = eINSTANCE.getEnvEntryType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.ResAuthTypeBase <em>Res Auth Type Base</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.ResAuthTypeBase
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getResAuthTypeBase()
-		 * @generated
-		 */
-		EEnum RES_AUTH_TYPE_BASE = eINSTANCE.getResAuthTypeBase();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.EjbRefType <em>Ejb Ref Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.EjbRefType
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getEjbRefType()
-		 * @generated
-		 */
-		EEnum EJB_REF_TYPE = eINSTANCE.getEjbRefType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.ResSharingScopeType <em>Res Sharing Scope Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.ResSharingScopeType
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getResSharingScopeType()
-		 * @generated
-		 */
-		EEnum RES_SHARING_SCOPE_TYPE = eINSTANCE.getResSharingScopeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.common.MessageDestinationUsageType <em>Message Destination Usage Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.common.MessageDestinationUsageType
-		 * @see org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl#getMessageDestinationUsageType()
-		 * @generated
-		 */
-		EEnum MESSAGE_DESTINATION_USAGE_TYPE = eINSTANCE.getMessageDestinationUsageType();
-
-	}
-
-} //CommonPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CompatibilityDescriptionGroup.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CompatibilityDescriptionGroup.java
deleted file mode 100644
index e069c1fa3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CompatibilityDescriptionGroup.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Compatibility Description Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDisplayName <em>Display Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getCompatibilityDescriptionGroup()
- * @model
- * @generated
- */
-public interface CompatibilityDescriptionGroup extends DescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Small Icon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getCompatibilityDescriptionGroup_SmallIcon()
-	 * @model
-	 * @generated
-	 */
-	String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-	void setSmallIcon(String value);
-
-	/**
-	 * Sets the value of the Small Icon attribute
-	 * @param value the new value of the attribute
-	 */
-	void setSmallIconGen(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Large Icon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getCompatibilityDescriptionGroup_LargeIcon()
-	 * @model
-	 * @generated
-	 */
-	String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-	void setLargeIcon(String value);
-
-	/**
-	 * Sets the value of the Large Icon
-	 * @param value the new value of the Large Icon
-	 */
-	void setLargeIconGen(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getCompatibilityDescriptionGroup_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Sets the value of the Description 
-	 * @param value the new value of the Description attrbute
-	 */
-	void setDescriptionGen(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getCompatibilityDescriptionGroup_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
-	 * Sets the value of the Display Name
-	 * @param value the new value of the Display Name
-	 */
-	void setDisplayNameGen(String value);
-
-} // CompatibilityDescriptionGroup
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DeploymentExtension.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DeploymentExtension.java
deleted file mode 100644
index 7cfcb0b2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DeploymentExtension.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deployment Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.DeploymentExtension#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.DeploymentExtension#isMustUnderstand <em>Must Understand</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.DeploymentExtension#getExtensionElements <em>Extension Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getDeploymentExtension()
- * @model 
- * @generated
- * @since 1.0 */
-public interface DeploymentExtension extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Namespace</em>' attribute.
-	 * @see #setNamespace(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDeploymentExtension_Namespace()
-	 * @model 
-	 * @generated
-	 */
-	String getNamespace();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.common.DeploymentExtension#getNamespace <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace</em>' attribute.
-	 * @see #getNamespace()
-	 * @generated
-	 */
-	void setNamespace(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Must Understand</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Must Understand</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Must Understand</em>' attribute.
-	 * @see #setMustUnderstand(boolean)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDeploymentExtension_MustUnderstand()
-	 * @model 
-	 * @generated
-	 */
-	boolean isMustUnderstand();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.common.DeploymentExtension#isMustUnderstand <em>Must Understand</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Must Understand</em>' attribute.
-	 * @see #isMustUnderstand()
-	 * @generated
-	 */
-	void setMustUnderstand(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Extension Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.ExtensibleType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Extension Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Extension Elements</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDeploymentExtension_ExtensionElements()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.ExtensibleType" containment="true" required="true"
-	 * @generated
-	 */
-	EList getExtensionElements();
-
-} // DeploymentExtension
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Description.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Description.java
deleted file mode 100644
index 2cec73343..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Description.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The description type is used by a description element to
- * provide text describing the parent element.  The elements
- * that use this type should include any information that the
- * Deployment Component's Deployment File file producer wants
- * to provide to the consumer of the Deployment Component's
- * Deployment File (i.e., to the Deployer). Typically, the
- * tools used by such a Deployment File consumer will display
- * the description when processing the parent element that
- * contains the description.
- * 
- * The lang attribute defines the language that the
- * description is provided in. The default value is "en" (English).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.Description#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.Description#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescription()
- * @model
- * @generated
- */
-public interface Description extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescription_Lang()
-	 * @model
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.Description#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescription_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.Description#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // Description
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DescriptionGroup.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DescriptionGroup.java
deleted file mode 100644
index d57f776d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DescriptionGroup.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * This group keeps the usage of the contained description related
- * elements consistent across J2EE deployment descriptors.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.DescriptionGroup#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.DescriptionGroup#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.DescriptionGroup#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescriptionGroup()
- * @model
- * @generated
- */
-public interface DescriptionGroup extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.IconType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icons</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icons</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescriptionGroup_Icons()
-	 * @model type="org.eclipse.jst.j2ee.common.IconType" containment="true"
-	 * @generated
-	 */
-	EList getIcons();
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescriptionGroup_DisplayNames()
-	 * @model type="org.eclipse.jst.j2ee.common.DisplayName" containment="true"
-	 * @generated
-	 */
-	EList getDisplayNames();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDescriptionGroup_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // DescriptionGroup
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DisplayName.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DisplayName.java
deleted file mode 100644
index fc157f77b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DisplayName.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The display-name type contains a short name that is intended
- * to be displayed by tools. It is used by display-name
- * elements.  The display name need not be unique.
- * 
- * Example:
- * 
- * ...
- *    <display-name xml:lang="en">Employee Self Service</display-name>
- * 
- * The value of the xml:lang attribute is "en" (English) by default.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.DisplayName#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.DisplayName#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getDisplayName()
- * @model
- * @generated
- */
-public interface DisplayName extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDisplayName_Lang()
-	 * @model
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.DisplayName#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getDisplayName_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.DisplayName#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // DisplayName
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EJBLocalRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EJBLocalRef.java
deleted file mode 100644
index d949d8da1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EJBLocalRef.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-
-
-/**
- * The ejb-local-ref element is used for the declaration of a reference to another enterprise bean's local home. The declaration consists of an optional description; the EJB reference name used in the code of the referencing enterprise bean; the expected type of the referenced enterprise bean; the expected local home and local interfaces of the referenced enterprise bean; and an optional ejb-link information. The optional ejb-link element is used to specify the referenced enterprise bean.
- * Used in: entity, session, message-driven
- * @generated
- * @since 1.0 */
-public interface EJBLocalRef extends EjbRef{
-
-	/**
-	 * @return The value of the Local attribute
-	 * The Local element contains the fully-qualified name of the enterprise bean's local interface.
-	 */
-	public String getLocal();
-	/**
-	 * @return The value of the localHome attribute
-	 * The local home element contains the fully-qualified name of the enterprise bean's local home interface.
-	 * Example: <home>com.aardvark.payroll.PayrollHome<//home>
-	 */
-	public String getLocalHome();
-	/**
-	 * @param value The new value of the local attribute
-	 */
-	public void setLocal(String value);
-	/**
-	 * @param value The new value of the localHome attribute
-	 */
-	public void setLocalHome(String value);
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRef.java
deleted file mode 100644
index 78bf54bb4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRef.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * The ejb-ref element is used for the declaration of a reference to an enterprise bean's home. The declaration consists of an optional description; the EJB reference name used in the code of the referencing application client; the expected type of the referenced enterprise bean; the expected home and remote interfaces of the referenced enterprise bean; and an optional ejb-link information. The optional  ejb-link element is used to specify the referenced enterprise bean.
- * @generated
- * @since 1.0 */
-public interface EjbRef extends J2EEEObject {
-
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists, within the scope of the parameter.
- * The ejb-link value of the ref must equate to a named enterprise bean contained in the jar; otherwise 
- * return null
- */
-public EnterpriseBean getLinkedEjb(EJBJar ejbJar);/**
- * Return an enterprise bean referenced by the EjbRef, if one exists, within the scope of the parameter.
- * The ejb-link value of the ref must equate to a named enterprise bean contained in the jar; otherwise 
- * return null
- */  
-/**
- * Return true if the name, home, remote, and link are equivalent.
- */
-boolean isEquivalent(EjbRef anEjbRef) ;
-/**
- * Return true if this reference is physically linked to
- * @anEJB.
- */
-boolean isLinked(EnterpriseBean anEJB) ;
-/**
- * Return true if the ejbref is for a local ejb interface.
- */
-boolean isLocal();
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The ejb-ref-name element contains the name of an EJB reference. This is the
-	 * JNDI name that the servlet code uses to get a reference to the enterprise bean.
-	 * Example: <ejb-ref-name>ejb//Payroll<//ejb-ref-name>
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * The ejb-ref-type element contains the expected type of the referenced
-	 * enterprise bean. The ejb-ref-type element must be one of the following:
-	 * <ejb-ref-type>Entity<//ejb-ref-type>
-	 * <ejb-ref-type>Session<//ejb-ref-type>
-	 */
-	EjbRefType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.EjbRef#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.common.EjbRefType
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(EjbRefType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.common.EjbRef#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetType()
-	 * @see #getType()
-	 * @see #setType(EjbRefType)
-	 * @generated
-	 */
-	void unsetType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.common.EjbRef#getType <em>Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Type</em>' attribute is set.
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @see #setType(EjbRefType)
-	 * @generated
-	 */
-	boolean isSetType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Home attribute
-	 * The home element contains the fully-qualified name of the enterprise bean's
-	 * home interface.
-	 * Example: <home>com.aardvark.payroll.PayrollHome<//home>
-	 */
-	String getHome();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Home attribute
-	 */
-	void setHome(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Remote attribute
-	 * The remote element contains the fully-qualified name of the enterprise bean's
-	 * remote interface.
-	 */
-	String getRemote();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Remote attribute
-	 */
-	void setRemote(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Link attribute
-	 * The ejb-link element is used in the ejb-ref element to specify that an EJB
-	 * reference is linked to an enterprise bean in the encompassing J2EE Application
-	 * package. The value of the ejb-link element must be the ejb-name of an
-	 * enterprise bean in the same J2EE Application package. 
-	 * Example: <ejb-link>EmployeeRecord<//ejb-link>
-	 */
-	String getLink();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Link attribute
-	 */
-	void setLink(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getEjbRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRefType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRefType.java
deleted file mode 100644
index a065e8191..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRefType.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface EjbRefType {}
- */
-public final class EjbRefType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SESSION= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int ENTITY= 1;
-
-	/**
-	 * The '<em><b>Session</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Session</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SESSION
-	 * @generated
-	 * @ordered
-	 */
-	public static final EjbRefType SESSION_LITERAL = new EjbRefType(SESSION, "Session", "Session"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Entity</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Entity</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ENTITY
-	 * @generated
-	 * @ordered
-	 */
-	public static final EjbRefType ENTITY_LITERAL = new EjbRefType(ENTITY, "Entity", "Entity"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Ejb Ref Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EjbRefType[] VALUES_ARRAY =
-		new EjbRefType[] {
-			SESSION_LITERAL,
-			ENTITY_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Ejb Ref Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EjbRefType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EjbRefType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType get(int value) {
-		switch (value) {
-			case SESSION: return SESSION_LITERAL;
-			case ENTITY: return ENTITY_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EjbRefType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //EjbRefType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntry.java
deleted file mode 100644
index 65312f8ad..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntry.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * The env-entry element contains the declaration of an application client's environment entries. The declaration consists of an optional description, the name of the environment entry, and an optional value.
- * @generated
- * @since 1.0 */
-public interface EnvEntry extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The env-entry-name element contains the name of an application client's
-	 * environment entry. 
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Value attribute
-	 * The env-entry-value element contains the value of an application client's
-	 * environment entry. The value must be a String that is valid for the constructor 
-	 * of the specified type that takes a single String parameter.
-	 * Used in: env-entry
-	 * Example:
-	 * <env-entry-value>//datasources//MyDatabase<//env-entry-value>
-	 */
-	String getValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Value attribute
-	 */
-	void setValue(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * The env-entry-type element contains the fully-qualified Java type of the
-	 * environment entry value that is expected by the application client's code. The
-	 * following are the legal values of env-entry-type: java.lang.Bool-ean,
-	 * java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte,
-	 * java.lang.Short, java.lang.Long, and java.lang.Float. 
-	 * Example: <env-entry-type>java.lang.Boolean<//env-entry-type>
-	 */
-	EnvEntryType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.EnvEntry#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.common.EnvEntryType
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(EnvEntryType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.common.EnvEntry#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetType()
-	 * @see #getType()
-	 * @see #setType(EnvEntryType)
-	 * @generated
-	 */
-	void unsetType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.common.EnvEntry#getType <em>Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Type</em>' attribute is set.
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @see #setType(EnvEntryType)
-	 * @generated
-	 */
-	boolean isSetType();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getEnvEntry_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntryType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntryType.java
deleted file mode 100644
index 84670a256..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntryType.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface EnvEntryType {}
- */
-public final class EnvEntryType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int STRING= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int INTEGER= 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BOOLEAN= 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DOUBLE= 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BYTE= 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SHORT= 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LONG= 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int FLOAT= 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CHARACTER= 8;
-
-	/**
-	 * The '<em><b>String</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>String</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STRING
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType STRING_LITERAL = new EnvEntryType(STRING, "String", "String"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Integer</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Integer</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTEGER
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType INTEGER_LITERAL = new EnvEntryType(INTEGER, "Integer", "Integer"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Boolean</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Boolean</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BOOLEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType BOOLEAN_LITERAL = new EnvEntryType(BOOLEAN, "Boolean", "Boolean"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Double</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Double</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DOUBLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType DOUBLE_LITERAL = new EnvEntryType(DOUBLE, "Double", "Double"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Byte</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Byte</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BYTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType BYTE_LITERAL = new EnvEntryType(BYTE, "Byte", "Byte"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Short</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Short</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SHORT
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType SHORT_LITERAL = new EnvEntryType(SHORT, "Short", "Short"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Long</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Long</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LONG
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType LONG_LITERAL = new EnvEntryType(LONG, "Long", "Long"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Float</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Float</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FLOAT
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType FLOAT_LITERAL = new EnvEntryType(FLOAT, "Float", "Float"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Character</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Character</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CHARACTER
-	 * @generated
-	 * @ordered
-	 */
-	public static final EnvEntryType CHARACTER_LITERAL = new EnvEntryType(CHARACTER, "Character", "Character"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Env Entry Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EnvEntryType[] VALUES_ARRAY =
-		new EnvEntryType[] {
-			STRING_LITERAL,
-			INTEGER_LITERAL,
-			BOOLEAN_LITERAL,
-			DOUBLE_LITERAL,
-			BYTE_LITERAL,
-			SHORT_LITERAL,
-			LONG_LITERAL,
-			FLOAT_LITERAL,
-			CHARACTER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Env Entry Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EnvEntryType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EnvEntryType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType get(int value) {
-		switch (value) {
-			case STRING: return STRING_LITERAL;
-			case INTEGER: return INTEGER_LITERAL;
-			case BOOLEAN: return BOOLEAN_LITERAL;
-			case DOUBLE: return DOUBLE_LITERAL;
-			case BYTE: return BYTE_LITERAL;
-			case SHORT: return SHORT_LITERAL;
-			case LONG: return LONG_LITERAL;
-			case FLOAT: return FLOAT_LITERAL;
-			case CHARACTER: return CHARACTER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EnvEntryType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //EnvEntryType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ExtensibleType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ExtensibleType.java
deleted file mode 100644
index 37b79a37d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ExtensibleType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extensible Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.ExtensibleType#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getExtensibleType()
- * @model 
- * @generated
- * @since 1.0 */
-public interface ExtensibleType extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getExtensibleType_Value()
-	 * @model 
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.common.ExtensibleType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // ExtensibleType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/IconType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/IconType.java
deleted file mode 100644
index 9600b312d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/IconType.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Icon Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The icon type contains small-icon and large-icon elements
- * that specify the file names for small and large GIF or
- * JPEG icon images used to represent the parent element in a
- * GUI tool.
- * 
- * The xml:lang attribute defines the language that the
- * icon file names are provided in. Its value is "en" (English)
- * by default.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.IconType#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.IconType#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.IconType#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getIconType()
- * @model
- * @generated
- */
-public interface IconType extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Small Icon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The small-icon element contains the name of a file
-	 *         containing a small (16 x 16) icon image. The file
-	 *         name is a relative path within the Deployment
-	 *         Component's Deployment File.
-	 * 
-	 *         The image may be either in the JPEG or GIF format.
-	 *         The icon can be used by tools.
-	 * 
-	 *         Example:
-	 * 
-	 *         <small-icon>employee-service-icon16x16.jpg</small-icon>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getIconType_SmallIcon()
-	 * @model
-	 * @generated
-	 */
-	String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.IconType#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-	void setSmallIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Large Icon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The large-icon element contains the name of a file
-	 *         containing a large
-	 *         (32 x 32) icon image. The file name is a relative
-	 *         path within the Deployment Component's Deployment
-	 *         File.
-	 * 
-	 *         The image may be either in the JPEG or GIF format.
-	 *         The icon can be used by tools.
-	 * 
-	 *         Example:
-	 * 
-	 *         <large-icon>employee-service-icon32x32.jpg</large-icon>
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getIconType_LargeIcon()
-	 * @model
-	 * @generated
-	 */
-	String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.IconType#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-	void setLargeIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang</em>' attribute.
-	 * @see #setLang(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getIconType_Lang()
-	 * @model
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.IconType#getLang <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lang</em>' attribute.
-	 * @see #getLang()
-	 * @generated
-	 */
-	void setLang(String value);
-
-} // IconType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Identity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Identity.java
deleted file mode 100644
index 7fb2c5074..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Identity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-/**
- * Specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.
- * @generated
- * @since 1.0 */
-public interface Identity extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the run as identity.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 * The role-name element contains the name of a security role.
-	 * 
-	 * The name must conform to the lexical rules for an NMTOKEN.
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getIdentity_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEEAttribute.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEEAttribute.java
deleted file mode 100644
index 833a1e7f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEEAttribute.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.ecore.EAttribute;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>J2EEE Attribute</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getJ2EEEAttribute()
- * @model
- * @generated
- */
-public interface J2EEEAttribute extends EAttribute {
-} // J2EEEAttribute
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEEObject.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEEObject.java
deleted file mode 100644
index 61dc13e01..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEEObject.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>J2EEE Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getJ2EEEObject()
- * @model
- * @generated
- */
-public interface J2EEEObject extends EObject {
-} // J2EEEObject
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/JNDIEnvRefsGroup.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/JNDIEnvRefsGroup.java
deleted file mode 100644
index 19bd56771..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/JNDIEnvRefsGroup.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JNDI Env Refs Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * This group keeps the usage of the contained JNDI environment
- * reference elements consistent across J2EE deployment descriptors.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEnvironmentProperties <em>Environment Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup()
- * @model abstract="true"
- * @generated
- */
-public interface JNDIEnvRefsGroup extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Environment Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.EnvEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Environment Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Environment Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_EnvironmentProperties()
-	 * @model type="org.eclipse.jst.j2ee.common.EnvEntry" containment="true"
-	 * @generated
-	 */
-	EList getEnvironmentProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.ResourceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_ResourceRefs()
-	 * @model type="org.eclipse.jst.j2ee.common.ResourceRef" containment="true"
-	 * @generated
-	 */
-	EList getResourceRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.EjbRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_EjbRefs()
-	 * @model type="org.eclipse.jst.j2ee.common.EjbRef" containment="true"
-	 * @generated
-	 */
-	EList getEjbRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Env Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.ResourceEnvRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Env Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A list of enterprise bean references to an administered object associated with a resource in the enterprise bean's environment. It consists of an optional description, the resource environment reference name, and an indication of the resource environment reference type expected by the enterprise bean code.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource Env Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_ResourceEnvRefs()
-	 * @model type="org.eclipse.jst.j2ee.common.ResourceEnvRef" containment="true"
-	 * @generated
-	 */
-	EList getResourceEnvRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Ejb Local Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.EJBLocalRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ejb Local Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Local Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_EjbLocalRefs()
-	 * @model type="org.eclipse.jst.j2ee.common.EJBLocalRef" containment="true"
-	 * @generated
-	 */
-	EList getEjbLocalRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.MessageDestinationRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destination Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_MessageDestinationRefs()
-	 * @model type="org.eclipse.jst.j2ee.common.MessageDestinationRef" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinationRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getJNDIEnvRefsGroup_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef" containment="true"
-	 * @generated
-	 */
-	EList getServiceRefs();
-
-} // JNDIEnvRefsGroup
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Listener.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Listener.java
deleted file mode 100644
index 2b3187dcc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Listener.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.jem.java.JavaClass;
-/**
- * Declares a class in the application must be registered as a web application listener bean.
- * @since 1.0 */
-public interface Listener extends CompatibilityDescriptionGroup{
-
-/**
- * Get the JavaClass for the listener.
- */
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ListenerClass reference
-	 * The listener-class element declares a class in the application must be
-	 * registered as a web application listener bean.
-	 */
-	JavaClass getListenerClass();
-
-/**
- * Get the fully qualified class name for the listener.
- */
-public String getListenerClassName();
-/**
- * Sets the listener class name.
- */
-public void setListenerClassName(String listenerClassName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ListenerClass reference
-	 */
-	void setListenerClass(JavaClass value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestination.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestination.java
deleted file mode 100644
index 8950e0344..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestination.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The message-destinationType specifies a message
- * destination. The logical destination described by this
- * element is mapped to a physical destination by the Deployer.
- * 
- * The message destination element contains:
- * 
- *         - an optional description
- *         - an optional display-name
- *         - an optional icon
- *         - a message destination name which must be unique
- *           among message destination names within the same
- *           Deployment File.
- * 
- * Example:
- * 
- * <message-destination>
- *         <message-destination-name>CorporateStocks
- *         </message-destination-name>
- * </message-destination>
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.MessageDestination#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestination()
- * @model
- * @generated
- */
-public interface MessageDestination extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The message-destination-name element specifies a
-	 *         name for a message destination.  This name must be
-	 *         unique among the names of message destinations
-	 *         within the Deployment File.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestination_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.MessageDestination#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // MessageDestination
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationRef.java
deleted file mode 100644
index 673fb6cf9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationRef.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The message-destination-ref element contains a declaration
- * of Deployment Component's reference to a message destination
- * associated with a resource in Deployment Component's
- * environment. It consists of:
- * 
- *         - an optional description
- *         - the message destination reference name
- *         - the message destination type
- *         - a specification as to whether the
- *           destination is used for
- *           consuming or producing messages, or both
- *         - a link to the message destination
- * 
- * Examples:
- * 
- * <message-destination-ref>
- *         <message-destination-ref-name>jms/StockQueue
- *         </message-destination-ref-name>
- *         <message-destination-type>javax.jms.Queue
- *         </message-destination-type>
- *         <message-destination-usage>Consumes
- *         </message-destination-usage>
- *         <message-destination-link>CorporateStocks
- *         </message-destination-link>
- * </message-destination-ref>
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getUsage <em>Usage</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getLink <em>Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationRef()
- * @model
- * @generated
- */
-public interface MessageDestinationRef extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationRef_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationRef_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Usage</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.common.MessageDestinationUsageType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Usage</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Usage</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationUsageType
-	 * @see #setUsage(MessageDestinationUsageType)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationRef_Usage()
-	 * @model
-	 * @generated
-	 */
-	MessageDestinationUsageType getUsage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getUsage <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationUsageType
-	 * @see #getUsage()
-	 * @generated
-	 */
-	void setUsage(MessageDestinationUsageType value);
-
-	/**
-	 * Returns the value of the '<em><b>Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Link</em>' attribute.
-	 * @see #setLink(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationRef_Link()
-	 * @model
-	 * @generated
-	 */
-	String getLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef#getLink <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link</em>' attribute.
-	 * @see #getLink()
-	 * @generated
-	 */
-	void setLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // MessageDestinationRef
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationUsageType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationUsageType.java
deleted file mode 100644
index d5e9887bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationUsageType.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Message Destination Usage Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getMessageDestinationUsageType()
- * @model
- * @generated
- */
-public final class MessageDestinationUsageType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Consumes</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES_LITERAL
-	 * @model name="Consumes"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONSUMES = 0;
-
-	/**
-	 * The '<em><b>Produces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PRODUCES_LITERAL
-	 * @model name="Produces"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRODUCES = 1;
-
-	/**
-	 * The '<em><b>Consumes Produces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES_PRODUCES_LITERAL
-	 * @model name="ConsumesProduces"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONSUMES_PRODUCES = 2;
-
-	/**
-	 * The '<em><b>Consumes</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Consumes</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES
-	 * @generated
-	 * @ordered
-	 */
-	public static final MessageDestinationUsageType CONSUMES_LITERAL = new MessageDestinationUsageType(CONSUMES, "Consumes", "Consumes"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Produces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Produces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PRODUCES
-	 * @generated
-	 * @ordered
-	 */
-	public static final MessageDestinationUsageType PRODUCES_LITERAL = new MessageDestinationUsageType(PRODUCES, "Produces", "Produces"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Consumes Produces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Consumes Produces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONSUMES_PRODUCES
-	 * @generated
-	 * @ordered
-	 */
-	public static final MessageDestinationUsageType CONSUMES_PRODUCES_LITERAL = new MessageDestinationUsageType(CONSUMES_PRODUCES, "ConsumesProduces", "ConsumesProduces"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Message Destination Usage Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MessageDestinationUsageType[] VALUES_ARRAY =
-		new MessageDestinationUsageType[] {
-			CONSUMES_LITERAL,
-			PRODUCES_LITERAL,
-			CONSUMES_PRODUCES_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Message Destination Usage Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MessageDestinationUsageType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MessageDestinationUsageType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType get(int value) {
-		switch (value) {
-			case CONSUMES: return CONSUMES_LITERAL;
-			case PRODUCES: return PRODUCES_LITERAL;
-			case CONSUMES_PRODUCES: return CONSUMES_PRODUCES_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MessageDestinationUsageType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //MessageDestinationUsageType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ParamValue.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ParamValue.java
deleted file mode 100644
index d30a9e807..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ParamValue.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Param Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * This type is a general type that can be used to declare
- * parameter/value lists.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.ParamValue#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.ParamValue#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.ParamValue#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.ParamValue#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getParamValue()
- * @model
- * @generated
- */
-public interface ParamValue extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The param-name element contains the name of a parameter.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getParamValue_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.ParamValue#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The param-value element contains the value of a parameter.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getParamValue_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.ParamValue#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4 deprecated, becomes descriptions
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getParamValue_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.ParamValue#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getParamValue_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // ParamValue
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java
deleted file mode 100644
index 1e5811b39..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>QName</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.QName#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.QName#getLocalPart <em>Local Part</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.QName#getCombinedQName <em>Combined QName</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.QName#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getQName()
- * @model
- * @generated
- */
-public interface QName extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Namespace URI</em>' attribute.
-	 * @see #setNamespaceURI(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getQName_NamespaceURI()
-	 * @model
-	 * @generated
-	 */
-	String getNamespaceURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.QName#getNamespaceURI <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace URI</em>' attribute.
-	 * @see #getNamespaceURI()
-	 * @generated
-	 */
-	void setNamespaceURI(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Part</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Part</em>' attribute.
-	 * @see #setLocalPart(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getQName_LocalPart()
-	 * @model
-	 * @generated
-	 */
-	String getLocalPart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.QName#getLocalPart <em>Local Part</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Part</em>' attribute.
-	 * @see #getLocalPart()
-	 * @generated
-	 */
-	void setLocalPart(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Combined QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Combined QName</em>' attribute.
-	 * @see #setCombinedQName(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getQName_CombinedQName()
-	 * @model
-	 * @generated
-	 */
-	String getCombinedQName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.QName#getCombinedQName <em>Combined QName</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Combined QName</em>' attribute.
-	 * @see #getCombinedQName()
-	 * @generated
-	 */
-	void setCombinedQName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * Internal field used by implementation classes.  Clients should use 
-	 * {@link #getNamespaceURI()}.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Internal Prefix Or Ns URI</em>' attribute.
-	 * @see #setInternalPrefixOrNsURI(String)
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getQName_InternalPrefixOrNsURI()
-	 * @model
-	 * @generated
-	 */
-	String getInternalPrefixOrNsURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.QName#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * Internal field used by implementation classes.  Clients should use 
-	 * {@link #setValues(String, String, String)}.
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Internal Prefix Or Ns URI</em>' attribute.
-	 * @see #getInternalPrefixOrNsURI()
-	 * @generated
-	 */
-	void setInternalPrefixOrNsURI(String value);
-
-	/**
-	 * Sets all the values for this qName
-	 * @param prefix    - The namespace prefix
-	 * @param nsURI     - The namespace URI
-	 * @param localPart - The local part
-	 */
-	void setValues(String prefix, String nsURI, String localPart);
-	
-
-} // QName
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResAuthTypeBase.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResAuthTypeBase.java
deleted file mode 100644
index 1ba4351ba..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResAuthTypeBase.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Res Auth Type Base</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * CONTAINER=0
- * Container=1
- * Application=2
- * SERVLET=3
- * 
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.j2ee.common.CommonPackage#getResAuthTypeBase()
- * @model
- * @generated
- */
-public final class ResAuthTypeBase extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Container</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER_LITERAL
-	 * @model name="Container"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTAINER = 0;
-
-	/**
-	 * The '<em><b>Application</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #APPLICATION_LITERAL
-	 * @model name="Application"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int APPLICATION = 1;
-
-	/**
-	 * The '<em><b>SERVLET</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SERVLET_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SERVLET = 2;
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthTypeBase CONTAINER_LITERAL = new ResAuthTypeBase(CONTAINER, "Container", "Container"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Application</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Application</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #APPLICATION
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthTypeBase APPLICATION_LITERAL = new ResAuthTypeBase(APPLICATION, "Application", "Application"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>SERVLET</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SERVLET</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SERVLET
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthTypeBase SERVLET_LITERAL = new ResAuthTypeBase(SERVLET, "SERVLET", "SERVLET"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Res Auth Type Base</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResAuthTypeBase[] VALUES_ARRAY =
-		new ResAuthTypeBase[] {
-			CONTAINER_LITERAL,
-			APPLICATION_LITERAL,
-			SERVLET_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Auth Type Base</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Auth Type Base</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthTypeBase get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthTypeBase result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Type Base</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthTypeBase getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthTypeBase result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Type Base</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthTypeBase get(int value) {
-		switch (value) {
-			case CONTAINER: return CONTAINER_LITERAL;
-			case APPLICATION: return APPLICATION_LITERAL;
-			case SERVLET: return SERVLET_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResAuthTypeBase(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResAuthTypeBase
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResSharingScopeType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResSharingScopeType.java
deleted file mode 100644
index ea577b73e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResSharingScopeType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface ResSharingScopeType {}
- * @since 1.0
- */
-public final class ResSharingScopeType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SHAREABLE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int UNSHAREABLE= 1;
-
-	/**
-	 * The '<em><b>Shareable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Shareable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SHAREABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResSharingScopeType SHAREABLE_LITERAL = new ResSharingScopeType(SHAREABLE, "Shareable", "Shareable"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Unshareable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Unshareable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSHAREABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResSharingScopeType UNSHAREABLE_LITERAL = new ResSharingScopeType(UNSHAREABLE, "Unshareable", "Unshareable"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Res Sharing Scope Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResSharingScopeType[] VALUES_ARRAY =
-		new ResSharingScopeType[] {
-			SHAREABLE_LITERAL,
-			UNSHAREABLE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Sharing Scope Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResSharingScopeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResSharingScopeType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType get(int value) {
-		switch (value) {
-			case SHAREABLE: return SHAREABLE_LITERAL;
-			case UNSHAREABLE: return UNSHAREABLE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResSharingScopeType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResSharingScopeType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceEnvRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceEnvRef.java
deleted file mode 100644
index eebf07ccc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceEnvRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * The resource-env-ref element contains a declaration of an enterprise bean's reference to an administered object associated with a resource in the enterprise bean's environment. It consists of an optional description, the resource environment reference name, and an indication of the resource environment reference type expected by the enterprise bean code.
- * 
- * Examples:
- * 
- * <resource-env-ref>
- *     <resource-env-ref-name>jms//StockQueue<//resource-env-ref-name>
- *     <resource-env-ref-type>javax.jms.Queue<//resource-env-ref-type>
- * <//resource-env-ref>
- * @generated
- * @since 1.0 */
-public interface ResourceEnvRef extends J2EEEObject {
-
-	/**
-	 * Gets the name for the type
-	 * @return String value
-	 */
-	public String getTypeName();
-	
-	/**
-	 * Sets the name of the type attribute
-	 * @param className sets the name for the type
-	 */
-	public void setTypeName(String className);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the resource env ref.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * Specifies the name of a resource environment reference; its value is the
-	 * environment entry name used in the enterprise bean code.
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Type reference
-	 * Specifies the type of a resource environment reference.  See the class
-	 * description for an example.
-	 */
-	JavaClass getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Type reference
-	 */
-	void setType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getResourceEnvRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceRef.java
deleted file mode 100644
index 35abc1c3f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceRef.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * The resource-ref element contains a declaration of application clients's reference to an external resource. It consists of an optional description, the resource factory reference name, the indication of the resource factory type expected by the application client's code, and the type of authentication (bean or container).
- * Example:
- * <resource-ref>
- * <res-ref-name>EmployeeAppDB<//res-ref-name>
- * <res-type>javax.sql.DataSource<//res-type>
- * <res-auth>Container<//res-auth>
- * <//resource-ref>
- * @generated
- * @since 1.0 */
-public interface ResourceRef extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The res-ref-name element specifies the name of the resource factory reference
-	 * name. The resource factory reference name is the name of the application
-	 * client's environment entry whose value contains the JNDI name of the data
-	 * source.
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * The res-type element specifies the type of the data source. The type is
-	 * specified by the Java interface (or class) expected to be implemented by the
-	 * data source.
-	 */
-	String getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Type attribute
-	 */
-	void setType(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Auth attribute
-	 * The res-auth element specifies whether the enterprise bean code signs on
-	 * programmatically to the resource manager, or whether the Container will sign on 
-	 * to the resource manager on behalf of the bean. In the latter case, the
-	 * Container uses information that is supplied by the Deployer.  The value of this 
-	 * element must be one of the two following:
-	 * <res-auth>Application<//res-auth>
-	 * <res-auth>Container<//res-auth>
-	 */
-	ResAuthTypeBase getAuth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.ResourceRef#getAuth <em>Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auth</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.common.ResAuthTypeBase
-	 * @see #isSetAuth()
-	 * @see #unsetAuth()
-	 * @see #getAuth()
-	 * @generated
-	 */
-	void setAuth(ResAuthTypeBase value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.common.ResourceRef#getAuth <em>Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAuth()
-	 * @see #getAuth()
-	 * @see #setAuth(ResAuthTypeBase)
-	 * @generated
-	 */
-	void unsetAuth();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.common.ResourceRef#getAuth <em>Auth</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Auth</em>' attribute is set.
-	 * @see #unsetAuth()
-	 * @see #getAuth()
-	 * @see #setAuth(ResAuthTypeBase)
-	 * @generated
-	 */
-	boolean isSetAuth();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Link attribute
-	 */
-	String getLink();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Link attribute
-	 */
-	void setLink(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ResSharingScope attribute
-	 * The res-sharing-scope element specifies whether connections obtained
-	 * through the given resource manager connection factory reference can be
-	 * shared. The value of this element, if specified, must be one of the
-	 * two following:  Shareable, Unshareable
-	 * 
-	 * The default value is Shareable.
-
-	 */
-	ResSharingScopeType getResSharingScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Res Sharing Scope</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.common.ResSharingScopeType
-	 * @see #isSetResSharingScope()
-	 * @see #unsetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @generated
-	 */
-	void setResSharingScope(ResSharingScopeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.common.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @generated
-	 */
-	void unsetResSharingScope();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.common.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Res Sharing Scope</em>' attribute is set.
-	 * @see #unsetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @generated
-	 */
-	boolean isSetResSharingScope();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getResourceRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/RunAsSpecifiedIdentity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/RunAsSpecifiedIdentity.java
deleted file mode 100644
index 09a078627..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/RunAsSpecifiedIdentity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It    contains an optional description and a specification of the security identity to be used.
- * @generated
- * @since 1.0 */
-public interface RunAsSpecifiedIdentity extends SecurityIdentity{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Identity reference
-	 * Optional specifies the run-as identity to be used for the execution of the
-	 * methods of an enterprise bean. It contains an optional description, and the
-	 * name of a security role.
-	 */
-	Identity getIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Identity reference
-	 */
-	void setIdentity(Identity value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityIdentity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityIdentity.java
deleted file mode 100644
index e5a4b4827..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityIdentity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It
- * contains an optional description and a specification of the security identity to be used.
- * @generated
- * @since 1.0 */
-public interface SecurityIdentity extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getSecurityIdentity_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Returns boolean value for the RunAsSpecifiedIdentity
-	 * @return boolean value
-	 */
-	boolean isRunAsSpecifiedIdentity();
-	
-	/**
-	 * Returns boolean value for the Caller Identity
-	 * @return boolean value
-	 */
-	boolean isUseCallerIdentity();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRole.java
deleted file mode 100644
index 8fba1908c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRole.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-/**
- * A semantic grouping of operations that may be performed by a subject.
- * The security-role element contains the declaration of a security role which is used in the security-constraints placed on the web application.
- * @generated
- * @since 1.0 */
-public interface SecurityRole extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 * The role-name element contains the name of a role. This element must contain a
-	 * non-empty string.
-
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getSecurityRole_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRoleRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRoleRef.java
deleted file mode 100644
index 4064b450b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRoleRef.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @generated
- * @since 1.0 */
-public interface SecurityRoleRef extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Link attribute
-	 * The role-link element is used to link a security role reference to a defined
-	 * security role. The role-link element must contain the name of one of the
-	 * security roles defined in the security-role elements.
-	 */
-	String getLink();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Link attribute
-	 */
-	void setLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.common.CommonPackage#getSecurityRoleRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/UseCallerIdentity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/UseCallerIdentity.java
deleted file mode 100644
index 20b216530..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/UseCallerIdentity.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-
-/**
- * The use-caller-identity element specifies that the caller's security identity be used as the security identity for the execution of the enterprise bean's methods.
- * @generated
- * @since 1.0 */
-public interface UseCallerIdentity extends SecurityIdentity{
-	//UseCallerIdentity
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonFactoryImpl.java
deleted file mode 100644
index 084b9b643..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonFactoryImpl.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.common.*;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationUsageType;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResSharingScopeType;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CommonFactoryImpl extends EFactoryImpl implements CommonFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CommonFactory init() {
-		try {
-			CommonFactory theCommonFactory = (CommonFactory)EPackage.Registry.INSTANCE.getEFactory("common.xmi"); 
-			if (theCommonFactory != null) {
-				return theCommonFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new CommonFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case CommonPackage.EJB_REF: return createEjbRef();
-			case CommonPackage.ENV_ENTRY: return createEnvEntry();
-			case CommonPackage.RESOURCE_REF: return createResourceRef();
-			case CommonPackage.SECURITY_ROLE_REF: return createSecurityRoleRef();
-			case CommonPackage.SECURITY_ROLE: return createSecurityRole();
-			case CommonPackage.RESOURCE_ENV_REF: return createResourceEnvRef();
-			case CommonPackage.EJB_LOCAL_REF: return createEJBLocalRef();
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY: return createRunAsSpecifiedIdentity();
-			case CommonPackage.IDENTITY: return createIdentity();
-			case CommonPackage.ICON_TYPE: return createIconType();
-			case CommonPackage.DISPLAY_NAME: return createDisplayName();
-			case CommonPackage.MESSAGE_DESTINATION_REF: return createMessageDestinationRef();
-			case CommonPackage.MESSAGE_DESTINATION: return createMessageDestination();
-			case CommonPackage.PARAM_VALUE: return createParamValue();
-			case CommonPackage.DESCRIPTION_GROUP: return createDescriptionGroup();
-			case CommonPackage.SECURITY_IDENTITY: return createSecurityIdentity();
-			case CommonPackage.USE_CALLER_IDENTITY: return createUseCallerIdentity();
-			case CommonPackage.DESCRIPTION: return createDescription();
-			case CommonPackage.QNAME: return createQName();
-			case CommonPackage.LISTENER: return createListener();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP: return createCompatibilityDescriptionGroup();
-			case CommonPackage.J2EEE_OBJECT: return createJ2EEEObject();
-			case CommonPackage.J2EEE_ATTRIBUTE: return createJ2EEEAttribute();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case CommonPackage.ENV_ENTRY_TYPE:
-				return createEnvEntryTypeFromString(eDataType, initialValue);
-			case CommonPackage.RES_AUTH_TYPE_BASE:
-				return createResAuthTypeBaseFromString(eDataType, initialValue);
-			case CommonPackage.EJB_REF_TYPE:
-				return createEjbRefTypeFromString(eDataType, initialValue);
-			case CommonPackage.RES_SHARING_SCOPE_TYPE:
-				return createResSharingScopeTypeFromString(eDataType, initialValue);
-			case CommonPackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				return createMessageDestinationUsageTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case CommonPackage.ENV_ENTRY_TYPE:
-				return convertEnvEntryTypeToString(eDataType, instanceValue);
-			case CommonPackage.RES_AUTH_TYPE_BASE:
-				return convertResAuthTypeBaseToString(eDataType, instanceValue);
-			case CommonPackage.EJB_REF_TYPE:
-				return convertEjbRefTypeToString(eDataType, instanceValue);
-			case CommonPackage.RES_SHARING_SCOPE_TYPE:
-				return convertResSharingScopeTypeToString(eDataType, instanceValue);
-			case CommonPackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				return convertMessageDestinationUsageTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRef createEjbRef() {
-		EjbRefImpl ejbRef = new EjbRefImpl();
-		return ejbRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntry createEnvEntry() {
-		EnvEntryImpl envEntry = new EnvEntryImpl();
-		return envEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceRef createResourceRef() {
-		ResourceRefImpl resourceRef = new ResourceRefImpl();
-		return resourceRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityRoleRef createSecurityRoleRef() {
-		SecurityRoleRefImpl securityRoleRef = new SecurityRoleRefImpl();
-		return securityRoleRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityRole createSecurityRole() {
-		SecurityRoleImpl securityRole = new SecurityRoleImpl();
-		return securityRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceEnvRef createResourceEnvRef() {
-		ResourceEnvRefImpl resourceEnvRef = new ResourceEnvRefImpl();
-		return resourceEnvRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBLocalRef createEJBLocalRef() {
-		EJBLocalRefImpl ejbLocalRef = new EJBLocalRefImpl();
-		return ejbLocalRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RunAsSpecifiedIdentity createRunAsSpecifiedIdentity() {
-		RunAsSpecifiedIdentityImpl runAsSpecifiedIdentity = new RunAsSpecifiedIdentityImpl();
-		return runAsSpecifiedIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Identity createIdentity() {
-		IdentityImpl identity = new IdentityImpl();
-		return identity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IconType createIconType() {
-		IconTypeImpl iconType = new IconTypeImpl();
-		return iconType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisplayName createDisplayName() {
-		DisplayNameImpl displayName = new DisplayNameImpl();
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationRef createMessageDestinationRef() {
-		MessageDestinationRefImpl messageDestinationRef = new MessageDestinationRefImpl();
-		return messageDestinationRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestination createMessageDestination() {
-		MessageDestinationImpl messageDestination = new MessageDestinationImpl();
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParamValue createParamValue() {
-		ParamValueImpl paramValue = new ParamValueImpl();
-		return paramValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescriptionGroup createDescriptionGroup() {
-		DescriptionGroupImpl descriptionGroup = new DescriptionGroupImpl();
-		return descriptionGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityIdentity createSecurityIdentity() {
-		SecurityIdentityImpl securityIdentity = new SecurityIdentityImpl();
-		return securityIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UseCallerIdentity createUseCallerIdentity() {
-		UseCallerIdentityImpl useCallerIdentity = new UseCallerIdentityImpl();
-		return useCallerIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description createDescription() {
-		DescriptionImpl description = new DescriptionImpl();
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QName createQName() {
-		QNameImpl qName = new QNameImpl();
-		return qName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Listener createListener() {
-		ListenerImpl listener = new ListenerImpl();
-		return listener;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompatibilityDescriptionGroup createCompatibilityDescriptionGroup() {
-		CompatibilityDescriptionGroupImpl compatibilityDescriptionGroup = new CompatibilityDescriptionGroupImpl();
-		return compatibilityDescriptionGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public J2EEEObject createJ2EEEObject() {
-		J2EEEObjectImpl j2EEEObject = new J2EEEObjectImpl();
-		return j2EEEObject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public J2EEEAttribute createJ2EEEAttribute() {
-		J2EEEAttributeImpl j2EEEAttribute = new J2EEEAttributeImpl();
-		return j2EEEAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntryType createEnvEntryTypeFromString(EDataType eDataType, String initialValue) {
-		EnvEntryType result = EnvEntryType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEnvEntryTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResAuthTypeBase createResAuthTypeBaseFromString(EDataType eDataType, String initialValue) {
-		ResAuthTypeBase result = ResAuthTypeBase.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResAuthTypeBaseToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbRefType createEjbRefTypeFromString(EDataType eDataType, String initialValue) {
-		EjbRefType result = EjbRefType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEjbRefTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResSharingScopeType createResSharingScopeTypeFromString(EDataType eDataType, String initialValue) {
-		ResSharingScopeType result = ResSharingScopeType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResSharingScopeTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationUsageType createMessageDestinationUsageTypeFromString(EDataType eDataType, String initialValue) {
-		MessageDestinationUsageType result = MessageDestinationUsageType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMessageDestinationUsageTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonPackage getCommonPackage() {
-		return (CommonPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static CommonPackage getPackage() {
-		return CommonPackage.eINSTANCE;
-	}
-
-} //CommonFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java
deleted file mode 100644
index b695bf56b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java
+++ /dev/null
@@ -1,1568 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.J2EEEAttribute;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationUsageType;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResSharingScopeType;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class CommonPackageImpl extends EPackageImpl implements CommonPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass envEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityRoleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceEnvRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbLocalRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass runAsSpecifiedIdentityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityIdentityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass identityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iconTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass displayNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDestinationRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDestinationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass paramValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jndiEnvRefsGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass useCallerIdentityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass qNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass listenerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compatibilityDescriptionGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass j2EEEObjectEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass j2EEEAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum envEntryTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resAuthTypeBaseEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum ejbRefTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resSharingScopeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum messageDestinationUsageTypeEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private CommonPackageImpl() {
-		super(eNS_URI, CommonFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static CommonPackage init() {
-		if (isInited) return (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Obtain or create and register package
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CommonPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theCommonPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theCommonPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theCommonPackage.freeze();
-
-		return theCommonPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityRole() {
-		return securityRoleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRole_Description() {
-		return (EAttribute)securityRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRole_RoleName() {
-		return (EAttribute)securityRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityRole_Descriptions() {
-		return (EReference)securityRoleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getResourceRef() {
-		return resourceRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Description() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Name() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Type() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Auth() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Link() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_ResSharingScope() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceRef_Descriptions() {
-		return (EReference)resourceRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEjbRef() {
-		return ejbRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Name() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Type() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Home() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Remote() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Link() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Description() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEjbRef_Descriptions() {
-		return (EReference)ejbRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBLocalRef() {
-		return ejbLocalRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBLocalRef_LocalHome() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBLocalRef_Local() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEnvEntry() {
-		return envEntryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Description() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Name() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Value() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Type() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnvEntry_Descriptions() {
-		return (EReference)envEntryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityRoleRef() {
-		return securityRoleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRoleRef_Name() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRoleRef_Description() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRoleRef_Link() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityRoleRef_Descriptions() {
-		return (EReference)securityRoleRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRunAsSpecifiedIdentity() {
-		return runAsSpecifiedIdentityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRunAsSpecifiedIdentity_Identity() {
-		return (EReference)runAsSpecifiedIdentityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityIdentity() {
-		return securityIdentityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityIdentity_Description() {
-		return (EAttribute)securityIdentityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityIdentity_Descriptions() {
-		return (EReference)securityIdentityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getUseCallerIdentity() {
-		return useCallerIdentityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescription() {
-		return descriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Lang() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Value() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getQName() {
-		return qNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_NamespaceURI() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_LocalPart() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_CombinedQName() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_InternalPrefixOrNsURI() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getListener() {
-		return listenerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getListener_ListenerClass() {
-		return (EReference)listenerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompatibilityDescriptionGroup() {
-		return compatibilityDescriptionGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_SmallIcon() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_LargeIcon() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_Description() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_DisplayName() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJ2EEEObject() {
-		return j2EEEObjectEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJ2EEEAttribute() {
-		return j2EEEAttributeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getIdentity() {
-		return identityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getIdentity_Description() {
-		return (EAttribute)identityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getIdentity_RoleName() {
-		return (EAttribute)identityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIdentity_Descriptions() {
-		return (EReference)identityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIconType() {
-		return iconTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIconType_SmallIcon() {
-		return (EAttribute)iconTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIconType_LargeIcon() {
-		return (EAttribute)iconTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIconType_Lang() {
-		return (EAttribute)iconTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDisplayName() {
-		return displayNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisplayName_Lang() {
-		return (EAttribute)displayNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisplayName_Value() {
-		return (EAttribute)displayNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDestinationRef() {
-		return messageDestinationRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Name() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Type() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Usage() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Link() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestinationRef_Descriptions() {
-		return (EReference)messageDestinationRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDestination() {
-		return messageDestinationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestination_Name() {
-		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParamValue() {
-		return paramValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Name() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Value() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Description() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParamValue_Descriptions() {
-		return (EReference)paramValueEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescriptionGroup() {
-		return descriptionGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescriptionGroup_Icons() {
-		return (EReference)descriptionGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescriptionGroup_DisplayNames() {
-		return (EReference)descriptionGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescriptionGroup_Descriptions() {
-		return (EReference)descriptionGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJNDIEnvRefsGroup() {
-		return jndiEnvRefsGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_EnvironmentProperties() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_ResourceRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_EjbRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_ResourceEnvRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_EjbLocalRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_MessageDestinationRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_ServiceRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getResourceEnvRef() {
-		return resourceEnvRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceEnvRef_Description() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceEnvRef_Name() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceEnvRef_Type() {
-		return (EReference)resourceEnvRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceEnvRef_Descriptions() {
-		return (EReference)resourceEnvRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getEjbRefType() {
-		return ejbRefTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getEnvEntryType() {
-		return envEntryTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getResAuthTypeBase() {
-		return resAuthTypeBaseEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getResSharingScopeType() {
-		return resSharingScopeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getMessageDestinationUsageType() {
-		return messageDestinationUsageTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CommonFactory getCommonFactory() {
-		return (CommonFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		ejbRefEClass = createEClass(EJB_REF);
-		createEAttribute(ejbRefEClass, EJB_REF__NAME);
-		createEAttribute(ejbRefEClass, EJB_REF__TYPE);
-		createEAttribute(ejbRefEClass, EJB_REF__HOME);
-		createEAttribute(ejbRefEClass, EJB_REF__REMOTE);
-		createEAttribute(ejbRefEClass, EJB_REF__LINK);
-		createEAttribute(ejbRefEClass, EJB_REF__DESCRIPTION);
-		createEReference(ejbRefEClass, EJB_REF__DESCRIPTIONS);
-
-		envEntryEClass = createEClass(ENV_ENTRY);
-		createEAttribute(envEntryEClass, ENV_ENTRY__DESCRIPTION);
-		createEAttribute(envEntryEClass, ENV_ENTRY__NAME);
-		createEAttribute(envEntryEClass, ENV_ENTRY__VALUE);
-		createEAttribute(envEntryEClass, ENV_ENTRY__TYPE);
-		createEReference(envEntryEClass, ENV_ENTRY__DESCRIPTIONS);
-
-		resourceRefEClass = createEClass(RESOURCE_REF);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__DESCRIPTION);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__NAME);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__TYPE);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__AUTH);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__LINK);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_SHARING_SCOPE);
-		createEReference(resourceRefEClass, RESOURCE_REF__DESCRIPTIONS);
-
-		securityRoleRefEClass = createEClass(SECURITY_ROLE_REF);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__NAME);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__DESCRIPTION);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__LINK);
-		createEReference(securityRoleRefEClass, SECURITY_ROLE_REF__DESCRIPTIONS);
-
-		securityRoleEClass = createEClass(SECURITY_ROLE);
-		createEAttribute(securityRoleEClass, SECURITY_ROLE__DESCRIPTION);
-		createEAttribute(securityRoleEClass, SECURITY_ROLE__ROLE_NAME);
-		createEReference(securityRoleEClass, SECURITY_ROLE__DESCRIPTIONS);
-
-		resourceEnvRefEClass = createEClass(RESOURCE_ENV_REF);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__DESCRIPTION);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__NAME);
-		createEReference(resourceEnvRefEClass, RESOURCE_ENV_REF__TYPE);
-		createEReference(resourceEnvRefEClass, RESOURCE_ENV_REF__DESCRIPTIONS);
-
-		ejbLocalRefEClass = createEClass(EJB_LOCAL_REF);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__LOCAL_HOME);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__LOCAL);
-
-		runAsSpecifiedIdentityEClass = createEClass(RUN_AS_SPECIFIED_IDENTITY);
-		createEReference(runAsSpecifiedIdentityEClass, RUN_AS_SPECIFIED_IDENTITY__IDENTITY);
-
-		identityEClass = createEClass(IDENTITY);
-		createEAttribute(identityEClass, IDENTITY__DESCRIPTION);
-		createEAttribute(identityEClass, IDENTITY__ROLE_NAME);
-		createEReference(identityEClass, IDENTITY__DESCRIPTIONS);
-
-		iconTypeEClass = createEClass(ICON_TYPE);
-		createEAttribute(iconTypeEClass, ICON_TYPE__SMALL_ICON);
-		createEAttribute(iconTypeEClass, ICON_TYPE__LARGE_ICON);
-		createEAttribute(iconTypeEClass, ICON_TYPE__LANG);
-
-		displayNameEClass = createEClass(DISPLAY_NAME);
-		createEAttribute(displayNameEClass, DISPLAY_NAME__LANG);
-		createEAttribute(displayNameEClass, DISPLAY_NAME__VALUE);
-
-		messageDestinationRefEClass = createEClass(MESSAGE_DESTINATION_REF);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__NAME);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__TYPE);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__USAGE);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__LINK);
-		createEReference(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__DESCRIPTIONS);
-
-		messageDestinationEClass = createEClass(MESSAGE_DESTINATION);
-		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__NAME);
-
-		paramValueEClass = createEClass(PARAM_VALUE);
-		createEAttribute(paramValueEClass, PARAM_VALUE__NAME);
-		createEAttribute(paramValueEClass, PARAM_VALUE__VALUE);
-		createEAttribute(paramValueEClass, PARAM_VALUE__DESCRIPTION);
-		createEReference(paramValueEClass, PARAM_VALUE__DESCRIPTIONS);
-
-		descriptionGroupEClass = createEClass(DESCRIPTION_GROUP);
-		createEReference(descriptionGroupEClass, DESCRIPTION_GROUP__ICONS);
-		createEReference(descriptionGroupEClass, DESCRIPTION_GROUP__DISPLAY_NAMES);
-		createEReference(descriptionGroupEClass, DESCRIPTION_GROUP__DESCRIPTIONS);
-
-		jndiEnvRefsGroupEClass = createEClass(JNDI_ENV_REFS_GROUP);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__RESOURCE_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__EJB_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__SERVICE_REFS);
-
-		securityIdentityEClass = createEClass(SECURITY_IDENTITY);
-		createEAttribute(securityIdentityEClass, SECURITY_IDENTITY__DESCRIPTION);
-		createEReference(securityIdentityEClass, SECURITY_IDENTITY__DESCRIPTIONS);
-
-		useCallerIdentityEClass = createEClass(USE_CALLER_IDENTITY);
-
-		descriptionEClass = createEClass(DESCRIPTION);
-		createEAttribute(descriptionEClass, DESCRIPTION__LANG);
-		createEAttribute(descriptionEClass, DESCRIPTION__VALUE);
-
-		qNameEClass = createEClass(QNAME);
-		createEAttribute(qNameEClass, QNAME__NAMESPACE_URI);
-		createEAttribute(qNameEClass, QNAME__LOCAL_PART);
-		createEAttribute(qNameEClass, QNAME__COMBINED_QNAME);
-		createEAttribute(qNameEClass, QNAME__INTERNAL_PREFIX_OR_NS_URI);
-
-		listenerEClass = createEClass(LISTENER);
-		createEReference(listenerEClass, LISTENER__LISTENER_CLASS);
-
-		compatibilityDescriptionGroupEClass = createEClass(COMPATIBILITY_DESCRIPTION_GROUP);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME);
-
-		j2EEEObjectEClass = createEClass(J2EEE_OBJECT);
-
-		j2EEEAttributeEClass = createEClass(J2EEE_ATTRIBUTE);
-
-		// Create enums
-		envEntryTypeEEnum = createEEnum(ENV_ENTRY_TYPE);
-		resAuthTypeBaseEEnum = createEEnum(RES_AUTH_TYPE_BASE);
-		ejbRefTypeEEnum = createEEnum(EJB_REF_TYPE);
-		resSharingScopeTypeEEnum = createEEnum(RES_SHARING_SCOPE_TYPE);
-		messageDestinationUsageTypeEEnum = createEEnum(MESSAGE_DESTINATION_USAGE_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		Webservice_clientPackage theWebservice_clientPackage = (Webservice_clientPackage)EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add supertypes to classes
-		ejbRefEClass.getESuperTypes().add(this.getJ2EEEObject());
-		envEntryEClass.getESuperTypes().add(this.getJ2EEEObject());
-		resourceRefEClass.getESuperTypes().add(this.getJ2EEEObject());
-		securityRoleRefEClass.getESuperTypes().add(this.getJ2EEEObject());
-		securityRoleEClass.getESuperTypes().add(this.getJ2EEEObject());
-		resourceEnvRefEClass.getESuperTypes().add(this.getJ2EEEObject());
-		ejbLocalRefEClass.getESuperTypes().add(this.getEjbRef());
-		runAsSpecifiedIdentityEClass.getESuperTypes().add(this.getSecurityIdentity());
-		identityEClass.getESuperTypes().add(this.getJ2EEEObject());
-		iconTypeEClass.getESuperTypes().add(this.getJ2EEEObject());
-		displayNameEClass.getESuperTypes().add(this.getJ2EEEObject());
-		messageDestinationRefEClass.getESuperTypes().add(this.getJ2EEEObject());
-		messageDestinationEClass.getESuperTypes().add(this.getCompatibilityDescriptionGroup());
-		paramValueEClass.getESuperTypes().add(this.getJ2EEEObject());
-		descriptionGroupEClass.getESuperTypes().add(this.getJ2EEEObject());
-		jndiEnvRefsGroupEClass.getESuperTypes().add(this.getCompatibilityDescriptionGroup());
-		securityIdentityEClass.getESuperTypes().add(this.getJ2EEEObject());
-		useCallerIdentityEClass.getESuperTypes().add(this.getSecurityIdentity());
-		descriptionEClass.getESuperTypes().add(this.getJ2EEEObject());
-		qNameEClass.getESuperTypes().add(this.getJ2EEEObject());
-		listenerEClass.getESuperTypes().add(this.getCompatibilityDescriptionGroup());
-		compatibilityDescriptionGroupEClass.getESuperTypes().add(this.getDescriptionGroup());
-		j2EEEAttributeEClass.getESuperTypes().add(theEcorePackage.getEAttribute());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(ejbRefEClass, EjbRef.class, "EjbRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEjbRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEjbRef_Type(), this.getEjbRefType(), "type", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEjbRef_Home(), ecorePackage.getEString(), "home", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEjbRef_Remote(), ecorePackage.getEString(), "remote", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEjbRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEjbRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEjbRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(envEntryEClass, EnvEntry.class, "EnvEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEnvEntry_Description(), ecorePackage.getEString(), "description", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEnvEntry_Name(), ecorePackage.getEString(), "name", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEnvEntry_Value(), ecorePackage.getEString(), "value", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEnvEntry_Type(), this.getEnvEntryType(), "type", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnvEntry_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(resourceRefEClass, ResourceRef.class, "ResourceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getResourceRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceRef_Type(), ecorePackage.getEString(), "type", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceRef_Auth(), this.getResAuthTypeBase(), "auth", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceRef_ResSharingScope(), this.getResSharingScopeType(), "resSharingScope", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(securityRoleRefEClass, SecurityRoleRef.class, "SecurityRoleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSecurityRoleRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSecurityRoleRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSecurityRoleRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityRoleRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(securityRoleEClass, SecurityRole.class, "SecurityRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSecurityRole_Description(), ecorePackage.getEString(), "description", null, 0, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSecurityRole_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityRole_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(resourceEnvRefEClass, ResourceEnvRef.class, "ResourceEnvRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getResourceEnvRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceEnvRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceEnvRef_Type(), theJavaRefPackage.getJavaClass(), null, "type", null, 1, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceEnvRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbLocalRefEClass, EJBLocalRef.class, "EJBLocalRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEJBLocalRef_LocalHome(), ecorePackage.getEString(), "localHome", null, 0, 1, EJBLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJBLocalRef_Local(), ecorePackage.getEString(), "local", null, 0, 1, EJBLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(runAsSpecifiedIdentityEClass, RunAsSpecifiedIdentity.class, "RunAsSpecifiedIdentity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRunAsSpecifiedIdentity_Identity(), this.getIdentity(), null, "identity", null, 0, 1, RunAsSpecifiedIdentity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(identityEClass, Identity.class, "Identity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIdentity_Description(), ecorePackage.getEString(), "description", null, 0, 1, Identity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getIdentity_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, Identity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIdentity_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, Identity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(iconTypeEClass, IconType.class, "IconType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIconType_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, IconType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getIconType_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, IconType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getIconType_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, IconType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(displayNameEClass, DisplayName.class, "DisplayName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDisplayName_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDisplayName_Value(), ecorePackage.getEString(), "value", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMessageDestinationRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDestinationRef_Type(), ecorePackage.getEString(), "type", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDestinationRef_Usage(), this.getMessageDestinationUsageType(), "usage", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDestinationRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageDestinationRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(messageDestinationEClass, MessageDestination.class, "MessageDestination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMessageDestination_Name(), ecorePackage.getEString(), "name", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(paramValueEClass, ParamValue.class, "ParamValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getParamValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getParamValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getParamValue_Description(), ecorePackage.getEString(), "description", null, 0, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getParamValue_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(descriptionGroupEClass, DescriptionGroup.class, "DescriptionGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDescriptionGroup_Icons(), this.getIconType(), null, "icons", null, 0, -1, DescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDescriptionGroup_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, DescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDescriptionGroup_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, DescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jndiEnvRefsGroupEClass, JNDIEnvRefsGroup.class, "JNDIEnvRefsGroup", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getJNDIEnvRefsGroup_EnvironmentProperties(), this.getEnvEntry(), null, "environmentProperties", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJNDIEnvRefsGroup_ResourceRefs(), this.getResourceRef(), null, "resourceRefs", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJNDIEnvRefsGroup_EjbRefs(), this.getEjbRef(), null, "ejbRefs", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJNDIEnvRefsGroup_ResourceEnvRefs(), this.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJNDIEnvRefsGroup_EjbLocalRefs(), this.getEJBLocalRef(), null, "ejbLocalRefs", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJNDIEnvRefsGroup_MessageDestinationRefs(), this.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJNDIEnvRefsGroup_ServiceRefs(), theWebservice_clientPackage.getServiceRef(), null, "serviceRefs", null, 0, -1, JNDIEnvRefsGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(securityIdentityEClass, SecurityIdentity.class, "SecurityIdentity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSecurityIdentity_Description(), ecorePackage.getEString(), "description", null, 0, 1, SecurityIdentity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityIdentity_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityIdentity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(useCallerIdentityEClass, UseCallerIdentity.class, "UseCallerIdentity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDescription_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDescription_Value(), ecorePackage.getEString(), "value", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(qNameEClass, QName.class, "QName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getQName_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, QName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getQName_LocalPart(), ecorePackage.getEString(), "localPart", null, 0, 1, QName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getQName_CombinedQName(), ecorePackage.getEString(), "combinedQName", null, 0, 1, QName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getQName_InternalPrefixOrNsURI(), ecorePackage.getEString(), "internalPrefixOrNsURI", null, 0, 1, QName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(listenerEClass, Listener.class, "Listener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getListener_ListenerClass(), theJavaRefPackage.getJavaClass(), null, "listenerClass", null, 1, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(compatibilityDescriptionGroupEClass, CompatibilityDescriptionGroup.class, "CompatibilityDescriptionGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCompatibilityDescriptionGroup_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, CompatibilityDescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompatibilityDescriptionGroup_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, CompatibilityDescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompatibilityDescriptionGroup_Description(), ecorePackage.getEString(), "description", null, 0, 1, CompatibilityDescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompatibilityDescriptionGroup_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, CompatibilityDescriptionGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(j2EEEObjectEClass, J2EEEObject.class, "J2EEEObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(j2EEEAttributeEClass, J2EEEAttribute.class, "J2EEEAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(envEntryTypeEEnum, EnvEntryType.class, "EnvEntryType");
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.STRING_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.INTEGER_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.BOOLEAN_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.DOUBLE_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.BYTE_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.SHORT_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.LONG_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.FLOAT_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.CHARACTER_LITERAL);
-
-		initEEnum(resAuthTypeBaseEEnum, ResAuthTypeBase.class, "ResAuthTypeBase");
-		addEEnumLiteral(resAuthTypeBaseEEnum, ResAuthTypeBase.CONTAINER_LITERAL);
-		addEEnumLiteral(resAuthTypeBaseEEnum, ResAuthTypeBase.APPLICATION_LITERAL);
-		addEEnumLiteral(resAuthTypeBaseEEnum, ResAuthTypeBase.SERVLET_LITERAL);
-
-		initEEnum(ejbRefTypeEEnum, EjbRefType.class, "EjbRefType");
-		addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.SESSION_LITERAL);
-		addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.ENTITY_LITERAL);
-
-		initEEnum(resSharingScopeTypeEEnum, ResSharingScopeType.class, "ResSharingScopeType");
-		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.SHAREABLE_LITERAL);
-		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.UNSHAREABLE_LITERAL);
-
-		initEEnum(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.class, "MessageDestinationUsageType");
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_LITERAL);
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.PRODUCES_LITERAL);
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //CommonPackageImpl
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CompatibilityDescriptionGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CompatibilityDescriptionGroupImpl.java
deleted file mode 100644
index e62f4edf3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CompatibilityDescriptionGroupImpl.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Compatibility Description Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl#getDisplayName <em>Display Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompatibilityDescriptionGroupImpl extends DescriptionGroupImpl implements CompatibilityDescriptionGroup {
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 */
-	protected CompatibilityDescriptionGroupImpl() {
-		super();
-		eAdapters().add(new DescriptionGroupAdapter());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.COMPATIBILITY_DESCRIPTION_GROUP;
-	}
-
-	public String getSmallIcon() {
-		if(eResource() == null) 
-			return getSmallIconGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getSmallIconGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getIcons().size() > 0)
-				return ((IconType)getIcons().get(0)).getSmallIcon();
-		}
-		return null;
-	}
-	
-	public void setSmallIcon(String newSmallIcon) {
-		if(eResource() == null) {
-			setSmallIconGen(newSmallIcon);
-			internalSetSmallIconInList(newSmallIcon); 
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setSmallIconGen(newSmallIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetSmallIconInList(newSmallIcon); 
-			break;
-		}
-	}
-	/**
-	 * @param newSmallIcon
-	 */
-	protected void internalSetSmallIconInList(String newSmallIcon) {
-		IconType newValue = null;
-		if(getIcons().size() > 0) {
-			newValue = (IconType) getIcons().get(0);
-			newValue.setSmallIcon(newSmallIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setSmallIcon(newSmallIcon);
-			getIcons().add(newValue); 
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSmallIconGen() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSmallIconGen(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	public String getLargeIcon() {
-		if(eResource() == null) 
-			return getLargeIconGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getLargeIconGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getIcons().size() > 0)
-				return ((IconType)getIcons().get(0)).getLargeIcon();
-		}
-		return null;
-	}
-	
-	public void setLargeIcon(String newLargeIcon) {
-		if(eResource() == null) {
-			setLargeIconGen(newLargeIcon);
-			internalSetLargeIconInList(newLargeIcon);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setLargeIconGen(newLargeIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetLargeIconInList(newLargeIcon); 
-			break;
-		}
-	}
-
-	/**
-	 * @param newLargeIcon
-	 */
-	protected void internalSetLargeIconInList(String newLargeIcon) {
-		IconType newValue = null;
-		if(getIcons().size() > 0) {
-			newValue = (IconType) getIcons().get(0);
-			newValue.setLargeIcon(newLargeIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setLargeIcon(newLargeIcon);
-			getIcons().add(newValue); 
-		}
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLargeIconGen() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLargeIconGen(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	public String getDescription() {
-		if(eResource() == null) 
-			return getDescriptionGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getDescriptionGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getDescriptions().size() > 0)
-				return ((Description)getDescriptions().get(0)).getValue();
-		}
-		return null;
-	}
-	
-	public void setDescription(String newDescription) {
-		if(eResource() == null) {
-			setDescriptionGen(newDescription);
-			internalSetDescriptionInList(newDescription);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setDescriptionGen(newDescription);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			internalSetDescriptionInList(newDescription); 
-			break;
-		}
-	}
-	
-	/**
-	 * @param newDescription
-	 */
-	protected void internalSetDescriptionInList(String newDescription) {
-		Description newValue = null;
-		if(getDescriptions().size() > 0) {
-			newValue = (Description) getDescriptions().get(0);
-			newValue.setValue(newDescription);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createDescription();
-			newValue.setValue(newDescription);
-			getDescriptions().add(newValue);
-		}
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescriptionGen() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescriptionGen(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDisplayName() {
-		if(eResource() == null) 
-			return getDisplayNameGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getDisplayNameGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getDisplayNames().size() > 0)
-				return ((DisplayName)getDisplayNames().get(0)).getValue();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.common.DescriptionGroup#setDisplayName(java.lang.String)
-	 */
-	public void setDisplayName(String newDisplayName) {
-		if(eResource() == null) {
-			setDisplayNameGen(newDisplayName);
-			internalSetDisplayNameInList(newDisplayName);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setDisplayNameGen(newDisplayName);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			internalSetDisplayNameInList(newDisplayName);
-			break;
-		}
-	}
-
-	/**
-	 * @param newDisplayName
-	 */
-	protected void internalSetDisplayNameInList(String newDisplayName) {
-		DisplayName newValue = null;
-		if(getDisplayNames().size() > 0) {
-			newValue = (DisplayName) getDisplayNames().get(0);
-			newValue.setValue(newDisplayName);
-		}
-		else  {
-			newValue = CommonFactory.eINSTANCE.createDisplayName();
-			newValue.setValue(newDisplayName);
-			getDisplayNames().add(newValue);
-		}			  
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayNameGen() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayNameGen(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				return getDisplayName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (smallIcon: ");
-		result.append(smallIcon);
-		result.append(", largeIcon: ");
-		result.append(largeIcon);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", displayName: ");
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CompatibilityDescriptionGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionGroupAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionGroupAdapter.java
deleted file mode 100644
index d87b2d7f5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionGroupAdapter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-
-
-
-/**
-	 * @author cbridgha
-	 *
-	 * To change the template for this generated type comment go to
-	 * Window - Preferences - Java - Code Generation - Code and Comments
-	 */
-	public class DescriptionGroupAdapter extends AdapterImpl {
-
-			/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getFeature() == CommonPackage.eINSTANCE.getDescriptionGroup_Icons() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getIconType_LargeIcon() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getIconType_SmallIcon()) {
-					synchIcons();
-					return;
-				}
-			else if (msg.getFeature() == CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getDescription_Value()) {
-					synchDescription();
-					return;
-				}
-			else if (msg.getFeature() == CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getDisplayName_Value()) {
-					synchDisplayName();
-					return;
-				}
-			
-		}
-
-		/**
-		 * 
-		 */
-		private void synchDescription() {
-			CompatibilityDescriptionGroup myTarget = (CompatibilityDescriptionGroup)getTarget();
-			if (myTarget.getDescriptions().isEmpty())
-				myTarget.setDescriptionGen(null);
-			else {
-				Description aDescription = (Description)myTarget.getDescriptions().get(0);
-				if (!aDescription.eAdapters().contains(this))
-					aDescription.eAdapters().add(this);
-				else 
-					myTarget.setDescriptionGen(aDescription.getValue());
-			}
-		}
-
-		/**
-		 * 
-		 */
-		private void synchDisplayName() {
-			CompatibilityDescriptionGroup myTarget = (CompatibilityDescriptionGroup)getTarget();
-			if (myTarget.getDisplayNames().isEmpty())
-				myTarget.setDisplayNameGen(null);
-			else {
-				DisplayName aDisplayName = (DisplayName)myTarget.getDisplayNames().get(0);
-				if (!aDisplayName.eAdapters().contains(this))
-					aDisplayName.eAdapters().add(this);
-				myTarget.setDisplayNameGen(aDisplayName.getValue());
-			}
-		}
-
-		/**
-		 * 
-		 */
-		private void synchIcons() {
-			CompatibilityDescriptionGroup myTarget = (CompatibilityDescriptionGroup)getTarget();
-			if (myTarget.getIcons().isEmpty()) {
-				myTarget.setLargeIconGen(null);
-				myTarget.setSmallIconGen(null);
-			}
-			else {
-				IconType anIcon = (IconType)myTarget.getIcons().get(0);
-				if (!anIcon.eAdapters().contains(this))
-					anIcon.eAdapters().add(this);
-				else {
-					myTarget.setLargeIconGen(anIcon.getLargeIcon());
-					myTarget.setSmallIconGen(anIcon.getSmallIcon());
-				}
-			}
-		}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier newTarget) {
-		if (newTarget instanceof CompatibilityDescriptionGroup)
-			super.setTarget(newTarget);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionGroupImpl.java
deleted file mode 100644
index 1b3fc8e55..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionGroupImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-
-
-/**
- * <!-- begin-user-doc -->An implementation of the model object '<em><b>Description Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionGroupImpl extends J2EEEObjectImpl implements DescriptionGroup {
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc --><!-- end-user-doc -->
-	 * 
-	 * @see #getIcons() @generated @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment
-	 * reference list. <!-- begin-user-doc --><!-- end-user-doc -->
-	 * 
-	 * @see #getDisplayNames() @generated @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment
-	 * reference list. <!-- begin-user-doc --><!-- end-user-doc -->
-	 * 
-	 * @see #getDescriptions() @generated @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	protected DescriptionGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.DESCRIPTION_GROUP;
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public EList getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(IconType.class, this, CommonPackage.DESCRIPTION_GROUP__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public EList getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				return getIcons();
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				getIcons().clear();
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.common.DescriptionGroup#getJ2EEVersionID()
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		
-		try {
-			J2EEVersionResource res = (J2EEVersionResource) eResource();
-				if (res == null)
-					throw new IllegalStateException();
-				return res.getJ2EEVersionID();
-		} catch (ClassCastException exception) {
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		}
-		
-	}
-
-} //DescriptionGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionImpl.java
deleted file mode 100644
index 0759cab8d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DescriptionImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionImpl extends J2EEEObjectImpl implements Description {
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DESCRIPTION__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DESCRIPTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION__LANG:
-				return getLang();
-			case CommonPackage.DESCRIPTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION__LANG:
-				setLang((String)newValue);
-				return;
-			case CommonPackage.DESCRIPTION__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case CommonPackage.DESCRIPTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.DESCRIPTION__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case CommonPackage.DESCRIPTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (lang: ");
-		result.append(lang);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DisplayNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DisplayNameImpl.java
deleted file mode 100644
index 880d4aaf4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/DisplayNameImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.DisplayName;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisplayNameImpl extends J2EEEObjectImpl implements DisplayName {
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisplayNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.DISPLAY_NAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DISPLAY_NAME__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DISPLAY_NAME__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				return getLang();
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				setLang((String)newValue);
-				return;
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (lang: ");
-		result.append(lang);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DisplayNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EJBLocalRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EJBLocalRefImpl.java
deleted file mode 100644
index 7baf31831..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EJBLocalRefImpl.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-
-/**
- * The ejb-local-ref element is used for the declaration of a reference to another enterprise bean's local home. The declaration consists of an optional description; the EJB reference name used in the code of the referencing enterprise bean; the expected type of the referenced enterprise bean; the expected local home and local interfaces of the referenced enterprise bean; and an optional ejb-link information. The optional ejb-link element is used to specify the referenced enterprise bean.
- * Used in: entity, session, message-driven
- * @generated
- */
-public class EJBLocalRefImpl extends EjbRefImpl implements EJBLocalRef {
-
-	/**
-	 * The default value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localHome = LOCAL_HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected String local = LOCAL_EDEFAULT;
-
-	public EJBLocalRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.EJB_LOCAL_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalHome() {
-		return localHome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalHome(String newLocalHome) {
-		String oldLocalHome = localHome;
-		localHome = newLocalHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_LOCAL_REF__LOCAL_HOME, oldLocalHome, localHome));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocal() {
-		return local;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocal(String newLocal) {
-		String oldLocal = local;
-		local = newLocal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_LOCAL_REF__LOCAL, oldLocal, local));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				return getLocalHome();
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				return getLocal();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				setLocalHome((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				setLocal((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				setLocalHome(LOCAL_HOME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				setLocal(LOCAL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				return LOCAL_HOME_EDEFAULT == null ? localHome != null : !LOCAL_HOME_EDEFAULT.equals(localHome);
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				return LOCAL_EDEFAULT == null ? local != null : !LOCAL_EDEFAULT.equals(local);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (localHome: ");
-		result.append(localHome);
-		result.append(", local: ");
-		result.append(local);
-		result.append(')');
-		return result.toString();
-	}
-
-/**
- * Return true if the ejbref is for a local ejb interface.
- */
-public boolean isLocal(){
-	return true;
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#getRemote()
-	 */
-	public String getRemote() {
-		return getLocal(); //forward to the local
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#setRemote(java.lang.String)
-	 */
-	public void setRemote(String value) {
-		setLocal(value); //forward to the local
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#getHome()
-	 */
-	public String getHome() {
-		return getLocalHome(); //forward to the local home
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#setHome(java.lang.String)
-	 */
-	public void setHome(String value) {
-		setLocalHome(value); //forward to the local home
-	}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EjbRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EjbRefImpl.java
deleted file mode 100644
index 9e10cf1ba..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EjbRefImpl.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-/**
- * The ejb-ref element is used for the declaration of a reference to an enterprise bean's home. The declaration consists of an optional description; the EJB reference name used in the code of the referencing application client; the expected type of the referenced enterprise bean; the expected home and remote interfaces of the referenced enterprise bean; and an optional ejb-link information. The optional  ejb-link element is used to specify the referenced enterprise bean.
- * @generated
- */
-public class EjbRefImpl extends J2EEEObjectImpl implements EjbRef {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EjbRefType TYPE_EDEFAULT = EjbRefType.SESSION_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EjbRefType type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The default value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String home = HOME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REMOTE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String remote = REMOTE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String link = LINK_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public EjbRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.EJB_REF;
-	}
-
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists, within the scope of the parameter.
- * The ejb-link value of the ref must equate to a named enterprise bean contained in the jar; otherwise 
- * return null
- */
-public EnterpriseBean getLinkedEjb(EJBJar ejbJar) {
-	if (getLink() == null) {
-		return null;
-	}
-	return ejbJar.getEnterpiseBeanFromRef(this);
-}/**
- * Return an enterprise bean referenced by the EjbRef, if one exists, within the scope of the parameter.
- * The ejb-link value of the ref must equate to a named enterprise bean contained in the jar; otherwise 
- * return null
- */  
-public boolean isEquivalent(EjbRef anEjbRef) {
-	if (anEjbRef == null) return false;
-	boolean equiv = true;
-	equiv = getName() == anEjbRef.getName() || (getName() != null && getName().equals(anEjbRef.getName()));
-	if (equiv)
-		equiv = getHome() == anEjbRef.getHome() || (getHome() != null && getHome().equals(anEjbRef.getHome()));
-	if (equiv)
-		equiv = getRemote() == anEjbRef.getRemote() || (getRemote() != null && getRemote().equals(anEjbRef.getRemote()));
-	if (equiv)
-		equiv = getLink() == anEjbRef.getLink() || (getLink() != null && getLink().equals(anEjbRef.getLink()));
-	return equiv;
-}
-public boolean isLinked(EnterpriseBean anEJB) {
-	if (getLink() == null)
-		return false;
-	return getLink().equals(anEJB.getName());
-}
-/**
- * Return true if the ejbref is for a local ejb interface.
- */
-public boolean isLocal(){
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The ejb-ref-name element contains the name of an EJB reference. This is the JNDI name that the servlet code uses to get a reference to the enterprise bean.
-	 * Example: <ejb-ref-name>ejb//Payroll<//ejb-ref-name>
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The ejb-ref-type element contains the expected type of the referenced enterprise bean. The ejb-ref-type element must be one of the following:
-	 * <ejb-ref-type>Entity<//ejb-ref-type>
-	 * <ejb-ref-type>Session<//ejb-ref-type>
-	 */
-	public EjbRefType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(EjbRefType newType) {
-		EjbRefType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		EjbRefType oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.EJB_REF__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The home element contains the fully-qualified name of the enterprise bean's home interface.
-	 * Example: <home>com.aardvark.payroll.PayrollHome<//home>
-	 */
-	public String getHome() {
-		return home;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setHome(String newHome) {
-		String oldHome = home;
-		home = newHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__HOME, oldHome, home));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The remote element contains the fully-qualified name of the enterprise bean's remote interface.
-	 */
-	public String getRemote() {
-		return remote;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRemote(String newRemote) {
-		String oldRemote = remote;
-		remote = newRemote;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__REMOTE, oldRemote, remote));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The ejb-link element is used in the ejb-ref element to specify that an EJB reference is linked to an enterprise bean in the encompassing J2EE Application package. The value of the ejb-link element must be the ejb-name of an enterprise bean in the same J2EE Application package. 
-	 * Example: <ejb-link>EmployeeRecord<//ejb-link>
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation The
-	 *            description element is used by the ejb-jar file producer to
-	 *            provide text describing the parent element. The description
-	 *            element should include any information that the ejb-jar file
-	 *            producer wants to provide to the consumer of the ejb-jar file
-	 *            (i.e. to the Deployer). Typically, the tools used by the
-	 *            ejb-jar file consumer will display the description when
-	 *            processing the parent element.
-	 */
-	public void setDescriptionGen(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__DESCRIPTION, oldDescription, description));
-	}
-
-	public void setDescription(String newDescription) {
-		if (!getDescriptions().isEmpty()) {
-        	Description d = (Description) getDescriptions().get(0);
-        	if (d != null)
-        		d.setValue(newDescription);
-        }
-		setDescriptionGen(newDescription);
-	}
-	
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.EJB_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.EJB_REF__NAME:
-				return getName();
-			case CommonPackage.EJB_REF__TYPE:
-				return getType();
-			case CommonPackage.EJB_REF__HOME:
-				return getHome();
-			case CommonPackage.EJB_REF__REMOTE:
-				return getRemote();
-			case CommonPackage.EJB_REF__LINK:
-				return getLink();
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.EJB_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__TYPE:
-				setType((EjbRefType)newValue);
-				return;
-			case CommonPackage.EJB_REF__HOME:
-				setHome((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__REMOTE:
-				setRemote((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.EJB_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__TYPE:
-				unsetType();
-				return;
-			case CommonPackage.EJB_REF__HOME:
-				setHome(HOME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__REMOTE:
-				setRemote(REMOTE_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.EJB_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.EJB_REF__TYPE:
-				return isSetType();
-			case CommonPackage.EJB_REF__HOME:
-				return HOME_EDEFAULT == null ? home != null : !HOME_EDEFAULT.equals(home);
-			case CommonPackage.EJB_REF__REMOTE:
-				return REMOTE_EDEFAULT == null ? remote != null : !REMOTE_EDEFAULT.equals(remote);
-			case CommonPackage.EJB_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", type: ");
-		if (typeESet) result.append(type); else result.append("<unset>");
-		result.append(", home: ");
-		result.append(home);
-		result.append(", remote: ");
-		result.append(remote);
-		result.append(", link: ");
-		result.append(link);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EnvEntryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EnvEntryImpl.java
deleted file mode 100644
index 33d976105..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/EnvEntryImpl.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-
-/**
- * The env-entry element contains the declaration of an application client's environment entries. The declaration consists of an optional description, the name of the environment entry, and an optional value.
- * @generated
- */
-public class EnvEntryImpl extends J2EEEObjectImpl implements EnvEntry {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String value = VALUE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EnvEntryType TYPE_EDEFAULT = EnvEntryType.STRING_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EnvEntryType type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public EnvEntryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.ENV_ENTRY;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry-name element contains the name of an application client's environment entry. 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry-value element contains the value of an application client's environment entry. The value must be a String that is valid for the constructor of the specified type that takes a single String parameter.
-	 * Used in: env-entry
-	 * Example:
-	 * <env-entry-value>//datasources//MyDatabase<//env-entry-value>
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry-type element contains the fully-qualified Java type of the environment entry value that is expected by the application client's code. The following are the legal values of env-entry-type: java.lang.Bool-ean, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte, java.lang.Short, java.lang.Long, and java.lang.Float. 
-	 * Example: <env-entry-type>java.lang.Boolean<//env-entry-type>
-	 */
-	public EnvEntryType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(EnvEntryType newType) {
-		EnvEntryType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		EnvEntryType oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.ENV_ENTRY__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.ENV_ENTRY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.ENV_ENTRY__NAME:
-				return getName();
-			case CommonPackage.ENV_ENTRY__VALUE:
-				return getValue();
-			case CommonPackage.ENV_ENTRY__TYPE:
-				return getType();
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__VALUE:
-				setValue((String)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__TYPE:
-				setType((EnvEntryType)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.ENV_ENTRY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.ENV_ENTRY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case CommonPackage.ENV_ENTRY__TYPE:
-				unsetType();
-				return;
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.ENV_ENTRY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.ENV_ENTRY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case CommonPackage.ENV_ENTRY__TYPE:
-				return isSetType();
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", type: ");
-		if (typeESet) result.append(type); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/IconTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/IconTypeImpl.java
deleted file mode 100644
index d2e2058ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/IconTypeImpl.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.IconType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Icon Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.IconTypeImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IconTypeImpl extends J2EEEObjectImpl implements IconType {
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IconTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.ICON_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSmallIcon() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSmallIcon(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ICON_TYPE__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLargeIcon() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLargeIcon(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ICON_TYPE__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ICON_TYPE__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.ICON_TYPE__LANG:
-				return getLang();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.ICON_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.ICON_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.ICON_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (smallIcon: ");
-		result.append(smallIcon);
-		result.append(", largeIcon: ");
-		result.append(largeIcon);
-		result.append(", lang: ");
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //IconTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/IdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/IdentityImpl.java
deleted file mode 100644
index 8edf2d812..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/IdentityImpl.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.Identity;
-
-
-/**
- * Specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.
- * @generated
- */
-public class IdentityImpl extends J2EEEObjectImpl implements Identity {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public IdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.IDENTITY;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the run as identity.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.IDENTITY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The role-name element contains the name of a security role.
-	 * 
-	 * The name must conform to the lexical rules for an NMTOKEN.
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.IDENTITY__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.IDENTITY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				return getRoleName();
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", roleName: ");
-		result.append(roleName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEEAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEEAttributeImpl.java
deleted file mode 100644
index 3a89e5d2d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEEAttributeImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.J2EEEAttribute;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>J2EEE Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class J2EEEAttributeImpl extends EAttributeImpl implements J2EEEAttribute {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected J2EEEAttributeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.J2EEE_ATTRIBUTE;
-	}
-
-} //J2EEEAttributeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEEObjectImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEEObjectImpl.java
deleted file mode 100644
index 6413581ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEEObjectImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>J2EEE Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class J2EEEObjectImpl extends EObjectImpl implements J2EEEObject {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected J2EEEObjectImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.J2EEE_OBJECT;
-	}
-
-} //J2EEEObjectImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResouceFactorySaxRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResouceFactorySaxRegistry.java
deleted file mode 100644
index 4210a55fd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResouceFactorySaxRegistry.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 11, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.common.internal.impl;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class J2EEResouceFactorySaxRegistry extends J2EEResourceFactoryRegistry {
-    public static J2EEResourceFactoryRegistry INSTANCE = new J2EEResouceFactorySaxRegistry();
-
-    public J2EEResouceFactorySaxRegistry() {
-        super();
-        initRegistration();
-    }
-    private void initRegistration() {
-    	EMF2SAXRendererFactory.INSTANCE.setValidating(false);
-        registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APP_CLIENT_DD_SHORT_NAME, new ApplicationClientResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-	}
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResourceFactoryDomRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResourceFactoryDomRegistry.java
deleted file mode 100644
index 8eb5915a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResourceFactoryDomRegistry.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 20, 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.common.internal.impl;
-
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class J2EEResourceFactoryDomRegistry
-        extends J2EEResourceFactoryRegistry {
-
-    /**
-     * 
-     */
-    public J2EEResourceFactoryDomRegistry() {
-        super();
-        initRegistration();
-    }
-    
-    private void initRegistration() {
-    	EMF2SAXRendererFactory.INSTANCE.setValidating(false);
-        registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APP_CLIENT_DD_SHORT_NAME, new ApplicationClientResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResourceFactoryRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResourceFactoryRegistry.java
deleted file mode 100644
index 3229aba6e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/J2EEResourceFactoryRegistry.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-
-
-public class J2EEResourceFactoryRegistry extends FileNameResourceFactoryRegistry {
-	
-	public static J2EEResourceFactoryRegistry INSTANCE = new J2EEResourceFactoryRegistry();
-
-	public J2EEResourceFactoryRegistry() {
-		super();
-	}
-	
-	public Resource.Factory delegatedGetFactory(URI uri) {
-		if (J2EEResourceFactoryRegistry.INSTANCE == this)
-			return super.delegatedGetFactory(uri);
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(uri);	
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/JNDIEnvRefsGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/JNDIEnvRefsGroupImpl.java
deleted file mode 100644
index 97979e9c1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/JNDIEnvRefsGroupImpl.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JNDI Env Refs Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getEnvironmentProperties <em>Environment Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class JNDIEnvRefsGroupImpl extends CompatibilityDescriptionGroupImpl implements JNDIEnvRefsGroup {
-	/**
-	 * The cached value of the '{@link #getEnvironmentProperties() <em>Environment Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvironmentProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList environmentProperties = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLocalRefs() <em>Ejb Local Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLocalRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbLocalRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JNDIEnvRefsGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.JNDI_ENV_REFS_GROUP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEnvironmentProperties() {
-		if (environmentProperties == null) {
-			environmentProperties = new EObjectContainmentEList(EnvEntry.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES);
-		}
-		return environmentProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEjbLocalRefs() {
-		if (ejbLocalRefs == null) {
-			ejbLocalRefs = new EObjectContainmentEList(EJBLocalRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS);
-		}
-		return ejbLocalRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				return getResourceRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				return getEjbRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				return getServiceRefs();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //JNDIEnvRefsGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ListenerImpl.java
deleted file mode 100644
index 1bd7dd089..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ListenerImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Listener;
-
-
-/**
- * Declares a class in the application must be registered as a web application listener bean.
- */
-public class ListenerImpl extends CompatibilityDescriptionGroupImpl implements Listener {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass listenerClass = null;
-		/**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	protected ListenerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.LISTENER;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The listener-class element declares a class in the application must be registered as a web application listener bean.
-	 */
-	public JavaClass getListenerClass() {
-		if (listenerClass != null && listenerClass.eIsProxy()) {
-			InternalEObject oldListenerClass = (InternalEObject)listenerClass;
-			listenerClass = (JavaClass)eResolveProxy(oldListenerClass);
-			if (listenerClass != oldListenerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonPackage.LISTENER__LISTENER_CLASS, oldListenerClass, listenerClass));
-			}
-		}
-		return listenerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetListenerClass() {
-		return listenerClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setListenerClass(JavaClass newListenerClass) {
-		JavaClass oldListenerClass = listenerClass;
-		listenerClass = newListenerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.LISTENER__LISTENER_CLASS, oldListenerClass, listenerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				if (resolve) return getListenerClass();
-				return basicGetListenerClass();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				setListenerClass((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				setListenerClass((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				return listenerClass != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-/**
- * createClassRef - return a JavaURL reference to the named Java class
- */
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-/**
- * Get the fully qualified class name for the listener.
- */
-public String getListenerClassName() {
-	getListenerClass();
-	return (listenerClass == null) ? null : listenerClass.getQualifiedName();
-}
-/**
- * Sets the listener class name.
- */
-public void setListenerClassName(String listenerClassName) {
-	eSet(CommonPackage.eINSTANCE.getListener_ListenerClass(), createClassRef(listenerClassName));
-}
-} //ListenerImpl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/MessageDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/MessageDestinationImpl.java
deleted file mode 100644
index 8ab113fa7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/MessageDestinationImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDestinationImpl extends CompatibilityDescriptionGroupImpl implements MessageDestination {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDestinationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.MESSAGE_DESTINATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDestinationImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/MessageDestinationRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/MessageDestinationRefImpl.java
deleted file mode 100644
index 76f5abf11..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/MessageDestinationRefImpl.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationUsageType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl#getUsage <em>Usage</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl#getLink <em>Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.MessageDestinationRefImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDestinationRefImpl extends J2EEEObjectImpl implements MessageDestinationRef {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUsage() <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MessageDestinationUsageType USAGE_EDEFAULT = MessageDestinationUsageType.CONSUMES_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getUsage() <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsage()
-	 * @generated
-	 * @ordered
-	 */
-	protected MessageDestinationUsageType usage = USAGE_EDEFAULT;
-	/**
-	 * This is true if the Auth attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @ordered
-	 */
-	protected boolean useESet = false;
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String link = LINK_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDestinationRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.MESSAGE_DESTINATION_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationUsageType getUsage() {
-		return usage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsage(MessageDestinationUsageType newUsage) {
-		MessageDestinationUsageType oldUsage = usage;
-		usage = newUsage == null ? USAGE_EDEFAULT : newUsage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__USAGE, oldUsage, usage));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void unsetUsage() {
-		MessageDestinationUsageType oldUsage = usage;
-		boolean oldUsageESet = useESet;
-		usage = USAGE_EDEFAULT;
-		useESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.MESSAGE_DESTINATION_REF__USAGE, oldUsage, USAGE_EDEFAULT, oldUsageESet));
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public boolean isSetUse() {
-		return useESet;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				return getName();
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				return getType();
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				return getUsage();
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				return getLink();
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				setType((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				setUsage((MessageDestinationUsageType)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				setUsage(USAGE_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				return usage != USAGE_EDEFAULT;
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", usage: ");
-		result.append(usage);
-		result.append(", link: ");
-		result.append(link);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDestinationRefImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ParamValueImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ParamValueImpl.java
deleted file mode 100644
index 364ef8ca0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ParamValueImpl.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.ParamValueImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParamValueImpl extends J2EEEObjectImpl implements ParamValue {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParamValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.PARAM_VALUE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.PARAM_VALUE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.PARAM_VALUE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.PARAM_VALUE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.PARAM_VALUE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				return getName();
-			case CommonPackage.PARAM_VALUE__VALUE:
-				return getValue();
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.PARAM_VALUE__VALUE:
-				setValue((String)newValue);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.PARAM_VALUE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.PARAM_VALUE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ParamValueImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/QNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/QNameImpl.java
deleted file mode 100644
index 368b0c110..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/QNameImpl.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.wst.common.internal.emf.utilities.NamespaceAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>QName</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.QNameImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.QNameImpl#getLocalPart <em>Local Part</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.QNameImpl#getCombinedQName <em>Combined QName</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.common.internal.impl.QNameImpl#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QNameImpl extends J2EEEObjectImpl implements QName {
-	/**
-	 * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespaceURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespaceURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocalPart() <em>Local Part</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_PART_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalPart() <em>Local Part</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localPart = LOCAL_PART_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCombinedQName() <em>Combined QName</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCombinedQName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMBINED_QNAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCombinedQName() <em>Combined QName</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCombinedQName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String combinedQName = COMBINED_QNAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getInternalPrefixOrNsURI() <em>Internal Prefix Or Ns URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInternalPrefixOrNsURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INTERNAL_PREFIX_OR_NS_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInternalPrefixOrNsURI() <em>Internal Prefix Or Ns URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInternalPrefixOrNsURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String internalPrefixOrNsURI = INTERNAL_PREFIX_OR_NS_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected QNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.QNAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNamespaceURIGen() {
-		return namespaceURI;
-	}
-
-	public String getNamespaceURI() {
-		if (namespaceURI != null)
-			return namespaceURI;
-		String resolved = NamespaceAdapter.getResolvedNamespaceURI(internalPrefixOrNsURI, this);
-		return resolved == null ? internalPrefixOrNsURI : resolved;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNamespaceURIGen(String newNamespaceURI) {
-		String oldNamespaceURI = namespaceURI;
-		namespaceURI = newNamespaceURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-	}
-
-	public void setNamespaceURI(String newNamespaceURI) {
-	    String prefix = getInternalPrefixOrNsURI();
-	    String oldNsURI = getInternalPrefixOrNsURI();
-	    if (!StringUtil.stringsEqual(prefix, oldNsURI))
-	        setValues(prefix, newNamespaceURI, getLocalPart());
-	    else {
-	        setNamespaceURIGen(newNamespaceURI);
-	        setInternalPrefixOrNsURI(newNamespaceURI);
-	    }
-			
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalPart() {
-		return localPart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalPartGen(String newLocalPart) {
-		String oldLocalPart = localPart;
-		localPart = newLocalPart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__LOCAL_PART, oldLocalPart, localPart));
-	}
-
-	public void setLocalPart(String newLocalPart) {
-		setLocalPartGen(newLocalPart);
-		updateCombine();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCombinedQName() {
-		return combinedQName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCombinedQNameGen(String newCombinedQName) {
-		String oldCombinedQName = combinedQName;
-		combinedQName = newCombinedQName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__COMBINED_QNAME, oldCombinedQName, combinedQName));
-	}
-
-	public void setCombinedQName(String newCombinedQName) {
-		setCombinedQNameGen(newCombinedQName);
-		updateParse();
-	}
-
-	/**
-	 * Parses the combined name into the components
-	 */
-	private void updateParse() {
-		String ns = null;
-		String lp = null;
-		if (combinedQName != null || combinedQName.length() > 0) {
-			int index = combinedQName.lastIndexOf(':');
-			
-			if (index < 0) { //No separator
-				ns = combinedQName;
-			} else if (index == 0) { //First char
-				lp = combinedQName.substring(1); 
-			} else if (index == combinedQName.length()-1) { //Last char
-				ns = combinedQName.substring(0, index);
-			} else { //In the middle, which is what it should be
-				ns = combinedQName.substring(0, index);
-				lp = combinedQName.substring(index+1, combinedQName.length());
-			}
-		}
-		setInternalPrefixOrNsURIGen(ns);
-		setLocalPartGen(lp);
-	}
-		
-	/**
-	 * updates the combined name from the components
-	 */
-	private void updateCombine() {
-		String cn = null;
-		if (internalPrefixOrNsURI != null || localPart != null) {
-			String ns = internalPrefixOrNsURI == null ? "" : internalPrefixOrNsURI; //$NON-NLS-1$
-			String lp = localPart == null ? "" : localPart; //$NON-NLS-1$
-			cn = ns+':'+lp;
-		}
-		setCombinedQNameGen(cn);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInternalPrefixOrNsURI() {
-		return internalPrefixOrNsURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInternalPrefixOrNsURIGen(String newInternalPrefixOrNsURI) {
-		String oldInternalPrefixOrNsURI = internalPrefixOrNsURI;
-		internalPrefixOrNsURI = newInternalPrefixOrNsURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI, oldInternalPrefixOrNsURI, internalPrefixOrNsURI));
-	}
-
-	public void setInternalPrefixOrNsURI(String newInternalPrefixOrNsURI) {
-		setInternalPrefixOrNsURIGen(newInternalPrefixOrNsURI);
-		updateCombine();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				return getNamespaceURI();
-			case CommonPackage.QNAME__LOCAL_PART:
-				return getLocalPart();
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				return getCombinedQName();
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				return getInternalPrefixOrNsURI();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				setNamespaceURI((String)newValue);
-				return;
-			case CommonPackage.QNAME__LOCAL_PART:
-				setLocalPart((String)newValue);
-				return;
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				setCombinedQName((String)newValue);
-				return;
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-				return;
-			case CommonPackage.QNAME__LOCAL_PART:
-				setLocalPart(LOCAL_PART_EDEFAULT);
-				return;
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				setCombinedQName(COMBINED_QNAME_EDEFAULT);
-				return;
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-			case CommonPackage.QNAME__LOCAL_PART:
-				return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * eIsSet for namespace uri must be derived if null so namespaceURI ! = null and internalPrefixOrNsURI != null must both be check.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				return NAMESPACE_URI_EDEFAULT == null ? (namespaceURI != null || internalPrefixOrNsURI != null) : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-			case CommonPackage.QNAME__LOCAL_PART:
-				return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (namespaceURI: ");
-		result.append(namespaceURI);
-		result.append(", localPart: ");
-		result.append(localPart);
-		result.append(", combinedQName: ");
-		result.append(combinedQName);
-		result.append(", internalPrefixOrNsURI: ");
-		result.append(internalPrefixOrNsURI);
-		result.append(')');
-		return result.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.QName#setValues(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void setValues(String prefix, String nsURI, String localPart) {
-		setInternalPrefixOrNsURIGen(prefix);
-		setLocalPartGen(localPart);
-		String existingURI = NamespaceAdapter.getNamespaceURIAtThisLevel(prefix, this);
-		boolean removed = false;
-		if (existingURI != null && !existingURI.equals(nsURI)) {
-			NamespaceAdapter.removeNamespace(prefix, this);
-			removed = true;
-		} 
-		if (existingURI == null || removed)
-			NamespaceAdapter.addNamespace(prefix, nsURI, this);
-		updateCombine();
-	}
-
-
-} //QNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ResourceEnvRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ResourceEnvRefImpl.java
deleted file mode 100644
index 0ed95419e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ResourceEnvRefImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-
-/**
- * The resource-env-ref element contains a declaration of an enterprise bean's reference to an administered object associated with a resource in the enterprise bean's environment. It consists of an optional description, the resource environment reference name, and an indication of the resource environment reference type expected by the enterprise bean code.
- * 
- * Examples:
- * 
- * <resource-env-ref>
- *     <resource-env-ref-name>jms//StockQueue<//resource-env-ref-name>
- *     <resource-env-ref-type>javax.jms.Queue<//resource-env-ref-type>
- * <//resource-env-ref>
- * @generated
- */
-public class ResourceEnvRefImpl extends J2EEEObjectImpl implements ResourceEnvRef {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass type = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public ResourceEnvRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.RESOURCE_ENV_REF;
-	}
-
-	/**
-	 * createClassRef - return a JavaURL reference to the named Java class
-	 */
-	public JavaClass createClassRef(String targetName) {
-		return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-	}
-
-	public String getTypeName() {
-		getType();
-		return type == null ? null : type.getQualifiedName();
-	}
-
-	public void setTypeName(String className) {
-		eSet(CommonPackage.eINSTANCE.getResourceEnvRef_Type(), createClassRef(className));
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 *            Specifies the name of a resource environment reference; its
-	 *            value is the environment entry name used in the enterprise
-	 *            bean code.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_ENV_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the type of a resource environment reference.  See the class description for an example.
-	 */
-	public JavaClass getType() {
-		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (JavaClass)eResolveProxy(oldType);
-			if (type != oldType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonPackage.RESOURCE_ENV_REF__TYPE, oldType, type));
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(JavaClass newType) {
-		JavaClass oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_ENV_REF__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				return getName();
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				setType((JavaClass)newValue);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				setType((JavaClass)null);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				return type != null;
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ResourceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ResourceRefImpl.java
deleted file mode 100644
index 45ea5a126..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/ResourceRefImpl.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResSharingScopeType;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-
-/**
- * The resource-ref element contains a declaration of application clients's reference to an external resource. It consists of an optional description, the resource factory reference name, the indication of the resource factory type expected by the application client's code, and the type of authentication (bean or container).
- * Example:
- * <resource-ref>
- * <res-ref-name>EmployeeAppDB<//res-ref-name>
- * <res-type>javax.sql.DataSource<//res-type>
- * <res-auth>Container<//res-auth>
- * <//resource-ref>
- * @generated
- */
-public class ResourceRefImpl extends J2EEEObjectImpl implements ResourceRef {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String type = TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuth() <em>Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResAuthTypeBase AUTH_EDEFAULT = ResAuthTypeBase.CONTAINER_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ResAuthTypeBase auth = AUTH_EDEFAULT;
-	/**
-	 * This is true if the Auth attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean authESet = false;
-
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String link = LINK_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getResSharingScope() <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResSharingScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResSharingScopeType RES_SHARING_SCOPE_EDEFAULT = ResSharingScopeType.SHAREABLE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ResSharingScopeType resSharingScope = RES_SHARING_SCOPE_EDEFAULT;
-	/**
-	 * This is true if the Res Sharing Scope attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resSharingScopeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public ResourceRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.RESOURCE_REF;
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-ref-name element specifies the name of the resource factory reference name. The resource factory reference name is the name of the application client's environment entry whose value contains the JNDI name of the data source.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-type element specifies the type of the data source. The type is specified by the Java interface (or class) expected to be implemented by the data source.
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__TYPE, oldType, type));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-auth element specifies whether the enterprise bean code signs on programmatically to the resource manager, or whether the Container will sign on to the resource manager on behalf of the bean. In the latter case, the Container uses information that is supplied by the Deployer.  The value of this element must be one of the two following:
-	 * <res-auth>Application<//res-auth>
-	 * <res-auth>Container<//res-auth>
-	 */
-	public ResAuthTypeBase getAuth() {
-		return auth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuth(ResAuthTypeBase newAuth) {
-		ResAuthTypeBase oldAuth = auth;
-		auth = newAuth == null ? AUTH_EDEFAULT : newAuth;
-		boolean oldAuthESet = authESet;
-		authESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__AUTH, oldAuth, auth, !oldAuthESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAuth() {
-		ResAuthTypeBase oldAuth = auth;
-		boolean oldAuthESet = authESet;
-		auth = AUTH_EDEFAULT;
-		authESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.RESOURCE_REF__AUTH, oldAuth, AUTH_EDEFAULT, oldAuthESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAuth() {
-		return authESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-sharing-scope element specifies whether connections obtained
-	 * through the given resource manager connection factory reference can be
-	 * shared. The value of this element, if specified, must be one of the
-	 * two following:  Shareable, Unshareable
-	 * 
-	 * The default value is Shareable.
-
-	 */
-	public ResSharingScopeType getResSharingScope() {
-		return resSharingScope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResSharingScope(ResSharingScopeType newResSharingScope) {
-		ResSharingScopeType oldResSharingScope = resSharingScope;
-		resSharingScope = newResSharingScope == null ? RES_SHARING_SCOPE_EDEFAULT : newResSharingScope;
-		boolean oldResSharingScopeESet = resSharingScopeESet;
-		resSharingScopeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE, oldResSharingScope, resSharingScope, !oldResSharingScopeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResSharingScope() {
-		ResSharingScopeType oldResSharingScope = resSharingScope;
-		boolean oldResSharingScopeESet = resSharingScopeESet;
-		resSharingScope = RES_SHARING_SCOPE_EDEFAULT;
-		resSharingScopeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE, oldResSharingScope, RES_SHARING_SCOPE_EDEFAULT, oldResSharingScopeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResSharingScope() {
-		return resSharingScopeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.RESOURCE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.RESOURCE_REF__NAME:
-				return getName();
-			case CommonPackage.RESOURCE_REF__TYPE:
-				return getType();
-			case CommonPackage.RESOURCE_REF__AUTH:
-				return getAuth();
-			case CommonPackage.RESOURCE_REF__LINK:
-				return getLink();
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				return getResSharingScope();
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__TYPE:
-				setType((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__AUTH:
-				setAuth((ResAuthTypeBase)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				setResSharingScope((ResSharingScopeType)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__AUTH:
-				unsetAuth();
-				return;
-			case CommonPackage.RESOURCE_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				unsetResSharingScope();
-				return;
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.RESOURCE_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.RESOURCE_REF__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case CommonPackage.RESOURCE_REF__AUTH:
-				return isSetAuth();
-			case CommonPackage.RESOURCE_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				return isSetResSharingScope();
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", auth: ");
-		if (authESet) result.append(auth); else result.append("<unset>");
-		result.append(", link: ");
-		result.append(link);
-		result.append(", resSharingScope: ");
-		if (resSharingScopeESet) result.append(resSharingScope); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/RunAsSpecifiedIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/RunAsSpecifiedIdentityImpl.java
deleted file mode 100644
index 10545a75e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/RunAsSpecifiedIdentityImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-
-
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It    contains an optional description and a specification of the security identity to be used.
- * @generated
- */
-public class RunAsSpecifiedIdentityImpl extends SecurityIdentityImpl implements RunAsSpecifiedIdentity {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Identity identity = null;
-	public RunAsSpecifiedIdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.RUN_AS_SPECIFIED_IDENTITY;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Optional specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.
-	 */
-	public Identity getIdentity() {
-		return identity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIdentity(Identity newIdentity, NotificationChain msgs) {
-		Identity oldIdentity = identity;
-		identity = newIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, oldIdentity, newIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setIdentity(Identity newIdentity) {
-		if (newIdentity != identity) {
-			NotificationChain msgs = null;
-			if (identity != null)
-				msgs = ((InternalEObject)identity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, null, msgs);
-			if (newIdentity != null)
-				msgs = ((InternalEObject)newIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, null, msgs);
-			msgs = basicSetIdentity(newIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, newIdentity, newIdentity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				return basicSetIdentity(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				return getIdentity();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				setIdentity((Identity)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				setIdentity((Identity)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				return identity != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isRunAsSpecifiedIdentity()
-	 */
-	public boolean isRunAsSpecifiedIdentity() {
-		return true;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityIdentityImpl.java
deleted file mode 100644
index 6c94abcfa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityIdentityImpl.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-
-
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It
- * contains an optional description and a specification of the security identity to be used.
- * @generated
- */
-public class SecurityIdentityImpl extends J2EEEObjectImpl implements SecurityIdentity {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public SecurityIdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.SECURITY_IDENTITY;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_IDENTITY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isRunAsSpecifiedIdentity()
-	 */
-	public boolean isRunAsSpecifiedIdentity() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isUseCallerIdentity()
-	 */
-	public boolean isUseCallerIdentity() {
-		return false;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityRoleImpl.java
deleted file mode 100644
index ac6983406..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityRoleImpl.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WorkbenchUtil;
-
-/**
- * A semantic grouping of operations that may be performed by a subject.
- * The security-role element contains the declaration of a security role which is used in the security-constraints placed on the web application.
- * @generated
- */
-public class SecurityRoleImpl extends J2EEEObjectImpl implements SecurityRole {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	static boolean inEclipse = WorkbenchUtil.workbenchIsRunning();
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public SecurityRoleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.SECURITY_ROLE;
-	}
-
-public boolean equals(Object o) {
-	if (inEclipse)
-		return super.equals(o);
-		
-	if (o instanceof SecurityRoleImpl) {
-		String r1 = getRoleName();
-		String r2 = ((SecurityRole) o).getRoleName();
-		if ((r1 != null) && (r2 != null)) {
-			if (r1.equals(r2)) {
-				return true;
-			}
-		} else if (r1 == null && r2 == null)
-			return super.equals(o);
-	}
-	return false;
-}
-public int hashCode() {
-	if (inEclipse || getRoleName() == null)
-		return super.hashCode();
-	return getRoleName().hashCode();
-}
-public String toString() {
-	String name = getRoleName() == null ? "<unknown>" : getRoleName(); //$NON-NLS-1$
-	return getClass().getName() + "(" + name + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescriptionGen() {
-		return description;
-	}
-
-	public String getDescription() {
-		if (!getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return getDescriptionGen();
-	}
-
-	public void setDescription(String newDescription) {
-		if (getDescriptions() != null) {
-			if (getDescriptions().isEmpty()) {
-				Description d = new DescriptionImpl();
-				d.setValue(newDescription);
-				getDescriptions().add(d);
-			} else {
-				Description d = (Description) getDescriptions().get(0);
-				if (d != null)
-					d.setValue(newDescription);
-			}
-		}
-		setDescriptionGen(newDescription);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescriptionGen(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation The
-	 *            role-name element contains the name of a role. This element
-	 *            must contain a non-empty string.
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.SECURITY_ROLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				return getRoleName();
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", roleName: ");
-		result.append(roleName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityRoleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityRoleRefImpl.java
deleted file mode 100644
index 4ac80eb42..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/SecurityRoleRefImpl.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-
-
-/**
- * @generated
- */
-public class SecurityRoleRefImpl extends J2EEEObjectImpl implements SecurityRoleRef {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String link = LINK_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public SecurityRoleRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.SECURITY_ROLE_REF;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE_REF__NAME, oldName, name));
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE_REF__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The role-link element is used to link a security role reference to a defined security role. The role-link element must contain the name of one of the security roles defined in the security-role elements.
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				return getName();
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				return getLink();
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", link: ");
-		result.append(link);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/UseCallerIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/UseCallerIdentityImpl.java
deleted file mode 100644
index 18f85b20d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/UseCallerIdentityImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-
-
-/**
- * The use-caller-identity element specifies that the caller's security identity be used as the security identity for the execution of the enterprise bean's methods.
- * @generated
- */
-public class UseCallerIdentityImpl extends SecurityIdentityImpl implements UseCallerIdentity {
-
-	public UseCallerIdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.Literals.USE_CALLER_IDENTITY;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isUseCallerIdentity()
-	 */
-	public boolean isUseCallerIdentity() {
-		return true;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceFactory.java
deleted file mode 100644
index 329b7afa2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @deprecated Since 4/22/2003
- * This is replaced with concrete implementers of {@link com.ibm.etools.emf2xml.impl.TranslatorResourceFactory}
- */
-
-public abstract class XMLResourceFactory extends ResourceFactoryImpl {
-/**
- * EJBJarResourceFactory constructor comment.
- */
-public XMLResourceFactory() {
-	//TODO: Delete this class
-	super();
-}
-
-/**
- * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl#createResource(URI)
- */
-public final Resource createResource(URI uri) {
-	XMLResource resource = primCreateResource(uri);
-	resource.getDefaultSaveOptions().put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-    resource.getDefaultSaveOptions().put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_LINE_WIDTH, new Integer(80));
-    return resource;
-}
-
-/**
- * Method primCreateResource.
- * @param uri
- * @return XMLResource
- */
-protected abstract XMLResource primCreateResource(URI uri) ;
-
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java
deleted file mode 100644
index 9fc4db367..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.impl;
-
-import java.math.BigDecimal;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
-import org.xml.sax.EntityResolver;
-
-
-public abstract class XMLResourceImpl extends TranslatorResourceImpl implements XMLResource,J2EEVersionResource {
-	/** Indicator to determine if this resource was loaded as an alt-dd (from an ear),
-	  * default is false */
-	protected boolean isAlt = false;
-	/** The application which declared the alt-dd for this resource; exists only if this resource is and
-	  * alt dd */
-	protected Application application;
-	protected boolean isNew = true;
-	
-	
-	private static class RootVersionAdapter extends AdapterImpl {
-		static final String ADAPTER_TYPE = RootVersionAdapter.class.getName();
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-		 */
-		public boolean isAdapterForType(Object type) {
-			return super.isAdapterForType(type);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getFeatureID(null) == RESOURCE__CONTENTS &&
-				msg.getEventType() == Notification.ADD) {
-					((XMLResourceImpl)msg.getNotifier()).syncVersionOfRootObject();
-					((Notifier)msg.getNotifier()).eAdapters().remove(this);
-				}
-		}
-		
-		
-
-	
-	}
-	
-	/**
-	 * @deprecated since 4/29/2003 - used for compatibility
-	 * Subclasses should be using the Renderers and translator framework 
-	 */
-	public XMLResourceImpl() {
-		super();
-	}
-
-	/**
-	 * @deprecated since 4/29/2003 - used for compatibility
-	 * Subclasses should be using the Renderers and translator framework 
-	 */
-	public XMLResourceImpl(URI uri) {
-		super(uri);
-	}
-	
-	public XMLResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	public XMLResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#initializeContents()
-	 */
-	protected void initializeContents() {
-		super.initializeContents();
-		eAdapters().add(new RootVersionAdapter());
-	}
-
-	
-	/**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	public boolean isAlt() {
-		return isAlt;
-	}
-	
-	
-	public void setApplication(Application newApplication) {
-		application = newApplication;
-	}
-	/**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	public void setIsAlt(boolean isAlternateDD) {
-		isAlt = isAlternateDD;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return J2EE_1_4_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setDoctypeValues(java.lang.String, java.lang.String)
-	 * This is setting the module version on the resource, where values are different that the J2EE version, this will be overridden
-	 */
-	public void setDoctypeValues(String publicId, String systemId) {
-		int version = J2EE_1_4_ID;
-		if (systemId == null) 
-			version = J2EE_1_4_ID;
-		else if (systemId.equals(getJ2EE_1_3_SystemID()) || systemId.equals(getJ2EE_Alt_1_3_SystemID()))
-			version = J2EE_1_3_ID;
-		else if (systemId.equals(getJ2EE_1_2_SystemID()) || systemId.equals(getJ2EE_Alt_1_2_SystemID()))
-			version = J2EE_1_2_ID;
-		super.setDoctypeValues(publicId, systemId);
-		setJ2EEVersionID(version);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#usesDTD()
-	 */
-	public boolean usesDTD() {
-		return getVersionID() != J2EE_1_4_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setVersionID(int)
-	 * @deprecated, Use setJ2EEVersionID() to set module version based on j2ee version
-	 **/
-	public void setVersionID(int id) {
-		setJ2EEVersionID(id);
-	}
-	protected void primSetVersionID(int id) {
-		super.setVersionID(id);
-	}
-	protected void primSetDoctypeValues(String aPublicId, String aSystemId) {
-		super.setDoctypeValues(aPublicId,aSystemId);
-	}
-	/*
-	 * Sets the module version based on the J2EE version
-	 */
-	public abstract void setJ2EEVersionID(int id);
-	/*
-	 * Sets the module version directly
-	 * */
-	 public abstract void setModuleVersionID(int id);
-	/**
-	 * @deprecated 
-	 * (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.XMLResource#isJ2EE1_3()
-	 */
-	public boolean isJ2EE1_3() {
-		return getVersionID() == J2EE_1_3_ID;
-	}
-	
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)}, 
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the system id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	public void setPublicId(String id) {
-		setDoctypeValues(id, getSystemId());
-	}
-	
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)},
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the public id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	public void setSystemId(String id) {
-		setDoctypeValues(getPublicId(), id);
-	}
-	protected String getDefaultPublicId() {
-		switch (getVersionID()) {
-			case (J2EE_1_2_ID) :
-				return getJ2EE_1_2_PublicID();
-			case (J2EE_1_3_ID) :	
-				return getJ2EE_1_3_PublicID();
-			default :
-				return null;
-		}	
-	}
-
-	protected String getDefaultSystemId() {
-		switch (getVersionID()) {
-			case (J2EE_1_2_ID) :
-				return getJ2EE_1_2_SystemID();
-			case (J2EE_1_3_ID) :	
-				return getJ2EE_1_3_SystemID();
-			default :
-				return null;
-		}
-	}
-	
-	public abstract String getJ2EE_1_2_PublicID();
-	
-	public abstract String getJ2EE_1_2_SystemID();
-	
-	/**
-	 * By default just return the proper 1.2 system ID, subclasses may override
-	 * @return alternate string for system ID
-	 */
-	public String getJ2EE_Alt_1_2_SystemID() {
-		return getJ2EE_1_2_SystemID();
-	}
-	
-	public abstract String getJ2EE_1_3_PublicID();
-	
-	public abstract String getJ2EE_1_3_SystemID();
-	
-	/**
-	 * By default just return the proper 1.3 system ID, subclasses may override
-	 * @return alternate string for system ID
-	 */
-	public String getJ2EE_Alt_1_3_SystemID() {
-		return getJ2EE_1_3_SystemID();
-	}
-	
-	
-	public NotificationChain basicSetResourceSet(ResourceSet aResourceSet, NotificationChain notifications) {
-		if (aResourceSet == null && this.resourceSet != null)
-			preDelete();
-		return super.basicSetResourceSet(aResourceSet, notifications);
-	}
-		
-	public Application getApplication() {
-		return application;
-	}
-	
-	/**
-	 * @deprecated - use getJ2EEVersionID() and getModuleVersionID()
-	 */
-	public int getVersionID() {
-		return getJ2EEVersionID();
-	}
-	
-	public EntityResolver getEntityResolver() {
-		return J2EEXmlDtDEntityResolver.INSTANCE;
-	}	
-	/* All subclasses will derive this value based on their module version
-	 */
-	public abstract int getJ2EEVersionID();
-
-	
-
-	/* This will be computed during loads of the resource
-	 */
-	public int getModuleVersionID() {
-		return super.getVersionID();
-	}
-	
-	protected abstract void syncVersionOfRootObject();
-	
-	protected String getModuleVersionString() {
-		
-		int ver = getModuleVersionID();
-		return new BigDecimal(String.valueOf(ver)).movePointLeft(1).toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonAdapterFactory.java
deleted file mode 100644
index 48d1fb632..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonAdapterFactory.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.jst.j2ee.common.*;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-
-
-
-public class CommonAdapterFactory extends AdapterFactoryImpl {
-	protected static CommonPackage modelPackage;
-
-	public CommonAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createSecurityRoleAdapter() {
-		return null;
-	}
-
-	public Adapter createResourceRefAdapter() {
-		return null;
-	}
-
-	public Adapter createEjbRefAdapter() {
-		return null;
-	}
-
-	public Adapter createEJBLocalRefAdapter() {
-		return null;
-	}
-
-	public Adapter createEnvEntryAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityRoleRefAdapter() {
-		return null;
-	}
-
-	public Adapter createRunAsSpecifiedIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createUseCallerIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createResourceEnvRefAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CommonSwitch modelSwitch =
-		new CommonSwitch() {
-			public Object caseEjbRef(EjbRef object) {
-				return createEjbRefAdapter();
-			}
-			public Object caseEnvEntry(EnvEntry object) {
-				return createEnvEntryAdapter();
-			}
-			public Object caseResourceRef(ResourceRef object) {
-				return createResourceRefAdapter();
-			}
-			public Object caseSecurityRoleRef(SecurityRoleRef object) {
-				return createSecurityRoleRefAdapter();
-			}
-			public Object caseSecurityRole(SecurityRole object) {
-				return createSecurityRoleAdapter();
-			}
-			public Object caseResourceEnvRef(ResourceEnvRef object) {
-				return createResourceEnvRefAdapter();
-			}
-			public Object caseEJBLocalRef(EJBLocalRef object) {
-				return createEJBLocalRefAdapter();
-			}
-			public Object caseRunAsSpecifiedIdentity(RunAsSpecifiedIdentity object) {
-				return createRunAsSpecifiedIdentityAdapter();
-			}
-			public Object caseIdentity(Identity object) {
-				return createIdentityAdapter();
-			}
-			public Object caseIconType(IconType object) {
-				return createIconTypeAdapter();
-			}
-			public Object caseDisplayName(DisplayName object) {
-				return createDisplayNameAdapter();
-			}
-			public Object caseMessageDestinationRef(MessageDestinationRef object) {
-				return createMessageDestinationRefAdapter();
-			}
-			public Object caseMessageDestination(MessageDestination object) {
-				return createMessageDestinationAdapter();
-			}
-			public Object caseParamValue(ParamValue object) {
-				return createParamValueAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-				return createJNDIEnvRefsGroupAdapter();
-			}
-			public Object caseSecurityIdentity(SecurityIdentity object) {
-				return createSecurityIdentityAdapter();
-			}
-			public Object caseUseCallerIdentity(UseCallerIdentity object) {
-				return createUseCallerIdentityAdapter();
-			}
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object caseListener(Listener object) {
-				return createListenerAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseJ2EEEAttribute(J2EEEAttribute object) {
-				return createJ2EEEAttributeAdapter();
-			}
-			public Object caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			public Object caseENamedElement(ENamedElement object) {
-				return createENamedElementAdapter();
-			}
-			public Object caseETypedElement(ETypedElement object) {
-				return createETypedElementAdapter();
-			}
-			public Object caseEStructuralFeature(EStructuralFeature object) {
-				return createEStructuralFeatureAdapter();
-			}
-			public Object caseEAttribute(EAttribute object) {
-				return createEAttributeAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityRoleAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createResourceRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEjbRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBLocalRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEnvEntryAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityRoleRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRunAsSpecifiedIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createUseCallerIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.Description
-	 * @generated
-	 */
-	public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.QName
-	 * @generated
-	 */
-	public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.Listener <em>Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.Listener
-	 * @generated
-	 */
-	public Adapter createListenerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEAttribute <em>J2EEE Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEAttribute
-	 * @generated
-	 */
-	public Adapter createJ2EEEAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ENamedElement <em>ENamed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.ENamedElement
-	 * @generated
-	 */
-	public Adapter createENamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ETypedElement <em>ETyped Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.ETypedElement
-	 * @generated
-	 */
-	public Adapter createETypedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EStructuralFeature <em>EStructural Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EStructuralFeature
-	 * @generated
-	 */
-	public Adapter createEStructuralFeatureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EAttribute <em>EAttribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EAttribute
-	 * @generated
-	 */
-	public Adapter createEAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.IconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.IconType
-	 * @generated
-	 */
-	public Adapter createIconTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DisplayName
-	 * @generated
-	 */
-	public Adapter createDisplayNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.MessageDestinationRef <em>Message Destination Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestinationRef
-	 * @generated
-	 */
-	public Adapter createMessageDestinationRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.MessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.MessageDestination
-	 * @generated
-	 */
-	public Adapter createMessageDestinationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.ParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.ParamValue
-	 * @generated
-	 */
-	public Adapter createParamValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	public Adapter createJNDIEnvRefsGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createResourceEnvRefAdapterGen() {
-		return null;
-	}
-
-} //CommonAdapterFactory
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonSwitch.java
deleted file mode 100644
index c99146a78..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonSwitch.java
+++ /dev/null
@@ -1,761 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.jst.j2ee.common.*;
-
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.common.CommonPackage
- * @generated
- */
-public class CommonSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static CommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonSwitch() {
-		if (modelPackage == null) {
-			modelPackage = CommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case CommonPackage.EJB_REF: {
-				EjbRef ejbRef = (EjbRef)theEObject;
-				Object result = caseEjbRef(ejbRef);
-				if (result == null) result = caseJ2EEEObject(ejbRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.ENV_ENTRY: {
-				EnvEntry envEntry = (EnvEntry)theEObject;
-				Object result = caseEnvEntry(envEntry);
-				if (result == null) result = caseJ2EEEObject(envEntry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.RESOURCE_REF: {
-				ResourceRef resourceRef = (ResourceRef)theEObject;
-				Object result = caseResourceRef(resourceRef);
-				if (result == null) result = caseJ2EEEObject(resourceRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.SECURITY_ROLE_REF: {
-				SecurityRoleRef securityRoleRef = (SecurityRoleRef)theEObject;
-				Object result = caseSecurityRoleRef(securityRoleRef);
-				if (result == null) result = caseJ2EEEObject(securityRoleRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.SECURITY_ROLE: {
-				SecurityRole securityRole = (SecurityRole)theEObject;
-				Object result = caseSecurityRole(securityRole);
-				if (result == null) result = caseJ2EEEObject(securityRole);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.RESOURCE_ENV_REF: {
-				ResourceEnvRef resourceEnvRef = (ResourceEnvRef)theEObject;
-				Object result = caseResourceEnvRef(resourceEnvRef);
-				if (result == null) result = caseJ2EEEObject(resourceEnvRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.EJB_LOCAL_REF: {
-				EJBLocalRef ejbLocalRef = (EJBLocalRef)theEObject;
-				Object result = caseEJBLocalRef(ejbLocalRef);
-				if (result == null) result = caseEjbRef(ejbLocalRef);
-				if (result == null) result = caseJ2EEEObject(ejbLocalRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY: {
-				RunAsSpecifiedIdentity runAsSpecifiedIdentity = (RunAsSpecifiedIdentity)theEObject;
-				Object result = caseRunAsSpecifiedIdentity(runAsSpecifiedIdentity);
-				if (result == null) result = caseSecurityIdentity(runAsSpecifiedIdentity);
-				if (result == null) result = caseJ2EEEObject(runAsSpecifiedIdentity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.IDENTITY: {
-				Identity identity = (Identity)theEObject;
-				Object result = caseIdentity(identity);
-				if (result == null) result = caseJ2EEEObject(identity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.ICON_TYPE: {
-				IconType iconType = (IconType)theEObject;
-				Object result = caseIconType(iconType);
-				if (result == null) result = caseJ2EEEObject(iconType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.DISPLAY_NAME: {
-				DisplayName displayName = (DisplayName)theEObject;
-				Object result = caseDisplayName(displayName);
-				if (result == null) result = caseJ2EEEObject(displayName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.MESSAGE_DESTINATION_REF: {
-				MessageDestinationRef messageDestinationRef = (MessageDestinationRef)theEObject;
-				Object result = caseMessageDestinationRef(messageDestinationRef);
-				if (result == null) result = caseJ2EEEObject(messageDestinationRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.MESSAGE_DESTINATION: {
-				MessageDestination messageDestination = (MessageDestination)theEObject;
-				Object result = caseMessageDestination(messageDestination);
-				if (result == null) result = caseCompatibilityDescriptionGroup(messageDestination);
-				if (result == null) result = caseDescriptionGroup(messageDestination);
-				if (result == null) result = caseJ2EEEObject(messageDestination);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.PARAM_VALUE: {
-				ParamValue paramValue = (ParamValue)theEObject;
-				Object result = caseParamValue(paramValue);
-				if (result == null) result = caseJ2EEEObject(paramValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.DESCRIPTION_GROUP: {
-				DescriptionGroup descriptionGroup = (DescriptionGroup)theEObject;
-				Object result = caseDescriptionGroup(descriptionGroup);
-				if (result == null) result = caseJ2EEEObject(descriptionGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.JNDI_ENV_REFS_GROUP: {
-				JNDIEnvRefsGroup jndiEnvRefsGroup = (JNDIEnvRefsGroup)theEObject;
-				Object result = caseJNDIEnvRefsGroup(jndiEnvRefsGroup);
-				if (result == null) result = caseCompatibilityDescriptionGroup(jndiEnvRefsGroup);
-				if (result == null) result = caseDescriptionGroup(jndiEnvRefsGroup);
-				if (result == null) result = caseJ2EEEObject(jndiEnvRefsGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.SECURITY_IDENTITY: {
-				SecurityIdentity securityIdentity = (SecurityIdentity)theEObject;
-				Object result = caseSecurityIdentity(securityIdentity);
-				if (result == null) result = caseJ2EEEObject(securityIdentity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.USE_CALLER_IDENTITY: {
-				UseCallerIdentity useCallerIdentity = (UseCallerIdentity)theEObject;
-				Object result = caseUseCallerIdentity(useCallerIdentity);
-				if (result == null) result = caseSecurityIdentity(useCallerIdentity);
-				if (result == null) result = caseJ2EEEObject(useCallerIdentity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.DESCRIPTION: {
-				Description description = (Description)theEObject;
-				Object result = caseDescription(description);
-				if (result == null) result = caseJ2EEEObject(description);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.QNAME: {
-				QName qName = (QName)theEObject;
-				Object result = caseQName(qName);
-				if (result == null) result = caseJ2EEEObject(qName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.LISTENER: {
-				Listener listener = (Listener)theEObject;
-				Object result = caseListener(listener);
-				if (result == null) result = caseCompatibilityDescriptionGroup(listener);
-				if (result == null) result = caseDescriptionGroup(listener);
-				if (result == null) result = caseJ2EEEObject(listener);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP: {
-				CompatibilityDescriptionGroup compatibilityDescriptionGroup = (CompatibilityDescriptionGroup)theEObject;
-				Object result = caseCompatibilityDescriptionGroup(compatibilityDescriptionGroup);
-				if (result == null) result = caseDescriptionGroup(compatibilityDescriptionGroup);
-				if (result == null) result = caseJ2EEEObject(compatibilityDescriptionGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.J2EEE_OBJECT: {
-				J2EEEObject j2EEEObject = (J2EEEObject)theEObject;
-				Object result = caseJ2EEEObject(j2EEEObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case CommonPackage.J2EEE_ATTRIBUTE: {
-				J2EEEAttribute j2EEEAttribute = (J2EEEAttribute)theEObject;
-				Object result = caseJ2EEEAttribute(j2EEEAttribute);
-				if (result == null) result = caseEAttribute(j2EEEAttribute);
-				if (result == null) result = caseEStructuralFeature(j2EEEAttribute);
-				if (result == null) result = caseETypedElement(j2EEEAttribute);
-				if (result == null) result = caseENamedElement(j2EEEAttribute);
-				if (result == null) result = caseEModelElement(j2EEEAttribute);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Ejb Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Ejb Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEjbRef(EjbRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Env Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Env Entry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEnvEntry(EnvEntry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceRef(ResourceRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Role Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Role Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityRoleRef(SecurityRoleRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityRole(SecurityRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Env Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Env Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceEnvRef(ResourceEnvRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Local Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Local Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBLocalRef(EJBLocalRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Run As Specified Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Run As Specified Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRunAsSpecifiedIdentity(RunAsSpecifiedIdentity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityIdentity(SecurityIdentity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIdentity(Identity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Icon Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Icon Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIconType(IconType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDisplayName(DisplayName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Destination Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Destination Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDestinationRef(MessageDestinationRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Destination</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDestination(MessageDestination object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Param Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Param Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseParamValue(ParamValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Use Caller Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Use Caller Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUseCallerIdentity(UseCallerIdentity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Listener</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseListener(Listener object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Attribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEAttribute(J2EEEAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseENamedElement(ENamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseETypedElement(ETypedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEStructuralFeature(EStructuralFeature object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EAttribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EAttribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEAttribute(EAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //CommonSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonUtil.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonUtil.java
deleted file mode 100644
index 56d104623..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/CommonUtil.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.MOFJ2EEResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaFactoryImpl;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationFactoryImpl;
-
-
-public class CommonUtil {
-public static boolean isDeploymentDescriptorRoot(EObject o) {
-	return isDeploymentDescriptorRoot(o, true);
-}
-public static boolean isDeploymentDescriptorRoot(EObject o, boolean includeEars) {
-	EObject meta = o.eClass();
-	return (includeEars && meta == eClassApplication()) ||
-		meta == eClassApplicationClient() ||
-		meta == eClassEJBJar() ||
-		meta == eClassWebApp() ||
-		meta == eClassConnector();
-}
-public static boolean isDeploymentDescriptorRoot(Object o) {
-	return isDeploymentDescriptorRoot(o, true);
-}
-public static boolean isDeploymentDescriptorRoot(Object o, boolean includeEARs) {
-	if (o instanceof EObject)
-		return isDeploymentDescriptorRoot((EObject)o, includeEARs);
-	return false;
-}
-protected static EClass eClassApplication() {
-	return ApplicationFactoryImpl.getPackage().getApplication();
-}
-protected static EClass eClassApplicationClient() {
-	return ClientFactoryImpl.getPackage().getApplicationClient();
-}
-protected static EClass eClassEJBJar() {
-	return EjbFactoryImpl.getPackage().getEJBJar();
-}
-protected static EClass eClassWebApp() {
-	return WebapplicationFactoryImpl.getPackage().getWebApp();
-}
-
-protected static EClass eClassConnector() {
-	return JcaFactoryImpl.getPackage().getConnector();
-}
-/**
- * Safety check method to ensure that the version of the dd object can be computed.
- */
-public static void checkDDObjectForVersion(EObject dd) {
-	if (dd.eIsProxy()) {
-		String proxyUri = ((InternalEObject)dd).eProxyURI().toString();
-		String message = MOFJ2EEResourceHandler.getString(MOFJ2EEResourceHandler.J2EE_VERSION_PROXY_ERROR, new Object[]{proxyUri}); 
-		throw new IllegalStateException(message);
-	} else if (dd.eResource() == null) {
-		String message = MOFJ2EEResourceHandler.J2EE_VERSION_NULL_ERROR; 
-		throw new IllegalStateException(message);
-	}
-}
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/Defaultable.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/Defaultable.java
deleted file mode 100644
index 4301ee406..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/Defaultable.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-import org.eclipse.emf.common.notify.Notifier;
-/**
- * Interface used for objects that can be "fluffed up" on demand, but not serialized unless modified
- * @since 1.0 */
-public interface Defaultable extends Notifier {
-public boolean isDefault();
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/DefaultedAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/DefaultedAdapterImpl.java
deleted file mode 100644
index 405409177..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/DefaultedAdapterImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-/**
- * Insert the type's description here.
- * Creation date: (03/22/01 10:54:22 AM)
- * @author: Administrator
- */
-public abstract class DefaultedAdapterImpl extends AdapterImpl {
-	final static String ADAPTER_KEY = "DEFAULTED_ADAPTER"; //$NON-NLS-1$
-	protected boolean fNotify = true;
-/**
- * DefaultedAdapter constructor comment.
- */
-public DefaultedAdapterImpl() {
-	super();
-}
-public abstract EObject defaultContainer();
-public boolean isAdapterForType(Object type) {
-	return ADAPTER_KEY.equals(type);
-}
-public static boolean isDefault(Defaultable object) {
-	Defaultor defaultor = (Defaultor) retrieveDefaultContainerFor(object);
-	return defaultor != null && defaultor.isDefault(object);
-}
-		
-/**
- * Insert the method's description here.
- * Creation date: (6/13/2001 8:43:41 PM)
- * @return boolean
- */
-public boolean isNotify() {
-	return fNotify;
-}
-public static DefaultedAdapterImpl retrieveAdapterFor(Defaultable notifier) {
-	return (DefaultedAdapterImpl)EcoreUtil.getExistingAdapter(notifier,ADAPTER_KEY);
-}
-public static EObject retrieveDefaultContainerFor(Defaultable notifier) {
-	DefaultedAdapterImpl adapter = retrieveAdapterFor(notifier);
-	return adapter == null ? null : adapter.defaultContainer();
-}
-/**
- * Insert the method's description here.
- * Creation date: (6/13/2001 8:43:41 PM)
- * @param newNotify boolean
- */
-public void setNotify(boolean newNotify) {
-	fNotify = newNotify;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/Defaultor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/Defaultor.java
deleted file mode 100644
index 3aadeb2f8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/Defaultor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-/**
- * Insert the type's description here.
- * Creation date: (6/15/2001 4:58:15 PM)
- * @author: Administrator
- * @since 1.0 */
-public interface Defaultor {
-/**
- * Returns true if this objects create @aDefaultable and it is still
- * currently default and not contained.
- * Creation date: (6/15/2001 4:59:28 PM)
- * @return boolean
- * @param aDefaultable org.eclipse.jst.j2ee.internal.common.util.Defaultable
- */
-boolean isDefault(Defaultable aDefaultable);
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/IDUtility.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/IDUtility.java
deleted file mode 100644
index dfbcdd8ad..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/IDUtility.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-
-
-/**
- * Utility class for generating and setting unique id's for ref objects contained within a resource.  This is needed
- * sometimes when a refobject is referenced by an object in a separate resource.  This utility will force the refobject 
- * to notify after the id gets set, using the static feature on this class.  The object must be contained in a resource
- * for the utility methods to work.
- */
-public class IDUtility {
-
-/**
- * IDUtility constructor comment.
- */
-public IDUtility() {
-	super();
-}
-/**
- * Generate a default id and notify.
- */
-protected static String primSetDefaultID(EObject object) {
-	return IDUtil.getOrAssignID(object);
-}
-	
-/**
- * Generate a default id and notify.
- * Helper for default id generation to support cross document references to non xmi resources
- * (eg, xml deployment descriptors); called from overriden accessors in selected objects;  
- */
-public static String setDefaultID(EObject object) {
-	if (object == null || object.eResource() == null)
-		return null;
-	return primSetDefaultID(object);
-}
-	
-/**
- * Generate a default id and notify, for this object and for all referenced objects that are contained
- * within the same resource.  Helper for default id generation to support cross document references to non xmi resources
- * (eg, xml deployment descriptors); useful for post copy/add  
- */
-public static String setDefaultID(EObject object, boolean recurseChildren) {
-	if (object == null || object.eResource() == null)
-		return null;
-		
-	String result = primSetDefaultID(object);
-
-	if (recurseChildren)
-		setDefaultIDForChildren(object);
-
-	return result;
-}
-	
-protected static void setDefaultIDForChildren(EObject object) {
-
-	List objects = object.eContents();
-	for (int i = 0; i < objects.size(); i++){
-		EObject o = (EObject)objects.get(i);
-		primSetDefaultID(o);
-	}
-}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/XmlSpecifiedDataAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/XmlSpecifiedDataAdapter.java
deleted file mode 100644
index 67d1934f1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/util/XmlSpecifiedDataAdapter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.util;
-
-/**
- * Insert the type's description here.
- * Creation date: (06/04/01 7:56:22 PM)
- * @author: Administrator
- */
-public class XmlSpecifiedDataAdapter extends org.eclipse.emf.common.notify.impl.AdapterImpl {
-	protected final static String ADAPTER_KEY = "XML_SPECIFIED_ADAPTER"; //$NON-NLS-1$
-/**
- * XmlSpecifiedDataAdapter constructor comment.
- */
-public XmlSpecifiedDataAdapter() {
-	super();
-}
-public boolean isAdapterForType(Object type) {
-	return ADAPTER_KEY.equals(type);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/package.xml
deleted file mode 100644
index 1ad91dcba..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/package.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-         This package includes api the common model artifacts that include (Resource References, EJB References, Display Name, Description Group, Security roles, Environment variables). 
-         Using this api the common model artifacts can be created and accessed in any j2ee modules (Enterprise Application, Application Client, Web App, EJB App, Connectors).
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AcknowledgeMode.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AcknowledgeMode.java
deleted file mode 100644
index 2a8a60fd7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AcknowledgeMode.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface AcknowledgeMode {}
- * @since 1.0
- */
-public final class AcknowledgeMode extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int AUTO_ACKNOWLEDGE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DUPS_OK_ACKNOWLEDGE= 1;
-
-	/**
-	 * The '<em><b>Auto Acknowledge</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Auto Acknowledge</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AUTO_ACKNOWLEDGE
-	 * @ordered
-	 */
-	public static final AcknowledgeMode AUTO_ACKNOWLEDGE_LITERAL = new AcknowledgeMode(AUTO_ACKNOWLEDGE, "Auto-acknowledge"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Dups Ok Acknowledge</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Dups Ok Acknowledge</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DUPS_OK_ACKNOWLEDGE
-	 *TODO: generate correctly
-	 * @ordered
-	 */
-	public static final AcknowledgeMode DUPS_OK_ACKNOWLEDGE_LITERAL = new AcknowledgeMode(DUPS_OK_ACKNOWLEDGE, "Dups-ok-acknowledge"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Acknowledge Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AcknowledgeMode[] VALUES_ARRAY =
-		new AcknowledgeMode[] {
-			AUTO_ACKNOWLEDGE_LITERAL,
-			DUPS_OK_ACKNOWLEDGE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Acknowledge Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Acknowledge Mode</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AcknowledgeMode get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AcknowledgeMode result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Acknowledge Mode</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AcknowledgeMode getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AcknowledgeMode result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Acknowledge Mode</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AcknowledgeMode get(int value) {
-		switch (value) {
-			case AUTO_ACKNOWLEDGE: return AUTO_ACKNOWLEDGE_LITERAL;
-			case DUPS_OK_ACKNOWLEDGE: return DUPS_OK_ACKNOWLEDGE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AcknowledgeMode(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-	private AcknowledgeMode(int value, String name) {
-		this(value, name, name);
-	}
-
-} //AcknowledgeMode
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfig.java
deleted file mode 100644
index bf1d0fe62..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfig.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The activation-configType defines information about the
- * expected configuration properties of the message-driven bean
- * in its operational environment. This may include information
- * about message acknowledgement, message selector, expected
- * destination type, etc.
- * 
- * The configuration information is expressed in terms of
- * name/value configuration properties.
- * 
- * The properties that are recognized for a particular
- * message-driven bean are determined by the messaging type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.ActivationConfig#getConfigProperties <em>Config Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.ActivationConfig#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getActivationConfig()
- * @model
- * @generated
- */
-public interface ActivationConfig extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getActivationConfig_ConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.ejb.ActivationConfigProperty" containment="true" required="true"
-	 * @generated
-	 */
-	EList getConfigProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getActivationConfig_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // ActivationConfig
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfigProperty.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfigProperty.java
deleted file mode 100644
index 8829dc951..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfigProperty.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Config Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The activation-config-propertyType contains a name/value
- * configuration property pair for a message-driven bean.
- * 
- * The properties that are recognized for a particular
- * message-driven bean are determined by the messaging type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getActivationConfigProperty()
- * @model
- * @generated
- */
-public interface ActivationConfigProperty extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The activation-config-property-value element
-	 *         contains the value for an activation configuration
-	 *         property of a message-driven bean.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getActivationConfigProperty_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The activation-config-property-name element contains
-	 *         the name for an activation configuration property of
-	 *         a message-driven bean.
-	 * 
-	 *         For JMS message-driven beans, the following property
-	 *         names are recognized: acknowledgeMode,
-	 *         messageSelector, destinationType, subscriptionDurability
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getActivationConfigProperty_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // ActivationConfigProperty
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AssemblyDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AssemblyDescriptor.java
deleted file mode 100644
index f5c995263..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AssemblyDescriptor.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-
-/**
- * The assembly-descriptor element contains application-assembly information.  The application-assembly information consists of the following parts: the definition of security roles, the definition of method permissions, and the definition of transaction attributes for enterprise beans with container-managed transaction demarcation. All the parts are optional in the sense that they are omitted if the lists represented by them are empty. Providing an assembly-descriptor in the deployment descriptor is optional for the ejb-jar file producer.
- * @generated
- * @since 1.0 */
-public interface AssemblyDescriptor extends J2EEEObject {
-
-	/**
-	 * Return the first method permission that contains all the roles in securityRoles and
-	 * is the same size
-	 * @param  securityRoles the list of SecurityRole
-	 * @return The MethodPermission
-	 */
-	MethodPermission getMethodPermission(List securityRoles);
-	/**
-	 * Return a List of MethodElements for @anEJB going
-	 * through the MethodPermissions.
-	 * @param anEJB the Enterprise Bean model
-	 * @return List of MethodElement
-	 */
-	List getMethodPermissionMethodElements(EnterpriseBean anEJB) ;
-	/**
-	 * Return a List of MethodElements for @anEJB going
-	 * through the MethodTransactions.
-	 * @param anEJB the Enterprise Bean model
-	 * @return List of MethodElement
-	 */
-	List getMethodTransactionMethodElements(EnterpriseBean anEJB) ;
-	
-	/**
-	 * Return the SecurityRole given a roleName
-	 * @param roleName the name of the role
-	 * @return SecurityRole
-	 */	
-	public SecurityRole getSecurityRoleNamed(String roleName);
-
-	/**
-	 * Rename the security role, if it exists
-	 * @param existingRoleName the existing role name
-	 * @param newRoleName the new role name
-	 */
-	public void renameSecurityRole(String existingRoleName, String newRoleName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodPermissions references
-	 */
-	EList getMethodPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodTransactions references
-	 * Specifies how the container must manage transaction scopes for the enterprise
-	 * bean's method invocations.  The element consists of an optional description, a
-	 * list of method elements, and a transaction attribute.The transaction attribute
-	 * is to be applied to all the specified methods.
-	 */
-	EList getMethodTransactions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbJar reference
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value the new value of the EjbJar reference
-	 */
-	void setEjbJar(EJBJar value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoles references
-	 */
-	EList getSecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ExcludeList reference
-	 */
-	ExcludeList getExcludeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value the new value of the ExcludeList reference
-	 */
-	void setExcludeList(ExcludeList value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getAssemblyDescriptor_MessageDestinations()
-	 * @model type="org.eclipse.jst.j2ee.common.MessageDestination" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinations();
-
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 * @param anEJB the Enterprise Bean model
-	 */
-	void removeData(EnterpriseBean anEJB) ;
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMPAttribute.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMPAttribute.java
deleted file mode 100644
index 2af6e80b2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMPAttribute.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.j2ee.common.J2EEEAttribute;
-/**
- * Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.
- * @generated
- * @since 1.0 */
-public interface CMPAttribute extends J2EEEAttribute {
-
-	/**
-	 * @deprecated - With EJB 2.0, assuming a Java field is no longer safe.
-	 * 		Use getType() and getName() to get the most common field info.
-	 *		Or use getEjbClass() to get additional Java info.
-	 *@return the Field value
-	 */
-
-	Field getField() ;
-	
-	/**
-	 * The name of the get method corresponding to this attrribute
-	 * @return the String value
-	 */
-	String getGetterName();
-	/**
-	 * Return the type of this attribute in its original form (i.e., unwrapped if
-	 * the type has been wrapped).
-	 * @return JavaHelpers value
-	 */
-	public JavaHelpers getOriginatingType() ;
-	
-	/**
-	 * The name of the set method corresponding to this attrribute
-	 * @return the String value
-	 */
-	String getSetterName();
-	
-	/**
-	 * Returns the Java Type of the attribute
-	 * @return the JavaHelpers
-	 */
-	JavaHelpers getType() ;
-	
-	/**
-	 * Returns true if the attribute is a CMR field
-	 * @return boolean value
-	 */
-	boolean isCMRField() ;
-	
-	/**
-	 * Returns true if the attribute is the key field of the bean
-	 * @return boolean value
-	 */
-	boolean isKey() ;
-	/**
-	 * Returns true if this field is a primkey-field in the deployment descriptor.
-	 * @return boolean value
-	 */
-	public boolean isPrimKeyField();
-	
-	/**
-	 * Sets the originating Java type
-	 * @param newOriginatingType the JavaHelpers
-	 */
-	public void setOriginatingType(JavaHelpers newOriginatingType) ;
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the cmr field.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getCMPAttribute_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Return true if a targetAttribute exists.
-	 * @return boolean value
-	 */
-	boolean isDerived();
-	
-	/**
-	 * Sets the attribute as a derived attribute
-	 * @param aBoolean the boolean value
-	 */
-	void setDerived(boolean aBoolean);
-	
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMRField.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMRField.java
deleted file mode 100644
index 243a971e9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMRField.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jem.java.JavaClass;
-/**
- * Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).
- * 
- * @generated
- * @since 1.0 */
-public interface CMRField extends CMPAttribute{
-
-	/**
-	 * Returns the java CollectionType name
-	 * @return The name of the java collection type
-	 */
-	public  String getCollectionTypeName();  
-	
-	/**
-	 * Sets the java collection type name
-	 * @param typeName the name of the java collection type
-	 */
-	public void setCollectionTypeName(String typeName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Role reference
-	 */
-	EJBRelationshipRole getRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Role reference
-	 */
-	void setRole(EJBRelationshipRole value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The CollectionType reference
-	 */
-	JavaClass getCollectionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CollectionType reference
-	 */
-	void setCollectionType(JavaClass value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationship.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationship.java
deleted file mode 100644
index 89c73209c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationship.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Insert the type's description here.
- * Creation date: (10/26/2001 9:24:27 AM)
- * @author: Administrator
- * @since 1.0 */
-public interface CommonRelationship extends EObject {
-	/**
-	 * Returns the EList of the common roles
-	 * @return EList reference
-	 */
-	public EList getCommonRoles();
-	
-	/**
-	 * Gets the first common role
-	 * @return CommonRelationshipRole reference
-	 */
-	public CommonRelationshipRole getFirstCommonRole();
-	
-	/**
-	 * Gets the second common role
-	 * @return CommonRelationshipRole
-	 */
-	public CommonRelationshipRole getSecondCommonRole();
-	
-	/**
-	 * Returns the name of the CommonRelationship
-	 * @return String value
-	 */
-	public String getName();
-	
-	/**
-	 * Sets the name of the CommonRelationship
-	 * @param value the String value of the name
-	 */
-	public void setName(String value);
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationshipRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationshipRole.java
deleted file mode 100644
index 3a25cbae9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationshipRole.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Insert the type's description here.
- * Creation date: (10/26/2001 9:24:27 AM)
- * @author: Administrator
- * @since 1.0 */
-public interface CommonRelationshipRole extends EObject {
-/**
- * Return the persistentAttributes from my Entity that are used
- * by this role.
- * @return the attributes of the CommonRelationshipRole
- */
-
-public EList getAttributes();
-/**
- * Return our parent relationship as a CommonRelationship
- * @return the CommonRelationship reference
- */
-
-public CommonRelationship getCommonRelationship();
-
-
-/**
-
- * Defines a name for a role that is unique within an ejb-relation. Different relationships can use the same name for a role.
- * @return The value of the Name attribute
-	 */
-	public String getName();
-/**
- * Return the actual name of this role.  This is the name defined in the Deployment
- * Descriptor.  You should use <code>getName()</code> for the name to use in code
- * generation.
- * @return the name of the CommonRelationshipRole 
- */
-String getRoleName();
-/**
- * Return the other role.
- * @return CommonRelationshipRole reference
- */
-
-CommonRelationshipRole getOppositeAsCommonRole() ;
-/**
- * @return The Source ejb
- * Compute the ContainerManagedEntity which is the source of a role that participates in a relationship.
- * @return  ContainerManagedEntity reference
- */
-public ContainerManagedEntity getSourceEntity();
-
-/**
- * Compute the ContainerManagedEntity which is the type of a role that participates in a relationship.
- * @return The type ejb 
- */
-public ContainerManagedEntity getTypeEntity();
-/**
-* @return The computed value of the isForward attribute
-* Specifies whether this role should be mapped to a persistent reference, such as a foreign key.
-*/
-public boolean isForward();
-
-/**
- * Returns true if this is a key 
- * @return The computed value isKey
- */
-public boolean isKey();
-
-/**
- * This method should be used as a hint about the key status of the role.
- * @param aBoolean the boolean value
- */
-public void setKey(boolean aBoolean) ;
-/**
-* @return The computed value isMany
-* Returns whether the upper limit of our multiplicity is > 1
-*/
-public boolean isMany();
-
-/**
-* 
-* sets the upper limit of our multiplicity
-* @param upperBound the int value of the multiplicity
-*/
-public void setUpper(int upperBound);
-
-/**
-* 
-* sets the lower limit of our multiplicity
-* @param lowerBound the int value if the multiplicity
-*/
-public void setLower(int lowerBound);
-
-/**
-* @return The computed value of the isNavigable attribute
-* Specifies that accessors should be generated for this relationship role.
-*/
-public boolean isNavigable();
-
-/**
- * Gets the attribute name of a given CMPAttribute
- * @param roleAttribute the CMPAttribute
- * @return the name of the targetAttribute
- */
-public String getTargetAttributeName(CMPAttribute roleAttribute);
-
-/**
- * Collects the attributes
- *
- */
-void reconcileAttributes();
-	/**
-	 * Method isRequired.
-	 * @return boolean value
-	 */
-	boolean isRequired();
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ContainerManagedEntity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ContainerManagedEntity.java
deleted file mode 100644
index 0e9bd21b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ContainerManagedEntity.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-
-/**
- * @generated
- * @since 1.0 */
-public interface ContainerManagedEntity extends Entity{
-
-	/**
-	 * Denotes 1.x version of the CMP Bean
-	 */
-	String VERSION_1_X = "1.x"; //$NON-NLS-1$
-	
-	/**
-	 * Denotes 2.x version of the CMP Bean
-	 */
-	String VERSION_2_X = "2.x"; //$NON-NLS-1$
-	
-	/**
-	 * 
-	 */
-	String WAS_GENERATED_STRING_KEY = "com.ibm.ws.ejbpersistence.dataaccess.GeneratedStringPK"; //$NON-NLS-1$
-	
-	/**
-	 * 
-	 */
-	String WAS_GENERATED_STRING_FIELD = "wasGenUnknownkeyValue"; //$NON-NLS-1$
-	
-	/**
-	 * Set to java.lang.Object
-	 */
-	String UNKNOWN_PRIMARY_KEY = "java.lang.Object"; //$NON-NLS-1$
-	
-	/**
-	 * Set to java.lang.String
-	 */
-	String JAVA_LANG_STRING = "java.lang.String"; //$NON-NLS-1$
-	
-	/**
-	 * 
-	 */
-	int DERIVED_FLAG_CHANGE = 301;
-	
-	/**
-	 * Create a new instance of CMPAttribute with aName and add it to the keyAttributes     
-	 * of the bean
-	 * @param aName the name of the key attribute
-	 * @return CMPAttribute
-	 */
-	public CMPAttribute addKeyAttributeName(String aName);
-
-	/**
-	 * Add a persistent attribute with the same name as the name for aField.
-	 * @param aField a reference of type Field
-	 * @return CMPAttribute
-	 */
-	public abstract CMPAttribute addPersistentAttribute(Field aField) ;
-	
-	/**
-	 * Create a new instance of CMPAttribute with aName and add it to the persistent attributes
-	 * @param aName the name of the persistent attribute
-	 * @return CMPAttribute
-	 */
-	public abstract CMPAttribute addPersistentAttributeName(String aName) ;
-	/**
-	 * Return the keyAttribute with aName.
-	 * Creation date: (8/8/2000 9:25:27 PM)
-	 * @return EStructuralFeature
-	 * @param aName java.lang.String
-	 */
-	CMPAttribute getKeyAttribute(String aName) ;
-	/**
-	 * Return the persistentAttribute with aName.
-	 * Creation date: (8/8/2000 9:25:27 PM)
-	 * @return EStructuralFeature
-	 * @param aName java.lang.String
-	 */
-	CMPAttribute getPersistentAttribute(String aName) ;
-	/**
-	 * If a primary key exists, return the persistent attribute; the primary key is defined as one and only one
-	 * key attribute, whose type is the same as the key class
-	 * @return a reference to the CMPAttribute
-	 * @deprecated - Use getPrimKeyField()
-	 */
-	CMPAttribute getPrimaryKeyAttribute();
-
-	/**
-	 * Returns true when invoked on the instance of this class
-	 * @return boolean value  
-	 */
-	public boolean isContainerManagedEntity();
-	
-	/**
-	 * Returns true if the CMP is of version 1.X
-	 * @return boolean value
-	 */
-	public boolean isVersion1_X();
-	
-	/**
-	 * Returns true if the CMP is of version 2.X
-	 * @return boolean value
-	 */
-	public boolean isVersion2_X();
-	
-	/**
-	 * Returns true if anAttribute is a key attribute of the CMP
-	 * @param anAttribute a attribute of the CMP of type CMPAttribute
-	 * @return boolean value
-	 */
-	public boolean isKeyAttribute(CMPAttribute anAttribute);
-	
-	/**
-	 * Return whether this bean represents an instance of the "unknown primary key" case
-	 * described in the specification.  This is identified by the primary key class
-	 * being specified as "java.lang.Object".
-	 * In order to deploy an unknown primary key bean, we must substitute a real key,
-	 * and add a corresponding field.
-	 * @return boolean value
-	 */
-	public boolean isUnknownPrimaryKey();
-	
-	/**
-	 * Returns the list of Persistent Field Names
-	 * @return an String array of names 
-	 */
-	public String[] listPersistentFieldNames();
-	
-	/**
-	 * Removes the attribute with the name specified in the aField from the list of persistent attributes
-	 * @param aField the Field reference
-	 * @return CMPAttribute reference
-	 */
-
-	CMPAttribute removePersistentAttribute(Field aField) ;
-	/**
-	 * Remove the persistentAttribute named aName.
-	 * Creation date: (8/2/2000 8:59:32 PM)
-	 * @param aName java.lang.String
-	 * @return CMPAttribute reference
-	 */
-	CMPAttribute removePersistentAttribute(String aName) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Version attribute
-	 * Specifies the version of an entity bean with container-managed persistence.
-	 * 
-	 * @invariant The cmp-version element must be one of the two following: 1.x , 2.x
-	 * @default 2.x
-
-	 */
-	String getVersion();
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	* @throws IllegalStateException throws this exception when an error is encountered in getting version of the CMP
-	* @return the version of CMP represented in int type 
-	*/
-	public int getCMPVersionID() throws IllegalStateException ;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Version attribute
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AbstractSchemaName attribute
-	 * The abstract-schema-name element specifies the name of the abstract schema type 
-	 * of an entity bean with cmp-version 2.x. It is used in EJB QL queries.
-	 * 
-	 * For example, the abstract-schema-name for an entity bean whose local interface
-	 * is com.acme.commerce.Order might be Order.
-	 * 
-
-	 */
-	String getAbstractSchemaName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the AbstractSchemaName attribute
-	 */
-	void setAbstractSchemaName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of PersistentAttributes references
-	 */
-	EList getPersistentAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of KeyAttributes references
-	 */
-	EList getKeyAttributes();
-
-	/**
-	 * Returns the value of the '<em><b>Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.ejb.Query}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.jst.j2ee.ejb.Query#getEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4 moved from CME
-	 * The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.
-	 * 
-	 * @invariant see description
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Queries</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getContainerManagedEntity_Queries()
-	 * @see org.eclipse.jst.j2ee.ejb.Query#getEntity
-	 * @model type="org.eclipse.jst.j2ee.ejb.Query" opposite="entity" containment="true"
-	 * @generated
-	 */
-	EList getQueries();
-
-	/**
-	 * Returns the value of the '<em><b>CMP Attribute</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.ejb.CMPAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CMP Attribute</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>CMP Attribute</em>' reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getContainerManagedEntity_CMPAttribute()
-	 * @model type="org.eclipse.jst.j2ee.ejb.CMPAttribute"
-	 * @generated
-	 */
-	EList getCMPAttribute();
-
-	/**
-	 * Returns the value of the '<em><b>Prim Key Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Prim Key Field</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Prim Key Field</em>' reference.
-	 * @see #setPrimKeyField(CMPAttribute)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getContainerManagedEntity_PrimKeyField()
-	 * @model
-	 * @generated
-	 */
-	CMPAttribute getPrimKeyField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getPrimKeyField <em>Prim Key Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prim Key Field</em>' reference.
-	 * @see #getPrimKeyField()
-	 * @generated
-	 */
-	void setPrimKeyField(CMPAttribute value);
-
-	/**
-	 * Return a List of all the available Query methods for the Home and Local Home interfaces.
-	 * @return List of Find Query Methods
-	 */
-	List getAvailableFindQueryMethods() ;
-	/**
-	 * Return a List of all the available Query methods for the Bean class.
-	 * @return List of Select Query Methods
-	 */
-	List getAvailableSelectQueryMethods();
-	/**
-	 * Return a List, sorted by signature, of all the available Query methods 
-	 * on the remote Home, local Home, or ejbSelect methods on the bean class
-	 * @return List of Query methods
-	 */
-	List getAllAvailableQueryMethods();
-	
-	/**
-	 * Returns the list of EJBExtensionFilter
-	 * @param aFilter a reference of type EJBExtensionFilter
-	 * @return List of filtered features
-	 */
-	public List getFilteredFeatures(EJBExtensionFilter aFilter);
-	
-	/**
-	 * Makes the primary Key Field proxy.
-	 *
-	 */
-	public void makePrimKeyFieldProxy();
-	/**
-	 * Gets the list of CMR Fields
-	 * @return The list of all CMR fields for this bean.
-	 */
-	public List getCMRFields();
-	/**
-	 * @return The list of all roles where this bean is the source.
-	 * @link CommonRelationshipRole
-	 */
-	public List getRoles();
-
-	/**
-	 * Return a specific CommonRelationshipRole which has a named role
-	 * that is equal to <code>roleName</code>.
-	 * @see CommonRelationshipRole
-	 * @param roleName the role name 
-	 * @return a reference to CommonRelationshipRole instance
-	 */
-	public CommonRelationshipRole getRole(String roleName);
-	
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/DestinationType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/DestinationType.java
deleted file mode 100644
index ea2637c66..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/DestinationType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface DestinationType {}
- * @since 1.0
- */
-public final class DestinationType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int QUEUE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int TOPIC= 1;
-
-	/**
-	 * The '<em><b>Queue</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Queue</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #QUEUE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DestinationType QUEUE_LITERAL = new DestinationType(QUEUE, "Queue", "Queue"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Topic</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Topic</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TOPIC
-	 * @generated
-	 * @ordered
-	 */
-	public static final DestinationType TOPIC_LITERAL = new DestinationType(TOPIC, "Topic", "Topic"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Destination Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final DestinationType[] VALUES_ARRAY =
-		new DestinationType[] {
-			QUEUE_LITERAL,
-			TOPIC_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Destination Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Destination Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DestinationType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DestinationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Destination Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DestinationType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DestinationType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Destination Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DestinationType get(int value) {
-		switch (value) {
-			case QUEUE: return QUEUE_LITERAL;
-			case TOPIC: return TOPIC_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private DestinationType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //DestinationType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBExtensionFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBExtensionFilter.java
deleted file mode 100644
index e8d2102aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBExtensionFilter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-/**
- * Insert the type's description here.
- * Creation date: (11/28/2000 5:31:53 PM)
- * @author: Administrator
- * @since 1.0 */
-public interface EJBExtensionFilter {
-	
-	/**
-	 * Return a List of one of the properties using a Filter
-	 * @param ejb reference to the Enterprise Bean model
-	 * @return List
-	 */	
-	List filter(EnterpriseBean ejb) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBJar.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBJar.java
deleted file mode 100644
index dbadea1b6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBJar.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.EjbRef;
-
-/**
- * The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file
- * name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar.
- * @since 1.0 */
-public interface EJBJar extends CompatibilityDescriptionGroup{
-
-/**
- * Return true if there are any ContainerManagedEntity beans in this jar.
- * @return boolean value
- */
-boolean containsContainerManagedBeans() ;
-
-/**
- * Returns true if there is security role with the name specified in the argument
- * @param name the name of the security role
- * @return boolean value
- */
-public boolean containsSecurityRole(String name);
-/**
- * Return List of BeanManaged beans in this jar.
- * @return java.util.List
- */
-List getBeanManagedBeans() ;
-/**
- * Return List of ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-List getContainerManagedBeans() ;
-/**
- * Return List of EJB 1.1 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-List getEJB11ContainerManagedBeans() ;
-/**
- * Return List of EJB 2.0 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-List getEJB20ContainerManagedBeans() ;
-/**
- * Return List of MessageDriven beans in this jar.
- * @return java.util.List
- */
-List getMessageDrivenBeans() ;
-/**
- * @return The list of EjbRelations references
- * A list of ejb-relation elements, which specify the container managed relationships.
- */
-public List getEjbRelations();
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists.  The ejb-link value
- * of the ref must equate to a named enterprise bean contained in the jar; otherwise return
- * null
- * @param ref reference to the EjbRef
- * @return reference to the EnterpriseBean model
- */
-public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref);
-
-/**
- * Return the enterprise bean model which has the bean name of ejbName
- * @param ejbName the name of the Enterprise Bean
- * @return reference to the EnterpriseBean model
- */
-public EnterpriseBean getEnterpriseBeanNamed(String ejbName);
-/**
- * Return ALL EnterpriseBean(s) that are referencing @aJavaClass as a
- * home, remote, bean class, or key class.
- * @param aJavaClass a reference of type JavaClass
- * @return java.util.List of EnterpriseBean
- */
-List getEnterpriseBeansWithReference(JavaClass aJavaClass) ;
-/**
- * Return the *FIRST* EnterpriseBean that is referencing @aJavaClass as its
- * home, remote, bean class, or key class.
- * @param aJavaClass a refernce of type JavaClass
- * @return reference to EnterpriseBean model
- */
-EnterpriseBean getEnterpriseBeanWithReference(JavaClass aJavaClass) ;
-/**
- * Return List of Session beans in this jar.
- * @return java.util.List of EnterpriseBean
- */
-List getSessionBeans() ;
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 1.1 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-boolean isVersion1_1Descriptor() ;
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 2.0 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-boolean isVersion2_0Descriptor() ;
-/**
- * Rename the security role contained in the assembly descriptor; for each enterprise bean, fix the role-link on any contained role
- * refs
- * @param existingRoleName the old name of the Security Role
- * @param newRoleName the new name of the Security Role
- */
-public void renameSecurityRole(String existingRoleName, String newRoleName);
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 *@throws IllegalStateException when an error is encountered while getting the version
-	 *@return the j2ee version of the Enterprise Bean in int
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the EjbClientJar attribute
-	 * The optional ejb-client-jar element specifies a JAR file that contains the
-	 * class files necessary for a client program to access the enterprise beans in
-	 * the ejb-jar file. The Deployer should make the ejb-client JAR file accessible
-	 * to the client's class-loader. 
-	 * Example:<ejb-client-jar>employee_service_client.jar<//ejb-client-jar>
-
-	 */
-	String getEjbClientJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EjbClientJar attribute
-	 */
-	void setEjbClientJar(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The version specifies the version of the
-	 *     EJB specification that the instance document must
-	 *     comply with. This information enables deployment tools
-	 *     to validate a particular EJB Deployment
-	 *     Descriptor with respect to a specific version of the EJB
-	 *     schema.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getEJBJar_Version()
-	 * @model
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	 * @throws IllegalStateException when an error is encountered while getting the spec version of the bean 
-	 * @return the spec version of the EnterpriseBean, 11, 20, 21 
-	 */
-	public int getVersionID() throws IllegalStateException ;
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.EJBJar#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AssemblyDescriptor reference
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the AssemblyDescriptor reference
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of EnterpriseBeans references
-	 * The enterprise-beans element contains the declarations of one or more
-	 * enterprise beans.
-	 */
-	EList getEnterpriseBeans();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RelationshipList reference
-	 * The relationships collection describes the relationships in which container
-	 * managed persistence entity beans and dependent objects participate. The
-	 * relationships element contains an optional description; a list of
-	 * ejb-entity-ref elements (references to entity beans that participate in
-	 * container managed relationships but whose abstract persistence schemas are not
-	 * included in the ejb-jar file);
-	 * and a list of ejb-relation elements, which specify the container managed
-	 * relationships.
-	 */
-	Relationships getRelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RelationshipList reference
-	 */
-	void setRelationshipList(Relationships value);
-
-	/**
-	 * Return the EJBRelationshipRole with the same name as <code>aRoleName</code>
-	 * that has <code>sourceCMP</code> as its source bean.
-	 * @param aRoleName the role name
-	 * @param sourceCMP reference to ContainerManagedEntity
-	 * @return a reference to EJBRelationshipRole
-	 */
-	EJBRelationshipRole getRelationshipRole(String aRoleName, ContainerManagedEntity sourceCMP) ;
-	
-	/**
-	 * Return the first EJBRelation with the same name as <code>aRelationName</code>.
-	 * @param aRelationName the name of the relation
-	 * @return a reference to EJBRelation
-	 */
-	EJBRelation getEJBRelation(String aRelationName) ;
-	
-	/**
-	 * Return all EJBRelation objects that have an EJBRelationshipRole with a
-	 * source EJB of <code>cmp</code>.
-	 * @param cmp reference to ContainerManagedEntity
-	 * @return List of EJBRelation
-	 */
-	List getEJBRelationsForSource(ContainerManagedEntity cmp);
-	
-	/**
-	 * Return all EJBRelationshipRole objects that have an EJBRelationshipRole with a
-	 * type EJB of <code>cmp</code>.
-	 * @param cmp reference to ContainerManagedEntit
-	 * @return List of EJBRelationshipRole
-	 */
-	List getEJBRelationshipRolesForType(ContainerManagedEntity cmp) ;
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBMethodCategory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBMethodCategory.java
deleted file mode 100644
index 3502873aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBMethodCategory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD.
- * @generated
- * @since 1.0 */
-public interface EJBMethodCategory extends J2EEEObject {
-	//EJBMethodCategory
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelation.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelation.java
deleted file mode 100644
index dd3f28b51..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelation.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.
- * 
- * @invariant The name of the relationship, if specified, is unique within the ejb-jar file.
- * @invariant self.relationshipRoles.size == 2
- * @invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name
- * 
- * @migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension
- * @migration EJB1.1 added optional attribute, description:String
- * @migration EJB1.1 added optional attribute, name:String (May have been inherited from EObject previously)
- * @since 1.0 
- * @generated
- * @extends CommonRelationship
- */
-public interface EJBRelation extends J2EEEObject, CommonRelationship {
-
-boolean containsRelationshipRole(EJBRelationshipRole aRole) ;
-EJBRelationshipRole getFirstRole() ;
-/**
- * Return the other role.
- */
-
-EJBRelationshipRole getOppositeRole(EJBRelationshipRole aRole) ;
-EJBRelationshipRole getSecondRole() ;
-/**
- * Set the forward role.
- */
-
-void setFoward(EJBRelationshipRole aRole) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the ejb relation.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The name of the relationship. If specified, must be unique within the ejb-jar
-	 * file.
-	 * @invariant self.name unique within Set<collect(ejbJar.ejbRelations.name)>
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RelationshipList reference
-	 */
-	Relationships getRelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the RelationshipList reference
-	 */
-	void setRelationshipList(Relationships value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of RelationshipRoles references
-	 * A collection containing exactly two relationship roles.
-	 * 
-	 * @migration EJB1.1 Containment used to be by reference on relation--now by value.
-
-	 */
-	EList getRelationshipRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getEJBRelation_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Return the EJBRelationshipRole with the same name as <code>aRoleName</code>.
-	 */
-	EJBRelationshipRole getRelationshipRole(String aRoleName) ;
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelationshipRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelationshipRole.java
deleted file mode 100644
index f8efe7c8a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelationshipRole.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-
-/**
- * The ejb-relationship-role element describes a role within a relationship.
- * There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship.
- * 
- * @invariant multiplicity != null
- * @invariant roleSource != null
- * @invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. 
- * @invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.
- * 
- * Example:
- * <ejb-relation>
- *   <ejb-relation-name>Product-LineItem<//ejb-relation-name>
- *   <ejb-relationship-role>
- *     <ejb-relationship-role-name>product-has-lineitems<//ejb-relationship-role-name>
- *     <multiplicity>One<//multiplicity>
- *     <relationship-role-source>
- *       <ejb-name>ProductEJB<//ejb-name>
- *     <//relationship-role-source>
- *   <//ejb-relationship-role>
- * ...
- * @since 1.0 
- * @generated
- * @extends CommonRelationshipRole
- */
-public interface EJBRelationshipRole extends J2EEEObject, CommonRelationshipRole {
-
-/**
- * @return The logical name which can be used for naming this role.
- * Required to be unique within a JAR.
- * If a cmr-field is defined, then a name in the form %source-ejb-name%_%cmr-field-name% is computed.
- * Otherwise a default ID is generated.
- */
-public String getLogicalName();
-/**
- * Return the other role.
- */
-
-EJBRelationshipRole getOpposite() ;
-/**
- * @return java.lang.String the unique name for this role
- * */
-public java.lang.String getName();
-/**
- * @return The Source ejb
- * Compute the ContainerManagedEntity which is the source of a role that participates in a relationship. 
- */
-public ContainerManagedEntity getSourceEntity();
-/**
-* @return The computed value of the isForward attribute
-* Specifies whether this role should be mapped to a persistent reference, such as a foreign key.
-*/
-public boolean isForward();
-/**
-* @return The computed value isMany
-* Returns whether the upper limit of our multiplicity is > 1
-*/
-public boolean isMany();
-/**
-* @return The computed value of the isNavigable attribute
-* Specifies that accessors should be generated for this relationship role.
-*/
-public boolean isNavigable();
-/**
- * Set this role to be the forward role.
- */
-
-void setFoward() ;
-
-public void setName(java.lang.String uniqueName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the ejb relationship role.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 * Defines a name for a role that is unique within an ejb-relation. Different
-	 * relationships can use the same name for a role.
-
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Multiplicity</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.ejb.MultiplicityKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multiplicity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the multiplicity of the role that participates in a relation.
-	 * 
-	 * The multiplicity element must be one of the two following:
-	 *      One
-	 *      Many
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Multiplicity</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.MultiplicityKind
-	 * @see #isSetMultiplicity()
-	 * @see #unsetMultiplicity()
-	 * @see #setMultiplicity(MultiplicityKind)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getEJBRelationshipRole_Multiplicity()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	MultiplicityKind getMultiplicity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.MultiplicityKind
-	 * @see #isSetMultiplicity()
-	 * @see #unsetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @generated
-	 */
-	void setMultiplicity(MultiplicityKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @see #setMultiplicity(MultiplicityKind)
-	 * @generated
-	 */
-	void unsetMultiplicity();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Multiplicity</em>' attribute is set.
-	 * @see #unsetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @see #setMultiplicity(MultiplicityKind)
-	 * @generated
-	 */
-	boolean isSetMultiplicity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the CascadeDelete attribute
-	 * Specifies that, within a particular relationship, the lifetime of one or more
-	 * entity beans is dependent upon the lifetime of another entity bean. The
-	 * cascade-delete element can Cascade delete can only be specified for an
-	 * EJBRelationshipRole contained in an EJBrelation in which the other
-	 * EJBRelationshipRole element specifies a multiplicity of One.
-	 * 
-	 * 
-
-	 */
-	boolean isCascadeDelete();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CascadeDelete attribute
-	 */
-	void setCascadeDelete(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#isCascadeDelete <em>Cascade Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetCascadeDelete()
-	 * @see #isCascadeDelete()
-	 * @see #setCascadeDelete(boolean)
-	 * @generated
-	 */
-  void unsetCascadeDelete();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#isCascadeDelete <em>Cascade Delete</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cascade Delete</em>' attribute is set.
-	 * @see #unsetCascadeDelete()
-	 * @see #isCascadeDelete()
-	 * @see #setCascadeDelete(boolean)
-	 * @generated
-	 */
-  boolean isSetCascadeDelete();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Relationship reference
-	 */
-	EJBRelation getRelationship();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Relationship reference
-	 */
-	void setRelationship(EJBRelation value);
-
-	void setRequired(Boolean isRequired);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Source reference
-	 * Designates the source of a role that participates in a relationship. A
-	 * relationship-role-source element uniquely identifies an entity bean.
-	 * @migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that
-	 * may not be sufficient, as this can now refer to dependent class names or ejb
-	 * refs
-	 */
-	RoleSource getSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Source reference
-	 */
-	void setSource(RoleSource value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The CmrField reference
-	 * A declaration of the CMRField, if any, by means of which the other side of the
-	 * relationship is accessed from the perspective of the role source
-	 * 
-	 * @migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list
-	 */
-	CMRField getCmrField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the CmrField reference
-	 */
-	void setCmrField(CMRField value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getEJBRelationshipRole_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Return whether this role is part of the key of the source EJB.
-	 */
-	boolean isKey();
-	
-	/**
-	 * This allows you to set the Role as being key so it will
-	 * not traverse it attributes to determine if it is key.
-	 */
-	void setKey(boolean aBoolean) ;
-	
-	void reconcileAttributes() ;
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBResource.java
deleted file mode 100644
index 7ea1b4b0d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBResource.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- * @author schacher
- * @since 1.0 */
-public interface EJBResource extends XMLResource {
-	EJBJar getEJBJar();
-	/**
-	 * Return true if this Resource supports the EJB 1.1 spec.
-	 */
-	boolean isEJB1_1();
-	/**
-	 * Return true if this Resource supports the EJB 2.0 spec.
-	 */
-	boolean isEJB2_0();
-	/**
-	 * Sets the batchMode.
-	 * @param batchMode The batchMode to set
-	 */
-	public void setBatchMode(boolean isBatch);
-	/**
-	 * Gets the batchmode - from the renderer
-	 */
-	public boolean isBatchMode();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java
deleted file mode 100644
index b77307889..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
- 
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jem.java.Method;
-/**
- * @generated
- * @since 1.0 */
-public interface EjbFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EjbFactory eINSTANCE = org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl.init();
-
-	/**
-	 * Creates and returns a reference to a MethodElement from the given signature
-	 * @param aSignature the signature of the MethodElement
-	 * @return MethodElement reference
-	 */
-	MethodElement createMethodElement(String aSignature) ;
-	
-	/**
-	 * Creates and returns a reference to a MethodElement from the given reference of a Method
-	 * @param method the reference of a Method
-	 * @return MethodElement reference
-	 */
-	MethodElement createMethodElementFrom(Method method) ;
-	
-	/**
-	 * Creates and returns a reference to a MethodElement from the given reference of a java.lang.reflect.Method
-	 * @param method reference of a java.lang.reflect.Method
-	 * @return MethodElement reference
-	 */
-	MethodElement createMethodElementFrom(java.lang.reflect.Method method) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodPermission value
-	 */
-	MethodPermission createMethodPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AssemblyDescriptor value
-	 */
-	AssemblyDescriptor createAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodTransaction value
-	 */
-	MethodTransaction createMethodTransaction();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Entity value
-	 */
-	Entity createEntity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContainerManagedEntity value
-	 */
-	ContainerManagedEntity createContainerManagedEntity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMPAttribute value
-	 */
-	CMPAttribute createCMPAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMRField value
-	 */
-	CMRField createCMRField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelationshipRole value
-	 */
-	EJBRelationshipRole createEJBRelationshipRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelation value
-	 */
-	EJBRelation createEJBRelation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Relationships value
-	 */
-	Relationships createRelationships();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBJar value
-	 */
-	EJBJar createEJBJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleSource value
-	 */
-	RoleSource createRoleSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Query value
-	 */
-	Query createQuery();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return QueryMethod value
-	 */
-	QueryMethod createQueryMethod();
-
-	/**
-	 * Returns a new object of class '<em>Activation Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Config Property</em>'.
-	 * @generated
-	 */
-	ActivationConfigProperty createActivationConfigProperty();
-
-	/**
-	 * Returns a new object of class '<em>Activation Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Config</em>'.
-	 * @generated
-	 */
-	ActivationConfig createActivationConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodElement value
-	 */
-	MethodElement createMethodElement();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExcludeList value
-	 */
-	ExcludeList createExcludeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Session value
-	 */
-	Session createSession();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDriven value
-	 */
-	MessageDriven createMessageDriven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDrivenDestination value
-	 */
-	MessageDrivenDestination createMessageDrivenDestination();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBMethodCategory value
-	 */
-	EJBMethodCategory createEJBMethodCategory();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	EjbPackage getEjbPackage();
-
-}
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementComparator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementComparator.java
deleted file mode 100644
index 8acd95e51..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementComparator.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.Comparator;
-
-/**
- * @since 1.0
- */
-
-public class EjbMethodElementComparator implements Comparator {
-	/**
-	 * Specifies the Interface type HOME
-	 */
-	static final int HOME = MethodElementKind.HOME;
-	/**
-	 * Specifies the Interface type REMOTE
-	 */
-	static final int REMOTE = MethodElementKind.REMOTE;
-	/**
-	 * Specifies the Interface type LOCAL_HOME
-	 */
-	static final int LOCAL_HOME = MethodElementKind.LOCAL_HOME;
-	/**
-	 * Specifies the Interface type LOCAL
-	 */
-	static final int LOCAL = MethodElementKind.LOCAL;
-	/**
-	 * The Interface type is unspecified
-	 */
-	static final int UNSPECIFIED = MethodElementKind.UNSPECIFIED;
-
-	/**
-	 * Constructor for EjbMethodElementComparator.
-	 */
-	public EjbMethodElementComparator() {
-		super();
-	}
-
-	/**
-	 * Compares two arguments for order.
-	 * @see Comparator#compare(Object, Object)
-	 *@param o1 the first object to be compared
-	 *@param 02 the second object to be compared
-	 *@return a negative integer, zero, or a positive integer
-	 */
-	public int compare(Object o1, Object o2) {
-		return compare((MethodElement) o1, (MethodElement) o2);
-	}
-	/**
-	 * Sort by type first in the following order:
-	 * Home, Remote, LocalHome, Local, Unspecified
-	 * Then alphabetically order.
-	 *
-	 * @param me1 the first object to be compared
-	 * @param me2 the second object to be compared
-	 * @return a negative integer, zero, or a positive integer
-	 */
-	protected int compare(MethodElement me1, MethodElement me2) {
-		int type1, type2;
-		type1 = me1.getType().getValue();
-		type2 = me2.getType().getValue();
-		if (type1 == type2)
-			return compareSignatures(me1, me2);
-		return compareTypes(type1, type2);
-	}
-
-	/**
-	 * @param type1 the first object to be compared
-	 * @param type2 the second object to be compared
-	 * @return a negative integer, zero, or a positive integer
-	 */
-	protected int compareTypes(int type1, int type2) {
-		if (type1 == HOME)
-			return -1;
-		if (type1 == REMOTE) {
-			if (type2 == HOME)
-				return 1;
-			return -1;
-		}
-		if (type1 == LOCAL_HOME) {
-			if (type2 == HOME || type2 == REMOTE)
-				return 1;
-			return -1;
-		}
-		if (type1 == LOCAL) {
-			if (type2 == HOME || type2 == REMOTE || type2 == LOCAL_HOME)
-				return 1;
-			return -1;
-		}
-		if (type1 == UNSPECIFIED) {
-			if (type2 == HOME || type2 == REMOTE || type2 == LOCAL_HOME || type2 == LOCAL)
-				return 1;
-			return -1;
-		}
-		return -1;
-	}
-	/**
-	 * @param me1 the first object to be compared
-	 * @param me2 the second object to be compared
-	 * @return a negative integer, zero, or a positive integer
-	 */
-	protected int compareSignatures(MethodElement me1, MethodElement me2) {
-		String sig1, sig2;
-		sig1 = me1.getSignature();
-		sig2 = me2.getSignature();
-		return sig1.compareTo(sig2);
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java
deleted file mode 100644
index ac76230d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java
+++ /dev/null
@@ -1,593 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 21, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.ejb;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-/**
- * @author blancett
- * @since 1.0
- * Used to sort and filter method element lists
- */
-public class EjbMethodElementHelper {
-	/**
-	 * Used to filter methods
-	 */
-	public static final int ALL_METHODS = 0;
-	/**
-	 * Used to filter methods
-	 */
-	public static final int HOME_METHODS = 1;
-	/**
-	 * Used to filter methods
-	 */
-	public static final int CLIENT_METHODS = 2;
-	/**
-	 * Used to filter methods
-	 */
-	public static final int REMOTE_METHODS = 3;
-	/**
-	 * Used to filter methods
-	 */
-	public static final int LOCAL_METHODS = 4;
-	/**
-	 * Used to filter methods
-	 */
-	public static final int LOCAL_HOME_METHODS = 5;
-	/**
-	 * Used to filter methods
-	 */
-	public static final int LOCAL_REMOTE_METHODS = 6;
-	/**
-	 * a MethodElement comparator
-	 */
-	protected EjbMethodElementComparator defaultMEComparator;
-	/**
-	 * a MethodElement comparator
-	 */
-	protected EjbMethodElementComparator defaultMethodElementComparator;
-	private static EjbMethodElementHelper singleton;
-	/**
-	 * Used to filter methods
-	 */
-	public static final String DEFAULT_METHOD_NAME = "*"; //$NON-NLS-1$
-	protected static final String METHOD_ELEMENT_NAME = "MethodElement"; //$NON-NLS-1$
-	/**
-	 * Constructor to create helper class
-	 */
-	public EjbMethodElementHelper() {
-		super();
-	}
-	/**
-	 * @return the singleton instance for this helper
-	 */
-	public static EjbMethodElementHelper singleton() {
-		if (singleton == null)
-			singleton = new EjbMethodElementHelper();
-		return singleton;
-	}
-	public boolean isMethodElementsEqual(MethodElement me1, MethodElement me2) {
-		return (me1.getSignature().equals(me2.getSignature()) 
-				&& me1.getEnterpriseBean() == me2.getEnterpriseBean() 
-				&& me1.getMethodParams().equals(me2.getMethodParams()) 
-				&& me1.getType() == me2.getType());
-	}
-	public boolean isMethodElementinList(List meList, Object me) {
-		if (! (me instanceof MethodElement))
-			return false;
-		for (int i = 0; i < meList.size(); i++) {
-			if (meList.get(i) instanceof MethodElement) {
-				MethodElement element = (MethodElement) meList.get(i);
-				if (isMethodElementsEqual(element, (MethodElement)me))
-					return true;
-			}
-		}
-		return false;
-	}
-	/**
-	 * @return a EjbMethodElementComparator
-	 */
-	protected EjbMethodElementComparator getDefaultMEComparator() {
-		if (defaultMEComparator == null)
-			defaultMEComparator = new EjbMethodElementComparator();
-		return defaultMEComparator;
-	}
-	/**
-	 * @return a EjbMethodElementComparator
-	 */
-	protected EjbMethodElementComparator getDefaultMethodElementComparator() {
-		if (defaultMethodElementComparator == null)
-			defaultMethodElementComparator = new EjbMethodElementComparator();
-		return defaultMethodElementComparator;
-	}
-	/**
-	 * @param result
-	 * @param someQueries
-	 */
-	protected void excludeQueryMethods(List result, List someQueries) {
-		if (someQueries.isEmpty())
-			return;
-		int size = someQueries.size();
-		List methods = new ArrayList(size);
-		Query query = null;
-		for (int i = 0; i < size; i++) {
-			query = (Query) someQueries.get(i);
-			methods.add(query.getQueryMethod());
-		}
-		excludeMethodElements(result, methods);
-	}
-	/**
-	 * @param cmp
-	 * @return
-	 */
-	public List getAvailableSelectQueryMethodsExcludingExisting(ContainerManagedEntity cmp) {
-		if (cmp == null)
-			return Collections.EMPTY_LIST;
-		List result = cmp.getAvailableSelectQueryMethods();
-		List existing = cmp.getQueries();
-		excludeQueryMethods(result, existing);
-		return result;
-	}
-	/**
-	 * Used to return finder methods with filter
-	 * @param cmp bean to exclude
-	 * @return list of method elements
-	 */
-	public List getAvailableFindQueryMethodsExcludingExisting(ContainerManagedEntity cmp) {
-		if (cmp == null)
-			return Collections.EMPTY_LIST;
-		List result = cmp.getAvailableFindQueryMethods();
-		List existing = cmp.getQueries();
-		excludeQueryMethods(result, existing);
-		return result;
-	}
-	/**
-	 * @param object
-	 * @param bean used to search
-	 * @return list of method elements
-	 */
-	public List getExistingOrAvailableTransactionMethodElements(EObject object, EnterpriseBean bean) {
-		List result = new ArrayList();
-		result.addAll(getAvailableMethodTransactionMethodElementsExcludingExisting(bean));
-		unionMethodElements(result, getExistingMethodElements(object, bean));
-		Collections.sort(result, getDefaultMEComparator());
-		return result;
-	}
-	/**
-	 * @param refObject
-	 * @param bean
-	 * @return
-	 */
-	protected List getExistingMethodElements(EObject refObject, EnterpriseBean bean) {
-		if (refObject != null) {
-			EjbPackage pack = getEjbPackage();
-			if (refObject.eClass() == pack.getMethodTransaction())
-				return ((MethodTransaction) refObject).getMethodElements(bean);
-			if (refObject.eClass() == pack.getMethodPermission())
-				return ((MethodPermission) refObject).getMethodElements(bean);
-		}
-		return Collections.EMPTY_LIST;
-	}
-	/**
-	 * @param sourceMethodElements
-	 * @param additionalMethodElements
-	 */
-	protected void unionMethodElements(List sourceMethodElements, List additionalMethodElements) {
-		MethodElement sourceME, additionalME;
-		int sourceSize, addSize;
-		sourceSize = sourceMethodElements.size();
-		addSize = additionalMethodElements.size();
-		List foundElements = new ArrayList(addSize);
-		boolean found = false;
-		for (int i = 0; i < addSize; i++) {
-			found = false;
-			additionalME = (MethodElement) additionalMethodElements.get(i);
-			sourceME = null;
-			for (int ii = 0; ii < sourceSize; ii++) {
-				sourceME = (MethodElement) sourceMethodElements.get(ii);
-				if (sourceME.isEquivalent(additionalME)) {
-					found = true;
-					break;
-				}
-			}
-			if (found)
-				foundElements.add(sourceME);
-		}
-		sourceMethodElements.removeAll(foundElements);
-		sourceMethodElements.addAll(additionalMethodElements);
-	}
-	/**
-	 * @param bean
-	 * @return
-	 */
-	public List getAvailableMethodTransactionMethodElementsExcludingExisting(EnterpriseBean bean) {
-		List result = new ArrayList();
-		List filteredMethods = new ArrayList();
-		if (bean.isEntity()) {
-			if (bean.getRemoteInterface() != null) {
-				filteredMethods = bean.getRemoteInterface().getMethodsExtendedWithFilters(Collections.EMPTY_LIST, getEntityMethodTransactionExcludedMethods((Entity) bean, REMOTE_METHODS));
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.REMOTE_LITERAL, bean));
-			}
-			if (bean.getHomeInterface() != null) {
-				filteredMethods = bean.getHomeInterface().getMethodsExtendedWithFilters(Collections.EMPTY_LIST, getEntityMethodTransactionExcludedMethods((Entity) bean, HOME_METHODS));
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.HOME_LITERAL, bean));
-			}
-			if (bean.getLocalInterface() != null) {
-				filteredMethods = bean.getLocalInterface().getMethodsExtendedWithFilters(Collections.EMPTY_LIST, getEntityMethodTransactionExcludedMethods((Entity) bean, LOCAL_METHODS));
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.LOCAL_LITERAL, bean));
-			}
-			if (bean.getLocalHomeInterface() != null)
-				result.addAll(bean.getAvailableLocalHomeMethodElements());
-			result.addAll(bean.getAvailableUnspecifiedMethodElements());
-		} else if (bean.isSession()) {
-			if (bean.getRemoteInterface() != null) {
-				filteredMethods = bean.getRemoteInterface().getMethodsExtendedWithFilters(getSessionMethodTransactionExcludedClasses((Session) bean, REMOTE_METHODS), Collections.EMPTY_LIST);
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.REMOTE_LITERAL, bean));
-			}
-			if (bean.getLocalInterface() != null) {
-				filteredMethods = bean.getLocalInterface().getMethodsExtendedWithFilters(getSessionMethodTransactionExcludedClasses((Session) bean, LOCAL_METHODS), Collections.EMPTY_LIST);
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.LOCAL_LITERAL, bean));
-			}
-			result.add(bean.getAvailableUnspecifiedMethodElements().get(0));
-		} else if (bean.isMessageDriven()) {
-			filteredMethods = Arrays.asList(new Object[]{getMethod(bean.getEjbClass(), getMDBMethod_Sig())});
-			result.addAll(bean.createMethodElements(filteredMethods, bean.getEjbClass()));
-		}
-		return result;
-	}
-	public List getMethodElementSignatures(List methods) {
-		List signatures, sameNames;
-		sameNames = new ArrayList();
-		signatures = new ArrayList(methods.size() + 1);
-		signatures.add(DEFAULT_METHOD_NAME);
-		Iterator it = methods.iterator();
-		Method aMethod;
-		String methodName;
-		while (it.hasNext()) {
-			aMethod = (Method) it.next();
-			methodName = aMethod.getName();
-			if (sameNames.contains(methodName)) {
-				if (!signatures.contains(methodName))
-					signatures.add(methodName);
-			} else
-				sameNames.add(methodName);
-			signatures.add(aMethod.getMethodElementSignature());
-		}
-		Collections.sort(signatures);
-		return signatures;
-	}
-	/**
-	 * Create method elements on EJB
-	 * @param signatures - List of method sigs
-	 * @param aType - The enum type
-	 * @param bean - EJB bean passed
-	 * @return a List of method elements
-	 */
-	protected List createMethodElements(List signatures, Enumerator aType, EnterpriseBean bean) {
-		return createMethodElements(METHOD_ELEMENT_NAME, signatures, aType, bean);
-	}
-	/**
-	 * @return
-	 */
-	protected EjbPackage getEjbPackage() {
-		return EjbFactoryImpl.getPackage();
-	}
-	/**
-	 * @return
-	 */
-	protected EjbFactory getEjbFactory() {
-		return ((EjbPackage) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory();
-	}
-	/**
-	 * Create method elements with ME type name
-	 * @param meTypeName The ME type
-	 * @param signatures list of method signatures
-	 * @param aType - enum type
-	 * @param bean - EJB bean
-	 * @return List of created elements
-	 */
-	protected List createMethodElements(String meTypeName, List signatures, Enumerator aType, EnterpriseBean bean) {
-		int size = signatures.size();
-		List methodElements = new ArrayList(size);
-		String signature;
-		MethodElement me;
-		for (int i = 0; i < size; i++) {
-			signature = (String) signatures.get(i);
-			me = (MethodElement) getEjbFactory().create((EClass) getEjbPackage().getEClassifier(meTypeName));
-			me.initializeFromSignature(signature);
-			me.setEnterpriseBean(bean);
-			me.setType((MethodElementKind) aType);
-			methodElements.add(me);
-		}
-		return methodElements;
-	}
-	/**
-	 * Get list of MTE's excluding bean
-	 * @param entity - excluded bean
-	 * @param type - filter on method type constants
-	 * @return List of method elements
-	 */
-	protected List getEntityMethodTransactionExcludedMethods(Entity entity, int type) {
-		List result = new ArrayList();
-		switch (type) {
-			case (REMOTE_METHODS) :
-				{
-					JavaClass aClass = getEJBObjectClass(entity);
-					aClass.getClassImport();
-					result.addAll(excludeMethods(aClass, Arrays.asList(new Object[]{getMethod(aClass, getRemoteRemoveMethod_Sig())})));
-					break;
-				}
-			case (HOME_METHODS) :
-				{
-					JavaClass aClass = getEJBHomeClass(entity);
-					aClass.getClassImport();
-					result.addAll(Arrays.asList(new Object[]{getMethod(aClass, getEjbGetMetaDataMethod_Sig()), getMethod(aClass, getEjbGetHomeHandleMethod_Sig())}));
-					break;
-				}
-			case (LOCAL_METHODS) :
-				{
-					JavaClass aClass = getEJBLocalObjectClass(entity);
-					aClass.getClassImport();
-					result.addAll(excludeMethods(aClass, Arrays.asList(new Object[]{getMethod(aClass, getLocalRemoveMethod_Sig())})));
-					break;
-				}
-		}
-		return result;
-	}
-	/**
-	 * Get Session ME list exclusing session beans
-	 * @param session - excludng beans
-	 * @param type - Interface type
-	 * @return - list of ME's
-	 */
-	protected List getSessionMethodTransactionExcludedClasses(Session session, int type) {
-		List result = new ArrayList();
-		Object[] allInterfaces;
-		String className;
-		switch (type) {
-			case (REMOTE_METHODS) :
-				{
-					className = getEJBObjectClassName();
-					allInterfaces = session.getRemoteInterface().getImplementsInterfaces().toArray();
-					result.addAll(getInterfaces(allInterfaces, className));
-					break;
-				}
-			case (LOCAL_METHODS) :
-				{
-					className = getEJBLocalObjectClassName();
-					allInterfaces = session.getLocalInterface().getImplementsInterfaces().toArray();
-					result.addAll(getInterfaces(allInterfaces, className));
-					break;
-				}
-		}
-		return result;
-	}
-	/**
-	 * @param aClass
-	 * @param methods
-	 * @return
-	 */
-	protected List excludeMethods(JavaClass aClass, List methods) {
-		List currentMethods = aClass.getMethods();
-		List resultMethods = new ArrayList();
-		for (int i = 0; i < currentMethods.size(); i++) {
-			if (!methods.contains(currentMethods.get(i)))
-				resultMethods.add(currentMethods.get(i));
-		}
-		return resultMethods;
-	}
-	/**
-	 * @param aClass
-	 * @param methodName
-	 * @return
-	 */
-	protected Method getMethod(JavaClass aClass, String methodName) {
-		List currentMethods = aClass.getMethods();
-		for (int i = 0; i < currentMethods.size(); i++) {
-			Method method = (Method) currentMethods.get(i);
-			if (methodName.equals(method.getSignature()))
-				return method;
-		}
-		return null;
-	}
-	protected Method getMethodUsingMethodSig(JavaClass aClass, String methodName) {
-		List currentMethods = aClass.getMethods();
-		for (int i = 0; i < currentMethods.size(); i++) {
-			Method method = (Method) currentMethods.get(i);
-			if (methodName.equals(method.getSignature()))
-				return method;
-		}
-		return null;
-	}
-	/**
-	 * Used to collect matched interfaces for ejbs
-	 * @param interfaces for filtering
-	 * @param aEjbObjectClassName - the ejb name
-	 * @return list of interfaces
-	 */
-	public List getInterfaces(Object[] interfaces, String aEjbObjectClassName) {
-		List extractedInterfaces = new ArrayList();
-		for (int i = 0; i < interfaces.length; i++) {
-			if (((JavaClass) interfaces[i]).getQualifiedName().equals(aEjbObjectClassName))
-				extractedInterfaces.add(interfaces[i]);
-		}
-		return extractedInterfaces;
-	}
-	/**
-	 * @param ejb
-	 * @param someMethodElementOwners
-	 * @param methodElementReference
-	 * @param usageFlag
-	 * @return
-	 */
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference, int usageFlag) {
-		return getAvailableMethodElementsExcludingExisting(ejb, someMethodElementOwners, methodElementReference, getDefaultMEComparator(), usageFlag);
-	}
-	/**
-	 * @param ejb
-	 * @param someMethodElementOwners
-	 * @param methodElementReference
-	 * @return
-	 */
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference) {
-		return getAvailableMethodElementsExcludingExisting(ejb, someMethodElementOwners, methodElementReference, getDefaultMEComparator());
-	}
-	/**
-	 * @param ejb
-	 * @param someMethodElementOwners
-	 * @param methodElementReference
-	 * @param comparator
-	 * @return
-	 */
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference, Comparator comparator) {
-		return getAvailableMethodElementsExcludingExisting(ejb, someMethodElementOwners, methodElementReference, comparator, ALL_METHODS);
-	}
-	/**
-	 * @param someMethodElementOwners
-	 * @param methodElementReference
-	 * @return
-	 */
-	protected List getExistingMethodElements(List someMethodElementOwners, EReference methodElementReference) {
-		if (someMethodElementOwners == null || someMethodElementOwners.isEmpty() || methodElementReference == null || !methodElementReference.isMany())
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		int size = someMethodElementOwners.size();
-		EObject owner = null;
-		for (int i = 0; i < size; i++) {
-			owner = (EObject) someMethodElementOwners.get(i);
-			result.addAll((List) owner.eGet(methodElementReference));
-		}
-		return result;
-	}
-	/**
-	 * @param ejb
-	 * @param someMethodElementOwners
-	 * @param methodElementReference
-	 * @param comparator
-	 * @param usageFlag
-	 * @return
-	 */
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference, Comparator comparator, int usageFlag) {
-		if (ejb == null)
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		boolean showHomes = usageFlag == ALL_METHODS || usageFlag == HOME_METHODS;
-		boolean showClients = usageFlag == ALL_METHODS || usageFlag == CLIENT_METHODS;
-		if (showHomes)
-			result.addAll(ejb.getAvailableHomeMethodElements());
-		if (showClients)
-			result.addAll(ejb.getAvailableRemoteMethodElements());
-		if (showHomes)
-			result.addAll(ejb.getAvailableLocalHomeMethodElements());
-		if (showClients)
-			result.addAll(ejb.getAvailableLocalMethodElements());
-		result.addAll(ejb.getAvailableUnspecifiedMethodElements());
-		excludeMethodElements(result, getExistingMethodElements(someMethodElementOwners, methodElementReference));
-		Collections.sort(result, comparator);
-		return result;
-	}
-	/**
-	 * @param sourceMethodElements
-	 * @param existingMethodElements
-	 */
-	protected void excludeMethodElements(List sourceMethodElements, List existingMethodElements) {
-		MethodElement sourceME, existingME;
-		int sourceSize, existingSize;
-		sourceSize = sourceMethodElements.size();
-		existingSize = existingMethodElements.size();
-		List foundElements = new ArrayList(existingSize);
-		boolean found = false;
-		for (int i = 0; i < existingSize; i++) {
-			found = false;
-			existingME = (MethodElement) existingMethodElements.get(i);
-			sourceME = null;
-			for (int ii = 0; ii < sourceSize; ii++) {
-				sourceME = (MethodElement) sourceMethodElements.get(ii);
-				if (existingME != null && existingME.getName() != null && sourceME.getSignature().equals(existingME.getSignature()) && sourceME.getTypeJavaClass() == existingME.getTypeJavaClass()) {
-					if (sourceME.getTypeJavaClass() != null) { //it returns
-						// null if the
-						// method is *
-						// and it is not
-						// a message
-						// bean
-						found = true;
-						break;
-					}
-					else if (sourceME.getEnterpriseBean().getEjbClass() == existingME.getEnterpriseBean().getEjbClass()) {
-						found = true;
-						break;
-					}
-				}
-			}
-			if (found)
-				foundElements.add(sourceME);
-		}
-		sourceMethodElements.removeAll(foundElements);
-	}
-	private String getEjbGetHomeHandleMethod_Sig() {
-		return "Public abstract javax.ejb.HomeHandle javax.ejb.EJBHome.getHomeHandle() throws java.rmi.RemoteException"; //$NON-NLS-1$
-	}
-	private String getEjbGetMetaDataMethod_Sig() {
-		return "Public abstract javax.ejb.EJBMetaData javax.ejb.EJBHome.getEJBMetaData() throws java.rmi.RemoteException"; //$NON-NLS-1$
-	}
-	private String getRemoteRemoveMethod_Sig() {
-		return "Public abstract void javax.ejb.EJBObject.remove() throws java.rmi.RemoteException,javax.ejb.RemoveException"; //non-nls //$NON-NLS-1$
-	}
-	private String getLocalRemoveMethod_Sig() {
-		return "Public abstract void javax.ejb.EJBLocalObject.remove() throws java.rmi.RemoteException,javax.ejb.RemoveException"; //non-nls //$NON-NLS-1$
-	}
-	private String getMDBMethod_Sig() {
-		return "public void onMessage(javax.jms.Message msg)"; //$NON-NLS-1$
-	}
-	private String getEJBObjectClassName() {
-		return "javax.ejb.EJBObject"; //$NON-NLS-1$
-	}
-	private String getEJBLocalObjectClassName() {
-		return "javax.ejb.EJBLocalObject"; //$NON-NLS-1$
-	}
-	private JavaClass getEJBObjectClass(EnterpriseBean bean) {
-		Resource res = bean.eResource();
-		ResourceSet set = res != null ? res.getResourceSet() : null;
-		return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("javax.ejb", "EJBObject", set); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	private JavaClass getEJBLocalObjectClass(EnterpriseBean bean) {
-		Resource res = bean.eResource();
-		ResourceSet set = res != null ? res.getResourceSet() : null;
-		return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("javax.ejb", "EJBLocalObject", set); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	private JavaClass getEJBHomeClass(EnterpriseBean bean) {
-		Resource res = bean.eResource();
-		ResourceSet set = res != null ? res.getResourceSet() : null;
-		return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("javax.ejb", "EJBHome", set); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java
deleted file mode 100644
index 004132503..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java
+++ /dev/null
@@ -1,3909 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	@since 1.0
- */
-public interface EjbPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "ejb"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN = 6;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__ICONS = CommonPackage.JNDI_ENV_REFS_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__DISPLAY_NAMES = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__DESCRIPTIONS = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__SMALL_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__LARGE_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__DESCRIPTION = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__DISPLAY_NAME = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES = CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__RESOURCE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__RESOURCE_ENV_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_LOCAL_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__SERVICE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__NAME = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__SECURITY_ROLE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_CLASS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__HOME_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__REMOTE_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_JAR = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__SECURITY_IDENTITY = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__LOCAL_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 8;
-	/**
-	 * The number of structural features of the '<em>Enterprise Bean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN_FEATURE_COUNT = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 9;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY = 5;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__ICONS = ENTERPRISE_BEAN__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__DISPLAY_NAMES = ENTERPRISE_BEAN__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__DESCRIPTIONS = ENTERPRISE_BEAN__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__SMALL_ICON = ENTERPRISE_BEAN__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__LARGE_ICON = ENTERPRISE_BEAN__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__DESCRIPTION = ENTERPRISE_BEAN__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__DISPLAY_NAME = ENTERPRISE_BEAN__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__ENVIRONMENT_PROPERTIES = ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__RESOURCE_REFS = ENTERPRISE_BEAN__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_REFS = ENTERPRISE_BEAN__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__RESOURCE_ENV_REFS = ENTERPRISE_BEAN__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_LOCAL_REFS = ENTERPRISE_BEAN__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__MESSAGE_DESTINATION_REFS = ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__SERVICE_REFS = ENTERPRISE_BEAN__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__NAME = ENTERPRISE_BEAN__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__SECURITY_ROLE_REFS = ENTERPRISE_BEAN__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_CLASS = ENTERPRISE_BEAN__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__HOME_INTERFACE = ENTERPRISE_BEAN__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__REMOTE_INTERFACE = ENTERPRISE_BEAN__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_JAR = ENTERPRISE_BEAN__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__SECURITY_IDENTITY = ENTERPRISE_BEAN__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__LOCAL_HOME_INTERFACE = ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__LOCAL_INTERFACE = ENTERPRISE_BEAN__LOCAL_INTERFACE;
-	/**
-	 * The feature id for the '<em><b>Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__REENTRANT = ENTERPRISE_BEAN_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__PRIMARY_KEY = ENTERPRISE_BEAN_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Entity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_FEATURE_COUNT = ENTERPRISE_BEAN_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__ICONS = ENTITY__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES = ENTITY__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__DESCRIPTIONS = ENTITY__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__SMALL_ICON = ENTITY__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__LARGE_ICON = ENTITY__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__DESCRIPTION = ENTITY__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__DISPLAY_NAME = ENTITY__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES = ENTITY__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__RESOURCE_REFS = ENTITY__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_REFS = ENTITY__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS = ENTITY__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS = ENTITY__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS = ENTITY__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__SERVICE_REFS = ENTITY__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__NAME = ENTITY__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS = ENTITY__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_CLASS = ENTITY__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__HOME_INTERFACE = ENTITY__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__REMOTE_INTERFACE = ENTITY__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_JAR = ENTITY__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY = ENTITY__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__LOCAL_HOME_INTERFACE = ENTITY__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__LOCAL_INTERFACE = ENTITY__LOCAL_INTERFACE;
-	/**
-	 * The feature id for the '<em><b>Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__REENTRANT = ENTITY__REENTRANT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__PRIMARY_KEY = ENTITY__PRIMARY_KEY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__VERSION = ENTITY_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME = ENTITY_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES = ENTITY_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES = ENTITY_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__QUERIES = ENTITY_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>CMP Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE = ENTITY_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Prim Key Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD = ENTITY_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Container Managed Entity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY_FEATURE_COUNT = ENTITY_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__UNCHECKED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__ROLES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__METHOD_ELEMENTS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Method Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__EJB_JAR = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__SECURITY_ROLES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Assembly Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__METHOD_ELEMENTS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TRANSACTION__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Method Transaction</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TRANSACTION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMP_ATTRIBUTE = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD = 16;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION = 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS = 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE = 15;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY = 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD = 20;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCLUDE_LIST = 19;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION = 4;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__ICONS = ENTERPRISE_BEAN__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__DISPLAY_NAMES = ENTERPRISE_BEAN__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__DESCRIPTIONS = ENTERPRISE_BEAN__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SMALL_ICON = ENTERPRISE_BEAN__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__LARGE_ICON = ENTERPRISE_BEAN__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__DESCRIPTION = ENTERPRISE_BEAN__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__DISPLAY_NAME = ENTERPRISE_BEAN__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__ENVIRONMENT_PROPERTIES = ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__RESOURCE_REFS = ENTERPRISE_BEAN__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_REFS = ENTERPRISE_BEAN__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__RESOURCE_ENV_REFS = ENTERPRISE_BEAN__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_LOCAL_REFS = ENTERPRISE_BEAN__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__MESSAGE_DESTINATION_REFS = ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__SERVICE_REFS = ENTERPRISE_BEAN__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__NAME = ENTERPRISE_BEAN__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SECURITY_ROLE_REFS = ENTERPRISE_BEAN__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_CLASS = ENTERPRISE_BEAN__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__HOME_INTERFACE = ENTERPRISE_BEAN__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__REMOTE_INTERFACE = ENTERPRISE_BEAN__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_JAR = ENTERPRISE_BEAN__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SECURITY_IDENTITY = ENTERPRISE_BEAN__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__LOCAL_HOME_INTERFACE = ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__LOCAL_INTERFACE = ENTERPRISE_BEAN__LOCAL_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__TRANSACTION_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SESSION_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Service Endpoint</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__SERVICE_ENDPOINT = ENTERPRISE_BEAN_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Session</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_FEATURE_COUNT = ENTERPRISE_BEAN_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN = 17;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION = 18;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_METHOD_CATEGORY = 7;
-	/**
-	 * The number of structural features of the '<em>EJB Method Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_METHOD_CATEGORY_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__EJB_CLIENT_JAR = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__ASSEMBLY_DESCRIPTOR = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__ENTERPRISE_BEANS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__RELATIONSHIP_LIST = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>EJB Jar</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__PARMS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__ENTERPRISE_BEAN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Method Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__EANNOTATIONS = CommonPackage.J2EEE_ATTRIBUTE__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMP_ATTRIBUTE__NAME = CommonPackage.J2EEE_ATTRIBUTE__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__ORDERED = CommonPackage.J2EEE_ATTRIBUTE__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__UNIQUE = CommonPackage.J2EEE_ATTRIBUTE__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__LOWER_BOUND = CommonPackage.J2EEE_ATTRIBUTE__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__UPPER_BOUND = CommonPackage.J2EEE_ATTRIBUTE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__MANY = CommonPackage.J2EEE_ATTRIBUTE__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__REQUIRED = CommonPackage.J2EEE_ATTRIBUTE__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__ETYPE = CommonPackage.J2EEE_ATTRIBUTE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__CHANGEABLE = CommonPackage.J2EEE_ATTRIBUTE__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__VOLATILE = CommonPackage.J2EEE_ATTRIBUTE__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__TRANSIENT = CommonPackage.J2EEE_ATTRIBUTE__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL = CommonPackage.J2EEE_ATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__DEFAULT_VALUE = CommonPackage.J2EEE_ATTRIBUTE__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__UNSETTABLE = CommonPackage.J2EEE_ATTRIBUTE__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__DERIVED = CommonPackage.J2EEE_ATTRIBUTE__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__ECONTAINING_CLASS = CommonPackage.J2EEE_ATTRIBUTE__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int CMP_ATTRIBUTE__ID = CommonPackage.J2EEE_ATTRIBUTE__ID;
-
-	/**
-	 * The feature id for the '<em><b>EAttribute Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__EATTRIBUTE_TYPE = CommonPackage.J2EEE_ATTRIBUTE__EATTRIBUTE_TYPE;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMP_ATTRIBUTE__DESCRIPTION = CommonPackage.J2EEE_ATTRIBUTE_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__DESCRIPTIONS = CommonPackage.J2EEE_ATTRIBUTE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>CMP Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE_FEATURE_COUNT = CommonPackage.J2EEE_ATTRIBUTE_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS__EJB_JAR = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS__EJB_RELATIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Relationships</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__EJB_QL = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__RETURN_TYPE_MAPPING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__QUERY_METHOD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__ENTITY = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__RELATIONSHIP_LIST = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__RELATIONSHIP_ROLES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>EJB Relation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__ROLE_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__MULTIPLICITY = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__CASCADE_DELETE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__RELATIONSHIP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__SOURCE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__CMR_FIELD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>EJB Relationship Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE__ROLE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE__ENTITY_BEAN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SOURCE__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Role Source</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SOURCE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__EANNOTATIONS = CMP_ATTRIBUTE__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__NAME = CMP_ATTRIBUTE__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ORDERED = CMP_ATTRIBUTE__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__UNIQUE = CMP_ATTRIBUTE__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__LOWER_BOUND = CMP_ATTRIBUTE__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__UPPER_BOUND = CMP_ATTRIBUTE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__MANY = CMP_ATTRIBUTE__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__REQUIRED = CMP_ATTRIBUTE__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ETYPE = CMP_ATTRIBUTE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__CHANGEABLE = CMP_ATTRIBUTE__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__VOLATILE = CMP_ATTRIBUTE__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__TRANSIENT = CMP_ATTRIBUTE__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DEFAULT_VALUE_LITERAL = CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DEFAULT_VALUE = CMP_ATTRIBUTE__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__UNSETTABLE = CMP_ATTRIBUTE__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DERIVED = CMP_ATTRIBUTE__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ECONTAINING_CLASS = CMP_ATTRIBUTE__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int CMR_FIELD__ID = CMP_ATTRIBUTE__ID;
-
-	/**
-	 * The feature id for the '<em><b>EAttribute Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__EATTRIBUTE_TYPE = CMP_ATTRIBUTE__EATTRIBUTE_TYPE;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__DESCRIPTION = CMP_ATTRIBUTE__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DESCRIPTIONS = CMP_ATTRIBUTE__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__ROLE = CMP_ATTRIBUTE_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__COLLECTION_TYPE = CMP_ATTRIBUTE_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>CMR Field</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD_FEATURE_COUNT = CMP_ATTRIBUTE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__ICONS = ENTERPRISE_BEAN__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__DISPLAY_NAMES = ENTERPRISE_BEAN__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__DESCRIPTIONS = ENTERPRISE_BEAN__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__SMALL_ICON = ENTERPRISE_BEAN__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__LARGE_ICON = ENTERPRISE_BEAN__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__DESCRIPTION = ENTERPRISE_BEAN__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__DISPLAY_NAME = ENTERPRISE_BEAN__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES = ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__RESOURCE_REFS = ENTERPRISE_BEAN__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_REFS = ENTERPRISE_BEAN__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__RESOURCE_ENV_REFS = ENTERPRISE_BEAN__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_LOCAL_REFS = ENTERPRISE_BEAN__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS = ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__SERVICE_REFS = ENTERPRISE_BEAN__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__NAME = ENTERPRISE_BEAN__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__SECURITY_ROLE_REFS = ENTERPRISE_BEAN__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_CLASS = ENTERPRISE_BEAN__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__HOME_INTERFACE = ENTERPRISE_BEAN__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__REMOTE_INTERFACE = ENTERPRISE_BEAN__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_JAR = ENTERPRISE_BEAN__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__SECURITY_IDENTITY = ENTERPRISE_BEAN__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__LOCAL_HOME_INTERFACE = ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__LOCAL_INTERFACE = ENTERPRISE_BEAN__LOCAL_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__TRANSACTION_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__MESSAGE_SELECTOR = ENTERPRISE_BEAN_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__ACKNOWLEDGE_MODE = ENTERPRISE_BEAN_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__LINK = ENTERPRISE_BEAN_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__DESTINATION = ENTERPRISE_BEAN_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Activation Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__ACTIVATION_CONFIG = ENTERPRISE_BEAN_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__MESSAGE_DESTINATION = ENTERPRISE_BEAN_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Messaging Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__MESSAGING_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Message Driven</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_FEATURE_COUNT = ENTERPRISE_BEAN_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION__TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION__BEAN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Message Driven Destination</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_DESTINATION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCLUDE_LIST__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCLUDE_LIST__METHOD_ELEMENTS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Exclude List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__NAME = METHOD_ELEMENT__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__PARMS = METHOD_ELEMENT__PARMS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__TYPE = METHOD_ELEMENT__TYPE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__DESCRIPTION = METHOD_ELEMENT__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__ENTERPRISE_BEAN = METHOD_ELEMENT__ENTERPRISE_BEAN;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD__DESCRIPTIONS = METHOD_ELEMENT__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__QUERY = METHOD_ELEMENT_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Query Method</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigPropertyImpl <em>Activation Config Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigPropertyImpl
-	 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getActivationConfigProperty()
-	 * @generated
-	 */
-	int ACTIVATION_CONFIG_PROPERTY = 21;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Activation Config Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigImpl <em>Activation Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigImpl
-	 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getActivationConfig()
-	 * @generated
-	 */
-	int ACTIVATION_CONFIG = 22;
-
-	/**
-	 * The feature id for the '<em><b>Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__CONFIG_PROPERTIES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Activation Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSACTION_ATTRIBUTE_TYPE = 23;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MULTIPLICITY_KIND = 31;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RETURN_TYPE_MAPPING = 29;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT_KIND = 26;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSACTION_TYPE = 24;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ACKNOWLEDGE_MODE = 27;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int DESTINATION_TYPE = 30;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SUBSCRIPTION_DURABILITY_KIND = 28;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_TYPE = 25;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "ejb.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.ejb"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EjbPackage eINSTANCE = org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodPermission object
-	 */
-	EClass getMethodPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodPermission_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodPermission_Unchecked();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodPermission_AssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodPermission_Roles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodPermission_MethodElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.MethodPermission#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MethodPermission#getDescriptions()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EReference getMethodPermission_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AssemblyDescriptor object
-	 */
-	EClass getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_MethodPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_MethodTransactions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_EjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_SecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_ExcludeList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.AssemblyDescriptor#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.AssemblyDescriptor#getMessageDestinations()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_MessageDestinations();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodTransaction object
-	 */
-	EClass getMethodTransaction();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodTransaction_TransactionAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodTransaction_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodTransaction_AssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodTransaction_MethodElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.MethodTransaction#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MethodTransaction#getDescriptions()
-	 * @see #getMethodTransaction()
-	 * @generated
-	 */
-	EReference getMethodTransaction_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EnterpriseBean object
-	 */
-	EClass getEnterpriseBean();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.ejb.EnterpriseBean#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.EnterpriseBean#getName()
-	 * @see #getEnterpriseBean()
-	 * @generated
-	 */
-	EAttribute getEnterpriseBean_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_SecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_EjbClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_HomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_RemoteInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_EjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_SecurityIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_LocalHomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_LocalInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Entity object
-	 */
-	EClass getEntity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.ejb.Entity#isReentrant <em>Reentrant</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reentrant</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.Entity#isReentrant()
-	 * @see #getEntity()
-	 * @generated
-	 */
-	EAttribute getEntity_Reentrant();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEntity_PrimaryKey();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContainerManagedEntity object
-	 */
-	EClass getContainerManagedEntity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContainerManagedEntity_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContainerManagedEntity_AbstractSchemaName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getContainerManagedEntity_PersistentAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getContainerManagedEntity_KeyAttributes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getQueries <em>Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Queries</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getQueries()
-	 * @see #getContainerManagedEntity()
-	 * @generated
-	 */
-	EReference getContainerManagedEntity_Queries();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getCMPAttribute <em>CMP Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>CMP Attribute</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getCMPAttribute()
-	 * @see #getContainerManagedEntity()
-	 * @generated
-	 */
-	EReference getContainerManagedEntity_CMPAttribute();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getPrimKeyField <em>Prim Key Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Prim Key Field</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ContainerManagedEntity#getPrimKeyField()
-	 * @see #getContainerManagedEntity()
-	 * @generated
-	 */
-	EReference getContainerManagedEntity_PrimKeyField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMPAttribute object
-	 */
-	EClass getCMPAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getCMPAttribute_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.CMPAttribute#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.CMPAttribute#getDescriptions()
-	 * @see #getCMPAttribute()
-	 * @generated
-	 */
-	EReference getCMPAttribute_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMRField object
-	 */
-	EClass getCMRField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getCMRField_Role();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getCMRField_CollectionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelationshipRole object
-	 */
-	EClass getEJBRelationshipRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_RoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_Multiplicity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_CascadeDelete();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelationshipRole_Relationship();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelationshipRole_Source();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelationshipRole_CmrField();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.EJBRelationshipRole#getDescriptions()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EReference getEJBRelationshipRole_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelation object
-	 */
-	EClass getEJBRelation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelation_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelation_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelation_RelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelation_RelationshipRoles();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.EJBRelation#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.EJBRelation#getDescriptions()
-	 * @see #getEJBRelation()
-	 * @generated
-	 */
-	EReference getEJBRelation_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Relationships object
-	 */
-	EClass getRelationships();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getRelationships_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRelationships_EjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRelationships_EjbRelations();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.Relationships#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.Relationships#getDescriptions()
-	 * @see #getRelationships()
-	 * @generated
-	 */
-	EReference getRelationships_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBJar object
-	 */
-	EClass getEJBJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBJar_EjbClientJar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.ejb.EJBJar#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.EJBJar#getVersion()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EAttribute getEJBJar_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJar_AssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJar_EnterpriseBeans();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJar_RelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleSource object
-	 */
-	EClass getRoleSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getRoleSource_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRoleSource_Role();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRoleSource_EntityBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.RoleSource#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.RoleSource#getDescriptions()
-	 * @see #getRoleSource()
-	 * @generated
-	 */
-	EReference getRoleSource_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Query object
-	 */
-	EClass getQuery();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getQuery_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getQuery_EjbQL();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getQuery_ReturnTypeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getQuery_QueryMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getQuery_Entity();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.Query#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.Query#getDescriptions()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EReference getQuery_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return QueryMethod object
-	 */
-	EClass getQueryMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getQueryMethod_Query();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty <em>Activation Config Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Config Property</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfigProperty
-	 * @generated
-	 */
-	EClass getActivationConfigProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getValue()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfigProperty#getName()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.ejb.ActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Config</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfig
-	 * @generated
-	 */
-	EClass getActivationConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.ActivationConfig#getConfigProperties <em>Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfig#getConfigProperties()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EReference getActivationConfig_ConfigProperties();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.ActivationConfig#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfig#getDescriptions()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EReference getActivationConfig_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodElement object
-	 */
-	EClass getMethodElement();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Parms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodElement_EnterpriseBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.MethodElement#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MethodElement#getDescriptions()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EReference getMethodElement_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExcludeList object
-	 */
-	EClass getExcludeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getExcludeList_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getExcludeList_MethodElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.ejb.ExcludeList#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.ExcludeList#getDescriptions()
-	 * @see #getExcludeList()
-	 * @generated
-	 */
-	EReference getExcludeList_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Session object
-	 */
-	EClass getSession();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSession_TransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSession_SessionType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.ejb.Session#getServiceEndpoint <em>Service Endpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Service Endpoint</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.Session#getServiceEndpoint()
-	 * @see #getSession()
-	 * @generated
-	 */
-	EReference getSession_ServiceEndpoint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDriven object
-	 */
-	EClass getMessageDriven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDriven_TransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDriven_MessageSelector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDriven_AcknowledgeMode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMessageDriven_Destination();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Activation Config</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MessageDriven#getActivationConfig()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EReference getMessageDriven_ActivationConfig();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getMessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Message Destination</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MessageDriven#getMessageDestination()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EReference getMessageDriven_MessageDestination();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getLink <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Link</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MessageDriven#getLink()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EAttribute getMessageDriven_Link();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getMessagingType <em>Messaging Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Messaging Type</em>'.
-	 * @see org.eclipse.jst.j2ee.ejb.MessageDriven#getMessagingType()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EReference getMessageDriven_MessagingType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDrivenDestination object
-	 */
-	EClass getMessageDrivenDestination();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDrivenDestination_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDrivenDestination_SubscriptionDurability();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMessageDrivenDestination_Bean();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBMethodCategory object
-	 */
-	EClass getEJBMethodCategory();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransactionAttributeType object
-	 */
-	EEnum getTransactionAttributeType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MultiplicityKind object
-	 */
-	EEnum getMultiplicityKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ReturnTypeMapping object
-	 */
-	EEnum getReturnTypeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodElementKind object
-	 */
-	EEnum getMethodElementKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransactionType object
-	 */
-	EEnum getTransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AcknowledgeMode object
-	 */
-	EEnum getAcknowledgeMode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return DestinationType object
-	 */
-	EEnum getDestinationType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SubscriptionDurabilityKind object
-	 */
-	EEnum getSubscriptionDurabilityKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SessionType object
-	 */
-	EEnum getSessionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EjbFactory getEjbFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.ContainerManagedEntityImpl <em>Container Managed Entity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.ContainerManagedEntityImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getContainerManagedEntity()
-		 * @generated
-		 */
-		EClass CONTAINER_MANAGED_ENTITY = eINSTANCE.getContainerManagedEntity();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTAINER_MANAGED_ENTITY__VERSION = eINSTANCE.getContainerManagedEntity_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Abstract Schema Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME = eINSTANCE.getContainerManagedEntity_AbstractSchemaName();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistent Attributes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES = eINSTANCE.getContainerManagedEntity_PersistentAttributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Key Attributes</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES = eINSTANCE.getContainerManagedEntity_KeyAttributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_MANAGED_ENTITY__QUERIES = eINSTANCE.getContainerManagedEntity_Queries();
-
-		/**
-		 * The meta object literal for the '<em><b>CMP Attribute</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE = eINSTANCE.getContainerManagedEntity_CMPAttribute();
-
-		/**
-		 * The meta object literal for the '<em><b>Prim Key Field</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD = eINSTANCE.getContainerManagedEntity_PrimKeyField();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.MethodPermissionImpl <em>Method Permission</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.MethodPermissionImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMethodPermission()
-		 * @generated
-		 */
-		EClass METHOD_PERMISSION = eINSTANCE.getMethodPermission();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PERMISSION__DESCRIPTION = eINSTANCE.getMethodPermission_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Unchecked</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PERMISSION__UNCHECKED = eINSTANCE.getMethodPermission_Unchecked();
-
-		/**
-		 * The meta object literal for the '<em><b>Assembly Descriptor</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR = eINSTANCE.getMethodPermission_AssemblyDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Roles</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__ROLES = eINSTANCE.getMethodPermission_Roles();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__METHOD_ELEMENTS = eINSTANCE.getMethodPermission_MethodElements();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PERMISSION__DESCRIPTIONS = eINSTANCE.getMethodPermission_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.AssemblyDescriptorImpl <em>Assembly Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.AssemblyDescriptorImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getAssemblyDescriptor()
-		 * @generated
-		 */
-		EClass ASSEMBLY_DESCRIPTOR = eINSTANCE.getAssemblyDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Permissions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS = eINSTANCE.getAssemblyDescriptor_MethodPermissions();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Transactions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS = eINSTANCE.getAssemblyDescriptor_MethodTransactions();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Jar</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__EJB_JAR = eINSTANCE.getAssemblyDescriptor_EjbJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__SECURITY_ROLES = eINSTANCE.getAssemblyDescriptor_SecurityRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude List</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST = eINSTANCE.getAssemblyDescriptor_ExcludeList();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destinations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS = eINSTANCE.getAssemblyDescriptor_MessageDestinations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.MethodTransactionImpl <em>Method Transaction</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.MethodTransactionImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMethodTransaction()
-		 * @generated
-		 */
-		EClass METHOD_TRANSACTION = eINSTANCE.getMethodTransaction();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Attribute</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE = eINSTANCE.getMethodTransaction_TransactionAttribute();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_TRANSACTION__DESCRIPTION = eINSTANCE.getMethodTransaction_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Assembly Descriptor</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR = eINSTANCE.getMethodTransaction_AssemblyDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_TRANSACTION__METHOD_ELEMENTS = eINSTANCE.getMethodTransaction_MethodElements();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_TRANSACTION__DESCRIPTIONS = eINSTANCE.getMethodTransaction_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.SessionImpl <em>Session</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.SessionImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getSession()
-		 * @generated
-		 */
-		EClass SESSION = eINSTANCE.getSession();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION__TRANSACTION_TYPE = eINSTANCE.getSession_TransactionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION__SESSION_TYPE = eINSTANCE.getSession_SessionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION__SERVICE_ENDPOINT = eINSTANCE.getSession_ServiceEndpoint();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.EntityImpl <em>Entity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EntityImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getEntity()
-		 * @generated
-		 */
-		EClass ENTITY = eINSTANCE.getEntity();
-
-		/**
-		 * The meta object literal for the '<em><b>Reentrant</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY__REENTRANT = eINSTANCE.getEntity_Reentrant();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTITY__PRIMARY_KEY = eINSTANCE.getEntity_PrimaryKey();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.EnterpriseBeanImpl <em>Enterprise Bean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EnterpriseBeanImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getEnterpriseBean()
-		 * @generated
-		 */
-		EClass ENTERPRISE_BEAN = eINSTANCE.getEnterpriseBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTERPRISE_BEAN__NAME = eINSTANCE.getEnterpriseBean_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Role Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__SECURITY_ROLE_REFS = eINSTANCE.getEnterpriseBean_SecurityRoleRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__EJB_CLASS = eINSTANCE.getEnterpriseBean_EjbClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Home Interface</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__HOME_INTERFACE = eINSTANCE.getEnterpriseBean_HomeInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Remote Interface</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__REMOTE_INTERFACE = eINSTANCE.getEnterpriseBean_RemoteInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Jar</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__EJB_JAR = eINSTANCE.getEnterpriseBean_EjbJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Identity</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__SECURITY_IDENTITY = eINSTANCE.getEnterpriseBean_SecurityIdentity();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Home Interface</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE = eINSTANCE.getEnterpriseBean_LocalHomeInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Interface</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTERPRISE_BEAN__LOCAL_INTERFACE = eINSTANCE.getEnterpriseBean_LocalInterface();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.EJBMethodCategoryImpl <em>EJB Method Category</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EJBMethodCategoryImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getEJBMethodCategory()
-		 * @generated
-		 */
-		EClass EJB_METHOD_CATEGORY = eINSTANCE.getEJBMethodCategory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarImpl <em>EJB Jar</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getEJBJar()
-		 * @generated
-		 */
-		EClass EJB_JAR = eINSTANCE.getEJBJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Client Jar</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR__EJB_CLIENT_JAR = eINSTANCE.getEJBJar_EjbClientJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_JAR__VERSION = eINSTANCE.getEJBJar_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Assembly Descriptor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__ASSEMBLY_DESCRIPTOR = eINSTANCE.getEJBJar_AssemblyDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Enterprise Beans</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__ENTERPRISE_BEANS = eINSTANCE.getEJBJar_EnterpriseBeans();
-
-		/**
-		 * The meta object literal for the '<em><b>Relationship List</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_JAR__RELATIONSHIP_LIST = eINSTANCE.getEJBJar_RelationshipList();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.MethodElementImpl <em>Method Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.MethodElementImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMethodElement()
-		 * @generated
-		 */
-		EClass METHOD_ELEMENT = eINSTANCE.getMethodElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__NAME = eINSTANCE.getMethodElement_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Parms</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__PARMS = eINSTANCE.getMethodElement_Parms();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__TYPE = eINSTANCE.getMethodElement_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__DESCRIPTION = eINSTANCE.getMethodElement_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Enterprise Bean</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_ELEMENT__ENTERPRISE_BEAN = eINSTANCE.getMethodElement_EnterpriseBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_ELEMENT__DESCRIPTIONS = eINSTANCE.getMethodElement_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.CMPAttributeImpl <em>CMP Attribute</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.CMPAttributeImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getCMPAttribute()
-		 * @generated
-		 */
-		EClass CMP_ATTRIBUTE = eINSTANCE.getCMPAttribute();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CMP_ATTRIBUTE__DESCRIPTION = eINSTANCE.getCMPAttribute_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CMP_ATTRIBUTE__DESCRIPTIONS = eINSTANCE.getCMPAttribute_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.RelationshipsImpl <em>Relationships</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.RelationshipsImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getRelationships()
-		 * @generated
-		 */
-		EClass RELATIONSHIPS = eINSTANCE.getRelationships();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RELATIONSHIPS__DESCRIPTION = eINSTANCE.getRelationships_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Jar</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATIONSHIPS__EJB_JAR = eINSTANCE.getRelationships_EjbJar();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Relations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATIONSHIPS__EJB_RELATIONS = eINSTANCE.getRelationships_EjbRelations();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATIONSHIPS__DESCRIPTIONS = eINSTANCE.getRelationships_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.QueryImpl <em>Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.QueryImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getQuery()
-		 * @generated
-		 */
-		EClass QUERY = eINSTANCE.getQuery();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY__DESCRIPTION = eINSTANCE.getQuery_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb QL</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY__EJB_QL = eINSTANCE.getQuery_EjbQL();
-
-		/**
-		 * The meta object literal for the '<em><b>Return Type Mapping</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY__RETURN_TYPE_MAPPING = eINSTANCE.getQuery_ReturnTypeMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Query Method</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY__QUERY_METHOD = eINSTANCE.getQuery_QueryMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY__ENTITY = eINSTANCE.getQuery_Entity();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY__DESCRIPTIONS = eINSTANCE.getQuery_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.EJBRelationImpl <em>EJB Relation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EJBRelationImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getEJBRelation()
-		 * @generated
-		 */
-		EClass EJB_RELATION = eINSTANCE.getEJBRelation();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATION__DESCRIPTION = eINSTANCE.getEJBRelation_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATION__NAME = eINSTANCE.getEJBRelation_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Relationship List</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATION__RELATIONSHIP_LIST = eINSTANCE.getEJBRelation_RelationshipList();
-
-		/**
-		 * The meta object literal for the '<em><b>Relationship Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATION__RELATIONSHIP_ROLES = eINSTANCE.getEJBRelation_RelationshipRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATION__DESCRIPTIONS = eINSTANCE.getEJBRelation_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.EJBRelationshipRoleImpl <em>EJB Relationship Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EJBRelationshipRoleImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getEJBRelationshipRole()
-		 * @generated
-		 */
-		EClass EJB_RELATIONSHIP_ROLE = eINSTANCE.getEJBRelationshipRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__DESCRIPTION = eINSTANCE.getEJBRelationshipRole_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__ROLE_NAME = eINSTANCE.getEJBRelationshipRole_RoleName();
-
-		/**
-		 * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__MULTIPLICITY = eINSTANCE.getEJBRelationshipRole_Multiplicity();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_RELATIONSHIP_ROLE__CASCADE_DELETE = eINSTANCE.getEJBRelationshipRole_CascadeDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Relationship</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__RELATIONSHIP = eINSTANCE.getEJBRelationshipRole_Relationship();
-
-		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__SOURCE = eINSTANCE.getEJBRelationshipRole_Source();
-
-		/**
-		 * The meta object literal for the '<em><b>Cmr Field</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__CMR_FIELD = eINSTANCE.getEJBRelationshipRole_CmrField();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EJB_RELATIONSHIP_ROLE__DESCRIPTIONS = eINSTANCE.getEJBRelationshipRole_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.RoleSourceImpl <em>Role Source</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.RoleSourceImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getRoleSource()
-		 * @generated
-		 */
-		EClass ROLE_SOURCE = eINSTANCE.getRoleSource();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_SOURCE__DESCRIPTION = eINSTANCE.getRoleSource_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Role</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_SOURCE__ROLE = eINSTANCE.getRoleSource_Role();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Bean</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_SOURCE__ENTITY_BEAN = eINSTANCE.getRoleSource_EntityBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_SOURCE__DESCRIPTIONS = eINSTANCE.getRoleSource_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.CMRFieldImpl <em>CMR Field</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.CMRFieldImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getCMRField()
-		 * @generated
-		 */
-		EClass CMR_FIELD = eINSTANCE.getCMRField();
-
-		/**
-		 * The meta object literal for the '<em><b>Role</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CMR_FIELD__ROLE = eINSTANCE.getCMRField_Role();
-
-		/**
-		 * The meta object literal for the '<em><b>Collection Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CMR_FIELD__COLLECTION_TYPE = eINSTANCE.getCMRField_CollectionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.MessageDrivenImpl <em>Message Driven</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.MessageDrivenImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMessageDriven()
-		 * @generated
-		 */
-		EClass MESSAGE_DRIVEN = eINSTANCE.getMessageDriven();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN__TRANSACTION_TYPE = eINSTANCE.getMessageDriven_TransactionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Selector</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN__MESSAGE_SELECTOR = eINSTANCE.getMessageDriven_MessageSelector();
-
-		/**
-		 * The meta object literal for the '<em><b>Acknowledge Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN__ACKNOWLEDGE_MODE = eINSTANCE.getMessageDriven_AcknowledgeMode();
-
-		/**
-		 * The meta object literal for the '<em><b>Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN__LINK = eINSTANCE.getMessageDriven_Link();
-
-		/**
-		 * The meta object literal for the '<em><b>Destination</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN__DESTINATION = eINSTANCE.getMessageDriven_Destination();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN__ACTIVATION_CONFIG = eINSTANCE.getMessageDriven_ActivationConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destination</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN__MESSAGE_DESTINATION = eINSTANCE.getMessageDriven_MessageDestination();
-
-		/**
-		 * The meta object literal for the '<em><b>Messaging Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN__MESSAGING_TYPE = eINSTANCE.getMessageDriven_MessagingType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.MessageDrivenDestinationImpl <em>Message Driven Destination</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.MessageDrivenDestinationImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMessageDrivenDestination()
-		 * @generated
-		 */
-		EClass MESSAGE_DRIVEN_DESTINATION = eINSTANCE.getMessageDrivenDestination();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_DESTINATION__TYPE = eINSTANCE.getMessageDrivenDestination_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Subscription Durability</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY = eINSTANCE.getMessageDrivenDestination_SubscriptionDurability();
-
-		/**
-		 * The meta object literal for the '<em><b>Bean</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_DRIVEN_DESTINATION__BEAN = eINSTANCE.getMessageDrivenDestination_Bean();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.ExcludeListImpl <em>Exclude List</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.ExcludeListImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getExcludeList()
-		 * @generated
-		 */
-		EClass EXCLUDE_LIST = eINSTANCE.getExcludeList();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXCLUDE_LIST__DESCRIPTION = eINSTANCE.getExcludeList_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCLUDE_LIST__METHOD_ELEMENTS = eINSTANCE.getExcludeList_MethodElements();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCLUDE_LIST__DESCRIPTIONS = eINSTANCE.getExcludeList_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.QueryMethodImpl <em>Query Method</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.QueryMethodImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getQueryMethod()
-		 * @generated
-		 */
-		EClass QUERY_METHOD = eINSTANCE.getQueryMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Query</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY_METHOD__QUERY = eINSTANCE.getQueryMethod_Query();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigPropertyImpl <em>Activation Config Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigPropertyImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getActivationConfigProperty()
-		 * @generated
-		 */
-		EClass ACTIVATION_CONFIG_PROPERTY = eINSTANCE.getActivationConfigProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_CONFIG_PROPERTY__VALUE = eINSTANCE.getActivationConfigProperty_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_CONFIG_PROPERTY__NAME = eINSTANCE.getActivationConfigProperty_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigImpl <em>Activation Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigImpl
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getActivationConfig()
-		 * @generated
-		 */
-		EClass ACTIVATION_CONFIG = eINSTANCE.getActivationConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Config Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVATION_CONFIG__CONFIG_PROPERTIES = eINSTANCE.getActivationConfig_ConfigProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVATION_CONFIG__DESCRIPTIONS = eINSTANCE.getActivationConfig_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.TransactionAttributeType <em>Transaction Attribute Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.TransactionAttributeType
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeType()
-		 * @generated
-		 */
-		EEnum TRANSACTION_ATTRIBUTE_TYPE = eINSTANCE.getTransactionAttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.TransactionType <em>Transaction Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.TransactionType
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getTransactionType()
-		 * @generated
-		 */
-		EEnum TRANSACTION_TYPE = eINSTANCE.getTransactionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.SessionType <em>Session Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.SessionType
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getSessionType()
-		 * @generated
-		 */
-		EEnum SESSION_TYPE = eINSTANCE.getSessionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.MethodElementKind <em>Method Element Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.MethodElementKind
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMethodElementKind()
-		 * @generated
-		 */
-		EEnum METHOD_ELEMENT_KIND = eINSTANCE.getMethodElementKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.AcknowledgeMode <em>Acknowledge Mode</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.AcknowledgeMode
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getAcknowledgeMode()
-		 * @generated
-		 */
-		EEnum ACKNOWLEDGE_MODE = eINSTANCE.getAcknowledgeMode();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind <em>Subscription Durability Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getSubscriptionDurabilityKind()
-		 * @generated
-		 */
-		EEnum SUBSCRIPTION_DURABILITY_KIND = eINSTANCE.getSubscriptionDurabilityKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.ReturnTypeMapping <em>Return Type Mapping</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.ReturnTypeMapping
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getReturnTypeMapping()
-		 * @generated
-		 */
-		EEnum RETURN_TYPE_MAPPING = eINSTANCE.getReturnTypeMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.DestinationType <em>Destination Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.DestinationType
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getDestinationType()
-		 * @generated
-		 */
-		EEnum DESTINATION_TYPE = eINSTANCE.getDestinationType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.ejb.MultiplicityKind <em>Multiplicity Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.ejb.MultiplicityKind
-		 * @see org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl#getMultiplicityKind()
-		 * @generated
-		 */
-		EEnum MULTIPLICITY_KIND = eINSTANCE.getMultiplicityKind();
-
-	}
-
-} //EjbPackage
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EnterpriseBean.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EnterpriseBean.java
deleted file mode 100644
index 641d59f49..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EnterpriseBean.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-
-
-/**
- * @generated
- * EnterpriseJavaBean is a class.  It can have instances, someone could write an instance document containing Departments and Employees.  It also has attributes, operations, and associations.  These are actually derived//filtered from its implementation classes and interfaces.  For mapping and browsing purposes, though, you would like the EJB to appear as a class.  
- * 
- * In this light, even Session Beans can have associations and properties implemented by their bean.  For example, it would be meaningful to describe associations from a Session to the Entities which it uses to perform its work.
- * @extends ENamedElement
- *
- ** @since 1.0 */
-public interface EnterpriseBean extends JNDIEnvRefsGroup, ENamedElement{
-
-/**
- * Creates a List of MethodElements that represent the
- * Methods from @someMethods pointing to this EJB.  It is
- * assumed that all of the methods belong to @anInterface.
- */
-List createMethodElements(List someMethods, JavaClass anInterface) ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- * @deprecated used getAvailableUnspecifiedMethodElements
- */
-List getAvailableCommonMethodElements() ;
-
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableUnspecifiedMethodElements() ;
-/**
- * This method will return a List of MethodElements signatures
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.
- * @deprecated used getAvailableUnspecifiedMethodElementSignatures
- */
-List getAvailableCommonMethodElementSignatures() ;
-/**
- * This method will return a List of MethodElements signatures
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.
- */
-List getAvailableUnspecifiedMethodElementSignatures() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Home interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableHomeMethodElements() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Local Home interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableLocalHomeMethodElements() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Local interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableLocalMethodElements() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Remote interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableRemoteMethodElements() ;
-/**
- * Return a List of all available MethodElements for all types as well as the
- * existing MethodElements from the <code>refObject</code>.  The parameter
- * will be either a MethodTransaction or a MethodPermission.  The List will be
- * sorted based on the passed EjbMethodElementComparator
- */
-public List getExistingOrAvailableMethodElements(EObject refObject, Comparator comparator) ;
-/**
- * Return a List of all available MethodElements for all types as well as the
- * existing MethodElements from the <code>refObject</code>.  The parameter
- * will be either a MethodTransaction or a MethodPermission.  The List will be
- * sorted based on the EjbMethodElementComparator
- */
-public List getExistingOrAvailableMethodElements(EObject refObject) ;
-public String getEjbClassName();
-/**
- * Return an EjbRef contained by this bean which is
- * equivalent to @anEjbRef.
- */
-EjbRef getEquivalentEjbRef(EjbRef anEjbRef) ;
-/**
- * Method getEquivalentEJBLocalRef.
- * @param anEjbLocalRef
- * @return EJBLocalRef
- */
-EJBLocalRef getEquivalentEJBLocalRef(EJBLocalRef anEjbLocalRef);
-
-public String getHomeInterfaceName();
-public Method[] getHomeMethodsForDeployment();
-/**
- * Return an EjbRef that is physically linked to @anEJB.
- */
-EjbRef getLinkedEJBReference(EnterpriseBean anEJB) ;
-/**
- * Return an EJBLocalRef that is physically linked to @anEJB.
- */
-EJBLocalRef getLinkedEJBLocalReference(EnterpriseBean anEJB) ;
-public String getLocalHomeInterfaceName();
-public Method[] getLocalHomeMethodsForDeployment();
-public String getLocalInterfaceName();
-public String getRemoteInterfaceName();
-public Method[] getRemoteMethodsForDeployment();
-/**
- * Return true if @aJavaClass as equal to the
- * home, remote, bean class, or key class.
- */
-boolean hasJavaReference(JavaClass aJavaClass) ;
-/**
- * Return true if this ejb has BeanManagedPersistance.
- */
-boolean isBeanManagedEntity() ;
-public boolean isContainerManagedEntity();
-public boolean isEntity();
-public boolean isMessageDriven();
-public boolean isSession();
-
-/**
- * returns an integer representing the version of the bean in the EJBJar
- * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
- */
-public int getVersionID();
-
-/**
- * @deprecated - Use {@link #getVersionID()}
- * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
- */
-public boolean isVersion1_X() ;
-
-/**
- * @deprecated - Use {@link #getVersionID()}
- * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
- */
-public boolean isVersion2_X() ;
-
-/**
- * Return true if this EJB has a local interface and a local home
- * interface.
- */
-public boolean hasLocalClient();
-
-/**
- * Return true if this EJB has a remote interface and a home
- * interface.
- */
-public boolean hasRemoteClient();
-
-/**
- * Fix the role-link on any contained role refs
- */
-public void reSyncSecurityRoleRef(String existingRoleName, String newRoleName);
-public void setEjbClassName(String ejbClassName);
-public void setHomeInterfaceName(String homeInterfaceName);
-public void setLocalHomeInterfaceName(String localHomeInterfaceName);
-public void setLocalInterfaceName(String localInterfaceName);
-public void setRemoteInterfaceName(String remoteInterfaceName);
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getEnterpriseBean_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.EnterpriseBean#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoleRefs references
-	 */
-	EList getSecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbClass reference
-	 */
-	JavaClass getEjbClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EjbClass reference
-	 */
-	void setEjbClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The HomeInterface reference
-	 */
-	JavaClass getHomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the HomeInterface reference
-	 */
-	void setHomeInterface(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RemoteInterface reference
-	 */
-	JavaClass getRemoteInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the RemoteInterface reference
-	 */
-	void setRemoteInterface(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbJar reference
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EjbJar reference
-	 */
-	void setEjbJar(EJBJar value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecurityIdentity reference
-	 * The security-identity element specifies whether the caller's security identity
-	 * is to be used for the execution of the methods of the enterprise bean or
-	 * whether a specific run-as identity is to be used. It
-	 * contains an optional description and a specification of the security identity
-	 * to be used.
-	 */
-	SecurityIdentity getSecurityIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the SecurityIdentity reference
-	 */
-	void setSecurityIdentity(SecurityIdentity value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LocalHomeInterface reference
-	 */
-	JavaClass getLocalHomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LocalHomeInterface reference
-	 */
-	void setLocalHomeInterface(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LocalInterface reference
-	 */
-	JavaClass getLocalInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LocalInterface reference
-	 */
-	void setLocalInterface(JavaClass value);
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Entity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Entity.java
deleted file mode 100644
index 30a9ad374..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Entity.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity bean's home and remote interfaces, if any; the names of the entity bean's local home and local interface, if any; the entity bean's implementation class; the entity bean's persistence management type; the entity bean's primary key class name; an indication of the entity bean's reentrancy; an optional specification of the entity bean's cmp-version; an optional specification of the entity bean's abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; an optional declaration of the bean's resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.
- * The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entity's persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entity's persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.
- * The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.
- * The optional local-home and local elements must be specified if the entity bean has a local home and local interface.
- * The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.
- * The other elements that are optional are "optional" in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if
- * the entity's persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entity's persistence-type is Bean.
- * @since 1.0 */
-public interface Entity extends EnterpriseBean{
-
-public String getPrimaryKeyName();
-public boolean isContainerManagedEntity();
-
-public void setPrimaryKeyName(String primaryKeyName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsReentrant attribute
-	 * The reentrant element specifies whether an entity bean is reentrant or not.
-
-	 */
-	boolean isReentrant();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.Entity#isReentrant <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reentrant</em>' attribute.
-	 * @see #isSetReentrant()
-	 * @see #unsetReentrant()
-	 * @see #isReentrant()
-	 * @generated
-	 */
-	void setReentrant(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.Entity#isReentrant <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetReentrant()
-	 * @see #isReentrant()
-	 * @see #setReentrant(boolean)
-	 * @generated
-	 */
-  void unsetReentrant();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.Entity#isReentrant <em>Reentrant</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reentrant</em>' attribute is set.
-	 * @see #unsetReentrant()
-	 * @see #isReentrant()
-	 * @see #setReentrant(boolean)
-	 * @generated
-	 */
-  boolean isSetReentrant();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The PrimaryKey reference
-	 * The primkey-field element is used to specify the name of the primary key field
-	 * for an entity with container-managed persistence.  The primkey-field must be
-	 * one of the fields declared in the cmp-field
-	 * element, and the type of the field must be the same as the primary key type. 
-	 * The primkey-field element is not used if the primary key maps to multiple
-	 * container-managed fields (i.e. the key is a compound key). In this case, the
-	 * fields of the primary key class must be public, and their names must correspond 
-	 * to the field names of the entity bean class that comprise the key.
-	 * Examples:<prim-key-class>java.lang.String<//prim-key-class>
-	 * 	<prim-key-class>com.wombat.empl.EmployeeID<//prim-key-class>
-	 * 	<prim-key-class>java.lang.Object<//prim-key-class>
-
-	 */
-	JavaClass getPrimaryKey();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the PrimaryKey reference
-	 */
-	void setPrimaryKey(JavaClass value);
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ExcludeList.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ExcludeList.java
deleted file mode 100644
index 4559e68bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ExcludeList.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.
- * 
- * If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.
- * @generated
- * @since 1.0 */
-public interface ExcludeList extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodElements references
-	 */
-	EList getMethodElements();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getExcludeList_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	* Return a List of MethodElements that point to
-	* @anEJB.
-	*/
-	List getMethodElements(EnterpriseBean anEJB);
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/IRoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/IRoleShapeStrategy.java
deleted file mode 100644
index 306edf0a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/IRoleShapeStrategy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-
-
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/6/2000 11:40:16 AM)
- * @author: Administrator
- * @since 1.0 */
-public interface IRoleShapeStrategy {
-	String ATTRIBUTE_NAME_JOINER = "_"; //$NON-NLS-1$
-	String ROLE_GET_PREFIX = "get"; //$NON-NLS-1$
-	String ROLE_SET_PREFIX = "set"; //$NON-NLS-1$
-boolean isFlat();
-boolean isRound();
-void reconcileAttributes(List roleAttributes) ;
-boolean usesAttributeNamed(String attributeName) ;
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDriven.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDriven.java
deleted file mode 100644
index a84ecc2a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDriven.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import org.eclipse.jem.java.JavaClass;
-
-
-
-
-/**
- * @generated
- * @since 1.0 */
-public interface MessageDriven extends EnterpriseBean{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionType attribute
-	 * The transaction-type element specifies an enterprise bean's transaction
-	 * management type.
-	 * 
-	 * The transaction-type element must be one of the two following: Bean, Container
-	 */
-	TransactionType getTransactionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	void setTransactionType(TransactionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	void unsetTransactionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getTransactionType <em>Transaction Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Type</em>' attribute is set.
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	boolean isSetTransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the MessageSelector attribute
-	 * The message-selector element is used to specify the JMS message
-	 * selector to be used in determining which messages a message-driven
-	 * bean is to receive.
-	 * 
-	 * Example value: 
-	 * JMSType = `car' AND color = `blue' AND weight > 2500
-
-	 */
-	String getMessageSelector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the MessageSelector attribute
-	 */
-	void setMessageSelector(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AcknowledgeMode attribute
-	 * an optional declaration of the acknowledgment mode for the message-driven bean
-	 * if bean-managed transaction demarcation is used (ie. self.transactionType =
-	 * Bean)
-	 * 
-	 * The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or
-	 * DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the
-	 * onMessage message of a message-driven bean that uses bean managed transaction
-	 * demarcation.
-	 * 
-	 * The acknowledge-mode must be one of the two following:  Auto-acknowledge,
-	 * Dups-ok-acknowledge
-
-	 */
-	AcknowledgeMode getAcknowledgeMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getAcknowledgeMode <em>Acknowledge Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Acknowledge Mode</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.AcknowledgeMode
-	 * @see #isSetAcknowledgeMode()
-	 * @see #unsetAcknowledgeMode()
-	 * @see #getAcknowledgeMode()
-	 * @generated
-	 */
-	void setAcknowledgeMode(AcknowledgeMode value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getAcknowledgeMode <em>Acknowledge Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAcknowledgeMode()
-	 * @see #getAcknowledgeMode()
-	 * @see #setAcknowledgeMode(AcknowledgeMode)
-	 * @generated
-	 */
-	void unsetAcknowledgeMode();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getAcknowledgeMode <em>Acknowledge Mode</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Acknowledge Mode</em>' attribute is set.
-	 * @see #unsetAcknowledgeMode()
-	 * @see #getAcknowledgeMode()
-	 * @see #setAcknowledgeMode(AcknowledgeMode)
-	 * @generated
-	 */
-	boolean isSetAcknowledgeMode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Destination reference
-	 * An optional declaration of the intended destination type of the message-driven
-	 * bean
-	 */
-	MessageDrivenDestination getDestination();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Destination reference
-	 */
-	void setDestination(MessageDrivenDestination value);
-
-	/**
-	 * Returns the value of the '<em><b>Activation Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Config</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activation Config</em>' containment reference.
-	 * @see #setActivationConfig(ActivationConfig)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMessageDriven_ActivationConfig()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ActivationConfig getActivationConfig();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getActivationConfig <em>Activation Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Config</em>' containment reference.
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	void setActivationConfig(ActivationConfig value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destination</em>' reference.
-	 * @see #setMessageDestination(JavaClass)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMessageDriven_MessageDestination()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getMessageDestination();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getMessageDestination <em>Message Destination</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination</em>' reference.
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	void setMessageDestination(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  - an optional declaration of the bean's
-	 * 	      message-destination-link
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link</em>' attribute.
-	 * @see #setLink(String)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMessageDriven_Link()
-	 * @model
-	 * @generated
-	 */
-	String getLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getLink <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link</em>' attribute.
-	 * @see #getLink()
-	 * @generated
-	 */
-	void setLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Messaging Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Messaging Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The messaging-type element specifies the message
-	 *         listener interface of the message-driven bean. If
-	 *         the messaging-type element is not specified, it is
-	 *         assumed to be javax.jms.MessageListener.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Messaging Type</em>' reference.
-	 * @see #setMessagingType(JavaClass)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMessageDriven_MessagingType()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getMessagingType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDriven#getMessagingType <em>Messaging Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Messaging Type</em>' reference.
-	 * @see #getMessagingType()
-	 * @generated
-	 */
-	void setMessagingType(JavaClass value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDrivenDestination.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDrivenDestination.java
deleted file mode 100644
index e99e2b838..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDrivenDestination.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The message-driven-destination element provides advice to the Deployer as to whether a message-driven bean is intended for a Queue or a Topic. The declaration consists of: the type of the message-driven bean's intended destination and an optional declaration of whether a durable or non-durable subscription should be used if the destination-type is javax.jms.Topic.
- * @since 1.0 
- * @generated
- */
-public interface MessageDrivenDestination extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * The destination-type element specifies the type of the JMS destination. The
-	 * type is specified by the Java interface expected to be implemented by the
-	 * destination.
-	 * 
-	 * The destination-type element must be one of the two following: javax.jms.Queue, 
-	 * javax.jms.Topic
-	 */
-	DestinationType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDrivenDestination#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.DestinationType
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(DestinationType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDrivenDestination#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetType()
-	 * @see #getType()
-	 * @see #setType(DestinationType)
-	 * @generated
-	 */
-	void unsetType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDrivenDestination#getType <em>Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Type</em>' attribute is set.
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @see #setType(DestinationType)
-	 * @generated
-	 */
-	boolean isSetType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SubscriptionDurability attribute
-	 * The subscription-durability element specifies whether a JMS topic subscription
-	 * is intended to be durable or nondurable.
-	 * 
-	 * The subscription-durability element must be one of the two following:  Durable, 
-	 * NonDurable
-
-	 */
-	SubscriptionDurabilityKind getSubscriptionDurability();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDrivenDestination#getSubscriptionDurability <em>Subscription Durability</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Subscription Durability</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind
-	 * @see #isSetSubscriptionDurability()
-	 * @see #unsetSubscriptionDurability()
-	 * @see #getSubscriptionDurability()
-	 * @generated
-	 */
-	void setSubscriptionDurability(SubscriptionDurabilityKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDrivenDestination#getSubscriptionDurability <em>Subscription Durability</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSubscriptionDurability()
-	 * @see #getSubscriptionDurability()
-	 * @see #setSubscriptionDurability(SubscriptionDurabilityKind)
-	 * @generated
-	 */
-	void unsetSubscriptionDurability();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MessageDrivenDestination#getSubscriptionDurability <em>Subscription Durability</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Subscription Durability</em>' attribute is set.
-	 * @see #unsetSubscriptionDurability()
-	 * @see #getSubscriptionDurability()
-	 * @see #setSubscriptionDurability(SubscriptionDurabilityKind)
-	 * @generated
-	 */
-	boolean isSetSubscriptionDurability();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Bean reference
-	 */
-	MessageDriven getBean();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Bean reference
-	 */
-	void setBean(MessageDriven value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElement.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElement.java
deleted file mode 100644
index 83ce6da05..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElement.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The method element is used to denote a method of an enterprise bean's
- * home or remote interface, or a set of methods. The ejb-name element
- * must be the name of one of the enterprise beans in declared in the
- * deployment descriptor; the optional method-intf element allows to
- * distinguish between a method with the same signature that is defined in
- * both the home and remote interface; the method-name element specifies
- * the method name; and the optional method-params elements identify a
- * single method among multiple methods with an overloaded method name.
- * 
- * There are three possible styles of the method element syntax:
- * 
- * 1. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>*<//method-name>
- * 	<//method>
- * 
- *    This style is used to refer to all the methods of the specified
- *    enterprise bean's home and remote interfaces.
- * 
- * 2. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 	<//method>>
- * 
- *    This style is used to refer to the specified method of the
- *    specified enterprise bean. If there are multiple methods with
- *    the same overloaded name, the element of this style refers to
- *    all the methods with the overloaded name.
- * 
- * 
- * 
- * 
- * 
- * 3. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 		<method-params>
- *    			<method-param>PARAM-1<//method-param>
- *    			<method-param>PARAM-2<//method-param>
- *           			...
- *    			<method-param>PARAM-n<//method-param>
- * 		<//method-params>
- * 	<method>	
- * 
- *    This style is used to refer to a single method within a set of
- *    methods with an overloaded name. PARAM-1 through PARAM-n are the
- *    fully-qualified Java types of the method's input parameters (if
- *    the method has no input arguments, the method-params element
- *    contains no method-param elements). Arrays are specified by the
- *    array element's type, followed by one or more pair of square
- *    brackets (e.g. int[][]).
- * 
- * 
- * Used in: method-permission and container-transaction
- * 
- * Examples:
- * 
- *     Style 1: The following method element refers to all the methods of
- * 		the EmployeeService bean's home and remote interfaces:
- * 
- * 		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>*<//method-name>
- * 		<//method>
- * 
- * 	Style 2: The following method element refers to all the create
- * 		methods of the EmployeeService bean's home interface:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 		<//method>
- * 
- * 	Style 3: The following method element refers to the
- * 		create(String firstName, String LastName) method of the
- * 	 	EmployeeService bean's home interface.
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	
- * 	The following example illustrates a Style 3 element with
- * 	more complex parameter types. The method
- * 			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
- * 				mypackage.MyClass[][] myclaar)
- *         would be specified as:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>foobar<//method-name>
- * 			<method-params>
- * 				<method-param>char<//method-param>
- * 				<method-param>int<//method-param>
- * 				<method-param>int[]<//method-param>
- * 				<method-param>mypackage.MyClass<//method-param>
- * 				<method-param>mypackage.MyClass[][]<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	The optional method-intf element can be used when it becomes
- *    necessary to differentiate between a method defined in the home
- *    interface and a method with the same name and signature that is
- *    defined in the remote interface.
- * 
- * 	For example, the method element
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Remote<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	can be used to differentiate the create(String, String) method
- *    defined in the remote interface from the create(String, String)
- *    method defined in the home interface, which would be defined as
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Home<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * @generated
- * @since 1.0 */
-public interface MethodElement extends J2EEEObject {
-
-	public static final String RIGHT_PAREN = "("; //$NON-NLS-1$
-	public static final String LEFT_PAREN = ")"; //$NON-NLS-1$
-	public static final String COMMA = ","; //$NON-NLS-1$
-	public void addMethodParams(String param);
-/**
- * Set the params for this method element to an empty array, as opposed
- * to null.
- */
-public void applyZeroParams();
-/**
- * Return true if this MethodElement and @anotherMethodElement
- * have the same name, parameters, and type.
- */
-boolean equalSignature(MethodElement anotherMethodElement) ;
-	java.util.List getMethodParams() ;/**
- * Answer whether method params apply to this method, e.g., it is specific to one
- * overloaded method, even if the method is a zero parameter method.  Answer false if no
- * parameters apply, that is, the method element applies to all overloaded methods with this name
- */ 
-/**
- * Answer a list of all the methods for which this method element applies.  The following rules are used:
- *
- * 1)  If the method element type is unspecified, the methods are obtained from the remote interface of the ejb;
- *		If it is specified, then the appropriate interface is used
- *
- * 2)  If the method name = "*", then all the PUBLIC methods for that interface are returned
- *
- * 3)  If the method name is specified, and no method params are specified, then all public methods for the interface
- *      having the same name are returned.
- *
- * 4)  If the method name and params are specified, then a zero or one element array is returned, containing the one and only method
- *      on the interface with the appropriate signature, if it exists
- */
-public Method[] getMethods();
-/**
- * Return the MethodElement that is most specific.
- */
-MethodElement getMostSpecific(MethodElement aMethodElement, JavaClass aJavaClass);
-/**
- * Return the signature.
- * For example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-String getSignature() ;
-/**
- * Return the type cast to a JavaClass.
- */
-JavaClass getTypeJavaClass() ;
-public boolean hasMethodParams();
-/**
- * Parse @aSignature setting the name and the params.
- * A signature example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-void initializeFromSignature(String aSignature) ;
-boolean isDefault();
-/**
- * Return true if this MethodElement and @anotherMethodElement
- * represent the same exact methods.
- */
-boolean isEquivalent(MethodElement anotherMethodElement) ;
-boolean isHome() ;
-boolean isRemote() ;
-boolean isUnspecified() ;
-boolean isLocalHome() ;
-boolean isLocal() ;
-/**
- * Return true if this MethodElement represents one or more
- * methods.
- */
-public boolean isValid() ;
-/**
- * Return true if this MethodElement has the same basic signature as
- * @aMethod, ignoring the return type, thrown exceptions, and declaring class of 
- * this instance or @aMethod.  Return false, if params is null
- */
-public boolean nameAndParamsEquals(Method aMethod);
-	public void removeMethodParams(String param);
-boolean represents(Method aMethod);
-public void setIdToReadableString();
-/**
- * Return true if this MethodElement uniquely identifies
- * @aMethod.  Return false, even if the MethodElement represents
- * @aMethod (i.e., @aMethod is contained in its list of methods).
- */
-boolean uniquelyIdentifies(Method aMethod);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The method-name element contains a name of an enterprise bean method,
-	 * or the asterisk (*) character. The asterisk is used when the element
-	 * denotes all the methods of an enterprise bean's remote and home
-	 * interfaces.
-
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Parms attribute
-	 * The method-params element contains a list of the fully-qualified Java type
-	 * names of the method parameters.  In the current implementation this is a space
-	 * delimitted String.  A null string indicates a generic method element that can
-	 * apply to multiple methods with the same name.  An empty string indicates a
-	 * method with zero parameters.  
-	 */
-	String getParms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Parms attribute
-	 */
-	void setParms(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 */
-	MethodElementKind getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodElement#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.MethodElementKind
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(MethodElementKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodElement#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetType()
-	 * @see #getType()
-	 * @see #setType(MethodElementKind)
-	 * @generated
-	 */
-	void unsetType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodElement#getType <em>Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Type</em>' attribute is set.
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @see #setType(MethodElementKind)
-	 * @generated
-	 */
-	boolean isSetType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EnterpriseBean reference
-	 */
-	EnterpriseBean getEnterpriseBean();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EnterpriseBean reference
-	 */
-	void setEnterpriseBean(EnterpriseBean value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMethodElement_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElementKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElementKind.java
deleted file mode 100644
index d121857d9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElementKind.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface MethodElementKind {}
- * @since 1.0
- */
-public final class MethodElementKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int UNSPECIFIED = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REMOTE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int HOME = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL_HOME = 4;
-	/**
-	 * The '<em><b>Service Endpoint</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SERVICE_ENDPOINT_LITERAL
-	 * @model name="ServiceEndpoint"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SERVICE_ENDPOINT = 5;
-
-	/**
-	 * The '<em><b>Unspecified</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Unspecified</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSPECIFIED
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind UNSPECIFIED_LITERAL = new MethodElementKind(UNSPECIFIED, "Unspecified", "Unspecified"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Remote</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind REMOTE_LITERAL = new MethodElementKind(REMOTE, "Remote", "Remote"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Home</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Home</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HOME
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind HOME_LITERAL = new MethodElementKind(HOME, "Home", "Home"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Local</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind LOCAL_LITERAL = new MethodElementKind(LOCAL, "Local", "Local"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Local Home</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Home</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_HOME
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind LOCAL_HOME_LITERAL = new MethodElementKind(LOCAL_HOME, "LocalHome", "LocalHome"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Service Endpoint</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Service Endpoint</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SERVICE_ENDPOINT
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind SERVICE_ENDPOINT_LITERAL = new MethodElementKind(SERVICE_ENDPOINT, "ServiceEndpoint", "ServiceEndpoint"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Method Element Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MethodElementKind[] VALUES_ARRAY =
-		new MethodElementKind[] {
-			UNSPECIFIED_LITERAL,
-			REMOTE_LITERAL,
-			HOME_LITERAL,
-			LOCAL_LITERAL,
-			LOCAL_HOME_LITERAL,
-			SERVICE_ENDPOINT_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Method Element Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Method Element Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodElementKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MethodElementKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Method Element Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodElementKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MethodElementKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Method Element Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodElementKind get(int value) {
-		switch (value) {
-			case UNSPECIFIED: return UNSPECIFIED_LITERAL;
-			case REMOTE: return REMOTE_LITERAL;
-			case HOME: return HOME_LITERAL;
-			case LOCAL: return LOCAL_LITERAL;
-			case LOCAL_HOME: return LOCAL_HOME_LITERAL;
-			case SERVICE_ENDPOINT: return SERVICE_ENDPOINT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MethodElementKind(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //MethodElementKind
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodPermission.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodPermission.java
deleted file mode 100644
index 9ff986f8d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodPermission.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-
-/**
- * The method-permission element specifies that one or more security roles are allowed to invoke one or more enterprise bean methods. The method-permission element consists of an optional description, a list of security role names, and a list of method elements.  The security roles used in the method-permission element must be defined in the security-role element of the deployment descriptor, and the methods must be methods defined in the enterprise bean's remote and//or home interfaces.
- * @generated
- * @since 1.0 */
-public interface MethodPermission extends J2EEEObject {
-
-/**
- * Return a List of MethodElements that point to
- * @anEJB.
- */
-List getMethodElements(EnterpriseBean anEJB) ;
-/**
- * Return the SecurityRole named @aRoleName.
- */
-SecurityRole getSecurityRole(String aRoleName) ;
-/**
- * Return true if this permission contains @aSecurityRole
- */
-boolean hasSecurityRole(SecurityRole aSecurityRole) ;
-/**
- * Return true if this permission contains a SecurityRole
- * named @aRoleName.
- */
-boolean hasSecurityRole(String aRoleName) ;
-/**
- * Return true if this MethodPermission and @anotherMethodPermission
- * have the same roles.
- */
-boolean isEquivalent(MethodPermission anotherMethodPermission) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Unchecked attribute
-	 */
-	boolean isUnchecked();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Unchecked attribute
-	 */
-	void setUnchecked(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodPermission#isUnchecked <em>Unchecked</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUnchecked()
-	 * @see #isUnchecked()
-	 * @see #setUnchecked(boolean)
-	 * @generated
-	 */
-	void unsetUnchecked();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodPermission#isUnchecked <em>Unchecked</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Unchecked</em>' attribute is set.
-	 * @see #unsetUnchecked()
-	 * @see #isUnchecked()
-	 * @see #setUnchecked(boolean)
-	 * @generated
-	 */
-	boolean isSetUnchecked();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AssemblyDescriptor reference
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the AssemblyDescriptor reference
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Roles references
-	 */
-	EList getRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodElements references
-	 */
-	EList getMethodElements();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMethodPermission_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodTransaction.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodTransaction.java
deleted file mode 100644
index 01302b5ea..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodTransaction.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * Specifies how the container must manage transaction scopes for the enterprise bean's method invocations.  It consists of an optional description, a list of method elements, and a transaction attribute.The transaction attribute is to be applied to all the specified methods.
- * @generated
- * @since 1.0 */
-public interface MethodTransaction extends J2EEEObject {
-
-/**
- * Return a List of MethodElements that point to
- * @anEJB.
- */
-List getMethodElements(EnterpriseBean anEJB) ;
-MethodElement getMostSpecificMethodElement(Method aMethod) ;
-/**
- * Return true if the transaction attributes are the same.
- */
-boolean isEquivalent(MethodTransaction anotherMethodTransaction) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionAttribute attribute
-	 * The trans-attribute element specifies how the container must manage the
-	 * transaction boundaries when delegating a method invocation to an enterprise
-	 * bean's business method.
-
-	 */
-	TransactionAttributeType getTransactionAttribute();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodTransaction#getTransactionAttribute <em>Transaction Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Attribute</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.TransactionAttributeType
-	 * @see #isSetTransactionAttribute()
-	 * @see #unsetTransactionAttribute()
-	 * @see #getTransactionAttribute()
-	 * @generated
-	 */
-	void setTransactionAttribute(TransactionAttributeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodTransaction#getTransactionAttribute <em>Transaction Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionAttribute()
-	 * @see #getTransactionAttribute()
-	 * @see #setTransactionAttribute(TransactionAttributeType)
-	 * @generated
-	 */
-	void unsetTransactionAttribute();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.MethodTransaction#getTransactionAttribute <em>Transaction Attribute</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Attribute</em>' attribute is set.
-	 * @see #unsetTransactionAttribute()
-	 * @see #getTransactionAttribute()
-	 * @see #setTransactionAttribute(TransactionAttributeType)
-	 * @generated
-	 */
-	boolean isSetTransactionAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AssemblyDescriptor reference
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the AssemblyDescriptor reference
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodElements references
-	 */
-	EList getMethodElements();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getMethodTransaction_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MultiplicityKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MultiplicityKind.java
deleted file mode 100644
index 11670f8ba..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MultiplicityKind.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface MultiplicityKind {}
- * @since 1.0
- */
-public final class MultiplicityKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int ONE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int MANY= 1;
-
-	/**
-	 * The '<em><b>One</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>One</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final MultiplicityKind ONE_LITERAL = new MultiplicityKind(ONE, "One", "One"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Many</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Many</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANY
-	 * @generated
-	 * @ordered
-	 */
-	public static final MultiplicityKind MANY_LITERAL = new MultiplicityKind(MANY, "Many", "Many"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Multiplicity Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MultiplicityKind[] VALUES_ARRAY =
-		new MultiplicityKind[] {
-			ONE_LITERAL,
-			MANY_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Multiplicity Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Multiplicity Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MultiplicityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multiplicity Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MultiplicityKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multiplicity Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityKind get(int value) {
-		switch (value) {
-			case ONE: return ONE_LITERAL;
-			case MANY: return MANY_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MultiplicityKind(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //MultiplicityKind
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Query.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Query.java
deleted file mode 100644
index 4ccd991dd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Query.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query
- * is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty.
- * @generated
- * @since 1.0 */
-public interface Query extends J2EEEObject {
-
-	/**
-	 * Returns boolean value for ReturnTypeMapping, checks if it is of type ReturnTypeMapping.LOCAL
-	 * @return boolean value
-	 */
-	public boolean isLocalResultMapping();
-	
-	/**
-	 * Returns boolean value for ReturnTypeMapping, checks if it is of type ReturnTypeMapping.REMOTE
-	 * @return boolean value
-	 */
-	public boolean isRemoteResultMapping();
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the query.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the EjbQL attribute
-	 * Contains the EJB QL query string that defines a finder or select query. This
-	 * element is defined within the scope of a query element whose contents specify
-	 * the finder or the select method that uses the query. The content must be a
-	 * valid EJB QL query string for the entity bean for which the query is specified. 
-	 * The ejb-ql element must be specified for all queries that are expressible in
-	 * EJB QL.
-	 * 
-	 * @invariant The value must be a valid EJB QL query string for the entity bean or 
-	 * dependent object class for which the query is specified.
-	 * @invariant The ejb-ql element must be specified for all queries that are
-	 * expressible in EJB QL.
-	 * 
-	 * Example:
-	 * <query>
-	 * <query-method>
-	 * <method-name>ejbSelectPendingLineitems<//method-name>
-	 * <method-params//>
-	 * <//query-method>
-	 * <ejb-ql>SELECT ENTITY(l)
-	 * FROM LineItems l
-	 * WHERE l.shipped is FALSE
-	 * <//ejb-ql>
-	 * <//query>
-	 */
-	String getEjbQL();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EjbQL attribute
-	 */
-	void setEjbQL(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ReturnTypeMapping attribute
-	 * The return-type-mapping element is used in the query element to specify whether 
-	 * an abstract schema type that is returned by a query for a select method is to
-	 * be mapped to an EJBLocalObject or EJBObject type.  The value of the
-	 * return-type-mapping element, if specified must be one of the following.
-	 */
-	ReturnTypeMapping getReturnTypeMapping();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.Query#getReturnTypeMapping <em>Return Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Type Mapping</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.ReturnTypeMapping
-	 * @see #isSetReturnTypeMapping()
-	 * @see #unsetReturnTypeMapping()
-	 * @see #getReturnTypeMapping()
-	 * @generated
-	 */
-	void setReturnTypeMapping(ReturnTypeMapping value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.Query#getReturnTypeMapping <em>Return Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReturnTypeMapping()
-	 * @see #getReturnTypeMapping()
-	 * @see #setReturnTypeMapping(ReturnTypeMapping)
-	 * @generated
-	 */
-	void unsetReturnTypeMapping();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.Query#getReturnTypeMapping <em>Return Type Mapping</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Return Type Mapping</em>' attribute is set.
-	 * @see #unsetReturnTypeMapping()
-	 * @see #getReturnTypeMapping()
-	 * @see #setReturnTypeMapping(ReturnTypeMapping)
-	 * @generated
-	 */
-	boolean isSetReturnTypeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The QueryMethod reference
-	 * The query-method element is used to specify the method (DB//SR//CM-"on the
-	 * home") for a finder or
-	 * select query.
-	 * 
-	 * The method-name element specifies the name of a finder or select
-	 * method in the entity bean's implementation class or a select method in
-	 * the dependent object class.
-	 * 
-	 * Each method-param must be defined for a query-method using the
-	 * method-params element.
-	 * 
-	 * Used in: query
-	 * 
-	 * Example:
-	 * 
-	 * Example:
-	 * <query>
-	 *   <description>Method finds large orders<//description>
-	 *   <query-method>
-	 *     <method-name>findLargeOrders<//method-name>
-	 *     <method-params><//method-params>
-	 *   <//query-method>
-	 *   <ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &gt; 1000<//ejb-ql>
-	 * <//query>
-	 */
-	QueryMethod getQueryMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the QueryMethod reference
-	 */
-	void setQueryMethod(QueryMethod value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Entity reference
-	 */
-	ContainerManagedEntity getEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.Query#getEntity <em>Entity</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity</em>' container reference.
-	 * @see #getEntity()
-	 * @generated
-	 */
-	void setEntity(ContainerManagedEntity value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getQuery_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/QueryMethod.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/QueryMethod.java
deleted file mode 100644
index d1ffa859a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/QueryMethod.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jem.java.JavaClass;
-/**
- * @generated
- * @since 1.0 */
-public interface QueryMethod extends MethodElement{
-	
-	/**
-	 * 
-	 */
-	public static final String SELECT_PREFIX = "ejbSelect"; //$NON-NLS-1$
-	
-	/**
-	 * 
-	 */
-	public static final String FIND_PREFIX = "find"; //$NON-NLS-1$
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Query reference
-	 */
-	Query getQuery();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Query reference
-	 */
-	void setQuery(Query value);
-
-	/**
-	 * Return an array of JavaClasses of all the interfaces or bean class that this method is presented
-	 * to a client.  If it is an ejbSelect... on the bean class will be returned and if
-	 * it if a find both home interfaces will be returned if they exist.
-	 * 
-	 * May return null.
-	 * @return array of JavaClass
-	 */
-	JavaClass[] getClientTypeJavaClasses() ;
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Relationships.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Relationships.java
deleted file mode 100644
index dd2432c0d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Relationships.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The relationships describes the relationships in which entity beans with container managed persistence participate. The relationships element contains an optional description; and a list of ejb-relation elements, which specify the container managed relationships.
- * @generated
- * @since 1.0 */
-public interface Relationships extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the collection of relationships.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbJar reference
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EjbJar reference
-	 */
-	void setEjbJar(EJBJar value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of EjbRelations references
-	 * A list of ejb-relation elements, which specify the container managed
-	 * relationships.
-	 */
-	EList getEjbRelations();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getRelationships_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ReturnTypeMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ReturnTypeMapping.java
deleted file mode 100644
index c652b49d4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ReturnTypeMapping.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface ReturnTypeMapping {}
- * @since 1.0
- */
-public final class ReturnTypeMapping extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL= 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REMOTE= 1;
-	/**
-	 * The '<em><b>Local</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final ReturnTypeMapping LOCAL_LITERAL = new ReturnTypeMapping(LOCAL, "Local", "Local"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Remote</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ReturnTypeMapping REMOTE_LITERAL = new ReturnTypeMapping(REMOTE, "Remote", "Remote"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Return Type Mapping</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ReturnTypeMapping[] VALUES_ARRAY =
-		new ReturnTypeMapping[] {
-			LOCAL_LITERAL,
-			REMOTE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Return Type Mapping</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Return Type Mapping</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ReturnTypeMapping get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ReturnTypeMapping result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Return Type Mapping</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ReturnTypeMapping getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ReturnTypeMapping result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Return Type Mapping</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ReturnTypeMapping get(int value) {
-		switch (value) {
-			case LOCAL: return LOCAL_LITERAL;
-			case REMOTE: return REMOTE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ReturnTypeMapping(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ReturnTypeMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/RoleSource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/RoleSource.java
deleted file mode 100644
index 4c9464d6d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/RoleSource.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.
- * @invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference.
- * @since 1.0 
- * @generated
- */
-public interface RoleSource extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Role reference
-	 */
-	EJBRelationshipRole getRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Role reference
-	 */
-	void setRole(EJBRelationshipRole value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EntityBean reference
-	 */
-	ContainerManagedEntity getEntityBean();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.RoleSource#getEntityBean <em>Entity Bean</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity Bean</em>' reference.
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	void setEntityBean(ContainerManagedEntity value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getRoleSource_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Session.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Session.java
deleted file mode 100644
index c1017b0a6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Session.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import org.eclipse.jem.java.JavaClass;
-
-
-
-
-/**
- * The session element declares an session bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a name assigned
- * to the enterprise bean in the deployment description; the names of the session bean's home and remote interfaces, if any; the names of the session bean's local home and local interfaces, if any; the session bean's implementation class; the session bean's state management type; the session bean's transaction management type; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; and an optional declaration of the bean's resource environment references. The elements that are optional are "optional" in the sense that they are omitted when if lists represented by them are empty.
- * @since 1.0 */
-public interface Session extends EnterpriseBean{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionType attribute
-	 * The transaction-type element specifies an enterprise bean's transaction
-	 * management type.
-	 * 
-
-	 */
-	TransactionType getTransactionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	void setTransactionType(TransactionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	void unsetTransactionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getTransactionType <em>Transaction Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Type</em>' attribute is set.
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	boolean isSetTransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SessionType attribute
-	 */
-	SessionType getSessionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getSessionType <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Session Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.ejb.SessionType
-	 * @see #isSetSessionType()
-	 * @see #unsetSessionType()
-	 * @see #getSessionType()
-	 * @generated
-	 */
-	void setSessionType(SessionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getSessionType <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSessionType()
-	 * @see #getSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @generated
-	 */
-	void unsetSessionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getSessionType <em>Session Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Session Type</em>' attribute is set.
-	 * @see #unsetSessionType()
-	 * @see #getSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @generated
-	 */
-	boolean isSetSessionType();
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Endpoint</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The service-endpoint element contains the
-	 *         fully-qualified name of the enterprise bean's web
-	 *         service endpoint interface. The service-endpoint
-	 *         element may only be specified for a stateless
-	 *         session bean. The specified interface must be a
-	 *         valid JAX-RPC service endpoint interface.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint</em>' reference.
-	 * @see #setServiceEndpoint(JavaClass)
-	 * @see org.eclipse.jst.j2ee.ejb.EjbPackage#getSession_ServiceEndpoint()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getServiceEndpoint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.ejb.Session#getServiceEndpoint <em>Service Endpoint</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint</em>' reference.
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 */
-	void setServiceEndpoint(JavaClass value);
-
-	/**
-	 * Helper method to set Java Class name via String
-	 * @param serviceEndpointName the name of the ServiceEndpoint
-	 */
-	public void setServiceEndpointName(String serviceEndpointName);
-	/**
-	 * Return true if this Session bean has a service endpoint interface
-	 * interface.
-	 * @return boolean value
-	 */
-	public boolean hasServiceEndpoint() ;
-	/**
-	 * Helper method to get Java Class name 
-	 * @return String value
-	 */
-	public String getServiceEndpointName();
-	
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SessionType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SessionType.java
deleted file mode 100644
index 55cb926e4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SessionType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface SessionType {}
- * @since 1.0
- */
-public final class SessionType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int STATEFUL= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int STATELESS= 1;
-
-	/**
-	 * The '<em><b>Stateful</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Stateful</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STATEFUL
-	 * @generated
-	 * @ordered
-	 */
-	public static final SessionType STATEFUL_LITERAL = new SessionType(STATEFUL, "Stateful", "Stateful"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Stateless</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Stateless</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STATELESS
-	 * @generated
-	 * @ordered
-	 */
-	public static final SessionType STATELESS_LITERAL = new SessionType(STATELESS, "Stateless", "Stateless"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Session Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SessionType[] VALUES_ARRAY =
-		new SessionType[] {
-			STATEFUL_LITERAL,
-			STATELESS_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Session Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SessionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SessionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType get(int value) {
-		switch (value) {
-			case STATEFUL: return STATEFUL_LITERAL;
-			case STATELESS: return STATELESS_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private SessionType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //SessionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SubscriptionDurabilityKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SubscriptionDurabilityKind.java
deleted file mode 100644
index 54d275299..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SubscriptionDurabilityKind.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface SubscriptionDurabilityKind {}
- * @since 1.0
- */
-public final class SubscriptionDurabilityKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DURABLE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NON_DURABLE= 1;
-
-	/**
-	 * The '<em><b>Durable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Durable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DURABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final SubscriptionDurabilityKind DURABLE_LITERAL = new SubscriptionDurabilityKind(DURABLE, "Durable", "Durable"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Non Durable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Non Durable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NON_DURABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final SubscriptionDurabilityKind NON_DURABLE_LITERAL = new SubscriptionDurabilityKind(NON_DURABLE, "NonDurable", "NonDurable"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Subscription Durability Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SubscriptionDurabilityKind[] VALUES_ARRAY =
-		new SubscriptionDurabilityKind[] {
-			DURABLE_LITERAL,
-			NON_DURABLE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Subscription Durability Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Subscription Durability Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SubscriptionDurabilityKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SubscriptionDurabilityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Subscription Durability Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SubscriptionDurabilityKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SubscriptionDurabilityKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Subscription Durability Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SubscriptionDurabilityKind get(int value) {
-		switch (value) {
-			case DURABLE: return DURABLE_LITERAL;
-			case NON_DURABLE: return NON_DURABLE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private SubscriptionDurabilityKind(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //SubscriptionDurabilityKind
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionAttributeType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionAttributeType.java
deleted file mode 100644
index 3a4e66b4f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionAttributeType.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface TransactionAttributeType {}
- * @since 1.0
- */
-public final class TransactionAttributeType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NOT_SUPPORTED= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SUPPORTS= 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REQUIRED= 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REQUIRES_NEW= 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int MANDATORY= 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NEVER= 5;
-
-	/**
-	 * The '<em><b>Not Supported</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not Supported</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_SUPPORTED
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType NOT_SUPPORTED_LITERAL = new TransactionAttributeType(NOT_SUPPORTED, "NotSupported", "NotSupported"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Supports</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Supports</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUPPORTS
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType SUPPORTS_LITERAL = new TransactionAttributeType(SUPPORTS, "Supports", "Supports"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Required</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Required</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRED
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType REQUIRED_LITERAL = new TransactionAttributeType(REQUIRED, "Required", "Required"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Requires New</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Requires New</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRES_NEW
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType REQUIRES_NEW_LITERAL = new TransactionAttributeType(REQUIRES_NEW, "RequiresNew", "RequiresNew"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Mandatory</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Mandatory</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANDATORY
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType MANDATORY_LITERAL = new TransactionAttributeType(MANDATORY, "Mandatory", "Mandatory"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Never</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Never</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NEVER
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType NEVER_LITERAL = new TransactionAttributeType(NEVER, "Never", "Never"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transaction Attribute Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionAttributeType[] VALUES_ARRAY =
-		new TransactionAttributeType[] {
-			NOT_SUPPORTED_LITERAL,
-			SUPPORTS_LITERAL,
-			REQUIRED_LITERAL,
-			REQUIRES_NEW_LITERAL,
-			MANDATORY_LITERAL,
-			NEVER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Attribute Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionAttributeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionAttributeType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType get(int value) {
-		switch (value) {
-			case NOT_SUPPORTED: return NOT_SUPPORTED_LITERAL;
-			case SUPPORTS: return SUPPORTS_LITERAL;
-			case REQUIRED: return REQUIRED_LITERAL;
-			case REQUIRES_NEW: return REQUIRES_NEW_LITERAL;
-			case MANDATORY: return MANDATORY_LITERAL;
-			case NEVER: return NEVER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionAttributeType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransactionAttributeType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionType.java
deleted file mode 100644
index 7b8fe3643..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface TransactionType {}
- * @since 1.0
- */
-public final class TransactionType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BEAN= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CONTAINER= 1;
-
-	/**
-	 * The '<em><b>Bean</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Bean</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionType BEAN_LITERAL = new TransactionType(BEAN, "Bean", "Bean"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionType CONTAINER_LITERAL = new TransactionType(CONTAINER, "Container", "Container"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionType[] VALUES_ARRAY =
-		new TransactionType[] {
-			BEAN_LITERAL,
-			CONTAINER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType get(int value) {
-		switch (value) {
-			case BEAN: return BEAN_LITERAL;
-			case CONTAINER: return CONTAINER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransactionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AbstractRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AbstractRelationshipRoleAttributeFilter.java
deleted file mode 100644
index a05f6ee09..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AbstractRelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/28/2000 7:06:49 PM)
- * @author: Administrator
- */
-public abstract class AbstractRelationshipRoleAttributeFilter extends ContainerManagedEntityFilter {
-/**
- * AbstractRelationshipRoleAttributeFilter constructor comment.
- */
-public AbstractRelationshipRoleAttributeFilter() {
-	super();
-}
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	List attributes = new ArrayList();
-	Iterator it = getSourceRoles(cmp).iterator();
-	CommonRelationshipRole role;
-	while (it.hasNext()) {
-		role = (CommonRelationshipRole) it.next();
-		attributes.addAll(role.getAttributes());
-	}
-	return attributes;
-}
-/**
- * Return the proper list of roles from cmpExt.
- */
-protected abstract java.util.List getSourceRoles(ContainerManagedEntity cmpExt) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AbstractRequiredRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AbstractRequiredRelationshipRoleFilter.java
deleted file mode 100644
index 765ec1ef6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AbstractRequiredRelationshipRoleFilter.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * Insert the type's description here.
- * Creation date: (10/15/2001 11:37:19 AM)
- * @author: Administrator
- */
-public abstract class AbstractRequiredRelationshipRoleFilter extends ContainerManagedEntityFilter {
-/**
- * AbstractRequiredRelationshipRoleFilter constructor comment.
- */
-public AbstractRequiredRelationshipRoleFilter() {
-	super();
-}
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	List roles = new ArrayList();
-	List allRoles = getRolesToFilter(cmp);
-	CommonRelationshipRole role;
-	for (int i = 0; i < allRoles.size(); i++) {
-		role = (CommonRelationshipRole) allRoles.get(i);
-		if (shouldAddFilteredResult(role))
-			roles.add(role);
-	}
-	return roles;
-}
-protected abstract java.util.List getRolesToFilter(ContainerManagedEntity cmp) ;
-/**
- * Return true if the multiplicity for @aRole is required.
- */
-protected boolean shouldAddFilteredResult(CommonRelationshipRole aRole) {
-	boolean required = aRole.isRequired();
-	if (required) {
-		CommonRelationshipRole opposite = aRole.getOppositeAsCommonRole();
-		if (opposite != null) {
-			if (opposite.isRequired() && !aRole.isKey()) {
-				if (opposite.isKey() || aRole.isMany())
-					return false;
-				if (!opposite.isMany())
-					//both are single and not key
-					return aRole.isForward();
-			}
-		}
-	}
-	return required;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ActivationConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ActivationConfigImpl.java
deleted file mode 100644
index ff858f5d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ActivationConfigImpl.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigImpl#getConfigProperties <em>Config Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationConfigImpl extends J2EEEObjectImpl implements ActivationConfig {
-	/**
-	 * The cached value of the '{@link #getConfigProperties() <em>Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList configProperties = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ACTIVATION_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ActivationConfigProperty.class, this, EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				return ((InternalEList)getConfigProperties()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				return getConfigProperties();
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ActivationConfigImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ActivationConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ActivationConfigPropertyImpl.java
deleted file mode 100644
index 8c22e5486..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ActivationConfigPropertyImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Config Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigPropertyImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.ejb.internal.impl.ActivationConfigPropertyImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationConfigPropertyImpl extends J2EEEObjectImpl implements ActivationConfigProperty {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationConfigPropertyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ACTIVATION_CONFIG_PROPERTY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				return getValue();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				setValue((String)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivationConfigPropertyImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AssemblyDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AssemblyDescriptorImpl.java
deleted file mode 100644
index 243e5397a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/AssemblyDescriptorImpl.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-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.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-/**
- * The assembly-descriptor element contains application-assembly information.  The application-assembly information consists of the following parts: the definition of security roles, the definition of method permissions, and the definition of transaction attributes for enterprise beans with container-managed transaction demarcation. All the parts are optional in the sense that they are omitted if the lists represented by them are empty. Providing an assembly-descriptor in the deployment descriptor is optional for the ejb-jar file producer.
- * @generated
- */
-public class AssemblyDescriptorImpl extends J2EEEObjectImpl implements AssemblyDescriptor {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodPermissions = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodTransactions = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ExcludeList excludeList = null;
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	public AssemblyDescriptorImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ASSEMBLY_DESCRIPTOR;
-	}
-
-/**
- * Return the first method permission that contains all the roles in securityRoles and
- * is the same size
- */
-
-public MethodPermission getMethodPermission(List securityRolesList) {
-	List permissions = getMethodPermissions();
-	MethodPermission temp = null;
-	for (int i = 0; i < permissions.size(); i++) {
-		temp = (MethodPermission) permissions.get(i);
-		if (temp.getRoles().containsAll(securityRolesList) && temp.getRoles().size() == securityRolesList.size())
-			return temp;
-	}
-	return null;
-}
-public List getMethodPermissionMethodElements(EnterpriseBean anEJB) {
-	List allMethodElements = new ArrayList();
-	List permissions = getMethodPermissions();
-	MethodPermission permission;
-	for (int i = 0; i < permissions.size(); i++){
-		permission = (MethodPermission) permissions.get(i);
-		allMethodElements.addAll(permission.getMethodElements(anEJB)); 
-	}
-	return allMethodElements;
-}
-	
-
-public List getMethodTransactionMethodElements(EnterpriseBean anEJB) {
-	List allMethodElements = new ArrayList();
-	List transactions = getMethodTransactions();
-	MethodTransaction transaction;
-	for (int i = 0; i < transactions.size(); i++){
-		transaction = (MethodTransaction) transactions.get(i);
-		allMethodElements.addAll(transaction.getMethodElements(anEJB)); 
-	}
-	return allMethodElements;
-}
-	
-public SecurityRole getSecurityRoleNamed(String roleName) {
-	java.util.List tempRoles = getSecurityRoles();
-	SecurityRole role;
-	for (int i = 0; i < tempRoles.size(); i++) {
-		role = (SecurityRole) tempRoles.get(i);
-		if (role.getRoleName().equals(roleName))
-			return role;
-	}
-	return null;
-}
-
-/**
- * @see org.eclipse.jst.j2ee.internal.ejb.AssemblyDescriptor
- */
-public void renameSecurityRole(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	SecurityRole role = getSecurityRoleNamed(existingRoleName);
-	role.setRoleName(newRoleName);
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodPermissions() {
-		if (methodPermissions == null) {
-			methodPermissions = new EObjectContainmentWithInverseEList(MethodPermission.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR);
-		}
-		return methodPermissions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies how the container must manage transaction scopes for the enterprise
-	 * bean's method invocations.  The element consists of an optional description, a
-	 * list of method elements, and a transaction attribute.The transaction attribute
-	 * is to be applied to all the specified methods.
-	 */
-	public EList getMethodTransactions() {
-		if (methodTransactions == null) {
-			methodTransactions = new EObjectContainmentWithInverseEList(MethodTransaction.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR);
-		}
-		return methodTransactions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBJar getEjbJar() {
-		if (eContainerFeatureID != EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR) return null;
-		return (EJBJar)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEjbJar(EJBJar newEjbJar, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newEjbJar, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		if (newEjbJar != eInternalContainer() || (eContainerFeatureID != EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR && newEjbJar != null)) {
-			if (EcoreUtil.isAncestor(this, newEjbJar))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEjbJar != null)
-				msgs = ((InternalEObject)newEjbJar).eInverseAdd(this, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, EJBJar.class, msgs);
-			msgs = basicSetEjbJar(newEjbJar, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, newEjbJar, newEjbJar));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ExcludeList getExcludeList() {
-		return excludeList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExcludeList(ExcludeList newExcludeList, NotificationChain msgs) {
-		ExcludeList oldExcludeList = excludeList;
-		excludeList = newExcludeList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, oldExcludeList, newExcludeList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExcludeList(ExcludeList newExcludeList) {
-		if (newExcludeList != excludeList) {
-			NotificationChain msgs = null;
-			if (excludeList != null)
-				msgs = ((InternalEObject)excludeList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, null, msgs);
-			if (newExcludeList != null)
-				msgs = ((InternalEObject)newExcludeList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, null, msgs);
-			msgs = basicSetExcludeList(newExcludeList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, newExcludeList, newExcludeList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return ((InternalEList)getMethodPermissions()).basicAdd(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				return ((InternalEList)getMethodTransactions()).basicAdd(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetEjbJar((EJBJar)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return ((InternalEList)getMethodPermissions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				return ((InternalEList)getMethodTransactions()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				return basicSetEjbJar(null, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return basicSetExcludeList(null, msgs);
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, EJBJar.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return getMethodPermissions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				return getMethodTransactions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return getSecurityRoles();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return getExcludeList();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				getMethodPermissions().clear();
-				getMethodPermissions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				getMethodTransactions().clear();
-				getMethodTransactions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				setExcludeList((ExcludeList)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				getMethodPermissions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				getMethodTransactions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				setExcludeList((ExcludeList)null);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return methodPermissions != null && !methodPermissions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				return methodTransactions != null && !methodTransactions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return excludeList != null;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	public void removeData(EnterpriseBean anEJB) {
-		if (anEJB != null) {
-			removeMethodPermissionData(anEJB);
-			removeMethodTransactionData(anEJB);
-		}
-	}
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	protected void removeMethodPermissionData(EnterpriseBean anEJB) {
-		List mes = getMethodPermissionMethodElements(anEJB);
-		MethodElement me;
-		MethodPermission mp;
-		for (int i = 0; i < mes.size(); i++){
-			me = (MethodElement) mes.get(i);
-			mp = (MethodPermission)me.eContainer();
-			if (mp.getMethodElements().size() == 1){
-				ExtendedEcoreUtil.becomeProxy(mp, mp.eResource());
-				getMethodPermissions().remove(mp);
-			}
-			else{
-				ExtendedEcoreUtil.becomeProxy(me, me.eResource());
-				mp.getMethodElements().remove(me);
-			}
-		}
-	}
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	protected void removeMethodTransactionData(EnterpriseBean anEJB) {
-		List mes = getMethodTransactionMethodElements(anEJB);
-		MethodElement me;
-		MethodTransaction mt;
-		for (int i = 0; i < mes.size(); i++){
-			me = (MethodElement) mes.get(i);
-			mt = (MethodTransaction)me.eContainer();
-			if (mt.getMethodElements().size() == 1){
-				ExtendedEcoreUtil.becomeProxy(mt, mt.eResource());
-				getMethodTransactions().remove(mt);
-			}
-			else{
-				ExtendedEcoreUtil.becomeProxy(me, me.eResource());	
-				mt.getMethodElements().remove(me);
-			}
-		}
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/CMPAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/CMPAttributeImpl.java
deleted file mode 100644
index de2d0c74a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/CMPAttributeImpl.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-/**
- * Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.
-
- */
-public class CMPAttributeImpl extends EAttributeImpl implements CMPAttribute, EAttribute {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	protected transient JavaHelpers originatingType;
-	protected transient CMPAttribute targetAttribute;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected boolean derived;
-	
-	public CMPAttributeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.CMP_ATTRIBUTE;
-	}
-
-protected Field findExistingField() {
-	JavaClass javaClass = getEjbClass();
-	if (javaClass != null)
-		return javaClass.getFieldExtended(getName());
-	return null;
-}
-public org.eclipse.emf.ecore.EClassifier getAccessorType() {
-	if (getEjbClass() != null) {
-		Method getter = getEjbClass().getMethodExtended(getGetterName(), Collections.EMPTY_LIST);
-		if (getter != null)
-			return getter.getReturnType();
-	}
-	return null;
-}
-public ContainerManagedEntity getCMPEntity() {
-	return (ContainerManagedEntity) eContainer();
-}
-/**
- * Return the EjbClass from the CMP Entity.
- */
-
-protected JavaClass getEjbClass() {
-	ContainerManagedEntity ejb = getCMPEntity();
-	return ejb == null ? null : ejb.getEjbClass();
-}
-/**
- * Return the KeyClass from the CMP Entity.
- */
-
-protected JavaClass getKeyClass() {
-	ContainerManagedEntity ejb = getCMPEntity();
-	return ejb == null ? null : ejb.getPrimaryKey();
-}
-/**
- * @deprecated - With EJB 2.0, assuming a Java field is no longer safe.
- * 		Use getType() and getName() to get the most common field info.
- *		Or use getEjbClass() to get additional Java info.
- */
-
- public Field getField() {
-	ContainerManagedEntity ejb = getCMPEntity();
-	
-	if(ejb == null)
-		return null;
-
-	Field field = null;
-	switch(ejb.getVersionID()) {
-		case J2EEVersionConstants.EJB_1_0_ID:
-		case J2EEVersionConstants.EJB_1_1_ID:
-			field = findExistingField();
-			//Set the field type based on the attribute type if necessary
-			if (field != null && getEType() != null && field.getEType() == null)
-				field.setEType(getEType()); 
-			break;
-		case J2EEVersionConstants.EJB_2_0_ID:
-		case J2EEVersionConstants.EJB_2_1_ID: default:
-			field = ((JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI)).getJavaRefFactory().createField();
-			field.setName(getName());
-			field.setEType(getAccessorType());
-			break; 
-	}
-	return field;
-}
-public String getGetterName() {
-	if (name != null && name.length() > 0) {
-		StringBuffer b = new StringBuffer("get"); //$NON-NLS-1$
-
-		b.append(Character.toUpperCase(name.charAt(0))).append(name.length() > 1 ? name.substring(1) : ""); //$NON-NLS-1$
-		return b.toString();
-	}
-	return name;
-}
-/**
- * Return the type of this attribute in its original form (i.e., unwrapped if
- * the type has been wrapped).
- */
-public JavaHelpers getOriginatingType() {
-	return originatingType;
-}
-public String getSetterName() {
-	return "set" + Character.toUpperCase(getName().charAt(0)) + (getName().length() > 1 ? getName().substring(1) : ""); //$NON-NLS-1$ //$NON-NLS-2$
-}
-public JavaHelpers getType() {
-	if (getEType() != null)
-		return (JavaHelpers) getEType();
-	// Be sensitive to CMP 2.0 beans, get type from field or get accessor type
-	ContainerManagedEntity ejb = getCMPEntity();
-	Resource res = eResource();
-	boolean modFlag = res == null ? false : res.isModified();
-	boolean deliveryFlag = eDeliver();
-	try {
-		eSetDeliver(false);
-		if(ejb != null) {
-			switch(ejb.getVersionID()) {
-				case J2EEVersionConstants.EJB_1_0_ID:
-				case J2EEVersionConstants.EJB_1_1_ID:
-					setEType(getTypeFromBeanField());
-					break;
-				case J2EEVersionConstants.EJB_2_0_ID:
-				case J2EEVersionConstants.EJB_2_1_ID: default:
-					setEType(get20Type());
-					break; 
-			} 
-		}
-	} finally {
-		eSetDeliver(deliveryFlag);
-		if (res != null && res.isTrackingModification())
-			res.setModified(modFlag);
-	}
-	return (JavaHelpers) getEType();
-}
-protected EClassifier getTypeFromBeanField() {
-	EClassifier type = null;
-	Field field = getField();
-	if (field != null)
-		type = field.getEType();
-	if (type == null)
-		type = getKeyFieldTypeFromKeyClass();
-	return type;
-}
-public EClassifier get20Type() {
-	EClassifier type = null;
-	if (getEjbClass() != null) {
-		String getterName = getGetterName();
-		if (getterName != null && getterName.length() > 0) {
-			Method getter = getEjbClass().getMethodExtended(getterName, Collections.EMPTY_LIST);
-			if (getter != null)
-				type = getter.getReturnType();
-		}
-	}
-	if (type == null)
-		type = getKeyFieldTypeFromKeyClass();
-	return type;	
-}
-/**
- * @return
- */
-private EClassifier getKeyFieldTypeFromKeyClass() {
-	if (isKey()) {
-		JavaClass key = getCMPEntity().getPrimaryKey();
-		if (key != null && key.getQualifiedName() != null && !key.getQualifiedName().startsWith("java.lang")) { //$NON-NLS-1$
-			Field field = key.getFieldExtended(getName());
-			if (field != null)
-				return field.getEType();
-		} else
-			return key;
-	}
-	return null;
-}
-public boolean isCMRField() {
-	return false;
-}
-public boolean isKey() {
-	return getCMPEntity() == null ? false : getCMPEntity().isKeyAttribute(this);
-}
-
-public boolean isPrimKeyField(){
-	return getCMPEntity() == null ? false : getCMPEntity().getPrimKeyField() == this;
-}
-
-public void setOriginatingType(JavaHelpers newOriginatingType) {
-	originatingType = newOriginatingType;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the cmr field.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMP_ATTRIBUTE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		return super.toString() + " :: " + getName(); //$NON-NLS-1$
-	}
-	/**
-	 * Returns true if a targetAttribute is being used.
-	 * @return Returns a boolean
-	 */
-	public boolean isDerived() {
-		return derived;
-	}
-	public void setDerived(boolean aBoolean) {
-		if (aBoolean && getEType() == null)
-			getType(); //This ensures that the type is set.
-		derived = aBoolean;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/CMRFieldImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/CMRFieldImpl.java
deleted file mode 100644
index 70d85a122..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/CMRFieldImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-/**
- * Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).
- * 
- * @generated
- */
-public class CMRFieldImpl extends CMPAttributeImpl implements CMRField {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass collectionType = null;
-	public CMRFieldImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.CMR_FIELD;
-	}
-
-/**
- * createClassRef - return a JavaURL reference to the named Java class
- */
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-public String getCollectionTypeName() {
-	getCollectionType();
-	return collectionType == null ? null : collectionType.getQualifiedName();
-}          
-
-public boolean isPrimKeyField(){
-	return false;
-}
-
-public boolean isCMRField() {
-	return true;
-}
-public void setCollectionTypeName(String typeName) {
-	eSet(EjbPackage.eINSTANCE.getCMRField_CollectionType(), createClassRef(typeName));
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBRelationshipRole getRole() {
-		if (eContainerFeatureID != EjbPackage.CMR_FIELD__ROLE) return null;
-		return (EJBRelationshipRole)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRole(EJBRelationshipRole newRole, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRole, EjbPackage.CMR_FIELD__ROLE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRole(EJBRelationshipRole newRole) {
-		if (newRole != eInternalContainer() || (eContainerFeatureID != EjbPackage.CMR_FIELD__ROLE && newRole != null)) {
-			if (EcoreUtil.isAncestor(this, newRole))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRole != null)
-				msgs = ((InternalEObject)newRole).eInverseAdd(this, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, EJBRelationshipRole.class, msgs);
-			msgs = basicSetRole(newRole, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__ROLE, newRole, newRole));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getCollectionType() {
-		if (collectionType != null && collectionType.eIsProxy()) {
-			InternalEObject oldCollectionType = (InternalEObject)collectionType;
-			collectionType = (JavaClass)eResolveProxy(oldCollectionType);
-			if (collectionType != oldCollectionType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.CMR_FIELD__COLLECTION_TYPE, oldCollectionType, collectionType));
-			}
-		}
-		return collectionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetCollectionType() {
-		return collectionType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCollectionType(JavaClass newCollectionType) {
-		JavaClass oldCollectionType = collectionType;
-		collectionType = newCollectionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__COLLECTION_TYPE, oldCollectionType, collectionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRole((EJBRelationshipRole)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				return basicSetRole(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, EJBRelationshipRole.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				return getRole();
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				if (resolve) return getCollectionType();
-				return basicGetCollectionType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				setRole((EJBRelationshipRole)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				setCollectionType((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				setRole((EJBRelationshipRole)null);
-				return;
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				setCollectionType((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CMR_FIELD__ROLE:
-				return getRole() != null;
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				return collectionType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.ejb.internal.impl.CMPAttributeImpl#getCMPEntity()
-	 */
-	public ContainerManagedEntity getCMPEntity() {
-		EJBRelationshipRole role = getRole();
-		if (role != null)
-			return role.getSourceEntity();
-		return null;
-	}
-
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ContainerManagedEntityFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ContainerManagedEntityFilter.java
deleted file mode 100644
index 206558b69..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ContainerManagedEntityFilter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBExtensionFilter;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * Insert the type's description here. Creation date: (11/28/2000 6:28:39 PM)
- * @author: Administrator
- */
-public abstract class ContainerManagedEntityFilter implements EJBExtensionFilter {
- 
-
-    /**
-     * AttributeFilter constructor comment.
-     */
-    public ContainerManagedEntityFilter() {
-        super();
-    }
-
-    /**
-     * filter method comment.
-     */
-    public abstract List filter(ContainerManagedEntity cmp);
-
-    /**
-     * All CMPAttributeFilters only operate on ContainerManagedEntityExtension
-     * objects.
-     */
-    public List filter(EnterpriseBean ejb) {
-        if (ejb.isEntity() && ((Entity) ejb).isContainerManagedEntity()) return filter((ContainerManagedEntity) ejb);
-        return new ArrayList();
-    }
-
-    protected void filterRoleAttributesByName(List allAttributes, List roleAttributes) {
-        if (!roleAttributes.isEmpty()) {
-            int allSize, roleSize;
-            roleSize = roleAttributes.size();
-            CMPAttribute roleAtt, allAtt;
-            for (int i = 0; i < roleSize; i++) {
-                roleAtt = (CMPAttribute) roleAttributes.get(i);
-                allSize = allAttributes.size();
-                for (int j = allSize - 1; j != -1; j--) {
-                    allAtt = (CMPAttribute) allAttributes.get(j);
-                    if (roleAtt == allAtt || roleAtt.getName().equals(allAtt.getName())) {
-                        allAttributes.remove(j);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    protected EjbModuleExtensionHelper getEjbModuleExtHelper(Object context) {
-        return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(context);
-    }
-
-    protected List getLocalRelationshipRoles(ContainerManagedEntity cmp) {
-        EjbModuleExtensionHelper modelExtender = null;
-        if (cmp.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID)
-            return cmp.getRoles();
-        else if ( (modelExtender = getEjbModuleExtHelper(cmp)) != null ){
-            return modelExtender.getLocalRelationshipRoles_cmp11(cmp);
-        } 
-        return Collections.EMPTY_LIST;
-    }
-    
-    protected List getRelationshipRoles(ContainerManagedEntity cmp) { 
-        List roles = new ArrayList(); 
-        collectRelationshipRoles(cmp, getEjbModuleExtHelper(cmp), roles);
-        return Collections.unmodifiableList(roles);
-    }
-    
-    public void collectRelationshipRoles(ContainerManagedEntity cmp, EjbModuleExtensionHelper extensionHelper, List containerList) {
-        if(cmp == null)
-            return;
-        containerList.addAll(getLocalRelationshipRoles(cmp));
-        if(extensionHelper != null)
-            collectRelationshipRoles((ContainerManagedEntity) extensionHelper.getSuperType(cmp), extensionHelper, containerList);        
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ContainerManagedEntityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ContainerManagedEntityImpl.java
deleted file mode 100644
index cea1c3efc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ContainerManagedEntityImpl.java
+++ /dev/null
@@ -1,821 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBExtensionFilter;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.internal.util.CMPKeySynchronizationAdapter;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-
-
-/**
- * @generated
- */
-public class ContainerManagedEntityImpl extends EntityImpl implements ContainerManagedEntity {
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * 
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "1.x"; //$NON-NLS-1$
-
-	protected EClassifier fGeneratedIdType = null;
-	protected static final String PERS_FEATURE_CHNG_NOTIFIER = "PersistentFeatureChangeNotificationAdapter";	 //$NON-NLS-1$
-	protected static final String QUERY_METHOD_NAME = "QueryMethod"; //$NON-NLS-1$
-	protected static final String FIND_BY_PRIM_KEY_METHOD_NAME = "findByPrimaryKey"; //$NON-NLS-1$
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String version = VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAbstractSchemaName() <em>Abstract Schema Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAbstractSchemaName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ABSTRACT_SCHEMA_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String abstractSchemaName = ABSTRACT_SCHEMA_NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList persistentAttributes = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList keyAttributes = null;
-	/**
-	 * The cached value of the '{@link #getQueries() <em>Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList queries = null;
-
-	/**
-	 * The cached value of the '{@link #getCMPAttribute() <em>CMP Attribute</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCMPAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList cmpAttribute = null;
-
-	/**
-	 * The cached value of the '{@link #getPrimKeyField() <em>Prim Key Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimKeyField()
-	 * @generated
-	 * @ordered
-	 */
-	protected CMPAttribute primKeyField = null;
-
-	/**
-	 * @generated
-	 */
-	protected ContainerManagedEntityImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.CONTAINER_MANAGED_ENTITY;
-	}
-
-/**
- * Create a new instance of AttributeExtn with aName and add it to the keyFeatures.
- * Creation date: (8/2/2000 9:11:13 PM)
- * @param aName java.lang.String
- * @return CMPAttribute
- */
-public CMPAttribute addKeyAttributeName(String aName) {
-	CMPAttribute attribute = getPersistentAttribute(aName);
-	if (attribute != null) {
-		List keys = getKeyAttributes();
-		CMPAttribute key;
-		for (int i = 0; i < keys.size(); i++) {
-			key = (CMPAttribute) keys.get(i);
-			if (aName.equals(key.getName()))
-				return attribute;
-		}
-		keys.add(attribute);
-	}
-	return attribute;
-}
-/**
- * Return a List of one of the properties using aFilter.
-*/
-public List getFilteredFeatures(EJBExtensionFilter aFilter) {
-		return aFilter.filter(this);
-	}
-/**
- * Add a persistent attribute with the same name as the name for aField.
- * Creation date: (8/3/2000 8:30:42 AM)
- * @param aField org.eclipse.jem.internal.java.Field
- * @return CMPAttribute
- */
-public CMPAttribute addPersistentAttribute(Field aField) {
-	if (aField == null)
-		return null;
-	return addPersistentAttributeName(aField.getName());
-}
-/**
- * Create a new instance of AttributeExtn with aName and add it to the persistentFeatures.
- * Creation date: (8/2/2000 9:11:13 PM)
- * @param aName java.lang.String
- * @return CMPAttribute
- */
-public CMPAttribute addPersistentAttributeName(String aName) {
-	CMPAttribute attribute = getPersistentAttribute(aName);
-	if (attribute == null) {
-		attribute = createPersistentAttribute(aName);
-		getPersistentAttributes().add(attribute);
-	}
-	return attribute;
-}
-protected CMPAttribute createPersistentAttribute(String aName) {
-	CMPAttribute attribute = ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createCMPAttribute();
-	attribute.setName(aName);
-	return attribute;
-}
-public List getAllAvailableQueryMethods() {
-	Set sigs = new HashSet();
-	List javaMethods = getAvailableSelectQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	javaMethods = getAvailableLocalQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	javaMethods = getAvailableRemoteQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	List signatures = new ArrayList(sigs);
-	return createQueryMethods(signatures);
-}
-protected List createQueryMethods(List signatures) {
-	Collections.sort(signatures);
-	Enumerator enumerator = MethodElementKind.UNSPECIFIED_LITERAL;
-	return createMethodElements(QUERY_METHOD_NAME, signatures, enumerator);
-}
-
-public List getAvailableSelectQueryMethods() {
-	List methods = getAvailableSelectQueryJavaMethods();
-	List sigs = getMethodElementSignatures(methods);
-	return createQueryMethods(sigs);
-}
-protected List getAvailableSelectQueryJavaMethods() {
-	JavaClass bean = getEjbClass();
-	if (bean == null)
-		return Collections.EMPTY_LIST;
-	return bean.getOnlySpecificMethods("ejbSelect", Collections.EMPTY_LIST);	 //$NON-NLS-1$
-}
-
-public List getAvailableFindQueryMethods() {
-	Set sigs = new HashSet();
-	List javaMethods = getAvailableRemoteQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	javaMethods = getAvailableLocalQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	List signatures = new ArrayList(sigs);
-	return createQueryMethods(signatures);
-}
-protected List getAvailableLocalQueryJavaMethods() {
-	return getAvailableQueryJavaMethods(getLocalHomeInterface());
-}
-/**
-* This returns the CMP version id by using the module id and the <cmp-version>. 
-* Compare with J2EEVersionConstants to determine CMP level
-* This will help differentiate between 2.0,2.1,...   rather than "2.x"
-*/
-public int getCMPVersionID() throws IllegalStateException {
-	J2EEVersionResource res = (J2EEVersionResource) eResource();
-	/* If resource is null we will return based on CMP version....*/
-	if (res == null) {
-		if (getVersion().equals(ContainerManagedEntity.VERSION_1_X))
-			return J2EEVersionConstants.EJB_1_1_ID;
-		return J2EEVersionConstants.EJB_2_0_ID;
-	}
-	int cmpVersion;
-	switch (res.getModuleVersionID()) {
-		case J2EEVersionConstants.EJB_2_0_ID :
-			if (getVersion().equalsIgnoreCase(VERSION_2_X))
-				cmpVersion = J2EEVersionConstants.EJB_2_0_ID;
-			else
-				cmpVersion = J2EEVersionConstants.EJB_1_1_ID;
-			break;
-		case J2EEVersionConstants.EJB_2_1_ID :
-					if (getVersion().equalsIgnoreCase(VERSION_2_X))
-						cmpVersion = J2EEVersionConstants.EJB_2_1_ID;
-					else
-						cmpVersion = J2EEVersionConstants.EJB_1_1_ID;
-					break;
-
-		default :
-			cmpVersion = res.getModuleVersionID();
-	}
-	return cmpVersion;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getVersionID()
- */
-public int getVersionID() {
-	return getCMPVersionID();
-}protected List getAvailableRemoteQueryJavaMethods() {
-	return getAvailableQueryJavaMethods(getHomeInterface());
-}
-
-protected List getAvailableQueryJavaMethods(JavaClass home) {
-	if (home == null) return Collections.EMPTY_LIST;
-	List excluded = new ArrayList(1);
-	excluded.add("findByPrimaryKey"); //$NON-NLS-1$
-	return home.getOnlySpecificMethods("find", excluded); //$NON-NLS-1$
-}
-
-protected EClassifier getGeneratedIdType() {
-	if (fGeneratedIdType == null) {
-		fGeneratedIdType = JavaRefFactory.eINSTANCE.reflectType(JAVA_LANG_STRING, this);
-	}
-	return fGeneratedIdType;
-}
-/**
- * Return the keyAttribute with aName.
- * Creation date: (8/8/2000 9:25:27 PM)
- * @return EStructuralFeature
- * @param aName java.lang.String
- */
-public CMPAttribute getKeyAttribute(String aName) {
-	if (aName != null) {
-		Iterator it = getKeyAttributes().iterator();
-		CMPAttribute next;
-		while (it.hasNext()) {
-			next = (CMPAttribute) it.next();
-			if (aName.equals(next.getName()))
-				return next;
-		}
-	}
-	return null;
-}
-/**
- * Return the persistentAttribute with aName.
- * Creation date: (8/8/2000 9:25:27 PM)
- * @return EStructuralFeature
- * @param aName java.lang.String
- */
-public CMPAttribute getPersistentAttribute(String aName) {
-	if (aName != null) {
-		Iterator it = getPersistentAttributes().iterator();
-		CMPAttribute next;
-		while (it.hasNext()) {
-			next = (CMPAttribute) it.next();
-			if (aName.equals(next.getName()))
-				return next;
-		}
-	}
-	return null;
-}
-
-/**
- * If a primary key exists, return the persistent attribute; the primary key is defined as one and only one
- * key attribute, whose type is the same as the key class
- * @deprecated use getPrimKeyField()
- */
-public CMPAttribute getPrimaryKeyAttribute() {
-	return getPrimKeyField();
-}
-
-
-/**
- * isContainerManagedEntity method comment.
- */
-public boolean isContainerManagedEntity() {
-	return true;
-}
-public boolean isKeyAttribute(CMPAttribute anAttribute) {
-	java.util.List attributes = getKeyAttributes();
-	for (int i = 0; i < attributes.size(); i++){
-		if (attributes.get(i) == anAttribute)
-			return true;
-	}
-	return false;
-}
-/*
- * Return whether this bean represents an instance of the "unknown primary key" case
- * described in the specification.  This is identified by the primary key class
- * being specified as "java.lang.Object".
- * In order to deploy an unknown primary key bean, we must substitute a real key,
- * and add a corresponding field.
- */
-public boolean isUnknownPrimaryKey() {
-	String keyName = getPrimaryKeyName();
-	if (keyName == null) return false;
-	//test whether it is unknown or we have the WAS generated key for the unknown prim key
-	boolean genTest = keyName.equals(UNKNOWN_PRIMARY_KEY) || keyName.equals(WAS_GENERATED_STRING_KEY);
-	if (genTest) return true;
-	//Lastly, test for the findByPrimaryKey(Object) method on the home.
-	JavaClass home = getHomeInterface();
-	if (home == null)
-		home = getLocalHomeInterface();
-	if (home == null) return false;
-	List parmType = new ArrayList(1);
-    parmType.add(UNKNOWN_PRIMARY_KEY);
-   	return home.getMethodExtended(FIND_BY_PRIM_KEY_METHOD_NAME, parmType) != null;
-}
-/**
- * isVersion1_X method comment.
- */
-public boolean isVersion1_X() {
-	return getVersion().equals(ContainerManagedEntity.VERSION_1_X);
-}
-/**
- * isVersion2_X method comment.
- */
-public boolean isVersion2_X() {
-	return getVersion().equals(ContainerManagedEntity.VERSION_2_X);
-}
-/* 
- * listPersistentFieldNames - return the names of our CMP fields. derived from persistentFeatures
- */
-public String[] listPersistentFieldNames() {
-	java.util.List attributes = getPersistentAttributes();
-	String[] names = new String[attributes.size()];
-	for (int i = 0; i < attributes.size(); i++) {
-		names[i] = ((CMPAttribute) attributes.get(i)).getName();
-	}
-	return names;
-}
-
-/**
- * Remove the persistentAttribute with the same name as the Field's name.
- * Creation date: (8/3/2000 8:33:01 AM)
- * @param aField org.eclipse.jem.internal.java.Field
- */
-public CMPAttribute removePersistentAttribute(Field aField) {
-	if (aField != null)
-		return removePersistentAttribute(aField.getName());
-	return null;
-}
-/**
- * Remove the persistentAttribute named aName.
- * Creation date: (8/2/2000 8:59:32 PM)
- * @param aName java.lang.String
- */
-public CMPAttribute removePersistentAttribute(String aName) {
-	if (aName != null) {
-		Iterator it = getPersistentAttributes().iterator();
-		CMPAttribute next;
-		while (it.hasNext()) {
-			next = (CMPAttribute) it.next();
-			if (aName.equals(next.getName())) {
-				getPersistentAttributes().remove(next);
-				return next;
-			}
-		}
-	}
-	return null;
-}
-/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the version of an entity bean with container-managed persistence.
-	 * 
-	 * @invariant The cmp-version element must be one of the two following: 1.x , 2.x
-	 * @default 2.x
-	 * Returns "1.x" if in a 1.1 Jar (For compatibility)
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The abstract-schema-name element specifies the name of the abstract schema type of an entity bean with cmp-version 2.x. It is used in EJB QL queries.
-	 * 
-	 * For example, the abstract-schema-name for an entity bean whose local interface is com.acme.commerce.Order might be Order.
-	 * 
-
-	 */
-	public String getAbstractSchemaName() {
-		return abstractSchemaName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAbstractSchemaName(String newAbstractSchemaName) {
-		String oldAbstractSchemaName = abstractSchemaName;
-		abstractSchemaName = newAbstractSchemaName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME, oldAbstractSchemaName, abstractSchemaName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getPersistentAttributes() {
-		if (persistentAttributes == null) {
-			persistentAttributes = new EObjectContainmentEList(CMPAttribute.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES);
-		}
-		return persistentAttributes;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (version: ");
-		result.append(version);
-		result.append(", abstractSchemaName: ");
-		result.append(abstractSchemaName);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getKeyAttributesGen() {
-		if (keyAttributes == null) {
-			keyAttributes = new EObjectResolvingEList(CMPAttribute.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES);
-		}
-		return keyAttributes;
-	}
-
-	public EList getKeyAttributes() {
-	    if(keyAttributes == null) {
-		    CMPKeySynchronizationAdapter syncAdapter = (CMPKeySynchronizationAdapter)  EcoreUtil.getExistingAdapter(this, CMPKeySynchronizationAdapter.ADAPTER_TYPE);
-			if(syncAdapter != null) 
-			    syncAdapter.initializeKeyAttributes(); 
-	    }
-		return getKeyAttributesGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getQueries() {
-		if (queries == null) {
-			queries = new EObjectContainmentWithInverseEList(Query.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES, EjbPackage.QUERY__ENTITY);
-		}
-		return queries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCMPAttribute() {
-		if (cmpAttribute == null) {
-			cmpAttribute = new EObjectResolvingEList(CMPAttribute.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE);
-		}
-		return cmpAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMPAttribute getPrimKeyField() {
-		if (primKeyField != null && primKeyField.eIsProxy()) {
-			InternalEObject oldPrimKeyField = (InternalEObject)primKeyField;
-			primKeyField = (CMPAttribute)eResolveProxy(oldPrimKeyField);
-			if (primKeyField != oldPrimKeyField) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD, oldPrimKeyField, primKeyField));
-			}
-		}
-		return primKeyField;
-	}
-
-	public void makePrimKeyFieldProxy() {
-		if (primKeyField == null) return;
-		String fieldName = primKeyField.getName();
-		if (fieldName == null) fieldName = ""; //$NON-NLS-1$
-		primKeyField = EjbFactory.eINSTANCE.createCMPAttribute();
-		((InternalEObject)primKeyField).eSetProxyURI(URI.createURI(fieldName));
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMPAttribute basicGetPrimKeyField() {
-		return primKeyField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrimKeyField(CMPAttribute newPrimKeyField) {
-		CMPAttribute oldPrimKeyField = primKeyField;
-		primKeyField = newPrimKeyField;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD, oldPrimKeyField, primKeyField));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				return ((InternalEList)getQueries()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				return ((InternalEList)getPersistentAttributes()).basicRemove(otherEnd, msgs);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				return ((InternalEList)getQueries()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				return getVersion();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				return getAbstractSchemaName();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				return getPersistentAttributes();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				return getKeyAttributes();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				return getQueries();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				return getCMPAttribute();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				if (resolve) return getPrimKeyField();
-				return basicGetPrimKeyField();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				setVersion((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				setAbstractSchemaName((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				getPersistentAttributes().clear();
-				getPersistentAttributes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				getKeyAttributes().clear();
-				getKeyAttributes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				getQueries().clear();
-				getQueries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				getCMPAttribute().clear();
-				getCMPAttribute().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				setPrimKeyField((CMPAttribute)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				setAbstractSchemaName(ABSTRACT_SCHEMA_NAME_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				getPersistentAttributes().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				getKeyAttributes().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				getQueries().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				getCMPAttribute().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				setPrimKeyField((CMPAttribute)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				return ABSTRACT_SCHEMA_NAME_EDEFAULT == null ? abstractSchemaName != null : !ABSTRACT_SCHEMA_NAME_EDEFAULT.equals(abstractSchemaName);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				return persistentAttributes != null && !persistentAttributes.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				return keyAttributes != null && !keyAttributes.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				return queries != null && !queries.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				return cmpAttribute != null && !cmpAttribute.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				return primKeyField != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getCMRFields()
-	 */
-	public List getCMRFields() {
-		List myRoles = getRoles();
-		List cmrFields = Collections.EMPTY_LIST;
-		if (myRoles != null && !myRoles.isEmpty()) {
-			cmrFields = new ArrayList();
-			Iterator i = myRoles.iterator();
-			while (i.hasNext()) {
-				EJBRelationshipRole role = (EJBRelationshipRole) i.next();
-				CMRField field = role.getCmrField();
-				if (field != null)
-					cmrFields.add(field);
-			}
-		}
-		return cmrFields;
-	}
-
-	public boolean isSelfReferencing(EJBRelation rel) {
-		if (rel.getSecondRole() == null)
-			return false;
-		return (rel.getFirstRole().getSourceEntity() == this) &&
-			(rel.getSecondRole().getSourceEntity() == this);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getRoles()
-	 */
-	public List getRoles() {
-		if (getEjbJar() == null)
-			return Collections.EMPTY_LIST;
-		List allRoles = getEjbJar().getEjbRelations();
-		List myRoles = Collections.EMPTY_LIST;
-		if (allRoles != null && !allRoles.isEmpty()) {
-			myRoles = new ArrayList();
-			Iterator i = allRoles.iterator();
-			while (i.hasNext()) {
-				EJBRelation rel = (EJBRelation) i.next();
-				EJBRelationshipRole role = rel.getFirstRole();
-				if (isSelfReferencing(rel)) {
-					myRoles.add(rel.getFirstRole());
-					myRoles.add(rel.getSecondRole());
-				}
-				else if ((role != null) && role.getSourceEntity() == this) {
-					myRoles.add(role);
-				} else {
-					role = rel.getSecondRole();
-					if ((role != null) && (role.getSourceEntity() == this))
-						myRoles.add(role);
-				}
-			}
-		}
-		return myRoles;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getRole(java.lang.String)
-	 */
-	public CommonRelationshipRole getRole(String roleName) {
-		List roles = getRoles();
-		for (int i=0; i<roles.size(); i++) {
-			CommonRelationshipRole role = (CommonRelationshipRole)roles.get(i);
-			if (role.getName().equals(roleName))
-				return role;
-		}
-		return null;
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJB20FlattenedRoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJB20FlattenedRoleShapeStrategy.java
deleted file mode 100644
index 6499b3277..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJB20FlattenedRoleShapeStrategy.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy;
-
-/**
- * Insert the type's description here.
- * Creation date: (11/6/2000 11:41:33 AM)
- * @author: Administrator
- */
-public class EJB20FlattenedRoleShapeStrategy extends RoleShapeStrategy {
-	/**
-	 * FlattenedRoleShapeStrategy constructor comment.
-	 */
-	public EJB20FlattenedRoleShapeStrategy(CommonRelationshipRole aRole) {
-		super(aRole);
-	}
-	protected boolean canContinue() {
-		return !busy && role.getName() != null && (role.isForward() ||
-			(role.isMany() && (role.getOppositeAsCommonRole() == null ||
-			role.getOppositeAsCommonRole().isMany())));
-	}
-	
-	public boolean usesAttributeNamed(String attributeName) {
-		if (attributeName != null) {
-			int index = attributeName.indexOf(IRoleShapeStrategy.ATTRIBUTE_NAME_JOINER);
-			String name = attributeName.substring(0, index);
-			return getRole().getName().equals(name);
-		}
-		return false;
-	}
-
-	/**
-	 * @see RoleShapeStrategy#reconcileAttributes(CommonRelationshipRole, String, List, List)
-	 */
-	protected void reconcileAttributes(CommonRelationshipRole aRole, String attributeName, List aList, List computedNames) {
-		
-		Resource res = aRole.eResource();
-		boolean dirtyFlag = res != null ? res.isModified() : false;
-		try {		
-			if (aRole.getOppositeAsCommonRole() != null) {
-				ContainerManagedEntity entity = aRole.getOppositeAsCommonRole().getSourceEntity();
-		//	ContainerManagedEntityExtension roleType = (ContainerManagedEntityExtension)getTypeExtension(aRole);
-			if (entity != null)
-				collectAttributes(entity, attributeName, aList, computedNames);
-		}
-		} finally {
-			if (res != null)
-				res.setModified(dirtyFlag);
-		}
-	}
-
-	/**
-	 * @see com.ibm.ejs.models.base.extensions.ejbext.impl.FlattenedRoleShapeStrategy#setDerivedAttributeType(CMPAttribute, JavaHelpers)
-	 */
-	protected void setDerivedAttributeType(CMPAttribute attribute, CMPAttribute targetAttribute, boolean isNew) {
-		if (targetAttribute == null) return;
-		JavaHelpers fieldType = targetAttribute.getType();
-		if (fieldType != null) {
-			int singleRoleNameSize = getRole().getName().length() + targetAttribute.getName().length() + 1; //one for the underscore
-			if (!(attribute.getName().length() > singleRoleNameSize)) //don't set the originating type since we are derived from another derived attribute
-				attribute.setOriginatingType(fieldType);
-			attribute.setEType(fieldType.getWrapper());
-		}
-		if (isNew && !getRole().isKey())
-			attribute.setDerived(true);
-	}
-	/**
-	 * getFields method comment.
-	 */
-	protected void collectAttributes(ContainerManagedEntity type, String attributeName, List aList, List computedNames) {
-		collectKeyModelledAttributes(type, attributeName, aList, computedNames);
-		collectKeyRoleAttributes(type, attributeName, aList, computedNames);
-	}
-	
-	/**
-	 * @deprecated to be safe, really should use collectAttributes(ContainerManagedEntity entity, CMPAttribute type, String attributeName, List aList, List computedNames)
-	 * @param type
-	 * @param attributeName
-	 * @param aList
-	 * @param computedNames
-	 */
-	protected void collectAttributes(CMPAttribute type, String attributeName, List aList, List computedNames) {
-		// This is necessary for code generation
-		ContainerManagedEntity entity = (ContainerManagedEntity) type.eContainer();
-		collectAttributes(entity, type, attributeName, aList, computedNames);
-	}
-	
-	/**
-	 * 
-	 */
-	protected void collectAttributes(ContainerManagedEntity entity, CMPAttribute type, String attributeName, List aList, List computedNames) {
-		boolean isNewAttribute = false;
-		attributeName = appendName(attributeName, type.getName());
-		computedNames.add(attributeName);
-		CMPAttribute attribute = getCMPEntity().getPersistentAttribute(attributeName);
-		if (attribute == null) {
-			attribute = createPersistentAttribute(attributeName);
-			isNewAttribute = true;
-		}
-		if (entity != null)
-			setDerivedAttributeType(attribute, type, isNewAttribute);
-		if (isNewAttribute) {
-			if (getRole().isKey())
-				getCMPEntity().getKeyAttributes().add(attribute);
-			aList.add(attribute);
-			getCMPEntity().getPersistentAttributes().add(attribute);
-		} else {
-			if (!aList.contains(attribute))
-				aList.add(attribute);
-		}
-	}
-	
-	protected CMPAttribute createPersistentAttribute(String aName) {
-		CMPAttribute attribute = ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createCMPAttribute();
-		attribute.setName(aName);
-		attribute.setDescription("Generated to support relationships.  Do NOT delete.");
-		return attribute;
-	}
-	/**
-	 * getFields method comment.
-	 */
-	protected void collectKeyModelledAttributes(ContainerManagedEntity entity, String attributeName, List aList, List computedNames) {
-		java.util.Iterator it = entity.getFilteredFeatures(ModelledKeyAttributeFilter.singleton()).iterator();
-		CMPAttribute attribute;
-		while (it.hasNext()) {
-			attribute = (CMPAttribute) it.next();
-			collectAttributes(entity, attribute, attributeName, aList, computedNames);
-		}
-	}
-	/**
-	 * getFields method comment.
-	 */
-	protected void collectKeyRoleAttributes(ContainerManagedEntity entity, String attributeName, List aList, List computedNames) {
-		if(visitedKeyTypes.contains(entity)){
-			throw new RuntimeException("Key role cycle detected");
-		}
-		visitedKeyTypes.add(entity);
-		java.util.Iterator it = entity.getFilteredFeatures(KeyRelationshipRoleFilter.singleton()).iterator();
-		CommonRelationshipRole aRole;
-		while (it.hasNext()) {
-			aRole = (CommonRelationshipRole) it.next();
-			String attName = appendName(attributeName, aRole.getName());
-			reconcileAttributes(aRole, attName, aList, computedNames);
-		}
-	}
-	protected ContainerManagedEntity getCMPEntity() {
-		return getRole().getSourceEntity();
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBJarImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBJarImpl.java
deleted file mode 100644
index aef54f3d8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBJarImpl.java
+++ /dev/null
@@ -1,733 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-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.Relationships;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-
-/**
- * The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file
- * name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar.
- */
-public class EJBJarImpl extends CompatibilityDescriptionGroupImpl implements EJBJar {
-
-	/**
-	 * The default value of the '{@link #getEjbClientJar() <em>Ejb Client Jar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClientJar()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_CLIENT_JAR_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String ejbClientJar = EJB_CLIENT_JAR_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AssemblyDescriptor assemblyDescriptor = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList enterpriseBeans = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Relationships relationshipList = null;
-	public EJBJarImpl() {
-		super();
-//		setRefId(com.ibm.etools.archive.ArchiveConstants.EJBJAR_ID);
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_JAR;
-	}
-
-/**
- * Return true if there are any ContainerManagedEntity beans in this jar.
- */
-public boolean containsContainerManagedBeans() {
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity())
-			return true;
-	}
-	return false;
-}
-/**
- * @see org.eclipse.jst.j2ee.internal.ejb.EJBJar
- */
-public boolean containsSecurityRole(java.lang.String name) {
-	AssemblyDescriptor ad = getAssemblyDescriptor();
-	return (ad != null) && (ad.getSecurityRoleNamed(name) != null);
-}
-/**
- * Return List of BMP beans in this jar.
- * @return java.util.List
- */
-public List getBeanManagedBeans() {
-	List allBeans, beans;
-	allBeans = getEnterpriseBeans();
-	int size = allBeans.size();
-	beans = new ArrayList(size);
-	EnterpriseBean ejb;
-	for (int i = 0; i < size; i++) {
-		ejb = (EnterpriseBean) allBeans.get(i);
-		if (ejb.isBeanManagedEntity())
-			beans.add(ejb);
-	}
-	return beans;
-}
-/**
- * Return List of ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-public List getContainerManagedBeans() {
-	List cmps = new ArrayList(getEnterpriseBeans().size());
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity())
-			cmps.add(ejb);
-	}
-	return cmps;
-}
-
-/**
- * Return List of EJB 1.1 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-public List getEJB11ContainerManagedBeans() {
-	List cmps = new ArrayList(getEnterpriseBeans().size());
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity() && ejb.getVersionID() <= J2EEVersionConstants.EJB_1_1_ID)
-			cmps.add(ejb);
-	}
-	return cmps;
-}
-
-/**
- * Return List of EJB 2.0 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-public List getEJB20ContainerManagedBeans() {
-	List cmps = new ArrayList(getEnterpriseBeans().size());
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity() && ejb.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID)
-			cmps.add(ejb);
-	}
-	return cmps;
-}
-	/*
-	 * @see EJBJar#getMessageDrivenBeans()
-	 */
-	public List getMessageDrivenBeans() {
-		List ejbs = getEnterpriseBeans();
-		int size = ejbs.size();
-		List mdbs = new ArrayList(size);
-		EnterpriseBean ejb;
-		for (int i = 0; i < size; i++) {
-			ejb = (EnterpriseBean)ejbs.get(i);
-			if (ejb.isMessageDriven())
-				mdbs.add(ejb);
-		}
-		return mdbs;
-	}
-/**
- * @return The list of EjbRelations references
- * A list of ejb-relation elements, which specify the container managed relationships.
- */
-public List getEjbRelations() {
-	return getRelationshipList() == null ? null : getRelationshipList().getEjbRelations();
-}
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists.  The ejb-link value
- * of the ref must equate to a named enterprise bean contained in the jar; otherwise return
- * null
- */
-public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref) {
-	String link = ref.getLink();
-	if (link == null) {
-		return null;
-	}
-	return getEnterpriseBeanNamed(link);
-}
-public EnterpriseBean getEnterpriseBeanNamed(String ejbName) {
-	if (ejbName == null)
-		return null;
-	EList beans = getEnterpriseBeans();
-	EnterpriseBean bean;
-	for (int i = 0; i < beans.size(); i++) {
-		bean = (EnterpriseBean) beans.get(i);
-		if (ejbName.equals(bean.getName()))
-			return bean;
-	}
-	return null;
-}
-/**
- * Return ALL EnterpriseBean(s) that are referencing @aJavaClass as a
- * home, remote, bean class, or key class.
- */
-public java.util.List getEnterpriseBeansWithReference(JavaClass aJavaClass) {
-	List beans = getEnterpriseBeans();
-	List result = new ArrayList();
-	EnterpriseBean bean = null;
-	for (int i = 0; i < beans.size(); i++){
-		bean = (EnterpriseBean) beans.get(i);
-		if (bean.hasJavaReference(aJavaClass))
-			result.add(bean);
-	}
-	return result;
-}
-/**
- * Return the *FIRST* EnterpriseBean that is referencing @aJavaClass as its
- * home, remote, bean class, or key class.
- */
-public EnterpriseBean getEnterpriseBeanWithReference(JavaClass aJavaClass) {
-	List beans = getEnterpriseBeans();
-	EnterpriseBean bean = null;
-	for (int i = 0; i < beans.size(); i++){
-		bean = (EnterpriseBean) beans.get(i);
-		if (bean.hasJavaReference(aJavaClass))
-			return bean;
-	}
-	return null;
-}
-/**
- * Return List of Session beans in this jar.
- * @return java.util.List
- */
-public List getSessionBeans() {
-	List allBeans, beans;
-	allBeans = getEnterpriseBeans();
-	int size = allBeans.size();
-	beans = new ArrayList(size);
-	EnterpriseBean ejb;
-	for (int i = 0; i < size; i++) {
-		ejb = (EnterpriseBean) allBeans.get(i);
-		if (ejb.isSession())
-			beans.add(ejb);
-	}
-	return beans;
-}
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 1.1 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_1Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	EJBResource ejbRes = (EJBResource) eResource();
-	return ejbRes.isEJB1_1();
-}
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 2.0 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_0Descriptor()  {
-	CommonUtil.checkDDObjectForVersion(this);
-	EJBResource ejbRes = (EJBResource) eResource();
-	return ejbRes.isEJB2_0();
-}
-/**
- * @see org.eclipse.jst.j2ee.internal.ejb.EJBJar
- */
-public void renameSecurityRole(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	AssemblyDescriptor ad = getAssemblyDescriptor();
-	if (ad != null)
-		ad.renameSecurityRole(existingRoleName, newRoleName);
-	List ejbs = getEnterpriseBeans();
-	for (int i = 0; i < ejbs.size(); i++) {
-		EnterpriseBean ejb = (EnterpriseBean) ejbs.get(i);
-		ejb.reSyncSecurityRoleRef(existingRoleName, newRoleName);
-	}
-}
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The optional ejb-client-jar element specifies a JAR file that contains the class files necessary for a client program to access the enterprise beans in the ejb-jar file. The Deployer should make the ejb-client JAR file accessible to the client's class-loader.  Example:<ejb-client-jar>employee_service_client.jar<//ejb-client-jar>
-
-	 */
-	public String getEjbClientJar() {
-		return ejbClientJar;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbClientJar(String newEjbClientJar) {
-		String oldEjbClientJar = ejbClientJar;
-		ejbClientJar = newEjbClientJar;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__EJB_CLIENT_JAR, oldEjbClientJar, ejbClientJar));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource ejbRes = (J2EEVersionResource) eResource();
-		if (ejbRes == null) {
-			// fix defect 3276, when resource is unloaded
-			if (version == null) 
-				throw new IllegalStateException();
-			if (version.equals("2.1")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_2_1_ID;
-			if (version.equals("2.0")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_2_0_ID;
-			if (version.equals("1.1")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_1_1_ID;
-			if (version.equals("1.0")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_1_0_ID;
-		}
-		return ejbRes.getModuleVersionID();
-	}
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException("XMLResource is null");
-		return res.getJ2EEVersionID();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		return assemblyDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor, NotificationChain msgs) {
-		AssemblyDescriptor oldAssemblyDescriptor = assemblyDescriptor;
-		assemblyDescriptor = newAssemblyDescriptor;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, oldAssemblyDescriptor, newAssemblyDescriptor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != assemblyDescriptor) {
-			NotificationChain msgs = null;
-			if (assemblyDescriptor != null)
-				msgs = ((InternalEObject)assemblyDescriptor).eInverseRemove(this, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, AssemblyDescriptor.class, msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, AssemblyDescriptor.class, msgs);
-			msgs = basicSetAssemblyDescriptor(newAssemblyDescriptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The enterprise-beans element contains the declarations of one or more
-	 * enterprise beans.
-	 */
-	public EList getEnterpriseBeans() {
-		if (enterpriseBeans == null) {
-			enterpriseBeans = new EObjectContainmentWithInverseEList(EnterpriseBean.class, this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EjbPackage.ENTERPRISE_BEAN__EJB_JAR);
-		}
-		return enterpriseBeans;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The relationships collection describes the relationships in which container managed persistence entity beans and dependent objects participate. The relationships element contains an optional description; a list of ejb-entity-ref elements (references to entity beans that participate in container managed relationships but whose abstract persistence schemas are not included in the ejb-jar file);
-	 * and a list of ejb-relation elements, which specify the container managed relationships.
-	 */
-	public Relationships getRelationshipList() {
-		return relationshipList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRelationshipList(Relationships newRelationshipList, NotificationChain msgs) {
-		Relationships oldRelationshipList = relationshipList;
-		relationshipList = newRelationshipList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, oldRelationshipList, newRelationshipList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRelationshipList(Relationships newRelationshipList) {
-		if (newRelationshipList != relationshipList) {
-			NotificationChain msgs = null;
-			if (relationshipList != null)
-				msgs = ((InternalEObject)relationshipList).eInverseRemove(this, EjbPackage.RELATIONSHIPS__EJB_JAR, Relationships.class, msgs);
-			if (newRelationshipList != null)
-				msgs = ((InternalEObject)newRelationshipList).eInverseAdd(this, EjbPackage.RELATIONSHIPS__EJB_JAR, Relationships.class, msgs);
-			msgs = basicSetRelationshipList(newRelationshipList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, newRelationshipList, newRelationshipList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				if (assemblyDescriptor != null)
-					msgs = ((InternalEObject)assemblyDescriptor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, null, msgs);
-				return basicSetAssemblyDescriptor((AssemblyDescriptor)otherEnd, msgs);
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return ((InternalEList)getEnterpriseBeans()).basicAdd(otherEnd, msgs);
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				if (relationshipList != null)
-					msgs = ((InternalEObject)relationshipList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__RELATIONSHIP_LIST, null, msgs);
-				return basicSetRelationshipList((Relationships)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return basicSetAssemblyDescriptor(null, msgs);
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return ((InternalEList)getEnterpriseBeans()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				return basicSetRelationshipList(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				return getEjbClientJar();
-			case EjbPackage.EJB_JAR__VERSION:
-				return getVersion();
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return getEnterpriseBeans();
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				return getRelationshipList();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				setEjbClientJar((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__VERSION:
-				setVersion((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				getEnterpriseBeans().clear();
-				getEnterpriseBeans().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				setEjbClientJar(EJB_CLIENT_JAR_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				getEnterpriseBeans().clear();
-				return;
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				return EJB_CLIENT_JAR_EDEFAULT == null ? ejbClientJar != null : !EJB_CLIENT_JAR_EDEFAULT.equals(ejbClientJar);
-			case EjbPackage.EJB_JAR__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return assemblyDescriptor != null;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return enterpriseBeans != null && !enterpriseBeans.isEmpty();
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				return relationshipList != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbClientJar: ");
-		result.append(ejbClientJar);
-		result.append(", version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-	public EJBRelationshipRole getRelationshipRole(String aRoleName, ContainerManagedEntity sourceCMP) {
-		if (aRoleName == null || sourceCMP == null) return null;
-		EJBRelationshipRole role = null;
-		if (getRelationshipList() != null) {
-			List relations = getRelationshipList().getEjbRelations();
-			int size = relations.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) relations.get(i);
-				role = rel.getRelationshipRole(aRoleName);
-				if (role != null && role.getSourceEntity() == sourceCMP)
-					return role;				
-			}
-		}
-		return null;
-	}
-	
-	public EJBRelation getEJBRelation(String aRelationName) {
-		Relationships relList = getRelationshipList();
-		if (relList != null) {
-			List rels = relList.getEjbRelations();
-			int size = rels.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) rels.get(i);
-				if (rel == null) continue;
-				if (aRelationName.equals(rel.getName()))
-					return rel;
-			}
-		}
-		return null;
-	}
-	/**
-	 * @see EJBJar#getEJBRelationsForSource(ContainerManagedEntity)
-	 */
-	public List getEJBRelationsForSource(ContainerManagedEntity cmp) {
-		Relationships relList = getRelationshipList();
-		List result = null;
-		if (relList != null) {
-			List rels = relList.getEjbRelations();
-			int size = rels.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) rels.get(i);
-				if (rel == null) continue;
-				List roles = rel.getRelationshipRoles();
-				EJBRelationshipRole role;
-				for (int j = 0; j < roles.size(); j++) {
-					role = (EJBRelationshipRole) roles.get(j);
-					if (role.getSourceEntity() == cmp) {
-						if (result == null)
-							result = new ArrayList();
-						result.add(rel);
-						break;
-					}
-				}
-			}
-		}
-		if (result == null)
-			result = Collections.EMPTY_LIST;
-		return result;
-	}
-	
-	public List getEJBRelationshipRolesForType(ContainerManagedEntity cmp) {
-		Relationships relList = getRelationshipList();
-		List result = null;
-		if (relList != null) {
-			List rels = relList.getEjbRelations();
-			int size = rels.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) rels.get(i);
-				if (rel == null) continue;
-				List roles = rel.getRelationshipRoles();
-				EJBRelationshipRole role;
-				for (int j = 0; j < roles.size(); j++) {
-					role = (EJBRelationshipRole) roles.get(j);
-					if (cmp.equals(((CommonRelationshipRole) role).getTypeEntity())) {
-						if (result == null)
-							result = new ArrayList();
-						result.add(role);
-						break;
-					}
-				}
-			}
-		}
-		if (result == null)
-			result = Collections.EMPTY_LIST;
-		return result;
-	}
-
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBJarResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBJarResourceFactory.java
deleted file mode 100644
index 35c6b0571..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBJarResourceFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-/**
- * @author schacher
- */
-public class EJBJarResourceFactory extends TranslatorResourceFactory {
-	
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJBJAR_SYSTEMID_1_1, "ejb-jar_1_1.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJBJAR_ALT_SYSTEMID_1_1, "ejb-jar_1.1.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJBJAR_SYSTEMID_2_0, "ejb-jar_2_0.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJBJAR_ALT_SYSTEMID_2_0, "ejb-jar_2.0.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJB_JAR_SCHEMA_LOC_2_1, "ejb-jar_2_1.xsd"); //$NON-NLS-1$
-	}
-
-	/**  
-	 */
-	public EJBJarResourceFactory() {
-		super(RendererFactory.getDefaultRendererFactory());
-	}
-
-	/**
-	 * @param aRendererFactory
-	 */
-	public EJBJarResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new EJBResourceImpl(uri, aRenderer);
-	}
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(aRendererFactory));
-	}
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.EJBJAR_DD_URI_OBJ);
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBMethodCategoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBMethodCategoryImpl.java
deleted file mode 100644
index 6cbcc8aac..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBMethodCategoryImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-/**
- * The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD.
- * @generated
- */
-public class EJBMethodCategoryImpl extends J2EEEObjectImpl implements EJBMethodCategory {
-
-	public EJBMethodCategoryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_METHOD_CATEGORY;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBRelationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBRelationImpl.java
deleted file mode 100644
index d6a46a219..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBRelationImpl.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-
-/**
- * The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.
- * 
- * @invariant The name of the relationship, if specified, is unique within the ejb-jar file.
- * @invariant self.relationshipRoles.size == 2
- * @invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name
- * 
- * @migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension
- * @migration EJB1.1 added optional attribute, description:String
- * @migration EJB1.1 added optional attribute, name:String (May have been inherited from EObject previously)
- * @generated
- */
-public class EJBRelationImpl extends J2EEEObjectImpl implements EJBRelation {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList relationshipRoles = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public EJBRelationImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_RELATION;
-	}
-
-public boolean containsRelationshipRole(EJBRelationshipRole aRole) {
-	return getRelationshipRoles().contains(aRole);
-}
-/**
- * Return the roles.
- */
-public EList getCommonRoles() {
-	return getRelationshipRoles();
-}
-/**
- * Return the first role.
- */
-public CommonRelationshipRole getFirstCommonRole() {
-	return getFirstRole();
-}
-/**
- * Return the first role.
- */
-public EJBRelationshipRole getFirstRole() {
-	List list = getRelationshipRoles();
-	if (list.size() == 0)
-		return null;
-	return (EJBRelationshipRole) list.get(0);
-}
-/**
- * Return the other role.
- */
-public EJBRelationshipRole getOppositeRole(EJBRelationshipRole aRole) {
-	if (aRole != null) {
-		if (aRole == getFirstRole())
-			return getSecondRole();
-		if (aRole == getSecondRole())
-			return getFirstRole();
-	}
-	return null;
-}
-/**
- * Return the first role.
- */
-public CommonRelationshipRole getSecondCommonRole() {
-	return getSecondRole();
-}
-/**
- * Return the second role.
- */
-public EJBRelationshipRole getSecondRole() {
-	List list = getRelationshipRoles();
-	if (list.size() < 2)
-		return null;
-	return (EJBRelationshipRole) list.get(1);
-}
-/**
- * Set the forward role.  Implemented by ensuring that the passed role is the first role 
- * which is the "tiebreaker" in case of unclear relationships, such as 1:1.
- */
-public void setFoward(EJBRelationshipRole aRole) {
-	
-	EList roles = getRelationshipRoles();
-	int currentIndex = roles.indexOf(aRole);
-	if (currentIndex != 0) {
-		if (currentIndex > -1)
-			roles.move(0, aRole);
-		else
-			roles.set(0, aRole);
-	}
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the ejb relation.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The name of the relationship. If specified, must be unique within the ejb-jar file.
-	 * @invariant self.name unique within Set<collect(ejbJar.ejbRelations.name)>
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Relationships getRelationshipList() {
-		if (eContainerFeatureID != EjbPackage.EJB_RELATION__RELATIONSHIP_LIST) return null;
-		return (Relationships)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRelationshipList(Relationships newRelationshipList, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRelationshipList, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRelationshipList(Relationships newRelationshipList) {
-		if (newRelationshipList != eInternalContainer() || (eContainerFeatureID != EjbPackage.EJB_RELATION__RELATIONSHIP_LIST && newRelationshipList != null)) {
-			if (EcoreUtil.isAncestor(this, newRelationshipList))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRelationshipList != null)
-				msgs = ((InternalEObject)newRelationshipList).eInverseAdd(this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS, Relationships.class, msgs);
-			msgs = basicSetRelationshipList(newRelationshipList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST, newRelationshipList, newRelationshipList));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A collection containing exactly two relationship roles.
-	 * 
-	 * @migration EJB1.1 Containment used to be by reference on relation--now by value.
-
-	 */
-	public EList getRelationshipRoles() {
-		if (relationshipRoles == null) {
-			relationshipRoles = new EObjectContainmentWithInverseEList(EJBRelationshipRole.class, this, EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP);
-		}
-		return relationshipRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRelationshipList((Relationships)otherEnd, msgs);
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				return ((InternalEList)getRelationshipRoles()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				return basicSetRelationshipList(null, msgs);
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				return ((InternalEList)getRelationshipRoles()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS, Relationships.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EJB_RELATION__NAME:
-				return getName();
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				return getRelationshipList();
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				return getRelationshipRoles();
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				getRelationshipRoles().clear();
-				getRelationshipRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)null);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				getRelationshipRoles().clear();
-				return;
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EJB_RELATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				return getRelationshipList() != null;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				return relationshipRoles != null && !relationshipRoles.isEmpty();
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	public EJBRelationshipRole getRelationshipRole(String aRoleName) {
-		if (aRoleName == null) return null;
-		List roles = getRelationshipRoles();
-		EJBRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (EJBRelationshipRole) roles.get(i);
-			if (aRoleName.equals(role.getName()))
-				return role;
-		}
-		return null;
-	}		
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBRelationshipRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBRelationshipRoleImpl.java
deleted file mode 100644
index 3b2358dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBRelationshipRoleImpl.java
+++ /dev/null
@@ -1,1012 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.CommonRelationship;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-/**
- * The ejb-relationship-role element describes a role within a relationship.
- * There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship.
- * 
- * @invariant multiplicity != null
- * @invariant roleSource != null
- * @invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. 
- * @invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBRelation in which the other EJBRelationshipRole element specifies a multiplicity of One.
- * 
- * Example:
- * <ejb-relation>
- *   <ejb-relation-name>Product-LineItem<//ejb-relation-name>
- *   <ejb-relationship-role>
- *     <ejb-relationship-role-name>product-has-lineitems<//ejb-relationship-role-name>
- *     <multiplicity>One<//multiplicity>
- *     <relationship-role-source>
- *       <ejb-name>ProductEJB<//ejb-name>
- *     <//relationship-role-source>
- *   <//ejb-relationship-role>
- * ...
- * @generated
- */
-public class EJBRelationshipRoleImpl extends J2EEEObjectImpl implements EJBRelationshipRole {
-
-
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	protected static final EList EMPTY_ELIST = new org.eclipse.emf.common.util.BasicEList(0);
-
-	// Need to cache the computed attributes so that they maintain identity
-	protected EList fAttributes = null;
-	protected String fName = null;
-	protected IRoleShapeStrategy roleShapeStrategy;
-	private static final String ROLE_STRATEGY_CLASS_NAME = "org.eclipse.jst.j2ee.ejb.internal.impl.EJB20FlattenedRoleShapeStrategy"; //$NON-NLS-1$
-	private static final String COMMON_ROLE_CLASS_NAME = "org.eclipse.jst.j2ee.ejb.CommonRelationshipRole"; //$NON-NLS-1$
-	private static Class COMMON_ROLE_CLASS;
-	private static Class ROLE_STRATEGY_CLASS;
-	private static Constructor ROLE_STRATEGY_CONSTRUCTOR;
-	private static final String NAME_SUFFIX = "Inverse"; //$NON-NLS-1$
-    
-	private boolean toStringGuard;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMultiplicity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MultiplicityKind MULTIPLICITY_EDEFAULT = MultiplicityKind.ONE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected MultiplicityKind multiplicity = MULTIPLICITY_EDEFAULT;
-	/**
-	 * This is true if the Multiplicity attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multiplicityESet = false;
-
-	/**
-	 * The default value of the '{@link #isCascadeDelete() <em>Cascade Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_DELETE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean cascadeDelete = CASCADE_DELETE_EDEFAULT;
-	/**
-	 * This is true if the Cascade Delete attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean cascadeDeleteESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected RoleSource source = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected CMRField cmrField = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	private boolean wasForward = false;
-	private boolean wasMany = false;
-    
-	private boolean isKeySet = false;
-	private boolean key = false;
-	
-	private transient Boolean required = null;
-
-	public EJBRelationshipRoleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EJB_RELATIONSHIP_ROLE;
-	}
-
-	/**
-	 * Return the persistentAttributes from my Entity that are used
-	 * by this role.
-	 */
-	
-	public EList getAttributes() {
-		if (fAttributes == null) {
-			fAttributes = new BasicEList(1);
-		}
-		if (fAttributes.isEmpty()) {
-			getRoleShapeStrategy().reconcileAttributes(fAttributes);
-		}
-		return fAttributes;
-	}
-	/**
-	 * Return our parent relationship as a CommonRelationship
-	 */
-
-	public CommonRelationship getCommonRelationship() {
-		return getRelationship();
-	}
-	protected IRoleShapeStrategy getDefaultRoleShapeStrategy() {
-		try {
-			return (IRoleShapeStrategy) getRoleStrategyConstructor(this).newInstance(new Object[] { this });
-		} catch (Throwable t) {
-			Logger.getLogger().logError("EJBRelationshipRoleImpl:Could not instantiate role shape strategy; this requires extensions"); //$NON-NLS-1$
-			Logger.getLogger().logError(t);
-			return null;
-		}
-
-	}
-
-
-	/**
-	 * @return The logical name which can be used for naming this role.
-	 * Required to be unique within a JAR.
-	 * If a cmr-field is defined, then a name in the form %source-ejb-name%_%cmr-field-name% is computed.
-	 * Otherwise a default ID is generated.
-	 */
-	public String getLogicalName() {
-		String result = null;
-		String qualifier = getCmrField().getName();
-		if (qualifier != null) {
-			result = getSource().getEntityBean().getName() + "_" + qualifier; //$NON-NLS-1$
-		} else {
-			// Apply a default ID
-			result = IDUtil.getOrAssignID(this);
-		}
-		return result;
-	}
-	/**
-	 * @return The name for this role, derived from the CMR-field name
-	 * Used to determine the name used in querying this role as well as the accessor method names which implement it.
-	 * Note: may return the XMI ID for non-navigable roles, ie - where there is no CMR-field.
-	 */
-	public String getName() {
-		if (fName == null) {
-			if (getCmrField() != null)
-				fName = getCmrField().getName();
-			else if (getOpposite() != null) {
-				EJBRelationshipRole op = getOpposite();
-				if (op.getCmrField() != null)
-					fName = op.getCmrField().getName() + op.getSourceEntity().getName() + NAME_SUFFIX;
-			} else {
-				if (eGetId() == null) 
-					eSetId();
-				fName = eGetId();
-			}
-		}
-		return fName;
-	}
-	/**
-	 * Return the other role.
-	 */
-	public EJBRelationshipRole getOpposite() {
-		if (getRelationship() != null)
-			return getRelationship().getOppositeRole(this);
-		return null;
-	}
-	/**
-	 * Return the other role.
-	 */
-	public CommonRelationshipRole getOppositeAsCommonRole() {
-		return getOpposite();
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (11/15/2000 6:50:30 PM)
-	 * @return com.ibm.ejs.models.base.extensions.ejbext.impl.IRoleShapeStrategy
-	 */
-	public IRoleShapeStrategy getRoleShapeStrategy() {
-		if (roleShapeStrategy == null)
-			roleShapeStrategy = getDefaultRoleShapeStrategy();
-		return roleShapeStrategy;
-	}
-	/**
-	 * @return The Source ejb
-	 * Compute the ContainerManagedEntity which is the source of a role that participates in a relationship. 
-	 */
-	public ContainerManagedEntity getSourceEntity() {
-		if(null == getSource()) {
-			return null;
-		}
-		return getSource().getEntityBean();
-	}
-	/**
-	* @return The computed value of the isForward attribute
-	* Specifies whether this role should be mapped to a persistent reference, such as a foreign key.
-	* The current implementation is:
-	* - if the role is many, it cannot be forward
-	* - if the role is single and not navigable, it cannot be forward
-	* - all other things being equal, the first role is considered to be forward
-	* - clients can manipulate this by setting an ambiguous role to be fwd (by manipulating the role order under the covers).
-	*/
-	public boolean isForward() {
-		if (this.isMany())
-			return false;
-		if (getOppositeAsCommonRole() == null)
-			return wasForward;
-		if (getOppositeAsCommonRole().isMany())
-			return true;
-	   // if (!this.isNavigable())  removed to allow non-navigable role in key
-	   //    return false;
-		if (getRelationship() == null)
-			return wasForward;
-		return (getRelationship().getFirstRole() == this);
-	}
-	/**
-	* @return The computed value isKey
-	*/
-	public boolean isKey() {
-		if (isKeySet)
-			return key;
-		return isKeyFromAttributes();
-	}
-    
-	protected boolean isKeyFromAttributes() {
-		List list = getAttributes();
-		if (list.isEmpty())
-			return false;
-		Iterator it = list.iterator();
-		CMPAttribute attribute;
-		while (it.hasNext()) {
-			attribute = (CMPAttribute) it.next();
-			if (!attribute.isKey())
-				return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * This allows you to set the Role as being key so it will
-	 * not traverse it attributes to determine if it is key.
-	 */
-	public void setKey(boolean aBoolean) {
-		key = aBoolean;
-		isKeySet = true;
-	} 
- 
-	/**
-	 * Handwritten version of isMany():
-	 */
- 
- 
-	public boolean isMany()  { 
-		if (getOpposite() == null) 
-			 return wasMany;  
-		return getOpposite().getMultiplicity() == MultiplicityKind.MANY_LITERAL;  
-	} 
- 
-         
-
-	/**
-	* @return The computed value of the isNavigable attribute
-	* Specifies that accessors should be generated for this relationship role.
-	* Current implementation is to test whether or not a CMR field exists.
-	*/
-	public boolean isNavigable() {
-		return getCmrField() != null;
-	}
-
-
-	public void reconcileAttributes() {
-		if (fAttributes != null)
-			getRoleShapeStrategy().reconcileAttributes(fAttributes);
-	}
-
-
-	/**
-	 * Set this role to be the forward role.
-	 */
-	public void setFoward() {
-		getRelationship().setFoward(this);
-	}
-	public void setName(java.lang.String uniqueName) {
-		fName = uniqueName;
-	}
-	public String toString() {
-		if (toStringGuard) return super.toString();
-		try {
-			toStringGuard = true;
-			String oppositeType = getOpposite() != null ? getTypeEntity().getName() : "<<unknown>>"; //$NON-NLS-1$
-			return getName() + "(" + oppositeType + ")" + (isMany() ? " *" : " 1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		} catch (Exception e) {
-			return e.toString();
-		} finally {
-			toStringGuard = false;
-		}
-	}
-
-	private static Class getCommonRoleClass(Object caller) throws ClassNotFoundException {
-
-		if (COMMON_ROLE_CLASS == null) {
-			COMMON_ROLE_CLASS = loadClass(COMMON_ROLE_CLASS_NAME, caller);
-		}
-		return COMMON_ROLE_CLASS;
-	}
-
-	private static Class loadClass(String name, Object caller) throws ClassNotFoundException {
-		ClassLoader cl = caller.getClass().getClassLoader();
-		if (cl != null)
-			return cl.loadClass(name);
-		return Class.forName(name);
-	}
-
-	private static Class getRoleStrategyClass(Object caller) throws ClassNotFoundException {
-		if (ROLE_STRATEGY_CLASS == null)
-			ROLE_STRATEGY_CLASS = loadClass(ROLE_STRATEGY_CLASS_NAME, caller);
-		return ROLE_STRATEGY_CLASS;
-	}
-
-	private static Constructor getRoleStrategyConstructor(Object caller) throws ClassNotFoundException, NoSuchMethodException {
-		if (ROLE_STRATEGY_CONSTRUCTOR == null) {
-			Class[] parmTypes = new Class[] { getCommonRoleClass(caller)};
-			ROLE_STRATEGY_CONSTRUCTOR = getRoleStrategyClass(caller).getConstructor(parmTypes);
-		}
-		return ROLE_STRATEGY_CONSTRUCTOR;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the ejb relationship role.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines a name for a role that is unique within an ejb-relation. Different
-	 * relationships can use the same name for a role.
-
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultiplicityKind getMultiplicity() {
-		return multiplicity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMultiplicity(MultiplicityKind newMultiplicity) {
-		MultiplicityKind oldMultiplicity = multiplicity;
-		multiplicity = newMultiplicity == null ? MULTIPLICITY_EDEFAULT : newMultiplicity;
-		boolean oldMultiplicityESet = multiplicityESet;
-		multiplicityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY, oldMultiplicity, multiplicity, !oldMultiplicityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMultiplicity() {
-		MultiplicityKind oldMultiplicity = multiplicity;
-		boolean oldMultiplicityESet = multiplicityESet;
-		multiplicity = MULTIPLICITY_EDEFAULT;
-		multiplicityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY, oldMultiplicity, MULTIPLICITY_EDEFAULT, oldMultiplicityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMultiplicity() {
-		return multiplicityESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies that, within a particular relationship, the lifetime of one or more
-	 * entity beans is dependent upon the lifetime of another entity bean. The
-	 * cascade-delete element can Cascade delete can only be specified for an
-	 * EJBRelationshipRole contained in an EJBrelation in which the other
-	 * EJBRelationshipRole element specifies a multiplicity of One.
-	 * 
-	 * 
-
-	 */
-	public boolean isCascadeDelete() {
-		return cascadeDelete;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCascadeDelete(boolean newCascadeDelete) {
-		boolean oldCascadeDelete = cascadeDelete;
-		cascadeDelete = newCascadeDelete;
-		boolean oldCascadeDeleteESet = cascadeDeleteESet;
-		cascadeDeleteESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, oldCascadeDelete, cascadeDelete, !oldCascadeDeleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetCascadeDelete() {
-		boolean oldCascadeDelete = cascadeDelete;
-		boolean oldCascadeDeleteESet = cascadeDeleteESet;
-		cascadeDelete = CASCADE_DELETE_EDEFAULT;
-		cascadeDeleteESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, oldCascadeDelete, CASCADE_DELETE_EDEFAULT, oldCascadeDeleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetCascadeDelete() {
-		return cascadeDeleteESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBRelation getRelationship() {
-		if (eContainerFeatureID != EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP) return null;
-		return (EJBRelation)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRelationship(EJBRelation newRelationship, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRelationship, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * This field/method will be replaced during code generation.
-	 */
-	public void setRelationship(EJBRelation newContainer) {
-		if (newContainer == null && getRelationship() != null) {
-			updateCachedSettings();
-			EJBRelationshipRoleImpl roleOpposite = (EJBRelationshipRoleImpl) getOpposite();
-			if (roleOpposite != null)
-				roleOpposite.updateCachedSettings();
-		} else
-			wasForward = false;
-		setRelationshipGen(newContainer);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CommonRelationshipRole#getTargetAttributeName(org.eclipse.jst.j2ee.internal.ejb.CMPAttribute)
-	 */
-	public String getTargetAttributeName(CMPAttribute roleAttribute) {
-		int roleNameSize = getName().length();
-		return roleAttribute.getName().substring(roleNameSize + 1);
-	}
-	/**
-	 * Method updateCachedSettings.
-	 */
-	protected void updateCachedSettings() {
-		wasForward = isForward();
-		wasMany = isMany();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Designates the source of a role that participates in a relationship. A
-	 * relationship-role-source element uniquely identifies an entity bean.
-	 * @migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that
-	 * may not be sufficient, as this can now refer to dependent class names or ejb
-	 * refs
-	 */
-	public RoleSource getSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSource(RoleSource newSource, NotificationChain msgs) {
-		RoleSource oldSource = source;
-		source = newSource;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, oldSource, newSource);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSource(RoleSource newSource) {
-		if (newSource != source) {
-			NotificationChain msgs = null;
-			if (source != null)
-				msgs = ((InternalEObject)source).eInverseRemove(this, EjbPackage.ROLE_SOURCE__ROLE, RoleSource.class, msgs);
-			if (newSource != null)
-				msgs = ((InternalEObject)newSource).eInverseAdd(this, EjbPackage.ROLE_SOURCE__ROLE, RoleSource.class, msgs);
-			msgs = basicSetSource(newSource, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, newSource, newSource));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A declaration of the CMRField, if any, by means of which the other side of the
-	 * relationship is accessed from the perspective of the role source
-	 * 
-	 * @migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list
-	 */
-	public CMRField getCmrField() {
-		return cmrField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCmrField(CMRField newCmrField, NotificationChain msgs) {
-		CMRField oldCmrField = cmrField;
-		cmrField = newCmrField;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, oldCmrField, newCmrField);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCmrField(CMRField newCmrField) {
-		if (newCmrField != cmrField) {
-			NotificationChain msgs = null;
-			if (cmrField != null)
-				msgs = ((InternalEObject)cmrField).eInverseRemove(this, EjbPackage.CMR_FIELD__ROLE, CMRField.class, msgs);
-			if (newCmrField != null)
-				msgs = ((InternalEObject)newCmrField).eInverseAdd(this, EjbPackage.CMR_FIELD__ROLE, CMRField.class, msgs);
-			msgs = basicSetCmrField(newCmrField, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, newCmrField, newCmrField));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRelationship((EJBRelation)otherEnd, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				if (source != null)
-					msgs = ((InternalEObject)source).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, null, msgs);
-				return basicSetSource((RoleSource)otherEnd, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				if (cmrField != null)
-					msgs = ((InternalEObject)cmrField).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, null, msgs);
-				return basicSetCmrField((CMRField)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				return basicSetRelationship(null, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				return basicSetSource(null, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return basicSetCmrField(null, msgs);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES, EJBRelation.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				return getRoleName();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				return getMultiplicity();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return isCascadeDelete() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				return getRelationship();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				return getSource();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return getCmrField();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				setMultiplicity((MultiplicityKind)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				setCascadeDelete(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				setRelationship((EJBRelation)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				setSource((RoleSource)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				setCmrField((CMRField)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				unsetMultiplicity();
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				unsetCascadeDelete();
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				setRelationship((EJBRelation)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				setSource((RoleSource)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				setCmrField((CMRField)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				return isSetMultiplicity();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return isSetCascadeDelete();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				return getRelationship() != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				return source != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return cmrField != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", roleName: ");
-		result.append(roleName);
-		result.append(", multiplicity: ");
-		if (multiplicityESet) result.append(multiplicity); else result.append("<unset>");
-		result.append(", cascadeDelete: ");
-		if (cascadeDeleteESet) result.append(cascadeDelete); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * @see CommonRelationshipRole#getTypeEntity()
-	 */
-	public ContainerManagedEntity getTypeEntity() {
-		if (getOpposite() != null)
-			return getOpposite().getSourceEntity();
-		return null;
-	}
-
-	/**
-	 * @see CommonRelationshipRole#isRequired()
-	 */
-	public boolean isRequired() {
-		if (required!=null)
-			return required.booleanValue();
-		return isKey();
-	}
-	
-	/**
-	 * Set the isRequired flag for bottom up
-	 */
-	public void setRequired(Boolean isRequired) {
-		required = isRequired;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRelationshipGen(EJBRelation newRelationship) {
-		if (newRelationship != eInternalContainer() || (eContainerFeatureID != EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP && newRelationship != null)) {
-			if (EcoreUtil.isAncestor(this, newRelationship))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRelationship != null)
-				msgs = ((InternalEObject)newRelationship).eInverseAdd(this, EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES, EJBRelation.class, msgs);
-			msgs = basicSetRelationship(newRelationship, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP, newRelationship, newRelationship));
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CommonRelationshipRole#setLower(int)
-	 */
-	public void setLower(int lowerBound) {
-		// Do nothing...  Only upperbound is relevant here
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CommonRelationshipRole#setUpper(int)
-	 */
-	public void setUpper(int upperBound) {
-		switch (upperBound) {
-			case MultiplicityKind.ONE :
-				setMultiplicity(MultiplicityKind.ONE_LITERAL);
-				break;
-			default :
-				setMultiplicity(MultiplicityKind.MANY_LITERAL);
-				break;
-		}
-	}
-	
-	/**
-	  Gets the MOF XMI ref id for this object.
-	 */
-	private String eGetId() {
-		XMIResource res = (XMIResource)eResource();
-		if (res == null)
-			return null;
-		return res.getID(this);
-	}
-
-	
-	/**
-	 * Set and return The id of this element
-	 */
-	private String eSetId() {
-
-
-		IDUtil.getOrAssignID(this);
-
-		return eGetId();
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java
deleted file mode 100644
index fbc87230b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.model.translator.ejb.EJBJarTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class EJBResourceImpl extends XMLResourceImpl implements EJBResource {
-
-	/**
-	 * @param uri
-	 * @param aRenderer
-	 */
-	public EJBResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * @param aRenderer
-	 */
-	public EJBResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/*
-	 * @see EJBResource#isEJB1_1()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isEJB1_1() {
-		return getModuleVersionID() == EJB_1_1_ID;
-	}
-
-	/*
-	 * @see EJBResource#isEJB2_0()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isEJB2_0() {
-		return getModuleVersionID() == EJB_2_0_ID;
-	}
-
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResource#getType()
-	 */
-	public int getType() {
-		return XMLResource.EJB_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.EJBJAR_DOCTYPE;
-			default :
-				return null;
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.EJBJAR_PUBLICID_1_1;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.EJBJAR_SYSTEMID_1_1;
-	}
-	
-	public String getJ2EE_Alt_1_2_SystemID() {
-		return J2EEConstants.EJBJAR_ALT_SYSTEMID_1_1;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.EJBJAR_PUBLICID_2_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.EJBJAR_SYSTEMID_2_0;
-	}
-	
-	public String getJ2EE_Alt_1_3_SystemID() {
-		return J2EEConstants.EJBJAR_ALT_SYSTEMID_2_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return EJBJarTranslator.INSTANCE;
-	}
-	
-	/* Return J2EE version based on module version
-	 */
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.EJB_1_1_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.EJB_2_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.EJB_2_1_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-	
-	/**
-	 * Return the first element in the EList.
-	 */
-	public EJBJar getEJBJar() {
-		return (EJBJar) getRootObject();
-	}
-	
-	public void setBatchMode(boolean isBatch) {
-		renderer.setBatchMode(isBatch);
-
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (EJB_2_1_ID) :
-					super.setDoctypeValues(null, null);
-					break;
-				case (EJB_2_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					break;
-				case (EJB_1_1_ID) :
-					super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					break;
-				case (EJB_1_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					
-			}
-		syncVersionOfRootObject();
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) {
-	switch (id) {
-		case (J2EE_1_4_ID) :
-					primSetDoctypeValues(null, null);
-					primSetVersionID(EJB_2_1_ID);
-					break;
-		case (J2EE_1_3_ID) :
-					primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					primSetVersionID(EJB_2_0_ID);
-					break;
-		case (J2EE_1_2_ID) :
-					primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					primSetVersionID(EJB_1_1_ID);
-			}
-		syncVersionOfRootObject();
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return EJB_2_1_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		EJBJar ejbJar = getEJBJar();
-		if (ejbJar == null)
-			return;
-		
-		String version = ejbJar.getVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			ejbJar.setVersion(newVersion);
-	}
-
-	public boolean isBatchMode() {
-		return renderer.isBatchMode();
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbFactoryImpl.java
deleted file mode 100644
index 5ad8e812e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbFactoryImpl.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.ejb.internal.util.CMPKeySynchronizationAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.AdapterFactoryDescriptor;
-import org.eclipse.wst.common.internal.emf.utilities.AdapterFactoryUtil;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-
-/**
- * @generated
- */
-public class EjbFactoryImpl extends EFactoryImpl implements EjbFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbFactory init() {
-		try {
-			EjbFactory theEjbFactory = (EjbFactory)EPackage.Registry.INSTANCE.getEFactory("ejb.xmi"); 
-			if (theEjbFactory != null) {
-				return theEjbFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EjbFactoryImpl();
-	}
-
-	private static List CMP_ADAPTER_FACTORIES = new ArrayList(1);
-	private static List CMP_ADAPTER_FACTORY_DESCRIPTORS = new ArrayList(1);
-	private static List EJB_RELATION_ADAPTER_FACTORIES = new ArrayList(1);
-	private static List EJB_RELATION_ADAPTER_FACTORY_DESCRIPTORS = new ArrayList(1);
-	private static List RELATIONSHIPS_ADAPTER_FACTORIES = new ArrayList(1);
-	private static List RELATIONSHIPS_ADAPTER_FACTORY_DESCRIPTORS = new ArrayList(1);
-	public static final String MM_VERSION = "1.1";  //$NON-NLS-1$
-	private boolean createdAdapterFactories = false;
-
-	public EjbFactoryImpl() {
-		super(); 
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY: return createContainerManagedEntity();
-			case EjbPackage.METHOD_PERMISSION: return createMethodPermission();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR: return createAssemblyDescriptor();
-			case EjbPackage.METHOD_TRANSACTION: return createMethodTransaction();
-			case EjbPackage.SESSION: return createSession();
-			case EjbPackage.ENTITY: return createEntity();
-			case EjbPackage.EJB_METHOD_CATEGORY: return createEJBMethodCategory();
-			case EjbPackage.EJB_JAR: return createEJBJar();
-			case EjbPackage.METHOD_ELEMENT: return createMethodElement();
-			case EjbPackage.CMP_ATTRIBUTE: return createCMPAttribute();
-			case EjbPackage.RELATIONSHIPS: return createRelationships();
-			case EjbPackage.QUERY: return createQuery();
-			case EjbPackage.EJB_RELATION: return createEJBRelation();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE: return createEJBRelationshipRole();
-			case EjbPackage.ROLE_SOURCE: return createRoleSource();
-			case EjbPackage.CMR_FIELD: return createCMRField();
-			case EjbPackage.MESSAGE_DRIVEN: return createMessageDriven();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION: return createMessageDrivenDestination();
-			case EjbPackage.EXCLUDE_LIST: return createExcludeList();
-			case EjbPackage.QUERY_METHOD: return createQueryMethod();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: return createActivationConfigProperty();
-			case EjbPackage.ACTIVATION_CONFIG: return createActivationConfig();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
-				return createTransactionAttributeTypeFromString(eDataType, initialValue);
-			case EjbPackage.TRANSACTION_TYPE:
-				return createTransactionTypeFromString(eDataType, initialValue);
-			case EjbPackage.SESSION_TYPE:
-				return createSessionTypeFromString(eDataType, initialValue);
-			case EjbPackage.METHOD_ELEMENT_KIND:
-				return createMethodElementKindFromString(eDataType, initialValue);
-			case EjbPackage.ACKNOWLEDGE_MODE:
-				return createAcknowledgeModeFromString(eDataType, initialValue);
-			case EjbPackage.SUBSCRIPTION_DURABILITY_KIND:
-				return createSubscriptionDurabilityKindFromString(eDataType, initialValue);
-			case EjbPackage.RETURN_TYPE_MAPPING:
-				return createReturnTypeMappingFromString(eDataType, initialValue);
-			case EjbPackage.DESTINATION_TYPE:
-				return createDestinationTypeFromString(eDataType, initialValue);
-			case EjbPackage.MULTIPLICITY_KIND:
-				return createMultiplicityKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
-				return convertTransactionAttributeTypeToString(eDataType, instanceValue);
-			case EjbPackage.TRANSACTION_TYPE:
-				return convertTransactionTypeToString(eDataType, instanceValue);
-			case EjbPackage.SESSION_TYPE:
-				return convertSessionTypeToString(eDataType, instanceValue);
-			case EjbPackage.METHOD_ELEMENT_KIND:
-				return convertMethodElementKindToString(eDataType, instanceValue);
-			case EjbPackage.ACKNOWLEDGE_MODE:
-				return convertAcknowledgeModeToString(eDataType, instanceValue);
-			case EjbPackage.SUBSCRIPTION_DURABILITY_KIND:
-				return convertSubscriptionDurabilityKindToString(eDataType, instanceValue);
-			case EjbPackage.RETURN_TYPE_MAPPING:
-				return convertReturnTypeMappingToString(eDataType, instanceValue);
-			case EjbPackage.DESTINATION_TYPE:
-				return convertDestinationTypeToString(eDataType, instanceValue);
-			case EjbPackage.MULTIPLICITY_KIND:
-				return convertMultiplicityKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-public MethodElement createMethodElement(String aSignature) {
-	MethodElement me = createMethodElement();
-	me.initializeFromSignature(aSignature);
-	return me;
-}
-/**
- * Helper method to create a MethodElement from a java method.   Defaults the type to "Unspecified".
- */
-public MethodElement createMethodElementFrom(
-	Method method) {
-
-	MethodElement element = createMethodElement();
-	element.setName(method.getName());
-	element.setType(MethodElementKind.UNSPECIFIED_LITERAL);
-
-	JavaParameter[] params = 
-		method.listParametersWithoutReturn();
-	if (params.length == 0)
-		element.applyZeroParams();
-	else { 
-		for (int i = 0; i < params.length; i++) {
-			JavaHelpers helper = (JavaHelpers) params[i].getEType();
-			element.addMethodParams(helper.getQualifiedName());
-		}
-	}
-	return element;
-} 
-/**
- * Helper method to reflect the method and create a MethodElement.  If the parameter is null, creates an element
- * with a name of "*".  Defaults the type to "Unspecified".
- */
-public MethodElement createMethodElementFrom(java.lang.reflect.Method method) {
-
-	String methodName = method == null ? "*" : method.getName(); //$NON-NLS-1$
-	MethodElement me = createMethodElement();
-	me.setName(methodName);
-	me.setType(MethodElementKind.UNSPECIFIED_LITERAL);
-	if (method != null) {
-		Class[] types = method.getParameterTypes();
-		for (int i = 0; i < types.length; i++) {
-			me.addMethodParams(getTypeName(types[i]));
-		}
-	}
-	return me;
-}
-public static EjbFactory getActiveFactory() {
-	return (EjbFactory) getPackage().getEFactoryInstance();
-}
-/*
- * Utility routine to paper over array type names
- * Borrowed from a package-visibility helper on java.lang.reflect.Field
- */
-static String getTypeName(Class type) {
-	if (type.isArray()) {
-		try {
-			Class cl = type;
-			int dimensions = 0;
-			while (cl.isArray()) {
-				dimensions++;
-				cl = cl.getComponentType();
-			}
-			StringBuffer sb = new StringBuffer();
-			sb.append(cl.getName());
-			for (int i = 0; i < dimensions; i++) {
-				sb.append("[]");//$NON-NLS-1$
-			}
-			return sb.toString();
-		} catch (Throwable e) { /*FALLTHRU*/
-		}
-	}
-	return type.getName();
-}
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MethodPermission createMethodPermission() {
-		MethodPermissionImpl methodPermission = new MethodPermissionImpl();
-		return methodPermission;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public AssemblyDescriptor createAssemblyDescriptor() {
-		AssemblyDescriptorImpl assemblyDescriptor = new AssemblyDescriptorImpl();
-		return assemblyDescriptor;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MethodTransaction createMethodTransaction() {
-		MethodTransactionImpl methodTransaction = new MethodTransactionImpl();
-		return methodTransaction;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Entity createEntity() {
-		EntityImpl entity = new EntityImpl();
-		return entity;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ContainerManagedEntity createContainerManagedEntityGen() {
-		ContainerManagedEntityImpl containerManagedEntity = new ContainerManagedEntityImpl();
-		return containerManagedEntity;
-	}
-
-  	public ContainerManagedEntity createContainerManagedEntity() {
-  		ContainerManagedEntity cmp = createContainerManagedEntityGen();
-  		adaptNew(cmp, CMP_ADAPTER_FACTORIES);
-  		addKeySynchronizationAdapter(cmp);
-  		return cmp;
-  	}
-  	
-	/**
-	 * @param cmp
-	 */
-	private void addKeySynchronizationAdapter(ContainerManagedEntity cmp) {
-		CMPKeySynchronizationAdapter cmpAdapter = new CMPKeySynchronizationAdapter(cmp);
-		Adapter loadingAdapter = ExtendedEcoreUtil.createAdapterForLoading(cmpAdapter,cmp);
-		cmp.eAdapters().add(loadingAdapter);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CMPAttribute createCMPAttribute() {
-		CMPAttributeImpl cmpAttribute = new CMPAttributeImpl();
-		return cmpAttribute;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CMRField createCMRField() {
-		CMRFieldImpl cmrField = new CMRFieldImpl();
-		return cmrField;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBRelationshipRole createEJBRelationshipRole() {
-		EJBRelationshipRoleImpl ejbRelationshipRole = new EJBRelationshipRoleImpl();
-		return ejbRelationshipRole;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBRelation createEJBRelationGen() {
-		EJBRelationImpl ejbRelation = new EJBRelationImpl();
-		return ejbRelation;
-	}
-
-  	public EJBRelation createEJBRelation() {
-  		EJBRelation rel = createEJBRelationGen();
-  		adaptNew(rel, EJB_RELATION_ADAPTER_FACTORIES);
-  		return rel;
-  	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Relationships createRelationshipsGen() {
-		RelationshipsImpl relationships = new RelationshipsImpl();
-		return relationships;
-	}
-
-	public Relationships createRelationships() {
-		Relationships rel = createRelationshipsGen();
-		adaptNew(rel, RELATIONSHIPS_ADAPTER_FACTORIES);
-		return rel;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBJar createEJBJar() {
-		EJBJarImpl ejbJar = new EJBJarImpl();
-		return ejbJar;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public RoleSource createRoleSource() {
-		RoleSourceImpl roleSource = new RoleSourceImpl();
-		return roleSource;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Query createQuery() {
-		QueryImpl query = new QueryImpl();
-		return query;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public QueryMethod createQueryMethod() {
-		QueryMethodImpl queryMethod = new QueryMethodImpl();
-		return queryMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfigProperty createActivationConfigProperty() {
-		ActivationConfigPropertyImpl activationConfigProperty = new ActivationConfigPropertyImpl();
-		return activationConfigProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfig createActivationConfig() {
-		ActivationConfigImpl activationConfig = new ActivationConfigImpl();
-		return activationConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionAttributeType createTransactionAttributeTypeFromString(EDataType eDataType, String initialValue) {
-		TransactionAttributeType result = TransactionAttributeType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionAttributeTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionType createTransactionTypeFromString(EDataType eDataType, String initialValue) {
-		TransactionType result = TransactionType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SessionType createSessionTypeFromString(EDataType eDataType, String initialValue) {
-		SessionType result = SessionType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSessionTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElementKind createMethodElementKindFromString(EDataType eDataType, String initialValue) {
-		MethodElementKind result = MethodElementKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMethodElementKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AcknowledgeMode createAcknowledgeModeFromString(EDataType eDataType, String initialValue) {
-		AcknowledgeMode result = AcknowledgeMode.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAcknowledgeModeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SubscriptionDurabilityKind createSubscriptionDurabilityKindFromString(EDataType eDataType, String initialValue) {
-		SubscriptionDurabilityKind result = SubscriptionDurabilityKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSubscriptionDurabilityKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReturnTypeMapping createReturnTypeMappingFromString(EDataType eDataType, String initialValue) {
-		ReturnTypeMapping result = ReturnTypeMapping.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertReturnTypeMappingToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DestinationType createDestinationTypeFromString(EDataType eDataType, String initialValue) {
-		DestinationType result = DestinationType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDestinationTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultiplicityKind createMultiplicityKindFromString(EDataType eDataType, String initialValue) {
-		MultiplicityKind result = MultiplicityKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMultiplicityKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MethodElement createMethodElement() {
-		MethodElementImpl methodElement = new MethodElementImpl();
-		return methodElement;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ExcludeList createExcludeList() {
-		ExcludeListImpl excludeList = new ExcludeListImpl();
-		return excludeList;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Session createSession() {
-		SessionImpl session = new SessionImpl();
-		return session;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MessageDriven createMessageDriven() {
-		MessageDrivenImpl messageDriven = new MessageDrivenImpl();
-		return messageDriven;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MessageDrivenDestination createMessageDrivenDestination() {
-		MessageDrivenDestinationImpl messageDrivenDestination = new MessageDrivenDestinationImpl();
-		return messageDrivenDestination;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBMethodCategory createEJBMethodCategory() {
-		EJBMethodCategoryImpl ejbMethodCategory = new EJBMethodCategoryImpl();
-		return ejbMethodCategory;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EjbPackage getEjbPackage() {
-		return (EjbPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static EjbPackage getPackage() {
-		return EjbPackage.eINSTANCE;
-	}
-
-	public static void internalRegisterCMPAdapterFactory(AdapterFactoryDescriptor config) {
-		CMP_ADAPTER_FACTORY_DESCRIPTORS.add(config);
-		
-	}
-	public static void internalRegisterEJBRelationAdapterFactory(AdapterFactoryDescriptor config) {
-		EJB_RELATION_ADAPTER_FACTORY_DESCRIPTORS.add(config);
-	}
-	public static void internalRegisterRelationshipsAdapterFactory(AdapterFactoryDescriptor config) {
-		RELATIONSHIPS_ADAPTER_FACTORY_DESCRIPTORS.add(config);
-	}
-	
-	
-	private void createAdapterFactories() {
-		createdAdapterFactories = true;
-		AdapterFactoryUtil.createAdapterFactories(CMP_ADAPTER_FACTORY_DESCRIPTORS, CMP_ADAPTER_FACTORIES);
-		AdapterFactoryUtil.createAdapterFactories(EJB_RELATION_ADAPTER_FACTORY_DESCRIPTORS, EJB_RELATION_ADAPTER_FACTORIES);
-		AdapterFactoryUtil.createAdapterFactories(RELATIONSHIPS_ADAPTER_FACTORY_DESCRIPTORS, RELATIONSHIPS_ADAPTER_FACTORIES);
-	}
-	
-	private void adaptNew(Notifier notifier, List factories) {
-		if (!createdAdapterFactories)
-			createAdapterFactories();
-		AdapterFactoryUtil.adaptNew(notifier, factories);
-	}
-
-}
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java
deleted file mode 100644
index 8ceb023f5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java
+++ /dev/null
@@ -1,1789 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-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.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class EjbPackageImpl extends EPackageImpl implements EjbPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass containerManagedEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPermissionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass assemblyDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodTransactionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sessionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass enterpriseBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbMethodCategoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbJarEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cmpAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass relationshipsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass queryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRelationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRelationshipRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleSourceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cmrFieldEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDrivenEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDrivenDestinationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass excludeListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass queryMethodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationConfigPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionAttributeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum sessionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum methodElementKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum acknowledgeModeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum subscriptionDurabilityKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum returnTypeMappingEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum destinationTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum multiplicityKindEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private EjbPackageImpl() {
-		super(eNS_URI, EjbFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static EjbPackage init() {
-		if (isInited) return (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-
-		// Obtain or create and register package
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EjbPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEjbPackage.freeze();
-
-		return theEjbPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethodPermission() {
-		return methodPermissionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodPermission_Description() {
-		return (EAttribute)methodPermissionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodPermission_Unchecked() {
-		return (EAttribute)methodPermissionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodPermission_AssemblyDescriptor() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodPermission_Roles() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodPermission_MethodElements() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPermission_Descriptions() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getAssemblyDescriptor() {
-		return assemblyDescriptorEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_MethodPermissions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_MethodTransactions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_EjbJar() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_SecurityRoles() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_ExcludeList() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_MessageDestinations() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethodTransaction() {
-		return methodTransactionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodTransaction_TransactionAttribute() {
-		return (EAttribute)methodTransactionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodTransaction_Description() {
-		return (EAttribute)methodTransactionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodTransaction_AssemblyDescriptor() {
-		return (EReference)methodTransactionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodTransaction_MethodElements() {
-		return (EReference)methodTransactionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodTransaction_Descriptions() {
-		return (EReference)methodTransactionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEnterpriseBean() {
-		return enterpriseBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnterpriseBean_Name() {
-		return (EAttribute)enterpriseBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_SecurityRoleRefs() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_EjbClass() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_HomeInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_RemoteInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_EjbJar() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_SecurityIdentity() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_LocalHomeInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_LocalInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEntity() {
-		return entityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntity_Reentrant() {
-		return (EAttribute)entityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEntity_PrimaryKey() {
-		return (EReference)entityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getContainerManagedEntity() {
-		return containerManagedEntityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContainerManagedEntity_Version() {
-		return (EAttribute)containerManagedEntityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContainerManagedEntity_AbstractSchemaName() {
-		return (EAttribute)containerManagedEntityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContainerManagedEntity_PersistentAttributes() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContainerManagedEntity_KeyAttributes() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerManagedEntity_Queries() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerManagedEntity_CMPAttribute() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerManagedEntity_PrimKeyField() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getCMPAttribute() {
-		return cmpAttributeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getCMPAttribute_Description() {
-		return (EAttribute)cmpAttributeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCMPAttribute_Descriptions() {
-		return (EReference)cmpAttributeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getCMRField() {
-		return cmrFieldEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getCMRField_Role() {
-		return (EReference)cmrFieldEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getCMRField_CollectionType() {
-		return (EReference)cmrFieldEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBRelationshipRole() {
-		return ejbRelationshipRoleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_Description() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_RoleName() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_Multiplicity() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_CascadeDelete() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelationshipRole_Relationship() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelationshipRole_Source() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelationshipRole_CmrField() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelationshipRole_Descriptions() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBRelation() {
-		return ejbRelationEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelation_Description() {
-		return (EAttribute)ejbRelationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelation_Name() {
-		return (EAttribute)ejbRelationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelation_RelationshipList() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelation_RelationshipRoles() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelation_Descriptions() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRelationships() {
-		return relationshipsEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getRelationships_Description() {
-		return (EAttribute)relationshipsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRelationships_EjbJar() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRelationships_EjbRelations() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRelationships_Descriptions() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBJar() {
-		return ejbJarEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBJar_EjbClientJar() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJar_Version() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJar_AssemblyDescriptor() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJar_EnterpriseBeans() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJar_RelationshipList() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRoleSource() {
-		return roleSourceEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getRoleSource_Description() {
-		return (EAttribute)roleSourceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRoleSource_Role() {
-		return (EReference)roleSourceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRoleSource_EntityBean() {
-		return (EReference)roleSourceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleSource_Descriptions() {
-		return (EReference)roleSourceEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getQuery() {
-		return queryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getQuery_Description() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getQuery_EjbQL() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getQuery_ReturnTypeMapping() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getQuery_QueryMethod() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getQuery_Entity() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQuery_Descriptions() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getQueryMethod() {
-		return queryMethodEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getQueryMethod_Query() {
-		return (EReference)queryMethodEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationConfigProperty() {
-		return activationConfigPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_Value() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_Name() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationConfig() {
-		return activationConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationConfig_ConfigProperties() {
-		return (EReference)activationConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationConfig_Descriptions() {
-		return (EReference)activationConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethodElement() {
-		return methodElementEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Name() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Parms() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Type() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Description() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodElement_EnterpriseBean() {
-		return (EReference)methodElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodElement_Descriptions() {
-		return (EReference)methodElementEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getExcludeList() {
-		return excludeListEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getExcludeList_Description() {
-		return (EAttribute)excludeListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getExcludeList_MethodElements() {
-		return (EReference)excludeListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExcludeList_Descriptions() {
-		return (EReference)excludeListEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSession() {
-		return sessionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSession_TransactionType() {
-		return (EAttribute)sessionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSession_SessionType() {
-		return (EAttribute)sessionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSession_ServiceEndpoint() {
-		return (EReference)sessionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMessageDriven() {
-		return messageDrivenEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDriven_TransactionType() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDriven_MessageSelector() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDriven_AcknowledgeMode() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMessageDriven_Destination() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDriven_ActivationConfig() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDriven_MessageDestination() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDriven_Link() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDriven_MessagingType() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMessageDrivenDestination() {
-		return messageDrivenDestinationEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDrivenDestination_Type() {
-		return (EAttribute)messageDrivenDestinationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDrivenDestination_SubscriptionDurability() {
-		return (EAttribute)messageDrivenDestinationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMessageDrivenDestination_Bean() {
-		return (EReference)messageDrivenDestinationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBMethodCategory() {
-		return ejbMethodCategoryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransactionAttributeType() {
-		return transactionAttributeTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getMultiplicityKind() {
-		return multiplicityKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getReturnTypeMapping() {
-		return returnTypeMappingEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getMethodElementKind() {
-		return methodElementKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransactionType() {
-		return transactionTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getAcknowledgeMode() {
-		return acknowledgeModeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getDestinationType() {
-		return destinationTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getSubscriptionDurabilityKind() {
-		return subscriptionDurabilityKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getSessionType() {
-		return sessionTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EjbFactory getEjbFactory() {
-		return (EjbFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		containerManagedEntityEClass = createEClass(CONTAINER_MANAGED_ENTITY);
-		createEAttribute(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__VERSION);
-		createEAttribute(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__QUERIES);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD);
-
-		methodPermissionEClass = createEClass(METHOD_PERMISSION);
-		createEAttribute(methodPermissionEClass, METHOD_PERMISSION__DESCRIPTION);
-		createEAttribute(methodPermissionEClass, METHOD_PERMISSION__UNCHECKED);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__ROLES);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__METHOD_ELEMENTS);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__DESCRIPTIONS);
-
-		assemblyDescriptorEClass = createEClass(ASSEMBLY_DESCRIPTOR);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__EJB_JAR);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
-
-		methodTransactionEClass = createEClass(METHOD_TRANSACTION);
-		createEAttribute(methodTransactionEClass, METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE);
-		createEAttribute(methodTransactionEClass, METHOD_TRANSACTION__DESCRIPTION);
-		createEReference(methodTransactionEClass, METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR);
-		createEReference(methodTransactionEClass, METHOD_TRANSACTION__METHOD_ELEMENTS);
-		createEReference(methodTransactionEClass, METHOD_TRANSACTION__DESCRIPTIONS);
-
-		sessionEClass = createEClass(SESSION);
-		createEAttribute(sessionEClass, SESSION__TRANSACTION_TYPE);
-		createEAttribute(sessionEClass, SESSION__SESSION_TYPE);
-		createEReference(sessionEClass, SESSION__SERVICE_ENDPOINT);
-
-		entityEClass = createEClass(ENTITY);
-		createEAttribute(entityEClass, ENTITY__REENTRANT);
-		createEReference(entityEClass, ENTITY__PRIMARY_KEY);
-
-		enterpriseBeanEClass = createEClass(ENTERPRISE_BEAN);
-		createEAttribute(enterpriseBeanEClass, ENTERPRISE_BEAN__NAME);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__SECURITY_ROLE_REFS);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__EJB_CLASS);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__HOME_INTERFACE);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__REMOTE_INTERFACE);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__EJB_JAR);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__SECURITY_IDENTITY);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__LOCAL_INTERFACE);
-
-		ejbMethodCategoryEClass = createEClass(EJB_METHOD_CATEGORY);
-
-		ejbJarEClass = createEClass(EJB_JAR);
-		createEAttribute(ejbJarEClass, EJB_JAR__EJB_CLIENT_JAR);
-		createEAttribute(ejbJarEClass, EJB_JAR__VERSION);
-		createEReference(ejbJarEClass, EJB_JAR__ASSEMBLY_DESCRIPTOR);
-		createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS);
-		createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIP_LIST);
-
-		methodElementEClass = createEClass(METHOD_ELEMENT);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__NAME);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__PARMS);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__TYPE);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__DESCRIPTION);
-		createEReference(methodElementEClass, METHOD_ELEMENT__ENTERPRISE_BEAN);
-		createEReference(methodElementEClass, METHOD_ELEMENT__DESCRIPTIONS);
-
-		cmpAttributeEClass = createEClass(CMP_ATTRIBUTE);
-		createEAttribute(cmpAttributeEClass, CMP_ATTRIBUTE__DESCRIPTION);
-		createEReference(cmpAttributeEClass, CMP_ATTRIBUTE__DESCRIPTIONS);
-
-		relationshipsEClass = createEClass(RELATIONSHIPS);
-		createEAttribute(relationshipsEClass, RELATIONSHIPS__DESCRIPTION);
-		createEReference(relationshipsEClass, RELATIONSHIPS__EJB_JAR);
-		createEReference(relationshipsEClass, RELATIONSHIPS__EJB_RELATIONS);
-		createEReference(relationshipsEClass, RELATIONSHIPS__DESCRIPTIONS);
-
-		queryEClass = createEClass(QUERY);
-		createEAttribute(queryEClass, QUERY__DESCRIPTION);
-		createEAttribute(queryEClass, QUERY__EJB_QL);
-		createEAttribute(queryEClass, QUERY__RETURN_TYPE_MAPPING);
-		createEReference(queryEClass, QUERY__QUERY_METHOD);
-		createEReference(queryEClass, QUERY__ENTITY);
-		createEReference(queryEClass, QUERY__DESCRIPTIONS);
-
-		ejbRelationEClass = createEClass(EJB_RELATION);
-		createEAttribute(ejbRelationEClass, EJB_RELATION__DESCRIPTION);
-		createEAttribute(ejbRelationEClass, EJB_RELATION__NAME);
-		createEReference(ejbRelationEClass, EJB_RELATION__RELATIONSHIP_LIST);
-		createEReference(ejbRelationEClass, EJB_RELATION__RELATIONSHIP_ROLES);
-		createEReference(ejbRelationEClass, EJB_RELATION__DESCRIPTIONS);
-
-		ejbRelationshipRoleEClass = createEClass(EJB_RELATIONSHIP_ROLE);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__DESCRIPTION);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__ROLE_NAME);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__MULTIPLICITY);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__CASCADE_DELETE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__RELATIONSHIP);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__SOURCE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__CMR_FIELD);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
-
-		roleSourceEClass = createEClass(ROLE_SOURCE);
-		createEAttribute(roleSourceEClass, ROLE_SOURCE__DESCRIPTION);
-		createEReference(roleSourceEClass, ROLE_SOURCE__ROLE);
-		createEReference(roleSourceEClass, ROLE_SOURCE__ENTITY_BEAN);
-		createEReference(roleSourceEClass, ROLE_SOURCE__DESCRIPTIONS);
-
-		cmrFieldEClass = createEClass(CMR_FIELD);
-		createEReference(cmrFieldEClass, CMR_FIELD__ROLE);
-		createEReference(cmrFieldEClass, CMR_FIELD__COLLECTION_TYPE);
-
-		messageDrivenEClass = createEClass(MESSAGE_DRIVEN);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__TRANSACTION_TYPE);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__MESSAGE_SELECTOR);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__ACKNOWLEDGE_MODE);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__LINK);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__DESTINATION);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__ACTIVATION_CONFIG);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__MESSAGE_DESTINATION);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__MESSAGING_TYPE);
-
-		messageDrivenDestinationEClass = createEClass(MESSAGE_DRIVEN_DESTINATION);
-		createEAttribute(messageDrivenDestinationEClass, MESSAGE_DRIVEN_DESTINATION__TYPE);
-		createEAttribute(messageDrivenDestinationEClass, MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY);
-		createEReference(messageDrivenDestinationEClass, MESSAGE_DRIVEN_DESTINATION__BEAN);
-
-		excludeListEClass = createEClass(EXCLUDE_LIST);
-		createEAttribute(excludeListEClass, EXCLUDE_LIST__DESCRIPTION);
-		createEReference(excludeListEClass, EXCLUDE_LIST__METHOD_ELEMENTS);
-		createEReference(excludeListEClass, EXCLUDE_LIST__DESCRIPTIONS);
-
-		queryMethodEClass = createEClass(QUERY_METHOD);
-		createEReference(queryMethodEClass, QUERY_METHOD__QUERY);
-
-		activationConfigPropertyEClass = createEClass(ACTIVATION_CONFIG_PROPERTY);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__VALUE);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__NAME);
-
-		activationConfigEClass = createEClass(ACTIVATION_CONFIG);
-		createEReference(activationConfigEClass, ACTIVATION_CONFIG__CONFIG_PROPERTIES);
-		createEReference(activationConfigEClass, ACTIVATION_CONFIG__DESCRIPTIONS);
-
-		// Create enums
-		transactionAttributeTypeEEnum = createEEnum(TRANSACTION_ATTRIBUTE_TYPE);
-		transactionTypeEEnum = createEEnum(TRANSACTION_TYPE);
-		sessionTypeEEnum = createEEnum(SESSION_TYPE);
-		methodElementKindEEnum = createEEnum(METHOD_ELEMENT_KIND);
-		acknowledgeModeEEnum = createEEnum(ACKNOWLEDGE_MODE);
-		subscriptionDurabilityKindEEnum = createEEnum(SUBSCRIPTION_DURABILITY_KIND);
-		returnTypeMappingEEnum = createEEnum(RETURN_TYPE_MAPPING);
-		destinationTypeEEnum = createEEnum(DESTINATION_TYPE);
-		multiplicityKindEEnum = createEEnum(MULTIPLICITY_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		containerManagedEntityEClass.getESuperTypes().add(this.getEntity());
-		methodPermissionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		assemblyDescriptorEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		methodTransactionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		sessionEClass.getESuperTypes().add(this.getEnterpriseBean());
-		entityEClass.getESuperTypes().add(this.getEnterpriseBean());
-		enterpriseBeanEClass.getESuperTypes().add(theCommonPackage.getJNDIEnvRefsGroup());
-		ejbMethodCategoryEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		ejbJarEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		methodElementEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		cmpAttributeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEAttribute());
-		relationshipsEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		queryEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		ejbRelationEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		ejbRelationshipRoleEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		roleSourceEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		cmrFieldEClass.getESuperTypes().add(this.getCMPAttribute());
-		messageDrivenEClass.getESuperTypes().add(this.getEnterpriseBean());
-		messageDrivenDestinationEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		excludeListEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		queryMethodEClass.getESuperTypes().add(this.getMethodElement());
-		activationConfigPropertyEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		activationConfigEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(containerManagedEntityEClass, ContainerManagedEntity.class, "ContainerManagedEntity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContainerManagedEntity_Version(), ecorePackage.getEString(), "version", "2.x", 0, 1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContainerManagedEntity_AbstractSchemaName(), ecorePackage.getEString(), "abstractSchemaName", null, 0, 1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContainerManagedEntity_PersistentAttributes(), this.getCMPAttribute(), null, "persistentAttributes", null, 0, -1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContainerManagedEntity_KeyAttributes(), this.getCMPAttribute(), null, "keyAttributes", null, 0, -1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContainerManagedEntity_Queries(), this.getQuery(), this.getQuery_Entity(), "queries", null, 0, -1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContainerManagedEntity_CMPAttribute(), this.getCMPAttribute(), null, "CMPAttribute", null, 0, -1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContainerManagedEntity_PrimKeyField(), this.getCMPAttribute(), null, "primKeyField", null, 0, 1, ContainerManagedEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodPermissionEClass, MethodPermission.class, "MethodPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodPermission_Description(), ecorePackage.getEString(), "description", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodPermission_Unchecked(), ecorePackage.getEBoolean(), "unchecked", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodPermission_AssemblyDescriptor(), this.getAssemblyDescriptor(), this.getAssemblyDescriptor_MethodPermissions(), "assemblyDescriptor", null, 1, 1, MethodPermission.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodPermission_Roles(), theCommonPackage.getSecurityRole(), null, "roles", null, 1, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodPermission_MethodElements(), this.getMethodElement(), null, "methodElements", null, 1, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodPermission_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(assemblyDescriptorEClass, AssemblyDescriptor.class, "AssemblyDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAssemblyDescriptor_MethodPermissions(), this.getMethodPermission(), this.getMethodPermission_AssemblyDescriptor(), "methodPermissions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAssemblyDescriptor_MethodTransactions(), this.getMethodTransaction(), this.getMethodTransaction_AssemblyDescriptor(), "methodTransactions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAssemblyDescriptor_EjbJar(), this.getEJBJar(), this.getEJBJar_AssemblyDescriptor(), "ejbJar", null, 0, 1, AssemblyDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAssemblyDescriptor_SecurityRoles(), theCommonPackage.getSecurityRole(), null, "securityRoles", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAssemblyDescriptor_ExcludeList(), this.getExcludeList(), null, "excludeList", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAssemblyDescriptor_MessageDestinations(), theCommonPackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodTransactionEClass, MethodTransaction.class, "MethodTransaction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodTransaction_TransactionAttribute(), this.getTransactionAttributeType(), "transactionAttribute", null, 0, 1, MethodTransaction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodTransaction_Description(), ecorePackage.getEString(), "description", null, 0, 1, MethodTransaction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodTransaction_AssemblyDescriptor(), this.getAssemblyDescriptor(), this.getAssemblyDescriptor_MethodTransactions(), "assemblyDescriptor", null, 1, 1, MethodTransaction.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodTransaction_MethodElements(), this.getMethodElement(), null, "methodElements", null, 1, -1, MethodTransaction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodTransaction_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, MethodTransaction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(sessionEClass, Session.class, "Session", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSession_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, Session.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSession_SessionType(), this.getSessionType(), "sessionType", null, 0, 1, Session.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSession_ServiceEndpoint(), theJavaRefPackage.getJavaClass(), null, "serviceEndpoint", null, 0, 1, Session.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEntity_Reentrant(), ecorePackage.getEBoolean(), "reentrant", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntity_PrimaryKey(), theJavaRefPackage.getJavaClass(), null, "primaryKey", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(enterpriseBeanEClass, EnterpriseBean.class, "EnterpriseBean", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEnterpriseBean_Name(), ecorePackage.getEString(), "name", null, 0, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_SecurityRoleRefs(), theCommonPackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_EjbClass(), theJavaRefPackage.getJavaClass(), null, "ejbClass", null, 1, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_HomeInterface(), theJavaRefPackage.getJavaClass(), null, "homeInterface", null, 1, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_RemoteInterface(), theJavaRefPackage.getJavaClass(), null, "remoteInterface", null, 1, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_EjbJar(), this.getEJBJar(), this.getEJBJar_EnterpriseBeans(), "ejbJar", null, 1, 1, EnterpriseBean.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_SecurityIdentity(), theCommonPackage.getSecurityIdentity(), null, "securityIdentity", null, 0, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_LocalHomeInterface(), theJavaRefPackage.getJavaClass(), null, "localHomeInterface", null, 0, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnterpriseBean_LocalInterface(), theJavaRefPackage.getJavaClass(), null, "localInterface", null, 0, 1, EnterpriseBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbMethodCategoryEClass, EJBMethodCategory.class, "EJBMethodCategory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEJBJar_EjbClientJar(), ecorePackage.getEString(), "ejbClientJar", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJBJar_Version(), ecorePackage.getEString(), "version", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBJar_AssemblyDescriptor(), this.getAssemblyDescriptor(), this.getAssemblyDescriptor_EjbJar(), "assemblyDescriptor", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBean(), this.getEnterpriseBean_EjbJar(), "enterpriseBeans", null, 1, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBJar_RelationshipList(), this.getRelationships(), this.getRelationships_EjbJar(), "relationshipList", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodElementEClass, MethodElement.class, "MethodElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_Parms(), ecorePackage.getEString(), "parms", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_Type(), this.getMethodElementKind(), "type", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodElement_EnterpriseBean(), this.getEnterpriseBean(), null, "enterpriseBean", null, 1, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodElement_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(cmpAttributeEClass, CMPAttribute.class, "CMPAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCMPAttribute_Description(), ecorePackage.getEString(), "description", null, 0, 1, CMPAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCMPAttribute_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, CMPAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(relationshipsEClass, Relationships.class, "Relationships", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRelationships_Description(), ecorePackage.getEString(), "description", null, 0, 1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRelationships_EjbJar(), this.getEJBJar(), this.getEJBJar_RelationshipList(), "ejbJar", null, 1, 1, Relationships.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRelationships_EjbRelations(), this.getEJBRelation(), this.getEJBRelation_RelationshipList(), "ejbRelations", null, 0, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRelationships_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getQuery_Description(), ecorePackage.getEString(), "description", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getQuery_EjbQL(), ecorePackage.getEString(), "ejbQL", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getQuery_ReturnTypeMapping(), this.getReturnTypeMapping(), "returnTypeMapping", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getQuery_QueryMethod(), this.getQueryMethod(), this.getQueryMethod_Query(), "queryMethod", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getQuery_Entity(), this.getContainerManagedEntity(), this.getContainerManagedEntity_Queries(), "entity", null, 0, 1, Query.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getQuery_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbRelationEClass, EJBRelation.class, "EJBRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEJBRelation_Description(), ecorePackage.getEString(), "description", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJBRelation_Name(), ecorePackage.getEString(), "name", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelation_RelationshipList(), this.getRelationships(), this.getRelationships_EjbRelations(), "relationshipList", null, 0, 1, EJBRelation.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelation_RelationshipRoles(), this.getEJBRelationshipRole(), this.getEJBRelationshipRole_Relationship(), "relationshipRoles", null, 2, 2, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelation_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbRelationshipRoleEClass, EJBRelationshipRole.class, "EJBRelationshipRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEJBRelationshipRole_Description(), ecorePackage.getEString(), "description", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJBRelationshipRole_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityKind(), "multiplicity", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEJBRelationshipRole_CascadeDelete(), ecorePackage.getEBoolean(), "cascadeDelete", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelationshipRole_Relationship(), this.getEJBRelation(), this.getEJBRelation_RelationshipRoles(), "relationship", null, 1, 1, EJBRelationshipRole.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelationshipRole_Source(), this.getRoleSource(), this.getRoleSource_Role(), "source", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelationshipRole_CmrField(), this.getCMRField(), this.getCMRField_Role(), "cmrField", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEJBRelationshipRole_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleSourceEClass, RoleSource.class, "RoleSource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleSource_Description(), ecorePackage.getEString(), "description", null, 0, 1, RoleSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRoleSource_Role(), this.getEJBRelationshipRole(), this.getEJBRelationshipRole_Source(), "role", null, 1, 1, RoleSource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRoleSource_EntityBean(), this.getContainerManagedEntity(), null, "entityBean", null, 1, 1, RoleSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRoleSource_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, RoleSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(cmrFieldEClass, CMRField.class, "CMRField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCMRField_Role(), this.getEJBRelationshipRole(), this.getEJBRelationshipRole_CmrField(), "role", null, 0, 1, CMRField.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCMRField_CollectionType(), theJavaRefPackage.getJavaClass(), null, "collectionType", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(messageDrivenEClass, MessageDriven.class, "MessageDriven", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMessageDriven_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDriven_MessageSelector(), ecorePackage.getEString(), "messageSelector", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDriven_AcknowledgeMode(), this.getAcknowledgeMode(), "acknowledgeMode", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDriven_Link(), ecorePackage.getEString(), "link", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageDriven_Destination(), this.getMessageDrivenDestination(), this.getMessageDrivenDestination_Bean(), "destination", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageDriven_ActivationConfig(), this.getActivationConfig(), null, "activationConfig", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageDriven_MessageDestination(), theJavaRefPackage.getJavaClass(), null, "messageDestination", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageDriven_MessagingType(), theJavaRefPackage.getJavaClass(), null, "messagingType", null, 0, 1, MessageDriven.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(messageDrivenDestinationEClass, MessageDrivenDestination.class, "MessageDrivenDestination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMessageDrivenDestination_Type(), this.getDestinationType(), "type", null, 0, 1, MessageDrivenDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMessageDrivenDestination_SubscriptionDurability(), this.getSubscriptionDurabilityKind(), "subscriptionDurability", null, 0, 1, MessageDrivenDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageDrivenDestination_Bean(), this.getMessageDriven(), this.getMessageDriven_Destination(), "bean", null, 1, 1, MessageDrivenDestination.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(excludeListEClass, ExcludeList.class, "ExcludeList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getExcludeList_Description(), ecorePackage.getEString(), "description", null, 0, 1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExcludeList_MethodElements(), this.getMethodElement(), null, "methodElements", null, 1, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExcludeList_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(queryMethodEClass, QueryMethod.class, "QueryMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getQueryMethod_Query(), this.getQuery(), this.getQuery_QueryMethod(), "query", null, 1, 1, QueryMethod.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(activationConfigPropertyEClass, ActivationConfigProperty.class, "ActivationConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getActivationConfigProperty_Value(), ecorePackage.getEString(), "value", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivationConfigProperty_Name(), ecorePackage.getEString(), "name", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(activationConfigEClass, ActivationConfig.class, "ActivationConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getActivationConfig_ConfigProperties(), this.getActivationConfigProperty(), null, "configProperties", null, 1, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getActivationConfig_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(transactionAttributeTypeEEnum, TransactionAttributeType.class, "TransactionAttributeType");
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NOT_SUPPORTED_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.SUPPORTS_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.REQUIRED_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.REQUIRES_NEW_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.MANDATORY_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NEVER_LITERAL);
-
-		initEEnum(transactionTypeEEnum, TransactionType.class, "TransactionType");
-		addEEnumLiteral(transactionTypeEEnum, TransactionType.BEAN_LITERAL);
-		addEEnumLiteral(transactionTypeEEnum, TransactionType.CONTAINER_LITERAL);
-
-		initEEnum(sessionTypeEEnum, SessionType.class, "SessionType");
-		addEEnumLiteral(sessionTypeEEnum, SessionType.STATEFUL_LITERAL);
-		addEEnumLiteral(sessionTypeEEnum, SessionType.STATELESS_LITERAL);
-
-		initEEnum(methodElementKindEEnum, MethodElementKind.class, "MethodElementKind");
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.UNSPECIFIED_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.REMOTE_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.HOME_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.LOCAL_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.LOCAL_HOME_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.SERVICE_ENDPOINT_LITERAL);
-
-		initEEnum(acknowledgeModeEEnum, AcknowledgeMode.class, "AcknowledgeMode");
-		addEEnumLiteral(acknowledgeModeEEnum, AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL);
-		addEEnumLiteral(acknowledgeModeEEnum, AcknowledgeMode.DUPS_OK_ACKNOWLEDGE_LITERAL);
-
-		initEEnum(subscriptionDurabilityKindEEnum, SubscriptionDurabilityKind.class, "SubscriptionDurabilityKind");
-		addEEnumLiteral(subscriptionDurabilityKindEEnum, SubscriptionDurabilityKind.DURABLE_LITERAL);
-		addEEnumLiteral(subscriptionDurabilityKindEEnum, SubscriptionDurabilityKind.NON_DURABLE_LITERAL);
-
-		initEEnum(returnTypeMappingEEnum, ReturnTypeMapping.class, "ReturnTypeMapping");
-		addEEnumLiteral(returnTypeMappingEEnum, ReturnTypeMapping.LOCAL_LITERAL);
-		addEEnumLiteral(returnTypeMappingEEnum, ReturnTypeMapping.REMOTE_LITERAL);
-
-		initEEnum(destinationTypeEEnum, DestinationType.class, "DestinationType");
-		addEEnumLiteral(destinationTypeEEnum, DestinationType.QUEUE_LITERAL);
-		addEEnumLiteral(destinationTypeEEnum, DestinationType.TOPIC_LITERAL);
-
-		initEEnum(multiplicityKindEEnum, MultiplicityKind.class, "MultiplicityKind");
-		addEEnumLiteral(multiplicityKindEEnum, MultiplicityKind.ONE_LITERAL);
-		addEEnumLiteral(multiplicityKindEEnum, MultiplicityKind.MANY_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //EjbPackageImpl
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EnterpriseBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EnterpriseBeanImpl.java
deleted file mode 100644
index 3017e9f9f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EnterpriseBeanImpl.java
+++ /dev/null
@@ -1,1292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-
-/**
- * @generated
- * EnterpriseJavaBean is a class.  It can have instances, someone could write an instance document containing Departments and Employees.  It also has attributes, operations, and associations.  These are actually derived//filtered from its implementation classes and interfaces.  For mapping and browsing purposes, though, you would like the EJB to appear as a class.  
- * 
- * In this light, even Session Beans can have associations and properties implemented by their bean.  For example, it would be meaningful to describe associations from a Session to the Entities which it uses to perform its work.
- */
-public abstract class EnterpriseBeanImpl extends JNDIEnvRefsGroupImpl implements EnterpriseBean {
-
-	protected final static Method[] EMPTY_METHOD_ARRAY = new Method[0];
-	protected static final String METHOD_ELEMENT_NAME = "MethodElement"; //$NON-NLS-1$
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoleRefs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass ejbClass = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass homeInterface = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass remoteInterface = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SecurityIdentity securityIdentity = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass localHomeInterface = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass localInterface = null;
-	protected EjbMethodElementComparator defaultMethodElementComparator;
-	public EnterpriseBeanImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ENTERPRISE_BEAN;
-	}
-
-	/**
-	 * createClassRef - return a JavaURL reference to the named Java class
-	 */
-	public JavaClass createClassRef(String targetName) {
-		return getJavaRefFactory().createClassRef(targetName);
-	}
-
-	protected List createMethodElements(List signatures, Enumerator aType) {
-		return createMethodElements(METHOD_ELEMENT_NAME, signatures, aType);
-	}
-	
-	protected List createMethodElements(String meTypeName, List signatures, Enumerator aType) {
-		int size = signatures.size();
-		List methodElements = new ArrayList(size);
-		String signature;
-		MethodElement me;
-		for (int i = 0; i < size; i++) {
-			signature = (String) signatures.get(i);
-			me = (MethodElement) getEjbFactory().create((EClass)getEjbPackage().getEClassifier(meTypeName));
-			me.initializeFromSignature(signature);
-			me.setEnterpriseBean(this);
-			me.setType((MethodElementKind)aType);
-			methodElements.add(me);
-		}
-		return methodElements;
-	}
-
-	public List createMethodElements(List someMethods, JavaClass anInterface) {
-		return createMethodElements(METHOD_ELEMENT_NAME, someMethods, anInterface);
-	}
-	
-	public List createMethodElements(String meTypeName, List someMethods, JavaClass anInterface) {
-		if (anInterface == null)
-			return Collections.EMPTY_LIST;
-		List signatures = getMethodElementSignatures(someMethods);
-		Collections.sort(signatures);
-		Enumerator enumerator = getMethodElementKindLiteral(anInterface);
-		return createMethodElements(meTypeName, signatures, enumerator);
-	}
-	
-	protected Enumerator getMethodElementKindLiteral(JavaClass anInterface) {
-		Enumerator enumerator = MethodElementKind.UNSPECIFIED_LITERAL;
-		if (anInterface == getHomeInterface())
-			enumerator = MethodElementKind.HOME_LITERAL;
-		else if (anInterface == getRemoteInterface())
-			enumerator = MethodElementKind.REMOTE_LITERAL;
-		else if (anInterface == getLocalHomeInterface())
-			enumerator = MethodElementKind.LOCAL_HOME_LITERAL;
-		else if (anInterface == getLocalInterface())
-			enumerator = MethodElementKind.LOCAL_LITERAL;
-		return enumerator;
-	}
-	
-	protected List getMethodElementSignatures(List someMethods) {
-		int size = someMethods.size();
-		List signatures = new ArrayList(size);
-		Method method;
-		for (int i = 0; i < size; i++) {
-			method = (Method) someMethods.get(i);
-			signatures.add(method.getMethodElementSignature());
-		}
-		return signatures;
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 * @deprecated use getAvailableUnspecifiedMethodElements();
-	 */
-	public List getAvailableCommonMethodElements() {
-		return getAvailableUnspecifiedMethodElements();
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableUnspecifiedMethodElements() {
-		List commonSigs = getAvailableUnspecifiedMethodElementSignatures();
-		return createMethodElements(commonSigs, MethodElementKind.UNSPECIFIED_LITERAL);
-	}
-	protected List gatherCommonSignatures(List sigCollections) {
-		if (sigCollections.isEmpty()) return sigCollections;
-		List first = (List)sigCollections.get(0);
-		if (sigCollections.size() == 1) return first;
-		List result = new ArrayList(first.size());
-		sigCollections.remove(0);
-		String sig = null;
-		boolean contains = false;
-		for (int i = 0; i < first.size(); i++) {
-			contains = false;
-			sig = (String) first.get(i);
-			List list = null;
-			for (int j = 0; j < sigCollections.size(); j++) {
-				list = (List) sigCollections.get(j);
-				if (list.contains(sig))
-					contains = true;
-			}
-			if (contains)
-				result.add(sig);
-		}
-		return result;
-	}
-	/**
-	 * Return a List of MethodElements that are set for a particular EObject
-	 * which can be a MethodTransaction or a MethodPermission.
-	 */
-	protected List getExistingMethodElements(EObject refObject) {
-		if (refObject != null) {
-			EjbPackage pack = getEjbPackage();
-			if (refObject.eClass() == pack.getMethodTransaction())
-				return ((MethodTransaction)refObject).getMethodElements(this);
-			if (refObject.eClass() == pack.getMethodPermission())
-				return ((MethodPermission)refObject).getMethodElements(this);
-		}
-		return Collections.EMPTY_LIST;
-	}
-	/**
-	 * This method will return a List of MethodElements signatures
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.
-	 * @deprecated use getAvailableUnspecifiedMethodElementSignatures();
-	 */
-	public List getAvailableCommonMethodElementSignatures() {
-		return getAvailableUnspecifiedMethodElementSignatures();
-	}
-	/**
-	 * This method will return a List of MethodElements signatures
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.
-	 */
-	public List getAvailableUnspecifiedMethodElementSignatures() {
-		List sigCollections = new ArrayList();
-		if (getHomeInterface() != null)
-			sigCollections.add(getHomeInterface().getMethodElementSignatures());
-		if (getRemoteInterface() != null)
-			sigCollections.add(getRemoteInterface().getMethodElementSignatures());
-		if (getLocalHomeInterface() != null)
-			sigCollections.add(getLocalHomeInterface().getMethodElementSignatures());
-		if (getLocalInterface() != null)
-			sigCollections.add(getLocalInterface().getMethodElementSignatures());	
-		return gatherCommonSignatures(sigCollections);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Home interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableHomeMethodElements() {
-		return getAvailableMethodElements(getHomeInterface(), MethodElementKind.HOME_LITERAL);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Local Home interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableLocalHomeMethodElements() {
-		return getAvailableMethodElements(getLocalHomeInterface(), MethodElementKind.LOCAL_HOME_LITERAL);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Local interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableLocalMethodElements() {
-		return getAvailableMethodElements(getLocalInterface(), MethodElementKind.LOCAL_LITERAL);
-	}
-
-	public List getAvailableServiceEndpointMethodElements(){
-		return getAvailableMethodElements(getServiceEndpoint(), MethodElementKind.SERVICE_ENDPOINT_LITERAL);
-	}
-	
-	protected List getAvailableMethodElements(JavaClass anInterface, Enumerator aType) {
-		if (anInterface == null)
-			return Collections.EMPTY_LIST;
-		List signatures = anInterface.getMethodElementSignatures();
-		return createMethodElements(signatures, aType);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Remote interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableRemoteMethodElements() {
-		return getAvailableMethodElements(getRemoteInterface(), MethodElementKind.REMOTE_LITERAL);
-	}
-	
-	/*
-	 * See EnterpriseBean#getExistingOrAvailableMethodElements(EObject, Comparator);
-	 */
-	public List getExistingOrAvailableMethodElements(EObject refObject, Comparator comparator) {
-		List result = new ArrayList();
-		result.addAll(getAvailableHomeMethodElements());
-		result.addAll(getAvailableRemoteMethodElements());
-		result.addAll(getAvailableLocalHomeMethodElements());
-		result.addAll(getAvailableLocalMethodElements());
-		result.addAll(getAvailableServiceEndpointMethodElements());
-		result.addAll(getAvailableUnspecifiedMethodElements());
-		
-		List list = getEjbClass().getImplementsInterfaces();
-		Iterator it = list.iterator();
-		while( it.hasNext()){
-			JavaClass  interfaceClass = (JavaClass)it.next();
-			String interfaceName = interfaceClass.getQualifiedName();
-			if( !interfaceName.equals("javax.ejb.MessageDrivenBean") && 
-					!interfaceName.equals("javax.ejb.EntityBean")&&
-					!interfaceName.equals("javax.ejb.SessionBean")){
-				result.addAll( getAvailableMethodElements(interfaceClass, MethodElementKind.UNSPECIFIED_LITERAL));
-			}
-		}
-		
-		unionMethodElements(result, getExistingMethodElements(refObject));
-		Collections.sort(result, comparator);
-		return result;
-	}
-	/*
-	 * See EnterpriseBean#getExistingOrAvailableMethodElements(EObject);
-	 */
-	public List getExistingOrAvailableMethodElements(EObject refObject) {
-		return getExistingOrAvailableMethodElements(refObject, getDefaultMethodElementComparator());	
-	}
-	
-	protected EjbMethodElementComparator getDefaultMethodElementComparator() {
-		if (defaultMethodElementComparator == null)
-			defaultMethodElementComparator = new EjbMethodElementComparator();
-		return defaultMethodElementComparator;
-	}
-	protected void unionMethodElements(List sourceMethodElements, List additionalMethodElements) {
-		MethodElement sourceME, additionalME;
-		int sourceSize, addSize;
-		sourceSize = sourceMethodElements.size();
-		addSize = additionalMethodElements.size();
-		List foundElements = new ArrayList(addSize);
-		boolean found = false;
-		for (int i = 0; i < addSize; i++){
-			found = false;
-			additionalME = (MethodElement) additionalMethodElements.get(i);
-			sourceME = null;
-			for (int ii = 0; ii < sourceSize; ii++){
-				sourceME = (MethodElement) sourceMethodElements.get(ii);
-				if (sourceME.isEquivalent(additionalME)) {
-					found = true;
-					break;
-				}
-			}
-			if (found)
-				foundElements.add(sourceME);
-		}
-		sourceMethodElements.removeAll(foundElements);
-		sourceMethodElements.addAll(additionalMethodElements);
-	}
-	public String getEjbClassName() {
-		getEjbClass();
-		return (ejbClass == null) ? null : ejbClass.getQualifiedName();
-	}
-	protected EjbPackage getEjbPackage() {
-		return EjbFactoryImpl.getPackage();
-	}
-	protected EjbFactory getEjbFactory() {
-		return ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory();
-	}
-	public EjbRef getEquivalentEjbRef(EjbRef anEjbRef) {
-		return getEquivalentEjbRef(anEjbRef, getEjbRefs());
-	}
-	public EJBLocalRef getEquivalentEJBLocalRef(EJBLocalRef anEjbLocalRef) {
-		return (EJBLocalRef) getEquivalentEjbRef(anEjbLocalRef, getEjbLocalRefs());
-	}
-	private EjbRef getEquivalentEjbRef(EjbRef anEjbRef, List someRefs) {
-		if (anEjbRef == null)
-			return null;
-		int size = someRefs.size();
-		EjbRef ref;
-		for (int i = 0; i < size; i++) {
-			ref = (EjbRef) someRefs.get(i);
-			if (ref.isEquivalent(anEjbRef))
-				return ref;
-		}
-		return null;
-	}
-	public String getHomeInterfaceName() {
-		getHomeInterface();
-		return homeInterface == null ? null : homeInterface.getQualifiedName();
-	}
-	/**
-	 * See <code>getMethods<code> for comment
-	 */
-	public Method[] getHomeMethodsForDeployment() {
-		return (getHomeInterface() != null ? getMethods(getHomeInterface()) : EMPTY_METHOD_ARRAY);
-	}
-	private JavaRefFactory getJavaRefFactory() {
-		return ((JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI)).getJavaRefFactory();
-	}
-	public EjbRef getLinkedEJBReference(EnterpriseBean anEJB) {
-		return getLinkedEJBReference(anEJB, getEjbRefs());
-	}
-	public EJBLocalRef getLinkedEJBLocalReference(EnterpriseBean anEJB) {
-		return (EJBLocalRef) getLinkedEJBReference(anEJB, getEjbLocalRefs());
-	}
-	private EjbRef getLinkedEJBReference(EnterpriseBean anEJB, List someRefs) {
-		if (anEJB == null)
-			return null;
-		int size = someRefs.size();
-		EjbRef ref;
-		for (int i = 0; i < size; i++) {
-			ref = (EjbRef) someRefs.get(i);
-			if (ref.isLinked(anEJB))
-				return ref;
-		}
-		return null;
-	}
-	public String getLocalHomeInterfaceName() {
-		getLocalHomeInterface();
-		return localHomeInterface == null ? null : localHomeInterface.getQualifiedName();
-	}
-	/**
-	 * See <code>getMethods<code> for comment
-	 */
-	public Method[] getLocalHomeMethodsForDeployment() {
-		return (getLocalHomeInterface() != null ? getMethods(getLocalHomeInterface()) : EMPTY_METHOD_ARRAY);
-	}
-	public String getLocalInterfaceName() {
-		getLocalInterface();
-		return localInterface == null ? null : localInterface.getQualifiedName();
-	}
-	/**
-	 * Retrieve an ordered list of methods for the given JavaClass.
-	 * The list should include all non-static, public methods that are
-	 * not inherited from javax.ejb.EJBObject
-	 * This uses the algorithm that web sphere currently uses, and could
-	 * be subject to change
-	 * Creation date: (8/21/00 1:41:03 PM)
-	 * @param intf JavaClass
-	 */
-	public static Method[] getMethods(JavaClass intf) {
-		Method[] allMethods = intf.listMethodExtended();
-		java.util.Vector resultVector = new java.util.Vector(allMethods.length);
-		java.util.Hashtable methodNameTable = new java.util.Hashtable();
-
-		//----------------------------------------------------------------
-		// Iterate over the list returned by "listMethodExtended" and
-		// filter out methods belonging to the EJBObject interface
-		// and method synonyms. 
-		//
-		// Method synonyms correspond to overrides. For all synonyms
-		// keep the method instance declared on the most specific class. 
-		// How do you determine the most specific class? Don't know.
-		// For now, if the method is declared on the interface class
-		// it always overrides others.
-		//----------------------------------------------------------------
-
-		Method[] result = null;
-
-		for (int i = 0; i < allMethods.length; i++) {
-			Method m = allMethods[i];
-
-			//---------------------------
-			// Filter out static methods
-			//---------------------------
-
-			if (m.isStatic()) {
-				continue;
-			}
-
-			String mKey = methodKey(m);
-
-			String interfaceName = m.getContainingJavaClass().getJavaName();
-			if (!interfaceName.equals("javax.ejb.EJBObject")) { //$NON-NLS-1$
-				Method synonym = (Method) methodNameTable.get(mKey);
-				if (synonym == null) {
-					methodNameTable.put(mKey, m);
-					resultVector.addElement(m);
-				} else {
-					//---------------------------------------------
-					// Method declared on most specific class wins
-					//---------------------------------------------
-					JavaClass mClass = m.getContainingJavaClass();
-					JavaClass sClass = synonym.getContainingJavaClass();
-					if (sClass.implementsInterface(mClass)) {
-						resultVector.removeElement(synonym);
-						methodNameTable.put(mKey, m);
-						resultVector.addElement(m);
-					}
-				}
-			}
-		}
-
-		result = new Method[resultVector.size()];
-		resultVector.copyInto(result);
-		return sortMethods(result);
-	}
-	public String getRemoteInterfaceName() {
-		getRemoteInterface();
-		return remoteInterface == null ? null : remoteInterface.getQualifiedName();
-	}
-	/**
-	 * See <code>getMethods<code> for comment
-	 */
-	public Method[] getRemoteMethodsForDeployment() {
-		return getMethods(getRemoteInterface());
-	}
-	/**
-	 * Return true if @aJavaClass as equal to the
-	 * home, remote, bean class, or key class.
-	 */
-	public boolean hasJavaReference(JavaClass aJavaClass) {
-		if (aJavaClass != null) {
-			return aJavaClass.equals(getEjbClass())||
-					aJavaClass.equals(getRemoteInterface()) || 
-					aJavaClass.equals(getHomeInterface()) || 
-					aJavaClass.equals(getLocalInterface()) ||
-					aJavaClass.equals(getLocalHomeInterface());
-		}
-		return false;
-	}
-	/**
-	 * Return true if this ejb has BeanManagedPersistance.
-	 */
-	public boolean isBeanManagedEntity() {
-		return isEntity() && !isContainerManagedEntity();
-	}
-	/**
-	 * isContainerManagedEntity method comment.
-	 */
-	public boolean isContainerManagedEntity() {
-		return false;
-	}
-	//Return false by default
-	public boolean isEntity() {
-		return false;
-	}
-	//Return false by default
-	public boolean isMessageDriven() {
-		return false;
-	}
-	//Return false by default
-	public boolean isSession() {
-		return false;
-	}
-	/**
-	 * @deprecated - Use getEjbJar().getVersionID()
-	 * isVersion1_X method comment.
-	 */
-	public boolean isVersion1_X() {
-		if (getEjbJar() != null)
-			return getEjbJar().getVersionID() <= J2EEVersionConstants.EJB_1_1_ID;
-		Revisit.revisit(); //jsholl this should throw an exception. if there is not JAR then the version is undefined
-		return false;
-	}
-	/**
-	 * @deprecated - Use getEjbJar().getVersionID()
-	 * isVersion2_X method comment.
-	 */
-	public boolean isVersion2_X() {
-		if (getEjbJar() != null) {
-			return getEjbJar().getVersionID() >= J2EEVersionConstants.EJB_1_1_ID;
-		}
-		Revisit.revisit(); //jsholl this should throw an exception. if there is not JAR then the version is undefined
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getVersionID()
-	 */
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-
-	
-	/*
-	 * @see EnterpriseBean#hasLocalClient()
-	 */
-	public boolean hasLocalClient() {
-		return getLocalInterface() != null && getLocalHomeInterface() != null;
-	}
-
-	/*
-	 * @see EnterpriseBean#hasRemoteClient()
-	 */
-	public boolean hasRemoteClient() {
-		return getRemoteInterface() != null && getHomeInterface() != null;
-	}
-	
-	/**
-	 *  Get method name string of form: 
-	 *  methodName(class name of arg1,class name of arg2,...)
-	 * Creation date: (8/24/00 1:21:10 PM)
-	 * @return String
-	 * @param m Method
-	 */
-	private static String methodKey(Method m) {
-		StringBuffer result = new StringBuffer(m.getName());
-
-		result.append("("); //$NON-NLS-1$
-
-		java.util.List args = m.getParameters();
-		JavaParameter arg;
-		for (int i = 0; i < args.size(); i++) {
-			arg = (JavaParameter) args.get(i);
-			result.append(((JavaHelpers) arg.getEType()).getJavaName());
-			result.append(","); //$NON-NLS-1$
-		}
-		result.append(")"); //$NON-NLS-1$
-		return result.toString();
-	}
-	public Object primRefValue(EObject feature) {
-		switch (eDerivedStructuralFeatureID(((EStructuralFeature)feature).getFeatureID(), ((EStructuralFeature)feature).getContainerClass())) {
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTION :
-				return getDescription();
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAME :
-				return getDisplayName();
-			case EjbPackage.ENTERPRISE_BEAN__SMALL_ICON :
-				return getSmallIcon();
-			case EjbPackage.ENTERPRISE_BEAN__LARGE_ICON :
-				return getLargeIcon();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS :
-				return getResourceRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS :
-				return getEjbClass();
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE :
-				return getHomeInterface();
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE :
-				return getRemoteInterface();
-			case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES :
-				return getEnvironmentProperties();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS :
-				return getSecurityRoleRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_REFS :
-				return getEjbRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS :
-				return getEjbLocalRefs();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS :
-				return getResourceEnvRefs();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY :
-				return getSecurityIdentity();
-			case EjbPackage.ENTERPRISE_BEAN__NAME :
-				return getName();
-		}
-		return null;
-	}
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean
-	 */
-	public void reSyncSecurityRoleRef(java.lang.String existingRoleName, java.lang.String newRoleName) {
-		List roleRefs = getSecurityRoleRefs();
-		for (int i = 0; i < roleRefs.size(); i++) {
-			SecurityRoleRef roleRef = (SecurityRoleRef) roleRefs.get(i);
-			if (roleRef.getLink() != null && roleRef.getLink().equals(existingRoleName))
-				roleRef.setLink(newRoleName);
-		}
-	}
-	public void setEjbClassName(String ejbClassName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_EjbClass(), createClassRef(ejbClassName));
-	}
-	public void setHomeInterfaceName(String homeInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface(), createClassRef(homeInterfaceName));
-	}
-	public void setLocalHomeInterfaceName(String localHomeInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface(), createClassRef(localHomeInterfaceName));
-	}
-	public void setLocalInterfaceName(String localInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface(), createClassRef(localInterfaceName));
-	}
-	public void setRemoteInterfaceName(String remoteInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface(), createClassRef(remoteInterfaceName));
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/24/00 1:32:13 PM)
-	 * @return Method[]
-	 * @param methods Method[]
-	 */
-	private static Method[] sortMethods(Method[] methods) {
-		Method result[] = new Method[methods.length];
-
-		/**
-		 *  Insert each element of given list of methods into result
-		 *  arary in sorted order
-		 */
-
-		for (int i = 0; i < methods.length; i++) {
-			Method currMethod = methods[i];
-			String currMethodName = currMethod.getSignature();
-			int insertIndex = 0;
-			while (insertIndex < i) {
-				if (currMethodName.compareTo(result[insertIndex].getSignature()) <= 0) {
-					break;
-				}
-				insertIndex++;
-			}
-
-			for (int j = insertIndex; j <= i; j++) {
-				Method tmpMethod = result[j];
-				result[j] = currMethod;
-				currMethod = tmpMethod;
-			}
-		}
-		return result;
-	}
-	public String toString() {
-		return getClass().getName() + "(" + getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-    /**
-     * Handwritten version of getEjbClass():
-     */
- 
- 
-    public JavaClass getEjbClass()  { 
-       if (ejbClass != null && ejbClass.eIsProxy()) { 
-          JavaClass oldEjbClass = ejbClass; 
-          JavaClass resolved = (JavaClass)EcoreUtil.resolve(ejbClass, this); 
-          resolved(this.ejbClass, resolved);
-          this.ejbClass = resolved;
-          if (ejbClass != oldEjbClass) { 
-             if (eNotificationRequired()) 
-                eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldEjbClass, ejbClass)); 
-          } 
-       } 
-       return ejbClass; 
-    } 
- 
-         
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbClass(JavaClass newEjbClass) {
-		JavaClass oldEjbClass = ejbClass;
-		ejbClass = newEjbClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getHomeInterface() {
-		if (homeInterface != null && homeInterface.eIsProxy()) {
-			InternalEObject oldHomeInterface = (InternalEObject)homeInterface;
-			homeInterface = (JavaClass)eResolveProxy(oldHomeInterface);
-			if (homeInterface != oldHomeInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE, oldHomeInterface, homeInterface));
-			}
-		}
-		return homeInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetHomeInterface() {
-		return homeInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setHomeInterface(JavaClass newHomeInterface) {
-		JavaClass oldHomeInterface = homeInterface;
-		homeInterface = newHomeInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE, oldHomeInterface, homeInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getRemoteInterface() {
-		if (remoteInterface != null && remoteInterface.eIsProxy()) {
-			InternalEObject oldRemoteInterface = (InternalEObject)remoteInterface;
-			remoteInterface = (JavaClass)eResolveProxy(oldRemoteInterface);
-			if (remoteInterface != oldRemoteInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE, oldRemoteInterface, remoteInterface));
-			}
-		}
-		return remoteInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetRemoteInterface() {
-		return remoteInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRemoteInterface(JavaClass newRemoteInterface) {
-		JavaClass oldRemoteInterface = remoteInterface;
-		remoteInterface = newRemoteInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE, oldRemoteInterface, remoteInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBJar getEjbJar() {
-		if (eContainerFeatureID != EjbPackage.ENTERPRISE_BEAN__EJB_JAR) return null;
-		return (EJBJar)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEjbJar(EJBJar newEjbJar, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newEjbJar, EjbPackage.ENTERPRISE_BEAN__EJB_JAR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		if (newEjbJar != eInternalContainer() || (eContainerFeatureID != EjbPackage.ENTERPRISE_BEAN__EJB_JAR && newEjbJar != null)) {
-			if (EcoreUtil.isAncestor(this, newEjbJar))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEjbJar != null)
-				msgs = ((InternalEObject)newEjbJar).eInverseAdd(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.class, msgs);
-			msgs = basicSetEjbJar(newEjbJar, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__EJB_JAR, newEjbJar, newEjbJar));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It
-	 * contains an optional description and a specification of the security identity to be used.
-	 */
-	public SecurityIdentity getSecurityIdentity() {
-		return securityIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecurityIdentity(SecurityIdentity newSecurityIdentity, NotificationChain msgs) {
-		SecurityIdentity oldSecurityIdentity = securityIdentity;
-		securityIdentity = newSecurityIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, oldSecurityIdentity, newSecurityIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecurityIdentity(SecurityIdentity newSecurityIdentity) {
-		if (newSecurityIdentity != securityIdentity) {
-			NotificationChain msgs = null;
-			if (securityIdentity != null)
-				msgs = ((InternalEObject)securityIdentity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, null, msgs);
-			if (newSecurityIdentity != null)
-				msgs = ((InternalEObject)newSecurityIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, null, msgs);
-			msgs = basicSetSecurityIdentity(newSecurityIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, newSecurityIdentity, newSecurityIdentity));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getLocalHomeInterface() {
-		if (localHomeInterface != null && localHomeInterface.eIsProxy()) {
-			InternalEObject oldLocalHomeInterface = (InternalEObject)localHomeInterface;
-			localHomeInterface = (JavaClass)eResolveProxy(oldLocalHomeInterface);
-			if (localHomeInterface != oldLocalHomeInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE, oldLocalHomeInterface, localHomeInterface));
-			}
-		}
-		return localHomeInterface;
-	}
-
-	public JavaClass getServiceEndpoint() {
-		return null;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetLocalHomeInterface() {
-		return localHomeInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLocalHomeInterface(JavaClass newLocalHomeInterface) {
-		JavaClass oldLocalHomeInterface = localHomeInterface;
-		localHomeInterface = newLocalHomeInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE, oldLocalHomeInterface, localHomeInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getLocalInterface() {
-		if (localInterface != null && localInterface.eIsProxy()) {
-			InternalEObject oldLocalInterface = (InternalEObject)localInterface;
-			localInterface = (JavaClass)eResolveProxy(oldLocalInterface);
-			if (localInterface != oldLocalInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE, oldLocalInterface, localInterface));
-			}
-		}
-		return localInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetLocalInterface() {
-		return localInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLocalInterface(JavaClass newLocalInterface) {
-		JavaClass oldLocalInterface = localInterface;
-		localInterface = newLocalInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE, oldLocalInterface, localInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetEjbJar((EJBJar)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				return basicSetEjbJar(null, msgs);
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				return basicSetSecurityIdentity(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				return getName();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				if (resolve) return getEjbClass();
-				return basicGetEjbClass();
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				if (resolve) return getHomeInterface();
-				return basicGetHomeInterface();
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				if (resolve) return getRemoteInterface();
-				return basicGetRemoteInterface();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				if (resolve) return getLocalHomeInterface();
-				return basicGetLocalHomeInterface();
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				if (resolve) return getLocalInterface();
-				return basicGetLocalInterface();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				setEjbClass((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				setHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				setEjbClass((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				setHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				return ejbClass != null;
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				return homeInterface != null;
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				return remoteInterface != null;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				return localHomeInterface != null;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				return localInterface != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * Preserve adapters when object is resolved.
-	 */
-	protected void resolved(EObject originalObject, EObject resolvedObject) {
-		if (originalObject != null && resolvedObject != null && originalObject != resolvedObject) {
-			Collection col = originalObject.eAdapters();
-			if (!col.isEmpty()) {
-				Iterator it = col.iterator();
-				Adapter a;
-				while (it.hasNext()) {
-					a = (Adapter) it.next();
-					if (a == null) continue;
-					resolvedObject.eAdapters().add(a);
-				}
-			}
-		}
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getEjbClassGen() {
-		if (ejbClass != null && ejbClass.eIsProxy()) {
-			InternalEObject oldEjbClass = (InternalEObject)ejbClass;
-			ejbClass = (JavaClass)eResolveProxy(oldEjbClass);
-			if (ejbClass != oldEjbClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-			}
-		}
-		return ejbClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetEjbClass() {
-		return ejbClass;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EModelElement#getEAnnotation(java.lang.String)
-	 */
-	public EAnnotation getEAnnotation(String source) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EModelElement#getEAnnotations()
-	 */
-	public EList getEAnnotations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EntityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EntityImpl.java
deleted file mode 100644
index 216cc2962..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EntityImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-
-/**
- * The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity bean's home and remote interfaces, if any; the names of the entity bean's local home and local interface, if any; the entity bean's implementation class; the entity bean's persistence management type; the entity bean's primary key class name; an indication of the entity bean's reentrancy; an optional specification of the entity bean's cmp-version; an optional specification of the entity bean's abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; an optional declaration of the bean's resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.
- * The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entity's persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entity's persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.
- * The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.
- * The optional local-home and local elements must be specified if the entity bean has a local home and local interface.
- * The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.
- * The other elements that are optional are "optional" in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if
- * the entity's persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entity's persistence-type is Bean.
- */
-public class EntityImpl extends EnterpriseBeanImpl implements Entity, EnterpriseBean {
-
-	/**
-	 * The default value of the '{@link #isReentrant() <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReentrant()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REENTRANT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReentrant() <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReentrant()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reentrant = REENTRANT_EDEFAULT;
-
-	/**
-	 * This is true if the Reentrant attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean reentrantESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass primaryKey = null;
-	public EntityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ENTITY;
-	}
-
-public String getPrimaryKeyName() {
-	getPrimaryKey();
-	return primaryKey == null ? null : primaryKey.getQualifiedName();
-}
-/**
- * Return true if @aJavaClass as equal to the
- * home, remote, bean class, or key class.
- */
-public boolean hasJavaReference(JavaClass aJavaClass) {
-	boolean result = super.hasJavaReference(aJavaClass);
-	if (!result && aJavaClass != null)
-		result = aJavaClass.equals(getPrimaryKey());
-	return result;
-}
-//Return false by default
-public boolean isContainerManagedEntity() {
-	return false;
-}
-public boolean isEntity() {
-	return true;
-}
-protected boolean primGetIsReentrant() {
-   return isReentrant();
-}
-protected JavaClass primGetPrimaryKey() {
-	return getPrimaryKey();
-}
-
-public java.lang.Object primRefValue(EObject feature) {
-	switch (eDerivedStructuralFeatureID(((EStructuralFeature)feature).getFeatureID(), ((EStructuralFeature)feature).getContainerClass())) {
-		case EjbPackage.ENTITY__REENTRANT: return new Boolean(isReentrant());
-		case EjbPackage.ENTITY__PRIMARY_KEY: return getPrimaryKey();
-	}
-	return super.primRefValue(feature);
-}
-public void setPrimaryKeyName(String primaryKeyName) {
-	eSet(EjbPackage.eINSTANCE.getEntity_PrimaryKey(), createClassRef(primaryKeyName));
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The reentrant element specifies whether an entity bean is reentrant or not.
-
-	 */
-	public boolean isReentrant() {
-		return reentrant;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReentrant(boolean newReentrant) {
-		boolean oldReentrant = reentrant;
-		reentrant = newReentrant;
-		boolean oldReentrantESet = reentrantESet;
-		reentrantESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY__REENTRANT, oldReentrant, reentrant, !oldReentrantESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetReentrant() {
-		boolean oldReentrant = reentrant;
-		boolean oldReentrantESet = reentrantESet;
-		reentrant = REENTRANT_EDEFAULT;
-		reentrantESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ENTITY__REENTRANT, oldReentrant, REENTRANT_EDEFAULT, oldReentrantESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetReentrant() {
-		return reentrantESet;
-	}
-
-    /**
-     * Handwritten version of getPrimaryKey():
-     */
- 
- 
-    public JavaClass getPrimaryKey()  { 
-       if (primaryKey != null && primaryKey.eIsProxy()) { 
-          JavaClass oldPrimaryKey = primaryKey; 
-          JavaClass resolved = (JavaClass)EcoreUtil.resolve(primaryKey, this); 
-          resolved(this.primaryKey, resolved);
-          this.primaryKey = resolved;
-          if (primaryKey != oldPrimaryKey) { 
-             if (eNotificationRequired()) 
-                eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldPrimaryKey, primaryKey)); 
-          } 
-       } 
-       return primaryKey; 
-    } 
- 
-         
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setPrimaryKey(JavaClass newPrimaryKey) {
-		JavaClass oldPrimaryKey = primaryKey;
-		primaryKey = newPrimaryKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY__PRIMARY_KEY, oldPrimaryKey, primaryKey));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ENTITY__REENTRANT:
-				return isReentrant() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				if (resolve) return getPrimaryKey();
-				return basicGetPrimaryKey();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ENTITY__REENTRANT:
-				setReentrant(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				setPrimaryKey((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTITY__REENTRANT:
-				unsetReentrant();
-				return;
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				setPrimaryKey((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ENTITY__REENTRANT:
-				return isSetReentrant();
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				return primaryKey != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (reentrant: ");
-		if (reentrantESet) result.append(reentrant); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The primkey-field element is used to specify the name of the primary key field
-	 * for an entity with container-managed persistence.  The primkey-field must be
-	 * one of the fields declared in the cmp-field
-	 * element, and the type of the field must be the same as the primary key type. 
-	 * The primkey-field element is not used if the primary key maps to multiple
-	 * container-managed fields (i.e. the key is a compound key). In this case, the
-	 * fields of the primary key class must be public, and their names must correspond 
-	 * to the field names of the entity bean class that comprise the key.
-	 * Examples:<prim-key-class>java.lang.String<//prim-key-class>
-	 * 	<prim-key-class>com.wombat.empl.EmployeeID<//prim-key-class>
-	 * 	<prim-key-class>java.lang.Object<//prim-key-class>
-
-	 */
-	public JavaClass getPrimaryKeyGen() {
-		if (primaryKey != null && primaryKey.eIsProxy()) {
-			InternalEObject oldPrimaryKey = (InternalEObject)primaryKey;
-			primaryKey = (JavaClass)eResolveProxy(oldPrimaryKey);
-			if (primaryKey != oldPrimaryKey) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTITY__PRIMARY_KEY, oldPrimaryKey, primaryKey));
-			}
-		}
-		return primaryKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetPrimaryKey() {
-		return primaryKey;
-	}
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ExcludeListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ExcludeListImpl.java
deleted file mode 100644
index fa6047f3d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ExcludeListImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-
-/**
- * The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.
- * 
- * If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.
- * @generated
- */
-public class ExcludeListImpl extends J2EEEObjectImpl implements ExcludeList {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodElements = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public ExcludeListImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.EXCLUDE_LIST;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EXCLUDE_LIST__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodElements() {
-		if (methodElements == null) {
-			methodElements = new EObjectContainmentEList(MethodElement.class, this, EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS);
-		}
-		return methodElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EXCLUDE_LIST__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				return ((InternalEList)getMethodElements()).basicRemove(otherEnd, msgs);
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				return getMethodElements();
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				getMethodElements().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				return;
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				return methodElements != null && !methodElements.isEmpty();
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-	public List getMethodElements(EnterpriseBean anEJB) {
-		if (anEJB == null)
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		List elements = getMethodElements();
-		MethodElement me;
-		for (int i = 0; i < elements.size(); i++) {
-			me = (MethodElement) elements.get(i);
-			if (anEJB.equals(me.getEnterpriseBean()))
-				result.add(me);
-		}
-		return result;
-	}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/KeyRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/KeyRelationshipRoleAttributeFilter.java
deleted file mode 100644
index 19436c1a6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/KeyRelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the keyAttributes (this includes inherited 
- * key attributes) from the ContainerManagedEntityExtension that is passed as an
- * argument to the filter method.
- * It will remove any key attribute that is not pointed to by an EjbRelationshipRole.
- * Thus, the returned list will contain key attributes (including inherited key attributes) that only
- * belong to roles.
- * Creation date: (11/28/2000 7:23:22 PM)
- * @author: Administrator
- */
-public class KeyRelationshipRoleAttributeFilter extends AbstractRelationshipRoleAttributeFilter {
-	private static KeyRelationshipRoleAttributeFilter singleton;
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected java.util.List getSourceRoles(ContainerManagedEntity cmp) {
-	return cmp.getFilteredFeatures(KeyRelationshipRoleFilter.singleton());
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.KeyRelationshipRoleAttributeFilter
- */
-public static KeyRelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new KeyRelationshipRoleAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/KeyRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/KeyRelationshipRoleFilter.java
deleted file mode 100644
index 01b7beada..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/KeyRelationshipRoleFilter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the relationshipRoles (this includes
- * inherited EjbRelationshipRoles) from the ContainerManagedEntityExtension
- * that is passed as an argument to the filter method. It will remove any
- * EjbRelationshipRole that is not part of the key. Creation date: (11/28/2000
- * 7:14:57 PM) @author: Administrator
- */
-public class KeyRelationshipRoleFilter extends ContainerManagedEntityFilter {
-
-    private static KeyRelationshipRoleFilter singleton;
-
-    /**
-     * filter method comment.
-     */
-    public java.util.List filter(ContainerManagedEntity cmp) {
-        List keyRoles = new ArrayList();
-        Iterator it = getRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role;
-        while (it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            if (role.isKey()) keyRoles.add(role);
-        }
-        return keyRoles;
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (11/28/2000 7:15:37
-     * PM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.KeyRelationshipRoleFilter
-     */
-    public static KeyRelationshipRoleFilter singleton() {
-        if (singleton == null) singleton = new KeyRelationshipRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalKeyAttributeFilter.java
deleted file mode 100644
index 6d80bfc8b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalKeyAttributeFilter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.ArrayList;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the keyAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any keyPersistentAttributes that are inherited by any supertypes.
- * That means the returned list of CMPAttributes will be key attributes that were defined locally
- * for the ContainerManagedEntity held by the ContainerManagedEntityExtension plus key attributes
- * that were added from EjbRelationshipRoles that are held by the ContainerManagedEntityExtension.
- * Creation date: (11/28/2000 6:24:33 PM)
- * @author: Administrator
- */
-public class LocalKeyAttributeFilter extends SupertypeCMPAttributeFilter {
-	private static LocalKeyAttributeFilter singleton;
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	return new ArrayList(cmp.getKeyAttributes());
-}
-/**
- * Return a boolean indicating whether anAttribute also exists in the superEntity.
- * For this filter, only the name has to be the same.
- */
-protected boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) {
-	CMPAttribute found = superEntity.getKeyAttribute(anAttribute.getName());
-	return found != null;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalKeyAttributeFilter
- */
-public static LocalKeyAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalKeyAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalModelledPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalModelledPersistentAttributeFilter.java
deleted file mode 100644
index 189535da1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalModelledPersistentAttributeFilter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-/**
- * This filter will return a subset of the persistentAttributes from the
- * ContainerManagedEntityExtension that is passed as an argument to the filter
- * method. It will remove any inherited persistentAttributes and any
- * persistentAttributes that are held by EjbRelationshipRole objects (including
- * inherited EjbRelationshipRole attributes). That means the returned list of
- * CMPAttributes will be attributes that were defined locally minus all
- * inherited attributes and minus any attributes pointed to by
- * EjbRelationshipRoles, thus the attributes will only be attributes that were
- * defined locally by the user. Creation date: (11/28/2000 7:31:42 PM) @author:
- * Administrator
- */
-public class LocalModelledPersistentAttributeFilter extends SupertypeCMPAttributeFilter {
-	private static LocalModelledPersistentAttributeFilter singleton;
-	/**
-	 * Return the proper list of attributes from cmpExt. Return local
-	 * attributes minus those added due to Relationship Roles.
-	 */
-	protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-		java.util.List local = null, localRoleAttributes; 
-		local = cmp.getFilteredFeatures(LocalPersistentAttributeFilter.singleton());
-		localRoleAttributes = cmp.getFilteredFeatures(LocalRelationshipRoleAttributeFilter.singleton());
-		if(local != null)
-		  local.removeAll(localRoleAttributes);
-		return local;
-	}
-	/**
-	 * Return a boolean indicating whether anAttribute also exists in the
-	 * superEntity. For this filter, only the name has to be the same.
-	 */
-	protected boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) {
-		CMPAttribute found = superEntity.getPersistentAttribute(anAttribute.getName());
-		return found != null;
-	}
-	/**
-	 * Insert the method's description here. Creation date: (11/28/2000 5:36:00
-	 * PM)
-	 * 
-	 * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalModelledPersistentAttributeFilter
-	 */
-	public static LocalModelledPersistentAttributeFilter singleton() {
-		if (singleton == null)
-			singleton = new LocalModelledPersistentAttributeFilter();
-		return singleton;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalOppositeRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalOppositeRelationshipRoleFilter.java
deleted file mode 100644
index 034835798..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalOppositeRelationshipRoleFilter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the relationshipRoles (this includes
- * inherited EjbRelationshipRoles) from the ContainerManagedEntityExtension
- * that is passed as an argument to the filter method. It will remove any
- * EjbRelationshipRole that is inherited and it will return the opposite role.
- * Creation date: (11/28/2000 7:14:57 PM) @author: Administrator
- */
-public class LocalOppositeRelationshipRoleFilter extends ContainerManagedEntityFilter {
-
-    private static LocalOppositeRelationshipRoleFilter singleton;
-
-    /**
-     * Return a List with the opposite roles for the local relationship roles.
-     */
-    public List filter(ContainerManagedEntity cmp) {
-        List oppositeRoles = new ArrayList();
-        Iterator it = getLocalRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role, opposite;
-        while (it != null && it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            opposite = role.getOppositeAsCommonRole();
-            if (opposite != null) oppositeRoles.add(opposite);
-        }
-        return oppositeRoles;
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (11/28/2000 7:15:37
-     * PM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalOppositeRelationshipRoleFilter
-     */
-    public static LocalOppositeRelationshipRoleFilter singleton() {
-        if (singleton == null) singleton = new LocalOppositeRelationshipRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalPersistentAttributeFilter.java
deleted file mode 100644
index b1c55bab2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalPersistentAttributeFilter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.ArrayList;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the persistentAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any persistentAttributes that are inherited by any supertypes.
- * That means the returned list of CMPAttributes will be attributes that were defined locally
- * for the ContainerManagedEntity held by the ContainerManagedEntityExtension plus attributes
- * that were added from EjbRelationshipRoles that are held by the ContainerManagedEntityExtension.
- * Creation date: (11/28/2000 5:35:03 PM)
- * @author: Administrator
- */
-public class LocalPersistentAttributeFilter extends SupertypeCMPAttributeFilter {
-	private static LocalPersistentAttributeFilter singleton;
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	return new ArrayList(cmp.getPersistentAttributes());
-}
-/**
- * Return a boolean indicating whether anAttribute also exists in the superEntity.
- * For this filter, only the name has to be the same.
- */
-protected boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) {
-	CMPAttribute found = superEntity.getPersistentAttribute(anAttribute.getName());
-	return found != null;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalPersistentAttributeFilter
- */
-public static LocalPersistentAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalPersistentAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalRelationshipRoleAttributeFilter.java
deleted file mode 100644
index 79ee21431..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalRelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the persistentAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any attribute that is not pointed to by an EjbRelationshipRole and
- * it will further remove attributes pointed to by inherited EjbRelationshipRoles.
- * Thus, the returned list will contain attributes that only belong to local
- * EjbRelationshipRoles (not including iherited roles).
- * Creation date: (11/28/2000 6:46:08 PM)
- * @author: Administrator
- */
-public class LocalRelationshipRoleAttributeFilter extends AbstractRelationshipRoleAttributeFilter {
-	private static LocalRelationshipRoleAttributeFilter singleton;
-/**
- * Return the proper list of roles from cmpExt.
- */
-protected java.util.List getSourceRoles(ContainerManagedEntity cmp) {
-   return getRelationshipRoles(cmp); 
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalRelationshipRoleAttributeFilter
- */
-public static LocalRelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalRelationshipRoleAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalRelationshipRoleKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalRelationshipRoleKeyAttributeFilter.java
deleted file mode 100644
index b9a5b7d94..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/LocalRelationshipRoleKeyAttributeFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * @author jlanuti
- *
- * 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 LocalRelationshipRoleKeyAttributeFilter extends LocalRelationshipRoleAttributeFilter {
-
-	private static LocalRelationshipRoleKeyAttributeFilter singleton;
-
-public static LocalRelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalRelationshipRoleKeyAttributeFilter();
-	return singleton;
-}
-
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	List attributes = new ArrayList();
-	Iterator it = getSourceRoles(cmp).iterator();
-	CommonRelationshipRole role;
-	while (it.hasNext()) {
-		role = (CommonRelationshipRole) it.next();
-		if (role.isKey())
-			attributes.addAll(role.getAttributes());
-	}
-	return attributes;
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MessageDrivenDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MessageDrivenDestinationImpl.java
deleted file mode 100644
index 6a9679909..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MessageDrivenDestinationImpl.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-
-/**
- * The message-driven-destination element provides advice to the Deployer as to whether a message-driven bean is intended for a Queue or a Topic. The declaration consists of: the type of the message-driven bean's intended destination and an optional declaration of whether a durable or non-durable subscription should be used if the destination-type is javax.jms.Topic.
- * @generated
- */
-public class MessageDrivenDestinationImpl extends J2EEEObjectImpl implements MessageDrivenDestination {
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DestinationType TYPE_EDEFAULT = DestinationType.QUEUE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DestinationType type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The default value of the '{@link #getSubscriptionDurability() <em>Subscription Durability</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubscriptionDurability()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final SubscriptionDurabilityKind SUBSCRIPTION_DURABILITY_EDEFAULT = SubscriptionDurabilityKind.DURABLE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SubscriptionDurabilityKind subscriptionDurability = SUBSCRIPTION_DURABILITY_EDEFAULT;
-	/**
-	 * This is true if the Subscription Durability attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean subscriptionDurabilityESet = false;
-
-	public MessageDrivenDestinationImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.MESSAGE_DRIVEN_DESTINATION;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The destination-type element specifies the type of the JMS destination. The type is specified by the Java interface expected to be implemented by the destination.
-	 * 
-	 * The destination-type element must be one of the two following: javax.jms.Queue, javax.jms.Topic
-	 */
-	public DestinationType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(DestinationType newType) {
-		DestinationType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		DestinationType oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The subscription-durability element specifies whether a JMS topic subscription is intended to be durable or nondurable.
-	 * 
-	 * The subscription-durability element must be one of the two following:  Durable, NonDurable
-
-	 */
-	public SubscriptionDurabilityKind getSubscriptionDurability() {
-		return subscriptionDurability;
-	}
-
-	/**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated NOT
-     */
-    public void setSubscriptionDurability(SubscriptionDurabilityKind newSubscriptionDurability) {
-    	SubscriptionDurabilityKind oldSubscriptionDurability = subscriptionDurability;
-    	subscriptionDurability = newSubscriptionDurability == null ? null : newSubscriptionDurability;
-    	boolean oldSubscriptionDurabilityESet = subscriptionDurabilityESet;
-    	subscriptionDurabilityESet = true;
-    	if (eNotificationRequired())
-    		eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY, oldSubscriptionDurability, subscriptionDurability, !oldSubscriptionDurabilityESet));
-    }
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSubscriptionDurability() {
-		SubscriptionDurabilityKind oldSubscriptionDurability = subscriptionDurability;
-		boolean oldSubscriptionDurabilityESet = subscriptionDurabilityESet;
-		subscriptionDurability = SUBSCRIPTION_DURABILITY_EDEFAULT;
-		subscriptionDurabilityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY, oldSubscriptionDurability, SUBSCRIPTION_DURABILITY_EDEFAULT, oldSubscriptionDurabilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSubscriptionDurability() {
-		return subscriptionDurabilityESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public MessageDriven getBean() {
-		if (eContainerFeatureID != EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN) return null;
-		return (MessageDriven)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBean(MessageDriven newBean, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newBean, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setBean(MessageDriven newBean) {
-		if (newBean != eInternalContainer() || (eContainerFeatureID != EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN && newBean != null)) {
-			if (EcoreUtil.isAncestor(this, newBean))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newBean != null)
-				msgs = ((InternalEObject)newBean).eInverseAdd(this, EjbPackage.MESSAGE_DRIVEN__DESTINATION, MessageDriven.class, msgs);
-			msgs = basicSetBean(newBean, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, newBean, newBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetBean((MessageDriven)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				return basicSetBean(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.MESSAGE_DRIVEN__DESTINATION, MessageDriven.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				return getType();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				return getSubscriptionDurability();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				return getBean();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				setType((DestinationType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				setSubscriptionDurability((SubscriptionDurabilityKind)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				setBean((MessageDriven)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				unsetType();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				unsetSubscriptionDurability();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				setBean((MessageDriven)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				return isSetType();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				return isSetSubscriptionDurability();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				return getBean() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		if (typeESet) result.append(type); else result.append("<unset>");
-		result.append(", subscriptionDurability: ");
-		if (subscriptionDurabilityESet) result.append(subscriptionDurability); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MessageDrivenImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MessageDrivenImpl.java
deleted file mode 100644
index 4af0f2369..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MessageDrivenImpl.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-
-/**
- * @generated
- */
-public class MessageDrivenImpl extends EnterpriseBeanImpl implements MessageDriven {
-
-	/**
-	 * The default value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionType TRANSACTION_TYPE_EDEFAULT = TransactionType.BEAN_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Transaction Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getMessageSelector() <em>Message Selector</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageSelector()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_SELECTOR_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String messageSelector = MESSAGE_SELECTOR_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAcknowledgeMode() <em>Acknowledge Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAcknowledgeMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AcknowledgeMode ACKNOWLEDGE_MODE_EDEFAULT = AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AcknowledgeMode acknowledgeMode = ACKNOWLEDGE_MODE_EDEFAULT;
-	/**
-	 * This is true if the Acknowledge Mode attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean acknowledgeModeESet = false;
-
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String link = LINK_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected MessageDrivenDestination destination = null;
-	/**
-	 * The cached value of the '{@link #getActivationConfig() <em>Activation Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfig()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActivationConfig activationConfig = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestination() <em>Message Destination</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestination()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass messageDestination = null;
-
-	/**
-	 * The cached value of the '{@link #getMessagingType() <em>Messaging Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessagingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass messagingType = null;
-
-	public MessageDrivenImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.MESSAGE_DRIVEN;
-	}
-
-public boolean isMessageDriven() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transaction-type element specifies an enterprise bean's transaction management type.
-	 * 
-	 * The transaction-type element must be one of the two following: Bean, Container
-	 */
-	public TransactionType getTransactionType() {
-		return transactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionType(TransactionType newTransactionType) {
-		TransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE, oldTransactionType, transactionType, !oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionType() {
-		TransactionType oldTransactionType = transactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionType = TRANSACTION_TYPE_EDEFAULT;
-		transactionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE, oldTransactionType, TRANSACTION_TYPE_EDEFAULT, oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionType() {
-		return transactionTypeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The message-selector element is used to specify the JMS message
-	 * selector to be used in determining which messages a message-driven
-	 * bean is to receive.
-	 * 
-	 * Example value: 
-	 * JMSType = `car' AND color = `blue' AND weight > 2500
-
-	 */
-	public String getMessageSelector() {
-		return messageSelector;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setMessageSelector(String newMessageSelector) {
-		String oldMessageSelector = messageSelector;
-		messageSelector = newMessageSelector;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR, oldMessageSelector, messageSelector));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * an optional declaration of the acknowledgment mode for the message-driven bean if bean-managed transaction demarcation is used (ie. self.transactionType = Bean)
-	 * 
-	 * The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the onMessage message of a message-driven bean that uses bean managed transaction demarcation.
-	 * 
-	 * The acknowledge-mode must be one of the two following:  Auto-acknowledge, Dups-ok-acknowledge
-
-	 */
-	public AcknowledgeMode getAcknowledgeMode() {
-		return acknowledgeMode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAcknowledgeMode(AcknowledgeMode newAcknowledgeMode) {
-		AcknowledgeMode oldAcknowledgeMode = acknowledgeMode;
-		acknowledgeMode = newAcknowledgeMode == null ? ACKNOWLEDGE_MODE_EDEFAULT : newAcknowledgeMode;
-		boolean oldAcknowledgeModeESet = acknowledgeModeESet;
-		acknowledgeModeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE, oldAcknowledgeMode, acknowledgeMode, !oldAcknowledgeModeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAcknowledgeMode() {
-		AcknowledgeMode oldAcknowledgeMode = acknowledgeMode;
-		boolean oldAcknowledgeModeESet = acknowledgeModeESet;
-		acknowledgeMode = ACKNOWLEDGE_MODE_EDEFAULT;
-		acknowledgeModeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE, oldAcknowledgeMode, ACKNOWLEDGE_MODE_EDEFAULT, oldAcknowledgeModeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAcknowledgeMode() {
-		return acknowledgeModeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * An optional declaration of the intended destination type of the message-driven bean
-	 */
-	public MessageDrivenDestination getDestination() {
-		return destination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDestination(MessageDrivenDestination newDestination, NotificationChain msgs) {
-		MessageDrivenDestination oldDestination = destination;
-		destination = newDestination;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__DESTINATION, oldDestination, newDestination);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDestination(MessageDrivenDestination newDestination) {
-		if (newDestination != destination) {
-			NotificationChain msgs = null;
-			if (destination != null)
-				msgs = ((InternalEObject)destination).eInverseRemove(this, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, MessageDrivenDestination.class, msgs);
-			if (newDestination != null)
-				msgs = ((InternalEObject)newDestination).eInverseAdd(this, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, MessageDrivenDestination.class, msgs);
-			msgs = basicSetDestination(newDestination, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__DESTINATION, newDestination, newDestination));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfig getActivationConfig() {
-		return activationConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetActivationConfig(ActivationConfig newActivationConfig, NotificationChain msgs) {
-		ActivationConfig oldActivationConfig = activationConfig;
-		activationConfig = newActivationConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, oldActivationConfig, newActivationConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationConfig(ActivationConfig newActivationConfig) {
-		if (newActivationConfig != activationConfig) {
-			NotificationChain msgs = null;
-			if (activationConfig != null)
-				msgs = ((InternalEObject)activationConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, null, msgs);
-			if (newActivationConfig != null)
-				msgs = ((InternalEObject)newActivationConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, null, msgs);
-			msgs = basicSetActivationConfig(newActivationConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, newActivationConfig, newActivationConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getMessageDestination() {
-		if (messageDestination != null && messageDestination.eIsProxy()) {
-			InternalEObject oldMessageDestination = (InternalEObject)messageDestination;
-			messageDestination = (JavaClass)eResolveProxy(oldMessageDestination);
-			if (messageDestination != oldMessageDestination) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION, oldMessageDestination, messageDestination));
-			}
-		}
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetMessageDestination() {
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestination(JavaClass newMessageDestination) {
-		JavaClass oldMessageDestination = messageDestination;
-		messageDestination = newMessageDestination;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION, oldMessageDestination, messageDestination));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__LINK, oldLink, link));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getMessagingType() {
-		if (messagingType != null && messagingType.eIsProxy()) {
-			InternalEObject oldMessagingType = (InternalEObject)messagingType;
-			messagingType = (JavaClass)eResolveProxy(oldMessagingType);
-			if (messagingType != oldMessagingType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE, oldMessagingType, messagingType));
-			}
-		}
-		return messagingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetMessagingType() {
-		return messagingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessagingType(JavaClass newMessagingType) {
-		JavaClass oldMessagingType = messagingType;
-		messagingType = newMessagingType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE, oldMessagingType, messagingType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				if (destination != null)
-					msgs = ((InternalEObject)destination).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN__DESTINATION, null, msgs);
-				return basicSetDestination((MessageDrivenDestination)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				return basicSetDestination(null, msgs);
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				return basicSetActivationConfig(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				return getTransactionType();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				return getMessageSelector();
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				return getAcknowledgeMode();
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				return getLink();
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				return getDestination();
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				return getActivationConfig();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				if (resolve) return getMessageDestination();
-				return basicGetMessageDestination();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				if (resolve) return getMessagingType();
-				return basicGetMessagingType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				setTransactionType((TransactionType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				setMessageSelector((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				setAcknowledgeMode((AcknowledgeMode)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				setLink((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				setDestination((MessageDrivenDestination)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				setActivationConfig((ActivationConfig)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				setMessageDestination((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				setMessagingType((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				unsetTransactionType();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				setMessageSelector(MESSAGE_SELECTOR_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				unsetAcknowledgeMode();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				setDestination((MessageDrivenDestination)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				setActivationConfig((ActivationConfig)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				setMessageDestination((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				setMessagingType((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				return isSetTransactionType();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				return MESSAGE_SELECTOR_EDEFAULT == null ? messageSelector != null : !MESSAGE_SELECTOR_EDEFAULT.equals(messageSelector);
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				return isSetAcknowledgeMode();
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				return destination != null;
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				return activationConfig != null;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				return messageDestination != null;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				return messagingType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (transactionType: ");
-		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>");
-		result.append(", messageSelector: ");
-		result.append(messageSelector);
-		result.append(", acknowledgeMode: ");
-		if (acknowledgeModeESet) result.append(acknowledgeMode); else result.append("<unset>");
-		result.append(", link: ");
-		result.append(link);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * @see EnterpriseBean#getAvailableLocalHomeMethodElements()
-	 */
-	public List getAvailableLocalHomeMethodElements() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * @see EnterpriseBean#getAvailableLocalMethodElements()
-	 */
-	public List getAvailableLocalMethodElements() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * @see EnterpriseBean#getAvailableRemoteMethodElements()
-	 */
-	public List getAvailableRemoteMethodElements() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * @see EnterpriseBeanImpl#getAvailableUnspecifiedMethodElementSignatures()
-	 */
-	public List getAvailableUnspecifiedMethodElementSignatures() {
-		//There is only the onMessage method
-		List sigs = new ArrayList(1);
-		sigs.add("onMessage(javax.jms.Message)"); //$NON-NLS-1$
-		return sigs;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodElementImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodElementImpl.java
deleted file mode 100644
index f89b2b6b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodElementImpl.java
+++ /dev/null
@@ -1,1041 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.internal.util.MethodElementHelper;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * The method element is used to denote a method of an enterprise bean's
- * home or remote interface, or a set of methods. The ejb-name element
- * must be the name of one of the enterprise beans in declared in the
- * deployment descriptor; the optional method-intf element allows to
- * distinguish between a method with the same signature that is defined in
- * both the home and remote interface; the method-name element specifies
- * the method name; and the optional method-params elements identify a
- * single method among multiple methods with an overloaded method name.
- * 
- * There are three possible styles of the method element syntax:
- * 
- * 1. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>*<//method-name>
- * 	<//method>
- * 
- *    This style is used to refer to all the methods of the specified
- *    enterprise bean's home and remote interfaces.
- * 
- * 2. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 	<//method>>
- * 
- *    This style is used to refer to the specified method of the
- *    specified enterprise bean. If there are multiple methods with
- *    the same overloaded name, the element of this style refers to
- *    all the methods with the overloaded name.
- * 
- * 
- * 
- * 
- * 
- * 3. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 		<method-params>
- *    			<method-param>PARAM-1<//method-param>
- *    			<method-param>PARAM-2<//method-param>
- *           			...
- *    			<method-param>PARAM-n<//method-param>
- * 		<//method-params>
- * 	<method>	
- * 
- *    This style is used to refer to a single method within a set of
- *    methods with an overloaded name. PARAM-1 through PARAM-n are the
- *    fully-qualified Java types of the method's input parameters (if
- *    the method has no input arguments, the method-params element
- *    contains no method-param elements). Arrays are specified by the
- *    array element's type, followed by one or more pair of square
- *    brackets (e.g. int[][]).
- * 
- * 
- * Used in: method-permission and container-transaction
- * 
- * Examples:
- * 
- *     Style 1: The following method element refers to all the methods of
- * 		the EmployeeService bean's home and remote interfaces:
- * 
- * 		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>*<//method-name>
- * 		<//method>
- * 
- * 	Style 2: The following method element refers to all the create
- * 		methods of the EmployeeService bean's home interface:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 		<//method>
- * 
- * 	Style 3: The following method element refers to the
- * 		create(String firstName, String LastName) method of the
- * 	 	EmployeeService bean's home interface.
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	
- * 	The following example illustrates a Style 3 element with
- * 	more complex parameter types. The method
- * 			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
- * 				mypackage.MyClass[][] myclaar)
- *         would be specified as:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>foobar<//method-name>
- * 			<method-params>
- * 				<method-param>char<//method-param>
- * 				<method-param>int<//method-param>
- * 				<method-param>int[]<//method-param>
- * 				<method-param>mypackage.MyClass<//method-param>
- * 				<method-param>mypackage.MyClass[][]<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	The optional method-intf element can be used when it becomes
- *    necessary to differentiate between a method defined in the home
- *    interface and a method with the same name and signature that is
- *    defined in the remote interface.
- * 
- * 	For example, the method element
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Remote<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	can be used to differentiate the create(String, String) method
- *    defined in the remote interface from the create(String, String)
- *    method defined in the home interface, which would be defined as
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Home<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * @generated
- */
-public class MethodElementImpl extends J2EEEObjectImpl implements MethodElement {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getParms() <em>Parms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParms()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARMS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String parms = PARMS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MethodElementKind TYPE_EDEFAULT = MethodElementKind.UNSPECIFIED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected MethodElementKind type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EnterpriseBean enterpriseBean = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public MethodElementImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.METHOD_ELEMENT;
-	}
-
-public void addMethodParams(String param) { 
-	String oldParms = getParms();
-	if (oldParms == null) {
-		setParms(param);
-	} else {
-		setParms(oldParms.concat(" ").concat(param)); //$NON-NLS-1$
-	}
-}
-/**
- * Set the params for this method element to an empty array, as opposed
- * to null.
- */
-public void applyZeroParams() {
-	setParms(""); //$NON-NLS-1$
-}
-public boolean equalSignature(MethodElement anotherMethodElement) {
-	boolean equal = getName().equals(anotherMethodElement.getName());
-	if (equal) {
-		equal = parmsEqual(anotherMethodElement);
-		if (equal) {
-			if (getType() == null)
-				equal = anotherMethodElement.getType() == null;
-			else
-				equal = getType().equals(anotherMethodElement.getType());
-		}
-	}
-	return equal;
-}
-public java.util.List getMethodParams() { 
-	StringTokenizer tok = getMethodParamsTokenizer();
-	java.util.List v = new ArrayList();
-	java.util.List paramsList = new ArrayList();
-	String current = null;
-	if (tok != null) {
-		while (current != null || tok.hasMoreTokens()) {
-			String peek = null;
-			if (current == null)
-				current = tok.nextToken();
-			if (tok.hasMoreTokens()) {
-				peek = tok.nextToken();
-				if (peek.startsWith("[")) { //$NON-NLS-1$
-					current += peek;
-					peek = null;
-				}
-			}
-			v.add(current);
-			if (peek != null)
-				current = peek;
-			else
-				current = null;
-		}
-
-	}
-	
-	/*
-		 * This is a hack to make sure that for old XMI generated files, that ven if there was ',' separated 
-		 * params, it parses them back out right.  To support 4.0.X AAT generated XMI files with runAs roles 
-		 * for methods.
-		 */
-	for (int i = 0; i < v.size(); i++)
-	{
-		tok = new StringTokenizer((String)v.get(i),","); //$NON-NLS-1$
-		if (tok != null)
-		{
-			while (tok.hasMoreTokens())
-			{
-				paramsList.add(tok.nextToken());
-			}
-		}
-	}
-	return paramsList;
-}
-private StringTokenizer getMethodParamsTokenizer() {
-	//This method is a hack for now; the cardinality is wrong for the params
-	String aParms = getParms();
-	if (aParms == null || aParms.length() == 0) {
-		return null;
-	}
-	return new StringTokenizer(getParms());
-}
-/**
- * Answer a list of all the methods for which this method element applies.  The following rules are used:
- *
- * 1)  If the method element type is unspecified, the methods are obtained from the remote interface of the ejb;
- *		If it is specified, then the appropriate interface is used
- *
- * 2)  If the method name = "*", then all the PUBLIC methods for that interface are returned
- *
- * 3)  If the method name is specified, and no method params are specified, then all public methods for the interface
- *      having the same name are returned.
- *
- * 4)  If the method name and params are specified, then a zero or one element array is returned, containing the one and only method
- *      on the interface with the appropriate signature, if it exists
- */
-public Method[] getMethods() {
-	EnterpriseBean ejb = getEnterpriseBean();
-	if(ejb == null)
-	    return new Method[0];
-	List result = null;
-	switch (getType().getValue()) {
-		case MethodElementKind.HOME :
-			{
-				result = getMethods(ejb.getHomeInterface());
-				break;
-			}
-		case MethodElementKind.REMOTE :
-			{
-				result = getMethods(ejb.getRemoteInterface());
-				break;
-			}
-		case MethodElementKind.LOCAL_HOME :
-			{
-				result = getMethods(ejb.getLocalHomeInterface());
-				break;
-			}
-		case MethodElementKind.LOCAL :
-			{
-				result = getMethods(ejb.getLocalInterface());
-				break;
-			}
-		case MethodElementKind.SERVICE_ENDPOINT :
-		   {
-		    	if(ejb.isSession()) {
-		    	    result = getMethods(((Session)ejb).getServiceEndpoint());
-		    	    break;
-		    	}
-		   }
-		case MethodElementKind.UNSPECIFIED :
-			{
-				if (ejb.isMessageDriven())
-					result = getMethods(ejb.getEjbClass());
-				else {
-					result = new ArrayList();
-					result.addAll(getMethods(ejb.getHomeInterface()));
-					result.addAll(getMethods(ejb.getRemoteInterface()));
-					result.addAll(getMethods(ejb.getLocalHomeInterface()));
-					result.addAll(getMethods(ejb.getLocalInterface()));
-				}
-				break;
-			}
-	}
-	return (Method[]) result.toArray(new Method[result.size()]);
-}
-/**
- * Answer a list of all the methods for which this method element applies.  The following rules are used:
- *
- * 1)  If the method element type is unspecified, the methods are obtained from the remote interface of the ejb;
- *		If it is specified, then the appropriate interface is used
- *
- * 2)  If the method name = "*", then all the PUBLIC methods for that interface are returned
- *
- * 3)  If the method name is specified, and no method params are specified, then all public methods for the interface
- *      having the same name are returned.
- *
- * 4)  If the method name and params are specified, then a zero or one element array is returned, containing the one and only method
- *      on the interface with the appropriate signature, if it exists
- */
-private List getMethods(JavaClass javaClass) {
-	if (javaClass == null) return Collections.EMPTY_LIST;
-	List result = null;
-	String methodName = getName().trim();
-	if (name.equals("*"))  //$NON-NLS-1$
-		result = javaClass.getPublicMethodsExtended();
-	else if (hasMethodParams()) {
-		result = new ArrayList();
-		Method method = javaClass.getPublicMethodExtended(name, getMethodParams());
-		if (method != null)
-			result.add(method);
-	} else
- 		result = javaClass.getPublicMethodsExtendedNamed(methodName);
- 
- 	return result;
-}
-/**
- * Return the MethodElement that is most specific.
- */
-public MethodElement getMostSpecific(MethodElement aMethodElement, JavaClass aClass) {
-	if (aMethodElement == null) return this;
-	if (aMethodElement.isDefault() && !isDefault())
-		return this;
-	if (!aMethodElement.isDefault() && isDefault())
-		return aMethodElement;
-	if (aMethodElement.hasMethodParams() && !hasMethodParams())
-		return aMethodElement;
-	if (!aMethodElement.hasMethodParams() && hasMethodParams())
-		return this;
-	if (isUnspecified() && !aMethodElement.isUnspecified())
-		return aMethodElement;
-	return this;
-}
-public static MethodElement getMostSpecificMethodElement(List methodElements, Method aMethod) {
-	MethodElement specificME = null;
-	if (aMethod != null) {
-		Iterator it = methodElements.iterator();
-		MethodElement me;
-		while (it.hasNext()) {
-			me = (MethodElement) it.next();
-			if (me.represents(aMethod)) {
-				if (me.uniquelyIdentifies(aMethod))
-					return me;
-				else if (specificME == null)
-					specificME = me;
-				else
-					specificME = specificME.getMostSpecific(me, aMethod.getJavaClass());
-			}
-		}
-	}
-	return specificME;
-}
-protected String getParmsString() {
-	String parmString = getParms();
-	if (parmString == null)
-		parmString = ""; //$NON-NLS-1$
-	return parmString;
-}
-/**
- * Return a String array for the possible MethodElement type names.
- */
-public static String[] getPossibleTypeNames() {
-	EjbPackage pack = EjbFactoryImpl.getPackage();
-	List literals = pack.getMethodElementKind().getELiterals();
-	String[] names = new String[literals.size()];
-	for (int i = 0; i < literals.size(); i++)
-		names[i] = literals.get(i).toString();
-	return names;
-}
-/**
- * Return the signature.
- * For example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-public String getSignature() {
-	if (isDefault())
-		return getName();
-	StringBuffer buf = new StringBuffer();
-	buf.append(getName());
-	if (hasMethodParams()){
-		buf.append(RIGHT_PAREN);
-		StringTokenizer tok = getMethodParamsTokenizer();
-		if (tok != null) {
-			while (tok.hasMoreTokens()) {
-				buf.append(tok.nextToken());
-				if (tok.hasMoreTokens())
-					buf.append(COMMA);		
-			}			
-		}
-		buf.append(LEFT_PAREN);
-	}
-	return buf.toString();
-}
-// Returns null if the EEnum is UNSPECIFIED
-// unless it is a MessageDriven bean.
-public JavaClass getTypeJavaClass() {
-	if (isHome())
-		return getEnterpriseBean().getHomeInterface();
-	else if (isRemote())
-		return getEnterpriseBean().getRemoteInterface();
-	else if (isLocalHome())
-		return getEnterpriseBean().getLocalHomeInterface();
-	else if (isLocal())
-		return getEnterpriseBean().getLocalInterface();
-	else if (isUnspecified() && getEnterpriseBean().isMessageDriven())
-		return getEnterpriseBean().getEjbClass();
-	else
-		return null;
-}
-	/**
- * Answer whether method params apply to this method, e.g., it is specific to one
- * overloaded method, even if the method is a zero parameter method.  Answer false if no
- * parameters apply, that is, the method element applies to all overloaded methods with this name
- */
-public boolean hasMethodParams() {
-	return getParms() != null;
-}
-/**
- * Parse @aSignature setting the name and the params.
- * A signature example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-public void initializeFromSignature(String aSignature) {
-	parseSignature(aSignature);
-}
-public boolean isDefault() {
-    return JavaClass.DEFAULT_METHOD_NAME.equals(getName());
-}
-/**
- * Return true if this MethodElement and @anotherMethodElement
- * represent the same exact methods.
- */
-public boolean isEquivalent(MethodElement anotherMethodElement) {
-	boolean equal = equalSignature(anotherMethodElement);
-	if (equal)
-		equal = getEnterpriseBean() == anotherMethodElement.getEnterpriseBean();
-	return equal;
-}
-public boolean isHome() {
-	return getType().getValue() == MethodElementKind.HOME;
-}
-public boolean isRemote() {
-	return getType().getValue() == MethodElementKind.REMOTE;
-}
-public boolean isUnspecified() {
-	return getType().getValue() == MethodElementKind.UNSPECIFIED;
-}
-public boolean isLocalHome() {
-	return getType().getValue() == MethodElementKind.LOCAL_HOME;
-}
-public boolean isLocal() {
-	return getType().getValue() == MethodElementKind.LOCAL;
-}
-/**
- * Return true if this MethodElement represents one or more
- * methods.
- */
-public boolean isValid() {
-	return getMethods().length > 0;
-}
-/**
- * Return true only if all the parameters for @aMethod
- * matches the names in the list of parameters.
- */
-public boolean matchesParams(Method aMethod) {
-	if (aMethod == null) return false;
-	List params = getMethodParams();
-	JavaParameter[] methodParams = aMethod.listParametersWithoutReturn();
-	if (params.size() != methodParams.length)
-		return false;
-	for (int i = 0; i < methodParams.length; i++){
-		String parameterType = ((JavaHelpers)methodParams[i].getEType()).getQualifiedName();
-		if (!params.get(i).equals(parameterType)) 
-			return false;
-	}
-	return true;
-}
-/**
- * Return true if this MethodElement has the same basic signature as
- * @aMethod, ignoring the return type, thrown exceptions, and declaring class of 
- * this instance or @aMethod.  Return false, if params is null
- */
-public boolean nameAndParamsEquals(Method aMethod) {
-	if (aMethod != null) {
-		if (getName().equals(aMethod.getName())) {
-			if (hasMethodParams())
-				return matchesParams(aMethod);
-			return false;
-		}
-	}
-	return false;
-}
-protected boolean parmsEqual(MethodElement me) {
-	if (me == null) return false;
-	List myParms, otherParms;
-	myParms = getMethodParams();
-	otherParms = me.getMethodParams();
-	if (myParms.size() != otherParms.size()) return false;
-	for (int i = 0; i < myParms.size(); i++){
-		if (!myParms.get(i).equals(otherParms.get(i)))
-			return false;
-	}
-	return true;
-}
-/**
- * Parse @aSignature setting the name and the params.
- * A signature example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-protected void parseSignature(String aSignature) {
-	int index = aSignature.indexOf(RIGHT_PAREN);
-
-	int endIndex = aSignature.indexOf(LEFT_PAREN);
-	if (endIndex < 0)
-	{
-		endIndex = aSignature.length() - 1;	
-	}	
-
-	if (index < 0){
-		setName(aSignature);
-		setParms(null); //There are no parameters in the sig so set to null
-	}
-	else {
-		String sigName = aSignature.substring(0, index);
-
-		setName(sigName);
-		String sigParms = aSignature.substring(index + 1, endIndex);
-
-		if (sigParms.length() > 0) {
-			char commaChar = COMMA.charAt(0);
-			char[] sigParmsChars = sigParms.toCharArray();
-			StringBuffer buf = new StringBuffer();
-			for (int i = 0; i < sigParmsChars.length; i++) {
-				if (sigParmsChars[i] != commaChar) {
-					buf.append(sigParmsChars[i]);
-				} else {
-					addMethodParams(buf.toString());
-					buf = new StringBuffer();
-				}
-			}
-			addMethodParams(buf.toString());
-		} else
-			applyZeroParams();
-	}
-}
-public void removeMethodParams(String param) { 
-	String myParams = getParms();
-	if (myParams == null || myParams.length() == 0) {
-		return;
-	}
-	StringTokenizer tok = new StringTokenizer(myParams);
-	StringBuffer newParms = new StringBuffer();
-	while (tok.hasMoreElements()) {
-		String token = tok.nextToken();
-		if (!token.equals(param)) {
-			newParms.append(token);
-			newParms.append(" "); //$NON-NLS-1$
-		}
-	}
-	setParms(newParms.toString().trim());
-}
-/**
- * represents method comment.
- */
-public boolean represents(Method aMethod) {
-	if (aMethod != null) {
-		if (isUnspecified() || typeClassImplementsInterface(aMethod.getJavaClass())) {
-			if (isDefault())
-				return true;
-			else 
-				if (getName().equals(aMethod.getName())) {
-					if (hasMethodParams())
-						return matchesParams(aMethod);
-					return true;
-				}
-		}
-	}					
-	return false;
-}
-/**
- * Sets the id to be [MethodTransactionID| MethodPermissionID]_EJBNAME_MethodName,
- * or [MethodTransactionID| MethodPermissionID]_EJBNAME_MethodName_Parms, if parms exist
- */
-public void setIdToReadableString() { 
-	String aParms = getParms() == null ? "" : "_"+getParms().replace(' ', '_'); //$NON-NLS-1$ //$NON-NLS-2$
-	String prefix = ""; //$NON-NLS-1$
-	switch (MethodElementHelper.getContainedType(this)) {
-		case MethodElementHelper.METHOD_PERMISSION :	
-			prefix = ((XMIResource)eContainer.eResource()).getID(eContainer);
-			break;
-		case MethodElementHelper.METHOD_TRANSACTION :
-			prefix = ((XMIResource)eContainer.eResource()).getID(eContainer);
-			break;
-	}
-	((XMIResource)eResource()).setID(this,prefix + "_" + getEnterpriseBean().getName() + "_" + getName() + aParms); //$NON-NLS-1$ //$NON-NLS-2$
-}
-protected boolean typeClassImplementsInterface(JavaClass anInterface) {
-	if (getTypeJavaClass() == null || anInterface == null) return false;
-	return getTypeJavaClass().implementsInterface(anInterface);
-}
-/**
- * Return true if this MethodElement uniquely identifies
- * @aMethod.  Return false, even if the MethodElement represents
- * @aMethod (i.e., @aMethod is contained in its list of methods).
- */
-public boolean uniquelyIdentifies(Method aMethod) {
-	if (aMethod != null) {
-		if (getTypeJavaClass() != null && 
-	        typeClassImplementsInterface(aMethod.getJavaClass()) && 
-	        getName().equals(aMethod.getName())) {
-			if (hasMethodParams())
-				return matchesParams(aMethod);
-			return aMethod.listParametersWithoutReturn().length==0;
-		}
-	}
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The method-name element contains a name of an enterprise bean method,
-	 * or the asterisk (*) character. The asterisk is used when the element
-	 * denotes all the methods of an enterprise bean's remote and home
-	 * interfaces.
-
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getParms() {
-		return parms;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParms(String newParms) {
-		String oldParms = parms;
-		parms = newParms;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__PARMS, oldParms, parms));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public MethodElementKind getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(MethodElementKind newType) {
-		MethodElementKind oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		MethodElementKind oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_ELEMENT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EnterpriseBean getEnterpriseBean() {
-		if (enterpriseBean != null && enterpriseBean.eIsProxy()) {
-			InternalEObject oldEnterpriseBean = (InternalEObject)enterpriseBean;
-			enterpriseBean = (EnterpriseBean)eResolveProxy(oldEnterpriseBean);
-			if (enterpriseBean != oldEnterpriseBean) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN, oldEnterpriseBean, enterpriseBean));
-			}
-		}
-		return enterpriseBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnterpriseBean basicGetEnterpriseBean() {
-		return enterpriseBean;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEnterpriseBean(EnterpriseBean newEnterpriseBean) {
-		EnterpriseBean oldEnterpriseBean = enterpriseBean;
-		enterpriseBean = newEnterpriseBean;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN, oldEnterpriseBean, enterpriseBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_ELEMENT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				return getName();
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				return getParms();
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				return getType();
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				if (resolve) return getEnterpriseBean();
-				return basicGetEnterpriseBean();
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				setParms((String)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				setType((MethodElementKind)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				setEnterpriseBean((EnterpriseBean)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				setParms(PARMS_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				unsetType();
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				setEnterpriseBean((EnterpriseBean)null);
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				return PARMS_EDEFAULT == null ? parms != null : !PARMS_EDEFAULT.equals(parms);
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				return isSetType();
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				return enterpriseBean != null;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", parms: ");
-		result.append(parms);
-		result.append(", type: ");
-		if (typeESet) result.append(type); else result.append("<unset>");
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodPermissionImpl.java
deleted file mode 100644
index 8f6963aef..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodPermissionImpl.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-
-/**
- * The method-permission element specifies that one or more security roles are allowed to invoke one or more enterprise bean methods. The method-permission element consists of an optional description, a list of security role names, and a list of method elements.  The security roles used in the method-permission element must be defined in the security-role element of the deployment descriptor, and the methods must be methods defined in the enterprise bean's remote and//or home interfaces.
- * @generated
- */
-public class MethodPermissionImpl extends J2EEEObjectImpl implements MethodPermission {
-
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isUnchecked() <em>Unchecked</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnchecked()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean UNCHECKED_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean unchecked = UNCHECKED_EDEFAULT;
-	/**
-	 * This is true if the Unchecked attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean uncheckedESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList roles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodElements = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public MethodPermissionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.METHOD_PERMISSION;
-	}
-
-public List getMethodElements(EnterpriseBean anEJB) {
-	if (anEJB == null) return Collections.EMPTY_LIST;
-	List result = new ArrayList();
-	List elements = getMethodElements();
-	MethodElement me;
-	for (int i = 0; i < elements.size(); i++){
-		me = (MethodElement) elements.get(i);
-		if (anEJB.equals(me.getEnterpriseBean()))
-			result.add(me);			
-	}
-	return result;
-}
-public SecurityRole getSecurityRole(String aRoleName) {
-	if (aRoleName == null) return null;
-	List myRoles = getRoles();
-	int size = myRoles.size();
-	SecurityRole role;
-	for (int i = 0; i < size; i++){
-		role = (SecurityRole) myRoles.get(i);
-		if (aRoleName.equals(role.getRoleName()))
-			return role;
-	}
-	return null;
-}
-/**
- * Return true if this permission contains @aSecurityRole
- */
-public boolean hasSecurityRole(SecurityRole aSecurityRole) {
-	if (aSecurityRole == null)
-		return false;
-	List myRoles = getRoles();
-	int size = myRoles.size();
-	for (int i = 0; i < size; i++) {
-		if (aSecurityRole == myRoles.get(i))
-			return true;
-	}
-	return false;
-}
-public boolean hasSecurityRole(String aRoleName) {
-	return getSecurityRole(aRoleName) != null;
-}
-/**
- * Return true if this MethodPermission and @anotherMethodPermission
- * have the same roles.
- */
-public boolean isEquivalent(MethodPermission anotherMethodPermission) {
-	if (anotherMethodPermission == null) return false;
-	return getRoles().size() == anotherMethodPermission.getRoles().size() &&
-			getRoles().containsAll(anotherMethodPermission.getRoles());
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isUnchecked() {
-		return unchecked;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUnchecked(boolean newUnchecked) {
-		boolean oldUnchecked = unchecked;
-		unchecked = newUnchecked;
-		boolean oldUncheckedESet = uncheckedESet;
-		uncheckedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__UNCHECKED, oldUnchecked, unchecked, !oldUncheckedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUnchecked() {
-		boolean oldUnchecked = unchecked;
-		boolean oldUncheckedESet = uncheckedESet;
-		unchecked = UNCHECKED_EDEFAULT;
-		uncheckedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_PERMISSION__UNCHECKED, oldUnchecked, UNCHECKED_EDEFAULT, oldUncheckedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUnchecked() {
-		return uncheckedESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		if (eContainerFeatureID != EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR) return null;
-		return (AssemblyDescriptor)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newAssemblyDescriptor, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != eInternalContainer() || (eContainerFeatureID != EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR && newAssemblyDescriptor != null)) {
-			if (EcoreUtil.isAncestor(this, newAssemblyDescriptor))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS, AssemblyDescriptor.class, msgs);
-			msgs = basicSetAssemblyDescriptor(newAssemblyDescriptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getRoles() {
-		if (roles == null) {
-			roles = new EObjectResolvingEList(SecurityRole.class, this, EjbPackage.METHOD_PERMISSION__ROLES);
-		}
-		return roles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodElements() {
-		if (methodElements == null) {
-			methodElements = new EObjectContainmentEList(MethodElement.class, this, EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS);
-		}
-		return methodElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_PERMISSION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetAssemblyDescriptor((AssemblyDescriptor)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				return basicSetAssemblyDescriptor(null, msgs);
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				return ((InternalEList)getMethodElements()).basicRemove(otherEnd, msgs);
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS, AssemblyDescriptor.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return isUnchecked() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				return getRoles();
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				return getMethodElements();
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				setUnchecked(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				getRoles().clear();
-				getRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				getMethodElements().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				unsetUnchecked();
-				return;
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				getRoles().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return isSetUnchecked();
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor() != null;
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				return roles != null && !roles.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				return methodElements != null && !methodElements.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", unchecked: ");
-		if (uncheckedESet) result.append(unchecked); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodTransactionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodTransactionImpl.java
deleted file mode 100644
index ef5dd292f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/MethodTransactionImpl.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-
-/**
- * Specifies how the container must manage transaction scopes for the enterprise bean's method invocations.  It consists of an optional description, a list of method elements, and a transaction attribute.The transaction attribute is to be applied to all the specified methods.
- * @generated
- */
-public class MethodTransactionImpl extends J2EEEObjectImpl implements MethodTransaction {
-
-	/**
-	 * The default value of the '{@link #getTransactionAttribute() <em>Transaction Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionAttributeType TRANSACTION_ATTRIBUTE_EDEFAULT = TransactionAttributeType.NOT_SUPPORTED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionAttributeType transactionAttribute = TRANSACTION_ATTRIBUTE_EDEFAULT;
-	/**
-	 * This is true if the Transaction Attribute attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionAttributeESet = false;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodElements = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public MethodTransactionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.METHOD_TRANSACTION;
-	}
-
-/**
- * Return an array of Strings for all the EEnumLiteral values
- * for the transactionAttribute enumeration.
- */
-public static String[] getAvailableTransactionAttributeNames() {
-	List l = getAvailableTransactionAttributes();
-	String[] names = new String[l.size()];
-	for (int i = 0; i < l.size(); i++)
-		names[i] = ((EEnumLiteral)l.get(i)).toString();
-	return names;
-}
-/**
- * Return a List of the all the EEnumLiteral values
- * for the transactionAttribute enumeration.
- * The toString() method for a EEnumLiteral will display
- * the String value for the enumeration value.
- */
-public static List getAvailableTransactionAttributes() {
-	EjbPackage pack = (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-	return pack.getTransactionAttributeType().getELiterals();
-}
-public List getMethodElements(EnterpriseBean anEJB) {
-	List result = new ArrayList();
-	List elements = getMethodElements();
-	MethodElement me;
-	for (int i = 0; i < elements.size(); i++){
-		me = (MethodElement) elements.get(i);
-		if (me.getEnterpriseBean() != null && me.getEnterpriseBean().equals(anEJB))
-			result.add(me);			
-	}
-	return result;
-}
-public MethodElement getMostSpecificMethodElement(Method aMethod) {
-   return MethodElementImpl.getMostSpecificMethodElement(getMethodElements(), aMethod);
-}
-public boolean isEquivalent(MethodTransaction anotherMethodTransaction) {
-	return getTransactionAttribute() == anotherMethodTransaction.getTransactionAttribute();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The trans-attribute element specifies how the container must manage the transaction boundaries when delegating a method invocation to an enterprise bean's business method.
-
-	 */
-	public TransactionAttributeType getTransactionAttribute() {
-		return transactionAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionAttribute(TransactionAttributeType newTransactionAttribute) {
-		TransactionAttributeType oldTransactionAttribute = transactionAttribute;
-		transactionAttribute = newTransactionAttribute == null ? TRANSACTION_ATTRIBUTE_EDEFAULT : newTransactionAttribute;
-		boolean oldTransactionAttributeESet = transactionAttributeESet;
-		transactionAttributeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE, oldTransactionAttribute, transactionAttribute, !oldTransactionAttributeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionAttribute() {
-		TransactionAttributeType oldTransactionAttribute = transactionAttribute;
-		boolean oldTransactionAttributeESet = transactionAttributeESet;
-		transactionAttribute = TRANSACTION_ATTRIBUTE_EDEFAULT;
-		transactionAttributeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE, oldTransactionAttribute, TRANSACTION_ATTRIBUTE_EDEFAULT, oldTransactionAttributeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionAttribute() {
-		return transactionAttributeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TRANSACTION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		if (eContainerFeatureID != EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR) return null;
-		return (AssemblyDescriptor)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newAssemblyDescriptor, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != eInternalContainer() || (eContainerFeatureID != EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR && newAssemblyDescriptor != null)) {
-			if (EcoreUtil.isAncestor(this, newAssemblyDescriptor))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS, AssemblyDescriptor.class, msgs);
-			msgs = basicSetAssemblyDescriptor(newAssemblyDescriptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodElements() {
-		if (methodElements == null) {
-			methodElements = new EObjectContainmentEList(MethodElement.class, this, EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS);
-		}
-		return methodElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetAssemblyDescriptor((AssemblyDescriptor)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				return basicSetAssemblyDescriptor(null, msgs);
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				return ((InternalEList)getMethodElements()).basicRemove(otherEnd, msgs);
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS, AssemblyDescriptor.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				return getTransactionAttribute();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				return getMethodElements();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				setTransactionAttribute((TransactionAttributeType)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				getMethodElements().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				unsetTransactionAttribute();
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				return isSetTransactionAttribute();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor() != null;
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				return methodElements != null && !methodElements.isEmpty();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (transactionAttribute: ");
-		if (transactionAttributeESet) result.append(transactionAttribute); else result.append("<unset>");
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ModelledKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ModelledKeyAttributeFilter.java
deleted file mode 100644
index aef838df3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ModelledKeyAttributeFilter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the keyAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any keyAttributes that are held by EjbRelationshipRole objects (including
- * inherited EjbRelationshipRole attributes).
- * That means the returned list of CMPAttributes will be key attributes that were defined locally
- * and all inherited key attributes minus any key attributes pointed to by EjbRelationshipRoles, thus the
- * key attributes will only be key attributes that were defined by the user.
- * Creation date: (11/28/2000 8:09:10 PM)
- * @author: Administrator
- */
-public class ModelledKeyAttributeFilter extends ContainerManagedEntityFilter {
-	private static ModelledKeyAttributeFilter singleton;
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	return getSourceAttributes(cmp);
-}
-/**
- * Return the proper list of attributes from cmpExt.
- * Return all attributes minus those added due to Relationship Roles.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	java.util.List all, localRoleKeyAttributes;
-	all = new java.util.ArrayList(cmp.getKeyAttributes());
-	localRoleKeyAttributes = cmp.getFilteredFeatures(KeyRelationshipRoleAttributeFilter.singleton());
-	filterRoleAttributesByName(all, localRoleKeyAttributes);
-	return all;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.ModelledKeyAttributeFilter
- */
-public static ModelledKeyAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new ModelledKeyAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ModelledPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ModelledPersistentAttributeFilter.java
deleted file mode 100644
index e68e8d0cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/ModelledPersistentAttributeFilter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the persistentAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any persistentAttributes that are held by EjbRelationshipRole objects (including
- * inherited EjbRelationshipRole attributes).
- * That means the returned list of CMPAttributes will be attributes that were defined locally
- * and all inherited attributes minus any attributes pointed to by EjbRelationshipRoles, thus the
- * attributes will only be attributes that were defined by the user.
- * Creation date: (11/28/2000 7:31:42 PM)
- * @author: Administrator
- */
-public class ModelledPersistentAttributeFilter extends ContainerManagedEntityFilter {
-	private static ModelledPersistentAttributeFilter singleton;
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	return getSourceAttributes(cmp);
-}
-/**
- * Return the proper list of attributes from cmpExt.
- * Return all attributes minus those added due to Relationship Roles.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	java.util.List all, roleAttributes;
-	all = new java.util.ArrayList(cmp.getPersistentAttributes());
-	roleAttributes = cmp.getFilteredFeatures(RelationshipRoleAttributeFilter.singleton());
-	filterRoleAttributesByName(all, roleAttributes);
-	return all;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.ModelledPersistentAttributeFilter
- */
-public static ModelledPersistentAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new ModelledPersistentAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/NonKeyRequiredRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/NonKeyRequiredRoleFilter.java
deleted file mode 100644
index e31f73c08..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/NonKeyRequiredRoleFilter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2003
- * 
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class NonKeyRequiredRoleFilter extends ContainerManagedEntityFilter {
-
-    private static NonKeyRequiredRoleFilter singleton;
-
-    /**
-     * filter method comment.
-     */
-    public List filter(ContainerManagedEntity cmp) {
-        List roles = new ArrayList();
-        Iterator it = getRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role;
-        while (it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            if (!role.isKey() && role.isRequired()) roles.add(role);
-        }
-        return roles;
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (11/28/2000 7:15:37
-     * PM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.KeyRelationshipRoleFilter
-     */
-    public static NonKeyRequiredRoleFilter singleton() {
-        if (singleton == null) singleton = new NonKeyRequiredRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/QueryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/QueryImpl.java
deleted file mode 100644
index 199f4e013..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/QueryImpl.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-
-/**
- * The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query
- * is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty.
- * @generated
- */
-public class QueryImpl extends J2EEEObjectImpl implements Query {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getEjbQL() <em>Ejb QL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbQL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_QL_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String ejbQL = EJB_QL_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getReturnTypeMapping() <em>Return Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnTypeMapping()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ReturnTypeMapping RETURN_TYPE_MAPPING_EDEFAULT = ReturnTypeMapping.LOCAL_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ReturnTypeMapping returnTypeMapping = RETURN_TYPE_MAPPING_EDEFAULT;
-	/**
-	 * This is true if the Return Type Mapping attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean returnTypeMappingESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected QueryMethod queryMethod = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public QueryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.QUERY;
-	}
-
-public boolean isLocalResultMapping() {
-	// override bug in the model which made Remote the default
-	return getReturnTypeMapping().getValue() == ReturnTypeMapping.LOCAL;
-}
-public boolean isRemoteResultMapping() {
-	return getReturnTypeMapping().getValue() == ReturnTypeMapping.REMOTE;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the query.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the EJB QL query string that defines a finder or select query. This element is defined within the scope of a query element whose contents specify the finder or the select method that uses the query. The content must be a valid EJB QL query string for the entity bean for which the query is specified. The ejb-ql element must be specified for all queries that are expressible in EJB QL.
-	 * 
-	 * @invariant The value must be a valid EJB QL query string for the entity bean or dependent object class for which the query is specified.
-	 * @invariant The ejb-ql element must be specified for all queries that are expressible in EJB QL.
-	 * 
-	 * Example:
-	 * <query>
-	 * <query-method>
-	 * <method-name>ejbSelectPendingLineitems<//method-name>
-	 * <method-params//>
-	 * <//query-method>
-	 * <ejb-ql>SELECT ENTITY(l)
-	 * FROM LineItems l
-	 * WHERE l.shipped is FALSE
-	 * <//ejb-ql>
-	 * <//query>
-	 */
-	public String getEjbQL() {
-		return ejbQL;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbQL(String newEjbQL) {
-		String oldEjbQL = ejbQL;
-		ejbQL = newEjbQL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__EJB_QL, oldEjbQL, ejbQL));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The return-type-mapping element is used in the query element to specify whether an abstract schema type that is returned by a query for a select method is to be mapped to an EJBLocalObject or EJBObject type.  The value of the return-type-mapping element, if specified must be one of the following.
-	 */
-	public ReturnTypeMapping getReturnTypeMapping() {
-		return returnTypeMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReturnTypeMapping(ReturnTypeMapping newReturnTypeMapping) {
-		ReturnTypeMapping oldReturnTypeMapping = returnTypeMapping;
-		returnTypeMapping = newReturnTypeMapping == null ? RETURN_TYPE_MAPPING_EDEFAULT : newReturnTypeMapping;
-		boolean oldReturnTypeMappingESet = returnTypeMappingESet;
-		returnTypeMappingESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__RETURN_TYPE_MAPPING, oldReturnTypeMapping, returnTypeMapping, !oldReturnTypeMappingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReturnTypeMapping() {
-		ReturnTypeMapping oldReturnTypeMapping = returnTypeMapping;
-		boolean oldReturnTypeMappingESet = returnTypeMappingESet;
-		returnTypeMapping = RETURN_TYPE_MAPPING_EDEFAULT;
-		returnTypeMappingESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.QUERY__RETURN_TYPE_MAPPING, oldReturnTypeMapping, RETURN_TYPE_MAPPING_EDEFAULT, oldReturnTypeMappingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReturnTypeMapping() {
-		return returnTypeMappingESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The query-method element is used to specify the method (DB//SR//CM-"on the home") for a finder or
-	 * select query.
-	 * 
-	 * The method-name element specifies the name of a finder or select
-	 * method in the entity bean's implementation class or a select method in
-	 * the dependent object class.
-	 * 
-	 * Each method-param must be defined for a query-method using the
-	 * method-params element.
-	 * 
-	 * Used in: query
-	 * 
-	 * Example:
-	 * 
-	 * Example:
-	 * <query>
-	 *   <description>Method finds large orders<//description>
-	 *   <query-method>
-	 *     <method-name>findLargeOrders<//method-name>
-	 *     <method-params><//method-params>
-	 *   <//query-method>
-	 *   <ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &gt; 1000<//ejb-ql>
-	 * <//query>
-	 */
-	public QueryMethod getQueryMethod() {
-		return queryMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQueryMethod(QueryMethod newQueryMethod, NotificationChain msgs) {
-		QueryMethod oldQueryMethod = queryMethod;
-		queryMethod = newQueryMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__QUERY_METHOD, oldQueryMethod, newQueryMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setQueryMethod(QueryMethod newQueryMethod) {
-		if (newQueryMethod != queryMethod) {
-			NotificationChain msgs = null;
-			if (queryMethod != null)
-				msgs = ((InternalEObject)queryMethod).eInverseRemove(this, EjbPackage.QUERY_METHOD__QUERY, QueryMethod.class, msgs);
-			if (newQueryMethod != null)
-				msgs = ((InternalEObject)newQueryMethod).eInverseAdd(this, EjbPackage.QUERY_METHOD__QUERY, QueryMethod.class, msgs);
-			msgs = basicSetQueryMethod(newQueryMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__QUERY_METHOD, newQueryMethod, newQueryMethod));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ContainerManagedEntity getEntity() {
-		if (eContainerFeatureID != EjbPackage.QUERY__ENTITY) return null;
-		return (ContainerManagedEntity)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEntity(ContainerManagedEntity newEntity, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newEntity, EjbPackage.QUERY__ENTITY, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEntity(ContainerManagedEntity newEntity) {
-		if (newEntity != eInternalContainer() || (eContainerFeatureID != EjbPackage.QUERY__ENTITY && newEntity != null)) {
-			if (EcoreUtil.isAncestor(this, newEntity))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEntity != null)
-				msgs = ((InternalEObject)newEntity).eInverseAdd(this, EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES, ContainerManagedEntity.class, msgs);
-			msgs = basicSetEntity(newEntity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__ENTITY, newEntity, newEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.QUERY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.QUERY__QUERY_METHOD:
-				if (queryMethod != null)
-					msgs = ((InternalEObject)queryMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY__QUERY_METHOD, null, msgs);
-				return basicSetQueryMethod((QueryMethod)otherEnd, msgs);
-			case EjbPackage.QUERY__ENTITY:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetEntity((ContainerManagedEntity)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return basicSetQueryMethod(null, msgs);
-			case EjbPackage.QUERY__ENTITY:
-				return basicSetEntity(null, msgs);
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.QUERY__ENTITY:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES, ContainerManagedEntity.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.QUERY__EJB_QL:
-				return getEjbQL();
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				return getReturnTypeMapping();
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return getQueryMethod();
-			case EjbPackage.QUERY__ENTITY:
-				return getEntity();
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.QUERY__EJB_QL:
-				setEjbQL((String)newValue);
-				return;
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				setReturnTypeMapping((ReturnTypeMapping)newValue);
-				return;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				setQueryMethod((QueryMethod)newValue);
-				return;
-			case EjbPackage.QUERY__ENTITY:
-				setEntity((ContainerManagedEntity)newValue);
-				return;
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.QUERY__EJB_QL:
-				setEjbQL(EJB_QL_EDEFAULT);
-				return;
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				unsetReturnTypeMapping();
-				return;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				setQueryMethod((QueryMethod)null);
-				return;
-			case EjbPackage.QUERY__ENTITY:
-				setEntity((ContainerManagedEntity)null);
-				return;
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.QUERY__EJB_QL:
-				return EJB_QL_EDEFAULT == null ? ejbQL != null : !EJB_QL_EDEFAULT.equals(ejbQL);
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				return isSetReturnTypeMapping();
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return queryMethod != null;
-			case EjbPackage.QUERY__ENTITY:
-				return getEntity() != null;
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", ejbQL: ");
-		result.append(ejbQL);
-		result.append(", returnTypeMapping: ");
-		if (returnTypeMappingESet) result.append(returnTypeMapping); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/QueryMethodImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/QueryMethodImpl.java
deleted file mode 100644
index c4bd93497..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/QueryMethodImpl.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-
-/**
- * @generated
- */
-public class QueryMethodImpl extends MethodElementImpl implements QueryMethod {
-
-	public QueryMethodImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.QUERY_METHOD;
-	}
-
-/**
- * For Query methods, their enterprise bean must be derived.
- * It is the Entity which contains the Query.
- */
-public EnterpriseBean getEnterpriseBean() {
-	if (enterpriseBean == null) {
-		if (getQuery() != null)
-			enterpriseBean = getQuery().getEntity();
-	}
-	return enterpriseBean;
-}
-/**
- * Answer the method for which this method element applies in the HOME INTERFACE.
- */
-protected Method getHomeMethod() {
-	Method result = null;
-	JavaClass javaClass = getEnterpriseBean().getHomeInterface();
-	if (javaClass != null) {
-		String methodName = getName().trim();
-		if (hasMethodParams())
-			result = javaClass.getPublicMethodExtended(methodName, getMethodParams());
-		else {
-			List methods = javaClass.getPublicMethodsExtendedNamed(methodName);
-			if (!methods.isEmpty())
-				result = (Method) methods.get(0);
-		}
-	}
-	return result;
-}
-/**
- * Answer the method for which this method element applies in the LOCAL HOME INTERFACE.
- */
-protected Method getLocalHomeMethod() {
-	Method result = null;
-	JavaClass javaClass = getEnterpriseBean().getLocalHomeInterface();
-	if (javaClass != null) {
-		String methodName = getName().trim();
-		if (hasMethodParams())
-			result = javaClass.getPublicMethodExtended(methodName, getMethodParams());
-		else {
-			List methods = javaClass.getPublicMethodsExtendedNamed(methodName);
-			if (!methods.isEmpty())
-				result = (Method) methods.get(0);
-		}
-	}
-	return result;
-}
-
-
-
-protected void addMethodIfNotNull(List aList, Method aMethod) {
-	if (aMethod != null)
-		aList.add(aMethod);
-}
-/**
- * This method will return a zero-length Method[] if there is no matching method
- * on the home, local home, or bean class.  It will return exactly one method
- * for ejbSelect, and one or two methods for finders.  The two method case occurs
- * when the same method with the same signature exists on both the home and
- * local home.
- */
-public Method[] getMethods() {
-	List result = new ArrayList(2);
-	if (getName().startsWith("ejbSelect")) { //$NON-NLS-1$
-		addMethodIfNotNull(result, getSelectMethod());
-	} else {
-		addMethodIfNotNull(result, getHomeMethod());
-		addMethodIfNotNull(result, getLocalHomeMethod());
-	}
-	return (Method[])result.toArray(new Method[result.size()]);
-}
-/**
- * Answer the method for which this method element applies in the HOME INTERFACE.
- */
-protected Method getSelectMethod() {
-	Method result = null;
-	JavaClass javaClass = getEnterpriseBean().getEjbClass();
-	String methodName = getName().trim();
-	if (hasMethodParams())
-		result = javaClass.getPublicMethodExtended(name, getMethodParams());
-	else {
-		List methods = javaClass.getPublicMethodsExtendedNamed(methodName);
-		if (!methods.isEmpty())
-			result = (Method) methods.iterator().next();
-	}
-	return result;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Query getQuery() {
-		if (eContainerFeatureID != EjbPackage.QUERY_METHOD__QUERY) return null;
-		return (Query)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQuery(Query newQuery, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newQuery, EjbPackage.QUERY_METHOD__QUERY, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setQuery(Query newQuery) {
-		if (newQuery != eInternalContainer() || (eContainerFeatureID != EjbPackage.QUERY_METHOD__QUERY && newQuery != null)) {
-			if (EcoreUtil.isAncestor(this, newQuery))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newQuery != null)
-				msgs = ((InternalEObject)newQuery).eInverseAdd(this, EjbPackage.QUERY__QUERY_METHOD, Query.class, msgs);
-			msgs = basicSetQuery(newQuery, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY_METHOD__QUERY, newQuery, newQuery));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetQuery((Query)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				return basicSetQuery(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.QUERY__QUERY_METHOD, Query.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				return getQuery();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				setQuery((Query)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				setQuery((Query)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.QUERY_METHOD__QUERY:
-				return getQuery() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * You should use getClientTypeJavaClasses to ensure you pick up both home interfaces
-	 * if they exist.
-	 */
-	public JavaClass getTypeJavaClass() {
-		JavaClass[] result = getClientTypeJavaClasses();
-		if (result != null && result.length > 0)
-			return result[0];
-		return null;
-	}
-	
-	/**
-	 * Return an array of JavaClasses of all the interfaces or bean class that this method is presented
-	 * to a client.  If it is an ejbSelect... on the bean class will be returned and if
-	 * it if a find both home interfaces will be returned if they exist.
-	 * 
-	 * May return null.
-	 */
-	public JavaClass[] getClientTypeJavaClasses() {
-		if (getName() == null || getEnterpriseBean() == null) return null;
-		EnterpriseBean ejb = getEnterpriseBean();
-		if (getName().startsWith(SELECT_PREFIX))
-			return new JavaClass[]{ejb.getEjbClass()};
-		//Next case is tougher since you could have both a remove and local client
-		//We want to return the home interface in this case.
-		if (getName().startsWith(FIND_PREFIX)) {
-			if (ejb.hasLocalClient() && !ejb.hasRemoteClient())
-				return new JavaClass[]{getEnterpriseBean().getLocalHomeInterface()};
-			if (ejb.hasRemoteClient() && !ejb.hasLocalClient())
-				return new JavaClass[]{ejb.getHomeInterface()};
-			if (ejb.hasRemoteClient() && ejb.hasLocalClient())
-				return new JavaClass[]{ejb.getLocalHomeInterface(), ejb.getHomeInterface()};
-		}
-		return null;
-	}
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RelationshipRoleAttributeFilter.java
deleted file mode 100644
index c6fb84d29..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the persistentAttributes (this includes inherited 
- * attributes) from the ContainerManagedEntityExtension that is passed as an
- * argument to the filter method.
- * It will remove any attribute that is not pointed to by an EjbRelationshipRole.
- * Thus, the returned list will contain attributes (including inherited attributes) that only
- * belong to roles.
- * Creation date: (11/28/2000 6:46:08 PM)
- * @author: Administrator
- */
-public class RelationshipRoleAttributeFilter extends AbstractRelationshipRoleAttributeFilter {
-	private static RelationshipRoleAttributeFilter singleton;
-/**
- * Return the proper list of roles from cmpExt.
- */
-protected java.util.List getSourceRoles(ContainerManagedEntity cmp) { 
-	   return getRelationshipRoles(cmp); 
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.RelationshipRoleAttributeFilter
- */
-public static RelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new RelationshipRoleAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RelationshipsImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RelationshipsImpl.java
deleted file mode 100644
index 3467eecb8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RelationshipsImpl.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-
-/**
- * The relationships describes the relationships in which entity beans with container managed persistence participate. The relationships element contains an optional description; and a list of ejb-relation elements, which specify the container managed relationships.
- * @generated
- */
-public class RelationshipsImpl extends J2EEEObjectImpl implements Relationships {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList ejbRelations = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public RelationshipsImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.RELATIONSHIPS;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the collection of relationships.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIPS__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBJar getEjbJar() {
-		if (eContainerFeatureID != EjbPackage.RELATIONSHIPS__EJB_JAR) return null;
-		return (EJBJar)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEjbJar(EJBJar newEjbJar, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newEjbJar, EjbPackage.RELATIONSHIPS__EJB_JAR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		if (newEjbJar != eInternalContainer() || (eContainerFeatureID != EjbPackage.RELATIONSHIPS__EJB_JAR && newEjbJar != null)) {
-			if (EcoreUtil.isAncestor(this, newEjbJar))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEjbJar != null)
-				msgs = ((InternalEObject)newEjbJar).eInverseAdd(this, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, EJBJar.class, msgs);
-			msgs = basicSetEjbJar(newEjbJar, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIPS__EJB_JAR, newEjbJar, newEjbJar));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A list of ejb-relation elements, which specify the container managed
-	 * relationships.
-	 */
-	public EList getEjbRelations() {
-		if (ejbRelations == null) {
-			ejbRelations = new EObjectContainmentWithInverseEList(EJBRelation.class, this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST);
-		}
-		return ejbRelations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.RELATIONSHIPS__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetEjbJar((EJBJar)otherEnd, msgs);
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return ((InternalEList)getEjbRelations()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				return basicSetEjbJar(null, msgs);
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return ((InternalEList)getEjbRelations()).basicRemove(otherEnd, msgs);
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, EJBJar.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return getEjbRelations();
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				getEjbRelations().clear();
-				getEjbRelations().addAll((Collection)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				getEjbRelations().clear();
-				return;
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return ejbRelations != null && !ejbRelations.isEmpty();
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RequiredLocalRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RequiredLocalRelationshipRoleFilter.java
deleted file mode 100644
index f67cb999b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RequiredLocalRelationshipRoleFilter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collections;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (10/15/2001 11:35:00 AM)
- * @author: Administrator
- */
-public class RequiredLocalRelationshipRoleFilter extends AbstractRequiredRelationshipRoleFilter {
-	private static RequiredLocalRelationshipRoleFilter singleton;
-protected java.util.List getRolesToFilter(ContainerManagedEntity cmp) {
-    EjbModuleExtensionHelper modHelper = getEjbModuleExtHelper(cmp);
-	if(modHelper != null)
-	  return modHelper.getLocalRelationshipRoles_cmp11(cmp);
-	return Collections.EMPTY_LIST;
-}
-/**
- * Insert the method's description here.
- * Creation date: (8/6/2001 11:27:25 AM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.RequiredLocalRelationshipRoleFilter
- */
-public static RequiredLocalRelationshipRoleFilter singleton() {
-	if (singleton == null)
-		singleton = new RequiredLocalRelationshipRoleFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RequiredRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RequiredRelationshipRoleFilter.java
deleted file mode 100644
index 1404f3c75..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RequiredRelationshipRoleFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * Insert the type's description here. Creation date: (8/6/2001 11:26:10 AM)
- * @author: Administrator
- */
-public class RequiredRelationshipRoleFilter extends ContainerManagedEntityFilter {
-
-    private static RequiredRelationshipRoleFilter singleton;
-
-    /**
-     * filter method comment.
-     */
-    public List filter(ContainerManagedEntity cmp) {
-        List roles = new ArrayList();
-        Iterator it = getRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role;
-        while (it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            if (shouldAddFilteredResult(role)) roles.add(role);
-        }
-        return roles;
-    }
-
-    /**
-     * Return true if the multiplicity for @aRole is required.
-     */
-    protected boolean shouldAddFilteredResult(CommonRelationshipRole aRole) {
-        return aRole.isRequired();
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (8/6/2001 11:27:25
-     * AM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.RequiredRelationshipRoleFilter
-     */
-    public static RequiredRelationshipRoleFilter singleton() {
-        if (singleton == null) singleton = new RequiredRelationshipRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RoleShapeStrategy.java
deleted file mode 100644
index 4195c1c30..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RoleShapeStrategy.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/6/2000 11:41:33 AM)
- * @author: Administrator
- */
-public abstract class RoleShapeStrategy implements IRoleShapeStrategy {
-	protected boolean busy = false;
-	protected CommonRelationshipRole role;
-	protected ArrayList visitedKeyTypes = new ArrayList(5);
-/**
- * FlattenedRoleShapeStrategy constructor comment.
- */
-public RoleShapeStrategy(CommonRelationshipRole aRole) {
-	super();
-	setRole(aRole);
-}
-protected String appendName(String fullName, String additionalName) {
-	return fullName + ATTRIBUTE_NAME_JOINER + additionalName;
-}
-protected boolean canContinue() {
-	return !busy && role.isForward() && role.getName() != null;
-}
-protected boolean canComputeNames() {
-	//return getRole().getOpposite() != null;
-	return true;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/16/00 9:19:27 PM)
- * @return CommonRelationshipRole
- */
-public CommonRelationshipRole getRole() {
-	return role;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/16/00 9:19:27 PM)
- * @return CommonRelationshipRole
- */
-
-public boolean isFlat () {
-	return false;
-}
-public boolean isRound () {
-	return false;
-}
-/**
- * Creates an appended name while uppercasing the first letter of the secondName.
- */
-public static String makeJavaName(String firstName, String secondName) {
-	StringBuffer nameBuffer = new StringBuffer(firstName);
-	nameBuffer.append(Character.toUpperCase(secondName.charAt(0)));
-	for (int i = 1; i < secondName.length(); i++)
-		nameBuffer.append(secondName.charAt(i));
-	return nameBuffer.toString();
-}
-public void reconcileAttributes(List roleAttributes) {
-	if (canContinue()) {
-		busy = true;
-		String attributeName = getRole().getName();
-		List computedNames = new ArrayList();
-		if (canComputeNames()){
-			visitedKeyTypes.clear();
-			reconcileAttributes(getRole(), attributeName, roleAttributes, computedNames);
-		}
-		removeExtraAttributes(computedNames);
-		busy = false;
-	}
-}
-/**
- * getFields method comment.
- */
-protected abstract void reconcileAttributes(CommonRelationshipRole aRole, String attributeName, List aList, List computedNames);
-/**
- * Remove attributes from our role whose name is not contained in the list of
- * @computedNames.  Also, remove from the role's source EJB.
- */
-protected void removeExtraAttributes(List computedNames) {
-	if (!getRole().getAttributes().isEmpty()) {
-		java.util.Iterator it = getRole().getAttributes().iterator();
-		ContainerManagedEntity cmp = getRole().getSourceEntity();
-		CMPAttribute attribute;
-		while (it.hasNext()) {
-			attribute = (CMPAttribute) it.next();
-			if (computedNames.contains(attribute.getName()))
-				continue;
-			it.remove();
-			cmp.getKeyAttributes().remove(attribute);
-			cmp.getPersistentAttributes().remove(attribute);
-		}
-	}
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/16/00 9:19:27 PM)
- * @param newRole com.ibm.ejs.models.base.extensions.ejbext.EjbRelationshipRole
- */
-public void setRole(CommonRelationshipRole newRole) {
-	role = newRole;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RoleSourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RoleSourceImpl.java
deleted file mode 100644
index 8885bfe32..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/RoleSourceImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-
-/**
- * Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.
- * @invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference.
- * @generated
- */
-public class RoleSourceImpl extends J2EEEObjectImpl implements RoleSource {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ContainerManagedEntity entityBean = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public RoleSourceImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.ROLE_SOURCE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ROLE_SOURCE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBRelationshipRole getRole() {
-		if (eContainerFeatureID != EjbPackage.ROLE_SOURCE__ROLE) return null;
-		return (EJBRelationshipRole)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRole(EJBRelationshipRole newRole, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRole, EjbPackage.ROLE_SOURCE__ROLE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRole(EJBRelationshipRole newRole) {
-		if (newRole != eInternalContainer() || (eContainerFeatureID != EjbPackage.ROLE_SOURCE__ROLE && newRole != null)) {
-			if (EcoreUtil.isAncestor(this, newRole))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRole != null)
-				msgs = ((InternalEObject)newRole).eInverseAdd(this, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, EJBRelationshipRole.class, msgs);
-			msgs = basicSetRole(newRole, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ROLE_SOURCE__ROLE, newRole, newRole));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ContainerManagedEntity getEntityBean() {
-		if (entityBean != null && entityBean.eIsProxy()) {
-			InternalEObject oldEntityBean = (InternalEObject)entityBean;
-			entityBean = (ContainerManagedEntity)eResolveProxy(oldEntityBean);
-			if (entityBean != oldEntityBean) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ROLE_SOURCE__ENTITY_BEAN, oldEntityBean, entityBean));
-			}
-		}
-		return entityBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContainerManagedEntity basicGetEntityBean() {
-		return entityBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEntityBean(ContainerManagedEntity newEntityBean) {
-		ContainerManagedEntity oldEntityBean = entityBean;
-		entityBean = newEntityBean;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ROLE_SOURCE__ENTITY_BEAN, oldEntityBean, entityBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ROLE_SOURCE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRole((EJBRelationshipRole)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				return basicSetRole(null, msgs);
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				return eInternalContainer().eInverseRemove(this, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, EJBRelationshipRole.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				return getRole();
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				if (resolve) return getEntityBean();
-				return basicGetEntityBean();
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				setRole((EJBRelationshipRole)newValue);
-				return;
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				setEntityBean((ContainerManagedEntity)newValue);
-				return;
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				setRole((EJBRelationshipRole)null);
-				return;
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				setEntityBean((ContainerManagedEntity)null);
-				return;
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				return getRole() != null;
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				return entityBean != null;
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/SessionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/SessionImpl.java
deleted file mode 100644
index 7845d9ad4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/SessionImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-
-/**
- * The session element declares an session bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a name assigned
- * to the enterprise bean in the deployment description; the names of the session bean's home and remote interfaces, if any; the names of the session bean's local home and local interfaces, if any; the session bean's implementation class; the session bean's state management type; the session bean's transaction management type; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; and an optional declaration of the bean's resource environment references. The elements that are optional are "optional" in the sense that they are omitted when if lists represented by them are empty.
- */
-public class SessionImpl extends EnterpriseBeanImpl implements Session, EnterpriseBean {
-
-	/**
-	 * The default value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionType TRANSACTION_TYPE_EDEFAULT = TransactionType.BEAN_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Transaction Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getSessionType() <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final SessionType SESSION_TYPE_EDEFAULT = SessionType.STATEFUL_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SessionType sessionType = SESSION_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Session Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean sessionTypeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpoint() <em>Service Endpoint</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass serviceEndpoint = null;
-
-	public SessionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.Literals.SESSION;
-	}
-
-	public boolean isSession() {
-		return true;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transaction-type element specifies an enterprise bean's transaction management type.
-	 * 
-
-	 */
-	public TransactionType getTransactionType() {
-		return transactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionType(TransactionType newTransactionType) {
-		TransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION__TRANSACTION_TYPE, oldTransactionType, transactionType, !oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionType() {
-		TransactionType oldTransactionType = transactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionType = TRANSACTION_TYPE_EDEFAULT;
-		transactionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION__TRANSACTION_TYPE, oldTransactionType, TRANSACTION_TYPE_EDEFAULT, oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionType() {
-		return transactionTypeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SessionType getSessionType() {
-		return sessionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSessionType(SessionType newSessionType) {
-		SessionType oldSessionType = sessionType;
-		sessionType = newSessionType == null ? SESSION_TYPE_EDEFAULT : newSessionType;
-		boolean oldSessionTypeESet = sessionTypeESet;
-		sessionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION__SESSION_TYPE, oldSessionType, sessionType, !oldSessionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSessionType() {
-		SessionType oldSessionType = sessionType;
-		boolean oldSessionTypeESet = sessionTypeESet;
-		sessionType = SESSION_TYPE_EDEFAULT;
-		sessionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION__SESSION_TYPE, oldSessionType, SESSION_TYPE_EDEFAULT, oldSessionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSessionType() {
-		return sessionTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getServiceEndpoint() {
-		if (serviceEndpoint != null && serviceEndpoint.eIsProxy()) {
-			InternalEObject oldServiceEndpoint = (InternalEObject)serviceEndpoint;
-			serviceEndpoint = (JavaClass)eResolveProxy(oldServiceEndpoint);
-			if (serviceEndpoint != oldServiceEndpoint) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.SESSION__SERVICE_ENDPOINT, oldServiceEndpoint, serviceEndpoint));
-			}
-		}
-		return serviceEndpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetServiceEndpoint() {
-		return serviceEndpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceEndpoint(JavaClass newServiceEndpoint) {
-		JavaClass oldServiceEndpoint = serviceEndpoint;
-		serviceEndpoint = newServiceEndpoint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION__SERVICE_ENDPOINT, oldServiceEndpoint, serviceEndpoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				return getTransactionType();
-			case EjbPackage.SESSION__SESSION_TYPE:
-				return getSessionType();
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				if (resolve) return getServiceEndpoint();
-				return basicGetServiceEndpoint();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				setTransactionType((TransactionType)newValue);
-				return;
-			case EjbPackage.SESSION__SESSION_TYPE:
-				setSessionType((SessionType)newValue);
-				return;
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				setServiceEndpoint((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				unsetTransactionType();
-				return;
-			case EjbPackage.SESSION__SESSION_TYPE:
-				unsetSessionType();
-				return;
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				setServiceEndpoint((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				return isSetTransactionType();
-			case EjbPackage.SESSION__SESSION_TYPE:
-				return isSetSessionType();
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				return serviceEndpoint != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (transactionType: ");
-		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>");
-		result.append(", sessionType: ");
-		if (sessionTypeESet) result.append(sessionType); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.ejb.Session#setServiceEndpointName(java.lang.String)
-     */
-    public void setServiceEndpointName(String serviceEndpointName) {
-        eSet(EjbPackage.eINSTANCE.getSession_ServiceEndpoint(), createClassRef(serviceEndpointName));
-    }
-	/*
-	 * @see EnterpriseBean#hasLocalClient()
-	 */
-	public boolean hasServiceEndpoint() {
-		return getServiceEndpoint() != null;
-	}
-	public String getServiceEndpointName() {
-		getServiceEndpoint();
-		return serviceEndpoint == null ? null : serviceEndpoint.getQualifiedName();
-	}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/SupertypeCMPAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/SupertypeCMPAttributeFilter.java
deleted file mode 100644
index 7e203cdfa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/SupertypeCMPAttributeFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/28/2000 6:54:26 PM)
- * @author: Administrator
- */
-public abstract class SupertypeCMPAttributeFilter extends ContainerManagedEntityFilter {
-/**
- * SupertypeCMPAttributeFilter constructor comment.
- */
-public SupertypeCMPAttributeFilter() {
-	super();
-}
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	ContainerManagedEntity supertype = null;
-	EjbModuleExtensionHelper extensionHelper = getEjbModuleExtHelper(cmp);
-	if(extensionHelper != null)
-	   supertype = (ContainerManagedEntity)extensionHelper.getSuperType(cmp);
-	if (supertype == null)
-		return getSourceAttributes(cmp);
-	return filterUsingSupertype(cmp, supertype);
-}
-/**
- * filter method comment.
- */
-protected java.util.List filterUsingSupertype(ContainerManagedEntity cmp, ContainerManagedEntity supertype) {
-	ContainerManagedEntity superEntity = supertype;
-	List result = new ArrayList();
-	Iterator it = getSourceAttributes(cmp).iterator();
-	CMPAttribute attribute;
-	while (it.hasNext()) {
-		attribute = (CMPAttribute) it.next();
-		if (!isSupertypeAttribute(superEntity, attribute))
-			result.add(attribute);
-	}
-	return result;
-}
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected abstract java.util.List getSourceAttributes(ContainerManagedEntity cmp) ;
-/**
- * Return a boolean indicating whether anAttribute also exists in the superEntity.
- */
-protected abstract boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPFieldDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPFieldDescriptor.java
deleted file mode 100644
index 8c6d067de..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPFieldDescriptor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-/**
- * A parameter descriptor is used to describe a method parameter.
- * It holds the parameter name and type.  The type is held in
- * Java readable form (not a signature).
- */
-public class CMPFieldDescriptor {
-	private String fType = null;
-	private String fName = null;
-/**
- * JavaParameterDescriptor default constructor.
- */
-public CMPFieldDescriptor() {
-	super();
-}
-/**
- * @return the parameter name.
- */
-public String getName() {
-	return fName;
-}
-/**
- * Returns the parameter type.
- * @return The parameter type in Java readable form (not a signature)
- */
-public String getType() {
-	return fType;
-}
-/**
- * Sets the parameter name.
- */
-public void setName(String newName) {
-	fName = (newName == null) ? null : newName.trim();
-}
-/**
- * Sets the parameter type.
- * @param newType The parameter name in Java readable form (not a signature)
- */
-public void setType(String newType) {
-	fType = (newType == null) ? null : newType.trim();
-}
-/**
- * Returns "type name".  The {@link JavaParameterDescriptor#getType()}
- * and {@link JavaParameterDescriptor#getName()} methods are used
- * to build the result.
- */
-public String toString() {
-	StringBuffer sb = new StringBuffer(100);
-	sb.append(getType());
-	sb.append(' ');
-	sb.append(getName());
-	return sb.toString();
-}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPHelper.java
deleted file mode 100644
index 06c45af2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPHelper.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-public class CMPHelper {
-	
-	public static final String GET = "get"; //$NON-NLS-1$
-	public static final String SET = "set"; //$NON-NLS-1$
-	protected static Comparator methodComparator = new Comparator() {
-		/**
-		 * @see Comparator#compare(Object, Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			Method m1 = (Method) o1;
-			Method m2 = (Method) o2;
-			String s1 = m1.getName();
-			String s2 = m2.getName();
-			if (s1 == null)
-				return "".compareTo(s2); //$NON-NLS-1$
-			return s1.compareTo(s2);
-		}
-	};
-	
-	public interface CMPFieldExistTester {
-		boolean isExisting(Field aField);
-		boolean isExisting(Method aMethod);
-	}
-
-	protected CMPHelper() {
-		super();
-	}
-	
-	/**
-	 * For CMP 2.0 beans, the bean class is abstract and
-	 * contains abstract get/set methods for the fields
-	 * This infers the those fields based on the get/set methods
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP20FieldDescriptors(JavaClass beanClass) {
-		return getAvailableCMP20FieldDescriptors(beanClass, null);
-	}
-	
-	/**
-	 * For CMP 2.0 beans, the bean class is abstract and
-	 * contains abstract get/set methods for the fields
-	 * This infers the those fields based on the get/set methods
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP20FieldDescriptors(JavaClass beanClass, CMPHelper.CMPFieldExistTester fieldTester) {
-		if (beanClass == null)
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		Map getters = new HashMap();	
-		List methods = beanClass.getPublicMethodsExtended();
-		Collections.sort(methods, methodComparator);
-		for (int i = 0; i < methods.size(); i++) {
-			Method aMethod = (Method) methods.get(i);
-			if (isGetter(aMethod) && aMethod.isAbstract() && !aMethod.isStatic() && 
-				(fieldTester == null || fieldTester.isExisting(aMethod))) 
-				getters.put(getFieldName(aMethod), aMethod);
-			else if (isSetter(aMethod) && aMethod.isAbstract() && !aMethod.isStatic()) {
-				String fieldName = getFieldName(aMethod);
-				Method getter = (Method) getters.get(fieldName);
-				if (typesAgree(getter, aMethod)) {
-					String typeName = getReturnTypeName(getter);
-					if (typeName != null && (fieldTester == null || fieldTester.isExisting(getter)))
-						result.add(createFieldDescriptor(fieldName, typeName));
-				}
-			}
-		}
-		return result;	
-	}
-	
-	/**
-	 * For CMP 1.1 beans, the list is simply the fields, extended, 
-	 * on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP11FieldDescriptors(JavaClass beanClass) {
-		return getAvailableCMP11FieldDescriptors(beanClass, null);
-	}
-	
-	/**
-	 * For CMP 1.1 beans, the list is simply the fields, extended, 
-	 * on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP11FieldDescriptors(JavaClass beanClass, CMPHelper.CMPFieldExistTester fieldTester) {
-		if (beanClass == null)
-			return Collections.EMPTY_LIST;
-		List fields = beanClass.getFieldsExtended();
-		List result = new ArrayList();
-		for (int i = 0; i < fields.size(); i++) {
-			Field aField = (Field) fields.get(i);
-			if (!isPublic(aField) || aField.isStatic() || aField.isTransient() ||
-			(fieldTester != null && !fieldTester.isExisting(aField)))
-				continue;
-			String name = aField.getName();
-			String typeName = getTypeName(aField);
-			if (typeName != null && name != null)
-				result.add(createFieldDescriptor(name, typeName));
-		}
-		return result;
-	}	
-	
-	/**
-	 * Get a list of available cmp fields for the CMP bean; if the bean
-	 * is v1.1, this is the fields on the bean class; if it is 2.0, this 
-	 * is defined by the abstract get/set methods on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMPFieldDescriptors(ContainerManagedEntity cmpBean) {
-		return getAvailableCMPFieldDescriptors(cmpBean, null);
-	}
-	
-	/**
-	 * Get a list of available cmp fields for the CMP bean; if the bean
-	 * is v1.1, this is the fields on the bean class; if it is 2.0, this 
-	 * is defined by the abstract get/set methods on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMPFieldDescriptors(ContainerManagedEntity cmpBean, CMPHelper.CMPFieldExistTester fieldTester) {
-		JavaClass beanClass = cmpBean.getEjbClass();
-		if (beanClass == null)
-			return Collections.EMPTY_LIST;
-		switch(cmpBean.getVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID:
-			case J2EEVersionConstants.EJB_1_1_ID:
-				return getAvailableCMP11FieldDescriptors(beanClass, fieldTester); 
-			case J2EEVersionConstants.EJB_2_0_ID:
-			case J2EEVersionConstants.EJB_2_1_ID: default:
-				return getAvailableCMP20FieldDescriptors(beanClass, fieldTester); 
-		}  
-	}
-	
-	/**
-	 * Does the method name start with "get", and is the method a zero arg
-	 * method, that does not return void?
-	 */
-	protected static boolean isGetter(Method aMethod) {
-		String name = aMethod.getName();
-		return name != null &&
-			name.startsWith(GET) &&
-			name.length() > 3 &&
-			aMethod.listParametersWithoutReturn().length==0 &&
-			!aMethod.isVoid();		
-	}
-	
-	
-	/**
-	 * Does the method name start with "get", and is the method a one arg
-	 * method, that is void
-	 */
-	protected static boolean isSetter(Method aMethod) {
-		String name = aMethod.getName();
-		return name != null &&
-			name.startsWith(SET) &&
-			name.length() > 3 &&
-			aMethod.listParametersWithoutReturn().length == 1 &&
-			aMethod.isVoid();
-	}
-			
-	protected static String getFieldName(Method aMethod) {
-		if (aMethod == null)
-			return null;
-			
-		return getFieldName(aMethod.getName());
-	}
-	
-	public static String getFieldName(String methodName) {
-		if (methodName == null)
-			return null;
-		StringBuffer sb = new StringBuffer(methodName);
-		sb.delete(0, 3);
-		char lower = Character.toLowerCase(sb.charAt(0));
-		sb.setCharAt(0, lower);
-		return sb.toString();
-	}
-	
-	protected static String getReturnTypeName(Method getter) {
-		if (getter == null)
-			return null;
-		JavaHelpers retType = getter.getReturnType();
-		return getTypeName(retType);
-	}
-	
-	protected static String getTypeName(Field aField) {
-		if (aField == null)
-			return null;
-		JavaHelpers type = (JavaHelpers)aField.getEType();
-		return getTypeName(type);
-	}
-	
-	protected static String getTypeName(JavaHelpers helpers) {
-		if (helpers == null)
-			return null;
-		return helpers.getQualifiedName();
-	}
-	/**
-	 * Precondition: setter must take one parameter, and getter must return
-	 * a type, not void
-	 */
-	protected static boolean typesAgree(Method getter, Method setter) {
-		if (getter == null || getter.isVoid() || setter == null)
-			return false;
-			
-		JavaParameter[] parameters = setter.listParametersWithoutReturn();
-		if (parameters.length != 1)
-			return false;
-			
-		JavaParameter param = parameters[0];
-		return param.getEType() != null &&
-				param.getEType() == getter.getReturnType();							
-	}
-	
-	protected static CMPFieldDescriptor createFieldDescriptor(String name, String typeName) {
-		CMPFieldDescriptor desc = new CMPFieldDescriptor();
-		desc.setName(name);
-		desc.setType(typeName);
-		return desc;
-	}
-	
-	protected static boolean isPublic(Field field) {
-		if (field == null)
-			return false;
-		return (JavaVisibilityKind.PUBLIC_LITERAL.getValue() == field.getJavaVisibility().getValue());
-	}
-		
-		
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPKeySynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPKeySynchronizationAdapter.java
deleted file mode 100644
index 8332dde68..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CMPKeySynchronizationAdapter.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 24, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.ContainerManagedEntityImpl;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CMPKeySynchronizationAdapter extends AdapterImpl {
-    
-    public static final String ADAPTER_TYPE = CMPKeySynchronizationAdapter.class.getName();
-    
-    private boolean initialized = false;
-
-	protected ContainerManagedEntity cmp = null;
-	private boolean isUpdating = false;
-	private boolean isEnabled = true;
-	
-	/**
-	 * Default constructor
-	 */
-	public CMPKeySynchronizationAdapter(ContainerManagedEntity cmp) {
-		super();
-		this.cmp = cmp;
-	}
-
-	/**
-	 * If the keyAttributes list is empty, try to reflect
-	 * the keyAttributes from the fields of the primaryKey class.
-	 */
-	public void initializeKeyAttributes() {
-	    if(cmp == null || initialized)
-	        return;
-	    //Disable notifications while we initialize
-	    cmp.eSetDeliver(false);
-	    try {
-		    Resource res = cmp.eResource();
-		    if(res == null)
-		        return;
-		    boolean cachedIsModified = res.isModified(); 
-		    try {
-				// Handle primkeyfield scenario
-				if (cmp.getPrimKeyField()!=null)
-					initializeForPrimKey();
-				// Handle compound key scenario
-				else 
-					initializeForCompoundKey();
-		    } finally {
-		        res.setModified(cachedIsModified);
-		    }
-	    } finally {
-	    	cmp.eSetDeliver(true);
-	    	initialized = true;
-	    }
-	}
-	
-	protected void initializeForPrimKey() { 
-		// Ensure the key attributes list contains only the primKeyField attribute
-		if (!(getKeyAttributes().size()==1 && getKeyAttributes().contains(cmp.getPrimKeyField())))
-			primKeyFieldChanged(cmp.getPrimKeyField());
-	}
-	
-	protected void initializeForCompoundKey() { 
-		List keys = getKeyAttributes();
-		// clear key list
-		keys.clear();
-		//ensure the key class is not null
-		JavaClass keyClass = cmp.getPrimaryKey();
-		if (keyClass == null)
-			return;
-		keyClass.eAdapters().add(this);
-		
-		// reflect key fields into key attributes list
-		List keyFields = keyClass.getFieldsExtended();
-		for (int i = 0; i < keyFields.size(); i++) {
-			Field field = (Field) keyFields.get(i);
-			if (field.getJavaVisibility() == JavaVisibilityKind.PUBLIC_LITERAL) { //only public fields
-				CMPAttribute keyAttribute = cmp.getPersistentAttribute(field.getName());
-				if (keyAttribute != null)
-					keys.add(keyAttribute);
-			}	
-		}
-	}
-	
-	public void notifyChanged(Notification notification) {
-		if (isUpdating || !isEnabled) return; //we don't want to react to our own changes
-		try {
-			isUpdating = true;
-			EClass featureClass = ((EObject)notification.getNotifier()).eClass();
-			if (EjbPackage.eINSTANCE.getContainerManagedEntity().equals(featureClass)) {			
-				switch (notification.getFeatureID(ContainerManagedEntity.class)) {
-					// handle if cmp attribute is updated, added, removed
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES : {
-						handleCMPAttributeEvent(notification);
-						break;	
-					}
-					// handle the key attributes list is updated programatically
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES : {
-						handleCMPAttributeEvent(notification);
-						break;	
-					}	
-					// handle if the key class is changed,added, removed
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY : {
-						handleKeyClassEvent(notification);
-						break;
-					}
-					// handle prim key field sets, adds, removes
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD : {
-						handlePrimKeyFieldEvent(notification);
-						break;
-					}
-				}
-			} else if (EjbPackage.eINSTANCE.getCMPAttribute().equals(featureClass)) {
-				switch (notification.getFeatureID(CMPAttribute.class)) {
-					// handle a set or change of an attribute name
-					case (EjbPackage.CMP_ATTRIBUTE__NAME) : {
-						handleCMPAttributeRenameEvent((CMPAttribute)notification.getNotifier(), notification.getOldValue());
-						break;	
-					}
-				}
-			}
-		} finally { 
-			// restore initial notification state
-			isUpdating = false;
-		}		
-	}
-
-	/**
-	 * @param attribute
-	 */
-	private void handleCMPAttributeRenameEvent(CMPAttribute attribute, Object oldValue) {
-		// if renamed attribute was in key and is not anymore, remove it from key list
-		if (getKeyAttributes().contains(attribute)) {
-			if (!isAttributeKeyClassField(attribute.getName()))
-				removeKeyAttribute(attribute,(String)oldValue);
-		}
-		// if renamed attribute is now part of the key, add it to the key list		
-		else
-			attributeAdded(attribute);	
-	}
-
-	/**
-	 * @param notification
-	 */
-	private void handlePrimKeyFieldEvent(Notification notification) {
-		EObject newPrimKeyField = (EObject)notification.getNewValue();
-		cmp.setPrimKeyField((CMPAttribute)newPrimKeyField);
-		// if primKeyField is removed or a proxy, recompute key attributes based on key class
-		if (newPrimKeyField == null || newPrimKeyField.eIsProxy()) {
-			CMPAttribute primField = (CMPAttribute)newPrimKeyField;
-			if (primField!=null && primField.getName() == null) {
-				primField.setName(((InternalEObject)primField).eProxyURI().toString());
-				makePrimKeyFieldProxy(primField.getName());
-			}
-			removeAllKeyAttributes();
-			initialized = false;
-			initializeKeyAttributes();
-		}
-		// Ensure the key attributes list contains only the primKeyField attribute
-		else if (!(getKeyAttributes().size()==1 && getKeyAttributes().contains(newPrimKeyField))) {
-			primKeyFieldChanged(newPrimKeyField);
-		}		
-			
-	}
-
-	/**
-	 * @param notification
-	 */
-	private void handleKeyClassEvent(Notification notification) {
-		// if primkey null or proxy, clear key fields and reinitialize if key class not null
-		if (cmp.getPrimKeyField()==null || cmp.getPrimKeyField().eIsProxy()) {
-			keyClassChanged();
-		}
-		// if primkey is not null, then do nothing
-		
-	}
-
-	/**
-	 * @param notification
-	 */
-	private void handleCMPAttributeEvent(Notification notification) {
-		int eventType = notification.getEventType();
-		// handle a CMPAttribute added
-		 if (eventType == Notification.ADD) {
-			 attributeAdded((CMPAttribute)notification.getNewValue());
-		 }
-		 // handle a CMPAttribute removed
-		 else if (eventType == Notification.REMOVE) {
-		 	CMPAttribute attribute = (CMPAttribute)notification.getOldValue();
-			// remove this adapter from the deleted attribute
-			attribute.eAdapters().remove(this);
-			removeKeyAttribute(attribute, attribute.getName());
-			
-		 }
-	}
-
-	protected void removeKeyAttribute(CMPAttribute attribute, String oldName) {
-		
-		// if attribute was a key attribute it will be removed, otherwise do nothing
-		getKeyAttributes().remove(attribute);
-		
-		// if it is the prim key attribute, then make the prim key attribute a proxy
-		if (cmp.getPrimKeyField()!=null && cmp.getPrimKeyField().equals(attribute)) {
-			makePrimKeyFieldProxy(oldName);
-		}
-			
-	}
-	
-	public void makePrimKeyFieldProxy(String oldName) {
-		if (cmp.getPrimKeyField() == null) return;
-		cmp.setPrimKeyField(EjbFactory.eINSTANCE.createCMPAttribute());
-		cmp.getPrimKeyField().setName(oldName);
-		((InternalEObject)cmp.getPrimKeyField()).eSetProxyURI(URI.createURI(oldName));
-		
-	}
-	
-	protected void removeAllKeyAttributes() {
-		// clear key attributes list on cmp
-		getKeyAttributes().clear();
-	}
-	
-	protected void addKeyAttribute(CMPAttribute attribute) {
-		
-		CMPAttribute primKeyField = cmp.getPrimKeyField();
-		// if prim key is null add attribute to key list
-		if (primKeyField==null || primKeyField.eIsProxy()) {
-			if (!getKeyAttributes().contains(attribute))
-				getKeyAttributes().add(attribute);
-			// if att is only key att, and type is the key class type, set the prim key field
-			if (getKeyAttributes().size()==1 && attribute.getType().equals(cmp.getPrimaryKey()))
-				cmp.setPrimKeyField(attribute);
-		}
-		// if primkey set + primkeyfield is the new attribute ensure its the only one
-		else if (primKeyField.equals(attribute)) {
-			if (!(getKeyAttributes().size()==1 && getKeyAttributes().contains(attribute))) {
-				getKeyAttributes().clear();
-				getKeyAttributes().add(attribute);
-			}	
-		}
-		// if primkey set,new attribute not prim key, key atts > 1, remove primkey field
-		else {
-			cmp.setPrimKeyField(null);
-			if (!getKeyAttributes().contains(attribute))
-				getKeyAttributes().add(attribute);
-		}		
-	}
-	
-	protected void attributeAdded(CMPAttribute attribute) {
-		//Make sure cmp key adapters are initialized if needed
-		cmp.getKeyAttributes();
-		
-		// add this as a listener to name changes on this attribute
-		if (!attribute.eAdapters().contains(this))
-			attribute.eAdapters().add(this);
-		
-		if (attribute.getName() ==null) return;
-		// add it to the key list if applicable and sort the key list
-		if (isAttributeKeyClassField(attribute.getName())) {
-			addKeyAttribute(attribute);
-			sortKeyAttributeList();
-		}
-		// if new attribute name is now prim key name, fix up prim key field
-		else if (cmp.getPrimKeyField()!=null && cmp.getPrimKeyField().eIsProxy() && attribute.getName().equals(cmp.getPrimKeyField().getName())) {
-			cmp.setPrimKeyField(attribute);
-			primKeyFieldChanged(attribute);
-		}	
-	}
-	
-
-	/**
-	 * Is the cmp attribute also a field in the key class?
-	 */
-	protected boolean isAttributeKeyClassField(String attributeName) {
-		// ensure key class is not null
-		JavaClass keyClass = cmp.getPrimaryKey();
-		if (keyClass == null)
-			return false;
-		// see if the attribute name matchs any of the reflected key class public field names
-		List keyFields = keyClass.getFieldsExtended();
-		for (int i = 0; i < keyFields.size(); i++) {
-			Field field = (Field) keyFields.get(i);
-			if (field.getJavaVisibility() == JavaVisibilityKind.PUBLIC_LITERAL) {
-				if (field.getName().equals(attributeName))
-					return true;
-			}	
-		}
-		return false;	
-	}
-	
-	/**
-	 * Sort the list of the key attributes to match the order of the key class
-	 */
-	private void sortKeyAttributeList() {
-		
-		List result = new ArrayList();
-		JavaClass keyClass = cmp.getPrimaryKey();
-		if (keyClass == null) return;
-		List keyFields = keyClass.getFieldsExtended();
-		List currentKeys = getKeyAttributes();
-		
-		// create a new list of the attributes in order of key class fields.
-		for (int i = 0; i < keyFields.size(); i++) {
-			Field field = (Field) keyFields.get(i);
-			if (field.getJavaVisibility() == JavaVisibilityKind.PUBLIC_LITERAL) { //only public fields
-				for (int j=0; j<currentKeys.size(); j++) {
-					CMPAttribute attribute = (CMPAttribute) currentKeys.get(j);
-					if (field.getName().equals(attribute.getName()))
-						result.add(attribute);	
-				}			
-			}	
-		}
-		//clear list and set the new key attribute order on the cmp
-		getKeyAttributes().clear();
-		getKeyAttributes().addAll(result);
-	}
-	
-	protected void keyClassChanged() {
-		JavaClass key = cmp.getPrimaryKey();
-		if (key !=null)
-			key.eAdapters().remove(this);
-		// if not prim key class, clear key attribute list
-		removeAllKeyAttributes();
-		initialized = false;
-		initializeKeyAttributes();
-	}
-	
-	protected void primKeyFieldChanged(EObject primKeyField) {
-		// if a primKeyField is added, do a remove all and an add
-		removeAllKeyAttributes();
-		
-		if (primKeyField != null && !primKeyField.eIsProxy()) {
-			if (!primKeyField.eAdapters().contains(this))
-				primKeyField.eAdapters().add(this);
-			getKeyAttributes().add(primKeyField);
-		}
-	}
-	
-	private EList getKeyAttributes() {
-	    return ((ContainerManagedEntityImpl)cmp).getKeyAttributesGen();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier newTarget) {
-		super.setTarget(newTarget); 
-	}
-	
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-     */
-    public boolean isAdapterForType(Object type) {
-        return ADAPTER_TYPE.equals(type);
-    }
-    //To turn sync on or off
-    public void setEnabled(boolean enabled){
-    	isEnabled = enabled;
-    }
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CommonRelationshipAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CommonRelationshipAttributeMaintenanceAdapter.java
deleted file mode 100644
index 4ad56a3bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/CommonRelationshipAttributeMaintenanceAdapter.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CommonRelationship;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-public abstract class CommonRelationshipAttributeMaintenanceAdapter extends AdapterImpl {
-	protected static EjbPackage EJB_PACK = EjbFactoryImpl.getPackage();
-	/**
-	 * Constructor for CommonRelationshipAttributeMaintenanceAdapter.
-	 */
-	public CommonRelationshipAttributeMaintenanceAdapter() {
-		super();
-	}
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		switch (msg.getEventType()) {
-			case Notification.ADD :
-				addedNotification(msg);
-				break;
-			case Notification.REMOVE :
-				removedNotification(msg);
-				break;
-		}
-	}
-	protected void addedNotification(Notification msg) {
-		if ((EStructuralFeature)msg.getFeature() == EJB_PACK.getContainerManagedEntity_KeyAttributes())
-			addedKeyAttribute((ContainerManagedEntity) msg.getNotifier(), (CMPAttribute) msg.getNewValue());
-		else if (isRelationshipsSF((EStructuralFeature)msg.getFeature()))
-			added();
-		else if (isRelationshipRolesSF((EStructuralFeature)msg.getFeature()))
-			addedRole((CommonRelationshipRole) msg.getNewValue());
-	}
-	protected void removedNotification(Notification msg) {
-		if ((EStructuralFeature)msg.getFeature() == EJB_PACK.getContainerManagedEntity_KeyAttributes())
-			removedKeyAttribute((ContainerManagedEntity) msg.getNotifier(), (CMPAttribute) msg.getOldValue());
-		else if (isRelationshipsSF((EStructuralFeature)msg.getFeature()))
-			removed();
-		else if (isRelationshipRolesSF((EStructuralFeature)msg.getFeature()))
-			removedRole((CommonRelationshipRole) msg.getOldValue());
-	}
-	protected abstract boolean isRelationshipRolesSF(EObject sf);
-	protected abstract boolean isRelationshipsSF(EObject sf);
-	//Same as the add
-	private void removedKeyAttribute(ContainerManagedEntity aCMPEntity, CMPAttribute cmpAttribute) {
-		addedKeyAttribute(aCMPEntity, cmpAttribute);
-	}
-	protected void addedKeyAttribute(ContainerManagedEntity aCMPEntity, CMPAttribute newAttribute) {
-		CommonRelationshipRole role, inverse;
-		role = getRole(aCMPEntity);
-		if (role != null && !role.isForward()) {
-			inverse = role.getOppositeAsCommonRole();
-			if (inverse != null)
-				inverse.reconcileAttributes();
-		}
-	}
-	protected CommonRelationshipRole getRole(ContainerManagedEntity aCMPEntity) {
-	    CommonRelationship relation = getRelationship();
-	    if (relation == null) return null;
-		List roles = relation.getCommonRoles();
-		if (roles.isEmpty())
-			return null;
-		CommonRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (CommonRelationshipRole) roles.get(i);
-			if (role.getSourceEntity() == aCMPEntity)
-				return role;
-		}
-		return role;
-	}
-	protected CommonRelationship getRelationship() {
-		return  (CommonRelationship) getTarget();
-	}
-	protected void reconcileRoleAttributes() {
-		List roles = getRelationship().getCommonRoles();
-		if (roles.isEmpty())
-			return;
-		CommonRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (CommonRelationshipRole) roles.get(i);
-			role.reconcileAttributes();
-		}
-	}
-	protected void added() {
-		reconcileRoleAttributes();
-	}
-	protected void removed() {
-		if (getRelationship().getCommonRoles().size() > 1) {
-			//remove one force a disconnect
-			getRelationship().getCommonRoles().remove(0);
-		}
-	}
-	/**
-	* Add this Adapter to @aRole and the ContainerManagedEntity
-	* that the ContainerManagedEntityExtension container is pointing to.
-	* This only works if @aRole is contained.
-	*/
-	protected void addAdaptors(CommonRelationshipRole aRole) {
-		removeAdaptors(aRole); //to ensure this adapter is not added twice
-		aRole.eAdapters().add(this);
-		ContainerManagedEntity cmp = aRole.getSourceEntity();
-		if (cmp != null)
-			cmp.eAdapters().add(this);
-	}
-	/**
-	 * Remove this Adapter from @aRole and the ContainerManagedEntity
-	 * that the ContainerManagedEntityExtension container is pointing to.
-	 * This only works if @aRole is contained.
-	 */
-	protected void removeAdaptors(CommonRelationshipRole aRole) {
-		aRole.eAdapters().remove(this);
-		ContainerManagedEntity cmp = aRole.getSourceEntity();
-		if (cmp != null)
-			cmp.eAdapters().remove(this);
-	}
-	protected void addedRole(CommonRelationshipRole aRole) {
-		addAdaptors(aRole);
-		if ((getRelationship().eContainer() != null) && rolesFullyReflected())
-			reconcileRoleAttributes();
-	}
-	protected boolean rolesFullyReflected() {
-		List roles = getRelationship().getCommonRoles();
-		if (roles.isEmpty())
-			return false;
-		CommonRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (CommonRelationshipRole) roles.get(i);
-			if (role.getSourceEntity() == null)
-				return false;
-		}
-		return true;
-	}
-		
-	protected void removedRole(CommonRelationshipRole aRole) {
-		removeAdaptors(aRole);
-		if (getRelationship().eContainer() != null) {
-			aRole.reconcileAttributes();
-			reconcileRoleAttributes();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier notifier) {
-		//Only set the target if it is a CommonRelationship
-		if (notifier == null || notifier instanceof CommonRelationship)
-			super.setTarget(notifier);
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/ConvertedEJBAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/ConvertedEJBAdapter.java
deleted file mode 100644
index d2ac77f2f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/ConvertedEJBAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-
-public class ConvertedEJBAdapter extends AdapterImpl {
-
-	public static final String ADAPTER_KEY = "ConvertedEJBAdpater";  //$NON-NLS-1$
-	public static final int VERSION_1_0 = 1;
-	
-	protected int version = -1;
-	protected boolean readOnly = false;
-	
-	
-	/**
-	 * Constructor for ConvertedEJBAdapter.
-	 */
-	public ConvertedEJBAdapter() {
-		super();
-	}
-
-	/**
-	 * Gets the version.  This will be one of the static constants.
-	 * @return Returns a int
-	 */
-	public int getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets the version.  This should be one of the static constants.
-	 * @param version The version to set
-	 */
-	public void setVersion(int version) {
-		this.version = version;
-	}
-
-	/**
-	 * Gets the readOnly.
-	 * @return Returns a 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 isFromVersion1_0() {
-		return version == VERSION_1_0;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EJBAttributeMaintenanceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EJBAttributeMaintenanceFactoryImpl.java
deleted file mode 100644
index ca5559108..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EJBAttributeMaintenanceFactoryImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-public class EJBAttributeMaintenanceFactoryImpl extends EjbAdapterFactory {
-	public static final String ADAPTER_KEY = "EJBAttributeMaintenance"; //$NON-NLS-1$
-	
-	public EJBAttributeMaintenanceFactoryImpl() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.util.EjbAdapterFactory#createAdapter(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public Adapter createAdapter(Notifier target) {
-		Adapter targetAdapter = (Adapter) modelSwitch.doSwitch((EObject)target);
-		return ExtendedEcoreUtil.createAdapterForLoading(targetAdapter, (EObject) target);
-	}
-
-
-	public Adapter createEJBRelationAdapter() {
-		return new EJBRelationAttributeMaintenanceAdapter();
-	}
-	
-	public Adapter createRelationshipsAdapter() {
-		return new RelationshipsAttributeMaintenanceAdapter();
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return ADAPTER_KEY == type;
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EJBRelationAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EJBRelationAttributeMaintenanceAdapter.java
deleted file mode 100644
index ebcf71844..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EJBRelationAttributeMaintenanceAdapter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import org.eclipse.emf.ecore.EObject;
-
-public class EJBRelationAttributeMaintenanceAdapter extends CommonRelationshipAttributeMaintenanceAdapter {
-	/**
-	 * Constructor for EJBRelationAttributeMaintenanceAdapter.
-	 * @param aRelationship
-	 */
-	public EJBRelationAttributeMaintenanceAdapter() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.ejb.internal.util.CommonRelationshipAttributeMaintenanceAdapter#isRelationshipRolesSF(EObject)
-	 */
-	protected boolean isRelationshipRolesSF(EObject sf) {
-		return sf == EJB_PACK.getEJBRelation_RelationshipRoles();
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.ejb.internal.util.CommonRelationshipAttributeMaintenanceAdapter#isRelationshipsSF(EObject)
-	 */
-	protected boolean isRelationshipsSF(EObject sf) {
-		return sf == EJB_PACK.getRelationships_EjbRelations();
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return EJBAttributeMaintenanceFactoryImpl.ADAPTER_KEY == type;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EjbAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EjbAdapterFactory.java
deleted file mode 100644
index 412ac027f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EjbAdapterFactory.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEAttribute;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-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.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-
-public class EjbAdapterFactory extends AdapterFactoryImpl {
-	protected static EjbPackage modelPackage;
-	public EjbAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (EjbPackage) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject) type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-	protected EjbSwitch sw = new EjbSwitch() {
-		public Object caseMethodPermission(MethodPermission object) {
-			return createMethodPermissionAdapter();
-		}
-		public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-			return createAssemblyDescriptorAdapter();
-		}
-		public Object caseMethodTransaction(MethodTransaction object) {
-			return createMethodTransactionAdapter();
-		}
-		public Object caseEnterpriseBean(EnterpriseBean object) {
-			return createEnterpriseBeanAdapter();
-		}
-		public Object caseEntity(Entity object) {
-			return createEntityAdapter();
-		}
-		public Object caseContainerManagedEntity(ContainerManagedEntity object) {
-			return createContainerManagedEntityAdapter();
-		}
-		public Object caseCMPAttribute(CMPAttribute object) {
-			return createCMPAttributeAdapter();
-		}
-		public Object caseCMRField(CMRField object) {
-			return createCMRFieldAdapter();
-		}
-		public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-			return createEJBRelationshipRoleAdapter();
-		}
-		public Object caseEJBRelation(EJBRelation object) {
-			return createEJBRelationAdapter();
-		}
-		public Object caseRelationships(Relationships object) {
-			return createRelationshipsAdapter();
-		}
-		public Object caseEJBJar(EJBJar object) {
-			return createEJBJarAdapter();
-		}
-		public Object caseRoleSource(RoleSource object) {
-			return createRoleSourceAdapter();
-		}
-		public Object caseQuery(Query object) {
-			return createQueryAdapter();
-		}
-		public Object caseQueryMethod(QueryMethod object) {
-			return createQueryMethodAdapter();
-		}
-		public Object caseMethodElement(MethodElement object) {
-			return createMethodElementAdapter();
-		}
-		public Object caseExcludeList(ExcludeList object) {
-			return createExcludeListAdapter();
-		}
-		public Object caseSession(Session object) {
-			return createSessionAdapter();
-		}
-		public Object caseMessageDriven(MessageDriven object) {
-			return createMessageDrivenAdapter();
-		}
-		public Object caseMessageDrivenDestination(MessageDrivenDestination object) {
-			return createMessageDrivenDestinationAdapter();
-		}
-		public Object caseActivationConfig(ActivationConfig object) {
-			return createActivationConfigAdapter();
-		}
-		public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-			return createActivationConfigPropertyAdapter();
-		}
-		public Object caseEJBMethodCategory(EJBMethodCategory object) {
-			return createEJBMethodCategoryAdapter();
-		}
-		public Object caseEAttribute(EAttribute object) {
-			return createEAttributeAdapter();
-		}
-		public Object caseEStructuralFeature(EStructuralFeature object) {
-			return createEStructuralFeatureAdapter();
-		}
-		public Object caseEModelElement(EModelElement object) {
-			return createEModelElementAdapter();
-		}
-		public Object caseENamedElement(ENamedElement object) {
-			return createENamedElementAdapter();
-		}
-	};
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter) sw.doSwitch((EObject) target);
-	}
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases
-	 * anyway.
-	 */
-	public Adapter createMethodPermissionAdapter() {
-		return null;
-	}
-	public Adapter createAssemblyDescriptorAdapter() {
-		return null;
-	}
-	public Adapter createMethodTransactionAdapter() {
-		return null;
-	}
-	public Adapter createEnterpriseBeanAdapter() {
-		return null;
-	}
-	public Adapter createEntityAdapter() {
-		return null;
-	}
-	public Adapter createContainerManagedEntityAdapter() {
-		return null;
-	}
-	public Adapter createCMPAttributeAdapter() {
-		return null;
-	}
-	public Adapter createCMRFieldAdapter() {
-		return null;
-	}
-	public Adapter createEJBRelationshipRoleAdapter() {
-		return null;
-	}
-	public Adapter createEJBRelationAdapter() {
-		return null;
-	}
-	public Adapter createRelationshipsAdapter() {
-		return null;
-	}
-	public Adapter createEJBJarAdapter() {
-		return null;
-	}
-	public Adapter createRoleSourceAdapter() {
-		return null;
-	}
-	public Adapter createQueryAdapter() {
-		return null;
-	}
-	public Adapter createQueryMethodAdapter() {
-		return null;
-	}
-	public Adapter createMethodElementAdapter() {
-		return null;
-	}
-	public Adapter createExcludeListAdapter() {
-		return null;
-	}
-	public Adapter createSessionAdapter() {
-		return null;
-	}
-	public Adapter createMessageDrivenAdapter() {
-		return null;
-	}
-	public Adapter createMessageDrivenDestinationAdapter() {
-		return null;
-	}
-	public Adapter createEJBMethodCategoryAdapter() {
-		return null;
-	}
-	public Adapter createEClassAdapter() {
-		return null;
-	}
-	public Adapter createEAttributeAdapter() {
-		return null;
-	}
-	public Adapter createEStructuralFeatureAdapter() {
-		return null;
-	}
-	public Adapter createEClassifierAdapter() {
-		return null;
-	}
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-	public Adapter createENamedElementAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EjbSwitch modelSwitch =
-		new EjbSwitch() {
-			public Object caseContainerManagedEntity(ContainerManagedEntity object) {
-				return createContainerManagedEntityAdapter();
-			}
-			public Object caseMethodPermission(MethodPermission object) {
-				return createMethodPermissionAdapter();
-			}
-			public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-				return createAssemblyDescriptorAdapter();
-			}
-			public Object caseMethodTransaction(MethodTransaction object) {
-				return createMethodTransactionAdapter();
-			}
-			public Object caseSession(Session object) {
-				return createSessionAdapter();
-			}
-			public Object caseEntity(Entity object) {
-				return createEntityAdapter();
-			}
-			public Object caseEnterpriseBean(EnterpriseBean object) {
-				return createEnterpriseBeanAdapter();
-			}
-			public Object caseEJBMethodCategory(EJBMethodCategory object) {
-				return createEJBMethodCategoryAdapter();
-			}
-			public Object caseEJBJar(EJBJar object) {
-				return createEJBJarAdapter();
-			}
-			public Object caseMethodElement(MethodElement object) {
-				return createMethodElementAdapter();
-			}
-			public Object caseCMPAttribute(CMPAttribute object) {
-				return createCMPAttributeAdapter();
-			}
-			public Object caseRelationships(Relationships object) {
-				return createRelationshipsAdapter();
-			}
-			public Object caseQuery(Query object) {
-				return createQueryAdapter();
-			}
-			public Object caseEJBRelation(EJBRelation object) {
-				return createEJBRelationAdapter();
-			}
-			public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-				return createEJBRelationshipRoleAdapter();
-			}
-			public Object caseRoleSource(RoleSource object) {
-				return createRoleSourceAdapter();
-			}
-			public Object caseCMRField(CMRField object) {
-				return createCMRFieldAdapter();
-			}
-			public Object caseMessageDriven(MessageDriven object) {
-				return createMessageDrivenAdapter();
-			}
-			public Object caseMessageDrivenDestination(MessageDrivenDestination object) {
-				return createMessageDrivenDestinationAdapter();
-			}
-			public Object caseExcludeList(ExcludeList object) {
-				return createExcludeListAdapter();
-			}
-			public Object caseQueryMethod(QueryMethod object) {
-				return createQueryMethodAdapter();
-			}
-			public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-				return createActivationConfigPropertyAdapter();
-			}
-			public Object caseActivationConfig(ActivationConfig object) {
-				return createActivationConfigAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-				return createJNDIEnvRefsGroupAdapter();
-			}
-			public Object caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			public Object caseENamedElement(ENamedElement object) {
-				return createENamedElementAdapter();
-			}
-			public Object caseETypedElement(ETypedElement object) {
-				return createETypedElementAdapter();
-			}
-			public Object caseEStructuralFeature(EStructuralFeature object) {
-				return createEStructuralFeatureAdapter();
-			}
-			public Object caseEAttribute(EAttribute object) {
-				return createEAttributeAdapter();
-			}
-			public Object caseJ2EEEAttribute(J2EEEAttribute object) {
-				return createJ2EEEAttributeAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases
-	 * anyway.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMethodPermissionAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAssemblyDescriptorAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMethodTransactionAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEnterpriseBeanAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEntityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createContainerManagedEntityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createCMPAttributeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createCMRFieldAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBRelationshipRoleAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBRelationAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRelationshipsAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBJarAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRoleSourceAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createQueryAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createQueryMethodAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.ejb.ActivationConfigProperty <em>Activation Config Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfigProperty
-	 * @generated
-	 */
-	public Adapter createActivationConfigPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.ejb.ActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.ejb.ActivationConfig
-	 * @generated
-	 */
-	public Adapter createActivationConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	public Adapter createJNDIEnvRefsGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMethodElementAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createExcludeListAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSessionAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMessageDrivenAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMessageDrivenDestinationAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBMethodCategoryAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEAttributeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEAttribute <em>J2EEE Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEAttribute
-	 * @generated
-	 */
-	public Adapter createJ2EEEAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEStructuralFeatureAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEModelElementAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createENamedElementAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ETypedElement <em>ETyped Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.ETypedElement
-	 * @generated
-	 */
-	public Adapter createETypedElementAdapter() {
-		return null;
-	}
-
-} //EjbAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EjbSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EjbSwitch.java
deleted file mode 100644
index cfa6c182f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/EjbSwitch.java
+++ /dev/null
@@ -1,836 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEAttribute;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-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.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.ejb.EjbPackage
- * @generated
- */
-public class EjbSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EjbPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbSwitch() {
-		if (modelPackage == null) {
-			modelPackage = EjbPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY: {
-				ContainerManagedEntity containerManagedEntity = (ContainerManagedEntity)theEObject;
-				Object result = caseContainerManagedEntity(containerManagedEntity);
-				if (result == null) result = caseEntity(containerManagedEntity);
-				if (result == null) result = caseEnterpriseBean(containerManagedEntity);
-				if (result == null) result = caseJNDIEnvRefsGroup(containerManagedEntity);
-				if (result == null) result = caseCompatibilityDescriptionGroup(containerManagedEntity);
-				if (result == null) result = caseDescriptionGroup(containerManagedEntity);
-				if (result == null) result = caseJ2EEEObject(containerManagedEntity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.METHOD_PERMISSION: {
-				MethodPermission methodPermission = (MethodPermission)theEObject;
-				Object result = caseMethodPermission(methodPermission);
-				if (result == null) result = caseJ2EEEObject(methodPermission);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ASSEMBLY_DESCRIPTOR: {
-				AssemblyDescriptor assemblyDescriptor = (AssemblyDescriptor)theEObject;
-				Object result = caseAssemblyDescriptor(assemblyDescriptor);
-				if (result == null) result = caseJ2EEEObject(assemblyDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.METHOD_TRANSACTION: {
-				MethodTransaction methodTransaction = (MethodTransaction)theEObject;
-				Object result = caseMethodTransaction(methodTransaction);
-				if (result == null) result = caseJ2EEEObject(methodTransaction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.SESSION: {
-				Session session = (Session)theEObject;
-				Object result = caseSession(session);
-				if (result == null) result = caseEnterpriseBean(session);
-				if (result == null) result = caseJNDIEnvRefsGroup(session);
-				if (result == null) result = caseCompatibilityDescriptionGroup(session);
-				if (result == null) result = caseDescriptionGroup(session);
-				if (result == null) result = caseJ2EEEObject(session);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ENTITY: {
-				Entity entity = (Entity)theEObject;
-				Object result = caseEntity(entity);
-				if (result == null) result = caseEnterpriseBean(entity);
-				if (result == null) result = caseJNDIEnvRefsGroup(entity);
-				if (result == null) result = caseCompatibilityDescriptionGroup(entity);
-				if (result == null) result = caseDescriptionGroup(entity);
-				if (result == null) result = caseJ2EEEObject(entity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ENTERPRISE_BEAN: {
-				EnterpriseBean enterpriseBean = (EnterpriseBean)theEObject;
-				Object result = caseEnterpriseBean(enterpriseBean);
-				if (result == null) result = caseJNDIEnvRefsGroup(enterpriseBean);
-				if (result == null) result = caseCompatibilityDescriptionGroup(enterpriseBean);
-				if (result == null) result = caseDescriptionGroup(enterpriseBean);
-				if (result == null) result = caseJ2EEEObject(enterpriseBean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_METHOD_CATEGORY: {
-				EJBMethodCategory ejbMethodCategory = (EJBMethodCategory)theEObject;
-				Object result = caseEJBMethodCategory(ejbMethodCategory);
-				if (result == null) result = caseJ2EEEObject(ejbMethodCategory);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_JAR: {
-				EJBJar ejbJar = (EJBJar)theEObject;
-				Object result = caseEJBJar(ejbJar);
-				if (result == null) result = caseCompatibilityDescriptionGroup(ejbJar);
-				if (result == null) result = caseDescriptionGroup(ejbJar);
-				if (result == null) result = caseJ2EEEObject(ejbJar);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.METHOD_ELEMENT: {
-				MethodElement methodElement = (MethodElement)theEObject;
-				Object result = caseMethodElement(methodElement);
-				if (result == null) result = caseJ2EEEObject(methodElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.CMP_ATTRIBUTE: {
-				CMPAttribute cmpAttribute = (CMPAttribute)theEObject;
-				Object result = caseCMPAttribute(cmpAttribute);
-				if (result == null) result = caseJ2EEEAttribute(cmpAttribute);
-				if (result == null) result = caseEAttribute(cmpAttribute);
-				if (result == null) result = caseEStructuralFeature(cmpAttribute);
-				if (result == null) result = caseETypedElement(cmpAttribute);
-				if (result == null) result = caseENamedElement(cmpAttribute);
-				if (result == null) result = caseEModelElement(cmpAttribute);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.RELATIONSHIPS: {
-				Relationships relationships = (Relationships)theEObject;
-				Object result = caseRelationships(relationships);
-				if (result == null) result = caseJ2EEEObject(relationships);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.QUERY: {
-				Query query = (Query)theEObject;
-				Object result = caseQuery(query);
-				if (result == null) result = caseJ2EEEObject(query);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_RELATION: {
-				EJBRelation ejbRelation = (EJBRelation)theEObject;
-				Object result = caseEJBRelation(ejbRelation);
-				if (result == null) result = caseJ2EEEObject(ejbRelation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EJB_RELATIONSHIP_ROLE: {
-				EJBRelationshipRole ejbRelationshipRole = (EJBRelationshipRole)theEObject;
-				Object result = caseEJBRelationshipRole(ejbRelationshipRole);
-				if (result == null) result = caseJ2EEEObject(ejbRelationshipRole);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ROLE_SOURCE: {
-				RoleSource roleSource = (RoleSource)theEObject;
-				Object result = caseRoleSource(roleSource);
-				if (result == null) result = caseJ2EEEObject(roleSource);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.CMR_FIELD: {
-				CMRField cmrField = (CMRField)theEObject;
-				Object result = caseCMRField(cmrField);
-				if (result == null) result = caseCMPAttribute(cmrField);
-				if (result == null) result = caseJ2EEEAttribute(cmrField);
-				if (result == null) result = caseEAttribute(cmrField);
-				if (result == null) result = caseEStructuralFeature(cmrField);
-				if (result == null) result = caseETypedElement(cmrField);
-				if (result == null) result = caseENamedElement(cmrField);
-				if (result == null) result = caseEModelElement(cmrField);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.MESSAGE_DRIVEN: {
-				MessageDriven messageDriven = (MessageDriven)theEObject;
-				Object result = caseMessageDriven(messageDriven);
-				if (result == null) result = caseEnterpriseBean(messageDriven);
-				if (result == null) result = caseJNDIEnvRefsGroup(messageDriven);
-				if (result == null) result = caseCompatibilityDescriptionGroup(messageDriven);
-				if (result == null) result = caseDescriptionGroup(messageDriven);
-				if (result == null) result = caseJ2EEEObject(messageDriven);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION: {
-				MessageDrivenDestination messageDrivenDestination = (MessageDrivenDestination)theEObject;
-				Object result = caseMessageDrivenDestination(messageDrivenDestination);
-				if (result == null) result = caseJ2EEEObject(messageDrivenDestination);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.EXCLUDE_LIST: {
-				ExcludeList excludeList = (ExcludeList)theEObject;
-				Object result = caseExcludeList(excludeList);
-				if (result == null) result = caseJ2EEEObject(excludeList);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.QUERY_METHOD: {
-				QueryMethod queryMethod = (QueryMethod)theEObject;
-				Object result = caseQueryMethod(queryMethod);
-				if (result == null) result = caseMethodElement(queryMethod);
-				if (result == null) result = caseJ2EEEObject(queryMethod);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: {
-				ActivationConfigProperty activationConfigProperty = (ActivationConfigProperty)theEObject;
-				Object result = caseActivationConfigProperty(activationConfigProperty);
-				if (result == null) result = caseJ2EEEObject(activationConfigProperty);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EjbPackage.ACTIVATION_CONFIG: {
-				ActivationConfig activationConfig = (ActivationConfig)theEObject;
-				Object result = caseActivationConfig(activationConfig);
-				if (result == null) result = caseJ2EEEObject(activationConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Container Managed Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Container Managed Entity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContainerManagedEntity(ContainerManagedEntity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Permission</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPermission(MethodPermission object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Assembly Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Assembly Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Transaction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Transaction</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodTransaction(MethodTransaction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Session</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Session</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSession(Session object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Entity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEntity(Entity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Enterprise Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Enterprise Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEnterpriseBean(EnterpriseBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Method Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Method Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBMethodCategory(EJBMethodCategory object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Jar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Jar</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBJar(EJBJar object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodElement(MethodElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>CMP Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>CMP Attribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCMPAttribute(CMPAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Relationships</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Relationships</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRelationships(Relationships object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Query</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQuery(Query object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Relation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Relation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBRelation(EJBRelation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Relationship Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Relationship Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Source</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Source</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleSource(RoleSource object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>CMR Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>CMR Field</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCMRField(CMRField object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Driven</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Driven</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDriven(MessageDriven object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Driven Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Driven Destination</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDrivenDestination(MessageDrivenDestination object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Exclude List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Exclude List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExcludeList(ExcludeList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Query Method</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Query Method</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQueryMethod(QueryMethod object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Config Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationConfig(ActivationConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseENamedElement(ENamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseETypedElement(ETypedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEStructuralFeature(EStructuralFeature object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EAttribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EAttribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEAttribute(EAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Attribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEAttribute(J2EEEAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //EjbSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/MDBActivationConfigModelUtil.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/MDBActivationConfigModelUtil.java
deleted file mode 100644
index 52451520f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/MDBActivationConfigModelUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Created on Jan 30, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import java.util.HashMap;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class MDBActivationConfigModelUtil {
-    
-    public static HashMap activationConfigMap;
-    
-    public static final String ackModeKey = "acknowledgeMode"; //$NON-NLS-1$
-
-    public static final String destinationTypeKey = "destinationType";//$NON-NLS-1$
-
-    public static final String durabilityKey = "subscriptionDurability";//$NON-NLS-1$
-
-    public static final String messageSelectorKey = "messageSelector";//$NON-NLS-1$
-
-    public static final String[] ackModeValues = new String[] { "Auto-acknowledge", "Dups-ok-acknowledge" }; //$NON-NLS-1$ //$NON-NLS-2$
-
-    public static final String[] destinationTypeValues = new String[] { "javax.jms.Queue", "javax.jms.Topic" };//$NON-NLS-1$ //$NON-NLS-2$
-
-    public static final String[] durabilityValue = new String[] { "Durable", "NonDurable" };//$NON-NLS-1$ //$NON-NLS-2$
-
-    /**
-     * 
-     */
-    public MDBActivationConfigModelUtil() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
-    
-    public static HashMap createStandardActivationConfigMap() {
-        activationConfigMap = new HashMap();
-        activationConfigMap.put(ackModeKey, ackModeValues);
-        activationConfigMap.put(destinationTypeKey, destinationTypeValues);
-        activationConfigMap.put(durabilityKey, durabilityValue);
-        activationConfigMap.put(messageSelectorKey, ""); //$NON-NLS-1$
-        return activationConfigMap;
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/MethodElementHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/MethodElementHelper.java
deleted file mode 100644
index 768ec9c5e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/MethodElementHelper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-
-
-/**
- * @author cbridgha
- *
- * 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 MethodElementHelper {
-	public static final int NONE = 0;
-	public static final int METHOD_PERMISSION = 1;
-	public static final int METHOD_TRANSACTION = 2;
-	public static final int EXCLUDE_LIST = 3;
-	public static int getContainedType(MethodElement me) {
-		EObject container = me.eContainer();
-		if (container == null)
-			return NONE;
-		if (container instanceof MethodPermission)
-			return METHOD_PERMISSION;
-		if (container instanceof MethodTransaction)
-			return METHOD_TRANSACTION;
-		if (container instanceof ExcludeList)
-			return EXCLUDE_LIST;
-		return NONE;
-	}
-	public static MethodPermission getMethodPermission(MethodElement me) {
-		if (METHOD_PERMISSION == getContainedType(me))
-			return (MethodPermission) me.eContainer();
-		return null;
-	}
-	public static MethodTransaction getMethodTransaction(MethodElement me) {
-		if (METHOD_TRANSACTION == getContainedType(me))
-			return (MethodTransaction) me.eContainer();
-		return null;
-	}
-	public static ExcludeList getExcludeList(MethodElement me) {
-		if (EXCLUDE_LIST == getContainedType(me))
-			return (ExcludeList) me.eContainer();
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/RelationshipsAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/RelationshipsAttributeMaintenanceAdapter.java
deleted file mode 100644
index 2a0ae8826..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/util/RelationshipsAttributeMaintenanceAdapter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.internal.util;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-public class RelationshipsAttributeMaintenanceAdapter extends AdapterImpl {
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		if ((EStructuralFeature)msg.getFeature() == EjbFactoryImpl.getPackage().getRelationships_EjbRelations()) {
-			switch (msg.getEventType()) {
-				case Notification.ADD :
-					addedEJBRelation((EJBRelation) msg.getNewValue(), (EStructuralFeature)msg.getFeature());
-					break;
-				case Notification.REMOVE :
-					removedEJBRelation((EJBRelation) msg.getOldValue(), (EStructuralFeature)msg.getFeature());
-					break;
-			}
-		}
-	}
-	private void removedEJBRelation(EJBRelation aRelation, EObject sf) {
-		Adapter a = getAdapter(aRelation);
-		if (a != null) {
-			Notification not = new ENotificationImpl((InternalEObject)aRelation, Notification.REMOVE,(EStructuralFeature) sf, aRelation, null, Notification.NO_INDEX);
-			a.notifyChanged(not);
-		}
-	}
-	private void addedEJBRelation(EJBRelation aRelation, EObject sf) {
-		Adapter a = getAdapter(aRelation);
-		if (a != null) {
-			Notification not = new ENotificationImpl((InternalEObject)aRelation, Notification.ADD,(EStructuralFeature) sf, null, aRelation, Notification.NO_INDEX);
-			a.notifyChanged(not);
-		}
-	}
-	private Adapter getAdapter(EObject anObject) {
-		return EcoreUtil.getAdapter(anObject.eAdapters(),EJBAttributeMaintenanceFactoryImpl.ADAPTER_KEY);
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/package.xml
deleted file mode 100644
index 5cca7958d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the enterprise bean module model api. Using this api the artifacts of an enterprise bean app
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/DefaultEJBModelExtenderProvider.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/DefaultEJBModelExtenderProvider.java
deleted file mode 100644
index f921460a5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/DefaultEJBModelExtenderProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 25, 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;
-
-/**
- * @author mdelder
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DefaultEJBModelExtenderProvider implements IEJBModelExtenderProvider {
-    
-	/**
-	 * 
-	 */
-	public DefaultEJBModelExtenderProvider() {
-		super();
-		
-	}
-	
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider#getEJBModuleExtension(java.lang.Object)
-     */
-    public EjbModuleExtensionHelper getEJBModuleExtension(Object context) {
-        return null;
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider#hasEJBModuleExtension(java.lang.Object)
-     */
-    public boolean hasEJBModuleExtension(Object context) {
-        return getEJBModuleExtension(context) != null;
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EJBModelExtenderManager.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EJBModelExtenderManager.java
deleted file mode 100644
index 616e889ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EJBModelExtenderManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 19, 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;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EJBModelExtenderManager implements IEJBModelExtenderManager { 
-
-    private IEJBModelExtenderProvider provider = new DefaultEJBModelExtenderProvider();
-    
-    /**
-     * @deprecated Should use IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
-     */
-    public static EjbModuleExtensionHelper getEJBModuleExtension() {
-        return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
-    }
-
-    public EjbModuleExtensionHelper getEJBModuleExtension(Object context) {
-        return provider.getEJBModuleExtension(context);
-    }
-    
-    public boolean hasEJBModuleExtension(Object context) {
-        return getEJBModuleExtension(context) != null;
-    } 
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderManager#setProvider(org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider)
-     */
-    public void setProvider(IEJBModelExtenderProvider provider) {
-        this.provider = provider;
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderManager#isProviderSet()
-     */
-    public boolean isProviderSet() {
-        return !(this.provider instanceof DefaultEJBModelExtenderProvider);
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EjbModuleExtensionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EjbModuleExtensionHelper.java
deleted file mode 100644
index 0002f56eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EjbModuleExtensionHelper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 19, 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;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-
-/**
- * This is a helper used for deriving the JNDI name of enterprise beans,
- * and for inheritance support.  The helper can be plugged in by application
- * server vendors.
- */
-
-public interface EjbModuleExtensionHelper extends J2EEModuleExtensionHelper {
-	List getSubtypes(EnterpriseBean anEJB);
-	EnterpriseBean getSuperType(EnterpriseBean anEJB);
-	List getRoleMethodNamesExtended(ContainerManagedEntity cmp);
-	String getEJBInheritanceFileName();
-	String getJNDIName(EJBJar jar, EnterpriseBean bean); 
-	List getRelationships_cmp11(EJBJar jar);
-	List getLocalRelationshipRoles_cmp11(ContainerManagedEntity cmp);
-	boolean isEJBInheritanceSupported();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ExceptionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ExceptionHelper.java
deleted file mode 100644
index cdd7d065d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ExceptionHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-/**
- * Utility class to factor common code for implementers of IWrappedException
- */
-public class ExceptionHelper {
-/**
- * Utility class; cannot be instantiated
- */
-private ExceptionHelper() {
-	super();
-}
-/**
- * Return the messages from @exception and all nested exceptions, in order from outermost to innermost
- */
-public static java.lang.String[] getAllMessages(IWrappedException exception) {
-	List messages = new ArrayList(4);
-	messages.add(exception.getMessage());
-	Exception nested = exception.getNestedException();
-	while (nested != null) {
-		messages.add(nested.getMessage());
-		if (nested instanceof IWrappedException) 
-			nested = ((IWrappedException)nested).getNestedException();
-		else
-			nested = null;
-	}
-	return (String[])messages.toArray(new String[messages.size()]);
-}
-/**
- * Return the messages from @exception and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public static String getConcatenatedMessages(IWrappedException exception) {
-	String[] messages = getAllMessages(exception);
-	StringBuffer sb = new StringBuffer(256);
-	for (int i = 0; i < messages.length; i++){
-		sb.append(messages[i]);
-		if (i < messages.length-1)
-			sb.append('\n');
-	}
-	return sb.toString();
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderManager.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderManager.java
deleted file mode 100644
index f72b2f95b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * The IEJBModelExtenderManager replaces the former J2EEModuleExtensionManager and acts
- * as a facade for a single IEJBModelExtenderProvider. The IEJBModelExtenderProvider will
- * provide the correct extension helper based on a given context (@see IEJBModelExtenderProvider).
- * 
- * @author mdelder
- *  
- */
-public interface IEJBModelExtenderManager extends IEJBModelExtenderProvider {
-
-    IEJBModelExtenderManager INSTANCE = new EJBModelExtenderManager();
-
-    /**
-     * 
-     * @return true if the provider for which the manager is a facade has been set
-     */
-    boolean isProviderSet();
-
-    /**
-     * 
-     * @param provider the manager will act as a facade to the given provider
-     */
-    void setProvider(IEJBModelExtenderProvider provider);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderProvider.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderProvider.java
deleted file mode 100644
index 28f285bfc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 25, 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;
-
-/**
- * @author mdelder
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEJBModelExtenderProvider {
-
-    /**
-     * 
-     * @param context a supplied object to determine the context (e.g. IProject if available)
-     * @return the appropriate EjbModuleExtensionHelper or <b>null</b> if none exists
-     */
-    EjbModuleExtensionHelper getEJBModuleExtension(Object context);
-
-    /**
-     * 
-     * @param context a supplied object to determine the context (e.g. IProject if available)
-     * @return true if the given context has an extension 
-     */
-    boolean hasEJBModuleExtension(Object context);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IWrappedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IWrappedException.java
deleted file mode 100644
index cce0218be..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IWrappedException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-/**
- * Common interface for WrappedRuntime and Wrapped exceptions, which can contain nested exceptions
- */
-public interface IWrappedException {
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
-public String[] getAllMessages();
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public String getConcatenatedMessages();
-public String getMessage();
-public java.lang.Exception getNestedException();
-public void printStackTrace();
-public void printStackTrace(java.io.PrintStream s);
-public void printStackTrace(java.io.PrintWriter s);
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
deleted file mode 100644
index f762c684c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.emf.common.util.URI;
-
-
-
-/**
- * This is a catalog of useful constants for the archive support.  Can be used to
- * store relative paths to specific xml and xmi resources.  
- */
-public interface J2EEConstants extends J2EEVersionConstants {
-	//Standard Jar info
-		/** "META-INF/MANIFEST.MF" 												*/
-	String MANIFEST_URI	 				=	"META-INF/MANIFEST.MF"; //$NON-NLS-1$
-	URI MANIFEST_URI_OBJ	 			=	URI.createURI(MANIFEST_URI);
-	String MANIFEST_SHORT_NAME			= 	"MANIFEST.MF"; //$NON-NLS-1$
-
-		/** "META-INF" 															*/
-	String META_INF						=	"META-INF"; //$NON-NLS-1$
-	/** "WEB-INF"  															*/
-	String WEB_INF						= 	"WEB-INF"; //$NON-NLS-1$
-	String WEB_INF_CLASSES				=	"WEB-INF/classes"; //$NON-NLS-1$
-	String WEB_INF_LIB					=	"WEB-INF/lib"; //$NON-NLS-1$
-	/** "ALT-INF"  															*/
-	String ALT_INF						= 	"ALT-INF"; //$NON-NLS-1$
-	//Application client info
-	/** "Application-client_ID"  											*/
-	String APP_CLIENT_ID       			=   "Application-client_ID"; //$NON-NLS-1$
-	/** "META-INF/application-client.xml"  									*/
-	String APP_CLIENT_DD_URI			= 	"META-INF/application-client.xml"; //$NON-NLS-1$
-	URI APP_CLIENT_DD_URI_OBJ		= 	URI.createURI(APP_CLIENT_DD_URI);
-	/** "application-client.xml"  											*/
-	String APP_CLIENT_DD_SHORT_NAME		= 	"application-client.xml"; //$NON-NLS-1$
-	/** Doc type for app client deployment descriptors */
-	String APP_CLIENT_DOCTYPE 			= 	"application-client"; //$NON-NLS-1$
-	String APP_CLIENT_PUBLICID_1_2		=   "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN"; //$NON-NLS-1$
-	String APP_CLIENT_PUBLICID_1_3		=   "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"; //$NON-NLS-1$
-	String APP_CLIENT_SYSTEMID_1_2		= 	"http://java.sun.com/j2ee/dtds/application-client_1_2.dtd"; //$NON-NLS-1$
-	String APP_CLIENT_ALT_SYSTEMID_1_2	= 	"http://java.sun.com/j2ee/dtds/application-client_1.2.dtd"; //$NON-NLS-1$
-	String APP_CLIENT_SYSTEMID_1_3		= 	"http://java.sun.com/dtd/application-client_1_3.dtd"; //$NON-NLS-1$
-	String APP_CLIENT_ALT_SYSTEMID_1_3	= 	"http://java.sun.com/dtd/application-client_1.3.dtd"; //$NON-NLS-1$
-	String APP_CLIENT_SCHEMA_1_4       =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";//$NON-NLS-1$
-	
-	
-	//Application constants
-	/** "Application_ID"													*/
-	String APPL_ID						=	"Application_ID"; //$NON-NLS-1$
-	/** "META-INF/application.xml" 											*/
-	String APPLICATION_DD_URI			=	"META-INF/application.xml"; //$NON-NLS-1$
-	URI APPLICATION_DD_URI_OBJ			= 	URI.createURI(APPLICATION_DD_URI);
-	/** "application.xml" 													*/
-	String APPLICATION_DD_SHORT_NAME	=	"application.xml"; //$NON-NLS-1$
-	String EAR_FILE_EXT = ".ear"; ////$NON-NLS-1$
-	/** Doc type for application deployment descriptors */
-	String APPLICATION_DOCTYPE 			= 	"application"; //$NON-NLS-1$
-	String APPLICATION_PUBLICID_1_2		=   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN"; //$NON-NLS-1$
-	String APPLICATION_PUBLICID_1_3		=   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"; //$NON-NLS-1$
-	String APPLICATION_PUBLICID_1_4		=   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.4//EN"; //$NON-NLS-1$
-	String APPLICATION_SYSTEMID_1_2		= 	"http://java.sun.com/j2ee/dtds/application_1_2.dtd"; //$NON-NLS-1$
-	String APPLICATION_ALT_SYSTEMID_1_2	= 	"http://java.sun.com/j2ee/dtds/application_1.2.dtd"; //$NON-NLS-1$
-	String APPLICATION_SYSTEMID_1_3		= 	"http://java.sun.com/dtd/application_1_3.dtd"; //$NON-NLS-1$
-	String APPLICATION_ALT_SYSTEMID_1_3	= 	"http://java.sun.com/dtd/application_1.3.dtd"; //$NON-NLS-1$
-	String APPLICATION_SYSTEMID_1_4		= 	"http://java.sun.com/dtd/application_1_4.dtd"; //$NON-NLS-1$
-	String APPLICATION_SCHEMA_1_4       =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";//$NON-NLS-1$
-	
-	//EJB Jar Constants
-	/** "ejb-jar_ID"														*/
-	String EJBJAR_ID					=	"ejb-jar_ID"; //$NON-NLS-1$
-	/** "AssemblyDescriptor_ID"												*/
-	String ASSEMBLYDESCRIPTOR_ID		=   "AssemblyDescriptor_ID"; //$NON-NLS-1$
-	/** "ejb-jar.xml"														*/
-	String EJBJAR_DD_SHORT_NAME			=	"ejb-jar.xml"; //$NON-NLS-1$
-	/** "META-INF/ejb-jar.xml"												*/
-	String EJBJAR_DD_URI				=	"META-INF/ejb-jar.xml"; //$NON-NLS-1$
-	URI EJBJAR_DD_URI_OBJ				= 	URI.createURI(EJBJAR_DD_URI);
-	/** "META-INF/ibm-ejb-jar-bnd.xmi"										*/
-	String EJBJAR_DOCTYPE 				= 	"ejb-jar"; //$NON-NLS-1$
-	String EJBJAR_PUBLICID_1_1		=   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"; //$NON-NLS-1$
-	String EJBJAR_PUBLICID_2_0		=   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"; //$NON-NLS-1$
-	String EJBJAR_SYSTEMID_1_1		= 	"http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd"; //$NON-NLS-1$
-	String EJBJAR_ALT_SYSTEMID_1_1	= 	"http://java.sun.com/j2ee/dtds/ejb-jar_1.1.dtd"; //$NON-NLS-1$
-	String EJBJAR_SYSTEMID_2_0		= 	"http://java.sun.com/dtd/ejb-jar_2_0.dtd"; //$NON-NLS-1$
-	String EJBJAR_ALT_SYSTEMID_2_0	= 	"http://java.sun.com/dtd/ejb-jar_2.0.dtd"; //$NON-NLS-1$
-	String EJBJAR_SCHEMA_2_1        =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";//$NON-NLS-1$
-	String EJBJAR_SCHEMA_2_1_NS     =   "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";//$NON-NLS-1$
-	
-	//Web app Constants
-	/** "WebApp_ID"															*/
-	String WEBAPP_ID					=  	"WebApp_ID"; //$NON-NLS-1$
-	/** "WEB-INF/web.xml"													*/
-	String WEBAPP_DD_URI				= 	"WEB-INF/web.xml"; //$NON-NLS-1$
-	URI WEBAPP_DD_URI_OBJ				= 	URI.createURI(WEBAPP_DD_URI);
-	/** "web.xml"															*/
-	String WEBAPP_DD_SHORT_NAME			= 	"web.xml"; //$NON-NLS-1$
-	/** "WEB-INF/ibm-web-bnd.xmi"											*/
-	/** Doc type for web app deployment descriptors */
-	String WEBAPP_DOCTYPE 				= 	"web-app"; //$NON-NLS-1$
-	String CONTEXTROOT 					= "context-root"; //$NON-NLS-1$
-	String WEBAPP_PUBLICID_2_2		=   "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"; //$NON-NLS-1$
-	String WEBAPP_PUBLICID_2_3		=   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"; //$NON-NLS-1$
-	String WEBAPP_SYSTEMID_2_2		= 	"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"; //$NON-NLS-1$
-	String WEBAPP_ALT_SYSTEMID_2_2	= 	"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"; //$NON-NLS-1$
-	String WEBAPP_SYSTEMID_2_3		= 	"http://java.sun.com/dtd/web-app_2_3.dtd"; //$NON-NLS-1$
-	String WEBAPP_ALT_SYSTEMID_2_3	= 	"http://java.sun.com/dtd/web-app_2.3.dtd"; //$NON-NLS-1$
-	String WEBAPP_SCHEMA_2_4        =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";//$NON-NLS-1$
-	//J2C Resource Adapter Constants
-	/** "J2CResourceAdapter_ID"												*/
-	String RAR_ID						=  	"J2CResourceAdapter_ID"; //$NON-NLS-1$
-	/** "META-INF/ra.xml"													*/
-	String RAR_DD_URI					= 	"META-INF/ra.xml"; //$NON-NLS-1$
-	URI RAR_DD_URI_OBJ					= 	URI.createURI(RAR_DD_URI);
-	String RAR_SHORT_NAME				=	"ra.xml"; //$NON-NLS-1$
-	//Need connector constant.
-	String CONNECTOR_ID					=	"Connector_ID"; //$NON-NLS-1$
-	/** Doc type for connector deployment descriptors */
-	String CONNECTOR_DOCTYPE 			= 	"connector"; //$NON-NLS-1$
-	String CONNECTOR_PUBLICID_1_0		=   "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"; //$NON-NLS-1$
-	String CONNECTOR_SYSTEMID_1_0		= 	"http://java.sun.com/dtd/connector_1_0.dtd"; //$NON-NLS-1$
-	String CONNECTOR_ALT_SYSTEMID_1_0	= 	"http://java.sun.com/dtd/connector_1.0.dtd"; //$NON-NLS-1$
-	String CONNECTOR_SCHEMA_1_5         =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";//$NON-NLS-1$
-	
-	//Web Services Constants
-	/** Doc type for webservices deployment descriptors */
-	String WEB_SERVICES_CLIENT_DOCTYPE  	= "webservicesclient"; 	//$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_PUBLICID_1_0 = "-//IBM Corporation, Inc.//DTD J2EE Web services client 1.0//EN"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_SYSTEMID_1_0 = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$	
-	String WEB_SERVICES_CLIENT_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_SHORTNAME    = "webservicesclient.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_DD_URI			= 	"webservicesclient.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_META_INF_DD_URI	=   "META-INF/webservicesclient.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_WEB_INF_DD_URI	=   "WEB-INF/webservicesclient.xml"; //$NON-NLS-1$
-	URI WEB_SERVICES_CLIENT_DD_URI_OBJ			= 	URI.createURI(WEB_SERVICES_CLIENT_DD_URI);
-	URI WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ	= 	URI.createURI(WEB_SERVICES_CLIENT_META_INF_DD_URI);
-	URI WEB_SERVICES_CLIENT_WEB_INF_DD_URI_OBJ	= 	URI.createURI(WEB_SERVICES_CLIENT_WEB_INF_DD_URI);
-	
-	String WEB_SERVICES_DD_URI			= 	"webservices.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_META_INF_DD_URI	=   "META-INF/webservices.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_WEB_INF_DD_URI	=   "WEB-INF/webservices.xml"; //$NON-NLS-1$
-	URI WEB_SERVICES_DD_URI_OBJ			= 	URI.createURI(WEB_SERVICES_DD_URI);
-	URI WEB_SERVICES_META_INF_DD_URI_OBJ	= URI.createURI(WEB_SERVICES_META_INF_DD_URI);
-	URI WEB_SERVICES_WEB_INF_DD_URI_OBJ	= 	URI.createURI(WEB_SERVICES_WEB_INF_DD_URI);
-	
-	//Miscellaneous constants
-	/** "UTF-8"																*/
-	String DEFAULT_XML_ENCODING 		= 	"UTF-8"; //$NON-NLS-1$
-	/** "1.0"																*/
-	String DEFAULT_XML_VERSION			= 	"1.0"; //$NON-NLS-1$
-	String JAVA_SUN_COM_URL				=   "http://java.sun.com"; //$NON-NLS-1$
-	String WWW_W3_ORG_URL				=   "http://www.w3.org"; //$NON-NLS-1$
-	String WWW_IBM_COM_URL				=   "http://www.ibm.com"; //$NON-NLS-1$
-	
-	String J2EE_NS_URL 						= "http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$
-	String J2EE_1_4_XSD_SHORT_NAME			= "j2ee_1_4.xsd"; //$NON-NLS-1$
-	String XSI_NS_URL 						= "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-	String APPLICATION_SCHEMA_LOC_1_4 	= "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"; //$NON-NLS-1$
-	String APP_CLIENT_SCHEMA_LOC_1_4 	= "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$
-	String EJB_JAR_SCHEMA_LOC_2_1		= "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$
-	String CONNECTOR_SCHEMA_LOC_1_5		= "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"; //$NON-NLS-1$
-	String WEB_APP_SCHEMA_LOC_2_4		= "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$
-	String JSP_SCHEMA_LOC_2_0			=  "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"; //$NON-NLS-1$
-	
-	public static final String EAR_MODEL_NAME = "EAR_VALIDATION"; //$NON-NLS-1$
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java
deleted file mode 100644
index f2ca49188..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.internal.util.EJBAttributeMaintenanceFactoryImpl;
-import org.eclipse.jst.j2ee.internal.common.J2EEXMIResourceFactory;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emf.utilities.AdapterFactoryDescriptor;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emf.utilities.EncoderDecoderRegistry;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.PasswordEncoderDecoder;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-
-/**
- * Insert the type's description here.
- * Creation date: (10/3/2000 3:07:37 PM)
- * @author: Administrator
- */
-public class J2EEInit {
-	
-	
-	static {
-		try { 
-			if(Boolean.getBoolean("LOG_XERCES_VERSION")) {				 //$NON-NLS-1$
-				Class clz = ClassLoader.getSystemClassLoader().loadClass("org.apache.xerces.impl.Version"); //$NON-NLS-1$
-				Method main = clz.getDeclaredMethod("main", new Class[] { String[].class } ); //$NON-NLS-1$
-				Object version = clz.newInstance();
-				main.invoke(version, new Object[] { new String[] {} }); 
-				System.out.println(clz.getResource("Version.class"));  //$NON-NLS-1$
-			}
-		} catch(Throwable t) {
-			System.out.println("Problem while logging version " + t);
-			t.printStackTrace();
-		} 
-	}
-	
-	protected static boolean initialized = false;
-	protected static boolean plugin_initialized = false;
-	public static void init() {
-		init(true);
-	}
-
-	public static void init(boolean shouldPreRegisterPackages) {
-		if (!initialized) {
-			initialized = true;
-			setDefaultEncoderDecoder();
-			DOMUtilities.setDefaultEntityResolver(J2EEXmlDtDEntityResolver.INSTANCE);
-			org.eclipse.jem.internal.java.init.JavaInit.init(shouldPreRegisterPackages);
-			if (shouldPreRegisterPackages)
-				preRegisterPackages();
-			initResourceFactories();
-			EjbFactoryImpl.internalRegisterEJBRelationAdapterFactory(new AdapterFactoryDescriptor() {
-				public AdapterFactory createAdapterFactory() {
-					return new EJBAttributeMaintenanceFactoryImpl();
-				}
-			});
-			EjbFactoryImpl.internalRegisterRelationshipsAdapterFactory(new AdapterFactoryDescriptor() {
-				public AdapterFactory createAdapterFactory() {
-					return new EJBAttributeMaintenanceFactoryImpl();
-				}
-			});
-			
-		}
-	}
-
-	/** 
-	 * If the currently defaulted encoder is the initial pass thru encoder,
-	 * then register a Password encoder for security; otherwise if a more sophisticated
-	 * encoder is already registered, then do nothing.
-	 */
-	private static void setDefaultEncoderDecoder() {
-		EncoderDecoderRegistry reg = EncoderDecoderRegistry.getDefaultRegistry();
-		if (reg.getDefaultEncoderDecoder() == EncoderDecoderRegistry.INITIAL_DEFAULT_ENCODER) {
-			reg.setDefaultEncoderDecoder(new PasswordEncoderDecoder());
-		}
-	}
-
-	private static void preRegisterPackages() {
-		//common
-		ExtendedEcoreUtil.preRegisterPackage("common.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return CommonPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return CommonFactory.eINSTANCE;
-			}
-		});
-		//application
-		ExtendedEcoreUtil.preRegisterPackage("application.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return ApplicationPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return ApplicationFactory.eINSTANCE;
-			}
-		});
-		//client
-		ExtendedEcoreUtil.preRegisterPackage("client.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return ClientPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return ClientFactory.eINSTANCE;
-			}
-		});
-		//webapplication
-		ExtendedEcoreUtil.preRegisterPackage("webapplication.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return WebapplicationPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return WebapplicationFactory.eINSTANCE;
-			}
-		});
-		//ejb
-		ExtendedEcoreUtil.preRegisterPackage("ejb.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return EjbPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return EjbFactory.eINSTANCE;
-			}
-		});
-		//jca
-		ExtendedEcoreUtil.preRegisterPackage("jca.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return JcaPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return JcaFactory.eINSTANCE;
-			}
-		});
-		//webservicesclient
-		ExtendedEcoreUtil.preRegisterPackage("webservice_client.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return Webservice_clientPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return Webservice_clientFactory.eINSTANCE;
-			}
-		});
-		//webservicescommon
-		ExtendedEcoreUtil.preRegisterPackage("wscommon.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return WscommonPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return WscommonFactory.eINSTANCE;
-			}
-		});
-		//webservicesdd
-		ExtendedEcoreUtil.preRegisterPackage("wsdd.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return WsddPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return WsddFactory.eINSTANCE;
-			}
-		});
-		//jaxrpcmap
-		ExtendedEcoreUtil.preRegisterPackage("jaxrpcmap.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return JaxrpcmapPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return JaxrpcmapFactory.eINSTANCE;
-			}
-		});		
-//		jsp
-		ExtendedEcoreUtil.preRegisterPackage("jsp.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return JspPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return JspFactory.eINSTANCE;
-			}
-		});
-		//taglib
-		ExtendedEcoreUtil.preRegisterPackage("taglib.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return TaglibPackage.eINSTANCE;
-			}
-			public EFactory getEFactory() {
-				return TaglibFactory.eINSTANCE;
-			}
-		});	
-		
-	}
-
-	public static void initResourceFactories() {
-		//Make protected	
-		Revisit.revisit();
-
-		// Only register the default factories if another set has not
-		// already been registered.
-
-		Resource.Factory j2ee = J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.EJBJAR_DD_URI_OBJ);
-		Resource.Factory defaultFact = J2EEResourceFactoryRegistry.INSTANCE.getFactory(URI.createURI(Resource.Factory.Registry.DEFAULT_EXTENSION));
-		if (j2ee == defaultFact) {
-			EJBJarResourceFactory.register();
-			WebAppResourceFactory.register();
-			ApplicationClientResourceFactory.register();
-			ApplicationResourceFactory.register();
-			ConnectorResourceFactory.register();
-			WebServicesClientResourceFactory.register();
-			WsddResourceFactory.register();
-			//register() is not called on the JaxrpcmapResourceFactory because
-			//the jaxprc-mapping descriptor does not have a standard short name.
-			//The short names have to be registered once they are known.
-			J2EEXMIResourceFactory.register();
-		}
-		EJBJarResourceFactory.registerDtds();
-		WebAppResourceFactory.registerDtds();
-		ApplicationClientResourceFactory.registerDtds();
-		ApplicationResourceFactory.registerDtds();
-		ConnectorResourceFactory.registerDtds();
-		WebServicesClientResourceFactory.registerDtds();
-		WsddResourceFactory.registerDtds();
-		JaxrpcmapResourceFactory.registerDtds();
-	}
-	public static void setPluginInit(boolean bPluginInit) {
-		// Here's where the configuration file would be read.
-		plugin_initialized = bPluginInit;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEModuleExtensionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEModuleExtensionHelper.java
deleted file mode 100644
index 2b8b84d1c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEModuleExtensionHelper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 19, 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;
-
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface J2EEModuleExtensionHelper {
-	String getDocType();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEMultiStatus.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEMultiStatus.java
deleted file mode 100644
index 11f91db1f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEMultiStatus.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * @author DABERG
- */
-public class J2EEMultiStatus extends J2EEStatus {
-	private J2EEStatus[] children = new J2EEStatus[0];
-
-	public void add(J2EEStatus status) {
-		J2EEStatus[] result =
-			new J2EEStatus[children.length + 1];
-		System.arraycopy(children, 0, result, 0, children.length);
-		result[result.length - 1] = status;
-		children = result;
-		int newSev = status.getSeverity();
-		int currentSev = getSeverity();
-		/* If all the statuses are NOT_NEEDED OR NOT_POSSIBLE, you want the combined status to be the highest severity
-		 * however, if all but one status are NOT_NEEDED or NOT_POSSIBLE, and one status completed, then the combined status
-		 * should be OK.  If there is a warning or error, then they take precedence
-		 */
-		if (children.length == 1)
-			setSeverity(newSev);
-		else if (currentSev > COMPLETED_OK && currentSev < WARNING && newSev == COMPLETED_OK)
-			setSeverity(newSev);
-		else if (newSev > currentSev && (currentSev != COMPLETED_OK || newSev >= WARNING) )
-			setSeverity(newSev);
-
-	}
-	/**
-	 * Adds all of the children of the given status to this multi-status.
-	 * Does nothing if the given status has no children (which includes
-	 * the case where it is not a multi-status).
-	 *
-	 * @param status the status whose children are to be added to this one
-	 */
-	public void addAll(J2EEStatus status) {
-		if (status == null)
-			return;
-		J2EEStatus[] statuses = status.getChildren();
-		for (int i = 0; i < statuses.length; i++) {
-			add(statuses[i]);
-		}
-	}
-
-	public J2EEStatus[] getChildren() {
-		return children;
-	}
-
-	public boolean isMultiStatus() {
-		return true;
-	}
-	/**
-	 * Merges the given status into this multi-status.
-	 * Equivalent to <code>add(status)</code> if the
-	 * given status is not a multi-status. 
-	 * Equivalent to <code>addAll(status)</code> if the
-	 * given status is a multi-status. 
-	 *
-	 * @param status the status to merge into this one
-	 * @see #add
-	 * @see #addAll
-	 */
-	public void merge(J2EEStatus status) {
-		if (status == null)
-			return;
-		if (!status.isMultiStatus()) {
-			add(status);
-		} else {
-			addAll(status);
-		}
-	}
-	/**
-	 * Returns a string representation of the status, suitable 
-	 * for debugging purposes only.
-	 */
-	public String toString() {
-		StringBuffer buf = new StringBuffer(super.toString());
-		buf.append(" children={"); //$NON-NLS-1$
-		for (int i = 0; i < children.length; i++) {
-			if (i != 0) {
-				buf.append("\n"); //$NON-NLS-1$
-			}
-			buf.append(children[i].toString());
-		}
-		buf.append("}"); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	/**
-	 * @see com.ibm.ejs.models.base.extensions.helper.J2EEStatus#append(J2EEStatus)
-	 */
-	public J2EEStatus append(J2EEStatus aStatus) {
-		if (aStatus != null)
-			merge(aStatus);
-		return this;
-	}
-	
-	public boolean isEmpty() {
-		return children.length == 0;
-	}
-
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EESpecificationConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EESpecificationConstants.java
deleted file mode 100644
index 6136035ab..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EESpecificationConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-public interface J2EESpecificationConstants {
-	String J2EE_VERSION_1_2 = "J2EE_1.2";  //$NON-NLS-1$
-	String J2EE_VERSION_1_3 = "J2EE_1.3";  //$NON-NLS-1$
-	String J2EE_VERSION_1_4 = "J2EE_1.4";  //$NON-NLS-1$
-
-	String DEFAULT_COMPLETED_STATUS_MSG = MOFJ2EEResourceHandler.DEFAULT_COMPLETED_STATUS_MSG; 
-	String DEFAULT_NOT_NEEDED_STATUS_MSG = MOFJ2EEResourceHandler.DEFAULT_NOT_NEEDED_STATUS_MSG; 
-	String DEFAULT_NOT_POSSIBLE_STATUS_MSG = MOFJ2EEResourceHandler.DEFAULT_NOT_POSSIBLE_STATUS_MSG; 
-	String DEFAULT_ERROR_STATUS_MSG = MOFJ2EEResourceHandler.DEFAULT_ERROR_STATUS_MSG; 
-	
-	String REMOVED_LOCAL_CLIENT_MSG = MOFJ2EEResourceHandler.REMOVED_LOCAL_CLIENT_MSG; 
-	String REMOVED_ACCESS_INTENTS_MSG = MOFJ2EEResourceHandler.REMOVED_ACCESS_INTENTS_MSG; 
-	String REMOVED_ISOLATION_LEVELS_MSG = MOFJ2EEResourceHandler.REMOVED_ISOLATION_LEVELS_MSG; 
-	String CONVERTED_FINDER_MSG = MOFJ2EEResourceHandler.CONVERTED_FINDER_MSG; 
-	String UNNAMED_EJB = MOFJ2EEResourceHandler.UNNAMED_EJB; 
-	String CONVERTED_QUERY_DESCRIPTION = MOFJ2EEResourceHandler.CONVERTED_QUERY_DESCRIPTION; 
-	String MIGRATED_DEFAULT_DATASOURCE_JAR_MSG = MOFJ2EEResourceHandler.MIGRATED_DEFAULT_DATASOURCE_JAR_MSG; 
-	String MIGRATED_DEFAULT_DATASOURCE_MSG 	   = MOFJ2EEResourceHandler.MIGRATED_DEFAULT_DATASOURCE_MSG; 
-	String ERROR_TEXT = MOFJ2EEResourceHandler.ERROR; 
-	String WARNING_TEXT = MOFJ2EEResourceHandler.WARNING; 
-	String INFO_TEXT = MOFJ2EEResourceHandler.INFO; 
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEStatus.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEStatus.java
deleted file mode 100644
index 3b9b2bde6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEStatus.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.text.MessageFormat;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @author DABERG
- *
- */
-public class J2EEStatus implements J2EESpecificationConstants { 
-    
-	public static final int COMPLETED_OK = 0;
-	public static final int NOT_NEEDED = 1;
-	public static final int NOT_POSSIBLE = 2;
-	public static final int WARNING = 3;
-	public static final int ERROR = 4; 
-
-    public static final J2EEStatus OK_STATUS = new J2EEStatus(COMPLETED_OK, ""); //$NON-NLS-1$
-
-	private static final J2EEStatus[] EmptyStatusArray = new J2EEStatus[0];
-
-	private int severity;
-	private String message;
-	private XMLResource resource;
-	private EObject targetObject;
-	
-	public J2EEStatus() {
-		//Default
-	}
-
-	public J2EEStatus(int aSeverity, String aMessage) {
-		this(aSeverity, (EObject)null, aMessage);
-	}
-	public J2EEStatus(int aSeverity, XMLResource xmlResource) {
-		this(aSeverity, xmlResource, null);
-	}
-	
-	public J2EEStatus(int aSeverity, EObject anObject) {
-		this(aSeverity, anObject, null);
-	}
-
-	public J2EEStatus(int aSeverity, XMLResource xmlResource, String aMessage) {
-		severity = aSeverity;
-		resource = xmlResource;
-		message = aMessage;
-	}
-	
-	public J2EEStatus(int aSeverity, EObject anObject, String aMessage) {
-		severity = aSeverity;
-		targetObject = anObject;
-		message = aMessage;
-	}
-	
-	public String format(String aPattern, String arg1) {
-		return MessageFormat.format(aPattern, new String[]{arg1});
-	}
-	
-	/**
-	 * Returns the message.
-	 * @return String
-	 */
-	public String getMessage() {
-		if (message == null)
-			message = createDefaultMessage();
-		return message;
-	}
-	
-	public String getMessageForDisplay() {
-		return getSeverityText()+" "+getMessage(); //$NON-NLS-1$
-	}
-	
-	protected String getSeverityText() {
-		switch (severity) {
-			case ERROR:
-				return ERROR_TEXT;
-			case WARNING:
-				return WARNING_TEXT;
-			case NOT_NEEDED:
-			case NOT_POSSIBLE:
-				return INFO_TEXT;
-			default:
-				return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Method createDefaultMessage.
-	 * @return String
-	 */
-	private String createDefaultMessage() {
-		String objDesc;
-		if (getResource() != null)
-			objDesc = getResource().getURI().toString();
-		else if (getTargetObject() != null && getTargetObject() instanceof ENamedElement)
-			objDesc = ((ENamedElement) getTargetObject()).getName();
-		else
-			return null;
-		switch (getSeverity()) {
-			case COMPLETED_OK :
-				return format(DEFAULT_COMPLETED_STATUS_MSG, objDesc);
-			case NOT_NEEDED :
-				return format(DEFAULT_NOT_NEEDED_STATUS_MSG, objDesc);
-			case NOT_POSSIBLE :
-				return format(DEFAULT_NOT_POSSIBLE_STATUS_MSG, objDesc);
-			case ERROR :
-				return format(DEFAULT_ERROR_STATUS_MSG, objDesc);
-		}
-		return null;
-	}
-
-
-	/**
-	 * Sets the message.
-	 * @param message The message to set
-	 */
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	/**
-	 * The migration was completed fine or was not needed.
-	 */
-	public boolean isOK() {
-		return severity == COMPLETED_OK || severity == NOT_NEEDED;
-	}
-
-	/**
-	 * An error ocurred during migration.
-	 */
-	public boolean isError() {
-		return severity == ERROR;
-	}
-	
-	/**
-	 * A warning ocurred during migration.
-	 */
-	public boolean isWarning() {
-		return severity == WARNING;
-	}
-
-	/**
-	 * The migration was not required.
-	 */
-	public boolean isNotNeeded() {
-		return severity == NOT_NEEDED;
-	}
-	/**
-	 * The migration was not possible.
-	 */
-	public boolean isNotPossible() {
-		return severity == NOT_POSSIBLE;
-	}
-	/**
-	 * Returns the severity.
-	 * @return int
-	 */
-	public int getSeverity() {
-		return severity;
-	}
-
-	/**
-	 * Sets the severity.
-	 * @param severity The severity to set
-	 */
-	public void setSeverity(int severity) {
-		this.severity = severity;
-	}
-
-	public J2EEStatus[] getChildren() {
-		return EmptyStatusArray;
-	}
-
-	public boolean isMultiStatus() {
-		return false;
-	}
-	public XMLResource getResource() {
-		return resource;
-	}
-	public EObject getTargetObject() {
-		return targetObject;
-	}
-
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		buf.append("MigrationStatus "); //$NON-NLS-1$
-		if (severity == COMPLETED_OK) {
-			buf.append("Completed OK"); //$NON-NLS-1$
-		} else if (severity == ERROR) {
-			buf.append("ERROR"); //$NON-NLS-1$
-		} else if (severity == WARNING) {
-			buf.append("WARNING"); //$NON-NLS-1$
-		} else if (severity == NOT_NEEDED) {
-			buf.append("Not Needed"); //$NON-NLS-1$
-		} else if (severity == NOT_POSSIBLE) {
-			buf.append("Not Possible"); //$NON-NLS-1$
-		} else {
-			buf.append("severity="); //$NON-NLS-1$
-			buf.append(severity);
-		}
-		buf.append(' ');
-		buf.append(message);
-		return buf.toString();
-	}
-	
-	/**
-	 * Append the paramater to this status, and return the resultant status;
-	 * clients must be careful to set their cached status to the return value, 
-	 * as it may be a new instance.
-	 */
-	public J2EEStatus append(J2EEStatus aStatus) {
-		if (aStatus == null)
-			return this;
-		J2EEMultiStatus multi = new J2EEMultiStatus();
-		multi.merge(this);
-		multi.merge(aStatus);
-		return multi;
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
deleted file mode 100644
index ed8bfd331..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 16, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * These constants are used with the XMLResource
- */
-public interface J2EEVersionConstants {
-	public int J2EE_1_2_ID = 12;
-	public int J2EE_1_3_ID = 13;
-	public int J2EE_1_4_ID = 14;
-	public int EJB_1_0_ID = 10;	
-	public int EJB_1_1_ID = 11;	
-	public int EJB_2_0_ID = 20;	
-	public int EJB_2_1_ID = 21;	
-	public int WEB_2_2_ID = 22;
-	public int WEB_2_3_ID = 23;
-	public int WEB_2_4_ID = 24;
-	public int TAGLIB_1_1_ID = 11;
-	public int TAGLIB_1_2_ID = 12;
-	public int TAGLIB_2_0_ID = 20;
-	public int JSP_1_1_ID = 11;
-	public int JSP_1_2_ID = 12;
-	public int JSP_2_0_ID = 20;
-	public int SERVLET_2_2 = 22;
-	public int SERVLET_2_3 = 23;
-	public int SERVLET_2_4 = 24;
-	public int JCA_1_0_ID = 10;
-	public int JCA_1_5_ID = 15;
-	public int WEBSERVICES_1_0_ID = 10;
-	public int WEBSERVICES_1_1_ID = 11;
-	public String J2EE_1_4_TEXT 		= "1.4"; //$NON-NLS-1$
-	
-
-	public int VERSION_1_0 = 10;	
-	public int VERSION_1_1 = 11;	
-	public int VERSION_1_2 = 12;	
-	public int VERSION_1_3 = 13;	
-	public int VERSION_1_4 = 14;
-	public int VERSION_1_5 = 15;
-	public int VERSION_2_0 = 20;
-	public int VERSION_2_1 = 21;	
-	public int VERSION_2_2 = 22;	
-	public int VERSION_2_3 = 23;	
-	public int VERSION_2_4 = 24;	
-	public int VERSION_2_5 = 25; 
-	
-	public String VERSION_1_0_TEXT		= "1.0"; //$NON-NLS-1$
-	public String VERSION_1_1_TEXT    	= "1.1"; //$NON-NLS-1$
-	public String VERSION_1_2_TEXT		= "1.2"; //$NON-NLS-1$
-	public String VERSION_1_3_TEXT		= "1.3"; //$NON-NLS-1$
-	public String VERSION_1_4_TEXT		= "1.4"; //$NON-NLS-1$
-	public String VERSION_1_5_TEXT		= "1.5"; //$NON-NLS-1$
-	public String VERSION_2_0_TEXT		= "2.0"; //$NON-NLS-1$
-	public String VERSION_2_1_TEXT		= "2.1"; //$NON-NLS-1$
-	public String VERSION_2_2_TEXT		= "2.2"; //$NON-NLS-1$
-	public String VERSION_2_3_TEXT		= "2.3"; //$NON-NLS-1$
-	public String VERSION_2_4_TEXT		= "2.4"; //$NON-NLS-1$
-	public String VERSION_2_5_TEXT		= "2.5"; //$NON-NLS-1$
-					
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/MOFJ2EEResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/MOFJ2EEResourceHandler.java
deleted file mode 100644
index 41d839a6d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/MOFJ2EEResourceHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class MOFJ2EEResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "mofj2ee";//$NON-NLS-1$
-
-	private MOFJ2EEResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String Stack_trace_of_nested_exce;
-	public static String ERROR;
-	public static String WARNING;
-	public static String INFO;
-	public static String DEFAULT_COMPLETED_STATUS_MSG;
-	public static String DEFAULT_NOT_NEEDED_STATUS_MSG;
-	public static String DEFAULT_NOT_POSSIBLE_STATUS_MSG;
-	public static String DEFAULT_ERROR_STATUS_MSG;
-	public static String REMOVED_LOCAL_CLIENT_MSG;
-	public static String REMOVED_ACCESS_INTENTS_MSG;
-	public static String REMOVED_ISOLATION_LEVELS_MSG;
-	public static String CONVERTED_FINDER_MSG;
-	public static String UNNAMED_EJB;
-	public static String CONVERTED_QUERY_DESCRIPTION;
-	public static String MIGRATED_DEFAULT_DATASOURCE_JAR_MSG;
-	public static String MIGRATED_DEFAULT_DATASOURCE_MSG;
-	public static String J2EE_VERSION_NULL_ERROR;
-	public static String J2EE_VERSION_PROXY_ERROR;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, MOFJ2EEResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java
deleted file mode 100644
index 9748f440a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-/**
- * Base exception class for non-runtime exceptions, where a caught exception
- * causes this exception to be thrown
- */
-public abstract class WrappedException extends Exception implements IWrappedException {
-	/** The exception which necessitated this exception */
-	protected Exception nestedException;
-
-public WrappedException() {
-	super();
-}
-public WrappedException(Exception e) {
-	super();
-	setNestedException(e);
-}
-public WrappedException(String s) {
-	super(s);
-}
-public WrappedException(String s, Exception e) {
-	super(s);
-	setNestedException(e);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
-public java.lang.String[] getAllMessages() {
-	return ExceptionHelper.getAllMessages(this);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public java.lang.String getConcatenatedMessages() {
-	return ExceptionHelper.getConcatenatedMessages(this);
-}
-public java.lang.Exception getNestedException() {
-	return nestedException;
-}
-/**
- * Print out a stack trace to the system err.
- */
-public void printStackTrace() {
-	printStackTrace(System.err);
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintStream s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(MOFJ2EEResourceHandler.Stack_trace_of_nested_exce); // = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintWriter s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(MOFJ2EEResourceHandler.Stack_trace_of_nested_exce); // = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-public void setNestedException(java.lang.Exception newNestedException) {
-	nestedException = newNestedException;
-    initCause(newNestedException);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
deleted file mode 100644
index 59495056b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-
-
-public class WrappedRuntimeException extends RuntimeException implements IWrappedException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -8926753082721271021L;
-	/** The exception which necessitated this runtime exception, if one exists */
-	protected Exception nestedException;
-public WrappedRuntimeException() {
-	super();
-}
-public WrappedRuntimeException(Exception e) {
-	super();
-	setNestedException(e);
-}
-public WrappedRuntimeException(String s) {
-	super(s);
-}
-public WrappedRuntimeException(String s, Exception e) {
-	super(s);
-	setNestedException(e);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
-public java.lang.String[] getAllMessages() {
-	return ExceptionHelper.getAllMessages(this);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public java.lang.String getConcatenatedMessages() {
-	return ExceptionHelper.getConcatenatedMessages(this);
-}
-/**
- * @return java.lang.Exception
- */
-public java.lang.Exception getNestedException() {
-	return nestedException;
-}
-/**
- * Print out a stack trace to the system err.
- */
-public void printStackTrace() {
-	printStackTrace(System.err);
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintStream s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(MOFJ2EEResourceHandler.Stack_trace_of_nested_exce); // = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintWriter s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(MOFJ2EEResourceHandler.Stack_trace_of_nested_exce); // = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-/**
- * @param newNestedException java.lang.Exception
- */
-public void setNestedException(java.lang.Exception newNestedException) {
-	nestedException = newNestedException;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEVersionResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEVersionResource.java
deleted file mode 100644
index b791f56dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEVersionResource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Common Interface used to check version of J2EE model resources
- */
-package org.eclipse.jst.j2ee.internal.common;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public interface J2EEVersionResource {
-	public int getJ2EEVersionID();
-	public int getModuleVersionID();
-	public int getVersionID();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResource.java
deleted file mode 100644
index 600158abe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResourceImpl;
-
-
-/**
- * @deprecated No longer required - change to extend CompatibilityXMIResourceImpl
- */
-public class J2EEXMIResource extends CompatibilityXMIResourceImpl implements J2EEVersionResource{
-
-	/**
-	 * Constructor for J2EEXMIResource.
-	 */
-	public J2EEXMIResource() {
-		super();
-	}
-
-	/**
-	 * Constructor for J2EEXMIResource.
-	 * @param uri
-	 */
-	public J2EEXMIResource(URI uri) {
-		super(uri);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.J2EEVersionResource#getJ2EEVersionID()
-	 */
-	public int getJ2EEVersionID() {
-		// TODO Auto-generated method stub
-		return J2EEVersionConstants.J2EE_1_3_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.J2EEVersionResource#getModuleVersionID()
-	 */
-	public int getModuleVersionID() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.J2EEVersionResource#getVersionID()
-	 */
-	public int getVersionID() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResourceFactory.java
deleted file mode 100644
index c3562d208..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResourceFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityResourceFactory;
-
-
-
-
-/**
- * @author nssheth
- *
- * 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 J2EEXMIResourceFactory extends CompatibilityResourceFactory {
-
-	public static J2EEXMIResourceFactory INSTANCE = new J2EEXMIResourceFactory();
-	
-	public static void register() {
-		J2EEResourceFactoryRegistry.INSTANCE.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, INSTANCE);
-	}
-
-	/**
-	 * Constructor for J2EEXMIResourceFactory.
-	 */
-	public J2EEXMIResourceFactory() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.Resource.Factory#createResource(URI)
-	 */
-	public Resource createResource(URI uri) {
-		J2EEXMIResource resource = new J2EEXMIResource(uri);
-		return resource;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
deleted file mode 100644
index d0cb95b29..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-
-
-public interface XMLResource extends TranslatorResource, J2EEVersionConstants {
-	public static final int APP_CLIENT_TYPE = 1;
-	public static final int APPLICATION_TYPE = 2;
-	public static final int EJB_TYPE = 3;
-	public static final int WEB_APP_TYPE = 4;
-	public static final int RAR_TYPE = 5;
-	public static final int WEB_SERVICES_CLIENT_TYPE = 6;
-
-	public static final String DELETED_ERROR_MSG = "This resource has been deleted and can no longer be used."; /**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	boolean isAlt();
-	public int getJ2EEVersionID();
-	public int getModuleVersionID();
-	public void setJ2EEVersionID(int id);
-	public void setModuleVersionID(int id);
-	/**
-	 * Used only if this resource is an alt; return the application which declares it
-	 */
-	Application getApplication();
-
-	void setApplication(Application newApplication);
-	/**
-	 * @deprecated use {@link #getVersionID()}
-	 * @see J2EEVersionConstants
-	 */
-	boolean isJ2EE1_3();
-
-	/**
-	 * Returns the type of this J2EE XMLResource.
-	 * You can use this method instead of using instanceof.
-	 * @see XMLResource#APP_CLIENT_TYPE
-	 * @see XMLResource#APPLICATION_TYPE
-	 * @see XMLResource#EJB_TYPE
-	 * @see XMLResource#WEB_APP_TYPE
-	 * @see XMLResource#RAR_TYPE
-	 */
-	int getType();
-	 /**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	void setIsAlt(boolean isAlternateDD);
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)}, 
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the system id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	void setSystemId(String id);
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)},
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the public id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	void setPublicId(String id);
-
-	//The following methods are to support ReferencedResource without having an actual
-	//This may be just a subset of what is available in ReferencedResource
-	void saveIfNecessary() throws Exception;
-	void releaseFromWrite();
-	void releaseFromRead();
-	void preDelete();
-	boolean isSharedForWrite();
-	boolean isShared();
-	boolean isReadOnly();
-	boolean isNew();
-	void accessForWrite();
-	void accessForRead(); 
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ApplicationTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ApplicationTranslator.java
deleted file mode 100644
index 6385efc2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ApplicationTranslator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.application;
-
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.EarDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author dfholttp
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ApplicationTranslator extends RootTranslator implements EarDeploymentDescriptorXmlMapperI, J2EEConstants {
-	public static ApplicationTranslator INSTANCE = new ApplicationTranslator();
-	private static Translator[] children13;
-	private static Translator[] children14;
-	private static ApplicationPackage APPLICATION_PKG = ApplicationPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-    public ApplicationTranslator() {
-		super(APPLICATION, ApplicationPackage.eINSTANCE.getApplication());
-    }
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected Translator[] create13Children() {
-		return  new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(ICON+"/"+SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), //$NON-NLS-1$
-			new Translator(ICON+"/"+LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), //$NON-NLS-1$
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new ModuleTranslator(),
-			CommonTranslators.createSecurityRoleTranslator13(APPLICATION_PKG.getApplication_SecurityRoles()),
-		};
-	}
-
-	protected Translator[] create14Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, APPLICATION_PKG.getApplication_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+APPLICATION_SCHEMA_LOC_1_4),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new ModuleTranslator(),
-			CommonTranslators.createSecurityRoleTranslator14(APPLICATION_PKG.getApplication_SecurityRoles()),
-		};
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ModuleTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ModuleTranslator.java
deleted file mode 100644
index 1ffd1e923..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ModuleTranslator.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.application;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.EarDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ModuleTranslator extends Translator implements EarDeploymentDescriptorXmlMapperI {
-	private static final ApplicationPackage APPLICATION_PKG = ApplicationPackage.eINSTANCE;
-
-	private static final Translator ALT_DD_TRANSLATOR = createAltDDTranslator();
-	private static final Translator[] WEB_TRANSLATORS = createWebModuleTranslators();
-	private static final Translator[] EJB_TRANSLATORS = createEJBModuleTranslators();
-	private static final Translator[] JAVA_TRANSLATORS = createJavaModuleTranslators();
-	private static final Translator[] CONNECTOR_TRANSLATORS = createConnectorModuleTranslators();
-	//private static final  
-
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public ModuleTranslator() {
-		super(MODULE, APPLICATION_PKG.getApplication_Modules());
-		addReadAheadHelper(new ReadAheadHelper(MODULE, new String[] { EJB, JAVA, WEB, CONNECTOR }, null));
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createConnectorModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(CONNECTOR, APPLICATION_PKG.getModule_Uri()),
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createJavaModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA, APPLICATION_PKG.getModule_Uri()),
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createEJBModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(EJB, APPLICATION_PKG.getModule_Uri()),
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createWebModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(WEB + "/" + WEB_URI, APPLICATION_PKG.getModule_Uri()), //$NON-NLS-1$
-			new Translator(WEB + "/" + CONTEXT_ROOT, APPLICATION_PKG.getWebModule_ContextRoot()), //$NON-NLS-1$
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-
-	}
-
-	private static Translator createAltDDTranslator() {
-		return new Translator(ALT_DD, ApplicationPackage.eINSTANCE.getModule_AltDD());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null) 
-			return CommonTranslators.EMPTY_CHILDREN;
-		else if (((Module) o).isEjbModule())
-			return EJB_TRANSLATORS;
-		else if (((Module) o).isConnectorModule())
-			return CONNECTOR_TRANSLATORS;
-		else if (((Module) o).isWebModule())
-			return WEB_TRANSLATORS;
-		else if (((Module) o).isJavaModule())
-			return JAVA_TRANSLATORS;
-		else
-			throw new IllegalStateException("Internal error: Module Type excepted"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		ApplicationFactory fact = ApplicationFactory.eINSTANCE;
-		if (EJB.equals(readAheadName))
-			return fact.createEjbModule();
-		else if (WEB.equals(readAheadName))
-			return fact.createWebModule();
-		else if (JAVA.equals(readAheadName))
-			return fact.createJavaClientModule();
-		else if (CONNECTOR.equals(readAheadName))
-			return fact.createConnectorModule();
-		else
-			return fact.createModule();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isManagedByParent()
-	 */
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/client/ApplicationClientTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/client/ApplicationClientTranslator.java
deleted file mode 100644
index 76f1f6e3c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/client/ApplicationClientTranslator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.client;
-
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.EnvEntryTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ApplicationClientTranslator extends RootTranslator implements DeploymentDescriptorXmlMapperI, J2EEConstants {
-	public static ApplicationClientTranslator INSTANCE = new ApplicationClientTranslator();
-	public static final String CALLBACK_HANDLER = "callback-handler"; //$NON-NLS-1$
-	public static final String APPLICATION_CLIENT = "application-client"; //$NON-NLS-1$
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	protected ApplicationClientTranslator() {
-		super(APPLICATION_CLIENT, ClientPackage.eINSTANCE.getApplicationClient());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected Translator[] create13Children() {
-		ClientPackage ePackageClient=ClientPackage.eINSTANCE;
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new EnvEntryTranslator(ePackageClient.getApplicationClient_EnvironmentProps(), true, false),
-			CommonTranslators.createEJBRefTranslator13(ePackageClient.getApplicationClient_EjbReferences()),
-			CommonTranslators.createResourceRefTranslator13(ePackageClient.getApplicationClient_ResourceRefs()),
-			//J2EE 1.3
-			CommonTranslators.createResourceEnvRefTranslator13(ePackageClient.getApplicationClient_ResourceEnvRefs()),
-			new JavaClassTranslator(CALLBACK_HANDLER, ePackageClient.getApplicationClient_CallbackHandler()),
-		};
-	}
-
-	protected Translator[] create14Children() {
-		ClientPackage ePackageClient=ClientPackage.eINSTANCE;
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, ePackageClient.getApplicationClient_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+APP_CLIENT_SCHEMA_LOC_1_4),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new EnvEntryTranslator(ePackageClient.getApplicationClient_EnvironmentProps(), true, true),
-			CommonTranslators.createEJBRefTranslator14(ePackageClient.getApplicationClient_EjbReferences()),
-			CommonTranslators.createServiceRefGroupTranslator(ePackageClient.getApplicationClient_ServiceRefs()),
-			CommonTranslators.createResourceRefTranslator14(ePackageClient.getApplicationClient_ResourceRefs()),
-			CommonTranslators.createResourceEnvRefTranslator14(ePackageClient.getApplicationClient_ResourceEnvRefs()),
-			CommonTranslators.createMessageDestinationRefTranslator(ePackageClient.getApplicationClient_MessageDestinationRefs()),
-			new JavaClassTranslator(CALLBACK_HANDLER, ePackageClient.getApplicationClient_CallbackHandler()),
-			CommonTranslators.createMessageDestinationTranslator(ePackageClient.getApplicationClient_MessageDestinations()),
-		//	CommonTranslators.createDeploymentExtensionTranslator(ePackageClient.getApplicationClient_DeploymentExtensions())
-		};
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/BooleanTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/BooleanTranslator.java
deleted file mode 100644
index 27885a25e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/BooleanTranslator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 21, 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.model.translator.common;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class BooleanTranslator extends Translator {
-
-	
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public BooleanTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, BOOLEAN_LOWERCASE);
-	}
-
-		
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (strValue == null)
-			return Boolean.FALSE;
-		else if (strValue.toUpperCase().equals("1") || strValue.toUpperCase().equals("YES")) //$NON-NLS-1$ //$NON-NLS-2$
-			return Boolean.TRUE;
-		else 
-			return Boolean.valueOf(strValue);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/CommonTranslators.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/CommonTranslators.java
deleted file mode 100644
index f2f723359..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/CommonTranslators.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 20, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emf.resource.DependencyTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * A static helper for creating Generic common J2EE translators
- */
-public class CommonTranslators implements DeploymentDescriptorXmlMapperI {
-
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static Webservice_clientPackage WEBSERVICE_PKG = Webservice_clientPackage.eINSTANCE;
-	public static final Translator[] EMPTY_CHILDREN = new Translator[] {};
-	private static final Translator EJB_REF_NAME_TRANSLATOR = new Translator(EJB_REF_NAME, COMMON_PKG.getEjbRef_Name());
-	private static final Translator EJB_REF_TYPE_TRANSLATOR = new Translator(EJB_REF_TYPE, COMMON_PKG.getEjbRef_Type());		//Enumeration
-	private static final Translator EJB_LINK_TRANSLATOR = new Translator(EJB_LINK, COMMON_PKG.getEjbRef_Link());
-	
-	private static final Translator RES_REF_NAME_TRANSLATOR = new Translator(RES_REF_NAME, COMMON_PKG.getResourceRef_Name());
-	private static final Translator RES_TYPE_TRANSLATOR = new Translator(RES_TYPE, COMMON_PKG.getResourceRef_Type());
-	private static final Translator RES_AUTH_TRANSLATOR = new ResAuthTranslator();
-	private static final Translator RES_SHARING_SCOPE_TRANSLATOR = new Translator(RES_SHARING_SCOPE, COMMON_PKG.getResourceRef_ResSharingScope());
-	
-	private static final Translator RES_ENV_REF_NAME_TRANSLATOR = new Translator(RESOURCE_ENV_REF_NAME, COMMON_PKG.getResourceEnvRef_Name());
-	private static final Translator RES_ENV_REF_TYPE_TRANSLATOR = new JavaClassTranslator(RESOURCE_ENV_REF_TYPE, COMMON_PKG.getResourceEnvRef_Type());
-	
-	private static final Translator SEC_REF_ROLE_NAME_TRANSALTOR = new Translator(ROLE_NAME, COMMON_PKG.getSecurityRoleRef_Name());
-	private static final Translator SEC_REF_ROLE_LINK_TRANSLATOR = new Translator(ROLE_LINK, COMMON_PKG.getSecurityRoleRef_Link());
-	
-	private static final Translator RUNAS_ROLE_NAME_TRANSLATOR = new DependencyTranslator(ROLE_NAME, COMMON_PKG.getIdentity_RoleName(), COMMON_PKG.getRunAsSpecifiedIdentity_Identity());
-	
-	private static final Translator SECURITY_ROLE_NAME_TRANSLATOR = new Translator(ROLE_NAME, COMMON_PKG.getSecurityRole_RoleName());
-	
-	public static final Translator DESCRIPTIONS_TRANSLATOR = createDescriptionTranslator(COMMON_PKG.getDescriptionGroup_Descriptions());
-	public static final Translator DISPLAYNAMES_TRANSLATOR = createDisplayNameTranslator(COMMON_PKG.getDescriptionGroup_DisplayNames());
-	public static final Translator ICONS_TRANSLATOR = createIconTranslator();
-	
-	//The Official Concept of JNDIEnvRefGroup FOR J2EE 1.4
-	public static final Translator JNDI_REF_GROUP_ENV_ENTRY_1_4 = new EnvEntryTranslator(COMMON_PKG.getJNDIEnvRefsGroup_EnvironmentProperties(), true, true);
-	public static final Translator JNDI_REF_GROUP_EJB_REF_1_4 = CommonTranslators.createEJBRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_EjbRefs());
-	public static final Translator JNDI_REF_GROUP_EJB_LOCAL_REF_1_4 = CommonTranslators.createEJBLocalRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_EjbLocalRefs());
-	public static final Translator JNDI_REF_GROUP_SERVICE_REF_1_4 = CommonTranslators.createServiceRefGroupTranslator(COMMON_PKG.getJNDIEnvRefsGroup_ServiceRefs());	
-	public static final Translator JNDI_REF_GROUP_RESOURCE_REF_1_4 = CommonTranslators.createResourceRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_ResourceRefs());
-	public static final Translator JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4 = CommonTranslators.createResourceEnvRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_ResourceEnvRefs());
-	public static final Translator JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4 = CommonTranslators.createMessageDestinationRefTranslator(COMMON_PKG.getJNDIEnvRefsGroup_MessageDestinationRefs());
-	
-	//The unofficial concept of JNDIEnvRefGroup FOR J2EE 1.3
-	public static final Translator JNDI_REF_GROUP_ENV_ENTRY_1_3 = new EnvEntryTranslator(COMMON_PKG.getJNDIEnvRefsGroup_EnvironmentProperties(), true, false);
-	public static final Translator JNDI_REF_GROUP_EJB_REF_1_3 = CommonTranslators.createEJBRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_EjbRefs());
-	public static final Translator JNDI_REF_GROUP_EJB_LOCAL_REF_1_3 = CommonTranslators.createEJBLocalRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_EjbLocalRefs());
-	public static final Translator JNDI_REF_GROUP_RESOURCE_REF_1_3 =  CommonTranslators.createResourceRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_ResourceRefs());
-	public static final Translator JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3 = CommonTranslators.createResourceEnvRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_ResourceEnvRefs());
-	
-	public static final Translator LISTENER_CLASS_TRANSLATOR = new JavaClassTranslator(LISTENER_CLASS, COMMON_PKG.getListener_ListenerClass());
-	
-	private CommonTranslators() {
-		super();
-	}
-	
-	public static Translator createSecurityRoleRefTranslator13(EStructuralFeature feature) {
-		
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE_REF, feature);
-		result.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityRoleRef_Description()), 
-			SEC_REF_ROLE_NAME_TRANSALTOR, 
-			SEC_REF_ROLE_LINK_TRANSLATOR 
-		});
-		return result;
-	}
-	
-	public static Translator createSecurityRoleRefTranslator14(EStructuralFeature feature) {
-		
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getSecurityRoleRef_Descriptions()), 
-			SEC_REF_ROLE_NAME_TRANSALTOR,
-			SEC_REF_ROLE_LINK_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createResourceEnvRefTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RESOURCE_ENV_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE, 
-			new Translator(DESCRIPTION, COMMON_PKG.getResourceEnvRef_Description()), 
-			RES_ENV_REF_NAME_TRANSLATOR, 
-			RES_ENV_REF_TYPE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createResourceEnvRefTranslator14(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RESOURCE_ENV_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE, 
-			createDescriptionTranslator(COMMON_PKG.getResourceEnvRef_Descriptions()), 
-			RES_ENV_REF_NAME_TRANSLATOR, 
-			RES_ENV_REF_TYPE_TRANSLATOR,
-			//J2EE1.4 Added
-		//	createDeploymentExtensionTranslator(COMMON_PKG.getResourceEnvRef_Extensions())
-		});
-		return result;
-	}
-	
-	public static Translator createResourceRefTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RESOURCE_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,		
-			new Translator(DESCRIPTION, COMMON_PKG.getResourceRef_Description()),
-			RES_REF_NAME_TRANSLATOR,
-			RES_TYPE_TRANSLATOR,
-			RES_AUTH_TRANSLATOR,
-			//EJB 2.0 Added
-			RES_SHARING_SCOPE_TRANSLATOR,
-		});
-		return result;
-	}
-	
-	public static Translator createResourceRefTranslator14(EStructuralFeature feature) {
-			GenericTranslator result = new GenericTranslator(RESOURCE_REF, feature);
-			result.setChildren(new Translator[] {
-				IDTranslator.INSTANCE,		
-				createDescriptionTranslator(COMMON_PKG.getResourceRef_Descriptions()),
-				RES_REF_NAME_TRANSLATOR,
-				RES_TYPE_TRANSLATOR,
-				RES_AUTH_TRANSLATOR,
-				//EJB 2.0 Added
-				RES_SHARING_SCOPE_TRANSLATOR,
-			
-				//J2EE1.4 Added
-			//	createDeploymentExtensionTranslator(COMMON_PKG.getResourceRef_Extensions())
-			});
-			return result;
-		}
-	
-	public static Translator createSecurityRoleTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityRole_Description()), 
-			SECURITY_ROLE_NAME_TRANSLATOR 
-		});
-		return result;
-	}
-	
-	public static Translator createSecurityRoleTranslator14(EStructuralFeature feature) {
-			GenericTranslator result = new GenericTranslator(SECURITY_ROLE, feature);
-			result.setChildren(new Translator[] {
-				IDTranslator.INSTANCE,
-				createDescriptionTranslator(COMMON_PKG.getSecurityRole_Descriptions()), 
-				SECURITY_ROLE_NAME_TRANSLATOR 
-			});
-			return result;
-		}
-	
-	public static Translator createEJBRefTranslator13(EStructuralFeature feature) {
-		return createEJBRefTranslator13(feature, false);
-	}
-	
-	public static Translator createEJBLocalRefTranslator13(EStructuralFeature feature) {
-		return createEJBRefTranslator13(feature, true);
-	}
-	private static Translator createEJBRefTranslator13(EStructuralFeature feature, boolean local) {
-		String nodeName = local ? EJB_LOCAL_REF : EJB_REF;
-		String homeTag = local ? LOCAL_HOME : HOME;
-		String remoteTag = local ? LOCAL : REMOTE;
-		EStructuralFeature homeFeature = local ? COMMON_PKG.getEJBLocalRef_LocalHome() : COMMON_PKG.getEjbRef_Home();
-		EStructuralFeature remoteFeature = local ? COMMON_PKG.getEJBLocalRef_Local() : COMMON_PKG.getEjbRef_Remote();
-		
-		GenericTranslator result = new GenericTranslator(nodeName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,				
-			new Translator(DESCRIPTION, COMMON_PKG.getEjbRef_Description()),
-			EJB_REF_NAME_TRANSLATOR,
-			EJB_REF_TYPE_TRANSLATOR,
-			new Translator(homeTag, homeFeature),
-			new Translator(remoteTag, remoteFeature),
-			EJB_LINK_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createEJBRefTranslator14(EStructuralFeature feature) {
-		return createEJBRefTranslator14(feature, false);
-	}
-	
-	public static Translator createEJBLocalRefTranslator14(EStructuralFeature feature) {
-		return createEJBRefTranslator14(feature, true);
-	}
-	private static Translator createEJBRefTranslator14(EStructuralFeature feature, boolean local) {
-		String nodeName = local ? EJB_LOCAL_REF : EJB_REF;
-		String homeTag = local ? LOCAL_HOME : HOME;
-		String remoteTag = local ? LOCAL : REMOTE;
-		EStructuralFeature homeFeature = local ? COMMON_PKG.getEJBLocalRef_LocalHome() : COMMON_PKG.getEjbRef_Home();
-		EStructuralFeature remoteFeature = local ? COMMON_PKG.getEJBLocalRef_Local() : COMMON_PKG.getEjbRef_Remote();
-		
-		GenericTranslator result = new GenericTranslator(nodeName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,				
-			createDescriptionTranslator(COMMON_PKG.getEjbRef_Descriptions()),
-			EJB_REF_NAME_TRANSLATOR,
-			EJB_REF_TYPE_TRANSLATOR,
-			new Translator(homeTag, homeFeature),
-			new Translator(remoteTag, remoteFeature),
-			EJB_LINK_TRANSLATOR,
-		//	createDeploymentExtensionTranslator(COMMON_PKG.getEjbRef_Extensions())
-		});
-		return result;
-	}
-	
-	
-	public static Translator createRunAsTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RUN_AS, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityIdentity_Description()),
-			//new DependencyTranslator(DES,)
-			RUNAS_ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-
-
-	public static Translator createRunAsTranslator14(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RUN_AS, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getSecurityIdentity_Descriptions()),
-			RUNAS_ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-	
-	
-	
-	public static  Translator createMessageDestinationRefTranslator(EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(MESSAGE_DEST_REF,feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getMessageDestinationRef_Descriptions()),
-			new Translator(MESSAGE_DEST_REF_NAME,COMMON_PKG.getMessageDestinationRef_Name()),
-			new Translator(MESSAGE_DEST_TYPE,COMMON_PKG.getMessageDestinationRef_Type()),
-			new Translator(MESSAGE_DEST_USAGE,COMMON_PKG.getMessageDestinationRef_Usage()),
-			new Translator(MESSAGE_DEST_LINK,COMMON_PKG.getMessageDestinationRef_Link()),
-			//createDeploymentExtensionTranslator(COMMON_PKG.getMessageDestinationRef_Extensions())	
-		});
-
-		return result;
-	}
-	
-	public static  Translator createMessageDestinationTranslator(EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(MESSAGE_DEST,feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			DESCRIPTIONS_TRANSLATOR,
-			DISPLAYNAMES_TRANSLATOR,
-			ICONS_TRANSLATOR,
-			new Translator(MESSAGE_DEST_NAME,COMMON_PKG.getMessageDestination_Name()),
-			//createDeploymentExtensionTranslator(COMMON_PKG.getMessageDestination_Extensions())
-		});
-
-		return result;
-	}
-
-	/**
-	 * This model was model from Websphere Webservices
-	 * @param reference
-	 * @return
-	 */
-	public static Translator createServiceRefGroupTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(SERVICE_REF, feature);
-		result.setChildren( new Translator[] {
-			IDTranslator.INSTANCE,
-			DESCRIPTIONS_TRANSLATOR,
-			DISPLAYNAMES_TRANSLATOR,
-			ICONS_TRANSLATOR,
-			new Translator(SERVICE_REF_NAME, WEBSERVICE_PKG.getServiceRef_ServiceRefName()),
-			new JavaClassTranslator(SERVICE_INTERFACE, WEBSERVICE_PKG.getServiceRef_ServiceInterface()),
-			new Translator(WSDL_FILE, WEBSERVICE_PKG.getServiceRef_WsdlFile()),
-			new Translator(JAXRPC_MAPPING_FILE, WEBSERVICE_PKG.getServiceRef_JaxrpcMappingFile()),
-			createQNameTranslator(SERVICE_QNAME, WEBSERVICE_PKG.getServiceRef_ServiceQname()),
-			createPortComponentRefTranslator(),
-			createServiceRefHandlerTranslator(),
-		});
-		
-		
-		return result;
-	}
-	
-	public static Translator createQNameTranslator(String domName, EStructuralFeature feature) {		
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, CommonPackage.eINSTANCE.getQName_CombinedQName())			
-		});
-		return result;	
-	}
-
-	/**
-	 * This model was model from Websphere Webservices
-	 * @return
-	 */
-	public static Translator createServiceRefHandlerTranslator() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WEBSERVICE_PKG.getServiceRef_Handlers());
-		result.setChildren(new Translator[]{
-			IDTranslator.INSTANCE,
-			DESCRIPTIONS_TRANSLATOR,
-			DISPLAYNAMES_TRANSLATOR,
-			ICONS_TRANSLATOR,
-			new Translator(HANDLER_NAME, WEBSERVICE_PKG.getHandler_HandlerName()),
-			new JavaClassTranslator(HANDLER_CLASS, WEBSERVICE_PKG.getHandler_HandlerClass()),
-			createParamValueType(HANDLER_INIT_PARAM, WEBSERVICE_PKG.getHandler_InitParams()),
-			createQNameTranslator(SOAP_HEADER, WEBSERVICE_PKG.getHandler_SoapHeaders()),
-			new Translator(SOAP_ROLE, WEBSERVICE_PKG.getHandler_SoapRoles()),
-			new Translator(PORT_NAME, WEBSERVICE_PKG.getHandler_PortNames())
-		});
-		
-		return result;
-	}
-
-	/**
-	 * @return
-	 */
-	public static Translator createPortComponentRefTranslator() {
-		GenericTranslator result = new GenericTranslator(PORT_COMPONENT_REF, WEBSERVICE_PKG.getServiceRef_PortComponentRefs());
-		result.setChildren( new Translator[]{
-			IDTranslator.INSTANCE,
-			new JavaClassTranslator(SERVICE_ENPOINT_INTERFACE, WEBSERVICE_PKG.getPortComponentRef_ServiceEndpointInterface()),
-			new Translator(PORT_COMPONENT_LINK , WEBSERVICE_PKG.getPortComponentRef_PortComponentLink())
-		});
-		return result;
-	}
-
-	/**
-	 * @return
-	 */
-	public static Translator createDescriptionTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(DESCRIPTION, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDescription_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDescription_Value()) 
-		});
-		return result;
-	}
-	
-	/**
-	 * @return
-	 */
-	public static Translator createDisplayNameTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(DISPLAY_NAME, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDisplayName_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDisplayName_Value()) 
-		});
-		return result;
-	}
-
-	
-	/**
-	 * @return
-	 */
-	public static Translator createIconTranslator() {
-		GenericTranslator result = new GenericTranslator(ICON, COMMON_PKG.getDescriptionGroup_Icons());
-		result.setChildren(new Translator[] {
-			new Translator(LANG, COMMON_PKG.getIconType_Lang(), Translator.DOM_ATTRIBUTE),
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON, COMMON_PKG.getIconType_SmallIcon()), 
-			new Translator(LARGE_ICON, COMMON_PKG.getIconType_LargeIcon()) 
-		});
-		return result;
-	}
-
-//	public static Translator createDeploymentExtensionTranslator(EStructuralFeature feature) {
-//		return createDeploymentExtensionTranslator(DEPLOY_EXT, feature);
-//	}
-//
-//	public static Translator createDeploymentExtensionTranslator(String domName, EStructuralFeature feature) {
-//		GenericTranslator result = new GenericTranslator(domName, feature);
-//		result.setChildren(new Translator[] {
-//			new Translator(NAMESPACE, COMMON_PKG.getDeploymentExtension_Namespace(), Translator.DOM_ATTRIBUTE),
-//			new Translator(MUSTUNDERSTAND, COMMON_PKG.getDeploymentExtension_MustUnderstand(), Translator.DOM_ATTRIBUTE),
-//			IDTranslator.INSTANCE,
-//			Translator.createParentAndTextAttributeTranslator(EXT_ELEMENT, COMMON_PKG.getDeploymentExtension_ExtensionElements(), COMMON_PKG.getExtensibleType_Value())
-//		});
-//		return result;
-//	}
-	
-	public static Translator createParamValueType(String domName, EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getParamValue_Descriptions()),
-			new Translator(PARAM_NAME, COMMON_PKG.getParamValue_Name()),
-			new Translator(PARAM_VALUE, COMMON_PKG.getParamValue_Value()),
-		});
-		return result;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTranslator.java
deleted file mode 100644
index cf6ec6206..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTranslator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EnvEntryTranslator extends Translator implements DeploymentDescriptorXmlMapperI {
-	private boolean isJ2EE14;
-	private static Translator[] children;
-	private static Translator[] reorderedChildren;
-	//Hacks because of inconsistencies in the servlet spec
-	boolean typeBeforeValue = true;
-	/**
-	 * Constructor for EnvEntryTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public EnvEntryTranslator(EStructuralFeature aFeature, boolean writeTypeBeforeValue, boolean isJ2EE14) {
-		super(ENV_ENTRY, aFeature);
-		typeBeforeValue = writeTypeBeforeValue;
-		this.isJ2EE14 = isJ2EE14;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren()
-	 */
-	public Translator[] getChildren(Object obj, int versionID) {
-		//Hava to you create a different one each time
-		children = createChildren();
-		setReorderedChildren();
-		
-		if (typeBeforeValue)
-			return children;
-		
-		return reorderedChildren;
-	}
-
-	protected Translator[] createChildren() {
-		CommonPackage ePackageCommon = CommonPackage.eINSTANCE;
-		Translator descriptionTranslator;
-		if (isJ2EE14)
-			descriptionTranslator = CommonTranslators.createDescriptionTranslator(ePackageCommon.getEnvEntry_Descriptions()); 
-		else 
-			descriptionTranslator = new Translator(DESCRIPTION, ePackageCommon.getEnvEntry_Description());
-			
-		return new Translator[] {
-			IDTranslator.INSTANCE,				
-			descriptionTranslator,
-			new Translator(ENV_ENTRY_NAME, ePackageCommon.getEnvEntry_Name()),
-			new EnvEntryTypeTranslator(), 
-			new Translator(ENV_ENTRY_VALUE, ePackageCommon.getEnvEntry_Value())
-		};
-	}
-	
-	protected void setReorderedChildren() {
-		reorderedChildren = new Translator[children.length];
-		System.arraycopy(children, 0, reorderedChildren, 0, children.length);
-		Translator temp = reorderedChildren[3];
-		reorderedChildren[3] = reorderedChildren[4];
-		reorderedChildren[4] = temp;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTypeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTypeTranslator.java
deleted file mode 100644
index afecd56ad..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTypeTranslator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EnvEntryTypeTranslator extends Translator implements DeploymentDescriptorXmlMapperI {
-	private static final String JAVA_LANG= "java.lang."; //$NON-NLS-1$
-	private static final int SUBSTRING_LENGTH = JAVA_LANG.length();
-	public EnvEntryTypeTranslator() {
-		super(ENV_ENTRY_TYPE, CommonPackage.eINSTANCE.getEnvEntry_Type());
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(String)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {		
-		if (strValue != null && strValue.startsWith(JAVA_LANG)) 
-			return super.convertStringToValue(strValue.substring(SUBSTRING_LENGTH), owner);
-		
-		return null;
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(Object)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (value != null) 
-			return JAVA_LANG + ((Enumerator)value).getName(); 
-		return null;
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/JavaClassTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/JavaClassTranslator.java
deleted file mode 100644
index e8d24f9fb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/JavaClassTranslator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-public class JavaClassTranslator extends Translator {
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param path
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
-		super(domNameAndPath, aFeature, path);
-	}
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param paths
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath[] paths) {
-		super(domNameAndPath, aFeature, paths);
-	}
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, style);
-	}
-
-	public Object convertStringToValue(String nodeName, String readAheadName, String value, Notifier owner) {
-		Object result = null;
-		if (value != null) {
-			result = convertStringToValue(value, (EObject) owner);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(String)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (strValue != null) {
-			String qualifiedName = removePreceedingAndTrailingPeriods(strValue.trim());		
-			if (owner != null) {
-				Resource ownerRes = owner.eResource();
-				if (ownerRes != null) {
-					ResourceSet rs = ownerRes.getResourceSet();
-					if (rs != null) {
-						//Try to reflect the type directly.  If nothing is returned
-						//or an error occurs, return a proxy.
-						Object javaClass = null;
-						try {
-							javaClass = JavaRefFactory.eINSTANCE.reflectType(qualifiedName, rs);
-						} catch (Exception e) {
-							//Ignore
-						}
-						if (javaClass != null)
-							return javaClass;
-					}
-				}
-			}
-			return JavaRefFactory.eINSTANCE.createClassRef(qualifiedName);
-		}
-		return null;
-	}
-	private String removePreceedingAndTrailingPeriods(String qualifiedName) {
-		char[] characters = qualifiedName.toCharArray();
-		int startIndex = 0;
-		for (; startIndex < characters.length && characters[startIndex] == '.'; startIndex++);
-		int qualifiedNameEnd = qualifiedName.length() - 1;
-		int endIndex = qualifiedNameEnd;
-		for (; endIndex > -1 && characters[endIndex] == '.'; endIndex--)
-		if (startIndex == 0 && endIndex == qualifiedNameEnd)
-			return qualifiedName;
-		return qualifiedName.substring(startIndex, endIndex + 1);
-	}	
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(Object)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (value != null)
-			return ((JavaClass) value).getQualifiedName();
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/ResAuthTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/ResAuthTranslator.java
deleted file mode 100644
index fdf8b9898..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/ResAuthTranslator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 30, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-/**
- * @author schacher
- */
-public class ResAuthTranslator extends Translator implements DeploymentDescriptorXmlMapperI {
-
-	private static final String CONTAINER_AUTH = "CONTAINER"; //$NON-NLS-1$
-	private static final String SERVLET_AUTH = "SERVLET"; //$NON-NLS-1$
-	public ResAuthTranslator() {
-		super(RES_AUTH, CommonPackage.eINSTANCE.getResourceRef_Auth());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (isWeb((ResourceRef)owner))
-			return convertWebStringToValue(strValue, owner);
-		
-		return super.convertStringToValue(strValue, owner);
-	}
-	
-	/**
-	 * @param strValue
-	 * @param owner
-	 * @return
-	 */
-	private Object convertWebStringToValue(String strValue, EObject owner) {
-		if (SERVLET_AUTH.equals(strValue)) 
-			return ResAuthTypeBase.APPLICATION_LITERAL;
-		else if (CONTAINER_AUTH.equals(strValue)) 
-			return ResAuthTypeBase.CONTAINER_LITERAL;
-		else 
-			return super.convertStringToValue(strValue, owner);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(java.lang.Object, org.eclipse.emf.ecore.EObject)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (isWeb22(((ResourceRef)owner)))
-			return convertWebValueToString(value, owner);
-		 
-		return super.convertValueToString(value, owner);
-	}
-	
-	/**
-	 * @param value
-	 * @param owner
-	 */
-	private String convertWebValueToString(Object value, EObject owner) {
-		if (ResAuthTypeBase.APPLICATION_LITERAL == value)
-			return SERVLET_AUTH;
-		else if (ResAuthTypeBase.CONTAINER_LITERAL == value)
-			return CONTAINER_AUTH;
-		else 
-			return super.convertValueToString(value, owner);
-	}
-
-	protected boolean isWeb(ResourceRef ref) {
-		EObject owner = ref.eContainer();
-		return (owner instanceof WebApp);
-	}
-	protected boolean isWeb22(ResourceRef ref) { 
-		return isWeb(ref) && ((WebApp)ref.eContainer()).getVersionID() <= J2EEVersionConstants.WEB_2_2_ID;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/connector/ConnectorTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/connector/ConnectorTranslator.java
deleted file mode 100644
index 82616b81e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/connector/ConnectorTranslator.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.connector;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.BooleanTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.RarDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-public class ConnectorTranslator extends RootTranslator implements RarDeploymentDescriptorXmlMapperI, J2EEConstants {
-	public static ConnectorTranslator INSTANCE = new ConnectorTranslator();
-	public static final String CONNECTOR = "connector"; //$NON-NLS-1$
-	private static JcaPackage CONNECTOR_PKG = JcaPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	private static final Translator VENDOR_NAME_TRANSLATOR = new Translator(VENDOR_NAME, CONNECTOR_PKG.getConnector_VendorName());
-	private static final Translator EIS_TYPE_TRANSLATOR = new Translator(EIS_TYPE, CONNECTOR_PKG.getConnector_EisType());
-	
-	private static final Translator CONFIG_PROPERTY_NAME_TRANSLATOR= new Translator(CONFIG_PROPERTY_NAME, CONNECTOR_PKG.getConfigProperty_Name());
-	private static final Translator CONFIG_PROPERTY_TYPE_TRANSLATOR= new Translator(CONFIG_PROPERTY_TYPE, CONNECTOR_PKG.getConfigProperty_Type());
-	private static final Translator CONFIG_PROPERTY_VALUE_TRANSLATOR= new Translator(CONFIG_PROPERTY_VALUE, CONNECTOR_PKG.getConfigProperty_Value());
-	
-	private static final Translator SECURITY_PERMISSION_SPEC_TRANSLATOR = new Translator(SECURITY_PERMISSION_SPEC, CONNECTOR_PKG.getSecurityPermission_Specification());
-	
-	private static final Translator AUTH_MECH_TYPE_TRANSLATOR = new Translator(AUTH_MECH_TYPE, CONNECTOR_PKG.getAuthenticationMechanism_AuthenticationMechanismType());
-	private static final Translator CREDENTIAL_INTERFACE_TRANSLATOR = new Translator(CREDENTIAL_INTERFACE, CONNECTOR_PKG.getAuthenticationMechanism_CredentialInterface());
-	
-	private static final BooleanTranslator LICENSE_REQUIRED_TRANSLATOR = new BooleanTranslator(LICENSE_REQUIRED, CONNECTOR_PKG.getLicense_Required());
-	
-	public ConnectorTranslator() {
-		super(CONNECTOR, JcaPackage.eINSTANCE.getConnector());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-	
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName() ),
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(ICON+"/"+SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon() ), //$NON-NLS-1$
-			new Translator(ICON+"/"+LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon() ), //$NON-NLS-1$
-			VENDOR_NAME_TRANSLATOR,
-			new Translator(SPEC_VERSION, CONNECTOR_PKG.getConnector_SpecVersion() ),
-			EIS_TYPE_TRANSLATOR,
-			new Translator(VERSION, CONNECTOR_PKG.getConnector_Version() ),
-			createLicenseTranslator13(),
-			createResourceAdapterTranslator13()
-		};
-	}
-	
-	protected Translator[] create14Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, CONNECTOR_PKG.getConnector_SpecVersion(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+CONNECTOR_SCHEMA_LOC_1_5),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			VENDOR_NAME_TRANSLATOR,
-			EIS_TYPE_TRANSLATOR,
-			new Translator(RESOURCEADAPTER_VERSION, CONNECTOR_PKG.getConnector_Version()),
-			createLicenseTranslator14(),
-			createResourceAdapterTranslator14(),
-		};
-	}
-
-	private Translator createResourceAdapterTranslator14() {
-		GenericTranslator result = new GenericTranslator(RESOURCEADAPTER, CONNECTOR_PKG.getConnector_ResourceAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(RESOURCEADAPTER_CLASS,CONNECTOR_PKG.getResourceAdapter_ResourceAdapterClass()),
-			createConfigurationPropertyTranslator14(CONNECTOR_PKG.getResourceAdapter_ConfigProperties()),
-			createOutboundTranslator(),
-			createInboundTranslator(),
-			createAdminObjectTranslator(),
-			createSecurityPermissionsTranslator()
-		});
-		return result;
-	}
-
-	private Translator createOutboundTranslator() {
-		GenericTranslator result = new GenericTranslator(OUTBOUND_RESOURCEADAPTER, CONNECTOR_PKG.getResourceAdapter_OutboundResourceAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createConnectionDefinationTranslator(),
-			new Translator(TRANSACTION_SUPPORT, CONNECTOR_PKG.getOutboundResourceAdapter_TransactionSupport()),
-			createAuthMechanismTranslator14(CONNECTOR_PKG.getOutboundResourceAdapter_AuthenticationMechanisms()),
-			new BooleanTranslator(REAUTHENTICATION_SUPPORT, CONNECTOR_PKG.getOutboundResourceAdapter_ReauthenticationSupport()),
-		});
-		return result;
-	}
-
-	private Translator createInboundTranslator() {
-		GenericTranslator result = new GenericTranslator(INBOUND_RESOURCEADAPTER, CONNECTOR_PKG.getResourceAdapter_InboundResourceAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createMessageAdapterTranslator()
-		});
-
-		return result;
-	}
-	
-	private Translator createMessageAdapterTranslator() {
-		GenericTranslator result = new GenericTranslator(MESSAGEADAPTER, CONNECTOR_PKG.getInboundResourceAdapter_MessageAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createMessageListenerTranslator(),
-		});
-
-		return result;
-	}
-		
-	private Translator createMessageListenerTranslator() {
-		GenericTranslator result = new GenericTranslator(MESSAGELISTENER, CONNECTOR_PKG.getMessageAdapter_MessageListeners());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(MESSAGELISTENER_TYPE, CONNECTOR_PKG.getMessageListener_MessageListenerType()),
-			createActivationSpecTranslator()
-		});
-		return result;
-	}
-
-	private Translator createActivationSpecTranslator() {
-		GenericTranslator result = new GenericTranslator(ACTIVATIONSPEC, CONNECTOR_PKG.getMessageListener_ActivationSpec());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(ACTIVATIONSPEC_CLASS, CONNECTOR_PKG.getActivationSpec_ActivationSpecClass()),
-			createRequiredConfigPropertyTranslator()
-		});
-		return result;
-	}
-
-	private Translator createRequiredConfigPropertyTranslator() {
-		GenericTranslator result = new GenericTranslator(REQUIRED_CONFIG_PROPERTY, CONNECTOR_PKG.getActivationSpec_RequiredConfigProperties());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getRequiredConfigPropertyType_Descriptions()),
-			new Translator(CONFIG_PROPERTY_NAME, CONNECTOR_PKG.getRequiredConfigPropertyType_Name())
-		});
-		return result;
-	}
-	
-	private Translator createAdminObjectTranslator() {
-		GenericTranslator result = new GenericTranslator(ADMINOBJECT, CONNECTOR_PKG.getResourceAdapter_AdminObjects());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(ADMINOBJECT_INTERFACE, CONNECTOR_PKG.getAdminObject_AdminObjectInterface()),
-			new Translator(ADMINOBJECT_CLASS, CONNECTOR_PKG.getAdminObject_AdminObjectClass()),
-			createConfigurationPropertyTranslator14(CONNECTOR_PKG.getAdminObject_ConfigProperties())
-			
-		});
-		return result;
-	}
-
-	private Translator createConnectionDefinationTranslator() {
-		GenericTranslator result = new GenericTranslator(CONNECTION_DEFINITION, CONNECTOR_PKG.getOutboundResourceAdapter_ConnectionDefinitions());
-		result.setChildren(new Translator[] {
-			new Translator(MANAGEDCONNECTIONFACTORY_CLASS, CONNECTOR_PKG.getConnectionDefinition_ManagedConnectionFactoryClass()),
-			createConfigurationPropertyTranslator14(CONNECTOR_PKG.getConnectionDefinition_ConfigProperties()),
-			new Translator(CONNECTIONFACTORY_INTERFACE, CONNECTOR_PKG.getConnectionDefinition_ConnectionFactoryInterface()),
-			new Translator(CONNECTIONFACTORY_IMPL_CLASS, CONNECTOR_PKG.getConnectionDefinition_ConnectionFactoryImplClass()),
-			new Translator(CONNECTION_INTERFACE, CONNECTOR_PKG.getConnectionDefinition_ConnectionInterface()),
-			new Translator(CONNECTION_IMPL_CLASS, CONNECTOR_PKG.getConnectionDefinition_ConnectionImplClass()),
-		});
-		return result;
-	}
-
-	public Translator createResourceAdapterTranslator13() {
-		GenericTranslator result = new GenericTranslator(RESOURCEADAPTER, CONNECTOR_PKG.getConnector_ResourceAdapter());
-		result.setChildren(new Translator[] {
-			new Translator(MANAGEDCONNECTIONFACTORY_CLASS, CONNECTOR_PKG.getResourceAdapter_ManagedConnectionFactoryClass() ),
-			new Translator(CONNECTIONFACTORY_INTERFACE, CONNECTOR_PKG.getResourceAdapter_ConnectionFactoryInterface() ),
-			new Translator(CONNECTIONFACTORY_IMPL_CLASS, CONNECTOR_PKG.getResourceAdapter_ConnectionFactoryImplClass() ),
-			new Translator(CONNECTION_INTERFACE, CONNECTOR_PKG.getResourceAdapter_ConnectionInterface()),
-			new Translator(CONNECTION_IMPL_CLASS, CONNECTOR_PKG.getResourceAdapter_ConnectionImplClass()),
-			new Translator(TRANSACTION_SUPPORT, CONNECTOR_PKG.getResourceAdapter_TransactionSupport() ),
-			createConfigurationPropertyTranslator13(CONNECTOR_PKG.getResourceAdapter_ConfigProperties()),
-			createAuthMechanismTranslator13(CONNECTOR_PKG.getResourceAdapter_AuthenticationMechanisms()),
-			new BooleanTranslator(REAUTHENTICATION_SUPPORT, CONNECTOR_PKG.getResourceAdapter_ReauthenticationSupport()),
-			createSecurityPermissionsTranslator()
-			
-			
-		});
-		return result;
-	}
-	
-	public Translator createSecurityPermissionsTranslator() {
-		GenericTranslator result = new GenericTranslator(SECURITY_PERMISSION, CONNECTOR_PKG.getResourceAdapter_SecurityPermissions());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getSecurityPermission_Description()),
-			SECURITY_PERMISSION_SPEC_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createAuthMechanismTranslator13(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(AUTH_MECHANISM, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getAuthenticationMechanism_Description()), 
-			AUTH_MECH_TYPE_TRANSLATOR,
-			CREDENTIAL_INTERFACE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createAuthMechanismTranslator14(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(AUTH_MECHANISM, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getAuthenticationMechanism_Descriptions()), 
-			AUTH_MECH_TYPE_TRANSLATOR,
-			CREDENTIAL_INTERFACE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	
-	public Translator createConfigurationPropertyTranslator13(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(CONFIG_PROPERTY, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getConfigProperty_Description()),
-			CONFIG_PROPERTY_NAME_TRANSLATOR,
-			CONFIG_PROPERTY_TYPE_TRANSLATOR,
-			CONFIG_PROPERTY_VALUE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createConfigurationPropertyTranslator14(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(CONFIG_PROPERTY, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getConfigProperty_Descriptions()),
-			CONFIG_PROPERTY_NAME_TRANSLATOR,
-			CONFIG_PROPERTY_TYPE_TRANSLATOR,
-			CONFIG_PROPERTY_VALUE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createLicenseTranslator13() {
-		GenericTranslator result = new GenericTranslator(LICENSE, CONNECTOR_PKG.getConnector_License());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getLicense_Description()), 
-			LICENSE_REQUIRED_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createLicenseTranslator14() {
-		GenericTranslator result = new GenericTranslator(LICENSE, CONNECTOR_PKG.getConnector_License());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getLicense_Descriptions()), 
-			LICENSE_REQUIRED_TRANSLATOR
-		});
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AbstractEJBTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AbstractEJBTranslator.java
deleted file mode 100644
index 896d4acf8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AbstractEJBTranslator.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public abstract class AbstractEJBTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI, J2EEVersionConstants {
-	protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	protected static final CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-	
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AbstractEJBTranslator(String domNameAndPath) {
-		super(domNameAndPath, EJB_PKG.getEJBJar_EnterpriseBeans());
-	}
-
-	
-	protected Translator[] create13Children() {
-		Translator[] start = getCommonBeginMaps13();
-		Translator[] middle = getSpecificMaps(J2EE_1_3_ID);
-		Translator[] end = getEndMaps13();
-		return (Translator[]) concat(start, concat(middle, end));
-	}
-	
-	protected Translator[] create14Children() {
-			Translator[] start = getCommonBeginMaps14();
-			Translator[] middle = getSpecificMaps(J2EE_1_4_ID);
-			Translator[] end = getEndMaps14();
-			//Translator[] deploymentExt = getDeploymentExtensionMaps();
-			return (Translator[]) concat(start, concat(middle, end));
-	}
-	
-	protected Translator[] getCommonBeginMaps13() {
-		
-		Translator[] beginMaps =  new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new Translator(EJB_NAME, EJB_PKG.getEnterpriseBean_Name())
-		};
-		
-		if (usesHomeRemoteAttributes())
-			return (Translator[])concat(concat(beginMaps, getHomeRemoteMaps()), getEJBClassMap());
-		return (Translator[])concat(beginMaps, getEJBClassMap());
-	}
-	
-
-	protected Translator[] getCommonBeginMaps14() {
-		
-		Translator[] beginMaps =  new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(EJB_NAME, EJB_PKG.getEnterpriseBean_Name())
-		};
-		if (usesHomeRemoteAttributes())
-			return (Translator[])concat(concat(beginMaps, getHomeRemoteMaps()), getEJBClassMap());
-		return (Translator[])concat(beginMaps, getEJBClassMap());
-	}
-	
-	protected Translator[] getHomeRemoteMaps() {
-		return new Translator[] {
-			new JavaClassTranslator(HOME, EJB_PKG.getEnterpriseBean_HomeInterface()),
-			new JavaClassTranslator(REMOTE, EJB_PKG.getEnterpriseBean_RemoteInterface()),
-			//Begin EJB 2.0
-			new JavaClassTranslator(LOCAL_HOME, EJB_PKG.getEnterpriseBean_LocalHomeInterface()),
-			new JavaClassTranslator(LOCAL, EJB_PKG.getEnterpriseBean_LocalInterface())
-			//End EJB 2.0
-		};
-	}
-
-	protected Translator[] getEJBClassMap() {
-		return new Translator[] {
-			new JavaClassTranslator(EJB_CLASS, EJB_PKG.getEnterpriseBean_EjbClass())
-		};
-	}
-
-	protected boolean usesHomeRemoteAttributes() {
-		return true;
-	}
-
-
-	protected Translator[] getEndMaps13() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_3,
-			CommonTranslators.createSecurityRoleRefTranslator13(EJB_PKG.getEnterpriseBean_SecurityRoleRefs()),
-			new SecurityIdentityTranslator(),
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3
-		};
-
-	}
-		
-	protected Translator[] getEndMaps14() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_SERVICE_REF_1_4,	
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4,
-			CommonTranslators.createSecurityRoleRefTranslator14(EJB_PKG.getEnterpriseBean_SecurityRoleRefs()),
-			new SecurityIdentityTranslator(),
-		};
-		
-	}
-	
-	protected abstract Translator[] getSpecificMaps(int versionID);
-
-//	protected Translator[] getDeploymentExtensionMaps(){
-//		return new Translator[] {
-//			CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEnterpriseBean_Extensions())
-//		};
-//	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AcknowledgeModeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AcknowledgeModeTranslator.java
deleted file mode 100644
index c8fef2562..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AcknowledgeModeTranslator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class AcknowledgeModeTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-
-	public static final String AUTO_ACKNOWLEDGE = "Auto-acknowledge"; //$NON-NLS-1$
-	public static final String DUPS_OK_ACKNOWLEDGE = "Dups-ok-acknowledge"; //$NON-NLS-1$
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AcknowledgeModeTranslator() {
-		super(ACKNOWLEDGE_MODE, EjbPackage.eINSTANCE.getMessageDriven_AcknowledgeMode());
-	}
-	
-	
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (AUTO_ACKNOWLEDGE.equalsIgnoreCase(strValue))
-			return AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL;
-		else if (DUPS_OK_ACKNOWLEDGE.equalsIgnoreCase(strValue))
-			return AcknowledgeMode.DUPS_OK_ACKNOWLEDGE_LITERAL;
-		else 
-			return super.convertStringToValue(strValue, owner);
-	}
-
-	public String convertValueToString(Object value, EObject owner) {
-		if (AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL.equals(value)) 
-			return AUTO_ACKNOWLEDGE;
-		else if (AcknowledgeMode.DUPS_OK_ACKNOWLEDGE_LITERAL.equals(value))
-			return DUPS_OK_ACKNOWLEDGE;
-		else
-			return super.convertValueToString(value, owner);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPFieldTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPFieldTranslator.java
deleted file mode 100644
index 7861a6fe2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPFieldTranslator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 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.model.translator.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CMPFieldTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	public static EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	public static Translator[] children;
-	public CMPFieldTranslator(){
-		super(CMP_FIELD, EJB_PKG.getContainerManagedEntity_PersistentAttributes());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren()
-	 */
-	protected Translator[] getChildren() {
-		if (children == null)
-			children = createChildren();
-		return children;
-	}
-
-	protected Translator[] createChildren(){
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION,EJB_PKG.getCMPAttribute_Description()),
-			new Translator(FIELD_NAME, EcorePackage.eINSTANCE.getENamedElement_Name())	
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-	 */
-	public List getMOFChildren(EObject mofObject) {
-		switch(((ContainerManagedEntity)mofObject).getVersionID()) {  
-			
-			case J2EEVersionConstants.EJB_1_0_ID:
-			case J2EEVersionConstants.EJB_1_1_ID:
-	
-				return super.getMOFChildren(mofObject);
-				
-			case J2EEVersionConstants.EJB_2_0_ID:
-			case J2EEVersionConstants.EJB_2_1_ID: default:
-	
-				return get20CMPAttributes((ContainerManagedEntity)mofObject);
-		}  
-	}
-	
-	public List get20CMPAttributes(ContainerManagedEntity cmp) {
-		List allAttributes, removed, result;
-		removed = null;
-		allAttributes = cmp.getPersistentAttributes();
-		int size = allAttributes.size();
-		CMPAttribute att = null;
-		for (int i = 0; i < size; i++) {
-			att = (CMPAttribute) allAttributes.get(i);
-			if (att.isDerived()) {
-				if (removed == null)
-					removed = new ArrayList();
-				removed.add(att);
-			}
-		}
-		if (removed != null) {
-			result = new ArrayList(size);
-			result.addAll(allAttributes);
-			result.removeAll(removed);
-		} else
-			result = allAttributes;
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPVersionTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPVersionTranslator.java
deleted file mode 100644
index f1743cd16..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPVersionTranslator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 3, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class CMPVersionTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public CMPVersionTranslator() {
-		super(CMP_VERSION, EjbPackage.eINSTANCE.getContainerManagedEntity_Version());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getMOFValue(EObject mofObject) {
-		EJBJar parent = ((ContainerManagedEntity)mofObject).getEjbJar();
-		if (parent.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID)
-			return super.getMOFValue(mofObject);
-		return null;
-	}
-	
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/ContainerManagedEntityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/ContainerManagedEntityTranslator.java
deleted file mode 100644
index ce47a35e9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/ContainerManagedEntityTranslator.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class ContainerManagedEntityTranslator extends EntityTranslator {
-
-	private static Translator[] children13;
-	private static Translator[] children14;
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public ContainerManagedEntityTranslator() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createContainerManagedEntity();
-	}
-	//TODO Uncomment all commented code and fix
-	/*
-	protected String extractStringValue(MapInfo map, EObject mofObject) {
-		if (map.getDOMName().equals(PRIMKEY_FIELD)) {	
-			CMPAttribute attr = getContainerManagedEntity().getPrimaryKeyAttribute();
-			return attr == null ? getSpecifiedPrimKeyFieldName() : attr.getName();
-		} else
-			return super.extractStringValue(map, mofObject);
-	
-	} 
-
-	protected String getSpecifiedPrimKeyFieldName() {
-		return CMPSpecAdapter.getSpecifiedPrimKeyFieldName(getContainerManagedEntity());
-	}
-	*/
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected String getPersistenceType() {
-		return CONTAINER;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.EntityTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		Translator[] cmpTranslators = new Translator[] {
-			//Begin EJB 2.0 added
-			new CMPVersionTranslator(),
-			new Translator(ABSTRACT_SCHEMA_NAME, EJB_PKG.getContainerManagedEntity_AbstractSchemaName()),
-			//End EJB 2.0 added
-		
-			new CMPFieldTranslator(),
-			new PrimKeyFieldTranslator(),
-		};
-		return (Translator[]) concat(super.getSpecificMaps(versionID), cmpTranslators);
-	}
-	
-	
-	protected Translator[] getEndMaps13() {
-		//Added for EJB 2.0
-		Translator[] queryT = new Translator[] {
-			createQueryTranslators()
-		};
-		return (Translator[]) concat(super.getEndMaps13(), queryT);
-	}
-	
-	protected Translator[] getEndMaps14() {
-			//Added for EJB 2.0
-			Translator[] queryT = new Translator[] {
-				createQueryTranslators()
-			};
-			return (Translator[]) concat(super.getEndMaps14(), queryT);
-	}
-		
-	public static Translator createQueryTranslators() {
-		GenericTranslator result = new GenericTranslator(QUERY, EJB_PKG.getContainerManagedEntity_Queries());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, EJB_PKG.getQuery_Description()),
-			createQueryMethodTranslators(),
-			new Translator(RESULT_TYPE_MAPPING, EJB_PKG.getQuery_ReturnTypeMapping()),
-			new Translator(EJB_QL, EJB_PKG.getQuery_EjbQL())
-		});
-		return result;
-	}
-	
-	public static Translator createQueryMethodTranslators() {
-		GenericTranslator result = new GenericTranslator(QUERY_METHOD, EJB_PKG.getQuery_QueryMethod());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(METHOD_NAME, EJB_PKG.getMethodElement_Name()),
-			new MethodParamsTranslator(EJB_PKG.getMethodElement_Parms())
-			});
-		return result;
-	}
-	
-	/*
-	protected void primUpdateDOMFeature(MapInfo map, Node node, EObject mofObject) {
-		if (map == noFeaturePrimKeyMapInfo)
-			return;
-		if (map.getDOMName().equals(CMP_VERSION)) {
-			updateDOMCmpVersionIfNecessary(map, node, mofObject);
-			return;
-		}
-		super.primUpdateDOMFeature(map, node, mofObject);
-		//If the primary key class has changed, this will impact the primary key field
-		if (map.getDOMName().equals(PRIM_KEY_CLASS)) {
-			String specifiedPrimKeyField = CMPSpecAdapter.getSpecifiedPrimKeyFieldName(getContainerManagedEntity());
-			try {
-				super.primUpdateDOMFeature(noFeaturePrimKeyMapInfo, node, mofObject);
-			} finally {
-				CMPSpecAdapter.setPrimKeyFieldFromXml(specifiedPrimKeyField, getContainerManagedEntity());
-			}
-		}
-	}
-	
-
-	protected void updateDOMCmpVersionIfNecessary(MapInfo map, Node node, EObject mofObject) {
-		if (!(mofObject instanceof ContainerManagedEntity)) 
-			return;
-		
-		EJBJar parent = ((ContainerManagedEntity)mofObject).getEjbJar();
-		if (parent.isVersion2_0Descriptor())
-			super.primUpdateDOMFeature(map, node, mofObject);
-	}
-	protected void primUpdateDOMMultiFeature(MapInfo map, Node node, EObject mofObject) {
-		if (map == featurePrimKeyMapInfo) 
-			super.primUpdateDOMFeature(noFeaturePrimKeyMapInfo, node, mofObject);
-		else 
-			super.primUpdateDOMMultiFeature(map, node, mofObject);
-	}
-	protected boolean primUpdateMOFFeature(MapInfo map, Node node, EObject mofObject) {
-		boolean hasChanged = super.primUpdateMOFFeature(map, node, mofObject);
-		//If the key class has changed, from the xml side, then we need to make sure we stamp the primkey field
-		//as being specified from xml, since we will not automatically remove that node
-		if (map.getDOMName().equals(PRIM_KEY_CLASS)) {
-			updateXmlKeyField(noFeaturePrimKeyMapInfo, node);
-			if (hasChanged)
-				updateMOFPrimKeyFieldFeature(featurePrimKeyMapInfo, getNode(), true);
-		}
-		return hasChanged;
-	}
-	protected void primUpdateMOFMultiFeature(MapInfo map, Node node, EObject mofObject) {
-		if (map == noFeaturePrimKeyMapInfo)
-			return;
-		if (map.getDOMName().equals(PRIMKEY_FIELD)) {
-			updateMOFPrimKeyFieldFeature(map, node, false);
-		} else if (map.getDOMName().equals(CMP_FIELD)) {
-			//cache the old list of cmp attributes before update
-			List cmpAttributesListCOPY = new ArrayList();
-			cmpAttributesListCOPY.addAll(getContainerManagedEntity().getPersistentAttributes());
-		
-			//do the update
-			super.primUpdateMOFMultiFeature(map, node, mofObject);
-
-			List newCmpAttributeList = getContainerManagedEntity().getPersistentAttributes();
-			//key the cmp attribute list and the key attribute list.
-			performKeySynchronization(cmpAttributesListCOPY, newCmpAttributeList);
-		} else 
-			super.primUpdateMOFMultiFeature(map, node, mofObject);
-	}
-	/**
-	 * Method that synchronizies the list of cmp attributes that are keys with the key attribute list.
-	 * When keys are added and deleted from the cmp attribute list.
-	 * 
-	 * @param List cmpAttributesListCOPY - Copy of the cmp attribute list before any attributes where added
-	 * 										or removed.
-	 * @param List newCmpAttributeList - List of cmp attributes after a modification has occured.
-	 */
-	 /*
-	protected void performKeySynchronization( List cmpAttributesListCOPY, List newCmpAttributeList ) {	
-		if( cmpAttributesListCOPY != null && newCmpAttributeList != null ) {	
-
-			//add and removes keys based on what the adapters give back
-		
-			List addedCmpAttributeList = getCmpAttributesDeltaList( cmpAttributesListCOPY, newCmpAttributeList );
-			if( addedCmpAttributeList != null && !addedCmpAttributeList.isEmpty() ) {					
-				//determine if any of the added attributes are keys, if so get a list of them.
-				List addedKeyAttributeList = getKeyAttributesFromList( addedCmpAttributeList, getContainerManagedEntity().getPrimaryKey() );
-				//now, add the keys to the list.
-				addKeysToKeyAttributeList( addedKeyAttributeList, getContainerManagedEntity() );
-			}// if
-		
-			List subtractedCmpAttributeList = getCmpAttributesDeltaList( newCmpAttributeList, cmpAttributesListCOPY );
-			if( subtractedCmpAttributeList != null && !subtractedCmpAttributeList.isEmpty() ) {
-				//determine if any of the subtracted attributes are keys, if so get a list of them.
-				List subtractedKeyAttributeList = getKeyAttributesFromList( subtractedCmpAttributeList, getContainerManagedEntity().getPrimaryKey() );
-				//now, subtract the keys from the list.
-				removeKeysFromKeyAttributeList( subtractedKeyAttributeList, getContainerManagedEntity() );
-			}// if		
-		
-		}// if	
-	}// performKeySynchronization
-
-	/**
-	 * Remove a bunch of keys from the current key attribute list.
-	 * 
-	 * @param List subtractedKeyAttributeList - The list of keys to subtract from the key attributes list.
-	 * @param ContainerManagedEntity cmp - The current container managed entity.
-	 */
-	 
-	 /*
-	public static void removeKeysFromKeyAttributeList( List subtractedKeyAttributeList, ContainerManagedEntity cmp ) {
-		if( subtractedKeyAttributeList != null && !subtractedKeyAttributeList.isEmpty() ) {
-			//Subtract the key attributes from the container managed entity
-			Iterator kli = subtractedKeyAttributeList.iterator();
-		
-			while( kli.hasNext() ) {
-				CMPAttribute cmpAttribute = (CMPAttribute)kli.next();
-				String cmpAttributeName = cmpAttribute.getName();
-				if( cmpAttributeName != null ) {
-					if( cmp != null && cmp.getKeyAttributes() != null ) {
-						List keyAttributeList = cmp.getKeyAttributes();
-						keyAttributeList.remove( cmpAttribute );
-					}// if
-				}// if
-			}// while
-		}// if
-	}// performKeySynchronization
-
-	/**
-	 * Adds a bunch of keys to the current key attribute list.
-	 * 
-	 * @param List addedCmpAttributeList - The list of keys to add to the key attributes list.
-	 * @param ContainerManagedEntity cmp - The current container managed entity.
-	 */
-	 
-	 /*
-	public static void addKeysToKeyAttributeList( List addedKeyAttributeList, ContainerManagedEntity cmp ) {
-		if( addedKeyAttributeList != null && !addedKeyAttributeList.isEmpty() ) {
-			//Add the key attributes to the container managed entity
-			Iterator kli = addedKeyAttributeList.iterator();
-		
-			while( kli.hasNext() ) {
-				CMPAttribute cmpAttribute = (CMPAttribute)kli.next();
-				String cmpAttributeName = cmpAttribute.getName();
-				if( cmpAttributeName != null ) {
-					if( cmp != null && cmp.getKeyAttributes() != null )
-						cmp.addKeyAttributeName( cmpAttributeName );
-				}// if
-			}// while
-		}// if
-	}// addKeysToKeyAttributeList
-
-	/**
-	 * Gets the key attributes contained in the list.
-	 * 
-	 * @param List attributeList - List of attributes.
-	 * @param JavaClass primaryKey - The primary key of the cmp.
-	 * @return List
-	 */
-	 
-	 /*
-	public static List getKeyAttributesFromList(  List attributeList, JavaClass primaryKey ) {
-		if (primaryKey == null || attributeList == null || attributeList.isEmpty()) 
-			return Collections.EMPTY_LIST;
-		
-		List foundKeyAttributeList = new ArrayList();
-		Iterator it = attributeList.iterator();		
-		while( it.hasNext() ) {	
-			CMPAttribute cmpAttr = (CMPAttribute)it.next();			
-			if( cmpAttr != null ) {
-				String cmpAttributeName = cmpAttr.getName();
-				if (cmpAttributeName != null) {			
-					Field keyField = primaryKey.getField(cmpAttributeName);	
-					if (keyField != null) 				
-						foundKeyAttributeList.add(cmpAttr);
-				}// if
-			} //if
-		}// while	
-		return foundKeyAttributeList;
-	}// getKeyAttributesFromList
-
-	/**
-	 * Gets the delta elements of two lists
-	 * 
-	 * @param List firstList - The list that is being compared too.
-	 * @param List secondList - The list to check the difference of.
-	 * @return List
-	 */
-	 
-	 /*
-	protected List getCmpAttributesDeltaList( List firstList, List secondList ) {
-		List diffAttributeList = new ArrayList();
-	
-		if( firstList != null && secondList != null ) {
-			Iterator it = secondList.iterator();
-			while( it.hasNext() ) {
-				CMPAttribute cmpAttribute = (CMPAttribute)it.next();
-				if( cmpAttribute != null && !firstList.contains( cmpAttribute ) ) {
-					diffAttributeList.add( cmpAttribute );
-				}// if
-			}// while
-			return diffAttributeList;
-		}// if	
-		return java.util.Collections.EMPTY_LIST;
-	}// getCmpAttributesDeltaList
-
-	protected void updateMOFPrimKeyFieldFeature(MapInfo map, Node node, boolean force) {
-		Resource res = getEObject().eResource();
-		boolean modFlag = res == null ? false : res.isModified();
-		String keyField = getDOMText(map, node);
-		//Determine if the prim-key field has changed.  If so, then recompute the keys; otherwise leave 
-		//it alone
-		if (keyField != null)
-			keyField = keyField.trim();
-		CMPAttribute existingKeyAtt = getContainerManagedEntity().getPrimaryKeyAttribute();
-		String existingKeyField = existingKeyAtt == null ? null : existingKeyAtt.getName();
-		if (!force 
-			&& ((keyField == null && existingKeyField == null) 
-				|| (keyField != null && keyField.equals(existingKeyField))
-				|| (existingKeyField != null && existingKeyField.equals(keyField))))
-			return;
-		
-		try {
-			getContainerManagedEntity().clearKeyAttributes(); //necessary to clear reflected flag
-			CMPAttribute keyAtt = null;
-			CMPSpecAdapter.setPrimKeyFieldFromXml(keyField, getContainerManagedEntity());
-			if (keyField != null) {
-				keyAtt = getContainerManagedEntity().addKeyAttributeName(keyField, false);
-				if (keyAtt != null) {
-					//This is an invalid state.
-					String className = getContainerManagedEntity().getPrimaryKeyName();
-					JavaClass ref = null;
-					if (className != null)
-						ref = JavaClassImpl.createClassRef(className);
-					keyAtt.setEType(ref);
-				}
-			} else {
-				//Hack to force the UI to refresh
-				EList keys = getContainerManagedEntity().getKeyAttributes();
-				if (!keys.isEmpty())
-					keys.set(0, keys.get(0));
-			}
-		} finally {
-			if (res != null && res.isTrackingModification())
-				res.setModified(modFlag);
-		}
-	}
-	protected void updateXmlKeyField(MapInfo map, Node node) {
-		String keyField = getDOMText(map, node);
-		CMPSpecAdapter.setPrimKeyFieldFromXml(keyField, getContainerManagedEntity());
-	}
-	
-		/**
-		 * @see AbstractDOMNodeAdapter#getMOFChildren(EObject, MapInfo)
-		 */
-		 /*
-		protected List getMOFChildren(EObject mofObject, MapInfo map) {
-			if (getContainerManagedEntity().isVersion2_X() && CMP_FIELD.equals(map.getDOMName()))
-				return get20CMPAttributes((ContainerManagedEntity)mofObject);
-			else
-				return super.getMOFChildren(mofObject, map);
-		}
-
-		/**
-		 * Method get20CMPAttributes.
-		 * @param containerManagedEntity
-		 * @return List
-		 */
-		 
-		 /*
-		private List get20CMPAttributes(ContainerManagedEntity cmp) {
-			List allAttributes, removed, result;
-			removed = null;
-			allAttributes = cmp.getPersistentAttributes();
-			int size = allAttributes.size();
-			CMPAttribute att = null;
-			for (int i = 0; i < size; i++) {
-				att = (CMPAttribute) allAttributes.get(i);
-				if (att.isDerived()) {
-					if (removed == null)
-						removed = new ArrayList();
-					removed.add(att);
-				}
-			}
-			if (removed != null) {
-				result = new ArrayList(size);
-				result.addAll(allAttributes);
-				result.removeAll(removed);
-			} else
-				result = allAttributes;
-			return result;
-		}
-	
-		/**
-		 * @see com.ibm.etools.mof2dom.AbstractDOMNodeAdapter#notifyChanged(new ENotificationImpl((InternalEObject)Notifier, int,(EStructuralFeature) EObject, Object, Object, int))
-		 */
-		 
-		 /*
-		public void notifyChanged(Notification notification) {
-			if (notification.getEventType() == ContainerManagedEntity.DERIVED_FLAG_CHANGE)
-				updateDOMFeature(getMap(CMP_FIELD), getNode(), getEObject());
-			else
-				super.notifyChanged(notification);
-		}
-
-		private MapInfo getMap(String aNodeName) {
-			for (int i = 0; i < fMaps.length; i++) {
-				if (aNodeName.equals(fMaps[i].getDOMName()))
-					return fMaps[i];
-			}
-			return null;
-		}
-		*/
-	}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EJBJarTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EJBJarTranslator.java
deleted file mode 100644
index 49afd53cc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EJBJarTranslator.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.SourceLinkTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-/**
- * @author schacher
- */
-public class EJBJarTranslator extends RootTranslator implements EjbDeploymentDescriptorXmlMapperI, J2EEConstants {
-	private static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	public static EJBJarTranslator INSTANCE = new EJBJarTranslator();
-	private static Translator[] children13;
-	private static Translator[] children14;
-
-	public static TranslatorPath ENTERPRISE_BEAN_NAME_TRANSLATOR_PATH =
-			new TranslatorPath(
-				new Translator[] {
-					new Translator(EJB_JAR, ROOT_FEATURE),
-					new Translator(EnterpriseBeansTranslator.ENTERPRISE_BEANS_PATH, EJB_PKG.getEJBJar_EnterpriseBeans()),
-					new Translator(EJB_NAME, EJB_PKG.getEnterpriseBean_Name())});
-
-
-	private static final Translator CMR_FIELD_NAME_TRANSLATOR = new Translator(CMR_FIELD_NAME, EcorePackage.eINSTANCE.getENamedElement_Name());
-	private static final Translator CMR_FIELD_TYPE_TRANSLATOR = new JavaClassTranslator(CMR_FIELD_TYPE, EJB_PKG.getCMRField_CollectionType());
-	private static final Translator ROLE_SOURCE_EJB_NAME_SOURCELINK_TRANSLATOR = new SourceLinkTranslator(EJB_NAME, EJB_PKG.getRoleSource_EntityBean(), ENTERPRISE_BEAN_NAME_TRANSLATOR_PATH);
-	private static final Translator EJB_RELATIONSHIP_ROLE_NAME_TRANSLATOR = new Translator(EJB_RELATIONSHIP_ROLE_NAME, EJB_PKG.getEJBRelationshipRole_RoleName());
-	private static final Translator MULTIPLICITY_TRANSLATOR = new MultiplicityTranslator();
-	private static final Translator CASCADE_DELETE_TRANSLATOR = new Translator(CASCADE_DELETE, EJB_PKG.getEJBRelationshipRole_CascadeDelete(), Translator.EMPTY_TAG);
-	private static final Translator EJB_RELATION_NAME_TRANSLATOR = new Translator(EJB_RELATION_NAME, EJB_PKG.getEJBRelation_Name());
-	private static final Translator UNCHECKED_TRANSLATOR = new Translator(UNCHECKED, EJB_PKG.getMethodPermission_Unchecked(), Translator.EMPTY_TAG);
-	private static final Translator METHOD_PERMISSION_ROLE_NAME_SOURCELINK_TRANSLATOR = new SourceLinkTranslator(ROLE_NAME,EJB_PKG.getMethodPermission_Roles(),new TranslatorPath(
-		new Translator[] {
-			new Translator(ASSEMBLY_DESCRIPTOR, CONTAINER_FEATURE),
-			new Translator(SECURITY_ROLE, EJB_PKG.getAssemblyDescriptor_SecurityRoles()),
-			new Translator(ROLE_NAME, CommonPackage.eINSTANCE.getSecurityRole_RoleName())
-		}));
-	private static final Translator SEC_ROLE_NAME_TRANSLATOR = new Translator(ROLE_NAME, CommonPackage.eINSTANCE.getSecurityRole_RoleName(),	new TranslatorPath(
-		new Translator[] {
-			new Translator(ASSEMBLY_DESCRIPTOR, CONTAINER_FEATURE),
-			new Translator(METHOD_PERMISSION, EJB_PKG.getAssemblyDescriptor_MethodPermissions()),
-			new Translator(SECURITY_ROLE, EJB_PKG.getMethodPermission_Roles()),
-			new Translator(ROLE_NAME, CommonPackage.eINSTANCE.getSecurityRole_RoleName())
-		}));
-	
-	private static final Translator TRANS_ATTRIBUTE_TRANSLATOR = new Translator(TRANS_ATTRIBUTE, EJB_PKG.getMethodTransaction_TransactionAttribute());
-	private static final Translator METHOD_ELEMENT_EJB_NAME_SOURCELINK_TRANSLATOR = new SourceLinkTranslator(EJB_NAME, EJB_PKG.getMethodElement_EnterpriseBean(), EJBJarTranslator.ENTERPRISE_BEAN_NAME_TRANSLATOR_PATH);
-	private static final Translator METHOD_NAME_TRANSLATOR = new Translator(METHOD_NAME, EJB_PKG.getMethodElement_Name());
-	private static final Translator METHOD_PARAM_TRANSLATOR = new MethodParamsTranslator(EJB_PKG.getMethodElement_Parms());
-	private static final Translator METHOD_ELEMENT_KIND_TRANSLATOR = new MethodElementKindTranslator();
-	
-	public EJBJarTranslator() {
-		super(EJB_JAR, EJB_PKG.getEJBJar());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new EnterpriseBeansTranslator(),
-			createRelationshipsTranslator13(),
-			createAssemblyDescriptorTranslator13(),
-			new Translator(EJB_CLIENT_JAR, EJB_PKG.getEJBJar_EjbClientJar()),
-		};
-	}
-
-	protected Translator[] create14Children() {
-		return	new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, EJB_PKG.getEJBJar_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+EJB_JAR_SCHEMA_LOC_2_1),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new EnterpriseBeansTranslator(),
-			createRelationshipsTranslator14(),
-			createAssemblyDescriptorTranslator14(),
-			new Translator(EJB_CLIENT_JAR, EJB_PKG.getEJBJar_EjbClientJar()),
-		//	CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEJBJar_Extensions())
-		};
-	}
-
-	public static Translator createRelationshipsTranslator13() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIPS, EJB_PKG.getEJBJar_RelationshipList());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getRelationships_Description()),
-				createEJBRelationsTranslator13(),
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationsTranslator13() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATION, EJB_PKG.getRelationships_EjbRelations());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getEJBRelation_Description()),
-				EJB_RELATION_NAME_TRANSLATOR,
-				createEJBRelationshipRoleTranslator13(),
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationshipRoleTranslator13() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATIONSHIP_ROLE, EJB_PKG.getEJBRelation_RelationshipRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getEJBRelationshipRole_Description()),
-				EJB_RELATIONSHIP_ROLE_NAME_TRANSLATOR,
-				MULTIPLICITY_TRANSLATOR,
-				CASCADE_DELETE_TRANSLATOR,
-				createRelationshipRoleSourceTranslator13(),
-				createCMRFieldTranslator13(),
-		});
-		return result;
-	}
-
-	private static Translator createRelationshipRoleSourceTranslator13() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIP_ROLE_SOURCE, EJB_PKG.getEJBRelationshipRole_Source());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getRoleSource_Description()),
-				ROLE_SOURCE_EJB_NAME_SOURCELINK_TRANSLATOR,
-		});
-		return result;
-	}
-
-	private static Translator createCMRFieldTranslator13() {
-		GenericTranslator result = new GenericTranslator(CMR_FIELD, EJB_PKG.getEJBRelationshipRole_CmrField());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getCMPAttribute_Description()),
-				CMR_FIELD_NAME_TRANSLATOR,
-				CMR_FIELD_TYPE_TRANSLATOR
-		});
-		return result;
-	}
-
-
-	/**
-	 * J2EE 1.4 Relationship
-	 * 
-	 */
-	public static Translator createRelationshipsTranslator14() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIPS, EJB_PKG.getEJBJar_RelationshipList());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getRelationships_Descriptions()),
-				createEJBRelationsTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getRelationships_Extensions())
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationsTranslator14() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATION, EJB_PKG.getRelationships_EjbRelations());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getEJBRelation_Descriptions()),
-				EJB_RELATION_NAME_TRANSLATOR,
-				createEJBRelationshipRoleTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEJBRelation_Extensions())
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationshipRoleTranslator14() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATIONSHIP_ROLE, EJB_PKG.getEJBRelation_RelationshipRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getEJBRelationshipRole_Descriptions()),
-				EJB_RELATIONSHIP_ROLE_NAME_TRANSLATOR,
-				MULTIPLICITY_TRANSLATOR,
-				CASCADE_DELETE_TRANSLATOR,
-				createRelationshipRoleSourceTranslator14(),
-				createCMRFieldTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEJBRelationshipRole_Extensions())
-		});
-		return result;
-	}
-
-	private static Translator createRelationshipRoleSourceTranslator14() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIP_ROLE_SOURCE, EJB_PKG.getEJBRelationshipRole_Source());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getRoleSource_Descriptions()),
-				ROLE_SOURCE_EJB_NAME_SOURCELINK_TRANSLATOR
-		});
-		return result;
-	}
-
-	private static Translator createCMRFieldTranslator14() {
-		GenericTranslator result = new GenericTranslator(CMR_FIELD, EJB_PKG.getEJBRelationshipRole_CmrField());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getCMPAttribute_Descriptions()),
-				CMR_FIELD_NAME_TRANSLATOR,
-				CMR_FIELD_TYPE_TRANSLATOR,
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getCMPAttribute_Extensions())
-		});
-		return result;
-	}
-
-	/*
-	 * <= J2EE 1.3 Assembly Descriptor 
-	 */
-	public static Translator createAssemblyDescriptorTranslator13() {
-		GenericTranslator result = new GenericTranslator(ASSEMBLY_DESCRIPTOR, EJB_PKG.getEJBJar_AssemblyDescriptor());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				createSecurityRoleTranslator13(),
-				createMethodPermissionTranslator13(),
-				createMethodTransactionTranslator13(),
-				createExcludesListTranslator13(),
-		});
-		return result;
-	}
-
-	public static Translator createMethodPermissionTranslator13() {
-		GenericTranslator result = new GenericTranslator(METHOD_PERMISSION, EJB_PKG.getAssemblyDescriptor_MethodPermissions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getMethodPermission_Description()),
-				UNCHECKED_TRANSLATOR,
-				METHOD_PERMISSION_ROLE_NAME_SOURCELINK_TRANSLATOR,
-				createMethodElementTranslators13(EJB_PKG.getMethodPermission_MethodElements())
-		});
-
-		return result;
-	}
-
-	//TODO: NEED TO FIGURE OUT SECURITY PATH		
-	public static Translator createSecurityRoleTranslator13() {
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE, EJB_PKG.getAssemblyDescriptor_SecurityRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, CommonPackage.eINSTANCE.getSecurityRole_Description()),
-				SEC_ROLE_NAME_TRANSLATOR
-			});
-
-		return result;
-	}
-
-	public static Translator createMethodTransactionTranslator13() {
-		GenericTranslator result = new GenericTranslator(CONTAINER_TRANSACTION, EJB_PKG.getAssemblyDescriptor_MethodTransactions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getMethodTransaction_Description()),
-				createMethodElementTranslators13(EJB_PKG.getMethodTransaction_MethodElements()),
-				TRANS_ATTRIBUTE_TRANSLATOR
-		});
-
-		return result;
-	}
-
-	public static Translator createExcludesListTranslator13() {
-		GenericTranslator result = new GenericTranslator(EXCLUDE_LIST, EJB_PKG.getAssemblyDescriptor_ExcludeList());
-		result.setChildren(	new Translator[] { 
-			IDTranslator.INSTANCE, 
-			new Translator(DESCRIPTION, EJB_PKG.getExcludeList_Description()), 
-			createMethodElementTranslators13(EJB_PKG.getExcludeList_MethodElements())
-		});
-		return result;
-	}
-
-	public static Translator createMethodElementTranslators13(EStructuralFeature eFeature) {
-		GenericTranslator result = new GenericTranslator(METHOD, eFeature);
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getMethodElement_Description()),
-				METHOD_ELEMENT_EJB_NAME_SOURCELINK_TRANSLATOR,
-				METHOD_ELEMENT_KIND_TRANSLATOR,
-				METHOD_NAME_TRANSLATOR,
-				METHOD_PARAM_TRANSLATOR
-			});
-		return result;
-	}
-	
-	
-	/*
-	 * J2EE 1.4 Assembly Descriptor 
-	 */
-	public static Translator createAssemblyDescriptorTranslator14() {
-		GenericTranslator result = new GenericTranslator(ASSEMBLY_DESCRIPTOR, EJB_PKG.getEJBJar_AssemblyDescriptor());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				createSecurityRoleTranslator14(),
-				createMethodPermissionTranslator14(),
-				createMethodTransactionTranslator14(),
-				CommonTranslators.createMessageDestinationTranslator(EJB_PKG.getAssemblyDescriptor_MessageDestinations()),
-				createExcludesListTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getAssemblyDescriptor_Extensions())
-		});
-		return result;
-	}
-
-	public static Translator createMethodPermissionTranslator14() {
-		GenericTranslator result = new GenericTranslator(METHOD_PERMISSION, EJB_PKG.getAssemblyDescriptor_MethodPermissions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getMethodPermission_Descriptions()),
-				UNCHECKED_TRANSLATOR,
-				METHOD_PERMISSION_ROLE_NAME_SOURCELINK_TRANSLATOR,
-				createMethodElementTranslators14(EJB_PKG.getMethodPermission_MethodElements())
-		});
-
-		return result;
-	}
-
-	//TODO: NEED TO FIGURE OUT SECURITY PATH		
-	public static Translator createSecurityRoleTranslator14() {
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE, EJB_PKG.getAssemblyDescriptor_SecurityRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(CommonPackage.eINSTANCE.getSecurityRole_Descriptions()),
-				SEC_ROLE_NAME_TRANSLATOR
-		});
-
-		return result;
-	}
-
-	public static Translator createMethodTransactionTranslator14() {
-		GenericTranslator result = new GenericTranslator(CONTAINER_TRANSACTION, EJB_PKG.getAssemblyDescriptor_MethodTransactions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getMethodTransaction_Descriptions()),
-				createMethodElementTranslators14(EJB_PKG.getMethodTransaction_MethodElements()),
-				TRANS_ATTRIBUTE_TRANSLATOR
-		});
-
-		return result;
-	}
-
-	public static Translator createExcludesListTranslator14() {
-		GenericTranslator result = new GenericTranslator(EXCLUDE_LIST, EJB_PKG.getAssemblyDescriptor_ExcludeList());
-		result.setChildren(	new Translator[] { 
-			IDTranslator.INSTANCE, 
-			CommonTranslators.createDescriptionTranslator(EJB_PKG.getExcludeList_Descriptions()), 
-			createMethodElementTranslators14(EJB_PKG.getExcludeList_MethodElements())
-		});
-		return result;
-	}
-
-	public static Translator createMethodElementTranslators14(EStructuralFeature eFeature) {
-		GenericTranslator result = new GenericTranslator(METHOD, eFeature);
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getMethodElement_Descriptions()),
-				METHOD_ELEMENT_EJB_NAME_SOURCELINK_TRANSLATOR,
-				METHOD_ELEMENT_KIND_TRANSLATOR,
-				METHOD_NAME_TRANSLATOR,
-				METHOD_PARAM_TRANSLATOR
-			});
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EnterpriseBeansTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EnterpriseBeansTranslator.java
deleted file mode 100644
index eba27c161..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EnterpriseBeansTranslator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.MultiObjectTranslator;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class EnterpriseBeansTranslator extends MultiObjectTranslator implements EjbDeploymentDescriptorXmlMapperI {
-	public static final String ENTERPRISE_BEANS_PATH = ENTERPRISE_BEANS+'/'+ENTITY+','+SESSION+','+MESSAGE_DRIVEN;
-    private static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	private static final SessionTranslator SESSION_TRANSLATOR = new SessionTranslator();
-	private static final EntityTranslator BMP_TRANSLATOR = new EntityTranslator();
-	private static final ContainerManagedEntityTranslator CMP_TRANSLATOR= new ContainerManagedEntityTranslator();
-	private static final MessageDrivenTranslator MESSAGE_DRIVEN_TRANSLATOR = new MessageDrivenTranslator();
-	private static Map delegates;
-	static {
-		delegates = new HashMap(7);
-		delegates.put(SESSION, SESSION_TRANSLATOR);
-		delegates.put(BEAN, BMP_TRANSLATOR);
-		delegates.put(CONTAINER, CMP_TRANSLATOR);
-		delegates.put(MESSAGE_DRIVEN, MESSAGE_DRIVEN_TRANSLATOR);
-	}
-	
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public EnterpriseBeansTranslator() {
-		super(ENTERPRISE_BEANS_PATH, EJB_PKG.getEJBJar_EnterpriseBeans());
-		addReadAheadHelper(new ReadAheadHelper(ENTITY, new String[] {BEAN, CONTAINER}, PERSISTENCE_TYPE ));
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.MultiObjectTranslator#getDelegateFor(org.eclipse.emf.ecore.EObject)
-	 */
-	public Translator getDelegateFor(EObject o) {
-		switch (o.eClass().getClassifierID()) {
-			case EjbPackage.SESSION :
-				return SESSION_TRANSLATOR;
-			case EjbPackage.ENTITY:
-				return BMP_TRANSLATOR;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY:
-				return CMP_TRANSLATOR;
-			case EjbPackage.MESSAGE_DRIVEN:
-				return MESSAGE_DRIVEN_TRANSLATOR;
-		}
-		throw new IllegalStateException("Bean type delegate expected"); //$NON-NLS-1$
-	}
-
-	public Translator getDelegateFor(String domName, String readAheadName) {
-		Translator result = null;
-		if (readAheadName != null)
-			result = (Translator) delegates.get(readAheadName);
-		else 
-			result = (Translator) delegates.get(domName);
-		
-		if (result == null) 
-			throw new IllegalStateException("Bean type delegate expected"); //$NON-NLS-1$
-		
-		return result;
-	}
-	
-
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EntityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EntityTranslator.java
deleted file mode 100644
index ef05ac4a9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EntityTranslator.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.model.translator.common.BooleanTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class EntityTranslator extends AbstractEJBTranslator {
-
-	private static Translator[] children13;
-	private static Translator[] children14;
-
-	private class PersistenceTypeTranslator extends Translator {
-
-		public PersistenceTypeTranslator() {
-			super(PERSISTENCE_TYPE, (EStructuralFeature) null);
-		}
-
-		/* (non-Javadoc)
-		 * @see com.ibm.etools.emf2xml.impl.Translator#extractStringValue(org.eclipse.emf.ecore.EObject)
-		 */
-		public String extractStringValue(EObject emfObject) {
-			return getPersistenceType();
-		}
-
-		/* (non-Javadoc)
-			   * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(java.lang.Object, org.eclipse.emf.ecore.EObject)
-			   */
-		public String convertValueToString(Object value, EObject owner) {
-			return getPersistenceType();
-		}
-		
-		/* (non-Javadoc)
-		 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-		 */
-		public List getMOFChildren(EObject mofObject) {
-			return Collections.singletonList(getPersistenceType());
-		}
-
-
-	}
-
-	protected String getPersistenceType() {
-		return BEAN;
-	}
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public EntityTranslator() {
-		super(ENTERPRISE_BEANS + '/' + ENTITY);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		Translator reentrantTranslator = null;
-		switch (versionID) {
-			case J2EE_1_2_ID :
-			case J2EE_1_3_ID :
-				reentrantTranslator = new Translator(REENTRANT, EJB_PKG.getEntity_Reentrant(), UNSET_IF_NULL);
-				break;
-			case J2EE_1_4_ID :
-				reentrantTranslator = new BooleanTranslator(REENTRANT, EJB_PKG.getEntity_Reentrant());
-			default :
-				break;
-		}
-		return new Translator[] { new PersistenceTypeTranslator(), new JavaClassTranslator(PRIM_KEY_CLASS, EJB_PKG.getEntity_PrimaryKey()), reentrantTranslator };
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createEntity();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenDestinationTypeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenDestinationTypeTranslator.java
deleted file mode 100644
index 724902835..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenDestinationTypeTranslator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 3, 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.model.translator.ejb;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MessageDrivenDestinationTypeTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	public static final String JAVAX_JMS = "javax.jms."; //$NON-NLS-1$
-
-
-	public MessageDrivenDestinationTypeTranslator() {
-		super(DESTINATION_TYPE, EJB_PKG.getMessageDrivenDestination_Type());
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(java.lang.Object, org.eclipse.emf.ecore.EObject)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (value != null){
-			Enumerator enumerator = (Enumerator) value;
-			if (enumerator != null)
-				return JAVAX_JMS + enumerator.toString();
-		}
-		return super.convertValueToString(value, owner);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		String correct = strValue;
-		if (strValue != null)
-			correct = strValue.substring(JAVAX_JMS.length());
-		return super.convertStringToValue(correct, owner);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenTranslator.java
deleted file mode 100644
index 8d9c762b7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenTranslator.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class MessageDrivenTranslator extends AbstractEJBTranslator {
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	private static Translator TRANSACTION_TYPE_XLATOR = new Translator(TRANSACTION_TYPE, EJB_PKG.getMessageDriven_TransactionType());
-	
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public MessageDrivenTranslator() {
-		super(ENTERPRISE_BEANS+'/'+MESSAGE_DRIVEN);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		switch (versionID) {
-			case J2EE_1_4_ID:
-				return getSpecificMaps14();
-			default:
-				return getSpecificMaps13();
-		}
-	}
-	
-	protected Translator[] getSpecificMaps13() {
-	
-		return new Translator[] {
-			TRANSACTION_TYPE_XLATOR,
-			
-			//EJB 2.0 PATH
-			new Translator(MESSAGE_SELECTOR, EJB_PKG.getMessageDriven_MessageSelector()),
-			new AcknowledgeModeTranslator(),
-			createMessageDrivenDestinationTranslator(),
-			
-		}; 
-	}
-
-	protected Translator[] getSpecificMaps14() {
-
-		return new Translator[] {
-			//EJB 2.1 Only
-			new JavaClassTranslator(MESSAGING_TYPE, EJB_PKG.getMessageDriven_MessagingType()),
-			//Both
-			TRANSACTION_TYPE_XLATOR,
-			//EJB 2.1 PATH
-			new JavaClassTranslator(MESSAGE_DEST_TYPE, EJB_PKG.getMessageDriven_MessageDestination()),
-			new Translator(MESSAGE_DEST_LINK, EJB_PKG.getMessageDriven_Link()),
-			createActivationConfigurationMaps(),
-		}; 
-	}
-	
-	
-	/**
-	 * @return
-	 */
-	private Translator createActivationConfigurationMaps() {
-		GenericTranslator result = new GenericTranslator(ACTIVATION_CONF, EJB_PKG.getMessageDriven_ActivationConfig());
-		result.setChildren(new Translator[]{
-			CommonTranslators.createDescriptionTranslator(EJB_PKG.getActivationConfig_Descriptions()),
-			createActivationConfigPropertiesMap(),
-		//	CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getActivationConfig_Extensions())
-		});
-		
-		return result;
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createActivationConfigPropertiesMap() {
-		GenericTranslator result = new GenericTranslator(ACTIVATION_CONF_PROPERTY, EJB_PKG.getActivationConfig_ConfigProperties());
-		result.setChildren(new Translator[] {
-			new Translator(ACTIVATION_CONF_PROPERTY_NAME, EJB_PKG.getActivationConfigProperty_Name()),
-			new Translator(ACTIVATION_CONF_PROPERTY_VALUE, EJB_PKG.getActivationConfigProperty_Value())
-		});		
-		return result;
-	}
-
-
-	/**
-	 * @return
-	 */
-	protected Translator createMessageDrivenDestinationTranslator() {
-		GenericTranslator result = new GenericTranslator(MESSAGE_DRIVEN_DESTINATION,EJB_PKG.getMessageDriven_Destination());
-		result.setChildren( new Translator[]{
-			new MessageDrivenDestinationTypeTranslator(),
-			new Translator(SUBSCRIPTION_DURABILITY, EJB_PKG.getMessageDrivenDestination_SubscriptionDurability())
-		});
-		return result;
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-	
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createMessageDriven();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getEndMaps13()
-	 */
-	protected Translator[] getEndMaps13() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_3,
-			new SecurityIdentityTranslator(),
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3
-		};
-	}
-	
-	protected Translator[] getEndMaps14() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_SERVICE_REF_1_4,	
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4,
-			new SecurityIdentityTranslator(),
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#usesHomeRemoteAttributes()
-	 */
-	protected boolean usesHomeRemoteAttributes() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodElementKindTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodElementKindTranslator.java
deleted file mode 100644
index 668735ab5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodElementKindTranslator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class MethodElementKindTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	private static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-    /**
-     * @param domNameAndPath
-     * @param eClass
-     */
-    public MethodElementKindTranslator(){
-		super(METHOD_INTF, EJB_PKG.getMethodElement_Type());
-    }
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		Object obj = super.convertStringToValue(strValue, owner);
-		if(obj != null)
-			return obj;
-		String correct = strValue;
-		if (strValue.equalsIgnoreCase("HOME")) //$NON-NLS-1$
-			correct = "Home"; //$NON-NLS-1$
-		else if (strValue.equalsIgnoreCase("REMOTE")) //$NON-NLS-1$
-			correct = "Remote"; //$NON-NLS-1$
-		else if (strValue.equalsIgnoreCase("LOCALHOME")) //$NON-NLS-1$
-			correct = "LocalHome"; //$NON-NLS-1$
-		else if (strValue.equalsIgnoreCase("LOCAL")) //$NON-NLS-1$
-			correct = "Local"; //$NON-NLS-1$
-		return super.convertStringToValue(correct, owner);
-	}
-	
-	/* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-     */
-    public boolean isSetMOFValue(EObject emfObject) {
-        if (((MethodElement)emfObject).getType() == MethodElementKind.UNSPECIFIED_LITERAL)
-        	return false;
-        return super.isSetMOFValue(emfObject);
-    }
-    
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-	 */
-	public List getMOFChildren(EObject mofObject) {
-		List result = super.getMOFChildren(mofObject);
-		if(result != null && result.size() > 0) {
-			MethodElementKind methodIntf = (MethodElementKind) result.get(0);
-			if(methodIntf.getValue() == MethodElementKind.UNSPECIFIED) 
-				result = Collections.EMPTY_LIST;
-		}
-		return result;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodParamsTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodParamsTranslator.java
deleted file mode 100644
index 988252fb8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodParamsTranslator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author dfholttp
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MethodParamsTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI{
-	protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-
-	//private EStructuralFeature eFeature;
-
-    public MethodParamsTranslator(EStructuralFeature eFeature) {
-        super(METHOD_PARAMS+'/'+METHOD_PARAM , eFeature);
-        //this.eFeature = eFeature;
-        this.fStyle |= Translator.EMPTY_CONTENT_IS_SIGNIFICANT;
-    }
-
-
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#isMultiValued()
-     */
-    public boolean isMultiValued() {
-		return true;
-    }
-    
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-     */
-    public List getMOFChildren(EObject mofObject) {
- 		return ((MethodElement)mofObject).getMethodParams();
-    }
-    
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject, java.lang.Object)
-     */
-    public void setMOFValue(EObject mofObject, Object value) {
-		List methodParams = ((MethodElement)mofObject).getMethodParams();
-		
-    	if(value == null || value.toString().length() == 0) {  
-    		if(methodParams == null || methodParams.size() == 0 ) {
-    			setMOFValueFromEmptyDOMPath(mofObject);
-			}
-    	} else {
-			((MethodElement)mofObject).addMethodParams((String)value);
-    	}
-    }
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.common.notify.Notifier, java.lang.Object, int)
-	 */
-	public void setMOFValue(Notifier owner, Object value, int newIndex) {
-		((MethodElement)owner).addMethodParams((String)value);
-	}
-
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#clearList(org.eclipse.emf.ecore.EObject)
-     */
-    public void clearList(EObject mofObject) {
-		((MethodElement)mofObject).eUnset(feature);
-    }
-    
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#shouldRenderEmptyDOMPath(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean shouldRenderEmptyDOMPath(EObject eObject) {
-		MethodElement me = ((MethodElement)eObject);
-		return me.hasMethodParams() && me.getMethodParams().isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValueFromEmptyDOMPath(org.eclipse.emf.ecore.EObject)
-	 */
-	public void setMOFValueFromEmptyDOMPath(EObject eObject) {
-		((MethodElement)eObject).applyZeroParams();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MultiplicityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MultiplicityTranslator.java
deleted file mode 100644
index ddd1b5bf3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MultiplicityTranslator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 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.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MultiplicityTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI{
-	
-	public MultiplicityTranslator(){
-		super(MULTIPLICITY,EjbPackage.eINSTANCE.getEJBRelationshipRole_Multiplicity());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		String correct = strValue;
-		if (strValue.toUpperCase().equals("ONE")) //$NON-NLS-1$
-			correct = "One"; //$NON-NLS-1$
-		else if (strValue.toUpperCase().equals("MANY")) //$NON-NLS-1$
-			correct = "Many"; //$NON-NLS-1$
-			
-		return super.convertStringToValue(correct, owner);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/PrimKeyFieldTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/PrimKeyFieldTranslator.java
deleted file mode 100644
index 20d3124e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/PrimKeyFieldTranslator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 3, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.SourceLinkTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-/**
- * @author jlanuti
- */
-public class PrimKeyFieldTranslator extends SourceLinkTranslator implements EjbDeploymentDescriptorXmlMapperI {
-	
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 * @param TranslatorPath
-	 */
-	public PrimKeyFieldTranslator() {
-		super(PRIMKEY_FIELD, EjbPackage.eINSTANCE.getContainerManagedEntity_PrimKeyField(),new TranslatorPath(
-			new Translator[] {
-				new Translator(CMP_FIELD, EjbPackage.eINSTANCE.getContainerManagedEntity_PersistentAttributes()),
-				new Translator(FIELD_NAME, EcorePackage.eINSTANCE.getENamedElement_Name())
-			}));
-	}
-	
-	protected String getSpecifiedPrimKeyFieldName(ContainerManagedEntity cmp) {
-		return cmp.getPrimKeyField().getName();
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		// try and convert the string to a cmp attribute, otherwise create a proxy
-		Object result = super.convertStringToValue(strValue, owner);
-		if (result == null || result == strValue /*reference check is valid here*/) {
-			result = EjbFactory.eINSTANCE.createCMPAttribute();
-			if (strValue == null) strValue = "";//$NON-NLS-1$
-			((InternalEObject)result).eSetProxyURI(URI.createURI(strValue));
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SecurityIdentityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SecurityIdentityTranslator.java
deleted file mode 100644
index c219b7700..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SecurityIdentityTranslator.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class SecurityIdentityTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	private static final CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-	private static final Translator[] RUN_AS_TRANSLATORS = createRunAsTranslators();
-	
-	private static final Translator[] USE_CALLER_TRANSLATORS = createUseCallerTranslators();
-	
-	
-	private static Translator[] createRunAsTranslators() {
-		GenericTranslator runAsTranslator = new GenericTranslator(RUN_AS, COMMON_PKG.getRunAsSpecifiedIdentity_Identity());
-		runAsTranslator.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, COMMON_PKG.getIdentity_Description()),
-			new Translator(ROLE_NAME, COMMON_PKG.getIdentity_RoleName())
-		});
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityIdentity_Description()),
-			runAsTranslator
-		};
-	}
-	
-	private static Translator[] createUseCallerTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityIdentity_Description()),
-			new Translator(USE_CALLER_IDENTITY, null, EMPTY_TAG)
-		};
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public SecurityIdentityTranslator() {
-		super(SECURITY_IDENTITY, EjbPackage.eINSTANCE.getEnterpriseBean_SecurityIdentity());
-		addReadAheadHelper(new ReadAheadHelper(SECURITY_IDENTITY, new String[] {RUN_AS, USE_CALLER_IDENTITY}, null));
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (((SecurityIdentity)o).isRunAsSpecifiedIdentity())
-			return RUN_AS_TRANSLATORS;
-		else if (((SecurityIdentity)o).isUseCallerIdentity())
-			return USE_CALLER_TRANSLATORS;
-		else
-			throw new IllegalStateException("Internal error: Security Identity Type expected"); //$NON-NLS-1$
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		CommonFactory fact = CommonFactory.eINSTANCE; 
-		if (RUN_AS.equals(readAheadName)) {
-			RunAsSpecifiedIdentity result = fact.createRunAsSpecifiedIdentity();
-			result.setIdentity(fact.createIdentity());
-			return result;
-		} else if (USE_CALLER_IDENTITY.equals(readAheadName))
-			return fact.createUseCallerIdentity();
-		else 
-			return null;
-	}
-
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SessionTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SessionTranslator.java
deleted file mode 100644
index 853d4c372..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SessionTranslator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class SessionTranslator extends AbstractEJBTranslator {
-
-	private static Translator[] children13;
-	private static Translator[] children14;
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public SessionTranslator() {
-		super(ENTERPRISE_BEANS+'/'+SESSION);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		return new Translator[] {
-			new Translator(SESSION_TYPE, EJB_PKG.getSession_SessionType(), UNSET_IF_NULL), 		//Enumeration
-			new Translator(TRANSACTION_TYPE, EJB_PKG.getSession_TransactionType(), UNSET_IF_NULL) 		//Enumeration
-		};
-	}
-		
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getEJBClassMap()
-	 * 
-	 * Support 1.4 and 1.3
-	 */
-	protected Translator[] getEJBClassMap() {
-		return new Translator[] {			
-			//J2EE 1.4
-			new JavaClassTranslator(SERVICE_ENDPOINT,EJB_PKG.getSession_ServiceEndpoint()),
-			//J2EE 1.3
-			new JavaClassTranslator(EJB_CLASS, EJB_PKG.getEnterpriseBean_EjbClass())
-		};
-		
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createSession();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-	
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/ErrorPageTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/ErrorPageTranslator.java
deleted file mode 100644
index 45c05770f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/ErrorPageTranslator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 21, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.WarDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class ErrorPageTranslator extends Translator implements WarDeploymentDescriptorXmlMapperI {
-	private static Translator[] ERROR_CODE_XLATORS = new Translator[] {
-		new Translator(ERROR_CODE, WebapplicationPackage.eINSTANCE.getErrorCodeErrorPage_ErrorCode()),
-		new Translator(LOCATION, WebapplicationPackage.eINSTANCE.getErrorPage_Location())
-	};
-	private static Translator[] EXCEPTION_TYPE_XLATORS = new Translator[] {
-		new JavaClassTranslator(EXCEPTION_TYPE, WebapplicationPackage.eINSTANCE.getExceptionTypeErrorPage_ExceptionType()),
-		new Translator(LOCATION, WebapplicationPackage.eINSTANCE.getErrorPage_Location())
-	};
-	
-	public ErrorPageTranslator() {
-		super(ERROR_PAGE, WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages());
-		addReadAheadHelper(new ReadAheadHelper(ERROR_PAGE, new String[] {ERROR_CODE, EXCEPTION_TYPE}, null));
-	
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WebapplicationFactory fact = WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
-		if (ERROR_CODE.equals(readAheadName))
-			return fact.createErrorCodeErrorPage();
-		else if (EXCEPTION_TYPE.equals(readAheadName))
-			return fact.createExceptionTypeErrorPage();
-		else
-			return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (((ErrorPage)o).isErrorCode())
-			return ERROR_CODE_XLATORS;
-		else if (((ErrorPage)o).isExceptionType())
-			return EXCEPTION_TYPE_XLATORS;
-		else
-			throw new IllegalStateException("Internal error: ErrorCode expected"); //$NON-NLS-1$
-	}
-		
-	public boolean isManagedByParent() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebAppTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebAppTranslator.java
deleted file mode 100644
index 86a64527c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebAppTranslator.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- */
-package org.eclipse.jst.j2ee.internal.model.translator.webapplication;
-
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.BooleanTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.EnvEntryTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.WarDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.SourceLinkTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebAppTranslator extends RootTranslator implements WarDeploymentDescriptorXmlMapperI, J2EEConstants {
-	private static WebapplicationPackage WEBAPP_PKG = WebapplicationPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static JspPackage JSP_PKG = JspPackage.eINSTANCE;
-	public static WebAppTranslator INSTANCE = new WebAppTranslator();
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	private static final Translator SERVLET_MAPPING_TRANSLATOR = createServletMappingTranslator();
-	private static final Translator SESSION_CONFIG_TRANSLATOR = createSessionConfigTranslator();
-	private static final Translator WELCOMEFILE_TRANSLATOR = createFileListTranslator();
-	private static final Translator MIME_MAPPING_TRANSLATOR = createMimeMappingTranslator();
-	private static final Translator ERROR_PAGE_TRANSLATOR = new ErrorPageTranslator();
-	private static final Translator LOGIN_CONFIG_TRANSLATOR = createLoginConfigTranslator();
-	private static final Translator DISTRIBUTABLE_TRANSLATOR = new Translator(DISTRIBUTABLE, WEBAPP_PKG.getWebApp_Distributable(), EMPTY_TAG);
-	
-	private static final Translator WEB_RESOURCE_NAME_TRANSLATOR = new Translator(WEB_RESOURCE_NAME, WEBAPP_PKG.getWebResourceCollection_WebResourceName()); 
-	private static final Translator URL_PATTERN_TRANSLATOR = new Translator(URL_PATTERN, WEBAPP_PKG.getWebResourceCollection_UrlPattern());
-	private static final Translator HTTP_METHOD_TRANSLATOR = new Translator(HTTP_METHOD, WEBAPP_PKG.getWebResourceCollection_HttpMethod());
-	
-	private static final Translator ROLE_NAME_TRANSLATOR = new Translator(ROLE_NAME, WEBAPP_PKG.getAuthConstraint_Roles());
-	private static final Translator TRANSPORT_GUARANTEE_TRANSLATOR = new Translator(TRANSPORT_GUARANTEE, WEBAPP_PKG.getUserDataConstraint_TransportGuarantee());
-
-	
-	protected WebAppTranslator() {
-		super(WEB_APP, WEBAPP_PKG.getWebApp());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()), 
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()), 
-			DISTRIBUTABLE_TRANSLATOR,
-			createContextParam13Translator(),	 
-			createFilter13Translator(),	 
-			createFilterMapping13Translator(),	 
-			createListener13Translator(), 
-			createServlet13Translator(), 
-			SERVLET_MAPPING_TRANSLATOR,	 
-			SESSION_CONFIG_TRANSLATOR,	 
-			MIME_MAPPING_TRANSLATOR,	 
-			WELCOMEFILE_TRANSLATOR, 
-			ERROR_PAGE_TRANSLATOR, 
-			createTagLibTranslator13(WEBAPP_PKG.getWebApp_TagLibs()), 
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3, 
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_3,
-			createSecurityConstraintTranslator13(),
-			LOGIN_CONFIG_TRANSLATOR, 
-			CommonTranslators.createSecurityRoleTranslator13(WEBAPP_PKG.getWebApp_SecurityRoles()), 
-			new EnvEntryTranslator(COMMON_PKG.getJNDIEnvRefsGroup_EnvironmentProperties(), false, false), 
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_3, 
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_3 
-		};
-	}
-	
-
-	protected Translator[] create14Children() {
-		Translator[] begin =  new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, WEBAPP_PKG.getWebApp_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+WEB_APP_SCHEMA_LOC_2_4),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			DISTRIBUTABLE_TRANSLATOR,
-			CommonTranslators.createParamValueType(CONTEXT_PARAM, WEBAPP_PKG.getWebApp_ContextParams()),
-			createFilter14Translator(),
-			createFilterMapping14Translator(),
-			createListener14Translator(),
-			createServlet14Translator(),
-			SERVLET_MAPPING_TRANSLATOR,	 
-			SESSION_CONFIG_TRANSLATOR,	 
-			MIME_MAPPING_TRANSLATOR,	 
-			WELCOMEFILE_TRANSLATOR, 
-			ERROR_PAGE_TRANSLATOR,
-			createJSPConfigTranslators(),
-			createSecurityConstraintTranslators14(),
-			LOGIN_CONFIG_TRANSLATOR,
-			CommonTranslators.createSecurityRoleTranslator14(WEBAPP_PKG.getWebApp_SecurityRoles())
-		};
-		Translator[] end = new Translator[] {
-			CommonTranslators.createMessageDestinationTranslator(WEBAPP_PKG.getWebApp_MessageDestinations()),
-			createLocaleEncodingMappingListTranslator(),
-		//	CommonTranslators.createDeploymentExtensionTranslator(WEBAPP_PKG.getWebApp_Extensions())
-		};
-		
-		
-		return (Translator[])concat(begin,concat(createJNDIEnvironmentRefsGroupTranslator(), end));
-	}
-	
-	public static Translator createSecurityConstraintTranslators14() {
-		GenericTranslator result = new GenericTranslator(SECURITY_CONSTRAINT, WEBAPP_PKG.getWebApp_Constraints());
-		result.setChildren(new Translator[] {
-			CommonTranslators.createDisplayNameTranslator(WEBAPP_PKG.getSecurityConstraint_DisplayNames()),
-			createWebResourceCollectionTranslator14(),
-			createAuthConstraintTranslator14(),
-			createUserDataConstraintTranslator14(),
-		});
-		return result;
-	}
-	
-	private static Translator createWebResourceCollectionTranslator14() {
-		GenericTranslator result = new GenericTranslator(WEB_RESOURCE_COLLECTION, WEBAPP_PKG.getSecurityConstraint_WebResourceCollections());
-		result.setChildren(new Translator[] {
-			WEB_RESOURCE_NAME_TRANSLATOR, 
-			CommonTranslators.createDescriptionTranslator(WEBAPP_PKG.getWebResourceCollection_Descriptions()), 
-			URL_PATTERN_TRANSLATOR,
-			HTTP_METHOD_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createAuthConstraintTranslator14() { 
-		GenericTranslator result = new GenericTranslator(AUTH_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_AuthConstraint());
-		result.setChildren(new Translator[] {
-			CommonTranslators.createDescriptionTranslator(WEBAPP_PKG.getAuthConstraint_Descriptions()), 
-			ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createUserDataConstraintTranslator14() {
-		GenericTranslator result = new GenericTranslator(USER_DATA_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_UserDataConstraint());
-		result.setChildren(new Translator[] {
-			CommonTranslators.createDescriptionTranslator(WEBAPP_PKG.getUserDataConstraint_Descriptions()), 
-			TRANSPORT_GUARANTEE_TRANSLATOR 
-		});
-		return result;
-	}
-
-
-	private Translator createJSPConfigTranslators() {
-		GenericTranslator result = new GenericTranslator(JSP_CONFIG, WEBAPP_PKG.getWebApp_JspConfig());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createTagLibTranslator14(JSP_PKG.getJSPConfig_TagLibs()),
-			createJSPPropertyGroupTranslator()
-		});
-		
-		return result;
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createJSPPropertyGroupTranslator() {
-		GenericTranslator result = new GenericTranslator(JSP_PROPERTY_GROUP, JSP_PKG.getJSPConfig_PropertyGroups());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(URL_PATTERN, JSP_PKG.getJSPPropertyGroup_UrlPattern()),
-			new BooleanTranslator(EL_IGNORED, JSP_PKG.getJSPPropertyGroup_ElIgnored()),
-			new Translator(PAGE_ENCODING, JSP_PKG.getJSPPropertyGroup_PageEncoding()),
-			new BooleanTranslator(SCRIPTING_INVALID, JSP_PKG.getJSPPropertyGroup_ScriptingInvalid()),
-			new BooleanTranslator(IS_XML,JSP_PKG.getJSPPropertyGroup_IsXML()),
-			new Translator(INCLUDE_PRELUDE, JSP_PKG.getJSPPropertyGroup_IncludePreludes()),
-			new Translator(INCLUDE_CODA, JSP_PKG.getJSPPropertyGroup_IncludeCodas())
-		});		
-		return result;
-	}
-
-
-	private Translator createLocaleEncodingMappingListTranslator() {
-		GenericTranslator result = new GenericTranslator(LOCALE_ENCODING_MAPPING_LIST, WEBAPP_PKG.getWebApp_LocalEncodingMappingList());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createLocaleEncodingMapping()
-		});
-		return result;
-	
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createLocaleEncodingMapping() {
-		GenericTranslator result = new GenericTranslator(LOCALE_ENCODING_MAPPING, WEBAPP_PKG.getLocalEncodingMappingList_LocalEncodingMappings());
-		result.setChildren(new Translator[] {
-			new Translator(LOCALE, WEBAPP_PKG.getLocalEncodingMapping_Locale()), 
-			new Translator(ENCODING, WEBAPP_PKG.getLocalEncodingMapping_Encoding()) 
-		});
-		return result;
-
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator[] createJNDIEnvironmentRefsGroupTranslator() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_SERVICE_REF_1_4,	
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4
-		};
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createFilterMapping14Translator() {
-		Translator dispatcher = new Translator(DISPATCHER, WEBAPP_PKG.getFilterMapping_DispatcherType());
-		return GenericTranslator.appendChild((GenericTranslator)createFilterMapping13Translator(),dispatcher);
-	}
-	
-	public static Translator createContextParam13Translator() {
-		GenericTranslator result = new GenericTranslator(CONTEXT_PARAM, WEBAPP_PKG.getWebApp_Contexts());
-		result.setChildren(new Translator[] {
-			new Translator(PARAM_NAME, WEBAPP_PKG.getContextParam_ParamName()), 
-			new Translator(PARAM_VALUE, WEBAPP_PKG.getContextParam_ParamValue()), 
-			new Translator(DESCRIPTION, WEBAPP_PKG.getContextParam_Description()), 
-		});
-		return result;
-	}
-	
-	public static Translator createFilter13Translator() {
-		GenericTranslator result = new GenericTranslator(FILTER, WEBAPP_PKG.getWebApp_Filters());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(FILTER_NAME, WEBAPP_PKG.getFilter_Name(), 
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-						})),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()), 
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()), 
-			new JavaClassTranslator(FILTER_CLASS, WEBAPP_PKG.getFilter_FilterClass()), 
-			createInitParamTranslator(WEBAPP_PKG.getFilter_InitParams())
-		});
-		return result;
-	}
-	
-	
-	public static Translator createFilter14Translator() {
-		GenericTranslator result = new GenericTranslator(FILTER, WEBAPP_PKG.getWebApp_Filters());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(FILTER_NAME, WEBAPP_PKG.getFilter_Name(), 
-						//TODO: Make sure the path is still valid
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-						})),
-			new JavaClassTranslator(FILTER_CLASS, WEBAPP_PKG.getFilter_FilterClass()), 
-			CommonTranslators.createParamValueType(INIT_PARAM,WEBAPP_PKG.getFilter_InitParamValues())
-		});
-		return result;
-	}
-	
-	public static Translator createFilterMapping13Translator() {
-		GenericTranslator result = new GenericTranslator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings());
-		result.setChildren(new Translator[] {
-			new SourceLinkTranslator(FILTER_NAME, WEBAPP_PKG.getFilterMapping_Filter(), 
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(FILTER, WEBAPP_PKG.getWebApp_Filters()), 
-							new Translator(FILTER_MAPPING, WEBAPP_PKG.getFilter_Name())
-						})),
-			new Translator(URL_PATTERN, WEBAPP_PKG.getFilterMapping_UrlPattern()), 
-			new SourceLinkTranslator(SERVLET_NAME, WEBAPP_PKG.getFilterMapping_Servlet(), 
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(SERVLET, WEBAPP_PKG.getWebApp_Servlets()), 
-							new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName()) 
-						}), Translator.STRING_RESULT_OK),
-		});
-		return result;
-	}
-	
-	public static Translator createInitParamTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(INIT_PARAM, feature);
-		result.setChildren(new Translator[] {
-			new Translator(PARAM_NAME, WEBAPP_PKG.getInitParam_ParamName()), 
-			new Translator(PARAM_VALUE, WEBAPP_PKG.getInitParam_ParamValue()), 
-			new Translator(DESCRIPTION, WEBAPP_PKG.getInitParam_Description()), 
-		});
-		return result;
-	}
-	
-	public static Translator createListener13Translator() {
-		GenericTranslator result = new GenericTranslator(LISTENER, WEBAPP_PKG.getWebApp_Listeners());
-		result.setChildren(new Translator[] {
-			CommonTranslators.LISTENER_CLASS_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createListener14Translator() {
-			GenericTranslator result = new GenericTranslator(LISTENER, WEBAPP_PKG.getWebApp_Listeners());
-			result.setChildren(new Translator[] {
-				CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-				CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-				CommonTranslators.ICONS_TRANSLATOR,
-				CommonTranslators.LISTENER_CLASS_TRANSLATOR
-			});
-			return result;
-	}
-	
-	public static Translator createServlet13Translator() {
-		GenericTranslator result = new GenericTranslator(SERVLET, WEBAPP_PKG.getWebApp_Servlets());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName(), 
-				new TranslatorPath[] {
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(SERVLET_MAPPING, WEBAPP_PKG.getWebApp_ServletMappings()), 
-					}), 
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-					}), 
-				}),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()), 
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()), 
-			new WebTypeTranslator(), //servlet-class or jsp-file  
-			createInitParamTranslator(WEBAPP_PKG.getServlet_Params()), 
-			new Translator(LOAD_ON_STARTUP, WEBAPP_PKG.getServlet_LoadOnStartup()),
-			CommonTranslators.createRunAsTranslator13(WEBAPP_PKG.getServlet_RunAs()),
-			CommonTranslators.createSecurityRoleRefTranslator13(WEBAPP_PKG.getServlet_SecurityRoleRefs()) 
-		});
-		return result;	
-	}
-	
-	public static Translator createServlet14Translator() {
-		GenericTranslator result = new GenericTranslator(SERVLET, WEBAPP_PKG.getWebApp_Servlets());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName(), 
-				new TranslatorPath[] {
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(SERVLET_MAPPING, WEBAPP_PKG.getWebApp_ServletMappings()), 
-					}), 
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-					}), 
-				}),
-			new WebTypeTranslator(), //servlet-class or jsp-file  
-			CommonTranslators.createParamValueType(INIT_PARAM,WEBAPP_PKG.getServlet_InitParams()), 
-			new Translator(LOAD_ON_STARTUP, WEBAPP_PKG.getServlet_LoadOnStartup()),
-			CommonTranslators.createRunAsTranslator14(WEBAPP_PKG.getServlet_RunAs()),
-			CommonTranslators.createSecurityRoleRefTranslator14(WEBAPP_PKG.getServlet_SecurityRoleRefs()),
-		//	CommonTranslators.createDeploymentExtensionTranslator(WEBAPP_PKG.getServlet_Extensions())
-		});
-		return result;	
-	}
-
-	public static Translator createServletMappingTranslator() {
-		GenericTranslator result = new GenericTranslator(SERVLET_MAPPING, WEBAPP_PKG.getWebApp_ServletMappings());
-		result.setChildren(new Translator[] {
-			new SourceLinkTranslator(SERVLET_NAME, WEBAPP_PKG.getServletMapping_Servlet(), 
-				new TranslatorPath(new Translator[] {
-					new Translator(WEB_APP, CONTAINER_FEATURE), 
-					new Translator(SERVLET, WEBAPP_PKG.getWebApp_Servlets()), 
-					new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName()) 
-				})),
-			new Translator(URL_PATTERN, WEBAPP_PKG.getServletMapping_UrlPattern()) 
-		});
-		return result;
-	}
-	
-	public static Translator createSessionConfigTranslator() {
-		GenericTranslator result = new GenericTranslator(SESSION_CONFIG, WEBAPP_PKG.getWebApp_SessionConfig());
-		result.setChildren(new Translator[] {
-			new Translator(SESSION_TIMEOUT, WebapplicationPackage.eINSTANCE.getSessionConfig_SessionTimeout()), 
-		});
-		return result;
-	}
-	
-	public static Translator createMimeMappingTranslator() {
-		GenericTranslator result = new GenericTranslator(MIME_MAPPING, WEBAPP_PKG.getWebApp_MimeMappings());
-		result.setChildren(new Translator[] {
-			new Translator(EXTENSION, WEBAPP_PKG.getMimeMapping_Extension()), 
-			new Translator(MIME_TYPE, WEBAPP_PKG.getMimeMapping_MimeType()), 
-			
-		});
-		return result;
-	}
-	
-	public static Translator createFileListTranslator() {
-		GenericTranslator result = new GenericTranslator(WELCOME_FILE_LIST, WEBAPP_PKG.getWebApp_FileList());
-		result.setChildren(new Translator[] {
-			createParentAndTextAttributeTranslator(WELCOME_FILE, WEBAPP_PKG.getWelcomeFileList_File(), WEBAPP_PKG.getWelcomeFile_WelcomeFile())
-		});
-		return result;
-	}
-	
-	public static Translator createTagLibTranslator14(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(TAGLIB, feature);
-		result.setChildren(new Translator[] {
-			new Translator(TAGLIB_URI, JSP_PKG.getTagLibRefType_TaglibURI()), 
-			new Translator(TAGLIB_LOCATION, JSP_PKG.getTagLibRefType_TaglibLocation()) 
-		});
-		return result;
-	}
-	public static Translator createTagLibTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(TAGLIB, feature);
-		result.setChildren(new Translator[] {
-			new Translator(TAGLIB_URI, WEBAPP_PKG.getTagLibRef_TaglibURI()), 
-			new Translator(TAGLIB_LOCATION, WEBAPP_PKG.getTagLibRef_TaglibLocation()) 
-		});
-		return result;
-	}
-	public static Translator createSecurityConstraintTranslator13() {
-		GenericTranslator result = new GenericTranslator(SECURITY_CONSTRAINT, WEBAPP_PKG.getWebApp_Constraints());
-		result.setChildren(new Translator[] {
-			new Translator(DISPLAY_NAME, WEBAPP_PKG.getSecurityConstraint_DisplayName()),
-			createWebResourceCollectionTranslator13(),
-			createAuthConstraintTranslator13(),
-			createUserDataConstraintTranslator13(),
-		});
-		return result;
-	}
-	
-	private static Translator createWebResourceCollectionTranslator13() {
-		GenericTranslator result = new GenericTranslator(WEB_RESOURCE_COLLECTION, WEBAPP_PKG.getSecurityConstraint_WebResourceCollections());
-		result.setChildren(new Translator[] {
-			WEB_RESOURCE_NAME_TRANSLATOR, 
-			new Translator(DESCRIPTION,WEBAPP_PKG.getWebResourceCollection_Description()), 
-			URL_PATTERN_TRANSLATOR,
-			HTTP_METHOD_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createAuthConstraintTranslator13() { 
-		GenericTranslator result = new GenericTranslator(AUTH_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_AuthConstraint());
-		result.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, WEBAPP_PKG.getAuthConstraint_Description()), 
-			ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createUserDataConstraintTranslator13() {
-		GenericTranslator result = new GenericTranslator(USER_DATA_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_UserDataConstraint());
-		result.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, WEBAPP_PKG.getUserDataConstraint_Description()), 
-			TRANSPORT_GUARANTEE_TRANSLATOR 
-		});
-		return result;
-	}
-	
-	public static Translator createLoginConfigTranslator() {
-		GenericTranslator result = new GenericTranslator(LOGIN_CONFIG, WEBAPP_PKG.getWebApp_LoginConfig());
-		result.setChildren(new Translator[] {
-			new Translator(AUTH_METHOD, WEBAPP_PKG.getLoginConfig_AuthMethod(), Translator.ENUM_FEATURE_WITH_HYPHENS), 
-			new Translator(REALM_NAME, WEBAPP_PKG.getLoginConfig_RealmName()), 
-			createFormLoginConfigTranslator()
-		});
-		return result;
-	}
-	
-	public static Translator createFormLoginConfigTranslator() {
-		GenericTranslator result = new GenericTranslator(FORM_LOGIN_CONFIG,  WEBAPP_PKG.getLoginConfig_FormLoginConfig());
-		result.setChildren(new Translator[] {
-			new Translator(FORM_LOGIN_PAGE, WEBAPP_PKG.getFormLoginConfig_FormLoginPage()), 
-			new Translator(FORM_ERROR_PAGE, WEBAPP_PKG.getFormLoginConfig_FormErrorPage()), 
-		});
-		return result;
-	}
-		
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebTypeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebTypeTranslator.java
deleted file mode 100644
index 22027b2c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebTypeTranslator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 20, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.webapplication;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.WarDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class WebTypeTranslator extends Translator implements WarDeploymentDescriptorXmlMapperI {
-	
-	private static Translator[] SERVLET_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WebapplicationPackage.eINSTANCE.getServletType_ClassName())
-	};
-	private static Translator[] JSP_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WebapplicationPackage.eINSTANCE.getJSPType_JspFile())
-	};
-	
-	public WebTypeTranslator() {
-		super(SERVLET_CLASS+','+JSP_FILE, WebapplicationPackage.eINSTANCE.getServlet_WebType());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (((WebType)o).isJspType())
-			return JSP_XLATORS;
-		else if (((WebType)o).isServletType())
-			return SERVLET_XLATORS;
-		else
-			throw new IllegalStateException("Internal error: Web Type expected"); //$NON-NLS-1$
-	}
-	
-	
-	public String getDOMName(Object value) {
-		if (((WebType)value).isJspType())
-			return JSP_FILE;
-		else if (((WebType)value).isServletType())
-			return SERVLET_CLASS;
-		else 
-			throw new IllegalStateException("Internal error: Web Type expected"); //$NON-NLS-1$
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WebapplicationFactory fact = WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
-		if (SERVLET_CLASS.equals(nodeName))
-			return fact.createServletType();
-		else if (JSP_FILE.equals(nodeName))
-			return fact.createJSPType();
-		else
-			return null;
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/EJBLinkTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/EJBLinkTranslator.java
deleted file mode 100644
index 8fe6d8d81..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/EJBLinkTranslator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-public class EJBLinkTranslator extends Translator implements WsddXmlMapperI {
-	
-	private static Translator[] EJB_LINK_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WsddPackage.eINSTANCE.getEJBLink_EjbLink())
-	};
-	
-	public EJBLinkTranslator() {
-		super(EJB_LINK, WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return EJB_LINK_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return EJB_LINK;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WsddFactory fact = WsddPackage.eINSTANCE.getWsddFactory();
-		return fact.createEJBLink();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ElementNameTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ElementNameTranslator.java
deleted file mode 100644
index dd3913ecc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ElementNameTranslator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ElementNameTranslator extends Translator implements JaxrpcmapXmlMapperI {
-	
-	private static Translator[]   ELEMENT_NAME_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, JaxrpcmapPackage.eINSTANCE.getElementName_Text())
-	};
-	
-	public ElementNameTranslator() {
-		super(ELEMENT_NAME, JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return ELEMENT_NAME_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return ELEMENT_NAME;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		JaxrpcmapFactory fact = JaxrpcmapPackage.eINSTANCE.getJaxrpcmapFactory();
-		return fact.createElementName();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/InterfaceMappingTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/InterfaceMappingTranslator.java
deleted file mode 100644
index 15bd4a1f3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/InterfaceMappingTranslator.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class InterfaceMappingTranslator extends Translator implements JaxrpcmapXmlMapperI {
-
-	
-	private static Translator[] SERVICE_INTERFACE_10XLATORS = new Translator[] {
-     new Translator(SERVICE_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface()),
-     create10WSDLServiceNameTranslator(),
-     createPortMappingTranslator()
-	};
-
-	private static Translator[] SERVICE_INTERFACE_11XLATORS = new Translator[] {
-     new Translator(SERVICE_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface()),
-     CommonTranslators.createQNameTranslator(WSDL_SERVICE_NAME, JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName()),
-     createPortMappingTranslator()
-	};
-
-	private static Translator[] SEI_10XLATORS = new Translator[] {
-     new Translator(SERVICE_ENDPOINT_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface()),
-      create10WSDLPortTypeTranslator(),
-      create10WSDLBindingTranslator(),
-      create10SEMethodMappingTranslator()
-	};
-
-	private static Translator[] SEI_11XLATORS = new Translator[] {
-     new Translator(SERVICE_ENDPOINT_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface()),
-     CommonTranslators.createQNameTranslator(WSDL_PORT_TYPE, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType()),
-     CommonTranslators.createQNameTranslator(WSDL_BINDING, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding()),
-     create11SEMethodMappingTranslator()
-	};
-	
-	public InterfaceMappingTranslator() {
-		super(SERVICE_INTERFACE_MAPPING+','+SERVICE_ENDPOINT_INTERFACE_MAPPING, JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (o instanceof ServiceInterfaceMapping)
-			return getServiceInterfaceTranslator(versionID);
-		else if (o instanceof ServiceEndpointInterfaceMapping)
-			return getSEITranslator(versionID);
-		else
-			throw new IllegalStateException("Internal error: InterfaceMapping expected"); //$NON-NLS-1$
-	}
-	
-	
-	public String getDOMName(Object value) {
-		if (value instanceof ServiceInterfaceMapping)
-			return SERVICE_INTERFACE_MAPPING;
-		else if (value instanceof ServiceEndpointInterfaceMapping)
-			return SERVICE_ENDPOINT_INTERFACE_MAPPING;
-		else 
-			throw new IllegalStateException("Internal error: InterfaceMapping expected"); //$NON-NLS-1$
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		JaxrpcmapFactory fact = JaxrpcmapPackage.eINSTANCE.getJaxrpcmapFactory();
-		if (SERVICE_INTERFACE_MAPPING.equals(nodeName))
-			return fact.createServiceInterfaceMapping();
-		else if (SERVICE_ENDPOINT_INTERFACE_MAPPING.equals(nodeName))
-			return fact.createServiceEndpointInterfaceMapping();
-		else
-			return null;
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-   private Translator[] getServiceInterfaceTranslator(int versionID)
-   {
-		switch (versionID) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return SERVICE_INTERFACE_10XLATORS;	
-			default :
-				return SERVICE_INTERFACE_11XLATORS; 
-		}
-    
-   }
-
-   private Translator[] getSEITranslator(int versionID)
-   {
-		switch (versionID) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return SEI_10XLATORS;	
-			default :
-				return SEI_11XLATORS; 
-		}
-    
-   }
-	private static Translator create10WSDLServiceNameTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_SERVICE_NAME, jaxrpcmapPackage.getServiceInterfaceMapping_WsdlServiceName());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator createPortMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(PORT_MAPPING, jaxrpcmapPackage.getServiceInterfaceMapping_PortMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PORT_NAME, jaxrpcmapPackage.getPortMapping_PortName()),
-			new Translator(JAVA_PORT_NAME, jaxrpcmapPackage.getPortMapping_JavaPortName())
-		});
-		return result;	
-	}
-	/*
-	private static Translator create10PortMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(PORT_MAPPING, jaxrpcmapPackage.getServiceInterfaceMapping_PortMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PORT_NAME, jaxrpcmapPackage.getPortMapping_PortName()),
-			new Translator(JAVA_PORT_NAME, jaxrpcmapPackage.getPortMapping_JavaPortName())
-		});
-		return result;	
-	}
-	*/
-
-	private static Translator create10WSDLPortTypeTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;	    
-		GenericTranslator result = new GenericTranslator(WSDL_PORT_TYPE, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_WsdlPortType());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLBindingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;	    	    
-		GenericTranslator result = new GenericTranslator(WSDL_BINDING, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_WsdlBinding());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator create10SEMethodMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(SERVICE_ENDPOINT_METHOD_MAPPING, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_METHOD_NAME, jaxrpcmapPackage.getServiceEndpointMethodMapping_JavaMethodName()),
-			new Translator(WSDL_OPERATION, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlOperation()),
-			new Translator(WRAPPED_ELEMENT, jaxrpcmapPackage.getServiceEndpointMethodMapping_WrappedElement(), Translator.EMPTY_TAG),
-			create10MethodParamPartsMappingTranslator(),
-			create10WSDLReturnValueMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create11SEMethodMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(SERVICE_ENDPOINT_METHOD_MAPPING, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_METHOD_NAME, jaxrpcmapPackage.getServiceEndpointMethodMapping_JavaMethodName()),
-			new Translator(WSDL_OPERATION, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlOperation()),
-			new Translator(WRAPPED_ELEMENT, jaxrpcmapPackage.getServiceEndpointMethodMapping_WrappedElement(), Translator.EMPTY_TAG),
-			create11MethodParamPartsMappingTranslator(),
-			create11WSDLReturnValueMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create10MethodParamPartsMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(METHOD_PARAM_PARTS_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_MethodParamPartsMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_POSITION, jaxrpcmapPackage.getMethodParamPartsMapping_ParamPosition()),
-			new Translator(PARAM_TYPE, jaxrpcmapPackage.getMethodParamPartsMapping_ParamType()),
-			create10WSDLMessageMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create11MethodParamPartsMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(METHOD_PARAM_PARTS_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_MethodParamPartsMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_POSITION, jaxrpcmapPackage.getMethodParamPartsMapping_ParamPosition()),
-			new Translator(PARAM_TYPE, jaxrpcmapPackage.getMethodParamPartsMapping_ParamType()),
-			create11WSDLMessageMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLMessageMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE_MAPPING, jaxrpcmapPackage.getMethodParamPartsMapping_WsdlMessageMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-          create10WSDLMessageTranslator(jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessagePartName()),
-			new Translator(PARAMETER_MODE, jaxrpcmapPackage.getWSDLMessageMapping_ParameterMode()),
-			new Translator(SOAP_HEADER, jaxrpcmapPackage.getWSDLMessageMapping_SoapHeader(), Translator.EMPTY_TAG),
-		});
-		return result;	
-	}
-
-	private static Translator create11WSDLMessageMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE_MAPPING, jaxrpcmapPackage.getMethodParamPartsMapping_WsdlMessageMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-          CommonTranslators.createQNameTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessagePartName()),
-			new Translator(PARAMETER_MODE, jaxrpcmapPackage.getWSDLMessageMapping_ParameterMode()),
-			new Translator(SOAP_HEADER, jaxrpcmapPackage.getWSDLMessageMapping_SoapHeader(), Translator.EMPTY_TAG),
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLMessageTranslator(EStructuralFeature feature) {
-	    //JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;	    	    	    
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLReturnValueMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_RETURN_VALUE_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(METHOD_RETURN_VALUE, jaxrpcmapPackage.getWSDLReturnValueMapping_MethodReturnValue()),
-			create10WSDLMessageTranslator(jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessagePartName())
-		});
-		return result;	
-	}
-
-	private static Translator create11WSDLReturnValueMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_RETURN_VALUE_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(METHOD_RETURN_VALUE, jaxrpcmapPackage.getWSDLReturnValueMapping_MethodReturnValue()),
-          CommonTranslators.createQNameTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessagePartName())
-		});
-		return result;	
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapTranslator.java
deleted file mode 100644
index 2a383776e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapTranslator.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-
-public class JaxrpcmapTranslator extends RootTranslator implements JaxrpcmapXmlMapperI, J2EEConstants{
-	public static JaxrpcmapTranslator INSTANCE = new JaxrpcmapTranslator();
-	private static Translator[] children10;
-	private static Translator[] children11;
-	private JaxrpcmapPackage jaxrpcmapPackage;
-	private CommonPackage commonPackage;
-	
-	
-	protected JaxrpcmapTranslator() {
-		super(JAVA_WSDL_MAPPING, JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-	    jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		commonPackage = CommonPackage.eINSTANCE;
-
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children10 == null)
-				{
-					children10 = create10Children();
-				}
-				return children10;	
-			default :
-				if (children11 == null)
-				{
-					children11 = create11Children();
-				}
-				return children11; 
-		}
-	}
-
-
-	protected Translator[] create10Children() {
-		
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			createPackageMappingTranslator(),
-			create10JavaXMLTypeMappingTranslator(),
-			create10ExceptionMappingTranslator(),
-			new InterfaceMappingTranslator()
-		};
-	}
-
-	protected Translator[] create11Children() {
-		
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+WebServiceConstants.JAXRPCMAP_SCHEMA_LOC),
-			new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION),			  			  
-			createPackageMappingTranslator(),
-			create11JavaXMLTypeMappingTranslator(),
-			create11ExceptionMappingTranslator(),
-			new InterfaceMappingTranslator()
-		};
-	}
-
-	public Translator createPackageMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(PACKAGE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_PackageMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PACKAGE_TYPE, jaxrpcmapPackage.getPackageMapping_PackageType()),
-			new Translator(NAMESPACEURI, jaxrpcmapPackage.getPackageMapping_NamespaceURI())
-		});
-		return result;	
-	}
-
-	public Translator create10JavaXMLTypeMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(JAVA_XML_TYPE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_JavaXMLTypeMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(CLASS_TYPE, jaxrpcmapPackage.getJavaXMLTypeMapping_ClassType()),
-			create10RootTypeQnameTranslator(),
-			new Translator(QNAME_SCOPE, jaxrpcmapPackage.getJavaXMLTypeMapping_QnameScope()),
-			create10VariableMappingTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create11JavaXMLTypeMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(JAVA_XML_TYPE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_JavaXMLTypeMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_TYPE, jaxrpcmapPackage.getJavaXMLTypeMapping_ClassType()),
-			new Translator(ANONYMOUS_TYPE_QNAME, jaxrpcmapPackage.getJavaXMLTypeMapping_AnonymousTypeQname()),
-			CommonTranslators.createQNameTranslator(ROOT_TYPE_QNAME, jaxrpcmapPackage.getJavaXMLTypeMapping_RootTypeQname()),
-			//create10RootTypeQnameTranslator(),  //RootTypeQName is still going to work the old (1.3) way because of anonymous types.
-			new Translator(QNAME_SCOPE, jaxrpcmapPackage.getJavaXMLTypeMapping_QnameScope()),
-			create11VariableMappingTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create10ExceptionMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(EXCEPTION_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_ExceptionMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(EXCEPTION_TYPE, jaxrpcmapPackage.getExceptionMapping_ExceptionType()),
-			create10WSDLMessageTranslator(),
-			createConstructorParamOrderTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create11ExceptionMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(EXCEPTION_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_ExceptionMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(EXCEPTION_TYPE, jaxrpcmapPackage.getExceptionMapping_ExceptionType()),
-			CommonTranslators.createQNameTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getExceptionMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getExceptionMapping_WsdlMessagePartName()),
-			createConstructorParamOrderTranslator()
-		});
-		return result;	
-	}
-
-	public Translator createInterfaceMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(SERVICE_INTERFACE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PACKAGE_TYPE, jaxrpcmapPackage.getPackageMapping_PackageType()),
-			new Translator(NAMESPACEURI, jaxrpcmapPackage.getPackageMapping_NamespaceURI())
-		});
-		return result;	
-	}
-
-
-	public Translator create10RootTypeQnameTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(ROOT_TYPE_QNAME, jaxrpcmapPackage.getJavaXMLTypeMapping_RootTypeQname());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-	public Translator create10VariableMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(VARIABLE_MAPPING, jaxrpcmapPackage.getJavaXMLTypeMapping_VariableMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_VARIABLE_NAME, jaxrpcmapPackage.getVariableMapping_JavaVariableName()),
-			new Translator(DATA_MEMBER, jaxrpcmapPackage.getVariableMapping_DataMember(), Translator.EMPTY_TAG),
-			new Translator(XML_ELEMENT_NAME, jaxrpcmapPackage.getVariableMapping_XmlElementName())
-		});
-		return result;	
-	}
-
-	public Translator create11VariableMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(VARIABLE_MAPPING, jaxrpcmapPackage.getJavaXMLTypeMapping_VariableMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_VARIABLE_NAME, jaxrpcmapPackage.getVariableMapping_JavaVariableName()),
-			new Translator(DATA_MEMBER, jaxrpcmapPackage.getVariableMapping_DataMember(), Translator.EMPTY_TAG),
-			new Translator(XML_ATTRIBUTE_NAME, jaxrpcmapPackage.getVariableMapping_XmlAttributeName()),
-			new Translator(XML_ELEMENT_NAME, jaxrpcmapPackage.getVariableMapping_XmlElementName()),
-			new Translator(XML_WILDCARD, jaxrpcmapPackage.getVariableMapping_XmlWildcard(), Translator.EMPTY_TAG)
-		});
-		return result;	
-	}
-
-	public Translator create10WSDLMessageTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getExceptionMapping_WsdlMessage());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-	public Translator createConstructorParamOrderTranslator() {
-		GenericTranslator result = new GenericTranslator(CONSTRUCTOR_PARAMETER_ORDER, jaxrpcmapPackage.getExceptionMapping_ConstructorParameterOrder());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new ElementNameTranslator()
-		});
-		return result;	
-	}
-	
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapXmlMapperI.java
deleted file mode 100644
index 4bfc870dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapXmlMapperI.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-//imports for J2EE core classes
-//import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an web service deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface JaxrpcmapXmlMapperI extends WebServiceCommonXmlMapperI
-{
-  public String JAVA_WSDL_MAPPING                       ="java-wsdl-mapping"; //$NON-NLS-1$
-  public String CLASS_TYPE                              ="class-type";//$NON-NLS-1$
-  public String JAVA_TYPE                                ="java-type";  //$NON-NLS-1$
-  public String CONSTRUCTOR_PARAMETER_ORDER             ="constructor-parameter-order";//$NON-NLS-1$
-  public String DATA_MEMBER                             ="data-member";//$NON-NLS-1$
-  public String ELEMENT_NAME                            ="element-name";//$NON-NLS-1$
-  public String EXCEPTION_MAPPING                       ="exception-mapping";//$NON-NLS-1$
-  public String EXCEPTION_TYPE                          ="exception-type";//$NON-NLS-1$
-  public String JAVA_METHOD_NAME                        ="java-method-name";//$NON-NLS-1$
-  public String JAVA_PORT_NAME                          ="java-port-name";//$NON-NLS-1$
-  public String JAVA_VARIABLE_NAME                      ="java-variable-name";//$NON-NLS-1$
-  public String JAVA_XML_TYPE_MAPPING                   ="java-xml-type-mapping";//$NON-NLS-1$
-  public String METHOD_PARAM_PARTS_MAPPING              ="method-param-parts-mapping";//$NON-NLS-1$
-  public String METHOD_RETURN_VALUE                     ="method-return-value";//$NON-NLS-1$
-  public String PACKAGE_MAPPING                         ="package-mapping";//$NON-NLS-1$
-  public String PACKAGE_TYPE                            ="package-type";//$NON-NLS-1$
-  public String PARAMETER_MODE                          ="parameter-mode";//$NON-NLS-1$
-  public String PARAM_POSITION                          ="param-position";//$NON-NLS-1$
-  public String PARAM_TYPE                              ="param-type";//$NON-NLS-1$
-  public String PORT_MAPPING                            ="port-mapping";//$NON-NLS-1$
-  public String QNAME_SCOPE                             ="qname-scope";//$NON-NLS-1$
-  public String ANONYMOUS_TYPE_QNAME             = "anonymous-type-qname";//$NON-NLS-1$
-  public String ROOT_TYPE_QNAME                         ="root-type-qname";//$NON-NLS-1$
-  //public String SERVICE_ENDPOINT_INTERFACE              ="service-endpoint-interface";
-  public String SERVICE_ENDPOINT_INTERFACE_MAPPING      ="service-endpoint-interface-mapping";//$NON-NLS-1$
-  public String SERVICE_ENDPOINT_METHOD_MAPPING         ="service-endpoint-method-mapping";//$NON-NLS-1$
-  //public String SERVICE_INTERFACE                       ="service-interface";
-  public String SERVICE_INTERFACE_MAPPING               ="service-interface-mapping";//$NON-NLS-1$
-  //public String SOAP_HEADER                             ="soap_header";
-  public String VARIABLE_MAPPING                        ="variable-mapping";//$NON-NLS-1$
-  public String WRAPPED_ELEMENT                         ="wrapped-element";//$NON-NLS-1$
-  public String WSDL_BINDING                            ="wsdl-binding";//$NON-NLS-1$
-  public String WSDL_MESSAGE                            ="wsdl-message";//$NON-NLS-1$
-  public String WSDL_MESSAGE_MAPPING                    ="wsdl-message-mapping";//$NON-NLS-1$
-  public String WSDL_MESSAGE_PART_NAME                  ="wsdl-message-part-name";//$NON-NLS-1$
-  public String WSDL_OPERATION                          ="wsdl-operation";//$NON-NLS-1$
-  public String WSDL_PORT_TYPE                          ="wsdl-port-type";//$NON-NLS-1$
-  public String WSDL_RETURN_VALUE_MAPPING               ="wsdl-return-value-mapping";//$NON-NLS-1$
-  public String WSDL_SERVICE_NAME                       ="wsdl-service-name";//$NON-NLS-1$
-  public String XML_ATTRIBUTE_NAME                        ="xml-attribute-name";//$NON-NLS-1$
-  public String XML_ELEMENT_NAME                        ="xml-element-name";//$NON-NLS-1$
-  public String XML_WILDCARD                                ="xml-wildcard";//$NON-NLS-1$
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/SOAPRoleTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/SOAPRoleTranslator.java
deleted file mode 100644
index fd0a35aa6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/SOAPRoleTranslator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-public class SOAPRoleTranslator extends Translator implements WsddXmlMapperI {
-	
-	private static Translator[] SOAP_ROLE_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WscommonPackage.eINSTANCE.getSOAPRole_SoapRole())
-	};
-	
-	public SOAPRoleTranslator() {
-		super(SOAP_ROLE, WsddPackage.eINSTANCE.getHandler_SoapRoles());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return SOAP_ROLE_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return SOAP_ROLE;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WscommonFactory fact = WscommonPackage.eINSTANCE.getWscommonFactory();
-		return fact.createSOAPRole();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ServletLinkTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ServletLinkTranslator.java
deleted file mode 100644
index cf3abda0e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ServletLinkTranslator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-public class ServletLinkTranslator extends Translator implements WsddXmlMapperI {
-	
-	private static Translator[] SERVLET_LINK_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WsddPackage.eINSTANCE.getServletLink_ServletLink())
-	};
-	
-	public ServletLinkTranslator() {
-		super(SERVLET_LINK, WsddPackage.eINSTANCE.getServiceImplBean_EServletLink());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return SERVLET_LINK_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return SERVLET_LINK;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WsddFactory fact = WsddPackage.eINSTANCE.getWsddFactory();
-		return fact.createServletLink();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServiceCommonXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServiceCommonXmlMapperI.java
deleted file mode 100644
index 9bf68c74c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServiceCommonXmlMapperI.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-//imports for J2EE core classes
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an web service deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface WebServiceCommonXmlMapperI extends DeploymentDescriptorXmlMapperI
-{
-//  public String WSDL_FILE                       = "wsdl-file";
-//  public String JAXRPC_MAPPING_FILE             = "jaxrpc-mapping-file";
-  public String NAMESPACEURI                    = "namespaceURI";//$NON-NLS-1$
-  public String LOCALPART                       = "localpart";//$NON-NLS-1$
-//  public String SERVICE_INTERFACE               = "service-interface";
-  public String SERVICE_ENDPOINT_INTERFACE      = "service-endpoint-interface";//$NON-NLS-1$
-//  public String HANDLER                         = "handler";
-//  public String HANDLER_NAME                    = "handler-name";
-//  public String HANDLER_CLASS                   = "handler-class";
-  public String INIT_PARAM                      = "init-param";//$NON-NLS-1$
-//  public String PARAM_NAME                      = "param-name";
-//  public String PARAM_VALUE                     = "param-value";
-//  public String SOAP_HEADER                     = "soap-header";
-//  public String SOAP_ROLE                       = "soap-role";
-//  public String PORT_NAME                       = "port-name";
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServicesTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServicesTranslator.java
deleted file mode 100644
index cd9b6a6dd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServicesTranslator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.WebServicesDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class WebServicesTranslator extends RootTranslator implements WebServicesDeploymentDescriptorXmlMapperI{
-	public static WebServicesTranslator INSTANCE = new WebServicesTranslator();
-	public static final String WEBSERVICESCLIENT = WEB_SERVICES_CLIENT; 
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-
-	private static  Webservice_clientPackage WEBSERVICECLIENT_PKG = Webservice_clientPackage.eINSTANCE;
-	
-	private static Translator[] children13;
-    
-	public WebServicesTranslator() {
-		super(WEBSERVICESCLIENT, Webservice_clientPackage.eINSTANCE.getWebServicesClient());
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (children13 == null)
-			children13 = create13Children();
-		return children13;
-	}
-	
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			createServiceRefGroupTranslator13(null),
-			createComponentScopedRefs13()
-		};
-	}
-	/**
-	 * This model was model from Websphere Webservices
-	 * @param reference
-	 * @return
-	 */
-	public static Translator createServiceRefGroupTranslator13(EStructuralFeature feature) {
-		if (feature == null)
-			feature = WEBSERVICECLIENT_PKG.getWebServicesClient_ServiceRefs();
-		GenericTranslator result = new GenericTranslator(SERVICE_REF, feature);
-		result.setChildren( new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new Translator(SERVICE_REF_NAME, WEBSERVICECLIENT_PKG.getServiceRef_ServiceRefName()),
-			new JavaClassTranslator(SERVICE_INTERFACE, WEBSERVICECLIENT_PKG.getServiceRef_ServiceInterface()),
-			new Translator(WSDL_FILE, WEBSERVICECLIENT_PKG.getServiceRef_WsdlFile()),
-			new Translator(JAXRPC_MAPPING_FILE, WEBSERVICECLIENT_PKG.getServiceRef_JaxrpcMappingFile()),
-			createQNameTranslator10(SERVICE_QNAME, WEBSERVICECLIENT_PKG.getServiceRef_ServiceQname()),
-			CommonTranslators.createPortComponentRefTranslator(),
-			createServiceRefHandlerTranslator13(),
-		});
-		
-		
-		return result;
-	}
-	/**
-	 * This model was model from Websphere Webservices
-	 * @return
-	 */
-	public static Translator createServiceRefHandlerTranslator13() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WEBSERVICECLIENT_PKG.getServiceRef_Handlers());
-		result.setChildren(new Translator[]{
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new Translator(HANDLER_NAME, WEBSERVICECLIENT_PKG.getHandler_HandlerName()),
-			new JavaClassTranslator(HANDLER_CLASS, WEBSERVICECLIENT_PKG.getHandler_HandlerClass()),
-			createParamValueType13(HANDLER_INIT_PARAM, WEBSERVICECLIENT_PKG.getHandler_InitParams()),
-			createQNameTranslator10(SOAP_HEADER, WEBSERVICECLIENT_PKG.getHandler_SoapHeaders()),
-			new Translator(SOAP_ROLE, WEBSERVICECLIENT_PKG.getHandler_SoapRoles()),
-			new Translator(PORT_NAME, WEBSERVICECLIENT_PKG.getHandler_PortNames())
-		});
-		
-		return result;
-	}
-    /**
-     * @return
-     */
-    private Translator createComponentScopedRefs13() {
-		GenericTranslator result = new GenericTranslator(COMP_SCOPED_REFS, WEBSERVICECLIENT_PKG.getWebServicesClient_ComponentScopedRefs());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(COMP_COMPONENT_NAME, WEBSERVICECLIENT_PKG.getComponentScopedRefs_ComponentName()), 
-			createServiceRefGroupTranslator13(WEBSERVICECLIENT_PKG.getComponentScopedRefs_ServiceRefs())
-		});
-		return result;
-    }
-    
-	public static Translator createQNameTranslator10(String domName, EStructuralFeature feature) {		
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, COMMON_PKG.getQName_NamespaceURI()),
-			new Translator(LOCALPART, COMMON_PKG.getQName_LocalPart())
-		});
-		return result;	
-	}
-	
-	public static Translator createParamValueType13(String domName, EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_NAME, COMMON_PKG.getParamValue_Name()),
-			new Translator(PARAM_VALUE, COMMON_PKG.getParamValue_Value()),
-			new Translator(DESCRIPTION, COMMON_PKG.getParamValue_Description())
-		});
-		return result;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
deleted file mode 100644
index 1ffa29a36..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-
-public class WsddTranslator extends RootTranslator implements WsddXmlMapperI, J2EEConstants{
-	public static WsddTranslator INSTANCE = new WsddTranslator();
-	private static Translator[] children10;
-	private static Translator[] children11;
-
-	private static WsddPackage WSDD_PKG = WsddPackage.eINSTANCE;
-	private static WscommonPackage WSCOMMON_PKG = WscommonPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-	protected WsddTranslator() {
-		super(WEBSERVICES, WsddPackage.eINSTANCE.getWebServices());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-	    
-		
-
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children10 == null)
-				{
-					children10 = create10Children();
-				}
-				return children10;	
-			default :
-				if (children11 == null)
-				{
-					children11 = create11Children();
-				}
-				return children11; 
-		}
-	}
-
-
-	protected Translator[] create10Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),			
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),			
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),			
-			create10WebServiceDescTranslator()
-		};
-	}
-
-	protected Translator[] create11Children() {
-		
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+WebServiceConstants.WEBSERVICE_SCHEMA_LOC),
-			new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION),			  
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,			
-			create11WebServiceDescTranslator()
-		};
-	}
-
-	public Translator create10WebServiceDescTranslator() {
-		GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, WSDD_PKG.getWebServiceDescription_Description()),			
-			new Translator(DISPLAY_NAME, WSDD_PKG.getWebServiceDescription_DisplayName()),			
-			new Translator(SMALL_ICON, WSDD_PKG.getWebServiceDescription_SmallIcon()),			
-			new Translator(LARGE_ICON, WSDD_PKG.getWebServiceDescription_LargeIcon()),						
-			new Translator(WEBSERVICE_DESCRIPTION_NAME, WSDD_PKG.getWebServiceDescription_WebServiceDescriptionName()),
-			new Translator(WSDL_FILE, WSDD_PKG.getWebServiceDescription_WsdlFile()),			
-			new Translator(JAXRPC_MAPPING_FILE, WSDD_PKG.getWebServiceDescription_JaxrpcMappingFile()),			
-			create10PortComponentTranslator()			  
-		});
-		return result;	
-	}
-
-	public Translator create11WebServiceDescTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			create11DescriptionTranslator(WSDD_PKG.getWebServiceDescription_DescriptionType()),
-			create11DisplayNameTranslator(WSDD_PKG.getWebServiceDescription_DisplayNameType()),			
-			create11IconTranslator(WSDD_PKG.getWebServiceDescription_IconType()),			
-			new Translator(WEBSERVICE_DESCRIPTION_NAME, WSDD_PKG.getWebServiceDescription_WebServiceDescriptionName()),
-			new Translator(WSDL_FILE, WSDD_PKG.getWebServiceDescription_WsdlFile()),			
-			new Translator(JAXRPC_MAPPING_FILE, WSDD_PKG.getWebServiceDescription_JaxrpcMappingFile()),			
-			create11PortComponentTranslator()			  
-		});
-		return result;	
-	}
-
-
-
-	public Translator create10PortComponentTranslator() {
-		GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, WSDD_PKG.getPortComponent_Description()),			
-			new Translator(DISPLAY_NAME, WSDD_PKG.getPortComponent_DisplayName()),			
-			new Translator(SMALL_ICON, WSDD_PKG.getPortComponent_SmallIcon()),			
-			new Translator(LARGE_ICON, WSDD_PKG.getPortComponent_LargeIcon()),						
-			new Translator(PORT_COMPONENT_NAME, WSDD_PKG.getPortComponent_PortComponentName()),
-			create10WsdlPortTranslator(),
-			new Translator(SERVICE_ENPOINT_INTERFACE, WSDD_PKG.getPortComponent_ServiceEndpointInterface()),
-			createServiceImplBeanTranslator(),
-			createHandler10Translator()
-		});
-		return result;	
-	}
-
-	public Translator create11PortComponentTranslator() {
-		GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, WSDD_PKG.getPortComponent_Description()),			
-			new Translator(DISPLAY_NAME, WSDD_PKG.getPortComponent_DisplayName()),			
-			new Translator(SMALL_ICON, WSDD_PKG.getPortComponent_SmallIcon()),			
-			new Translator(LARGE_ICON, WSDD_PKG.getPortComponent_LargeIcon()),				
-			new Translator(PORT_COMPONENT_NAME, WSDD_PKG.getPortComponent_PortComponentName()),
-			CommonTranslators.createQNameTranslator(WSDL_PORT, WSDD_PKG.getPortComponent_WsdlPort()),
-			new Translator(SERVICE_ENPOINT_INTERFACE, WSDD_PKG.getPortComponent_ServiceEndpointInterface()),
-			createServiceImplBeanTranslator(),
-			createHandler11Translator()
-		});
-		return result;	
-	}
-
-	public Translator create10WsdlPortTranslator() {
-		GenericTranslator result = new GenericTranslator(WSDL_PORT, WSDD_PKG.getPortComponent_WsdlPort());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, COMMON_PKG.getQName_NamespaceURI()),
-			new Translator(LOCALPART, COMMON_PKG.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-
-	public Translator createServiceImplBeanTranslator() {
-		GenericTranslator result = new GenericTranslator(SERVICE_IMPL_BEAN, WSDD_PKG.getPortComponent_ServiceImplBean());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new ServletLinkTranslator(),
-			new EJBLinkTranslator()
-		});
-		return result;	
-	}
-
-
-	public Translator createHandler10Translator() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WSDD_PKG.getPortComponent_Handlers());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),			
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),			
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),			
-			new Translator(HANDLER_NAME, WSDD_PKG.getHandler_HandlerName()),
-			new Translator(HANDLER_CLASS, WSDD_PKG.getHandler_HandlerClass()),			
-			create10InitParamTranslator(),
-			create10SOAPHeaderTranslator(),
-			new SOAPRoleTranslator()
-		});
-		return result;	
-	}
-
-	public Translator createHandler11Translator() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WSDD_PKG.getPortComponent_Handlers());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,			
-			new Translator(HANDLER_NAME, WSDD_PKG.getHandler_HandlerName()),
-			new Translator(HANDLER_CLASS, WSDD_PKG.getHandler_HandlerClass()),			
-			create11InitParamTranslator(),
-			CommonTranslators.createQNameTranslator(SOAP_HEADER, WSDD_PKG.getHandler_SoapHeaders()),
-			new SOAPRoleTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create10InitParamTranslator() {
-		GenericTranslator result = new GenericTranslator(INIT_PARAM, WSDD_PKG.getHandler_InitParams());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_NAME, WSCOMMON_PKG.getInitParam_ParamName()),
-			new Translator(PARAM_VALUE, WSCOMMON_PKG.getInitParam_ParamValue()),			
-			new Translator(DESCRIPTION, WSCOMMON_PKG.getInitParam_Description())			
-		});
-		return result;	
-	}
-
-	public Translator create11InitParamTranslator() {
-		GenericTranslator result = new GenericTranslator(INIT_PARAM, WSDD_PKG.getHandler_InitParams());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			create11DescriptionTranslator(WSCOMMON_PKG.getInitParam_DescriptionTypes()),						  
-			new Translator(PARAM_NAME, WSCOMMON_PKG.getInitParam_ParamName()),
-			new Translator(PARAM_VALUE, WSCOMMON_PKG.getInitParam_ParamValue())
-		});
-		return result;	
-	}
-
-
-	public Translator create10SOAPHeaderTranslator() {
-		GenericTranslator result = new GenericTranslator(SOAP_HEADER, WSDD_PKG.getHandler_SoapHeaders());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, COMMON_PKG.getQName_NamespaceURI()),
-			new Translator(LOCALPART, COMMON_PKG.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-	public Translator create11DescriptionTranslator(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(DESCRIPTION, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDescription_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDescription_Value())
-		});
-		return result;
-	}
-	public  Translator create11DisplayNameTranslator(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(DISPLAY_NAME, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDisplayName_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDisplayName_Value())
-		});
-		return result;
-	}
-
-	private Translator create11IconTranslator(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(ICON, afeature);
-		result.setChildren(new Translator[] {
-			new Translator(LANG, COMMON_PKG.getIconType_Lang(), Translator.DOM_ATTRIBUTE),		  
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON, COMMON_PKG.getIconType_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getIconType_LargeIcon())
-		});
-		return result;
-	}
-	
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddXmlMapperI.java
deleted file mode 100644
index a435cb5d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddXmlMapperI.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-//imports for J2EE core classes
-//import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an web service deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface WsddXmlMapperI extends WebServiceCommonXmlMapperI
-{
-  public String WEBSERVICES                     = "webservices";//$NON-NLS-1$
-  public String WEBSERVICE_DESCRIPTION          = "webservice-description";//$NON-NLS-1$
-  public String WEBSERVICE_DESCRIPTION_NAME     = "webservice-description-name";//$NON-NLS-1$
-  public String PORT_COMPONENT                  = "port-component";//$NON-NLS-1$
-  public String PORT_COMPONENT_NAME             = "port-component-name";//$NON-NLS-1$
-  public String WSDL_PORT                       = "wsdl-port";//$NON-NLS-1$
-  public String SERVICE_IMPL_BEAN               = "service-impl-bean";//$NON-NLS-1$
-  public String SERVLET_LINK                    = "servlet-link";//$NON-NLS-1$
-  //EJB_LINK is defined in DeploymentDescriptorXmlMapperI
-  //public String EJB_LINK                        = "ejb-link";
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/CollectingErrorHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/CollectingErrorHandler.java
deleted file mode 100644
index 31337e73b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/CollectingErrorHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-/**
- * Insert the type's description here.
- * Creation date: (03/19/01 11:10:38 AM)
- * @author: Administrator
- */
-public class CollectingErrorHandler implements ErrorHandler {
-	protected List caughtExceptions;
-/**
- * CollectingErrorHandler constructor comment.
- */
-public CollectingErrorHandler() {
-	super();
-}
-/**
- * @see org.xml.sax.ErrorHandler
- */
-public void error(SAXParseException exception) throws SAXException {
-	getCaughtExceptions().add(exception);
-}
-/**
- * @see org.xml.sax.ErrorHandler
- */
-public void fatalError(SAXParseException exception) throws SAXException {
-	getCaughtExceptions().add(exception);
-}
-public List getCaughtExceptions() {
-	if (caughtExceptions == null) {
-		caughtExceptions = new ArrayList();
-	}
-	return caughtExceptions;
-}
-
-/**
- * @see org.xml.sax.ErrorHandler
- */
-public void warning(SAXParseException exception) throws SAXException {
-	getCaughtExceptions().add(exception);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/DeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/DeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 63218d104..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/DeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-
-/**
- * This interface represents a catalog of all the tag names which may be shared in 
- * a deployment descriptor for EJBJars, ears, and wars. Interface shared by readers and 
- * writers to have access to common constants
- */
-
-public interface DeploymentDescriptorXmlMapperI {
-	String DESCRIPTION = "description";//$NON-NLS-1$
-	String DISPLAY_NAME = "display-name";//$NON-NLS-1$
-	String EJB_LINK = "ejb-link";//$NON-NLS-1$
-	String ENV_ENTRY = "env-entry";//$NON-NLS-1$
-	String ENV_ENTRY_NAME = "env-entry-name";//$NON-NLS-1$
-	String ENV_ENTRY_TYPE = "env-entry-type";//$NON-NLS-1$
-	String ENV_ENTRY_VALUE = "env-entry-value";//$NON-NLS-1$
-	String EJB_LOCAL_REF = "ejb-local-ref";	//$NON-NLS-1$				// J2EE1.3
-	String EJB_REF = "ejb-ref";//$NON-NLS-1$
-	String EJB_REF_NAME = "ejb-ref-name";//$NON-NLS-1$
-	String EJB_REF_TYPE = "ejb-ref-type";//$NON-NLS-1$
-	String HOME = "home";//$NON-NLS-1$
-	String ICON = "icon";//$NON-NLS-1$
-	String ID = "id";//$NON-NLS-1$
-	String LARGE_ICON = "large-icon";//$NON-NLS-1$
-	String LARGE_ICON_PATH = "icon/large-icon";//$NON-NLS-1$
-	String LOCAL = "local";//$NON-NLS-1$									// J2EE1.3
-	String LOCAL_HOME = "local-home";//$NON-NLS-1$						// J2EE1.3
-	String REMOTE = "remote";//$NON-NLS-1$
-	String RES_AUTH = "res-auth";//$NON-NLS-1$
-	String RES_REF_NAME = "res-ref-name";//$NON-NLS-1$
-	String RES_SHARING_SCOPE = "res-sharing-scope";//$NON-NLS-1$ 		// J2EE1.3 
-	String RES_TYPE = "res-type";//$NON-NLS-1$
-	String RESOURCE_ENV_REF = "resource-env-ref"; //$NON-NLS-1$			// J2EE1.3
-	String RESOURCE_ENV_REF_NAME = "resource-env-ref-name";//$NON-NLS-1$ // J2EE1.3
-	String RESOURCE_ENV_REF_TYPE = "resource-env-ref-type";//$NON-NLS-1$ // J2EE1.3
-	String RESOURCE_REF = "resource-ref";//$NON-NLS-1$
-	String ROLE_LINK = "role-link";//$NON-NLS-1$
-	String ROLE_NAME = "role-name";//$NON-NLS-1$
-	String RUN_AS = "run-as";	//$NON-NLS-1$							// J2EE1.3
-	String SECURITY_IDENTITY = "security-identity";	//$NON-NLS-1$		// J2EE1.3
-	String SECURITY_ROLE = "security-role";//$NON-NLS-1$
-	String SECURITY_ROLE_REF = "security-role-ref";//$NON-NLS-1$
-	String SMALL_ICON = "small-icon";//$NON-NLS-1$
-	String SMALL_ICON_PATH = "icon/small-icon";//$NON-NLS-1$
-	String USE_CALLER_IDENTITY = "use-caller-identity";//$NON-NLS-1$		// J2EE1.3
-	
-	
-	//	J2EE 1.4
-	String LANG = "xml:lang";//$NON-NLS-1$
-	String DEPLOY_EXT = "deployment-extension";		//$NON-NLS-1$		// J2EE1.4
-	String EXT_ELEMENT = "extension-element";	//$NON-NLS-1$			// J2EE1.4
-	String MESSAGE_DEST_REF = "message-destination-ref";//$NON-NLS-1$	// J2EE1.4
-	String MESSAGE_DEST_REF_NAME = "message-destination-ref-name";//$NON-NLS-1$	// J2EE1.4
-	String MESSAGE_DEST_TYPE = "message-destination-type";//$NON-NLS-1$			// J2EE1.4
-	String MESSAGE_DEST_LINK = "message-destination-link";	//$NON-NLS-1$		// J2EE1.4
-	String MESSAGE_DEST_USAGE = "message-destination-usage";//$NON-NLS-1$		// J2EE1.4
-	String MESSAGE_DEST = "message-destination";	//$NON-NLS-1$			// J2EE1.4
-	String MESSAGE_DEST_NAME = "message-destination-name";	//$NON-NLS-1$			// J2EE1.4
-	String SERVICE_REF = "service-ref";//$NON-NLS-1$
-	String SERVICE_REF_NAME = "service-ref-name";//$NON-NLS-1$
-	String SERVICE_INTERFACE = "service-interface";//$NON-NLS-1$
-	String WSDL_FILE = "wsdl-file";//$NON-NLS-1$
-	String JAXRPC_MAPPING_FILE = "jaxrpc-mapping-file";//$NON-NLS-1$
-	String SERVICE_QNAME = "service-qname";//$NON-NLS-1$
-	String PORT_COMPONENT_REF = "port-component-ref";//$NON-NLS-1$
-	String HANDLER = "handler";//$NON-NLS-1$
-	String SERVICE_ENPOINT_INTERFACE = "service-endpoint-interface";//$NON-NLS-1$
-	String PORT_COMPONENT_LINK = "port-component-link";//$NON-NLS-1$
-	String HANDLER_NAME = "handler-name";//$NON-NLS-1$
-	String HANDLER_CLASS = "handler-class";//$NON-NLS-1$
-	String HANDLER_INIT_PARAM = "init-param";//$NON-NLS-1$
-	String SOAP_HEADER = "soap-header";//$NON-NLS-1$
-	String SOAP_ROLE = "soap-role";//$NON-NLS-1$
-	String PORT_NAME = "port-name";//$NON-NLS-1$
-	String VERSION = "version";//$NON-NLS-1$
-	String XML_NS = "xmlns";//$NON-NLS-1$
-	String XML_NS_XSI = "xmlns:xsi";//$NON-NLS-1$
-	String XSI_SCHEMA_LOCATION = "xsi:schemaLocation";//$NON-NLS-1$
-	String NAMESPACE = "namespace";//$NON-NLS-1$
-	String MUSTUNDERSTAND = "mustUnderstand";//$NON-NLS-1$
-	String PARAM_NAME = "param-name";//$NON-NLS-1$
-	String PARAM_VALUE = "param-value";//$NON-NLS-1$
-	String LISTENER_CLASS = "listener-class";//$NON-NLS-1$	// Servlet2.3
-	
-	
-	
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EarDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EarDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 45c82e298..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EarDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an EAR deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface EarDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	String ALT_DD = "alt-dd";//$NON-NLS-1$
-	String APPLICATION = "application";//$NON-NLS-1$
-	String CONTEXT_ROOT = "context-root";//$NON-NLS-1$
-	String EJB = "ejb";//$NON-NLS-1$
-	String JAVA = "java";//$NON-NLS-1$
-	String MODULE = "module";//$NON-NLS-1$
-	String WEB = "web";//$NON-NLS-1$
-	String WEB_URI = "web-uri";//$NON-NLS-1$
-	String CONNECTOR = "connector";//$NON-NLS-1$
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EjbDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EjbDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index b57ecb14c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EjbDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an EJB Jar deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-
-public interface EjbDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	String ABSTRACT_SCHEMA_NAME = "abstract-schema-name"; //$NON-NLS-1$	// EJB2.0
-	String ACKNOWLEDGE_MODE = "acknowledge-mode";//$NON-NLS-1$ 			// EJB2.0
-	String ASSEMBLY_DESCRIPTOR = "assembly-descriptor";//$NON-NLS-1$
-	String BEAN = "Bean";//$NON-NLS-1$
-	String CASCADE_DELETE = "cascade-delete";//$NON-NLS-1$ 				// EJB2.0
-	String CMP_FIELD = "cmp-field";//$NON-NLS-1$
-	String CMP_VERSION = "cmp-version";		//$NON-NLS-1$				// EJB2.0
-	String CMR_FIELD = "cmr-field";		//$NON-NLS-1$					// EJB2.0
-	String CMR_FIELD_NAME = "cmr-field-name";//$NON-NLS-1$				// EJB2.0
-	String CMR_FIELD_TYPE = "cmr-field-type";//$NON-NLS-1$				// EJB2.0
-	String CONTAINER = "Container";//$NON-NLS-1$
-	String CONTAINER_TRANSACTION = "container-transaction";//$NON-NLS-1$
-	String DESTINATION_TYPE = "destination-type";	//$NON-NLS-1$		// EJB2.0
-	String EJB_CLASS = "ejb-class";//$NON-NLS-1$
-	String EJB_CLIENT_JAR = "ejb-client-jar";//$NON-NLS-1$
-	String EJB_JAR = "ejb-jar";//$NON-NLS-1$
-	String EJB_NAME = "ejb-name";//$NON-NLS-1$
-	String EJB_QL = "ejb-ql";		//$NON-NLS-1$						// EJB2.0
-	String EJB_RELATION = "ejb-relation";//$NON-NLS-1$					// EJB2.0
-	String EJB_RELATION_NAME = "ejb-relation-name";	//$NON-NLS-1$		// EJB2.0
-	String EJB_RELATIONSHIP_ROLE = "ejb-relationship-role";//$NON-NLS-1$	// EJB2.0
-	String EJB_RELATIONSHIP_ROLE_NAME = "ejb-relationship-role-name";//$NON-NLS-1$ // EJB2.0
-	String ENTERPRISE_BEANS = "enterprise-beans";//$NON-NLS-1$
-	String ENTITY = "entity";//$NON-NLS-1$
-	String EXCLUDE_LIST = "exclude-list";	//$NON-NLS-1$// EJB2.0 - MODELED???
-	String FIELD_NAME = "field-name";//$NON-NLS-1$
-	String MESSAGE_DRIVEN = "message-driven";	//$NON-NLS-1$			// EJB2.0
-	String MESSAGE_DRIVEN_DESTINATION = "message-driven-destination"; //$NON-NLS-1$// EJB2.0
-	String MESSAGE_SELECTOR = "message-selector";	//$NON-NLS-1$		// EJB2.0
-	String METHOD = "method";//$NON-NLS-1$
-	String METHOD_INTF = "method-intf";//$NON-NLS-1$
-	String METHOD_NAME = "method-name";//$NON-NLS-1$
-	String METHOD_PARAM = "method-param";//$NON-NLS-1$
-	String METHOD_PARAMS = "method-params";//$NON-NLS-1$
-	String METHOD_PERMISSION = "method-permission";//$NON-NLS-1$
-	String MULTIPLICITY = "multiplicity";//$NON-NLS-1$					// EJB2.0
-	String PERSISTENCE_TYPE = "persistence-type";//$NON-NLS-1$
-	String PRIM_KEY_CLASS = "prim-key-class";//$NON-NLS-1$
-	String PRIMKEY_FIELD = "primkey-field";//$NON-NLS-1$
-	String REENTRANT = "reentrant";//$NON-NLS-1$
-	String RELATIONSHIP_ROLE_SOURCE = "relationship-role-source";//$NON-NLS-1$ // EJB2.0
-	String RELATIONSHIPS = "relationships"; 	//$NON-NLS-1$			// EJB2.0
-	String RESULT_TYPE_MAPPING = "result-type-mapping";	//$NON-NLS-1$	// EJB2.0
-	String QUERY = "query";			//$NON-NLS-1$						// EJB2.0
-	String QUERY_METHOD = "query-method";	//$NON-NLS-1$				// EJB2.0
-	String SESSION = "session";//$NON-NLS-1$
-	String SESSION_TYPE = "session-type";//$NON-NLS-1$
-	String SUBSCRIPTION_DURABILITY = "subscription-durability";//$NON-NLS-1$ // EJB2.0
-	String TRANS_ATTRIBUTE = "trans-attribute";//$NON-NLS-1$
-	String TRANSACTION_TYPE = "transaction-type";//$NON-NLS-1$
-	String UNCHECKED = "unchecked";			//$NON-NLS-1$				// EJB2.0
-
-	//EJB 2.1	
-	String SERVICE_ENDPOINT = "service-endpoint";//$NON-NLS-1$
-	String MESSAGING_TYPE = "messaging-type";//$NON-NLS-1$
-	String MESSAGE_DEST_TYPE = "message-destination-type";//$NON-NLS-1$
-	String MESSAGE_DEST_LINK = "message-destination-link";//$NON-NLS-1$
-	String ACTIVATION_CONF = "activation-config";//$NON-NLS-1$
-	String ACTIVATION_CONF_PROPERTY = "activation-config-property";//$NON-NLS-1$
-	String ACTIVATION_CONF_PROPERTY_NAME = "activation-config-property-name";//$NON-NLS-1$
-	String ACTIVATION_CONF_PROPERTY_VALUE = "activation-config-property-value";//$NON-NLS-1$
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java
deleted file mode 100644
index 4cba97aff..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-/**
- * Insert the type's description here.
- * Creation date: (4/11/2001 11:58:50 AM)
- * @author: Administrator
- */
-public class GeneralXmlDocumentReader
-{
-    protected InputSource inputSource;
-    protected EntityResolver entityResolver;
-    protected ErrorHandler errorHandler;
-    protected boolean doValidate = false;
-    protected boolean doAllowJavaEncodings = false;
-
-/**
- * GeneralXmlDocumentReader constructor comment.
- */
-    public GeneralXmlDocumentReader() 
-    {
-        super();
-    }
-/**
- * GeneralXmlDocumentReader constructor comment.
- */
-    public GeneralXmlDocumentReader(InputSource source) 
-    {
-        super();
-        setInputSource(source);
-    }
-/**
- * GeneralXmlDocumentReader constructor comment.
- */
-    public GeneralXmlDocumentReader(InputSource source, EntityResolver resolver, ErrorHandler handler) 
-    {
-        super();
-        setInputSource(source);
-        setEntityResolver(resolver);
-        setErrorHandler(handler);
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.EntityResolver
- */
-    protected org.xml.sax.EntityResolver createDefaultEntityResolver() 
-    {
-        return null;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.ErrorHandler
- */
-    protected org.xml.sax.ErrorHandler createDefaultErrorHandler() 
-    {
-        return new ErrorHandler() {
-        	/* (non-Javadoc)
-			 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-			 */
-			public void error(SAXParseException exception) throws SAXException {
-				throw exception;
-			}
-			/* (non-Javadoc)
-			 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-			 */
-			public void fatalError(SAXParseException exception) throws SAXException {
-				throw exception;
-			}
-			/* (non-Javadoc)
-			 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-			 */
-			public void warning(SAXParseException exception) throws SAXException {
-				Logger.getLogger().logWarning(exception);
-			}
-        };
-    }
-    protected javax.xml.parsers.DocumentBuilder createNewDOMParser() 
-    {
-        try
-        {
-            javax.xml.parsers.DocumentBuilderFactory dbf = javax.xml.parsers.DocumentBuilderFactory.newInstance();
-            setFeatures(dbf);
-            return dbf.newDocumentBuilder();
-
-        }
-        catch (Exception ie)
-        {
-            handleException(J2EEXMLResourceHandler.getString(XMLParseResourceHandler.failed_instantiating_EXC_, (new Object[] {"Failed to instantiate parser"})), ie); //$NON-NLS-1$ // = "Failed instantiating: "
-        }
-        return null;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @return boolean
- */
-    public boolean doAllowJavaEncodings() 
-    {
-        return doAllowJavaEncodings;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @return boolean
- */
-    public boolean doValidate() 
-    {
-        return doValidate;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 1:34:14 PM)
- * @return java.lang.ClassLoader
- */
-    public java.lang.ClassLoader getClassLoader() 
-    {
-        ClassLoader cl = getClass().getClassLoader();
-        if (cl == null)
-            cl = Thread.currentThread().getContextClassLoader();
-        if (cl == null)
-            cl = ClassLoader.getSystemClassLoader();
-
-        return cl;
-    }
-    public Document getDocument() 
-    {
-        return parseDocument();
-    }
-    
-    protected Document getDocument(javax.xml.parsers.DocumentBuilder domParser) 
-    {
-        return domParser.newDocument();
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.EntityResolver
- */
-    public org.xml.sax.EntityResolver getEntityResolver() 
-    {
-        if (entityResolver == null)
-            entityResolver = createDefaultEntityResolver();
-        return entityResolver;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.ErrorHandler
- */
-    public org.xml.sax.ErrorHandler getErrorHandler() 
-    {
-        if (errorHandler == null)
-        {
-            errorHandler = createDefaultErrorHandler();
-        }
-        return errorHandler;
-    }
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.InputSource
- */
-    public org.xml.sax.InputSource getInputSource() 
-    {
-        return inputSource;
-    }
-    
-    protected void handleException(String aMessage, Throwable anException) 
-    {
-        if (anException instanceof InvocationTargetException)
-        {
-            InvocationTargetException invocationEx =
-            (InvocationTargetException) anException;
-            if (invocationEx.getTargetException() != null)
-                handleException(aMessage, invocationEx.getTargetException());
-        }
-        else
-            primHandleException(aMessage, anException);
-    }
-    
-    protected Document parse(javax.xml.parsers.DocumentBuilder domParser, InputSource is) 
-    {
-        try
-        {
-            return domParser.parse(is);
-        }
-        catch (org.xml.sax.SAXException ex)
-        {
-            handleException(J2EEXMLResourceHandler.getString(XMLParseResourceHandler.failed_instantiating_EXC_, (new Object[] {"SAX Parser error"})), ex); //$NON-NLS-1$ // = "Failed instantiating: "
-
-        }
-        catch (java.io.IOException ex)
-        {
-            handleException(J2EEXMLResourceHandler.getString(XMLParseResourceHandler.failed_instantiating_EXC_, (new Object[] {"IO Exception on input stream"})), ex); //$NON-NLS-1$ // = "Failed instantiating: "
-        }
-        return null;
-    }
-
-
-    public Document parseDocument() 
-    {
-    	ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-    	try {
-    		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-			javax.xml.parsers.DocumentBuilder parser = createNewDOMParser();
-        	setEntityResolver(parser);
-        	setErrorHandler(parser);
-        	return parse(parser, getInputSource());
-	} finally {
-      Thread.currentThread().setContextClassLoader(prevClassLoader);
-	}
-    	
-    	
-    	
-    	
-        
-    }
-    
-    protected void primHandleException(String aMessage, Throwable anException) 
-    {
-        org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(anException);
-        throw new RuntimeException(aMessage);
-
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @param newAllowJavaEncodings boolean
- */
-    public void setAllowJavaEncodings(boolean newAllowJavaEncodings) 
-    {
-        doAllowJavaEncodings = newAllowJavaEncodings;
-    }
-    
-    protected void setEntityResolver(javax.xml.parsers.DocumentBuilder domParser) 
-    {
-        if (getEntityResolver() != null)
-        {
-            domParser.setEntityResolver(getEntityResolver());
-        }
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @param newEntityResolver org.xml.sax.EntityResolver
- */
-    public void setEntityResolver(org.xml.sax.EntityResolver newEntityResolver) 
-    {
-        entityResolver = newEntityResolver;
-    }
-    
-
-    protected void setErrorHandler(javax.xml.parsers.DocumentBuilder domParser) 
-    {
-        if (getErrorHandler() != null)
-        {
-            domParser.setErrorHandler(getErrorHandler());
-        }
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @param newErrorHandler org.xml.sax.ErrorHandler
- */
-    public void setErrorHandler(org.xml.sax.ErrorHandler newErrorHandler) 
-    {
-        errorHandler = newErrorHandler;
-    }
-
-    protected void setFeatures(javax.xml.parsers.DocumentBuilderFactory domParser) 
-    {
-        try {
-			domParser.setValidating(doValidate());
-	        domParser.setAttribute("http://apache.org/xml/features/allow-java-encodings", new Boolean(doAllowJavaEncodings())); //$NON-NLS-1$
-	        domParser.setExpandEntityReferences(true);
-		} catch(IllegalArgumentException e) {
-			//Ignore
-		}
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @param newInputSource org.xml.sax.InputSource
- */
-    public void setInputSource(org.xml.sax.InputSource newInputSource) 
-    {
-        inputSource = newInputSource;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @param newValidate boolean
- */
-    public void setValidate(boolean newValidate) 
-    {
-        doValidate = newValidate;
-    }
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXMLResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXMLResourceHandler.java
deleted file mode 100644
index 92f8095fd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXMLResourceHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-import org.eclipse.osgi.util.NLS;
-
-public class J2EEXMLResourceHandler extends NLS {
-	private static final String BUNDLE_NAME = "j2eexml";//$NON-NLS-1$
-
-	private J2EEXMLResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String Valid_values_are___EXC_;
-	public static String RAR_file_support__IO_excep_EXC_;
-	public static String Failure_occurred_reading_x_EXC_;
-	public static String missing_req_field_EXC_;
-	public static String An_IO_Exception_occurred_w_EXC_;
-	public static String must_be_boolean_EXC_;
-	public static String unsupported_encoding_EXC_;
-	public static String rar_dtd_not_found_EXC_;
-	public static String empty_collection_EXC_;
-	public static String must_be_int_EXC_;
-	public static String Invalid_value_for__EXC_;
-	public static String An_Exception_occurred_whil_EXC_;
-	public static String dtd_not_found_EXC_;
-	public static String Not_supported_in_this_rele_EXC_;
-	public static String io_ex_saving_EXC_;
-	public static String could_not_create_file_EXC_;
-	public static String unsupported_type_EXC_;
-	public static String Key1;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, J2EEXMLResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXmlDtDEntityResolver.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXmlDtDEntityResolver.java
deleted file mode 100644
index ec6b64d93..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXmlDtDEntityResolver.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-public class J2EEXmlDtDEntityResolver implements org.xml.sax.EntityResolver {
-
-	/** All the dtds that this resolver knows about; import strategies register these
-	 * at startup */ 
-	protected static Map supportedDtDs;
-	static {
-		registerDtD("http://www.w3.org/2001/xml.xsd", "xml.xsd");  //$NON-NLS-1$ //$NON-NLS-2$
-		registerDtD("XMLSchema.dtd", "XMLSchema.dtd"); //$NON-NLS-1$ //$NON-NLS-2$
-		registerDtD("datatypes.dtd", "datatypes.dtd"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	public static J2EEXmlDtDEntityResolver INSTANCE = new J2EEXmlDtDEntityResolver();
-/**
- * EjbXmlEntityResolver constructor comment.
- */
-public J2EEXmlDtDEntityResolver() {
-	super();
-}
-public static Map getSupportedDtDs() {
-	if (supportedDtDs == null)
-		supportedDtDs = new HashMap();
-	return supportedDtDs;
-}
-/**
- * Maps the system id for the dtd to a local id to be retrieved loaded from the class path
- */
-public static void registerDtD(String systemID, String localID) { 
-    //Make sure local file exists on classpath first.
-	
-	ClassLoader loader = J2EEXmlDtDEntityResolver.class.getClassLoader();
-	URL url = null;
-	if (loader == null) {	    
-		url = ClassLoader.getSystemResource(localID);
-	} else {	    
-		url = loader.getResource(localID);
-	}
-	if (url == null) {
-		return;
-	}
-	getSupportedDtDs().put(systemID, localID);
-	getSupportedDtDs().put(getShortName(systemID), localID);
-}
-/**
- * for a system id with a URL that begins with "http://java.sun.com/", check to see if that is a recognized dtd;
- * if so, load the dtd from the class path using the value of the registered dtd.
- *
- * @return an Input source on a locally resolved dtd, or null of the systemid does not start with "http://java.sun.com/"
- * 
- * @throws SAXException with a nested NotSupportedException if the dtd is not recognized
- * @throws FileNotFoundException if the resolved dtd cannot be loaded from the classpath
- */
-public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) throws java.io.IOException, org.xml.sax.SAXException {
-	String localResourceName = null;
-	//boolean isJavaSytemId = false;
-	if (shouldBeRegistered(systemId)) {
-		localResourceName = (String)getSupportedDtDs().get(systemId);
-		//isJavaSytemId = true;	
-	} else {
-		String shortName = getShortName(systemId);
-		localResourceName = (String)getSupportedDtDs().get(shortName);
-		if (localResourceName != null)
-			systemId = localResourceName;
-	}
-		
-	if (localResourceName == null) {
-		return null;
-	} 
-	ClassLoader loader = getClass().getClassLoader();
-	URL url = null;
-	if (loader == null) {	    
-		url = ClassLoader.getSystemResource(localResourceName);
-	} else {	    
-		url = loader.getResource(localResourceName);
-	}
-	
-	
-	if (url == null) {
-		String message = J2EEXMLResourceHandler.getString(J2EEXMLResourceHandler.dtd_not_found_EXC_, (new Object[] {localResourceName}));// = "Could not parse xml because the resolved resource "{0}" could not be found in classpath"
-		throw new java.io.FileNotFoundException(message);
-	}
-	
-	InputSource result = new InputSource(url.toString());
-	result.setPublicId(publicId);	
-	// force the encoding to be UTF8
-	result.setEncoding("UTF-8"); //$NON-NLS-1$
-	
-	return result;
-}
-protected boolean shouldBeRegistered(String systemId) {
-	
-	return systemId.startsWith(J2EEConstants.JAVA_SUN_COM_URL) 
-		|| systemId.startsWith(J2EEConstants.WWW_W3_ORG_URL)
-		|| systemId.startsWith(J2EEConstants.WWW_IBM_COM_URL);
-}
-
-/**
- * Returns the filename from the uri, or the segment after the last occurrence of a separator
- */
-private static String getShortName(String uri) {
-	String tempURI = uri.replace('\\', '/');
-	while (tempURI.endsWith("/")) //$NON-NLS-1$
-		tempURI = tempURI.substring(0, tempURI.length()-1);
-	int lastIndex = tempURI.lastIndexOf('/');
-	if (lastIndex == -1)
-		return uri;
-	return uri.substring(lastIndex+1, tempURI.length());
-}
-}
-
-
-
- 
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/MissingRequiredDataException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/MissingRequiredDataException.java
deleted file mode 100644
index 4d1f229a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/MissingRequiredDataException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-public class MissingRequiredDataException extends RuntimeException {
-
-private static final long serialVersionUID = -301039854542561304L;
-/**
- * MissingRequiredDataException constructor comment.
- */
-public MissingRequiredDataException() {
-	super();
-}
-/**
- * MissingRequiredDataException constructor comment.
- * @param s java.lang.String
- */
-public MissingRequiredDataException(String s) {
-	super(s);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/NotSupportedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/NotSupportedException.java
deleted file mode 100644
index dbb5d1a2f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/NotSupportedException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-import org.eclipse.jst.j2ee.internal.WrappedRuntimeException;
-
-
-
-
-public class NotSupportedException extends WrappedRuntimeException {
-private static final long serialVersionUID = -3535594720987598196L;
-/**
- * NotSupportedException constructor comment.
- */
-public NotSupportedException() {
-	super();
-}
-/**
- * NotSupportedException constructor comment.
- * @param e java.lang.Exception
- */
-public NotSupportedException(Exception e) {
-	super(e);
-}
-/**
- * NotSupportedException constructor comment.
- * @param s java.lang.String
- */
-public NotSupportedException(String s) {
-	super(s);
-}
-/**
- * NotSupportedException constructor comment.
- * @param s java.lang.String
- * @param e java.lang.Exception
- */
-public NotSupportedException(String s, Exception e) {
-	super(s, e);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/RarDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/RarDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 78993cebb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/RarDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an RAR deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface RarDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	public String AUTH_MECHANISM = "authentication-mechanism";//$NON-NLS-1$
-	public String AUTH_MECH_TYPE = "authentication-mechanism-type";//$NON-NLS-1$
-	public String CONFIG_PROPERTY = "config-property";//$NON-NLS-1$
-	public String CONFIG_PROPERTY_NAME = "config-property-name";//$NON-NLS-1$
-	public String CONFIG_PROPERTY_VALUE = "config-property-value";//$NON-NLS-1$
-	public String CONFIG_PROPERTY_TYPE = "config-property-type";//$NON-NLS-1$
-	public String CONNECTOR = "connector";//$NON-NLS-1$
-	public String CONNECTIONFACTORY_INTERFACE = "connectionfactory-interface";//$NON-NLS-1$
-	public String CONNECTIONFACTORY_IMPL_CLASS = "connectionfactory-impl-class";//$NON-NLS-1$
-	public String CONNECTION_INTERFACE = "connection-interface";//$NON-NLS-1$
-	public String CONNECTION_IMPL_CLASS = "connection-impl-class";//$NON-NLS-1$
-	public String CREDENTIAL_INTERFACE = "credential-interface";//$NON-NLS-1$
-	public String EIS_TYPE = "eis-type";//$NON-NLS-1$
-	public String LICENSE = "license";//$NON-NLS-1$
-	public String LICENSE_REQUIRED = "license-required";//$NON-NLS-1$
-	public String MANAGEDCONNECTIONFACTORY_CLASS = "managedconnectionfactory-class";//$NON-NLS-1$
-	public String REAUTHENTICATION_SUPPORT = "reauthentication-support";//$NON-NLS-1$
-	public String RESOURCEADAPTER = "resourceadapter";//$NON-NLS-1$
-	public String SECURITY_PERMISSION = "security-permission";//$NON-NLS-1$
-	public String SECURITY_PERMISSION_SPEC = "security-permission-spec";//$NON-NLS-1$
-	public String SPEC_VERSION = "spec-version";//$NON-NLS-1$
-	public String TRANSACTION_SUPPORT = "transaction-support";//$NON-NLS-1$
-	public String VENDOR_NAME = "vendor-name";//$NON-NLS-1$
-	//JCA 1.5
-	public String RESOURCEADAPTER_VERSION = "resourceadapter-version";//$NON-NLS-1$
-	public String RESOURCEADAPTER_CLASS = "resourceadapter-class";//$NON-NLS-1$
-	public String OUTBOUND_RESOURCEADAPTER = "outbound-resourceadapter";//$NON-NLS-1$
-	public String INBOUND_RESOURCEADAPTER = "inbound-resourceadapter";//$NON-NLS-1$
-	
-	public String CONNECTION_DEFINITION = "connection-definition";//$NON-NLS-1$
-	public String MESSAGEADAPTER = "messageadapter";//$NON-NLS-1$
-	public String MESSAGELISTENER = "messagelistener";//$NON-NLS-1$
-	public String MESSAGELISTENER_TYPE = "messagelistener-type";//$NON-NLS-1$
-	public String ACTIVATIONSPEC = "activationspec";//$NON-NLS-1$
-	public String ACTIVATIONSPEC_CLASS = "activationspec-class";//$NON-NLS-1$
-	public String REQUIRED_CONFIG_PROPERTY = "required-config-property";//$NON-NLS-1$
-	
-	public String ADMINOBJECT = "adminobject";//$NON-NLS-1$
-	public String ADMINOBJECT_CLASS = "adminobject-class";//$NON-NLS-1$
-	public String ADMINOBJECT_INTERFACE = "adminobject-interface"; //$NON-NLS-1$
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WarDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WarDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index acf0eaee3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WarDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an WAR deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface WarDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	public String AUTH_CONSTRAINT = "auth-constraint";//$NON-NLS-1$
-	public String AUTH_METHOD = "auth-method";//$NON-NLS-1$
-	public String CONTEXT_PARAM = "context-param";//$NON-NLS-1$
-	public String DISTRIBUTABLE = "distributable";//$NON-NLS-1$
-	public String ERROR_CODE = "error-code";//$NON-NLS-1$
-	public String ERROR_PAGE = "error-page";//$NON-NLS-1$
-	public String EXCEPTION_TYPE = "exception-type";//$NON-NLS-1$
-	public String EXTENSION = "extension";//$NON-NLS-1$
-	public String FILTER = "filter";			//$NON-NLS-1$		// Servlet2.3
-	public String FILTER_MAPPING = "filter-mapping";//$NON-NLS-1$	// Servlet2.3
-	public String FILTER_NAME = "filter-name";		//$NON-NLS-1$	// Servlet2.3
-	public String FILTER_CLASS = "filter-class";//$NON-NLS-1$		// Servlet2.3
-	public String FORM_ERROR_PAGE = "form-error-page";//$NON-NLS-1$
-	public String FORM_LOGIN_CONFIG = "form-login-config";//$NON-NLS-1$
-	public String FORM_LOGIN_PAGE = "form-login-page";//$NON-NLS-1$
-	public String HTTP_METHOD = "http-method";//$NON-NLS-1$
-	public String INIT_PARAM = "init-param";//$NON-NLS-1$
-	public String JSP_FILE = "jsp-file";//$NON-NLS-1$
-	public String LISTENER = "listener";	//$NON-NLS-1$			// Servlet2.3
-	public String LOAD_ON_STARTUP = "load-on-startup";//$NON-NLS-1$
-	public String LOCATION = "location";//$NON-NLS-1$
-	public String LOGIN_CONFIG = "login-config";//$NON-NLS-1$
-	public String MIME_MAPPING = "mime-mapping";//$NON-NLS-1$
-	public String MIME_TYPE = "mime-type";//$NON-NLS-1$
-	public String REALM_NAME = "realm-name";//$NON-NLS-1$
-	public String SECURITY_CONSTRAINT = "security-constraint";//$NON-NLS-1$
-	public String SERVLET = "servlet";//$NON-NLS-1$
-	public String SERVLET_CLASS = "servlet-class";//$NON-NLS-1$
-	public String SERVLET_MAPPING = "servlet-mapping";//$NON-NLS-1$
-	public String SERVLET_NAME = "servlet-name";//$NON-NLS-1$
-	public String SESSION_CONFIG = "session-config";//$NON-NLS-1$
-	public String SESSION_TIMEOUT = "session-timeout";//$NON-NLS-1$
-	public String TAGLIB = "taglib";//$NON-NLS-1$
-	public String TAGLIB_LOCATION = "taglib-location";//$NON-NLS-1$
-	public String TAGLIB_URI = "taglib-uri";//$NON-NLS-1$
-	public String TRANSPORT_GUARANTEE = "transport-guarantee";//$NON-NLS-1$
-	public String URL_PATTERN = "url-pattern";//$NON-NLS-1$
-	public String USER_DATA_CONSTRAINT = "user-data-constraint";//$NON-NLS-1$
-	public String WEB_APP = "web-app";//$NON-NLS-1$
-	public String WEB_RESOURCE_COLLECTION = "web-resource-collection";//$NON-NLS-1$
-	public String WEB_RESOURCE_NAME = "web-resource-name";//$NON-NLS-1$
-	public String WELCOME_FILE = "welcome-file";//$NON-NLS-1$
-	public String WELCOME_FILE_LIST = "welcome-file-list";//$NON-NLS-1$
-	
-	public String DISPATCHER = "dispatcher";//$NON-NLS-1$
-	public String LOCALE_ENCODING_MAPPING_LIST = "locale-encoding-mapping-list";//$NON-NLS-1$
-	public String LOCALE_ENCODING_MAPPING = "locale-encoding-mapping";//$NON-NLS-1$
-	public String LOCALE = "locale";//$NON-NLS-1$
-	public String ENCODING = "encoding";//$NON-NLS-1$
-	public String JSP_CONFIG = "jsp-config";//$NON-NLS-1$
-	public String JSP_PROPERTY_GROUP = "jsp-property-group";//$NON-NLS-1$
-	public String EL_IGNORED = "el-ignored";//$NON-NLS-1$
-	public String PAGE_ENCODING = "page-encoding";//$NON-NLS-1$
-	public String SCRIPTING_INVALID = "scripting-invalid";//$NON-NLS-1$
-	public String IS_XML = "is-xml";//$NON-NLS-1$
-	public String INCLUDE_PRELUDE = "include-prelude";//$NON-NLS-1$
-	public String INCLUDE_CODA = "include-coda";//$NON-NLS-1$
-	
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WebServicesDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WebServicesDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 49868b6a9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WebServicesDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 5, 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.xml;
-
-/**
- * @author dfholttp
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface WebServicesDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI{
-	//1.3 specific WebServices DD
-	public String COMP_SCOPED_REFS = "component-scoped-refs";//$NON-NLS-1$
-	public String COMP_COMPONENT_NAME = "component-name";//$NON-NLS-1$
-	public String WEB_SERVICES_CLIENT = "webservicesclient";//$NON-NLS-1$
-	public String LOCALPART = "localpart";//$NON-NLS-1$
-	public String NAMESPACEURI = "namespaceURI";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XMLParseResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XMLParseResourceHandler.java
deleted file mode 100644
index e7ef7b772..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XMLParseResourceHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class XMLParseResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "xmlparse";//$NON-NLS-1$
-
-	private XMLParseResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String method_invoke_failed_EXC_;
-	public static String failed_to_load_EXC_;
-	public static String method_not_found_EXC_;
-	public static String failed_instantiating_EXC_;
-	public static String parse_exception_occured_EXC_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, XMLParseResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XmlDocumentReader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XmlDocumentReader.java
deleted file mode 100644
index 9a75760da..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XmlDocumentReader.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-import java.io.InputStream;
-
-import org.eclipse.jst.j2ee.internal.WrappedRuntimeException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
-
-/**
- * Insert the type's description here.
- * Creation date: (02/21/01 4:34:13 PM)
- * @author: Administrator
- */
-public class XmlDocumentReader extends GeneralXmlDocumentReader {
-/**
- * XmlDocumentReader constructor comment.
- */
-public XmlDocumentReader(InputSource source) {
-	super(source);
-	setFlagDefaults();
-}
-/**
- * XmlDocumentReader constructor comment.
- */
-public XmlDocumentReader(InputSource source, EntityResolver resolver, ErrorHandler handler) {
-	super(source, resolver, handler);
-	setFlagDefaults();
-}
-/**
- * Insert the method's description here.
- * Creation date: (03/19/01 10:13:26 AM)
- * @return org.xml.sax.EntityResolver
- */
-public org.xml.sax.EntityResolver createDefaultEntityResolver() {
-	return J2EEXmlDtDEntityResolver.INSTANCE;
-}
-
-protected void handleException(String aMessage, Throwable anException) {
-	if (anException instanceof SAXParseException) 
-		handleException(aMessage, (SAXParseException) anException);
-	else
-		super.handleException(aMessage, anException);
-}
-protected void handleException(String aMessage, SAXParseException parseException) {
-	primHandleException(J2EEXMLResourceHandler.getString(XMLParseResourceHandler.parse_exception_occured_EXC_, (new Object[] {new Integer(parseException.getLineNumber()), new Integer(parseException.getColumnNumber()) })), parseException);  
-	//$NON-NLS-1$ = "An Exception occurred while parsing xml: {0} Line #: {1} :Column #: "
-}
-protected void primHandleException(String aMessage, Throwable anException) {
-	if (anException instanceof Exception)
-		throw new WrappedRuntimeException(aMessage, (Exception)anException);
-	super.primHandleException(aMessage, anException);
-}
-protected void setFlagDefaults() {
-	setAllowJavaEncodings(true);
-	setValidate(true);
-}
-   public static DocumentType readDocumentType(InputStream in, String uri) {
-    	InputSource source = new InputSource(in);
-    	GeneralXmlDocumentReader aReader =  new XmlDocumentReader(source);
-    	aReader.setValidate(false);
-    	Document aDocument = aReader.parseDocument();
-    	if (aDocument != null)
-    		return aDocument.getDoctype();
-    	return null;
-    }
-    	
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ActivationSpec.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ActivationSpec.java
deleted file mode 100644
index dd204914f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ActivationSpec.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Spec</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The activationspecType specifies an activation
- * specification.  The information includes fully qualified
- * Java class name of an activation specification and a set of
- * required configuration property names.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ActivationSpec#getActivationSpecClass <em>Activation Spec Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ActivationSpec#getRequiredConfigProperties <em>Required Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getActivationSpec()
- * @model
- * @generated
- */
-public interface ActivationSpec extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Activation Spec Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Spec Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element activationspec-class specifies the fully
-	 *         qualified Java class name of the activation
-	 *         specification class. This class must implement the
-	 *         javax.resource.spi.ActivationSpec interface. The
-	 *         implementation of this class is required to be a
-	 *         JavaBean.
-	 * 
-	 *         Example:
-	 *             <activationspec-class>com.wombat.ActivationSpecImpl
-	 *             </activationspec-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activation Spec Class</em>' attribute.
-	 * @see #setActivationSpecClass(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getActivationSpec_ActivationSpecClass()
-	 * @model
-	 * @generated
-	 */
-	String getActivationSpecClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ActivationSpec#getActivationSpecClass <em>Activation Spec Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Spec Class</em>' attribute.
-	 * @see #getActivationSpecClass()
-	 * @generated
-	 */
-	void setActivationSpecClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Required Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Required Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Required Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getActivationSpec_RequiredConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType" containment="true"
-	 * @generated
-	 */
-	EList getRequiredConfigProperties();
-
-} // ActivationSpec
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AdminObject.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AdminObject.java
deleted file mode 100644
index 17db5072e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AdminObject.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Admin Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The adminobjectType specifies information about an
- * administered object.  Administered objects are specific to a
- * messaging style or message provider.  This contains
- * information on the Java type of the interface implemented by
- * an administered object, its Java class name and its
- * configuration properties.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectInterface <em>Admin Object Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectClass <em>Admin Object Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.AdminObject#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getAdminObject()
- * @model
- * @generated
- */
-public interface AdminObject extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Admin Object Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Admin Object Interface</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element adminobject-interface specifies the
-	 *         fully qualified name of the Java type of the
-	 *         interface implemented by an administered object.
-	 * 
-	 *         Example:
-	 *           <adminobject-interface>javax.jms.Destination
-	 *           </adminobject-interface>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Object Interface</em>' attribute.
-	 * @see #setAdminObjectInterface(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getAdminObject_AdminObjectInterface()
-	 * @model
-	 * @generated
-	 */
-	String getAdminObjectInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectInterface <em>Admin Object Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Admin Object Interface</em>' attribute.
-	 * @see #getAdminObjectInterface()
-	 * @generated
-	 */
-	void setAdminObjectInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Admin Object Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Admin Object Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element adminobject-class specifies the fully
-	 *         qualified Java class name of an administered object.
-	 * 
-	 *         Example:
-	 *             <adminobject-class>com.wombat.DestinationImpl
-	 *             </adminobject-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Object Class</em>' attribute.
-	 * @see #setAdminObjectClass(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getAdminObject_AdminObjectClass()
-	 * @model
-	 * @generated
-	 */
-	String getAdminObjectClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectClass <em>Admin Object Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Admin Object Class</em>' attribute.
-	 * @see #getAdminObjectClass()
-	 * @generated
-	 */
-	void setAdminObjectClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.ConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getAdminObject_ConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.jca.ConfigProperty" containment="true"
-	 * @generated
-	 */
-	EList getConfigProperties();
-
-} // AdminObject
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanism.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanism.java
deleted file mode 100644
index df2c033e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanism.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.
- * 
- * Note that BasicPassword mechanism type should support the
- * javax.resource.spi.security.PasswordCredential interface.
- * The Kerbv5 mechanism type should support the
- * javax.resource.spi.security.GenericCredential interface.
- * @generated
- * @since 1.0 */
-public interface AuthenticationMechanism extends J2EEEObject {
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Authentication Mechanism</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Authentication Mechanism</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authentication Mechanism</em>' attribute.
-	 * @see #setAuthenticationMechanism(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getAuthenticationMechanism_AuthenticationMechanism()
-	 * @model
-	 * @generated
-	 */
-	String getAuthenticationMechanism();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getAuthenticationMechanism <em>Authentication Mechanism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authentication Mechanism</em>' attribute.
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 */
-	void setAuthenticationMechanism(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AuthenticationMechanismType attribute
-	 * The authentication-mechanism-type specifies type of an authentication mechanism.
-	 * 
-	 * The example values are:
-	 *   - BasicPassword
-	 *   - Kerbv5
-	 * 
-	 * Any additional security mechanisms are outside the scope of the
-	 * Connector architecture specification.
-
-	 */
-	AuthenticationMechanismType getAuthenticationMechanismType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getAuthenticationMechanismType <em>Authentication Mechanism Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authentication Mechanism Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.jca.AuthenticationMechanismType
-	 * @see #isSetAuthenticationMechanismType()
-	 * @see #unsetAuthenticationMechanismType()
-	 * @see #getAuthenticationMechanismType()
-	 * @generated
-	 */
-	void setAuthenticationMechanismType(AuthenticationMechanismType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getAuthenticationMechanismType <em>Authentication Mechanism Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAuthenticationMechanismType()
-	 * @see #getAuthenticationMechanismType()
-	 * @see #setAuthenticationMechanismType(AuthenticationMechanismType)
-	 * @generated
-	 */
-	void unsetAuthenticationMechanismType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getAuthenticationMechanismType <em>Authentication Mechanism Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Authentication Mechanism Type</em>' attribute is set.
-	 * @see #unsetAuthenticationMechanismType()
-	 * @see #getAuthenticationMechanismType()
-	 * @see #setAuthenticationMechanismType(AuthenticationMechanismType)
-	 * @generated
-	 */
-	boolean isSetAuthenticationMechanismType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the CredentialInterface attribute
-	 * Specifies the interface that the resource adapter implementation supports for
-	 * the representation of the credentials. This element should be used by
-	 * application server to find out the Credential interface it should use as part
-	 * of the security contract.
-	 * 
-	 * The possible values are:
-	 *    javax.resource.spi.security.PasswordCredential
-	 *    javax.resource.spi.security.GenericCredential
-
-	 */
-	String getCredentialInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CredentialInterface attribute
-	 */
-	void setCredentialInterface(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the CustomAuthMechType attribute
-	 * This is an internal variable used to store the AthenticationMechanismType when
-	 * it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType 
-	 * is set to 'Custom' in those cases.  This attribute should not be used by
-	 * runtime.  It is only used by the writer to write back out the custom
-	 * AuthenticationMechanismType string in the case of custom
-	 * AuthenticationMechanismType's.  
-	 * This variable is internal, used only by the reader//writer classes, and can
-	 * change or disappear without notice.  
-	 */
-	String getCustomAuthMechType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CustomAuthMechType attribute
-	 */
-	void setCustomAuthMechType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getAuthenticationMechanism_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanismType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanismType.java
deleted file mode 100644
index 6bc546b5f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanismType.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface AuthenticationMechanismType {}
- * @since 1.0
- */
-public final class AuthenticationMechanismType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BASIC_PASSWORD= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int KERBV5= 1;
-
-	/**
-	 * The '<em><b>Basic Password</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Basic Password</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BASIC_PASSWORD
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthenticationMechanismType BASIC_PASSWORD_LITERAL = new AuthenticationMechanismType(BASIC_PASSWORD, "BasicPassword", "BasicPassword");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Kerbv5</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Kerbv5</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #KERBV5
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthenticationMechanismType KERBV5_LITERAL = new AuthenticationMechanismType(KERBV5, "Kerbv5", "Kerbv5");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Authentication Mechanism Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AuthenticationMechanismType[] VALUES_ARRAY =
-		new AuthenticationMechanismType[] {
-			BASIC_PASSWORD_LITERAL,
-			KERBV5_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Authentication Mechanism Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Authentication Mechanism Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthenticationMechanismType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AuthenticationMechanismType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Authentication Mechanism Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthenticationMechanismType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AuthenticationMechanismType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Authentication Mechanism Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthenticationMechanismType get(int value) {
-		switch (value) {
-			case BASIC_PASSWORD: return BASIC_PASSWORD_LITERAL;
-			case KERBV5: return KERBV5_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AuthenticationMechanismType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //AuthenticationMechanismType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConfigProperty.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConfigProperty.java
deleted file mode 100644
index c117efee1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConfigProperty.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The config property contains a declaration of a single
- * configuration property for a ManagedConnectionFactory instance.
- * 
- * Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).
- * 
- * The declaration consists of an optional description, name, type
- * and an optional value of the configuration property. If the resource
- * adapter provider does not specify a value than the deployer is
- * responsible for providing a valid value for a configuration property.
- * 
- * Any bounds or well-defined values of properties should be described in the description.
- * @generated
- * @since 1.0 */
-public interface ConfigProperty extends J2EEEObject {
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * Contains the name of a configuration property.
-	 * 
-	 * The connector architecture defines a set of well-defined properties all of type 
-	 * java.lang.String. These are as follows:
-	 * 
-	 *      ServerName
-	 *      PortNumber
-	 *      UserName
-	 *      Password
-	 *      ConnectionURL
-	 * 
-	 * A resource adapter provider can extend this property set to include properties
-	 * specific to the resource adapter and its underlying EIS.
-
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * Contains the fully qualified Java type of a configuration property as required
-	 * by ManagedConnection-Factory instance.
-	 * 
-	 * The following are the legal values of config-property-type:
-	 *    java.lang.Boolean, java.lang.String, java.lang.Integer,
-	 *    java.lang.Double, java.lang.Byte, java.lang.Short,
-	 *    java.lang.Long, java.lang.Float, java.lang.Character
-	 */
-	String getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Type attribute
-	 */
-	void setType(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Value attribute
-	 * Contains the value of a configuration entry.
-	 */
-	String getValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Value attribute
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConfigProperty_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectionDefinition.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectionDefinition.java
deleted file mode 100644
index c7cd5480d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectionDefinition.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connection Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The connection-definitionType defines a set of connection
- * interfaces and classes pertaining to a particular connection
- * type. This also includes configurable properties for
- * ManagedConnectionFactory instances that may be produced out
- * of this set.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryInterface <em>Connection Factory Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionInterface <em>Connection Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionImplClass <em>Connection Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition()
- * @model
- * @generated
- */
-public interface ConnectionDefinition extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Managed Connection Factory Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Managed Connection Factory Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element managedconnectionfactory-class specifies
-	 *         the fully qualified name of the Java class that
-	 *         implements the
-	 *         javax.resource.spi.ManagedConnectionFactory interface.
-	 *         This Java class is provided as part of resource
-	 *         adapter's implementation of connector architecture
-	 *         specified contracts. The implementation of this
-	 *         class is required to be a JavaBean.
-	 * 
-	 *         Example:
-	 *         <managedconnectionfactory-class>
-	 *             com.wombat.ManagedConnectionFactoryImpl
-	 *         </managedconnectionfactory-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Managed Connection Factory Class</em>' attribute.
-	 * @see #setManagedConnectionFactoryClass(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition_ManagedConnectionFactoryClass()
-	 * @model
-	 * @generated
-	 */
-	String getManagedConnectionFactoryClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Managed Connection Factory Class</em>' attribute.
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 */
-	void setManagedConnectionFactoryClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Factory Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Factory Interface</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element connectionfactory-interface specifies
-	 *         the fully qualified name of the ConnectionFactory
-	 *         interface supported by the resource adapter.
-	 * 
-	 *         Example:
-	 *         <connectionfactory-interface>com.wombat.ConnectionFactory
-	 *         </connectionfactory-interface>
-	 * 
-	 *         OR
-	 * 
-	 *         <connectionfactory-interface>javax.resource.cci.ConnectionFactory
-	 *         </connectionfactory-interface>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Factory Interface</em>' attribute.
-	 * @see #setConnectionFactoryInterface(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition_ConnectionFactoryInterface()
-	 * @model
-	 * @generated
-	 */
-	String getConnectionFactoryInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryInterface <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Factory Interface</em>' attribute.
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 */
-	void setConnectionFactoryInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Factory Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Factory Impl Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element connectionfactory-impl-class specifies
-	 *         the fully qualified name of the ConnectionFactory
-	 *         class that implements resource adapter
-	 *         specific ConnectionFactory interface.
-	 * 
-	 *         Example:
-	 * 
-	 *         <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
-	 *         </connectionfactory-impl-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Factory Impl Class</em>' attribute.
-	 * @see #setConnectionFactoryImplClass(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition_ConnectionFactoryImplClass()
-	 * @model
-	 * @generated
-	 */
-	String getConnectionFactoryImplClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Factory Impl Class</em>' attribute.
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 */
-	void setConnectionFactoryImplClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Interface</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The connection-interface element specifies the fully
-	 *         qualified name of the Connection interface supported
-	 *         by the resource adapter.
-	 * 
-	 *         Example:
-	 * 
-	 *             <connection-interface>javax.resource.cci.Connection
-	 *             </connection-interface>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Interface</em>' attribute.
-	 * @see #setConnectionInterface(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition_ConnectionInterface()
-	 * @model
-	 * @generated
-	 */
-	String getConnectionInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionInterface <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Interface</em>' attribute.
-	 * @see #getConnectionInterface()
-	 * @generated
-	 */
-	void setConnectionInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Impl Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The connection-impl-classType specifies the fully
-	 *         qualified name of the Connection class that
-	 *         implements resource adapter specific Connection
-	 *         interface.  It is used by the connection-impl-class
-	 *         elements.
-	 * 
-	 *         Example:
-	 * 
-	 *             <connection-impl-class>com.wombat.ConnectionImpl
-	 *             </connection-impl-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Impl Class</em>' attribute.
-	 * @see #setConnectionImplClass(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition_ConnectionImplClass()
-	 * @model
-	 * @generated
-	 */
-	String getConnectionImplClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionImplClass <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Impl Class</em>' attribute.
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 */
-	void setConnectionImplClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.ConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getConnectionDefinition_ConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.jca.ConfigProperty" containment="true"
-	 * @generated
-	 */
-	EList getConfigProperties();
-
-} // ConnectionDefinition
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/Connector.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/Connector.java
deleted file mode 100644
index 7da362ce9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/Connector.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-/**
- * The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.
-
- * @since 1.0 */
-public interface Connector extends CompatibilityDescriptionGroup{
-
-
-	/**
-	* This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	* @throws IllegalStateException if calling this function fails
-	* @return the version of the J2C module 
-	*/
-	public int getVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the VendorName attribute
-	 * Specifies the name of resource adapter provider vendor.
-	 * Example: Wombat Corp.
-	 */
-	String getVendorName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the VendorName attribute
-	 */
-	void setVendorName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SpecVersion attribute
-	 * Specifies the version of the connector architecture specification that is
-	 * supported by this resource adapter. This information enables deployer to
-	 * configure the resource adapter to support deployment and runtime requirements
-	 * of the corresponding connector architecture specification.
-
-	 */
-	String getSpecVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SpecVersion attribute
-	 */
-	void setSpecVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the EisType attribute
-	 * Contains information about the type of the EIS. For example, the type of an EIS 
-	 * can be product name of EIS independent of any version info.
-	 * 
-	 * This helps in identifying EIS instances that can be used with
-	 * this resource adapter.
-
-	 */
-	String getEisType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EisType attribute
-	 */
-	void setEisType(String value);
-
-	/**
-	 * These values are used in the deployment descriptor, use getVersionID() to determine module versions
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Version attribute
-	 * Specifies a string-based version of the resource adapter from the resource
-	 * adapter provider.
-	 * 
-	 * Example: 1.0
-	 */
-	String getVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Version attribute
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The License reference
-	 * Specifies licensing requirements for the resource adapter module. This element
-	 * specifies whether a license is required to deploy and use this resource
-	 * adapter, and an optional description of the licensing terms (examples: duration 
-	 * of license, number of
-	 * connection restrictions).
-	 */
-	License getLicense();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the License reference
-	 */
-	void setLicense(License value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ResourceAdapter reference
-	 */
-	ResourceAdapter getResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ResourceAdapter reference
-	 */
-	void setResourceAdapter(ResourceAdapter value);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectorResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectorResource.java
deleted file mode 100644
index 510e5691c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectorResource.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * 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.jca;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- *@since 1.0
- */
-public interface ConnectorResource extends XMLResource {
-	
-	/**
-	 * Returns the deployment descriptor model
-	 * @return Connector
-	 */
-	public Connector getConnector() ;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/InboundResourceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/InboundResourceAdapter.java
deleted file mode 100644
index 6699f77cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/InboundResourceAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Inbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The inbound-resourceadapterType specifies information
- * about an inbound resource adapter. This contains information
- * specific to the implementation of the resource adapter
- * library as specified through the messageadapter element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.InboundResourceAdapter#getMessageAdapter <em>Message Adapter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getInboundResourceAdapter()
- * @model
- * @generated
- */
-public interface InboundResourceAdapter extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Message Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Adapter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The messagelistener-type element content must be
-	 *         unique in the messageadapter. Several messagelisteners
-	 *         can not use the same messagelistener-type.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Adapter</em>' containment reference.
-	 * @see #setMessageAdapter(MessageAdapter)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getInboundResourceAdapter_MessageAdapter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MessageAdapter getMessageAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.InboundResourceAdapter#getMessageAdapter <em>Message Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Adapter</em>' containment reference.
-	 * @see #getMessageAdapter()
-	 * @generated
-	 */
-	void setMessageAdapter(MessageAdapter value);
-
-} // InboundResourceAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java
deleted file mode 100644
index efc973e63..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * @generated
- * @since 1.0 */
-public interface JcaFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JcaFactory eINSTANCE = org.eclipse.jst.j2ee.jca.internal.impl.JcaFactoryImpl.init();
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Connector value
-	 */
-	Connector createConnector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return License value
-	 */
-	License createLicense();
-
-	/**
-	 * Returns a new object of class '<em>Inbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Inbound Resource Adapter</em>'.
-	 * @generated
-	 */
-	InboundResourceAdapter createInboundResourceAdapter();
-
-	/**
-	 * Returns a new object of class '<em>Outbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outbound Resource Adapter</em>'.
-	 * @generated
-	 */
-	OutboundResourceAdapter createOutboundResourceAdapter();
-
-	/**
-	 * Returns a new object of class '<em>Message Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Adapter</em>'.
-	 * @generated
-	 */
-	MessageAdapter createMessageAdapter();
-
-	/**
-	 * Returns a new object of class '<em>Connection Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Connection Definition</em>'.
-	 * @generated
-	 */
-	ConnectionDefinition createConnectionDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Admin Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Admin Object</em>'.
-	 * @generated
-	 */
-	AdminObject createAdminObject();
-
-	/**
-	 * Returns a new object of class '<em>Message Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Listener</em>'.
-	 * @generated
-	 */
-	MessageListener createMessageListener();
-
-	/**
-	 * Returns a new object of class '<em>Activation Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Spec</em>'.
-	 * @generated
-	 */
-	ActivationSpec createActivationSpec();
-
-	/**
-	 * Returns a new object of class '<em>Required Config Property Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Required Config Property Type</em>'.
-	 * @generated
-	 */
-	RequiredConfigPropertyType createRequiredConfigPropertyType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResourceAdapter value
-	 */
-	ResourceAdapter createResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityPermission value
-	 */
-	SecurityPermission createSecurityPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthenticationMechanism value
-	 */
-	AuthenticationMechanism createAuthenticationMechanism();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ConfigProperty value
-	 */
-	ConfigProperty createConfigProperty();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	JcaPackage getJcaPackage();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java
deleted file mode 100644
index 7a67df845..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java
+++ /dev/null
@@ -1,1969 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	@since 1.0
- */
-public interface JcaPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "jca";//$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__VENDOR_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__SPEC_VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__EIS_TYPE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__LICENSE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__RESOURCE_ADAPTER = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * The number of structural features of the '<em>Connector</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LICENSE = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__TRANSACTION_SUPPORT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Resource Adapter Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__SECURITY_PERMISSIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONFIG_PROPERTIES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Outbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>Inbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 12;
-
-	/**
-	 * The feature id for the '<em><b>Admin Objects</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__ADMIN_OBJECTS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 13;
-
-	/**
-	 * The number of structural features of the '<em>Resource Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 14;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_PERMISSION = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Authentication Mechanism</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSACTION_SUPPORT_KIND = 15;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM_TYPE = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "jca.xmi";//$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.jca";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JcaPackage eINSTANCE = org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTHENTICATION_MECHANISM__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Authentication Mechanism</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTHENTICATION_MECHANISM_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIG_PROPERTY__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Config Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIG_PROPERTY_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_PERMISSION__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_PERMISSION__SPECIFICATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_PERMISSION__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Security Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_PERMISSION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LICENSE__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LICENSE__REQUIRED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LICENSE__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>License</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LICENSE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.InboundResourceAdapterImpl <em>Inbound Resource Adapter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.InboundResourceAdapterImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getInboundResourceAdapter()
-	 * @generated
-	 */
-	int INBOUND_RESOURCE_ADAPTER = 6;
-
-	/**
-	 * The feature id for the '<em><b>Message Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Inbound Resource Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INBOUND_RESOURCE_ADAPTER_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl <em>Outbound Resource Adapter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getOutboundResourceAdapter()
-	 * @generated
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER = 7;
-
-	/**
-	 * The feature id for the '<em><b>Reauthentication Support</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Transaction Support</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Connection Definitions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Authentication Mechanisms</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Outbound Resource Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageAdapterImpl <em>Message Adapter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.MessageAdapterImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getMessageAdapter()
-	 * @generated
-	 */
-	int MESSAGE_ADAPTER = 8;
-
-	/**
-	 * The feature id for the '<em><b>Message Listeners</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_ADAPTER__MESSAGE_LISTENERS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Message Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_ADAPTER_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl <em>Connection Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getConnectionDefinition()
-	 * @generated
-	 */
-	int CONNECTION_DEFINITION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Managed Connection Factory Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Connection Factory Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Connection Factory Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Connection Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Connection Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONFIG_PROPERTIES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Connection Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl <em>Admin Object</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getAdminObject()
-	 * @generated
-	 */
-	int ADMIN_OBJECT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Admin Object Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Admin Object Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT__ADMIN_OBJECT_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT__CONFIG_PROPERTIES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Admin Object</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageListenerImpl <em>Message Listener</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.MessageListenerImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getMessageListener()
-	 * @generated
-	 */
-	int MESSAGE_LISTENER = 11;
-
-	/**
-	 * The feature id for the '<em><b>Message Listener Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Activation Spec</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_LISTENER__ACTIVATION_SPEC = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Message Listener</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_LISTENER_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ActivationSpecImpl <em>Activation Spec</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.ActivationSpecImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getActivationSpec()
-	 * @generated
-	 */
-	int ACTIVATION_SPEC = 12;
-
-	/**
-	 * The feature id for the '<em><b>Activation Spec Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Required Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Activation Spec</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_SPEC_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.RequiredConfigPropertyTypeImpl <em>Required Config Property Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.RequiredConfigPropertyTypeImpl
-	 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getRequiredConfigPropertyType()
-	 * @generated
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE = 13;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Required Config Property Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Connector object
-	 */
-	EClass getConnector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_VendorName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_SpecVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_EisType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getConnector_License();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getConnector_ResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return License object
-	 */
-	EClass getLicense();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLicense_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLicense_Required();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.License#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.License#getDescriptions()
-	 * @see #getLicense()
-	 * @generated
-	 */
-	EReference getLicense_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.InboundResourceAdapter <em>Inbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Inbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.InboundResourceAdapter
-	 * @generated
-	 */
-	EClass getInboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.jca.InboundResourceAdapter#getMessageAdapter <em>Message Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Message Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.InboundResourceAdapter#getMessageAdapter()
-	 * @see #getInboundResourceAdapter()
-	 * @generated
-	 */
-	EReference getInboundResourceAdapter_MessageAdapter();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter <em>Outbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.OutboundResourceAdapter
-	 * @generated
-	 */
-	EClass getOutboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reauthentication Support</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#isReauthenticationSupport()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EAttribute getOutboundResourceAdapter_ReauthenticationSupport();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transaction Support</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getTransactionSupport()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EAttribute getOutboundResourceAdapter_TransactionSupport();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getConnectionDefinitions <em>Connection Definitions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Connection Definitions</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getConnectionDefinitions()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EReference getOutboundResourceAdapter_ConnectionDefinitions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getAuthenticationMechanisms <em>Authentication Mechanisms</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Authentication Mechanisms</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getAuthenticationMechanisms()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EReference getOutboundResourceAdapter_AuthenticationMechanisms();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.MessageAdapter <em>Message Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.MessageAdapter
-	 * @generated
-	 */
-	EClass getMessageAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.MessageAdapter#getMessageListeners <em>Message Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Listeners</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.MessageAdapter#getMessageListeners()
-	 * @see #getMessageAdapter()
-	 * @generated
-	 */
-	EReference getMessageAdapter_MessageListeners();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition <em>Connection Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Connection Definition</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition
-	 * @generated
-	 */
-	EClass getConnectionDefinition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Managed Connection Factory Class</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition#getManagedConnectionFactoryClass()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ManagedConnectionFactoryClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryInterface <em>Connection Factory Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Factory Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryInterface()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionFactoryInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Factory Impl Class</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionFactoryImplClass()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionFactoryImplClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionInterface <em>Connection Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionInterface()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionImplClass <em>Connection Impl Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Impl Class</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConnectionImplClass()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionImplClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConfigProperties <em>Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition#getConfigProperties()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EReference getConnectionDefinition_ConfigProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.AdminObject <em>Admin Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Admin Object</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.AdminObject
-	 * @generated
-	 */
-	EClass getAdminObject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectInterface <em>Admin Object Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Admin Object Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectInterface()
-	 * @see #getAdminObject()
-	 * @generated
-	 */
-	EAttribute getAdminObject_AdminObjectInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectClass <em>Admin Object Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Admin Object Class</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.AdminObject#getAdminObjectClass()
-	 * @see #getAdminObject()
-	 * @generated
-	 */
-	EAttribute getAdminObject_AdminObjectClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.AdminObject#getConfigProperties <em>Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.AdminObject#getConfigProperties()
-	 * @see #getAdminObject()
-	 * @generated
-	 */
-	EReference getAdminObject_ConfigProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.MessageListener <em>Message Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Listener</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.MessageListener
-	 * @generated
-	 */
-	EClass getMessageListener();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.MessageListener#getMessageListenerType <em>Message Listener Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Listener Type</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.MessageListener#getMessageListenerType()
-	 * @see #getMessageListener()
-	 * @generated
-	 */
-	EAttribute getMessageListener_MessageListenerType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.jca.MessageListener#getActivationSpec <em>Activation Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Activation Spec</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.MessageListener#getActivationSpec()
-	 * @see #getMessageListener()
-	 * @generated
-	 */
-	EReference getMessageListener_ActivationSpec();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.ActivationSpec <em>Activation Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Spec</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ActivationSpec
-	 * @generated
-	 */
-	EClass getActivationSpec();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ActivationSpec#getActivationSpecClass <em>Activation Spec Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activation Spec Class</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ActivationSpec#getActivationSpecClass()
-	 * @see #getActivationSpec()
-	 * @generated
-	 */
-	EAttribute getActivationSpec_ActivationSpecClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.ActivationSpec#getRequiredConfigProperties <em>Required Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Required Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ActivationSpec#getRequiredConfigProperties()
-	 * @see #getActivationSpec()
-	 * @generated
-	 */
-	EReference getActivationSpec_RequiredConfigProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType <em>Required Config Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Required Config Property Type</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType
-	 * @generated
-	 */
-	EClass getRequiredConfigPropertyType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getName()
-	 * @see #getRequiredConfigPropertyType()
-	 * @generated
-	 */
-	EAttribute getRequiredConfigPropertyType_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getDescriptions()
-	 * @see #getRequiredConfigPropertyType()
-	 * @generated
-	 */
-	EReference getRequiredConfigPropertyType_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResourceAdapter object
-	 */
-	EClass getResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ManagedConnectionFactoryClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionFactoryInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionFactoryImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_TransactionSupport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ReauthenticationSupport();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getResourceAdapterClass <em>Resource Adapter Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resource Adapter Class</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ResourceAdapter#getResourceAdapterClass()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EAttribute getResourceAdapter_ResourceAdapterClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceAdapter_SecurityPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceAdapter_AuthenticationMechanisms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceAdapter_ConfigProperties();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getOutboundResourceAdapter <em>Outbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Outbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ResourceAdapter#getOutboundResourceAdapter()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EReference getResourceAdapter_OutboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getInboundResourceAdapter <em>Inbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Inbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ResourceAdapter#getInboundResourceAdapter()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EReference getResourceAdapter_InboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getAdminObjects <em>Admin Objects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Admin Objects</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ResourceAdapter#getAdminObjects()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EReference getResourceAdapter_AdminObjects();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityPermission object
-	 */
-	EClass getSecurityPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityPermission_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityPermission_Specification();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.SecurityPermission#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.SecurityPermission#getDescriptions()
-	 * @see #getSecurityPermission()
-	 * @generated
-	 */
-	EReference getSecurityPermission_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthenticationMechanism object
-	 */
-	EClass getAuthenticationMechanism();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getAuthenticationMechanism <em>Authentication Mechanism</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authentication Mechanism</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getAuthenticationMechanism()
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 */
-	EAttribute getAuthenticationMechanism_AuthenticationMechanism();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_AuthenticationMechanismType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_CredentialInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ConfigProperty object
-	 */
-	EClass getConfigProperty();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Value();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.ConfigProperty#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.ConfigProperty#getDescriptions()
-	 * @see #getConfigProperty()
-	 * @generated
-	 */
-	EReference getConfigProperty_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransactionSupportKind object
-	 */
-	EEnum getTransactionSupportKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthenticationMechanismType object
-	 */
-	EEnum getAuthenticationMechanismType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	JcaFactory getJcaFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl <em>Connector</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getConnector()
-		 * @generated
-		 */
-		EClass CONNECTOR = eINSTANCE.getConnector();
-
-		/**
-		 * The meta object literal for the '<em><b>Vendor Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTOR__VENDOR_NAME = eINSTANCE.getConnector_VendorName();
-
-		/**
-		 * The meta object literal for the '<em><b>Spec Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTOR__SPEC_VERSION = eINSTANCE.getConnector_SpecVersion();
-
-		/**
-		 * The meta object literal for the '<em><b>Eis Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTOR__EIS_TYPE = eINSTANCE.getConnector_EisType();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTOR__VERSION = eINSTANCE.getConnector_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>License</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTOR__LICENSE = eINSTANCE.getConnector_License();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Adapter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTOR__RESOURCE_ADAPTER = eINSTANCE.getConnector_ResourceAdapter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl <em>Resource Adapter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getResourceAdapter()
-		 * @generated
-		 */
-		EClass RESOURCE_ADAPTER = eINSTANCE.getResourceAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Managed Connection Factory Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS = eINSTANCE.getResourceAdapter_ManagedConnectionFactoryClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Factory Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE = eINSTANCE.getResourceAdapter_ConnectionFactoryInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Factory Impl Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS = eINSTANCE.getResourceAdapter_ConnectionFactoryImplClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__CONNECTION_INTERFACE = eINSTANCE.getResourceAdapter_ConnectionInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Impl Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS = eINSTANCE.getResourceAdapter_ConnectionImplClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Support</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__TRANSACTION_SUPPORT = eINSTANCE.getResourceAdapter_TransactionSupport();
-
-		/**
-		 * The meta object literal for the '<em><b>Reauthentication Support</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT = eINSTANCE.getResourceAdapter_ReauthenticationSupport();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Adapter Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS = eINSTANCE.getResourceAdapter_ResourceAdapterClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Permissions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ADAPTER__SECURITY_PERMISSIONS = eINSTANCE.getResourceAdapter_SecurityPermissions();
-
-		/**
-		 * The meta object literal for the '<em><b>Authentication Mechanisms</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS = eINSTANCE.getResourceAdapter_AuthenticationMechanisms();
-
-		/**
-		 * The meta object literal for the '<em><b>Config Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ADAPTER__CONFIG_PROPERTIES = eINSTANCE.getResourceAdapter_ConfigProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Outbound Resource Adapter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER = eINSTANCE.getResourceAdapter_OutboundResourceAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Inbound Resource Adapter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER = eINSTANCE.getResourceAdapter_InboundResourceAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Admin Objects</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_ADAPTER__ADMIN_OBJECTS = eINSTANCE.getResourceAdapter_AdminObjects();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.AuthenticationMechanismImpl <em>Authentication Mechanism</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.AuthenticationMechanismImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getAuthenticationMechanism()
-		 * @generated
-		 */
-		EClass AUTHENTICATION_MECHANISM = eINSTANCE.getAuthenticationMechanism();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTHENTICATION_MECHANISM__DESCRIPTION = eINSTANCE.getAuthenticationMechanism_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Authentication Mechanism</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM = eINSTANCE.getAuthenticationMechanism_AuthenticationMechanism();
-
-		/**
-		 * The meta object literal for the '<em><b>Authentication Mechanism Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE = eINSTANCE.getAuthenticationMechanism_AuthenticationMechanismType();
-
-		/**
-		 * The meta object literal for the '<em><b>Credential Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE = eINSTANCE.getAuthenticationMechanism_CredentialInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Custom Auth Mech Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE = eINSTANCE.getAuthenticationMechanism_CustomAuthMechType();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference AUTHENTICATION_MECHANISM__DESCRIPTIONS = eINSTANCE.getAuthenticationMechanism_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.ConfigPropertyImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getConfigProperty()
-		 * @generated
-		 */
-		EClass CONFIG_PROPERTY = eINSTANCE.getConfigProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONFIG_PROPERTY__DESCRIPTION = eINSTANCE.getConfigProperty_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONFIG_PROPERTY__NAME = eINSTANCE.getConfigProperty_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONFIG_PROPERTY__TYPE = eINSTANCE.getConfigProperty_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONFIG_PROPERTY__VALUE = eINSTANCE.getConfigProperty_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONFIG_PROPERTY__DESCRIPTIONS = eINSTANCE.getConfigProperty_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.SecurityPermissionImpl <em>Security Permission</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.SecurityPermissionImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getSecurityPermission()
-		 * @generated
-		 */
-		EClass SECURITY_PERMISSION = eINSTANCE.getSecurityPermission();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_PERMISSION__DESCRIPTION = eINSTANCE.getSecurityPermission_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Specification</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_PERMISSION__SPECIFICATION = eINSTANCE.getSecurityPermission_Specification();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_PERMISSION__DESCRIPTIONS = eINSTANCE.getSecurityPermission_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.LicenseImpl <em>License</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.LicenseImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getLicense()
-		 * @generated
-		 */
-		EClass LICENSE = eINSTANCE.getLicense();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LICENSE__DESCRIPTION = eINSTANCE.getLicense_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Required</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LICENSE__REQUIRED = eINSTANCE.getLicense_Required();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LICENSE__DESCRIPTIONS = eINSTANCE.getLicense_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.InboundResourceAdapterImpl <em>Inbound Resource Adapter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.InboundResourceAdapterImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getInboundResourceAdapter()
-		 * @generated
-		 */
-		EClass INBOUND_RESOURCE_ADAPTER = eINSTANCE.getInboundResourceAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Adapter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER = eINSTANCE.getInboundResourceAdapter_MessageAdapter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl <em>Outbound Resource Adapter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getOutboundResourceAdapter()
-		 * @generated
-		 */
-		EClass OUTBOUND_RESOURCE_ADAPTER = eINSTANCE.getOutboundResourceAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Reauthentication Support</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT = eINSTANCE.getOutboundResourceAdapter_ReauthenticationSupport();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Support</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT = eINSTANCE.getOutboundResourceAdapter_TransactionSupport();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Definitions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS = eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions();
-
-		/**
-		 * The meta object literal for the '<em><b>Authentication Mechanisms</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS = eINSTANCE.getOutboundResourceAdapter_AuthenticationMechanisms();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageAdapterImpl <em>Message Adapter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.MessageAdapterImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getMessageAdapter()
-		 * @generated
-		 */
-		EClass MESSAGE_ADAPTER = eINSTANCE.getMessageAdapter();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Listeners</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_ADAPTER__MESSAGE_LISTENERS = eINSTANCE.getMessageAdapter_MessageListeners();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl <em>Connection Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getConnectionDefinition()
-		 * @generated
-		 */
-		EClass CONNECTION_DEFINITION = eINSTANCE.getConnectionDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Managed Connection Factory Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS = eINSTANCE.getConnectionDefinition_ManagedConnectionFactoryClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Factory Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE = eINSTANCE.getConnectionDefinition_ConnectionFactoryInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Factory Impl Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS = eINSTANCE.getConnectionDefinition_ConnectionFactoryImplClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTION_DEFINITION__CONNECTION_INTERFACE = eINSTANCE.getConnectionDefinition_ConnectionInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Connection Impl Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS = eINSTANCE.getConnectionDefinition_ConnectionImplClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Config Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONNECTION_DEFINITION__CONFIG_PROPERTIES = eINSTANCE.getConnectionDefinition_ConfigProperties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl <em>Admin Object</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getAdminObject()
-		 * @generated
-		 */
-		EClass ADMIN_OBJECT = eINSTANCE.getAdminObject();
-
-		/**
-		 * The meta object literal for the '<em><b>Admin Object Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE = eINSTANCE.getAdminObject_AdminObjectInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Admin Object Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ADMIN_OBJECT__ADMIN_OBJECT_CLASS = eINSTANCE.getAdminObject_AdminObjectClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Config Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ADMIN_OBJECT__CONFIG_PROPERTIES = eINSTANCE.getAdminObject_ConfigProperties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageListenerImpl <em>Message Listener</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.MessageListenerImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getMessageListener()
-		 * @generated
-		 */
-		EClass MESSAGE_LISTENER = eINSTANCE.getMessageListener();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Listener Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE = eINSTANCE.getMessageListener_MessageListenerType();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Spec</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_LISTENER__ACTIVATION_SPEC = eINSTANCE.getMessageListener_ActivationSpec();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.ActivationSpecImpl <em>Activation Spec</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.ActivationSpecImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getActivationSpec()
-		 * @generated
-		 */
-		EClass ACTIVATION_SPEC = eINSTANCE.getActivationSpec();
-
-		/**
-		 * The meta object literal for the '<em><b>Activation Spec Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS = eINSTANCE.getActivationSpec_ActivationSpecClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Required Config Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES = eINSTANCE.getActivationSpec_RequiredConfigProperties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.internal.impl.RequiredConfigPropertyTypeImpl <em>Required Config Property Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.RequiredConfigPropertyTypeImpl
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getRequiredConfigPropertyType()
-		 * @generated
-		 */
-		EClass REQUIRED_CONFIG_PROPERTY_TYPE = eINSTANCE.getRequiredConfigPropertyType();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REQUIRED_CONFIG_PROPERTY_TYPE__NAME = eINSTANCE.getRequiredConfigPropertyType_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS = eINSTANCE.getRequiredConfigPropertyType_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanismType <em>Authentication Mechanism Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.AuthenticationMechanismType
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getAuthenticationMechanismType()
-		 * @generated
-		 */
-		EEnum AUTHENTICATION_MECHANISM_TYPE = eINSTANCE.getAuthenticationMechanismType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jca.TransactionSupportKind <em>Transaction Support Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jca.TransactionSupportKind
-		 * @see org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl#getTransactionSupportKind()
-		 * @generated
-		 */
-		EEnum TRANSACTION_SUPPORT_KIND = eINSTANCE.getTransactionSupportKind();
-
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_CustomAuthMechType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.jca.AuthenticationMechanism#getDescriptions()
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 */
-	EReference getAuthenticationMechanism_Descriptions();
-
-} //JcaPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/License.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/License.java
deleted file mode 100644
index 8a85424fe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/License.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * Specifies licensing requirements for the resource adapter module. Specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions).
- * @since 1.0 
- * @generated
- */
-public interface License extends J2EEEObject {
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Required attribute
-	 */
-	boolean isRequired();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Required attribute
-	 */
-	void setRequired(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jca.License#isRequired <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	void unsetRequired();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jca.License#isRequired <em>Required</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Required</em>' attribute is set.
-	 * @see #unsetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	boolean isSetRequired();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getLicense_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageAdapter.java
deleted file mode 100644
index 3ff46b588..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageAdapter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Adapter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The messageadapterType specifies information about the
- * messaging capabilities of the resource adapter. This
- * contains information specific to the implementation of the
- * resource adapter library as specified through the
- * messagelistener element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.MessageAdapter#getMessageListeners <em>Message Listeners</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getMessageAdapter()
- * @model
- * @generated
- */
-public interface MessageAdapter extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Message Listeners</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.MessageListener}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Listeners</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Listeners</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getMessageAdapter_MessageListeners()
-	 * @model type="org.eclipse.jst.j2ee.jca.MessageListener" containment="true" required="true"
-	 * @generated
-	 */
-	EList getMessageListeners();
-
-} // MessageAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageListener.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageListener.java
deleted file mode 100644
index 1f525d2ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageListener.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Listener</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The messagelistenerType specifies information about a
- * specific message listener supported by the messaging
- * resource adapter. It contains information on the Java type
- * of the message listener interface and an activation
- * specification.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.MessageListener#getMessageListenerType <em>Message Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.MessageListener#getActivationSpec <em>Activation Spec</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getMessageListener()
- * @model
- * @generated
- */
-public interface MessageListener extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Message Listener Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Listener Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element messagelistener-type specifies the fully
-	 *         qualified name of the Java type of a message
-	 *         listener interface.
-	 * 
-	 *         Example:
-	 * 
-	 *           <messagelistener-type>javax.jms.MessageListener
-	 *           </messagelistener-type>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Listener Type</em>' attribute.
-	 * @see #setMessageListenerType(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getMessageListener_MessageListenerType()
-	 * @model
-	 * @generated
-	 */
-	String getMessageListenerType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.MessageListener#getMessageListenerType <em>Message Listener Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Listener Type</em>' attribute.
-	 * @see #getMessageListenerType()
-	 * @generated
-	 */
-	void setMessageListenerType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Activation Spec</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Spec</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Activation Spec</em>' containment reference.
-	 * @see #setActivationSpec(ActivationSpec)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getMessageListener_ActivationSpec()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	ActivationSpec getActivationSpec();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.MessageListener#getActivationSpec <em>Activation Spec</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Spec</em>' containment reference.
-	 * @see #getActivationSpec()
-	 * @generated
-	 */
-	void setActivationSpec(ActivationSpec value);
-
-} // MessageListener
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/OutboundResourceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/OutboundResourceAdapter.java
deleted file mode 100644
index 80e70c136..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/OutboundResourceAdapter.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The outbound-resourceadapterType specifies information about
- * an outbound resource adapter. The information includes fully
- * qualified names of classes/interfaces required as part of
- * the connector architecture specified contracts for
- * connection management, level of transaction support
- * provided, one or more authentication mechanisms supported
- * and additional required security permissions.
- * 
- * If there is no authentication-mechanism specified as part of
- * resource adapter element then the resource adapter does not
- * support any standard security authentication mechanisms as
- * part of security contract. The application server ignores
- * the security part of the system contracts in this case.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getConnectionDefinitions <em>Connection Definitions</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getAuthenticationMechanisms <em>Authentication Mechanisms</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getOutboundResourceAdapter()
- * @model
- * @generated
- */
-public interface OutboundResourceAdapter extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Reauthentication Support</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reauthentication Support</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element reauthentication-support specifies
-	 *         whether the resource adapter implementation supports
-	 *         re-authentication of existing Managed- Connection
-	 *         instance. Note that this information is for the
-	 *         resource adapter implementation and not for the
-	 *         underlying EIS instance. This element must have
-	 *         either a "true" or "false" value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Reauthentication Support</em>' attribute.
-	 * @see #isSetReauthenticationSupport()
-	 * @see #unsetReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getOutboundResourceAdapter_ReauthenticationSupport()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isReauthenticationSupport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reauthentication Support</em>' attribute.
-	 * @see #isSetReauthenticationSupport()
-	 * @see #unsetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 */
-	void setReauthenticationSupport(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	void unsetReauthenticationSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reauthentication Support</em>' attribute is set.
-	 * @see #unsetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	boolean isSetReauthenticationSupport();
-
-	/**
-	 * Returns the value of the '<em><b>Transaction Support</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.jca.TransactionSupportKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transaction Support</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transaction Support</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.jca.TransactionSupportKind
-	 * @see #isSetTransactionSupport()
-	 * @see #unsetTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getOutboundResourceAdapter_TransactionSupport()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	TransactionSupportKind getTransactionSupport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Support</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.jca.TransactionSupportKind
-	 * @see #isSetTransactionSupport()
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @generated
-	 */
-	void setTransactionSupport(TransactionSupportKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	void unsetTransactionSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Support</em>' attribute is set.
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	boolean isSetTransactionSupport();
-
-	/**
-	 * Returns the value of the '<em><b>Connection Definitions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.ConnectionDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Definitions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connection Definitions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getOutboundResourceAdapter_ConnectionDefinitions()
-	 * @model type="org.eclipse.jst.j2ee.jca.ConnectionDefinition" containment="true"
-	 * @generated
-	 */
-	EList getConnectionDefinitions();
-
-	/**
-	 * Returns the value of the '<em><b>Authentication Mechanisms</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.AuthenticationMechanism}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Authentication Mechanisms</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authentication Mechanisms</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getOutboundResourceAdapter_AuthenticationMechanisms()
-	 * @model type="org.eclipse.jst.j2ee.jca.AuthenticationMechanism" containment="true"
-	 * @generated
-	 */
-	EList getAuthenticationMechanisms();
-
-} // OutboundResourceAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/RequiredConfigPropertyType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/RequiredConfigPropertyType.java
deleted file mode 100644
index 963fcebe7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/RequiredConfigPropertyType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Required Config Property Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The required-config-propertyType contains a declaration
- * of a single configuration property used for specifying a
- * required configuration property name. It is used
- * by required-config-property elements.
- * 
- * Example:
- * 
- * <required-config-property>Destination</required-config-property>
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jca.JcaPackage#getRequiredConfigPropertyType()
- * @model
- * @generated
- */
-public interface RequiredConfigPropertyType extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getRequiredConfigPropertyType_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getRequiredConfigPropertyType_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // RequiredConfigPropertyType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ResourceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ResourceAdapter.java
deleted file mode 100644
index e9da57205..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ResourceAdapter.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * Specifies information about the resource adapter. The information includes fully-qualified names of class//interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional
- * required security permissions.
- * 
- * If there is no authentication-mechanism specified as part of
- * resource adapter element then the resource adapter does not
- * support any standard security authentication mechanisms as part
- * of security contract. The application server ignores the security
- * part of the system contracts in this case.
- * @generated
- * @since 1.0
- */
-public interface ResourceAdapter extends J2EEEObject {
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ManagedConnectionFactoryClass attribute
-	 * Specifies the fully qualified name of the Java class that implements the
-	 * javax.resource.spi.Managed-ConnectionFactory interface. This Java class is
-	 * provided as part of resource adapter's implementation of connector architecture 
-	 * specified contracts.
-
-	 */
-	String getManagedConnectionFactoryClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ManagedConnectionFactoryClass attribute
-	 */
-	void setManagedConnectionFactoryClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionFactoryInterface attribute
-	 * Specifies the fully-qualified name of the ConnectionFactory interface supported 
-	 * by the resource adapter.
-
-	 */
-	String getConnectionFactoryInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionFactoryInterface attribute
-	 */
-	void setConnectionFactoryInterface(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionFactoryImplClass attribute
-	 * Specifies the fully-qualified name of the ConnectionFactory class that
-	 * implements resource adapter specific ConnectionFactory interface.
-	 */
-	String getConnectionFactoryImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionFactoryImplClass attribute
-	 */
-	void setConnectionFactoryImplClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionInterface attribute
-	 */
-	String getConnectionInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionInterface attribute
-	 */
-	void setConnectionInterface(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionImplClass attribute
-	 * Specifies the fully-qualified name of the Connection interface supported by the 
-	 * resource adapter.
-	 */
-	String getConnectionImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionImplClass attribute
-	 */
-	void setConnectionImplClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionSupport attribute
-	 * The transaction-support element specifies the level of transaction
-	 * support provided by the resource adapter.
-	 * The value of transaction-support must be one of the following:
-	 *   NoTransaction
-	 *   LocalTransaction
-	 *   XATransaction
-	 */
-	TransactionSupportKind getTransactionSupport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Support</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.jca.TransactionSupportKind
-	 * @see #isSetTransactionSupport()
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @generated
-	 */
-	void setTransactionSupport(TransactionSupportKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	void unsetTransactionSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Support</em>' attribute is set.
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	boolean isSetTransactionSupport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ReauthenticationSupport attribute
-	 * Specifies whether the resource adapter implementation supports
-	 * re-authentication of existing Managed-Connection instance. Note that this
-	 * information is for the resource adapter implementation and not for the
-	 * underlying EIS instance.
-	 */
-	boolean isReauthenticationSupport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ReauthenticationSupport attribute
-	 */
-	void setReauthenticationSupport(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	void unsetReauthenticationSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reauthentication Support</em>' attribute is set.
-	 * @see #unsetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	boolean isSetReauthenticationSupport();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Adapter Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Adapter Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element resourceadapter-class specifies the
-	 *         fully qualified name of a Java class that implements
-	 *         the javax.resource.spi.ResourceAdapter
-	 *         interface. This Java class is provided as part of
-	 *         resource adapter's implementation of connector
-	 *         architecture specified contracts. The implementation
-	 *         of this class is required to be a JavaBean.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource Adapter Class</em>' attribute.
-	 * @see #setResourceAdapterClass(String)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getResourceAdapter_ResourceAdapterClass()
-	 * @model
-	 * @generated
-	 */
-	String getResourceAdapterClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getResourceAdapterClass <em>Resource Adapter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resource Adapter Class</em>' attribute.
-	 * @see #getResourceAdapterClass()
-	 * @generated
-	 */
-	void setResourceAdapterClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityPermissions references
-	 */
-	EList getSecurityPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of AuthenticationMechanisms references
-	 */
-	EList getAuthenticationMechanisms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ConfigProperties references
-	 */
-	EList getConfigProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Outbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Outbound Resource Adapter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The connectionfactory-interface element content must be
-	 *         unique in the outbound-resourceadapter. Multiple connection-definitions
-	 *         can not use the same connectionfactory-type.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outbound Resource Adapter</em>' containment reference.
-	 * @see #setOutboundResourceAdapter(OutboundResourceAdapter)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getResourceAdapter_OutboundResourceAdapter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	OutboundResourceAdapter getOutboundResourceAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getOutboundResourceAdapter <em>Outbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outbound Resource Adapter</em>' containment reference.
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	void setOutboundResourceAdapter(OutboundResourceAdapter value);
-
-	/**
-	 * Returns the value of the '<em><b>Inbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inbound Resource Adapter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Inbound Resource Adapter</em>' containment reference.
-	 * @see #setInboundResourceAdapter(InboundResourceAdapter)
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getResourceAdapter_InboundResourceAdapter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	InboundResourceAdapter getInboundResourceAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jca.ResourceAdapter#getInboundResourceAdapter <em>Inbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inbound Resource Adapter</em>' containment reference.
-	 * @see #getInboundResourceAdapter()
-	 * @generated
-	 */
-	void setInboundResourceAdapter(InboundResourceAdapter value);
-
-	/**
-	 * Returns the value of the '<em><b>Admin Objects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jca.AdminObject}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Admin Objects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Objects</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getResourceAdapter_AdminObjects()
-	 * @model type="org.eclipse.jst.j2ee.jca.AdminObject" containment="true"
-	 * @generated
-	 */
-	EList getAdminObjects();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/SecurityPermission.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/SecurityPermission.java
deleted file mode 100644
index 051690600..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/SecurityPermission.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * Specifies a security permission that is required by the resource adapter code.
- * 
- * The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.
- * @generated
- * @since 1.0 */
-public interface SecurityPermission extends J2EEEObject {
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Specification attribute
-	 * The element permission-spec specifies a security permission based on the
-	 * Security policy file syntax. 
-
-	 */
-	String getSpecification();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Specification attribute
-	 */
-	void setSpecification(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jca.JcaPackage#getSecurityPermission_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/TransactionSupportKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/TransactionSupportKind.java
deleted file mode 100644
index 83d7c6e86..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/TransactionSupportKind.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface TransactionSupportKind {}
- * @since 1.0
- */
-public final class TransactionSupportKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NO_TRANSACTION= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL_TRANSACTION= 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int XA_TRANSACTION= 2;
-
-	/**
-	 * The '<em><b>No Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>No Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NO_TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionSupportKind NO_TRANSACTION_LITERAL = new TransactionSupportKind(NO_TRANSACTION, "NoTransaction", "NoTransaction");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Local Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionSupportKind LOCAL_TRANSACTION_LITERAL = new TransactionSupportKind(LOCAL_TRANSACTION, "LocalTransaction", "LocalTransaction");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>XA Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>XA Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #XA_TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionSupportKind XA_TRANSACTION_LITERAL = new TransactionSupportKind(XA_TRANSACTION, "XATransaction", "XATransaction");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transaction Support Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionSupportKind[] VALUES_ARRAY =
-		new TransactionSupportKind[] {
-			NO_TRANSACTION_LITERAL,
-			LOCAL_TRANSACTION_LITERAL,
-			XA_TRANSACTION_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Support Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Support Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionSupportKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionSupportKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Support Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionSupportKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionSupportKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Support Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionSupportKind get(int value) {
-		switch (value) {
-			case NO_TRANSACTION: return NO_TRANSACTION_LITERAL;
-			case LOCAL_TRANSACTION: return LOCAL_TRANSACTION_LITERAL;
-			case XA_TRANSACTION: return XA_TRANSACTION_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionSupportKind(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransactionSupportKind
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ActivationSpecImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ActivationSpecImpl.java
deleted file mode 100644
index c7ae35b91..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ActivationSpecImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Spec</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ActivationSpecImpl#getActivationSpecClass <em>Activation Spec Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ActivationSpecImpl#getRequiredConfigProperties <em>Required Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationSpecImpl extends J2EEEObjectImpl implements ActivationSpec {
-	/**
-	 * The default value of the '{@link #getActivationSpecClass() <em>Activation Spec Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationSpecClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVATION_SPEC_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActivationSpecClass() <em>Activation Spec Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationSpecClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activationSpecClass = ACTIVATION_SPEC_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRequiredConfigProperties() <em>Required Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRequiredConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList requiredConfigProperties = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationSpecImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.ACTIVATION_SPEC;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivationSpecClass() {
-		return activationSpecClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationSpecClass(String newActivationSpecClass) {
-		String oldActivationSpecClass = activationSpecClass;
-		activationSpecClass = newActivationSpecClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS, oldActivationSpecClass, activationSpecClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRequiredConfigProperties() {
-		if (requiredConfigProperties == null) {
-			requiredConfigProperties = new EObjectContainmentEList(RequiredConfigPropertyType.class, this, JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES);
-		}
-		return requiredConfigProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				return ((InternalEList)getRequiredConfigProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				return getActivationSpecClass();
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				return getRequiredConfigProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				setActivationSpecClass((String)newValue);
-				return;
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				getRequiredConfigProperties().clear();
-				getRequiredConfigProperties().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				setActivationSpecClass(ACTIVATION_SPEC_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				getRequiredConfigProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				return ACTIVATION_SPEC_CLASS_EDEFAULT == null ? activationSpecClass != null : !ACTIVATION_SPEC_CLASS_EDEFAULT.equals(activationSpecClass);
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				return requiredConfigProperties != null && !requiredConfigProperties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (activationSpecClass: ");
-		result.append(activationSpecClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivationSpecImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/AdminObjectImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/AdminObjectImpl.java
deleted file mode 100644
index 49c86097d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/AdminObjectImpl.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Admin Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl#getAdminObjectInterface <em>Admin Object Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl#getAdminObjectClass <em>Admin Object Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.AdminObjectImpl#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AdminObjectImpl extends J2EEEObjectImpl implements AdminObject {
-	/**
-	 * The default value of the '{@link #getAdminObjectInterface() <em>Admin Object Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADMIN_OBJECT_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAdminObjectInterface() <em>Admin Object Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String adminObjectInterface = ADMIN_OBJECT_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAdminObjectClass() <em>Admin Object Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADMIN_OBJECT_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAdminObjectClass() <em>Admin Object Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String adminObjectClass = ADMIN_OBJECT_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConfigProperties() <em>Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList configProperties = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AdminObjectImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.ADMIN_OBJECT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAdminObjectInterface() {
-		return adminObjectInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdminObjectInterface(String newAdminObjectInterface) {
-		String oldAdminObjectInterface = adminObjectInterface;
-		adminObjectInterface = newAdminObjectInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE, oldAdminObjectInterface, adminObjectInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAdminObjectClass() {
-		return adminObjectClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdminObjectClass(String newAdminObjectClass) {
-		String oldAdminObjectClass = adminObjectClass;
-		adminObjectClass = newAdminObjectClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS, oldAdminObjectClass, adminObjectClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ConfigProperty.class, this, JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				return ((InternalEList)getConfigProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				return getAdminObjectInterface();
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				return getAdminObjectClass();
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				return getConfigProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				setAdminObjectInterface((String)newValue);
-				return;
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				setAdminObjectClass((String)newValue);
-				return;
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				setAdminObjectInterface(ADMIN_OBJECT_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				setAdminObjectClass(ADMIN_OBJECT_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				return ADMIN_OBJECT_INTERFACE_EDEFAULT == null ? adminObjectInterface != null : !ADMIN_OBJECT_INTERFACE_EDEFAULT.equals(adminObjectInterface);
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				return ADMIN_OBJECT_CLASS_EDEFAULT == null ? adminObjectClass != null : !ADMIN_OBJECT_CLASS_EDEFAULT.equals(adminObjectClass);
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (adminObjectInterface: ");
-		result.append(adminObjectInterface);
-		result.append(", adminObjectClass: ");
-		result.append(adminObjectClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AdminObjectImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/AuthenticationMechanismImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/AuthenticationMechanismImpl.java
deleted file mode 100644
index 8ad794fac..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/AuthenticationMechanismImpl.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.
- * 
- * Note that BasicPassword mechanism type should support the
- * javax.resource.spi.security.PasswordCredential interface.
- * The Kerbv5 mechanism type should support the
- * javax.resource.spi.security.GenericCredential interface.
- * @generated
- */
-public class AuthenticationMechanismImpl extends J2EEEObjectImpl implements AuthenticationMechanism {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuthenticationMechanism() <em>Authentication Mechanism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHENTICATION_MECHANISM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthenticationMechanism() <em>Authentication Mechanism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authenticationMechanism = AUTHENTICATION_MECHANISM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAuthenticationMechanismType() <em>Authentication Mechanism Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanismType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AuthenticationMechanismType AUTHENTICATION_MECHANISM_TYPE_EDEFAULT = AuthenticationMechanismType.BASIC_PASSWORD_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AuthenticationMechanismType authenticationMechanismType = AUTHENTICATION_MECHANISM_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Authentication Mechanism Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean authenticationMechanismTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getCredentialInterface() <em>Credential Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCredentialInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREDENTIAL_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String credentialInterface = CREDENTIAL_INTERFACE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getCustomAuthMechType() <em>Custom Auth Mech Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomAuthMechType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_AUTH_MECH_TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String customAuthMechType = CUSTOM_AUTH_MECH_TYPE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected AuthenticationMechanismImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.AUTHENTICATION_MECHANISM;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthenticationMechanism() {
-		return authenticationMechanism;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthenticationMechanism(String newAuthenticationMechanism) {
-		String oldAuthenticationMechanism = authenticationMechanism;
-		authenticationMechanism = newAuthenticationMechanism;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM, oldAuthenticationMechanism, authenticationMechanism));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The authentication-mechanism-type specifies type of an authentication mechanism.
-	 * 
-	 * The example values are:
-	 *   - BasicPassword
-	 *   - Kerbv5
-	 * 
-	 * Any additional security mechanisms are outside the scope of the
-	 * Connector architecture specification.
-
-	 */
-	public AuthenticationMechanismType getAuthenticationMechanismType() {
-		return authenticationMechanismType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthenticationMechanismType(AuthenticationMechanismType newAuthenticationMechanismType) {
-		AuthenticationMechanismType oldAuthenticationMechanismType = authenticationMechanismType;
-		authenticationMechanismType = newAuthenticationMechanismType == null ? AUTHENTICATION_MECHANISM_TYPE_EDEFAULT : newAuthenticationMechanismType;
-		boolean oldAuthenticationMechanismTypeESet = authenticationMechanismTypeESet;
-		authenticationMechanismTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE, oldAuthenticationMechanismType, authenticationMechanismType, !oldAuthenticationMechanismTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAuthenticationMechanismType() {
-		AuthenticationMechanismType oldAuthenticationMechanismType = authenticationMechanismType;
-		boolean oldAuthenticationMechanismTypeESet = authenticationMechanismTypeESet;
-		authenticationMechanismType = AUTHENTICATION_MECHANISM_TYPE_EDEFAULT;
-		authenticationMechanismTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE, oldAuthenticationMechanismType, AUTHENTICATION_MECHANISM_TYPE_EDEFAULT, oldAuthenticationMechanismTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAuthenticationMechanismType() {
-		return authenticationMechanismTypeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the interface that the resource adapter implementation supports for
-	 * the representation of the credentials. This element should be used by
-	 * application server to find out the Credential interface it should use as part
-	 * of the security contract.
-	 * 
-	 * The possible values are:
-	 *    javax.resource.spi.security.PasswordCredential
-	 *    javax.resource.spi.security.GenericCredential
-
-	 */
-	public String getCredentialInterface() {
-		return credentialInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCredentialInterface(String newCredentialInterface) {
-		String oldCredentialInterface = credentialInterface;
-		credentialInterface = newCredentialInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE, oldCredentialInterface, credentialInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", authenticationMechanism: ");
-		result.append(authenticationMechanism);
-		result.append(", authenticationMechanismType: ");
-		if (authenticationMechanismTypeESet) result.append(authenticationMechanismType); else result.append("<unset>");
-		result.append(", credentialInterface: ");
-		result.append(credentialInterface);
-		result.append(", customAuthMechType: ");
-		result.append(customAuthMechType);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * This is an internal variable used to store the AthenticationMechanismType when
-	 * it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType 
-	 * is set to 'Custom' in those cases.  This attribute should not be used by
-	 * runtime.  It is only used by the writer to write back out the custom
-	 * AuthenticationMechanismType string in the case of custom
-	 * AuthenticationMechanismType's.  
-	 * This variable is internal, used only by the reader//writer classes, and can
-	 * change or disappear without notice.  
-	 */
-	public String getCustomAuthMechType() {
-		return customAuthMechType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCustomAuthMechType(String newCustomAuthMechType) {
-		String oldCustomAuthMechType = customAuthMechType;
-		customAuthMechType = newCustomAuthMechType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE, oldCustomAuthMechType, customAuthMechType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				return getAuthenticationMechanism();
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				return getAuthenticationMechanismType();
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				return getCredentialInterface();
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				return getCustomAuthMechType();
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				setAuthenticationMechanism((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				setAuthenticationMechanismType((AuthenticationMechanismType)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				setCredentialInterface((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				setCustomAuthMechType((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				setAuthenticationMechanism(AUTHENTICATION_MECHANISM_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				unsetAuthenticationMechanismType();
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				setCredentialInterface(CREDENTIAL_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				setCustomAuthMechType(CUSTOM_AUTH_MECH_TYPE_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				return AUTHENTICATION_MECHANISM_EDEFAULT == null ? authenticationMechanism != null : !AUTHENTICATION_MECHANISM_EDEFAULT.equals(authenticationMechanism);
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				return isSetAuthenticationMechanismType();
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				return CREDENTIAL_INTERFACE_EDEFAULT == null ? credentialInterface != null : !CREDENTIAL_INTERFACE_EDEFAULT.equals(credentialInterface);
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				return CUSTOM_AUTH_MECH_TYPE_EDEFAULT == null ? customAuthMechType != null : !CUSTOM_AUTH_MECH_TYPE_EDEFAULT.equals(customAuthMechType);
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConfigPropertyImpl.java
deleted file mode 100644
index 28faf8567..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConfigPropertyImpl.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * The config property contains a declaration of a single
- * configuration property for a ManagedConnectionFactory instance.
- * 
- * Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).
- * 
- * The declaration consists of an optional description, name, type
- * and an optional value of the configuration property. If the resource
- * adapter provider does not specify a value than the deployer is
- * responsible for providing a valid value for a configuration property.
- * 
- * Any bounds or well-defined values of properties should be described in the description.
- * @generated
- */
-public class ConfigPropertyImpl extends J2EEEObjectImpl implements ConfigProperty {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String type = TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String value = VALUE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected ConfigPropertyImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.CONFIG_PROPERTY;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the name of a configuration property.
-	 * 
-	 * The connector architecture defines a set of well-defined properties all of type java.lang.String. These are as follows:
-	 * 
-	 *      ServerName
-	 *      PortNumber
-	 *      UserName
-	 *      Password
-	 *      ConnectionURL
-	 * 
-	 * A resource adapter provider can extend this property set to include properties specific to the resource adapter and its underlying EIS.
-
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the fully qualified Java type of a configuration property as required by ManagedConnection-Factory instance.
-	 * 
-	 * The following are the legal values of config-property-type:
-	 *    java.lang.Boolean, java.lang.String, java.lang.Integer,
-	 *    java.lang.Double, java.lang.Byte, java.lang.Short,
-	 *    java.lang.Long, java.lang.Float, java.lang.Character
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__TYPE, oldType, type));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the value of a configuration entry.
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				return getName();
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				return getType();
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				return getValue();
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				setName((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				setType((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				setValue((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectionDefinitionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectionDefinitionImpl.java
deleted file mode 100644
index ef1227734..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectionDefinitionImpl.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connection Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionFactoryInterface <em>Connection Factory Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionInterface <em>Connection Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionImplClass <em>Connection Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.ConnectionDefinitionImpl#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConnectionDefinitionImpl extends J2EEEObjectImpl implements ConnectionDefinition {
-	/**
-	 * The default value of the '{@link #getManagedConnectionFactoryClass() <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getManagedConnectionFactoryClass() <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String managedConnectionFactoryClass = MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionFactoryInterface() <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionFactoryInterface() <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionFactoryInterface = CONNECTION_FACTORY_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionFactoryImplClass() <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionFactoryImplClass() <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionFactoryImplClass = CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionInterface() <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionInterface() <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionInterface = CONNECTION_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionImplClass() <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionImplClass() <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionImplClass = CONNECTION_IMPL_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConfigProperties() <em>Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList configProperties = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConnectionDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.CONNECTION_DEFINITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getManagedConnectionFactoryClass() {
-		return managedConnectionFactoryClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setManagedConnectionFactoryClass(String newManagedConnectionFactoryClass) {
-		String oldManagedConnectionFactoryClass = managedConnectionFactoryClass;
-		managedConnectionFactoryClass = newManagedConnectionFactoryClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS, oldManagedConnectionFactoryClass, managedConnectionFactoryClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionFactoryInterface() {
-		return connectionFactoryInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionFactoryInterface(String newConnectionFactoryInterface) {
-		String oldConnectionFactoryInterface = connectionFactoryInterface;
-		connectionFactoryInterface = newConnectionFactoryInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE, oldConnectionFactoryInterface, connectionFactoryInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionFactoryImplClass() {
-		return connectionFactoryImplClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionFactoryImplClass(String newConnectionFactoryImplClass) {
-		String oldConnectionFactoryImplClass = connectionFactoryImplClass;
-		connectionFactoryImplClass = newConnectionFactoryImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS, oldConnectionFactoryImplClass, connectionFactoryImplClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionInterface() {
-		return connectionInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionInterface(String newConnectionInterface) {
-		String oldConnectionInterface = connectionInterface;
-		connectionInterface = newConnectionInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE, oldConnectionInterface, connectionInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionImplClass() {
-		return connectionImplClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionImplClass(String newConnectionImplClass) {
-		String oldConnectionImplClass = connectionImplClass;
-		connectionImplClass = newConnectionImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS, oldConnectionImplClass, connectionImplClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ConfigProperty.class, this, JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				return ((InternalEList)getConfigProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				return getManagedConnectionFactoryClass();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				return getConnectionFactoryInterface();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				return getConnectionFactoryImplClass();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				return getConnectionInterface();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				return getConnectionImplClass();
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				return getConfigProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				setConnectionInterface((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass(MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface(CONNECTION_FACTORY_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass(CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				setConnectionInterface(CONNECTION_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass(CONNECTION_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				return MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT == null ? managedConnectionFactoryClass != null : !MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT.equals(managedConnectionFactoryClass);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				return CONNECTION_FACTORY_INTERFACE_EDEFAULT == null ? connectionFactoryInterface != null : !CONNECTION_FACTORY_INTERFACE_EDEFAULT.equals(connectionFactoryInterface);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				return CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT == null ? connectionFactoryImplClass != null : !CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT.equals(connectionFactoryImplClass);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				return CONNECTION_INTERFACE_EDEFAULT == null ? connectionInterface != null : !CONNECTION_INTERFACE_EDEFAULT.equals(connectionInterface);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				return CONNECTION_IMPL_CLASS_EDEFAULT == null ? connectionImplClass != null : !CONNECTION_IMPL_CLASS_EDEFAULT.equals(connectionImplClass);
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (managedConnectionFactoryClass: ");
-		result.append(managedConnectionFactoryClass);
-		result.append(", connectionFactoryInterface: ");
-		result.append(connectionFactoryInterface);
-		result.append(", connectionFactoryImplClass: ");
-		result.append(connectionFactoryImplClass);
-		result.append(", connectionInterface: ");
-		result.append(connectionInterface);
-		result.append(", connectionImplClass: ");
-		result.append(connectionImplClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ConnectionDefinitionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorImpl.java
deleted file mode 100644
index 606bf26a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorImpl.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-
-
-/**
- * The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.
-
- */
-public class ConnectorImpl extends CompatibilityDescriptionGroupImpl implements Connector {
-
-	/**
-	 * The default value of the '{@link #getVendorName() <em>Vendor Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVendorName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VENDOR_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String vendorName = VENDOR_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getSpecVersion() <em>Spec Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpecVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SPEC_VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String specVersion = SPEC_VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getEisType() <em>Eis Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEisType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EIS_TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String eisType = EIS_TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String version = VERSION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected License license = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ResourceAdapter resourceAdapter = null;
-	protected ConnectorImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.CONNECTOR;
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	* This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the name of resource adapter provider vendor.
-	 * Example: Wombat Corp.
-	 */
-	public String getVendorName() {
-		return vendorName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVendorName(String newVendorName) {
-		String oldVendorName = vendorName;
-		vendorName = newVendorName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__VENDOR_NAME, oldVendorName, vendorName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the version of the connector architecture specification that is supported by this resource adapter. This information enables deployer to configure the resource adapter to support deployment and runtime requirements of the corresponding connector architecture specification.
-
-	 */
-	public String getSpecVersion() {
-		return specVersion;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSpecVersion(String newSpecVersion) {
-		String oldSpecVersion = specVersion;
-		specVersion = newSpecVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__SPEC_VERSION, oldSpecVersion, specVersion));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains information about the type of the EIS. For example, the type of an EIS can be product name of EIS independent of any version info.
-	 * 
-	 * This helps in identifying EIS instances that can be used with
-	 * this resource adapter.
-
-	 */
-	public String getEisType() {
-		return eisType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEisType(String newEisType) {
-		String oldEisType = eisType;
-		eisType = newEisType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__EIS_TYPE, oldEisType, eisType));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies a string-based version of the resource adapter from the resource adapter provider.
-	 * 
-	 * Example: 1.0
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies licensing requirements for the resource adapter module. This element specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of
-	 * connection restrictions).
-	 */
-	public License getLicense() {
-		return license;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLicense(License newLicense, NotificationChain msgs) {
-		License oldLicense = license;
-		license = newLicense;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__LICENSE, oldLicense, newLicense);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLicense(License newLicense) {
-		if (newLicense != license) {
-			NotificationChain msgs = null;
-			if (license != null)
-				msgs = ((InternalEObject)license).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__LICENSE, null, msgs);
-			if (newLicense != null)
-				msgs = ((InternalEObject)newLicense).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__LICENSE, null, msgs);
-			msgs = basicSetLicense(newLicense, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__LICENSE, newLicense, newLicense));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ResourceAdapter getResourceAdapter() {
-		return resourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetResourceAdapter(ResourceAdapter newResourceAdapter, NotificationChain msgs) {
-		ResourceAdapter oldResourceAdapter = resourceAdapter;
-		resourceAdapter = newResourceAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCE_ADAPTER, oldResourceAdapter, newResourceAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setResourceAdapter(ResourceAdapter newResourceAdapter) {
-		if (newResourceAdapter != resourceAdapter) {
-			NotificationChain msgs = null;
-			if (resourceAdapter != null)
-				msgs = ((InternalEObject)resourceAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__RESOURCE_ADAPTER, null, msgs);
-			if (newResourceAdapter != null)
-				msgs = ((InternalEObject)newResourceAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__RESOURCE_ADAPTER, null, msgs);
-			msgs = basicSetResourceAdapter(newResourceAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCE_ADAPTER, newResourceAdapter, newResourceAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.CONNECTOR__LICENSE:
-				return basicSetLicense(null, msgs);
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				return basicSetResourceAdapter(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				return getVendorName();
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				return getSpecVersion();
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				return getEisType();
-			case JcaPackage.CONNECTOR__VERSION:
-				return getVersion();
-			case JcaPackage.CONNECTOR__LICENSE:
-				return getLicense();
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				return getResourceAdapter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				setVendorName((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				setSpecVersion((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				setEisType((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__VERSION:
-				setVersion((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__LICENSE:
-				setLicense((License)newValue);
-				return;
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				setResourceAdapter((ResourceAdapter)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				setVendorName(VENDOR_NAME_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				setSpecVersion(SPEC_VERSION_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				setEisType(EIS_TYPE_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__LICENSE:
-				setLicense((License)null);
-				return;
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				setResourceAdapter((ResourceAdapter)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				return VENDOR_NAME_EDEFAULT == null ? vendorName != null : !VENDOR_NAME_EDEFAULT.equals(vendorName);
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				return SPEC_VERSION_EDEFAULT == null ? specVersion != null : !SPEC_VERSION_EDEFAULT.equals(specVersion);
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				return EIS_TYPE_EDEFAULT == null ? eisType != null : !EIS_TYPE_EDEFAULT.equals(eisType);
-			case JcaPackage.CONNECTOR__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case JcaPackage.CONNECTOR__LICENSE:
-				return license != null;
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				return resourceAdapter != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (vendorName: ");
-		result.append(vendorName);
-		result.append(", specVersion: ");
-		result.append(specVersion);
-		result.append(", eisType: ");
-		result.append(eisType);
-		result.append(", version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceFactory.java
deleted file mode 100644
index 3226faaa3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class ConnectorResourceFactory extends TranslatorResourceFactory {
-	
-	/**
-	 * Method registerDtds.
-	 */
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.CONNECTOR_SYSTEMID_1_0, "connector_1_0.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.CONNECTOR_ALT_SYSTEMID_1_0, "connector_1.0.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.CONNECTOR_SCHEMA_LOC_1_5, "connector_1_5.xsd"); //$NON-NLS-1$
-	} 
-	
-
-	 
-	/**
-	 * Constructor for ConnectorResourceFactory.
-	 * @param aRendererFactory
-	 */
-	public ConnectorResourceFactory() {
-		super(RendererFactory.getDefaultRendererFactory());
-	}
- 
-	/**
-	 * Constructor for ConnectorResourceFactory.
-	 * @param aRendererFactory
-	 */
-	public ConnectorResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-     */
-    protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new ConnectorResourceImpl(uri, aRenderer);
-    }
-    
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.RAR_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java
deleted file mode 100644
index f6f9dff55..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.connector.ConnectorTranslator;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-public class ConnectorResourceImpl extends XMLResourceImpl implements ConnectorResource{
-
-	/**
-	 * Constructor for ApplicationClientResourceImpl.
-	 * @param uri
-	 * @param aRenderer
-	 */
-	public ConnectorResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-	/**
-	 * Constructor for ApplicationClientResourceImpl.
-	 * @param aRenderer
-	 */
-	public ConnectorResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public Connector getConnector() {
-		return (Connector) getRootObject();
-	}
-
-	
-	public int getType() {
-		return RAR_TYPE;
-	}
-
-
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.CONNECTOR_SYSTEMID_1_0;
-	}
-	
-	public String getJ2EE_Alt_1_2_SystemID() {
-		return J2EEConstants.CONNECTOR_ALT_SYSTEMID_1_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.CONNECTOR_SYSTEMID_1_0;
-	}
-	
-	public String getJ2EE_Alt_1_3_SystemID() {
-		return J2EEConstants.CONNECTOR_ALT_SYSTEMID_1_0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.CONNECTOR_PUBLICID_1_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.CONNECTOR_PUBLICID_1_0;
-	}
-
-
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.CONNECTOR_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setDoctypeValues(java.lang.String, java.lang.String)
-	 * This is setting the module version on the resource.
-	 */
-	public void setDoctypeValues(String publicId, String systemId) {
-		int version = JCA_1_5_ID;
-		if (systemId == null) 
-			version = JCA_1_5_ID;
-		else if (systemId.equals(getJ2EE_1_3_SystemID()))
-			version = JCA_1_0_ID;
-		super.setDoctypeValues(publicId, systemId);
-		super.setVersionID(version);
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (JCA_1_5_ID) :
-					super.setDoctypeValues(null, null);
-					break;
-				case (JCA_1_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-			}
-		syncVersionOfRootObject();
-	}
-		/*
-		 * Based on the J2EE version, this will set the module version
-		 */
-		public void setJ2EEVersionID(int id) {
-		switch (id) {
-			case (J2EE_1_4_ID) :
-						primSetDoctypeValues(null, null);
-						primSetVersionID(JCA_1_5_ID);
-						break;
-			case (J2EE_1_3_ID) :
-						primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-						primSetVersionID(JCA_1_0_ID);
-						break;
-			case (J2EE_1_2_ID) :
-						primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-						primSetVersionID(JCA_1_0_ID);
-				}
-			syncVersionOfRootObject();
-		}
-	/**
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return ConnectorTranslator.INSTANCE;
-	}
-	/* Return J2EE version based on module version
-	 */
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.JCA_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.JCA_1_5_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return JCA_1_5_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		Connector conn = getConnector();
-		if (conn == null)
-			return;
-	
-		String version = conn.getSpecVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			conn.setSpecVersion(newVersion);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/InboundResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/InboundResourceAdapterImpl.java
deleted file mode 100644
index cd33cb550..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/InboundResourceAdapterImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Inbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.InboundResourceAdapterImpl#getMessageAdapter <em>Message Adapter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InboundResourceAdapterImpl extends J2EEEObjectImpl implements InboundResourceAdapter {
-	/**
-	 * The cached value of the '{@link #getMessageAdapter() <em>Message Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected MessageAdapter messageAdapter = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InboundResourceAdapterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.INBOUND_RESOURCE_ADAPTER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageAdapter getMessageAdapter() {
-		return messageAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMessageAdapter(MessageAdapter newMessageAdapter, NotificationChain msgs) {
-		MessageAdapter oldMessageAdapter = messageAdapter;
-		messageAdapter = newMessageAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, oldMessageAdapter, newMessageAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageAdapter(MessageAdapter newMessageAdapter) {
-		if (newMessageAdapter != messageAdapter) {
-			NotificationChain msgs = null;
-			if (messageAdapter != null)
-				msgs = ((InternalEObject)messageAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, null, msgs);
-			if (newMessageAdapter != null)
-				msgs = ((InternalEObject)newMessageAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, null, msgs);
-			msgs = basicSetMessageAdapter(newMessageAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, newMessageAdapter, newMessageAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				return basicSetMessageAdapter(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				return getMessageAdapter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				setMessageAdapter((MessageAdapter)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				setMessageAdapter((MessageAdapter)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				return messageAdapter != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //InboundResourceAdapterImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaFactoryImpl.java
deleted file mode 100644
index adf3140ea..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaFactoryImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-
-/**
- * @generated
- */
-public class JcaFactoryImpl extends EFactoryImpl implements JcaFactory {
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JcaFactory init() {
-		try {
-			JcaFactory theJcaFactory = (JcaFactory)EPackage.Registry.INSTANCE.getEFactory("jca.xmi"); 
-			if (theJcaFactory != null) {
-				return theJcaFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new JcaFactoryImpl();
-	}
-
-	public JcaFactoryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JcaPackage.CONNECTOR: return createConnector();
-			case JcaPackage.RESOURCE_ADAPTER: return createResourceAdapter();
-			case JcaPackage.AUTHENTICATION_MECHANISM: return createAuthenticationMechanism();
-			case JcaPackage.CONFIG_PROPERTY: return createConfigProperty();
-			case JcaPackage.SECURITY_PERMISSION: return createSecurityPermission();
-			case JcaPackage.LICENSE: return createLicense();
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER: return createInboundResourceAdapter();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER: return createOutboundResourceAdapter();
-			case JcaPackage.MESSAGE_ADAPTER: return createMessageAdapter();
-			case JcaPackage.CONNECTION_DEFINITION: return createConnectionDefinition();
-			case JcaPackage.ADMIN_OBJECT: return createAdminObject();
-			case JcaPackage.MESSAGE_LISTENER: return createMessageListener();
-			case JcaPackage.ACTIVATION_SPEC: return createActivationSpec();
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE: return createRequiredConfigPropertyType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case JcaPackage.AUTHENTICATION_MECHANISM_TYPE:
-				return createAuthenticationMechanismTypeFromString(eDataType, initialValue);
-			case JcaPackage.TRANSACTION_SUPPORT_KIND:
-				return createTransactionSupportKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case JcaPackage.AUTHENTICATION_MECHANISM_TYPE:
-				return convertAuthenticationMechanismTypeToString(eDataType, instanceValue);
-			case JcaPackage.TRANSACTION_SUPPORT_KIND:
-				return convertTransactionSupportKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Connector createConnector() {
-		ConnectorImpl connector = new ConnectorImpl();
-		return connector;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public License createLicense() {
-		LicenseImpl license = new LicenseImpl();
-		return license;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InboundResourceAdapter createInboundResourceAdapter() {
-		InboundResourceAdapterImpl inboundResourceAdapter = new InboundResourceAdapterImpl();
-		return inboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutboundResourceAdapter createOutboundResourceAdapter() {
-		OutboundResourceAdapterImpl outboundResourceAdapter = new OutboundResourceAdapterImpl();
-		return outboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageAdapter createMessageAdapter() {
-		MessageAdapterImpl messageAdapter = new MessageAdapterImpl();
-		return messageAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConnectionDefinition createConnectionDefinition() {
-		ConnectionDefinitionImpl connectionDefinition = new ConnectionDefinitionImpl();
-		return connectionDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AdminObject createAdminObject() {
-		AdminObjectImpl adminObject = new AdminObjectImpl();
-		return adminObject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageListener createMessageListener() {
-		MessageListenerImpl messageListener = new MessageListenerImpl();
-		return messageListener;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationSpec createActivationSpec() {
-		ActivationSpecImpl activationSpec = new ActivationSpecImpl();
-		return activationSpec;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequiredConfigPropertyType createRequiredConfigPropertyType() {
-		RequiredConfigPropertyTypeImpl requiredConfigPropertyType = new RequiredConfigPropertyTypeImpl();
-		return requiredConfigPropertyType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuthenticationMechanismType createAuthenticationMechanismTypeFromString(EDataType eDataType, String initialValue) {
-		AuthenticationMechanismType result = AuthenticationMechanismType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAuthenticationMechanismTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionSupportKind createTransactionSupportKindFromString(EDataType eDataType, String initialValue) {
-		TransactionSupportKind result = TransactionSupportKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransactionSupportKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ResourceAdapter createResourceAdapter() {
-		ResourceAdapterImpl resourceAdapter = new ResourceAdapterImpl();
-		return resourceAdapter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public SecurityPermission createSecurityPermission() {
-		SecurityPermissionImpl securityPermission = new SecurityPermissionImpl();
-		return securityPermission;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public AuthenticationMechanism createAuthenticationMechanism() {
-		AuthenticationMechanismImpl authenticationMechanism = new AuthenticationMechanismImpl();
-		return authenticationMechanism;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ConfigProperty createConfigProperty() {
-		ConfigPropertyImpl configProperty = new ConfigPropertyImpl();
-		return configProperty;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JcaPackage getJcaPackage() {
-		return (JcaPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JcaPackage getPackage() {
-		return JcaPackage.eINSTANCE;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java
deleted file mode 100644
index a28e33d60..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class JcaPackageImpl extends EPackageImpl implements JcaPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass authenticationMechanismEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass configPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityPermissionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass licenseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass inboundResourceAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outboundResourceAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectionDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass adminObjectEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageListenerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationSpecEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass requiredConfigPropertyTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum authenticationMechanismTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionSupportKindEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private JcaPackageImpl() {
-		super(eNS_URI, JcaFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JcaPackage init() {
-		if (isInited) return (JcaPackage)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
-		// Obtain or create and register package
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JcaPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theJcaPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theJcaPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theJcaPackage.freeze();
-
-		return theJcaPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getConnector() {
-		return connectorEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_VendorName() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_SpecVersion() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_EisType() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_Version() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getConnector_License() {
-		return (EReference)connectorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getConnector_ResourceAdapter() {
-		return (EReference)connectorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLicense() {
-		return licenseEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLicense_Description() {
-		return (EAttribute)licenseEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLicense_Required() {
-		return (EAttribute)licenseEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLicense_Descriptions() {
-		return (EReference)licenseEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInboundResourceAdapter() {
-		return inboundResourceAdapterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInboundResourceAdapter_MessageAdapter() {
-		return (EReference)inboundResourceAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutboundResourceAdapter() {
-		return outboundResourceAdapterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutboundResourceAdapter_ReauthenticationSupport() {
-		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutboundResourceAdapter_TransactionSupport() {
-		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutboundResourceAdapter_ConnectionDefinitions() {
-		return (EReference)outboundResourceAdapterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutboundResourceAdapter_AuthenticationMechanisms() {
-		return (EReference)outboundResourceAdapterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageAdapter() {
-		return messageAdapterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageAdapter_MessageListeners() {
-		return (EReference)messageAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConnectionDefinition() {
-		return connectionDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ManagedConnectionFactoryClass() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionFactoryInterface() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionFactoryImplClass() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionInterface() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionImplClass() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConnectionDefinition_ConfigProperties() {
-		return (EReference)connectionDefinitionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAdminObject() {
-		return adminObjectEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAdminObject_AdminObjectInterface() {
-		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAdminObject_AdminObjectClass() {
-		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAdminObject_ConfigProperties() {
-		return (EReference)adminObjectEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageListener() {
-		return messageListenerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageListener_MessageListenerType() {
-		return (EAttribute)messageListenerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageListener_ActivationSpec() {
-		return (EReference)messageListenerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationSpec() {
-		return activationSpecEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationSpec_ActivationSpecClass() {
-		return (EAttribute)activationSpecEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationSpec_RequiredConfigProperties() {
-		return (EReference)activationSpecEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRequiredConfigPropertyType() {
-		return requiredConfigPropertyTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRequiredConfigPropertyType_Name() {
-		return (EAttribute)requiredConfigPropertyTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRequiredConfigPropertyType_Descriptions() {
-		return (EReference)requiredConfigPropertyTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getResourceAdapter() {
-		return resourceAdapterEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ManagedConnectionFactoryClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionFactoryInterface() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionFactoryImplClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionInterface() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionImplClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_TransactionSupport() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ReauthenticationSupport() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceAdapter_ResourceAdapterClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceAdapter_SecurityPermissions() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceAdapter_AuthenticationMechanisms() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceAdapter_ConfigProperties() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceAdapter_OutboundResourceAdapter() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceAdapter_InboundResourceAdapter() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceAdapter_AdminObjects() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityPermission() {
-		return securityPermissionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityPermission_Description() {
-		return (EAttribute)securityPermissionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityPermission_Specification() {
-		return (EAttribute)securityPermissionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityPermission_Descriptions() {
-		return (EReference)securityPermissionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getAuthenticationMechanism() {
-		return authenticationMechanismEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_Description() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuthenticationMechanism_AuthenticationMechanism() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_AuthenticationMechanismType() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_CredentialInterface() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getConfigProperty() {
-		return configPropertyEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Description() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Name() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Type() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Value() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConfigProperty_Descriptions() {
-		return (EReference)configPropertyEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransactionSupportKind() {
-		return transactionSupportKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getAuthenticationMechanismType() {
-		return authenticationMechanismTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JcaFactory getJcaFactory() {
-		return (JcaFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		connectorEClass = createEClass(CONNECTOR);
-		createEAttribute(connectorEClass, CONNECTOR__VENDOR_NAME);
-		createEAttribute(connectorEClass, CONNECTOR__SPEC_VERSION);
-		createEAttribute(connectorEClass, CONNECTOR__EIS_TYPE);
-		createEAttribute(connectorEClass, CONNECTOR__VERSION);
-		createEReference(connectorEClass, CONNECTOR__LICENSE);
-		createEReference(connectorEClass, CONNECTOR__RESOURCE_ADAPTER);
-
-		resourceAdapterEClass = createEClass(RESOURCE_ADAPTER);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_INTERFACE);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__TRANSACTION_SUPPORT);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__SECURITY_PERMISSIONS);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__CONFIG_PROPERTIES);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__ADMIN_OBJECTS);
-
-		authenticationMechanismEClass = createEClass(AUTHENTICATION_MECHANISM);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__DESCRIPTION);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE);
-		createEReference(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__DESCRIPTIONS);
-
-		configPropertyEClass = createEClass(CONFIG_PROPERTY);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__DESCRIPTION);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__NAME);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__TYPE);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__VALUE);
-		createEReference(configPropertyEClass, CONFIG_PROPERTY__DESCRIPTIONS);
-
-		securityPermissionEClass = createEClass(SECURITY_PERMISSION);
-		createEAttribute(securityPermissionEClass, SECURITY_PERMISSION__DESCRIPTION);
-		createEAttribute(securityPermissionEClass, SECURITY_PERMISSION__SPECIFICATION);
-		createEReference(securityPermissionEClass, SECURITY_PERMISSION__DESCRIPTIONS);
-
-		licenseEClass = createEClass(LICENSE);
-		createEAttribute(licenseEClass, LICENSE__DESCRIPTION);
-		createEAttribute(licenseEClass, LICENSE__REQUIRED);
-		createEReference(licenseEClass, LICENSE__DESCRIPTIONS);
-
-		inboundResourceAdapterEClass = createEClass(INBOUND_RESOURCE_ADAPTER);
-		createEReference(inboundResourceAdapterEClass, INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER);
-
-		outboundResourceAdapterEClass = createEClass(OUTBOUND_RESOURCE_ADAPTER);
-		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT);
-		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT);
-		createEReference(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS);
-		createEReference(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-
-		messageAdapterEClass = createEClass(MESSAGE_ADAPTER);
-		createEReference(messageAdapterEClass, MESSAGE_ADAPTER__MESSAGE_LISTENERS);
-
-		connectionDefinitionEClass = createEClass(CONNECTION_DEFINITION);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_INTERFACE);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS);
-		createEReference(connectionDefinitionEClass, CONNECTION_DEFINITION__CONFIG_PROPERTIES);
-
-		adminObjectEClass = createEClass(ADMIN_OBJECT);
-		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE);
-		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ADMIN_OBJECT_CLASS);
-		createEReference(adminObjectEClass, ADMIN_OBJECT__CONFIG_PROPERTIES);
-
-		messageListenerEClass = createEClass(MESSAGE_LISTENER);
-		createEAttribute(messageListenerEClass, MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE);
-		createEReference(messageListenerEClass, MESSAGE_LISTENER__ACTIVATION_SPEC);
-
-		activationSpecEClass = createEClass(ACTIVATION_SPEC);
-		createEAttribute(activationSpecEClass, ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS);
-		createEReference(activationSpecEClass, ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES);
-
-		requiredConfigPropertyTypeEClass = createEClass(REQUIRED_CONFIG_PROPERTY_TYPE);
-		createEAttribute(requiredConfigPropertyTypeEClass, REQUIRED_CONFIG_PROPERTY_TYPE__NAME);
-		createEReference(requiredConfigPropertyTypeEClass, REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS);
-
-		// Create enums
-		authenticationMechanismTypeEEnum = createEEnum(AUTHENTICATION_MECHANISM_TYPE);
-		transactionSupportKindEEnum = createEEnum(TRANSACTION_SUPPORT_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		connectorEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		resourceAdapterEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		authenticationMechanismEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		configPropertyEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		securityPermissionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		licenseEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		inboundResourceAdapterEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		outboundResourceAdapterEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		messageAdapterEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		connectionDefinitionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		adminObjectEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		messageListenerEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		activationSpecEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		requiredConfigPropertyTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConnector_VendorName(), ecorePackage.getEString(), "vendorName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnector_SpecVersion(), ecorePackage.getEString(), "specVersion", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnector_EisType(), ecorePackage.getEString(), "eisType", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnector_Version(), ecorePackage.getEString(), "version", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnector_ResourceAdapter(), this.getResourceAdapter(), null, "resourceAdapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(resourceAdapterEClass, ResourceAdapter.class, "ResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getResourceAdapter_ManagedConnectionFactoryClass(), ecorePackage.getEString(), "managedConnectionFactoryClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_ConnectionFactoryInterface(), ecorePackage.getEString(), "connectionFactoryInterface", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_ConnectionFactoryImplClass(), ecorePackage.getEString(), "connectionFactoryImplClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_ConnectionInterface(), ecorePackage.getEString(), "connectionInterface", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_ConnectionImplClass(), ecorePackage.getEString(), "connectionImplClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_TransactionSupport(), this.getTransactionSupportKind(), "transactionSupport", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_ReauthenticationSupport(), ecorePackage.getEBoolean(), "reauthenticationSupport", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getResourceAdapter_ResourceAdapterClass(), ecorePackage.getEString(), "resourceAdapterClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceAdapter_SecurityPermissions(), this.getSecurityPermission(), null, "securityPermissions", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceAdapter_AuthenticationMechanisms(), this.getAuthenticationMechanism(), null, "authenticationMechanisms", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceAdapter_ConfigProperties(), this.getConfigProperty(), null, "configProperties", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceAdapter_OutboundResourceAdapter(), this.getOutboundResourceAdapter(), null, "outboundResourceAdapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceAdapter_InboundResourceAdapter(), this.getInboundResourceAdapter(), null, "inboundResourceAdapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getResourceAdapter_AdminObjects(), this.getAdminObject(), null, "adminObjects", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(authenticationMechanismEClass, AuthenticationMechanism.class, "AuthenticationMechanism", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAuthenticationMechanism_Description(), ecorePackage.getEString(), "description", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuthenticationMechanism_AuthenticationMechanism(), ecorePackage.getEString(), "authenticationMechanism", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuthenticationMechanism_AuthenticationMechanismType(), this.getAuthenticationMechanismType(), "authenticationMechanismType", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuthenticationMechanism_CredentialInterface(), ecorePackage.getEString(), "credentialInterface", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuthenticationMechanism_CustomAuthMechType(), ecorePackage.getEString(), "customAuthMechType", null, 0, 1, AuthenticationMechanism.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuthenticationMechanism_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConfigProperty_Description(), ecorePackage.getEString(), "description", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConfigProperty_Name(), ecorePackage.getEString(), "name", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConfigProperty_Type(), ecorePackage.getEString(), "type", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConfigProperty_Value(), ecorePackage.getEString(), "value", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConfigProperty_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(securityPermissionEClass, SecurityPermission.class, "SecurityPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSecurityPermission_Description(), ecorePackage.getEString(), "description", null, 0, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSecurityPermission_Specification(), ecorePackage.getEString(), "specification", null, 0, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityPermission_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(licenseEClass, License.class, "License", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLicense_Description(), ecorePackage.getEString(), "description", null, 0, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLicense_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLicense_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(inboundResourceAdapterEClass, InboundResourceAdapter.class, "InboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getInboundResourceAdapter_MessageAdapter(), this.getMessageAdapter(), null, "messageAdapter", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), ecorePackage.getEBoolean(), "reauthenticationSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportKind(), "transactionSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOutboundResourceAdapter_ConnectionDefinitions(), this.getConnectionDefinition(), null, "connectionDefinitions", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOutboundResourceAdapter_AuthenticationMechanisms(), this.getAuthenticationMechanism(), null, "authenticationMechanisms", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(messageAdapterEClass, MessageAdapter.class, "MessageAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMessageAdapter_MessageListeners(), this.getMessageListener(), null, "messageListeners", null, 1, -1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(connectionDefinitionEClass, ConnectionDefinition.class, "ConnectionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConnectionDefinition_ManagedConnectionFactoryClass(), ecorePackage.getEString(), "managedConnectionFactoryClass", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnectionDefinition_ConnectionFactoryInterface(), ecorePackage.getEString(), "connectionFactoryInterface", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnectionDefinition_ConnectionFactoryImplClass(), ecorePackage.getEString(), "connectionFactoryImplClass", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnectionDefinition_ConnectionInterface(), ecorePackage.getEString(), "connectionInterface", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConnectionDefinition_ConnectionImplClass(), ecorePackage.getEString(), "connectionImplClass", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConnectionDefinition_ConfigProperties(), this.getConfigProperty(), null, "configProperties", null, 0, -1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(adminObjectEClass, AdminObject.class, "AdminObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAdminObject_AdminObjectInterface(), ecorePackage.getEString(), "adminObjectInterface", null, 0, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAdminObject_AdminObjectClass(), ecorePackage.getEString(), "adminObjectClass", null, 0, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAdminObject_ConfigProperties(), this.getConfigProperty(), null, "configProperties", null, 0, -1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(messageListenerEClass, MessageListener.class, "MessageListener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMessageListener_MessageListenerType(), ecorePackage.getEString(), "messageListenerType", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMessageListener_ActivationSpec(), this.getActivationSpec(), null, "activationSpec", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(activationSpecEClass, ActivationSpec.class, "ActivationSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getActivationSpec_ActivationSpecClass(), ecorePackage.getEString(), "activationSpecClass", null, 0, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getActivationSpec_RequiredConfigProperties(), this.getRequiredConfigPropertyType(), null, "requiredConfigProperties", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(requiredConfigPropertyTypeEClass, RequiredConfigPropertyType.class, "RequiredConfigPropertyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRequiredConfigPropertyType_Name(), ecorePackage.getEString(), "name", null, 0, 1, RequiredConfigPropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRequiredConfigPropertyType_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, RequiredConfigPropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(authenticationMechanismTypeEEnum, AuthenticationMechanismType.class, "AuthenticationMechanismType");
-		addEEnumLiteral(authenticationMechanismTypeEEnum, AuthenticationMechanismType.BASIC_PASSWORD_LITERAL);
-		addEEnumLiteral(authenticationMechanismTypeEEnum, AuthenticationMechanismType.KERBV5_LITERAL);
-
-		initEEnum(transactionSupportKindEEnum, TransactionSupportKind.class, "TransactionSupportKind");
-		addEEnumLiteral(transactionSupportKindEEnum, TransactionSupportKind.NO_TRANSACTION_LITERAL);
-		addEEnumLiteral(transactionSupportKindEEnum, TransactionSupportKind.LOCAL_TRANSACTION_LITERAL);
-		addEEnumLiteral(transactionSupportKindEEnum, TransactionSupportKind.XA_TRANSACTION_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_CustomAuthMechType() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuthenticationMechanism_Descriptions() {
-		return (EReference)authenticationMechanismEClass.getEStructuralFeatures().get(5);
-	}
-
-} //JcaPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/LicenseImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/LicenseImpl.java
deleted file mode 100644
index 92efc7778..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/LicenseImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-
-
-/**
- * Specifies licensing requirements for the resource adapter module. Specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions).
- * @generated
- */
-public class LicenseImpl extends J2EEEObjectImpl implements License {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRequired()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REQUIRED_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean required = REQUIRED_EDEFAULT;
-	/**
-	 * This is true if the Required attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean requiredESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected LicenseImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.LICENSE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.LICENSE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isRequired() {
-		return required;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRequired(boolean newRequired) {
-		boolean oldRequired = required;
-		required = newRequired;
-		boolean oldRequiredESet = requiredESet;
-		requiredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.LICENSE__REQUIRED, oldRequired, required, !oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRequired() {
-		boolean oldRequired = required;
-		boolean oldRequiredESet = requiredESet;
-		required = REQUIRED_EDEFAULT;
-		requiredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.LICENSE__REQUIRED, oldRequired, REQUIRED_EDEFAULT, oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRequired() {
-		return requiredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.LICENSE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.LICENSE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.LICENSE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.LICENSE__REQUIRED:
-				unsetRequired();
-				return;
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.LICENSE__REQUIRED:
-				return isSetRequired();
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", required: ");
-		if (requiredESet) result.append(required); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/MessageAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/MessageAdapterImpl.java
deleted file mode 100644
index c89036ca7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/MessageAdapterImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Adapter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageAdapterImpl#getMessageListeners <em>Message Listeners</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageAdapterImpl extends J2EEEObjectImpl implements MessageAdapter {
-	/**
-	 * The cached value of the '{@link #getMessageListeners() <em>Message Listeners</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageListeners = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageAdapterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.MESSAGE_ADAPTER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageListeners() {
-		if (messageListeners == null) {
-			messageListeners = new EObjectContainmentEList(MessageListener.class, this, JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS);
-		}
-		return messageListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				return ((InternalEList)getMessageListeners()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				return getMessageListeners();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				getMessageListeners().clear();
-				getMessageListeners().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				getMessageListeners().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				return messageListeners != null && !messageListeners.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MessageAdapterImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/MessageListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/MessageListenerImpl.java
deleted file mode 100644
index 7f7ec35d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/MessageListenerImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Listener</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageListenerImpl#getMessageListenerType <em>Message Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.MessageListenerImpl#getActivationSpec <em>Activation Spec</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageListenerImpl extends J2EEEObjectImpl implements MessageListener {
-	/**
-	 * The default value of the '{@link #getMessageListenerType() <em>Message Listener Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_LISTENER_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageListenerType() <em>Message Listener Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageListenerType = MESSAGE_LISTENER_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getActivationSpec() <em>Activation Spec</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationSpec()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActivationSpec activationSpec = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageListenerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.MESSAGE_LISTENER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageListenerType() {
-		return messageListenerType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageListenerType(String newMessageListenerType) {
-		String oldMessageListenerType = messageListenerType;
-		messageListenerType = newMessageListenerType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE, oldMessageListenerType, messageListenerType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationSpec getActivationSpec() {
-		return activationSpec;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetActivationSpec(ActivationSpec newActivationSpec, NotificationChain msgs) {
-		ActivationSpec oldActivationSpec = activationSpec;
-		activationSpec = newActivationSpec;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, oldActivationSpec, newActivationSpec);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationSpec(ActivationSpec newActivationSpec) {
-		if (newActivationSpec != activationSpec) {
-			NotificationChain msgs = null;
-			if (activationSpec != null)
-				msgs = ((InternalEObject)activationSpec).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, null, msgs);
-			if (newActivationSpec != null)
-				msgs = ((InternalEObject)newActivationSpec).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, null, msgs);
-			msgs = basicSetActivationSpec(newActivationSpec, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, newActivationSpec, newActivationSpec));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				return basicSetActivationSpec(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				return getMessageListenerType();
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				return getActivationSpec();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				setMessageListenerType((String)newValue);
-				return;
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				setActivationSpec((ActivationSpec)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				setMessageListenerType(MESSAGE_LISTENER_TYPE_EDEFAULT);
-				return;
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				setActivationSpec((ActivationSpec)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				return MESSAGE_LISTENER_TYPE_EDEFAULT == null ? messageListenerType != null : !MESSAGE_LISTENER_TYPE_EDEFAULT.equals(messageListenerType);
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				return activationSpec != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (messageListenerType: ");
-		result.append(messageListenerType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageListenerImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/OutboundResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/OutboundResourceAdapterImpl.java
deleted file mode 100644
index c71621e29..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/OutboundResourceAdapterImpl.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl#isReauthenticationSupport <em>Reauthentication Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl#getTransactionSupport <em>Transaction Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl#getConnectionDefinitions <em>Connection Definitions</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.OutboundResourceAdapterImpl#getAuthenticationMechanisms <em>Authentication Mechanisms</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OutboundResourceAdapterImpl extends J2EEEObjectImpl implements OutboundResourceAdapter {
-	/**
-	 * The default value of the '{@link #isReauthenticationSupport() <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REAUTHENTICATION_SUPPORT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReauthenticationSupport() <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-
-	/**
-	 * This is true if the Reauthentication Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reauthenticationSupportESet = false;
-
-	/**
-	 * The default value of the '{@link #getTransactionSupport() <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionSupportKind TRANSACTION_SUPPORT_EDEFAULT = TransactionSupportKind.NO_TRANSACTION_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getTransactionSupport() <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected TransactionSupportKind transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-
-	/**
-	 * This is true if the Transaction Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionSupportESet = false;
-
-	/**
-	 * The cached value of the '{@link #getConnectionDefinitions() <em>Connection Definitions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionDefinitions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList connectionDefinitions = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthenticationMechanisms() <em>Authentication Mechanisms</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanisms()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList authenticationMechanisms = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutboundResourceAdapterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.OUTBOUND_RESOURCE_ADAPTER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isReauthenticationSupport() {
-		return reauthenticationSupport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReauthenticationSupport(boolean newReauthenticationSupport) {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		reauthenticationSupport = newReauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, reauthenticationSupport, !oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReauthenticationSupport() {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-		reauthenticationSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, REAUTHENTICATION_SUPPORT_EDEFAULT, oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReauthenticationSupport() {
-		return reauthenticationSupportESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionSupportKind getTransactionSupport() {
-		return transactionSupport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionSupport(TransactionSupportKind newTransactionSupport) {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		transactionSupport = newTransactionSupport == null ? TRANSACTION_SUPPORT_EDEFAULT : newTransactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, transactionSupport, !oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionSupport() {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-		transactionSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, TRANSACTION_SUPPORT_EDEFAULT, oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionSupport() {
-		return transactionSupportESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConnectionDefinitions() {
-		if (connectionDefinitions == null) {
-			connectionDefinitions = new EObjectContainmentEList(ConnectionDefinition.class, this, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS);
-		}
-		return connectionDefinitions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAuthenticationMechanisms() {
-		if (authenticationMechanisms == null) {
-			authenticationMechanisms = new EObjectContainmentEList(AuthenticationMechanism.class, this, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-		}
-		return authenticationMechanisms;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				return ((InternalEList)getConnectionDefinitions()).basicRemove(otherEnd, msgs);
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return ((InternalEList)getAuthenticationMechanisms()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isReauthenticationSupport() ? Boolean.TRUE : Boolean.FALSE;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return getTransactionSupport();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				return getConnectionDefinitions();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return getAuthenticationMechanisms();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				setReauthenticationSupport(((Boolean)newValue).booleanValue());
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				setTransactionSupport((TransactionSupportKind)newValue);
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				getConnectionDefinitions().clear();
-				getConnectionDefinitions().addAll((Collection)newValue);
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				getAuthenticationMechanisms().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				unsetReauthenticationSupport();
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				unsetTransactionSupport();
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				getConnectionDefinitions().clear();
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isSetReauthenticationSupport();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return isSetTransactionSupport();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				return connectionDefinitions != null && !connectionDefinitions.isEmpty();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return authenticationMechanisms != null && !authenticationMechanisms.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (reauthenticationSupport: ");
-		if (reauthenticationSupportESet) result.append(reauthenticationSupport); else result.append("<unset>");
-		result.append(", transactionSupport: ");
-		if (transactionSupportESet) result.append(transactionSupport); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //OutboundResourceAdapterImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/RequiredConfigPropertyTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/RequiredConfigPropertyTypeImpl.java
deleted file mode 100644
index af0a25b9b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/RequiredConfigPropertyTypeImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Required Config Property Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.RequiredConfigPropertyTypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jca.internal.impl.RequiredConfigPropertyTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RequiredConfigPropertyTypeImpl extends J2EEEObjectImpl implements RequiredConfigPropertyType {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RequiredConfigPropertyTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.REQUIRED_CONFIG_PROPERTY_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				return getName();
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RequiredConfigPropertyTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ResourceAdapterImpl.java
deleted file mode 100644
index 1fe04bbee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ResourceAdapterImpl.java
+++ /dev/null
@@ -1,812 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-
-
-/**
- * Specifies information about the resource adapter. The information includes fully-qualified names of class//interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional
- * required security permissions.
- * 
- * If there is no authentication-mechanism specified as part of
- * resource adapter element then the resource adapter does not
- * support any standard security authentication mechanisms as part
- * of security contract. The application server ignores the security
- * part of the system contracts in this case.
- * @generated
- */
-public class ResourceAdapterImpl extends J2EEEObjectImpl implements ResourceAdapter {
-
-	/**
-	 * The default value of the '{@link #getManagedConnectionFactoryClass() <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String managedConnectionFactoryClass = MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionFactoryInterface() <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionFactoryInterface = CONNECTION_FACTORY_INTERFACE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionFactoryImplClass() <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionFactoryImplClass = CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionInterface() <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionInterface = CONNECTION_INTERFACE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionImplClass() <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionImplClass = CONNECTION_IMPL_CLASS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getTransactionSupport() <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionSupportKind TRANSACTION_SUPPORT_EDEFAULT = TransactionSupportKind.NO_TRANSACTION_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionSupportKind transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-	/**
-	 * This is true if the Transaction Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionSupportESet = false;
-
-	/**
-	 * The default value of the '{@link #isReauthenticationSupport() <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REAUTHENTICATION_SUPPORT_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-	/**
-	 * This is true if the Reauthentication Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reauthenticationSupportESet = false;
-
-	/**
-	 * The default value of the '{@link #getResourceAdapterClass() <em>Resource Adapter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESOURCE_ADAPTER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceAdapterClass() <em>Resource Adapter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resourceAdapterClass = RESOURCE_ADAPTER_CLASS_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityPermissions = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList authenticationMechanisms = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList configProperties = null;
-	/**
-	 * The cached value of the '{@link #getOutboundResourceAdapter() <em>Outbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected OutboundResourceAdapter outboundResourceAdapter = null;
-
-	/**
-	 * The cached value of the '{@link #getInboundResourceAdapter() <em>Inbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInboundResourceAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected InboundResourceAdapter inboundResourceAdapter = null;
-
-	/**
-	 * The cached value of the '{@link #getAdminObjects() <em>Admin Objects</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjects()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList adminObjects = null;
-
-	protected ResourceAdapterImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.RESOURCE_ADAPTER;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully qualified name of the Java class that implements the javax.resource.spi.Managed-ConnectionFactory interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts.
-
-	 */
-	public String getManagedConnectionFactoryClass() {
-		return managedConnectionFactoryClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setManagedConnectionFactoryClass(String newManagedConnectionFactoryClass) {
-		String oldManagedConnectionFactoryClass = managedConnectionFactoryClass;
-		managedConnectionFactoryClass = newManagedConnectionFactoryClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS, oldManagedConnectionFactoryClass, managedConnectionFactoryClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully-qualified name of the ConnectionFactory interface supported by the resource adapter.
-
-	 */
-	public String getConnectionFactoryInterface() {
-		return connectionFactoryInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionFactoryInterface(String newConnectionFactoryInterface) {
-		String oldConnectionFactoryInterface = connectionFactoryInterface;
-		connectionFactoryInterface = newConnectionFactoryInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE, oldConnectionFactoryInterface, connectionFactoryInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully-qualified name of the ConnectionFactory class that implements resource adapter specific ConnectionFactory interface.
-	 */
-	public String getConnectionFactoryImplClass() {
-		return connectionFactoryImplClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionFactoryImplClass(String newConnectionFactoryImplClass) {
-		String oldConnectionFactoryImplClass = connectionFactoryImplClass;
-		connectionFactoryImplClass = newConnectionFactoryImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS, oldConnectionFactoryImplClass, connectionFactoryImplClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getConnectionInterface() {
-		return connectionInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionInterface(String newConnectionInterface) {
-		String oldConnectionInterface = connectionInterface;
-		connectionInterface = newConnectionInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE, oldConnectionInterface, connectionInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully-qualified name of the Connection interface supported by the resource adapter.
-	 */
-	public String getConnectionImplClass() {
-		return connectionImplClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionImplClass(String newConnectionImplClass) {
-		String oldConnectionImplClass = connectionImplClass;
-		connectionImplClass = newConnectionImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS, oldConnectionImplClass, connectionImplClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transaction-support element specifies the level of transaction
-	 * support provided by the resource adapter.
-	 * The value of transaction-support must be one of the following:
-	 *   NoTransaction
-	 *   LocalTransaction
-	 *   XATransaction
-	 */
-	public TransactionSupportKind getTransactionSupport() {
-		return transactionSupport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionSupport(TransactionSupportKind newTransactionSupport) {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		transactionSupport = newTransactionSupport == null ? TRANSACTION_SUPPORT_EDEFAULT : newTransactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, transactionSupport, !oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionSupport() {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-		transactionSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, TRANSACTION_SUPPORT_EDEFAULT, oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionSupport() {
-		return transactionSupportESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies whether the resource adapter implementation supports re-authentication of existing Managed-Connection instance. Note that this information is for the resource adapter implementation and not for the underlying EIS instance.
-	 */
-	public boolean isReauthenticationSupport() {
-		return reauthenticationSupport;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setReauthenticationSupport(boolean newReauthenticationSupport) {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		reauthenticationSupport = newReauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, reauthenticationSupport, !oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReauthenticationSupport() {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-		reauthenticationSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, REAUTHENTICATION_SUPPORT_EDEFAULT, oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReauthenticationSupport() {
-		return reauthenticationSupportESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getResourceAdapterClass() {
-		return resourceAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourceAdapterClass(String newResourceAdapterClass) {
-		String oldResourceAdapterClass = resourceAdapterClass;
-		resourceAdapterClass = newResourceAdapterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS, oldResourceAdapterClass, resourceAdapterClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityPermissions() {
-		if (securityPermissions == null) {
-			securityPermissions = new EObjectContainmentEList(SecurityPermission.class, this, JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS);
-		}
-		return securityPermissions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getAuthenticationMechanisms() {
-		if (authenticationMechanisms == null) {
-			authenticationMechanisms = new EObjectContainmentEList(AuthenticationMechanism.class, this, JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-		}
-		return authenticationMechanisms;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ConfigProperty.class, this, JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutboundResourceAdapter getOutboundResourceAdapter() {
-		return outboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOutboundResourceAdapter(OutboundResourceAdapter newOutboundResourceAdapter, NotificationChain msgs) {
-		OutboundResourceAdapter oldOutboundResourceAdapter = outboundResourceAdapter;
-		outboundResourceAdapter = newOutboundResourceAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, oldOutboundResourceAdapter, newOutboundResourceAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutboundResourceAdapter(OutboundResourceAdapter newOutboundResourceAdapter) {
-		if (newOutboundResourceAdapter != outboundResourceAdapter) {
-			NotificationChain msgs = null;
-			if (outboundResourceAdapter != null)
-				msgs = ((InternalEObject)outboundResourceAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, null, msgs);
-			if (newOutboundResourceAdapter != null)
-				msgs = ((InternalEObject)newOutboundResourceAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, null, msgs);
-			msgs = basicSetOutboundResourceAdapter(newOutboundResourceAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, newOutboundResourceAdapter, newOutboundResourceAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InboundResourceAdapter getInboundResourceAdapter() {
-		return inboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInboundResourceAdapter(InboundResourceAdapter newInboundResourceAdapter, NotificationChain msgs) {
-		InboundResourceAdapter oldInboundResourceAdapter = inboundResourceAdapter;
-		inboundResourceAdapter = newInboundResourceAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, oldInboundResourceAdapter, newInboundResourceAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInboundResourceAdapter(InboundResourceAdapter newInboundResourceAdapter) {
-		if (newInboundResourceAdapter != inboundResourceAdapter) {
-			NotificationChain msgs = null;
-			if (inboundResourceAdapter != null)
-				msgs = ((InternalEObject)inboundResourceAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, null, msgs);
-			if (newInboundResourceAdapter != null)
-				msgs = ((InternalEObject)newInboundResourceAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, null, msgs);
-			msgs = basicSetInboundResourceAdapter(newInboundResourceAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, newInboundResourceAdapter, newInboundResourceAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAdminObjects() {
-		if (adminObjects == null) {
-			adminObjects = new EObjectContainmentEList(AdminObject.class, this, JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS);
-		}
-		return adminObjects;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				return ((InternalEList)getSecurityPermissions()).basicRemove(otherEnd, msgs);
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return ((InternalEList)getAuthenticationMechanisms()).basicRemove(otherEnd, msgs);
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				return ((InternalEList)getConfigProperties()).basicRemove(otherEnd, msgs);
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				return basicSetOutboundResourceAdapter(null, msgs);
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				return basicSetInboundResourceAdapter(null, msgs);
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				return ((InternalEList)getAdminObjects()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				return getManagedConnectionFactoryClass();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				return getConnectionFactoryInterface();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				return getConnectionFactoryImplClass();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				return getConnectionInterface();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				return getConnectionImplClass();
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return getTransactionSupport();
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isReauthenticationSupport() ? Boolean.TRUE : Boolean.FALSE;
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				return getResourceAdapterClass();
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				return getSecurityPermissions();
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return getAuthenticationMechanisms();
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				return getConfigProperties();
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				return getOutboundResourceAdapter();
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				return getInboundResourceAdapter();
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				return getAdminObjects();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				setConnectionInterface((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				setTransactionSupport((TransactionSupportKind)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				setReauthenticationSupport(((Boolean)newValue).booleanValue());
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				setResourceAdapterClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				getSecurityPermissions().clear();
-				getSecurityPermissions().addAll((Collection)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				getAuthenticationMechanisms().addAll((Collection)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				setOutboundResourceAdapter((OutboundResourceAdapter)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				setInboundResourceAdapter((InboundResourceAdapter)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				getAdminObjects().clear();
-				getAdminObjects().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass(MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface(CONNECTION_FACTORY_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass(CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				setConnectionInterface(CONNECTION_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass(CONNECTION_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				unsetTransactionSupport();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				unsetReauthenticationSupport();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				setResourceAdapterClass(RESOURCE_ADAPTER_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				getSecurityPermissions().clear();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				setOutboundResourceAdapter((OutboundResourceAdapter)null);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				setInboundResourceAdapter((InboundResourceAdapter)null);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				getAdminObjects().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				return MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT == null ? managedConnectionFactoryClass != null : !MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT.equals(managedConnectionFactoryClass);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				return CONNECTION_FACTORY_INTERFACE_EDEFAULT == null ? connectionFactoryInterface != null : !CONNECTION_FACTORY_INTERFACE_EDEFAULT.equals(connectionFactoryInterface);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				return CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT == null ? connectionFactoryImplClass != null : !CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT.equals(connectionFactoryImplClass);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				return CONNECTION_INTERFACE_EDEFAULT == null ? connectionInterface != null : !CONNECTION_INTERFACE_EDEFAULT.equals(connectionInterface);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				return CONNECTION_IMPL_CLASS_EDEFAULT == null ? connectionImplClass != null : !CONNECTION_IMPL_CLASS_EDEFAULT.equals(connectionImplClass);
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return isSetTransactionSupport();
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isSetReauthenticationSupport();
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				return RESOURCE_ADAPTER_CLASS_EDEFAULT == null ? resourceAdapterClass != null : !RESOURCE_ADAPTER_CLASS_EDEFAULT.equals(resourceAdapterClass);
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				return securityPermissions != null && !securityPermissions.isEmpty();
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return authenticationMechanisms != null && !authenticationMechanisms.isEmpty();
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				return outboundResourceAdapter != null;
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				return inboundResourceAdapter != null;
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				return adminObjects != null && !adminObjects.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (managedConnectionFactoryClass: ");
-		result.append(managedConnectionFactoryClass);
-		result.append(", connectionFactoryInterface: ");
-		result.append(connectionFactoryInterface);
-		result.append(", connectionFactoryImplClass: ");
-		result.append(connectionFactoryImplClass);
-		result.append(", connectionInterface: ");
-		result.append(connectionInterface);
-		result.append(", connectionImplClass: ");
-		result.append(connectionImplClass);
-		result.append(", transactionSupport: ");
-		if (transactionSupportESet) result.append(transactionSupport); else result.append("<unset>");
-		result.append(", reauthenticationSupport: ");
-		if (reauthenticationSupportESet) result.append(reauthenticationSupport); else result.append("<unset>");
-		result.append(", resourceAdapterClass: ");
-		result.append(resourceAdapterClass);
-		result.append(')');
-		return result.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/SecurityPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/SecurityPermissionImpl.java
deleted file mode 100644
index 8c22329ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/SecurityPermissionImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-/**
- * Specifies a security permission that is required by the resource adapter code.
- * 
- * The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.
- * @generated
- */
-public class SecurityPermissionImpl extends J2EEEObjectImpl implements SecurityPermission {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getSpecification() <em>Specification</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SPECIFICATION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String specification = SPECIFICATION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected SecurityPermissionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.Literals.SECURITY_PERMISSION;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.SECURITY_PERMISSION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The element permission-spec specifies a security permission based on the Security policy file syntax. 
-
-	 */
-	public String getSpecification() {
-		return specification;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSpecification(String newSpecification) {
-		String oldSpecification = specification;
-		specification = newSpecification;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.SECURITY_PERMISSION__SPECIFICATION, oldSpecification, specification));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				return getSpecification();
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				setSpecification((String)newValue);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				setSpecification(SPECIFICATION_EDEFAULT);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				return SPECIFICATION_EDEFAULT == null ? specification != null : !SPECIFICATION_EDEFAULT.equals(specification);
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", specification: ");
-		result.append(specification);
-		result.append(')');
-		return result.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JCADescriptionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JCADescriptionHelper.java
deleted file mode 100644
index 686e4f1b7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JCADescriptionHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.util;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-/**
- * @deprecated
- */
-public class JCADescriptionHelper {
-	public static void setDescription(ConfigProperty property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	public static String getDescription(ConfigProperty property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(SecurityPermission property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	
-	public static String getDescription(SecurityPermission property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(License property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	
-	public static String getDescription(License property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(AuthenticationMechanism property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	
-	public static String getDescription(AuthenticationMechanism property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(RequiredConfigPropertyType property, String description, int jcaVersionID) {
-		if(jcaVersionID == J2EEVersionConstants.JCA_1_5_ID) {
-	        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-			descriptionObj.setValue(description);
-			property.getDescriptions().add(descriptionObj);
-	    }
-	}
-	public static String getDescription(RequiredConfigPropertyType property,int jcaVersionID) {
-		if(jcaVersionID == J2EEVersionConstants.JCA_1_5_ID) {
-			 EList localizedDescriptions = property.getDescriptions();
-			 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-			 	return null;
-		     Description localizedDescription = (Description)localizedDescriptions.get(0);
-		     if(localizedDescription != null)
-		     	return localizedDescription.getValue();
-	    }
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JcaAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JcaAdapterFactory.java
deleted file mode 100644
index b0041d941..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JcaAdapterFactory.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-
-public class JcaAdapterFactory extends AdapterFactoryImpl {
-	protected static JcaPackage modelPackage;
-
-	public JcaAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (JcaPackage)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected JcaSwitch sw = new JcaSwitch() {
-		public Object caseConnector(Connector object) {
-			return createConnectorAdapter();
-		}
-		public Object caseLicense(License object) {
-			return createLicenseAdapter();
-		}
-		public Object caseResourceAdapter(ResourceAdapter object) {
-			return createResourceAdapterAdapter();
-		}
-		public Object caseSecurityPermission(SecurityPermission object) {
-			return createSecurityPermissionAdapter();
-		}
-		public Object caseAuthenticationMechanism(AuthenticationMechanism object) {
-			return createAuthenticationMechanismAdapter();
-		}
-		public Object caseConfigProperty(ConfigProperty object) {
-			return createConfigPropertyAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target); // sw
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createConnectorAdapter() {
-		return null;
-	}
-
-	public Adapter createLicenseAdapter() {
-		return null;
-	}
-
-	public Adapter createResourceAdapterAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityPermissionAdapter() {
-		return null;
-	}
-
-	public Adapter createAuthenticationMechanismAdapter() {
-		return null;
-	}
-
-	public Adapter createConfigPropertyAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JcaSwitch modelSwitch =
-		new JcaSwitch() {
-			public Object caseConnector(Connector object) {
-				return createConnectorAdapter();
-			}
-			public Object caseResourceAdapter(ResourceAdapter object) {
-				return createResourceAdapterAdapter();
-			}
-			public Object caseAuthenticationMechanism(AuthenticationMechanism object) {
-				return createAuthenticationMechanismAdapter();
-			}
-			public Object caseConfigProperty(ConfigProperty object) {
-				return createConfigPropertyAdapter();
-			}
-			public Object caseSecurityPermission(SecurityPermission object) {
-				return createSecurityPermissionAdapter();
-			}
-			public Object caseLicense(License object) {
-				return createLicenseAdapter();
-			}
-			public Object caseInboundResourceAdapter(InboundResourceAdapter object) {
-				return createInboundResourceAdapterAdapter();
-			}
-			public Object caseOutboundResourceAdapter(OutboundResourceAdapter object) {
-				return createOutboundResourceAdapterAdapter();
-			}
-			public Object caseMessageAdapter(MessageAdapter object) {
-				return createMessageAdapterAdapter();
-			}
-			public Object caseConnectionDefinition(ConnectionDefinition object) {
-				return createConnectionDefinitionAdapter();
-			}
-			public Object caseAdminObject(AdminObject object) {
-				return createAdminObjectAdapter();
-			}
-			public Object caseMessageListener(MessageListener object) {
-				return createMessageListenerAdapter();
-			}
-			public Object caseActivationSpec(ActivationSpec object) {
-				return createActivationSpecAdapter();
-			}
-			public Object caseRequiredConfigPropertyType(RequiredConfigPropertyType object) {
-				return createRequiredConfigPropertyTypeAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createConnectorAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLicenseAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.InboundResourceAdapter <em>Inbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.InboundResourceAdapter
-	 * @generated
-	 */
-	public Adapter createInboundResourceAdapterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.OutboundResourceAdapter <em>Outbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.OutboundResourceAdapter
-	 * @generated
-	 */
-	public Adapter createOutboundResourceAdapterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.MessageAdapter <em>Message Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.MessageAdapter
-	 * @generated
-	 */
-	public Adapter createMessageAdapterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.ConnectionDefinition <em>Connection Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.ConnectionDefinition
-	 * @generated
-	 */
-	public Adapter createConnectionDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.AdminObject <em>Admin Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.AdminObject
-	 * @generated
-	 */
-	public Adapter createAdminObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.MessageListener <em>Message Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.MessageListener
-	 * @generated
-	 */
-	public Adapter createMessageListenerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.ActivationSpec <em>Activation Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.ActivationSpec
-	 * @generated
-	 */
-	public Adapter createActivationSpecAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType <em>Required Config Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType
-	 * @generated
-	 */
-	public Adapter createRequiredConfigPropertyTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createResourceAdapterAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityPermissionAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAuthenticationMechanismAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createConfigPropertyAdapterGen() {
-		return null;
-	}
-
-} //JcaAdapterFactory
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JcaSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JcaSwitch.java
deleted file mode 100644
index d2ad30cfd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/util/JcaSwitch.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.jca.JcaPackage
- * @generated
- */
-public class JcaSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JcaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JcaSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JcaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case JcaPackage.CONNECTOR: {
-				Connector connector = (Connector)theEObject;
-				Object result = caseConnector(connector);
-				if (result == null) result = caseCompatibilityDescriptionGroup(connector);
-				if (result == null) result = caseDescriptionGroup(connector);
-				if (result == null) result = caseJ2EEEObject(connector);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.RESOURCE_ADAPTER: {
-				ResourceAdapter resourceAdapter = (ResourceAdapter)theEObject;
-				Object result = caseResourceAdapter(resourceAdapter);
-				if (result == null) result = caseJ2EEEObject(resourceAdapter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.AUTHENTICATION_MECHANISM: {
-				AuthenticationMechanism authenticationMechanism = (AuthenticationMechanism)theEObject;
-				Object result = caseAuthenticationMechanism(authenticationMechanism);
-				if (result == null) result = caseJ2EEEObject(authenticationMechanism);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.CONFIG_PROPERTY: {
-				ConfigProperty configProperty = (ConfigProperty)theEObject;
-				Object result = caseConfigProperty(configProperty);
-				if (result == null) result = caseJ2EEEObject(configProperty);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.SECURITY_PERMISSION: {
-				SecurityPermission securityPermission = (SecurityPermission)theEObject;
-				Object result = caseSecurityPermission(securityPermission);
-				if (result == null) result = caseJ2EEEObject(securityPermission);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.LICENSE: {
-				License license = (License)theEObject;
-				Object result = caseLicense(license);
-				if (result == null) result = caseJ2EEEObject(license);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER: {
-				InboundResourceAdapter inboundResourceAdapter = (InboundResourceAdapter)theEObject;
-				Object result = caseInboundResourceAdapter(inboundResourceAdapter);
-				if (result == null) result = caseJ2EEEObject(inboundResourceAdapter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER: {
-				OutboundResourceAdapter outboundResourceAdapter = (OutboundResourceAdapter)theEObject;
-				Object result = caseOutboundResourceAdapter(outboundResourceAdapter);
-				if (result == null) result = caseJ2EEEObject(outboundResourceAdapter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.MESSAGE_ADAPTER: {
-				MessageAdapter messageAdapter = (MessageAdapter)theEObject;
-				Object result = caseMessageAdapter(messageAdapter);
-				if (result == null) result = caseJ2EEEObject(messageAdapter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.CONNECTION_DEFINITION: {
-				ConnectionDefinition connectionDefinition = (ConnectionDefinition)theEObject;
-				Object result = caseConnectionDefinition(connectionDefinition);
-				if (result == null) result = caseJ2EEEObject(connectionDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.ADMIN_OBJECT: {
-				AdminObject adminObject = (AdminObject)theEObject;
-				Object result = caseAdminObject(adminObject);
-				if (result == null) result = caseJ2EEEObject(adminObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.MESSAGE_LISTENER: {
-				MessageListener messageListener = (MessageListener)theEObject;
-				Object result = caseMessageListener(messageListener);
-				if (result == null) result = caseJ2EEEObject(messageListener);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.ACTIVATION_SPEC: {
-				ActivationSpec activationSpec = (ActivationSpec)theEObject;
-				Object result = caseActivationSpec(activationSpec);
-				if (result == null) result = caseJ2EEEObject(activationSpec);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE: {
-				RequiredConfigPropertyType requiredConfigPropertyType = (RequiredConfigPropertyType)theEObject;
-				Object result = caseRequiredConfigPropertyType(requiredConfigPropertyType);
-				if (result == null) result = caseJ2EEEObject(requiredConfigPropertyType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Connector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Connector</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConnector(Connector object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceAdapter(ResourceAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Authentication Mechanism</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Authentication Mechanism</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAuthenticationMechanism(AuthenticationMechanism object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Config Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConfigProperty(ConfigProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Permission</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityPermission(SecurityPermission object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>License</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>License</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLicense(License object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Inbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Inbound Resource Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInboundResourceAdapter(InboundResourceAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outbound Resource Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutboundResourceAdapter(OutboundResourceAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageAdapter(MessageAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Connection Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Connection Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConnectionDefinition(ConnectionDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Admin Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Admin Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAdminObject(AdminObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Listener</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageListener(MessageListener object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Spec</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationSpec(ActivationSpec object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Required Config Property Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Required Config Property Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRequiredConfigPropertyType(RequiredConfigPropertyType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JcaSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/package.xml
deleted file mode 100644
index 798897c79..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the connector module model api. Using this api the artifacts of an connector app
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPConfig.java
deleted file mode 100644
index 865aa0286..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPConfig.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JSP Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The jsp-configType is used to provide global configuration
- * information for the JSP files in a web application. It has
- * two subelements, taglib and jsp-property-group.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPConfig#getTagLibs <em>Tag Libs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPConfig#getPropertyGroups <em>Property Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPConfig()
- * @model
- * @generated
- */
-public interface JSPConfig extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Tag Libs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jsp.TagLibRefType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tag Libs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tag Libs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPConfig_TagLibs()
-	 * @model type="org.eclipse.jst.j2ee.jsp.TagLibRefType" containment="true"
-	 * @generated
-	 */
-	EList getTagLibs();
-
-	/**
-	 * Returns the value of the '<em><b>Property Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Groups</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPConfig_PropertyGroups()
-	 * @model type="org.eclipse.jst.j2ee.jsp.JSPPropertyGroup" containment="true"
-	 * @generated
-	 */
-	EList getPropertyGroups();
-
-} // JSPConfig
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPPropertyGroup.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPPropertyGroup.java
deleted file mode 100644
index 4862edc35..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPPropertyGroup.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JSP Property Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The jsp-property-groupType is used to group a number of
- * files so they can be given global property information.
- * All files so described are deemed to be JSP files. The
- * following additional properties can be described:
- * 
- * - Control enabling of EL evaluation. - Control enabling
- * of Scripting elements. - Indicate pageEncoding
- * information. - Indicating that a resource is a JSP
- * document - Prelude and Coda automatic includes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getUrlPattern <em>Url Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getPageEncoding <em>Page Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getIncludePreludes <em>Include Preludes</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getIncludeCodas <em>Include Codas</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup()
- * @model
- * @generated
- */
-public interface JSPPropertyGroup extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Url Pattern</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Pattern</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Pattern</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_UrlPattern()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getUrlPattern();
-
-	/**
-	 * Returns the value of the '<em><b>El Ignored</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>El Ignored</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Can be used to easily set the isELIgnored
-	 * 	property of a group of JSP pages. By default,
-	 * 	the EL evaluation is enabled for Web
-	 * 	Applications using a Servlet 2.4 or greater
-	 * 	web.xml, and disabled otherwise.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>El Ignored</em>' attribute.
-	 * @see #isSetElIgnored()
-	 * @see #unsetElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_ElIgnored()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isElIgnored();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>El Ignored</em>' attribute.
-	 * @see #isSetElIgnored()
-	 * @see #unsetElIgnored()
-	 * @see #isElIgnored()
-	 * @generated
-	 */
-	void setElIgnored(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetElIgnored()
-	 * @see #isElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @generated
-	 */
-	void unsetElIgnored();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>El Ignored</em>' attribute is set.
-	 * @see #unsetElIgnored()
-	 * @see #isElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @generated
-	 */
-	boolean isSetElIgnored();
-
-	/**
-	 * Returns the value of the '<em><b>Page Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Page Encoding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The valid values of page-encoding are those of
-	 * 	the pageEncoding page directive. It is a
-	 * 	translation-time error to name different
-	 * 	encodings in the pageEncoding attribute of the
-	 * 	page directive of a JSP page and in a JSP
-	 * 	configuration element matching the page. It is
-	 * 	also a translation-time error to name different
-	 * 	encodings in the prolog of a document in XML
-	 * 	syntax and in a JSP configuration element
-	 * 	matching the document. It is legal to name the
-	 * 	same encoding through mulitple mechanisms.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Page Encoding</em>' attribute.
-	 * @see #setPageEncoding(String)
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_PageEncoding()
-	 * @model
-	 * @generated
-	 */
-	String getPageEncoding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getPageEncoding <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Page Encoding</em>' attribute.
-	 * @see #getPageEncoding()
-	 * @generated
-	 */
-	void setPageEncoding(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Scripting Invalid</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scripting Invalid</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Can be used to easily disable scripting in a
-	 * 	group of JSP pages. By default, scripting is
-	 * 	enabled.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scripting Invalid</em>' attribute.
-	 * @see #isSetScriptingInvalid()
-	 * @see #unsetScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_ScriptingInvalid()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isScriptingInvalid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scripting Invalid</em>' attribute.
-	 * @see #isSetScriptingInvalid()
-	 * @see #unsetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 */
-	void setScriptingInvalid(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @generated
-	 */
-	void unsetScriptingInvalid();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Scripting Invalid</em>' attribute is set.
-	 * @see #unsetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @generated
-	 */
-	boolean isSetScriptingInvalid();
-
-	/**
-	 * Returns the value of the '<em><b>Is XML</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is XML</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If true, denotes that the group of resources
-	 * 	that match the URL pattern are JSP documents,
-	 * 	and thus must be interpreted as XML documents.
-	 * 	If false, the resources are assumed to not be
-	 * 	JSP documents, unless there is another property
-	 * 	group that indicates otherwise.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is XML</em>' attribute.
-	 * @see #isSetIsXML()
-	 * @see #unsetIsXML()
-	 * @see #setIsXML(boolean)
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_IsXML()
-	 * @model default="false" unsettable="true"
-	 * @generated
-	 */
-	boolean isIsXML();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is XML</em>' attribute.
-	 * @see #isSetIsXML()
-	 * @see #unsetIsXML()
-	 * @see #isIsXML()
-	 * @generated
-	 */
-	void setIsXML(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsXML()
-	 * @see #isIsXML()
-	 * @see #setIsXML(boolean)
-	 * @generated
-	 */
-	void unsetIsXML();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is XML</em>' attribute is set.
-	 * @see #unsetIsXML()
-	 * @see #isIsXML()
-	 * @see #setIsXML(boolean)
-	 * @generated
-	 */
-	boolean isSetIsXML();
-
-	/**
-	 * Returns the value of the '<em><b>Include Preludes</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Include Preludes</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The include-prelude element is a
-	 * 	context-relative path that must correspond to
-	 * 	an element in the Web Application. When the
-	 * 	element is present, the given path will be
-	 * 	automatically included (as in an include
-	 * 	directive) at the beginning of each JSP page in
-	 * 	this jsp-property-group.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Include Preludes</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_IncludePreludes()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getIncludePreludes();
-
-	/**
-	 * Returns the value of the '<em><b>Include Codas</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Include Codas</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The include-coda element is a context-relative
-	 * 	path that must correspond to an element in the
-	 * 	Web Application. When the element is present,
-	 * 	the given path will be automatically included
-	 * 	(as in an include directive) at the end of each
-	 * 	JSP page in this jsp-property-group.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Include Codas</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getJSPPropertyGroup_IncludeCodas()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getIncludeCodas();
-
-} // JSPPropertyGroup
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java
deleted file mode 100644
index 0f75d566e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.jsp.JspPackage
- * @generated
- */
-public interface JspFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JspFactory eINSTANCE = org.eclipse.jst.j2ee.jsp.internal.impl.JspFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>JSP Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Config</em>'.
-	 * @generated
-	 */
-	JSPConfig createJSPConfig();
-
-	/**
-	 * Returns a new object of class '<em>JSP Property Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Property Group</em>'.
-	 * @generated
-	 */
-	JSPPropertyGroup createJSPPropertyGroup();
-
-	/**
-	 * Returns a new object of class '<em>Tag Lib Ref Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tag Lib Ref Type</em>'.
-	 * @generated
-	 */
-	TagLibRefType createTagLibRefType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	JspPackage getJspPackage();
-
-} //JspFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java
deleted file mode 100644
index 980027649..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * /**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.jsp.JspFactory
- * @model kind="package"
- * @generated
- */
-public interface JspPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "jsp";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "jsp.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.jsp";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JspPackage eINSTANCE = org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPConfigImpl <em>JSP Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JSPConfigImpl
-	 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl#getJSPConfig()
-	 * @generated
-	 */
-	int JSP_CONFIG = 0;
-
-	/**
-	 * The feature id for the '<em><b>Tag Libs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__TAG_LIBS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Property Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__PROPERTY_GROUPS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>JSP Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl <em>JSP Property Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl
-	 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl#getJSPPropertyGroup()
-	 * @generated
-	 */
-	int JSP_PROPERTY_GROUP = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Url Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__URL_PATTERN = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>El Ignored</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__EL_IGNORED = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Page Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__PAGE_ENCODING = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Scripting Invalid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__SCRIPTING_INVALID = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Is XML</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__IS_XML = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Include Preludes</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__INCLUDE_PRELUDES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Include Codas</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__INCLUDE_CODAS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>JSP Property Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.jsp.internal.impl.TagLibRefTypeImpl <em>Tag Lib Ref Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.jsp.internal.impl.TagLibRefTypeImpl
-	 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl#getTagLibRefType()
-	 * @generated
-	 */
-	int TAG_LIB_REF_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Taglib URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_TYPE__TAGLIB_URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Taglib Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_TYPE__TAGLIB_LOCATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Tag Lib Ref Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jsp.JSPConfig <em>JSP Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Config</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPConfig
-	 * @generated
-	 */
-	EClass getJSPConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jsp.JSPConfig#getTagLibs <em>Tag Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tag Libs</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPConfig#getTagLibs()
-	 * @see #getJSPConfig()
-	 * @generated
-	 */
-	EReference getJSPConfig_TagLibs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.jsp.JSPConfig#getPropertyGroups <em>Property Groups</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Property Groups</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPConfig#getPropertyGroups()
-	 * @see #getJSPConfig()
-	 * @generated
-	 */
-	EReference getJSPConfig_PropertyGroups();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup <em>JSP Property Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Property Group</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup
-	 * @generated
-	 */
-	EClass getJSPPropertyGroup();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getUrlPattern <em>Url Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Url Pattern</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getUrlPattern()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>El Ignored</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isElIgnored()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_ElIgnored();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getPageEncoding <em>Page Encoding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Page Encoding</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getPageEncoding()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_PageEncoding();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scripting Invalid</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isScriptingInvalid()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_ScriptingInvalid();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is XML</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#isIsXML()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_IsXML();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getIncludePreludes <em>Include Preludes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Preludes</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getIncludePreludes()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_IncludePreludes();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getIncludeCodas <em>Include Codas</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Codas</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup#getIncludeCodas()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_IncludeCodas();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.jsp.TagLibRefType <em>Tag Lib Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tag Lib Ref Type</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.TagLibRefType
-	 * @generated
-	 */
-	EClass getTagLibRefType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibURI <em>Taglib URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Taglib URI</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibURI()
-	 * @see #getTagLibRefType()
-	 * @generated
-	 */
-	EAttribute getTagLibRefType_TaglibURI();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibLocation <em>Taglib Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Taglib Location</em>'.
-	 * @see org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibLocation()
-	 * @see #getTagLibRefType()
-	 * @generated
-	 */
-	EAttribute getTagLibRefType_TaglibLocation();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	JspFactory getJspFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPConfigImpl <em>JSP Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JSPConfigImpl
-		 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl#getJSPConfig()
-		 * @generated
-		 */
-		EClass JSP_CONFIG = eINSTANCE.getJSPConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Tag Libs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_CONFIG__TAG_LIBS = eINSTANCE.getJSPConfig_TagLibs();
-
-		/**
-		 * The meta object literal for the '<em><b>Property Groups</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_CONFIG__PROPERTY_GROUPS = eINSTANCE.getJSPConfig_PropertyGroups();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl <em>JSP Property Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl
-		 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl#getJSPPropertyGroup()
-		 * @generated
-		 */
-		EClass JSP_PROPERTY_GROUP = eINSTANCE.getJSPPropertyGroup();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Pattern</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__URL_PATTERN = eINSTANCE.getJSPPropertyGroup_UrlPattern();
-
-		/**
-		 * The meta object literal for the '<em><b>El Ignored</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__EL_IGNORED = eINSTANCE.getJSPPropertyGroup_ElIgnored();
-
-		/**
-		 * The meta object literal for the '<em><b>Page Encoding</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__PAGE_ENCODING = eINSTANCE.getJSPPropertyGroup_PageEncoding();
-
-		/**
-		 * The meta object literal for the '<em><b>Scripting Invalid</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__SCRIPTING_INVALID = eINSTANCE.getJSPPropertyGroup_ScriptingInvalid();
-
-		/**
-		 * The meta object literal for the '<em><b>Is XML</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__IS_XML = eINSTANCE.getJSPPropertyGroup_IsXML();
-
-		/**
-		 * The meta object literal for the '<em><b>Include Preludes</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__INCLUDE_PRELUDES = eINSTANCE.getJSPPropertyGroup_IncludePreludes();
-
-		/**
-		 * The meta object literal for the '<em><b>Include Codas</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_PROPERTY_GROUP__INCLUDE_CODAS = eINSTANCE.getJSPPropertyGroup_IncludeCodas();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.jsp.internal.impl.TagLibRefTypeImpl <em>Tag Lib Ref Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.jsp.internal.impl.TagLibRefTypeImpl
-		 * @see org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl#getTagLibRefType()
-		 * @generated
-		 */
-		EClass TAG_LIB_REF_TYPE = eINSTANCE.getTagLibRefType();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB_REF_TYPE__TAGLIB_URI = eINSTANCE.getTagLibRefType_TaglibURI();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB_REF_TYPE__TAGLIB_LOCATION = eINSTANCE.getTagLibRefType_TaglibLocation();
-
-	}
-
-} //JspPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/TagLibRefType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/TagLibRefType.java
deleted file mode 100644
index 5368b0e0b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/TagLibRefType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tag Lib Ref Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * A taglib can be used to provide information on a tag
- * library that is used by a JSP page within the Web
- * Application.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibURI <em>Taglib URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibLocation <em>Taglib Location</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.jsp.JspPackage#getTagLibRefType()
- * @model
- * @generated
- */
-public interface TagLibRefType extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Taglib URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taglib URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  A taglib-uri element describes a URI identifying a
-	 *         tag library used in the web application.  The body
-	 *         of the taglib-uri element may be either an
-	 *         absolute URI specification, or a relative URI.
-	 *         There should be no entries in web.xml with the
-	 *         same taglib-uri value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Taglib URI</em>' attribute.
-	 * @see #setTaglibURI(String)
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getTagLibRefType_TaglibURI()
-	 * @model
-	 * @generated
-	 */
-	String getTaglibURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibURI <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taglib URI</em>' attribute.
-	 * @see #getTaglibURI()
-	 * @generated
-	 */
-	void setTaglibURI(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Taglib Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taglib Location</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * the taglib-location element contains the location
-	 *         (as a resource relative to the root of the web
-	 *         application) where to find the Tag Library
-	 *         Description file for the tag library.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Taglib Location</em>' attribute.
-	 * @see #setTaglibLocation(String)
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#getTagLibRefType_TaglibLocation()
-	 * @model
-	 * @generated
-	 */
-	String getTaglibLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.jsp.TagLibRefType#getTaglibLocation <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taglib Location</em>' attribute.
-	 * @see #getTaglibLocation()
-	 * @generated
-	 */
-	void setTaglibLocation(String value);
-
-} // TagLibRefType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JSPConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JSPConfigImpl.java
deleted file mode 100644
index 5a24ea7fe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JSPConfigImpl.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JSP Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPConfigImpl#getTagLibs <em>Tag Libs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPConfigImpl#getPropertyGroups <em>Property Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JSPConfigImpl extends J2EEEObjectImpl implements JSPConfig {
-	/**
-	 * The cached value of the '{@link #getTagLibs() <em>Tag Libs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagLibs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList tagLibs = null;
-
-	/**
-	 * The cached value of the '{@link #getPropertyGroups() <em>Property Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPropertyGroups()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList propertyGroups = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JSPConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.Literals.JSP_CONFIG;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTagLibs() {
-		if (tagLibs == null) {
-			tagLibs = new EObjectContainmentEList(TagLibRefType.class, this, JspPackage.JSP_CONFIG__TAG_LIBS);
-		}
-		return tagLibs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPropertyGroups() {
-		if (propertyGroups == null) {
-			propertyGroups = new EObjectContainmentEList(JSPPropertyGroup.class, this, JspPackage.JSP_CONFIG__PROPERTY_GROUPS);
-		}
-		return propertyGroups;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return ((InternalEList)getTagLibs()).basicRemove(otherEnd, msgs);
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				return ((InternalEList)getPropertyGroups()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return getTagLibs();
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				return getPropertyGroups();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				getTagLibs().clear();
-				getTagLibs().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				getPropertyGroups().clear();
-				getPropertyGroups().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				getTagLibs().clear();
-				return;
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				getPropertyGroups().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return tagLibs != null && !tagLibs.isEmpty();
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				return propertyGroups != null && !propertyGroups.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //JSPConfigImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JSPPropertyGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JSPPropertyGroupImpl.java
deleted file mode 100644
index cf989b519..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JSPPropertyGroupImpl.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JSP Property Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#getUrlPattern <em>Url Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#isElIgnored <em>El Ignored</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#getPageEncoding <em>Page Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#isScriptingInvalid <em>Scripting Invalid</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#isIsXML <em>Is XML</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#getIncludePreludes <em>Include Preludes</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.JSPPropertyGroupImpl#getIncludeCodas <em>Include Codas</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JSPPropertyGroupImpl extends CompatibilityDescriptionGroupImpl implements JSPPropertyGroup {
-	/**
-	 * The cached value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPattern = null;
-
-	/**
-	 * The default value of the '{@link #isElIgnored() <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElIgnored()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EL_IGNORED_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isElIgnored() <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElIgnored()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elIgnored = EL_IGNORED_EDEFAULT;
-
-	/**
-	 * This is true if the El Ignored attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elIgnoredESet = false;
-
-	/**
-	 * The default value of the '{@link #getPageEncoding() <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPageEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PAGE_ENCODING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPageEncoding() <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPageEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pageEncoding = PAGE_ENCODING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isScriptingInvalid() <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SCRIPTING_INVALID_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isScriptingInvalid() <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scriptingInvalid = SCRIPTING_INVALID_EDEFAULT;
-
-	/**
-	 * This is true if the Scripting Invalid attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scriptingInvalidESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsXML() <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsXML()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_XML_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsXML() <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsXML()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isXML = IS_XML_EDEFAULT;
-
-	/**
-	 * This is true if the Is XML attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isXMLESet = false;
-
-	/**
-	 * The cached value of the '{@link #getIncludePreludes() <em>Include Preludes</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludePreludes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includePreludes = null;
-
-	/**
-	 * The cached value of the '{@link #getIncludeCodas() <em>Include Codas</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludeCodas()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includeCodas = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JSPPropertyGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.Literals.JSP_PROPERTY_GROUP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getUrlPattern() {
-		if (urlPattern == null) {
-			urlPattern = new EDataTypeUniqueEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN);
-		}
-		return urlPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isElIgnored() {
-		return elIgnored;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElIgnored(boolean newElIgnored) {
-		boolean oldElIgnored = elIgnored;
-		elIgnored = newElIgnored;
-		boolean oldElIgnoredESet = elIgnoredESet;
-		elIgnoredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED, oldElIgnored, elIgnored, !oldElIgnoredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetElIgnored() {
-		boolean oldElIgnored = elIgnored;
-		boolean oldElIgnoredESet = elIgnoredESet;
-		elIgnored = EL_IGNORED_EDEFAULT;
-		elIgnoredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED, oldElIgnored, EL_IGNORED_EDEFAULT, oldElIgnoredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetElIgnored() {
-		return elIgnoredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPageEncoding() {
-		return pageEncoding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPageEncoding(String newPageEncoding) {
-		String oldPageEncoding = pageEncoding;
-		pageEncoding = newPageEncoding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING, oldPageEncoding, pageEncoding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isScriptingInvalid() {
-		return scriptingInvalid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScriptingInvalid(boolean newScriptingInvalid) {
-		boolean oldScriptingInvalid = scriptingInvalid;
-		scriptingInvalid = newScriptingInvalid;
-		boolean oldScriptingInvalidESet = scriptingInvalidESet;
-		scriptingInvalidESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID, oldScriptingInvalid, scriptingInvalid, !oldScriptingInvalidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetScriptingInvalid() {
-		boolean oldScriptingInvalid = scriptingInvalid;
-		boolean oldScriptingInvalidESet = scriptingInvalidESet;
-		scriptingInvalid = SCRIPTING_INVALID_EDEFAULT;
-		scriptingInvalidESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID, oldScriptingInvalid, SCRIPTING_INVALID_EDEFAULT, oldScriptingInvalidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetScriptingInvalid() {
-		return scriptingInvalidESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsXML() {
-		return isXML;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsXML(boolean newIsXML) {
-		boolean oldIsXML = isXML;
-		isXML = newIsXML;
-		boolean oldIsXMLESet = isXMLESet;
-		isXMLESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__IS_XML, oldIsXML, isXML, !oldIsXMLESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsXML() {
-		boolean oldIsXML = isXML;
-		boolean oldIsXMLESet = isXMLESet;
-		isXML = IS_XML_EDEFAULT;
-		isXMLESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__IS_XML, oldIsXML, IS_XML_EDEFAULT, oldIsXMLESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsXML() {
-		return isXMLESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIncludePreludes() {
-		if (includePreludes == null) {
-			includePreludes = new EDataTypeUniqueEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
-		}
-		return includePreludes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIncludeCodas() {
-		if (includeCodas == null) {
-			includeCodas = new EDataTypeUniqueEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS);
-		}
-		return includeCodas;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				return getUrlPattern();
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				return isElIgnored() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				return getPageEncoding();
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				return isScriptingInvalid() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				return isIsXML() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				return getIncludePreludes();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				return getIncludeCodas();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				getUrlPattern().clear();
-				getUrlPattern().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				setElIgnored(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				setPageEncoding((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				setScriptingInvalid(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				setIsXML(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				getIncludePreludes().clear();
-				getIncludePreludes().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				getIncludeCodas().clear();
-				getIncludeCodas().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				getUrlPattern().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				unsetElIgnored();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				setPageEncoding(PAGE_ENCODING_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				unsetScriptingInvalid();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				unsetIsXML();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				getIncludePreludes().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				getIncludeCodas().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				return urlPattern != null && !urlPattern.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				return isSetElIgnored();
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				return PAGE_ENCODING_EDEFAULT == null ? pageEncoding != null : !PAGE_ENCODING_EDEFAULT.equals(pageEncoding);
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				return isSetScriptingInvalid();
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				return isSetIsXML();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				return includePreludes != null && !includePreludes.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				return includeCodas != null && !includeCodas.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (urlPattern: ");
-		result.append(urlPattern);
-		result.append(", elIgnored: ");
-		if (elIgnoredESet) result.append(elIgnored); else result.append("<unset>");
-		result.append(", pageEncoding: ");
-		result.append(pageEncoding);
-		result.append(", scriptingInvalid: ");
-		if (scriptingInvalidESet) result.append(scriptingInvalid); else result.append("<unset>");
-		result.append(", isXML: ");
-		if (isXMLESet) result.append(isXML); else result.append("<unset>");
-		result.append(", includePreludes: ");
-		result.append(includePreludes);
-		result.append(", includeCodas: ");
-		result.append(includeCodas);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JSPPropertyGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspFactoryImpl.java
deleted file mode 100644
index bbfa36879..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspFactoryImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspFactoryImpl extends EFactoryImpl implements JspFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JspFactory init() {
-		try {
-			JspFactory theJspFactory = (JspFactory)EPackage.Registry.INSTANCE.getEFactory("jsp.xmi"); 
-			if (theJspFactory != null) {
-				return theJspFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new JspFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JspPackage.JSP_CONFIG: return createJSPConfig();
-			case JspPackage.JSP_PROPERTY_GROUP: return createJSPPropertyGroup();
-			case JspPackage.TAG_LIB_REF_TYPE: return createTagLibRefType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPConfig createJSPConfig() {
-		JSPConfigImpl jspConfig = new JSPConfigImpl();
-		return jspConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPPropertyGroup createJSPPropertyGroup() {
-		JSPPropertyGroupImpl jspPropertyGroup = new JSPPropertyGroupImpl();
-		return jspPropertyGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagLibRefType createTagLibRefType() {
-		TagLibRefTypeImpl tagLibRefType = new TagLibRefTypeImpl();
-		return tagLibRefType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspPackage getJspPackage() {
-		return (JspPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static JspPackage getPackage() {
-		return JspPackage.eINSTANCE;
-	}
-
-} //JspFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
deleted file mode 100644
index 9caf99cc6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspPackageImpl extends EPackageImpl implements JspPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspPropertyGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibRefTypeEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.jsp.JspPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private JspPackageImpl() {
-		super(eNS_URI, JspFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static JspPackage init() {
-		if (isInited) return (JspPackage)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
-
-		// Obtain or create and register package
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JspPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theJspPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theJspPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theJspPackage.freeze();
-
-		return theJspPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJSPConfig() {
-		return jspConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPConfig_TagLibs() {
-		return (EReference)jspConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPConfig_PropertyGroups() {
-		return (EReference)jspConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJSPPropertyGroup() {
-		return jspPropertyGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_UrlPattern() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_ElIgnored() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_PageEncoding() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_ScriptingInvalid() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_IsXML() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_IncludePreludes() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_IncludeCodas() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTagLibRefType() {
-		return tagLibRefTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLibRefType_TaglibURI() {
-		return (EAttribute)tagLibRefTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLibRefType_TaglibLocation() {
-		return (EAttribute)tagLibRefTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspFactory getJspFactory() {
-		return (JspFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		jspConfigEClass = createEClass(JSP_CONFIG);
-		createEReference(jspConfigEClass, JSP_CONFIG__TAG_LIBS);
-		createEReference(jspConfigEClass, JSP_CONFIG__PROPERTY_GROUPS);
-
-		jspPropertyGroupEClass = createEClass(JSP_PROPERTY_GROUP);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__URL_PATTERN);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__EL_IGNORED);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__PAGE_ENCODING);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__SCRIPTING_INVALID);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__IS_XML);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__INCLUDE_CODAS);
-
-		tagLibRefTypeEClass = createEClass(TAG_LIB_REF_TYPE);
-		createEAttribute(tagLibRefTypeEClass, TAG_LIB_REF_TYPE__TAGLIB_URI);
-		createEAttribute(tagLibRefTypeEClass, TAG_LIB_REF_TYPE__TAGLIB_LOCATION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		jspConfigEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		jspPropertyGroupEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		tagLibRefTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(jspConfigEClass, JSPConfig.class, "JSPConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getJSPConfig_TagLibs(), this.getTagLibRefType(), null, "tagLibs", null, 0, -1, JSPConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPConfig_PropertyGroups(), this.getJSPPropertyGroup(), null, "propertyGroups", null, 0, -1, JSPConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jspPropertyGroupEClass, JSPPropertyGroup.class, "JSPPropertyGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJSPPropertyGroup_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, -1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPPropertyGroup_ElIgnored(), ecorePackage.getEBoolean(), "elIgnored", "true", 0, 1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPPropertyGroup_PageEncoding(), ecorePackage.getEString(), "pageEncoding", null, 0, 1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPPropertyGroup_ScriptingInvalid(), ecorePackage.getEBoolean(), "scriptingInvalid", "true", 0, 1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPPropertyGroup_IsXML(), ecorePackage.getEBoolean(), "isXML", "false", 0, 1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPPropertyGroup_IncludePreludes(), ecorePackage.getEString(), "includePreludes", null, 0, -1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPPropertyGroup_IncludeCodas(), ecorePackage.getEString(), "includeCodas", null, 0, -1, JSPPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tagLibRefTypeEClass, TagLibRefType.class, "TagLibRefType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTagLibRefType_TaglibURI(), ecorePackage.getEString(), "taglibURI", null, 0, 1, TagLibRefType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagLibRefType_TaglibLocation(), ecorePackage.getEString(), "taglibLocation", null, 0, 1, TagLibRefType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //JspPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/TagLibRefTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/TagLibRefTypeImpl.java
deleted file mode 100644
index 9bfe1f555..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/TagLibRefTypeImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tag Lib Ref Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.TagLibRefTypeImpl#getTaglibURI <em>Taglib URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.jsp.internal.impl.TagLibRefTypeImpl#getTaglibLocation <em>Taglib Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TagLibRefTypeImpl extends J2EEEObjectImpl implements TagLibRefType {
-	/**
-	 * The default value of the '{@link #getTaglibURI() <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibURI() <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taglibURI = TAGLIB_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_LOCATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taglibLocation = TAGLIB_LOCATION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TagLibRefTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.Literals.TAG_LIB_REF_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaglibURI() {
-		return taglibURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaglibURI(String newTaglibURI) {
-		String oldTaglibURI = taglibURI;
-		taglibURI = newTaglibURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI, oldTaglibURI, taglibURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaglibLocation() {
-		return taglibLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaglibLocation(String newTaglibLocation) {
-		String oldTaglibLocation = taglibLocation;
-		taglibLocation = newTaglibLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION, oldTaglibLocation, taglibLocation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				return getTaglibURI();
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				return getTaglibLocation();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				setTaglibURI((String)newValue);
-				return;
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				setTaglibLocation((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				setTaglibURI(TAGLIB_URI_EDEFAULT);
-				return;
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				setTaglibLocation(TAGLIB_LOCATION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				return TAGLIB_URI_EDEFAULT == null ? taglibURI != null : !TAGLIB_URI_EDEFAULT.equals(taglibURI);
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				return TAGLIB_LOCATION_EDEFAULT == null ? taglibLocation != null : !TAGLIB_LOCATION_EDEFAULT.equals(taglibLocation);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (taglibURI: ");
-		result.append(taglibURI);
-		result.append(", taglibLocation: ");
-		result.append(taglibLocation);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TagLibRefTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/util/JspAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/util/JspAdapterFactory.java
deleted file mode 100644
index 171c18919..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/util/JspAdapterFactory.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.jsp.JspPackage
- * @generated
- */
-public class JspAdapterFactory extends AdapterFactoryImpl
-{
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JspPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = JspPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JspSwitch modelSwitch =
-		new JspSwitch() {
-			public Object caseJSPConfig(JSPConfig object) {
-				return createJSPConfigAdapter();
-			}
-			public Object caseJSPPropertyGroup(JSPPropertyGroup object) {
-				return createJSPPropertyGroupAdapter();
-			}
-			public Object caseTagLibRefType(TagLibRefType object) {
-				return createTagLibRefTypeAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jsp.JSPConfig <em>JSP Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPConfig
-	 * @generated
-	 */
-	public Adapter createJSPConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jsp.JSPPropertyGroup <em>JSP Property Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jsp.JSPPropertyGroup
-	 * @generated
-	 */
-	public Adapter createJSPPropertyGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.jsp.TagLibRefType <em>Tag Lib Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.jsp.TagLibRefType
-	 * @generated
-	 */
-	public Adapter createTagLibRefTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //JspAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/util/JspSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/util/JspSwitch.java
deleted file mode 100644
index b579f5042..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/util/JspSwitch.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.jsp.JspPackage
- * @generated
- */
-public class JspSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JspPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JspPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case JspPackage.JSP_CONFIG: {
-				JSPConfig jspConfig = (JSPConfig)theEObject;
-				Object result = caseJSPConfig(jspConfig);
-				if (result == null) result = caseJ2EEEObject(jspConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JspPackage.JSP_PROPERTY_GROUP: {
-				JSPPropertyGroup jspPropertyGroup = (JSPPropertyGroup)theEObject;
-				Object result = caseJSPPropertyGroup(jspPropertyGroup);
-				if (result == null) result = caseCompatibilityDescriptionGroup(jspPropertyGroup);
-				if (result == null) result = caseDescriptionGroup(jspPropertyGroup);
-				if (result == null) result = caseJ2EEEObject(jspPropertyGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JspPackage.TAG_LIB_REF_TYPE: {
-				TagLibRefType tagLibRefType = (TagLibRefType)theEObject;
-				Object result = caseTagLibRefType(tagLibRefType);
-				if (result == null) result = caseJ2EEEObject(tagLibRefType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JSP Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JSP Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJSPConfig(JSPConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JSP Property Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JSP Property Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJSPPropertyGroup(JSPPropertyGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag Lib Ref Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag Lib Ref Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagLibRefType(TagLibRefType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JspSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/package.xml
deleted file mode 100644
index 80faa8120..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the JSP model api. Using this api the artifacts of a JSP and TagLib ref
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/BodyContentType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/BodyContentType.java
deleted file mode 100644
index e99a7e7e7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/BodyContentType.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-public final class BodyContentType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int TAGDEPENDENT = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int JSP = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int EMPTY = 2;
-	/**
-	 * The '<em><b>Scriptless</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SCRIPTLESS_LITERAL
-	 * @model name="scriptless"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SCRIPTLESS = 3;
-
-	/**
-	 * The '<em><b>Tagdependent</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Tagdependent</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TAGDEPENDENT
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType TAGDEPENDENT_LITERAL = new BodyContentType(TAGDEPENDENT, "tagdependent", "tagdependent");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>JSP</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>JSP</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JSP
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType JSP_LITERAL = new BodyContentType(JSP, "JSP", "JSP");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Empty</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Empty</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EMPTY
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType EMPTY_LITERAL = new BodyContentType(EMPTY, "empty", "empty");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Scriptless</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Scriptless</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SCRIPTLESS
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType SCRIPTLESS_LITERAL = new BodyContentType(SCRIPTLESS, "scriptless", "scriptless");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Body Content Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final BodyContentType[] VALUES_ARRAY =
-		new BodyContentType[] {
-			TAGDEPENDENT_LITERAL,
-			JSP_LITERAL,
-			EMPTY_LITERAL,
-			SCRIPTLESS_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Body Content Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Body Content Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BodyContentType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BodyContentType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Body Content Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BodyContentType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BodyContentType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Body Content Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BodyContentType get(int value) {
-		switch (value) {
-			case TAGDEPENDENT: return TAGDEPENDENT_LITERAL;
-			case JSP: return JSP_LITERAL;
-			case EMPTY: return EMPTY_LITERAL;
-			case SCRIPTLESS: return SCRIPTLESS_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private BodyContentType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //BodyContentType
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/ExtensibleType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/ExtensibleType.java
deleted file mode 100644
index e1394ae36..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/ExtensibleType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extensible Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.ExtensibleType#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getExtensibleType()
- * @model abstract="true"
- * @generated
- */
-public interface ExtensibleType extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getExtensibleType_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.ExtensibleType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // ExtensibleType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/Function.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/Function.java
deleted file mode 100644
index 9039043e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/Function.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Function</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * The function element is used to provide information on each
- * function in the tag library that is to be exposed to the EL.
- * 
- * The function element may have several subelements defining:
- * 
- * description         Optional tag-specific information
- * 
- * display-name        A short name that is intended to be
- *                     displayed by tools
- * 
- * icon                Optional icon element that can be used
- *                     by tools
- * 
- * name                A unique name for this function
- * 
- * function-class      Provides the name of the Java class that
- *                     implements the function
- * 
- * function-signature  Provides the signature, as in the Java
- *                     Language Specification, of the Java
- *                     method that is to be used to implement
- *                     the function.
- * 
- * example             Optional informal description of an
- *                     example of a use of this function
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.Function#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.Function#getSignature <em>Signature</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.Function#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionClass <em>Function Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionExtensions <em>Function Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getFunction()
- * @model
- * @generated
- */
-public interface Function extends DescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getFunction_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Signature</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Signature</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides the signature, as in the Java Language
-	 *         Specification, of the static Java method that is
-	 *         to be used to implement the function.
-	 * 
-	 *         Example:
-	 * 
-	 *         java.lang.String nickName( java.lang.String, int )
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Signature</em>' attribute.
-	 * @see #setSignature(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getFunction_Signature()
-	 * @model
-	 * @generated
-	 */
-	String getSignature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getSignature <em>Signature</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Signature</em>' attribute.
-	 * @see #getSignature()
-	 * @generated
-	 */
-	void setSignature(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Example</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The example element contains an informal description
-	 *         of an example of the use of this function.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Example</em>' attribute.
-	 * @see #setExample(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getFunction_Example()
-	 * @model
-	 * @generated
-	 */
-	String getExample();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getExample <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Example</em>' attribute.
-	 * @see #getExample()
-	 * @generated
-	 */
-	void setExample(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Function Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides the fully-qualified class name of the Java
-	 *         class containing the static method that implements
-	 *         the function.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Function Class</em>' reference.
-	 * @see #setFunctionClass(JavaClass)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getFunction_FunctionClass()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getFunctionClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionClass <em>Function Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function Class</em>' reference.
-	 * @see #getFunctionClass()
-	 * @generated
-	 */
-	void setFunctionClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Function Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.taglib.internal.TldExtension}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Function Extensions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getFunction_FunctionExtensions()
-	 * @model type="org.eclipse.jst.j2ee.taglib.internal.TldExtension" containment="true"
-	 * @generated
-	 */
-	EList getFunctionExtensions();
-
-} // Function
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPScriptingVariableScope.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPScriptingVariableScope.java
deleted file mode 100644
index 4d9b1c0b6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPScriptingVariableScope.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-public final class JSPScriptingVariableScope extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NESTED = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int AT_BEGIN = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int AT_END = 2;
-	/**
-	 * The '<em><b>NESTED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NESTED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NESTED
-	 * @generated
-	 * @ordered
-	 */
-	public static final JSPScriptingVariableScope NESTED_LITERAL = new JSPScriptingVariableScope(NESTED, "NESTED", "NESTED");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>AT BEGIN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AT BEGIN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AT_BEGIN
-	 * @generated
-	 * @ordered
-	 */
-	public static final JSPScriptingVariableScope AT_BEGIN_LITERAL = new JSPScriptingVariableScope(AT_BEGIN, "AT_BEGIN", "AT_BEGIN");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>AT END</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AT END</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AT_END
-	 * @generated
-	 * @ordered
-	 */
-	public static final JSPScriptingVariableScope AT_END_LITERAL = new JSPScriptingVariableScope(AT_END, "AT_END", "AT_END");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>JSP Scripting Variable Scope</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final JSPScriptingVariableScope[] VALUES_ARRAY =
-		new JSPScriptingVariableScope[] {
-			NESTED_LITERAL,
-			AT_BEGIN_LITERAL,
-			AT_END_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>JSP Scripting Variable Scope</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>JSP Scripting Variable Scope</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JSPScriptingVariableScope get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			JSPScriptingVariableScope result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>JSP Scripting Variable Scope</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JSPScriptingVariableScope getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			JSPScriptingVariableScope result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>JSP Scripting Variable Scope</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JSPScriptingVariableScope get(int value) {
-		switch (value) {
-			case NESTED: return NESTED_LITERAL;
-			case AT_BEGIN: return AT_BEGIN_LITERAL;
-			case AT_END: return AT_END_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private JSPScriptingVariableScope(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //JSPScriptingVariableScope
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPTag.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPTag.java
deleted file mode 100644
index ecc0f102d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPTag.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-
-/**
- * The tag element defines an action in this tag library. The tag element has one attribute, id.
- * The tag element may have several subelements defining:
- * name -- The unique action name
- * tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag
- * tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo
- * body-content -- The body content type
- * display-name -- A short name that is intended to be displayed by tools
- * small-icon -- Optional small-icon that can be used by tools
- * large-icon -- Optional large-icon that can be used by tools
- * description -- Optional tag-specific information
- * variable -- Optional scripting variable information
- * attribute -- All attributes of this action
- * example -- Optional informal description of an example of a use of this action.
-
- */
-public interface JSPTag extends DescriptionGroup {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the BodyContent attribute
-	 * Provides a hint as to the content of the body of this tag. Primarily intended
-	 * for use by page composition tools.There are currently three values specified:
-	 * 
-	 * tagdependent - The body of the tag is interpreted by the tag implementation
-	 * itself, and is most likely in a		different "langage", e.g embedded SQL
-	 * statements.
-	 * 
-	 * JSP - The body of the tag contains nested JSP syntax
-	 * 
-	 * empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::= 
-	 * tagdependent | JSP | empty
-	 */
-	BodyContentType getBodyContent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getBodyContent <em>Body Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body Content</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.BodyContentType
-	 * @see #isSetBodyContent()
-	 * @see #unsetBodyContent()
-	 * @see #getBodyContent()
-	 * @generated
-	 */
-	void setBodyContent(BodyContentType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getBodyContent <em>Body Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBodyContent()
-	 * @see #getBodyContent()
-	 * @see #setBodyContent(BodyContentType)
-	 * @generated
-	 */
-	void unsetBodyContent();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getBodyContent <em>Body Content</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Body Content</em>' attribute is set.
-	 * @see #unsetBodyContent()
-	 * @see #getBodyContent()
-	 * @see #setBodyContent(BodyContentType)
-	 * @generated
-	 */
-	boolean isSetBodyContent();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Example attribute
-	 * The example element provides an informal description of an example of the use
-	 * of a tag.
-	 */
-	String getExample();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Example attribute
-	 */
-	void setExample(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getJSPTag_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Dynamic Attributes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dynamic Attributes</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dynamic Attributes</em>' attribute.
-	 * @see #setDynamicAttributes(boolean)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getJSPTag_DynamicAttributes()
-	 * @model
-	 * @generated
-	 */
-	boolean isDynamicAttributes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#isDynamicAttributes <em>Dynamic Attributes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dynamic Attributes</em>' attribute.
-	 * @see #isDynamicAttributes()
-	 * @generated
-	 */
-	void setDynamicAttributes(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Attributes references
-	 */
-	EList getAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Variables references
-	 * The variable element provides information on the scripting variables defined by 
-	 * this tag.
-	 * It is a (translation time) error for an action that has one or more variable
-	 * subelements to have a TagExtraInfo class that returns a non-null object.
-	 * The subelements of variable are of the form:
-	 * name-given -- The variable name as a constant
-	 * name-from-attribute -- The name of an attribute whose (translation time) value
-	 * will give the name of the variable. One of name-given or namefrom-attribute is
-	 * required.
-	 * variable-class -- Name of the class of the variable. java.lang.String is
-	 * default.
-	 * declare -- Whether the variable is declared or not. True is the default.
-	 * scope -- The scope of the scripting variable defined. NESTED is default.
-
-	 */
-	EList getVariables();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The TagClass reference
-	 * The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag
-	 * that implements the request time semantics for this tag. This element is
-	 * required.
-	 * @regexp fully qualified Java class name
-
-	 */
-	JavaClass getTagClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the TagClass reference
-	 */
-	void setTagClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The TeiClass reference
-	 * The tei-class element indicates the subclass of
-	 * javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated
-	 * at translation time. This element is optional.
-	 * @regexp fully qualified Java class name
-	 */
-	JavaClass getTeiClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the TeiClass reference
-	 */
-	void setTeiClass(JavaClass value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPTagAttribute.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPTagAttribute.java
deleted file mode 100644
index a1f92eb18..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPTagAttribute.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The attribute tag defines an attribute for the nesting tag
- * @generated
- */
-public interface JSPTagAttribute extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * Defines the canonical name of a tag or attribute being defined (required).
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Required attribute
-	 * Defines if the nesting attribute is required or optional.
-	 */
-	boolean isRequired();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Required attribute
-	 */
-	void setRequired(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRequired <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	void unsetRequired();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRequired <em>Required</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Required</em>' attribute is set.
-	 * @see #unsetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	boolean isSetRequired();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RtExprValue attribute
-	 * Defines if the nesting attribute can have scriptlet expressions asa value, i.e
-	 * the value of the attribute may be dynamically calculatedat request time, as
-	 * opposed to a static value determined at translationtime. (optional)
-	 * Default = false
-	 */
-	boolean isRtExprValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RtExprValue attribute
-	 */
-	void setRtExprValue(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRtExprValue <em>Rt Expr Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRtExprValue()
-	 * @see #isRtExprValue()
-	 * @see #setRtExprValue(boolean)
-	 * @generated
-	 */
-	void unsetRtExprValue();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRtExprValue <em>Rt Expr Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Rt Expr Value</em>' attribute is set.
-	 * @see #unsetRtExprValue()
-	 * @see #isRtExprValue()
-	 * @see #setRtExprValue(boolean)
-	 * @generated
-	 */
-	boolean isSetRtExprValue();
-
-	/**
-	 * Returns the value of the '<em><b>Fragment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fragment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Fragment</em>' attribute.
-	 * @see #setFragment(boolean)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getJSPTagAttribute_Fragment()
-	 * @model
-	 * @generated
-	 */
-	boolean isFragment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isFragment <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fragment</em>' attribute.
-	 * @see #isFragment()
-	 * @generated
-	 */
-	void setFragment(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Type reference
-	 * The value of the type element describes the Java type of the attributes value.
-	 * For static values (those determined at translation time) the type is always
-	 * java.lang.String.
-	 */
-	JavaClass getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Type reference
-	 */
-	void setType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getJSPTagAttribute_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPVariable.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPVariable.java
deleted file mode 100644
index aa0ee1cda..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/JSPVariable.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * @generated
- */
-public interface JSPVariable extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the NameGiven attribute
-	 * The name-given element provides the name for the scripting variable.
-	 * 
-	 * One of name-given or name-from-attribute is required.
-	 */
-	String getNameGiven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the NameGiven attribute
-	 */
-	void setNameGiven(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the NameFromAttribute attribute
-	 * The name of an attribute whose (translation-time) value will give the name of
-	 * the variable.
-	 */
-	String getNameFromAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the NameFromAttribute attribute
-	 */
-	void setNameFromAttribute(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Declare attribute
-	 * The value of the declare element indicates whether the scripting variable is to 
-	 * be defined or not. See TagExtraInfo for details.
-	 * This element is optional and is the default is true.
-
-	 */
-	boolean isDeclare();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Declare attribute
-	 */
-	void setDeclare(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Scope attribute
-	 */
-	JSPScriptingVariableScope getScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope
-	 * @see #getScope()
-	 * @generated
-	 */
-	void setScope(JSPScriptingVariableScope value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The VariableClass reference
-	 */
-	JavaClass getVariableClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the VariableClass reference
-	 */
-	void setVariableClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getJSPVariable_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TagFile.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TagFile.java
deleted file mode 100644
index ef917982a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TagFile.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tag File</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4
- * Defines an action in this tag library that is implemented
- * as a .tag file.
- * 
- * The tag-file element has two required subelements:
- * 
- * name    The unique action name
- * 
- * path    Where to find the .tag file implementing this
- *         action, relative to the root of the web application or
- * 	the root of the JAR file for a tag library packaged in
- * 	a JAR.  This must begin with /WEB-INF/tags if the .tag
- * 	file resides in the WAR, or /META-INF/tags if the .tag
- * 	file resides in a JAR.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getTagExtensions <em>Tag Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagFile()
- * @model
- * @generated
- */
-public interface TagFile extends DescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagFile_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Path</em>' attribute.
-	 * @see #setPath(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagFile_Path()
-	 * @model
-	 * @generated
-	 */
-	String getPath();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getPath <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Path</em>' attribute.
-	 * @see #getPath()
-	 * @generated
-	 */
-	void setPath(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Example</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Example</em>' attribute.
-	 * @see #setExample(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagFile_Example()
-	 * @model
-	 * @generated
-	 */
-	String getExample();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getExample <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Example</em>' attribute.
-	 * @see #getExample()
-	 * @generated
-	 */
-	void setExample(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Tag Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.taglib.internal.TldExtension}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tag Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tag Extensions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagFile_TagExtensions()
-	 * @model type="org.eclipse.jst.j2ee.taglib.internal.TldExtension" containment="true"
-	 * @generated
-	 */
-	EList getTagExtensions();
-
-} // TagFile
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TagLib.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TagLib.java
deleted file mode 100644
index 9d75b314b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TagLib.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-/**
- * The taglib tag is the document root.
-
- */
-public interface TagLib extends CompatibilityDescriptionGroup {
-	/**
-	 * These values are used in the deployment descriptor, use getVersionID() to determine module versions
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TagLibVersion attribute
-	 * Describes this version number of the tag library (dewey decimal).
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	String getTagLibVersion();
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the TagLibVersion attribute
-	 */
-	void setTagLibVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the JspVersion attribute
-	 * Describes the JSP version (number) this tag library requires in order to
-	 * function (dewey decimal).  Default is 1.2
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	String getJspVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the JspVersion attribute
-	 */
-	void setJspVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ShortName attribute
-	 * The value of the short-name element is a name that could be used by a JSP
-	 * authoring tool to create names with a mnemonic value; for example, it may be
-	 * used as the prefered prefix value in taglib directives. Do not use white space, 
-	 * and do not start with digits or underscore.
-	 */
-	String getShortName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ShortName attribute
-	 */
-	void setShortName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Uri attribute
-	 * The value of the uri element is a public URI that uniquely identifies the exact 
-	 * semantics of this taglibrary.
-	 */
-	String getUri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Uri attribute
-	 */
-	void setUri(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Tags references
-	 */
-	EList getTags();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Validator reference
-	 * The validator element provides information on an optional validator that can be 
-	 * used to validate the conformance of a JSP page to using this tag library.
-
-	 */
-	Validator getValidator();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Validator reference
-	 */
-	void setValidator(Validator value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Listeners references
-	 */
-	EList getListeners();
-
-	/**
-	 * Returns the value of the '<em><b>Functions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.taglib.internal.Function}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Functions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Functions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagLib_Functions()
-	 * @model type="org.eclipse.jst.j2ee.taglib.internal.Function" containment="true"
-	 * @generated
-	 */
-	EList getFunctions();
-
-	/**
-	 * Returns the value of the '<em><b>Taglib Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.taglib.internal.TldExtension}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taglib Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Taglib Extensions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTagLib_TaglibExtensions()
-	 * @model type="org.eclipse.jst.j2ee.taglib.internal.TldExtension" containment="true"
-	 * @generated
-	 */
-	EList getTaglibExtensions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TaglibFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TaglibFactory.java
deleted file mode 100644
index 37589a1a6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TaglibFactory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaglibFactory.java,v 1.3 2006/07/14 15:07:02 jlanuti Exp $
- */
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.taglib.TaglibPackage
- * @generated
- */
-public interface TaglibFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TaglibFactory eINSTANCE = org.eclipse.jst.j2ee.taglib.internal.impl.TaglibFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Tag Lib</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tag Lib</em>'.
-	 * @generated
-	 */
-	TagLib createTagLib();
-
-	/**
-	 * Returns a new object of class '<em>JSP Tag</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Tag</em>'.
-	 * @generated
-	 */
-	JSPTag createJSPTag();
-
-	/**
-	 * Returns a new object of class '<em>JSP Tag Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Tag Attribute</em>'.
-	 * @generated
-	 */
-	JSPTagAttribute createJSPTagAttribute();
-
-	/**
-	 * Returns a new object of class '<em>Validator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Validator</em>'.
-	 * @generated
-	 */
-	Validator createValidator();
-
-	/**
-	 * Returns a new object of class '<em>JSP Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Variable</em>'.
-	 * @generated
-	 */
-	JSPVariable createJSPVariable();
-
-	/**
-	 * Returns a new object of class '<em>Function</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Function</em>'.
-	 * @generated
-	 */
-	Function createFunction();
-
-	/**
-	 * Returns a new object of class '<em>Tag File</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tag File</em>'.
-	 * @generated
-	 */
-	TagFile createTagFile();
-
-	/**
-	 * Returns a new object of class '<em>Tld Extension</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tld Extension</em>'.
-	 * @generated
-	 */
-	TldExtension createTldExtension();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	TaglibPackage getTaglibPackage();
-
-} //TaglibFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TaglibPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TaglibPackage.java
deleted file mode 100644
index cec424a9a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TaglibPackage.java
+++ /dev/null
@@ -1,1876 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaglibPackage.java,v 1.3 2006/07/14 15:07:02 jlanuti Exp $
- */
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.taglib.TaglibFactory
- * @model kind="package"
- * @generated
- */
-public interface TaglibPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "taglib";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "taglib.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.taglib";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TaglibPackage eINSTANCE = org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagLibImpl <em>Tag Lib</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TagLibImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getTagLib()
-	 * @generated
-	 */
-	int TAG_LIB = 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Tag Lib Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__TAG_LIB_VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Jsp Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__JSP_VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Short Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__SHORT_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__URI = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Tags</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__TAGS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Validator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__VALIDATOR = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Listeners</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__LISTENERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Functions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__FUNCTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Taglib Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__TAGLIB_EXTENSIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the '<em>Tag Lib</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagImpl <em>JSP Tag</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPTag()
-	 * @generated
-	 */
-	int JSP_TAG = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__ICONS = CommonPackage.DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__DISPLAY_NAMES = CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__DESCRIPTIONS = CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Body Content</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__BODY_CONTENT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__EXAMPLE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__NAME = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Dynamic Attributes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__DYNAMIC_ATTRIBUTES = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__ATTRIBUTES = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Variables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__VARIABLES = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Tag Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__TAG_CLASS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Tei Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__TEI_CLASS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>JSP Tag</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_FEATURE_COUNT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagAttributeImpl <em>JSP Tag Attribute</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagAttributeImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPTagAttribute()
-	 * @generated
-	 */
-	int JSP_TAG_ATTRIBUTE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__REQUIRED = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Rt Expr Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Fragment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__FRAGMENT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>JSP Tag Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.ValidatorImpl <em>Validator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.ValidatorImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getValidator()
-	 * @generated
-	 */
-	int VALIDATOR = 3;
-
-	/**
-	 * The feature id for the '<em><b>Validator Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATOR__VALIDATOR_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATOR__INIT_PARAMS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATOR__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Validator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATOR_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.JSPVariableImpl <em>JSP Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.JSPVariableImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPVariable()
-	 * @generated
-	 */
-	int JSP_VARIABLE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name Given</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__NAME_GIVEN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name From Attribute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__NAME_FROM_ATTRIBUTE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Declare</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__DECLARE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__SCOPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Variable Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__VARIABLE_CLASS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>JSP Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl <em>Function</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getFunction()
-	 * @generated
-	 */
-	int FUNCTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__ICONS = CommonPackage.DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__DISPLAY_NAMES = CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__DESCRIPTIONS = CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__NAME = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Signature</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__SIGNATURE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__EXAMPLE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Function Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__FUNCTION_CLASS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Function Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__FUNCTION_EXTENSIONS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Function</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION_FEATURE_COUNT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl <em>Tag File</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getTagFile()
-	 * @generated
-	 */
-	int TAG_FILE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__ICONS = CommonPackage.DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__DISPLAY_NAMES = CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__DESCRIPTIONS = CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__NAME = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__PATH = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__EXAMPLE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Tag Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__TAG_EXTENSIONS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Tag File</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE_FEATURE_COUNT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.TldExtensionImpl <em>Tld Extension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TldExtensionImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getTldExtension()
-	 * @generated
-	 */
-	int TLD_EXTENSION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TLD_EXTENSION__NAMESPACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Extension Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TLD_EXTENSION__EXTENSION_ELEMENTS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Tld Extension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TLD_EXTENSION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.ExtensibleTypeImpl <em>Extensible Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.ExtensibleTypeImpl
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getExtensibleType()
-	 * @generated
-	 */
-	int EXTENSIBLE_TYPE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSIBLE_TYPE__VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Extensible Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSIBLE_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.BodyContentType <em>Body Content Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.BodyContentType
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getBodyContentType()
-	 * @generated
-	 */
-	int BODY_CONTENT_TYPE = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope <em>JSP Scripting Variable Scope</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope
-	 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPScriptingVariableScope()
-	 * @generated
-	 */
-	int JSP_SCRIPTING_VARIABLE_SCOPE = 10;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib <em>Tag Lib</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tag Lib</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib
-	 * @generated
-	 */
-	EClass getTagLib();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getTagLibVersion <em>Tag Lib Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tag Lib Version</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getTagLibVersion()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_TagLibVersion();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getJspVersion <em>Jsp Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jsp Version</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getJspVersion()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_JspVersion();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getShortName <em>Short Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Short Name</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getShortName()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_ShortName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getUri <em>Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Uri</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getUri()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EAttribute getTagLib_Uri();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getTags <em>Tags</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tags</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getTags()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_Tags();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getValidator <em>Validator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Validator</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getValidator()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_Validator();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getListeners <em>Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Listeners</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getListeners()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_Listeners();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getFunctions <em>Functions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Functions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getFunctions()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_Functions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.TagLib#getTaglibExtensions <em>Taglib Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Taglib Extensions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagLib#getTaglibExtensions()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_TaglibExtensions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag <em>JSP Tag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Tag</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag
-	 * @generated
-	 */
-	EClass getJSPTag();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getBodyContent <em>Body Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Body Content</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getBodyContent()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EAttribute getJSPTag_BodyContent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Example</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getExample()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EAttribute getJSPTag_Example();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getName()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EAttribute getJSPTag_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#isDynamicAttributes <em>Dynamic Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Dynamic Attributes</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#isDynamicAttributes()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EAttribute getJSPTag_DynamicAttributes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Attributes</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getAttributes()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EReference getJSPTag_Attributes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getVariables <em>Variables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Variables</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getVariables()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EReference getJSPTag_Variables();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getTagClass <em>Tag Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Tag Class</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getTagClass()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EReference getJSPTag_TagClass();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTag#getTeiClass <em>Tei Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Tei Class</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTag#getTeiClass()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EReference getJSPTag_TeiClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute <em>JSP Tag Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Tag Attribute</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute
-	 * @generated
-	 */
-	EClass getJSPTagAttribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#getName()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EAttribute getJSPTagAttribute_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRequired <em>Required</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Required</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRequired()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EAttribute getJSPTagAttribute_Required();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRtExprValue <em>Rt Expr Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rt Expr Value</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isRtExprValue()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EAttribute getJSPTagAttribute_RtExprValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isFragment <em>Fragment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fragment</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#isFragment()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EAttribute getJSPTagAttribute_Fragment();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#getType()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EReference getJSPTagAttribute_Type();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute#getDescriptions()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EReference getJSPTagAttribute_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.Validator <em>Validator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Validator</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Validator
-	 * @generated
-	 */
-	EClass getValidator();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.taglib.internal.Validator#getValidatorClass <em>Validator Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Validator Class</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Validator#getValidatorClass()
-	 * @see #getValidator()
-	 * @generated
-	 */
-	EReference getValidator_ValidatorClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.Validator#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Validator#getInitParams()
-	 * @see #getValidator()
-	 * @generated
-	 */
-	EReference getValidator_InitParams();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.Validator#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Validator#getDescriptions()
-	 * @see #getValidator()
-	 * @generated
-	 */
-	EReference getValidator_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable <em>JSP Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Variable</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable
-	 * @generated
-	 */
-	EClass getJSPVariable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getNameGiven <em>Name Given</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name Given</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getNameGiven()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EAttribute getJSPVariable_NameGiven();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getNameFromAttribute <em>Name From Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name From Attribute</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getNameFromAttribute()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EAttribute getJSPVariable_NameFromAttribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#isDeclare <em>Declare</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Declare</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable#isDeclare()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EAttribute getJSPVariable_Declare();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getScope <em>Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scope</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getScope()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EAttribute getJSPVariable_Scope();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getVariableClass <em>Variable Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Variable Class</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getVariableClass()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EReference getJSPVariable_VariableClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPVariable#getDescriptions()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EReference getJSPVariable_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.Function <em>Function</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Function</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function
-	 * @generated
-	 */
-	EClass getFunction();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function#getName()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EAttribute getFunction_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getSignature <em>Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Signature</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function#getSignature()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EAttribute getFunction_Signature();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Example</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function#getExample()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EAttribute getFunction_Example();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionClass <em>Function Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Function Class</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionClass()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EReference getFunction_FunctionClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionExtensions <em>Function Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Function Extensions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function#getFunctionExtensions()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EReference getFunction_FunctionExtensions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile <em>Tag File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tag File</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagFile
-	 * @generated
-	 */
-	EClass getTagFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagFile#getName()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EAttribute getTagFile_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getPath <em>Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Path</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagFile#getPath()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EAttribute getTagFile_Path();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Example</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagFile#getExample()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EAttribute getTagFile_Example();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile#getTagExtensions <em>Tag Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tag Extensions</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagFile#getTagExtensions()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EReference getTagFile_TagExtensions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension <em>Tld Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tld Extension</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TldExtension
-	 * @generated
-	 */
-	EClass getTldExtension();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension#getNamespace <em>Namespace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Namespace</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TldExtension#getNamespace()
-	 * @see #getTldExtension()
-	 * @generated
-	 */
-	EAttribute getTldExtension_Namespace();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension#getExtensionElements <em>Extension Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extension Elements</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TldExtension#getExtensionElements()
-	 * @see #getTldExtension()
-	 * @generated
-	 */
-	EReference getTldExtension_ExtensionElements();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.taglib.internal.ExtensibleType <em>Extensible Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extensible Type</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.ExtensibleType
-	 * @generated
-	 */
-	EClass getExtensibleType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.taglib.internal.ExtensibleType#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.ExtensibleType#getValue()
-	 * @see #getExtensibleType()
-	 * @generated
-	 */
-	EAttribute getExtensibleType_Value();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.taglib.internal.BodyContentType <em>Body Content Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Body Content Type</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.BodyContentType
-	 * @generated
-	 */
-	EEnum getBodyContentType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope <em>JSP Scripting Variable Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>JSP Scripting Variable Scope</em>'.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope
-	 * @generated
-	 */
-	EEnum getJSPScriptingVariableScope();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	TaglibFactory getTaglibFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagLibImpl <em>Tag Lib</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TagLibImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getTagLib()
-		 * @generated
-		 */
-		EClass TAG_LIB = eINSTANCE.getTagLib();
-
-		/**
-		 * The meta object literal for the '<em><b>Tag Lib Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__TAG_LIB_VERSION = eINSTANCE.getTagLib_TagLibVersion();
-
-		/**
-		 * The meta object literal for the '<em><b>Jsp Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__JSP_VERSION = eINSTANCE.getTagLib_JspVersion();
-
-		/**
-		 * The meta object literal for the '<em><b>Short Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__SHORT_NAME = eINSTANCE.getTagLib_ShortName();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB__URI = eINSTANCE.getTagLib_Uri();
-
-		/**
-		 * The meta object literal for the '<em><b>Tags</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_LIB__TAGS = eINSTANCE.getTagLib_Tags();
-
-		/**
-		 * The meta object literal for the '<em><b>Validator</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_LIB__VALIDATOR = eINSTANCE.getTagLib_Validator();
-
-		/**
-		 * The meta object literal for the '<em><b>Listeners</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_LIB__LISTENERS = eINSTANCE.getTagLib_Listeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Functions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_LIB__FUNCTIONS = eINSTANCE.getTagLib_Functions();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib Extensions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_LIB__TAGLIB_EXTENSIONS = eINSTANCE.getTagLib_TaglibExtensions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagImpl <em>JSP Tag</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPTag()
-		 * @generated
-		 */
-		EClass JSP_TAG = eINSTANCE.getJSPTag();
-
-		/**
-		 * The meta object literal for the '<em><b>Body Content</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG__BODY_CONTENT = eINSTANCE.getJSPTag_BodyContent();
-
-		/**
-		 * The meta object literal for the '<em><b>Example</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG__EXAMPLE = eINSTANCE.getJSPTag_Example();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG__NAME = eINSTANCE.getJSPTag_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Dynamic Attributes</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG__DYNAMIC_ATTRIBUTES = eINSTANCE.getJSPTag_DynamicAttributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_TAG__ATTRIBUTES = eINSTANCE.getJSPTag_Attributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_TAG__VARIABLES = eINSTANCE.getJSPTag_Variables();
-
-		/**
-		 * The meta object literal for the '<em><b>Tag Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_TAG__TAG_CLASS = eINSTANCE.getJSPTag_TagClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Tei Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_TAG__TEI_CLASS = eINSTANCE.getJSPTag_TeiClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagAttributeImpl <em>JSP Tag Attribute</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.JSPTagAttributeImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPTagAttribute()
-		 * @generated
-		 */
-		EClass JSP_TAG_ATTRIBUTE = eINSTANCE.getJSPTagAttribute();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG_ATTRIBUTE__NAME = eINSTANCE.getJSPTagAttribute_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Required</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG_ATTRIBUTE__REQUIRED = eINSTANCE.getJSPTagAttribute_Required();
-
-		/**
-		 * The meta object literal for the '<em><b>Rt Expr Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE = eINSTANCE.getJSPTagAttribute_RtExprValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Fragment</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TAG_ATTRIBUTE__FRAGMENT = eINSTANCE.getJSPTagAttribute_Fragment();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_TAG_ATTRIBUTE__TYPE = eINSTANCE.getJSPTagAttribute_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_TAG_ATTRIBUTE__DESCRIPTIONS = eINSTANCE.getJSPTagAttribute_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.ValidatorImpl <em>Validator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.ValidatorImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getValidator()
-		 * @generated
-		 */
-		EClass VALIDATOR = eINSTANCE.getValidator();
-
-		/**
-		 * The meta object literal for the '<em><b>Validator Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VALIDATOR__VALIDATOR_CLASS = eINSTANCE.getValidator_ValidatorClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VALIDATOR__INIT_PARAMS = eINSTANCE.getValidator_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VALIDATOR__DESCRIPTIONS = eINSTANCE.getValidator_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.JSPVariableImpl <em>JSP Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.JSPVariableImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPVariable()
-		 * @generated
-		 */
-		EClass JSP_VARIABLE = eINSTANCE.getJSPVariable();
-
-		/**
-		 * The meta object literal for the '<em><b>Name Given</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_VARIABLE__NAME_GIVEN = eINSTANCE.getJSPVariable_NameGiven();
-
-		/**
-		 * The meta object literal for the '<em><b>Name From Attribute</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_VARIABLE__NAME_FROM_ATTRIBUTE = eINSTANCE.getJSPVariable_NameFromAttribute();
-
-		/**
-		 * The meta object literal for the '<em><b>Declare</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_VARIABLE__DECLARE = eINSTANCE.getJSPVariable_Declare();
-
-		/**
-		 * The meta object literal for the '<em><b>Scope</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_VARIABLE__SCOPE = eINSTANCE.getJSPVariable_Scope();
-
-		/**
-		 * The meta object literal for the '<em><b>Variable Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_VARIABLE__VARIABLE_CLASS = eINSTANCE.getJSPVariable_VariableClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JSP_VARIABLE__DESCRIPTIONS = eINSTANCE.getJSPVariable_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl <em>Function</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getFunction()
-		 * @generated
-		 */
-		EClass FUNCTION = eINSTANCE.getFunction();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FUNCTION__NAME = eINSTANCE.getFunction_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Signature</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FUNCTION__SIGNATURE = eINSTANCE.getFunction_Signature();
-
-		/**
-		 * The meta object literal for the '<em><b>Example</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FUNCTION__EXAMPLE = eINSTANCE.getFunction_Example();
-
-		/**
-		 * The meta object literal for the '<em><b>Function Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FUNCTION__FUNCTION_CLASS = eINSTANCE.getFunction_FunctionClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Function Extensions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FUNCTION__FUNCTION_EXTENSIONS = eINSTANCE.getFunction_FunctionExtensions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl <em>Tag File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getTagFile()
-		 * @generated
-		 */
-		EClass TAG_FILE = eINSTANCE.getTagFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_FILE__NAME = eINSTANCE.getTagFile_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Path</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_FILE__PATH = eINSTANCE.getTagFile_Path();
-
-		/**
-		 * The meta object literal for the '<em><b>Example</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_FILE__EXAMPLE = eINSTANCE.getTagFile_Example();
-
-		/**
-		 * The meta object literal for the '<em><b>Tag Extensions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_FILE__TAG_EXTENSIONS = eINSTANCE.getTagFile_TagExtensions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.TldExtensionImpl <em>Tld Extension</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TldExtensionImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getTldExtension()
-		 * @generated
-		 */
-		EClass TLD_EXTENSION = eINSTANCE.getTldExtension();
-
-		/**
-		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TLD_EXTENSION__NAMESPACE = eINSTANCE.getTldExtension_Namespace();
-
-		/**
-		 * The meta object literal for the '<em><b>Extension Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TLD_EXTENSION__EXTENSION_ELEMENTS = eINSTANCE.getTldExtension_ExtensionElements();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.impl.ExtensibleTypeImpl <em>Extensible Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.ExtensibleTypeImpl
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getExtensibleType()
-		 * @generated
-		 */
-		EClass EXTENSIBLE_TYPE = eINSTANCE.getExtensibleType();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXTENSIBLE_TYPE__VALUE = eINSTANCE.getExtensibleType_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.BodyContentType <em>Body Content Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.BodyContentType
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getBodyContentType()
-		 * @generated
-		 */
-		EEnum BODY_CONTENT_TYPE = eINSTANCE.getBodyContentType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope <em>JSP Scripting Variable Scope</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope
-		 * @see org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl#getJSPScriptingVariableScope()
-		 * @generated
-		 */
-		EEnum JSP_SCRIPTING_VARIABLE_SCOPE = eINSTANCE.getJSPScriptingVariableScope();
-
-	}
-
-} //TaglibPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TldExtension.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TldExtension.java
deleted file mode 100644
index 132c61f23..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/TldExtension.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tld Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension#getExtensionElements <em>Extension Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTldExtension()
- * @model
- * @generated
- */
-public interface TldExtension extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Namespace</em>' attribute.
-	 * @see #setNamespace(String)
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTldExtension_Namespace()
-	 * @model
-	 * @generated
-	 */
-	String getNamespace();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension#getNamespace <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace</em>' attribute.
-	 * @see #getNamespace()
-	 * @generated
-	 */
-	void setNamespace(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Extension Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.taglib.internal.ExtensibleType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Extension Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Extension Elements</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getTldExtension_ExtensionElements()
-	 * @model type="org.eclipse.jst.j2ee.taglib.internal.ExtensibleType" containment="true" required="true"
-	 * @generated
-	 */
-	EList getExtensionElements();
-
-} // TldExtension
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/Validator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/Validator.java
deleted file mode 100644
index dff2b07cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/Validator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.
- * @generated
- */
-public interface Validator extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ValidatorClass reference
-	 * defines the TagLibraryValidator class that can be
-	 * used to validate the conformance of a JSP page to using this tag library.
-	 */
-	JavaClass getValidatorClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ValidatorClass reference
-	 */
-	void setValidatorClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of InitParams references
-	 */
-	EList getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.taglib.TaglibPackage#getValidator_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/ExtensibleTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/ExtensibleTypeImpl.java
deleted file mode 100644
index 8b85445e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/ExtensibleTypeImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.taglib.internal.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensible Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.ExtensibleTypeImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ExtensibleTypeImpl extends J2EEEObjectImpl implements ExtensibleType {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtensibleTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.EXTENSIBLE_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.EXTENSIBLE_TYPE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExtensibleTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/FunctionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/FunctionImpl.java
deleted file mode 100644
index 80a19a04e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/FunctionImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl;
-import org.eclipse.jst.j2ee.taglib.internal.Function;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Function</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl#getSignature <em>Signature</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl#getFunctionClass <em>Function Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.FunctionImpl#getFunctionExtensions <em>Function Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FunctionImpl extends DescriptionGroupImpl implements Function {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SIGNATURE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected String signature = SIGNATURE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXAMPLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected String example = EXAMPLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFunctionClass() <em>Function Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctionClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass functionClass = null;
-
-	/**
-	 * The cached value of the '{@link #getFunctionExtensions() <em>Function Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctionExtensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList functionExtensions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FunctionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.FUNCTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSignature() {
-		return signature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSignature(String newSignature) {
-		String oldSignature = signature;
-		signature = newSignature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__SIGNATURE, oldSignature, signature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExample() {
-		return example;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExample(String newExample) {
-		String oldExample = example;
-		example = newExample;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__EXAMPLE, oldExample, example));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getFunctionClass() {
-		if (functionClass != null && functionClass.eIsProxy()) {
-			InternalEObject oldFunctionClass = (InternalEObject)functionClass;
-			functionClass = (JavaClass)eResolveProxy(oldFunctionClass);
-			if (functionClass != oldFunctionClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.FUNCTION__FUNCTION_CLASS, oldFunctionClass, functionClass));
-			}
-		}
-		return functionClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetFunctionClass() {
-		return functionClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFunctionClass(JavaClass newFunctionClass) {
-		JavaClass oldFunctionClass = functionClass;
-		functionClass = newFunctionClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__FUNCTION_CLASS, oldFunctionClass, functionClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFunctionExtensions() {
-		if (functionExtensions == null) {
-			functionExtensions = new EObjectContainmentEList(TldExtension.class, this, TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS);
-		}
-		return functionExtensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				return ((InternalEList)getFunctionExtensions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.FUNCTION__NAME:
-				return getName();
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				return getSignature();
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				return getExample();
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				if (resolve) return getFunctionClass();
-				return basicGetFunctionClass();
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				return getFunctionExtensions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.FUNCTION__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				setSignature((String)newValue);
-				return;
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				setExample((String)newValue);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				setFunctionClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				getFunctionExtensions().clear();
-				getFunctionExtensions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.FUNCTION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				setSignature(SIGNATURE_EDEFAULT);
-				return;
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				setExample(EXAMPLE_EDEFAULT);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				setFunctionClass((JavaClass)null);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				getFunctionExtensions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.FUNCTION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature);
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				return EXAMPLE_EDEFAULT == null ? example != null : !EXAMPLE_EDEFAULT.equals(example);
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				return functionClass != null;
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				return functionExtensions != null && !functionExtensions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", signature: ");
-		result.append(signature);
-		result.append(", example: ");
-		result.append(example);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FunctionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPTagAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPTagAttributeImpl.java
deleted file mode 100644
index c843573e7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPTagAttributeImpl.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-
-
-/**
- * The attribute tag defines an attribute for the nesting tag
- * @generated
- */
-public class JSPTagAttributeImpl extends J2EEEObjectImpl implements JSPTagAttribute {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRequired()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REQUIRED_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean required = REQUIRED_EDEFAULT;
-	/**
-	 * This is true if the Required attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean requiredESet = false;
-
-	/**
-	 * The default value of the '{@link #isRtExprValue() <em>Rt Expr Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRtExprValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RT_EXPR_VALUE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean rtExprValue = RT_EXPR_VALUE_EDEFAULT;
-	/**
-	 * This is true if the Rt Expr Value attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean rtExprValueESet = false;
-
-	/**
-	 * The default value of the '{@link #isFragment() <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFragment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FRAGMENT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isFragment() <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFragment()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fragment = FRAGMENT_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass type = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public JSPTagAttributeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.JSP_TAG_ATTRIBUTE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines the canonical name of a tag or attribute being defined (required).
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines if the nesting attribute is required or optional.
-	 */
-	public boolean isRequired() {
-		return required;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRequired(boolean newRequired) {
-		boolean oldRequired = required;
-		required = newRequired;
-		boolean oldRequiredESet = requiredESet;
-		requiredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED, oldRequired, required, !oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRequired() {
-		boolean oldRequired = required;
-		boolean oldRequiredESet = requiredESet;
-		required = REQUIRED_EDEFAULT;
-		requiredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED, oldRequired, REQUIRED_EDEFAULT, oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRequired() {
-		return requiredESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines if the nesting attribute can have scriptlet expressions asa value, i.e
-	 * the value of the attribute may be dynamically calculatedat request time, as
-	 * opposed to a static value determined at translationtime. (optional)
-	 * Default = false
-	 */
-	public boolean isRtExprValue() {
-		return rtExprValue;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRtExprValue(boolean newRtExprValue) {
-		boolean oldRtExprValue = rtExprValue;
-		rtExprValue = newRtExprValue;
-		boolean oldRtExprValueESet = rtExprValueESet;
-		rtExprValueESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE, oldRtExprValue, rtExprValue, !oldRtExprValueESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRtExprValue() {
-		boolean oldRtExprValue = rtExprValue;
-		boolean oldRtExprValueESet = rtExprValueESet;
-		rtExprValue = RT_EXPR_VALUE_EDEFAULT;
-		rtExprValueESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE, oldRtExprValue, RT_EXPR_VALUE_EDEFAULT, oldRtExprValueESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRtExprValue() {
-		return rtExprValueESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFragment() {
-		return fragment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFragment(boolean newFragment) {
-		boolean oldFragment = fragment;
-		fragment = newFragment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT, oldFragment, fragment));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the type element describes the Java type of the attributes value.
-	 * For static values (those determined at translation time) the type is always
-	 * java.lang.String.
-	 */
-	public JavaClass getType() {
-		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (JavaClass)eResolveProxy(oldType);
-			if (type != oldType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE, oldType, type));
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(JavaClass newType) {
-		JavaClass oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				return getName();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				return isRtExprValue() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				return isFragment() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				setRtExprValue(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				setFragment(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				setType((JavaClass)newValue);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				unsetRequired();
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				unsetRtExprValue();
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				setFragment(FRAGMENT_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				setType((JavaClass)null);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				return isSetRequired();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				return isSetRtExprValue();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				return fragment != FRAGMENT_EDEFAULT;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				return type != null;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", required: ");
-		if (requiredESet) result.append(required); else result.append("<unset>");
-		result.append(", rtExprValue: ");
-		if (rtExprValueESet) result.append(rtExprValue); else result.append("<unset>");
-		result.append(", fragment: ");
-		result.append(fragment);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPTagImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPTagImpl.java
deleted file mode 100644
index 326e3ced8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPTagImpl.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl;
-import org.eclipse.jst.j2ee.taglib.internal.BodyContentType;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTag;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.internal.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-
-
-/**
- * The tag element defines an action in this tag library. The tag element has one attribute, id.
- * The tag element may have several subelements defining:
- * name -- The unique action name
- * tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag
- * tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo
- * body-content -- The body content type
- * display-name -- A short name that is intended to be displayed by tools
- * small-icon -- Optional small-icon that can be used by tools
- * large-icon -- Optional large-icon that can be used by tools
- * description -- Optional tag-specific information
- * variable -- Optional scripting variable information
- * attribute -- All attributes of this action
- * example -- Optional informal description of an example of a use of this action.
-
- */
-public class JSPTagImpl extends DescriptionGroupImpl implements JSPTag {
-
-	/**
-	 * The default value of the '{@link #getBodyContent() <em>Body Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBodyContent()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BodyContentType BODY_CONTENT_EDEFAULT = BodyContentType.TAGDEPENDENT_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected BodyContentType bodyContent = BODY_CONTENT_EDEFAULT;
-	/**
-	 * This is true if the Body Content attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bodyContentESet = false;
-
-	/**
-	 * The default value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXAMPLE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String example = EXAMPLE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDynamicAttributes() <em>Dynamic Attributes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDynamicAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DYNAMIC_ATTRIBUTES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDynamicAttributes() <em>Dynamic Attributes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDynamicAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean dynamicAttributes = DYNAMIC_ATTRIBUTES_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList attributes = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList variables = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass tagClass = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass teiClass = null;
-	public JSPTagImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.JSP_TAG;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Provides a hint as to the content of the body of this tag. Primarily intended
-	 * for use by page composition tools.There are currently three values specified:
-	 * 
-	 * tagdependent - The body of the tag is interpreted by the tag implementation
-	 * itself, and is most likely in a		different "langage", e.g embedded SQL
-	 * statements.
-	 * 
-	 * JSP - The body of the tag contains nested JSP syntax
-	 * 
-	 * empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::= 
-	 * tagdependent | JSP | empty
-	 */
-	public BodyContentType getBodyContent() {
-		return bodyContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBodyContent(BodyContentType newBodyContent) {
-		BodyContentType oldBodyContent = bodyContent;
-		bodyContent = newBodyContent == null ? BODY_CONTENT_EDEFAULT : newBodyContent;
-		boolean oldBodyContentESet = bodyContentESet;
-		bodyContentESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__BODY_CONTENT, oldBodyContent, bodyContent, !oldBodyContentESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBodyContent() {
-		BodyContentType oldBodyContent = bodyContent;
-		boolean oldBodyContentESet = bodyContentESet;
-		bodyContent = BODY_CONTENT_EDEFAULT;
-		bodyContentESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, TaglibPackage.JSP_TAG__BODY_CONTENT, oldBodyContent, BODY_CONTENT_EDEFAULT, oldBodyContentESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBodyContent() {
-		return bodyContentESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The example element provides an informal description of an example of the use
-	 * of a tag.
-	 */
-	public String getExample() {
-		return example;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExample(String newExample) {
-		String oldExample = example;
-		example = newExample;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__EXAMPLE, oldExample, example));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDynamicAttributes() {
-		return dynamicAttributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDynamicAttributes(boolean newDynamicAttributes) {
-		boolean oldDynamicAttributes = dynamicAttributes;
-		dynamicAttributes = newDynamicAttributes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES, oldDynamicAttributes, dynamicAttributes));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getAttributes() {
-		if (attributes == null) {
-			attributes = new EObjectContainmentEList(JSPTagAttribute.class, this, TaglibPackage.JSP_TAG__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The variable element provides information on the scripting variables defined by 
-	 * this tag.
-	 * It is a (translation time) error for an action that has one or more variable
-	 * subelements to have a TagExtraInfo class that returns a non-null object.
-	 * The subelements of variable are of the form:
-	 * name-given -- The variable name as a constant
-	 * name-from-attribute -- The name of an attribute whose (translation time) value
-	 * will give the name of the variable. One of name-given or namefrom-attribute is
-	 * required.
-	 * variable-class -- Name of the class of the variable. java.lang.String is
-	 * default.
-	 * declare -- Whether the variable is declared or not. True is the default.
-	 * scope -- The scope of the scripting variable defined. NESTED is default.
-
-	 */
-	public EList getVariables() {
-		if (variables == null) {
-			variables = new EObjectContainmentEList(JSPVariable.class, this, TaglibPackage.JSP_TAG__VARIABLES);
-		}
-		return variables;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag
-	 * that implements the request time semantics for this tag. This element is
-	 * required.
-	 * @regexp fully qualified Java class name
-
-	 */
-	public JavaClass getTagClass() {
-		if (tagClass != null && tagClass.eIsProxy()) {
-			InternalEObject oldTagClass = (InternalEObject)tagClass;
-			tagClass = (JavaClass)eResolveProxy(oldTagClass);
-			if (tagClass != oldTagClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_TAG__TAG_CLASS, oldTagClass, tagClass));
-			}
-		}
-		return tagClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetTagClass() {
-		return tagClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTagClass(JavaClass newTagClass) {
-		JavaClass oldTagClass = tagClass;
-		tagClass = newTagClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__TAG_CLASS, oldTagClass, tagClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The tei-class element indicates the subclass of
-	 * javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated
-	 * at translation time. This element is optional.
-	 * @regexp fully qualified Java class name
-	 */
-	public JavaClass getTeiClass() {
-		if (teiClass != null && teiClass.eIsProxy()) {
-			InternalEObject oldTeiClass = (InternalEObject)teiClass;
-			teiClass = (JavaClass)eResolveProxy(oldTeiClass);
-			if (teiClass != oldTeiClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_TAG__TEI_CLASS, oldTeiClass, teiClass));
-			}
-		}
-		return teiClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetTeiClass() {
-		return teiClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTeiClass(JavaClass newTeiClass) {
-		JavaClass oldTeiClass = teiClass;
-		teiClass = newTeiClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__TEI_CLASS, oldTeiClass, teiClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				return ((InternalEList)getVariables()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				return getBodyContent();
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				return getExample();
-			case TaglibPackage.JSP_TAG__NAME:
-				return getName();
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				return isDynamicAttributes() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				return getAttributes();
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				return getVariables();
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				if (resolve) return getTagClass();
-				return basicGetTagClass();
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				if (resolve) return getTeiClass();
-				return basicGetTeiClass();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				setBodyContent((BodyContentType)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				setExample((String)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				setDynamicAttributes(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				getVariables().clear();
-				getVariables().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				setTagClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				setTeiClass((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				unsetBodyContent();
-				return;
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				setExample(EXAMPLE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				setDynamicAttributes(DYNAMIC_ATTRIBUTES_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				getVariables().clear();
-				return;
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				setTagClass((JavaClass)null);
-				return;
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				setTeiClass((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				return isSetBodyContent();
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				return EXAMPLE_EDEFAULT == null ? example != null : !EXAMPLE_EDEFAULT.equals(example);
-			case TaglibPackage.JSP_TAG__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				return dynamicAttributes != DYNAMIC_ATTRIBUTES_EDEFAULT;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				return variables != null && !variables.isEmpty();
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				return tagClass != null;
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				return teiClass != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (bodyContent: ");
-		if (bodyContentESet) result.append(bodyContent); else result.append("<unset>");
-		result.append(", example: ");
-		result.append(example);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", dynamicAttributes: ");
-		result.append(dynamicAttributes);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPVariableImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPVariableImpl.java
deleted file mode 100644
index 24ef03cd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/JSPVariableImpl.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope;
-import org.eclipse.jst.j2ee.taglib.internal.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-
-
-/**
- * @generated
- */
-public class JSPVariableImpl extends J2EEEObjectImpl implements JSPVariable {
-
-	/**
-	 * The default value of the '{@link #getNameGiven() <em>Name Given</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNameGiven()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_GIVEN_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String nameGiven = NAME_GIVEN_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getNameFromAttribute() <em>Name From Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNameFromAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_FROM_ATTRIBUTE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String nameFromAttribute = NAME_FROM_ATTRIBUTE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isDeclare() <em>Declare</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeclare()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DECLARE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean declare = DECLARE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final JSPScriptingVariableScope SCOPE_EDEFAULT = JSPScriptingVariableScope.NESTED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JSPScriptingVariableScope scope = SCOPE_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass variableClass = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public JSPVariableImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.JSP_VARIABLE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The name-given element provides the name for the scripting variable.
-	 * 
-	 * One of name-given or name-from-attribute is required.
-	 */
-	public String getNameGiven() {
-		return nameGiven;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setNameGiven(String newNameGiven) {
-		String oldNameGiven = nameGiven;
-		nameGiven = newNameGiven;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__NAME_GIVEN, oldNameGiven, nameGiven));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The name of an attribute whose (translation-time) value will give the name of
-	 * the variable.
-	 */
-	public String getNameFromAttribute() {
-		return nameFromAttribute;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setNameFromAttribute(String newNameFromAttribute) {
-		String oldNameFromAttribute = nameFromAttribute;
-		nameFromAttribute = newNameFromAttribute;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE, oldNameFromAttribute, nameFromAttribute));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the declare element indicates whether the scripting variable is to 
-	 * be defined or not. See TagExtraInfo for details.
-	 * This element is optional and is the default is true.
-
-	 */
-	public boolean isDeclare() {
-		return declare;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDeclare(boolean newDeclare) {
-		boolean oldDeclare = declare;
-		declare = newDeclare;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__DECLARE, oldDeclare, declare));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JSPScriptingVariableScope getScope() {
-		return scope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScope(JSPScriptingVariableScope newScope) {
-		JSPScriptingVariableScope oldScope = scope;
-		scope = newScope == null ? SCOPE_EDEFAULT : newScope;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__SCOPE, oldScope, scope));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getVariableClass() {
-		if (variableClass != null && variableClass.eIsProxy()) {
-			InternalEObject oldVariableClass = (InternalEObject)variableClass;
-			variableClass = (JavaClass)eResolveProxy(oldVariableClass);
-			if (variableClass != oldVariableClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS, oldVariableClass, variableClass));
-			}
-		}
-		return variableClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetVariableClass() {
-		return variableClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVariableClass(JavaClass newVariableClass) {
-		JavaClass oldVariableClass = variableClass;
-		variableClass = newVariableClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS, oldVariableClass, variableClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, TaglibPackage.JSP_VARIABLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				return getNameGiven();
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				return getNameFromAttribute();
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				return isDeclare() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				return getScope();
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				if (resolve) return getVariableClass();
-				return basicGetVariableClass();
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				setNameGiven((String)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				setNameFromAttribute((String)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				setDeclare(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				setScope((JSPScriptingVariableScope)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				setVariableClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				setNameGiven(NAME_GIVEN_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				setNameFromAttribute(NAME_FROM_ATTRIBUTE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				setDeclare(DECLARE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				setScope(SCOPE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				setVariableClass((JavaClass)null);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				return NAME_GIVEN_EDEFAULT == null ? nameGiven != null : !NAME_GIVEN_EDEFAULT.equals(nameGiven);
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				return NAME_FROM_ATTRIBUTE_EDEFAULT == null ? nameFromAttribute != null : !NAME_FROM_ATTRIBUTE_EDEFAULT.equals(nameFromAttribute);
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				return declare != DECLARE_EDEFAULT;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				return scope != SCOPE_EDEFAULT;
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				return variableClass != null;
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (nameGiven: ");
-		result.append(nameGiven);
-		result.append(", nameFromAttribute: ");
-		result.append(nameFromAttribute);
-		result.append(", declare: ");
-		result.append(declare);
-		result.append(", scope: ");
-		result.append(scope);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TagFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TagFileImpl.java
deleted file mode 100644
index cfb67045e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TagFileImpl.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.DescriptionGroupImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TagFile;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tag File</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.TagFileImpl#getTagExtensions <em>Tag Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TagFileImpl extends DescriptionGroupImpl implements TagFile {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PATH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected String path = PATH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXAMPLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected String example = EXAMPLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTagExtensions() <em>Tag Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagExtensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList tagExtensions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TagFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.TAG_FILE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_FILE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPath(String newPath) {
-		String oldPath = path;
-		path = newPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_FILE__PATH, oldPath, path));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExample() {
-		return example;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExample(String newExample) {
-		String oldExample = example;
-		example = newExample;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_FILE__EXAMPLE, oldExample, example));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTagExtensions() {
-		if (tagExtensions == null) {
-			tagExtensions = new EObjectContainmentEList(TldExtension.class, this, TaglibPackage.TAG_FILE__TAG_EXTENSIONS);
-		}
-		return tagExtensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				return ((InternalEList)getTagExtensions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.TAG_FILE__NAME:
-				return getName();
-			case TaglibPackage.TAG_FILE__PATH:
-				return getPath();
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				return getExample();
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				return getTagExtensions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.TAG_FILE__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__PATH:
-				setPath((String)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				setExample((String)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				getTagExtensions().clear();
-				getTagExtensions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.TAG_FILE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_FILE__PATH:
-				setPath(PATH_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				setExample(EXAMPLE_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				getTagExtensions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.TAG_FILE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.TAG_FILE__PATH:
-				return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				return EXAMPLE_EDEFAULT == null ? example != null : !EXAMPLE_EDEFAULT.equals(example);
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				return tagExtensions != null && !tagExtensions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", path: ");
-		result.append(path);
-		result.append(", example: ");
-		result.append(example);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TagFileImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TagLibImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TagLibImpl.java
deleted file mode 100644
index 0dcca1e35..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TagLibImpl.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.taglib.internal.Function;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTag;
-import org.eclipse.jst.j2ee.taglib.internal.TagLib;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-import org.eclipse.jst.j2ee.taglib.internal.Validator;
-
-
-/**
- * The taglib tag is the document root.
-
- */
-public class TagLibImpl extends CompatibilityDescriptionGroupImpl implements TagLib {
-
-	/**
-	 * The default value of the '{@link #getTagLibVersion() <em>Tag Lib Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagLibVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAG_LIB_VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String tagLibVersion = TAG_LIB_VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getJspVersion() <em>Jsp Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JSP_VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String jspVersion = JSP_VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getShortName() <em>Short Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SHORT_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String shortName = SHORT_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String uri = URI_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList tags = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Validator validator = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList listeners = null;
-	/**
-	 * The cached value of the '{@link #getFunctions() <em>Functions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList functions = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibExtensions() <em>Taglib Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibExtensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList taglibExtensions = null;
-
-	public TagLibImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.TAG_LIB;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Describes this version number of the tag library (dewey decimal).
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	public String getTagLibVersion() {
-		return tagLibVersion;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTagLibVersion(String newTagLibVersion) {
-		String oldTagLibVersion = tagLibVersion;
-		tagLibVersion = newTagLibVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__TAG_LIB_VERSION, oldTagLibVersion, tagLibVersion));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Describes the JSP version (number) this tag library requires in order to
-	 * function (dewey decimal).  Default is 1.2
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	public String getJspVersion() {
-		return jspVersion;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setJspVersion(String newJspVersion) {
-		String oldJspVersion = jspVersion;
-		jspVersion = newJspVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__JSP_VERSION, oldJspVersion, jspVersion));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the short-name element is a name that could be used by a JSP
-	 * authoring tool to create names with a mnemonic value; for example, it may be
-	 * used as the prefered prefix value in taglib directives. Do not use white space, 
-	 * and do not start with digits or underscore.
-	 */
-	public String getShortName() {
-		return shortName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setShortName(String newShortName) {
-		String oldShortName = shortName;
-		shortName = newShortName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__SHORT_NAME, oldShortName, shortName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the uri element is a public URI that uniquely identifies the exact 
-	 * semantics of this taglibrary.
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__URI, oldUri, uri));
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(displayName);
-	}
-	
-	/**
-	This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	 */
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getTags() {
-		if (tags == null) {
-			tags = new EObjectContainmentEList(JSPTag.class, this, TaglibPackage.TAG_LIB__TAGS);
-		}
-		return tags;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The validator element provides information on an optional validator that can be 
-	 * used to validate the conformance of a JSP page to using this tag library.
-
-	 */
-	public Validator getValidator() {
-		return validator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValidator(Validator newValidator, NotificationChain msgs) {
-		Validator oldValidator = validator;
-		validator = newValidator;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__VALIDATOR, oldValidator, newValidator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValidator(Validator newValidator) {
-		if (newValidator != validator) {
-			NotificationChain msgs = null;
-			if (validator != null)
-				msgs = ((InternalEObject)validator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaglibPackage.TAG_LIB__VALIDATOR, null, msgs);
-			if (newValidator != null)
-				msgs = ((InternalEObject)newValidator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TaglibPackage.TAG_LIB__VALIDATOR, null, msgs);
-			msgs = basicSetValidator(newValidator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__VALIDATOR, newValidator, newValidator));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getListeners() {
-		if (listeners == null) {
-			listeners = new EObjectContainmentEList(Listener.class, this, TaglibPackage.TAG_LIB__LISTENERS);
-		}
-		return listeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFunctions() {
-		if (functions == null) {
-			functions = new EObjectContainmentEList(Function.class, this, TaglibPackage.TAG_LIB__FUNCTIONS);
-		}
-		return functions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTaglibExtensions() {
-		if (taglibExtensions == null) {
-			taglibExtensions = new EObjectContainmentEList(TldExtension.class, this, TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS);
-		}
-		return taglibExtensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.TAG_LIB__TAGS:
-				return ((InternalEList)getTags()).basicRemove(otherEnd, msgs);
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				return basicSetValidator(null, msgs);
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				return ((InternalEList)getListeners()).basicRemove(otherEnd, msgs);
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				return ((InternalEList)getFunctions()).basicRemove(otherEnd, msgs);
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				return ((InternalEList)getTaglibExtensions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				return getTagLibVersion();
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				return getJspVersion();
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				return getShortName();
-			case TaglibPackage.TAG_LIB__URI:
-				return getUri();
-			case TaglibPackage.TAG_LIB__TAGS:
-				return getTags();
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				return getValidator();
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				return getListeners();
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				return getFunctions();
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				return getTaglibExtensions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				setTagLibVersion((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				setJspVersion((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				setShortName((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__URI:
-				setUri((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__TAGS:
-				getTags().clear();
-				getTags().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				setValidator((Validator)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				getListeners().clear();
-				getListeners().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				getFunctions().clear();
-				getFunctions().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				getTaglibExtensions().clear();
-				getTaglibExtensions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				setTagLibVersion(TAG_LIB_VERSION_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				setJspVersion(JSP_VERSION_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				setShortName(SHORT_NAME_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__TAGS:
-				getTags().clear();
-				return;
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				setValidator((Validator)null);
-				return;
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				getListeners().clear();
-				return;
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				getFunctions().clear();
-				return;
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				getTaglibExtensions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				return TAG_LIB_VERSION_EDEFAULT == null ? tagLibVersion != null : !TAG_LIB_VERSION_EDEFAULT.equals(tagLibVersion);
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				return JSP_VERSION_EDEFAULT == null ? jspVersion != null : !JSP_VERSION_EDEFAULT.equals(jspVersion);
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				return SHORT_NAME_EDEFAULT == null ? shortName != null : !SHORT_NAME_EDEFAULT.equals(shortName);
-			case TaglibPackage.TAG_LIB__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case TaglibPackage.TAG_LIB__TAGS:
-				return tags != null && !tags.isEmpty();
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				return validator != null;
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				return listeners != null && !listeners.isEmpty();
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				return functions != null && !functions.isEmpty();
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				return taglibExtensions != null && !taglibExtensions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (tagLibVersion: ");
-		result.append(tagLibVersion);
-		result.append(", jspVersion: ");
-		result.append(jspVersion);
-		result.append(", shortName: ");
-		result.append(shortName);
-		result.append(", uri: ");
-		result.append(uri);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibFactoryImpl.java
deleted file mode 100644
index 8cbb491c2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibFactoryImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.taglib.internal.BodyContentType;
-import org.eclipse.jst.j2ee.taglib.internal.Function;
-import org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTag;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.internal.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.internal.TagFile;
-import org.eclipse.jst.j2ee.taglib.internal.TagLib;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-import org.eclipse.jst.j2ee.taglib.internal.Validator;
-
-/**
- * @generated
- */
-public class TaglibFactoryImpl extends EFactoryImpl implements TaglibFactory {
- 
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TaglibFactory init() {
-		try {
-			TaglibFactory theTaglibFactory = (TaglibFactory)EPackage.Registry.INSTANCE.getEFactory("taglib.xmi"); 
-			if (theTaglibFactory != null) {
-				return theTaglibFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new TaglibFactoryImpl();
-	}
-
-	public TaglibFactoryImpl() {
-		super(); 		
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TaglibPackage.TAG_LIB: return createTagLib();
-			case TaglibPackage.JSP_TAG: return createJSPTag();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE: return createJSPTagAttribute();
-			case TaglibPackage.VALIDATOR: return createValidator();
-			case TaglibPackage.JSP_VARIABLE: return createJSPVariable();
-			case TaglibPackage.FUNCTION: return createFunction();
-			case TaglibPackage.TAG_FILE: return createTagFile();
-			case TaglibPackage.TLD_EXTENSION: return createTldExtension();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case TaglibPackage.BODY_CONTENT_TYPE:
-				return createBodyContentTypeFromString(eDataType, initialValue);
-			case TaglibPackage.JSP_SCRIPTING_VARIABLE_SCOPE:
-				return createJSPScriptingVariableScopeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case TaglibPackage.BODY_CONTENT_TYPE:
-				return convertBodyContentTypeToString(eDataType, instanceValue);
-			case TaglibPackage.JSP_SCRIPTING_VARIABLE_SCOPE:
-				return convertJSPScriptingVariableScopeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-public static TaglibFactory getActiveFactory() {
-	return (TaglibFactory) getPackage().getEFactoryInstance();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public TagLib createTagLib() {
-		TagLibImpl tagLib = new TagLibImpl();
-		return tagLib;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Validator createValidator() {
-		ValidatorImpl validator = new ValidatorImpl();
-		return validator;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPTag createJSPTag() {
-		JSPTagImpl jspTag = new JSPTagImpl();
-		return jspTag;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPTagAttribute createJSPTagAttribute() {
-		JSPTagAttributeImpl jspTagAttribute = new JSPTagAttributeImpl();
-		return jspTagAttribute;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPVariable createJSPVariable() {
-		JSPVariableImpl jspVariable = new JSPVariableImpl();
-		return jspVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Function createFunction() {
-		FunctionImpl function = new FunctionImpl();
-		return function;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagFile createTagFile() {
-		TagFileImpl tagFile = new TagFileImpl();
-		return tagFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TldExtension createTldExtension() {
-		TldExtensionImpl tldExtension = new TldExtensionImpl();
-		return tldExtension;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BodyContentType createBodyContentTypeFromString(EDataType eDataType, String initialValue) {
-		BodyContentType result = BodyContentType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBodyContentTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPScriptingVariableScope createJSPScriptingVariableScopeFromString(EDataType eDataType, String initialValue) {
-		JSPScriptingVariableScope result = JSPScriptingVariableScope.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertJSPScriptingVariableScopeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public TaglibPackage getTaglibPackage() {
-		return (TaglibPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static TaglibPackage getPackage() {
-		return TaglibPackage.eINSTANCE;
-	}
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java
deleted file mode 100644
index 1a65035e2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java
+++ /dev/null
@@ -1,862 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.BodyContentType;
-import org.eclipse.jst.j2ee.taglib.internal.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.internal.Function;
-import org.eclipse.jst.j2ee.taglib.internal.JSPScriptingVariableScope;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTag;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.internal.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.internal.TagFile;
-import org.eclipse.jst.j2ee.taglib.internal.TagLib;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-import org.eclipse.jst.j2ee.taglib.internal.Validator;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class TaglibPackageImpl extends EPackageImpl implements TaglibPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspTagEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspTagAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass validatorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspVariableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass functionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tldExtensionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extensibleTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum bodyContentTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum jspScriptingVariableScopeEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private TaglibPackageImpl() {
-		super(eNS_URI, TaglibFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static TaglibPackage init() {
-		if (isInited) return (TaglibPackage)EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI);
-
-		// Obtain or create and register package
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TaglibPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theTaglibPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theTaglibPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theTaglibPackage.freeze();
-
-		return theTaglibPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getTagLib() {
-		return tagLibEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_TagLibVersion() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_JspVersion() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_ShortName() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_Uri() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getTagLib_Tags() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getTagLib_Validator() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getTagLib_Listeners() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagLib_Functions() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagLib_TaglibExtensions() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getValidator() {
-		return validatorEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getValidator_ValidatorClass() {
-		return (EReference)validatorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getValidator_InitParams() {
-		return (EReference)validatorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getValidator_Descriptions() {
-		return (EReference)validatorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPTag() {
-		return jspTagEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTag_BodyContent() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTag_Example() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPTag_Name() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPTag_DynamicAttributes() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_Attributes() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_Variables() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_TagClass() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_TeiClass() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPTagAttribute() {
-		return jspTagAttributeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTagAttribute_Name() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTagAttribute_Required() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTagAttribute_RtExprValue() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPTagAttribute_Fragment() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTagAttribute_Type() {
-		return (EReference)jspTagAttributeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPTagAttribute_Descriptions() {
-		return (EReference)jspTagAttributeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPVariable() {
-		return jspVariableEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_NameGiven() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_NameFromAttribute() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_Declare() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_Scope() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPVariable_VariableClass() {
-		return (EReference)jspVariableEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPVariable_Descriptions() {
-		return (EReference)jspVariableEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFunction() {
-		return functionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFunction_Name() {
-		return (EAttribute)functionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFunction_Signature() {
-		return (EAttribute)functionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFunction_Example() {
-		return (EAttribute)functionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFunction_FunctionClass() {
-		return (EReference)functionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFunction_FunctionExtensions() {
-		return (EReference)functionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTagFile() {
-		return tagFileEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagFile_Name() {
-		return (EAttribute)tagFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagFile_Path() {
-		return (EAttribute)tagFileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagFile_Example() {
-		return (EAttribute)tagFileEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagFile_TagExtensions() {
-		return (EReference)tagFileEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTldExtension() {
-		return tldExtensionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTldExtension_Namespace() {
-		return (EAttribute)tldExtensionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTldExtension_ExtensionElements() {
-		return (EReference)tldExtensionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtensibleType() {
-		return extensibleTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtensibleType_Value() {
-		return (EAttribute)extensibleTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getBodyContentType() {
-		return bodyContentTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getJSPScriptingVariableScope() {
-		return jspScriptingVariableScopeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public TaglibFactory getTaglibFactory() {
-		return (TaglibFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		tagLibEClass = createEClass(TAG_LIB);
-		createEAttribute(tagLibEClass, TAG_LIB__TAG_LIB_VERSION);
-		createEAttribute(tagLibEClass, TAG_LIB__JSP_VERSION);
-		createEAttribute(tagLibEClass, TAG_LIB__SHORT_NAME);
-		createEAttribute(tagLibEClass, TAG_LIB__URI);
-		createEReference(tagLibEClass, TAG_LIB__TAGS);
-		createEReference(tagLibEClass, TAG_LIB__VALIDATOR);
-		createEReference(tagLibEClass, TAG_LIB__LISTENERS);
-		createEReference(tagLibEClass, TAG_LIB__FUNCTIONS);
-		createEReference(tagLibEClass, TAG_LIB__TAGLIB_EXTENSIONS);
-
-		jspTagEClass = createEClass(JSP_TAG);
-		createEAttribute(jspTagEClass, JSP_TAG__BODY_CONTENT);
-		createEAttribute(jspTagEClass, JSP_TAG__EXAMPLE);
-		createEAttribute(jspTagEClass, JSP_TAG__NAME);
-		createEAttribute(jspTagEClass, JSP_TAG__DYNAMIC_ATTRIBUTES);
-		createEReference(jspTagEClass, JSP_TAG__ATTRIBUTES);
-		createEReference(jspTagEClass, JSP_TAG__VARIABLES);
-		createEReference(jspTagEClass, JSP_TAG__TAG_CLASS);
-		createEReference(jspTagEClass, JSP_TAG__TEI_CLASS);
-
-		jspTagAttributeEClass = createEClass(JSP_TAG_ATTRIBUTE);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__NAME);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__REQUIRED);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__FRAGMENT);
-		createEReference(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__TYPE);
-		createEReference(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__DESCRIPTIONS);
-
-		validatorEClass = createEClass(VALIDATOR);
-		createEReference(validatorEClass, VALIDATOR__VALIDATOR_CLASS);
-		createEReference(validatorEClass, VALIDATOR__INIT_PARAMS);
-		createEReference(validatorEClass, VALIDATOR__DESCRIPTIONS);
-
-		jspVariableEClass = createEClass(JSP_VARIABLE);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__NAME_GIVEN);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__NAME_FROM_ATTRIBUTE);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__DECLARE);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__SCOPE);
-		createEReference(jspVariableEClass, JSP_VARIABLE__VARIABLE_CLASS);
-		createEReference(jspVariableEClass, JSP_VARIABLE__DESCRIPTIONS);
-
-		functionEClass = createEClass(FUNCTION);
-		createEAttribute(functionEClass, FUNCTION__NAME);
-		createEAttribute(functionEClass, FUNCTION__SIGNATURE);
-		createEAttribute(functionEClass, FUNCTION__EXAMPLE);
-		createEReference(functionEClass, FUNCTION__FUNCTION_CLASS);
-		createEReference(functionEClass, FUNCTION__FUNCTION_EXTENSIONS);
-
-		tagFileEClass = createEClass(TAG_FILE);
-		createEAttribute(tagFileEClass, TAG_FILE__NAME);
-		createEAttribute(tagFileEClass, TAG_FILE__PATH);
-		createEAttribute(tagFileEClass, TAG_FILE__EXAMPLE);
-		createEReference(tagFileEClass, TAG_FILE__TAG_EXTENSIONS);
-
-		tldExtensionEClass = createEClass(TLD_EXTENSION);
-		createEAttribute(tldExtensionEClass, TLD_EXTENSION__NAMESPACE);
-		createEReference(tldExtensionEClass, TLD_EXTENSION__EXTENSION_ELEMENTS);
-
-		extensibleTypeEClass = createEClass(EXTENSIBLE_TYPE);
-		createEAttribute(extensibleTypeEClass, EXTENSIBLE_TYPE__VALUE);
-
-		// Create enums
-		bodyContentTypeEEnum = createEEnum(BODY_CONTENT_TYPE);
-		jspScriptingVariableScopeEEnum = createEEnum(JSP_SCRIPTING_VARIABLE_SCOPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		WebapplicationPackage theWebapplicationPackage = (WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-
-		// Add supertypes to classes
-		tagLibEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		jspTagEClass.getESuperTypes().add(theCommonPackage.getDescriptionGroup());
-		jspTagAttributeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		validatorEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		jspVariableEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		functionEClass.getESuperTypes().add(theCommonPackage.getDescriptionGroup());
-		tagFileEClass.getESuperTypes().add(theCommonPackage.getDescriptionGroup());
-		tldExtensionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		extensibleTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(tagLibEClass, TagLib.class, "TagLib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTagLib_TagLibVersion(), ecorePackage.getEString(), "tagLibVersion", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagLib_JspVersion(), ecorePackage.getEString(), "jspVersion", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagLib_ShortName(), ecorePackage.getEString(), "shortName", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagLib_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagLib_Tags(), this.getJSPTag(), null, "tags", null, 1, -1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagLib_Validator(), this.getValidator(), null, "validator", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagLib_Listeners(), theCommonPackage.getListener(), null, "listeners", null, 0, -1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagLib_Functions(), this.getFunction(), null, "functions", null, 0, -1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagLib_TaglibExtensions(), this.getTldExtension(), null, "taglibExtensions", null, 0, -1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jspTagEClass, JSPTag.class, "JSPTag", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJSPTag_BodyContent(), this.getBodyContentType(), "bodyContent", null, 0, 1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPTag_Example(), ecorePackage.getEString(), "example", null, 0, 1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPTag_Name(), ecorePackage.getEString(), "name", null, 0, 1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPTag_DynamicAttributes(), ecorePackage.getEBoolean(), "dynamicAttributes", null, 0, 1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPTag_Attributes(), this.getJSPTagAttribute(), null, "attributes", null, 0, -1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPTag_Variables(), this.getJSPVariable(), null, "variables", null, 0, -1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPTag_TagClass(), theJavaRefPackage.getJavaClass(), null, "tagClass", null, 1, 1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPTag_TeiClass(), theJavaRefPackage.getJavaClass(), null, "teiClass", null, 1, 1, JSPTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jspTagAttributeEClass, JSPTagAttribute.class, "JSPTagAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJSPTagAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, JSPTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPTagAttribute_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, JSPTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPTagAttribute_RtExprValue(), ecorePackage.getEBoolean(), "rtExprValue", "false", 0, 1, JSPTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPTagAttribute_Fragment(), ecorePackage.getEBoolean(), "fragment", null, 0, 1, JSPTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPTagAttribute_Type(), theJavaRefPackage.getJavaClass(), null, "type", null, 0, 1, JSPTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPTagAttribute_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, JSPTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(validatorEClass, Validator.class, "Validator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getValidator_ValidatorClass(), theJavaRefPackage.getJavaClass(), null, "validatorClass", null, 0, 1, Validator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getValidator_InitParams(), theWebapplicationPackage.getInitParam(), null, "initParams", null, 0, -1, Validator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getValidator_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, Validator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jspVariableEClass, JSPVariable.class, "JSPVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJSPVariable_NameGiven(), ecorePackage.getEString(), "nameGiven", null, 0, 1, JSPVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPVariable_NameFromAttribute(), ecorePackage.getEString(), "nameFromAttribute", null, 0, 1, JSPVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPVariable_Declare(), ecorePackage.getEBoolean(), "declare", null, 0, 1, JSPVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJSPVariable_Scope(), this.getJSPScriptingVariableScope(), "scope", null, 0, 1, JSPVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPVariable_VariableClass(), theJavaRefPackage.getJavaClass(), null, "variableClass", null, 0, 1, JSPVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJSPVariable_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, JSPVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFunction_Signature(), ecorePackage.getEString(), "signature", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFunction_Example(), ecorePackage.getEString(), "example", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFunction_FunctionClass(), theJavaRefPackage.getJavaClass(), null, "functionClass", null, 1, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFunction_FunctionExtensions(), this.getTldExtension(), null, "functionExtensions", null, 0, -1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tagFileEClass, TagFile.class, "TagFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTagFile_Name(), ecorePackage.getEString(), "name", null, 0, 1, TagFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagFile_Path(), ecorePackage.getEString(), "path", null, 0, 1, TagFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagFile_Example(), ecorePackage.getEString(), "example", null, 0, 1, TagFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagFile_TagExtensions(), this.getTldExtension(), null, "tagExtensions", null, 0, -1, TagFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tldExtensionEClass, TldExtension.class, "TldExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTldExtension_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, TldExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTldExtension_ExtensionElements(), this.getExtensibleType(), null, "extensionElements", null, 1, -1, TldExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(extensibleTypeEClass, ExtensibleType.class, "ExtensibleType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getExtensibleType_Value(), ecorePackage.getEString(), "value", null, 0, 1, ExtensibleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(bodyContentTypeEEnum, BodyContentType.class, "BodyContentType");
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.TAGDEPENDENT_LITERAL);
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.JSP_LITERAL);
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.EMPTY_LITERAL);
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.SCRIPTLESS_LITERAL);
-
-		initEEnum(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.class, "JSPScriptingVariableScope");
-		addEEnumLiteral(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.NESTED_LITERAL);
-		addEEnumLiteral(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.AT_BEGIN_LITERAL);
-		addEEnumLiteral(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.AT_END_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //TaglibPackageImpl
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TldExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TldExtensionImpl.java
deleted file mode 100644
index 8be7431dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TldExtensionImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.taglib.internal.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tld Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.TldExtensionImpl#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.taglib.internal.impl.TldExtensionImpl#getExtensionElements <em>Extension Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TldExtensionImpl extends J2EEEObjectImpl implements TldExtension {
-	/**
-	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespace()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAMESPACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespace()
-	 * @generated
-	 * @ordered
-	 */
-	protected String namespace = NAMESPACE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExtensionElements() <em>Extension Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtensionElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extensionElements = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TldExtensionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.TLD_EXTENSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNamespace(String newNamespace) {
-		String oldNamespace = namespace;
-		namespace = newNamespace;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TLD_EXTENSION__NAMESPACE, oldNamespace, namespace));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtensionElements() {
-		if (extensionElements == null) {
-			extensionElements = new EObjectContainmentEList(ExtensibleType.class, this, TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS);
-		}
-		return extensionElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				return ((InternalEList)getExtensionElements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				return getNamespace();
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				return getExtensionElements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				setNamespace((String)newValue);
-				return;
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				getExtensionElements().clear();
-				getExtensionElements().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				setNamespace(NAMESPACE_EDEFAULT);
-				return;
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				getExtensionElements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				return extensionElements != null && !extensionElements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (namespace: ");
-		result.append(namespace);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TldExtensionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/ValidatorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/ValidatorImpl.java
deleted file mode 100644
index a0f441274..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/ValidatorImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.Validator;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-
-
-/**
- * The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.
- * @generated
- */
-public class ValidatorImpl extends J2EEEObjectImpl implements Validator {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass validatorClass = null;
-	public ValidatorImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.Literals.VALIDATOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getValidatorClass() {
-		if (validatorClass != null && validatorClass.eIsProxy()) {
-			InternalEObject oldValidatorClass = (InternalEObject)validatorClass;
-			validatorClass = (JavaClass)eResolveProxy(oldValidatorClass);
-			if (validatorClass != oldValidatorClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.VALIDATOR__VALIDATOR_CLASS, oldValidatorClass, validatorClass));
-			}
-		}
-		return validatorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetValidatorClass() {
-		return validatorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValidatorClass(JavaClass newValidatorClass) {
-		JavaClass oldValidatorClass = validatorClass;
-		validatorClass = newValidatorClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.VALIDATOR__VALIDATOR_CLASS, oldValidatorClass, validatorClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(InitParam.class, this, TaglibPackage.VALIDATOR__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, TaglibPackage.VALIDATOR__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				if (resolve) return getValidatorClass();
-				return basicGetValidatorClass();
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				return getInitParams();
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				setValidatorClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				setValidatorClass((JavaClass)null);
-				return;
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				return validatorClass != null;
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	protected EList initParams=null;
-
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected boolean setValidatorClass=false;
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/util/TaglibAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/util/TaglibAdapterFactory.java
deleted file mode 100644
index 0584e4300..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/util/TaglibAdapterFactory.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.taglib.internal.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.internal.Function;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTag;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.internal.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.internal.TagFile;
-import org.eclipse.jst.j2ee.taglib.internal.TagLib;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-import org.eclipse.jst.j2ee.taglib.internal.Validator;
-
-
-
-public class TaglibAdapterFactory extends AdapterFactoryImpl {
-	protected static TaglibPackage modelPackage;
-
-	public TaglibAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (TaglibPackage)EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected TaglibSwitch sw = new TaglibSwitch() {
-		public Object caseTagLib(TagLib object) {
-			return createTagLibAdapter();
-		}
-		public Object caseValidator(Validator object) {
-			return createValidatorAdapter();
-		}
-		public Object caseJSPTag(JSPTag object) {
-			return createJSPTagAdapter();
-		}
-		public Object caseJSPTagAttribute(JSPTagAttribute object) {
-			return createJSPTagAttributeAdapter();
-		}
-		public Object caseJSPVariable(JSPVariable object) {
-			return createJSPVariableAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)sw.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createTagLibAdapter() {
-		return null;
-	}
-
-	public Adapter createValidatorAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPTagAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPTagAttributeAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPVariableAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaglibSwitch modelSwitch =
-		new TaglibSwitch() {
-			public Object caseTagLib(TagLib object) {
-				return createTagLibAdapter();
-			}
-			public Object caseJSPTag(JSPTag object) {
-				return createJSPTagAdapter();
-			}
-			public Object caseJSPTagAttribute(JSPTagAttribute object) {
-				return createJSPTagAttributeAdapter();
-			}
-			public Object caseValidator(Validator object) {
-				return createValidatorAdapter();
-			}
-			public Object caseJSPVariable(JSPVariable object) {
-				return createJSPVariableAdapter();
-			}
-			public Object caseFunction(Function object) {
-				return createFunctionAdapter();
-			}
-			public Object caseTagFile(TagFile object) {
-				return createTagFileAdapter();
-			}
-			public Object caseTldExtension(TldExtension object) {
-				return createTldExtensionAdapter();
-			}
-			public Object caseExtensibleType(ExtensibleType object) {
-				return createExtensibleTypeAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createTagLibAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createValidatorAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPTagAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPTagAttributeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPVariableAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.taglib.internal.Function <em>Function</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.Function
-	 * @generated
-	 */
-	public Adapter createFunctionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.taglib.internal.TagFile <em>Tag File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TagFile
-	 * @generated
-	 */
-	public Adapter createTagFileAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.taglib.internal.TldExtension <em>Tld Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.TldExtension
-	 * @generated
-	 */
-	public Adapter createTldExtensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.taglib.internal.ExtensibleType <em>Extensible Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.taglib.internal.ExtensibleType
-	 * @generated
-	 */
-	public Adapter createExtensibleTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //TaglibAdapterFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/util/TaglibSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/util/TaglibSwitch.java
deleted file mode 100644
index a68e44e67..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/util/TaglibSwitch.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.taglib.internal.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.internal.Function;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTag;
-import org.eclipse.jst.j2ee.taglib.internal.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.internal.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.internal.TagFile;
-import org.eclipse.jst.j2ee.taglib.internal.TagLib;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.TldExtension;
-import org.eclipse.jst.j2ee.taglib.internal.Validator;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibFactoryImpl;
-
-public class TaglibSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TaglibPackage modelPackage;
-
-	protected static TaglibFactory factory;
-
-	public TaglibSwitch() {
-		factory = (TaglibFactory)TaglibFactoryImpl.getPackage().getEFactoryInstance();
-		modelPackage = TaglibFactoryImpl.getPackage();
-	}
-	public Object doSwitch(EObject theEObject) {
-		     EClass theEClass = theEObject.eClass();
-      if (theEClass.eContainer() != modelPackage) return defaultCase(theEObject);
-     
-		switch (theEClass.getClassifierID()) {
-			case TaglibPackage.TAG_LIB:
-			    {
-				TagLib castedObject = (TagLib)theEObject;
-				Object result = caseTagLib(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.VALIDATOR:
-			    {
-				Validator castedObject = (Validator)theEObject;
-				Object result = caseValidator(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.JSP_TAG:
-			    {
-				JSPTag castedObject = (JSPTag)theEObject;
-				Object result = caseJSPTag(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.JSP_TAG_ATTRIBUTE:
-			    {
-				JSPTagAttribute castedObject = (JSPTagAttribute)theEObject;
-				Object result = caseJSPTagAttribute(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.JSP_VARIABLE:
-			    {
-				JSPVariable castedObject = (JSPVariable)theEObject;
-				Object result = caseJSPVariable(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			default: return defaultCase(theEObject);
-		}
-	} // doSwitch
-
-	public Object caseTagLib(TagLib object) {
-		return null;
-	}
-
-	public Object caseValidator(Validator object) {
-		return null;
-	}
-
-	public Object caseJSPTag(JSPTag object) {
-		return null;
-	}
-
-	public Object caseJSPTagAttribute(JSPTagAttribute object) {
-		return null;
-	}
-
-	public Object caseJSPVariable(JSPVariable object) {
-		return null;
-	}
-
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitchGen(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TaglibPackage.TAG_LIB: {
-				TagLib tagLib = (TagLib)theEObject;
-				Object result = caseTagLib(tagLib);
-				if (result == null) result = caseCompatibilityDescriptionGroup(tagLib);
-				if (result == null) result = caseDescriptionGroup(tagLib);
-				if (result == null) result = caseJ2EEEObject(tagLib);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.JSP_TAG: {
-				JSPTag jspTag = (JSPTag)theEObject;
-				Object result = caseJSPTag(jspTag);
-				if (result == null) result = caseDescriptionGroup(jspTag);
-				if (result == null) result = caseJ2EEEObject(jspTag);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.JSP_TAG_ATTRIBUTE: {
-				JSPTagAttribute jspTagAttribute = (JSPTagAttribute)theEObject;
-				Object result = caseJSPTagAttribute(jspTagAttribute);
-				if (result == null) result = caseJ2EEEObject(jspTagAttribute);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.VALIDATOR: {
-				Validator validator = (Validator)theEObject;
-				Object result = caseValidator(validator);
-				if (result == null) result = caseJ2EEEObject(validator);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.JSP_VARIABLE: {
-				JSPVariable jspVariable = (JSPVariable)theEObject;
-				Object result = caseJSPVariable(jspVariable);
-				if (result == null) result = caseJ2EEEObject(jspVariable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.FUNCTION: {
-				Function function = (Function)theEObject;
-				Object result = caseFunction(function);
-				if (result == null) result = caseDescriptionGroup(function);
-				if (result == null) result = caseJ2EEEObject(function);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.TAG_FILE: {
-				TagFile tagFile = (TagFile)theEObject;
-				Object result = caseTagFile(tagFile);
-				if (result == null) result = caseDescriptionGroup(tagFile);
-				if (result == null) result = caseJ2EEEObject(tagFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.TLD_EXTENSION: {
-				TldExtension tldExtension = (TldExtension)theEObject;
-				Object result = caseTldExtension(tldExtension);
-				if (result == null) result = caseJ2EEEObject(tldExtension);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TaglibPackage.EXTENSIBLE_TYPE: {
-				ExtensibleType extensibleType = (ExtensibleType)theEObject;
-				Object result = caseExtensibleType(extensibleType);
-				if (result == null) result = caseJ2EEEObject(extensibleType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseTagLibGen(TagLib object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseValidatorGen(Validator object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseJSPTagGen(JSPTag object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseJSPTagAttributeGen(JSPTagAttribute object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseJSPVariableGen(JSPVariable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Function</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Function</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFunction(Function object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag File</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag File</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagFile(TagFile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tld Extension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tld Extension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTldExtension(TldExtension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensible Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensible Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtensibleType(ExtensibleType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object defaultCaseGen(EObject object) {
-		return null;
-	}
-
-} //TaglibSwitch
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthConstraint.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthConstraint.java
deleted file mode 100644
index e5be05186..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthConstraint.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The auth-constraint element indicates the user roles that should be permitted access to this resource collection. The role used here must appear in a security-role-ref element.
- * @since 1.0
- * @generated
- */
-public interface AuthConstraint extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * A description of the auth constraint.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Roles attribute
-	 * A list of role names for the auth constraint.  Each element specifies the name
-	 * of a security role (a String).
-
-	 */
-	EList getRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecConstraint reference
-	 */
-	SecurityConstraint getSecConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value the new value of the SecConstraint reference
-	 */
-	void setSecConstraint(SecurityConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getAuthConstraint_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthMethodKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthMethodKind.java
deleted file mode 100644
index 2816033f8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthMethodKind.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-/**
- * 
- * @since 1.0
- *
- */
-
-
-public final class AuthMethodKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int UNSPECIFIED = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BASIC = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DIGEST = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int FORM = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CLIENT_CERT = 4;
-	/**
-	 * The '<em><b>UNSPECIFIED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSPECIFIED
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind UNSPECIFIED_LITERAL = new AuthMethodKind(UNSPECIFIED, "UNSPECIFIED", "UNSPECIFIED");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>BASIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>BASIC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BASIC
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind BASIC_LITERAL = new AuthMethodKind(BASIC, "BASIC", "BASIC");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DIGEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DIGEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DIGEST
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind DIGEST_LITERAL = new AuthMethodKind(DIGEST, "DIGEST", "DIGEST");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>FORM</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FORM</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FORM
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind FORM_LITERAL = new AuthMethodKind(FORM, "FORM", "FORM");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>CLIENT CERT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CLIENT CERT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CLIENT_CERT
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind CLIENT_CERT_LITERAL = new AuthMethodKind(CLIENT_CERT, "CLIENT_CERT", "CLIENT_CERT");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Auth Method Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AuthMethodKind[] VALUES_ARRAY =
-		new AuthMethodKind[] {
-			UNSPECIFIED_LITERAL,
-			BASIC_LITERAL,
-			DIGEST_LITERAL,
-			FORM_LITERAL,
-			CLIENT_CERT_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Auth Method Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Auth Method Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthMethodKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AuthMethodKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Auth Method Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthMethodKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AuthMethodKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Auth Method Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthMethodKind get(int value) {
-		switch (value) {
-			case UNSPECIFIED: return UNSPECIFIED_LITERAL;
-			case BASIC: return BASIC_LITERAL;
-			case DIGEST: return DIGEST_LITERAL;
-			case FORM: return FORM_LITERAL;
-			case CLIENT_CERT: return CLIENT_CERT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AuthMethodKind(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //AuthMethodKind
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ContextParam.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ContextParam.java
deleted file mode 100644
index 995cc1f70..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ContextParam.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The context-param element contains the declaration of a web application's servlet context initialization parameters.
- * @since 1.0
- * @generated
- */
-public interface ContextParam extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamName attribute
-	 * The param-name element contains the name of a parameter.
-	 */
-	String getParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamName attribute
-	 */
-	void setParamName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamValue attribute
-	 * The param-value element contains the value of a parameter.
-	 */
-	String getParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamValue attribute
-	 */
-	void setParamValue(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/DispatcherType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/DispatcherType.java
deleted file mode 100644
index dad6697e1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/DispatcherType.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Dispatcher Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getDispatcherType()
- * @model
- * @generated
- */
-public final class DispatcherType extends AbstractEnumerator
-{
-	/**
-	 * The '<em><b>FORWARD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FORWARD_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FORWARD = 0;
-
-	/**
-	 * The '<em><b>INCLUDE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INCLUDE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INCLUDE = 1;
-
-	/**
-	 * The '<em><b>REQUEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REQUEST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REQUEST = 2;
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ERROR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ERROR = 3;
-
-	/**
-	 * The '<em><b>FORWARD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FORWARD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FORWARD
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType FORWARD_LITERAL = new DispatcherType(FORWARD, "FORWARD", "FORWARD");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>INCLUDE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INCLUDE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INCLUDE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType INCLUDE_LITERAL = new DispatcherType(INCLUDE, "INCLUDE", "INCLUDE");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>REQUEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>REQUEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUEST
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType REQUEST_LITERAL = new DispatcherType(REQUEST, "REQUEST", "REQUEST");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ERROR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ERROR
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType ERROR_LITERAL = new DispatcherType(ERROR, "ERROR", "ERROR");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Dispatcher Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final DispatcherType[] VALUES_ARRAY =
-		new DispatcherType[] {
-			FORWARD_LITERAL,
-			INCLUDE_LITERAL,
-			REQUEST_LITERAL,
-			ERROR_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Dispatcher Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DispatcherType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DispatcherType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType get(int value) {
-		switch (value) {
-			case FORWARD: return FORWARD_LITERAL;
-			case INCLUDE: return INCLUDE_LITERAL;
-			case REQUEST: return REQUEST_LITERAL;
-			case ERROR: return ERROR_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private DispatcherType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //DispatcherType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorCodeErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorCodeErrorPage.java
deleted file mode 100644
index 24f051c31..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorCodeErrorPage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-
-/**
- * @generated
- */
-public interface ErrorCodeErrorPage extends ErrorPage{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ErrorCode attribute
-	 * The error-code contains an HTTP error code, ex: 404
-
-	 */
-	String getErrorCode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ErrorCode attribute
-	 */
-	void setErrorCode(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorPage.java
deleted file mode 100644
index c069e7948..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorPage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application
- * @generated
- */
-public interface ErrorPage extends J2EEEObject {
-
-public boolean isErrorCode();
-public boolean isExceptionType();
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Location attribute
-	 * The location element contains the location of the resource in the web
-	 * application
-	 */
-	String getLocation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Location attribute
-	 */
-	void setLocation(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ExceptionTypeErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ExceptionTypeErrorPage.java
deleted file mode 100644
index a990fc106..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ExceptionTypeErrorPage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-/**
- * @generated
- */
-public interface ExceptionTypeErrorPage extends ErrorPage {
-
-
-
-
-public String getExceptionTypeName() ;
-void setExceptionTypeName(String exceptionTypeName) ;
-/**
- * @deprecated Use @link{#setExceptionTypeName(String)}
- */
-void setExceptionTypeName(String exceptionTypeName, ResourceSet context) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ExceptionType reference
-	 * The exception type contains a fully qualified class name of a Java exception
-	 * type.
-	 */
-	JavaClass getExceptionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ExceptionType reference
-	 */
-	void setExceptionType(JavaClass value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Filter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Filter.java
deleted file mode 100644
index 770b6d9b9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Filter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.
-
- */
-public interface Filter extends CompatibilityDescriptionGroup{
-
-public String getFilterClassName();
-public void setFilterClassName(String filterClassName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The logical name of the filter. This name is used to map the filter.
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of InitParams references
-	 * The init-params contain a name//value pairs as initialization params for the
-	 * filter
-
-	 */
-	EList getInitParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FilterClass reference
-	 * The fully qualified classname of the filter.
-	 */
-	JavaClass getFilterClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the FilterClass reference
-	 */
-	void setFilterClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Param Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Param Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The init-param element contains a name/value pair as
-	 *         an initialization param of a servlet filter
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Init Param Values</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getFilter_InitParamValues()
-	 * @model type="org.eclipse.jst.j2ee.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getInitParamValues();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FilterMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FilterMapping.java
deleted file mode 100644
index 824879769..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FilterMapping.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the <filtername> sub-elements of one of the <filter> declarations in the deployment descriptor.
- * 
- * @invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.
- * @generated
- */
-public interface FilterMapping extends J2EEEObject {
-
-/**
- * Returns the name of the servlet that this mapping applies to.
- */
-public String getServletName();
-/**
- * Sets the name of the servlet that this mapping applies to.
- */
-public void setServletName(String servletName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the UrlPattern attribute
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	String getUrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UrlPattern attribute
-	 */
-	void setUrlPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Dispatcher Type</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webapplication.DispatcherType}.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.webapplication.DispatcherType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dispatcher Type</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dispatcher Type</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.webapplication.DispatcherType
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getFilterMapping_DispatcherType()
-	 * @model type="org.eclipse.jst.j2ee.webapplication.DispatcherType" upper="4"
-	 * @generated
-	 */
-	EList getDispatcherType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Filter reference
-	 * The filter being mapped
-	 */
-	Filter getFilter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Filter reference
-	 */
-	void setFilter(Filter value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Servlet reference
-	 * An optional servlet that is mapped by a filter mapping.  servletName is used to 
-	 * resolve the servlet reference.
-	 */
-	Servlet getServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Servlet reference
-	 */
-	void setServlet(Servlet value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FormLoginConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FormLoginConfig.java
deleted file mode 100644
index 1f41b24eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FormLoginConfig.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The form-login-config element specifies the login and error pages that should be used in form based login. If form based authentication is not used, these elements are ignored.
- * @generated
- */
-public interface FormLoginConfig extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the FormLoginPage attribute
-	 * The form-login-page element defines the location in the web app where the page
-	 * that can be used for login can be found
-	 */
-	String getFormLoginPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the FormLoginPage attribute
-	 */
-	void setFormLoginPage(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the FormErrorPage attribute
-	 * The form-error-page element defines the location in the web app where the error 
-	 * page that is displayed when login is not successful can be found
-	 */
-	String getFormErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the FormErrorPage attribute
-	 */
-	void setFormErrorPage(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LoginConfig reference
-	 */
-	LoginConfig getLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LoginConfig reference
-	 */
-	void setLoginConfig(LoginConfig value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodType.java
deleted file mode 100644
index 80a1f55f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- *  @deprecated since 4/25/2003 use list on {@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection}
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodType#getHttpMethod <em>Http Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getHTTPMethodType()
- * @model 
- * @generated
- */
-public interface HTTPMethodType extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Http Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Http Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Http Method</em>' attribute.
-	 * @see #setHttpMethod(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getHTTPMethodType_HttpMethod()
-	 * @model
-	 * @generated
-	 */
-	String getHttpMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.HTTPMethodType#getHttpMethod <em>Http Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Http Method</em>' attribute.
-	 * @see #getHttpMethod()
-	 * @generated
-	 */
-	void setHttpMethod(String value);
-
-} // HTTPMethodType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodTypeEnum.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodTypeEnum.java
deleted file mode 100644
index 2f7c04113..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodTypeEnum.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>HTTP Method Type Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getHTTPMethodTypeEnum()
- * @model
- * @generated
- */
-public final class HTTPMethodTypeEnum extends AbstractEnumerator {
-	/**
-	 * The '<em><b>GET</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The http-method contains an HTTP method (GET | POST |...)
-	 * <!-- end-model-doc -->
-	 * @see #GET_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GET = 0;
-
-	/**
-	 * The '<em><b>POST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #POST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST = 1;
-
-	/**
-	 * The '<em><b>PUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PUT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PUT = 2;
-
-	/**
-	 * The '<em><b>DELETE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DELETE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DELETE = 3;
-
-	/**
-	 * The '<em><b>HEAD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #HEAD_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int HEAD = 4;
-
-	/**
-	 * The '<em><b>OPTIONS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OPTIONS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OPTIONS = 5;
-
-	/**
-	 * The '<em><b>TRACE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TRACE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TRACE = 6;
-
-	/**
-	 * The '<em><b>GET</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>GET</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GET
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum GET_LITERAL = new HTTPMethodTypeEnum(GET, "GET", "GET");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>POST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>POST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #POST
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum POST_LITERAL = new HTTPMethodTypeEnum(POST, "POST", "POST");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>PUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PUT
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum PUT_LITERAL = new HTTPMethodTypeEnum(PUT, "PUT", "PUT");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DELETE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DELETE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DELETE
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum DELETE_LITERAL = new HTTPMethodTypeEnum(DELETE, "DELETE", "DELETE");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>HEAD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>HEAD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HEAD
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum HEAD_LITERAL = new HTTPMethodTypeEnum(HEAD, "HEAD", "HEAD");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>OPTIONS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OPTIONS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OPTIONS
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum OPTIONS_LITERAL = new HTTPMethodTypeEnum(OPTIONS, "OPTIONS", "OPTIONS");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>TRACE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TRACE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TRACE
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum TRACE_LITERAL = new HTTPMethodTypeEnum(TRACE, "TRACE", "TRACE");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>HTTP Method Type Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final HTTPMethodTypeEnum[] VALUES_ARRAY =
-		new HTTPMethodTypeEnum[] {
-			GET_LITERAL,
-			POST_LITERAL,
-			PUT_LITERAL,
-			DELETE_LITERAL,
-			HEAD_LITERAL,
-			OPTIONS_LITERAL,
-			TRACE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>HTTP Method Type Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>HTTP Method Type Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static HTTPMethodTypeEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			HTTPMethodTypeEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>HTTP Method Type Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static HTTPMethodTypeEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			HTTPMethodTypeEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>HTTP Method Type Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static HTTPMethodTypeEnum get(int value) {
-		switch (value) {
-			case GET: return GET_LITERAL;
-			case POST: return POST_LITERAL;
-			case PUT: return PUT_LITERAL;
-			case DELETE: return DELETE_LITERAL;
-			case HEAD: return HEAD_LITERAL;
-			case OPTIONS: return OPTIONS_LITERAL;
-			case TRACE: return TRACE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private HTTPMethodTypeEnum(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //HTTPMethodTypeEnum
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/InitParam.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/InitParam.java
deleted file mode 100644
index 466dc8cb8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/InitParam.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The init-param element contains a name//value pair as an initialization param of the servlet
- * @generated
- */
-public interface InitParam extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamName attribute
-	 * 
-	 * 
-
-	 */
-	String getParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamName attribute
-	 */
-	void setParamName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamValue attribute
-	 */
-	String getParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamValue attribute
-	 */
-	void setParamValue(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/JSPType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/JSPType.java
deleted file mode 100644
index e0c2c7045..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/JSPType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-
-/**
- * @generated
- * @since 1.0
- */
-public interface JSPType extends WebType{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the JspFile attribute
-	 * The jsp-file element contains the full path to a JSP file within the web
-	 * application.
-
-	 */
-	String getJspFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the JspFile attribute
-	 */
-	void setJspFile(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMapping.java
deleted file mode 100644
index 6a64c17f3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMapping.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Local Encoding Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getLocale <em>Locale</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getEncoding <em>Encoding</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getLocalEncodingMapping()
- * @model
- * @generated
- */
-public interface LocalEncodingMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Locale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Locale</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Locale</em>' attribute.
-	 * @see #setLocale(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getLocalEncodingMapping_Locale()
-	 * @model
-	 * @generated
-	 */
-	String getLocale();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getLocale <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Locale</em>' attribute.
-	 * @see #getLocale()
-	 * @generated
-	 */
-	void setLocale(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Encoding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Encoding</em>' attribute.
-	 * @see #setEncoding(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getLocalEncodingMapping_Encoding()
-	 * @model
-	 * @generated
-	 */
-	String getEncoding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getEncoding <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Encoding</em>' attribute.
-	 * @see #getEncoding()
-	 * @generated
-	 */
-	void setEncoding(String value);
-
-} // LocalEncodingMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMappingList.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMappingList.java
deleted file mode 100644
index ba45cdf5d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMappingList.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Local Encoding Mapping List</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList#getLocalEncodingMappings <em>Local Encoding Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getLocalEncodingMappingList()
- * @model
- * @generated
- */
-public interface LocalEncodingMappingList extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Local Encoding Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Encoding Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Encoding Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getLocalEncodingMappingList_LocalEncodingMappings()
-	 * @model type="org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping" containment="true" required="true"
-	 * @generated
-	 */
-	EList getLocalEncodingMappings();
-
-} // LocalEncodingMappingList
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LoginConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LoginConfig.java
deleted file mode 100644
index 31677e675..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LoginConfig.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login
- * mechanism.
- * @generated
- */
-public interface LoginConfig extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AuthMethod attribute
-	 * The auth-method element is used to configure the authentication mechanism for
-	 * the web application. As a prerequisite to gaining access to any web resources
-	 * which are protected by an authorization constraint, a user must have
-	 * authenticated using the configured mechanism. Legal values for this element are 
-	 * "BASIC", "DIGEST", "FORM", or "CLIENT-CERT".
-	 */
-	AuthMethodKind getAuthMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auth Method</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.webapplication.AuthMethodKind
-	 * @see #isSetAuthMethod()
-	 * @see #unsetAuthMethod()
-	 * @see #getAuthMethod()
-	 * @generated
-	 */
-	void setAuthMethod(AuthMethodKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webapplication.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAuthMethod()
-	 * @see #getAuthMethod()
-	 * @see #setAuthMethod(AuthMethodKind)
-	 * @generated
-	 */
-	void unsetAuthMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webapplication.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Auth Method</em>' attribute is set.
-	 * @see #unsetAuthMethod()
-	 * @see #getAuthMethod()
-	 * @see #setAuthMethod(AuthMethodKind)
-	 * @generated
-	 */
-	boolean isSetAuthMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RealmName attribute
-	 * The realm name element specifies the realm name to use in HTTP Basic
-	 * authorization
-	 */
-	String getRealmName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RealmName attribute
-	 */
-	void setRealmName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Authorization Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Authorization Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Authorization Method</em>' attribute.
-	 * @see #setAuthorizationMethod(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getLoginConfig_AuthorizationMethod()
-	 * @model
-	 * @generated
-	 */
-	String getAuthorizationMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.LoginConfig#getAuthorizationMethod <em>Authorization Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authorization Method</em>' attribute.
-	 * @see #getAuthorizationMethod()
-	 * @generated
-	 */
-	void setAuthorizationMethod(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FormLoginConfig reference
-	 */
-	FormLoginConfig getFormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the FormLoginConfig reference
-	 */
-	void setFormLoginConfig(FormLoginConfig value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/MimeMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/MimeMapping.java
deleted file mode 100644
index fa7211087..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/MimeMapping.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The mime-mapping element defines a mapping between an extension and a mime type.
- * @generated
- * @since 1.0
- */
-public interface MimeMapping extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Extension attribute
-	 * The extension element contains a string describing an extension. example: "txt"
-	 */
-	String getExtension();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Extension attribute
-	 */
-	void setExtension(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the MimeType attribute
-	 * The mime-type element contains a defined mime type. example: "text//plain"
-	 */
-	String getMimeType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the MimeType attribute
-	 */
-	void setMimeType(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ResAuthServletType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ResAuthServletType.java
deleted file mode 100644
index fa11b7e33..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ResAuthServletType.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-/**
- *@since 1.0
- */
-public final class ResAuthServletType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CONTAINER = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SERVLET = 1;
-	/**
-	 * The '<em><b>CONTAINER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CONTAINER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthServletType CONTAINER_LITERAL = new ResAuthServletType(CONTAINER, "CONTAINER", "CONTAINER");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>SERVLET</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SERVLET</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SERVLET
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthServletType SERVLET_LITERAL = new ResAuthServletType(SERVLET, "SERVLET", "SERVLET");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Res Auth Servlet Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResAuthServletType[] VALUES_ARRAY =
-		new ResAuthServletType[] {
-			CONTAINER_LITERAL,
-			SERVLET_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Auth Servlet Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Auth Servlet Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthServletType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthServletType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Servlet Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthServletType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthServletType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Servlet Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthServletType get(int value) {
-		switch (value) {
-			case CONTAINER: return CONTAINER_LITERAL;
-			case SERVLET: return SERVLET_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResAuthServletType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //ResAuthServletType
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/RoleNameType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/RoleNameType.java
deleted file mode 100644
index 8754df7ac..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/RoleNameType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * @generated
- * @since  1.0
- */
-public interface RoleNameType extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SecurityConstraint.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SecurityConstraint.java
deleted file mode 100644
index 39b37b631..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SecurityConstraint.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The security-constraint element is used to associate security constraints with one or more web resource collections
- * @generated
- * @since 1.0
- */
-public interface SecurityConstraint extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4 deprecated, becomes displayNames
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getSecurityConstraint_DisplayName()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.SecurityConstraint#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of WebResourceCollections references
-	 */
-	EList getWebResourceCollections();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AuthConstraint reference
-	 */
-	AuthConstraint getAuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the AuthConstraint reference
-	 */
-	void setAuthConstraint(AuthConstraint value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The UserDataConstraint reference
-	 */
-	UserDataConstraint getUserDataConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UserDataConstraint reference
-	 */
-	void setUserDataConstraint(UserDataConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.DisplayName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Names</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Names</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getSecurityConstraint_DisplayNames()
-	 * @model type="org.eclipse.jst.j2ee.common.DisplayName" containment="true"
-	 * @generated
-	 */
-	EList getDisplayNames();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Servlet.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Servlet.java
deleted file mode 100644
index 8c43cd520..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Servlet.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-
-/**
- * The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded.
- * @since 1.0
- */
-public interface Servlet extends CompatibilityDescriptionGroup{
-
-
-	/**
-	 * Returns an unmodifiable list of the mappings that this
-	 * servlet participates in.  Since servletMappings is not
-	 * a bi-directional attribute, if you want to add or delete a
-	 * mapping, this must be done in the web-app.
-	 * @return java.util.List
-	 */
-	public List getMappings();
-	
-	/**
-	 * Gets the Servlet parameters in  java.util.Properties
-	 * @return java.util.Properties
-	 */
-	public Properties getParamsAsProperties() ;
-	/**
-	 * Fix the role-link on any contained role refs
-	 * @param existingRoleName existing role name
-	 * @param newRoleName new role name
-	 */
-	public void reSyncSecurityRoleRef(String existingRoleName, String newRoleName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ServletName attribute
-	 * The servlet-name element contains the canonical name of the servlet.
-	 */
-	String getServletName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ServletName attribute
-	 */
-	void setServletName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the LoadOnStartup attribute
-	 * The load-on-startup element indicates that this servlet should be loaded on the 
-	 * startup of the web application. The optional contents of these element must be
-	 * a positive integer indicating the order in which the servlet should be loaded.
-	 * Lower integers are loaded before higher integers. If no value is specified, or
-	 * if the value specified is not a positive integer, the container is free to load 
-	 * it at any time in the startup sequence.
-
-	 */
-	Integer getLoadOnStartup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Load On Startup</em>' attribute.
-	 * @see #isSetLoadOnStartup()
-	 * @see #unsetLoadOnStartup()
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 */
-	void setLoadOnStartup(Integer value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webapplication.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetLoadOnStartup()
-	 * @see #getLoadOnStartup()
-	 * @see #setLoadOnStartup(Integer)
-	 * @generated
-	 */
-  void unsetLoadOnStartup();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webapplication.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Load On Startup</em>' attribute is set.
-	 * @see #unsetLoadOnStartup()
-	 * @see #getLoadOnStartup()
-	 * @see #setLoadOnStartup(Integer)
-	 * @generated
-	 */
-  boolean isSetLoadOnStartup();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebType reference
-	 */
-	WebType getWebType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebType reference
-	 */
-	void setWebType(WebType value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Params references
-	 */
-	EList getParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoleRefs references
-	 */
-	EList getSecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RunAs reference
-	 * If defined for a servlet, overrides the security identity used to call an EJB
-	 * by that servlet in this web application. The role-name is one of the security
-	 * roles already defined for this web application.
-	 */
-	RunAsSpecifiedIdentity getRunAs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RunAs reference
-	 */
-	void setRunAs(RunAsSpecifiedIdentity value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getServlet_InitParams()
-	 * @model type="org.eclipse.jst.j2ee.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getInitParams();
-
-	/**
-	 * return the java servlet class associated with this servlet
-	 * @return reference to JavaClass
-	 */
-	public JavaClass getServletClass();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletMapping.java
deleted file mode 100644
index 2b96ad8a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletMapping.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The servlet-mapping element defines a mapping between a servlet and a url pattern
- * @since 1.0
- * @generated
- */
-public interface ServletMapping extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the UrlPattern attribute
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	String getUrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UrlPattern attribute
-	 */
-	void setUrlPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * The servlet-name element contains the canonical name of the
-	 * servlet. Each servlet name is unique within the web
-	 * application.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getServletMapping_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.ServletMapping#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Servlet reference
-	 */
-	Servlet getServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Servlet reference
-	 */
-	void setServlet(Servlet value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletType.java
deleted file mode 100644
index 1a634b337..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-
-/**
- * @generated
- * @since 1.0
- */
-public interface ServletType extends WebType{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ClassName attribute
-	 */
-	String getClassName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ClassName attribute
-	 */
-	void setClassName(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SessionConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SessionConfig.java
deleted file mode 100644
index 80e9d76a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SessionConfig.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The session-config element defines the session parameters for this web application.
- * @since 1.0
- * @generated
- */
-public interface SessionConfig extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SessionTimeout attribute
-	 * The session-timeout element defines the default session timeout interval for
-	 * all sessions created in this web application. The specified timeout must be
-	 * expressed in a whole number of minutes.
-	 */
-	int getSessionTimeout();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SessionTimeout attribute
-	 */
-	void setSessionTimeout(int value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webapplication.SessionConfig#getSessionTimeout <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetSessionTimeout()
-	 * @see #getSessionTimeout()
-	 * @see #setSessionTimeout(int)
-	 * @generated
-	 */
-  void unsetSessionTimeout();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webapplication.SessionConfig#getSessionTimeout <em>Session Timeout</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Session Timeout</em>' attribute is set.
-	 * @see #unsetSessionTimeout()
-	 * @see #getSessionTimeout()
-	 * @see #setSessionTimeout(int)
-	 * @generated
-	 */
-  boolean isSetSessionTimeout();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TagLibRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TagLibRef.java
deleted file mode 100644
index 5dc2b04ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TagLibRef.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The taglib element is used to describe a JSP tag library.
- * @version since J2EE1.4 deprecated, use org.eclipse.jst.j2ee.internal.jsp.TagLibRef
- * @generated
- * @since 1.0
- */
-public interface TagLibRef extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TaglibURI attribute
-	 * The taglib-uri element describes a URI, relative to the location of the web.xml 
-	 * document, identifying a Tag Library used in the Web Application.
-	 */
-	String getTaglibURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the TaglibURI attribute
-	 */
-	void setTaglibURI(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TaglibLocation attribute
-	 * The taglib-location element contains the location (as a resource relative to
-	 * the root of the web application) where to find the Tag Libary Description file
-	 * for the tag library.
-	 */
-	String getTaglibLocation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the TaglibLocation attribute
-	 */
-	void setTaglibLocation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Web App</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getTagLibs <em>Tag Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Web App</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Web App</em>' container reference.
-	 * @see #setWebApp(WebApp)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getTagLibRef_WebApp()
-	 * @see org.eclipse.jst.j2ee.webapplication.WebApp#getTagLibs
-	 * @model opposite="tagLibs"
-	 * @generated
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.TagLibRef#getWebApp <em>Web App</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web App</em>' container reference.
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TransportGuaranteeType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TransportGuaranteeType.java
deleted file mode 100644
index 3c8e83326..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TransportGuaranteeType.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-/**
- *@since 1.0
- */
-
-public final class TransportGuaranteeType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NONE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int INTEGRAL = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CONFIDENTIAL = 2;
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType NONE_LITERAL = new TransportGuaranteeType(NONE, "NONE", "NONE");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>INTEGRAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INTEGRAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTEGRAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType INTEGRAL_LITERAL = new TransportGuaranteeType(INTEGRAL, "INTEGRAL", "INTEGRAL");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>CONFIDENTIAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CONFIDENTIAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONFIDENTIAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType CONFIDENTIAL_LITERAL = new TransportGuaranteeType(CONFIDENTIAL, "CONFIDENTIAL", "CONFIDENTIAL");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transport Guarantee Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransportGuaranteeType[] VALUES_ARRAY =
-		new TransportGuaranteeType[] {
-			NONE_LITERAL,
-			INTEGRAL_LITERAL,
-			CONFIDENTIAL_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transport Guarantee Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransportGuaranteeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransportGuaranteeType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType get(int value) {
-		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case INTEGRAL: return INTEGRAL_LITERAL;
-			case CONFIDENTIAL: return CONFIDENTIAL_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransportGuaranteeType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //TransportGuaranteeType
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/URLPatternType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/URLPatternType.java
deleted file mode 100644
index 058d5b3b9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/URLPatternType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- *  <!-- begin-user-doc -->
- * @deprecated since 4/25/2003 use list on {@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection} 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.URLPatternType#getUrlPattern <em>Url Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.URLPatternType#getResCollection <em>Res Collection</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getURLPatternType()
- * @model
- * @generated
- */
-public interface URLPatternType extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the UrlPattern attribute
-	 */
-	String getUrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UrlPattern attribute
-	 */
-	void setUrlPattern(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ResCollection reference
-	 */
-	WebResourceCollection getResCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ResCollection reference
-	 */
-	void setResCollection(WebResourceCollection value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/UserDataConstraint.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/UserDataConstraint.java
deleted file mode 100644
index 845ba8fc7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/UserDataConstraint.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * The user-data-constraint element is used to indicate how data communicated between the client and container should be protected
- * @since 1.0
- * @generated
- */
-public interface UserDataConstraint extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * A description for the user data constraint.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransportGuarantee attribute
-	 * The transport-guarantee element specifies that the communication between client 
-	 * and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the
-	 * application does not require any
-	 * transport guarantees. A value of INTEGRAL means that the application requires
-	 * that the data sent between the client and server be sent in such a way that it
-	 * can't be changed in transit. CONFIDENTIAL means that the application requires
-	 * that the data be transmitted in a fashion that prevents other entities from
-	 * observing the contents of the transmission. In most cases, the presence of the
-	 * INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required.
-	 */
-	TransportGuaranteeType getTransportGuarantee();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transport Guarantee</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType
-	 * @see #isSetTransportGuarantee()
-	 * @see #unsetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 */
-	void setTransportGuarantee(TransportGuaranteeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webapplication.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @generated
-	 */
-	void unsetTransportGuarantee();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webapplication.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transport Guarantee</em>' attribute is set.
-	 * @see #unsetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @generated
-	 */
-	boolean isSetTransportGuarantee();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecConstraint reference
-	 */
-	SecurityConstraint getSecConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SecConstraint reference
-	 */
-	void setSecConstraint(SecurityConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getUserDataConstraint_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebApp.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebApp.java
deleted file mode 100644
index b6abae256..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebApp.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-
-/**
- * The web-app element is the root of the deployment descriptor for
- * a web application.
- * @since 1.0
- */
-public interface WebApp extends JNDIEnvRefsGroup{
-
-	/**
-	 * Returns true if there is a SecurityRole with the name passed
-	 * @param name name of the SecurityRole
-	 * @return boolean value
-	 */
-	public boolean containsSecurityRole(String name);
-	
-	/**
-	 * Returns an ErrorPage if it has the specified error code
-	 * @param code the error code
-	 * @return refernce to ErrorPage
-	 */
-	ErrorPage getErrorPageByCode(Integer code) ;
-	
-	/**
-	 * Returns an ErrorPage given an exceptionType
-	 * @param exceptionType the java Exception Type
-	 * @return refernce to ErrorPage
-	 */
-	ErrorPage getErrorPageByExceptionType(String exceptionType) ;
-	/**
-	 * Finds a filter mapping for a specified filter.
-	 * @param aFilter The filter to find the mappings for.
-	 * @return The filter mapping for the specified filter, or null if no
-	 * mapping exists for the filter.
-	 */
-
-	FilterMapping getFilterMapping(Filter aFilter);
-	
-	/**
-	 * Gets refernce to the instance of Filter which has the specified name
-	 * @param name the name of the Filter to look for
-	 * @return refernce to teh Filter
-	 */
-	public Filter getFilterNamed(String name);
-	/**
-	 * Gets the names of the filters defined for this web application.
-	 * @return A list of filter names (Strings).
-	 */
-
-	List getFilterNames() ;
-	/**
-	 * Returns the mime type for the specified extension
-	 * @param extension to find the mime type for.
-	 * @return String value
-	 */
-	String getMimeType(String extension);
-	
-	/**
-	 * Returns the SecurityRole with the specified name
-	 * @param roleName the name of the SecurityRole to be searched for
-	 * @return reference to the model object SecurityRole
-	 */
-	public SecurityRole getSecurityRoleNamed(String roleName);
-	
-	/**
-	 * Finds a servlet mapping for a specified servlet.
-	 * @param aServlet The servlet to find the mappings for.
-	 * @return The servlet mapping for the specified servlet, or null if no
-	 * mapping exists for the servlet.
-	 */
-	ServletMapping getServletMapping(Servlet aServlet);
-	
-	/**
-	 * Returns a Servlet with the specified name 
-	 * @param name the name of the Servlet to search for
-	 * @return reference to the model object Servlet
-	 */
-	public Servlet getServletNamed(String name);
-	
-	/**
-	 * Gets the names of the servlets defined for this web application.
-	 * @return A list of servlet names (Strings).
-	 */
-	List getServletNames() ;
-	/**
-	 * Return boolean indicating if this Web App was populated from an Servlet2.2 compliant descriptor
-	 * @return boolean
-	 * @deprecated Use getVersionID() to determine module level
-	 */
-	public boolean isVersion2_2Descriptor();
-	/**
-	 * Return boolean indicating if this Web App was populated from an Servlet2.3 compliant descriptor
-	 * @return boolean
-	 * @deprecated Use getVersionID() to determine module level
-	 */
-	public boolean isVersion2_3Descriptor();
-	/**
-	 * Rename the security role if it exists; for each servlet, fix the role-link on any contained role
-	 * refs
-	 * @param existingRoleName curent security role name
-	 * @param newRoleName new security role name
-	 */
-	public void renameSecurityRole(String existingRoleName, String newRoleName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Distributable attribute
-	 * The distributable element, by its presence in a web application deployment
-	 * descriptor, indicates that this web application is programmed appropriately to
-	 * be deployed into a distributed servlet container
-	 */
-	boolean isDistributable();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Distributable attribute
-	 */
-	void setDistributable(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webapplication.WebApp#isDistributable <em>Distributable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDistributable()
-	 * @see #isDistributable()
-	 * @see #setDistributable(boolean)
-	 * @generated
-	 */
-	void unsetDistributable();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webapplication.WebApp#isDistributable <em>Distributable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Distributable</em>' attribute is set.
-	 * @see #unsetDistributable()
-	 * @see #isDistributable()
-	 * @see #setDistributable(boolean)
-	 * @generated
-	 */
-	boolean isSetDistributable();
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebApp_Version()
-	 * @model
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	 *@throws IllegalStateException the exception is thrown if a problem is encountered in finding the 
-	 *module version. 	* 
-	* @return the module version id represented in the int e.g. 22, 23, 24
-	*/
-	public int getVersionID() throws IllegalStateException ;
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 *@throws IllegalStateException the exception is thrown if a problem is encountered in finding the 
-	 *j2ee version. 
-	 *@return the j2ee version represented in the int
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException ;
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Contexts references
-	 */
-	EList getContexts();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ErrorPages references
-	 */
-	EList getErrorPages();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FileList reference
-	 */
-	WelcomeFileList getFileList();
-
-	/**
-	 * @deprecated : Use getEnvironmentProperties()
-	 * @return reference to EList
-	 */
-	EList getEnvEntries();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the FileList reference
-	 */
-	void setFileList(WelcomeFileList value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of TagLibs references
-	 */
-	EList getTagLibs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Constraints references
-	 */
-	EList getConstraints();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LoginConfig reference
-	 */
-	LoginConfig getLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the LoginConfig reference
-	 */
-	void setLoginConfig(LoginConfig value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MimeMappings references
-	 */
-	EList getMimeMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SessionConfig reference
-	 */
-	SessionConfig getSessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SessionConfig reference
-	 */
-	void setSessionConfig(SessionConfig value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ServletMappings references
-	 */
-	EList getServletMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Servlets references
-	 */
-	EList getServlets();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoles references
-	 */
-	EList getSecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Filters references
-	 */
-	EList getFilters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of FilterMappings references
-	 * Filter mappings defined for the web app
-	 */
-	EList getFilterMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Listeners references
-	 * The listeners collection contains deployment properties for a web application
-	 * listener beans in the web app.
-	 */
-	EList getListeners();
-
-	/**
-	 * Returns the value of the '<em><b>Context Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebApp_ContextParams()
-	 * @model type="org.eclipse.jst.j2ee.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getContextParams();
-
-	/**
-	 * Returns the value of the '<em><b>Jsp Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jsp Config</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jsp Config</em>' containment reference.
-	 * @see #setJspConfig(JSPConfig)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebApp_JspConfig()
-	 * @model containment="true"
-	 * @generated
-	 */
-	JSPConfig getJspConfig();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getJspConfig <em>Jsp Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jsp Config</em>' containment reference.
-	 * @see #getJspConfig()
-	 * @generated
-	 */
-	void setJspConfig(JSPConfig value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebApp_MessageDestinations()
-	 * @model type="org.eclipse.jst.j2ee.common.MessageDestination" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinations();
-
-	/**
-	 * Returns the value of the '<em><b>Local Encoding Mapping List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Encoding Mapping List</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Encoding Mapping List</em>' containment reference.
-	 * @see #setLocalEncodingMappingList(LocalEncodingMappingList)
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebApp_LocalEncodingMappingList()
-	 * @model containment="true"
-	 * @generated
-	 */
-	LocalEncodingMappingList getLocalEncodingMappingList();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getLocalEncodingMappingList <em>Local Encoding Mapping List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Encoding Mapping List</em>' containment reference.
-	 * @see #getLocalEncodingMappingList()
-	 * @generated
-	 */
-	void setLocalEncodingMappingList(LocalEncodingMappingList value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebAppResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebAppResource.java
deleted file mode 100644
index d87771ce2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebAppResource.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- * @author schacher
- * @since 1.0
- */
-public interface WebAppResource extends XMLResource {
-	
-	/**
-	 * Returns reference to the model object WebApp
-	 * @return reference to  model object WebApp
-	 */
-	WebApp getWebApp();
-	/**
-	 * Return true if this Resource supports the Web 2.2 spec.
-	 * @return boolean value
-	 */
-	boolean isWeb2_2();
-	/**
-	 * Return true if this Resource supports the Web 2.3 spec.
-	 * @return boolean value
-	 */
-	boolean isWeb2_3();
-	/**
-	 * Return true if this Resource supports the Web 2.4 spec.
-	 * @return boolean value
-	 */
-	boolean isWeb2_4();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebResourceCollection.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebResourceCollection.java
deleted file mode 100644
index 57d56ecc9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebResourceCollection.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * @generated
- * The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.
- * @since 1.0
- */
-public interface WebResourceCollection extends J2EEEObject {
-
-	/**
-	 * Adds instance of HTTPMethodType
-	 * @param httpMethod name of the httpMethod to add
-	 */
-	public void addHTTP(String httpMethod);
-	
-	/**
-	 * Adds instance of URLPatternType
-	 * @param urlPattern name of the url to add
-	 */
-	public void addURL(String urlPattern);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the WebResourceName attribute
-	 * The web-resource-name contains the name of this web resource collection
-	 */
-	String getWebResourceName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebResourceName attribute
-	 */
-	void setWebResourceName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Url Pattern</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Pattern</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Url Pattern</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebResourceCollection_UrlPattern()
-	 * @model type="java.lang.String" unique="false" required="true"
-	 * @generated
-	 */
-	EList getUrlPattern();
-
-	/**
-	 * Returns the value of the '<em><b>Http Method</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum}.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Http Method</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Http Method</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebResourceCollection_HttpMethod()
-	 * @model type="org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum"
-	 * @generated
-	 */
-	EList getHttpMethod();
-
-	/**
-	 * @deprecated : Use getHttpMethod();
-	 * @return List of HttpMethods
-	 */
-	EList getHTTPs();
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecConstraint reference
-	 */
-	
-	
-	SecurityConstraint getSecConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SecConstraint reference
-	 */
-	void setSecConstraint(SecurityConstraint value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of URLs references
-	 */
-	EList getURLs();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.Description}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @version J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage#getWebResourceCollection_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebType.java
deleted file mode 100644
index 1b0b94d32..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * @generated
- * @since 1.0
- */
-public interface WebType extends J2EEEObject {
-
-	/**
-	 * Returns true if the type denotes a JSP
-	 * @return boolean value
-	 */
-	public boolean isJspType();
-	
-	/**
-	 * Returns true if the type denotes a servlet
-	 * @return boolean value
-	 */
-	public boolean isServletType();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java
deleted file mode 100644
index a012c9353..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * @generated
- * @since 1.0
- */
-public interface WebapplicationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WebapplicationFactory eINSTANCE = org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationFactoryImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebApp value
-	 */
-	WebApp createWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContextParam value
-	 */
-	ContextParam createContextParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorPage value
-	 */
-	ErrorPage createErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExceptionTypeErrorPage value
-	 */
-	ExceptionTypeErrorPage createExceptionTypeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorCodeErrorPage value
-	 */
-	ErrorCodeErrorPage createErrorCodeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFileList value
-	 */
-	WelcomeFileList createWelcomeFileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFile value
-	 */
-	WelcomeFile createWelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TagLibRef value
-	 */
-	TagLibRef createTagLibRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityConstraint value
-	 */
-	SecurityConstraint createSecurityConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebResourceCollection value
-	 */
-	WebResourceCollection createWebResourceCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return URLPatternType value
-	 */
-	URLPatternType createURLPatternType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthConstraint value
-	 */
-	AuthConstraint createAuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return UserDataConstraint value
-	 */
-	UserDataConstraint createUserDataConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return LoginConfig value
-	 */
-	LoginConfig createLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FormLoginConfig value
-	 */
-	FormLoginConfig createFormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MimeMapping value
-	 */
-	MimeMapping createMimeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SessionConfig value
-	 */
-	SessionConfig createSessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletMapping value
-	 */
-	ServletMapping createServletMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Servlet value
-	 */
-	Servlet createServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletType value
-	 */
-	ServletType createServletType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPType value
-	 */
-	JSPType createJSPType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return InitParam value
-	 */
-	InitParam createInitParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Filter value
-	 */
-	Filter createFilter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FilterMapping value
-	 */
-	FilterMapping createFilterMapping();
-
-	/**
-	 * Returns a new object of class '<em>Local Encoding Mapping List</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Local Encoding Mapping List</em>'.
-	 * @generated
-	 */
-	LocalEncodingMappingList createLocalEncodingMappingList();
-
-	/**
-	 * Returns a new object of class '<em>Local Encoding Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Local Encoding Mapping</em>'.
-	 * @generated
-	 */
-	LocalEncodingMapping createLocalEncodingMapping();
-
-	/**
-	 * Returns a new object of class '<em>HTTP Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>HTTP Method Type</em>'.
-	 * @generated
-	 */
-	HTTPMethodType createHTTPMethodType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleNameType value
-	 */
-	RoleNameType createRoleNameType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	WebapplicationPackage getWebapplicationPackage();
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java
deleted file mode 100644
index 73ed8a9ab..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java
+++ /dev/null
@@ -1,3385 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	@since 1.0
- */
-public interface WebapplicationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "webapplication";//$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ICONS = CommonPackage.JNDI_ENV_REFS_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DISPLAY_NAMES = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DESCRIPTIONS = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SMALL_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__LARGE_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__DESCRIPTION = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__DISPLAY_NAME = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Environment Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ENVIRONMENT_PROPERTIES = CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__RESOURCE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__EJB_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__RESOURCE_ENV_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__EJB_LOCAL_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MESSAGE_DESTINATION_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SERVICE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__DISTRIBUTABLE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__VERSION = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__CONTEXTS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__ERROR_PAGES = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__FILE_LIST = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__TAG_LIBS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__CONSTRAINTS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__LOGIN_CONFIG = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__MIME_MAPPINGS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SESSION_CONFIG = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SERVLET_MAPPINGS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SERVLETS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SECURITY_ROLES = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__FILTERS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__FILTER_MAPPINGS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__LISTENERS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Context Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__CONTEXT_PARAMS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 16;
-
-	/**
-	 * The feature id for the '<em><b>Jsp Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__JSP_CONFIG = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 17;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MESSAGE_DESTINATIONS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 18;
-
-	/**
-	 * The feature id for the '<em><b>Local Encoding Mapping List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__LOCAL_ENCODING_MAPPING_LIST = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 19;
-
-	/**
-	 * The number of structural features of the '<em>Web App</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_FEATURE_COUNT = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 20;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__PARAM_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__PARAM_VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Context Param</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTEXT_PARAM_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_PAGE = 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE = 22;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE = 23;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE_LIST = 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE = 21;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB_REF = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int URL_PATTERN_TYPE = 19;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int HTTP_METHOD_TYPE = 28;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT = 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT = 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG = 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_CONFIG = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET = 2;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__SERVLET_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__LOAD_ON_STARTUP = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__WEB_APP = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__WEB_TYPE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__SECURITY_ROLE_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__RUN_AS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Servlet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING__URL_PATTERN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING__NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING__SERVLET = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Servlet Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_CONFIG__SESSION_TIMEOUT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_CONFIG__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Session Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_CONFIG_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING__EXTENSION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING__MIME_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Mime Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE_LIST__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE_LIST__FILE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Welcome File List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_LIST_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_PAGE__LOCATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_PAGE__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB_REF__TAGLIB_URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB_REF__TAGLIB_LOCATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Web App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Tag Lib Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__DISPLAY_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__AUTH_CONSTRAINT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__DISPLAY_NAMES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Security Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Url Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__URL_PATTERN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Http Method</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__HTTP_METHOD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__UR_LS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>HTT Ps</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__HTT_PS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Web Resource Collection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT__ROLES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT__SEC_CONSTRAINT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Auth Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT__SEC_CONSTRAINT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT__DESCRIPTIONS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>User Data Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__AUTH_METHOD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__REALM_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Authorization Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG__AUTHORIZATION_METHOD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__WEB_APP = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__FORM_LOGIN_CONFIG = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Login Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG__LOGIN_CONFIG = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Form Login Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORM_LOGIN_CONFIG_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_TYPE = 16;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_TYPE = 17;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TYPE = 18;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM = 15;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM__PARAM_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM__PARAM_VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Init Param</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_PARAM_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Web Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_TYPE__CLASS_NAME = WEB_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Servlet Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_TYPE_FEATURE_COUNT = WEB_TYPE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TYPE__JSP_FILE = WEB_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>JSP Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TYPE_FEATURE_COUNT = WEB_TYPE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int URL_PATTERN_TYPE__URL_PATTERN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int URL_PATTERN_TYPE__RES_COLLECTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>URL Pattern Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int URL_PATTERN_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER = 25;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING = 24;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_NAME_TYPE = 20;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_NAME_TYPE__ROLE_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Role Name Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NAME_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE__WELCOME_FILE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE__FILE_LIST = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Welcome File</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE__LOCATION = ERROR_PAGE__LOCATION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE__WEB_APP = ERROR_PAGE__WEB_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE = ERROR_PAGE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Exception Type Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE_FEATURE_COUNT = ERROR_PAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE__LOCATION = ERROR_PAGE__LOCATION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE__WEB_APP = ERROR_PAGE__WEB_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE__ERROR_CODE = ERROR_PAGE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Error Code Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_CODE_ERROR_PAGE_FEATURE_COUNT = ERROR_PAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING__URL_PATTERN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Dispatcher Type</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__DISPATCHER_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING__FILTER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING__SERVLET = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Filter Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__FILTER_CLASS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Init Param Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__INIT_PARAM_VALUES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Filter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingListImpl <em>Local Encoding Mapping List</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingListImpl
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getLocalEncodingMappingList()
-	 * @generated
-	 */
-	int LOCAL_ENCODING_MAPPING_LIST = 26;
-
-	/**
-	 * The feature id for the '<em><b>Local Encoding Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Local Encoding Mapping List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING_LIST_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingImpl <em>Local Encoding Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingImpl
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getLocalEncodingMapping()
-	 * @generated
-	 */
-	int LOCAL_ENCODING_MAPPING = 27;
-
-	/**
-	 * The feature id for the '<em><b>Locale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING__LOCALE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING__ENCODING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Local Encoding Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Http Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_METHOD_TYPE__HTTP_METHOD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>HTTP Method Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_METHOD_TYPE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webapplication.ResAuthServletType <em>Res Auth Servlet Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webapplication.ResAuthServletType
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getResAuthServletType()
-	 * @generated
-	 */
-	int RES_AUTH_SERVLET_TYPE = 29;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum <em>HTTP Method Type Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getHTTPMethodTypeEnum()
-	 * @generated
-	 */
-	int HTTP_METHOD_TYPE_ENUM = 30;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSPORT_GUARANTEE_TYPE = 31;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webapplication.DispatcherType <em>Dispatcher Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webapplication.DispatcherType
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getDispatcherType()
-	 * @generated
-	 */
-	int DISPATCHER_TYPE = 32;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webapplication.AuthMethodKind <em>Auth Method Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webapplication.AuthMethodKind
-	 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getAuthMethodKind()
-	 * @generated
-	 */
-	int AUTH_METHOD_KIND = 33;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "webapplication.xmi";//$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.webapplication";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WebapplicationPackage eINSTANCE = org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebApp object
-	 */
-	EClass getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EAttribute getWebApp_Distributable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebApp#getVersion()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EAttribute getWebApp_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_Contexts();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_ErrorPages();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_FileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_TagLibs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_Constraints();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_LoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_MimeMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_SessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_ServletMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_Servlets();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_SecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_Filters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_FilterMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return
-	 */
-	EReference getWebApp_Listeners();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getContextParams <em>Context Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Context Params</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebApp#getContextParams()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_ContextParams();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getJspConfig <em>Jsp Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Jsp Config</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebApp#getJspConfig()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_JspConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebApp#getMessageDestinations()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_MessageDestinations();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webapplication.WebApp#getLocalEncodingMappingList <em>Local Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Local Encoding Mapping List</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebApp#getLocalEncodingMappingList()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_LocalEncodingMappingList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContextParam object
-	 */
-	EClass getContextParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return Name
-	 */
-	EAttribute getContextParam_ParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return Value
-	 */
-	EAttribute getContextParam_ParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return Description
-	 */
-	EAttribute getContextParam_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return WebApp
-	 */
-	EReference getContextParam_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorPage object
-	 */
-	EClass getErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return Location
-	 */
-	EAttribute getErrorPage_Location();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return WebApp
-	 */
-	EReference getErrorPage_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExceptionTypeErrorPage object
-	 */
-	EClass getExceptionTypeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getExceptionTypeErrorPage_ExceptionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorCodeErrorPage object
-	 */
-	/**
-	 * @return ErrorCodeErrorPage object
-	 */
-	EClass getErrorCodeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return ErrorCode
-	 */
-	EAttribute getErrorCodeErrorPage_ErrorCode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFileList object
-	 */
-	EClass getWelcomeFileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWelcomeFileList_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWelcomeFileList_File();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFile object
-	 */
-	EClass getWelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWelcomeFile_WelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWelcomeFile_FileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TagLibRef object
-	 */
-	EClass getTagLibRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLibRef_TaglibURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLibRef_TaglibLocation();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.jst.j2ee.webapplication.TagLibRef#getWebApp <em>Web App</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Web App</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.TagLibRef#getWebApp()
-	 * @see #getTagLibRef()
-	 * @generated
-	 */
-	EReference getTagLibRef_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityConstraint object
-	 */
-	EClass getSecurityConstraint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.SecurityConstraint#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.SecurityConstraint#getDisplayName()
-	 * @see #getSecurityConstraint()
-	 * @generated
-	 */
-	EAttribute getSecurityConstraint_DisplayName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_WebResourceCollections();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_AuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_UserDataConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.SecurityConstraint#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.SecurityConstraint#getDisplayNames()
-	 * @see #getSecurityConstraint()
-	 * @generated
-	 */
-	EReference getSecurityConstraint_DisplayNames();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebResourceCollection object
-	 */
-	EClass getWebResourceCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWebResourceCollection_WebResourceName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWebResourceCollection_Description();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getUrlPattern <em>Url Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Url Pattern</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getUrlPattern()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EAttribute getWebResourceCollection_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getHttpMethod <em>Http Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Http Method</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getHttpMethod()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EAttribute getWebResourceCollection_HttpMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebResourceCollection_SecConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getURLs <em>UR Ls</em>}'.
-	 * <!-- begin-user-doc -->
-	 * @deprecated since 4/25/2003 use {@link #getWebResourceCollection_UrlPattern()}
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>UR Ls</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getURLs()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EReference getWebResourceCollection_URLs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getDescriptions()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EReference getWebResourceCollection_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getHTTPs <em>HTT Ps</em>}'.
-	 * <!-- begin-user-doc -->
-	 * @deprecated since 4/25/2003 use {@link #getWebResourceCollection_HttpMethod()}
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>HTT Ps</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.WebResourceCollection#getHTTPs()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EReference getWebResourceCollection_HTTPs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return URLPatternType object
-	 */
-	EClass getURLPatternType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getURLPatternType_UrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getURLPatternType_ResCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return HTTPMethodType object
-	 */
-	EClass getHTTPMethodType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.HTTPMethodType#getHttpMethod <em>Http Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Http Method</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.HTTPMethodType#getHttpMethod()
-	 * @see #getHTTPMethodType()
-	 * @generated
-	 */
-	EAttribute getHTTPMethodType_HttpMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthConstraint object
-	 */
-	EClass getAuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return Description
-	 */
-	EAttribute getAuthConstraint_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return Roles
-	 */
-	EAttribute getAuthConstraint_Roles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @return SecConstraint object
-	 */
-	EReference getAuthConstraint_SecConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.AuthConstraint#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.AuthConstraint#getDescriptions()
-	 * @see #getAuthConstraint()
-	 * @generated
-	 */
-	EReference getAuthConstraint_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return UserDataConstraint object
-	 */
-	EClass getUserDataConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getUserDataConstraint_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getUserDataConstraint_TransportGuarantee();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getUserDataConstraint_SecConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.UserDataConstraint#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.UserDataConstraint#getDescriptions()
-	 * @see #getUserDataConstraint()
-	 * @generated
-	 */
-	EReference getUserDataConstraint_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return LoginConfig object
-	 */
-	EClass getLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLoginConfig_AuthMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLoginConfig_RealmName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.LoginConfig#getAuthorizationMethod <em>Authorization Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authorization Method</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.LoginConfig#getAuthorizationMethod()
-	 * @see #getLoginConfig()
-	 * @generated
-	 */
-	EAttribute getLoginConfig_AuthorizationMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLoginConfig_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLoginConfig_FormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FormLoginConfig object
-	 */
-	EClass getFormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFormLoginConfig_FormLoginPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFormLoginConfig_FormErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFormLoginConfig_LoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MimeMapping object
-	 */
-	EClass getMimeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMimeMapping_Extension();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMimeMapping_MimeType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMimeMapping_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SessionConfig object
-	 */
-	EClass getSessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSessionConfig_SessionTimeout();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSessionConfig_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletMapping object
-	 */
-	EClass getServletMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServletMapping_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.ServletMapping#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.ServletMapping#getName()
-	 * @see #getServletMapping()
-	 * @generated
-	 */
-	EAttribute getServletMapping_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServletMapping_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServletMapping_Servlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Servlet object
-	 */
-	EClass getServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServlet_ServletName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServlet_LoadOnStartup();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_WebType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_Params();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_SecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_RunAs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.Servlet#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.Servlet#getInitParams()
-	 * @see #getServlet()
-	 * @generated
-	 */
-	EReference getServlet_InitParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebType object
-	 */
-	EClass getWebType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletType object
-	 */
-	EClass getServletType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServletType_ClassName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPType object
-	 */
-	EClass getJSPType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPType_JspFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return InitParam object
-	 */
-	EClass getInitParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitParam_ParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitParam_ParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitParam_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Filter object
-	 */
-	EClass getFilter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFilter_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilter_InitParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilter_FilterClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.Filter#getInitParamValues <em>Init Param Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Param Values</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.Filter#getInitParamValues()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EReference getFilter_InitParamValues();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FilterMapping object
-	 */
-	EClass getFilterMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFilterMapping_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.webapplication.FilterMapping#getDispatcherType <em>Dispatcher Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Dispatcher Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.FilterMapping#getDispatcherType()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_DispatcherType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilterMapping_Filter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilterMapping_Servlet();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList <em>Local Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Local Encoding Mapping List</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList
-	 * @generated
-	 */
-	EClass getLocalEncodingMappingList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList#getLocalEncodingMappings <em>Local Encoding Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Local Encoding Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList#getLocalEncodingMappings()
-	 * @see #getLocalEncodingMappingList()
-	 * @generated
-	 */
-	EReference getLocalEncodingMappingList_LocalEncodingMappings();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping <em>Local Encoding Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Local Encoding Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping
-	 * @generated
-	 */
-	EClass getLocalEncodingMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getLocale <em>Locale</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Locale</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getLocale()
-	 * @see #getLocalEncodingMapping()
-	 * @generated
-	 */
-	EAttribute getLocalEncodingMapping_Locale();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getEncoding <em>Encoding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Encoding</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping#getEncoding()
-	 * @see #getLocalEncodingMapping()
-	 * @generated
-	 */
-	EAttribute getLocalEncodingMapping_Encoding();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.webapplication.ResAuthServletType <em>Res Auth Servlet Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Res Auth Servlet Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.ResAuthServletType
-	 * @generated
-	 */
-	EEnum getResAuthServletType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum <em>HTTP Method Type Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>HTTP Method Type Enum</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum
-	 * @generated
-	 */
-	EEnum getHTTPMethodTypeEnum();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleNameType object
-	 */
-	EClass getRoleNameType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getRoleNameType_RoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransportGuaranteeType object
-	 */
-	EEnum getTransportGuaranteeType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.webapplication.DispatcherType <em>Dispatcher Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Dispatcher Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.DispatcherType
-	 * @generated
-	 */
-	EEnum getDispatcherType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.webapplication.AuthMethodKind <em>Auth Method Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Auth Method Kind</em>'.
-	 * @see org.eclipse.jst.j2ee.webapplication.AuthMethodKind
-	 * @generated
-	 */
-	EEnum getAuthMethodKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	WebapplicationFactory getWebapplicationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppImpl <em>Web App</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getWebApp()
-		 * @generated
-		 */
-		EClass WEB_APP = eINSTANCE.getWebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>Distributable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP__DISTRIBUTABLE = eINSTANCE.getWebApp_Distributable();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_APP__VERSION = eINSTANCE.getWebApp_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Contexts</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__CONTEXTS = eINSTANCE.getWebApp_Contexts();
-
-		/**
-		 * The meta object literal for the '<em><b>Error Pages</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__ERROR_PAGES = eINSTANCE.getWebApp_ErrorPages();
-
-		/**
-		 * The meta object literal for the '<em><b>File List</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__FILE_LIST = eINSTANCE.getWebApp_FileList();
-
-		/**
-		 * The meta object literal for the '<em><b>Tag Libs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__TAG_LIBS = eINSTANCE.getWebApp_TagLibs();
-
-		/**
-		 * The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__CONSTRAINTS = eINSTANCE.getWebApp_Constraints();
-
-		/**
-		 * The meta object literal for the '<em><b>Login Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__LOGIN_CONFIG = eINSTANCE.getWebApp_LoginConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Mime Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__MIME_MAPPINGS = eINSTANCE.getWebApp_MimeMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SESSION_CONFIG = eINSTANCE.getWebApp_SessionConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SERVLET_MAPPINGS = eINSTANCE.getWebApp_ServletMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlets</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SERVLETS = eINSTANCE.getWebApp_Servlets();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__SECURITY_ROLES = eINSTANCE.getWebApp_SecurityRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Filters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__FILTERS = eINSTANCE.getWebApp_Filters();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__FILTER_MAPPINGS = eINSTANCE.getWebApp_FilterMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Listeners</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__LISTENERS = eINSTANCE.getWebApp_Listeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Context Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__CONTEXT_PARAMS = eINSTANCE.getWebApp_ContextParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Jsp Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__JSP_CONFIG = eINSTANCE.getWebApp_JspConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Destinations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__MESSAGE_DESTINATIONS = eINSTANCE.getWebApp_MessageDestinations();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Encoding Mapping List</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_APP__LOCAL_ENCODING_MAPPING_LIST = eINSTANCE.getWebApp_LocalEncodingMappingList();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ContextParamImpl <em>Context Param</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ContextParamImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getContextParam()
-		 * @generated
-		 */
-		EClass CONTEXT_PARAM = eINSTANCE.getContextParam();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTEXT_PARAM__PARAM_NAME = eINSTANCE.getContextParam_ParamName();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTEXT_PARAM__PARAM_VALUE = eINSTANCE.getContextParam_ParamValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTEXT_PARAM__DESCRIPTION = eINSTANCE.getContextParam_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTEXT_PARAM__WEB_APP = eINSTANCE.getContextParam_WebApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ServletImpl <em>Servlet</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ServletImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getServlet()
-		 * @generated
-		 */
-		EClass SERVLET = eINSTANCE.getServlet();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__SERVLET_NAME = eINSTANCE.getServlet_ServletName();
-
-		/**
-		 * The meta object literal for the '<em><b>Load On Startup</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET__LOAD_ON_STARTUP = eINSTANCE.getServlet_LoadOnStartup();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__WEB_APP = eINSTANCE.getServlet_WebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__WEB_TYPE = eINSTANCE.getServlet_WebType();
-
-		/**
-		 * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__PARAMS = eINSTANCE.getServlet_Params();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Role Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__SECURITY_ROLE_REFS = eINSTANCE.getServlet_SecurityRoleRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Run As</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__RUN_AS = eINSTANCE.getServlet_RunAs();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET__INIT_PARAMS = eINSTANCE.getServlet_InitParams();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ServletMappingImpl <em>Servlet Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ServletMappingImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getServletMapping()
-		 * @generated
-		 */
-		EClass SERVLET_MAPPING = eINSTANCE.getServletMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Pattern</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET_MAPPING__URL_PATTERN = eINSTANCE.getServletMapping_UrlPattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET_MAPPING__NAME = eINSTANCE.getServletMapping_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET_MAPPING__WEB_APP = eINSTANCE.getServletMapping_WebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVLET_MAPPING__SERVLET = eINSTANCE.getServletMapping_Servlet();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.SessionConfigImpl <em>Session Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.SessionConfigImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getSessionConfig()
-		 * @generated
-		 */
-		EClass SESSION_CONFIG = eINSTANCE.getSessionConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Session Timeout</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SESSION_CONFIG__SESSION_TIMEOUT = eINSTANCE.getSessionConfig_SessionTimeout();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SESSION_CONFIG__WEB_APP = eINSTANCE.getSessionConfig_WebApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.MimeMappingImpl <em>Mime Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.MimeMappingImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getMimeMapping()
-		 * @generated
-		 */
-		EClass MIME_MAPPING = eINSTANCE.getMimeMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Extension</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MIME_MAPPING__EXTENSION = eINSTANCE.getMimeMapping_Extension();
-
-		/**
-		 * The meta object literal for the '<em><b>Mime Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MIME_MAPPING__MIME_TYPE = eINSTANCE.getMimeMapping_MimeType();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MIME_MAPPING__WEB_APP = eINSTANCE.getMimeMapping_WebApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.WelcomeFileListImpl <em>Welcome File List</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WelcomeFileListImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getWelcomeFileList()
-		 * @generated
-		 */
-		EClass WELCOME_FILE_LIST = eINSTANCE.getWelcomeFileList();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WELCOME_FILE_LIST__WEB_APP = eINSTANCE.getWelcomeFileList_WebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>File</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WELCOME_FILE_LIST__FILE = eINSTANCE.getWelcomeFileList_File();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ErrorPageImpl <em>Error Page</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ErrorPageImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getErrorPage()
-		 * @generated
-		 */
-		EClass ERROR_PAGE = eINSTANCE.getErrorPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ERROR_PAGE__LOCATION = eINSTANCE.getErrorPage_Location();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ERROR_PAGE__WEB_APP = eINSTANCE.getErrorPage_WebApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.TagLibRefImpl <em>Tag Lib Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.TagLibRefImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getTagLibRef()
-		 * @generated
-		 */
-		EClass TAG_LIB_REF = eINSTANCE.getTagLibRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB_REF__TAGLIB_URI = eINSTANCE.getTagLibRef_TaglibURI();
-
-		/**
-		 * The meta object literal for the '<em><b>Taglib Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TAG_LIB_REF__TAGLIB_LOCATION = eINSTANCE.getTagLibRef_TaglibLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TAG_LIB_REF__WEB_APP = eINSTANCE.getTagLibRef_WebApp();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.SecurityConstraintImpl <em>Security Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.SecurityConstraintImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getSecurityConstraint()
-		 * @generated
-		 */
-		EClass SECURITY_CONSTRAINT = eINSTANCE.getSecurityConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECURITY_CONSTRAINT__DISPLAY_NAME = eINSTANCE.getSecurityConstraint_DisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__WEB_APP = eINSTANCE.getSecurityConstraint_WebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Resource Collections</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = eINSTANCE.getSecurityConstraint_WebResourceCollections();
-
-		/**
-		 * The meta object literal for the '<em><b>Auth Constraint</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__AUTH_CONSTRAINT = eINSTANCE.getSecurityConstraint_AuthConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>User Data Constraint</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = eINSTANCE.getSecurityConstraint_UserDataConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECURITY_CONSTRAINT__DISPLAY_NAMES = eINSTANCE.getSecurityConstraint_DisplayNames();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.WebResourceCollectionImpl <em>Web Resource Collection</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebResourceCollectionImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getWebResourceCollection()
-		 * @generated
-		 */
-		EClass WEB_RESOURCE_COLLECTION = eINSTANCE.getWebResourceCollection();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Resource Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = eINSTANCE.getWebResourceCollection_WebResourceName();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__DESCRIPTION = eINSTANCE.getWebResourceCollection_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Pattern</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__URL_PATTERN = eINSTANCE.getWebResourceCollection_UrlPattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Http Method</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_RESOURCE_COLLECTION__HTTP_METHOD = eINSTANCE.getWebResourceCollection_HttpMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Sec Constraint</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT = eINSTANCE.getWebResourceCollection_SecConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>UR Ls</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_RESOURCE_COLLECTION__UR_LS = eINSTANCE.getWebResourceCollection_URLs();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_RESOURCE_COLLECTION__DESCRIPTIONS = eINSTANCE.getWebResourceCollection_Descriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>HTT Ps</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_RESOURCE_COLLECTION__HTT_PS = eINSTANCE.getWebResourceCollection_HTTPs();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.AuthConstraintImpl <em>Auth Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.AuthConstraintImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getAuthConstraint()
-		 * @generated
-		 */
-		EClass AUTH_CONSTRAINT = eINSTANCE.getAuthConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTH_CONSTRAINT__DESCRIPTION = eINSTANCE.getAuthConstraint_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Roles</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AUTH_CONSTRAINT__ROLES = eINSTANCE.getAuthConstraint_Roles();
-
-		/**
-		 * The meta object literal for the '<em><b>Sec Constraint</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference AUTH_CONSTRAINT__SEC_CONSTRAINT = eINSTANCE.getAuthConstraint_SecConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference AUTH_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getAuthConstraint_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.UserDataConstraintImpl <em>User Data Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.UserDataConstraintImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getUserDataConstraint()
-		 * @generated
-		 */
-		EClass USER_DATA_CONSTRAINT = eINSTANCE.getUserDataConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER_DATA_CONSTRAINT__DESCRIPTION = eINSTANCE.getUserDataConstraint_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Transport Guarantee</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = eINSTANCE.getUserDataConstraint_TransportGuarantee();
-
-		/**
-		 * The meta object literal for the '<em><b>Sec Constraint</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USER_DATA_CONSTRAINT__SEC_CONSTRAINT = eINSTANCE.getUserDataConstraint_SecConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USER_DATA_CONSTRAINT__DESCRIPTIONS = eINSTANCE.getUserDataConstraint_Descriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LoginConfigImpl <em>Login Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.LoginConfigImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getLoginConfig()
-		 * @generated
-		 */
-		EClass LOGIN_CONFIG = eINSTANCE.getLoginConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Auth Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOGIN_CONFIG__AUTH_METHOD = eINSTANCE.getLoginConfig_AuthMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Realm Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOGIN_CONFIG__REALM_NAME = eINSTANCE.getLoginConfig_RealmName();
-
-		/**
-		 * The meta object literal for the '<em><b>Authorization Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOGIN_CONFIG__AUTHORIZATION_METHOD = eINSTANCE.getLoginConfig_AuthorizationMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Web App</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOGIN_CONFIG__WEB_APP = eINSTANCE.getLoginConfig_WebApp();
-
-		/**
-		 * The meta object literal for the '<em><b>Form Login Config</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOGIN_CONFIG__FORM_LOGIN_CONFIG = eINSTANCE.getLoginConfig_FormLoginConfig();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.FormLoginConfigImpl <em>Form Login Config</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.FormLoginConfigImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getFormLoginConfig()
-		 * @generated
-		 */
-		EClass FORM_LOGIN_CONFIG = eINSTANCE.getFormLoginConfig();
-
-		/**
-		 * The meta object literal for the '<em><b>Form Login Page</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = eINSTANCE.getFormLoginConfig_FormLoginPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Form Error Page</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = eINSTANCE.getFormLoginConfig_FormErrorPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Login Config</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FORM_LOGIN_CONFIG__LOGIN_CONFIG = eINSTANCE.getFormLoginConfig_LoginConfig();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.InitParamImpl <em>Init Param</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.InitParamImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getInitParam()
-		 * @generated
-		 */
-		EClass INIT_PARAM = eINSTANCE.getInitParam();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_PARAM__PARAM_NAME = eINSTANCE.getInitParam_ParamName();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_PARAM__PARAM_VALUE = eINSTANCE.getInitParam_ParamValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_PARAM__DESCRIPTION = eINSTANCE.getInitParam_Description();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.WebTypeImpl <em>Web Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebTypeImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getWebType()
-		 * @generated
-		 */
-		EClass WEB_TYPE = eINSTANCE.getWebType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ServletTypeImpl <em>Servlet Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ServletTypeImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getServletType()
-		 * @generated
-		 */
-		EClass SERVLET_TYPE = eINSTANCE.getServletType();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET_TYPE__CLASS_NAME = eINSTANCE.getServletType_ClassName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.JSPTypeImpl <em>JSP Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.JSPTypeImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getJSPType()
-		 * @generated
-		 */
-		EClass JSP_TYPE = eINSTANCE.getJSPType();
-
-		/**
-		 * The meta object literal for the '<em><b>Jsp File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JSP_TYPE__JSP_FILE = eINSTANCE.getJSPType_JspFile();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.URLPatternTypeImpl <em>URL Pattern Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.URLPatternTypeImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getURLPatternType()
-		 * @generated
-		 */
-		EClass URL_PATTERN_TYPE = eINSTANCE.getURLPatternType();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Pattern</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute URL_PATTERN_TYPE__URL_PATTERN = eINSTANCE.getURLPatternType_UrlPattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Res Collection</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference URL_PATTERN_TYPE__RES_COLLECTION = eINSTANCE.getURLPatternType_ResCollection();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.RoleNameTypeImpl <em>Role Name Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.RoleNameTypeImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getRoleNameType()
-		 * @generated
-		 */
-		EClass ROLE_NAME_TYPE = eINSTANCE.getRoleNameType();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_NAME_TYPE__ROLE_NAME = eINSTANCE.getRoleNameType_RoleName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.WelcomeFileImpl <em>Welcome File</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WelcomeFileImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getWelcomeFile()
-		 * @generated
-		 */
-		EClass WELCOME_FILE = eINSTANCE.getWelcomeFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Welcome File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WELCOME_FILE__WELCOME_FILE = eINSTANCE.getWelcomeFile_WelcomeFile();
-
-		/**
-		 * The meta object literal for the '<em><b>File List</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WELCOME_FILE__FILE_LIST = eINSTANCE.getWelcomeFile_FileList();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ExceptionTypeErrorPageImpl <em>Exception Type Error Page</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ExceptionTypeErrorPageImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getExceptionTypeErrorPage()
-		 * @generated
-		 */
-		EClass EXCEPTION_TYPE_ERROR_PAGE = eINSTANCE.getExceptionTypeErrorPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Exception Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE = eINSTANCE.getExceptionTypeErrorPage_ExceptionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.ErrorCodeErrorPageImpl <em>Error Code Error Page</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.ErrorCodeErrorPageImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getErrorCodeErrorPage()
-		 * @generated
-		 */
-		EClass ERROR_CODE_ERROR_PAGE = eINSTANCE.getErrorCodeErrorPage();
-
-		/**
-		 * The meta object literal for the '<em><b>Error Code</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ERROR_CODE_ERROR_PAGE__ERROR_CODE = eINSTANCE.getErrorCodeErrorPage_ErrorCode();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.FilterMappingImpl <em>Filter Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.FilterMappingImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getFilterMapping()
-		 * @generated
-		 */
-		EClass FILTER_MAPPING = eINSTANCE.getFilterMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Url Pattern</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__URL_PATTERN = eINSTANCE.getFilterMapping_UrlPattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Dispatcher Type</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER_MAPPING__DISPATCHER_TYPE = eINSTANCE.getFilterMapping_DispatcherType();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER_MAPPING__FILTER = eINSTANCE.getFilterMapping_Filter();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER_MAPPING__SERVLET = eINSTANCE.getFilterMapping_Servlet();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.FilterImpl <em>Filter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.FilterImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getFilter()
-		 * @generated
-		 */
-		EClass FILTER = eINSTANCE.getFilter();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FILTER__NAME = eINSTANCE.getFilter_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__INIT_PARAMS = eINSTANCE.getFilter_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__FILTER_CLASS = eINSTANCE.getFilter_FilterClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Param Values</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FILTER__INIT_PARAM_VALUES = eINSTANCE.getFilter_InitParamValues();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingListImpl <em>Local Encoding Mapping List</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingListImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getLocalEncodingMappingList()
-		 * @generated
-		 */
-		EClass LOCAL_ENCODING_MAPPING_LIST = eINSTANCE.getLocalEncodingMappingList();
-
-		/**
-		 * The meta object literal for the '<em><b>Local Encoding Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingImpl <em>Local Encoding Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getLocalEncodingMapping()
-		 * @generated
-		 */
-		EClass LOCAL_ENCODING_MAPPING = eINSTANCE.getLocalEncodingMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Locale</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOCAL_ENCODING_MAPPING__LOCALE = eINSTANCE.getLocalEncodingMapping_Locale();
-
-		/**
-		 * The meta object literal for the '<em><b>Encoding</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LOCAL_ENCODING_MAPPING__ENCODING = eINSTANCE.getLocalEncodingMapping_Encoding();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.internal.impl.HTTPMethodTypeImpl <em>HTTP Method Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.HTTPMethodTypeImpl
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getHTTPMethodType()
-		 * @generated
-		 */
-		EClass HTTP_METHOD_TYPE = eINSTANCE.getHTTPMethodType();
-
-		/**
-		 * The meta object literal for the '<em><b>Http Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HTTP_METHOD_TYPE__HTTP_METHOD = eINSTANCE.getHTTPMethodType_HttpMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.ResAuthServletType <em>Res Auth Servlet Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.ResAuthServletType
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getResAuthServletType()
-		 * @generated
-		 */
-		EEnum RES_AUTH_SERVLET_TYPE = eINSTANCE.getResAuthServletType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum <em>HTTP Method Type Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getHTTPMethodTypeEnum()
-		 * @generated
-		 */
-		EEnum HTTP_METHOD_TYPE_ENUM = eINSTANCE.getHTTPMethodTypeEnum();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType <em>Transport Guarantee Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getTransportGuaranteeType()
-		 * @generated
-		 */
-		EEnum TRANSPORT_GUARANTEE_TYPE = eINSTANCE.getTransportGuaranteeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.DispatcherType <em>Dispatcher Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.DispatcherType
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getDispatcherType()
-		 * @generated
-		 */
-		EEnum DISPATCHER_TYPE = eINSTANCE.getDispatcherType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webapplication.AuthMethodKind <em>Auth Method Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webapplication.AuthMethodKind
-		 * @see org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl#getAuthMethodKind()
-		 * @generated
-		 */
-		EEnum AUTH_METHOD_KIND = eINSTANCE.getAuthMethodKind();
-
-	}
-
-} //WebapplicationPackage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFile.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFile.java
deleted file mode 100644
index 5ddf48c9e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFile.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The welcome-file element contains file name to use as a default welcome file, such as index.html
- * @since 1.0
- * @generated
- */
-public interface WelcomeFile extends J2EEEObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the WelcomeFile attribute
-	 */
-	String getWelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WelcomeFile attribute
-	 */
-	void setWelcomeFile(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FileList reference
-	 */
-	WelcomeFileList getFileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the FileList reference
-	 */
-	void setFileList(WelcomeFileList value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFileList.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFileList.java
deleted file mode 100644
index 326eda575..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFileList.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-/**
- * The welcome-file-list contains an ordered list of welcome files elements.
- * @generated
- * @since 1.0
- */
-public interface WelcomeFileList extends J2EEEObject {
-
-	/**
-	 * Adds the file whose name is specified in the parameter
-	 * @param name the name of the file to be added
-	 */
-	public void addFileNamed(String name);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of File references
-	 */
-	EList getFile();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/AuthConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/AuthConstraintImpl.java
deleted file mode 100644
index 3e2461854..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/AuthConstraintImpl.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * The auth-constraint element indicates the user roles that should be permitted access to this resource collection. The role used here must appear in a security-role-ref element.
- * @generated
- */
-public class AuthConstraintImpl extends J2EEEObjectImpl implements AuthConstraint {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList roles = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public AuthConstraintImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.AUTH_CONSTRAINT;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A description of the auth constraint.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A list of role names for the auth constraint.  Each element specifies the name
-	 * of a security role (a String).
-
-	 */
-	public EList getRoles() {
-		if (roles == null) {
-			roles = new EDataTypeUniqueEList(String.class, this, WebapplicationPackage.AUTH_CONSTRAINT__ROLES);
-		}
-		return roles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SecurityConstraint getSecConstraint() {
-		if (eContainerFeatureID != WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT) return null;
-		return (SecurityConstraint)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecConstraint(SecurityConstraint newSecConstraint, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newSecConstraint, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecConstraint(SecurityConstraint newSecConstraint) {
-		if (newSecConstraint != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT && newSecConstraint != null)) {
-			if (EcoreUtil.isAncestor(this, newSecConstraint))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSecConstraint != null)
-				msgs = ((InternalEObject)newSecConstraint).eInverseAdd(this, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, SecurityConstraint.class, msgs);
-			msgs = basicSetSecConstraint(newSecConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, newSecConstraint, newSecConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetSecConstraint((SecurityConstraint)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				return basicSetSecConstraint(null, msgs);
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, SecurityConstraint.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				return getRoles();
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint();
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				getRoles().clear();
-				getRoles().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)newValue);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				getRoles().clear();
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)null);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				return roles != null && !roles.isEmpty();
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint() != null;
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", roles: ");
-		result.append(roles);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ContextParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ContextParamImpl.java
deleted file mode 100644
index 10e742bf5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ContextParamImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The context-param element contains the declaration of a web application's servlet context initialization parameters.
- * @generated
- */
-public class ContextParamImpl extends J2EEEObjectImpl implements ContextParam {
-
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramName = PARAM_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramValue = PARAM_VALUE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	public ContextParamImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.CONTEXT_PARAM;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The param-name element contains the name of a parameter.
-	 */
-	public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The param-value element contains the value of a parameter.
-	 */
-	public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.CONTEXT_PARAM__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.CONTEXT_PARAM__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.CONTEXT_PARAM__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__CONTEXTS, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__CONTEXTS, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				return getParamName();
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				return getParamValue();
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				return getWebApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				return getWebApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (paramName: ");
-		result.append(paramName);
-		result.append(", paramValue: ");
-		result.append(paramValue);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ErrorCodeErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ErrorCodeErrorPageImpl.java
deleted file mode 100644
index f81b6347a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ErrorCodeErrorPageImpl.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * @generated
- */
-public class ErrorCodeErrorPageImpl extends ErrorPageImpl implements ErrorCodeErrorPage {
-
-	/**
-	 * The default value of the '{@link #getErrorCode() <em>Error Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getErrorCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ERROR_CODE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String errorCode = ERROR_CODE_EDEFAULT;
-	public ErrorCodeErrorPageImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.ERROR_CODE_ERROR_PAGE;
-	}
-
-/**
- * isErrorCode method comment.
- */
-public boolean isErrorCode() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The error-code contains an HTTP error code, ex: 404
-
-	 */
-	public String getErrorCode() {
-		return errorCode;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setErrorCode(String newErrorCode) {
-		String oldErrorCode = errorCode;
-		errorCode = newErrorCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE, oldErrorCode, errorCode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				return getErrorCode();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				setErrorCode((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				setErrorCode(ERROR_CODE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				return ERROR_CODE_EDEFAULT == null ? errorCode != null : !ERROR_CODE_EDEFAULT.equals(errorCode);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (errorCode: ");
-		result.append(errorCode);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ErrorPageImpl.java
deleted file mode 100644
index d75e6edb9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ErrorPageImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application
- * @generated
- */
-public class ErrorPageImpl extends J2EEEObjectImpl implements ErrorPage {
-
-	/**
-	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String location = LOCATION_EDEFAULT;
-	public ErrorPageImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.ERROR_PAGE;
-	}
-
-/**
- * isErrorCode method comment.
- */
-public boolean isErrorCode() {
-	return false;
-}
-/**
- * isExceptionType method comment.
- */
-public boolean isExceptionType() {
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The location element contains the location of the resource in the web
-	 * application
-	 */
-	public String getLocation() {
-		return location;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLocation(String newLocation) {
-		String oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ERROR_PAGE__LOCATION, oldLocation, location));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.ERROR_PAGE__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.ERROR_PAGE__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.ERROR_PAGE__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ERROR_PAGE__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				return getLocation();
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				return getWebApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				return getWebApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (location: ");
-		result.append(location);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ExceptionTypeErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ExceptionTypeErrorPageImpl.java
deleted file mode 100644
index 8471bb0bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ExceptionTypeErrorPageImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * @generated
- */
-public class ExceptionTypeErrorPageImpl extends ErrorPageImpl implements ExceptionTypeErrorPage {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass exceptionType = null;
-	public ExceptionTypeErrorPageImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.EXCEPTION_TYPE_ERROR_PAGE;
-	}
-
-/**
- * Helper method to set the ExceptionType to a JavaClass having a fully qualified
- * name specified by the parameter
- */
-public String getExceptionTypeName() {
-	getExceptionType();
-	return exceptionType == null ? null : exceptionType.getQualifiedName();
-}/**
- * Helper method to set the ExceptionType to a JavaClass having a fully qualified
- * name specified by the parameter
- */ 
-public boolean isExceptionType() {
-	return true;
-}
-public void setExceptionTypeName(String exceptionTypeName) {
-	setExceptionType(JavaRefFactory.eINSTANCE.createClassRef(exceptionTypeName));
-}
-/**
- * @deprecated Use @link{#setExceptionTypeName(String)}
- */
-public void setExceptionTypeName(String exceptionTypeName, ResourceSet context) {
-	setExceptionTypeName(exceptionTypeName);
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The exception type contains a fully qualified class name of a Java exception type.
-	 */
-	public JavaClass getExceptionType() {
-		if (exceptionType != null && exceptionType.eIsProxy()) {
-			InternalEObject oldExceptionType = (InternalEObject)exceptionType;
-			exceptionType = (JavaClass)eResolveProxy(oldExceptionType);
-			if (exceptionType != oldExceptionType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-			}
-		}
-		return exceptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetExceptionType() {
-		return exceptionType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExceptionType(JavaClass newExceptionType) {
-		JavaClass oldExceptionType = exceptionType;
-		exceptionType = newExceptionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				if (resolve) return getExceptionType();
-				return basicGetExceptionType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				setExceptionType((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				setExceptionType((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				return exceptionType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FilterImpl.java
deleted file mode 100644
index d0de3a7bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FilterImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.
-
- */
-public class FilterImpl extends CompatibilityDescriptionGroupImpl implements Filter {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList initParams = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass filterClass = null;
-	/**
-	 * The cached value of the '{@link #getInitParamValues() <em>Init Param Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParamValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParamValues = null;
-
-		/**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	protected FilterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.FILTER;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The logical name of the filter. This name is used to map the filter.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getInitParams() is used for J2EE1.3
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(InitParam.class, this, WebapplicationPackage.FILTER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The fully qualified classname of the filter.
-	 */
-	public JavaClass getFilterClass() {
-		if (filterClass != null && filterClass.eIsProxy()) {
-			InternalEObject oldFilterClass = (InternalEObject)filterClass;
-			filterClass = (JavaClass)eResolveProxy(oldFilterClass);
-			if (filterClass != oldFilterClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.FILTER__FILTER_CLASS, oldFilterClass, filterClass));
-			}
-		}
-		return filterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetFilterClass() {
-		return filterClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFilterClass(JavaClass newFilterClass) {
-		JavaClass oldFilterClass = filterClass;
-		filterClass = newFilterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER__FILTER_CLASS, oldFilterClass, filterClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getInitParamValues() is used for J2EE1.4
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParamValues() {
-		if (initParamValues == null) {
-			initParamValues = new EObjectContainmentEList(ParamValue.class, this, WebapplicationPackage.FILTER__INIT_PARAM_VALUES);
-		}
-		return initParamValues;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				return ((InternalEList)getInitParamValues()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER__NAME:
-				return getName();
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				return getInitParams();
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				if (resolve) return getFilterClass();
-				return basicGetFilterClass();
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				return getInitParamValues();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER__NAME:
-				setName((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				setFilterClass((JavaClass)newValue);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				getInitParamValues().clear();
-				getInitParamValues().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				setFilterClass((JavaClass)null);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				getInitParamValues().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				return filterClass != null;
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				return initParamValues != null && !initParamValues.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-
-
-public String getFilterClassName() {
-	getFilterClass();
-	return (filterClass == null) ? null : filterClass.getQualifiedName();
-}
-public void setFilterClassName(String filterClassName) {
-	eSet(WebapplicationPackage.eINSTANCE.getFilter_FilterClass(), createClassRef(filterClassName));
-}
-} //FilterImpl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FilterMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FilterMappingImpl.java
deleted file mode 100644
index 94455bbd1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FilterMappingImpl.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the <filtername> sub-elements of one of the <filter> declarations in the deployment descriptor.
- * 
- * @invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.
- * @generated
- */
-public class FilterMappingImpl extends J2EEEObjectImpl implements FilterMapping {
-
-	/**
-	 * The default value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_PATTERN_EDEFAULT = null;
-
-	protected transient String servletName;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String urlPattern = URL_PATTERN_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDispatcherType() <em>Dispatcher Type</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDispatcherType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList dispatcherType = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Filter filter = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Servlet servlet = null;
-	public FilterMappingImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.FILTER_MAPPING;
-	}
-
-/**
- * Returns the name of the servlet that this mapping applies to.
- */
-	public Servlet getServlet(){
-	Servlet lservlet = this.getServletGen();
-	if (lservlet == null && servletName != null){
-		WebApp webapp = (WebApp)eContainer();
-		if (webapp != null){
-			lservlet=webapp.getServletNamed(servletName);
-			if (lservlet != null) 
-				setServlet(lservlet);
-		}
-	}
-	return lservlet;
-}
-/**
- * Returns the name of the servlet that this mapping applies to.
- */
-public String getServletName(){
-	String ret = null;
-	if (servletName != null)
-		ret =  servletName;
-
-	Servlet lservlet = getServlet();
-	if (lservlet != null)
-		ret = lservlet.getServletName();
-	return ret;
-}
-/**
- * Sets the name of the servlet that this mapping applies to.
- */
-public void setServletName(String servletName){
-	this.servletName = servletName;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	public String getUrlPattern() {
-		return urlPattern;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUrlPattern(String newUrlPattern) {
-		String oldUrlPattern = urlPattern;
-		urlPattern = newUrlPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER_MAPPING__URL_PATTERN, oldUrlPattern, urlPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDispatcherType() {
-		if (dispatcherType == null) {
-			dispatcherType = new EDataTypeUniqueEList(DispatcherType.class, this, WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE);
-		}
-		return dispatcherType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The filter being mapped
-	 */
-	public Filter getFilter() {
-		if (filter != null && filter.eIsProxy()) {
-			InternalEObject oldFilter = (InternalEObject)filter;
-			filter = (Filter)eResolveProxy(oldFilter);
-			if (filter != oldFilter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.FILTER_MAPPING__FILTER, oldFilter, filter));
-			}
-		}
-		return filter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Filter basicGetFilter() {
-		return filter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFilter(Filter newFilter) {
-		Filter oldFilter = filter;
-		filter = newFilter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER_MAPPING__FILTER, oldFilter, filter));
-	}
-
-	public void setServlet(Servlet l) {
-		servletName = null;
-		setServletGen(l);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setServletGen(Servlet newServlet) {
-		Servlet oldServlet = servlet;
-		servlet = newServlet;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER_MAPPING__SERVLET, oldServlet, servlet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				return getDispatcherType();
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				if (resolve) return getFilter();
-				return basicGetFilter();
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				if (resolve) return getServlet();
-				return basicGetServlet();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				getDispatcherType().clear();
-				getDispatcherType().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				setFilter((Filter)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				setServlet((Servlet)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				setUrlPattern(URL_PATTERN_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				getDispatcherType().clear();
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				setFilter((Filter)null);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				setServlet((Servlet)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				return URL_PATTERN_EDEFAULT == null ? urlPattern != null : !URL_PATTERN_EDEFAULT.equals(urlPattern);
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				return dispatcherType != null && !dispatcherType.isEmpty();
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				return filter != null;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				return servlet != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * (Removed Generated flag to preserve override This field/method will NOT be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				getDispatcherType().clear();
-				getDispatcherType().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				setFilter((Filter)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				if(newValue instanceof String)
-	                setServletName((String)newValue);
-	            else
-	                setServlet((Servlet)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (urlPattern: ");
-		result.append(urlPattern);
-		result.append(", dispatcherType: ");
-		result.append(dispatcherType);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * An optional servlet that is mapped by a filter mapping.  servletName is used to resolve the servlet reference.
-	 */
-	public Servlet getServletGen() {
-		if (servlet != null && servlet.eIsProxy()) {
-			InternalEObject oldServlet = (InternalEObject)servlet;
-			servlet = (Servlet)eResolveProxy(oldServlet);
-			if (servlet != oldServlet) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.FILTER_MAPPING__SERVLET, oldServlet, servlet));
-			}
-		}
-		return servlet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Servlet basicGetServlet() {
-		return servlet;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FormLoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FormLoginConfigImpl.java
deleted file mode 100644
index 096fa594d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/FormLoginConfigImpl.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The form-login-config element specifies the login and error pages that should be used in form based login. If form based authentication is not used, these elements are ignored.
- * @generated
- */
-public class FormLoginConfigImpl extends J2EEEObjectImpl implements FormLoginConfig {
-
-	/**
-	 * The default value of the '{@link #getFormLoginPage() <em>Form Login Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormLoginPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORM_LOGIN_PAGE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String formLoginPage = FORM_LOGIN_PAGE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getFormErrorPage() <em>Form Error Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormErrorPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORM_ERROR_PAGE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String formErrorPage = FORM_ERROR_PAGE_EDEFAULT;
-	public FormLoginConfigImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.FORM_LOGIN_CONFIG;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The form-login-page element defines the location in the web app where the page
-	 * that can be used for login can be found
-	 */
-	public String getFormLoginPage() {
-		return formLoginPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFormLoginPage(String newFormLoginPage) {
-		String oldFormLoginPage = formLoginPage;
-		formLoginPage = newFormLoginPage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE, oldFormLoginPage, formLoginPage));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The form-error-page element defines the location in the web app where the error 
-	 * page that is displayed when login is not successful can be found
-	 */
-	public String getFormErrorPage() {
-		return formErrorPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFormErrorPage(String newFormErrorPage) {
-		String oldFormErrorPage = formErrorPage;
-		formErrorPage = newFormErrorPage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE, oldFormErrorPage, formErrorPage));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public LoginConfig getLoginConfig() {
-		if (eContainerFeatureID != WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG) return null;
-		return (LoginConfig)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLoginConfig(LoginConfig newLoginConfig, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newLoginConfig, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLoginConfig(LoginConfig newLoginConfig) {
-		if (newLoginConfig != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG && newLoginConfig != null)) {
-			if (EcoreUtil.isAncestor(this, newLoginConfig))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newLoginConfig != null)
-				msgs = ((InternalEObject)newLoginConfig).eInverseAdd(this, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, LoginConfig.class, msgs);
-			msgs = basicSetLoginConfig(newLoginConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, newLoginConfig, newLoginConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetLoginConfig((LoginConfig)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				return basicSetLoginConfig(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, LoginConfig.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				return getFormLoginPage();
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				return getFormErrorPage();
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				return getLoginConfig();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				setFormLoginPage((String)newValue);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				setFormErrorPage((String)newValue);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				setFormLoginPage(FORM_LOGIN_PAGE_EDEFAULT);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				setFormErrorPage(FORM_ERROR_PAGE_EDEFAULT);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				return FORM_LOGIN_PAGE_EDEFAULT == null ? formLoginPage != null : !FORM_LOGIN_PAGE_EDEFAULT.equals(formLoginPage);
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				return FORM_ERROR_PAGE_EDEFAULT == null ? formErrorPage != null : !FORM_ERROR_PAGE_EDEFAULT.equals(formErrorPage);
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				return getLoginConfig() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (formLoginPage: ");
-		result.append(formLoginPage);
-		result.append(", formErrorPage: ");
-		result.append(formErrorPage);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/HTTPMethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/HTTPMethodTypeImpl.java
deleted file mode 100644
index 2d285b54b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/HTTPMethodTypeImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>HTTP Method Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.internal.impl.HTTPMethodTypeImpl#getHttpMethod <em>Http Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPMethodTypeImpl extends J2EEEObjectImpl implements HTTPMethodType {
-	/**
-	 * The default value of the '{@link #getHttpMethod() <em>Http Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HTTP_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHttpMethod() <em>Http Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String httpMethod = HTTP_METHOD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPMethodTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.HTTP_METHOD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHttpMethod() {
-		return httpMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHttpMethod(String newHttpMethod) {
-		String oldHttpMethod = httpMethod;
-		httpMethod = newHttpMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD, oldHttpMethod, httpMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				return getHttpMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				setHttpMethod((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				setHttpMethod(HTTP_METHOD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				return HTTP_METHOD_EDEFAULT == null ? httpMethod != null : !HTTP_METHOD_EDEFAULT.equals(httpMethod);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (httpMethod: ");
-		result.append(httpMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-} //HTTPMethodTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/InitParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/InitParamImpl.java
deleted file mode 100644
index e5ae8aa80..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/InitParamImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The init-param element contains a name//value pair as an initialization param of the servlet
- * @generated
- */
-public class InitParamImpl extends J2EEEObjectImpl implements InitParam {
-
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramName = PARAM_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramValue = PARAM_VALUE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	public InitParamImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.INIT_PARAM;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * 
-	 * 
-
-	 */
-	public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.INIT_PARAM__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.INIT_PARAM__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.INIT_PARAM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				return getParamName();
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				return getParamValue();
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				return getDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (paramName: ");
-		result.append(paramName);
-		result.append(", paramValue: ");
-		result.append(paramValue);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/JSPTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/JSPTypeImpl.java
deleted file mode 100644
index cd6f0cadb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/JSPTypeImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * @generated
- */
-public class JSPTypeImpl extends WebTypeImpl implements JSPType {
-
-	/**
-	 * The default value of the '{@link #getJspFile() <em>Jsp File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JSP_FILE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String jspFile = JSP_FILE_EDEFAULT;
-	public JSPTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.JSP_TYPE;
-	}
-
-public boolean isJspType() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The jsp-file element contains the full path to a JSP file within the web
-	 * application.
-
-	 */
-	public String getJspFile() {
-		return jspFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setJspFile(String newJspFile) {
-		String oldJspFile = jspFile;
-		jspFile = newJspFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.JSP_TYPE__JSP_FILE, oldJspFile, jspFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				return getJspFile();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				setJspFile((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				setJspFile(JSP_FILE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				return JSP_FILE_EDEFAULT == null ? jspFile != null : !JSP_FILE_EDEFAULT.equals(jspFile);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (jspFile: ");
-		result.append(jspFile);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LocalEncodingMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LocalEncodingMappingImpl.java
deleted file mode 100644
index da605e798..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LocalEncodingMappingImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Local Encoding Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingImpl#getLocale <em>Locale</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingImpl#getEncoding <em>Encoding</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocalEncodingMappingImpl extends J2EEEObjectImpl implements LocalEncodingMapping {
-	/**
-	 * The default value of the '{@link #getLocale() <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocale()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCALE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocale() <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocale()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locale = LOCALE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENCODING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String encoding = ENCODING_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocalEncodingMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.LOCAL_ENCODING_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocale() {
-		return locale;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocale(String newLocale) {
-		String oldLocale = locale;
-		locale = newLocale;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE, oldLocale, locale));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEncoding() {
-		return encoding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEncoding(String newEncoding) {
-		String oldEncoding = encoding;
-		encoding = newEncoding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING, oldEncoding, encoding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				return getLocale();
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				return getEncoding();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				setLocale((String)newValue);
-				return;
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				setEncoding((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				setLocale(LOCALE_EDEFAULT);
-				return;
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				setEncoding(ENCODING_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				return LOCALE_EDEFAULT == null ? locale != null : !LOCALE_EDEFAULT.equals(locale);
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				return ENCODING_EDEFAULT == null ? encoding != null : !ENCODING_EDEFAULT.equals(encoding);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (locale: ");
-		result.append(locale);
-		result.append(", encoding: ");
-		result.append(encoding);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LocalEncodingMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LocalEncodingMappingListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LocalEncodingMappingListImpl.java
deleted file mode 100644
index f2a2f0e44..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LocalEncodingMappingListImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Local Encoding Mapping List</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webapplication.internal.impl.LocalEncodingMappingListImpl#getLocalEncodingMappings <em>Local Encoding Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocalEncodingMappingListImpl extends J2EEEObjectImpl implements LocalEncodingMappingList {
-	/**
-	 * The cached value of the '{@link #getLocalEncodingMappings() <em>Local Encoding Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalEncodingMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList localEncodingMappings = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocalEncodingMappingListImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.LOCAL_ENCODING_MAPPING_LIST;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getLocalEncodingMappings() {
-		if (localEncodingMappings == null) {
-			localEncodingMappings = new EObjectContainmentEList(LocalEncodingMapping.class, this, WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
-		}
-		return localEncodingMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return ((InternalEList)getLocalEncodingMappings()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return getLocalEncodingMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				getLocalEncodingMappings().clear();
-				getLocalEncodingMappings().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				getLocalEncodingMappings().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return localEncodingMappings != null && !localEncodingMappings.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LocalEncodingMappingListImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LoginConfigImpl.java
deleted file mode 100644
index 8d96a8e69..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/LoginConfigImpl.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.AuthMethodKind;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login
- * mechanism.
- * @generated
- */
-public class LoginConfigImpl extends J2EEEObjectImpl implements LoginConfig {
-
-	/**
-	 * The default value of the '{@link #getAuthMethod() <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AuthMethodKind AUTH_METHOD_EDEFAULT = AuthMethodKind.UNSPECIFIED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AuthMethodKind authMethod = AUTH_METHOD_EDEFAULT;
-	/**
-	 * This is true if the Auth Method attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean authMethodESet = false;
-
-	/**
-	 * The default value of the '{@link #getRealmName() <em>Realm Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRealmName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REALM_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String realmName = REALM_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuthorizationMethod() <em>Authorization Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthorizationMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHORIZATION_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthorizationMethod() <em>Authorization Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthorizationMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authorizationMethod = AUTHORIZATION_METHOD_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected FormLoginConfig formLoginConfig = null;
-	public LoginConfigImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.LOGIN_CONFIG;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The auth-method element is used to configure the authentication mechanism for
-	 * the web application. As a prerequisite to gaining access to any web resources
-	 * which are protected by an authorization constraint, a user must have
-	 * authenticated using the configured mechanism. Legal values for this element are 
-	 * "BASIC", "DIGEST", "FORM", or "CLIENT-CERT".
-	 */
-	public AuthMethodKind getAuthMethod() {
-		return authMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthMethod(AuthMethodKind newAuthMethod) {
-		AuthMethodKind oldAuthMethod = authMethod;
-		authMethod = newAuthMethod == null ? AUTH_METHOD_EDEFAULT : newAuthMethod;
-		boolean oldAuthMethodESet = authMethodESet;
-		authMethodESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD, oldAuthMethod, authMethod, !oldAuthMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAuthMethod() {
-		AuthMethodKind oldAuthMethod = authMethod;
-		boolean oldAuthMethodESet = authMethodESet;
-		authMethod = AUTH_METHOD_EDEFAULT;
-		authMethodESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD, oldAuthMethod, AUTH_METHOD_EDEFAULT, oldAuthMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAuthMethod() {
-		return authMethodESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The realm name element specifies the realm name to use in HTTP Basic
-	 * authorization
-	 */
-	public String getRealmName() {
-		return realmName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRealmName(String newRealmName) {
-		String oldRealmName = realmName;
-		realmName = newRealmName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__REALM_NAME, oldRealmName, realmName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthorizationMethod() {
-		return authorizationMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthorizationMethod(String newAuthorizationMethod) {
-		String oldAuthorizationMethod = authorizationMethod;
-		authorizationMethod = newAuthorizationMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD, oldAuthorizationMethod, authorizationMethod));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.LOGIN_CONFIG__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.LOGIN_CONFIG__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public FormLoginConfig getFormLoginConfig() {
-		return formLoginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFormLoginConfig(FormLoginConfig newFormLoginConfig, NotificationChain msgs) {
-		FormLoginConfig oldFormLoginConfig = formLoginConfig;
-		formLoginConfig = newFormLoginConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, oldFormLoginConfig, newFormLoginConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFormLoginConfig(FormLoginConfig newFormLoginConfig) {
-		if (newFormLoginConfig != formLoginConfig) {
-			NotificationChain msgs = null;
-			if (formLoginConfig != null)
-				msgs = ((InternalEObject)formLoginConfig).eInverseRemove(this, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, FormLoginConfig.class, msgs);
-			if (newFormLoginConfig != null)
-				msgs = ((InternalEObject)newFormLoginConfig).eInverseAdd(this, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, FormLoginConfig.class, msgs);
-			msgs = basicSetFormLoginConfig(newFormLoginConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, newFormLoginConfig, newFormLoginConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				if (formLoginConfig != null)
-					msgs = ((InternalEObject)formLoginConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, null, msgs);
-				return basicSetFormLoginConfig((FormLoginConfig)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				return basicSetWebApp(null, msgs);
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return basicSetFormLoginConfig(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				return getAuthMethod();
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				return getRealmName();
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				return getAuthorizationMethod();
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return getFormLoginConfig();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				setAuthMethod((AuthMethodKind)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				setRealmName((String)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				setAuthorizationMethod((String)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				setFormLoginConfig((FormLoginConfig)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				unsetAuthMethod();
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				setRealmName(REALM_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				setAuthorizationMethod(AUTHORIZATION_METHOD_EDEFAULT);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				setFormLoginConfig((FormLoginConfig)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				return isSetAuthMethod();
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				return REALM_NAME_EDEFAULT == null ? realmName != null : !REALM_NAME_EDEFAULT.equals(realmName);
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				return AUTHORIZATION_METHOD_EDEFAULT == null ? authorizationMethod != null : !AUTHORIZATION_METHOD_EDEFAULT.equals(authorizationMethod);
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return formLoginConfig != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (authMethod: ");
-		if (authMethodESet) result.append(authMethod); else result.append("<unset>");
-		result.append(", realmName: ");
-		result.append(realmName);
-		result.append(", authorizationMethod: ");
-		result.append(authorizationMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/MimeMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/MimeMappingImpl.java
deleted file mode 100644
index fe6c22036..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/MimeMappingImpl.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The mime-mapping element defines a mapping between an extension and a mime type.
- * @generated
- */
-public class MimeMappingImpl extends J2EEEObjectImpl implements MimeMapping {
-
-	/**
-	 * The default value of the '{@link #getExtension() <em>Extension</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtension()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTENSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String extension = EXTENSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getMimeType() <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMimeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MIME_TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String mimeType = MIME_TYPE_EDEFAULT;
-	public MimeMappingImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.MIME_MAPPING;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The extension element contains a string describing an extension. example: "txt"
-	 */
-	public String getExtension() {
-		return extension;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExtension(String newExtension) {
-		String oldExtension = extension;
-		extension = newExtension;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.MIME_MAPPING__EXTENSION, oldExtension, extension));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The mime-type element contains a defined mime type. example: "text//plain"
-	 */
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setMimeType(String newMimeType) {
-		String oldMimeType = mimeType;
-		mimeType = newMimeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.MIME_MAPPING__MIME_TYPE, oldMimeType, mimeType));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.MIME_MAPPING__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.MIME_MAPPING__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.MIME_MAPPING__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__MIME_MAPPINGS, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.MIME_MAPPING__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__MIME_MAPPINGS, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				return getExtension();
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				return getMimeType();
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				return getWebApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				setExtension((String)newValue);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				setMimeType((String)newValue);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				setExtension(EXTENSION_EDEFAULT);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				setMimeType(MIME_TYPE_EDEFAULT);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				return EXTENSION_EDEFAULT == null ? extension != null : !EXTENSION_EDEFAULT.equals(extension);
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				return MIME_TYPE_EDEFAULT == null ? mimeType != null : !MIME_TYPE_EDEFAULT.equals(mimeType);
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				return getWebApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (extension: ");
-		result.append(extension);
-		result.append(", mimeType: ");
-		result.append(mimeType);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/RoleNameTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/RoleNameTypeImpl.java
deleted file mode 100644
index cc5fcd4c2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/RoleNameTypeImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * @generated
- */
-public class RoleNameTypeImpl extends J2EEEObjectImpl implements RoleNameType {
-
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	public RoleNameTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.ROLE_NAME_TYPE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				return getRoleName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (roleName: ");
-		result.append(roleName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/SecurityConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/SecurityConstraintImpl.java
deleted file mode 100644
index 468099288..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/SecurityConstraintImpl.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * The security-constraint element is used to associate security constraints with one or more web resource collections
- * @generated
- */
-public class SecurityConstraintImpl extends J2EEEObjectImpl implements SecurityConstraint {
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList webResourceCollections = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AuthConstraint authConstraint = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected UserDataConstraint userDataConstraint = null;
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	public SecurityConstraintImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.SECURITY_CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__CONSTRAINTS, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getWebResourceCollections() {
-		if (webResourceCollections == null) {
-			webResourceCollections = new EObjectContainmentWithInverseEList(WebResourceCollection.class, this, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT);
-		}
-		return webResourceCollections;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AuthConstraint getAuthConstraint() {
-		return authConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAuthConstraint(AuthConstraint newAuthConstraint, NotificationChain msgs) {
-		AuthConstraint oldAuthConstraint = authConstraint;
-		authConstraint = newAuthConstraint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, oldAuthConstraint, newAuthConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAuthConstraint(AuthConstraint newAuthConstraint) {
-		if (newAuthConstraint != authConstraint) {
-			NotificationChain msgs = null;
-			if (authConstraint != null)
-				msgs = ((InternalEObject)authConstraint).eInverseRemove(this, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, AuthConstraint.class, msgs);
-			if (newAuthConstraint != null)
-				msgs = ((InternalEObject)newAuthConstraint).eInverseAdd(this, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, AuthConstraint.class, msgs);
-			msgs = basicSetAuthConstraint(newAuthConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, newAuthConstraint, newAuthConstraint));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public UserDataConstraint getUserDataConstraint() {
-		return userDataConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUserDataConstraint(UserDataConstraint newUserDataConstraint, NotificationChain msgs) {
-		UserDataConstraint oldUserDataConstraint = userDataConstraint;
-		userDataConstraint = newUserDataConstraint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, oldUserDataConstraint, newUserDataConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUserDataConstraint(UserDataConstraint newUserDataConstraint) {
-		if (newUserDataConstraint != userDataConstraint) {
-			NotificationChain msgs = null;
-			if (userDataConstraint != null)
-				msgs = ((InternalEObject)userDataConstraint).eInverseRemove(this, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, UserDataConstraint.class, msgs);
-			if (newUserDataConstraint != null)
-				msgs = ((InternalEObject)newUserDataConstraint).eInverseAdd(this, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, UserDataConstraint.class, msgs);
-			msgs = basicSetUserDataConstraint(newUserDataConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, newUserDataConstraint, newUserDataConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return ((InternalEList)getWebResourceCollections()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				if (authConstraint != null)
-					msgs = ((InternalEObject)authConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, null, msgs);
-				return basicSetAuthConstraint((AuthConstraint)otherEnd, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				if (userDataConstraint != null)
-					msgs = ((InternalEObject)userDataConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, null, msgs);
-				return basicSetUserDataConstraint((UserDataConstraint)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				return basicSetWebApp(null, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return ((InternalEList)getWebResourceCollections()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return basicSetAuthConstraint(null, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return basicSetUserDataConstraint(null, msgs);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__CONSTRAINTS, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				return getDisplayName();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return getWebResourceCollections();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return getAuthConstraint();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return getUserDataConstraint();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return getDisplayNames();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				getWebResourceCollections().clear();
-				getWebResourceCollections().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				setAuthConstraint((AuthConstraint)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				setUserDataConstraint((UserDataConstraint)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				getWebResourceCollections().clear();
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				setAuthConstraint((AuthConstraint)null);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				setUserDataConstraint((UserDataConstraint)null);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return webResourceCollections != null && !webResourceCollections.isEmpty();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return authConstraint != null;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return userDataConstraint != null;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (displayName: ");
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletImpl.java
deleted file mode 100644
index 19178756d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletImpl.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded.
- */
-public class ServletImpl extends CompatibilityDescriptionGroupImpl implements Servlet {
-
-	/**
-	 * The default value of the '{@link #getServletName() <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVLET_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String servletName = SERVLET_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLoadOnStartup() <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer LOAD_ON_STARTUP_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Integer loadOnStartup = LOAD_ON_STARTUP_EDEFAULT;
-	/**
-	 * This is true if the Load On Startup attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean loadOnStartupESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected WebType webType = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList params = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoleRefs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected RunAsSpecifiedIdentity runAs = null;
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	public ServletImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.SERVLET;
-	}
-
-/**
- * Returns an unmodifiable list of the mappings that this
- * servlet participates in.  Since servletMappings is not
- * a bi-directional attribute, if you want to add or delete a
- * mapping, this must be done in the web-app.
- * @return java.util.List
- */
-public List getMappings() {
-	WebApp webApp = (WebApp) eContainer();
-	if (webApp == null) return new BasicEList(0);
-	
-	EList allMappings = webApp.getServletMappings();
-	Iterator i = allMappings.iterator();
-	List mappings = new Vector();
-	while (i.hasNext()) {
-		ServletMapping mapping = (ServletMapping) i.next();
-		if (mapping.getServlet() == this)
-			mappings.add(mapping);
-	}
-	return mappings;
-}
-/**
- * getParamsAsProperties method comment.
- */
-public Properties getParamsAsProperties() {
-	Properties props = new Properties();
-	List lparams = getParams();
-	InitParam param;
-	for (int i = 0; i < lparams.size(); i++) {
-		param = (InitParam) lparams.get(i);
-		props.setProperty(param.getParamName(), param.getParamValue());
-	}
-	return props;
-}
-/**
- * @see Servlet
- */
-public void reSyncSecurityRoleRef(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	List roleRefs = getSecurityRoleRefs();
-	for (int i = 0; i < roleRefs.size(); i++) {
-		SecurityRoleRef roleRef = (SecurityRoleRef) roleRefs.get(i);
-		if (roleRef.getLink() != null && roleRef.getLink().equals(existingRoleName))
-			roleRef.setLink(newRoleName);
-	}
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The servlet-name element contains the canonical name of the servlet.
-	 */
-	public String getServletName() {
-		return servletName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setServletName(String newServletName) {
-		String oldServletName = servletName;
-		servletName = newServletName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__SERVLET_NAME, oldServletName, servletName));
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The load-on-startup element indicates that this servlet should be loaded on the startup of the web application. The optional contents of these element must be a positive integer indicating the order in which the servlet should be loaded. Lower integers are loaded before higher integers. If no value is specified, or if the value specified is not a positive integer, the container is free to load it at any time in the startup sequence.
-
-	 */
-	public Integer getLoadOnStartup() {
-		return loadOnStartup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLoadOnStartup(Integer newLoadOnStartup) {
-		Integer oldLoadOnStartup = loadOnStartup;
-		loadOnStartup = newLoadOnStartup;
-		boolean oldLoadOnStartupESet = loadOnStartupESet;
-		loadOnStartupESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__LOAD_ON_STARTUP, oldLoadOnStartup, loadOnStartup, !oldLoadOnStartupESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetLoadOnStartup() {
-		Integer oldLoadOnStartup = loadOnStartup;
-		boolean oldLoadOnStartupESet = loadOnStartupESet;
-		loadOnStartup = LOAD_ON_STARTUP_EDEFAULT;
-		loadOnStartupESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.SERVLET__LOAD_ON_STARTUP, oldLoadOnStartup, LOAD_ON_STARTUP_EDEFAULT, oldLoadOnStartupESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetLoadOnStartup() {
-		return loadOnStartupESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SERVLET__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SERVLET__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.SERVLET__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__SERVLETS, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebType getWebType() {
-		return webType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebType(WebType newWebType, NotificationChain msgs) {
-		WebType oldWebType = webType;
-		webType = newWebType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__WEB_TYPE, oldWebType, newWebType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebType(WebType newWebType) {
-		if (newWebType != webType) {
-			NotificationChain msgs = null;
-			if (webType != null)
-				msgs = ((InternalEObject)webType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__WEB_TYPE, null, msgs);
-			if (newWebType != null)
-				msgs = ((InternalEObject)newWebType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__WEB_TYPE, null, msgs);
-			msgs = basicSetWebType(newWebType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__WEB_TYPE, newWebType, newWebType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getParams() is used for J2EE1.4
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getParams() {
-		if (params == null) {
-			params = new EObjectContainmentEList(InitParam.class, this, WebapplicationPackage.SERVLET__PARAMS);
-		}
-		return params;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * If defined for a servlet, overrides the security identity used to call an EJB by that servlet in this web application. The role-name is one of the security roles already defined for this web application.
-	 */
-	public RunAsSpecifiedIdentity getRunAs() {
-		return runAs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRunAs(RunAsSpecifiedIdentity newRunAs, NotificationChain msgs) {
-		RunAsSpecifiedIdentity oldRunAs = runAs;
-		runAs = newRunAs;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__RUN_AS, oldRunAs, newRunAs);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRunAs(RunAsSpecifiedIdentity newRunAs) {
-		if (newRunAs != runAs) {
-			NotificationChain msgs = null;
-			if (runAs != null)
-				msgs = ((InternalEObject)runAs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__RUN_AS, null, msgs);
-			if (newRunAs != null)
-				msgs = ((InternalEObject)newRunAs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__RUN_AS, null, msgs);
-			msgs = basicSetRunAs(newRunAs, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__RUN_AS, newRunAs, newRunAs));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getInitParams() is used for J2EE1.3
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, WebapplicationPackage.SERVLET__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				return basicSetWebApp(null, msgs);
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				return basicSetWebType(null, msgs);
-			case WebapplicationPackage.SERVLET__PARAMS:
-				return ((InternalEList)getParams()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				return basicSetRunAs(null, msgs);
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__SERVLETS, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				return getServletName();
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				return getLoadOnStartup();
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				return getWebType();
-			case WebapplicationPackage.SERVLET__PARAMS:
-				return getParams();
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				return getRunAs();
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				return getInitParams();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				setServletName((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				setLoadOnStartup((Integer)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				setWebType((WebType)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__PARAMS:
-				getParams().clear();
-				getParams().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				setRunAs((RunAsSpecifiedIdentity)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				setServletName(SERVLET_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				unsetLoadOnStartup();
-				return;
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				setWebType((WebType)null);
-				return;
-			case WebapplicationPackage.SERVLET__PARAMS:
-				getParams().clear();
-				return;
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				setRunAs((RunAsSpecifiedIdentity)null);
-				return;
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				return SERVLET_NAME_EDEFAULT == null ? servletName != null : !SERVLET_NAME_EDEFAULT.equals(servletName);
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				return isSetLoadOnStartup();
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				return webType != null;
-			case WebapplicationPackage.SERVLET__PARAMS:
-				return params != null && !params.isEmpty();
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				return runAs != null;
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (servletName: ");
-		result.append(servletName);
-		result.append(", loadOnStartup: ");
-		if (loadOnStartupESet) result.append(loadOnStartup); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-	/** 
-	 * return the java servlet class for this servlet
-	 */
-	public JavaClass getServletClass() {
-		JavaClass javaClass = null;
-		String javaClassName = null;
-		// Handle servlet case
-		if (getWebType().isServletType())
-			javaClassName = ((ServletType)getWebType()).getClassName();
-		//Handle the JSP case
-		else {
-			String relPath = ((JSPType)getWebType()).getJspFile();
-			URI webAppURI = getWebApp().eResource().getURI();
-			javaClassName = webAppURI.segment(1)+"/"+webAppURI.segment(2)+relPath;//$NON-NLS-1$
-		}
-		javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(javaClassName,this);
-		return javaClass;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletMappingImpl.java
deleted file mode 100644
index 206355e24..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletMappingImpl.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The servlet-mapping element defines a mapping between a servlet and a url pattern
- * @generated
- */
-public class ServletMappingImpl extends J2EEEObjectImpl implements ServletMapping {
-
-	/**
-	 * The default value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_PATTERN_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String urlPattern = URL_PATTERN_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Servlet servlet = null;
-	public ServletMappingImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.SERVLET_MAPPING;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	public String getUrlPattern() {
-		return urlPattern;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUrlPattern(String newUrlPattern) {
-		String oldUrlPattern = urlPattern;
-		urlPattern = newUrlPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN, oldUrlPattern, urlPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SERVLET_MAPPING__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SERVLET_MAPPING__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.SERVLET_MAPPING__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Servlet getServlet() {
-		if (servlet != null && servlet.eIsProxy()) {
-			InternalEObject oldServlet = (InternalEObject)servlet;
-			servlet = (Servlet)eResolveProxy(oldServlet);
-			if (servlet != oldServlet) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.SERVLET_MAPPING__SERVLET, oldServlet, servlet));
-			}
-		}
-		return servlet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Servlet basicGetServlet() {
-		return servlet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setServlet(Servlet newServlet) {
-		Servlet oldServlet = servlet;
-		servlet = newServlet;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__SERVLET, oldServlet, servlet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				return getName();
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				if (resolve) return getServlet();
-				return basicGetServlet();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				setName((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				setServlet((Servlet)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				setUrlPattern(URL_PATTERN_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				setServlet((Servlet)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				return URL_PATTERN_EDEFAULT == null ? urlPattern != null : !URL_PATTERN_EDEFAULT.equals(urlPattern);
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				return servlet != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (urlPattern: ");
-		result.append(urlPattern);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletTypeImpl.java
deleted file mode 100644
index 67f911a1b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/ServletTypeImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * @generated
- */
-public class ServletTypeImpl extends WebTypeImpl implements ServletType {
-
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-	public ServletTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.SERVLET_TYPE;
-	}
-
-public boolean isServletType() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setClassName(String newClassName) {
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_TYPE__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				return getClassName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (className: ");
-		result.append(className);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/SessionConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/SessionConfigImpl.java
deleted file mode 100644
index c905f6762..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/SessionConfigImpl.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The session-config element defines the session parameters for this web application.
- * @generated
- */
-public class SessionConfigImpl extends J2EEEObjectImpl implements SessionConfig {
-
-	/**
-	 * The default value of the '{@link #getSessionTimeout() <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionTimeout()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SESSION_TIMEOUT_EDEFAULT = 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected int sessionTimeout = SESSION_TIMEOUT_EDEFAULT;
-	/**
-	 * This is true if the Session Timeout attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean sessionTimeoutESet = false;
-
-	public SessionConfigImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.SESSION_CONFIG;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The session-timeout element defines the default session timeout interval for
-	 * all sessions created in this web application. The specified timeout must be
-	 * expressed in a whole number of minutes.
-	 */
-	public int getSessionTimeout() {
-		return sessionTimeout;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSessionTimeout(int newSessionTimeout) {
-		int oldSessionTimeout = sessionTimeout;
-		sessionTimeout = newSessionTimeout;
-		boolean oldSessionTimeoutESet = sessionTimeoutESet;
-		sessionTimeoutESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT, oldSessionTimeout, sessionTimeout, !oldSessionTimeoutESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetSessionTimeout() {
-		int oldSessionTimeout = sessionTimeout;
-		boolean oldSessionTimeoutESet = sessionTimeoutESet;
-		sessionTimeout = SESSION_TIMEOUT_EDEFAULT;
-		sessionTimeoutESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT, oldSessionTimeout, SESSION_TIMEOUT_EDEFAULT, oldSessionTimeoutESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetSessionTimeout() {
-		return sessionTimeoutESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SESSION_CONFIG__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SESSION_CONFIG__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.SESSION_CONFIG__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__SESSION_CONFIG, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SESSION_CONFIG__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__SESSION_CONFIG, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				return new Integer(getSessionTimeout());
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				return getWebApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				setSessionTimeout(((Integer)newValue).intValue());
-				return;
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				unsetSessionTimeout();
-				return;
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				return isSetSessionTimeout();
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				return getWebApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (sessionTimeout: ");
-		if (sessionTimeoutESet) result.append(sessionTimeout); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/TagLibRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/TagLibRefImpl.java
deleted file mode 100644
index cb501cb24..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/TagLibRefImpl.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * The taglib element is used to describe a JSP tag library.
- * @generated
- */
-public class TagLibRefImpl extends J2EEEObjectImpl implements TagLibRef {
-
-	/**
-	 * The default value of the '{@link #getTaglibURI() <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String taglibURI = TAGLIB_URI_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_LOCATION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String taglibLocation = TAGLIB_LOCATION_EDEFAULT;
-	public TagLibRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.TAG_LIB_REF;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The taglib-uri element describes a URI, relative to the location of the web.xml 
-	 * document, identifying a Tag Library used in the Web Application.
-	 */
-	public String getTaglibURI() {
-		return taglibURI;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTaglibURI(String newTaglibURI) {
-		String oldTaglibURI = taglibURI;
-		taglibURI = newTaglibURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI, oldTaglibURI, taglibURI));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The taglib-location element contains the location (as a resource relative to
-	 * the root of the web application) where to find the Tag Libary Description file
-	 * for the tag library.
-	 */
-	public String getTaglibLocation() {
-		return taglibLocation;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTaglibLocation(String newTaglibLocation) {
-		String oldTaglibLocation = taglibLocation;
-		taglibLocation = newTaglibLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION, oldTaglibLocation, taglibLocation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.TAG_LIB_REF__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.TAG_LIB_REF__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.TAG_LIB_REF__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__TAG_LIBS, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.TAG_LIB_REF__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				return basicSetWebApp(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__TAG_LIBS, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				return getTaglibURI();
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				return getTaglibLocation();
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				return getWebApp();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				setTaglibURI((String)newValue);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				setTaglibLocation((String)newValue);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				setTaglibURI(TAGLIB_URI_EDEFAULT);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				setTaglibLocation(TAGLIB_LOCATION_EDEFAULT);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				return TAGLIB_URI_EDEFAULT == null ? taglibURI != null : !TAGLIB_URI_EDEFAULT.equals(taglibURI);
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				return TAGLIB_LOCATION_EDEFAULT == null ? taglibLocation != null : !TAGLIB_LOCATION_EDEFAULT.equals(taglibLocation);
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				return getWebApp() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (taglibURI: ");
-		result.append(taglibURI);
-		result.append(", taglibLocation: ");
-		result.append(taglibLocation);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/URLPatternTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/URLPatternTypeImpl.java
deleted file mode 100644
index ce8bda977..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/URLPatternTypeImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * @generated
- */
-public class URLPatternTypeImpl extends J2EEEObjectImpl implements URLPatternType {
-
-	/**
-	 * The default value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_PATTERN_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String urlPattern = URL_PATTERN_EDEFAULT;
-	public URLPatternTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.URL_PATTERN_TYPE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getUrlPattern() {
-		return urlPattern;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUrlPattern(String newUrlPattern) {
-		String oldUrlPattern = urlPattern;
-		urlPattern = newUrlPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN, oldUrlPattern, urlPattern));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebResourceCollection getResCollection() {
-		if (eContainerFeatureID != WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION) return null;
-		return (WebResourceCollection)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetResCollection(WebResourceCollection newResCollection, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newResCollection, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setResCollection(WebResourceCollection newResCollection) {
-		if (newResCollection != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION && newResCollection != null)) {
-			if (EcoreUtil.isAncestor(this, newResCollection))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newResCollection != null)
-				msgs = ((InternalEObject)newResCollection).eInverseAdd(this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS, WebResourceCollection.class, msgs);
-			msgs = basicSetResCollection(newResCollection, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION, newResCollection, newResCollection));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetResCollection((WebResourceCollection)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				return basicSetResCollection(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS, WebResourceCollection.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				return getResCollection();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				setResCollection((WebResourceCollection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				setUrlPattern(URL_PATTERN_EDEFAULT);
-				return;
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				setResCollection((WebResourceCollection)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				return URL_PATTERN_EDEFAULT == null ? urlPattern != null : !URL_PATTERN_EDEFAULT.equals(urlPattern);
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				return getResCollection() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (urlPattern: ");
-		result.append(urlPattern);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/UserDataConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/UserDataConstraintImpl.java
deleted file mode 100644
index fbf20e313..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/UserDataConstraintImpl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * The user-data-constraint element is used to indicate how data communicated between the client and container should be protected
- * @generated
- */
-public class UserDataConstraintImpl extends J2EEEObjectImpl implements UserDataConstraint {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getTransportGuarantee() <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransportGuaranteeType TRANSPORT_GUARANTEE_EDEFAULT = TransportGuaranteeType.NONE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransportGuaranteeType transportGuarantee = TRANSPORT_GUARANTEE_EDEFAULT;
-	/**
-	 * This is true if the Transport Guarantee attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transportGuaranteeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public UserDataConstraintImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.USER_DATA_CONSTRAINT;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A description for the user data constraint.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transport-guarantee element specifies that the communication between client 
-	 * and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the
-	 * application does not require any
-	 * transport guarantees. A value of INTEGRAL means that the application requires
-	 * that the data sent between the client and server be sent in such a way that it
-	 * can't be changed in transit. CONFIDENTIAL means that the application requires
-	 * that the data be transmitted in a fashion that prevents other entities from
-	 * observing the contents of the transmission. In most cases, the presence of the
-	 * INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required.
-	 */
-	public TransportGuaranteeType getTransportGuarantee() {
-		return transportGuarantee;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransportGuarantee(TransportGuaranteeType newTransportGuarantee) {
-		TransportGuaranteeType oldTransportGuarantee = transportGuarantee;
-		transportGuarantee = newTransportGuarantee == null ? TRANSPORT_GUARANTEE_EDEFAULT : newTransportGuarantee;
-		boolean oldTransportGuaranteeESet = transportGuaranteeESet;
-		transportGuaranteeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE, oldTransportGuarantee, transportGuarantee, !oldTransportGuaranteeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransportGuarantee() {
-		TransportGuaranteeType oldTransportGuarantee = transportGuarantee;
-		boolean oldTransportGuaranteeESet = transportGuaranteeESet;
-		transportGuarantee = TRANSPORT_GUARANTEE_EDEFAULT;
-		transportGuaranteeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE, oldTransportGuarantee, TRANSPORT_GUARANTEE_EDEFAULT, oldTransportGuaranteeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransportGuarantee() {
-		return transportGuaranteeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SecurityConstraint getSecConstraint() {
-		if (eContainerFeatureID != WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT) return null;
-		return (SecurityConstraint)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecConstraint(SecurityConstraint newSecConstraint, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newSecConstraint, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecConstraint(SecurityConstraint newSecConstraint) {
-		if (newSecConstraint != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT && newSecConstraint != null)) {
-			if (EcoreUtil.isAncestor(this, newSecConstraint))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSecConstraint != null)
-				msgs = ((InternalEObject)newSecConstraint).eInverseAdd(this, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, SecurityConstraint.class, msgs);
-			msgs = basicSetSecConstraint(newSecConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, newSecConstraint, newSecConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetSecConstraint((SecurityConstraint)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				return basicSetSecConstraint(null, msgs);
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, SecurityConstraint.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				return getTransportGuarantee();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				setTransportGuarantee((TransportGuaranteeType)newValue);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)newValue);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				unsetTransportGuarantee();
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)null);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				return isSetTransportGuarantee();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint() != null;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(", transportGuarantee: ");
-		if (transportGuaranteeESet) result.append(transportGuarantee); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppImpl.java
deleted file mode 100644
index 3a7ea52ba..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppImpl.java
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.internal.impl.JNDIEnvRefsGroupImpl;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-/**
- * The web-app element is the root of the deployment descriptor for
- * a web application.
- */
-public class WebAppImpl extends JNDIEnvRefsGroupImpl implements WebApp {
-
-	/**
-	 * The default value of the '{@link #isDistributable() <em>Distributable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDistributable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISTRIBUTABLE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean distributable = DISTRIBUTABLE_EDEFAULT;
-	/**
-	 * This is true if the Distributable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean distributableESet = false;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList contexts = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList errorPages = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected WelcomeFileList fileList = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList tagLibs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList constraints = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LoginConfig loginConfig = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList mimeMappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SessionConfig sessionConfig = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList servletMappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList servlets = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList filters = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList filterMappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList listeners = null;
-	/**
-	 * The cached value of the '{@link #getContextParams() <em>Context Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList contextParams = null;
-
-	/**
-	 * The cached value of the '{@link #getJspConfig() <em>Jsp Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspConfig()
-	 * @generated
-	 * @ordered
-	 */
-	protected JSPConfig jspConfig = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalEncodingMappingList() <em>Local Encoding Mapping List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalEncodingMappingList()
-	 * @generated
-	 * @ordered
-	 */
-	protected LocalEncodingMappingList localEncodingMappingList = null;
-
-	public WebAppImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.WEB_APP;
-	}
-
-/**
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp
- */
-public boolean containsSecurityRole(java.lang.String name) {
-	return getSecurityRoleNamed(name) != null;
-}
-public ErrorPage getErrorPageByCode(Integer code) {
-	List lerrorPages = getErrorPages();
-	String codeString = code.toString();
-	Iterator ie = lerrorPages.iterator();
-	while (ie.hasNext()) {
-		ErrorPage ep = (ErrorPage) ie.next();
-		if (ep.isErrorCode()) {
-			ErrorCodeErrorPage ecep = (ErrorCodeErrorPage) ep;
-			if (codeString.equals(ecep.getErrorCode()))
-				return ecep;
-		}
-	}
-	return null;
-}
-public ErrorPage getErrorPageByExceptionType(String exceptionType) {
-	if (exceptionType != null) {
-		List lerrorPages = getErrorPages();
-		Iterator ie = lerrorPages.iterator();
-		while (ie.hasNext()) {
-			ErrorPage ep = (ErrorPage) ie.next();
-			if (ep.isExceptionType()) {
-				ExceptionTypeErrorPage etep = (ExceptionTypeErrorPage) ep;
-				if (exceptionType.equals(etep.getExceptionTypeName()))
-					return etep;
-			}
-		}
-	}
-	return null;
-}
-/**
- * Finds a filter mapping for a specified filter.
- * @param filter The filter to find the mapping for.
- * @return The first filter mapping found for the specified filter, or null if no
- * mapping exists for the filter.
- */
-public FilterMapping getFilterMapping(
-	Filter aFilter) {
-	if (aFilter != null) {
-		List mappings = getFilterMappings();
-		FilterMapping mapping;
-		for (int i = 0; i < mappings.size(); i++) {
-			mapping = (FilterMapping) mappings.get(i);
-			if (aFilter.equals(mapping.getFilter())) 
-				return mapping;
-		}
-	}
-	return null;
-}
-/**
- * getFilterNamed method comment.
- */
-public Filter getFilterNamed(java.lang.String name) {
-	List lfilters = getFilters();
-	if (lfilters == null || lfilters.size() == 0) {
-		return null;
-	}
-	Filter next;
-	for (int i = 0; i < lfilters.size(); i++) {
-		next = (Filter) lfilters.get(i);
-		if (next.getName().equals(name)) {
-			return next;
-		}
-	}
-	return null;
-}
-public List getFilterNames() {
-	List names, lfilters = getFilters();
-	names = new ArrayList(lfilters.size());
-	Filter next;
-	for (int i = 0; i < lfilters.size(); i++) {
-		next = (Filter) lfilters.get(i);
-		names.add(next.getName());
-	}
-	return names;
-}
-/**
- * Returns the mime type for the specified extension
- * @param An extension to find the mime type for.
- */
-public java.lang.String getMimeType(java.lang.String extension) {
-	if (extension != null) {
-		List mappings = getMimeMappings();
-		MimeMapping mapping;
-		for (int i = 0; i < mappings.size(); i++) {
-			mapping = (MimeMapping) mappings.get(i);
-			if (extension.equals(mapping.getExtension()))
-				return mapping.getMimeType();
-		}
-	}
-	return null;
-}
-public SecurityRole getSecurityRoleNamed(String roleName) {
-	java.util.List tempRoles = getSecurityRoles();
-	SecurityRole role;
-	for (int i = 0; i < tempRoles.size(); i++) {
-		role = (SecurityRole) tempRoles.get(i);
-		if (role.getRoleName().equals(roleName))
-			return role;
-	}
-	return null;
-}
-/**
- * Finds a servlet mapping for a specified servlet.
- * @param servlet The servlet to find the mappings for.
- * @return The servlet mapping for the specified servlet, or null if no
- * mapping exists for the servlet.
- */
-public ServletMapping getServletMapping(
-	Servlet aServlet) {
-	if (aServlet != null) {
-		List mappings = getServletMappings();
-		ServletMapping mapping;
-		for (int i = 0; i < mappings.size(); i++) {
-			mapping = (ServletMapping) mappings.get(i);
-			if (aServlet.equals(mapping.getServlet())) 
-				return mapping;
-		}
-	}
-	return null;
-}
-/**
- * getServletNamed method comment.
- */
-public Servlet getServletNamed(java.lang.String name) {
-	List lservlets = getServlets();
-	if (lservlets == null || lservlets.size() == 0) {
-		return null;
-	}
-	Servlet next;
-	String nextName;
-	for (int i = 0; i < lservlets.size(); i++) {
-		next = (Servlet) lservlets.get(i);
-		nextName = next.getServletName();
-		if (nextName != null && nextName.equals(name)) {
-			return next;
-		}
-	}
-	return null;
-}
-public List getServletNames() {
-	List names, lservlets = getServlets();
-	names = new ArrayList(lservlets.size());
-	Servlet next;
-	for (int i = 0; i < lservlets.size(); i++) {
-		next = (Servlet) lservlets.get(i);
-		names.add(next.getServletName());
-	}
-	return names;
-}
-/**
- * Return boolean indicating if this Web App was populated from an Servlet2.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_2Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.WEBAPP_SYSTEMID_2_2);
-}
-/**
- * Return boolean indicating if this Web App was populated from an Servlet2.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_3Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.WEBAPP_SYSTEMID_2_3);
-}
-/**
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp
- */
-public void renameSecurityRole(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	SecurityRole role = getSecurityRoleNamed(existingRoleName);
-	if (role != null)
-		role.setRoleName(newRoleName);
-	List theServlets = getServlets();
-	for (int i = 0; i < theServlets.size(); i++){
-		Servlet servlet = (Servlet)theServlets.get(i);
-		servlet.reSyncSecurityRoleRef(existingRoleName, newRoleName);
-	}
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The distributable element, by its presence in a web application deployment
-	 * descriptor, indicates that this web application is programmed appropriately to
-	 * be deployed into a distributed servlet container
-	 */
-	public boolean isDistributable() {
-		return distributable;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDistributable(boolean newDistributable) {
-		boolean oldDistributable = distributable;
-		distributable = newDistributable;
-		boolean oldDistributableESet = distributableESet;
-		distributableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__DISTRIBUTABLE, oldDistributable, distributable, !oldDistributableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDistributable() {
-		boolean oldDistributable = distributable;
-		boolean oldDistributableESet = distributableESet;
-		distributable = DISTRIBUTABLE_EDEFAULT;
-		distributableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.WEB_APP__DISTRIBUTABLE, oldDistributable, DISTRIBUTABLE_EDEFAULT, oldDistributableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDistributable() {
-		return distributableESet;
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getContexts() {
-		if (contexts == null) {
-			contexts = new EObjectContainmentWithInverseEList(ContextParam.class, this, WebapplicationPackage.WEB_APP__CONTEXTS, WebapplicationPackage.CONTEXT_PARAM__WEB_APP);
-		}
-		return contexts;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getErrorPages() {
-		if (errorPages == null) {
-			errorPages = new EObjectContainmentWithInverseEList(ErrorPage.class, this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebapplicationPackage.ERROR_PAGE__WEB_APP);
-		}
-		return errorPages;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WelcomeFileList getFileList() {
-		return fileList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFileList(WelcomeFileList newFileList, NotificationChain msgs) {
-		WelcomeFileList oldFileList = fileList;
-		fileList = newFileList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__FILE_LIST, oldFileList, newFileList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFileList(WelcomeFileList newFileList) {
-		if (newFileList != fileList) {
-			NotificationChain msgs = null;
-			if (fileList != null)
-				msgs = ((InternalEObject)fileList).eInverseRemove(this, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, WelcomeFileList.class, msgs);
-			if (newFileList != null)
-				msgs = ((InternalEObject)newFileList).eInverseAdd(this, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, WelcomeFileList.class, msgs);
-			msgs = basicSetFileList(newFileList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__FILE_LIST, newFileList, newFileList));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getTagLibs() {
-		if (tagLibs == null) {
-			tagLibs = new EObjectContainmentWithInverseEList(TagLibRef.class, this, WebapplicationPackage.WEB_APP__TAG_LIBS, WebapplicationPackage.TAG_LIB_REF__WEB_APP);
-		}
-		return tagLibs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getConstraints() {
-		if (constraints == null) {
-			constraints = new EObjectContainmentWithInverseEList(SecurityConstraint.class, this, WebapplicationPackage.WEB_APP__CONSTRAINTS, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP);
-		}
-		return constraints;
-	}
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	*/
-	
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) {
-			// fix defect 3276, when resource is unloaded
-			if (version == null) 
-				throw new IllegalStateException();
-			
-				if (version.equals("2.4"))//$NON-NLS-1$
-					return J2EEVersionConstants.WEB_2_4_ID;
-				if (version.equals("2.3"))//$NON-NLS-1$
-					return J2EEVersionConstants.WEB_2_3_ID;
-				if (version.equals("2.2"))//$NON-NLS-1$
-					return J2EEVersionConstants.WEB_2_2_ID;
-			
-		}
-		return res.getModuleVersionID();
-	}
-
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getJ2EEVersionID();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public LoginConfig getLoginConfig() {
-		return loginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLoginConfig(LoginConfig newLoginConfig, NotificationChain msgs) {
-		LoginConfig oldLoginConfig = loginConfig;
-		loginConfig = newLoginConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, oldLoginConfig, newLoginConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLoginConfig(LoginConfig newLoginConfig) {
-		if (newLoginConfig != loginConfig) {
-			NotificationChain msgs = null;
-			if (loginConfig != null)
-				msgs = ((InternalEObject)loginConfig).eInverseRemove(this, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, LoginConfig.class, msgs);
-			if (newLoginConfig != null)
-				msgs = ((InternalEObject)newLoginConfig).eInverseAdd(this, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, LoginConfig.class, msgs);
-			msgs = basicSetLoginConfig(newLoginConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, newLoginConfig, newLoginConfig));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMimeMappings() {
-		if (mimeMappings == null) {
-			mimeMappings = new EObjectContainmentWithInverseEList(MimeMapping.class, this, WebapplicationPackage.WEB_APP__MIME_MAPPINGS, WebapplicationPackage.MIME_MAPPING__WEB_APP);
-		}
-		return mimeMappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SessionConfig getSessionConfig() {
-		return sessionConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSessionConfig(SessionConfig newSessionConfig, NotificationChain msgs) {
-		SessionConfig oldSessionConfig = sessionConfig;
-		sessionConfig = newSessionConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__SESSION_CONFIG, oldSessionConfig, newSessionConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSessionConfig(SessionConfig newSessionConfig) {
-		if (newSessionConfig != sessionConfig) {
-			NotificationChain msgs = null;
-			if (sessionConfig != null)
-				msgs = ((InternalEObject)sessionConfig).eInverseRemove(this, WebapplicationPackage.SESSION_CONFIG__WEB_APP, SessionConfig.class, msgs);
-			if (newSessionConfig != null)
-				msgs = ((InternalEObject)newSessionConfig).eInverseAdd(this, WebapplicationPackage.SESSION_CONFIG__WEB_APP, SessionConfig.class, msgs);
-			msgs = basicSetSessionConfig(newSessionConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__SESSION_CONFIG, newSessionConfig, newSessionConfig));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getServletMappings() {
-		if (servletMappings == null) {
-			servletMappings = new EObjectContainmentWithInverseEList(ServletMapping.class, this, WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS, WebapplicationPackage.SERVLET_MAPPING__WEB_APP);
-		}
-		return servletMappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getServlets() {
-		if (servlets == null) {
-			servlets = new EObjectContainmentWithInverseEList(Servlet.class, this, WebapplicationPackage.WEB_APP__SERVLETS, WebapplicationPackage.SERVLET__WEB_APP);
-		}
-		return servlets;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, WebapplicationPackage.WEB_APP__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getFilters() {
-		if (filters == null) {
-			filters = new EObjectContainmentEList(Filter.class, this, WebapplicationPackage.WEB_APP__FILTERS);
-		}
-		return filters;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Filter mappings defined for the web app
-	 */
-	public EList getFilterMappings() {
-		if (filterMappings == null) {
-			filterMappings = new EObjectContainmentEList(FilterMapping.class, this, WebapplicationPackage.WEB_APP__FILTER_MAPPINGS);
-		}
-		return filterMappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The listeners collection contains deployment properties for a web application
-	 * listener beans in the web app.
-	 */
-	public EList getListeners() {
-		if (listeners == null) {
-			listeners = new EObjectContainmentEList(Listener.class, this, WebapplicationPackage.WEB_APP__LISTENERS);
-		}
-		return listeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getContextParams() {
-		if (contextParams == null) {
-			contextParams = new EObjectContainmentEList(ParamValue.class, this, WebapplicationPackage.WEB_APP__CONTEXT_PARAMS);
-		}
-		return contextParams;
-	}
-
-	/**
-	 * @deprecated: Use getEnvironmentProperties()
-	 */
-	public EList getEnvEntries() {
-		
-		return getEnvironmentProperties();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPConfig getJspConfig() {
-		return jspConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetJspConfig(JSPConfig newJspConfig, NotificationChain msgs) {
-		JSPConfig oldJspConfig = jspConfig;
-		jspConfig = newJspConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__JSP_CONFIG, oldJspConfig, newJspConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJspConfig(JSPConfig newJspConfig) {
-		if (newJspConfig != jspConfig) {
-			NotificationChain msgs = null;
-			if (jspConfig != null)
-				msgs = ((InternalEObject)jspConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__JSP_CONFIG, null, msgs);
-			if (newJspConfig != null)
-				msgs = ((InternalEObject)newJspConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__JSP_CONFIG, null, msgs);
-			msgs = basicSetJspConfig(newJspConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__JSP_CONFIG, newJspConfig, newJspConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocalEncodingMappingList getLocalEncodingMappingList() {
-		return localEncodingMappingList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLocalEncodingMappingList(LocalEncodingMappingList newLocalEncodingMappingList, NotificationChain msgs) {
-		LocalEncodingMappingList oldLocalEncodingMappingList = localEncodingMappingList;
-		localEncodingMappingList = newLocalEncodingMappingList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, oldLocalEncodingMappingList, newLocalEncodingMappingList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalEncodingMappingList(LocalEncodingMappingList newLocalEncodingMappingList) {
-		if (newLocalEncodingMappingList != localEncodingMappingList) {
-			NotificationChain msgs = null;
-			if (localEncodingMappingList != null)
-				msgs = ((InternalEObject)localEncodingMappingList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, null, msgs);
-			if (newLocalEncodingMappingList != null)
-				msgs = ((InternalEObject)newLocalEncodingMappingList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, null, msgs);
-			msgs = basicSetLocalEncodingMappingList(newLocalEncodingMappingList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, newLocalEncodingMappingList, newLocalEncodingMappingList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				return ((InternalEList)getContexts()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				return ((InternalEList)getErrorPages()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				if (fileList != null)
-					msgs = ((InternalEObject)fileList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__FILE_LIST, null, msgs);
-				return basicSetFileList((WelcomeFileList)otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				return ((InternalEList)getTagLibs()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				return ((InternalEList)getConstraints()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				if (loginConfig != null)
-					msgs = ((InternalEObject)loginConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__LOGIN_CONFIG, null, msgs);
-				return basicSetLoginConfig((LoginConfig)otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				return ((InternalEList)getMimeMappings()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				if (sessionConfig != null)
-					msgs = ((InternalEObject)sessionConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__SESSION_CONFIG, null, msgs);
-				return basicSetSessionConfig((SessionConfig)otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				return ((InternalEList)getServletMappings()).basicAdd(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				return ((InternalEList)getServlets()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				return ((InternalEList)getContexts()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				return ((InternalEList)getErrorPages()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				return basicSetFileList(null, msgs);
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				return ((InternalEList)getTagLibs()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				return ((InternalEList)getConstraints()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				return basicSetLoginConfig(null, msgs);
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				return ((InternalEList)getMimeMappings()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				return basicSetSessionConfig(null, msgs);
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				return ((InternalEList)getServletMappings()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				return ((InternalEList)getServlets()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				return ((InternalEList)getFilters()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				return ((InternalEList)getFilterMappings()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				return ((InternalEList)getListeners()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				return ((InternalEList)getContextParams()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				return basicSetJspConfig(null, msgs);
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				return basicSetLocalEncodingMappingList(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				return isDistributable() ? Boolean.TRUE : Boolean.FALSE;
-			case WebapplicationPackage.WEB_APP__VERSION:
-				return getVersion();
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				return getContexts();
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				return getErrorPages();
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				return getFileList();
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				return getTagLibs();
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				return getConstraints();
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				return getLoginConfig();
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				return getMimeMappings();
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				return getSessionConfig();
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				return getServletMappings();
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				return getServlets();
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				return getSecurityRoles();
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				return getFilters();
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				return getFilterMappings();
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				return getListeners();
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				return getContextParams();
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				return getJspConfig();
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				return getLocalEncodingMappingList();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				setDistributable(((Boolean)newValue).booleanValue());
-				return;
-			case WebapplicationPackage.WEB_APP__VERSION:
-				setVersion((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				getContexts().clear();
-				getContexts().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				getErrorPages().clear();
-				getErrorPages().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				setFileList((WelcomeFileList)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				getTagLibs().clear();
-				getTagLibs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				getConstraints().clear();
-				getConstraints().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				getMimeMappings().clear();
-				getMimeMappings().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				setSessionConfig((SessionConfig)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				getServletMappings().clear();
-				getServletMappings().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				getServlets().clear();
-				getServlets().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				getFilters().clear();
-				getFilters().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				getFilterMappings().clear();
-				getFilterMappings().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				getListeners().clear();
-				getListeners().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				getContextParams().clear();
-				getContextParams().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				setJspConfig((JSPConfig)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				setLocalEncodingMappingList((LocalEncodingMappingList)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				unsetDistributable();
-				return;
-			case WebapplicationPackage.WEB_APP__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				getContexts().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				getErrorPages().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				setFileList((WelcomeFileList)null);
-				return;
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				getTagLibs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				getConstraints().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)null);
-				return;
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				getMimeMappings().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				setSessionConfig((SessionConfig)null);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				getServletMappings().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				getServlets().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				getFilters().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				getFilterMappings().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				getListeners().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				getContextParams().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				setJspConfig((JSPConfig)null);
-				return;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				setLocalEncodingMappingList((LocalEncodingMappingList)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				return isSetDistributable();
-			case WebapplicationPackage.WEB_APP__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				return contexts != null && !contexts.isEmpty();
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				return errorPages != null && !errorPages.isEmpty();
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				return fileList != null;
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				return tagLibs != null && !tagLibs.isEmpty();
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				return constraints != null && !constraints.isEmpty();
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				return loginConfig != null;
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				return mimeMappings != null && !mimeMappings.isEmpty();
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				return sessionConfig != null;
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				return servletMappings != null && !servletMappings.isEmpty();
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				return servlets != null && !servlets.isEmpty();
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				return filters != null && !filters.isEmpty();
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				return filterMappings != null && !filterMappings.isEmpty();
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				return listeners != null && !listeners.isEmpty();
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				return contextParams != null && !contextParams.isEmpty();
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				return jspConfig != null;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				return localEncodingMappingList != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (distributable: ");
-		if (distributableESet) result.append(distributable); else result.append("<unset>");
-		result.append(", version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppResourceFactory.java
deleted file mode 100644
index 15eb845a5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppResourceFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebAppResourceFactory extends TranslatorResourceFactory {
-
-	/**
-	 * Method registerDtds.
-	 */
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_SYSTEMID_2_2, "web-app_2_2.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_2, "web-app_2.2.dtd");	//$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_SYSTEMID_2_3, "web-app_2_3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_3, "web-app_2.3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_APP_SCHEMA_LOC_2_4, "web-app_2_4.xsd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.JSP_SCHEMA_LOC_2_0, "jsp_2_0.xsd"); //$NON-NLS-1$
-	}
-
-	/** 
-	 */
-	public WebAppResourceFactory() {
-		super(RendererFactory.getDefaultRendererFactory()); 
-	}
-
-	/**
-	 * @param aRendererFactory
-	 */
-	public WebAppResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory); 
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new WebAppResourceImpl(uri, aRenderer);
-	}
-	
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) { 
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {		
-		aRegistry.registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-	
-	public static Resource.Factory getRegisteredFactory() {
-
-		System.err.println("fetching registered factory for web app uri");
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.WEBAPP_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppResourceImpl.java
deleted file mode 100644
index a7aba6a31..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebAppResourceImpl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.webapplication.WebAppTranslator;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebAppResourceImpl extends XMLResourceImpl implements WebAppResource {
-
-	
-	public WebAppResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	public WebAppResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	
-	public WebApp getWebApp() {
-		return (WebApp) getRootObject();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.WEBAPP_PUBLICID_2_2;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.WEBAPP_SYSTEMID_2_2;
-	}
-	
-	public String getJ2EE_Alt_1_2_SystemID() {
-		return J2EEConstants.WEBAPP_ALT_SYSTEMID_2_2;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.WEBAPP_PUBLICID_2_3;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.WEBAPP_SYSTEMID_2_3;
-	}
-
-	public String getJ2EE_Alt_1_3_SystemID() {
-		return J2EEConstants.WEBAPP_ALT_SYSTEMID_2_3;
-	}
-	/*
-	 * @see WebAppResource#isWeb2_2()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isWeb2_2() {
-		return getModuleVersionID() == WEB_2_2_ID;
-	}
-	/*
-	 * @see WebAppResource#isWeb2_3()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isWeb2_3() {
-		return getModuleVersionID() == WEB_2_3_ID;
-	}
-	/*
-	 * @see WebAppResource#isWeb2_4()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isWeb2_4() {
-		return getModuleVersionID() == WEB_2_4_ID;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.WEBAPP_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResource#getType()
-	 */
-	public int getType() {
-		return WEB_APP_TYPE;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return WebAppTranslator.INSTANCE;
-	}
-	/* Return J2EE version based on module version
-	*/
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.WEB_2_2_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.WEB_2_3_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.WEB_2_4_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-	super.setVersionID(id);
-	switch (id) {
-			case (WEB_2_4_ID) :
-				super.setDoctypeValues(null, null);
-				break;
-			case (WEB_2_3_ID) :
-				super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-				break;
-			case (WEB_2_2_ID) :
-				super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-			
-		}
-		syncVersionOfRootObject();
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) {
-	switch (id) {
-		case (J2EE_1_4_ID) :
-					primSetDoctypeValues(null, null);
-					primSetVersionID(WEB_2_4_ID);
-					break;
-		case (J2EE_1_3_ID) :
-					primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					primSetVersionID(WEB_2_3_ID);
-					break;
-		case (J2EE_1_2_ID) :
-					primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					primSetVersionID(WEB_2_2_ID);
-			}
-		syncVersionOfRootObject();
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WEB_2_4_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		WebApp app = getWebApp();
-		if (app == null)
-			return;
-	
-		String version = app.getVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			app.setVersion(newVersion);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebResourceCollectionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebResourceCollectionImpl.java
deleted file mode 100644
index df3e3264d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebResourceCollectionImpl.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.
-
- */
-public class WebResourceCollectionImpl extends EObjectImpl implements WebResourceCollection, EObject {
-
-	/**
-	 * The default value of the '{@link #getWebResourceName() <em>Web Resource Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebResourceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WEB_RESOURCE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String webResourceName = WEB_RESOURCE_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPattern = null;
-
-	/**
-	 * The cached value of the '{@link #getHttpMethod() <em>Http Method</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList httpMethod = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList urLs = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getHTTPs() <em>HTT Ps</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHTTPs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList httPs = null;
-
-	public WebResourceCollectionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.WEB_RESOURCE_COLLECTION;
-	}
-
-/**
- * addHTTP method comment.
- */
-public void addHTTP(java.lang.String ahttpMethod) {
-	HTTPMethodType http = getFactory().createHTTPMethodType();
-	http.setHttpMethod(ahttpMethod);
-	getHTTPs().add(http);
-}
-/**
- * addURL method comment.
- */
-public void addURL(java.lang.String aurlPattern) {
-	URLPatternType url = getFactory().createURLPatternType();
-	url.setUrlPattern(aurlPattern);
-	getURLs().add(url);
-}
-public WebapplicationFactory getFactory() {
-	return ((WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI)).getWebapplicationFactory();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The web-resource-name contains the name of this web resource collection
-	 */
-	public String getWebResourceName() {
-		return webResourceName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebResourceName(String newWebResourceName) {
-		String oldWebResourceName = webResourceName;
-		webResourceName = newWebResourceName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME, oldWebResourceName, webResourceName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getUrlPattern() {
-		if (urlPattern == null) {
-			urlPattern = new EDataTypeEList(String.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN);
-		}
-		return urlPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getHttpMethod() {
-		if (httpMethod == null) {
-			httpMethod = new EDataTypeUniqueEList(HTTPMethodTypeEnum.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD);
-		}
-		return httpMethod;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SecurityConstraint getSecConstraint() {
-		if (eContainerFeatureID != WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT) return null;
-		return (SecurityConstraint)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecConstraint(SecurityConstraint newSecConstraint, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newSecConstraint, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecConstraint(SecurityConstraint newSecConstraint) {
-		if (newSecConstraint != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT && newSecConstraint != null)) {
-			if (EcoreUtil.isAncestor(this, newSecConstraint))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSecConstraint != null)
-				msgs = ((InternalEObject)newSecConstraint).eInverseAdd(this, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS, SecurityConstraint.class, msgs);
-			msgs = basicSetSecConstraint(newSecConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT, newSecConstraint, newSecConstraint));
-	}
-
-	/**
-	 *  <!-- begin-user-doc -->
-	 * @version J2EE1.4 deprecated, use getUrlPattern()
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getURLs() {
-		if (urLs == null) {
-			urLs = new EObjectContainmentWithInverseEList(URLPatternType.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION);
-		}
-		return urLs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * @version J2EE1.4 deprecated, use getHttpMethods()
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getHTTPs() {
-		if (httPs == null) {
-			httPs = new EObjectContainmentEList(HTTPMethodType.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS);
-		}
-		return httPs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetSecConstraint((SecurityConstraint)otherEnd, msgs);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				return ((InternalEList)getURLs()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				return basicSetSecConstraint(null, msgs);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				return ((InternalEList)getURLs()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				return ((InternalEList)getHTTPs()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS, SecurityConstraint.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				return getWebResourceName();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				return getHttpMethod();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				return getSecConstraint();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				return getURLs();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return getDescriptions();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				return getHTTPs();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				setWebResourceName((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				getUrlPattern().clear();
-				getUrlPattern().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				getHttpMethod().clear();
-				getHttpMethod().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				getURLs().clear();
-				getURLs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				getHTTPs().clear();
-				getHTTPs().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				setWebResourceName(WEB_RESOURCE_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				getUrlPattern().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				getHttpMethod().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)null);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				getURLs().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				getHTTPs().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				return WEB_RESOURCE_NAME_EDEFAULT == null ? webResourceName != null : !WEB_RESOURCE_NAME_EDEFAULT.equals(webResourceName);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				return urlPattern != null && !urlPattern.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				return httpMethod != null && !httpMethod.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				return getSecConstraint() != null;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				return urLs != null && !urLs.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				return httPs != null && !httPs.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (webResourceName: ");
-		result.append(webResourceName);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", urlPattern: ");
-		result.append(urlPattern);
-		result.append(", httpMethod: ");
-		result.append(httpMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebTypeImpl.java
deleted file mode 100644
index 30c1d486a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebTypeImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-/**
- * @generated
- */
-public abstract class WebTypeImpl extends J2EEEObjectImpl implements WebType {
-
-	public WebTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.WEB_TYPE;
-	}
-
-/**
- * isJspType method comment.
- */
-public boolean isJspType() {
-	return false;
-}
-/**
- * isServletType method comment.
- */
-public boolean isServletType() {
-	return false;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationFactoryImpl.java
deleted file mode 100644
index 86f92c360..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationFactoryImpl.java
+++ /dev/null
@@ -1,524 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.AuthMethodKind;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.ResAuthServletType;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-/**
- * @generated
- */
-public class WebapplicationFactoryImpl extends EFactoryImpl implements WebapplicationFactory {
- 
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WebapplicationFactory init() {
-		try {
-			WebapplicationFactory theWebapplicationFactory = (WebapplicationFactory)EPackage.Registry.INSTANCE.getEFactory("webapplication.xmi"); 
-			if (theWebapplicationFactory != null) {
-				return theWebapplicationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new WebapplicationFactoryImpl();
-	}
-
-	public static final String MM_VERSION = "1.1";//$NON-NLS-1$
-	
-	public WebapplicationFactoryImpl() {
-		super(); 	
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WebapplicationPackage.WEB_APP: return createWebApp();
-			case WebapplicationPackage.CONTEXT_PARAM: return createContextParam();
-			case WebapplicationPackage.SERVLET: return createServlet();
-			case WebapplicationPackage.SERVLET_MAPPING: return createServletMapping();
-			case WebapplicationPackage.SESSION_CONFIG: return createSessionConfig();
-			case WebapplicationPackage.MIME_MAPPING: return createMimeMapping();
-			case WebapplicationPackage.WELCOME_FILE_LIST: return createWelcomeFileList();
-			case WebapplicationPackage.ERROR_PAGE: return createErrorPage();
-			case WebapplicationPackage.TAG_LIB_REF: return createTagLibRef();
-			case WebapplicationPackage.SECURITY_CONSTRAINT: return createSecurityConstraint();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION: return createWebResourceCollection();
-			case WebapplicationPackage.AUTH_CONSTRAINT: return createAuthConstraint();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT: return createUserDataConstraint();
-			case WebapplicationPackage.LOGIN_CONFIG: return createLoginConfig();
-			case WebapplicationPackage.FORM_LOGIN_CONFIG: return createFormLoginConfig();
-			case WebapplicationPackage.INIT_PARAM: return createInitParam();
-			case WebapplicationPackage.SERVLET_TYPE: return createServletType();
-			case WebapplicationPackage.JSP_TYPE: return createJSPType();
-			case WebapplicationPackage.URL_PATTERN_TYPE: return createURLPatternType();
-			case WebapplicationPackage.ROLE_NAME_TYPE: return createRoleNameType();
-			case WebapplicationPackage.WELCOME_FILE: return createWelcomeFile();
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE: return createExceptionTypeErrorPage();
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE: return createErrorCodeErrorPage();
-			case WebapplicationPackage.FILTER_MAPPING: return createFilterMapping();
-			case WebapplicationPackage.FILTER: return createFilter();
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST: return createLocalEncodingMappingList();
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING: return createLocalEncodingMapping();
-			case WebapplicationPackage.HTTP_METHOD_TYPE: return createHTTPMethodType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case WebapplicationPackage.RES_AUTH_SERVLET_TYPE:
-				return createResAuthServletTypeFromString(eDataType, initialValue);
-			case WebapplicationPackage.HTTP_METHOD_TYPE_ENUM:
-				return createHTTPMethodTypeEnumFromString(eDataType, initialValue);
-			case WebapplicationPackage.TRANSPORT_GUARANTEE_TYPE:
-				return createTransportGuaranteeTypeFromString(eDataType, initialValue);
-			case WebapplicationPackage.DISPATCHER_TYPE:
-				return createDispatcherTypeFromString(eDataType, initialValue);
-			case WebapplicationPackage.AUTH_METHOD_KIND:
-				return createAuthMethodKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case WebapplicationPackage.RES_AUTH_SERVLET_TYPE:
-				return convertResAuthServletTypeToString(eDataType, instanceValue);
-			case WebapplicationPackage.HTTP_METHOD_TYPE_ENUM:
-				return convertHTTPMethodTypeEnumToString(eDataType, instanceValue);
-			case WebapplicationPackage.TRANSPORT_GUARANTEE_TYPE:
-				return convertTransportGuaranteeTypeToString(eDataType, instanceValue);
-			case WebapplicationPackage.DISPATCHER_TYPE:
-				return convertDispatcherTypeToString(eDataType, instanceValue);
-			case WebapplicationPackage.AUTH_METHOD_KIND:
-				return convertAuthMethodKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-public static WebapplicationFactory getActiveFactory() {
-	return (WebapplicationFactory) getPackage().getEFactoryInstance();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebApp createWebApp() {
-		WebAppImpl webApp = new WebAppImpl();
-		return webApp;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ContextParam createContextParam() {
-		ContextParamImpl contextParam = new ContextParamImpl();
-		return contextParam;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ErrorPage createErrorPage() {
-		ErrorPageImpl errorPage = new ErrorPageImpl();
-		return errorPage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagLibRef createTagLibRef() {
-		TagLibRefImpl tagLibRef = new TagLibRefImpl();
-		return tagLibRef;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ExceptionTypeErrorPage createExceptionTypeErrorPage() {
-		ExceptionTypeErrorPageImpl exceptionTypeErrorPage = new ExceptionTypeErrorPageImpl();
-		return exceptionTypeErrorPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ErrorCodeErrorPage createErrorCodeErrorPage() {
-		ErrorCodeErrorPageImpl errorCodeErrorPage = new ErrorCodeErrorPageImpl();
-		return errorCodeErrorPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WelcomeFileList createWelcomeFileList() {
-		WelcomeFileListImpl welcomeFileList = new WelcomeFileListImpl();
-		return welcomeFileList;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WelcomeFile createWelcomeFile() {
-		WelcomeFileImpl welcomeFile = new WelcomeFileImpl();
-		return welcomeFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public SecurityConstraint createSecurityConstraint() {
-		SecurityConstraintImpl securityConstraint = new SecurityConstraintImpl();
-		return securityConstraint;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebResourceCollection createWebResourceCollection() {
-		WebResourceCollectionImpl webResourceCollection = new WebResourceCollectionImpl();
-		return webResourceCollection;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public URLPatternType createURLPatternType() {
-		URLPatternTypeImpl urlPatternType = new URLPatternTypeImpl();
-		return urlPatternType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public AuthConstraint createAuthConstraint() {
-		AuthConstraintImpl authConstraint = new AuthConstraintImpl();
-		return authConstraint;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public UserDataConstraint createUserDataConstraint() {
-		UserDataConstraintImpl userDataConstraint = new UserDataConstraintImpl();
-		return userDataConstraint;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LoginConfig createLoginConfig() {
-		LoginConfigImpl loginConfig = new LoginConfigImpl();
-		return loginConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public FormLoginConfig createFormLoginConfig() {
-		FormLoginConfigImpl formLoginConfig = new FormLoginConfigImpl();
-		return formLoginConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MimeMapping createMimeMapping() {
-		MimeMappingImpl mimeMapping = new MimeMappingImpl();
-		return mimeMapping;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public SessionConfig createSessionConfig() {
-		SessionConfigImpl sessionConfig = new SessionConfigImpl();
-		return sessionConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ServletMapping createServletMapping() {
-		ServletMappingImpl servletMapping = new ServletMappingImpl();
-		return servletMapping;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Servlet createServlet() {
-		ServletImpl servlet = new ServletImpl();
-		return servlet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ServletType createServletType() {
-		ServletTypeImpl servletType = new ServletTypeImpl();
-		return servletType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPType createJSPType() {
-		JSPTypeImpl jspType = new JSPTypeImpl();
-		return jspType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public InitParam createInitParam() {
-		InitParamImpl initParam = new InitParamImpl();
-		return initParam;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Filter createFilter() {
-		FilterImpl filter = new FilterImpl();
-		return filter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public FilterMapping createFilterMapping() {
-		FilterMappingImpl filterMapping = new FilterMappingImpl();
-		return filterMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocalEncodingMappingList createLocalEncodingMappingList() {
-		LocalEncodingMappingListImpl localEncodingMappingList = new LocalEncodingMappingListImpl();
-		return localEncodingMappingList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocalEncodingMapping createLocalEncodingMapping() {
-		LocalEncodingMappingImpl localEncodingMapping = new LocalEncodingMappingImpl();
-		return localEncodingMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPMethodType createHTTPMethodType() {
-		HTTPMethodTypeImpl httpMethodType = new HTTPMethodTypeImpl();
-		return httpMethodType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResAuthServletType createResAuthServletTypeFromString(EDataType eDataType, String initialValue) {
-		ResAuthServletType result = ResAuthServletType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertResAuthServletTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPMethodTypeEnum createHTTPMethodTypeEnumFromString(EDataType eDataType, String initialValue) {
-		HTTPMethodTypeEnum result = HTTPMethodTypeEnum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHTTPMethodTypeEnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransportGuaranteeType createTransportGuaranteeTypeFromString(EDataType eDataType, String initialValue) {
-		TransportGuaranteeType result = TransportGuaranteeType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTransportGuaranteeTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DispatcherType createDispatcherTypeFromString(EDataType eDataType, String initialValue) {
-		DispatcherType result = DispatcherType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDispatcherTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuthMethodKind createAuthMethodKindFromString(EDataType eDataType, String initialValue) {
-		AuthMethodKind result = AuthMethodKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAuthMethodKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public RoleNameType createRoleNameType() {
-		RoleNameTypeImpl roleNameType = new RoleNameTypeImpl();
-		return roleNameType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebapplicationPackage getWebapplicationPackage() {
-		return (WebapplicationPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static WebapplicationPackage getPackage() {
-		return WebapplicationPackage.eINSTANCE;
-	}
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java
deleted file mode 100644
index 5cf498617..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java
+++ /dev/null
@@ -1,1861 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.AuthMethodKind;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.ResAuthServletType;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-public class WebapplicationPackageImpl extends EPackageImpl implements WebapplicationPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webAppEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contextParamEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sessionConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass welcomeFileListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass errorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webResourceCollectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass authConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userDataConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass loginConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass formLoginConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass initParamEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass urlPatternTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleNameTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass welcomeFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass exceptionTypeErrorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass errorCodeErrorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass filterMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass filterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass localEncodingMappingListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass localEncodingMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpMethodTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resAuthServletTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum httpMethodTypeEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transportGuaranteeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum dispatcherTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum authMethodKindEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private WebapplicationPackageImpl() {
-		super(eNS_URI, WebapplicationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static WebapplicationPackage init() {
-		if (isInited) return (WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WebapplicationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theWebapplicationPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theWebapplicationPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theWebapplicationPackage.freeze();
-
-		return theWebapplicationPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebApp() {
-		return webAppEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebApp_Distributable() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_Version() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Contexts() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_ErrorPages() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_FileList() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_TagLibs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Constraints() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_LoginConfig() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_MimeMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_SessionConfig() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_ServletMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Servlets() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_SecurityRoles() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Filters() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_FilterMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Listeners() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ContextParams() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_JspConfig() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_MessageDestinations() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_LocalEncodingMappingList() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getContextParam() {
-		return contextParamEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContextParam_ParamName() {
-		return (EAttribute)contextParamEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContextParam_ParamValue() {
-		return (EAttribute)contextParamEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContextParam_Description() {
-		return (EAttribute)contextParamEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContextParam_WebApp() {
-		return (EReference)contextParamEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getErrorPage() {
-		return errorPageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getErrorPage_Location() {
-		return (EAttribute)errorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getErrorPage_WebApp() {
-		return (EReference)errorPageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getExceptionTypeErrorPage() {
-		return exceptionTypeErrorPageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getExceptionTypeErrorPage_ExceptionType() {
-		return (EReference)exceptionTypeErrorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getErrorCodeErrorPage() {
-		return errorCodeErrorPageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getErrorCodeErrorPage_ErrorCode() {
-		return (EAttribute)errorCodeErrorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWelcomeFileList() {
-		return welcomeFileListEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWelcomeFileList_WebApp() {
-		return (EReference)welcomeFileListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWelcomeFileList_File() {
-		return (EReference)welcomeFileListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWelcomeFile() {
-		return welcomeFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWelcomeFile_WelcomeFile() {
-		return (EAttribute)welcomeFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWelcomeFile_FileList() {
-		return (EReference)welcomeFileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getTagLibRef() {
-		return tagLibRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLibRef_TaglibURI() {
-		return (EAttribute)tagLibRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLibRef_TaglibLocation() {
-		return (EAttribute)tagLibRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagLibRef_WebApp() {
-		return (EReference)tagLibRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityConstraint() {
-		return securityConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityConstraint_DisplayName() {
-		return (EAttribute)securityConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_WebApp() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_WebResourceCollections() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_AuthConstraint() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_UserDataConstraint() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityConstraint_DisplayNames() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebResourceCollection() {
-		return webResourceCollectionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebResourceCollection_WebResourceName() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebResourceCollection_Description() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_UrlPattern() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_HttpMethod() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebResourceCollection_SecConstraint() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebResourceCollection_URLs() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebResourceCollection_Descriptions() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebResourceCollection_HTTPs() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getURLPatternType() {
-		return urlPatternTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getURLPatternType_UrlPattern() {
-		return (EAttribute)urlPatternTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getURLPatternType_ResCollection() {
-		return (EReference)urlPatternTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getHTTPMethodType() {
-		return httpMethodTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPMethodType_HttpMethod() {
-		return (EAttribute)httpMethodTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getAuthConstraint() {
-		return authConstraintEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthConstraint_Description() {
-		return (EAttribute)authConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthConstraint_Roles() {
-		return (EAttribute)authConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAuthConstraint_SecConstraint() {
-		return (EReference)authConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuthConstraint_Descriptions() {
-		return (EReference)authConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getUserDataConstraint() {
-		return userDataConstraintEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getUserDataConstraint_Description() {
-		return (EAttribute)userDataConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getUserDataConstraint_TransportGuarantee() {
-		return (EAttribute)userDataConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getUserDataConstraint_SecConstraint() {
-		return (EReference)userDataConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUserDataConstraint_Descriptions() {
-		return (EReference)userDataConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLoginConfig() {
-		return loginConfigEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLoginConfig_AuthMethod() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLoginConfig_RealmName() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLoginConfig_AuthorizationMethod() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLoginConfig_WebApp() {
-		return (EReference)loginConfigEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLoginConfig_FormLoginConfig() {
-		return (EReference)loginConfigEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFormLoginConfig() {
-		return formLoginConfigEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFormLoginConfig_FormLoginPage() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFormLoginConfig_FormErrorPage() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFormLoginConfig_LoginConfig() {
-		return (EReference)formLoginConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMimeMapping() {
-		return mimeMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMimeMapping_Extension() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMimeMapping_MimeType() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMimeMapping_WebApp() {
-		return (EReference)mimeMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSessionConfig() {
-		return sessionConfigEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSessionConfig_SessionTimeout() {
-		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSessionConfig_WebApp() {
-		return (EReference)sessionConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getServletMapping() {
-		return servletMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServletMapping_UrlPattern() {
-		return (EAttribute)servletMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServletMapping_Name() {
-		return (EAttribute)servletMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServletMapping_WebApp() {
-		return (EReference)servletMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServletMapping_Servlet() {
-		return (EReference)servletMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getServlet() {
-		return servletEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServlet_ServletName() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServlet_LoadOnStartup() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_WebApp() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_WebType() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_Params() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_SecurityRoleRefs() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_RunAs() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_InitParams() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebType() {
-		return webTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getServletType() {
-		return servletTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServletType_ClassName() {
-		return (EAttribute)servletTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPType() {
-		return jspTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPType_JspFile() {
-		return (EAttribute)jspTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getInitParam() {
-		return initParamEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitParam_ParamName() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitParam_ParamValue() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitParam_Description() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFilter() {
-		return filterEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFilter_Name() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilter_InitParams() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilter_FilterClass() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilter_InitParamValues() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFilterMapping() {
-		return filterMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFilterMapping_UrlPattern() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_DispatcherType() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilterMapping_Filter() {
-		return (EReference)filterMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilterMapping_Servlet() {
-		return (EReference)filterMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocalEncodingMappingList() {
-		return localEncodingMappingListEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLocalEncodingMappingList_LocalEncodingMappings() {
-		return (EReference)localEncodingMappingListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocalEncodingMapping() {
-		return localEncodingMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocalEncodingMapping_Locale() {
-		return (EAttribute)localEncodingMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocalEncodingMapping_Encoding() {
-		return (EAttribute)localEncodingMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getResAuthServletType() {
-		return resAuthServletTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getHTTPMethodTypeEnum() {
-		return httpMethodTypeEnumEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRoleNameType() {
-		return roleNameTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getRoleNameType_RoleName() {
-		return (EAttribute)roleNameTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransportGuaranteeType() {
-		return transportGuaranteeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getDispatcherType() {
-		return dispatcherTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAuthMethodKind() {
-		return authMethodKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebapplicationFactory getWebapplicationFactory() {
-		return (WebapplicationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		webAppEClass = createEClass(WEB_APP);
-		createEAttribute(webAppEClass, WEB_APP__DISTRIBUTABLE);
-		createEAttribute(webAppEClass, WEB_APP__VERSION);
-		createEReference(webAppEClass, WEB_APP__CONTEXTS);
-		createEReference(webAppEClass, WEB_APP__ERROR_PAGES);
-		createEReference(webAppEClass, WEB_APP__FILE_LIST);
-		createEReference(webAppEClass, WEB_APP__TAG_LIBS);
-		createEReference(webAppEClass, WEB_APP__CONSTRAINTS);
-		createEReference(webAppEClass, WEB_APP__LOGIN_CONFIG);
-		createEReference(webAppEClass, WEB_APP__MIME_MAPPINGS);
-		createEReference(webAppEClass, WEB_APP__SESSION_CONFIG);
-		createEReference(webAppEClass, WEB_APP__SERVLET_MAPPINGS);
-		createEReference(webAppEClass, WEB_APP__SERVLETS);
-		createEReference(webAppEClass, WEB_APP__SECURITY_ROLES);
-		createEReference(webAppEClass, WEB_APP__FILTERS);
-		createEReference(webAppEClass, WEB_APP__FILTER_MAPPINGS);
-		createEReference(webAppEClass, WEB_APP__LISTENERS);
-		createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS);
-		createEReference(webAppEClass, WEB_APP__JSP_CONFIG);
-		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
-		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPING_LIST);
-
-		contextParamEClass = createEClass(CONTEXT_PARAM);
-		createEAttribute(contextParamEClass, CONTEXT_PARAM__PARAM_NAME);
-		createEAttribute(contextParamEClass, CONTEXT_PARAM__PARAM_VALUE);
-		createEAttribute(contextParamEClass, CONTEXT_PARAM__DESCRIPTION);
-		createEReference(contextParamEClass, CONTEXT_PARAM__WEB_APP);
-
-		servletEClass = createEClass(SERVLET);
-		createEAttribute(servletEClass, SERVLET__SERVLET_NAME);
-		createEAttribute(servletEClass, SERVLET__LOAD_ON_STARTUP);
-		createEReference(servletEClass, SERVLET__WEB_APP);
-		createEReference(servletEClass, SERVLET__WEB_TYPE);
-		createEReference(servletEClass, SERVLET__PARAMS);
-		createEReference(servletEClass, SERVLET__SECURITY_ROLE_REFS);
-		createEReference(servletEClass, SERVLET__RUN_AS);
-		createEReference(servletEClass, SERVLET__INIT_PARAMS);
-
-		servletMappingEClass = createEClass(SERVLET_MAPPING);
-		createEAttribute(servletMappingEClass, SERVLET_MAPPING__URL_PATTERN);
-		createEAttribute(servletMappingEClass, SERVLET_MAPPING__NAME);
-		createEReference(servletMappingEClass, SERVLET_MAPPING__WEB_APP);
-		createEReference(servletMappingEClass, SERVLET_MAPPING__SERVLET);
-
-		sessionConfigEClass = createEClass(SESSION_CONFIG);
-		createEAttribute(sessionConfigEClass, SESSION_CONFIG__SESSION_TIMEOUT);
-		createEReference(sessionConfigEClass, SESSION_CONFIG__WEB_APP);
-
-		mimeMappingEClass = createEClass(MIME_MAPPING);
-		createEAttribute(mimeMappingEClass, MIME_MAPPING__EXTENSION);
-		createEAttribute(mimeMappingEClass, MIME_MAPPING__MIME_TYPE);
-		createEReference(mimeMappingEClass, MIME_MAPPING__WEB_APP);
-
-		welcomeFileListEClass = createEClass(WELCOME_FILE_LIST);
-		createEReference(welcomeFileListEClass, WELCOME_FILE_LIST__WEB_APP);
-		createEReference(welcomeFileListEClass, WELCOME_FILE_LIST__FILE);
-
-		errorPageEClass = createEClass(ERROR_PAGE);
-		createEAttribute(errorPageEClass, ERROR_PAGE__LOCATION);
-		createEReference(errorPageEClass, ERROR_PAGE__WEB_APP);
-
-		tagLibRefEClass = createEClass(TAG_LIB_REF);
-		createEAttribute(tagLibRefEClass, TAG_LIB_REF__TAGLIB_URI);
-		createEAttribute(tagLibRefEClass, TAG_LIB_REF__TAGLIB_LOCATION);
-		createEReference(tagLibRefEClass, TAG_LIB_REF__WEB_APP);
-
-		securityConstraintEClass = createEClass(SECURITY_CONSTRAINT);
-		createEAttribute(securityConstraintEClass, SECURITY_CONSTRAINT__DISPLAY_NAME);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__WEB_APP);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__AUTH_CONSTRAINT);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__DISPLAY_NAMES);
-
-		webResourceCollectionEClass = createEClass(WEB_RESOURCE_COLLECTION);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__DESCRIPTION);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__URL_PATTERN);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTTP_METHOD);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__UR_LS);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTT_PS);
-
-		authConstraintEClass = createEClass(AUTH_CONSTRAINT);
-		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__DESCRIPTION);
-		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__ROLES);
-		createEReference(authConstraintEClass, AUTH_CONSTRAINT__SEC_CONSTRAINT);
-		createEReference(authConstraintEClass, AUTH_CONSTRAINT__DESCRIPTIONS);
-
-		userDataConstraintEClass = createEClass(USER_DATA_CONSTRAINT);
-		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__DESCRIPTION);
-		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE);
-		createEReference(userDataConstraintEClass, USER_DATA_CONSTRAINT__SEC_CONSTRAINT);
-		createEReference(userDataConstraintEClass, USER_DATA_CONSTRAINT__DESCRIPTIONS);
-
-		loginConfigEClass = createEClass(LOGIN_CONFIG);
-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__AUTH_METHOD);
-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__REALM_NAME);
-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__AUTHORIZATION_METHOD);
-		createEReference(loginConfigEClass, LOGIN_CONFIG__WEB_APP);
-		createEReference(loginConfigEClass, LOGIN_CONFIG__FORM_LOGIN_CONFIG);
-
-		formLoginConfigEClass = createEClass(FORM_LOGIN_CONFIG);
-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE);
-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_ERROR_PAGE);
-		createEReference(formLoginConfigEClass, FORM_LOGIN_CONFIG__LOGIN_CONFIG);
-
-		initParamEClass = createEClass(INIT_PARAM);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_NAME);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_VALUE);
-		createEAttribute(initParamEClass, INIT_PARAM__DESCRIPTION);
-
-		webTypeEClass = createEClass(WEB_TYPE);
-
-		servletTypeEClass = createEClass(SERVLET_TYPE);
-		createEAttribute(servletTypeEClass, SERVLET_TYPE__CLASS_NAME);
-
-		jspTypeEClass = createEClass(JSP_TYPE);
-		createEAttribute(jspTypeEClass, JSP_TYPE__JSP_FILE);
-
-		urlPatternTypeEClass = createEClass(URL_PATTERN_TYPE);
-		createEAttribute(urlPatternTypeEClass, URL_PATTERN_TYPE__URL_PATTERN);
-		createEReference(urlPatternTypeEClass, URL_PATTERN_TYPE__RES_COLLECTION);
-
-		roleNameTypeEClass = createEClass(ROLE_NAME_TYPE);
-		createEAttribute(roleNameTypeEClass, ROLE_NAME_TYPE__ROLE_NAME);
-
-		welcomeFileEClass = createEClass(WELCOME_FILE);
-		createEAttribute(welcomeFileEClass, WELCOME_FILE__WELCOME_FILE);
-		createEReference(welcomeFileEClass, WELCOME_FILE__FILE_LIST);
-
-		exceptionTypeErrorPageEClass = createEClass(EXCEPTION_TYPE_ERROR_PAGE);
-		createEReference(exceptionTypeErrorPageEClass, EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE);
-
-		errorCodeErrorPageEClass = createEClass(ERROR_CODE_ERROR_PAGE);
-		createEAttribute(errorCodeErrorPageEClass, ERROR_CODE_ERROR_PAGE__ERROR_CODE);
-
-		filterMappingEClass = createEClass(FILTER_MAPPING);
-		createEAttribute(filterMappingEClass, FILTER_MAPPING__URL_PATTERN);
-		createEAttribute(filterMappingEClass, FILTER_MAPPING__DISPATCHER_TYPE);
-		createEReference(filterMappingEClass, FILTER_MAPPING__FILTER);
-		createEReference(filterMappingEClass, FILTER_MAPPING__SERVLET);
-
-		filterEClass = createEClass(FILTER);
-		createEAttribute(filterEClass, FILTER__NAME);
-		createEReference(filterEClass, FILTER__INIT_PARAMS);
-		createEReference(filterEClass, FILTER__FILTER_CLASS);
-		createEReference(filterEClass, FILTER__INIT_PARAM_VALUES);
-
-		localEncodingMappingListEClass = createEClass(LOCAL_ENCODING_MAPPING_LIST);
-		createEReference(localEncodingMappingListEClass, LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
-
-		localEncodingMappingEClass = createEClass(LOCAL_ENCODING_MAPPING);
-		createEAttribute(localEncodingMappingEClass, LOCAL_ENCODING_MAPPING__LOCALE);
-		createEAttribute(localEncodingMappingEClass, LOCAL_ENCODING_MAPPING__ENCODING);
-
-		httpMethodTypeEClass = createEClass(HTTP_METHOD_TYPE);
-		createEAttribute(httpMethodTypeEClass, HTTP_METHOD_TYPE__HTTP_METHOD);
-
-		// Create enums
-		resAuthServletTypeEEnum = createEEnum(RES_AUTH_SERVLET_TYPE);
-		httpMethodTypeEnumEEnum = createEEnum(HTTP_METHOD_TYPE_ENUM);
-		transportGuaranteeTypeEEnum = createEEnum(TRANSPORT_GUARANTEE_TYPE);
-		dispatcherTypeEEnum = createEEnum(DISPATCHER_TYPE);
-		authMethodKindEEnum = createEEnum(AUTH_METHOD_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JspPackage theJspPackage = (JspPackage)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		webAppEClass.getESuperTypes().add(theCommonPackage.getJNDIEnvRefsGroup());
-		contextParamEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		servletEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		servletMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		sessionConfigEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		mimeMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		welcomeFileListEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		errorPageEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		tagLibRefEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		securityConstraintEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		webResourceCollectionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		authConstraintEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		userDataConstraintEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		loginConfigEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		formLoginConfigEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		initParamEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		webTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		servletTypeEClass.getESuperTypes().add(this.getWebType());
-		jspTypeEClass.getESuperTypes().add(this.getWebType());
-		urlPatternTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		roleNameTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		welcomeFileEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		exceptionTypeErrorPageEClass.getESuperTypes().add(this.getErrorPage());
-		errorCodeErrorPageEClass.getESuperTypes().add(this.getErrorPage());
-		filterMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		filterEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		localEncodingMappingListEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		localEncodingMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		httpMethodTypeEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWebApp_Distributable(), ecorePackage.getEBoolean(), "distributable", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebApp_Version(), ecorePackage.getEString(), "version", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_Contexts(), this.getContextParam(), this.getContextParam_WebApp(), "contexts", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_ErrorPages(), this.getErrorPage(), this.getErrorPage_WebApp(), "errorPages", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_FileList(), this.getWelcomeFileList(), this.getWelcomeFileList_WebApp(), "fileList", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_TagLibs(), this.getTagLibRef(), this.getTagLibRef_WebApp(), "tagLibs", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_Constraints(), this.getSecurityConstraint(), this.getSecurityConstraint_WebApp(), "constraints", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_LoginConfig(), this.getLoginConfig(), this.getLoginConfig_WebApp(), "loginConfig", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_MimeMappings(), this.getMimeMapping(), this.getMimeMapping_WebApp(), "mimeMappings", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_SessionConfig(), this.getSessionConfig(), this.getSessionConfig_WebApp(), "sessionConfig", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_ServletMappings(), this.getServletMapping(), this.getServletMapping_WebApp(), "servletMappings", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_Servlets(), this.getServlet(), this.getServlet_WebApp(), "servlets", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_SecurityRoles(), theCommonPackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_Listeners(), theCommonPackage.getListener(), null, "listeners", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_ContextParams(), theCommonPackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_JspConfig(), theJspPackage.getJSPConfig(), null, "jspConfig", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_MessageDestinations(), theCommonPackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebApp_LocalEncodingMappingList(), this.getLocalEncodingMappingList(), null, "localEncodingMappingList", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contextParamEClass, ContextParam.class, "ContextParam", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContextParam_ParamName(), ecorePackage.getEString(), "paramName", null, 0, 1, ContextParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContextParam_ParamValue(), ecorePackage.getEString(), "paramValue", null, 0, 1, ContextParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContextParam_Description(), ecorePackage.getEString(), "description", null, 0, 1, ContextParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContextParam_WebApp(), this.getWebApp(), this.getWebApp_Contexts(), "webApp", null, 0, 1, ContextParam.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(servletEClass, Servlet.class, "Servlet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServlet_ServletName(), ecorePackage.getEString(), "servletName", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServlet_LoadOnStartup(), ecorePackage.getEIntegerObject(), "loadOnStartup", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServlet_WebApp(), this.getWebApp(), this.getWebApp_Servlets(), "webApp", null, 0, 1, Servlet.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServlet_WebType(), this.getWebType(), null, "webType", null, 1, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServlet_Params(), this.getInitParam(), null, "params", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServlet_SecurityRoleRefs(), theCommonPackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServlet_RunAs(), theCommonPackage.getRunAsSpecifiedIdentity(), null, "runAs", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServlet_InitParams(), theCommonPackage.getParamValue(), null, "initParams", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(servletMappingEClass, ServletMapping.class, "ServletMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServletMapping_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServletMapping_Name(), ecorePackage.getEString(), "name", null, 0, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServletMapping_WebApp(), this.getWebApp(), this.getWebApp_ServletMappings(), "webApp", null, 0, 1, ServletMapping.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServletMapping_Servlet(), this.getServlet(), null, "servlet", null, 1, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(sessionConfigEClass, SessionConfig.class, "SessionConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSessionConfig_SessionTimeout(), ecorePackage.getEInt(), "sessionTimeout", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSessionConfig_WebApp(), this.getWebApp(), this.getWebApp_SessionConfig(), "webApp", null, 0, 1, SessionConfig.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(mimeMappingEClass, MimeMapping.class, "MimeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMimeMapping_Extension(), ecorePackage.getEString(), "extension", null, 0, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMimeMapping_MimeType(), ecorePackage.getEString(), "mimeType", null, 0, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMimeMapping_WebApp(), this.getWebApp(), this.getWebApp_MimeMappings(), "webApp", null, 0, 1, MimeMapping.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(welcomeFileListEClass, WelcomeFileList.class, "WelcomeFileList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWelcomeFileList_WebApp(), this.getWebApp(), this.getWebApp_FileList(), "webApp", null, 0, 1, WelcomeFileList.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWelcomeFileList_File(), this.getWelcomeFile(), this.getWelcomeFile_FileList(), "file", null, 0, -1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(errorPageEClass, ErrorPage.class, "ErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getErrorPage_Location(), ecorePackage.getEString(), "location", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getErrorPage_WebApp(), this.getWebApp(), this.getWebApp_ErrorPages(), "webApp", null, 0, 1, ErrorPage.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tagLibRefEClass, TagLibRef.class, "TagLibRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTagLibRef_TaglibURI(), ecorePackage.getEString(), "taglibURI", null, 0, 1, TagLibRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTagLibRef_TaglibLocation(), ecorePackage.getEString(), "taglibLocation", null, 0, 1, TagLibRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTagLibRef_WebApp(), this.getWebApp(), this.getWebApp_TagLibs(), "webApp", null, 0, 1, TagLibRef.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(securityConstraintEClass, SecurityConstraint.class, "SecurityConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSecurityConstraint_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityConstraint_WebApp(), this.getWebApp(), this.getWebApp_Constraints(), "webApp", null, 0, 1, SecurityConstraint.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityConstraint_WebResourceCollections(), this.getWebResourceCollection(), this.getWebResourceCollection_SecConstraint(), "webResourceCollections", null, 1, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityConstraint_AuthConstraint(), this.getAuthConstraint(), this.getAuthConstraint_SecConstraint(), "authConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityConstraint_UserDataConstraint(), this.getUserDataConstraint(), this.getUserDataConstraint_SecConstraint(), "userDataConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSecurityConstraint_DisplayNames(), theCommonPackage.getDisplayName(), null, "displayNames", null, 0, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(webResourceCollectionEClass, WebResourceCollection.class, "WebResourceCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWebResourceCollection_WebResourceName(), ecorePackage.getEString(), "webResourceName", null, 0, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebResourceCollection_Description(), ecorePackage.getEString(), "description", null, 0, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebResourceCollection_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 1, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebResourceCollection_HttpMethod(), this.getHTTPMethodTypeEnum(), "httpMethod", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebResourceCollection_SecConstraint(), this.getSecurityConstraint(), this.getSecurityConstraint_WebResourceCollections(), "secConstraint", null, 0, 1, WebResourceCollection.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebResourceCollection_URLs(), this.getURLPatternType(), this.getURLPatternType_ResCollection(), "URLs", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebResourceCollection_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebResourceCollection_HTTPs(), this.getHTTPMethodType(), null, "HTTPs", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(authConstraintEClass, AuthConstraint.class, "AuthConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAuthConstraint_Description(), ecorePackage.getEString(), "description", null, 0, 1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuthConstraint_Roles(), ecorePackage.getEString(), "roles", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuthConstraint_SecConstraint(), this.getSecurityConstraint(), this.getSecurityConstraint_AuthConstraint(), "secConstraint", null, 0, 1, AuthConstraint.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuthConstraint_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(userDataConstraintEClass, UserDataConstraint.class, "UserDataConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getUserDataConstraint_Description(), ecorePackage.getEString(), "description", null, 0, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUserDataConstraint_TransportGuarantee(), this.getTransportGuaranteeType(), "transportGuarantee", null, 0, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getUserDataConstraint_SecConstraint(), this.getSecurityConstraint(), this.getSecurityConstraint_UserDataConstraint(), "secConstraint", null, 0, 1, UserDataConstraint.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getUserDataConstraint_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(loginConfigEClass, LoginConfig.class, "LoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLoginConfig_AuthMethod(), this.getAuthMethodKind(), "authMethod", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLoginConfig_RealmName(), ecorePackage.getEString(), "realmName", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLoginConfig_AuthorizationMethod(), ecorePackage.getEString(), "authorizationMethod", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLoginConfig_WebApp(), this.getWebApp(), this.getWebApp_LoginConfig(), "webApp", null, 0, 1, LoginConfig.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLoginConfig_FormLoginConfig(), this.getFormLoginConfig(), this.getFormLoginConfig_LoginConfig(), "formLoginConfig", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(formLoginConfigEClass, FormLoginConfig.class, "FormLoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFormLoginConfig_FormLoginPage(), ecorePackage.getEString(), "formLoginPage", null, 0, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFormLoginConfig_FormErrorPage(), ecorePackage.getEString(), "formErrorPage", null, 0, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFormLoginConfig_LoginConfig(), this.getLoginConfig(), this.getLoginConfig_FormLoginConfig(), "loginConfig", null, 0, 1, FormLoginConfig.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(initParamEClass, InitParam.class, "InitParam", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInitParam_ParamName(), ecorePackage.getEString(), "paramName", null, 0, 1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInitParam_ParamValue(), ecorePackage.getEString(), "paramValue", null, 0, 1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInitParam_Description(), ecorePackage.getEString(), "description", null, 0, 1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(webTypeEClass, WebType.class, "WebType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(servletTypeEClass, ServletType.class, "ServletType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServletType_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, ServletType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(jspTypeEClass, JSPType.class, "JSPType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJSPType_JspFile(), ecorePackage.getEString(), "jspFile", null, 0, 1, JSPType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(urlPatternTypeEClass, URLPatternType.class, "URLPatternType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getURLPatternType_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, 1, URLPatternType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getURLPatternType_ResCollection(), this.getWebResourceCollection(), this.getWebResourceCollection_URLs(), "resCollection", null, 0, 1, URLPatternType.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleNameTypeEClass, RoleNameType.class, "RoleNameType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleNameType_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, RoleNameType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(welcomeFileEClass, WelcomeFile.class, "WelcomeFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWelcomeFile_WelcomeFile(), ecorePackage.getEString(), "welcomeFile", null, 0, 1, WelcomeFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWelcomeFile_FileList(), this.getWelcomeFileList(), this.getWelcomeFileList_File(), "fileList", null, 0, 1, WelcomeFile.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(exceptionTypeErrorPageEClass, ExceptionTypeErrorPage.class, "ExceptionTypeErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getExceptionTypeErrorPage_ExceptionType(), theJavaRefPackage.getJavaClass(), null, "exceptionType", null, 1, 1, ExceptionTypeErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(errorCodeErrorPageEClass, ErrorCodeErrorPage.class, "ErrorCodeErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getErrorCodeErrorPage_ErrorCode(), ecorePackage.getEString(), "errorCode", null, 0, 1, ErrorCodeErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(filterMappingEClass, FilterMapping.class, "FilterMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFilterMapping_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFilterMapping_DispatcherType(), this.getDispatcherType(), "dispatcherType", null, 0, 4, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFilterMapping_Filter(), this.getFilter(), null, "filter", null, 1, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFilterMapping_Servlet(), this.getServlet(), null, "servlet", null, 0, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFilter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFilter_InitParams(), this.getInitParam(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFilter_FilterClass(), theJavaRefPackage.getJavaClass(), null, "filterClass", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFilter_InitParamValues(), theCommonPackage.getParamValue(), null, "initParamValues", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(localEncodingMappingListEClass, LocalEncodingMappingList.class, "LocalEncodingMappingList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLocalEncodingMappingList_LocalEncodingMappings(), this.getLocalEncodingMapping(), null, "localEncodingMappings", null, 1, -1, LocalEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(localEncodingMappingEClass, LocalEncodingMapping.class, "LocalEncodingMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLocalEncodingMapping_Locale(), ecorePackage.getEString(), "locale", null, 0, 1, LocalEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLocalEncodingMapping_Encoding(), ecorePackage.getEString(), "encoding", null, 0, 1, LocalEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(httpMethodTypeEClass, HTTPMethodType.class, "HTTPMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getHTTPMethodType_HttpMethod(), ecorePackage.getEString(), "httpMethod", null, 0, 1, HTTPMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(resAuthServletTypeEEnum, ResAuthServletType.class, "ResAuthServletType");
-		addEEnumLiteral(resAuthServletTypeEEnum, ResAuthServletType.CONTAINER_LITERAL);
-		addEEnumLiteral(resAuthServletTypeEEnum, ResAuthServletType.SERVLET_LITERAL);
-
-		initEEnum(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.class, "HTTPMethodTypeEnum");
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.GET_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.POST_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.PUT_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.DELETE_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.HEAD_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.OPTIONS_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.TRACE_LITERAL);
-
-		initEEnum(transportGuaranteeTypeEEnum, TransportGuaranteeType.class, "TransportGuaranteeType");
-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.NONE_LITERAL);
-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.INTEGRAL_LITERAL);
-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.CONFIDENTIAL_LITERAL);
-
-		initEEnum(dispatcherTypeEEnum, DispatcherType.class, "DispatcherType");
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.FORWARD_LITERAL);
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.INCLUDE_LITERAL);
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.REQUEST_LITERAL);
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ERROR_LITERAL);
-
-		initEEnum(authMethodKindEEnum, AuthMethodKind.class, "AuthMethodKind");
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.UNSPECIFIED_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.BASIC_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.DIGEST_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.FORM_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.CLIENT_CERT_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //WebapplicationPackageImpl
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WelcomeFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WelcomeFileImpl.java
deleted file mode 100644
index f91739829..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WelcomeFileImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-/**
- * The welcome-file element contains file name to use as a default welcome file, such as index.html
- * @generated
- */
-public class WelcomeFileImpl extends J2EEEObjectImpl implements WelcomeFile {
-
-	/**
-	 * The default value of the '{@link #getWelcomeFile() <em>Welcome File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWelcomeFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WELCOME_FILE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String welcomeFile = WELCOME_FILE_EDEFAULT;
-	public WelcomeFileImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.WELCOME_FILE;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getWelcomeFile() {
-		return welcomeFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWelcomeFile(String newWelcomeFile) {
-		String oldWelcomeFile = welcomeFile;
-		welcomeFile = newWelcomeFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WELCOME_FILE__WELCOME_FILE, oldWelcomeFile, welcomeFile));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WelcomeFileList getFileList() {
-		if (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE__FILE_LIST) return null;
-		return (WelcomeFileList)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFileList(WelcomeFileList newFileList, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newFileList, WebapplicationPackage.WELCOME_FILE__FILE_LIST, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFileList(WelcomeFileList newFileList) {
-		if (newFileList != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE__FILE_LIST && newFileList != null)) {
-			if (EcoreUtil.isAncestor(this, newFileList))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newFileList != null)
-				msgs = ((InternalEObject)newFileList).eInverseAdd(this, WebapplicationPackage.WELCOME_FILE_LIST__FILE, WelcomeFileList.class, msgs);
-			msgs = basicSetFileList(newFileList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WELCOME_FILE__FILE_LIST, newFileList, newFileList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetFileList((WelcomeFileList)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				return basicSetFileList(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WELCOME_FILE_LIST__FILE, WelcomeFileList.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				return getWelcomeFile();
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				return getFileList();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				setWelcomeFile((String)newValue);
-				return;
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				setFileList((WelcomeFileList)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				setWelcomeFile(WELCOME_FILE_EDEFAULT);
-				return;
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				setFileList((WelcomeFileList)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				return WELCOME_FILE_EDEFAULT == null ? welcomeFile != null : !WELCOME_FILE_EDEFAULT.equals(welcomeFile);
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				return getFileList() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (welcomeFile: ");
-		result.append(welcomeFile);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WelcomeFileListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WelcomeFileListImpl.java
deleted file mode 100644
index ac162529e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WelcomeFileListImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-/**
- * The welcome-file-list contains an ordered list of welcome files elements.
- * @generated
- */
-public class WelcomeFileListImpl extends J2EEEObjectImpl implements WelcomeFileList {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList file = null;
-	public WelcomeFileListImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.Literals.WELCOME_FILE_LIST;
-	}
-
-/**
- * addFileNamed method comment.
- */
-public void addFileNamed(java.lang.String name) {
-	WelcomeFile lfile = ((WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI)).getWebapplicationFactory().createWelcomeFile();
-	lfile.setWelcomeFile(name);
-	getFile().add(lfile);
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP) return null;
-		return (WebApp)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebApp(WebApp newWebApp, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, msgs);
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eInternalContainer() || (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__FILE_LIST, WebApp.class, msgs);
-			msgs = basicSetWebApp(newWebApp, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getFile() {
-		if (file == null) {
-			file = new EObjectContainmentWithInverseEList(WelcomeFile.class, this, WebapplicationPackage.WELCOME_FILE_LIST__FILE, WebapplicationPackage.WELCOME_FILE__FILE_LIST);
-		}
-		return file;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetWebApp((WebApp)otherEnd, msgs);
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				return ((InternalEList)getFile()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				return basicSetWebApp(null, msgs);
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				return ((InternalEList)getFile()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				return eInternalContainer().eInverseRemove(this, WebapplicationPackage.WEB_APP__FILE_LIST, WebApp.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				return getFile();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				getFile().clear();
-				getFile().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				getFile().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				return file != null && !file.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/util/WebapplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/util/WebapplicationAdapterFactory.java
deleted file mode 100644
index 94527294e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/util/WebapplicationAdapterFactory.java
+++ /dev/null
@@ -1,710 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-
-public class WebapplicationAdapterFactory extends AdapterFactoryImpl {
-	protected static WebapplicationPackage modelPackage;
-
-	public WebapplicationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected WebapplicationSwitch sw = new WebapplicationSwitch() {
-		public Object caseWebApp(WebApp object) {
-			return createWebAppAdapter();
-		}
-		public Object caseContextParam(ContextParam object) {
-			return createContextParamAdapter();
-		}
-		public Object caseErrorPage(ErrorPage object) {
-			return createErrorPageAdapter();
-		}
-		public Object caseExceptionTypeErrorPage(ExceptionTypeErrorPage object) {
-			return createExceptionTypeErrorPageAdapter();
-		}
-		public Object caseErrorCodeErrorPage(ErrorCodeErrorPage object) {
-			return createErrorCodeErrorPageAdapter();
-		}
-		public Object caseWelcomeFileList(WelcomeFileList object) {
-			return createWelcomeFileListAdapter();
-		}
-		public Object caseWelcomeFile(WelcomeFile object) {
-			return createWelcomeFileAdapter();
-		}
-		public Object caseTagLibRef(TagLibRef object) {
-			return createTagLibRefAdapter();
-		}
-		public Object caseSecurityConstraint(SecurityConstraint object) {
-			return createSecurityConstraintAdapter();
-		}
-		public Object caseWebResourceCollection(WebResourceCollection object) {
-			return createWebResourceCollectionAdapter();
-		}
-		public Object caseURLPatternType(URLPatternType object) {
-			return createURLPatternTypeAdapter();
-		}
-		public Object caseHTTPMethodType(HTTPMethodType object) {
-			return createHTTPMethodTypeAdapter();
-		}
-		public Object caseAuthConstraint(AuthConstraint object) {
-			return createAuthConstraintAdapter();
-		}
-		public Object caseUserDataConstraint(UserDataConstraint object) {
-			return createUserDataConstraintAdapter();
-		}
-		public Object caseLoginConfig(LoginConfig object) {
-			return createLoginConfigAdapter();
-		}
-		public Object caseFormLoginConfig(FormLoginConfig object) {
-			return createFormLoginConfigAdapter();
-		}
-		public Object caseMimeMapping(MimeMapping object) {
-			return createMimeMappingAdapter();
-		}
-		public Object caseSessionConfig(SessionConfig object) {
-			return createSessionConfigAdapter();
-		}
-		public Object caseServletMapping(ServletMapping object) {
-			return createServletMappingAdapter();
-		}
-		public Object caseServlet(Servlet object) {
-			return createServletAdapter();
-		}
-		public Object caseWebType(WebType object) {
-			return createWebTypeAdapter();
-		}
-		public Object caseServletType(ServletType object) {
-			return createServletTypeAdapter();
-		}
-		public Object caseJSPType(JSPType object) {
-			return createJSPTypeAdapter();
-		}
-		public Object caseInitParam(InitParam object) {
-			return createInitParamAdapter();
-		}
-		public Object caseFilter(Filter object) {
-			return createFilterAdapter();
-		}
-		public Object caseFilterMapping(FilterMapping object) {
-			return createFilterMappingAdapter();
-		}
-		public Object caseRoleNameType(RoleNameType object) {
-			return createRoleNameTypeAdapter();
-		}
-		public Object caseLocalEncodingMappingList(LocalEncodingMappingList object) {
-			return createLocalEncodingMappingListAdapter();
-		}
-		public Object caseLocalEncodingMapping(LocalEncodingMapping object) {
-			return createLocalEncodingMappingAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)sw.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createWebAppAdapter() {
-		return null;
-	}
-
-	public Adapter createContextParamAdapter() {
-		return null;
-	}
-
-	public Adapter createErrorPageAdapter() {
-		return null;
-	}
-
-	public Adapter createExceptionTypeErrorPageAdapter() {
-		return null;
-	}
-
-	public Adapter createErrorCodeErrorPageAdapter() {
-		return null;
-	}
-
-	public Adapter createWelcomeFileListAdapter() {
-		return null;
-	}
-
-	public Adapter createWelcomeFileAdapter() {
-		return null;
-	}
-
-	public Adapter createTagLibRefAdapter() {
-		return null;
-	}
-
-	public Adapter createTagLibRefTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityConstraintAdapter() {
-		return null;
-	}
-
-	public Adapter createWebResourceCollectionAdapter() {
-		return null;
-	}
-
-	public Adapter createURLPatternTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createHTTPMethodTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	public Adapter createAuthConstraintAdapter() {
-		return null;
-	}
-
-	public Adapter createUserDataConstraintAdapter() {
-		return null;
-	}
-
-	public Adapter createLoginConfigAdapter() {
-		return null;
-	}
-
-	public Adapter createFormLoginConfigAdapter() {
-		return null;
-	}
-
-	public Adapter createMimeMappingAdapter() {
-		return null;
-	}
-
-	public Adapter createSessionConfigAdapter() {
-		return null;
-	}
-
-	public Adapter createServletMappingAdapter() {
-		return null;
-	}
-
-	public Adapter createServletAdapter() {
-		return null;
-	}
-
-	public Adapter createWebTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createServletTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createInitParamAdapter() {
-		return null;
-	}
-
-	public Adapter createFilterAdapter() {
-		return null;
-	}
-
-	public Adapter createFilterMappingAdapter() {
-		return null;
-	}
-
-	public Adapter createListenerAdapter() {
-		return null;
-	}
-
-	public Adapter createRoleNameTypeAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebapplicationSwitch modelSwitch =
-		new WebapplicationSwitch() {
-			public Object caseWebApp(WebApp object) {
-				return createWebAppAdapter();
-			}
-			public Object caseContextParam(ContextParam object) {
-				return createContextParamAdapter();
-			}
-			public Object caseServlet(Servlet object) {
-				return createServletAdapter();
-			}
-			public Object caseServletMapping(ServletMapping object) {
-				return createServletMappingAdapter();
-			}
-			public Object caseSessionConfig(SessionConfig object) {
-				return createSessionConfigAdapter();
-			}
-			public Object caseMimeMapping(MimeMapping object) {
-				return createMimeMappingAdapter();
-			}
-			public Object caseWelcomeFileList(WelcomeFileList object) {
-				return createWelcomeFileListAdapter();
-			}
-			public Object caseErrorPage(ErrorPage object) {
-				return createErrorPageAdapter();
-			}
-			public Object caseTagLibRef(TagLibRef object) {
-				return createTagLibRefAdapter();
-			}
-			public Object caseSecurityConstraint(SecurityConstraint object) {
-				return createSecurityConstraintAdapter();
-			}
-			public Object caseWebResourceCollection(WebResourceCollection object) {
-				return createWebResourceCollectionAdapter();
-			}
-			public Object caseAuthConstraint(AuthConstraint object) {
-				return createAuthConstraintAdapter();
-			}
-			public Object caseUserDataConstraint(UserDataConstraint object) {
-				return createUserDataConstraintAdapter();
-			}
-			public Object caseLoginConfig(LoginConfig object) {
-				return createLoginConfigAdapter();
-			}
-			public Object caseFormLoginConfig(FormLoginConfig object) {
-				return createFormLoginConfigAdapter();
-			}
-			public Object caseInitParam(InitParam object) {
-				return createInitParamAdapter();
-			}
-			public Object caseWebType(WebType object) {
-				return createWebTypeAdapter();
-			}
-			public Object caseServletType(ServletType object) {
-				return createServletTypeAdapter();
-			}
-			public Object caseJSPType(JSPType object) {
-				return createJSPTypeAdapter();
-			}
-			public Object caseURLPatternType(URLPatternType object) {
-				return createURLPatternTypeAdapter();
-			}
-			public Object caseRoleNameType(RoleNameType object) {
-				return createRoleNameTypeAdapter();
-			}
-			public Object caseWelcomeFile(WelcomeFile object) {
-				return createWelcomeFileAdapter();
-			}
-			public Object caseExceptionTypeErrorPage(ExceptionTypeErrorPage object) {
-				return createExceptionTypeErrorPageAdapter();
-			}
-			public Object caseErrorCodeErrorPage(ErrorCodeErrorPage object) {
-				return createErrorCodeErrorPageAdapter();
-			}
-			public Object caseFilterMapping(FilterMapping object) {
-				return createFilterMappingAdapter();
-			}
-			public Object caseFilter(Filter object) {
-				return createFilterAdapter();
-			}
-			public Object caseLocalEncodingMappingList(LocalEncodingMappingList object) {
-				return createLocalEncodingMappingListAdapter();
-			}
-			public Object caseLocalEncodingMapping(LocalEncodingMapping object) {
-				return createLocalEncodingMappingAdapter();
-			}
-			public Object caseHTTPMethodType(HTTPMethodType object) {
-				return createHTTPMethodTypeAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-				return createJNDIEnvRefsGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebAppAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createContextParamAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createErrorPageAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createExceptionTypeErrorPageAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createErrorCodeErrorPageAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWelcomeFileListAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWelcomeFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createTagLibRefAdapterGen() {
-		return null;
-	}
-
-	public Adapter createTagLibRefTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityConstraintAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebResourceCollectionAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createURLPatternTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAuthConstraintAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createUserDataConstraintAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLoginConfigAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFormLoginConfigAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMimeMappingAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSessionConfigAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createServletMappingAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createServletAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createServletTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createInitParamAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFilterAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFilterMappingAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList <em>Local Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList
-	 * @generated
-	 */
-	public Adapter createLocalEncodingMappingListAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping <em>Local Encoding Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping
-	 * @generated
-	 */
-	public Adapter createLocalEncodingMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	public Adapter createJNDIEnvRefsGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRoleNameTypeAdapterGen() {
-		return null;
-	}
-
-} //WebapplicationAdapterFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/util/WebapplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/util/WebapplicationSwitch.java
deleted file mode 100644
index 7e862cf4b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/util/WebapplicationSwitch.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webapplication.WebapplicationPackage
- * @generated
- */
-public class WebapplicationSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static WebapplicationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebapplicationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WebapplicationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case WebapplicationPackage.WEB_APP: {
-				WebApp webApp = (WebApp)theEObject;
-				Object result = caseWebApp(webApp);
-				if (result == null) result = caseJNDIEnvRefsGroup(webApp);
-				if (result == null) result = caseCompatibilityDescriptionGroup(webApp);
-				if (result == null) result = caseDescriptionGroup(webApp);
-				if (result == null) result = caseJ2EEEObject(webApp);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.CONTEXT_PARAM: {
-				ContextParam contextParam = (ContextParam)theEObject;
-				Object result = caseContextParam(contextParam);
-				if (result == null) result = caseJ2EEEObject(contextParam);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.SERVLET: {
-				Servlet servlet = (Servlet)theEObject;
-				Object result = caseServlet(servlet);
-				if (result == null) result = caseCompatibilityDescriptionGroup(servlet);
-				if (result == null) result = caseDescriptionGroup(servlet);
-				if (result == null) result = caseJ2EEEObject(servlet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.SERVLET_MAPPING: {
-				ServletMapping servletMapping = (ServletMapping)theEObject;
-				Object result = caseServletMapping(servletMapping);
-				if (result == null) result = caseJ2EEEObject(servletMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.SESSION_CONFIG: {
-				SessionConfig sessionConfig = (SessionConfig)theEObject;
-				Object result = caseSessionConfig(sessionConfig);
-				if (result == null) result = caseJ2EEEObject(sessionConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.MIME_MAPPING: {
-				MimeMapping mimeMapping = (MimeMapping)theEObject;
-				Object result = caseMimeMapping(mimeMapping);
-				if (result == null) result = caseJ2EEEObject(mimeMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.WELCOME_FILE_LIST: {
-				WelcomeFileList welcomeFileList = (WelcomeFileList)theEObject;
-				Object result = caseWelcomeFileList(welcomeFileList);
-				if (result == null) result = caseJ2EEEObject(welcomeFileList);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.ERROR_PAGE: {
-				ErrorPage errorPage = (ErrorPage)theEObject;
-				Object result = caseErrorPage(errorPage);
-				if (result == null) result = caseJ2EEEObject(errorPage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.TAG_LIB_REF: {
-				TagLibRef tagLibRef = (TagLibRef)theEObject;
-				Object result = caseTagLibRef(tagLibRef);
-				if (result == null) result = caseJ2EEEObject(tagLibRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.SECURITY_CONSTRAINT: {
-				SecurityConstraint securityConstraint = (SecurityConstraint)theEObject;
-				Object result = caseSecurityConstraint(securityConstraint);
-				if (result == null) result = caseJ2EEEObject(securityConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION: {
-				WebResourceCollection webResourceCollection = (WebResourceCollection)theEObject;
-				Object result = caseWebResourceCollection(webResourceCollection);
-				if (result == null) result = caseJ2EEEObject(webResourceCollection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.AUTH_CONSTRAINT: {
-				AuthConstraint authConstraint = (AuthConstraint)theEObject;
-				Object result = caseAuthConstraint(authConstraint);
-				if (result == null) result = caseJ2EEEObject(authConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.USER_DATA_CONSTRAINT: {
-				UserDataConstraint userDataConstraint = (UserDataConstraint)theEObject;
-				Object result = caseUserDataConstraint(userDataConstraint);
-				if (result == null) result = caseJ2EEEObject(userDataConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.LOGIN_CONFIG: {
-				LoginConfig loginConfig = (LoginConfig)theEObject;
-				Object result = caseLoginConfig(loginConfig);
-				if (result == null) result = caseJ2EEEObject(loginConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.FORM_LOGIN_CONFIG: {
-				FormLoginConfig formLoginConfig = (FormLoginConfig)theEObject;
-				Object result = caseFormLoginConfig(formLoginConfig);
-				if (result == null) result = caseJ2EEEObject(formLoginConfig);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.INIT_PARAM: {
-				InitParam initParam = (InitParam)theEObject;
-				Object result = caseInitParam(initParam);
-				if (result == null) result = caseJ2EEEObject(initParam);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.WEB_TYPE: {
-				WebType webType = (WebType)theEObject;
-				Object result = caseWebType(webType);
-				if (result == null) result = caseJ2EEEObject(webType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.SERVLET_TYPE: {
-				ServletType servletType = (ServletType)theEObject;
-				Object result = caseServletType(servletType);
-				if (result == null) result = caseWebType(servletType);
-				if (result == null) result = caseJ2EEEObject(servletType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.JSP_TYPE: {
-				JSPType jspType = (JSPType)theEObject;
-				Object result = caseJSPType(jspType);
-				if (result == null) result = caseWebType(jspType);
-				if (result == null) result = caseJ2EEEObject(jspType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.URL_PATTERN_TYPE: {
-				URLPatternType urlPatternType = (URLPatternType)theEObject;
-				Object result = caseURLPatternType(urlPatternType);
-				if (result == null) result = caseJ2EEEObject(urlPatternType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.ROLE_NAME_TYPE: {
-				RoleNameType roleNameType = (RoleNameType)theEObject;
-				Object result = caseRoleNameType(roleNameType);
-				if (result == null) result = caseJ2EEEObject(roleNameType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.WELCOME_FILE: {
-				WelcomeFile welcomeFile = (WelcomeFile)theEObject;
-				Object result = caseWelcomeFile(welcomeFile);
-				if (result == null) result = caseJ2EEEObject(welcomeFile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE: {
-				ExceptionTypeErrorPage exceptionTypeErrorPage = (ExceptionTypeErrorPage)theEObject;
-				Object result = caseExceptionTypeErrorPage(exceptionTypeErrorPage);
-				if (result == null) result = caseErrorPage(exceptionTypeErrorPage);
-				if (result == null) result = caseJ2EEEObject(exceptionTypeErrorPage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE: {
-				ErrorCodeErrorPage errorCodeErrorPage = (ErrorCodeErrorPage)theEObject;
-				Object result = caseErrorCodeErrorPage(errorCodeErrorPage);
-				if (result == null) result = caseErrorPage(errorCodeErrorPage);
-				if (result == null) result = caseJ2EEEObject(errorCodeErrorPage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.FILTER_MAPPING: {
-				FilterMapping filterMapping = (FilterMapping)theEObject;
-				Object result = caseFilterMapping(filterMapping);
-				if (result == null) result = caseJ2EEEObject(filterMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.FILTER: {
-				Filter filter = (Filter)theEObject;
-				Object result = caseFilter(filter);
-				if (result == null) result = caseCompatibilityDescriptionGroup(filter);
-				if (result == null) result = caseDescriptionGroup(filter);
-				if (result == null) result = caseJ2EEEObject(filter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST: {
-				LocalEncodingMappingList localEncodingMappingList = (LocalEncodingMappingList)theEObject;
-				Object result = caseLocalEncodingMappingList(localEncodingMappingList);
-				if (result == null) result = caseJ2EEEObject(localEncodingMappingList);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING: {
-				LocalEncodingMapping localEncodingMapping = (LocalEncodingMapping)theEObject;
-				Object result = caseLocalEncodingMapping(localEncodingMapping);
-				if (result == null) result = caseJ2EEEObject(localEncodingMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WebapplicationPackage.HTTP_METHOD_TYPE: {
-				HTTPMethodType httpMethodType = (HTTPMethodType)theEObject;
-				Object result = caseHTTPMethodType(httpMethodType);
-				if (result == null) result = caseJ2EEEObject(httpMethodType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web App</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web App</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebApp(WebApp object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Context Param</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Context Param</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContextParam(ContextParam object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServlet(Servlet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServletMapping(ServletMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Session Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Session Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSessionConfig(SessionConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mime Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mime Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMimeMapping(MimeMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Welcome File List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Welcome File List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWelcomeFileList(WelcomeFileList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseErrorPage(ErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag Lib Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag Lib Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagLibRef(TagLibRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityConstraint(SecurityConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Resource Collection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Resource Collection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebResourceCollection(WebResourceCollection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Auth Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Auth Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAuthConstraint(AuthConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>User Data Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>User Data Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUserDataConstraint(UserDataConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Login Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLoginConfig(LoginConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Form Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Form Login Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFormLoginConfig(FormLoginConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInitParam(InitParam object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebType(WebType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServletType(ServletType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JSP Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JSP Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJSPType(JSPType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>URL Pattern Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>URL Pattern Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseURLPatternType(URLPatternType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Name Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Name Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleNameType(RoleNameType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Welcome File</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Welcome File</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWelcomeFile(WelcomeFile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Exception Type Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Exception Type Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExceptionTypeErrorPage(ExceptionTypeErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Error Code Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Error Code Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseErrorCodeErrorPage(ErrorCodeErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Filter Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Filter Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFilterMapping(FilterMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Filter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFilter(Filter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Local Encoding Mapping List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Local Encoding Mapping List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocalEncodingMappingList(LocalEncodingMappingList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Local Encoding Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Local Encoding Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocalEncodingMapping(LocalEncodingMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>HTTP Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>HTTP Method Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPMethodType(HTTPMethodType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WebapplicationSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/package.xml
deleted file mode 100644
index afe8e3776..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the EJBArtifactEdit api. This api is used to work with the emf model
-        of a flexible ejb module. It contains api to read and serialize out the emf model.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
deleted file mode 100644
index b4fa66142..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.internal;
-
-public final class WebServiceConstants
-{
-  public static final String DEFAULT_XML_ENCODING = "UTF-8";//$NON-NLS-1$
-
-  public static final String WEBSERVICE_DD_SHORT_NAME   = "webservices.xml"; //$NON-NLS-1$
-  public static final String WEBSERVICE_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_web_services_1_0.dtd"; //$NON-NLS-1$
-  public static final String WEBSERVICE_PUBLICID = "-//IBM Corporation, Inc.//DTD J2EE Web services 1.0//EN"; //$NON-NLS-1$  
-  public static final String WEBSERVICE_DOCTYPE = "webservices";//$NON-NLS-1$
-  public static final String WEBSERVICE_SCHEMA_LOC = "http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd";//$NON-NLS-1$
-  public static final String WEBSERVICE_SCHEMA_LOC_SUN = "http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd";//$NON-NLS-1$
-
-  public static final String WEBSERVICECLIENT_DD_SHORT_NAME   = "webservicesclient.xml"; //$NON-NLS-1$
-  public static final String WEBSERVICECLIENT_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$
-  public static final String WEBSERVICECLIENT_PUBLICID = "-//IBM Corporation, Inc.//DTD J2EE Web services client 1.0//EN"; //$NON-NLS-1$  
-  public static final String WEBSERVICECLIENT_DOCTYPE = "webservicesclient";//$NON-NLS-1$
-
-public static final String WEBSERVICE_TEMP_DD_SHORT_NAME = "webservices-temp.xml";//$NON-NLS-1$
-
-  //public static final String JAXRPCMAP_DD_SHORT_NAME   = "mapping.xml"; //$NON-NLS-1$ !!We don't have a standard name!!
-  public static final String JAXRPCMAP_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_jaxrpc_mapping_1_0.dtd"; //$NON-NLS-1$
-  public static final String JAXRPCMAP_PUBLICID = "-//IBM Corporation, Inc.//DTD J2EE JAX-RPC mapping 1.0//EN"; //$NON-NLS-1$  
-  public static final String JAXRPCMAP_DOCTYPE = "java-wsdl-mapping";//$NON-NLS-1$
-  public static final String JAXRPCMAP_SCHEMA_LOC = "http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd";//$NON-NLS-1$
-  public static final String JAXRPCMAP_SCHEMA_LOC_SUN = "http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd";//$NON-NLS-1$
-  
-  
-
-  public static final int WEBSERVICE_1_0_ID = 10;
-  public static final int WEBSERVICE_1_1_ID = 11;
-  public static final String WEBSERVICE_SCHEMA_VERSION = "1.1";//$NON-NLS-1$
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceInit.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceInit.java
deleted file mode 100644
index f818636ce..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceInit.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.j2ee.webservice.internal;
-
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl;
-
-
-
-/**
-* Initializer class to preregister packages, register resource factories, and dtds for the web services models.
-*/
-public class WebServiceInit
-{
-  protected static boolean initialized = false;
-
-  public static void init()
-  {
-
-    if (initialized) return;
- 
-
-    // Initialize the Ecore package.
-    org.eclipse.emf.ecore.impl.EcorePackageImpl.init();
-
-    J2EEInit.init();    
-
-    // Initialize packages
-    JaxrpcmapPackageImpl.init();
-
-
-    // Register resource factories for xml descriptors
-
-
-    // Not calling JaxrpcmapResourceFactory.register() because it does nothing. Registration must be done for each filename as follows:
-    // J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(filename, new JaxrpcmapResourceFactory(EMF2DOMRendererFactory.INSTANCE));  
-    // where filename is a java.lang.String name of the mapping file
-
-    //Register DTDs
-    JaxrpcmapResourceFactory.registerDtds();
-
-
-    initialized = true;
-
-
-  }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/DescriptionGroupHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/DescriptionGroupHelper.java
deleted file mode 100644
index f13c5c49c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/DescriptionGroupHelper.java
+++ /dev/null
@@ -1,1577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.webservice.internal.util;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-
-public class DescriptionGroupHelper
-{
-
-  public static String[] getValues(WebServices webServices, DescriptionGroupItem item)
-  {
-    return getValues(webServices, item, false);
-  }
-  
-  public static String[] getValues(WebServices webServices, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServices.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescriptions(webServices, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayNames(webServices, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcons(webServices, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcons(webServices, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-
-  private static String[] getDescriptions(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] descriptions = webServices.getDescriptions().toArray();
-      values = new String[descriptions.length];
-      if (lang)
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-    	values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getDescription();
-      }
-    }
-    return values;
-  }
-
-  private static String[] getDisplayNames(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] displayNames = webServices.getDisplayNames().toArray();
-      values = new String[displayNames.length];      
-      if (lang)
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getValue();
-        }
-      }
-
-     
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getDisplayName();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getSmallIcons(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] icons = webServices.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getSmallIcon();
-        }
-      }
-
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getSmallIcon();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getLargeIcons(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] icons = webServices.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLargeIcon();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getLargeIcon();
-      }
-      
-    }
-    return values;
-  }
-
-
-  //WebServicesDescription methods
-  public static String getValue(WebServiceDescription webServicesDescription, DescriptionGroupItem item)
-  {
-    return getValue(webServicesDescription, item, false);
-  }
-  
-  public static String getValue(WebServiceDescription webServicesDescription, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServicesDescription.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescription(webServicesDescription, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayName(webServicesDescription, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcon(webServicesDescription, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcon(webServicesDescription, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-  private static String getDescription(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DescriptionType descType = webServicesDescription.getDescriptionType();
-      if (descType!=null)
-      {
-        if (lang)
-        {
-        	ret =  descType.getLang();
-        }
-        else
-        {
-        	ret =  descType.getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {	
-  
-		if( !lang )
-		{
-			ret = webServicesDescription.getDescription();
-		}
-    }
-    return ret;
-    
-  }
-
-  private static String getDisplayName(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DisplayNameType dnType = webServicesDescription.getDisplayNameType();
-      if (dnType!=null)
-      {
-        if (lang)
-        {
-        	ret =  dnType.getLang();
-        }
-        else
-        {
-        	ret =  dnType.getValue();
-        }
-      }
-
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-        ret = webServicesDescription.getDisplayName();
-      }
-    }
-    return ret;
-  }
-
-  private static String getSmallIcon(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = webServicesDescription.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret =  iconType.getLang();
-        }
-        else
-        {
-        	ret =  iconType.getSmallIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang)
-      {
-      	ret =  webServicesDescription.getSmallIcon();
-      }
-    }
-    return ret;
-  }
-
-  private static String getLargeIcon(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-    String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = webServicesDescription.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret =  iconType.getLang();
-        }
-        else
-        {
-        	ret =  iconType.getLargeIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret =  webServicesDescription.getLargeIcon();
-      }
-    }
-    return ret;
-  }
-
-  //PortComponent methods
-  public static String getValue(PortComponent portComponent, DescriptionGroupItem item)
-  {
-    return getValue(portComponent, item, false);
-  }
-  
-  public static String getValue(PortComponent portComponent, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)portComponent.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescription(portComponent, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayName(portComponent, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcon(portComponent, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcon(portComponent, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-  private static String getDescription(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DescriptionType descType = portComponent.getDescriptionType();
-      if (descType!=null)
-      {
-        if (lang)
-        {
-        	ret =  descType.getLang();
-        }
-        else
-        {
-        	ret =  descType.getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret =  portComponent.getDescription();
-      }
-    }
-    return ret;
-  }
-
-  private static String getDisplayName(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DisplayNameType dnType = portComponent.getDisplayNameType();
-      if (dnType!=null)
-      {
-        if (lang)
-        {
-        	ret =  dnType.getLang();
-        }
-        else
-        {
-        	ret =  dnType.getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret =  portComponent.getDisplayName();
-      }
-    }
-    return ret;
-  }
-
-  private static String getSmallIcon(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = portComponent.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret = iconType.getLang();
-        }
-        else
-        {
-        	ret = iconType.getSmallIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret = portComponent.getSmallIcon();
-      }
-    }
-    return ret;
-  }
-
-  private static String getLargeIcon(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-    String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = portComponent.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret = iconType.getLang();
-        }
-        else
-        {
-        	ret = iconType.getLargeIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if ( !lang )
-      {
-      	ret = portComponent.getLargeIcon();
-      }
-    }
-    return ret;
-  }
-
-  public static String[] getValues(Handler handler, DescriptionGroupItem item)
-  {
-    return getValues(handler, item, false);
-  }
-  
-  public static String[] getValues(Handler handler, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)handler.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescriptions(handler, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayNames(handler, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcons(handler, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcons(handler, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-  private static String[] getDescriptions(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] descriptions = handler.getDescriptions().toArray();
-      values = new String[descriptions.length];      
-      if (lang)
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getValue();
-        }
-      }
-
-
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getDescription();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getDisplayNames(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] displayNames = handler.getDisplayNames().toArray();
-      values = new String[displayNames.length];      
-      if (lang)
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getValue();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getDisplayName();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getSmallIcons(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] icons = handler.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getSmallIcon();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getSmallIcon();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getLargeIcons(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values =  null;
-    if (isJ2EE14)
-    {
-      Object[] icons = handler.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLargeIcon();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getLargeIcon();
-      }
-
-    }
-    return values;
-  }
-
-  //Setter for WebServices
-  public static void setValue(WebServices webServices, DescriptionGroupItem item, String value)
-  {
-    setValue(webServices, item, value, false);
-  }
-  
-  public static void setValue(WebServices webServices, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServices.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(webServices, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(webServices, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(webServices, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(webServices, isJ2EE14, value, setLang);        
-        //break;        
-      default://do nothing ;
-    }
-  }
-
-  private static void setDescription(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      Object[] descriptions = webServices.getDescriptions().toArray();
-      Description firstDescription = null;
-      if (descriptions.length < 1)
-      {
-        //create a Description
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        Description newDescription = factory.createDescription();
-        if (setLang)
-        {
-          newDescription.setLang(value);
-        }
-        else
-        {
-          newDescription.setValue(value);
-        }
-        webServices.getDescriptions().add(newDescription);
-      }
-      else
-      {
-        firstDescription = (Description)descriptions[0];
-        if (setLang)
-        {
-          firstDescription.setLang(value);
-        }
-        else
-        {
-          firstDescription.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      Object[] displayNames = webServices.getDisplayNames().toArray();
-      DisplayName firstDisplayName = null;
-      if (displayNames.length < 1)
-      {
-        //create a DisplayName
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        DisplayName newDisplayName = factory.createDisplayName();
-        if (setLang)
-        {
-          newDisplayName.setLang(value);
-        }
-        else
-        {
-          newDisplayName.setValue(value);
-        }
-
-        webServices.getDisplayNames().add(newDisplayName);
-      }
-      else
-      {
-        firstDisplayName = (DisplayName)displayNames[0];
-        if (setLang)
-        {
-          firstDisplayName.setLang(value);
-        }
-        else
-        {
-          firstDisplayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = webServices.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setSmallIcon(value);
-        }
-        webServices.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setSmallIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = webServices.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setLargeIcon(value);
-        }
-        webServices.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setLargeIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setLargeIcon(value);
-    }
-    
-  }
-
-
-//Setters for WebServiceDescriptions
-  public static void setValue(WebServiceDescription webServiceDescription, DescriptionGroupItem item, String value)
-  {
-    setValue(webServiceDescription, item, value, false);
-  }
-  
-  public static void setValue(WebServiceDescription webServiceDescription, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServiceDescription.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(webServiceDescription, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(webServiceDescription, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(webServiceDescription, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(webServiceDescription, isJ2EE14, value, setLang);        
-        //break;        
-      default:
-    }
-  }
-
-  private static void setDescription(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      
-      DescriptionType description = webServiceDescription.getDescriptionType();
-      if (description == null)
-      {
-        //create a DescriptionType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DescriptionType descriptionNew = factory.createDescriptionType();
-
-        if (setLang)
-        {
-          descriptionNew.setLang(value);
-        }
-        else
-        {
-
-          descriptionNew.setValue(value);
-        }
-        
-        webServiceDescription.setDescriptionType(descriptionNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          description.setLang(value);
-        }
-        else
-        {
-
-          description.setValue(value);
-        }
-        
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      
-      DisplayNameType displayName = webServiceDescription.getDisplayNameType();
-      if (displayName == null)
-      {
-        //create a DisplayNameType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DisplayNameType displayNameNew = factory.createDisplayNameType();
-        if (setLang)
-        {
-          displayNameNew.setLang(value);
-        }
-        else
-        {
-          displayNameNew.setValue(value);
-        }
-        webServiceDescription.setDisplayNameType(displayNameNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          displayName.setLang(value);
-        }
-        else
-        {
-          displayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = webServiceDescription.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setSmallIcon(value);
-        }
-
-        webServiceDescription.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setSmallIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = webServiceDescription.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setLargeIcon(value);
-        }
-
-        webServiceDescription.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setLargeIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setLargeIcon(value);
-    }
-    
-  }
-
-
-//Setters for PortComponents
-  public static void setValue(PortComponent portComponent, DescriptionGroupItem item, String value)
-  {
-
-    setValue(portComponent, item, value, false);
-  }
-  
-  public static void setValue(PortComponent portComponent, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)portComponent.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(portComponent, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(portComponent, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(portComponent, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(portComponent, isJ2EE14, value, setLang);        
-        //break;        
-      default: 
-    }
-  }
-
-  private static void setDescription(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      
-      DescriptionType description = portComponent.getDescriptionType();
-      if (description == null)
-      {
-        //create a DescriptionType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DescriptionType descriptionNew = factory.createDescriptionType();
-        if (setLang)
-        {
-          descriptionNew.setLang(value);
-        }
-        else
-        {
-          descriptionNew.setValue(value);
-        }
-        
-        portComponent.setDescriptionType(descriptionNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          description.setLang(value);
-        }
-        else
-        {
-          description.setValue(value);
-        }
-        
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      
-      DisplayNameType displayName = portComponent.getDisplayNameType();
-      if (displayName == null)
-      {
-        //create a DisplayNameType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DisplayNameType displayNameNew = factory.createDisplayNameType();
-        if (setLang)
-        {
-          displayNameNew.setLang(value);
-        }
-        else
-        {
-          displayNameNew.setValue(value);
-        }
-        portComponent.setDisplayNameType(displayNameNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          displayName.setLang(value);
-        }
-        else
-        {
-          displayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = portComponent.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setSmallIcon(value);
-        }
-
-        portComponent.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setSmallIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = portComponent.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setLargeIcon(value);
-        }
-
-        portComponent.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setLargeIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setLargeIcon(value);
-    }
-    
-  }
-
-  //Setter for Handlers
-  public static void setValue(Handler handler, DescriptionGroupItem item, String value)
-  {
-    setValue(handler, item, value, false);
-  }
-  
-  public static void setValue(Handler handler, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)handler.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(handler, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(handler, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(handler, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(handler, isJ2EE14, value, setLang);        
-        //break;        
-      default://do nothing ;
-    }
-  }
-
-  private static void setDescription(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      Object[] descriptions = handler.getDescriptions().toArray();
-      Description firstDescription = null;
-      if (descriptions.length < 1)
-      {
-        //create a Description
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        Description newDescription = factory.createDescription();
-        if (setLang)
-        {
-          newDescription.setLang(value);
-        }
-        else
-        {
-          newDescription.setValue(value);
-        }
-        handler.getDescriptions().add(newDescription);
-      }
-      else
-      {
-        firstDescription = (Description)descriptions[0];
-        if (setLang)
-        {
-          firstDescription.setLang(value);
-        }
-        else
-        {
-          firstDescription.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      Object[] displayNames = handler.getDisplayNames().toArray();
-      DisplayName firstDisplayName = null;
-      if (displayNames.length < 1)
-      {
-        //create a DisplayName
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        DisplayName newDisplayName = factory.createDisplayName();
-        if (setLang)
-        {
-          newDisplayName.setLang(value);
-        }
-        else
-        {
-          newDisplayName.setValue(value);
-        }
-
-        handler.getDisplayNames().add(newDisplayName);
-      }
-      else
-      {
-        firstDisplayName = (DisplayName)displayNames[0];
-        if (setLang)
-        {
-          firstDisplayName.setLang(value);
-        }
-        else
-        {
-          firstDisplayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = handler.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setSmallIcon(value);
-        }
-        handler.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setSmallIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = handler.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setLargeIcon(value);
-        }
-        handler.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setLargeIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setLargeIcon(value);
-    }
-    
-  }
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/DescriptionGroupItem.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/DescriptionGroupItem.java
deleted file mode 100644
index 1c3591577..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/DescriptionGroupItem.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.webservice.internal.util;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-public final class DescriptionGroupItem extends AbstractEnumerator
-{
-  public static final int DESCRIPTION = 0;
-
-  public static final int DISPLAY_NAME = 1;
-
-  public static final int SMALL_ICON = 2;
-
-  public static final int LARGE_ICON = 3;
-
-  public static final DescriptionGroupItem DESCRIPTION_LITERAL = new DescriptionGroupItem(DESCRIPTION, "description");//$NON-NLS-1$
-  public static final DescriptionGroupItem DISPLAY_NAME_LITERAL = new DescriptionGroupItem(DISPLAY_NAME, "display-name");//$NON-NLS-1$
-  public static final DescriptionGroupItem SMALL_ICON_LITERAL = new DescriptionGroupItem(SMALL_ICON, "small-icon");//$NON-NLS-1$
-  public static final DescriptionGroupItem LARGE_ICON_LITERAL = new DescriptionGroupItem(LARGE_ICON, "large-icon");//$NON-NLS-1$
-
-  private static final DescriptionGroupItem[] VALUES_ARRAY =
-    new DescriptionGroupItem[]
-    {
-      DESCRIPTION_LITERAL,
-      DISPLAY_NAME_LITERAL,
-      SMALL_ICON_LITERAL,
-      LARGE_ICON_LITERAL
-    };
-
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-	 * Returns the '<em><b>Dependency Type</b></em>' literal with the specified value. 
-	 *  <!-- begin-user-doc -->
-	 * @param name passes literal name
-	 * @return literal instance
-	 *  <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-  public static DescriptionGroupItem get(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      DescriptionGroupItem result = VALUES_ARRAY[i];
-      if (result.toString().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-  /**
-	 * Returns the '<em><b>Dependency Type</b></em>' literal with the specified value. 
-	 *  <!-- begin-user-doc -->
-	 * @param value passes literal value
-	 * @return literal instance
-	 *  <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-  public static DescriptionGroupItem get(int value)
-  {
-    switch (value)
-    {
-      case DESCRIPTION: return DESCRIPTION_LITERAL;
-      case DISPLAY_NAME: return DISPLAY_NAME_LITERAL;
-      case SMALL_ICON: return SMALL_ICON_LITERAL;
-      case LARGE_ICON: return LARGE_ICON_LITERAL;      
-    }
-    return null;	
-  }
-
-  private DescriptionGroupItem(int value, String name)
-  {
-    super(value, name);
-  }
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/QNameHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/QNameHelper.java
deleted file mode 100644
index aee7c6dfb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/util/QNameHelper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.webservice.internal.util;
-
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-
-
-
-/**
-* JSR-109 v1.1 changed the way qualified names are represented. As a result the EMF model changed as well. 
-* The new model is capable of reading/writing both v1.0 and v1.1 descriptors but the QName APIs work differently
-* depending on the version of the descriptor. This class provides static methods to set values on QName's in order
-* to hide and isolate the version checking logic.
-*/
-public class QNameHelper
-{
-
-  private static String DEFAULT_PREFIX="pfx";//$NON-NLS-1$
-
-  /*
-  * Sets the namespaceURI and the localpart on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set. If the QName does not belong to a Resource,
-  *                                    the version is assumed to be J2EE 1.4.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameNamespaceURI(QName qnameEObject, String namespaceURI)
-  {
-    String localpart = qnameEObject.getLocalPart();
-    setQNameValue(qnameEObject, namespaceURI, localpart);    
-  }
-  
-  /*
-  * Sets the namespaceURI and the localpart on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set. If the QName does not belong to a Resource,
-  *                                    the version is assumed to be J2EE 1.4.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameValue(QName qnameEObject, String namespaceURI, String localPart)
-  {
-    setQNameValue(qnameEObject, namespaceURI, localPart, ""); //$NON-NLS-1$   
-  }
-
-  /**
-  * Sets the namespaceURI, localpart, and prefix on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set. If the QName does not belong to a Resource,
-  *                                    the version is assumed to be J2EE 1.4.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @param prefix The prefix. Used in JSR-109 v1.1 only. This is the prefix that will be used for the namespace declaration
-                           If the supplied prefix is null or of length 0, the existing prefix is used. If no prefix exists, and this
-  *                       is a JSR-109 v1.1 descriptor the default prefix defined in DEFAULT_PREFIX is used.
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameValue(QName qnameEObject, String namespaceURI, String localPart, String prefix)
-  {
-    int versionID;
-    
-    //Get the versionID from the QName's Resource if available
-    J2EEVersionResource res = (J2EEVersionResource)qnameEObject.eResource();
-    if (res == null)
-    {
-      //use a J2EE 1.4 version ID as the default
-      versionID = J2EEVersionConstants.J2EE_1_4_ID;
-    }
-    else
-    {
-      versionID = res.getJ2EEVersionID();
-    }
-
-    setQNameValue(qnameEObject, namespaceURI, localPart, prefix, versionID);
-    
-    
-  }
-
-  /**
-  * Sets the namespaceURI, localpart, and prefix on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @param prefix The prefix. Used in JSR-109 v1.1 only. This is the prefix that will be used for the namespace declaration
-                           If the supplied prefix is null or of length 0, the existing prefix is used. If no prefix exists, and this
-  *                       is a JSR-109 v1.1 descriptor the default prefix defined DEFAULT_PREFIX is used.
-  *@param versionID The J2EE version. Should be set to one of the version IDs defined in J2EEVersionConstants.
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameValue(QName qnameEObject, String namespaceURI, String localPart, String prefix, int versionID)
-  {      
-
-    if (versionID==J2EEVersionConstants.J2EE_1_3_ID)
-    {
-      //ignore the prefix and set things the old way
-      qnameEObject.setNamespaceURI(namespaceURI);
-      qnameEObject.setLocalPart(localPart);    
-    }
-    else
-    {
-      //resource is J2EE 1.4
-      if (prefix==null || prefix.length()==0)
-      {
-        //use the existing prefix
-        prefix = qnameEObject.getInternalPrefixOrNsURI();
-        if (prefix==null || prefix.length()==0)
-        {
-          //use the default prefix
-          prefix = new String(DEFAULT_PREFIX);
-        }
-      }
-      qnameEObject.setValues(prefix, namespaceURI, localPart);
-    
-    }
-    
-  }
-  
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
deleted file mode 100644
index 8acc3f49c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.internal.wsdd;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddResourceImpl;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class WsddResourceFactory extends TranslatorResourceFactory
-{
-	
-	  /**
-	  * WsddResourceFactory constructor comment.
-	  */
-	  public WsddResourceFactory() 
-	  {
-		  super(RendererFactory.getDefaultRendererFactory());
-	  }
-	
-  /**
-  * WsddResourceFactory constructor comment.
-  */
-  public WsddResourceFactory(RendererFactory aRendererFactory) 
-  {
-	  super(aRendererFactory);
-  }
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new WsddResourceImpl(uri, aRenderer);
-	}
-
-  /**
-   * Register myself with the Resource.Factory.Registry
-   */
-  public static void registerWith(RendererFactory aRendererFactory) {
-  	J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(aRendererFactory));
-  	J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(WebServiceConstants.WEBSERVICE_TEMP_DD_SHORT_NAME, new WsddResourceFactory(aRendererFactory));
-  }
-  public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(RendererFactory.getDefaultRendererFactory()));
-		aRegistry.registerLastFileSegment(WebServiceConstants.WEBSERVICE_TEMP_DD_SHORT_NAME, new WsddResourceFactory(RendererFactory.getDefaultRendererFactory()));
-  }
-	
-  /**
-   * register using the default renderer factory.
-   * @see #registerWith(RendererFactory)
-   */
-  public static void register() {
-  	registerWith(RendererFactory.getDefaultRendererFactory());
-  }
-
-  /**
-   * Method registerDtds.
-  */
-  public static void registerDtds() 
-  {
-    //http://www.ibm.com/webservices/dtd/j2ee_web_services_1_0.dtd
-  	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SYSTEMID, "j2ee_web_services_1_0.dtd");//$NON-NLS-1$
-	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$
-    J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$	
-  }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ComponentScopedRefs.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ComponentScopedRefs.java
deleted file mode 100644
index 410122f52..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ComponentScopedRefs.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Scoped Refs</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4 deprecated
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getComponentName <em>Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getComponentScopedRefs()
- * @model
- * @generated
- */
-public interface ComponentScopedRefs extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Component Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Component Name</em>' attribute.
-	 * @see #setComponentName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getComponentScopedRefs_ComponentName()
-	 * @model
-	 * @generated
-	 */
-    String getComponentName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getComponentName <em>Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Component Name</em>' attribute.
-	 * @see #getComponentName()
-	 * @generated
-	 */
-    void setComponentName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef}.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getComponentScopedRefs_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef" containment="true" required="true"
-	 * @generated
-	 */
-    EList getServiceRefs();
-
-} // ComponentScopedRefs
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Handler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Handler.java
deleted file mode 100644
index e1a3debb3..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Handler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Declares the handler for a port-component. Handlers can access the
- *     init-param name/value pairs using the HandlerInfo interface. If
- *     port-name is not specified, the handler is assumed to be associated
- *     with all ports of the service.
- * 
- *     Used in: service-ref
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getSoapRoles <em>Soap Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getPortNames <em>Port Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getSoapHeaders <em>Soap Headers</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler()
- * @model
- * @generated
- */
-public interface Handler extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handler Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the name of the handler. The name must be unique within the module.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Name</em>' attribute.
-	 * @see #setHandlerName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler_HandlerName()
-	 * @model
-	 * @generated
-	 */
-	String getHandlerName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerName <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Name</em>' attribute.
-	 * @see #getHandlerName()
-	 * @generated
-	 */
-	void setHandlerName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.QName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Soap Headers</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Headers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler_SoapHeaders()
-	 * @model type="org.eclipse.jst.j2ee.common.QName" containment="true"
-	 * @generated
-	 */
-	EList getSoapHeaders();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Roles</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Soap Roles</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The soap-role element contains a SOAP actor definition that the Handler will play as a role.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Soap Roles</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler_SoapRoles()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getSoapRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Port Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-name element defines the WSDL port-name that a handler should be associated with.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Names</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler_PortNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getPortNames();
-
-	/**
-	 * Returns the value of the '<em><b>Handler Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handler Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines a fully qualified class name for the handler implementation.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Class</em>' reference.
-	 * @see #setHandlerClass(JavaClass)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler_HandlerClass()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getHandlerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerClass <em>Handler Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Class</em>' reference.
-	 * @see #getHandlerClass()
-	 * @generated
-	 */
-	void setHandlerClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getHandler_InitParams()
-	 * @model type="org.eclipse.jst.j2ee.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getInitParams();
-
-} // Handler
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/PortComponentRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/PortComponentRef.java
deleted file mode 100644
index 922139133..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/PortComponentRef.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Component Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The port-component-ref element declares a client dependency
- *     on the container for resolving a Service Endpoint Interface
- *     to a WSDL port. It optionally associates the Service Endpoint
- *     Interface with a particular port-component. This is only used
- *     by the container for a Service.getPort(Class) method call.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getPortComponentRef()
- * @model
- * @generated
- */
-public interface PortComponentRef extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Port Component Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Component Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-component-link element links a port-component-ref to a
-	 *         specific port-component required to be made available by a service
-	 *         reference.
-	 * 
-	 *         The value of a port-component-link must be the port-component-name
-	 *         of a port-component in the same module or another module in the same
-	 *         application unit. The syntax for specification follows the syntax
-	 *         defined for ejb-link in the EJB 2.0 specification.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Link</em>' attribute.
-	 * @see #setPortComponentLink(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getPortComponentRef_PortComponentLink()
-	 * @model
-	 * @generated
-	 */
-	String getPortComponentLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Component Link</em>' attribute.
-	 * @see #getPortComponentLink()
-	 * @generated
-	 */
-	void setPortComponentLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Endpoint Interface</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-endpoint-interface element defines a fully qualified
-	 *         Java class that represents the Service Endpoint Interface of a
-	 *         WSDL port.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint Interface</em>' reference.
-	 * @see #setServiceEndpointInterface(JavaClass)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getPortComponentRef_ServiceEndpointInterface()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getServiceEndpointInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint Interface</em>' reference.
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 */
-	void setServiceEndpointInterface(JavaClass value);
-
-} // PortComponentRef
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ServiceRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ServiceRef.java
deleted file mode 100644
index 7f572a4a5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ServiceRef.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.QName;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-ref element declares a reference to a Web
- *     service. It contains optional description, display name and
- *     icons, a declaration of the required Service interface,
- *     an optional WSDL document location, an optional set
- *     of JAX-RPC mappings, an optional QName for the service element,
- *     an optional set of Service Endpoint Interfaces to be resolved
- *     by the container to a WSDL port, and an optional set of handlers.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceRefName <em>Service Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getPortComponentRefs <em>Port Component Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceQname <em>Service Qname</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef()
- * @model
- * @generated
- */
-public interface ServiceRef extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Service Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Ref Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-ref-name element declares logical name that the
-	 *         components in the module use to look up the Web service. It
-	 *         is recommended that all service reference names start with
-	 *         "service/".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Ref Name</em>' attribute.
-	 * @see #setServiceRefName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_ServiceRefName()
-	 * @model
-	 * @generated
-	 */
-	String getServiceRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceRefName <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Ref Name</em>' attribute.
-	 * @see #getServiceRefName()
-	 * @generated
-	 */
-	void setServiceRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Wsdl File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  The wsdl-file element contains the URI location of a WSDL file. The
-	 *         location is relative to the root of the module.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl File</em>' attribute.
-	 * @see #setWsdlFile(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_WsdlFile()
-	 * @model
-	 * @generated
-	 */
-	String getWsdlFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getWsdlFile <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl File</em>' attribute.
-	 * @see #getWsdlFile()
-	 * @generated
-	 */
-	void setWsdlFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jaxrpc Mapping File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The jaxrpc-mapping-file element contains the name of a file that
-	 *         describes the JAX-RPC mapping between the Java interaces used by
-	 *         the application and the WSDL description in the wsdl-file.  The
-	 *         file name is a relative path within the module file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #setJaxrpcMappingFile(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_JaxrpcMappingFile()
-	 * @model
-	 * @generated
-	 */
-	String getJaxrpcMappingFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 */
-	void setJaxrpcMappingFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Interface</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-interface element declares the fully qualified class
-	 *         name of the JAX-RPC Service interface the client depends on.
-	 *         In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	 *         generated Service Interface class may also be specified.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Interface</em>' reference.
-	 * @see #setServiceInterface(JavaClass)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_ServiceInterface()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getServiceInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceInterface <em>Service Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Interface</em>' reference.
-	 * @see #getServiceInterface()
-	 * @generated
-	 */
-	void setServiceInterface(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Component Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Component Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-component-ref element declares a client dependency
-	 *         on the container for resolving a Service Endpoint Interface
-	 *         to a WSDL port. It optionally associates the Service Endpoint
-	 *         Interface with a particular port-component. This is only used
-	 *         by the container for a Service.getPort(Class) method call.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_PortComponentRefs()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef" containment="true"
-	 * @generated
-	 */
-	EList getPortComponentRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.Handler}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handlers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  Declares the handler for a port-component. Handlers can access the
-	 *         init-param name/value pairs using the HandlerInfo interface. If
-	 *         port-name is not specified, the handler is assumed to be associated
-	 *         with all ports of the service.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handlers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_Handlers()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.Handler" containment="true"
-	 * @generated
-	 */
-	EList getHandlers();
-
-	/**
-	 * Returns the value of the '<em><b>Service Qname</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Qname</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Qname</em>' containment reference.
-	 * @see #setServiceQname(QName)
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getServiceRef_ServiceQname()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	QName getServiceQname();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceQname <em>Service Qname</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Qname</em>' containment reference.
-	 * @see #getServiceQname()
-	 * @generated
-	 */
-	void setServiceQname(QName value);
-
-} // ServiceRef
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesClient.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesClient.java
deleted file mode 100644
index 887bcfefe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesClient.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web Services Client</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @version J2EE1.4 deprecated
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient#getComponentScopedRefs <em>Component Scoped Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getWebServicesClient()
- * @model
- * @generated
- */
-public interface WebServicesClient extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Component Scoped Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs}.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Component Scoped Refs</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Component Scoped Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getWebServicesClient_ComponentScopedRefs()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs" containment="true"
-	 * @generated
-	 */
-    EList getComponentScopedRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef}.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Service Refs</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#getWebServicesClient_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef" containment="true"
-	 * @generated
-	 */
-    EList getServiceRefs();
-
-} // WebServicesClient
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesResource.java
deleted file mode 100644
index f9434275f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesResource.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 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.webservice.wsclient;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- *@since 1.0
- */
-public interface WebServicesResource extends XMLResource{
-	
-	/**
-	 * Returns reference to the model object WebServicesClient
-	 * @return reference to the model object WebServicesClient
-	 */
-	public WebServicesClient getWebServicesClient();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java
deleted file mode 100644
index d827dc6f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage
- * @generated
- */
-public interface Webservice_clientFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Webservice_clientFactory eINSTANCE = org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Service Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Ref</em>'.
-	 * @generated
-	 */
-	ServiceRef createServiceRef();
-
-	/**
-	 * Returns a new object of class '<em>Port Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Component Ref</em>'.
-	 * @generated
-	 */
-	PortComponentRef createPortComponentRef();
-
-	/**
-	 * Returns a new object of class '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Handler</em>'.
-	 * @generated
-	 */
-	Handler createHandler();
-
-	/**
-	 * Returns a new object of class '<em>Web Services Client</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web Services Client</em>'.
-	 * @generated
-	 */
-    WebServicesClient createWebServicesClient();
-
-	/**
-	 * Returns a new object of class '<em>Component Scoped Refs</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Component Scoped Refs</em>'.
-	 * @generated
-	 */
-    ComponentScopedRefs createComponentScopedRefs();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	Webservice_clientPackage getWebservice_clientPackage();
-
-} //Webservice_clientFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java
deleted file mode 100644
index aa3bdef4a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java
+++ /dev/null
@@ -1,956 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * /**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	
- *
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory
- * @model kind="package"
- * @generated
- */
-public interface Webservice_clientPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "wsclient";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "webservice_client.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.webservice.wsclient";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Webservice_clientPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl <em>Service Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getServiceRef()
-	 * @generated
-	 */
-	int SERVICE_REF = 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Service Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_INTERFACE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_REF_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__WSDL_FILE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__JAXRPC_MAPPING_FILE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__PORT_COMPONENT_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__HANDLERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Service Qname</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_QNAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Service Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.PortComponentRefImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getPortComponentRef()
-	 * @generated
-	 */
-	int PORT_COMPONENT_REF = 1;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__PORT_COMPONENT_LINK = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Port Component Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl <em>Handler</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getHandler()
-	 * @generated
-	 */
-	int HANDLER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__HANDLER_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Soap Roles</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__SOAP_ROLES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Port Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__PORT_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Handler Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__HANDLER_CLASS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__SOAP_HEADERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Handler</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientImpl <em>Web Services Client</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getWebServicesClient()
-	 * @generated
-	 */
-    int WEB_SERVICES_CLIENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Component Scoped Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int WEB_SERVICES_CLIENT__SERVICE_REFS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Web Services Client</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int WEB_SERVICES_CLIENT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ComponentScopedRefsImpl <em>Component Scoped Refs</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ComponentScopedRefsImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getComponentScopedRefs()
-	 * @generated
-	 */
-    int COMPONENT_SCOPED_REFS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int COMPONENT_SCOPED_REFS__COMPONENT_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int COMPONENT_SCOPED_REFS__SERVICE_REFS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Component Scoped Refs</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int COMPONENT_SCOPED_REFS_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef <em>Service Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Ref</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef
-	 * @generated
-	 */
-	EClass getServiceRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceRefName <em>Service Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Ref Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceRefName()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_ServiceRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getWsdlFile <em>Wsdl File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl File</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getWsdlFile()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_WsdlFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jaxrpc Mapping File</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getJaxrpcMappingFile()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_JaxrpcMappingFile();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceInterface <em>Service Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Service Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceInterface()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_ServiceInterface();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getPortComponentRefs <em>Port Component Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Port Component Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getPortComponentRefs()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_PortComponentRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getHandlers <em>Handlers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handlers</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getHandlers()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_Handlers();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceQname <em>Service Qname</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Service Qname</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef#getServiceQname()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_ServiceQname();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef <em>Port Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Component Ref</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef
-	 * @generated
-	 */
-	EClass getPortComponentRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Component Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getPortComponentLink()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EAttribute getPortComponentRef_PortComponentLink();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Service Endpoint Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef#getServiceEndpointInterface()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EReference getPortComponentRef_ServiceEndpointInterface();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Handler</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler
-	 * @generated
-	 */
-	EClass getHandler();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerName <em>Handler Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerName()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EAttribute getHandler_HandlerName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getSoapHeaders <em>Soap Headers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Soap Headers</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler#getSoapHeaders()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EReference getHandler_SoapHeaders();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getSoapRoles <em>Soap Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Soap Roles</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler#getSoapRoles()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EAttribute getHandler_SoapRoles();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getPortNames <em>Port Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Port Names</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler#getPortNames()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EAttribute getHandler_PortNames();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerClass <em>Handler Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Handler Class</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler#getHandlerClass()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EReference getHandler_HandlerClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler#getInitParams()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EReference getHandler_InitParams();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient <em>Web Services Client</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web Services Client</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient
-	 * @generated
-	 */
-    EClass getWebServicesClient();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient#getComponentScopedRefs <em>Component Scoped Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Component Scoped Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient#getComponentScopedRefs()
-	 * @see #getWebServicesClient()
-	 * @generated
-	 */
-    EReference getWebServicesClient_ComponentScopedRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient#getServiceRefs()
-	 * @see #getWebServicesClient()
-	 * @generated
-	 */
-    EReference getWebServicesClient_ServiceRefs();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs <em>Component Scoped Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Component Scoped Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs
-	 * @generated
-	 */
-    EClass getComponentScopedRefs();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getComponentName <em>Component Name</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Component Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getComponentName()
-	 * @see #getComponentScopedRefs()
-	 * @generated
-	 */
-    EAttribute getComponentScopedRefs_ComponentName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs#getServiceRefs()
-	 * @see #getComponentScopedRefs()
-	 * @generated
-	 */
-    EReference getComponentScopedRefs_ServiceRefs();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	Webservice_clientFactory getWebservice_clientFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl <em>Service Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getServiceRef()
-		 * @generated
-		 */
-		EClass SERVICE_REF = eINSTANCE.getServiceRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Interface</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__SERVICE_INTERFACE = eINSTANCE.getServiceRef_ServiceInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Ref Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__SERVICE_REF_NAME = eINSTANCE.getServiceRef_ServiceRefName();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__WSDL_FILE = eINSTANCE.getServiceRef_WsdlFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Jaxrpc Mapping File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_REF__JAXRPC_MAPPING_FILE = eINSTANCE.getServiceRef_JaxrpcMappingFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Component Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__PORT_COMPONENT_REFS = eINSTANCE.getServiceRef_PortComponentRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__HANDLERS = eINSTANCE.getServiceRef_Handlers();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Qname</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_REF__SERVICE_QNAME = eINSTANCE.getServiceRef_ServiceQname();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.PortComponentRefImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getPortComponentRef()
-		 * @generated
-		 */
-		EClass PORT_COMPONENT_REF = eINSTANCE.getPortComponentRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Component Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT_REF__PORT_COMPONENT_LINK = eINSTANCE.getPortComponentRef_PortComponentLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint Interface</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getPortComponentRef_ServiceEndpointInterface();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl <em>Handler</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getHandler()
-		 * @generated
-		 */
-		EClass HANDLER = eINSTANCE.getHandler();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HANDLER__HANDLER_NAME = eINSTANCE.getHandler_HandlerName();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Roles</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HANDLER__SOAP_ROLES = eINSTANCE.getHandler_SoapRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HANDLER__PORT_NAMES = eINSTANCE.getHandler_PortNames();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Class</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference HANDLER__HANDLER_CLASS = eINSTANCE.getHandler_HandlerClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference HANDLER__INIT_PARAMS = eINSTANCE.getHandler_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Headers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference HANDLER__SOAP_HEADERS = eINSTANCE.getHandler_SoapHeaders();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientImpl <em>Web Services Client</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getWebServicesClient()
-		 * @generated
-		 */
-		EClass WEB_SERVICES_CLIENT = eINSTANCE.getWebServicesClient();
-
-		/**
-		 * The meta object literal for the '<em><b>Component Scoped Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS = eINSTANCE.getWebServicesClient_ComponentScopedRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICES_CLIENT__SERVICE_REFS = eINSTANCE.getWebServicesClient_ServiceRefs();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ComponentScopedRefsImpl <em>Component Scoped Refs</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ComponentScopedRefsImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl#getComponentScopedRefs()
-		 * @generated
-		 */
-		EClass COMPONENT_SCOPED_REFS = eINSTANCE.getComponentScopedRefs();
-
-		/**
-		 * The meta object literal for the '<em><b>Component Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMPONENT_SCOPED_REFS__COMPONENT_NAME = eINSTANCE.getComponentScopedRefs_ComponentName();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Refs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference COMPONENT_SCOPED_REFS__SERVICE_REFS = eINSTANCE.getComponentScopedRefs_ServiceRefs();
-
-	}
-
-} //Webservice_clientPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/ComponentScopedRefsImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/ComponentScopedRefsImpl.java
deleted file mode 100644
index be67556bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/ComponentScopedRefsImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Scoped Refs</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ComponentScopedRefsImpl#getComponentName <em>Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ComponentScopedRefsImpl#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentScopedRefsImpl extends J2EEEObjectImpl implements ComponentScopedRefs {
-	/**
-	 * The default value of the '{@link #getComponentName() <em>Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getComponentName()
-	 * @generated
-	 * @ordered
-	 */
-    protected static final String COMPONENT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComponentName() <em>Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getComponentName()
-	 * @generated
-	 * @ordered
-	 */
-    protected String componentName = COMPONENT_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList serviceRefs = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected ComponentScopedRefsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected EClass eStaticClass() {
-		return Webservice_clientPackage.Literals.COMPONENT_SCOPED_REFS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String getComponentName() {
-		return componentName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void setComponentName(String newComponentName) {
-		String oldComponentName = componentName;
-		componentName = newComponentName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME, oldComponentName, componentName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				return getComponentName();
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				return getServiceRefs();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				setComponentName((String)newValue);
-				return;
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				setComponentName(COMPONENT_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				return COMPONENT_NAME_EDEFAULT == null ? componentName != null : !COMPONENT_NAME_EDEFAULT.equals(componentName);
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (componentName: ");
-		result.append(componentName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ComponentScopedRefsImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/HandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/HandlerImpl.java
deleted file mode 100644
index 82df8394f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/HandlerImpl.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl#getSoapRoles <em>Soap Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl#getPortNames <em>Port Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.HandlerImpl#getSoapHeaders <em>Soap Headers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HandlerImpl extends CompatibilityDescriptionGroupImpl implements Handler {
-	/**
-	 * The default value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HANDLER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String handlerName = HANDLER_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSoapRoles() <em>Soap Roles</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSoapRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList soapRoles = null;
-
-	/**
-	 * The cached value of the '{@link #getPortNames() <em>Port Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList portNames = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass handlerClass = null;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapHeaders() <em>Soap Headers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSoapHeaders()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList soapHeaders = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HandlerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return Webservice_clientPackage.Literals.HANDLER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHandlerName() {
-		return handlerName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerName(String newHandlerName) {
-		String oldHandlerName = handlerName;
-		handlerName = newHandlerName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.HANDLER__HANDLER_NAME, oldHandlerName, handlerName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSoapHeaders() {
-		if (soapHeaders == null) {
-			soapHeaders = new EObjectContainmentEList(QName.class, this, Webservice_clientPackage.HANDLER__SOAP_HEADERS);
-		}
-		return soapHeaders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				return ((InternalEList)getSoapHeaders()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				return getHandlerName();
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				return getSoapRoles();
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				return getPortNames();
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				if (resolve) return getHandlerClass();
-				return basicGetHandlerClass();
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				return getInitParams();
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				return getSoapHeaders();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				setHandlerName((String)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				getSoapRoles().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				getPortNames().clear();
-				getPortNames().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass((JavaClass)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				getSoapHeaders().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				setHandlerName(HANDLER_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				getPortNames().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass((JavaClass)null);
-				return;
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				return HANDLER_NAME_EDEFAULT == null ? handlerName != null : !HANDLER_NAME_EDEFAULT.equals(handlerName);
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				return soapRoles != null && !soapRoles.isEmpty();
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				return portNames != null && !portNames.isEmpty();
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				return handlerClass != null;
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				return soapHeaders != null && !soapHeaders.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSoapRoles() {
-		if (soapRoles == null) {
-			soapRoles = new EDataTypeUniqueEList(String.class, this, Webservice_clientPackage.HANDLER__SOAP_ROLES);
-		}
-		return soapRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPortNames() {
-		if (portNames == null) {
-			portNames = new EDataTypeUniqueEList(String.class, this, Webservice_clientPackage.HANDLER__PORT_NAMES);
-		}
-		return portNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getHandlerClass() {
-		if (handlerClass != null && handlerClass.eIsProxy()) {
-			InternalEObject oldHandlerClass = (InternalEObject)handlerClass;
-			handlerClass = (JavaClass)eResolveProxy(oldHandlerClass);
-			if (handlerClass != oldHandlerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Webservice_clientPackage.HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-			}
-		}
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetHandlerClass() {
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerClass(JavaClass newHandlerClass) {
-		JavaClass oldHandlerClass = handlerClass;
-		handlerClass = newHandlerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, Webservice_clientPackage.HANDLER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (handlerName: ");
-		result.append(handlerName);
-		result.append(", soapRoles: ");
-		result.append(soapRoles);
-		result.append(", portNames: ");
-		result.append(portNames);
-		result.append(')');
-		return result.toString();
-	}
-
-} //HandlerImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/PortComponentRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/PortComponentRefImpl.java
deleted file mode 100644
index 37a5493e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/PortComponentRefImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.TypeKind;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Component Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.PortComponentRefImpl#getPortComponentLink <em>Port Component Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.PortComponentRefImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortComponentRefImpl extends J2EEEObjectImpl implements PortComponentRef {
-	/**
-	 * The default value of the '{@link #getPortComponentLink() <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PORT_COMPONENT_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentLink() <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String portComponentLink = PORT_COMPONENT_LINK_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass serviceEndpointInterface = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PortComponentRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return Webservice_clientPackage.Literals.PORT_COMPONENT_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPortComponentLink() {
-		return portComponentLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPortComponentLink(String newPortComponentLink) {
-		String oldPortComponentLink = portComponentLink;
-		portComponentLink = newPortComponentLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK, oldPortComponentLink, portComponentLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getServiceEndpointInterfaceGen() {
-		if (serviceEndpointInterface != null && serviceEndpointInterface.eIsProxy()) {
-			InternalEObject oldServiceEndpointInterface = (InternalEObject)serviceEndpointInterface;
-			serviceEndpointInterface = (JavaClass)eResolveProxy(oldServiceEndpointInterface);
-			if (serviceEndpointInterface != oldServiceEndpointInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-			}
-		}
-		return serviceEndpointInterface;
-	}
-	
-	public JavaClass getServiceEndpointInterface() {
-		serviceEndpointInterface = getServiceEndpointInterfaceGen();
-		if (serviceEndpointInterface!=null) {
-			// Verify the interface type is set correctly on the SEI
-			TypeKind typeKind = serviceEndpointInterface.getKind();
-			if (typeKind == null || !typeKind.equals(TypeKind.INTERFACE_LITERAL))
-				serviceEndpointInterface.setKind(TypeKind.INTERFACE_LITERAL);
-		}
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetServiceEndpointInterface() {
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceEndpointInterface(JavaClass newServiceEndpointInterface) {
-		JavaClass oldServiceEndpointInterface = serviceEndpointInterface;
-		serviceEndpointInterface = newServiceEndpointInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				return getPortComponentLink();
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				if (resolve) return getServiceEndpointInterface();
-				return basicGetServiceEndpointInterface();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				setPortComponentLink((String)newValue);
-				return;
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((JavaClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				setPortComponentLink(PORT_COMPONENT_LINK_EDEFAULT);
-				return;
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((JavaClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				return PORT_COMPONENT_LINK_EDEFAULT == null ? portComponentLink != null : !PORT_COMPONENT_LINK_EDEFAULT.equals(portComponentLink);
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				return serviceEndpointInterface != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (portComponentLink: "); //$NON-NLS-1$
-		result.append(portComponentLink);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortComponentRefImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/ServiceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/ServiceRefImpl.java
deleted file mode 100644
index 39405d207..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/ServiceRefImpl.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getServiceRefName <em>Service Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getPortComponentRefs <em>Port Component Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl#getServiceQname <em>Service Qname</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceRefImpl extends CompatibilityDescriptionGroupImpl implements ServiceRef {
-	/**
-	 * The cached value of the '{@link #getServiceInterface() <em>Service Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass serviceInterface = null;
-
-	/**
-	 * The default value of the '{@link #getServiceRefName() <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefName() <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceRefName = SERVICE_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WSDL_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String wsdlFile = WSDL_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JAXRPC_MAPPING_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String jaxrpcMappingFile = JAXRPC_MAPPING_FILE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentRefs() <em>Port Component Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList portComponentRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList handlers = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceQname() <em>Service Qname</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceQname()
-	 * @generated
-	 * @ordered
-	 */
-	protected QName serviceQname = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return Webservice_clientPackage.Literals.SERVICE_REF;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceRefName() {
-		return serviceRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceRefName(String newServiceRefName) {
-		String oldServiceRefName = serviceRefName;
-		serviceRefName = newServiceRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME, oldServiceRefName, serviceRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWsdlFile() {
-		return wsdlFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWsdlFile(String newWsdlFile) {
-		String oldWsdlFile = wsdlFile;
-		wsdlFile = newWsdlFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__WSDL_FILE, oldWsdlFile, wsdlFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getJaxrpcMappingFile() {
-		return jaxrpcMappingFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJaxrpcMappingFile(String newJaxrpcMappingFile) {
-		String oldJaxrpcMappingFile = jaxrpcMappingFile;
-		jaxrpcMappingFile = newJaxrpcMappingFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE, oldJaxrpcMappingFile, jaxrpcMappingFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getServiceInterface() {
-		if (serviceInterface != null && serviceInterface.eIsProxy()) {
-			InternalEObject oldServiceInterface = (InternalEObject)serviceInterface;
-			serviceInterface = (JavaClass)eResolveProxy(oldServiceInterface);
-			if (serviceInterface != oldServiceInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-			}
-		}
-		return serviceInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetServiceInterface() {
-		return serviceInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceInterface(JavaClass newServiceInterface) {
-		JavaClass oldServiceInterface = serviceInterface;
-		serviceInterface = newServiceInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPortComponentRefs() {
-		if (portComponentRefs == null) {
-			portComponentRefs = new EObjectContainmentEList(PortComponentRef.class, this, Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS);
-		}
-		return portComponentRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getHandlers() {
-		if (handlers == null) {
-			handlers = new EObjectContainmentEList(Handler.class, this, Webservice_clientPackage.SERVICE_REF__HANDLERS);
-		}
-		return handlers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QName getServiceQname() {
-		return serviceQname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetServiceQname(QName newServiceQname, NotificationChain msgs) {
-		QName oldServiceQname = serviceQname;
-		serviceQname = newServiceQname;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, oldServiceQname, newServiceQname);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceQname(QName newServiceQname) {
-		if (newServiceQname != serviceQname) {
-			NotificationChain msgs = null;
-			if (serviceQname != null)
-				msgs = ((InternalEObject)serviceQname).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, null, msgs);
-			if (newServiceQname != null)
-				msgs = ((InternalEObject)newServiceQname).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, null, msgs);
-			msgs = basicSetServiceQname(newServiceQname, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, newServiceQname, newServiceQname));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return ((InternalEList)getPortComponentRefs()).basicRemove(otherEnd, msgs);
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				return basicSetServiceQname(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				if (resolve) return getServiceInterface();
-				return basicGetServiceInterface();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				return getServiceRefName();
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				return getWsdlFile();
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				return getJaxrpcMappingFile();
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return getPortComponentRefs();
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				return getHandlers();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				return getServiceQname();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				setServiceInterface((JavaClass)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				setServiceRefName((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				setWsdlFile((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				getPortComponentRefs().clear();
-				getPortComponentRefs().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				getHandlers().clear();
-				getHandlers().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				setServiceQname((QName)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				setServiceInterface((JavaClass)null);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				setServiceRefName(SERVICE_REF_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				setWsdlFile(WSDL_FILE_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile(JAXRPC_MAPPING_FILE_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				getPortComponentRefs().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				getHandlers().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				setServiceQname((QName)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				return serviceInterface != null;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				return SERVICE_REF_NAME_EDEFAULT == null ? serviceRefName != null : !SERVICE_REF_NAME_EDEFAULT.equals(serviceRefName);
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				return WSDL_FILE_EDEFAULT == null ? wsdlFile != null : !WSDL_FILE_EDEFAULT.equals(wsdlFile);
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				return JAXRPC_MAPPING_FILE_EDEFAULT == null ? jaxrpcMappingFile != null : !JAXRPC_MAPPING_FILE_EDEFAULT.equals(jaxrpcMappingFile);
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return portComponentRefs != null && !portComponentRefs.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				return handlers != null && !handlers.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				return serviceQname != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (serviceRefName: ");
-		result.append(serviceRefName);
-		result.append(", wsdlFile: ");
-		result.append(wsdlFile);
-		result.append(", jaxrpcMappingFile: ");
-		result.append(jaxrpcMappingFile);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceRefImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesClientImpl.java
deleted file mode 100644
index dbc6990ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesClientImpl.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web Services Client</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientImpl#getComponentScopedRefs <em>Component Scoped Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientImpl#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebServicesClientImpl extends J2EEEObjectImpl implements WebServicesClient {
-	/**
-	 * The cached value of the '{@link #getComponentScopedRefs() <em>Component Scoped Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getComponentScopedRefs()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList componentScopedRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList serviceRefs = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected WebServicesClientImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected EClass eStaticClass() {
-		return Webservice_clientPackage.Literals.WEB_SERVICES_CLIENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EList getComponentScopedRefs() {
-		if (componentScopedRefs == null) {
-			componentScopedRefs = new EObjectContainmentEList(ComponentScopedRefs.class, this, Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS);
-		}
-		return componentScopedRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				return ((InternalEList)getComponentScopedRefs()).basicRemove(otherEnd, msgs);
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				return getComponentScopedRefs();
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				return getServiceRefs();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				getComponentScopedRefs().clear();
-				getComponentScopedRefs().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				getComponentScopedRefs().clear();
-				return;
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				return componentScopedRefs != null && !componentScopedRefs.isEmpty();
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WebServicesClientImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesClientResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesClientResourceFactory.java
deleted file mode 100644
index 824c4979b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesClientResourceFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 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.webservice.wsclient.internal.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class WebServicesClientResourceFactory
-    extends TranslatorResourceFactory {
-	
-	/**
-     * @param aRendererFactory
-     */
-    public WebServicesClientResourceFactory() {
-        super(RendererFactory.getDefaultRendererFactory());
-    }
-	
-		/**
-		 * Method registerDtds.
-		 */
-		public static void registerDtds() {
-			J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_SERVICES_CLIENT_SYSTEMID_1_0, "j2ee_web_services_client_1_0.dtd"); //$NON-NLS-1$
-			J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1, "j2ee_web_services_client_1_1.xsd"); //$NON-NLS-1$
-		}
-    /**
-     * @param aRendererFactory
-     */
-    public WebServicesClientResourceFactory(RendererFactory aRendererFactory) {
-        super(aRendererFactory);
-    }
-
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new WebServicesResourceImpl(uri, aRenderer);
-	}
-	  public static void register(FileNameResourceFactoryRegistry aRegistry) {
-			aRegistry.registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	  }
-    
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.WEB_SERVICES_CLIENT_DD_URI_OBJ);
-	}
-    
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesResourceImpl.java
deleted file mode 100644
index d6b5c040b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/WebServicesResourceImpl.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 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.webservice.wsclient.internal.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.webservices.WebServicesTranslator;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class WebServicesResourceImpl extends XMLResourceImpl implements WebServicesResource {
-
-    /**
-     * @param uri
-     * @param aRenderer
-     */
-    public WebServicesResourceImpl(URI uri, Renderer aRenderer) {
-        super(uri, aRenderer);
-    }
-
-    /**
-     * @param aRenderer
-     */
-    public WebServicesResourceImpl(Renderer aRenderer) {
-        super(aRenderer);
-    }
-
-		/**
-	 * Return the first element in the EList.
-	 */
-	public WebServicesClient getWebServicesClient() {
-		return (WebServicesClient) getRootObject();
-	}
-    
-    public int getType() {
-        return WEB_SERVICES_CLIENT_TYPE;
-    }
-
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_SYSTEMID_1_0;
-	}
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_SYSTEMID_1_0;
-	}
-
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_PUBLICID_1_0;
-	}
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_PUBLICID_1_0;
-	}
-
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.WEB_SERVICES_CLIENT_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setDoctypeValues(java.lang.String, java.lang.String)
-	 * This is setting the module version on the resource.
-	 */
-	public void setDoctypeValues(String publicId, String systemId) {
-		int version = WEBSERVICES_1_0_ID;
-		super.setDoctypeValues(publicId, systemId);
-		super.setVersionID(version);
-	}
-		/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (WEBSERVICES_1_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-			}
-		syncVersionOfRootObject();
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) {
-	switch (id) {
-		case (J2EE_1_3_ID) :
-					primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					primSetVersionID(WEBSERVICES_1_0_ID);
-					break;
-		case (J2EE_1_2_ID) :
-					primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					primSetVersionID(WEBSERVICES_1_0_ID);
-			}
-		syncVersionOfRootObject();
-	}
-	/* Return J2EE version based on module version
-	 */
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.WEBSERVICES_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			default :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-		}
-	}
-	/**
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return WebServicesTranslator.INSTANCE;
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WEBSERVICES_1_0_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		//not model for J2EE 1.4 so no operation required.
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientFactoryImpl.java
deleted file mode 100644
index 2f91cdd00..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientFactoryImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Webservice_clientFactoryImpl extends EFactoryImpl implements Webservice_clientFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Webservice_clientFactory init() {
-		try {
-			Webservice_clientFactory theWebservice_clientFactory = (Webservice_clientFactory)EPackage.Registry.INSTANCE.getEFactory("webservice_client.xmi"); 
-			if (theWebservice_clientFactory != null) {
-				return theWebservice_clientFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new Webservice_clientFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case Webservice_clientPackage.SERVICE_REF: return createServiceRef();
-			case Webservice_clientPackage.PORT_COMPONENT_REF: return createPortComponentRef();
-			case Webservice_clientPackage.HANDLER: return createHandler();
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT: return createWebServicesClient();
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS: return createComponentScopedRefs();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRef createServiceRef() {
-		ServiceRefImpl serviceRef = new ServiceRefImpl();
-		return serviceRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PortComponentRef createPortComponentRef() {
-		PortComponentRefImpl portComponentRef = new PortComponentRefImpl();
-		return portComponentRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Handler createHandler() {
-		HandlerImpl handler = new HandlerImpl();
-		return handler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public WebServicesClient createWebServicesClient() {
-		WebServicesClientImpl webServicesClient = new WebServicesClientImpl();
-		return webServicesClient;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ComponentScopedRefs createComponentScopedRefs() {
-		ComponentScopedRefsImpl componentScopedRefs = new ComponentScopedRefsImpl();
-		return componentScopedRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientPackage getWebservice_clientPackage() {
-		return (Webservice_clientPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static Webservice_clientPackage getPackage() {
-		return Webservice_clientPackage.eINSTANCE;
-	}
-
-} //Webservice_clientFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
deleted file mode 100644
index 9d6dc5d93..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
+++ /dev/null
@@ -1,540 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Webservice_clientPackageImpl extends EPackageImpl implements Webservice_clientPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serviceRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass portComponentRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass handlerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private EClass webServicesClientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private EClass componentScopedRefsEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private Webservice_clientPackageImpl() {
-		super(eNS_URI, Webservice_clientFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static Webservice_clientPackage init() {
-		if (isInited) return (Webservice_clientPackage)EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI);
-
-		// Obtain or create and register package
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Webservice_clientPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theWebservice_clientPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theWebservice_clientPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theWebservice_clientPackage.freeze();
-
-		return theWebservice_clientPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServiceRef() {
-		return serviceRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_ServiceRefName() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_WsdlFile() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_JaxrpcMappingFile() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_ServiceInterface() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_PortComponentRefs() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_Handlers() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_ServiceQname() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPortComponentRef() {
-		return portComponentRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPortComponentRef_PortComponentLink() {
-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPortComponentRef_ServiceEndpointInterface() {
-		return (EReference)portComponentRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHandler() {
-		return handlerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHandler_HandlerName() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getHandler_SoapHeaders() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHandler_SoapRoles() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHandler_PortNames() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getHandler_HandlerClass() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getHandler_InitParams() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EClass getWebServicesClient() {
-		return webServicesClientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getWebServicesClient_ComponentScopedRefs() {
-		return (EReference)webServicesClientEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getWebServicesClient_ServiceRefs() {
-		return (EReference)webServicesClientEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EClass getComponentScopedRefs() {
-		return componentScopedRefsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EAttribute getComponentScopedRefs_ComponentName() {
-		return (EAttribute)componentScopedRefsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getComponentScopedRefs_ServiceRefs() {
-		return (EReference)componentScopedRefsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientFactory getWebservice_clientFactory() {
-		return (Webservice_clientFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		serviceRefEClass = createEClass(SERVICE_REF);
-		createEReference(serviceRefEClass, SERVICE_REF__SERVICE_INTERFACE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__SERVICE_REF_NAME);
-		createEAttribute(serviceRefEClass, SERVICE_REF__WSDL_FILE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__JAXRPC_MAPPING_FILE);
-		createEReference(serviceRefEClass, SERVICE_REF__PORT_COMPONENT_REFS);
-		createEReference(serviceRefEClass, SERVICE_REF__HANDLERS);
-		createEReference(serviceRefEClass, SERVICE_REF__SERVICE_QNAME);
-
-		portComponentRefEClass = createEClass(PORT_COMPONENT_REF);
-		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__PORT_COMPONENT_LINK);
-		createEReference(portComponentRefEClass, PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE);
-
-		handlerEClass = createEClass(HANDLER);
-		createEAttribute(handlerEClass, HANDLER__HANDLER_NAME);
-		createEAttribute(handlerEClass, HANDLER__SOAP_ROLES);
-		createEAttribute(handlerEClass, HANDLER__PORT_NAMES);
-		createEReference(handlerEClass, HANDLER__HANDLER_CLASS);
-		createEReference(handlerEClass, HANDLER__INIT_PARAMS);
-		createEReference(handlerEClass, HANDLER__SOAP_HEADERS);
-
-		webServicesClientEClass = createEClass(WEB_SERVICES_CLIENT);
-		createEReference(webServicesClientEClass, WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS);
-		createEReference(webServicesClientEClass, WEB_SERVICES_CLIENT__SERVICE_REFS);
-
-		componentScopedRefsEClass = createEClass(COMPONENT_SCOPED_REFS);
-		createEAttribute(componentScopedRefsEClass, COMPONENT_SCOPED_REFS__COMPONENT_NAME);
-		createEReference(componentScopedRefsEClass, COMPONENT_SCOPED_REFS__SERVICE_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		serviceRefEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		portComponentRefEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		handlerEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		webServicesClientEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		componentScopedRefsEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(serviceRefEClass, ServiceRef.class, "ServiceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getServiceRef_ServiceInterface(), theJavaRefPackage.getJavaClass(), null, "serviceInterface", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceRef_ServiceRefName(), ecorePackage.getEString(), "serviceRefName", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceRef_WsdlFile(), ecorePackage.getEString(), "wsdlFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceRef_JaxrpcMappingFile(), ecorePackage.getEString(), "jaxrpcMappingFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceRef_PortComponentRefs(), this.getPortComponentRef(), null, "portComponentRefs", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceRef_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceRef_ServiceQname(), theCommonPackage.getQName(), null, "serviceQname", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPortComponentRef_PortComponentLink(), ecorePackage.getEString(), "portComponentLink", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponentRef_ServiceEndpointInterface(), theJavaRefPackage.getJavaClass(), null, "serviceEndpointInterface", null, 1, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(handlerEClass, Handler.class, "Handler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getHandler_HandlerName(), ecorePackage.getEString(), "handlerName", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHandler_SoapRoles(), ecorePackage.getEString(), "soapRoles", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHandler_PortNames(), ecorePackage.getEString(), "portNames", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHandler_HandlerClass(), theJavaRefPackage.getJavaClass(), null, "handlerClass", null, 1, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHandler_InitParams(), theCommonPackage.getParamValue(), null, "initParams", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHandler_SoapHeaders(), theCommonPackage.getQName(), null, "soapHeaders", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(webServicesClientEClass, WebServicesClient.class, "WebServicesClient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWebServicesClient_ComponentScopedRefs(), this.getComponentScopedRefs(), null, "componentScopedRefs", null, 0, -1, WebServicesClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebServicesClient_ServiceRefs(), this.getServiceRef(), null, "serviceRefs", null, 0, -1, WebServicesClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(componentScopedRefsEClass, ComponentScopedRefs.class, "ComponentScopedRefs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getComponentScopedRefs_ComponentName(), ecorePackage.getEString(), "componentName", null, 0, 1, ComponentScopedRefs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getComponentScopedRefs_ServiceRefs(), this.getServiceRef(), null, "serviceRefs", null, 1, -1, ComponentScopedRefs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //Webservice_clientPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/util/Webservice_clientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/util/Webservice_clientAdapterFactory.java
deleted file mode 100644
index 5aea684be..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/util/Webservice_clientAdapterFactory.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage
- * @generated
- */
-public class Webservice_clientAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Webservice_clientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = Webservice_clientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Webservice_clientSwitch modelSwitch =
-		new Webservice_clientSwitch() {
-			public Object caseServiceRef(ServiceRef object) {
-				return createServiceRefAdapter();
-			}
-			public Object casePortComponentRef(PortComponentRef object) {
-				return createPortComponentRefAdapter();
-			}
-			public Object caseHandler(Handler object) {
-				return createHandlerAdapter();
-			}
-			public Object caseWebServicesClient(WebServicesClient object) {
-				return createWebServicesClientAdapter();
-			}
-			public Object caseComponentScopedRefs(ComponentScopedRefs object) {
-				return createComponentScopedRefsAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef <em>Service Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef
-	 * @generated
-	 */
-	public Adapter createServiceRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef <em>Port Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef
-	 * @generated
-	 */
-	public Adapter createPortComponentRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsclient.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.Handler
-	 * @generated
-	 */
-	public Adapter createHandlerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient <em>Web Services Client</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient
-	 * @generated
-	 */
-    public Adapter createWebServicesClientAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs <em>Component Scoped Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs
-	 * @generated
-	 */
-    public Adapter createComponentScopedRefsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //Webservice_clientAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/util/Webservice_clientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/util/Webservice_clientSwitch.java
deleted file mode 100644
index ec466302b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/util/Webservice_clientSwitch.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage
- * @generated
- */
-public class Webservice_clientSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Webservice_clientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientSwitch() {
-		if (modelPackage == null) {
-			modelPackage = Webservice_clientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case Webservice_clientPackage.SERVICE_REF: {
-				ServiceRef serviceRef = (ServiceRef)theEObject;
-				Object result = caseServiceRef(serviceRef);
-				if (result == null) result = caseCompatibilityDescriptionGroup(serviceRef);
-				if (result == null) result = caseDescriptionGroup(serviceRef);
-				if (result == null) result = caseJ2EEEObject(serviceRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Webservice_clientPackage.PORT_COMPONENT_REF: {
-				PortComponentRef portComponentRef = (PortComponentRef)theEObject;
-				Object result = casePortComponentRef(portComponentRef);
-				if (result == null) result = caseJ2EEEObject(portComponentRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Webservice_clientPackage.HANDLER: {
-				Handler handler = (Handler)theEObject;
-				Object result = caseHandler(handler);
-				if (result == null) result = caseCompatibilityDescriptionGroup(handler);
-				if (result == null) result = caseDescriptionGroup(handler);
-				if (result == null) result = caseJ2EEEObject(handler);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT: {
-				WebServicesClient webServicesClient = (WebServicesClient)theEObject;
-				Object result = caseWebServicesClient(webServicesClient);
-				if (result == null) result = caseJ2EEEObject(webServicesClient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS: {
-				ComponentScopedRefs componentScopedRefs = (ComponentScopedRefs)theEObject;
-				Object result = caseComponentScopedRefs(componentScopedRefs);
-				if (result == null) result = caseJ2EEEObject(componentScopedRefs);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceRef(ServiceRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Component Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePortComponentRef(PortComponentRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHandler(Handler object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Services Client</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Services Client</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseWebServicesClient(WebServicesClient object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Component Scoped Refs</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Component Scoped Refs</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseComponentScopedRefs(ComponentScopedRefs object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //Webservice_clientSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/package.xml
deleted file mode 100644
index 4237e0f30..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the web services client model api. Using this api the artifacts of a web services client
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DescriptionType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DescriptionType.java
deleted file mode 100644
index 21b1e8def..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DescriptionType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.Description;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getDescriptionType()
- * @model
- * @generated
- */
-public interface DescriptionType extends Description {
-// DescriptionType
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DisplayNameType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DisplayNameType.java
deleted file mode 100644
index da5ea8703..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DisplayNameType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.DisplayName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Display Name Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getDisplayNameType()
- * @model
- * @generated
- */
-public interface DisplayNameType extends DisplayName {
-// DisplayNameType
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/InitParam.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/InitParam.java
deleted file mode 100644
index 38183bb44..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/InitParam.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Init Param</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamName <em>Param Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamValue <em>Param Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescriptionTypes <em>Description Types</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getInitParam()
- * @model
- * @generated
- */
-public interface InitParam extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Param Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Param Name</em>' attribute.
-	 * @see #setParamName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getInitParam_ParamName()
-	 * @model
-	 * @generated
-	 */
-  String getParamName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamName <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Name</em>' attribute.
-	 * @see #getParamName()
-	 * @generated
-	 */
-  void setParamName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Param Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Param Value</em>' attribute.
-	 * @see #setParamValue(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getInitParam_ParamValue()
-	 * @model
-	 * @generated
-	 */
-  String getParamValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamValue <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Value</em>' attribute.
-	 * @see #getParamValue()
-	 * @generated
-	 */
-  void setParamValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getInitParam_Description()
-	 * @model
-	 * @generated
-	 */
-  String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-  void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description Types</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Types</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getInitParam_DescriptionTypes()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType" containment="true"
-	 * @generated
-	 */
-  EList getDescriptionTypes();
-
-} // InitParam
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/PortName.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/PortName.java
deleted file mode 100644
index ea2c7d093..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/PortName.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.PortName#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getPortName()
- * @model
- * @generated
- */
-public interface PortName extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port Name</em>' attribute.
-	 * @see #setPortName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getPortName_PortName()
-	 * @model
-	 * @generated
-	 */
-  String getPortName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wscommon.PortName#getPortName <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Name</em>' attribute.
-	 * @see #getPortName()
-	 * @generated
-	 */
-  void setPortName(String value);
-
-} // PortName
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPHeader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPHeader.java
deleted file mode 100644
index e2a6c5da5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPHeader.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SOAP Header</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Defines the QName of a SOAP header that will be processed by the handler.
- * 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getSOAPHeader()
- * @model
- * @generated
- */
-public interface SOAPHeader extends QName {
-// SOAPHeader
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPRole.java
deleted file mode 100644
index 30c654f60..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPRole.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SOAP Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The soap-role element contains a SOAP actor definition that the Handler will play as a role.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole#getSoapRole <em>Soap Role</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getSOAPRole()
- * @model
- * @generated
- */
-public interface SOAPRole extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Soap Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Role</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Role</em>' attribute.
-	 * @see #setSoapRole(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#getSOAPRole_SoapRole()
-	 * @model
-	 * @generated
-	 */
-  String getSoapRole();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole#getSoapRole <em>Soap Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Soap Role</em>' attribute.
-	 * @see #getSoapRole()
-	 * @generated
-	 */
-  void setSoapRole(String value);
-
-} // SOAPRole
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java
deleted file mode 100644
index 4cfb71e38..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage
- * @generated
- */
-public interface WscommonFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WscommonFactory eINSTANCE = org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Init Param</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Init Param</em>'.
-	 * @generated
-	 */
-  InitParam createInitParam();
-
-	/**
-	 * Returns a new object of class '<em>SOAP Header</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SOAP Header</em>'.
-	 * @generated
-	 */
-  SOAPHeader createSOAPHeader();
-
-	/**
-	 * Returns a new object of class '<em>SOAP Role</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SOAP Role</em>'.
-	 * @generated
-	 */
-  SOAPRole createSOAPRole();
-
-	/**
-	 * Returns a new object of class '<em>Port Name</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Name</em>'.
-	 * @generated
-	 */
-  PortName createPortName();
-
-	/**
-	 * Returns a new object of class '<em>Description Type</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description Type</em>'.
-	 * @generated
-	 */
-  DescriptionType createDescriptionType();
-
-	/**
-	 * Returns a new object of class '<em>Display Name Type</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Display Name Type</em>'.
-	 * @generated
-	 */
-  DisplayNameType createDisplayNameType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-  WscommonPackage getWscommonPackage();
-
-} //WscommonFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java
deleted file mode 100644
index 51afc00ba..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * **
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *	
- *
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory
- * @model kind="package"
- * @generated
- */
-public interface WscommonPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNAME = "wscommon";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_URI = "wscommon.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_PREFIX = "org.eclipse.jst.j2ee.webservice.wscommon";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WscommonPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl <em>Init Param</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getInitParam()
-	 * @generated
-	 */
-  int INIT_PARAM = 0;
-
-	/**
-	 * The feature id for the '<em><b>Param Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__PARAM_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Param Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__PARAM_VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Description Types</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__DESCRIPTION_TYPES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Init Param</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPHeaderImpl <em>SOAP Header</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPHeaderImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getSOAPHeader()
-	 * @generated
-	 */
-  int SOAP_HEADER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>SOAP Header</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPRoleImpl <em>SOAP Role</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPRoleImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getSOAPRole()
-	 * @generated
-	 */
-  int SOAP_ROLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Soap Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_ROLE__SOAP_ROLE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>SOAP Role</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_ROLE_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.PortNameImpl <em>Port Name</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.PortNameImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getPortName()
-	 * @generated
-	 */
-  int PORT_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_NAME__PORT_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Port Name</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_NAME_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DescriptionTypeImpl <em>Description Type</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DescriptionTypeImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getDescriptionType()
-	 * @generated
-	 */
-  int DESCRIPTION_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DESCRIPTION_TYPE__LANG = CommonPackage.DESCRIPTION__LANG;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DESCRIPTION_TYPE__VALUE = CommonPackage.DESCRIPTION__VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Description Type</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DESCRIPTION_TYPE_FEATURE_COUNT = CommonPackage.DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DisplayNameTypeImpl <em>Display Name Type</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DisplayNameTypeImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getDisplayNameType()
-	 * @generated
-	 */
-  int DISPLAY_NAME_TYPE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DISPLAY_NAME_TYPE__LANG = CommonPackage.DISPLAY_NAME__LANG;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DISPLAY_NAME_TYPE__VALUE = CommonPackage.DISPLAY_NAME__VALUE;
-
-	/**
-	 * The number of structural features of the '<em>Display Name Type</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DISPLAY_NAME_TYPE_FEATURE_COUNT = CommonPackage.DISPLAY_NAME_FEATURE_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam <em>Init Param</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Init Param</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.InitParam
-	 * @generated
-	 */
-  EClass getInitParam();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamName <em>Param Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamName()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EAttribute getInitParam_ParamName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Value</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getParamValue()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EAttribute getInitParam_ParamValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescription()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EAttribute getInitParam_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescriptionTypes <em>Description Types</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Description Types</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.InitParam#getDescriptionTypes()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EReference getInitParam_DescriptionTypes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader <em>SOAP Header</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>SOAP Header</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader
-	 * @generated
-	 */
-  EClass getSOAPHeader();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole <em>SOAP Role</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>SOAP Role</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole
-	 * @generated
-	 */
-  EClass getSOAPRole();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole#getSoapRole <em>Soap Role</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Soap Role</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole#getSoapRole()
-	 * @see #getSOAPRole()
-	 * @generated
-	 */
-  EAttribute getSOAPRole_SoapRole();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wscommon.PortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.PortName
-	 * @generated
-	 */
-  EClass getPortName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wscommon.PortName#getPortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.PortName#getPortName()
-	 * @see #getPortName()
-	 * @generated
-	 */
-  EAttribute getPortName_PortName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType
-	 * @generated
-	 */
-  EClass getDescriptionType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Display Name Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType
-	 * @generated
-	 */
-  EClass getDisplayNameType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-  WscommonFactory getWscommonFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl <em>Init Param</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getInitParam()
-		 * @generated
-		 */
-		EClass INIT_PARAM = eINSTANCE.getInitParam();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_PARAM__PARAM_NAME = eINSTANCE.getInitParam_ParamName();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_PARAM__PARAM_VALUE = eINSTANCE.getInitParam_ParamValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INIT_PARAM__DESCRIPTION = eINSTANCE.getInitParam_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Description Types</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INIT_PARAM__DESCRIPTION_TYPES = eINSTANCE.getInitParam_DescriptionTypes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPHeaderImpl <em>SOAP Header</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPHeaderImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getSOAPHeader()
-		 * @generated
-		 */
-		EClass SOAP_HEADER = eINSTANCE.getSOAPHeader();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPRoleImpl <em>SOAP Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPRoleImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getSOAPRole()
-		 * @generated
-		 */
-		EClass SOAP_ROLE = eINSTANCE.getSOAPRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Role</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SOAP_ROLE__SOAP_ROLE = eINSTANCE.getSOAPRole_SoapRole();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.PortNameImpl <em>Port Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.PortNameImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getPortName()
-		 * @generated
-		 */
-		EClass PORT_NAME = eINSTANCE.getPortName();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_NAME__PORT_NAME = eINSTANCE.getPortName_PortName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DescriptionTypeImpl <em>Description Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DescriptionTypeImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getDescriptionType()
-		 * @generated
-		 */
-		EClass DESCRIPTION_TYPE = eINSTANCE.getDescriptionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DisplayNameTypeImpl <em>Display Name Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.DisplayNameTypeImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl#getDisplayNameType()
-		 * @generated
-		 */
-		EClass DISPLAY_NAME_TYPE = eINSTANCE.getDisplayNameType();
-
-	}
-
-} //WscommonPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/DescriptionTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/DescriptionTypeImpl.java
deleted file mode 100644
index 1cf7a3368..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/DescriptionTypeImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.DescriptionImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DescriptionTypeImpl extends DescriptionImpl implements DescriptionType
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected DescriptionTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.Literals.DESCRIPTION_TYPE;
-	}
-
-} //DescriptionTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/DisplayNameTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/DisplayNameTypeImpl.java
deleted file mode 100644
index 9754c0468..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/DisplayNameTypeImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.DisplayNameImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Display Name Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DisplayNameTypeImpl extends DisplayNameImpl implements DisplayNameType
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected DisplayNameTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.Literals.DISPLAY_NAME_TYPE;
-	}
-
-} //DisplayNameTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/InitParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/InitParamImpl.java
deleted file mode 100644
index 4d93848c7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/InitParamImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Init Param</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl#getParamName <em>Param Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl#getParamValue <em>Param Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.InitParamImpl#getDescriptionTypes <em>Description Types</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InitParamImpl extends J2EEEObjectImpl implements InitParam
-{
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String paramName = PARAM_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-  protected String paramValue = PARAM_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptionTypes() <em>Description Types</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescriptionTypes()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList descriptionTypes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected InitParamImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.Literals.INIT_PARAM;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.INIT_PARAM__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.INIT_PARAM__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.INIT_PARAM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getDescriptionTypes() {
-		if (descriptionTypes == null) {
-			descriptionTypes = new EObjectContainmentEList(DescriptionType.class, this, WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES);
-		}
-		return descriptionTypes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				return ((InternalEList)getDescriptionTypes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				return getParamName();
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				return getParamValue();
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				return getDescription();
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				return getDescriptionTypes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				getDescriptionTypes().clear();
-				getDescriptionTypes().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				getDescriptionTypes().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				return descriptionTypes != null && !descriptionTypes.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (paramName: ");
-		result.append(paramName);
-		result.append(", paramValue: ");
-		result.append(paramValue);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InitParamImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/PortNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/PortNameImpl.java
deleted file mode 100644
index f4c8c555b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/PortNameImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.PortNameImpl#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortNameImpl extends J2EEEObjectImpl implements PortName
-{
-	/**
-	 * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PORT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String portName = PORT_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected PortNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.Literals.PORT_NAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getPortName() {
-		return portName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setPortName(String newPortName) {
-		String oldPortName = portName;
-		portName = newPortName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.PORT_NAME__PORT_NAME, oldPortName, portName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				return getPortName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				setPortName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				setPortName(PORT_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (portName: ");
-		result.append(portName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/SOAPHeaderImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/SOAPHeaderImpl.java
deleted file mode 100644
index 6caefce4c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/SOAPHeaderImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SOAP Header</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderImpl extends QNameImpl implements SOAPHeader
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected SOAPHeaderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.Literals.SOAP_HEADER;
-	}
-
-} //SOAPHeaderImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/SOAPRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/SOAPRoleImpl.java
deleted file mode 100644
index 695584d40..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/SOAPRoleImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SOAP Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.SOAPRoleImpl#getSoapRole <em>Soap Role</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPRoleImpl extends J2EEEObjectImpl implements SOAPRole
-{
-	/**
-	 * The default value of the '{@link #getSoapRole() <em>Soap Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapRole()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SOAP_ROLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapRole() <em>Soap Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapRole()
-	 * @generated
-	 * @ordered
-	 */
-  protected String soapRole = SOAP_ROLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected SOAPRoleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.Literals.SOAP_ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getSoapRole() {
-		return soapRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSoapRole(String newSoapRole) {
-		String oldSoapRole = soapRole;
-		soapRole = newSoapRole;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.SOAP_ROLE__SOAP_ROLE, oldSoapRole, soapRole));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				return getSoapRole();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				setSoapRole((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				setSoapRole(SOAP_ROLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				return SOAP_ROLE_EDEFAULT == null ? soapRole != null : !SOAP_ROLE_EDEFAULT.equals(soapRole);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (soapRole: ");
-		result.append(soapRole);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SOAPRoleImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonFactoryImpl.java
deleted file mode 100644
index 41418d655..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonFactoryImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WscommonFactoryImpl extends EFactoryImpl implements WscommonFactory
-{
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WscommonFactory init() {
-		try {
-			WscommonFactory theWscommonFactory = (WscommonFactory)EPackage.Registry.INSTANCE.getEFactory("wscommon.xmi"); 
-			if (theWscommonFactory != null) {
-				return theWscommonFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new WscommonFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WscommonPackage.INIT_PARAM: return createInitParam();
-			case WscommonPackage.SOAP_HEADER: return createSOAPHeader();
-			case WscommonPackage.SOAP_ROLE: return createSOAPRole();
-			case WscommonPackage.PORT_NAME: return createPortName();
-			case WscommonPackage.DESCRIPTION_TYPE: return createDescriptionType();
-			case WscommonPackage.DISPLAY_NAME_TYPE: return createDisplayNameType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public InitParam createInitParam() {
-		InitParamImpl initParam = new InitParamImpl();
-		return initParam;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public SOAPHeader createSOAPHeader() {
-		SOAPHeaderImpl soapHeader = new SOAPHeaderImpl();
-		return soapHeader;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public SOAPRole createSOAPRole() {
-		SOAPRoleImpl soapRole = new SOAPRoleImpl();
-		return soapRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public PortName createPortName() {
-		PortNameImpl portName = new PortNameImpl();
-		return portName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DescriptionType createDescriptionType() {
-		DescriptionTypeImpl descriptionType = new DescriptionTypeImpl();
-		return descriptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DisplayNameType createDisplayNameType() {
-		DisplayNameTypeImpl displayNameType = new DisplayNameTypeImpl();
-		return displayNameType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonPackage getWscommonPackage() {
-		return (WscommonPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-  public static WscommonPackage getPackage() {
-		return WscommonPackage.eINSTANCE;
-	}
-
-} //WscommonFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
deleted file mode 100644
index 59b2e4264..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WscommonPackageImpl extends EPackageImpl implements WscommonPackage
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass initParamEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass soapHeaderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass soapRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass portNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass descriptionTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass displayNameTypeEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-  private WscommonPackageImpl() {
-		super(eNS_URI, WscommonFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-  public static WscommonPackage init() {
-		if (isInited) return (WscommonPackage)EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI);
-
-		// Obtain or create and register package
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WscommonPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theWscommonPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theWscommonPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theWscommonPackage.freeze();
-
-		return theWscommonPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getInitParam() {
-		return initParamEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getInitParam_ParamName() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getInitParam_ParamValue() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getInitParam_Description() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getInitParam_DescriptionTypes() {
-		return (EReference)initParamEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getSOAPHeader() {
-		return soapHeaderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getSOAPRole() {
-		return soapRoleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getSOAPRole_SoapRole() {
-		return (EAttribute)soapRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getPortName() {
-		return portNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortName_PortName() {
-		return (EAttribute)portNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getDescriptionType() {
-		return descriptionTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getDisplayNameType() {
-		return displayNameTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonFactory getWscommonFactory() {
-		return (WscommonFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		initParamEClass = createEClass(INIT_PARAM);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_NAME);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_VALUE);
-		createEAttribute(initParamEClass, INIT_PARAM__DESCRIPTION);
-		createEReference(initParamEClass, INIT_PARAM__DESCRIPTION_TYPES);
-
-		soapHeaderEClass = createEClass(SOAP_HEADER);
-
-		soapRoleEClass = createEClass(SOAP_ROLE);
-		createEAttribute(soapRoleEClass, SOAP_ROLE__SOAP_ROLE);
-
-		portNameEClass = createEClass(PORT_NAME);
-		createEAttribute(portNameEClass, PORT_NAME__PORT_NAME);
-
-		descriptionTypeEClass = createEClass(DESCRIPTION_TYPE);
-
-		displayNameTypeEClass = createEClass(DISPLAY_NAME_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		initParamEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		soapHeaderEClass.getESuperTypes().add(theCommonPackage.getQName());
-		soapRoleEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		portNameEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		descriptionTypeEClass.getESuperTypes().add(theCommonPackage.getDescription());
-		displayNameTypeEClass.getESuperTypes().add(theCommonPackage.getDisplayName());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(initParamEClass, InitParam.class, "InitParam", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInitParam_ParamName(), ecorePackage.getEString(), "paramName", null, 0, 1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInitParam_ParamValue(), ecorePackage.getEString(), "paramValue", null, 0, 1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInitParam_Description(), ecorePackage.getEString(), "description", null, 0, 1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getInitParam_DescriptionTypes(), this.getDescriptionType(), null, "descriptionTypes", null, 0, -1, InitParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(soapHeaderEClass, SOAPHeader.class, "SOAPHeader", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(soapRoleEClass, SOAPRole.class, "SOAPRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSOAPRole_SoapRole(), ecorePackage.getEString(), "soapRole", null, 0, 1, SOAPRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(portNameEClass, PortName.class, "PortName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPortName_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, PortName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(descriptionTypeEClass, DescriptionType.class, "DescriptionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(displayNameTypeEClass, DisplayNameType.class, "DisplayNameType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //WscommonPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/util/WscommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/util/WscommonAdapterFactory.java
deleted file mode 100644
index faea15778..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/util/WscommonAdapterFactory.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage
- * @generated
- */
-public class WscommonAdapterFactory extends AdapterFactoryImpl
-{
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WscommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = WscommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-  public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WscommonSwitch modelSwitch =
-		new WscommonSwitch() {
-			public Object caseInitParam(InitParam object) {
-				return createInitParamAdapter();
-			}
-			public Object caseSOAPHeader(SOAPHeader object) {
-				return createSOAPHeaderAdapter();
-			}
-			public Object caseSOAPRole(SOAPRole object) {
-				return createSOAPRoleAdapter();
-			}
-			public Object casePortName(PortName object) {
-				return createPortNameAdapter();
-			}
-			public Object caseDescriptionType(DescriptionType object) {
-				return createDescriptionTypeAdapter();
-			}
-			public Object caseDisplayNameType(DisplayNameType object) {
-				return createDisplayNameTypeAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseDisplayName(DisplayName object) {
-				return createDisplayNameAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-  public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam <em>Init Param</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.InitParam
-	 * @generated
-	 */
-  public Adapter createInitParamAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader <em>SOAP Header</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader
-	 * @generated
-	 */
-  public Adapter createSOAPHeaderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole <em>SOAP Role</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole
-	 * @generated
-	 */
-  public Adapter createSOAPRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wscommon.PortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.PortName
-	 * @generated
-	 */
-  public Adapter createPortNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType
-	 * @generated
-	 */
-  public Adapter createDescriptionTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType
-	 * @generated
-	 */
-  public Adapter createDisplayNameTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.Description
-	 * @generated
-	 */
-  public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DisplayName
-	 * @generated
-	 */
-  public Adapter createDisplayNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.QName
-	 * @generated
-	 */
-  public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-  public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //WscommonAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/util/WscommonSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/util/WscommonSwitch.java
deleted file mode 100644
index ac09a4d1e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/util/WscommonSwitch.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage
- * @generated
- */
-public class WscommonSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WscommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WscommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-  public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case WscommonPackage.INIT_PARAM: {
-				InitParam initParam = (InitParam)theEObject;
-				Object result = caseInitParam(initParam);
-				if (result == null) result = caseJ2EEEObject(initParam);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WscommonPackage.SOAP_HEADER: {
-				SOAPHeader soapHeader = (SOAPHeader)theEObject;
-				Object result = caseSOAPHeader(soapHeader);
-				if (result == null) result = caseQName(soapHeader);
-				if (result == null) result = caseJ2EEEObject(soapHeader);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WscommonPackage.SOAP_ROLE: {
-				SOAPRole soapRole = (SOAPRole)theEObject;
-				Object result = caseSOAPRole(soapRole);
-				if (result == null) result = caseJ2EEEObject(soapRole);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WscommonPackage.PORT_NAME: {
-				PortName portName = (PortName)theEObject;
-				Object result = casePortName(portName);
-				if (result == null) result = caseJ2EEEObject(portName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WscommonPackage.DESCRIPTION_TYPE: {
-				DescriptionType descriptionType = (DescriptionType)theEObject;
-				Object result = caseDescriptionType(descriptionType);
-				if (result == null) result = caseDescription(descriptionType);
-				if (result == null) result = caseJ2EEEObject(descriptionType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WscommonPackage.DISPLAY_NAME_TYPE: {
-				DisplayNameType displayNameType = (DisplayNameType)theEObject;
-				Object result = caseDisplayNameType(displayNameType);
-				if (result == null) result = caseDisplayName(displayNameType);
-				if (result == null) result = caseJ2EEEObject(displayNameType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseInitParam(InitParam object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>SOAP Header</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>SOAP Header</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseSOAPHeader(SOAPHeader object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>SOAP Role</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>SOAP Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseSOAPRole(SOAPRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object casePortName(PortName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Type</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDescriptionType(DescriptionType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name Type</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDisplayNameType(DisplayNameType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDisplayName(DisplayName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-  public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WscommonSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/package.xml
deleted file mode 100644
index 2d6ffc703..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the web services common model api. Using this api the common web services model artifacts (SoapHeaders, Ports, DisplayName, InitParams etc.) 
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/BeanLink.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/BeanLink.java
deleted file mode 100644
index e2047ee4c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/BeanLink.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Link</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getBeanLink()
- * @model
- * @generated
- */
-public interface BeanLink extends J2EEEObject {
- // BeanLink
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/EJBLink.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/EJBLink.java
deleted file mode 100644
index 185c3c68a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/EJBLink.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EJB Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The ejb-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a Web Service Endpoint.
- * 
- * The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file.
- * 
- * Used in: service-impl-bean
- * 
- * Examples:
- * <ejb-link>EmployeeRecord</ejb-link>
- * 	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.EJBLink#getEjbLink <em>Ejb Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getEJBLink()
- * @model
- * @generated
- */
-public interface EJBLink extends BeanLink {
-	/**
-	 * Returns the value of the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ejb Link</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Link</em>' attribute.
-	 * @see #setEjbLink(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getEJBLink_EjbLink()
-	 * @model
-	 * @generated
-	 */
-  String getEjbLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.EJBLink#getEjbLink <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Link</em>' attribute.
-	 * @see #getEjbLink()
-	 * @generated
-	 */
-  void setEjbLink(String value);
-
-} // EJBLink
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/Handler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/Handler.java
deleted file mode 100644
index 1737212df..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/Handler.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Declares the handler for a port-component. Handlers can access the init-param name/value pairs using the HandlerInfo interface.
- * 
- * Used in: port-component
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getSoapHeaders <em>Soap Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getSoapRoles <em>Soap Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getHandler()
- * @model
- * @generated
- */
-public interface Handler extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Handler Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handler Name</em>' attribute.
-	 * @see #setHandlerName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getHandler_HandlerName()
-	 * @model
-	 * @generated
-	 */
-  String getHandlerName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerName <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Name</em>' attribute.
-	 * @see #getHandlerName()
-	 * @generated
-	 */
-  void setHandlerName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Handler Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Handler Class</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handler Class</em>' attribute.
-	 * @see #setHandlerClass(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getHandler_HandlerClass()
-	 * @model
-	 * @generated
-	 */
-  String getHandlerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerClass <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Class</em>' attribute.
-	 * @see #getHandlerClass()
-	 * @generated
-	 */
-  void setHandlerClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wscommon.InitParam}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getHandler_InitParams()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wscommon.InitParam" containment="true"
-	 * @generated
-	 */
-  EList getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Headers</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Headers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getHandler_SoapHeaders()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader" containment="true"
-	 * @generated
-	 */
-  EList getSoapHeaders();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Roles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Roles</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Roles</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getHandler_SoapRoles()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole" containment="true"
-	 * @generated
-	 */
-  EList getSoapRoles();
-
-} // Handler
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java
deleted file mode 100644
index bf530fdd6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The port-component element associates a WSDL port with a Web service interface and implementation.  It defines the name of the port as a component, optional description, optional display name, optional iconic representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getPortComponentName <em>Port Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getWsdlPort <em>Wsdl Port</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceImplBean <em>Service Impl Bean</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent()
- * @model
- * @generated
- */
-public interface PortComponent extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Port Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Component Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-component-name element specifies a port component's name. This name is assigned by the module producer to name the service implementation bean in the module's deployment descriptor. The name must be unique among the port component names defined in the same module.
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Name</em>' attribute.
-	 * @see #setPortComponentName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_PortComponentName()
-	 * @model
-	 * @generated
-	 */
-  String getPortComponentName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getPortComponentName <em>Port Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Component Name</em>' attribute.
-	 * @see #getPortComponentName()
-	 * @generated
-	 */
-  void setPortComponentName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Endpoint Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-endpoint-interface element contains the fully-qualified name of the port component's Service Endpoint Interface.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #setServiceEndpointInterface(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_ServiceEndpointInterface()
-	 * @model
-	 * @generated
-	 */
-  String getServiceEndpointInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 */
-  void setServiceEndpointInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Small Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_SmallIcon()
-	 * @model
-	 * @generated
-	 */
-  String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-  void setSmallIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Large Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_LargeIcon()
-	 * @model
-	 * @generated
-	 */
-  String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-  void setLargeIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_Description()
-	 * @model
-	 * @generated
-	 */
-  String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-  void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_DisplayName()
-	 * @model
-	 * @generated
-	 */
-  String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-  void setDisplayName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Port</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Port</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Port</em>' containment reference.
-	 * @see #setWsdlPort(WSDLPort)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_WsdlPort()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLPort getWsdlPort();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getWsdlPort <em>Wsdl Port</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Port</em>' containment reference.
-	 * @see #getWsdlPort()
-	 * @generated
-	 */
-  void setWsdlPort(WSDLPort value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Impl Bean</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Impl Bean</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Impl Bean</em>' containment reference.
-	 * @see #setServiceImplBean(ServiceImplBean)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_ServiceImplBean()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  ServiceImplBean getServiceImplBean();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceImplBean <em>Service Impl Bean</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Impl Bean</em>' containment reference.
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  void setServiceImplBean(ServiceImplBean value);
-
-	/**
-	 * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsdd.Handler}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Handlers</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handlers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_Handlers()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsdd.Handler" containment="true"
-	 * @generated
-	 */
-  EList getHandlers();
-
-	/**
-	 * Returns the value of the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Type</em>' containment reference.
-	 * @see #setDescriptionType(DescriptionType)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_DescriptionType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DescriptionType getDescriptionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescriptionType <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description Type</em>' containment reference.
-	 * @see #getDescriptionType()
-	 * @generated
-	 */
-  void setDescriptionType(DescriptionType value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #setDisplayNameType(DisplayNameType)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_DisplayNameType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DisplayNameType getDisplayNameType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayNameType <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #getDisplayNameType()
-	 * @generated
-	 */
-  void setDisplayNameType(DisplayNameType value);
-
-	/**
-	 * Returns the value of the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Icon Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icon Type</em>' containment reference.
-	 * @see #setIconType(IconType)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getPortComponent_IconType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  IconType getIconType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getIconType <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Icon Type</em>' containment reference.
-	 * @see #getIconType()
-	 * @generated
-	 */
-  void setIconType(IconType value);
-
-} // PortComponent
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServiceImplBean.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServiceImplBean.java
deleted file mode 100644
index 15b148a09..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServiceImplBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Impl Bean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-impl-bean element defines the Web service implementation.A service implementation can be an EJB bean class or JAX-RPC web component. Existing EJB implementations are exposed as a Web service using an ejb-link.
- * 
- * Used in: port-component
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEEJBLink <em>EEJB Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEServletLink <em>EServlet Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getBeanLink <em>Bean Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getServiceImplBean()
- * @model
- * @generated
- */
-public interface ServiceImplBean extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>EEJB Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EEJB Link</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>EEJB Link</em>' containment reference.
-	 * @see #setEEJBLink(EJBLink)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getServiceImplBean_EEJBLink()
-	 * @model containment="true"
-	 * @generated
-	 */
-  EJBLink getEEJBLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEEJBLink <em>EEJB Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EEJB Link</em>' containment reference.
-	 * @see #getEEJBLink()
-	 * @generated
-	 */
-  void setEEJBLink(EJBLink value);
-
-	/**
-	 * Returns the value of the '<em><b>EServlet Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EServlet Link</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>EServlet Link</em>' containment reference.
-	 * @see #setEServletLink(ServletLink)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getServiceImplBean_EServletLink()
-	 * @model containment="true"
-	 * @generated
-	 */
-  ServletLink getEServletLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEServletLink <em>EServlet Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EServlet Link</em>' containment reference.
-	 * @see #getEServletLink()
-	 * @generated
-	 */
-  void setEServletLink(ServletLink value);
-
-	/**
-	 * Returns the value of the '<em><b>Bean Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Bean Link</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bean Link</em>' containment reference.
-	 * @see #setBeanLink(BeanLink)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getServiceImplBean_BeanLink()
-	 * @model containment="true"
-	 * @generated
-	 */
-  BeanLink getBeanLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getBeanLink <em>Bean Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bean Link</em>' containment reference.
-	 * @see #getBeanLink()
-	 * @generated
-	 */
-  void setBeanLink(BeanLink value);
-
-} // ServiceImplBean
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServletLink.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServletLink.java
deleted file mode 100644
index e652a1361..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServletLink.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Servlet Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The servlet-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a JAX-RPC Service Endpoint.
- * 
- * The value of the servlet-link element must be the servlet-name of a JAX-RPC Service Endpoint in the same WAR file.
- * 
- * Used in: service-impl-bean
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.ServletLink#getServletLink <em>Servlet Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getServletLink()
- * @model
- * @generated
- */
-public interface ServletLink extends BeanLink {
-	/**
-	 * Returns the value of the '<em><b>Servlet Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Servlet Link</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlet Link</em>' attribute.
-	 * @see #setServletLink(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getServletLink_ServletLink()
-	 * @model
-	 * @generated
-	 */
-  String getServletLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServletLink#getServletLink <em>Servlet Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Servlet Link</em>' attribute.
-	 * @see #getServletLink()
-	 * @generated
-	 */
-  void setServletLink(String value);
-
-} // ServletLink
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WSDLPort.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WSDLPort.java
deleted file mode 100644
index 13ec2e211..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WSDLPort.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Port</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Defines the name space and local name part of the WSDL port QName.
- * 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWSDLPort()
- * @model
- * @generated
- */
-public interface WSDLPort extends QName {
- // WSDLPort
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServiceDescription.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServiceDescription.java
deleted file mode 100644
index f4e10ce5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServiceDescription.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web Service Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The webservice-description element defines a WSDL document file and the set of Port components associated with the WSDL ports defined in the WSDL document.  There may be multiple webservice-descriptions defined within a module.
- * 
- * All WSDL file ports must have a corresponding port-component element defined.
- * 
- * Used in: webservices
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName <em>Web Service Description Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getPortComponents <em>Port Components</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription()
- * @model
- * @generated
- */
-public interface WebServiceDescription extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Jaxrpc Mapping File</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The jaxrpc-mapping-file element contains the name of a file that describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #setJaxrpcMappingFile(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_JaxrpcMappingFile()
-	 * @model
-	 * @generated
-	 */
-  String getJaxrpcMappingFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 */
-  void setJaxrpcMappingFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Web Service Description Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Web Service Description Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The webservice-description-name identifies the collection of port-components associated with a WSDL file and JAX-RPC mapping. The name must be unique within the deployment descriptor.
-	 * 
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Web Service Description Name</em>' attribute.
-	 * @see #setWebServiceDescriptionName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_WebServiceDescriptionName()
-	 * @model
-	 * @generated
-	 */
-  String getWebServiceDescriptionName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName <em>Web Service Description Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web Service Description Name</em>' attribute.
-	 * @see #getWebServiceDescriptionName()
-	 * @generated
-	 */
-  void setWebServiceDescriptionName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl File</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The wsdl-file element contains the name of a WSDL file in the module. The file name is a relative path within the module.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl File</em>' attribute.
-	 * @see #setWsdlFile(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_WsdlFile()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWsdlFile <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl File</em>' attribute.
-	 * @see #getWsdlFile()
-	 * @generated
-	 */
-  void setWsdlFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Small Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_SmallIcon()
-	 * @model
-	 * @generated
-	 */
-  String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-  void setSmallIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Large Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_LargeIcon()
-	 * @model
-	 * @generated
-	 */
-  String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-  void setLargeIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_Description()
-	 * @model
-	 * @generated
-	 */
-  String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-  void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_DisplayName()
-	 * @model
-	 * @generated
-	 */
-  String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-  void setDisplayName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Components</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Components</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port Components</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_PortComponents()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsdd.PortComponent" containment="true" required="true"
-	 * @generated
-	 */
-  EList getPortComponents();
-
-	/**
-	 * Returns the value of the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Type</em>' containment reference.
-	 * @see #setDescriptionType(DescriptionType)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_DescriptionType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DescriptionType getDescriptionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescriptionType <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description Type</em>' containment reference.
-	 * @see #getDescriptionType()
-	 * @generated
-	 */
-  void setDescriptionType(DescriptionType value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #setDisplayNameType(DisplayNameType)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_DisplayNameType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DisplayNameType getDisplayNameType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayNameType <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #getDisplayNameType()
-	 * @generated
-	 */
-  void setDisplayNameType(DisplayNameType value);
-
-	/**
-	 * Returns the value of the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Icon Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icon Type</em>' containment reference.
-	 * @see #setIconType(IconType)
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServiceDescription_IconType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  IconType getIconType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getIconType <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Icon Type</em>' containment reference.
-	 * @see #getIconType()
-	 * @generated
-	 */
-  void setIconType(IconType value);
-
-} // WebServiceDescription
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServices.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServices.java
deleted file mode 100644
index 5802180d4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServices.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web Services</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The webservices element is the root element for the web services deployment descriptor.  It specifies the set of Web service descriptions that are to be deployed into the J2EE Application Server and the dependencies they have on container resources and services.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServices#getWebServiceDescriptions <em>Web Service Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServices()
- * @model
- * @generated
- */
-public interface WebServices extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Web Service Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Web Service Descriptions</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Web Service Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#getWebServices_WebServiceDescriptions()
-	 * @model type="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription" containment="true" required="true"
-	 * @generated
-	 */
-  EList getWebServiceDescriptions();
-
-} // WebServices
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java
deleted file mode 100644
index 93108bedd..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage
- * @generated
- */
-public interface WsddFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WsddFactory eINSTANCE = org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Web Services</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web Services</em>'.
-	 * @generated
-	 */
-  WebServices createWebServices();
-
-	/**
-	 * Returns a new object of class '<em>Web Service Description</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web Service Description</em>'.
-	 * @generated
-	 */
-  WebServiceDescription createWebServiceDescription();
-
-	/**
-	 * Returns a new object of class '<em>Port Component</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Component</em>'.
-	 * @generated
-	 */
-  PortComponent createPortComponent();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Port</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Port</em>'.
-	 * @generated
-	 */
-  WSDLPort createWSDLPort();
-
-	/**
-	 * Returns a new object of class '<em>Service Impl Bean</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Impl Bean</em>'.
-	 * @generated
-	 */
-  ServiceImplBean createServiceImplBean();
-
-	/**
-	 * Returns a new object of class '<em>Servlet Link</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Servlet Link</em>'.
-	 * @generated
-	 */
-  ServletLink createServletLink();
-
-	/**
-	 * Returns a new object of class '<em>EJB Link</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Link</em>'.
-	 * @generated
-	 */
-  EJBLink createEJBLink();
-
-	/**
-	 * Returns a new object of class '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Handler</em>'.
-	 * @generated
-	 */
-  Handler createHandler();
-
-	/**
-	 * Returns a new object of class '<em>Bean Link</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Link</em>'.
-	 * @generated
-	 */
-	BeanLink createBeanLink();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-  WsddPackage getWsddPackage();
-
-} //WsddFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java
deleted file mode 100644
index 4d6c8728d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java
+++ /dev/null
@@ -1,1567 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * /**
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- *
- *
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory
- * @model kind="package"
- * @generated
- */
-public interface WsddPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNAME = "wsdd";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_URI = "wsdd.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_PREFIX = "org.eclipse.jst.j2ee.webservice.wsdd";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WsddPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServicesImpl <em>Web Services</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServicesImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getWebServices()
-	 * @generated
-	 */
-  int WEB_SERVICES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Web Service Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Web Services</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl <em>Web Service Description</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getWebServiceDescription()
-	 * @generated
-	 */
-  int WEB_SERVICE_DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Web Service Description Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__WSDL_FILE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__SMALL_ICON = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__LARGE_ICON = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DISPLAY_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Port Components</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__ICON_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 10;
-
-	/**
-	 * The number of structural features of the '<em>Web Service Description</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl <em>Port Component</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getPortComponent()
-	 * @generated
-	 */
-  int PORT_COMPONENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__PORT_COMPONENT_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__SMALL_ICON = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__LARGE_ICON = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DESCRIPTION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DISPLAY_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Port</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__WSDL_PORT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Service Impl Bean</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__SERVICE_IMPL_BEAN = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__HANDLERS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DESCRIPTION_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DISPLAY_NAME_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__ICON_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 11;
-
-	/**
-	 * The number of structural features of the '<em>Port Component</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl <em>WSDL Port</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getWSDLPort()
-	 * @generated
-	 */
-  int WSDL_PORT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Port</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl <em>Service Impl Bean</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getServiceImplBean()
-	 * @generated
-	 */
-  int SERVICE_IMPL_BEAN = 4;
-
-	/**
-	 * The feature id for the '<em><b>EEJB Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN__EEJB_LINK = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EServlet Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN__ESERVLET_LINK = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Bean Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN__BEAN_LINK = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Service Impl Bean</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.BeanLinkImpl <em>Bean Link</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.BeanLinkImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getBeanLink()
-	 * @generated
-	 */
-  int BEAN_LINK = 8;
-
-	/**
-	 * The number of structural features of the '<em>Bean Link</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int BEAN_LINK_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServletLinkImpl <em>Servlet Link</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServletLinkImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getServletLink()
-	 * @generated
-	 */
-  int SERVLET_LINK = 5;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVLET_LINK__SERVLET_LINK = BEAN_LINK_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Servlet Link</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVLET_LINK_FEATURE_COUNT = BEAN_LINK_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.EJBLinkImpl <em>EJB Link</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.EJBLinkImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getEJBLink()
-	 * @generated
-	 */
-  int EJB_LINK = 6;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EJB_LINK__EJB_LINK = BEAN_LINK_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>EJB Link</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EJB_LINK_FEATURE_COUNT = BEAN_LINK_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl <em>Handler</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getHandler()
-	 * @generated
-	 */
-  int HANDLER = 7;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__HANDLER_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Handler Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__HANDLER_CLASS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__SOAP_HEADERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Soap Roles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__SOAP_ROLES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Handler</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServices <em>Web Services</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web Services</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServices
-	 * @generated
-	 */
-  EClass getWebServices();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServices#getWebServiceDescriptions <em>Web Service Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Web Service Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServices#getWebServiceDescriptions()
-	 * @see #getWebServices()
-	 * @generated
-	 */
-  EReference getWebServices_WebServiceDescriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription <em>Web Service Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web Service Description</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription
-	 * @generated
-	 */
-  EClass getWebServiceDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jaxrpc Mapping File</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_JaxrpcMappingFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName <em>Web Service Description Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Web Service Description Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_WebServiceDescriptionName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWsdlFile <em>Wsdl File</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl File</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getWsdlFile()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_WsdlFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getSmallIcon()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getLargeIcon()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescription()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayName()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_DisplayName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getPortComponents <em>Port Components</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Port Components</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getPortComponents()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_PortComponents();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDescriptionType()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_DescriptionType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Display Name Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getDisplayNameType()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_DisplayNameType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getIconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Icon Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription#getIconType()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_IconType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent <em>Port Component</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Component</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent
-	 * @generated
-	 */
-  EClass getPortComponent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getPortComponentName <em>Port Component Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Component Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getPortComponentName()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_PortComponentName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Endpoint Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceEndpointInterface()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_ServiceEndpointInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getSmallIcon()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getLargeIcon()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescription()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayName()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_DisplayName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getWsdlPort <em>Wsdl Port</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Port</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getWsdlPort()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_WsdlPort();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceImplBean <em>Service Impl Bean</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Service Impl Bean</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getServiceImplBean()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_ServiceImplBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getHandlers <em>Handlers</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handlers</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getHandlers()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_Handlers();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDescriptionType()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_DescriptionType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Display Name Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getDisplayNameType()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_DisplayNameType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getIconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Icon Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent#getIconType()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_IconType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort <em>WSDL Port</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Port</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort
-	 * @generated
-	 */
-  EClass getWSDLPort();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean <em>Service Impl Bean</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Impl Bean</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean
-	 * @generated
-	 */
-  EClass getServiceImplBean();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEEJBLink <em>EEJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>EEJB Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEEJBLink()
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  EReference getServiceImplBean_EEJBLink();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEServletLink <em>EServlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>EServlet Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getEServletLink()
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  EReference getServiceImplBean_EServletLink();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getBeanLink <em>Bean Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Bean Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean#getBeanLink()
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  EReference getServiceImplBean_BeanLink();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServletLink <em>Servlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Servlet Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServletLink
-	 * @generated
-	 */
-  EClass getServletLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServletLink#getServletLink <em>Servlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Servlet Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServletLink#getServletLink()
-	 * @see #getServletLink()
-	 * @generated
-	 */
-  EAttribute getServletLink_ServletLink();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.EJBLink <em>EJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJB Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.EJBLink
-	 * @generated
-	 */
-  EClass getEJBLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.EJBLink#getEjbLink <em>Ejb Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.EJBLink#getEjbLink()
-	 * @see #getEJBLink()
-	 * @generated
-	 */
-  EAttribute getEJBLink_EjbLink();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Handler</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler
-	 * @generated
-	 */
-  EClass getHandler();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerName <em>Handler Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerName()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EAttribute getHandler_HandlerName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerClass <em>Handler Class</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Class</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler#getHandlerClass()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EAttribute getHandler_HandlerClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler#getInitParams()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EReference getHandler_InitParams();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getSoapHeaders <em>Soap Headers</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Soap Headers</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler#getSoapHeaders()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EReference getHandler_SoapHeaders();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler#getSoapRoles <em>Soap Roles</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Soap Roles</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler#getSoapRoles()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EReference getHandler_SoapRoles();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.wsdd.BeanLink <em>Bean Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Link</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.BeanLink
-	 * @generated
-	 */
-  EClass getBeanLink();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-  WsddFactory getWsddFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServicesImpl <em>Web Services</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServicesImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getWebServices()
-		 * @generated
-		 */
-		EClass WEB_SERVICES = eINSTANCE.getWebServices();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Service Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS = eINSTANCE.getWebServices_WebServiceDescriptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl <em>Web Service Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getWebServiceDescription()
-		 * @generated
-		 */
-		EClass WEB_SERVICE_DESCRIPTION = eINSTANCE.getWebServiceDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Jaxrpc Mapping File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE = eINSTANCE.getWebServiceDescription_JaxrpcMappingFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Web Service Description Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME = eINSTANCE.getWebServiceDescription_WebServiceDescriptionName();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__WSDL_FILE = eINSTANCE.getWebServiceDescription_WsdlFile();
-
-		/**
-		 * The meta object literal for the '<em><b>Small Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__SMALL_ICON = eINSTANCE.getWebServiceDescription_SmallIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Large Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__LARGE_ICON = eINSTANCE.getWebServiceDescription_LargeIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__DESCRIPTION = eINSTANCE.getWebServiceDescription_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WEB_SERVICE_DESCRIPTION__DISPLAY_NAME = eINSTANCE.getWebServiceDescription_DisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Components</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS = eINSTANCE.getWebServiceDescription_PortComponents();
-
-		/**
-		 * The meta object literal for the '<em><b>Description Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE = eINSTANCE.getWebServiceDescription_DescriptionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE = eINSTANCE.getWebServiceDescription_DisplayNameType();
-
-		/**
-		 * The meta object literal for the '<em><b>Icon Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WEB_SERVICE_DESCRIPTION__ICON_TYPE = eINSTANCE.getWebServiceDescription_IconType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl <em>Port Component</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getPortComponent()
-		 * @generated
-		 */
-		EClass PORT_COMPONENT = eINSTANCE.getPortComponent();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Component Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT__PORT_COMPONENT_NAME = eINSTANCE.getPortComponent_PortComponentName();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getPortComponent_ServiceEndpointInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Small Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT__SMALL_ICON = eINSTANCE.getPortComponent_SmallIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Large Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT__LARGE_ICON = eINSTANCE.getPortComponent_LargeIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT__DESCRIPTION = eINSTANCE.getPortComponent_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_COMPONENT__DISPLAY_NAME = eINSTANCE.getPortComponent_DisplayName();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Port</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT__WSDL_PORT = eINSTANCE.getPortComponent_WsdlPort();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Impl Bean</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT__SERVICE_IMPL_BEAN = eINSTANCE.getPortComponent_ServiceImplBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT__HANDLERS = eINSTANCE.getPortComponent_Handlers();
-
-		/**
-		 * The meta object literal for the '<em><b>Description Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT__DESCRIPTION_TYPE = eINSTANCE.getPortComponent_DescriptionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT__DISPLAY_NAME_TYPE = eINSTANCE.getPortComponent_DisplayNameType();
-
-		/**
-		 * The meta object literal for the '<em><b>Icon Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PORT_COMPONENT__ICON_TYPE = eINSTANCE.getPortComponent_IconType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl <em>WSDL Port</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WSDLPortImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getWSDLPort()
-		 * @generated
-		 */
-		EClass WSDL_PORT = eINSTANCE.getWSDLPort();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl <em>Service Impl Bean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getServiceImplBean()
-		 * @generated
-		 */
-		EClass SERVICE_IMPL_BEAN = eINSTANCE.getServiceImplBean();
-
-		/**
-		 * The meta object literal for the '<em><b>EEJB Link</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_IMPL_BEAN__EEJB_LINK = eINSTANCE.getServiceImplBean_EEJBLink();
-
-		/**
-		 * The meta object literal for the '<em><b>EServlet Link</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_IMPL_BEAN__ESERVLET_LINK = eINSTANCE.getServiceImplBean_EServletLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Bean Link</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_IMPL_BEAN__BEAN_LINK = eINSTANCE.getServiceImplBean_BeanLink();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServletLinkImpl <em>Servlet Link</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServletLinkImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getServletLink()
-		 * @generated
-		 */
-		EClass SERVLET_LINK = eINSTANCE.getServletLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Servlet Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVLET_LINK__SERVLET_LINK = eINSTANCE.getServletLink_ServletLink();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.EJBLinkImpl <em>EJB Link</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.EJBLinkImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getEJBLink()
-		 * @generated
-		 */
-		EClass EJB_LINK = eINSTANCE.getEJBLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Ejb Link</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EJB_LINK__EJB_LINK = eINSTANCE.getEJBLink_EjbLink();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl <em>Handler</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getHandler()
-		 * @generated
-		 */
-		EClass HANDLER = eINSTANCE.getHandler();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HANDLER__HANDLER_NAME = eINSTANCE.getHandler_HandlerName();
-
-		/**
-		 * The meta object literal for the '<em><b>Handler Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute HANDLER__HANDLER_CLASS = eINSTANCE.getHandler_HandlerClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Init Params</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference HANDLER__INIT_PARAMS = eINSTANCE.getHandler_InitParams();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Headers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference HANDLER__SOAP_HEADERS = eINSTANCE.getHandler_SoapHeaders();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Roles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference HANDLER__SOAP_ROLES = eINSTANCE.getHandler_SoapRoles();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.BeanLinkImpl <em>Bean Link</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.BeanLinkImpl
-		 * @see org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddPackageImpl#getBeanLink()
-		 * @generated
-		 */
-		EClass BEAN_LINK = eINSTANCE.getBeanLink();
-
-	}
-
-} //WsddPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java
deleted file mode 100644
index 98ce79e2d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- *@since 1.0
- */
-public interface WsddResource extends XMLResource
-{
-
-	/**
-	 * 
-	 */
-	public static final int WEB_SERVICE_TYPE = 6;
-
-	/**
-	 * Returns reference to the model object WebServices
-	 * @return reference to the model object WebServices 
-	 */
-	WebServices getWebServices();
-	
-	/**
-	 * Returns true if the WebService is of version 1.0
-	 * @return boolean value
-	 */
-	public boolean isWebService1_0();
-	
-	/**
-	 * Returns true if the WebService is of version 1.1
-	 * @return boolean value
-	 */
-	public boolean isWebService1_1();
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/BeanLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/BeanLinkImpl.java
deleted file mode 100644
index 4cbf03376..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/BeanLinkImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class BeanLinkImpl extends J2EEEObjectImpl implements BeanLink
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected BeanLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.BEAN_LINK;
-	}
-
-} //BeanLinkImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/EJBLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/EJBLinkImpl.java
deleted file mode 100644
index 8f5d45782..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/EJBLinkImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJB Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.EJBLinkImpl#getEjbLink <em>Ejb Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJBLinkImpl extends BeanLinkImpl implements EJBLink
-{
-	/**
-	 * The default value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String EJB_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected String ejbLink = EJB_LINK_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EJBLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.EJB_LINK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getEjbLink() {
-		return ejbLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setEjbLink(String newEjbLink) {
-		String oldEjbLink = ejbLink;
-		ejbLink = newEjbLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.EJB_LINK__EJB_LINK, oldEjbLink, ejbLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				return getEjbLink();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				setEjbLink((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				setEjbLink(EJB_LINK_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				return EJB_LINK_EDEFAULT == null ? ejbLink != null : !EJB_LINK_EDEFAULT.equals(ejbLink);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ejbLink: ");
-		result.append(ejbLink);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EJBLinkImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/HandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/HandlerImpl.java
deleted file mode 100644
index 505aa258b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/HandlerImpl.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl#getSoapHeaders <em>Soap Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.HandlerImpl#getSoapRoles <em>Soap Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HandlerImpl extends CompatibilityDescriptionGroupImpl implements Handler
-{
-	/**
-	 * The default value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String HANDLER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String handlerName = HANDLER_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String HANDLER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-  protected String handlerClass = HANDLER_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList initParams = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapHeaders() <em>Soap Headers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapHeaders()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList soapHeaders = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapRoles() <em>Soap Roles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapRoles()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList soapRoles = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected HandlerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.HANDLER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getHandlerName() {
-		return handlerName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setHandlerName(String newHandlerName) {
-		String oldHandlerName = handlerName;
-		handlerName = newHandlerName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.HANDLER__HANDLER_NAME, oldHandlerName, handlerName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getHandlerClass() {
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setHandlerClass(String newHandlerClass) {
-		String oldHandlerClass = handlerClass;
-		handlerClass = newHandlerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(InitParam.class, this, WsddPackage.HANDLER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getSoapHeaders() {
-		if (soapHeaders == null) {
-			soapHeaders = new EObjectContainmentEList(SOAPHeader.class, this, WsddPackage.HANDLER__SOAP_HEADERS);
-		}
-		return soapHeaders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getSoapRoles() {
-		if (soapRoles == null) {
-			soapRoles = new EObjectContainmentEList(SOAPRole.class, this, WsddPackage.HANDLER__SOAP_ROLES);
-		}
-		return soapRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				return ((InternalEList)getSoapHeaders()).basicRemove(otherEnd, msgs);
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				return ((InternalEList)getSoapRoles()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				return getHandlerName();
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				return getHandlerClass();
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				return getInitParams();
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				return getSoapHeaders();
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				return getSoapRoles();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				setHandlerName((String)newValue);
-				return;
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass((String)newValue);
-				return;
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				getSoapHeaders().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				getSoapRoles().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				setHandlerName(HANDLER_NAME_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass(HANDLER_CLASS_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				return;
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				return HANDLER_NAME_EDEFAULT == null ? handlerName != null : !HANDLER_NAME_EDEFAULT.equals(handlerName);
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				return HANDLER_CLASS_EDEFAULT == null ? handlerClass != null : !HANDLER_CLASS_EDEFAULT.equals(handlerClass);
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				return soapHeaders != null && !soapHeaders.isEmpty();
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				return soapRoles != null && !soapRoles.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (handlerName: ");
-		result.append(handlerName);
-		result.append(", handlerClass: ");
-		result.append(handlerClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //HandlerImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java
deleted file mode 100644
index be360ec91..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/PortComponentImpl.java
+++ /dev/null
@@ -1,824 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Component</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getPortComponentName <em>Port Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getWsdlPort <em>Wsdl Port</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getServiceImplBean <em>Service Impl Bean</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortComponentImpl extends J2EEEObjectImpl implements PortComponent
-{
-	/**
-	 * The default value of the '{@link #getPortComponentName() <em>Port Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortComponentName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PORT_COMPONENT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentName() <em>Port Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortComponentName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String portComponentName = PORT_COMPONENT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SERVICE_ENDPOINT_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected String serviceEndpointInterface = SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlPort() <em>Wsdl Port</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlPort()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLPort wsdlPort = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceImplBean() <em>Service Impl Bean</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceImplBean()
-	 * @generated
-	 * @ordered
-	 */
-  protected ServiceImplBean serviceImplBean = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlers()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList handlers = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptionType() <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescriptionType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DescriptionType descriptionType = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNameType() <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayNameType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DisplayNameType displayNameType = null;
-
-	/**
-	 * The cached value of the '{@link #getIconType() <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getIconType()
-	 * @generated
-	 * @ordered
-	 */
-  protected IconType iconType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected PortComponentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.PORT_COMPONENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getPortComponentName() {
-		return portComponentName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setPortComponentName(String newPortComponentName) {
-		String oldPortComponentName = portComponentName;
-		portComponentName = newPortComponentName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME, oldPortComponentName, portComponentName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getServiceEndpointInterface() {
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServiceEndpointInterface(String newServiceEndpointInterface) {
-		String oldServiceEndpointInterface = serviceEndpointInterface;
-		serviceEndpointInterface = newServiceEndpointInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getSmallIcon() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSmallIcon(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getLargeIcon() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setLargeIcon(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLPort getWsdlPort() {
-		return wsdlPort;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlPort(WSDLPort newWsdlPort, NotificationChain msgs) {
-		WSDLPort oldWsdlPort = wsdlPort;
-		wsdlPort = newWsdlPort;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__WSDL_PORT, oldWsdlPort, newWsdlPort);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlPort(WSDLPort newWsdlPort) {
-		if (newWsdlPort != wsdlPort) {
-			NotificationChain msgs = null;
-			if (wsdlPort != null)
-				msgs = ((InternalEObject)wsdlPort).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__WSDL_PORT, null, msgs);
-			if (newWsdlPort != null)
-				msgs = ((InternalEObject)newWsdlPort).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__WSDL_PORT, null, msgs);
-			msgs = basicSetWsdlPort(newWsdlPort, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__WSDL_PORT, newWsdlPort, newWsdlPort));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceImplBean getServiceImplBean() {
-		return serviceImplBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetServiceImplBean(ServiceImplBean newServiceImplBean, NotificationChain msgs) {
-		ServiceImplBean oldServiceImplBean = serviceImplBean;
-		serviceImplBean = newServiceImplBean;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, oldServiceImplBean, newServiceImplBean);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServiceImplBean(ServiceImplBean newServiceImplBean) {
-		if (newServiceImplBean != serviceImplBean) {
-			NotificationChain msgs = null;
-			if (serviceImplBean != null)
-				msgs = ((InternalEObject)serviceImplBean).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, null, msgs);
-			if (newServiceImplBean != null)
-				msgs = ((InternalEObject)newServiceImplBean).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, null, msgs);
-			msgs = basicSetServiceImplBean(newServiceImplBean, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, newServiceImplBean, newServiceImplBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getHandlers() {
-		if (handlers == null) {
-			handlers = new EObjectContainmentEList(Handler.class, this, WsddPackage.PORT_COMPONENT__HANDLERS);
-		}
-		return handlers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DescriptionType getDescriptionType() {
-		return descriptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDescriptionType(DescriptionType newDescriptionType, NotificationChain msgs) {
-		DescriptionType oldDescriptionType = descriptionType;
-		descriptionType = newDescriptionType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, oldDescriptionType, newDescriptionType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescriptionType(DescriptionType newDescriptionType) {
-		if (newDescriptionType != descriptionType) {
-			NotificationChain msgs = null;
-			if (descriptionType != null)
-				msgs = ((InternalEObject)descriptionType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, null, msgs);
-			if (newDescriptionType != null)
-				msgs = ((InternalEObject)newDescriptionType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, null, msgs);
-			msgs = basicSetDescriptionType(newDescriptionType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, newDescriptionType, newDescriptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DisplayNameType getDisplayNameType() {
-		return displayNameType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDisplayNameType(DisplayNameType newDisplayNameType, NotificationChain msgs) {
-		DisplayNameType oldDisplayNameType = displayNameType;
-		displayNameType = newDisplayNameType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, oldDisplayNameType, newDisplayNameType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayNameType(DisplayNameType newDisplayNameType) {
-		if (newDisplayNameType != displayNameType) {
-			NotificationChain msgs = null;
-			if (displayNameType != null)
-				msgs = ((InternalEObject)displayNameType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, null, msgs);
-			if (newDisplayNameType != null)
-				msgs = ((InternalEObject)newDisplayNameType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, null, msgs);
-			msgs = basicSetDisplayNameType(newDisplayNameType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, newDisplayNameType, newDisplayNameType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public IconType getIconType() {
-		return iconType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetIconType(IconType newIconType, NotificationChain msgs) {
-		IconType oldIconType = iconType;
-		iconType = newIconType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__ICON_TYPE, oldIconType, newIconType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setIconType(IconType newIconType) {
-		if (newIconType != iconType) {
-			NotificationChain msgs = null;
-			if (iconType != null)
-				msgs = ((InternalEObject)iconType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__ICON_TYPE, null, msgs);
-			if (newIconType != null)
-				msgs = ((InternalEObject)newIconType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__ICON_TYPE, null, msgs);
-			msgs = basicSetIconType(newIconType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__ICON_TYPE, newIconType, newIconType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				return basicSetWsdlPort(null, msgs);
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				return basicSetServiceImplBean(null, msgs);
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				return basicSetDescriptionType(null, msgs);
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				return basicSetDisplayNameType(null, msgs);
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				return basicSetIconType(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				return getPortComponentName();
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				return getServiceEndpointInterface();
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				return getSmallIcon();
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				return getLargeIcon();
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				return getDescription();
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				return getDisplayName();
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				return getWsdlPort();
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				return getServiceImplBean();
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				return getHandlers();
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				return getDescriptionType();
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				return getDisplayNameType();
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				return getIconType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				setPortComponentName((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				setWsdlPort((WSDLPort)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				setServiceImplBean((ServiceImplBean)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				getHandlers().clear();
-				getHandlers().addAll((Collection)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				setIconType((IconType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				setPortComponentName(PORT_COMPONENT_NAME_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface(SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				setWsdlPort((WSDLPort)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				setServiceImplBean((ServiceImplBean)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				getHandlers().clear();
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				setIconType((IconType)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				return PORT_COMPONENT_NAME_EDEFAULT == null ? portComponentName != null : !PORT_COMPONENT_NAME_EDEFAULT.equals(portComponentName);
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				return SERVICE_ENDPOINT_INTERFACE_EDEFAULT == null ? serviceEndpointInterface != null : !SERVICE_ENDPOINT_INTERFACE_EDEFAULT.equals(serviceEndpointInterface);
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				return wsdlPort != null;
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				return serviceImplBean != null;
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				return handlers != null && !handlers.isEmpty();
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				return descriptionType != null;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				return displayNameType != null;
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				return iconType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (portComponentName: ");
-		result.append(portComponentName);
-		result.append(", serviceEndpointInterface: ");
-		result.append(serviceEndpointInterface);
-		result.append(", smallIcon: ");
-		result.append(smallIcon);
-		result.append(", largeIcon: ");
-		result.append(largeIcon);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", displayName: ");
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortComponentImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/ServiceImplBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/ServiceImplBeanImpl.java
deleted file mode 100644
index 2479d750a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/ServiceImplBeanImpl.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Impl Bean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl#getEEJBLink <em>EEJB Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl#getEServletLink <em>EServlet Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl#getBeanLink <em>Bean Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceImplBeanImpl extends J2EEEObjectImpl implements ServiceImplBean
-{
-	/**
-	 * The cached value of the '{@link #getEEJBLink() <em>EEJB Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEEJBLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected EJBLink eEJBLink = null;
-
-	/**
-	 * The cached value of the '{@link #getEServletLink() <em>EServlet Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEServletLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected ServletLink eServletLink = null;
-
-	/**
-	 * The cached value of the '{@link #getBeanLink() <em>Bean Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getBeanLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected BeanLink beanLink = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServiceImplBeanImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.SERVICE_IMPL_BEAN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EJBLink getEEJBLink() {
-		return eEJBLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetEEJBLink(EJBLink newEEJBLink, NotificationChain msgs) {
-		EJBLink oldEEJBLink = eEJBLink;
-		eEJBLink = newEEJBLink;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, oldEEJBLink, newEEJBLink);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setEEJBLink(EJBLink newEEJBLink) {
-		if (newEEJBLink != eEJBLink) {
-			NotificationChain msgs = null;
-			if (eEJBLink != null)
-				msgs = ((InternalEObject)eEJBLink).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, null, msgs);
-			if (newEEJBLink != null)
-				msgs = ((InternalEObject)newEEJBLink).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, null, msgs);
-			msgs = basicSetEEJBLink(newEEJBLink, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, newEEJBLink, newEEJBLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServletLink getEServletLink() {
-		return eServletLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetEServletLink(ServletLink newEServletLink, NotificationChain msgs) {
-		ServletLink oldEServletLink = eServletLink;
-		eServletLink = newEServletLink;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, oldEServletLink, newEServletLink);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setEServletLink(ServletLink newEServletLink) {
-		if (newEServletLink != eServletLink) {
-			NotificationChain msgs = null;
-			if (eServletLink != null)
-				msgs = ((InternalEObject)eServletLink).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, null, msgs);
-			if (newEServletLink != null)
-				msgs = ((InternalEObject)newEServletLink).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, null, msgs);
-			msgs = basicSetEServletLink(newEServletLink, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, newEServletLink, newEServletLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public BeanLink getBeanLink() {
-		return beanLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetBeanLink(BeanLink newBeanLink, NotificationChain msgs) {
-		BeanLink oldBeanLink = beanLink;
-		beanLink = newBeanLink;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, oldBeanLink, newBeanLink);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setBeanLink(BeanLink newBeanLink) {
-		if (newBeanLink != beanLink) {
-			NotificationChain msgs = null;
-			if (beanLink != null)
-				msgs = ((InternalEObject)beanLink).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, null, msgs);
-			if (newBeanLink != null)
-				msgs = ((InternalEObject)newBeanLink).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, null, msgs);
-			msgs = basicSetBeanLink(newBeanLink, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, newBeanLink, newBeanLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				return basicSetEEJBLink(null, msgs);
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				return basicSetEServletLink(null, msgs);
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				return basicSetBeanLink(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				return getEEJBLink();
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				return getEServletLink();
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				return getBeanLink();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				setEEJBLink((EJBLink)newValue);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				setEServletLink((ServletLink)newValue);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				setBeanLink((BeanLink)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				setEEJBLink((EJBLink)null);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				setEServletLink((ServletLink)null);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				setBeanLink((BeanLink)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				return eEJBLink != null;
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				return eServletLink != null;
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				return beanLink != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ServiceImplBeanImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/ServletLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/ServletLinkImpl.java
deleted file mode 100644
index 95a993199..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/ServletLinkImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Servlet Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServletLinkImpl#getServletLink <em>Servlet Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServletLinkImpl extends BeanLinkImpl implements ServletLink
-{
-	/**
-	 * The default value of the '{@link #getServletLink() <em>Servlet Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServletLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SERVLET_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServletLink() <em>Servlet Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServletLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected String servletLink = SERVLET_LINK_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServletLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.SERVLET_LINK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getServletLink() {
-		return servletLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServletLink(String newServletLink) {
-		String oldServletLink = servletLink;
-		servletLink = newServletLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVLET_LINK__SERVLET_LINK, oldServletLink, servletLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				return getServletLink();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				setServletLink((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				setServletLink(SERVLET_LINK_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				return SERVLET_LINK_EDEFAULT == null ? servletLink != null : !SERVLET_LINK_EDEFAULT.equals(servletLink);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (servletLink: ");
-		result.append(servletLink);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServletLinkImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WSDLPortImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WSDLPortImpl.java
deleted file mode 100644
index 372205baa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WSDLPortImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Port</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLPortImpl extends QNameImpl implements WSDLPort
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLPortImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.WSDL_PORT;
-	}
-
-} //WSDLPortImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WebServiceDescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WebServiceDescriptionImpl.java
deleted file mode 100644
index bb02ad4f2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WebServiceDescriptionImpl.java
+++ /dev/null
@@ -1,969 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web Service Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getWebServiceDescriptionName <em>Web Service Description Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getPortComponents <em>Port Components</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServiceDescriptionImpl#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebServiceDescriptionImpl extends J2EEEObjectImpl implements WebServiceDescription
-{
-	/**
-	 * The default value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String JAXRPC_MAPPING_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected String jaxrpcMappingFile = JAXRPC_MAPPING_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWebServiceDescriptionName() <em>Web Service Description Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWebServiceDescriptionName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWebServiceDescriptionName() <em>Web Service Description Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWebServiceDescriptionName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String webServiceDescriptionName = WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlFile = WSDL_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPortComponents() <em>Port Components</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortComponents()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList portComponents = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptionType() <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescriptionType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DescriptionType descriptionType = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNameType() <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayNameType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DisplayNameType displayNameType = null;
-
-	/**
-	 * The cached value of the '{@link #getIconType() <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getIconType()
-	 * @generated
-	 * @ordered
-	 */
-  protected IconType iconType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WebServiceDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.WEB_SERVICE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getJaxrpcMappingFile() {
-		return jaxrpcMappingFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setJaxrpcMappingFile(String newJaxrpcMappingFile) {
-		String oldJaxrpcMappingFile = jaxrpcMappingFile;
-		jaxrpcMappingFile = newJaxrpcMappingFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE, oldJaxrpcMappingFile, jaxrpcMappingFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWebServiceDescriptionName() {
-		return webServiceDescriptionName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWebServiceDescriptionName(String newWebServiceDescriptionName) {
-		String oldWebServiceDescriptionName = webServiceDescriptionName;
-		webServiceDescriptionName = newWebServiceDescriptionName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME, oldWebServiceDescriptionName, webServiceDescriptionName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlFile() {
-		return wsdlFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlFile(String newWsdlFile) {
-		String oldWsdlFile = wsdlFile;
-		wsdlFile = newWsdlFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE, oldWsdlFile, wsdlFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getSmallIconGen() {
-		return smallIcon;
-	}
-
-  public String getSmallIcon() {
-  	if(eResource() == null) 
-  		return getSmallIconGen();
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		return getSmallIconGen(); 
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		if (getIconType() != null)
-  			return getIconType().getSmallIcon();
-  	}
-  	return null;
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSmallIconGen(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getLargeIconGen() {
-		return largeIcon;
-	}
-
-  public String getLargeIcon() {
-  	if(eResource() == null) 
-  		return getLargeIconGen();
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		return getLargeIconGen(); 
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		if (getIconType() != null)
-  			return getIconType().getLargeIcon();
-  	}
-  	return null;
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setLargeIconGen(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.jst.j2ee.internal.common.DescriptionGroup#getJ2EEVersionID()
-   */
-  public int getJ2EEVersionID() throws IllegalStateException {
-  	J2EEVersionResource res = (J2EEVersionResource) eResource();
-  	if (res == null)
-  		throw new IllegalStateException();
-  	return res.getJ2EEVersionID();
-  }
-  
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDescriptionGen() {
-		return description;
-	}
-
-	public String getDescription() {
-		if(eResource() == null) 
-			return getDescriptionGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getDescriptionGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getDescriptionType() != null)
-				return ((Description)getDescriptionType()).getValue();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescriptionGen(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION, oldDescription, description));
-	}
-
-  public void setDescription(String newDescription) {
-  	if(eResource() == null) {
-  		setDescriptionGen(newDescription);
-  		internalSetDescriptionType(newDescription);
-  		return;
-  	}
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		setDescriptionGen(newDescription);
-  		break;
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		internalSetDescriptionType(newDescription); 
-  		break;
-  	}
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDisplayNameGen() {
-		return displayName;
-	}
-
-  public String getDisplayName() {
-  	if(eResource() == null) 
-  		return getDisplayNameGen();
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		return getDisplayNameGen(); 
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		if (getDisplayNameType() != null)
-  			return ((DisplayName)getDisplayNameType()).getValue();
-  	}
-  	return null;
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayNameGen(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-  public void setDisplayName(String newDisplayName) {
-  	if(eResource() == null) {
-  		setDisplayNameGen(newDisplayName);
-  		internalSetDisplayNameType(newDisplayName);
-  		return;
-  	}
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		setDisplayNameGen(newDisplayName);
-  		break;
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		internalSetDisplayNameType(newDisplayName);
-  		break;
-  	}
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getPortComponents() {
-		if (portComponents == null) {
-			portComponents = new EObjectContainmentEList(PortComponent.class, this, WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS);
-		}
-		return portComponents;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DescriptionType getDescriptionType() {
-		return descriptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDescriptionType(DescriptionType newDescriptionType, NotificationChain msgs) {
-		DescriptionType oldDescriptionType = descriptionType;
-		descriptionType = newDescriptionType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, oldDescriptionType, newDescriptionType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescriptionType(DescriptionType newDescriptionType) {
-		if (newDescriptionType != descriptionType) {
-			NotificationChain msgs = null;
-			if (descriptionType != null)
-				msgs = ((InternalEObject)descriptionType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, null, msgs);
-			if (newDescriptionType != null)
-				msgs = ((InternalEObject)newDescriptionType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, null, msgs);
-			msgs = basicSetDescriptionType(newDescriptionType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, newDescriptionType, newDescriptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DisplayNameType getDisplayNameType() {
-		return displayNameType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDisplayNameType(DisplayNameType newDisplayNameType, NotificationChain msgs) {
-		DisplayNameType oldDisplayNameType = displayNameType;
-		displayNameType = newDisplayNameType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, oldDisplayNameType, newDisplayNameType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayNameType(DisplayNameType newDisplayNameType) {
-		if (newDisplayNameType != displayNameType) {
-			NotificationChain msgs = null;
-			if (displayNameType != null)
-				msgs = ((InternalEObject)displayNameType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, null, msgs);
-			if (newDisplayNameType != null)
-				msgs = ((InternalEObject)newDisplayNameType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, null, msgs);
-			msgs = basicSetDisplayNameType(newDisplayNameType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, newDisplayNameType, newDisplayNameType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public IconType getIconType() {
-		return iconType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetIconType(IconType newIconType, NotificationChain msgs) {
-		IconType oldIconType = iconType;
-		iconType = newIconType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, oldIconType, newIconType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setIconType(IconType newIconType) {
-		if (newIconType != iconType) {
-			NotificationChain msgs = null;
-			if (iconType != null)
-				msgs = ((InternalEObject)iconType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, null, msgs);
-			if (newIconType != null)
-				msgs = ((InternalEObject)newIconType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, null, msgs);
-			msgs = basicSetIconType(newIconType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, newIconType, newIconType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				return ((InternalEList)getPortComponents()).basicRemove(otherEnd, msgs);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				return basicSetDescriptionType(null, msgs);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				return basicSetDisplayNameType(null, msgs);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				return basicSetIconType(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				return getJaxrpcMappingFile();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				return getWebServiceDescriptionName();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				return getWsdlFile();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				return getSmallIcon();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				return getLargeIcon();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				return getDescription();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				return getDisplayName();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				return getPortComponents();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				return getDescriptionType();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				return getDisplayNameType();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				return getIconType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				setWebServiceDescriptionName((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				setWsdlFile((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				getPortComponents().clear();
-				getPortComponents().addAll((Collection)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				setIconType((IconType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile(JAXRPC_MAPPING_FILE_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				setWebServiceDescriptionName(WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				setWsdlFile(WSDL_FILE_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				getPortComponents().clear();
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)null);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)null);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				setIconType((IconType)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				return JAXRPC_MAPPING_FILE_EDEFAULT == null ? jaxrpcMappingFile != null : !JAXRPC_MAPPING_FILE_EDEFAULT.equals(jaxrpcMappingFile);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				return WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT == null ? webServiceDescriptionName != null : !WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT.equals(webServiceDescriptionName);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				return WSDL_FILE_EDEFAULT == null ? wsdlFile != null : !WSDL_FILE_EDEFAULT.equals(wsdlFile);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				return portComponents != null && !portComponents.isEmpty();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				return descriptionType != null;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				return displayNameType != null;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				return iconType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (jaxrpcMappingFile: ");
-		result.append(jaxrpcMappingFile);
-		result.append(", webServiceDescriptionName: ");
-		result.append(webServiceDescriptionName);
-		result.append(", wsdlFile: ");
-		result.append(wsdlFile);
-		result.append(", smallIcon: ");
-		result.append(smallIcon);
-		result.append(", largeIcon: ");
-		result.append(largeIcon);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", displayName: ");
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @param newDescription
-	 */
-	protected void internalSetDescriptionType(String newDescription) {
-		DescriptionType newValue = null;
-		if(getDescriptionType() != null) {
-			newValue = getDescriptionType();
-			newValue.setValue(newDescription);
-		}
-		else {
-			newValue = WscommonFactory.eINSTANCE.createDescriptionType();
-			newValue.setValue(newDescription);
-			setDescriptionType(newValue);
-		}
-		
-	}
-
-	/**
-	 * @param newDisplayName
-	 */
-	protected void internalSetDisplayNameType(String newDisplayName) {
-		DisplayNameType newValue = null;
-		if(getDisplayNameType() != null) {
-			newValue = getDisplayNameType();
-			newValue.setValue(newDisplayName);
-		}
-		else  {
-			newValue = WscommonFactory.eINSTANCE.createDisplayNameType();
-			newValue.setValue(newDisplayName);
-			setDisplayNameType(newValue);
-		}			  
-		
-	}
-
-	/**
-	 * @param newLargeIcon
-	 */
-	protected void internalSetLargeIconType(String newLargeIcon) {
-		IconType newValue = null;
-		if(getIconType() != null) {
-			newValue = getIconType();
-			newValue.setLargeIcon(newLargeIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setLargeIcon(newLargeIcon);
-			setIconType(newValue);
-		}
-		
-	}
-
-	/**
-	 * @param newSmallIcon
-	 */
-	protected void internalSetSmallIconType(String newSmallIcon) {
-		IconType newValue = null;
-		if(getIconType() != null) {
-			newValue = getIconType();
-			newValue.setSmallIcon(newSmallIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setSmallIcon(newSmallIcon);
-			setIconType(newValue);
-		}
-	}
-
-	public void setLargeIcon(String newLargeIcon) {
-		if(eResource() == null) {
-			setLargeIconGen(newLargeIcon);
-			internalSetLargeIconType(newLargeIcon);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setLargeIconGen(newLargeIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetLargeIconType(newLargeIcon); 
-			break;
-		}
-	}
-
-	public void setSmallIcon(String newSmallIcon) {
-		if(eResource() == null) {
-			setSmallIconGen(newSmallIcon);
-			internalSetSmallIconType(newSmallIcon); 
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setSmallIconGen(newSmallIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetSmallIconType(newSmallIcon); 
-			break;
-		}
-	}
-
-} //WebServiceDescriptionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WebServicesImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WebServicesImpl.java
deleted file mode 100644
index d0a2781d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WebServicesImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web Services</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WebServicesImpl#getWebServiceDescriptions <em>Web Service Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebServicesImpl extends CompatibilityDescriptionGroupImpl implements WebServices
-{
-	/**
-	 * The cached value of the '{@link #getWebServiceDescriptions() <em>Web Service Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWebServiceDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList webServiceDescriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WebServicesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.Literals.WEB_SERVICES;
-	}
-
-  /**
-   *
-   */
-  public void setDisplayName(String newDisplayName) {
-  	super.setDisplayName(newDisplayName);
-  }
-  
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getWebServiceDescriptions() {
-		if (webServiceDescriptions == null) {
-			webServiceDescriptions = new EObjectContainmentEList(WebServiceDescription.class, this, WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS);
-		}
-		return webServiceDescriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				return ((InternalEList)getWebServiceDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				return getWebServiceDescriptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				getWebServiceDescriptions().clear();
-				getWebServiceDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				getWebServiceDescriptions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				return webServiceDescriptions != null && !webServiceDescriptions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WebServicesImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java
deleted file mode 100644
index a7c5631c1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddFactoryImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WsddFactoryImpl extends EFactoryImpl implements WsddFactory
-{
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WsddFactory init() {
-		try {
-			WsddFactory theWsddFactory = (WsddFactory)EPackage.Registry.INSTANCE.getEFactory("wsdd.xmi"); 
-			if (theWsddFactory != null) {
-				return theWsddFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new WsddFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WsddPackage.WEB_SERVICES: return createWebServices();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION: return createWebServiceDescription();
-			case WsddPackage.PORT_COMPONENT: return createPortComponent();
-			case WsddPackage.WSDL_PORT: return createWSDLPort();
-			case WsddPackage.SERVICE_IMPL_BEAN: return createServiceImplBean();
-			case WsddPackage.SERVLET_LINK: return createServletLink();
-			case WsddPackage.EJB_LINK: return createEJBLink();
-			case WsddPackage.HANDLER: return createHandler();
-			case WsddPackage.BEAN_LINK: return createBeanLink();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WebServices createWebServices() {
-		WebServicesImpl webServices = new WebServicesImpl();
-		return webServices;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WebServiceDescription createWebServiceDescription() {
-		WebServiceDescriptionImpl webServiceDescription = new WebServiceDescriptionImpl();
-		return webServiceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public PortComponent createPortComponent() {
-		PortComponentImpl portComponent = new PortComponentImpl();
-		return portComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLPort createWSDLPort() {
-		WSDLPortImpl wsdlPort = new WSDLPortImpl();
-		return wsdlPort;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceImplBean createServiceImplBean() {
-		ServiceImplBeanImpl serviceImplBean = new ServiceImplBeanImpl();
-		return serviceImplBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServletLink createServletLink() {
-		ServletLinkImpl servletLink = new ServletLinkImpl();
-		return servletLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EJBLink createEJBLink() {
-		EJBLinkImpl ejbLink = new EJBLinkImpl();
-		return ejbLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Handler createHandler() {
-		HandlerImpl handler = new HandlerImpl();
-		return handler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeanLink createBeanLink() {
-		BeanLinkImpl beanLink = new BeanLinkImpl();
-		return beanLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddPackage getWsddPackage() {
-		return (WsddPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-  public static WsddPackage getPackage() {
-		return WsddPackage.eINSTANCE;
-	}
-
-} //WsddFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
deleted file mode 100644
index d3841e615..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
+++ /dev/null
@@ -1,794 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.taglib.internal.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.internal.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WsddPackageImpl extends EPackageImpl implements WsddPackage
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass webServicesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass webServiceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass portComponentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlPortEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass serviceImplBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass servletLinkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass ejbLinkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass handlerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass beanLinkEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-  private WsddPackageImpl() {
-		super(eNS_URI, WsddFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-  public static WsddPackage init() {
-		if (isInited) return (WsddPackage)EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI);
-
-		// Obtain or create and register package
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WsddPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WsddPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage_1 = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof TaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof WscommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theWsddPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theApplicationPackage_1.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theWsddPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theApplicationPackage_1.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theWsddPackage.freeze();
-
-		return theWsddPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWebServices() {
-		return webServicesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServices_WebServiceDescriptions() {
-		return (EReference)webServicesEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWebServiceDescription() {
-		return webServiceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_JaxrpcMappingFile() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_WebServiceDescriptionName() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_WsdlFile() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_SmallIcon() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_LargeIcon() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_Description() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_DisplayName() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_PortComponents() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_DescriptionType() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_DisplayNameType() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_IconType() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getPortComponent() {
-		return portComponentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_PortComponentName() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_ServiceEndpointInterface() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_SmallIcon() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_LargeIcon() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_Description() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_DisplayName() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_WsdlPort() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_ServiceImplBean() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_Handlers() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_DescriptionType() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_DisplayNameType() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_IconType() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLPort() {
-		return wsdlPortEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServiceImplBean() {
-		return serviceImplBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceImplBean_EEJBLink() {
-		return (EReference)serviceImplBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceImplBean_EServletLink() {
-		return (EReference)serviceImplBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceImplBean_BeanLink() {
-		return (EReference)serviceImplBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServletLink() {
-		return servletLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServletLink_ServletLink() {
-		return (EAttribute)servletLinkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getEJBLink() {
-		return ejbLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getEJBLink_EjbLink() {
-		return (EAttribute)ejbLinkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getHandler() {
-		return handlerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getHandler_HandlerName() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getHandler_HandlerClass() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getHandler_InitParams() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getHandler_SoapHeaders() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getHandler_SoapRoles() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getBeanLink() {
-		return beanLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddFactory getWsddFactory() {
-		return (WsddFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		webServicesEClass = createEClass(WEB_SERVICES);
-		createEReference(webServicesEClass, WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS);
-
-		webServiceDescriptionEClass = createEClass(WEB_SERVICE_DESCRIPTION);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__WSDL_FILE);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__SMALL_ICON);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__LARGE_ICON);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DESCRIPTION);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DISPLAY_NAME);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__ICON_TYPE);
-
-		portComponentEClass = createEClass(PORT_COMPONENT);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__PORT_COMPONENT_NAME);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__SMALL_ICON);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__LARGE_ICON);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__DESCRIPTION);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__DISPLAY_NAME);
-		createEReference(portComponentEClass, PORT_COMPONENT__WSDL_PORT);
-		createEReference(portComponentEClass, PORT_COMPONENT__SERVICE_IMPL_BEAN);
-		createEReference(portComponentEClass, PORT_COMPONENT__HANDLERS);
-		createEReference(portComponentEClass, PORT_COMPONENT__DESCRIPTION_TYPE);
-		createEReference(portComponentEClass, PORT_COMPONENT__DISPLAY_NAME_TYPE);
-		createEReference(portComponentEClass, PORT_COMPONENT__ICON_TYPE);
-
-		wsdlPortEClass = createEClass(WSDL_PORT);
-
-		serviceImplBeanEClass = createEClass(SERVICE_IMPL_BEAN);
-		createEReference(serviceImplBeanEClass, SERVICE_IMPL_BEAN__EEJB_LINK);
-		createEReference(serviceImplBeanEClass, SERVICE_IMPL_BEAN__ESERVLET_LINK);
-		createEReference(serviceImplBeanEClass, SERVICE_IMPL_BEAN__BEAN_LINK);
-
-		servletLinkEClass = createEClass(SERVLET_LINK);
-		createEAttribute(servletLinkEClass, SERVLET_LINK__SERVLET_LINK);
-
-		ejbLinkEClass = createEClass(EJB_LINK);
-		createEAttribute(ejbLinkEClass, EJB_LINK__EJB_LINK);
-
-		handlerEClass = createEClass(HANDLER);
-		createEAttribute(handlerEClass, HANDLER__HANDLER_NAME);
-		createEAttribute(handlerEClass, HANDLER__HANDLER_CLASS);
-		createEReference(handlerEClass, HANDLER__INIT_PARAMS);
-		createEReference(handlerEClass, HANDLER__SOAP_HEADERS);
-		createEReference(handlerEClass, HANDLER__SOAP_ROLES);
-
-		beanLinkEClass = createEClass(BEAN_LINK);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		WscommonPackage theWscommonPackage = (WscommonPackage)EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		webServicesEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		webServiceDescriptionEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		portComponentEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlPortEClass.getESuperTypes().add(theCommonPackage.getQName());
-		serviceImplBeanEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		servletLinkEClass.getESuperTypes().add(this.getBeanLink());
-		ejbLinkEClass.getESuperTypes().add(this.getBeanLink());
-		handlerEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		beanLinkEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(webServicesEClass, WebServices.class, "WebServices", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWebServices_WebServiceDescriptions(), this.getWebServiceDescription(), null, "webServiceDescriptions", null, 1, -1, WebServices.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(webServiceDescriptionEClass, WebServiceDescription.class, "WebServiceDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWebServiceDescription_JaxrpcMappingFile(), ecorePackage.getEString(), "jaxrpcMappingFile", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebServiceDescription_WebServiceDescriptionName(), ecorePackage.getEString(), "webServiceDescriptionName", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebServiceDescription_WsdlFile(), ecorePackage.getEString(), "wsdlFile", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebServiceDescription_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebServiceDescription_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebServiceDescription_Description(), ecorePackage.getEString(), "description", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWebServiceDescription_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebServiceDescription_PortComponents(), this.getPortComponent(), null, "portComponents", null, 1, -1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebServiceDescription_DescriptionType(), theWscommonPackage.getDescriptionType(), null, "descriptionType", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebServiceDescription_DisplayNameType(), theWscommonPackage.getDisplayNameType(), null, "displayNameType", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWebServiceDescription_IconType(), theCommonPackage.getIconType(), null, "iconType", null, 0, 1, WebServiceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(portComponentEClass, PortComponent.class, "PortComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPortComponent_PortComponentName(), ecorePackage.getEString(), "portComponentName", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortComponent_ServiceEndpointInterface(), ecorePackage.getEString(), "serviceEndpointInterface", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortComponent_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortComponent_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortComponent_Description(), ecorePackage.getEString(), "description", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortComponent_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponent_WsdlPort(), this.getWSDLPort(), null, "wsdlPort", null, 1, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponent_ServiceImplBean(), this.getServiceImplBean(), null, "serviceImplBean", null, 1, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponent_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponent_DescriptionType(), theWscommonPackage.getDescriptionType(), null, "descriptionType", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponent_DisplayNameType(), theWscommonPackage.getDisplayNameType(), null, "displayNameType", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPortComponent_IconType(), theCommonPackage.getIconType(), null, "iconType", null, 0, 1, PortComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlPortEClass, WSDLPort.class, "WSDLPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(serviceImplBeanEClass, ServiceImplBean.class, "ServiceImplBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getServiceImplBean_EEJBLink(), this.getEJBLink(), null, "eEJBLink", null, 0, 1, ServiceImplBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceImplBean_EServletLink(), this.getServletLink(), null, "eServletLink", null, 0, 1, ServiceImplBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceImplBean_BeanLink(), this.getBeanLink(), null, "beanLink", null, 0, 1, ServiceImplBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(servletLinkEClass, ServletLink.class, "ServletLink", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServletLink_ServletLink(), ecorePackage.getEString(), "servletLink", null, 0, 1, ServletLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ejbLinkEClass, EJBLink.class, "EJBLink", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEJBLink_EjbLink(), ecorePackage.getEString(), "ejbLink", null, 0, 1, EJBLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(handlerEClass, Handler.class, "Handler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getHandler_HandlerName(), ecorePackage.getEString(), "handlerName", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHandler_HandlerClass(), ecorePackage.getEString(), "handlerClass", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHandler_InitParams(), theWscommonPackage.getInitParam(), null, "initParams", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHandler_SoapHeaders(), theWscommonPackage.getSOAPHeader(), null, "soapHeaders", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHandler_SoapRoles(), theWscommonPackage.getSOAPRole(), null, "soapRoles", null, 0, -1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(beanLinkEClass, BeanLink.class, "BeanLink", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //WsddPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java
deleted file mode 100644
index a2e32325d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.webservices.WsddTranslator;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class WsddResourceImpl extends XMLResourceImpl implements WsddResource
-{
-	/**
-	 * Constructor for WsddResourceImpl.
-	 */
-	public WsddResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * Constructor for WsddResourceImpl.
-	 * @param uri
-	 */
-	public WsddResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public WebServices getWebServices() {
-		return (WebServices) getRootObject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return WsddTranslator.INSTANCE;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.XMLResource#getType()
-	 */
-	public int getType() {
-		return WEB_SERVICE_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() 
-	{
-	  switch (getJ2EEVersionID()) 
-	  {
-	    case (J2EE_1_2_ID) :
-	    case (J2EE_1_3_ID) :	
-	      return WebServiceConstants.WEBSERVICE_DOCTYPE;
-	    default :
-    		return null;
-    }
-
-
-	}
-
-   public boolean isWebService1_0()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_0_ID);
-   }
-
-   public boolean isWebService1_1()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_1_ID);  
-   }
-
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-	super.setVersionID(id);
-	switch (id) {
-			case (WebServiceConstants.WEBSERVICE_1_1_ID) :
-				super.setDoctypeValues(null, null);
-				break;
-			case (WebServiceConstants.WEBSERVICE_1_0_ID) :
-				super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-				break;			
-		}
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) 
-  {
-    switch (id) {
-    	case (J2EE_1_4_ID) :
-    				primSetDoctypeValues(null, null);
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_1_ID);
-    				break;
-    	case (J2EE_1_3_ID) :
-    				primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    				break;
-    	case (J2EE_1_2_ID) :
-    				primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-	  return  WebServiceConstants.WEBSERVICE_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-	  return WebServiceConstants.WEBSERVICE_SYSTEMID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-	  return WebServiceConstants.WEBSERVICE_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-    return WebServiceConstants.WEBSERVICE_SYSTEMID;
-	}
-
-	/* Return J2EE version based on module version
-	*/
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case WebServiceConstants.WEBSERVICE_1_0_ID:
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case WebServiceConstants.WEBSERVICE_1_1_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WebServiceConstants.WEBSERVICE_1_1_ID;
-	}
-
-
-  protected void syncVersionOfRootObject()
-  {
-    //Do nothing for now since the root object does not have a version.
-  }
-
-  
-    
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java
deleted file mode 100644
index ba36ca9d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddAdapterFactory.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage
- * @generated
- */
-public class WsddAdapterFactory extends AdapterFactoryImpl
-{
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WsddPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = WsddPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-  public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WsddSwitch modelSwitch =
-		new WsddSwitch() {
-			public Object caseWebServices(WebServices object) {
-				return createWebServicesAdapter();
-			}
-			public Object caseWebServiceDescription(WebServiceDescription object) {
-				return createWebServiceDescriptionAdapter();
-			}
-			public Object casePortComponent(PortComponent object) {
-				return createPortComponentAdapter();
-			}
-			public Object caseWSDLPort(WSDLPort object) {
-				return createWSDLPortAdapter();
-			}
-			public Object caseServiceImplBean(ServiceImplBean object) {
-				return createServiceImplBeanAdapter();
-			}
-			public Object caseServletLink(ServletLink object) {
-				return createServletLinkAdapter();
-			}
-			public Object caseEJBLink(EJBLink object) {
-				return createEJBLinkAdapter();
-			}
-			public Object caseHandler(Handler object) {
-				return createHandlerAdapter();
-			}
-			public Object caseBeanLink(BeanLink object) {
-				return createBeanLinkAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-  public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServices <em>Web Services</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServices
-	 * @generated
-	 */
-  public Adapter createWebServicesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription <em>Web Service Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription
-	 * @generated
-	 */
-  public Adapter createWebServiceDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.PortComponent <em>Port Component</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.PortComponent
-	 * @generated
-	 */
-  public Adapter createPortComponentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort <em>WSDL Port</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort
-	 * @generated
-	 */
-  public Adapter createWSDLPortAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean <em>Service Impl Bean</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean
-	 * @generated
-	 */
-  public Adapter createServiceImplBeanAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.ServletLink <em>Servlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.ServletLink
-	 * @generated
-	 */
-  public Adapter createServletLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.EJBLink <em>EJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.EJBLink
-	 * @generated
-	 */
-  public Adapter createEJBLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.Handler
-	 * @generated
-	 */
-  public Adapter createHandlerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.wsdd.BeanLink <em>Bean Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.wsdd.BeanLink
-	 * @generated
-	 */
-  public Adapter createBeanLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.DescriptionGroup <em>Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.DescriptionGroup
-	 * @generated
-	 */
-  public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup <em>Compatibility Description Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.QName
-	 * @generated
-	 */
-  public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-  public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //WsddAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java
deleted file mode 100644
index 7d3d0865e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/util/WsddSwitch.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage
- * @generated
- */
-public class WsddSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WsddPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WsddPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-  public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case WsddPackage.WEB_SERVICES: {
-				WebServices webServices = (WebServices)theEObject;
-				Object result = caseWebServices(webServices);
-				if (result == null) result = caseCompatibilityDescriptionGroup(webServices);
-				if (result == null) result = caseDescriptionGroup(webServices);
-				if (result == null) result = caseJ2EEEObject(webServices);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.WEB_SERVICE_DESCRIPTION: {
-				WebServiceDescription webServiceDescription = (WebServiceDescription)theEObject;
-				Object result = caseWebServiceDescription(webServiceDescription);
-				if (result == null) result = caseJ2EEEObject(webServiceDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.PORT_COMPONENT: {
-				PortComponent portComponent = (PortComponent)theEObject;
-				Object result = casePortComponent(portComponent);
-				if (result == null) result = caseJ2EEEObject(portComponent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.WSDL_PORT: {
-				WSDLPort wsdlPort = (WSDLPort)theEObject;
-				Object result = caseWSDLPort(wsdlPort);
-				if (result == null) result = caseQName(wsdlPort);
-				if (result == null) result = caseJ2EEEObject(wsdlPort);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.SERVICE_IMPL_BEAN: {
-				ServiceImplBean serviceImplBean = (ServiceImplBean)theEObject;
-				Object result = caseServiceImplBean(serviceImplBean);
-				if (result == null) result = caseJ2EEEObject(serviceImplBean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.SERVLET_LINK: {
-				ServletLink servletLink = (ServletLink)theEObject;
-				Object result = caseServletLink(servletLink);
-				if (result == null) result = caseBeanLink(servletLink);
-				if (result == null) result = caseJ2EEEObject(servletLink);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.EJB_LINK: {
-				EJBLink ejbLink = (EJBLink)theEObject;
-				Object result = caseEJBLink(ejbLink);
-				if (result == null) result = caseBeanLink(ejbLink);
-				if (result == null) result = caseJ2EEEObject(ejbLink);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.HANDLER: {
-				Handler handler = (Handler)theEObject;
-				Object result = caseHandler(handler);
-				if (result == null) result = caseCompatibilityDescriptionGroup(handler);
-				if (result == null) result = caseDescriptionGroup(handler);
-				if (result == null) result = caseJ2EEEObject(handler);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WsddPackage.BEAN_LINK: {
-				BeanLink beanLink = (BeanLink)theEObject;
-				Object result = caseBeanLink(beanLink);
-				if (result == null) result = caseJ2EEEObject(beanLink);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Services</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Services</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWebServices(WebServices object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Service Description</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Service Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWebServiceDescription(WebServiceDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Component</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Component</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object casePortComponent(PortComponent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Port</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Port</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLPort(WSDLPort object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Impl Bean</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Impl Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServiceImplBean(ServiceImplBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Link</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServletLink(ServletLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Link</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseEJBLink(EJBLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseHandler(Handler object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Bean Link</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Bean Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseBeanLink(BeanLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-  public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WsddSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/package.xml b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/package.xml
deleted file mode 100644
index 6aba955f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the web services deployment descriptor common model api. Using this api the  web services depolyment descriptor model artifacts (PortComponents, Handlers, WSDLPorts, WebServices Description etc.) 
-        can be created and accessed.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse.properties
deleted file mode 100644
index a5799e81e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E Failed to invoke the method named: {0}
-failed_to_load_EXC_=IWAE0096E Failed to load: {0}
-method_not_found_EXC_=IWAE0097E Could not find the following method named: {0}
-failed_instantiating_EXC_=IWAE0098E Failed instantiating: {0}
-parse_exception_occured_EXC_=IWAE0099E An Exception occurred while parsing xml: Line #: {0} :Column #: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/plugin.properties b/plugins/org.eclipse.jst.j2ee.core/plugin.properties
deleted file mode 100644
index 2e764f731..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Model
-providerName=www.example.org
-EJB_VALIDATOR=EJB Validator
-J2EEApplicationErrorCustomizer=J2EE Application Error Customizer
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/plugin.xml b/plugins/org.eclipse.jst.j2ee.core/plugin.xml
deleted file mode 100644
index d72cdd393..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/plugin.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension-point id="ejbModelExtender" name="ejbModelExtender" schema="schema/ejbModelExtender.exsd"/>
-     <extension-point id="jndiBindingsHelpers" name="jndiBindingsHelpers" schema="schema/jndiBindingsHelpers.exsd"/>
-
-<!--J2EEInit-->
-<!--============================-->
-<!-- J2EE Core Extension Point Registry-->
-<!--============================-->
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="common.xmi"
-            class="org.eclipse.jst.j2ee.common.CommonPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="application.xmi"
-            class="org.eclipse.jst.j2ee.application.ApplicationPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="client.xmi"
-            class="org.eclipse.jst.j2ee.client.ClientPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="webapplication.xmi"
-            class="org.eclipse.jst.j2ee.webapplication.WebapplicationPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="ejb.xmi"
-            class="org.eclipse.jst.j2ee.ejb.EjbPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="jca.xmi"
-            class="org.eclipse.jst.j2ee.jca.JcaPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="jsp.xmi"
-            class="org.eclipse.jst.j2ee.jsp.JspPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="webservice_client.xmi"
-            class="org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="wscommon.xmi"
-            class="org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="wsdd.xmi"
-            class="org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.ibm.com/websphere/appserver/schemas/5.0.2/wscommon.xmi"
-            class="org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.ibm.com/websphere/appserver/schemas/5.0.2/wsdd.xmi"
-            class="org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage">
-      </package>
-   </extension>
-<!--ArchiveInit-->
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="commonarchive.xmi"
-            class="org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="commonarchive.looseconfig.xmi"
-            class="org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage">
-      </package>
-   </extension>
-<!-- ====================================================== -->
-<!-- a place holder for the future.                         -->
-<!-- Several that have not changed are still registered as  -->
-<!-- Register package mappings                              -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.wst.common.emf.packageURIMap">
-      <map
-            uri="common.xmi"
-            prefix="common">
-      </map>
-      <map
-            uri="application.xmi"
-            prefix="application">
-      </map>
-      <map
-            uri="client.xmi"
-            prefix="client">
-      </map>
-      <map
-            uri="webapplication.xmi"
-            prefix="webapplication">
-      </map>
-      <map
-            uri="ejb.xmi"
-            prefix="ejb">
-      </map>
-      <map
-            uri="jca.xmi"
-            prefix="jca">
-      </map>
-      <map
-            uri="taglib.xmi"
-            prefix="taglib">
-      </map>
-      <map
-            uri="jsp.xmi"
-            prefix="jsp">
-      </map>
-      <map
-            uri="commonarchive.xmi"
-            prefix="commonarchive">
-      </map>
-      <map
-            uri="commonarchive.looseconfig.xmi"
-            prefix="commonarchive.looseconfig">
-      </map>
-   </extension>
-   <extension
-         id="j2eeApplicationErrorCustomizer"
-         name="%J2EEApplicationErrorCustomizer"
-         point="org.eclipse.wst.xml.core.errorCustomizer">
-      <errorCustomizer
-            class="org.eclipse.jst.j2ee.core.internal.validation.xmlerrorcustomization.J2EEErrorMessageCustomizer"
-            namespace="http://java.sun.com/xml/ns/j2ee"/>
-   </extension>
-   
-   
-  <extension
-        point="org.eclipse.wst.common.modulecore.resourceFactories">
-     <resourceFactory
-           class="org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory"
-           shortSegment="web.xml"/>
-     <resourceFactory
-           class="org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarResourceFactory"
-           shortSegment="ejb-jar.xml"/>
-     <resourceFactory
-           class="org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory"
-           shortSegment="application-client.xml"/>
-     <resourceFactory
-           class="org.eclipse.jst.j2ee.application.internal.impl.ApplicationResourceFactory"
-           shortSegment="application.xml"/>
-     <resourceFactory
-           class="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory"
-           shortSegment="ra.xml"/>
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.core/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.core/prepareforpii.xml
deleted file mode 100644
index 032895999..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/prepareforpii.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.etools.j2ee.core"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/mofj2ee" >
-			 <fileset dir="${plugindir}/mofj2ee">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		<copy todir = "${outputDir}/commonArchive" >
-			 <fileset dir="${plugindir}/commonArchive">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		<copy todir = "${outputDir}/j2ee-validation" >
-			 <fileset dir="${plugindir}/j2ee-validation">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/application.cat b/plugins/org.eclipse.jst.j2ee.core/rose/application.cat
deleted file mode 100644
index c77b9cbdc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/application.cat
+++ /dev/null
@@ -1,901 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "application"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

-	    value      	(value Text "DCE:d87f3e00-8826-11e1-0000-005d9e6adec4:1"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "application.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Application")))

-    quid       	"38C03008014E"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d87f3e00-8826-11e1-0001-005d9e6adec4:1")))

-	    quid       	"38FF3C1002A8"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "Application"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d87f3e00-8826-11e1-0002-005d9e6adec4:1"))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C030A803B1"

-	    documentation 	

-|The applicationType defines the structure of the

-|application.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AE930094"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "version"

-		    quid       	"3E53F85800F7"

-		    documentation 	

-|@version J2EE1.4 

-|The required value for the version is 1.4.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Module"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d880c4a0-8826-11e1-0000-005d9e6adec4:1")))

-	    quid       	"38C0322C0006"

-	    documentation 	

-|The module element represents a single J2EE module and contains an ejb, java, or web element, which indicates the module type and contains a path to the module file, and an optional alt-dd element, which specifies an optional URI to the post-assembly version of the deployment descriptor. The application deployment descriptor must have one module element for each J2EE module in the application package.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "uri"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-0001-005d9e6adec4:1")))

-		    quid       	"38C032B202DA"

-		    documentation 	

-|Specifies the URI of a module, relative to the top level of the application package.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "altDD"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-0002-005d9e6adec4:1")))

-		    quid       	"38C032E00204"

-		    documentation 	

-|The alt-dd element specifies an optional URI to the post-assembly version of the deployment descriptor file for a particular J2EE module. The URI must specify the full pathname of the deployment descriptor file relative to the application's root directory. If alt-dd is not specified, the deployer must read the deployment descriptor from the default location and file name required by the respective component specification.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WebModule"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d880c4a0-8826-11e1-0003-005d9e6adec4:1")))

-	    quid       	"3904860D027B"

-	    documentation 	

-|Contains the web-uri and context-root of a web application module.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-0004-005d9e6adec4:1")))

-		    quid       	"390486AE01C9"

-		    supplier   	"Logical View::application::Module"

-		    quidu      	"38C0322C0006"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "contextRoot"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-0005-005d9e6adec4:1")))

-		    quid       	"390486140358"

-		    documentation 	

-|The context-root element specifies the context root of a web application

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "JavaClientModule"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d880c4a0-8826-11e1-0006-005d9e6adec4:1")))

-	    quid       	"390486730015"

-	    documentation 	

-|specifies the URI of a java application client module, relative to the top level of the application package.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-0007-005d9e6adec4:1")))

-		    quid       	"390486B201F6"

-		    supplier   	"Logical View::application::Module"

-		    quidu      	"38C0322C0006")))

-	(object Class "EjbModule"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d880c4a0-8826-11e1-0008-005d9e6adec4:1")))

-	    quid       	"390486830253"

-	    documentation 	

-|Specifies the URI of a ejb-jar, relative to the top level of the application package.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-0009-005d9e6adec4:1")))

-		    quid       	"390486B60379"

-		    supplier   	"Logical View::application::Module"

-		    quidu      	"38C0322C0006")))

-	(object Class "ConnectorModule"

-	    quid       	"39895BC00227"

-	    documentation 	"Specifies the URI of a resource adapter archive file, relative to the top level of the application package."

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39895BCA0218"

-		    supplier   	"Logical View::application::Module"

-		    quidu      	"38C0322C0006")))

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d880c4a0-8826-11e1-000a-005d9e6adec4:1")))

-	    quid       	"38C033F800B2"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-000b-005d9e6adec4:1")))

-		    quid       	"38C033F9017C"

-		    documentation 	"@deprecated"

-		    supplier   	"Logical View::application::Application"

-		    quidu      	"38C030A803B1"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "securityRoles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-000c-005d9e6adec4:1")))

-		    quid       	"38C033F9017D"

-		    documentation 	

-|Contains the definitions of security roles which are

-|global to the application. 

-		    

-		    label      	"securityRoles"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d880c4a0-8826-11e1-000d-005d9e6adec4:1")))

-	    quid       	"38C0340003C1"

-	    roles      	(list role_list

-		(object Role "application"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-000e-005d9e6adec4:1")))

-		    quid       	"38C0340102E6"

-		    label      	"application"

-		    supplier   	"Logical View::application::Application"

-		    quidu      	"38C030A803B1"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "modules"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d880c4a0-8826-11e1-000f-005d9e6adec4:1")))

-		    quid       	"38C0340102E7"

-		    documentation 	

-|The application deployment descriptor must have one

-|        module element for each J2EE module in the

-|        application package. A module element is defined

-|        by moduleType definition.

-		    

-		    label      	"modules"

-		    supplier   	"Logical View::application::Module"

-		    quidu      	"38C0322C0006"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Application Diagram"

-	    quid       	"38C0325900BF"

-	    title      	"Application Diagram"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::application::WebModule" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(330, 1608)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(142, 1505)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	376

-			justify    	0

-			label      	"WebModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3904860D027B"

-		    width      	394

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::JavaClientModule" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(678, 1577)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(578, 1501)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	200

-			justify    	0

-			label      	"JavaClientModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390486730015"

-		    width      	218

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::EjbModule" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(922, 1575)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(841, 1499)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EjbModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390486830253"

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::ConnectorModule" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1150, 1575)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1049, 1499)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	202

-			justify    	0

-			label      	"ConnectorModule")

-		    icon_style 	"Icon"

-		    line_color 	16384

-		    fill_color 	13434833

-		    quidu      	"39895BC00227"

-		    width      	220

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @5

-		    location   	(2100, 1097)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1562, 635)

-			fill_color 	13434879

-			nlines     	18

-			max_width  	1040

-			label      	

-|The following conventions apply to all J2EE deployment descriptor elements unless indicated otherwise:

-|

-|- In elements that contain PCDATA, leading and trailing whitespace in the data may e ignored.

-|

-|- In elements whose value is an  "enumerated type", the value is case sensitive.

-|

-|- In elements that specify a pathname to a file within the same JAR file, relative filenames (i.e., those not starting with "/") are considered relative to the root of the JAR file's namespace.  Absolute filenames (i.e., those starting with "/") also specify names in the root of the JAR file's namespace.  In general, relative names are preferred.  The exception is .war files where absolute names are preferred for consistency with the servlet API.

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1100

-		    height     	937)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(987, 136)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(809, 57)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRole" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(300, 1101)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(122, 947)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	356

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"38C031FE012D"

-		    width      	374

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::Application" @8

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(367, 439)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(114, 233)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	506

-			justify    	0

-			label      	"Application")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C030A803B1"

-		    width      	524

-		    height     	436

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @9

-		    location   	(356, 795)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C033F800B2"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$1" @10

-			    Parent_View 	@9

-			    location   	(4, -309)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @11

-				Parent_View 	@10

-				location   	(214, 694)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	231

-				justify    	0

-				label      	""

-				pctDist    	0.735426

-				height     	143

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C033F9017C"

-			    client     	@9

-			    supplier   	@8

-			    vertices   	(list Points

-				(356, 795)

-				(356, 657))

-			    line_style 	3

-			    origin_attachment 	(356, 795)

-			    terminal_attachment 	(356, 657)

-			    label      	(object SegLabel @12

-				Parent_View 	@10

-				location   	(423, 692)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.748879

-				height     	67

-				orientation 	1))

-			(object RoleView "securityRoles" @13

-			    Parent_View 	@9

-			    location   	(4, -309)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @14

-				Parent_View 	@13

-				location   	(212, 900)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	283

-				justify    	0

-				label      	"+securityRoles"

-				pctDist    	0.753623

-				height     	145

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C033F9017D"

-			    client     	@9

-			    supplier   	@7

-			    vertices   	(list Points

-				(356, 795)

-				(356, 934))

-			    line_style 	3

-			    origin_attachment 	(356, 795)

-			    terminal_attachment 	(356, 934)

-			    label      	(object SegLabel @15

-				Parent_View 	@13

-				location   	(412, 903)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.775362

-				height     	56

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::application::Module" @16

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(833, 1072)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@16

-			location   	(702, 970)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"Module")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0322C0006"

-		    compartment 	(object Compartment

-			Parent_View 	@16

-			location   	(702, 1031)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	294)

-		    width      	280

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$2" @17

-		    location   	(878, 661)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0340003C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "application" @18

-			    Parent_View 	@17

-			    location   	(-658, -491)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @19

-				Parent_View 	@18

-				location   	(758, 558)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	231

-				justify    	0

-				label      	"+application"

-				pctDist    	0.584615

-				height     	44

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C0340102E6"

-			    client     	@17

-			    supplier   	@8

-			    vertices   	(list Points

-				(878, 661)

-				(878, 601)

-				(629, 601))

-			    line_style 	3

-			    origin_attachment 	(878, 661)

-			    terminal_attachment 	(629, 601)

-			    label      	(object SegLabel @20

-				Parent_View 	@18

-				location   	(723, 643)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.695385

-				height     	42

-				orientation 	0))

-			(object RoleView "modules" @21

-			    Parent_View 	@17

-			    location   	(-658, -491)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @22

-				Parent_View 	@21

-				location   	(753, 914)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	180

-				justify    	0

-				label      	"+modules"

-				pctDist    	0.851449

-				height     	126

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C0340102E7"

-			    client     	@17

-			    supplier   	@16

-			    vertices   	(list Points

-				(878, 661)

-				(878, 957))

-			    line_style 	3

-			    origin_attachment 	(878, 661)

-			    terminal_attachment 	(878, 957)

-			    label      	(object SegLabel @23

-				Parent_View 	@21

-				location   	(948, 916)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.862319

-				height     	70

-				orientation 	0))))

-		(object InheritTreeView "" @24

-		    location   	(833, 1325)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@16

-		    vertices   	(list Points

-			(833, 1325)

-			(833, 1186)))

-		(object InheritView "" @25

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486B60379"

-		    client     	@3

-		    supplier   	@16

-		    vertices   	(list Points

-			(922, 1487)

-			(922, 1325))

-		    line_style 	3

-		    origin_attachment 	(922, 1487)

-		    terminal_attachment 	(922, 1325)

-		    drawSupplier 	@24)

-		(object InheritView "" @26

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486AE01C9"

-		    client     	@1

-		    supplier   	@16

-		    vertices   	(list Points

-			(419, 1492)

-			(419, 1325))

-		    line_style 	3

-		    origin_attachment 	(419, 1492)

-		    terminal_attachment 	(419, 1325)

-		    drawSupplier 	@24)

-		(object InheritView "" @27

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486B201F6"

-		    client     	@2

-		    supplier   	@16

-		    vertices   	(list Points

-			(678, 1489)

-			(678, 1325))

-		    line_style 	3

-		    origin_attachment 	(678, 1489)

-		    terminal_attachment 	(678, 1325)

-		    drawSupplier 	@24)

-		(object InheritView "" @28

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39895BCA0218"

-		    client     	@4

-		    supplier   	@16

-		    vertices   	(list Points

-			(1141, 1487)

-			(1141, 1306)

-			(894, 1306)

-			(894, 1186))

-		    line_style 	3

-		    origin_attachment 	(1141, 1487)

-		    terminal_attachment 	(894, 1186))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/client.cat b/plugins/org.eclipse.jst.j2ee.core/rose/client.cat
deleted file mode 100644
index cd237782a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/client.cat
+++ /dev/null
@@ -1,1576 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "client"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

-	    value      	(value Text "DCE:d8e72790-8826-11e1-0000-005d9e6adec4:1"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "client.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Client")))

-    quid       	"38C0280700C0"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8e72790-8826-11e1-0001-005d9e6adec4:1")))

-	    quid       	"38FF3C180336"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "ApplicationClient"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8e72790-8826-11e1-0002-005d9e6adec4:1"))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C028AB009E"

-	    documentation 	

-|The application-client element is the root element of an application client deployment descriptor.  The application client deployment descriptor describes the EJB components and external resources referenced by the application client.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AEFC0009"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "version"

-		    quid       	"3E559EEA0241"

-		    documentation 	

-|@version J2EE1.4

-|The required value for the version is 1.4.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ResAuthApplicationType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8e72790-8826-11e1-0007-005d9e6adec4:1")))

-	    quid       	"38C0A0C201A5"

-	    documentation 	

-|Application=0

-|Container=1

-	    

-	    stereotype 	"enumeration"

-	    language   	"Java")

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8e72790-8826-11e1-0009-005d9e6adec4:1")))

-	    quid       	"38C02A5B0211"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8e72790-8826-11e1-000a-005d9e6adec4:1")))

-		    quid       	"38C02A5D0002"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "resourceRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8e72790-8826-11e1-000b-005d9e6adec4:1")))

-		    quid       	"38C02A5D000C"

-		    documentation 	"Contains declarations of the application clients's references to an external resources."

-		    label      	"resourceRefs"

-		    supplier   	"Logical View::common::ResourceRef"

-		    quidu      	"371BC79303C6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8e72790-8826-11e1-000c-005d9e6adec4:1")))

-	    quid       	"38C02B4501D5"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$3"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8e72790-8826-11e1-000d-005d9e6adec4:1")))

-		    quid       	"38C02B46021C"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "environmentProps"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8e72790-8826-11e1-000e-005d9e6adec4:1")))

-		    quid       	"38C02B460226"

-		    documentation 	"The env-entry element contains the declaration of an application client's environment entries. Each declaration consists of an optional description, the name of the environment entry, and an optional value."

-		    label      	"environmentProps"

-		    supplier   	"Logical View::common::EnvEntry"

-		    quidu      	"371BC77800E2"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8e72790-8826-11e1-000f-005d9e6adec4:1")))

-	    quid       	"38C02B4B0011"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$5"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8e72790-8826-11e1-0010-005d9e6adec4:1")))

-		    quid       	"38C02B4C0044"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "ejbReferences"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8e72790-8826-11e1-0011-005d9e6adec4:1")))

-		    quid       	"38C02B4C0045"

-		    documentation 	

-|Contains a list of ejb-ref elements used for the declaration of a reference to an enterprise

-|bean's home. 

-		    

-		    label      	"ejbReferences"

-		    supplier   	"Logical View::common::EjbRef"

-		    quidu      	"371BC78202B3"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"39895E8E00FD"

-	    roles      	(list role_list

-		(object Role "resourceEnvRefs"

-		    quid       	"39895E8F033A"

-		    documentation 	

-|The resource-env-ref element contains a declaration of an application client's reference to an administered object associated with a resource in the application client's environment.  It consists of an optional

-|description, the resource environment reference name, and an indication of the resource environment reference type expected by the application client code.

-|

-|Used in: application-client

-|

-|Example:

-|

-|<resource-env-ref>

-|    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>

-|    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>

-|</resource-env-ref>

-|

-		    

-		    label      	"resourceEnvRefs"

-		    supplier   	"Logical View::common::ResourceEnvRef"

-		    quidu      	"39BF207200D3"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"39895E8F034E"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"39895F3D029A"

-	    roles      	(list role_list

-		(object Role "callbackHandler "

-		    quid       	"39895F3E01F1"

-		    documentation 	"A class provided by the application.  The class must have a no args constructor and must implement the javax.security.auth.callback.CallbackHandler interface.  The class will be instantiated by the application client container and used by the container to collect authentication information from the user."

-		    label      	"callbackHandler "

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"39895F3E0223"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E53F4AC005F"

-	    roles      	(list role_list

-		(object Role "serviceRefs"

-		    quid       	"3E53F4AC02F4"

-		    documentation 	"@version J2EE1.4"

-		    label      	"serviceRefs"

-		    supplier   	"Logical View::wsclient::ServiceRef"

-		    quidu      	"3E4D2F560184"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E53F4AC0308"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E53F50701D2"

-	    roles      	(list role_list

-		(object Role "messageDestinationRefs"

-		    quid       	"3E53F50800B1"

-		    documentation 	

-|@version J2EE1.4

-|The message-destination-ref-name element specifies the

-|    name of a message destination reference; its value is

-|    the message destination reference name used in the

-|    application client code. The name is a JNDI name

-|    relative to the java:comp/env context and must be unique

-|    within an application client.

-		    

-		    label      	"messageDestinationRefs"

-		    supplier   	"Logical View::common::MessageDestinationRef"

-		    quidu      	"3E4C1F52028C"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E53F50800BB"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E53F5DB0372"

-	    roles      	(list role_list

-		(object Role "messageDestinations"

-		    quid       	"3E53F5DD003F"

-		    documentation 	"@version J2EE1.4"

-		    label      	"messageDestinations"

-		    supplier   	"Logical View::common::MessageDestination"

-		    quidu      	"3E4C211001CF"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E53F5DD0053"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Client Diagram"

-	    quid       	"38C028C600ED"

-	    title      	"Client Diagram"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(453, 729)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(275, 650)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResourceRef" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2096, 2064)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1619, 1810)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	954

-			justify    	0

-			label      	"ResourceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"371BC79303C6"

-		    width      	972

-		    height     	532

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EnvEntry" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1024, 2016)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(778, 1812)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	492

-			justify    	0

-			label      	"EnvEntry")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"371BC77800E2"

-		    width      	510

-		    height     	432

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EjbRef" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1456, 2064)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1224, 1810)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	464

-			justify    	0

-			label      	"EjbRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"371BC78202B3"

-		    width      	482

-		    height     	532

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResourceEnvRef" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2288, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1951, 486)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	674

-			justify    	0

-			label      	"ResourceEnvRef")

-		    icon_style 	"Icon"

-		    line_color 	16384

-		    fill_color 	12632256

-		    quidu      	"39BF207200D3"

-		    width      	692

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(782, 218)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(689, 139)

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsclient::ServiceRef" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(432, 2016)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(336, 1941)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	192

-			justify    	0

-			label      	"ServiceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777088

-		    quidu      	"3E4D2F560184"

-		    width      	210

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestinationRef" @8

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1072, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(637, 464)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	870

-			justify    	0

-			label      	"MessageDestinationRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4C1F52028C"

-		    width      	888

-		    height     	376

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestination" @9

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1568, 496)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@9

-			location   	(1329, 392)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	478

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4C211001CF"

-		    width      	496

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::client::ApplicationClient" @10

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 1264)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@10

-			location   	(131, 1058)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	506

-			justify    	0

-			label      	"ApplicationClient")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C028AB009E"

-		    width      	524

-		    height     	436

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @11

-		    location   	(1564, 1330)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C02A5B0211"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$1" @12

-			    Parent_View 	@11

-			    location   	(1308, 274)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @13

-				Parent_View 	@12

-				location   	(831, 1289)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02A5D0002"

-			    client     	@11

-			    supplier   	@10

-			    vertices   	(list Points

-				(1564, 1330)

-				(646, 1330))

-			    line_style 	3

-			    origin_attachment 	(1564, 1330)

-			    terminal_attachment 	(646, 1330)

-			    label      	(object SegLabel @14

-				Parent_View 	@12

-				location   	(784, 1304)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.850107

-				height     	27

-				orientation 	1))

-			(object RoleView "resourceRefs" @15

-			    Parent_View 	@11

-			    location   	(1308, 274)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @16

-				Parent_View 	@15

-				location   	(2155, 1638)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	264

-				justify    	0

-				label      	"+resourceRefs"

-				pctDist    	0.826607

-				height     	142

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02A5D000C"

-			    client     	@11

-			    supplier   	@2

-			    vertices   	(list Points

-				(1564, 1330)

-				(2013, 1330)

-				(2013, 1798))

-			    line_style 	3

-			    origin_attachment 	(1564, 1330)

-			    terminal_attachment 	(2013, 1798)

-			    label      	(object SegLabel @17

-				Parent_View 	@15

-				location   	(2067, 1706)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$2" @18

-		    location   	(993, 1454)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C02B4501D5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$3" @19

-			    Parent_View 	@18

-			    location   	(113, 414)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @20

-				Parent_View 	@19

-				location   	(715, 1413)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B46021C"

-			    client     	@18

-			    supplier   	@10

-			    vertices   	(list Points

-				(993, 1454)

-				(646, 1454))

-			    line_style 	3

-			    origin_attachment 	(993, 1454)

-			    terminal_attachment 	(646, 1454)

-			    label      	(object SegLabel @21

-				Parent_View 	@19

-				location   	(735, 1390)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.746108

-				height     	65

-				orientation 	1))

-			(object RoleView "environmentProps" @22

-			    Parent_View 	@18

-			    location   	(113, 414)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @23

-				Parent_View 	@22

-				location   	(1242, 1524)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	348

-				justify    	0

-				label      	"+environmentProps"

-				pctDist    	0.320896

-				height     	189

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B460226"

-			    client     	@18

-			    supplier   	@3

-			    vertices   	(list Points

-				(993, 1454)

-				(1053, 1454)

-				(1053, 1800))

-			    line_style 	3

-			    origin_attachment 	(993, 1454)

-			    terminal_attachment 	(1053, 1800)

-			    label      	(object SegLabel @24

-				Parent_View 	@22

-				location   	(1131, 1712)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.786025

-				height     	78

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$4" @25

-		    location   	(1233, 1415)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C02B4B0011"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$5" @26

-			    Parent_View 	@25

-			    location   	(-351, 327)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @27

-				Parent_View 	@26

-				location   	(764, 1374)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B4C0044"

-			    client     	@25

-			    supplier   	@10

-			    vertices   	(list Points

-				(1233, 1415)

-				(646, 1415))

-			    line_style 	3

-			    origin_attachment 	(1233, 1415)

-			    terminal_attachment 	(646, 1415)

-			    label      	(object SegLabel @28

-				Parent_View 	@26

-				location   	(706, 1362)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "ejbReferences" @29

-			    Parent_View 	@25

-			    location   	(-351, 327)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @30

-				Parent_View 	@29

-				location   	(1619, 1586)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	288

-				justify    	0

-				label      	"+ejbReferences"

-				pctDist    	0.638132

-				height     	182

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B4C0045"

-			    client     	@25

-			    supplier   	@4

-			    vertices   	(list Points

-				(1233, 1415)

-				(1437, 1415)

-				(1437, 1798))

-			    line_style 	3

-			    origin_attachment 	(1233, 1415)

-			    terminal_attachment 	(1437, 1798)

-			    label      	(object SegLabel @31

-				Parent_View 	@29

-				location   	(1534, 1718)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.864668

-				height     	97

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$6" @32

-		    location   	(1549, 1268)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39895E8E00FD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resourceEnvRefs" @33

-			    Parent_View 	@32

-			    location   	(1165, 1012)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @34

-				Parent_View 	@33

-				location   	(2169, 997)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	338

-				justify    	0

-				label      	"+resourceEnvRefs"

-				pctDist    	0.789588

-				height     	179

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895E8F033A"

-			    client     	@32

-			    supplier   	@5

-			    vertices   	(list Points

-				(1549, 1268)

-				(1990, 1268)

-				(1990, 806))

-			    line_style 	3

-			    origin_attachment 	(1549, 1268)

-			    terminal_attachment 	(1990, 806)

-			    label      	(object SegLabel @35

-				Parent_View 	@33

-				location   	(2038, 916)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.879377

-				height     	48

-				orientation 	1))

-			(object RoleView "$UNNAMED$7" @36

-			    Parent_View 	@32

-			    location   	(1165, 1012)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895E8F034E"

-			    client     	@32

-			    supplier   	@10

-			    vertices   	(list Points

-				(1549, 1268)

-				(646, 1268))

-			    line_style 	3

-			    origin_attachment 	(1549, 1268)

-			    terminal_attachment 	(646, 1268))))

-		(object AssociationViewNew "$UNNAMED$8" @37

-		    location   	(781, 760)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39895F3D029A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "callbackHandler " @38

-			    Parent_View 	@37

-			    location   	(397, 504)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @39

-				Parent_View 	@38

-				location   	(984, 355)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	315

-				justify    	0

-				label      	"+callbackHandler "

-				pctDist    	0.899209

-				height     	203

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895F3E01F1"

-			    client     	@37

-			    supplier   	@6

-			    vertices   	(list Points

-				(781, 760)

-				(781, 309))

-			    line_style 	3

-			    origin_attachment 	(781, 760)

-			    terminal_attachment 	(781, 309)

-			    label      	(object SegLabel @40

-				Parent_View 	@38

-				location   	(718, 353)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.905138

-				height     	64

-				orientation 	0))

-			(object RoleView "$UNNAMED$9" @41

-			    Parent_View 	@37

-			    location   	(397, 504)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895F3E0223"

-			    client     	@37

-			    supplier   	@10

-			    vertices   	(list Points

-				(781, 760)

-				(781, 1076)

-				(646, 1076))

-			    line_style 	3

-			    origin_attachment 	(781, 760)

-			    terminal_attachment 	(646, 1076))))

-		(object AssociationViewNew "$UNNAMED$10" @42

-		    location   	(329, 1705)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53F4AC005F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceRefs" @43

-			    Parent_View 	@42

-			    location   	(-171, 1027)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @44

-				Parent_View 	@43

-				location   	(196, 1848)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	240

-				justify    	0

-				label      	"+serviceRefs"

-				pctDist    	0.639344

-				height     	134

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F4AC02F4"

-			    client     	@42

-			    supplier   	@7

-			    vertices   	(list Points

-				(329, 1705)

-				(329, 1928))

-			    line_style 	3

-			    origin_attachment 	(329, 1705)

-			    terminal_attachment 	(329, 1928)

-			    label      	(object SegLabel @45

-				Parent_View 	@43

-				location   	(403, 1853)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.663934

-				height     	74

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @46

-			    Parent_View 	@42

-			    location   	(-171, 1027)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F4AC0308"

-			    client     	@42

-			    supplier   	@10

-			    vertices   	(list Points

-				(329, 1705)

-				(329, 1482))

-			    line_style 	3

-			    origin_attachment 	(329, 1705)

-			    terminal_attachment 	(329, 1482))))

-		(object AssociationViewNew "$UNNAMED$12" @47

-		    location   	(896, 1080)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53F50701D2"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinationRefs" @48

-			    Parent_View 	@47

-			    location   	(396, 402)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @49

-				Parent_View 	@48

-				location   	(1146, 876)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	474

-				justify    	0

-				label      	"+messageDestinationRefs"

-				pctDist    	0.808765

-				height     	250

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F50800B1"

-			    client     	@47

-			    supplier   	@8

-			    vertices   	(list Points

-				(896, 1080)

-				(896, 827))

-			    line_style 	3

-			    origin_attachment 	(896, 1080)

-			    terminal_attachment 	(896, 827)

-			    label      	(object SegLabel @50

-				Parent_View 	@48

-				location   	(832, 876)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.808765

-				height     	65

-				orientation 	0))

-			(object RoleView "$UNNAMED$13" @51

-			    Parent_View 	@47

-			    location   	(396, 402)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F50800BB"

-			    client     	@47

-			    supplier   	@10

-			    vertices   	(list Points

-				(896, 1080)

-				(896, 1140)

-				(646, 1140))

-			    line_style 	3

-			    origin_attachment 	(896, 1080)

-			    terminal_attachment 	(646, 1140))))

-		(object AssociationViewNew "$UNNAMED$14" @52

-		    location   	(1401, 1202)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53F5DB0372"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinations" @53

-			    Parent_View 	@52

-			    location   	(1023, -60)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @54

-				Parent_View 	@53

-				location   	(1767, 690)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	424

-				justify    	0

-				label      	"+messageDestinations"

-				pctDist    	0.897567

-				height     	201

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F5DD003F"

-			    client     	@52

-			    supplier   	@9

-			    vertices   	(list Points

-				(1401, 1202)

-				(1566, 1202)

-				(1566, 612))

-			    line_style 	3

-			    origin_attachment 	(1401, 1202)

-			    terminal_attachment 	(1566, 612)

-			    label      	(object SegLabel @55

-				Parent_View 	@53

-				location   	(1483, 674)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.918987

-				height     	84

-				orientation 	0))

-			(object RoleView "$UNNAMED$15" @56

-			    Parent_View 	@52

-			    location   	(1023, -60)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F5DD0053"

-			    client     	@52

-			    supplier   	@10

-			    vertices   	(list Points

-				(1401, 1202)

-				(646, 1202))

-			    line_style 	3

-			    origin_attachment 	(1401, 1202)

-			    terminal_attachment 	(646, 1202))))))

-	(object ClassDiagram "resAuth Relation"

-	    quid       	"38C0A0B10060"

-	    title      	"resAuth Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::client::ResAuthApplicationType" @57

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(275, 734)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@57

-			location   	(31, 708)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"ResAuthApplicationType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@57

-			location   	(31, 658)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A0C201A5"

-		    width      	506

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResAuthTypeBase" @58

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@58

-			location   	(94, 93)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"ResAuthTypeBase")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@58

-			location   	(94, 43)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	353

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C09ED400B4"

-		    width      	374

-		    height     	418

-		    annotation 	8

-		    autoResize 	TRUE)))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/common.cat b/plugins/org.eclipse.jst.j2ee.core/rose/common.cat
deleted file mode 100644
index 1dce4423f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/common.cat
+++ /dev/null
@@ -1,6287 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "common"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "common.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Common")))

-    quid       	"38C08F0F038D"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    quid       	"39B7E48C0067"

-	    supplier   	"Logical View::ejb"

-	    quidu      	"3780E272032D")

-	(object Visibility_Relationship

-	    quid       	"39AB2BF100FA"

-	    supplier   	"Logical View::application"

-	    quidu      	"38C03008014E"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "EjbRef"

-	    quid       	"371BC78202B3"

-	    documentation 	

-|The ejb-refType is used by ejb-ref elements for the

-|declaration of a reference to an enterprise bean's home. The

-|declaration consists of:

-|

-|    - an optional description

-|    - the EJB reference name used in the code of

-|      the Deployment Component that's referencing the enterprise

-|      bean

-|    - the expected type of the referenced enterprise bean

-|    - the expected home and remote interfaces of the referenced

-|      enterprise bean

-|    - optional ejb-link information, used to specify the

-|      referenced enterprise bean

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"371BD4000185"

-		    documentation 	

-|The ejb-ref-name element contains the name of an EJB reference. This is the JNDI name that the servlet code uses to get a reference to the enterprise bean.

-|Example: <ejb-ref-name>ejb/Payroll</ejb-ref-name>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"371BD413018C"

-		    documentation 	

-|The ejb-ref-type element contains the expected type of the referenced enterprise bean. The ejb-ref-type element must be one of the following:

-|<ejb-ref-type>Entity</ejb-ref-type>

-|<ejb-ref-type>Session</ejb-ref-type>

-		    

-		    type       	"EjbRefType"

-		    quidu      	"38C126FB0081"

-		    exportControl 	"Public")

-		(object ClassAttribute "home"

-		    quid       	"371BD425032D"

-		    documentation 	

-|The home element contains the fully-qualified name of the enterprise bean’s home interface.

-|Example: <home>com.aardvark.payroll.PayrollHome</home>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "remote"

-		    quid       	"371BD42E0073"

-		    documentation 	"The remote element contains the fully-qualified name of the enterprise bean’s remote interface."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"371BD45B028A"

-		    documentation 	

-|The ejb-link element is used in the ejb-ref element to specify that an EJB reference is linked to an enterprise bean in the encompassing J2EE Application package. The value of the ejb-link element must be the ejb-name of an enterprise bean in the same J2EE Application package. 

-|Example: <ejb-link>EmployeeRecord</ejb-link>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38BDD87602E5"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "EnvEntry"

-	    quid       	"371BC77800E2"

-	    documentation 	

-|The env-entryType is used to declare an application's

-|environment entry. The declaration consists of an optional

-|description, the name of the environment entry, and an

-|optional value.  If a value is not specified, one must be

-|supplied during deployment.

-|

-|It is used by env-entry elements.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"371BD3710392"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"371BD3780111"

-		    documentation 	

-|The env-entry-name element contains the name of a

-|        Deployment Component's environment entry.  The name

-|        is a JNDI name relative to the java:comp/env

-|        context.  The name must be unique within a

-|        Deployment Component. The uniqueness

-|        constraints must be defined within the declared

-|        context.

-|

-|        Example:

-|

-|        <env-entry-name>minAmount</env-entry-name>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"371BD38003A8"

-		    documentation 	

-|The env-entry-value designates the value of a

-|        Deployment Component's environment entry. The value

-|        must be a String that is valid for the

-|        constructor of the specified type that takes a

-|        single String parameter, or for java.lang.Character,

-|        a single character.

-|

-|        Example:

-|

-|        <env-entry-value>100.00</env-entry-value>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38BDD8340091"

-		    documentation 	

-|The env-entry-type element contains the fully-qualified Java type of the environment entry value that is expected by the application client’s code. The following are the legal values of env-entry-type: java.lang.Bool-ean, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte, java.lang.Short, java.lang.Long, and java.lang.Float. 

-|Example: <env-entry-type>java.lang.Boolean</env-entry-type>

-		    

-		    type       	"EnvEntryType"

-		    quidu      	"38BDD7A60315"

-		    exportControl 	"Public")))

-	(object Class "ResourceRef"

-	    quid       	"371BC79303C6"

-	    documentation 	

-|The resource-refType contains a declaration of a

-|Deployment Component's reference to an external resource. It

-|consists of an optional description, the resource manager

-|connection factory reference name, the indication of the

-|resource manager connection factory type expected by the

-|Deployment Component code, the type of authentication

-|(Application or Container), and an optional specification of

-|the shareability of connections obtained from the resource

-|(Shareable or Unshareable).

-|

-|Example:

-|

-|<resource-ref>

-|    <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>

-|    <res-type>javax.sql.DataSource</res-type>

-|    <res-auth>Container</res-auth>

-|    <res-sharing-scope>Shareable</res-sharing-scope>

-|</resource-ref>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"371BD5580338"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"371BD55F0310"

-		    documentation 	

-|The res-ref-name element specifies the name of a

-|        resource manager connection factory reference.

-|        The name is a JNDI name relative to the

-|        java:comp/env context.

-|        The name must be unique within a Deployment File.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    quid       	"371BD575024A"

-		    documentation 	

-|The res-type element specifies the type of the data

-|        source. The type is specified by the fully qualified

-|        Java language class or interface

-|        expected to be implemented by the data source.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "auth"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38BDD8D900AC"

-		    documentation 	

-|The res-auth element specifies whether the enterprise bean code signs on programmatically to the resource manager, or whether the Container will sign on to the resource manager on behalf of the bean. In the latter case, the Container uses information that is supplied by the Deployer.  The value of this element must be one of the two following:

-|<res-auth>Application</res-auth>

-|<res-auth>Container</res-auth>

-		    

-		    type       	"ResAuthTypeBase"

-		    quidu      	"38C09ED400B4"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"39A9C7430008"

-		    documentation 	"@version J2EE1.4 deprecated"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "resSharingScope"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF27FC03DB"

-		    documentation 	

-|The res-sharing-scope element specifies whether connections obtained

-|through the given resource manager connection factory reference can be

-|shared. The value of this element, if specified, must be one of the

-|two following:  Shareable, Unshareable

-|

-|The default value is Shareable.

-|

-		    

-		    type       	"ResSharingScopeType"

-		    quidu      	"39BF288C00A3"

-		    exportControl 	"Public")))

-	(object Class "EnvEntryType"

-	    quid       	"38BDD7A60315"

-	    documentation 	

-|@version J2EE1.3 added Character

-|String=0

-|Integer=1

-|Boolean=2

-|Double=3

-|Byte=4

-|Short=5

-|Long=6

-|Float=7

-|Character=8

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "String"

-		    quid       	"39A9C7D800CB"

-		    exportControl 	"Public")

-		(object ClassAttribute "Integer"

-		    quid       	"39A9C7DB009D"

-		    exportControl 	"Public")

-		(object ClassAttribute "Boolean"

-		    quid       	"39A9C7E200ED"

-		    exportControl 	"Public")

-		(object ClassAttribute "Double"

-		    quid       	"39A9C7E401C3"

-		    exportControl 	"Public")

-		(object ClassAttribute "Byte"

-		    quid       	"39A9C7E600E9"

-		    exportControl 	"Public")

-		(object ClassAttribute "Short"

-		    quid       	"39A9C7EF02FF"

-		    exportControl 	"Public")

-		(object ClassAttribute "Long"

-		    quid       	"39A9C7F103D4"

-		    exportControl 	"Public")

-		(object ClassAttribute "Float"

-		    quid       	"39A9C7F302F1"

-		    exportControl 	"Public")

-		(object ClassAttribute "Character"

-		    quid       	"39886ADD03A8"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SecurityRoleRef"

-	    quid       	"371BC7A0025C"

-	    documentation 	

-|The security-role-refType contains the declaration of a

-|security role reference in a component's or a

-|Deployment Component's code. The declaration consists of an

-|optional description, the security role name used in the

-|code, and an optional link to a security role. If the

-|security role is not specified, the Deployer must choose an

-|appropriate security role.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"371BD4BC0135"

-		    documentation 	

-|The value of the role-name element must be the String used

-|        as the parameter to the

-|        EJBContext.isCallerInRole(String roleName) method or the

-|        HttpServletRequest.isUserInRole(String role) method.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38BDD89D01C8"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"38BDD8AC0134"

-		    documentation 	

-|The role-link element is a reference to a defined

-|        security role. The role-link element must contain

-|        the name of one of the security roles defined in the

-|        security-role elements.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ResAuthTypeBase"

-	    quid       	"38C09ED400B4"

-	    documentation 	

-|CONTAINER=0

-|Container=1

-|Application=2

-|SERVLET=3

-|

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Container"

-		    quid       	"3EA6D8F301E7"

-		    exportControl 	"Public")

-		(object ClassAttribute "Application"

-		    quid       	"3EA6D9000178"

-		    exportControl 	"Public")

-		(object ClassAttribute "SERVLET"

-		    quid       	"3EAFED8B0138"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "EjbRefType"

-	    quid       	"38C126FB0081"

-	    documentation 	

-|Session=0

-|Entity=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Session"

-		    quid       	"39A9C7C601D3"

-		    exportControl 	"Public")

-		(object ClassAttribute "Entity"

-		    quid       	"39A9C7CD0242"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SecurityRole"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C031FE012D"

-	    documentation 	

-|The security-roleType contains the definition of a security

-|role. The definition consists of an optional description of the

-|security role, and the security role name.

-|

-|Example:

-|

-|    <security-role>

-|    <description>

-|        This role includes all employees who are authorized

-|        to access the employee service application.

-|    </description>

-|    <role-name>employee</role-name>

-|    </security-role>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"38C032690159"

-		    documentation 	"@deprecated See descriptions"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roleName"

-		    quid       	"38C0327D014D"

-		    documentation 	

-|The role-name element contains the name of a role. This element must contain a non-empty string.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ResourceEnvRef"

-	    quid       	"39BF207200D3"

-	    documentation 	

-|The resource-env-refType is used to define

-|resource-env-type elements.  It contains a declaration of a

-|Deployment Component's reference to an administered object

-|associated with a resource in the Deployment Component's

-|environment.  It consists of an optional description, the

-|resource environment reference name, and an indication of

-|the resource environment reference type expected by the

-|Deployment Component code.

-|

-|Example:

-|

-|<resource-env-ref>

-|    <resource-env-ref-name>jms/StockQueue

-|    </resource-env-ref-name>

-|    <resource-env-ref-type>javax.jms.Queue

-|    </resource-env-ref-type>

-|</resource-env-ref>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF21C20177"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the resource env ref.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"39BF21CD03C1"

-		    documentation 	

-|The resource-env-ref-name element specifies the name

-|        of a resource environment reference; its value is

-|        the environment entry name used in

-|        the Deployment Component code.  The name is a JNDI

-|        name relative to the java:comp/env context and must

-|        be unique within a Deployment Component.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ResSharingScopeType"

-	    quid       	"39BF288C00A3"

-	    documentation 	

-|Shareable=0

-|Unshareable=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Shareable"

-		    quid       	"39BF28AE00A2"

-		    exportControl 	"Public")

-		(object ClassAttribute "Unshareable"

-		    quid       	"39BF28B0027C"

-		    exportControl 	"Public")))

-	(object Class "EJBLocalRef"

-	    quid       	"398862E20101"

-	    documentation 	

-|@version J2EE1.3

-|The ejb-local-refType is used by ejb-local-ref elements for

-|the declaration of a reference to an enterprise bean's local

-|home. The declaration consists of:

-|

-|    - an optional description

-|    - the EJB reference name used in the code of the Deployment

-|      Component that's referencing the enterprise bean

-|    - the expected type of the referenced enterprise bean

-|    - the expected local home and local interfaces of the

-|      referenced enterprise bean

-|    - optional ejb-link information, used to specify the

-|      referenced enterprise bean

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E91E66A0374"

-		    supplier   	"Logical View::common::EjbRef"

-		    quidu      	"371BC78202B3"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "localHome"

-		    quid       	"3E4BE9E1035D"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "local"

-		    quid       	"3E4BE9EC00B9"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "RunAsSpecifiedIdentity"

-	    quid       	"39BF2C9E02C8"

-	    documentation 	

-|The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It    contains an optional description and a specification of the security identity to be used.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39BF2D0F0130"

-		    supplier   	"Logical View::common::SecurityIdentity"

-		    quidu      	"39BF2C040245")))

-	(object Class "Identity"

-	    quid       	"39BF2DA40058"

-	    documentation 	

-|Specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF2DDC00B3"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the run as identity.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roleName"

-		    quid       	"39BF2DEB00F1"

-		    documentation 	

-|The role-name element contains the name of a security role.

-|

-|The name must conform to the lexical rules for an NMTOKEN.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "IconType"

-	    quid       	"3E4A99EE003A"

-	    documentation 	

-|@version J2EE1.4

-|The icon type contains small-icon and large-icon elements

-|that specify the file names for small and large GIF or

-|JPEG icon images used to represent the parent element in a

-|GUI tool.

-|

-|The xml:lang attribute defines the language that the

-|icon file names are provided in. Its value is "en" (English)

-|by default.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "smallIcon"

-		    quid       	"3E4A9A16027C"

-		    documentation 	

-|The small-icon element contains the name of a file

-|        containing a small (16 x 16) icon image. The file

-|        name is a relative path within the Deployment

-|        Component's Deployment File.

-|

-|        The image may be either in the JPEG or GIF format.

-|        The icon can be used by tools.

-|

-|        Example:

-|

-|        <small-icon>employee-service-icon16x16.jpg</small-icon>

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"3E4A9A1D00E1"

-		    documentation 	

-|The large-icon element contains the name of a file

-|        containing a large

-|        (32 x 32) icon image. The file name is a relative

-|        path within the Deployment Component's Deployment

-|        File.

-|

-|        The image may be either in the JPEG or GIF format.

-|        The icon can be used by tools.

-|

-|        Example:

-|

-|        <large-icon>employee-service-icon32x32.jpg</large-icon>

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "lang"

-		    quid       	"3E4A9AC101C4"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DisplayName"

-	    quid       	"3E4A9922000E"

-	    documentation 	

-|@version J2EE1.4

-|The display-name type contains a short name that is intended

-|to be displayed by tools. It is used by display-name

-|elements.  The display name need not be unique.

-|

-|Example:

-|

-|...

-|   <display-name xml:lang="en">Employee Self Service</display-name>

-|

-|The value of the xml:lang attribute is "en" (English) by default.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "lang"

-		    quid       	"3E4A993C0106"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3E4A99510341"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDestinationRef"

-	    quid       	"3E4C1F52028C"

-	    documentation 	

-|@version J2EE1.4

-|The message-destination-ref element contains a declaration

-|of Deployment Component's reference to a message destination

-|associated with a resource in Deployment Component's

-|environment. It consists of:

-|

-|        - an optional description

-|        - the message destination reference name

-|        - the message destination type

-|        - a specification as to whether the

-|          destination is used for

-|          consuming or producing messages, or both

-|        - a link to the message destination

-|

-|Examples:

-|

-|<message-destination-ref>

-|        <message-destination-ref-name>jms/StockQueue

-|        </message-destination-ref-name>

-|        <message-destination-type>javax.jms.Queue

-|        </message-destination-type>

-|        <message-destination-usage>Consumes

-|        </message-destination-usage>

-|        <message-destination-link>CorporateStocks

-|        </message-destination-link>

-|</message-destination-ref>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4C1F7C01D8"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    quid       	"3E4C1F910002"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "usage"

-		    quid       	"3E4C1F9E02AA"

-		    type       	"MessageDestinationUsageType"

-		    quidu      	"3EAED1C200A8"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"3E4C1FBF00EE"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDestination"

-	    quid       	"3E4C211001CF"

-	    documentation 	

-|@version J2EE1.4

-|The message-destinationType specifies a message

-|destination. The logical destination described by this

-|element is mapped to a physical destination by the Deployer.

-|

-|The message destination element contains:

-|

-|        - an optional description

-|        - an optional display-name

-|        - an optional icon

-|        - a message destination name which must be unique

-|          among message destination names within the same

-|          Deployment File.

-|

-|Example:

-|

-|<message-destination>

-|        <message-destination-name>CorporateStocks

-|        </message-destination-name>

-|</message-destination>

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E9D5FC6011C"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4D2CFC03CD"

-		    documentation 	

-|The message-destination-name element specifies a

-|        name for a message destination.  This name must be

-|        unique among the names of message destinations

-|        within the Deployment File.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ParamValue"

-	    quid       	"3E4C221202C1"

-	    documentation 	

-|@version J2EE1.4

-|This type is a general type that can be used to declare

-|parameter/value lists.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4C22430217"

-		    documentation 	"The param-name element contains the name of a parameter."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3E4D426D03C6"

-		    documentation 	"The param-value element contains the value of a parameter."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3F7868BE0236"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DescriptionGroup"

-	    quid       	"3E4D451F01FB"

-	    documentation 	

-|@version J2EE1.4

-|This group keeps the usage of the contained description related

-|elements consistent across J2EE deployment descriptors.

-	    )

-	(object Class "JNDIEnvRefsGroup"

-	    quid       	"3E4D53950349"

-	    documentation 	

-|@version J2EE1.4

-|This group keeps the usage of the contained JNDI environment

-|reference elements consistent across J2EE deployment descriptors.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B1F8006C"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    abstract   	TRUE)

-	(object Class "SecurityIdentity"

-	    quid       	"39BF2C040245"

-	    documentation 	

-|The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It

-|contains an optional description and a specification of the security identity to be used.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"398871C20279"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "UseCallerIdentity"

-	    quid       	"39BF2C9002F0"

-	    documentation 	

-|The use-caller-identity element specifies that the caller's security identity be used as the security identity for the execution of the enterprise bean's methods.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39BF2D0A007F"

-		    supplier   	"Logical View::common::SecurityIdentity"

-		    quidu      	"39BF2C040245")))

-	(object Class "Description"

-	    quid       	"3E4A98D602E0"

-	    documentation 	

-|@version J2EE1.4

-|The description type is used by a description element to

-|provide text describing the parent element.  The elements

-|that use this type should include any information that the

-|Deployment Component's Deployment File file producer wants

-|to provide to the consumer of the Deployment Component's

-|Deployment File (i.e., to the Deployer). Typically, the

-|tools used by such a Deployment File consumer will display

-|the description when processing the parent element that

-|contains the description.

-|

-|The lang attribute defines the language that the

-|description is provided in. The default value is "en" (English).

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "lang"

-		    quid       	"3E4A98E001AE"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3E4A98E900DF"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDestinationUsageType"

-	    quid       	"3EAED1C200A8"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Consumes"

-		    quid       	"3EAED1DD016F"

-		    exportControl 	"Public")

-		(object ClassAttribute "Produces"

-		    quid       	"3EAED1F40190"

-		    exportControl 	"Public")

-		(object ClassAttribute "ConsumesProduces"

-		    quid       	"3EAED1F90332"

-		    exportControl 	"Public")))

-	(object Class "QName"

-	    quid       	"3F3BEF5D02C0"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "namespaceURI"

-		    quid       	"3F3BEF7000DD"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "localPart"

-		    quid       	"3F3BEFDE0230"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "combinedQName"

-		    quid       	"3F4391D100FA"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "internalPrefixOrNsURI"

-		    quid       	"3F437DD203B6"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "Listener"

-	    quid       	"39BFB26001BD"

-	    documentation 	

-|@version J2EE1.4 moved from webapp

-|

-|Declares a class in the application must be registered as a web application listener bean.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4058AE790141"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197")))

-	(object Class "CompatibilityDescriptionGroup"

-	    quid       	"4023ADF20197"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AE8701D8"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "smallIcon"

-		    quid       	"4023AE130145"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"4023AE1D009F"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"4023AE25029F"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "displayName"

-		    quid       	"4023AE3001C9"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3904632A005C"

-	    roles      	(list role_list

-		(object Role "/linkedSecurityRole"

-		    quid       	"3904632B016C"

-		    label      	"/linkedSecurityRole"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    keys       	(list class_attribute_list

-			(object ClassAttribute "name"

-			    quid       	"3989605401D3"

-			    type       	"String"))

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3904632B01BC"

-		    supplier   	"Logical View::common::SecurityRoleRef"

-		    quidu      	"371BC7A0025C")))

-	(object Association "$UNNAMED$2"

-	    quid       	"398ED2980285"

-	    roles      	(list role_list

-		(object Role "/linkedEJB"

-		    quid       	"398ED29A00B1"

-		    label      	"/linkedEJB"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"

-		    keys       	(list class_attribute_list

-			(object ClassAttribute "name"

-			    quid       	"3989606A0116"

-			    type       	"String"))

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"398ED29A0151"

-		    supplier   	"Logical View::common::EjbRef"

-		    quidu      	"371BC78202B3")))

-	(object Association "$UNNAMED$4"

-	    quid       	"399784A702BA"

-	    documentation 	

-|The resource-env-ref-type element specifies the type

-|        of a resource environment reference.  It is the

-|        fully qualified name of a Java language class or

-|        interface.

-	    

-	    roles      	(list role_list

-		(object Role "type"

-		    quid       	"399784A802A7"

-		    documentation 	

-|The resource-env-ref-type element specifies the type

-|        of a resource environment reference.  It is the

-|        fully qualified name of a Java language class or

-|        interface.

-		    

-		    label      	"type"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"399784A802D0"

-		    supplier   	"Logical View::common::ResourceEnvRef"

-		    quidu      	"39BF207200D3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"39BF2DB5023D"

-	    roles      	(list role_list

-		(object Role "identity"

-		    quid       	"39BF2DB601D1"

-		    documentation 	"Optional specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role."

-		    label      	"identity"

-		    supplier   	"Logical View::common::Identity"

-		    quidu      	"39BF2DA40058"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"39BF2DB601D2"

-		    supplier   	"Logical View::common::RunAsSpecifiedIdentity"

-		    quidu      	"39BF2C9E02C8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3E4D43320152"

-	    roles      	(list role_list

-		(object Role "icons"

-		    quid       	"3E4D43350016"

-		    label      	"icons"

-		    supplier   	"Logical View::common::IconType"

-		    quidu      	"3E4A99EE003A"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"3E4D4335002A"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E4D43540133"

-	    roles      	(list role_list

-		(object Role "displayNames"

-		    quid       	"3E4D43550152"

-		    label      	"displayNames"

-		    supplier   	"Logical View::common::DisplayName"

-		    quidu      	"3E4A9922000E"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E4D43550166"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E4D434D0255"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D434E012A"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E4D434E0152"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E4C23ED00C5"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C23EE0153"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E4C23EE0167"

-		    supplier   	"Logical View::common::ResourceRef"

-		    quidu      	"371BC79303C6"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3E4C0B37005A"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C0B380084"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3E4C0B38008E"

-		    supplier   	"Logical View::common::EnvEntry"

-		    quidu      	"371BC77800E2"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"3E53ED900289"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E53ED9101EA"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"3E53ED910262"

-		    supplier   	"Logical View::common::SecurityRoleRef"

-		    quidu      	"371BC7A0025C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E4D26DC03E6"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D26DE02DB"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E4D26DE0303"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3E4C23800295"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C2382011B"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3E4C2382012F"

-		    supplier   	"Logical View::common::ResourceEnvRef"

-		    quidu      	"39BF207200D3"

-		    is_aggregate 	TRUE)))

-	(object Association "descriptions"

-	    quid       	"3E4C0978022E"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C09790230"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$24"

-		    quid       	"3E4C0979023A"

-		    supplier   	"Logical View::common::EjbRef"

-		    quidu      	"371BC78202B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$25"

-	    quid       	"3E4C20210031"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C202101CC"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$26"

-		    quid       	"3E4C202101E0"

-		    supplier   	"Logical View::common::MessageDestinationRef"

-		    quidu      	"3E4C1F52028C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$27"

-	    quid       	"3E5679FE0087"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E5679FE0344"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$28"

-		    quid       	"3E5679FE0362"

-		    supplier   	"Logical View::common::SecurityIdentity"

-		    quidu      	"39BF2C040245"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$29"

-	    quid       	"3E4C22270090"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C222703C5"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$30"

-		    quid       	"3E4C222703D9"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$31"

-	    quid       	"3E95CA660065"

-	    documentation 	"@version J2EE1.4"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E95CA66032C"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$32"

-		    quid       	"3E95CA66035E"

-		    supplier   	"Logical View::common::Identity"

-		    quidu      	"39BF2DA40058"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Refs to Resources"

-	    quid       	"39044F8402E5"

-	    title      	"Refs to Resources"

-	    documentation 	"@version J2EE1.4 deprecated"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	2720

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::EjbRefType" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2545, 441)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(2382, 357)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"EjbRefType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@1

-			location   	(2382, 307)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	323

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C126FB0081"

-		    width      	344

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @2

-		    location   	(2432, 2147)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1703, 1894)

-			fill_color 	13434879

-			nlines     	10

-			max_width  	1422

-			label      	

-|@version J2EE1.3 

-|ADDED resSharingScope:ResSharingScopeType

-|

-|The res-sharing-scope element specifies whether connections obtained through the given resource manager connection factory reference can be shared. The value of this element, if specified, must be one of the two following:

-|     Shareable

-|     Unshareable

-|    

-|The default value is Shareable.

-			)

-		    line_color 	4227072

-		    fill_color 	13434833

-		    width      	1482

-		    height     	519)

-		(object ClassView "Class" "Logical View::common::ResSharingScopeType" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(472, 2252)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(249, 2168)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	446

-			justify    	0

-			label      	"ResSharingScopeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@3

-			location   	(249, 2118)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	446

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF288C00A3"

-		    width      	464

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @4

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@2

-		    supplier   	@3

-		    vertices   	(list Points

-			(1690, 2261)

-			(704, 2261))

-		    line_style 	3

-		    origin_attachment 	(1690, 2261)

-		    terminal_attachment 	(704, 2261))

-		(object NoteView @5

-		    location   	(1963, 1691)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1400, 1597)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	1090

-			label      	

-|Deprecated:

-|description becomes descriptions:List<DescriptionType>

-|link becomes ??

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1150

-		    height     	200)

-		(object ClassView "Class" "Logical View::common::SecurityRole" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1599, 1451)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(1518, 1375)

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C031FE012D"

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2624, 1424)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(2446, 1299)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC7A0025C"

-		    width      	374

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @8

-		    location   	(2063, 1454)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3904632A005C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/linkedSecurityRole" @9

-			    Parent_View 	@8

-			    location   	(1151, 174)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @10

-				Parent_View 	@9

-				location   	(1912, 1496)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"+/linkedSecurityRole"

-				pctDist    	0.404624

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B016C"

-			    client     	@8

-			    supplier   	@6

-			    vertices   	(list Points

-				(2063, 1454)

-				(1689, 1454))

-			    line_style 	3

-			    origin_attachment 	(2063, 1454)

-			    terminal_attachment 	(1689, 1454)

-			    label      	(object SegLabel @11

-				Parent_View 	@9

-				location   	(1739, 1402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.867052

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$1" @12

-			    Parent_View 	@8

-			    location   	(1151, 174)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @13

-				Parent_View 	@12

-				location   	(2361, 1413)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	307

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B01BC"

-			    client     	@8

-			    supplier   	@7

-			    vertices   	(list Points

-				(2063, 1454)

-				(2437, 1454))

-			    line_style 	3

-			    origin_attachment 	(2063, 1454)

-			    terminal_attachment 	(2437, 1454)

-			    label      	(object SegLabel @14

-				Parent_View 	@12

-				location   	(2295, 1454)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::EJBLocalRef" @15

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    ShowOperationSignature 	TRUE

-		    location   	(288, 736)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(109, 609)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	358

-			justify    	0

-			label      	"EJBLocalRef")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398862E20101"

-		    width      	376

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @16

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1328, 2656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@16

-			location   	(1214, 2602)

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	246

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResourceEnvRef" @17

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(416, 2608)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@17

-			location   	(151, 2481)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	530

-			justify    	0

-			label      	"ResourceEnvRef")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF207200D3"

-		    width      	548

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$4" @18

-		    location   	(947, 2681)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399784A702BA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "type" @19

-			    Parent_View 	@18

-			    location   	(595, 777)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @20

-				Parent_View 	@19

-				location   	(1126, 2737)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+type"

-				pctDist    	0.696335

-				height     	56

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399784A802A7"

-			    client     	@18

-			    supplier   	@16

-			    vertices   	(list Points

-				(947, 2681)

-				(1205, 2681))

-			    line_style 	3

-			    origin_attachment 	(947, 2681)

-			    terminal_attachment 	(1205, 2681)

-			    label      	(object SegLabel @21

-				Parent_View 	@19

-				location   	(1149, 2628)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.783691

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$5" @22

-			    Parent_View 	@18

-			    location   	(595, 777)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399784A802D0"

-			    client     	@18

-			    supplier   	@17

-			    vertices   	(list Points

-				(947, 2681)

-				(690, 2681))

-			    line_style 	3

-			    origin_attachment 	(947, 2681)

-			    terminal_attachment 	(690, 2681))))

-		(object ClassView "Class" "Logical View::common::Description" @23

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1472, 2416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@23

-			location   	(1344, 2314)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @24

-		    location   	(1012, 2518)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C23800295"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$23" @25

-			    Parent_View 	@24

-			    location   	(-571, 1996)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @26

-				Parent_View 	@25

-				location   	(755, 2477)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C2382012F"

-			    client     	@24

-			    supplier   	@17

-			    vertices   	(list Points

-				(1012, 2518)

-				(690, 2518))

-			    line_style 	3

-			    origin_attachment 	(1012, 2518)

-			    terminal_attachment 	(690, 2518))

-			(object RoleView "descriptions" @27

-			    Parent_View 	@24

-			    location   	(-571, 1996)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @28

-				Parent_View 	@27

-				location   	(1062, 2484)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.158416

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C2382011B"

-			    client     	@24

-			    supplier   	@23

-			    vertices   	(list Points

-				(1012, 2518)

-				(1335, 2518))

-			    line_style 	3

-			    origin_attachment 	(1012, 2518)

-			    terminal_attachment 	(1335, 2518)

-			    label      	(object SegLabel @29

-				Parent_View 	@27

-				location   	(1275, 2486)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.818482

-				height     	33

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::ResourceRef" @30

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(496, 1728)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@30

-			location   	(101, 1507)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	790

-			justify    	0

-			label      	"ResourceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC79303C6"

-		    width      	808

-		    height     	466

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @31

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@2

-		    supplier   	@30

-		    vertices   	(list Points

-			(1690, 1897)

-			(900, 1897))

-		    line_style 	3

-		    origin_attachment 	(1690, 1897)

-		    terminal_attachment 	(900, 1897))

-		(object AttachView "" @32

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@30

-		    supplier   	@5

-		    vertices   	(list Points

-			(900, 1716)

-			(1387, 1704))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::Description" @33

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1600, 512)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(1472, 410)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$14" @34

-		    location   	(815, 735)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C23ED00C5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @35

-			    Parent_View 	@34

-			    location   	(307, -1087)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @36

-				Parent_View 	@35

-				location   	(1221, 582)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.681347

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C23EE0153"

-			    client     	@34

-			    supplier   	@33

-			    vertices   	(list Points

-				(815, 735)

-				(815, 622)

-				(1463, 622))

-			    line_style 	3

-			    origin_attachment 	(815, 735)

-			    terminal_attachment 	(1463, 622)

-			    label      	(object SegLabel @37

-				Parent_View 	@35

-				location   	(1392, 584)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.908031

-				height     	39

-				orientation 	0))

-			(object RoleView "$UNNAMED$15" @38

-			    Parent_View 	@34

-			    location   	(307, -1087)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C23EE0167"

-			    client     	@34

-			    supplier   	@30

-			    vertices   	(list Points

-				(815, 735)

-				(815, 1494))

-			    line_style 	3

-			    origin_attachment 	(815, 735)

-			    terminal_attachment 	(815, 1494))))

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @39

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1648, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@39

-			location   	(1554, 88)

-			nlines     	2

-			max_width  	188

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3780E71A010A"

-		    width      	206

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EjbRef" @40

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(288, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@40

-			location   	(110, 76)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"EjbRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC78202B3"

-		    width      	374

-		    height     	416

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "descriptions" @41

-		    location   	(969, 400)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C0978022E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @42

-			    Parent_View 	@41

-			    location   	(681, 144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @43

-				Parent_View 	@42

-				location   	(1270, 365)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.608602

-				height     	36

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C09790230"

-			    client     	@41

-			    supplier   	@33

-			    vertices   	(list Points

-				(969, 400)

-				(1463, 400))

-			    line_style 	3

-			    origin_attachment 	(969, 400)

-			    terminal_attachment 	(1463, 400)

-			    label      	(object SegLabel @44

-				Parent_View 	@42

-				location   	(1475, 361)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	1.025806

-				height     	40

-				orientation 	0))

-			(object RoleView "$UNNAMED$24" @45

-			    Parent_View 	@41

-			    location   	(681, 144)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C0979023A"

-			    client     	@41

-			    supplier   	@40

-			    vertices   	(list Points

-				(969, 400)

-				(475, 400))

-			    line_style 	3

-			    origin_attachment 	(969, 400)

-			    terminal_attachment 	(475, 400))))

-		(object AssociationViewNew "$UNNAMED$2" @46

-		    location   	(1010, 141)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398ED2980285"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/linkedEJB" @47

-			    Parent_View 	@46

-			    location   	(738, -211)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @48

-				Parent_View 	@47

-				location   	(1336, 102)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+/linkedEJB"

-				pctDist    	0.611276

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398ED29A00B1"

-			    client     	@46

-			    supplier   	@39

-			    vertices   	(list Points

-				(1010, 141)

-				(1545, 141))

-			    line_style 	3

-			    origin_attachment 	(1010, 141)

-			    terminal_attachment 	(1545, 141)

-			    label      	(object SegLabel @49

-				Parent_View 	@47

-				location   	(1450, 164)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.824607

-				height     	23

-				orientation 	1))

-			(object RoleView "$UNNAMED$3" @50

-			    Parent_View 	@46

-			    location   	(738, -211)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398ED29A0151"

-			    client     	@46

-			    supplier   	@40

-			    vertices   	(list Points

-				(1010, 141)

-				(475, 141))

-			    line_style 	3

-			    origin_attachment 	(1010, 141)

-			    terminal_attachment 	(475, 141)

-			    label      	(object SegLabel @51

-				Parent_View 	@50

-				location   	(616, 141)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))))

-		(object InheritView "" @52

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E91E66A0374"

-		    client     	@15

-		    supplier   	@40

-		    vertices   	(list Points

-			(288, 596)

-			(288, 480))

-		    line_style 	0)))

-	(object ClassDiagram "Security"

-	    quid       	"3B7951F8018D"

-	    title      	"Security"

-	    documentation 	

-|The env-entry-name element contains the name of a

-|        Deployment Component's environment entry.  The name

-|        is a JNDI name relative to the java:comp/env

-|        context.  The name must be unique within a

-|        Deployment Component. The uniqueness

-|        constraints must be defined within the declared

-|        context.

-|

-|        Example:

-|

-|        <env-entry-name>minAmount</env-entry-name>

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1837

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::UseCallerIdentity" @53

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(512, 2118)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@53

-			location   	(411, 2041)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	202

-			justify    	0

-			label      	"UseCallerIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C9002F0"

-		    width      	220

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @54

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(416, 1232)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@54

-			location   	(165, 1028)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	502

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	520

-		    height     	432

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @55

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1664, 1504)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@55

-			location   	(1281, 1275)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	766

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    width      	784

-		    height     	482

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityIdentity" @56

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(864, 1664)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@56

-			location   	(686, 1586)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C040245"

-		    width      	374

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @57

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF2D0A007F"

-		    client     	@53

-		    supplier   	@56

-		    vertices   	(list Points

-			(580, 2028)

-			(792, 1754))

-		    line_style 	0)

-		(object AssociationViewNew "" @58

-		    location   	(705, 1510)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39BF2C1F018F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @59

-			    Parent_View 	@58

-			    location   	(-159, -26)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @60

-				Parent_View 	@59

-				location   	(625, 1490)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200264"

-			    client     	@58

-			    supplier   	@54

-			    vertices   	(list Points

-				(705, 1510)

-				(641, 1448))

-			    line_style 	0)

-			(object RoleView "securityIdentity" @61

-			    Parent_View 	@58

-			    location   	(-159, -26)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @62

-				Parent_View 	@61

-				location   	(566, 1576)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	299

-				justify    	0

-				label      	"+securityIdentity"

-				pctDist    	-0.603746

-				height     	145

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200263"

-			    client     	@58

-			    supplier   	@56

-			    vertices   	(list Points

-				(705, 1510)

-				(770, 1573))

-			    line_style 	0

-			    label      	(object SegLabel @63

-				Parent_View 	@61

-				location   	(814, 1515)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.889576

-				height     	73

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @64

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 336)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@64

-			location   	(158, 211)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC7A0025C"

-		    width      	374

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRole" @65

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1584, 304)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@65

-			location   	(1406, 202)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C031FE012D"

-		    width      	374

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @66

-		    location   	(960, 281)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3904632A005C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$1" @67

-			    Parent_View 	@66

-			    location   	(-381, -107)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @68

-				Parent_View 	@67

-				location   	(705, 204)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	307

-				justify    	0

-				label      	""

-				pctDist    	0.585052

-				height     	78

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B01BC"

-			    client     	@66

-			    supplier   	@64

-			    vertices   	(list Points

-				(960, 281)

-				(523, 281))

-			    line_style 	3

-			    origin_attachment 	(960, 281)

-			    terminal_attachment 	(523, 281)

-			    label      	(object SegLabel @69

-				Parent_View 	@67

-				location   	(664, 281)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))

-			(object RoleView "/linkedSecurityRole" @70

-			    Parent_View 	@66

-			    location   	(-381, -107)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @71

-				Parent_View 	@70

-				location   	(1172, 238)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"+/linkedSecurityRole"

-				pctDist    	0.487113

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B016C"

-			    client     	@66

-			    supplier   	@65

-			    vertices   	(list Points

-				(960, 281)

-				(1397, 281))

-			    line_style 	3

-			    origin_attachment 	(960, 281)

-			    terminal_attachment 	(1397, 281)

-			    label      	(object SegLabel @72

-				Parent_View 	@70

-				location   	(1351, 342)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.896907

-				height     	61

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::RunAsSpecifiedIdentity" @73

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 2128)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@73

-			location   	(894, 2078)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	452

-			justify    	0

-			label      	"RunAsSpecifiedIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C9E02C8"

-		    width      	470

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @74

-		    location   	(1313, 1905)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39982A2E0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @75

-			    Parent_View 	@74

-			    location   	(216, -168)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @76

-				Parent_View 	@75

-				location   	(1393, 1750)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F018E"

-			    client     	@74

-			    supplier   	@55

-			    vertices   	(list Points

-				(1313, 1905)

-				(1450, 1745))

-			    line_style 	0)

-			(object RoleView "runAs" @77

-			    Parent_View 	@74

-			    location   	(216, -168)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @78

-				Parent_View 	@77

-				location   	(1172, 1983)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+runAs"

-				pctDist    	0.717360

-				height     	57

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F0184"

-			    client     	@74

-			    supplier   	@73

-			    vertices   	(list Points

-				(1313, 1905)

-				(1173, 2065))

-			    line_style 	0

-			    label      	(object SegLabel @79

-				Parent_View 	@77

-				location   	(1296, 2013)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.437963

-				height     	58

-				orientation 	0))))

-		(object InheritView "" @80

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF2D0F0130"

-		    client     	@73

-		    supplier   	@56

-		    vertices   	(list Points

-			(1085, 2065)

-			(914, 1754))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::Description" @81

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 880)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@81

-			location   	(992, 778)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4A98D602E0"

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$27" @82

-		    location   	(987, 1283)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5679FE0087"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @83

-			    Parent_View 	@82

-			    location   	(120, -384)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @84

-				Parent_View 	@83

-				location   	(1181, 1107)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.750403

-				height     	130

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5679FE0344"

-			    client     	@82

-			    supplier   	@81

-			    vertices   	(list Points

-				(987, 1283)

-				(1080, 994))

-			    line_style 	0

-			    label      	(object SegLabel @85

-				Parent_View 	@83

-				location   	(1007, 1044)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.773758

-				height     	57

-				orientation 	0))

-			(object RoleView "$UNNAMED$28" @86

-			    Parent_View 	@82

-			    location   	(120, -384)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5679FE0362"

-			    client     	@82

-			    supplier   	@56

-			    vertices   	(list Points

-				(987, 1283)

-				(892, 1573))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$18" @87

-		    location   	(482, 869)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53ED900289"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @88

-			    Parent_View 	@87

-			    location   	(76, 513)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @89

-				Parent_View 	@88

-				location   	(814, 835)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.662088

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53ED9101EA"

-			    client     	@87

-			    supplier   	@81

-			    vertices   	(list Points

-				(482, 869)

-				(983, 869))

-			    line_style 	3

-			    origin_attachment 	(482, 869)

-			    terminal_attachment 	(983, 869)

-			    label      	(object SegLabel @90

-				Parent_View 	@88

-				location   	(919, 920)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.872845

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$19" @91

-			    Parent_View 	@87

-			    location   	(76, 513)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53ED910262"

-			    client     	@87

-			    supplier   	@64

-			    vertices   	(list Points

-				(482, 869)

-				(378, 869)

-				(378, 473))

-			    line_style 	3

-			    origin_attachment 	(482, 869)

-			    terminal_attachment 	(378, 473))))

-		(object AssociationViewNew "$UNNAMED$20" @92

-		    location   	(1634, 751)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4D26DC03E6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$21" @93

-			    Parent_View 	@92

-			    location   	(1364, -89)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1593, 485)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26DE0303"

-			    client     	@92

-			    supplier   	@65

-			    vertices   	(list Points

-				(1634, 751)

-				(1634, 417))

-			    line_style 	3

-			    origin_attachment 	(1634, 751)

-			    terminal_attachment 	(1634, 417))

-			(object RoleView "descriptions" @95

-			    Parent_View 	@92

-			    location   	(1364, -89)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @96

-				Parent_View 	@95

-				location   	(1443, 776)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.575000

-				height     	36

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26DE02DB"

-			    client     	@92

-			    supplier   	@81

-			    vertices   	(list Points

-				(1634, 751)

-				(1634, 811)

-				(1257, 811))

-			    line_style 	3

-			    origin_attachment 	(1634, 751)

-			    terminal_attachment 	(1257, 811)

-			    label      	(object SegLabel @97

-				Parent_View 	@95

-				location   	(1344, 849)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.801075

-				height     	38

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::Identity" @98

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2032, 2112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@98

-			location   	(1767, 2010)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"Identity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BF2DA40058"

-		    width      	548

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$6" @99

-		    location   	(1556, 2119)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39BF2DB5023D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$7" @100

-			    Parent_View 	@99

-			    location   	(-282, 91)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @101

-				Parent_View 	@100

-				location   	(1395, 2081)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2DB601D2"

-			    client     	@99

-			    supplier   	@73

-			    vertices   	(list Points

-				(1556, 2119)

-				(1355, 2122))

-			    line_style 	0)

-			(object RoleView "identity" @102

-			    Parent_View 	@99

-			    location   	(-282, 91)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @103

-				Parent_View 	@102

-				location   	(1653, 2076)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	172

-				justify    	0

-				label      	"+identity"

-				pctDist    	0.483528

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2DB601D1"

-			    client     	@99

-			    supplier   	@98

-			    vertices   	(list Points

-				(1556, 2119)

-				(1757, 2115))

-			    line_style 	0

-			    label      	(object SegLabel @104

-				Parent_View 	@102

-				location   	(1699, 2159)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.710327

-				height     	42

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$31" @105

-		    location   	(2122, 1057)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E95CA660065"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @106

-			    Parent_View 	@105

-			    location   	(88, -1056)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @107

-				Parent_View 	@106

-				location   	(1411, 1018)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.837607

-				height     	36

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E95CA66032C"

-			    client     	@105

-			    supplier   	@81

-			    vertices   	(list Points

-				(2122, 1057)

-				(2122, 982)

-				(1257, 982))

-			    line_style 	3

-			    origin_attachment 	(2122, 1057)

-			    terminal_attachment 	(1257, 982)

-			    label      	(object SegLabel @108

-				Parent_View 	@106

-				location   	(1302, 920)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.951826

-				height     	63

-				orientation 	1))

-			(object RoleView "$UNNAMED$32" @109

-			    Parent_View 	@105

-			    location   	(88, -1056)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E95CA66035E"

-			    client     	@105

-			    supplier   	@98

-			    vertices   	(list Points

-				(2122, 1057)

-				(2122, 1998))

-			    line_style 	3

-			    origin_attachment 	(2122, 1057)

-			    terminal_attachment 	(2122, 1998))))))

-	(object ClassDiagram "Env Entries"

-	    quid       	"399825D90228"

-	    title      	"Env Entries"

-	    documentation 	

-|The description type is used by a description element to

-|provide text describing the parent element.  The elements

-|that use this type should include any information that the

-|Deployment Component's Deployment File file producer wants

-|to provide to the consumer of the Deployment Component's

-|Deployment File (i.e., to the Deployer). Typically, the

-|tools used by such a Deployment File consumer will display

-|the description when processing the parent element that

-|contains the description.

-|

-|The lang attribute defines the language that the

-|description is provided in. The default value is "en" (English).

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1863

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::EnvEntryType" @110

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1134, 1928)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@110

-			location   	(971, 1669)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"EnvEntryType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@110

-			location   	(971, 1619)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	323

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38BDD7A60315"

-		    width      	344

-		    height     	642

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @111

-		    location   	(2034, 1896)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@111

-			location   	(1596, 1818)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	840

-			label      	

-|@version J2EE1.3

-|ADDED java.lang.Character to EnvEntryType

-			)

-		    line_color 	32768

-		    fill_color 	13434833

-		    width      	900

-		    height     	169)

-		(object AttachView "" @112

-		    stereotype 	TRUE

-		    line_color 	32768

-		    client     	@111

-		    supplier   	@110

-		    vertices   	(list Points

-			(1583, 1894)

-			(1306, 1894))

-		    line_style 	3

-		    origin_attachment 	(1583, 1894)

-		    terminal_attachment 	(1306, 1894))

-		(object NoteView @113

-		    location   	(940, 944)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@113

-			location   	(380, 872)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	1084

-			label      	

-|Deprecated:

-|description becomes descriptions:List<DescriptionType>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1144

-		    height     	157)

-		(object ClassView "Class" "Logical View::common::Description" @114

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1440, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@114

-			location   	(1312, 1114)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EnvEntry" @115

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 1328)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@115

-			location   	(193, 1154)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	382

-			justify    	0

-			label      	"EnvEntry")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC77800E2"

-		    width      	400

-		    height     	372

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @116

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@113

-		    supplier   	@115

-		    vertices   	(list Points

-			(826, 1022)

-			(584, 1189))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$16" @117

-		    location   	(943, 1268)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C0B37005A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @118

-			    Parent_View 	@117

-			    location   	(478, 10)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @119

-				Parent_View 	@118

-				location   	(1157, 1193)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.612100

-				height     	53

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C0B380084"

-			    client     	@117

-			    supplier   	@114

-			    vertices   	(list Points

-				(943, 1268)

-				(1302, 1229))

-			    line_style 	0

-			    label      	(object SegLabel @120

-				Parent_View 	@118

-				location   	(1229, 1281)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.783837

-				height     	43

-				orientation 	1))

-			(object RoleView "$UNNAMED$17" @121

-			    Parent_View 	@117

-			    location   	(478, 10)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C0B38008E"

-			    client     	@117

-			    supplier   	@115

-			    vertices   	(list Points

-				(943, 1268)

-				(584, 1306))

-			    line_style 	0)))))

-	(object ClassDiagram "New J2EE1.4 Datatypes"

-	    quid       	"3E4BE5610107"

-	    title      	"New J2EE1.4 Datatypes"

-	    documentation 	

-|The ejb-local-refType is used by ejb-local-ref elements for

-|the declaration of a reference to an enterprise bean's local

-|home. The declaration consists of:

-|

-|    - an optional description

-|    - the EJB reference name used in the code of the Deployment

-|      Component that's referencing the enterprise bean

-|    - the expected type of the referenced enterprise bean

-|    - the expected local home and local interfaces of the

-|      referenced enterprise bean

-|    - optional ejb-link information, used to specify the

-|      referenced enterprise bean

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	2724

-	    origin_y   	481

-	    items      	(list diagram_item_list

-		(object Label @122

-		    location   	(1485, 315)

-		    font       	(object Font

-			size       	14

-			face       	"Arial Black"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	2

-		    max_width  	1663

-		    label      	

-|New types and datatypes introduced for J2EE1.4

-|(Corresponds to j2ee_1_4.xsd)

-		    )

-		(object ClassView "Class" "Logical View::common::MessageDestinationUsageType" @123

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2898, 1903)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@123

-			location   	(2595, 1794)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	606

-			justify    	0

-			label      	"MessageDestinationUsageType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@123

-			location   	(2595, 1744)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	606

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3EAED1C200A8"

-		    width      	624

-		    height     	342

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::QName" @124

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 2416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@124

-			location   	(1622, 2260)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"QName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16744703

-		    quidu      	"3F3BEF5D02C0"

-		    width      	710

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestinationRef" @125

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 1888)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@125

-			location   	(1515, 1732)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	906

-			justify    	0

-			label      	"MessageDestinationRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4C1F52028C"

-		    width      	924

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @126

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3202, 646)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@126

-			location   	(3023, 596)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @127

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3424, 1008)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@127

-			location   	(3255, 902)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	338

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    width      	356

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$25" @128

-		    location   	(2745, 1417)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C20210031"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @129

-			    Parent_View 	@128

-			    location   	(603, -777)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @130

-				Parent_View 	@129

-				location   	(3022, 1190)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.606717

-				height     	52

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C202101CC"

-			    client     	@128

-			    supplier   	@127

-			    vertices   	(list Points

-				(2745, 1417)

-				(3245, 1114))

-			    line_style 	0

-			    label      	(object SegLabel @131

-				Parent_View 	@129

-				location   	(3124, 1240)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.711564

-				height     	44

-				orientation 	1))

-			(object RoleView "$UNNAMED$26" @132

-			    Parent_View 	@128

-			    location   	(603, -777)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C202101E0"

-			    client     	@128

-			    supplier   	@125

-			    vertices   	(list Points

-				(2745, 1417)

-				(2242, 1719))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$12" @133

-		    location   	(3295, 798)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4D434D0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$13" @134

-			    Parent_View 	@133

-			    location   	(-133, -747)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @135

-				Parent_View 	@134

-				location   	(3216, 748)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E0152"

-			    client     	@133

-			    supplier   	@126

-			    vertices   	(list Points

-				(3295, 798)

-				(3239, 708))

-			    line_style 	0)

-			(object RoleView "descriptions" @136

-			    Parent_View 	@133

-			    location   	(-133, -747)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @137

-				Parent_View 	@136

-				location   	(3305, 892)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E012A"

-			    client     	@133

-			    supplier   	@127

-			    vertices   	(list Points

-				(3295, 798)

-				(3351, 889))

-			    line_style 	0

-			    label      	(object SegLabel @138

-				Parent_View 	@136

-				location   	(3391, 852)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::ParamValue" @139

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3488, 1536)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@139

-			location   	(3256, 1405)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	464

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4C221202C1"

-		    width      	482

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$29" @140

-		    location   	(3454, 1259)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C22270090"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @141

-			    Parent_View 	@140

-			    location   	(183, -1056)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @142

-				Parent_View 	@141

-				location   	(3317, 1190)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.637579

-				height     	129

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C222703C5"

-			    client     	@140

-			    supplier   	@127

-			    vertices   	(list Points

-				(3454, 1259)

-				(3438, 1126))

-			    line_style 	0

-			    label      	(object SegLabel @143

-				Parent_View 	@141

-				location   	(3494, 1134)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$30" @144

-			    Parent_View 	@140

-			    location   	(183, -1056)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C222703D9"

-			    client     	@140

-			    supplier   	@139

-			    vertices   	(list Points

-				(3454, 1259)

-				(3470, 1392))

-			    line_style 	0)))

-		(object ClassView "Class" "Logical View::common::MessageDestination" @145

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2605, 1134)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@145

-			location   	(2430, 1028)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	350

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4C211001CF"

-		    width      	368

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Listener" @146

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2048, 1088)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@146

-			location   	(1957, 1038)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	182

-			justify    	0

-			label      	"Listener")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16744703

-		    quidu      	"39BFB26001BD"

-		    width      	200

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @147

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 800)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@147

-			location   	(1406, 746)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	246

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @148

-		    location   	(1794, 949)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39C03E6C035A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @149

-			    Parent_View 	@148

-			    location   	(1524, 829)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @150

-				Parent_View 	@149

-				location   	(1937, 980)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02CF"

-			    client     	@148

-			    supplier   	@146

-			    vertices   	(list Points

-				(1794, 949)

-				(1947, 1031))

-			    line_style 	0)

-			(object RoleView "listenerClass" @151

-			    Parent_View 	@148

-			    location   	(1524, 829)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @152

-				Parent_View 	@151

-				location   	(1653, 920)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	275

-				justify    	0

-				label      	"+listenerClass"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02A7"

-			    client     	@148

-			    supplier   	@147

-			    vertices   	(list Points

-				(1794, 949)

-				(1643, 866))

-			    line_style 	0

-			    label      	(object SegLabel @153

-				Parent_View 	@151

-				location   	(1682, 828)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object CategoryView "Logical View::java" @154

-		    location   	(2976, 1440)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@154

-			location   	(2799, 1405)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	354

-			justify    	0

-			label      	"java")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@154

-			location   	(2799, 1355)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"<<metamodel>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549F2C004E"

-		    width      	366

-		    height     	182)

-		(object ClassView "Class" "Logical View::common::CompatibilityDescriptionGroup" @155

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2296, 703)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@155

-			location   	(1950, 547)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"4023ADF20197"

-		    width      	710

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @156

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4023AE8701D8"

-		    client     	@155

-		    supplier   	@126

-		    vertices   	(list Points

-			(2651, 679)

-			(3013, 657))

-		    line_style 	0)

-		(object InheritView "" @157

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4058AE790141"

-		    client     	@146

-		    supplier   	@155

-		    vertices   	(list Points

-			(2087, 1025)

-			(2187, 871))

-		    line_style 	0)

-		(object InheritView "" @158

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E9D5FC6011C"

-		    client     	@145

-		    supplier   	@155

-		    vertices   	(list Points

-			(2519, 1015)

-			(2416, 871))

-		    line_style 	0)))

-	(object ClassDiagram "J2EE1.4 Description Groups"

-	    quid       	"3E4D458003A9"

-	    title      	"J2EE1.4 Description Groups"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	669

-	    items      	(list diagram_item_list

-		(object Label @159

-		    location   	(88, 200)

-		    font       	(object Font

-			size       	14

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"Description Groups")

-		(object Label @160

-		    location   	(103, 334)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	2

-		    max_width  	1281

-		    label      	"An abstract mixin class for commonly used display and description attributes")

-		(object ClassView "Class" "Logical View::common::DisplayName" @161

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2330, 675)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@161

-			location   	(2114, 573)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A9922000E"

-		    width      	450

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::IconType" @162

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(686, 684)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@162

-			location   	(431, 559)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	510

-			justify    	0

-			label      	"IconType")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A99EE003A"

-		    width      	528

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @163

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1569, 672)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@163

-			location   	(1441, 570)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @164

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1401, 1141)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@164

-			location   	(1222, 1091)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$10" @165

-		    location   	(2087, 1150)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D43540133"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNames" @166

-			    Parent_View 	@165

-			    location   	(1735, 574)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @167

-				Parent_View 	@166

-				location   	(2043, 879)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+displayNames"

-				pctDist    	0.818662

-				height     	182

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43550152"

-			    client     	@165

-			    supplier   	@161

-			    vertices   	(list Points

-				(2087, 1150)

-				(2224, 1150)

-				(2224, 789))

-			    line_style 	3

-			    origin_attachment 	(2087, 1150)

-			    terminal_attachment 	(2224, 789)

-			    label      	(object SegLabel @168

-				Parent_View 	@166

-				location   	(2171, 839)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @169

-			    Parent_View 	@165

-			    location   	(1735, 574)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43550166"

-			    client     	@165

-			    supplier   	@164

-			    vertices   	(list Points

-				(2087, 1150)

-				(1589, 1150))

-			    line_style 	3

-			    origin_attachment 	(2087, 1150)

-			    terminal_attachment 	(1589, 1150))))

-		(object AssociationViewNew "$UNNAMED$8" @170

-		    location   	(937, 1083)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D43320152"

-		    roleview_list 	(list RoleViews

-			(object RoleView "icons" @171

-			    Parent_View 	@170

-			    location   	(585, 507)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @172

-				Parent_View 	@171

-				location   	(1049, 844)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+icons"

-				pctDist    	0.913669

-				height     	112

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43350016"

-			    client     	@170

-			    supplier   	@162

-			    vertices   	(list Points

-				(937, 1083)

-				(937, 820))

-			    line_style 	3

-			    origin_attachment 	(937, 1083)

-			    terminal_attachment 	(937, 820)

-			    label      	(object SegLabel @173

-				Parent_View 	@171

-				location   	(864, 843)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.920863

-				height     	74

-				orientation 	0))

-			(object RoleView "$UNNAMED$9" @174

-			    Parent_View 	@170

-			    location   	(585, 507)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4335002A"

-			    client     	@170

-			    supplier   	@164

-			    vertices   	(list Points

-				(937, 1083)

-				(937, 1143)

-				(1213, 1143))

-			    line_style 	3

-			    origin_attachment 	(937, 1083)

-			    terminal_attachment 	(1213, 1143))))

-		(object AssociationViewNew "$UNNAMED$12" @175

-		    location   	(1575, 932)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D434D0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @176

-			    Parent_View 	@175

-			    location   	(1223, 356)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @177

-				Parent_View 	@176

-				location   	(1407, 844)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.608392

-				height     	169

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E012A"

-			    client     	@175

-			    supplier   	@163

-			    vertices   	(list Points

-				(1575, 932)

-				(1575, 786))

-			    line_style 	3

-			    origin_attachment 	(1575, 932)

-			    terminal_attachment 	(1575, 786)

-			    label      	(object SegLabel @178

-				Parent_View 	@176

-				location   	(1522, 802)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$13" @179

-			    Parent_View 	@175

-			    location   	(1223, 356)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E0152"

-			    client     	@175

-			    supplier   	@164

-			    vertices   	(list Points

-				(1575, 932)

-				(1575, 1079))

-			    line_style 	3

-			    origin_attachment 	(1575, 932)

-			    terminal_attachment 	(1575, 1079))))

-		(object ClassView "Class" "Logical View::common::CompatibilityDescriptionGroup" @180

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1426, 1608)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@180

-			location   	(1080, 1452)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16744703

-		    quidu      	"4023ADF20197"

-		    width      	710

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @181

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4023AE8701D8"

-		    client     	@180

-		    supplier   	@164

-		    vertices   	(list Points

-			(1416, 1439)

-			(1404, 1203))

-		    line_style 	0)))

-	(object ClassDiagram "J2EE1.4 JNDI Env Refs Group"

-	    quid       	"3E4D547001BD"

-	    title      	"J2EE1.4 JNDI Env Refs Group"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	1956

-	    origin_y   	2150

-	    items      	(list diagram_item_list

-		(object NoteView @182

-		    location   	(3461, 2107)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@182

-			location   	(3123, 1985)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	640

-			label      	

-|See common "Security" diagram

-|for more details.  This element is now common to more than just the ejb spec.

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	700

-		    height     	256)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @183

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1744, 2816)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@183

-			location   	(1565, 2766)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityIdentity" @184

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2688, 2112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@184

-			location   	(2532, 2066)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	312

-			justify    	0

-			label      	"SecurityIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C040245"

-		    width      	330

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @185

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@182

-		    supplier   	@184

-		    vertices   	(list Points

-			(3110, 2108)

-			(2853, 2110))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wsclient::ServiceRef" @186

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2816, 2624)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@186

-			location   	(2697, 2570)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	238

-			justify    	0

-			label      	"ServiceRef")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D2F560184"

-		    width      	256

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestinationRef" @187

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2848, 2384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@187

-			location   	(2617, 2334)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	462

-			justify    	0

-			label      	"MessageDestinationRef")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C1F52028C"

-		    width      	480

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResourceEnvRef" @188

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2720, 1856)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@188

-			location   	(2557, 1810)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"ResourceEnvRef")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF207200D3"

-		    width      	344

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResourceRef" @189

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2752, 1632)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@189

-			location   	(2619, 1586)

-			nlines     	1

-			max_width  	266

-			justify    	0

-			label      	"ResourceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC79303C6"

-		    width      	284

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EnvEntry" @190

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2736, 1424)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@190

-			location   	(2640, 1378)

-			nlines     	1

-			max_width  	192

-			justify    	0

-			label      	"EnvEntry")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC77800E2"

-		    width      	210

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EJBLocalRef" @191

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2720, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@191

-			location   	(2586, 1170)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	268

-			justify    	0

-			label      	"EJBLocalRef")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398862E20101"

-		    width      	286

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::EjbRef" @192

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2736, 976)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@192

-			location   	(2655, 930)

-			nlines     	1

-			max_width  	162

-			justify    	0

-			label      	"EjbRef")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC78202B3"

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::JNDIEnvRefsGroup" @193

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1744, 2528)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@193

-			location   	(1553, 2478)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	382

-			justify    	0

-			label      	"JNDIEnvRefsGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4D53950349"

-		    width      	400

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @194

-		    location   	(2316, 2587)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D2FA901C9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceRefs" @195

-			    Parent_View 	@194

-			    location   	(1298, 1650)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @196

-				Parent_View 	@195

-				location   	(2532, 2640)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	240

-				justify    	0

-				label      	"+serviceRefs"

-				pctDist    	0.582555

-				height     	53

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2FAA02C5"

-			    client     	@194

-			    supplier   	@186

-			    vertices   	(list Points

-				(2316, 2587)

-				(2688, 2587))

-			    line_style 	3

-			    origin_attachment 	(2316, 2587)

-			    terminal_attachment 	(2688, 2587)

-			    label      	(object SegLabel @197

-				Parent_View 	@195

-				location   	(2650, 2534)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "" @198

-			    Parent_View 	@194

-			    location   	(1298, 1650)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2FAA02CF"

-			    client     	@194

-			    supplier   	@193

-			    vertices   	(list Points

-				(2316, 2587)

-				(1944, 2587))

-			    line_style 	3

-			    origin_attachment 	(2316, 2587)

-			    terminal_attachment 	(1944, 2587))))

-		(object AssociationViewNew "" @199

-		    location   	(2213, 2347)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D23AA024F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinationRefs" @200

-			    Parent_View 	@199

-			    location   	(1195, 1410)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @201

-				Parent_View 	@200

-				location   	(2336, 2295)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	474

-				justify    	0

-				label      	"+messageDestinationRefs"

-				pctDist    	0.314433

-				height     	53

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D23AD01AA"

-			    client     	@199

-			    supplier   	@187

-			    vertices   	(list Points

-				(2213, 2347)

-				(2608, 2347))

-			    line_style 	3

-			    origin_attachment 	(2213, 2347)

-			    terminal_attachment 	(2608, 2347)

-			    label      	(object SegLabel @202

-				Parent_View 	@200

-				location   	(2567, 2401)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "" @203

-			    Parent_View 	@199

-			    location   	(1195, 1410)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D23AD01B4"

-			    client     	@199

-			    supplier   	@193

-			    vertices   	(list Points

-				(2213, 2347)

-				(1936, 2347)

-				(1936, 2466))

-			    line_style 	3

-			    origin_attachment 	(2213, 2347)

-			    terminal_attachment 	(1936, 2466))))

-		(object AssociationViewNew "" @204

-		    location   	(1951, 1850)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF209F00C4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @205

-			    Parent_View 	@204

-			    location   	(1599, 122)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @206

-				Parent_View 	@205

-				location   	(1933, 2330)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF209F0396"

-			    client     	@204

-			    supplier   	@193

-			    vertices   	(list Points

-				(1951, 1850)

-				(1891, 1850)

-				(1891, 2466))

-			    line_style 	3

-			    origin_attachment 	(1951, 1850)

-			    terminal_attachment 	(1891, 2466))

-			(object RoleView "resourceEnvRefs" @207

-			    Parent_View 	@204

-			    location   	(1599, 122)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @208

-				Parent_View 	@207

-				location   	(2368, 1893)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	338

-				justify    	0

-				label      	"+resourceEnvRefs"

-				pctDist    	0.698113

-				height     	43

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF209F0395"

-			    client     	@204

-			    supplier   	@188

-			    vertices   	(list Points

-				(1951, 1850)

-				(2548, 1850))

-			    line_style 	3

-			    origin_attachment 	(1951, 1850)

-			    terminal_attachment 	(2548, 1850)

-			    label      	(object SegLabel @209

-				Parent_View 	@207

-				location   	(2488, 1797)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "" @210

-		    location   	(1857, 1658)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @211

-			Parent_View 	@210

-			location   	(1842, 1694)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			hidden     	TRUE

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	60

-			justify    	0

-			label      	""

-			pctDist    	0.250000

-			height     	36

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230139"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resourceRefs" @212

-			    Parent_View 	@210

-			    location   	(529, 1482)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @213

-				Parent_View 	@212

-				location   	(2473, 1640)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	362

-				justify    	0

-				label      	"+resourceRefs"

-				pctDist    	0.830875

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323013B"

-			    client     	@210

-			    supplier   	@189

-			    vertices   	(list Points

-				(1857, 1658)

-				(1857, 1598)

-				(2610, 1598))

-			    line_style 	3

-			    origin_attachment 	(1857, 1658)

-			    terminal_attachment 	(2610, 1598)

-			    label      	(object SegLabel @214

-				Parent_View 	@212

-				location   	(2559, 1553)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.938053

-				height     	46

-				orientation 	0))

-			(object RoleView "" @215

-			    Parent_View 	@210

-			    location   	(529, 1482)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @216

-				Parent_View 	@215

-				location   	(1916, 2404)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.925020

-				height     	59

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323013A"

-			    client     	@210

-			    supplier   	@193

-			    vertices   	(list Points

-				(1857, 1658)

-				(1857, 2466))

-			    line_style 	3

-			    origin_attachment 	(1857, 1658)

-			    terminal_attachment 	(1857, 2466))))

-		(object AssociationViewNew "" @217

-		    location   	(1796, 1508)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @218

-			Parent_View 	@217

-			location   	(1588, 1544)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			hidden     	TRUE

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	60

-			justify    	0

-			label      	""

-			pctDist    	-2.966667

-			height     	36

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E323012D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "environmentProperties" @219

-			    Parent_View 	@217

-			    location   	(420, 948)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @220

-				Parent_View 	@219

-				location   	(2361, 1448)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	586

-				justify    	0

-				label      	"+environmentProperties"

-				pctDist    	0.718367

-				height     	62

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323012F"

-			    client     	@217

-			    supplier   	@190

-			    vertices   	(list Points

-				(1796, 1508)

-				(1796, 1386)

-				(2631, 1386))

-			    line_style 	3

-			    origin_attachment 	(1796, 1508)

-			    terminal_attachment 	(2631, 1386)

-			    label      	(object SegLabel @221

-				Parent_View 	@219

-				location   	(2540, 1333)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.906040

-				height     	54

-				orientation 	0))

-			(object RoleView "" @222

-			    Parent_View 	@217

-			    location   	(420, 948)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @223

-				Parent_View 	@222

-				location   	(1709, 2400)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.932653

-				height     	88

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323012E"

-			    client     	@217

-			    supplier   	@193

-			    vertices   	(list Points

-				(1796, 1508)

-				(1796, 2465))

-			    line_style 	3

-			    origin_attachment 	(1796, 1508)

-			    terminal_attachment 	(1796, 2465))))

-		(object AssociationViewNew "" @224

-		    location   	(1740, 1411)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398863840172"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbLocalRefs" @225

-			    Parent_View 	@224

-			    location   	(1324, 1075)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @226

-				Parent_View 	@225

-				location   	(2372, 1147)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	270

-				justify    	0

-				label      	"+ejbLocalRefs"

-				pctDist    	0.805630

-				height     	48

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988638502AA"

-			    client     	@224

-			    supplier   	@191

-			    vertices   	(list Points

-				(1740, 1411)

-				(1740, 1194)

-				(2577, 1194))

-			    line_style 	3

-			    origin_attachment 	(1740, 1411)

-			    terminal_attachment 	(2577, 1194)

-			    label      	(object SegLabel @227

-				Parent_View 	@225

-				location   	(2471, 1248)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "" @228

-			    Parent_View 	@224

-			    location   	(1324, 1075)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988638502B4"

-			    client     	@224

-			    supplier   	@193

-			    vertices   	(list Points

-				(1740, 1411)

-				(1740, 2466))

-			    line_style 	3

-			    origin_attachment 	(1740, 1411)

-			    terminal_attachment 	(1740, 2466))))

-		(object AssociationViewNew "" @229

-		    location   	(1677, 1248)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @230

-			Parent_View 	@229

-			location   	(1677, 1189)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			hidden     	TRUE

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	60

-			justify    	0

-			label      	""

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39045AE401F1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbRefs" @231

-			    Parent_View 	@229

-			    location   	(173, 1008)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @232

-				Parent_View 	@231

-				location   	(2437, 977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	226

-				justify    	0

-				label      	"+ejbRefs"

-				pctDist    	0.828194

-				height     	24

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045AE50301"

-			    client     	@229

-			    supplier   	@192

-			    vertices   	(list Points

-				(1677, 1248)

-				(1677, 1000)

-				(2646, 1000))

-			    line_style 	3

-			    origin_attachment 	(1677, 1248)

-			    terminal_attachment 	(2646, 1000)

-			    label      	(object SegLabel @233

-				Parent_View 	@231

-				location   	(2547, 1045)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.919236

-				height     	45

-				orientation 	1))

-			(object RoleView "" @234

-			    Parent_View 	@229

-			    location   	(173, 1008)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @235

-				Parent_View 	@234

-				location   	(1712, 2327)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.886095

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045AE50080"

-			    client     	@229

-			    supplier   	@193

-			    vertices   	(list Points

-				(1677, 1248)

-				(1677, 2465))

-			    line_style 	3

-			    origin_attachment 	(1677, 1248)

-			    terminal_attachment 	(1677, 2465))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.mdl b/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.mdl
deleted file mode 100644
index 21e2bb264..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.mdl
+++ /dev/null
@@ -1,9428 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Design "Logical View"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Java"

-	    name       	"IDE"

-	    value      	"Internal Editor")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagName1"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagText1"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagApply1"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagName2"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagText2"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagApply2"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagName3"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagText3"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagApply3"

-	    value      	""))

-    quid       	"3A0B2474025F"

-    enforceClosureAutoLoad 	FALSE

-    defaults   	(object defaults

-	rightMargin 	0.250000

-	leftMargin 	0.250000

-	topMargin  	0.250000

-	bottomMargin 	0.500000

-	pageOverlap 	0.250000

-	clipIconLabels 	TRUE

-	autoResize 	TRUE

-	snapToGrid 	TRUE

-	gridX      	16

-	gridY      	16

-	defaultFont 	(object Font

-	    size       	10

-	    face       	"Arial"

-	    bold       	FALSE

-	    italics    	FALSE

-	    underline  	FALSE

-	    strike     	FALSE

-	    color      	0

-	    default_color 	TRUE)

-	showMessageNum 	1

-	showClassOfObject 	TRUE

-	notation   	"Unified")

-    root_usecase_package 	(object Class_Category "Use Case View"

-	quid       	"3A0B2474026A"

-	exportControl 	"Public"

-	global     	TRUE

-	logical_models 	(list unit_reference_list)

-	logical_presentations 	(list unit_reference_list

-	    (object UseCaseDiagram "Main"

-		quid       	"3A0B24790339"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    root_category 	(object Class_Category "Logical View"

-	quid       	"3A0B24740269"

-	exportControl 	"Public"

-	global     	TRUE

-	subsystem  	"Component View"

-	quidu      	"3A0B2474027D"

-	logical_models 	(list unit_reference_list

-	    (object Class_Category "ecore"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"

-		quid       	"39A5ED04004E")

-	    (object Class_Category "application"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\application.cat"

-		quid       	"38C03008014E")

-	    (object Class_Category "client"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\client.cat"

-		quid       	"38C0280700C0")

-	    (object Class_Category "ejb"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\ejbschema.cat"

-		quid       	"3780E272032D")

-	    (object Class_Category "webapplication"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webapplication.cat"

-		quid       	"38C076D603DD")

-	    (object Class_Category "commonArchiveCore"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\commonArchiveCore.cat"

-		quid       	"3A0DB68B0046")

-	    (object Class_Category "java"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jem\\rose\\edocjava2.cat"

-		quid       	"36549F2C004E")

-	    (object Class_Category "common"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\common.cat"

-		quid       	"38C08F0F038D")

-	    (object Class_Category "jca"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jca1_0.cat"

-		quid       	"3C60904200BB")

-	    (object Class_Category "wsclient"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webservices_client_1_0.cat"

-		quid       	"3E4D2F4B02AA")

-	    (object Class_Category "jsp"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jsp_2_0.cat"

-		quid       	"3E4D4F69036B"))

-	logical_presentations 	(list unit_reference_list

-	    (object ClassDiagram "Main"

-		quid       	"3A0B24790360"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	650

-		origin_y   	0

-		items      	(list diagram_item_list

-		    (object CategoryView "Logical View::ecore" @1

-			location   	(1104, 160)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@1

-			    location   	(960, 76)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"ecore")

-			icon_style 	"Label"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"39A5ED04004E"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::application" @2

-			location   	(1904, 816)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@2

-			    location   	(1760, 732)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"application")

-			icon_style 	"Label"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C03008014E"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::client" @3

-			location   	(2368, 1104)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@3

-			    location   	(2224, 1020)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"client")

-			icon_style 	"Label"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C0280700C0"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::ejb" @4

-			location   	(752, 848)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@4

-			    location   	(598, 813)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	308

-			    justify    	0

-			    label      	"ejb")

-			stereotype 	(object ItemLabel

-			    Parent_View 	@4

-			    location   	(598, 763)

-			    fill_color 	13434879

-			    anchor     	10

-			    nlines     	1

-			    max_width  	308

-			    justify    	0

-			    label      	"<<metamodel>>")

-			icon_style 	"Label"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3780E272032D"

-			width      	320

-			height     	182)

-		    (object CategoryView "Logical View::webapplication" @5

-			location   	(1216, 880)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@5

-			    location   	(1072, 796)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"webapplication")

-			icon_style 	"Label"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C076D603DD"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::java" @6

-			location   	(640, 416)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@6

-			    location   	(486, 381)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	308

-			    justify    	0

-			    label      	"java")

-			stereotype 	(object ItemLabel

-			    Parent_View 	@6

-			    location   	(486, 331)

-			    fill_color 	13434879

-			    anchor     	10

-			    nlines     	1

-			    max_width  	308

-			    justify    	0

-			    label      	"<<metamodel>>")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"36549F2C004E"

-			width      	320

-			height     	182)

-		    (object ImportView "" @7

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			stereotype 	TRUE

-			line_color 	3342489

-			quidu      	"39BD366000FE"

-			client     	@6

-			supplier   	@1

-			vertices   	(list Points

-			    (768, 270)

-			    (768, 159)

-			    (953, 159))

-			line_style 	3

-			origin_attachment 	(768, 270)

-			terminal_attachment 	(953, 159))

-		    (object CategoryView "Logical View::common" @8

-			location   	(1200, 432)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@8

-			    location   	(1056, 348)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"common")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C08F0F038D"

-			width      	300

-			height     	180)

-		    (object ImportView "" @9

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			stereotype 	TRUE

-			line_color 	3342489

-			quidu      	"38FF3C150151"

-			client     	@5

-			supplier   	@8

-			vertices   	(list Points

-			    (1210, 735)

-			    (1203, 522))

-			line_style 	0)

-		    (object ImportView "" @10

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			stereotype 	TRUE

-			line_color 	3342489

-			quidu      	"38FF3C1002A8"

-			client     	@2

-			supplier   	@8

-			vertices   	(list Points

-			    (1756, 671)

-			    (1756, 513)

-			    (1350, 513))

-			line_style 	3

-			origin_attachment 	(1756, 671)

-			terminal_attachment 	(1350, 513))

-		    (object ImportView "" @11

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			stereotype 	TRUE

-			line_color 	3342489

-			quidu      	"380567F50384"

-			client     	@4

-			supplier   	@6

-			vertices   	(list Points

-			    (752, 702)

-			    (752, 507))

-			line_style 	3

-			origin_attachment 	(752, 702)

-			terminal_attachment 	(752, 507))

-		    (object ImportView "" @12

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			stereotype 	TRUE

-			line_color 	3342489

-			quidu      	"38FF3C1C0256"

-			client     	@4

-			supplier   	@8

-			vertices   	(list Points

-			    (863, 702)

-			    (863, 406)

-			    (1049, 406))

-			line_style 	3

-			origin_attachment 	(863, 702)

-			terminal_attachment 	(1049, 406))

-		    (object CategoryView "Logical View::jca" @13

-			location   	(1680, 192)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@13

-			    location   	(1536, 108)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"jca")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3C60904200BB"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::commonArchiveCore::looseconfig" @14

-			location   	(1744, 1152)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@14

-			    location   	(1500, 1068)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	488

-			    justify    	0

-			    label      	"looseconfig")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3C71147E033D"

-			width      	500

-			height     	180)

-		    (object CategoryView "Logical View::wsclient" @15

-			location   	(2048, 336)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@15

-			    location   	(1904, 252)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"wsclient")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3E4D2F4B02AA"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::jsp" @16

-			location   	(2448, 336)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@16

-			    location   	(2304, 252)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"jsp")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3E4D4F69036B"

-			width      	300

-			height     	180)

-		    (object ImportView "" @17

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			stereotype 	TRUE

-			line_color 	3342489

-			quidu      	"38FF3C180336"

-			client     	@3

-			supplier   	@8

-			vertices   	(list Points

-			    (2219, 959)

-			    (2219, 462)

-			    (1350, 462))

-			line_style 	3

-			origin_attachment 	(2219, 959)

-			terminal_attachment 	(1350, 462))

-		    (object CategoryView "Logical View::commonArchiveCore" @18

-			location   	(1072, 1184)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@18

-			    location   	(928, 1100)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"commonArchiveCore")

-			icon_style 	"Label"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3A0DB68B0046"

-			width      	300

-			height     	180)))))

-    root_subsystem 	(object SubSystem "Component View"

-	quid       	"3A0B2474027D"

-	physical_models 	(list unit_reference_list)

-	physical_presentations 	(list unit_reference_list

-	    (object Module_Diagram "Main"

-		quid       	"3A0B24790338"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list)))

-	category   	"Logical View"

-	quidu      	"430A8774022C")

-    process_structure 	(object Processes

-	quid       	"3A0B2474027E"

-	ProcsNDevs 	(list

-	    (object Process_Diagram "Deployment View"

-		quid       	"3A0B24740291"

-		title      	"Deployment View"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    properties 	(object Properties

-	attributes 	(list Attribute_Set

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"roseId"

-		value      	"753117540")

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnique"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isResolveProxies"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Const"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialValue"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Copyright"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RootPackage"

-			value      	"C++ Reverse Engineered")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialHeaderIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialBodyIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngRootDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngDirectoriesAsPackages"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderFileExtension"

-			value      	".h")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationFileExtension"

-			value      	".cpp")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewHeaderFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewImplementationFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalization"

-			value      	("FileCapitalizationSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectories"

-			value      	("CodeGenExtraDirectoriesSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"StripClassPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"TabWidth"

-			value      	8)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IndentWidth"

-			value      	4)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"AccessIndentation"

-			value      	-2)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRules"

-			value      	("ModelIdCommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"PageWidth"

-			value      	80)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassMemberOrder"

-			value      	("MemberOrderSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"OneParameterPerLine"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NamespaceBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FunctionBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectoriesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Namespaces"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Packages"

-				value      	2)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalizationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Same as model"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Upper case"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case with underscores"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BraceStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B1"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B2"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B3"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B4"

-				value      	4)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B5"

-				value      	5)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"MemberOrderSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Public First"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Private First"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Order by kind"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Unordered"

-				value      	4)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation and reverse engineering"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never generate model IDs"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CreateBackupFiles"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRules"

-			value      	("CommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Always synchronize"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Reverse engineering only"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never synchronize"

-				value      	4)))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialCodeBody"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"GenerateFunctionBody"

-			value      	("GenerateFunctionBodySet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"GenerateFunctionBodySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Default"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"False"

-				value      	0)))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderSourceFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BodySourceFile"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IsNamespace"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSI C++ Event Watcher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSIConvert"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"$ROSEADA83_SOURCE")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultCodeBody"

-			value      	"[statement]")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassAccess"

-			value      	("ImplementationSet" 43))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationType"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"PolymorphicUnit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleAccess"

-			value      	("ImplementationSet" 45))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Discriminant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsTask"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"LimitedPrivate"

-				value      	200)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ConstructorKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubunit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Spec"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Renaming"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Separate"

-				value      	4)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"FunctionReturn"

-				value      	206)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialCodeBody"

-			value      	"${default}")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"After"

-				value      	234)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"After"

-				value      	234)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseColonNotation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"$ROSEADA95_SOURCE")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultCodeBody"

-			value      	"[statement]")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibility"

-			value      	("TypeVisibilitySet" 43))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementation"

-			value      	("TypeImplementationSet" 208))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControl"

-			value      	("TypeControlSet" 225))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlName"

-			value      	"Controlled_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementation"

-			value      	("RecordImplementationSet" 209))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordKindPackageName"

-			value      	"${class}_Record_Kinds")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsLimited"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessType"

-			value      	("GenerateAccessTypeSet" 230))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeVisibility"

-			value      	("TypeVisibilitySet" 45))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessClassWide"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"MaybeAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementation"

-			value      	("ParameterizedImplementationSet" 11))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParentClassName"

-			value      	"Superclass")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfTypeName"

-			value      	"Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfTypeName"

-			value      	"Access_Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfAccessTypeName"

-			value      	"Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfAccessTypeName"

-			value      	"Access_Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayIndexDefinition"

-			value      	"Positive range <>")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDefaultConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateCopyConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDestructor"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateTypeEquality"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeEqualityName"

-			value      	(value Text 

-|"="

-			))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Tagged"

-				value      	208)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Record"

-				value      	210)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Mixin"

-				value      	211)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Task"

-				value      	212)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"SingleType"

-				value      	209)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"MultipleTypes"

-				value      	213)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Unconstrained"

-				value      	214)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Private"

-				value      	43)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"None"

-				value      	225)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InitializationOnly"

-				value      	226)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AssignmentFinalizationOnly"

-				value      	227)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"All"

-				value      	228)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Always"

-				value      	229)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Auto"

-				value      	230)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IncompleteType"

-			value      	("IncompleteTypeSet" 1))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlVisibility"

-			value      	("TypeVisibilitySet" 43))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IncompleteTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotDeclare"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"NoDiscriminantPart"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"UnknownDiscriminantPart"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"KnownDiscriminantPart"

-				value      	4)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IndefiniteType"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsPrivate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubunit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateOverriding"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryBarrierCondition"

-			value      	"True")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Spec"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Abstract"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Renaming"

-				value      	4)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"RenamingAsBody"

-				value      	5)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Separate"

-				value      	6)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Access"

-				value      	220)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialCodeBody"

-			value      	"${default}")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessDiscriminantClassWide"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessDiscriminantClassWide"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessDiscriminantClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IncludePath"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"WindowsShell"

-				value      	101)))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"PathSeparator"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ConstValue"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ImplementationType"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Context"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"OperationIsOneWay"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"BoundedRoleType"

-			value      	("AssocTypeSet" 47))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"project"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SPPackageCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedureCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedurePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ViewCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"JoinCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"cONTAINERCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ViewPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpacePrefix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDatabase"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TargetDatabase"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Location"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTableSpace"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeault"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"BufferPool"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExtentSize"

-			value      	1)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrefetchSize"

-			value      	1)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PageSize"

-			value      	4)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ManagedBy"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ContainerList"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmSchema"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmDomainPackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchemaPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DatabaseID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DBMS"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsView"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomain"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSPPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Synonymns"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpace"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SelectClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdatable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckOption"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PersistToServer"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CorrelationName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSnapShot"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDistinct"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsPackage"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIdentity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"NullsAllowed"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ColumnType"

-			value      	"Native")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OID"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRelationship"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RIMethod"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrict"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrictName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicityName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsConstraint"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTrigger"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsStoredProcedure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsCluster"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpace"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"FillFactor"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"KeyList"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckPredicate"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DeferalMode"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"InitialCheckTime"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInsertEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeleteEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRow"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"WhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Language"

-			value      	"SQL")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ProcType"

-			value      	"Procedure")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeterministic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParameterStyle"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ReturnedNull"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExternalName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Parameter"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsOutParameter"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OperationID"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler Communicator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"framework"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Java"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"RootDir"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UsePrefixes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ShowCodegenDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultAuthor"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultSince"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocNumAsterisks"

-			value      	0)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MaxNumChars"

-			value      	80)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VM"

-			value      	("VMType" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassPath"

-			value      	";D:\\j2sdk1.4.2_08\\jre\\lib\\charsets.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\jce.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\jsse.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\rt.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\sunrsasign.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\dnsns.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\ldapsec.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\localedata.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\sunjce_provider.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\security\\local_policy.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\security\\US_export_policy.jar;D:\\j2sdk1.4.2_08\\lib\\dt.jar;D:\\j2sdk1.4.2_08\\lib\\htmlconverter.jar;D:\\j2sdk1.4.2_08\\lib\\tools.jar")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"Java"

-				name       	"WindowsShell"

-				value      	101)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VMType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Sun"

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Microsoft"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"IBM"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"InstanceVariablePrefix"

-			value      	"m_")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassVariablePrefix"

-			value      	"s_")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultAttributeDataType"

-			value      	"int")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultOperationReturnType"

-			value      	"void")

-		    (object Attribute

-			tool       	"Java"

-			name       	"NoClassCustomDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GlobalImports"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceClassStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceMethodStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseSpaces"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SpacingItems"

-			value      	3)

-		    (object Attribute

-			tool       	"Java"

-			name       	"RoseDefaultCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AsteriskCommentStyle"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavaCommentStyle"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocAuthor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocSince"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"NotShowRoseIDDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateRoseID"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultReturnLine"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagName1"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagApply1"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagText1"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagName2"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagApply2"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagText2"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagName3"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagApply3"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineTagText3"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReferenceClasspath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"VAJavaWorkingFolder"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"RemotePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"RemoteSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"HomePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"HomeSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"PrimaryKeySuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBDTDLocation"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDTDLocation"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultEJBVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultServletVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultJ2EEJavadoc"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineJavaDocTags"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalHomePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalHomeSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"SourceControl"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCSelected"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCProjectSourceRoot"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCProjectName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCComment"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"FundamentalType"

-			value      	"boolean; char; byte; short; int; long; float; double; Boolean; Byte; Character; Double; Float; Integer; Long; Object; Short; String; StringBuffer; Void; java.math.BigDecimal; java.math.BigInteger; java.sql.Date; java.sql.Time; java.sql.Timestamp; java.util.AbstractCollection; java.util.AbstractList;java.util.AbstractMap; java.util.AbstractSequentialList; java.util.AbstractSet; java.util.ArrayList; java.util.Arrays; java.util.BitSet; java.util.Calendar; java.util.Collections; java.util.Date; java.util.Date; java.util.Dictionary; java.util.EventObject; java.util.GregorianCalendar; java.util.HashMap; java.util.HashSet; java.util.Hashtable; java.util.LinkedList; java.util.ListResourceBundle; java.util.Locale; java.util.Observable; java.util.Properties; java.util.PropertyPermission; java.util.PropertyResourceBundle; java.util.Random; java.util.ResourceBundle; java.util.SimpleTimeZone; java.util.Stack; java.util.StringTokenizer; java.util.Timer; java.util.TimerTask; java.util.TimeZone; java.util.TreeMap; java.util.TreeSet; java.util.Vector; java.util.WeakHashMap")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion"

-			value      	("EJBVersion_Set" 230))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"2.0"

-				value      	230)

-			    (object Attribute

-				tool       	"Java"

-				name       	"1.x"

-				value      	231)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BMP_Extend_CMP"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion"

-			value      	("EJBVersion_Set" 230))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"2.0"

-				value      	230)

-			    (object Attribute

-				tool       	"Java"

-				name       	"1.x"

-				value      	231)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BMP_Extend_CMP"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Http_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion"

-			value      	("EJBVersion_Set" 230))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"2.0"

-				value      	230)

-			    (object Attribute

-				tool       	"Java"

-				name       	"1.x"

-				value      	231)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BMP_Extend_CMP"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_EJB__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"BMP_Extend_CMP"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion"

-			value      	("EJBVersion_Set" 230))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"2.0"

-				value      	230)

-			    (object Attribute

-				tool       	"Java"

-				name       	"1.x"

-				value      	231)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBXMLFilePath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Abstract"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Native"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Synchronized"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedReturn"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReplaceExistingCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsNavigable"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"propertyId"

-		value      	"360000002")

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DDLScriptFilename"

-			value      	"DDL1.SQL")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DropClause"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnName"

-			value      	"_ID")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnType"

-			value      	"NUMBER(5,0)")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNameSuffix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSchema"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"WhereClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeLength"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypePrecision"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeScale"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionOfREFS"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKind"

-			value      	("MethodKindSet" 1903))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OverloadID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSelfish"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerType"

-			value      	("TriggerTypeSet" 1801))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEvent"

-			value      	("TriggerEventSet" 1601))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerText"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerReferencingNames"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEach"

-			value      	("TriggerForEachSet" 1701))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerWhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"MapMethod"

-				value      	1901)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"OrderMethod"

-				value      	1902)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Function"

-				value      	1903)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Procedure"

-				value      	1904)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Operator"

-				value      	1905)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Constructor"

-				value      	1906)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Destructor"

-				value      	1907)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Trigger"

-				value      	1908)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Calculated"

-				value      	1909)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"AFTER"

-				value      	1801)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"BEFORE"

-				value      	1802)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSTEAD OF"

-				value      	1803)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEachSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"ROW"

-				value      	1701)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"STATEMENT"

-				value      	1702)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEventSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT"

-				value      	1601)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE"

-				value      	1602)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"DELETE"

-				value      	1603)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE"

-				value      	1604)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR DELETE"

-				value      	1605)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE OR DELETE"

-				value      	1606)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE OR DELETE"

-				value      	1607)))))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NullsAllowed"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Precision"

-			value      	"2")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Scale"

-			value      	"6")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsPrimaryKey"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CompositeUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"R2Editor"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ComponentTest"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"cg"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"UseMSVC"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"compiler2.1__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"UseMSVC"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CommentWidth"

-			value      	60)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"compiler3.0__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"UseMSVC"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CommentWidth"

-			value      	60)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ClassKey"

-			value      	"class")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"PutBodiesInSpec"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDefaultConstructor"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DefaultConstructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExplicitDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateCopyConstructor"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyConstructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExplicitCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDestructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DestructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DestructorKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssignmentOperation"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssignmentVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssignmentKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssignmentOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEqualityOperations"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"EqualityVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"EqualityKind"

-			value      	("FriendKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineEqualityOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateRelationalOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"RelationalVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"RelationalKind"

-			value      	("FriendKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineRelationalOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateStorageMgmtOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StorageMgmtVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineStorageMgmtOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSubscriptOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSubscriptOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDereferenceOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDereferenceOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateIndirectionOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineIndirectionOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateStreamOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StreamVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineStreamOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ThreeKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"KindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FriendKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"DeclareAndDefine"

-				value      	199)

-			    (object Attribute

-				tool       	"cg"

-				name       	"DeclareOnly"

-				value      	205)

-			    (object Attribute

-				tool       	"cg"

-				name       	"DoNotDeclare"

-				value      	206)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"VisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExtensionlessFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeFormat"

-			value      	(value Text 

-|// $package

-|#include "$file"

-|

-			))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludePrecompiledHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeOrder"

-			value      	"AMIR")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyle"

-			value      	("InliningStyleSet" 207))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"InClassDeclaration"

-				value      	208)

-			    (object Attribute

-				tool       	"cg"

-				name       	"FollowingClassDeclaration"

-				value      	207)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"TypesDefined"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeClosure"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExtensionlessFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeFormat"

-			value      	(value Text 

-|// $package

-|#include "$file"

-|

-			))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludePrecompiledHeader"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeOrder"

-			value      	"AMIR")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyle"

-			value      	("InliningStyleSet" 207))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"InClassDeclaration"

-				value      	208)

-			    (object Attribute

-				tool       	"cg"

-				name       	"FollowingClassDeclaration"

-				value      	207)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"TypesDefined"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeClosure"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationKind"

-			value      	("OperationKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAbstractBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SpecialDeclReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationIsConst"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationIsExplicit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CCRegion"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"BodyAnnotations"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateFriendBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateFriendDecl"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"Ordered"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$supplier")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HasRelTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$targetClass")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"InstanceArguments"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerGet"

-			value      	"$data.get($keys)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerSet"

-			value      	"$data.set($keys,$value)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedContainer"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassContainer"

-			value      	"$supplier *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassInitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetSetByReference"

-			value      	("QualifiedGetSetByReferenceSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetSetByReferenceSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_GetSetByReference"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateQualifiedGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineQualifiedGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateQualifiedSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedSetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedSetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineQualifiedSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberName"

-			value      	"$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssocClassGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassSetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassSetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssocClassSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassForwardReferenceOnly"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtAttributeVisibility"

-				value      	211)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CCRegion"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"BodyReferenceOnly"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DirectoryIsOnSearchList"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"PrecompiledHeader"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"IsNamespace"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Indent"

-			value      	2)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Version"

-			value      	"5.0")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCClassTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCClassTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Interface_Part"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Connection_Part"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Class_Factory"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CObjectFunctionality"

-			value      	("CObjectFunctionalitySet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CObjectFunctionalitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dynamic"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dyncreate"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Serial"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOverrideGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDataGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DATA_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateFieldGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_FIELD_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMessageGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMessageMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MESSAGE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEFactory"

-			value      	("OLEFactorySet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEFactorySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Built_in"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Simple"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Licensed"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEName"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEClassID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOLECtlType"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLECtlType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOLETypeLib"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibMajor"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibMinor"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GeneratePropPageIDs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEPropPageIDs"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDispatchMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockProperties"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockFunctions"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DispatchDefValue"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDispIdEnum"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISP_ID_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInterfaceMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"INTERFACE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"InitInterface"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateEventMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockEvents"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateEventSinkMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PropNotifySinks"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateConnectionMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CONNECTION_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"ConnectionPointIID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"InheritanceType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLECommands"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MFCDeclares"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MFCImplements"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"ATL_Declares"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateCOMMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"COM_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateConnectionPointMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CONNECTION_POINT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMsgMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GeneratePropertyMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PROPERTY_MAP_Entries"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCOperationTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCOperationTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Virtual_Override"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Message_Handler"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dispatch_Handler"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Event_Firing_Function"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Event_Sink_Handler"

-				value      	5)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Std_OLE_Method"

-				value      	6)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Command_Parser"

-				value      	7)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Get_Function"

-				value      	8)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Set_Function"

-				value      	9)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Notify_Function"

-				value      	10)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Macro_Generated_Function"

-				value      	11)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MESSAGE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"BodyImage"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateIncludesGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_INCLUDES_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInsertLocation"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateIncludesGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_INCLUDES_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInsertLocation"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Model Integrator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Web Publisher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"COM"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"TypeKinds"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"COM"

-				name       	"enum"

-				value      	100)

-			    (object Attribute

-				tool       	"COM"

-				name       	"record"

-				value      	101)

-			    (object Attribute

-				tool       	"COM"

-				name       	"module"

-				value      	102)

-			    (object Attribute

-				tool       	"COM"

-				name       	"interface"

-				value      	103)

-			    (object Attribute

-				tool       	"COM"

-				name       	"dispinterface"

-				value      	104)

-			    (object Attribute

-				tool       	"COM"

-				name       	"coclass"

-				value      	105)

-			    (object Attribute

-				tool       	"COM"

-				name       	"alias"

-				value      	106)

-			    (object Attribute

-				tool       	"COM"

-				name       	"union"

-				value      	107)

-			    (object Attribute

-				tool       	"COM"

-				name       	"max"

-				value      	108)

-			    (object Attribute

-				tool       	"COM"

-				name       	"(none)"

-				value      	109)))

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"kind"

-			value      	("TypeKinds" 109))

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"dllname"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"alias"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"filename"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"library"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpfile"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"lcid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Version Control"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"InstancingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Private"

-				value      	221)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"PublicNotCreatable"

-				value      	213)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"SingleUse"

-				value      	214)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalSingleUse"

-				value      	215)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"MultiUse"

-				value      	219)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalMultiUse"

-				value      	220)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"BaseSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	222)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"0"

-				value      	223)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"1"

-				value      	224)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionBase"

-			value      	("BaseSet" 222))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionExplicit"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionCompare"

-			value      	("CompareSet" 202))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Instancing"

-			value      	("InstancingSet" 219))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"CompareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	202)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Binary"

-				value      	203)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Text"

-				value      	204)))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"LibraryName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"AliasName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"IsStatic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ReplaceExistingBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"DefaultBody"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImplementsDelegation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByVal"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Optional"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ParamArray"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProjectFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportReferences"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"QuickImport"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportBinary"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"VisualStudio"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Web Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"WindowsShell"

-				value      	101)))))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_PublicID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"NotationValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"InternalValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ParameterEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ExternalEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_PublicID"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"DefaultDeclType"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Assign All"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ComponentPath"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ClearCase"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"RequisitePro"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"SoDA"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"TopLink"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngRootDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RootPackage"

-			value      	"C++ Reverse Engineered")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngDirectoriesAsPackages"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderFileExtension"

-			value      	".h")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationFileExtension"

-			value      	".cpp")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewHeaderFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewImplementationFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalization"

-			value      	("FileCapitalizationSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectories"

-			value      	("CodeGenExtraDirectoriesSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"StripClassPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"TabWidth"

-			value      	8)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IndentWidth"

-			value      	4)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"AccessIndentation"

-			value      	-2)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRules"

-			value      	("ModelIdCommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"PageWidth"

-			value      	80)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassMemberOrder"

-			value      	("MemberOrderSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"OneParameterPerLine"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NamespaceBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FunctionBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Copyright"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialHeaderIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialBodyIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectoriesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Namespaces"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Packages"

-				value      	2)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalizationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Same as model"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Upper case"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case with underscores"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BraceStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B1"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B2"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B3"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B4"

-				value      	4)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B5"

-				value      	5)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"MemberOrderSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Public First"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Private First"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Order by kind"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Unordered"

-				value      	4)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation and reverse engineering"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never generate model IDs"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CreateBackupFiles"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRules"

-			value      	("CommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Always synchronize"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Reverse engineering only"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never synchronize"

-				value      	4)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Mode"

-			value      	("ParameterModeSet" 232))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Default"

-				value      	232)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"InOut"

-				value      	203)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormal"

-			value      	("GenericFormalSet" 1))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociationMapping"

-			value      	("AssociationMappingSet" 1))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormalSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Default"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Object"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Type"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	4)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	5)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociationMappingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Name"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Type"

-				value      	2)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Mode"

-			value      	("ParameterModeSet" 232))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Default"

-				value      	232)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Access"

-				value      	220)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormal"

-			value      	("GenericFormalSet" 1))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociationMapping"

-			value      	("AssociationMappingSet" 1))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormalSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Default"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Object"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Type"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	4)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	5)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Package"

-				value      	6)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociationMappingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Name"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Type"

-				value      	2)))))

-	    (object Attribute

-		tool       	"Deploy"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BodyReferenceOnly"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Direction"

-			value      	("ParamDirectionTypeSet" 102))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ParamDirectionTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"in"

-				value      	102)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"inout"

-				value      	103)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"out"

-				value      	104))))))

-	quid       	"3A0B2474027F"))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchiveCore.cat b/plugins/org.eclipse.jst.j2ee.core/rose/commonArchiveCore.cat
deleted file mode 100644
index 45e9d1576..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchiveCore.cat
+++ /dev/null
@@ -1,4616 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "commonArchiveCore"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Commonarchive"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "commonarchive.xmi")))

-    quid       	"3A0DB68B0046"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    quid       	"3F2E8236025A"

-	    supplier   	"Logical View::ejbext"

-	    quidu      	"39AA86660190")

-	(object Visibility_Relationship

-	    quid       	"3F2E8236025B"

-	    supplier   	"Logical View::webappext"

-	    quidu      	"39B534FD024C")

-	(object Visibility_Relationship

-	    quid       	"3F2E8236025C"

-	    supplier   	"Logical View::ejbbnd"

-	    quidu      	"39B960FC03CA")

-	(object Visibility_Relationship

-	    quid       	"3F2E82360264"

-	    supplier   	"Logical View::webappbnd"

-	    quidu      	"39B961060107")

-	(object Visibility_Relationship

-	    quid       	"3F2E82360265"

-	    supplier   	"Logical View::clientbnd"

-	    quidu      	"39B9614F031F")

-	(object Visibility_Relationship

-	    quid       	"3F2E82360266"

-	    supplier   	"Logical View::applicationext"

-	    quidu      	"3A22E6080303")

-	(object Visibility_Relationship

-	    quid       	"3F2E82360267"

-	    supplier   	"Logical View::applicationbnd"

-	    quidu      	"39B9611502A4")

-	(object Visibility_Relationship

-	    quid       	"3F2E82360268"

-	    supplier   	"Logical View::j2cbnd"

-	    quidu      	"39B9632E038C"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "File"

-	    quid       	"3A0DB75B00E5"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "URI"

-		    quid       	"3A1012D900AA"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "lastModified"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3A1013300163"

-		    type       	"long"

-		    exportControl 	"Public")

-		(object ClassAttribute "size"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3A101339008A"

-		    type       	"long"

-		    exportControl 	"Public")

-		(object ClassAttribute "directoryEntry"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3A3150640092"

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "originalURI"

-		    attributes 	(list Attribute_Set)

-		    quid       	"3A423640032C"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Archive"

-	    quid       	"3A0DB75F0177"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A54BF5D018C"

-		    supplier   	"Logical View::commonArchiveCore::Container"

-		    quidu      	"3A54BE55016E"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "types"

-		    quid       	"3FA17B530039"

-		    stereotype 	"0...*"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "EJBJarFile"

-	    quid       	"3A0DBB250022"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A0DC27D03BE"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136"))

-	    language   	"Java")

-	(object Class "WARFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3A0DBB49018C"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A0DC29003E4"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136"))

-	    language   	"Java")

-	(object Class "EARFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3A0DBB79007D"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A36452000DE"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136"))

-	    language   	"Java")

-	(object Class "ApplicationClientFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3A0DBB810128"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A0DC2790214"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136"))

-	    language   	"Java")

-	(object Class "ModuleFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3A0DC1230136"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A0DC2CE00AE"

-		    supplier   	"Logical View::commonArchiveCore::Archive"

-		    quidu      	"3A0DB75F0177"))

-	    language   	"Java"

-	    abstract   	TRUE)

-	(object Class "Container"

-	    quid       	"3A54BE55016E"

-	    stereotype 	"abstract"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A54C16801FC"

-		    supplier   	"Logical View::commonArchiveCore::File"

-		    quidu      	"3A0DB75B00E5"))

-	    abstract   	TRUE)

-	(object Class "ReadOnlyDirectory"

-	    quid       	"3A54BEB0004D"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A54BF750295"

-		    supplier   	"Logical View::commonArchiveCore::Container"

-		    quidu      	"3A54BE55016E")))

-	(object Class "RARFile"

-	    quid       	"3A6DEBCF03C5"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A6DEBE701CB"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136")))

-	(object Class "ModuleRef"

-	    quid       	"3C711E300115"

-	    abstract   	TRUE)

-	(object Class "EJBModuleRef"

-	    quid       	"3C7125A802A5"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3C712A1D0165"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115")))

-	(object Class "WebModuleRef"

-	    quid       	"3C7125B10293"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3C712A2001EB"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115")))

-	(object Class "ClientModuleRef"

-	    quid       	"3C7125B90259"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3C712A23031C"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115")))

-	(object Class "ConnectorModuleRef"

-	    quid       	"3C7125C600E5"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3C712A2B025F"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3A0DC23C0270"

-	    roles      	(list role_list

-		(object Role "/moduleFiles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"3A0DC23D014F"

-		    label      	"/moduleFiles"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "earFile"

-		    quid       	"3A0DC23D02FE"

-		    label      	"earFile"

-		    supplier   	"Logical View::commonArchiveCore::EARFile"

-		    quidu      	"3A0DBB79007D"

-		    client_cardinality 	(value cardinality "0..1"))))

-	(object Association "$UNNAMED$1"

-	    quid       	"3A3A953E00A9"

-	    roles      	(list role_list

-		(object Role "loadingContainer"

-		    quid       	"3A3A953F0082"

-		    label      	"loadingContainer"

-		    supplier   	"Logical View::commonArchiveCore::Container"

-		    quidu      	"3A54BE55016E"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$2"

-		    quid       	"3A3A953F00AA"

-		    supplier   	"Logical View::commonArchiveCore::File"

-		    quidu      	"3A0DB75B00E5")))

-	(object Association "$UNNAMED$3"

-	    quid       	"3A54BF4E0022"

-	    roles      	(list role_list

-		(object Role "container"

-		    quid       	"3A54BF4E0023"

-		    label      	"container"

-		    supplier   	"Logical View::commonArchiveCore::Container"

-		    quidu      	"3A54BE55016E"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "files"

-		    quid       	"3A54BF4E0024"

-		    label      	"files"

-		    supplier   	"Logical View::commonArchiveCore::File"

-		    quidu      	"3A0DB75B00E5"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3C711EF902F4"

-	    roles      	(list role_list

-		(object Role "moduleFile"

-		    quid       	"3C711EFA024C"

-		    label      	"moduleFile"

-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"

-		    quidu      	"3A0DC1230136"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3C711EFA024E"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"3C712223019B"

-	    roles      	(list role_list

-		(object Role "moduleRefs"

-		    quid       	"3C7122240246"

-		    label      	"moduleRefs"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "earFile"

-		    quid       	"3C7122240248"

-		    label      	"earFile"

-		    supplier   	"Logical View::commonArchiveCore::EARFile"

-		    quidu      	"3A0DBB79007D"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$7"

-	    quid       	"3F297D500278"

-	    roles      	(list role_list

-		(object Role "warFile"

-		    quid       	"3F297D500279"

-		    label      	"warFile"

-		    supplier   	"Logical View::commonArchiveCore::WARFile"

-		    quidu      	"3A0DBB49018C")

-		(object Role "deploymentDescriptor"

-		    quid       	"3F297D50027A"

-		    label      	"deploymentDescriptor"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3F297E2800B5"

-	    roles      	(list role_list

-		(object Role "ejbJarFile"

-		    quid       	"3F297E2800B6"

-		    label      	"ejbJarFile"

-		    supplier   	"Logical View::commonArchiveCore::EJBJarFile"

-		    quidu      	"3A0DBB250022")

-		(object Role "deploymentDescriptor"

-		    quid       	"3F297E2800B7"

-		    label      	"deploymentDescriptor"

-		    supplier   	"Logical View::ejb::EJBJar"

-		    quidu      	"371BC55D01E1"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$9"

-	    quid       	"3F297F6E0245"

-	    roles      	(list role_list

-		(object Role "earFile"

-		    quid       	"3F297F6E0246"

-		    label      	"earFile"

-		    supplier   	"Logical View::commonArchiveCore::EARFile"

-		    quidu      	"3A0DBB79007D")

-		(object Role "deploymentDescriptor"

-		    quid       	"3F297F6E0247"

-		    label      	"deploymentDescriptor"

-		    supplier   	"Logical View::application::Application"

-		    quidu      	"38C030A803B1"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3F298321035F"

-	    roles      	(list role_list

-		(object Role "deploymentDescriptor"

-		    quid       	"3F2983220284"

-		    label      	"deploymentDescriptor"

-		    supplier   	"Logical View::jca::Connector"

-		    quidu      	"3C609091010F"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3F2983220298"

-		    supplier   	"Logical View::commonArchiveCore::RARFile"

-		    quidu      	"3A6DEBCF03C5")))

-	(object Association "$UNNAMED$12"

-	    quid       	"3F298462039D"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$13"

-		    quid       	"3F298462039E"

-		    supplier   	"Logical View::commonArchiveCore::ApplicationClientFile"

-		    quidu      	"3A0DBB810128")

-		(object Role "deploymentDescriptor"

-		    quid       	"3F298462039F"

-		    label      	"deploymentDescriptor"

-		    supplier   	"Logical View::client::ApplicationClient"

-		    quidu      	"38C028AB009E"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"430A92520127"

-	    roles      	(list role_list

-		(object Role "module"

-		    quid       	"430A92530147"

-		    label      	"module"

-		    supplier   	"Logical View::application::Module"

-		    quidu      	"38C0322C0006"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"430A92530149"

-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"

-		    quidu      	"3C711E300115")))

-	(object Class_Category "looseconfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Ecore"

-		    name       	"prefix"

-		    value      	(value Text "Looseconfig"))

-		(object Attribute

-		    tool       	"Ecore"

-		    name       	"basePackage"

-		    value      	(value Text "org.eclipse.jst.j2ee.commonarchivecore"))

-		(object Attribute

-		    tool       	"Ecore"

-		    name       	"nsURI"

-		    value      	(value Text "commonarchive.looseconfig.xmi")))

-	    quid       	"3C71147E033D"

-	    exportControl 	"Public"

-	    logical_models 	(list unit_reference_list

-		(object Class "LooseApplication"

-		    quid       	"3C56EB4E006A"

-		    superclasses 	(list inheritance_relationship_list

-			(object Inheritance_Relationship

-			    quid       	"3C753DEE00EA"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"

-			    quidu      	"3C56EAAF006C")))

-		(object Class "LooseArchive"

-		    quid       	"3C56EAAF006C"

-		    operations 	(list Operations

-			(object Operation "isModule"

-			    quid       	"3C5ABFC303DE"

-			    result     	"boolean"

-			    concurrency 	"Sequential"

-			    opExportControl 	"Public"

-			    uid        	0))

-		    class_attributes 	(list class_attribute_list

-			(object ClassAttribute "uri"

-			    quid       	"3C56EB9C01A3"

-			    type       	"String"

-			    exportControl 	"Public")

-			(object ClassAttribute "binariesPath"

-			    quid       	"3C56EBA900BB"

-			    type       	"String"

-			    exportControl 	"Public")

-			(object ClassAttribute "resourcesPath"

-			    quid       	"3C711DD3020B"

-			    type       	"String"

-			    exportControl 	"Public"))

-		    abstract   	TRUE)

-		(object Class "LooseLibrary"

-		    quid       	"3C5AF7AC0028"

-		    superclasses 	(list inheritance_relationship_list

-			(object Inheritance_Relationship

-			    quid       	"3C5AF7C2037C"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"

-			    quidu      	"3C56EAAF006C")))

-		(object Class "LooseModule"

-		    quid       	"3C5ABEFE0290"

-		    superclasses 	(list inheritance_relationship_list

-			(object Inheritance_Relationship

-			    quid       	"3C5AC03900EE"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"

-			    quidu      	"3C56EAAF006C"))

-		    class_attributes 	(list class_attribute_list

-			(object ClassAttribute "altDD"

-			    quid       	"3C5ABFFA021A"

-			    type       	"String"

-			    exportControl 	"Public")))

-		(object Class "LooseConfiguration"

-		    quid       	"3C56E92C00BF")

-		(object Class "LooseWARFile"

-		    quid       	"3C5AF7DB018E"

-		    superclasses 	(list inheritance_relationship_list

-			(object Inheritance_Relationship

-			    quid       	"3C5AF7F5028F"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseModule"

-			    quidu      	"3C5ABEFE0290")))

-		(object Association "$UNNAMED$16"

-		    quid       	"3C56FDE60173"

-		    roles      	(list role_list

-			(object Role "applications"

-			    quid       	"3C56FDE702DD"

-			    label      	"applications"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseApplication"

-			    quidu      	"3C56EB4E006A"

-			    client_cardinality 	(value cardinality "0..n")

-			    Containment 	"By Value"

-			    is_navigable 	TRUE)

-			(object Role "$UNNAMED$17"

-			    quid       	"3C56FDE702DF"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseConfiguration"

-			    quidu      	"3C56E92C00BF"

-			    is_aggregate 	TRUE)))

-		(object Association "$UNNAMED$18"

-		    quid       	"3C56FDEF0018"

-		    roles      	(list role_list

-			(object Role "looseArchives"

-			    quid       	"3C56FDF00023"

-			    label      	"looseArchives"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"

-			    quidu      	"3C56EAAF006C"

-			    client_cardinality 	(value cardinality "0..n")

-			    Containment 	"By Value"

-			    is_navigable 	TRUE)

-			(object Role "looseApp"

-			    quid       	"3C56FDF00025"

-			    label      	"looseApp"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseApplication"

-			    quidu      	"3C56EB4E006A"

-			    is_navigable 	TRUE

-			    is_aggregate 	TRUE)))

-		(object Association "$UNNAMED$19"

-		    quid       	"3C5AF80200DF"

-		    roles      	(list role_list

-			(object Role "looseLibs"

-			    quid       	"3C5AF8030087"

-			    label      	"looseLibs"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseLibrary"

-			    quidu      	"3C5AF7AC0028"

-			    client_cardinality 	(value cardinality "0..n")

-			    Containment 	"By Value"

-			    is_navigable 	TRUE)

-			(object Role "looseWAR"

-			    quid       	"3C5AF8030089"

-			    label      	"looseWAR"

-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseWARFile"

-			    quidu      	"3C5AF7DB018E"

-			    is_navigable 	TRUE

-			    is_aggregate 	TRUE))))

-	    logical_presentations 	(list unit_reference_list

-		(object ClassDiagram "Main"

-		    quid       	"3C56E9120173"

-		    title      	"Main"

-		    zoom       	100

-		    max_height 	28350

-		    max_width  	21600

-		    origin_x   	0

-		    origin_y   	0

-		    items      	(list diagram_item_list

-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseConfiguration" @1

-			    ShowCompartmentStereotypes 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(384, 160)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@1

-				location   	(162, 110)

-				fill_color 	13434879

-				nlines     	1

-				max_width  	444

-				justify    	0

-				label      	"LooseConfiguration")

-			    icon_style 	"Icon"

-			    line_color 	3342489

-			    fill_color 	13434879

-			    quidu      	"3C56E92C00BF"

-			    width      	462

-			    height     	124

-			    annotation 	8

-			    autoResize 	TRUE)

-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseArchive" @2

-			    ShowCompartmentStereotypes 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(1312, 224)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	TRUE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@2

-				location   	(1141, 174)

-				fill_color 	13434879

-				nlines     	1

-				max_width  	342

-				justify    	0

-				label      	"LooseArchive")

-			    icon_style 	"Icon"

-			    line_color 	3342489

-			    fill_color 	13434879

-			    quidu      	"3C56EAAF006C"

-			    width      	360

-			    height     	124

-			    annotation 	8

-			    autoResize 	TRUE)

-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseApplication" @3

-			    ShowCompartmentStereotypes 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(368, 848)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@3

-				location   	(161, 798)

-				fill_color 	13434879

-				nlines     	1

-				max_width  	414

-				justify    	0

-				label      	"LooseApplication")

-			    icon_style 	"Icon"

-			    line_color 	3342489

-			    fill_color 	13434879

-			    quidu      	"3C56EB4E006A"

-			    width      	432

-			    height     	124

-			    annotation 	8

-			    autoResize 	TRUE)

-			(object AssociationViewNew "$UNNAMED$16" @4

-			    location   	(281, 503)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C56FDE60173"

-			    roleview_list 	(list RoleViews

-				(object RoleView "applications" @5

-				    Parent_View 	@4

-				    location   	(-103, 375)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	FALSE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object SegLabel @6

-					Parent_View 	@5

-					location   	(143, 694)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	1

-					anchor_loc 	1

-					nlines     	1

-					max_width  	247

-					justify    	0

-					label      	"+applications"

-					pctDist    	0.679688

-					height     	139

-					orientation 	1)

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"3C56FDE702DD"

-				    client     	@4

-				    supplier   	@3

-				    vertices   	(list Points

-					(281, 503)

-					(281, 786))

-				    line_style 	3

-				    origin_attachment 	(281, 503)

-				    terminal_attachment 	(281, 786)

-				    label      	(object SegLabel @7

-					Parent_View 	@5

-					location   	(334, 649)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	2

-					anchor_loc 	1

-					nlines     	1

-					max_width  	15

-					justify    	0

-					label      	"0..n"

-					pctDist    	0.516854

-					height     	53

-					orientation 	0))

-				(object RoleView "$UNNAMED$17" @8

-				    Parent_View 	@4

-				    location   	(-103, 375)

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"3C56FDE702DF"

-				    client     	@4

-				    supplier   	@1

-				    vertices   	(list Points

-					(281, 503)

-					(281, 221))

-				    line_style 	3

-				    origin_attachment 	(281, 503)

-				    terminal_attachment 	(281, 221))))

-			(object AssociationViewNew "$UNNAMED$18" @9

-			    location   	(546, 284)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C56FDEF0018"

-			    roleview_list 	(list RoleViews

-				(object RoleView "looseArchives" @10

-				    Parent_View 	@9

-				    location   	(162, -324)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	FALSE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object SegLabel @11

-					Parent_View 	@10

-					location   	(941, 245)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	1

-					anchor_loc 	1

-					nlines     	1

-					max_width  	285

-					justify    	0

-					label      	"+looseArchives"

-					pctDist    	0.676245

-					height     	40

-					orientation 	0)

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"3C56FDF00023"

-				    client     	@9

-				    supplier   	@2

-				    vertices   	(list Points

-					(546, 284)

-					(1132, 284))

-				    line_style 	3

-				    origin_attachment 	(546, 284)

-				    terminal_attachment 	(1132, 284)

-				    label      	(object SegLabel @12

-					Parent_View 	@10

-					location   	(995, 324)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	2

-					anchor_loc 	1

-					nlines     	1

-					max_width  	15

-					justify    	0

-					label      	"0..n"

-					pctDist    	0.766284

-					height     	40

-					orientation 	1))

-				(object RoleView "looseApp" @13

-				    Parent_View 	@9

-				    location   	(162, -324)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	FALSE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object SegLabel @14

-					Parent_View 	@13

-					location   	(566, 612)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	1

-					anchor_loc 	1

-					nlines     	1

-					max_width  	208

-					justify    	0

-					label      	"+looseApp"

-					pctDist    	0.702495

-					height     	103

-					orientation 	0)

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"3C56FDF00025"

-				    client     	@9

-				    supplier   	@3

-				    vertices   	(list Points

-					(546, 284)

-					(463, 284)

-					(463, 786))

-				    line_style 	3

-				    origin_attachment 	(546, 284)

-				    terminal_attachment 	(463, 786))))

-			(object NoteView @15

-			    location   	(448, 1680)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@15

-				location   	(44, 1543)

-				fill_color 	13434879

-				nlines     	5

-				max_width  	772

-				label      	"Assumption:  For a given running server, there exists only one config with a set of applications")

-			    line_color 	3342489

-			    fill_color 	13434879

-			    width      	832

-			    height     	287)

-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseModule" @16

-			    ShowCompartmentStereotypes 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(1632, 896)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@16

-				location   	(1466, 846)

-				fill_color 	13434879

-				nlines     	1

-				max_width  	332

-				justify    	0

-				label      	"LooseModule")

-			    icon_style 	"Icon"

-			    line_color 	3342489

-			    fill_color 	13434879

-			    quidu      	"3C5ABEFE0290"

-			    width      	350

-			    height     	124

-			    annotation 	8

-			    autoResize 	TRUE)

-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseLibrary" @17

-			    ShowCompartmentStereotypes 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(928, 912)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@17

-				location   	(775, 862)

-				fill_color 	13434879

-				nlines     	1

-				max_width  	306

-				justify    	0

-				label      	"LooseLibrary")

-			    icon_style 	"Icon"

-			    line_color 	3342489

-			    fill_color 	13434879

-			    quidu      	"3C5AF7AC0028"

-			    width      	324

-			    height     	124

-			    annotation 	8

-			    autoResize 	TRUE)

-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseWARFile" @18

-			    ShowCompartmentStereotypes 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(1648, 1328)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@18

-				location   	(1462, 1278)

-				fill_color 	13434879

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"LooseWARFile")

-			    icon_style 	"Icon"

-			    line_color 	3342489

-			    fill_color 	13434879

-			    quidu      	"3C5AF7DB018E"

-			    width      	390

-			    height     	124

-			    annotation 	8

-			    autoResize 	TRUE)

-			(object AssociationViewNew "$UNNAMED$19" @19

-			    location   	(1006, 1312)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C5AF80200DF"

-			    roleview_list 	(list RoleViews

-				(object RoleView "looseLibs" @20

-				    Parent_View 	@19

-				    location   	(-642, -128)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	FALSE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object SegLabel @21

-					Parent_View 	@20

-					location   	(791, 1017)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	1

-					anchor_loc 	1

-					nlines     	1

-					max_width  	196

-					justify    	0

-					label      	"+looseLibs"

-					pctDist    	0.905963

-					height     	107

-					orientation 	0)

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"3C5AF8030087"

-				    client     	@19

-				    supplier   	@17

-				    vertices   	(list Points

-					(1006, 1312)

-					(897, 1312)

-					(897, 974))

-				    line_style 	3

-				    origin_attachment 	(1006, 1312)

-				    terminal_attachment 	(897, 974)

-				    label      	(object SegLabel @22

-					Parent_View 	@20

-					location   	(951, 1019)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	2

-					anchor_loc 	1

-					nlines     	1

-					max_width  	15

-					justify    	0

-					label      	"0..n"

-					pctDist    	0.900000

-					height     	54

-					orientation 	1))

-				(object RoleView "looseWAR" @23

-				    Parent_View 	@19

-				    location   	(-642, -128)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	FALSE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object SegLabel @24

-					Parent_View 	@23

-					location   	(1311, 1272)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					anchor     	1

-					anchor_loc 	1

-					nlines     	1

-					max_width  	226

-					justify    	0

-					label      	"+looseWAR"

-					pctDist    	0.683973

-					height     	41

-					orientation 	0)

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"3C5AF8030089"

-				    client     	@19

-				    supplier   	@18

-				    vertices   	(list Points

-					(1006, 1312)

-					(1453, 1312))

-				    line_style 	3

-				    origin_attachment 	(1006, 1312)

-				    terminal_attachment 	(1453, 1312))))

-			(object NoteView @25

-			    location   	(1952, 320)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@25

-				location   	(1755, 133)

-				fill_color 	13434879

-				nlines     	7

-				max_width  	359

-				label      	

-|uri is either relative to the EAR root or WEB-INF/lib.

-|binariesPath and resourcesPath are absolute

-				)

-			    line_color 	3342489

-			    fill_color 	13434879

-			    width      	419

-			    height     	387)

-			(object InheritView "" @26

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C5AF7F5028F"

-			    client     	@18

-			    supplier   	@16

-			    vertices   	(list Points

-				(1606, 1266)

-				(1606, 958))

-			    line_style 	3

-			    origin_attachment 	(1606, 1266)

-			    terminal_attachment 	(1606, 958))

-			(object InheritTreeView "" @27

-			    location   	(1312, 703)

-			    line_color 	3342489

-			    fill_color 	13434879

-			    supplier   	@2

-			    vertices   	(list Points

-				(1312, 703)

-				(1312, 286)))

-			(object InheritView "" @28

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C5AC03900EE"

-			    client     	@16

-			    supplier   	@2

-			    vertices   	(list Points

-				(1650, 834)

-				(1650, 703))

-			    line_style 	3

-			    origin_attachment 	(1650, 834)

-			    terminal_attachment 	(1650, 703)

-			    drawSupplier 	@27)

-			(object InheritView "" @29

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C5AF7C2037C"

-			    client     	@17

-			    supplier   	@2

-			    vertices   	(list Points

-				(913, 850)

-				(913, 703))

-			    line_style 	3

-			    origin_attachment 	(913, 850)

-			    terminal_attachment 	(913, 703)

-			    drawSupplier 	@27)

-			(object InheritView "" @30

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C753DEE00EA"

-			    client     	@3

-			    supplier   	@2

-			    vertices   	(list Points

-				(513, 786)

-				(513, 703))

-			    line_style 	3

-			    origin_attachment 	(513, 786)

-			    terminal_attachment 	(513, 703)

-			    drawSupplier 	@27))))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "common archive"

-	    quid       	"3A0DB75100E1"

-	    title      	"common archive"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	919

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBJarFile" @31

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    location   	(1440, 1792)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@31

-			location   	(1321, 1741)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	238

-			justify    	0

-			label      	"EJBJarFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB250022"

-		    width      	256

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ApplicationClientFile" @32

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    location   	(1824, 1792)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@32

-			location   	(1620, 1741)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	408

-			justify    	0

-			label      	"ApplicationClientFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB810128"

-		    width      	426

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @33

-		    location   	(1328, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(906, 119)

-			fill_color 	13434879

-			nlines     	6

-			max_width  	808

-			label      	"The loading container is the original container from which the file was opened.  If the file is copied and the copy added to a new archive, the new file can still get an input stream on itself from the loading container.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	868

-		    height     	319)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ReadOnlyDirectory" @34

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(896, 1136)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@34

-			location   	(704, 1085)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	384

-			justify    	0

-			label      	"ReadOnlyDirectory")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A54BEB0004D"

-		    width      	402

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::Container" @35

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(480, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@35

-			location   	(315, 804)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	330

-			justify    	0

-			label      	"Container")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@35

-			location   	(315, 754)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	330

-			justify    	0

-			label      	"<<abstract>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A54BE55016E"

-		    width      	348

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::File" @36

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(496, 384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@36

-			location   	(254, 203)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	484

-			justify    	0

-			label      	"File")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DB75B00E5"

-		    compartment 	(object Compartment

-			Parent_View 	@36

-			location   	(254, 264)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	481)

-		    width      	502

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$3" @37

-		    location   	(113, 601)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A54BF4E0022"

-		    roleview_list 	(list RoleViews

-			(object RoleView "files" @38

-			    Parent_View 	@37

-			    location   	(-591, -103)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @39

-				Parent_View 	@38

-				location   	(174, 272)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+files"

-				pctDist    	0.830532

-				height     	50

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3A54BF4E0024"

-			    client     	@37

-			    supplier   	@36

-			    vertices   	(list Points

-				(113, 601)

-				(113, 321)

-				(245, 321))

-			    line_style 	3

-			    origin_attachment 	(113, 601)

-			    terminal_attachment 	(245, 321)

-			    label      	(object SegLabel @40

-				Parent_View 	@38

-				location   	(203, 375)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "container" @41

-			    Parent_View 	@37

-			    location   	(-591, -103)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @42

-				Parent_View 	@41

-				location   	(193, 861)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	194

-				justify    	0

-				label      	"+container"

-				pctDist    	0.725352

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3A54BF4E0023"

-			    client     	@37

-			    supplier   	@35

-			    vertices   	(list Points

-				(113, 601)

-				(113, 819)

-				(306, 819))

-			    line_style 	3

-			    origin_attachment 	(113, 601)

-			    terminal_attachment 	(306, 819)

-			    label      	(object SegLabel @43

-				Parent_View 	@41

-				location   	(245, 771)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.854460

-				height     	49

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$1" @44

-		    location   	(828, 678)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A3A953E00A9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "loadingContainer" @45

-			    Parent_View 	@44

-			    location   	(332, 294)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(1003, 757)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	324

-				justify    	0

-				label      	"+loadingContainer"

-				pctDist    	0.249344

-				height     	175

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3A3A953F0082"

-			    client     	@44

-			    supplier   	@35

-			    vertices   	(list Points

-				(828, 678)

-				(828, 821)

-				(654, 821))

-			    line_style 	3

-			    origin_attachment 	(828, 678)

-			    terminal_attachment 	(654, 821)

-			    label      	(object SegLabel @47

-				Parent_View 	@45

-				location   	(686, 875)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$2" @48

-			    Parent_View 	@44

-			    location   	(332, 294)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3A3A953F00AA"

-			    client     	@44

-			    supplier   	@36

-			    vertices   	(list Points

-				(828, 678)

-				(828, 441)

-				(747, 441))

-			    line_style 	3

-			    origin_attachment 	(828, 678)

-			    terminal_attachment 	(747, 441))))

-		(object AttachView "" @49

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@33

-		    supplier   	@44

-		    vertices   	(list Points

-			(1130, 431)

-			(828, 678))

-		    line_style 	0)

-		(object InheritView "" @50

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A54C16801FC"

-		    client     	@35

-		    supplier   	@36

-		    vertices   	(list Points

-			(483, 741)

-			(489, 577))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::commonArchiveCore::Archive" @51

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@51

-			location   	(94, 1135)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	484

-			justify    	0

-			label      	"Archive")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DB75F0177"

-		    compartment 	(object Compartment

-			Parent_View 	@51

-			location   	(94, 1196)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	482)

-		    width      	502

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @52

-		    location   	(480, 1013)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@35

-		    vertices   	(list Points

-			(480, 1013)

-			(480, 922)))

-		(object InheritView "" @53

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A54BF750295"

-		    client     	@34

-		    supplier   	@35

-		    vertices   	(list Points

-			(851, 1073)

-			(851, 1013))

-		    line_style 	3

-		    origin_attachment 	(851, 1073)

-		    terminal_attachment 	(851, 1013)

-		    drawSupplier 	@52)

-		(object InheritView "" @54

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A54BF5D018C"

-		    client     	@51

-		    supplier   	@35

-		    vertices   	(list Points

-			(266, 1123)

-			(266, 1013))

-		    line_style 	3

-		    origin_attachment 	(266, 1123)

-		    terminal_attachment 	(266, 1013)

-		    drawSupplier 	@52)

-		(object ClassView "Class" "Logical View::commonArchiveCore::WARFile" @55

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    location   	(1168, 1792)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@55

-			location   	(1064, 1741)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	208

-			justify    	0

-			label      	"WARFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB49018C"

-		    width      	226

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::RARFile" @56

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(928, 1792)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@56

-			location   	(836, 1741)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	184

-			justify    	0

-			label      	"RARFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A6DEBCF03C5"

-		    width      	202

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @57

-		    location   	(336, 1510)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@51

-		    vertices   	(list Points

-			(336, 1510)

-			(336, 1309)))

-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleFile" @58

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(928, 1536)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@58

-			location   	(817, 1485)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	222

-			justify    	0

-			label      	"ModuleFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DC1230136"

-		    width      	240

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @59

-		    location   	(928, 1706)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@58

-		    vertices   	(list Points

-			(928, 1706)

-			(928, 1599)))

-		(object InheritView "" @60

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC27D03BE"

-		    client     	@31

-		    supplier   	@58

-		    vertices   	(list Points

-			(1425, 1729)

-			(1425, 1706))

-		    line_style 	3

-		    origin_attachment 	(1425, 1729)

-		    terminal_attachment 	(1425, 1706)

-		    drawSupplier 	@59)

-		(object InheritView "" @61

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC2790214"

-		    client     	@32

-		    supplier   	@58

-		    vertices   	(list Points

-			(1611, 1729)

-			(1611, 1706))

-		    line_style 	3

-		    origin_attachment 	(1611, 1729)

-		    terminal_attachment 	(1611, 1706)

-		    drawSupplier 	@59)

-		(object InheritView "" @62

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC2CE00AE"

-		    client     	@58

-		    supplier   	@51

-		    vertices   	(list Points

-			(817, 1536)

-			(817, 1510))

-		    line_style 	3

-		    origin_attachment 	(817, 1536)

-		    terminal_attachment 	(817, 1510)

-		    drawSupplier 	@57)

-		(object InheritView "" @63

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC29003E4"

-		    client     	@55

-		    supplier   	@58

-		    vertices   	(list Points

-			(1168, 1729)

-			(1168, 1706))

-		    line_style 	3

-		    origin_attachment 	(1168, 1729)

-		    terminal_attachment 	(1168, 1706)

-		    drawSupplier 	@59)

-		(object InheritView "" @64

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A6DEBE701CB"

-		    client     	@56

-		    supplier   	@58

-		    vertices   	(list Points

-			(929, 1729)

-			(929, 1706))

-		    line_style 	3

-		    origin_attachment 	(929, 1729)

-		    terminal_attachment 	(929, 1706)

-		    drawSupplier 	@59)

-		(object ClassView "Class" "Logical View::commonArchiveCore::EARFile" @65

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(736, 1984)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@65

-			location   	(644, 1933)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	184

-			justify    	0

-			label      	"EARFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB79007D"

-		    width      	202

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @66

-		    location   	(647, 1720)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC23C0270"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/moduleFiles" @67

-			    Parent_View 	@66

-			    location   	(-169, 760)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @68

-				Parent_View 	@67

-				location   	(621, 1832)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	272

-				justify    	0

-				label      	"+/moduleFiles"

-				pctDist    	-0.383333

-				height     	27

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3A0DC23D014F"

-			    client     	@66

-			    supplier   	@58

-			    vertices   	(list Points

-				(647, 1720)

-				(647, 1660)

-				(821, 1660)

-				(821, 1599))

-			    line_style 	3

-			    origin_attachment 	(647, 1720)

-			    terminal_attachment 	(821, 1599)

-			    label      	(object SegLabel @69

-				Parent_View 	@67

-				location   	(714, 1691)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.432515

-				height     	31

-				orientation 	1))

-			(object RoleView "earFile" @70

-			    Parent_View 	@66

-			    location   	(-169, 760)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3A0DC23D02FE"

-			    client     	@66

-			    supplier   	@65

-			    vertices   	(list Points

-				(647, 1720)

-				(647, 1921))

-			    line_style 	3

-			    origin_attachment 	(647, 1720)

-			    terminal_attachment 	(647, 1921)

-			    label      	(object SegLabel @71

-				Parent_View 	@70

-				location   	(613, 1897)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.884161

-				height     	35

-				orientation 	1))))

-		(object InheritView "" @72

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A36452000DE"

-		    client     	@65

-		    supplier   	@58

-		    vertices   	(list Points

-			(769, 1921)

-			(769, 1706))

-		    line_style 	3

-		    origin_attachment 	(769, 1921)

-		    terminal_attachment 	(769, 1706)

-		    drawSupplier 	@59)

-		(object ClassView "Class" "Logical View::application::Application" @73

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2064, 2032)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@73

-			location   	(1908, 1953)

-			nlines     	1

-			max_width  	312

-			justify    	0

-			label      	"Application")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C030A803B1"

-		    width      	330

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$9" @74

-		    location   	(1368, 2015)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F297F6E0245"

-		    roleview_list 	(list RoleViews

-			(object RoleView "deploymentDescriptor" @75

-			    Parent_View 	@74

-			    location   	(632, 31)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @76

-				Parent_View 	@75

-				location   	(1793, 1974)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	423

-				justify    	0

-				label      	"+deploymentDescriptor"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297F6E0247"

-			    client     	@74

-			    supplier   	@73

-			    vertices   	(list Points

-				(1368, 2015)

-				(1899, 2015))

-			    line_style 	3

-			    origin_attachment 	(1368, 2015)

-			    terminal_attachment 	(1899, 2015)

-			    label      	(object SegLabel @77

-				Parent_View 	@75

-				location   	(1846, 2069)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "earFile" @78

-			    Parent_View 	@74

-			    location   	(632, 31)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @79

-				Parent_View 	@78

-				location   	(943, 1974)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	149

-				justify    	0

-				label      	"+earFile"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297F6E0246"

-			    client     	@74

-			    supplier   	@65

-			    vertices   	(list Points

-				(1368, 2015)

-				(837, 2015))

-			    line_style 	3

-			    origin_attachment 	(1368, 2015)

-			    terminal_attachment 	(837, 2015))))

-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleRef" @80

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(624, 2384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@80

-			location   	(514, 2333)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	220

-			justify    	0

-			label      	"ModuleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C711E300115"

-		    width      	238

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$4" @81

-		    location   	(441, 1835)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C711EF902F4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "moduleFile" @82

-			    Parent_View 	@81

-			    location   	(121, -533)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @83

-				Parent_View 	@82

-				location   	(612, 1561)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	232

-				justify    	0

-				label      	"+moduleFile"

-				pctDist    	0.681922

-				height     	25

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C711EFA024C"

-			    client     	@81

-			    supplier   	@58

-			    vertices   	(list Points

-				(441, 1835)

-				(441, 1585)

-				(808, 1585))

-			    line_style 	3

-			    origin_attachment 	(441, 1835)

-			    terminal_attachment 	(808, 1585)

-			    label      	(object SegLabel @84

-				Parent_View 	@82

-				location   	(731, 1623)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.876481

-				height     	38

-				orientation 	1))

-			(object RoleView "$UNNAMED$5" @85

-			    Parent_View 	@81

-			    location   	(121, -533)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C711EFA024E"

-			    client     	@81

-			    supplier   	@80

-			    vertices   	(list Points

-				(441, 1835)

-				(441, 2388)

-				(505, 2388))

-			    line_style 	3

-			    origin_attachment 	(441, 1835)

-			    terminal_attachment 	(505, 2388))))

-		(object AssociationViewNew "$UNNAMED$6" @86

-		    location   	(716, 2184)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C712223019B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "moduleRefs" @87

-			    Parent_View 	@86

-			    location   	(252, 40)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(857, 2270)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	254

-				justify    	0

-				label      	"+moduleRefs"

-				pctDist    	0.635036

-				height     	141

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C7122240246"

-			    client     	@86

-			    supplier   	@80

-			    vertices   	(list Points

-				(716, 2184)

-				(716, 2321))

-			    line_style 	3

-			    origin_attachment 	(716, 2184)

-			    terminal_attachment 	(716, 2321)

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(670, 2281)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.715736

-				height     	47

-				orientation 	1))

-			(object RoleView "earFile" @90

-			    Parent_View 	@86

-			    location   	(252, 40)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @91

-				Parent_View 	@90

-				location   	(803, 2144)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	149

-				justify    	0

-				label      	"+earFile"

-				pctDist    	0.301471

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C7122240248"

-			    client     	@86

-			    supplier   	@65

-			    vertices   	(list Points

-				(716, 2184)

-				(716, 2047))

-			    line_style 	3

-			    origin_attachment 	(716, 2184)

-			    terminal_attachment 	(716, 2047)

-			    label      	(object SegLabel @92

-				Parent_View 	@90

-				location   	(755, 2068)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.854626

-				height     	39

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::application::Module" @93

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2048, 2384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@93

-			location   	(1917, 2334)

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"Module")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C0322C0006"

-		    width      	280

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @94

-		    location   	(2102, 2222)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0340003C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "modules" @95

-			    Parent_View 	@94

-			    location   	(278, 1486)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @96

-				Parent_View 	@95

-				location   	(1999, 2270)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	180

-				justify    	0

-				label      	"+modules"

-				pctDist    	0.484848

-				height     	104

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C0340102E7"

-			    client     	@94

-			    supplier   	@93

-			    vertices   	(list Points

-				(2102, 2222)

-				(2102, 2321))

-			    line_style 	3

-			    origin_attachment 	(2102, 2222)

-			    terminal_attachment 	(2102, 2321)

-			    label      	(object SegLabel @97

-				Parent_View 	@95

-				location   	(2157, 2288)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.678010

-				height     	55

-				orientation 	0))

-			(object RoleView "application" @98

-			    Parent_View 	@94

-			    location   	(278, 1486)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C0340102E6"

-			    client     	@94

-			    supplier   	@73

-			    vertices   	(list Points

-				(2102, 2222)

-				(2102, 2123))

-			    line_style 	3

-			    origin_attachment 	(2102, 2222)

-			    terminal_attachment 	(2102, 2123)

-			    label      	(object SegLabel @99

-				Parent_View 	@98

-				location   	(2156, 2133)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$14" @100

-		    location   	(1325, 2384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"430A92520127"

-		    roleview_list 	(list RoleViews

-			(object RoleView "module" @101

-			    Parent_View 	@100

-			    location   	(701, 0)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @102

-				Parent_View 	@101

-				location   	(1791, 2343)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	172

-				justify    	0

-				label      	"+module"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"430A92530147"

-			    client     	@100

-			    supplier   	@93

-			    vertices   	(list Points

-				(1325, 2384)

-				(1907, 2384))

-			    line_style 	0

-			    label      	(object SegLabel @103

-				Parent_View 	@101

-				location   	(1849, 2438)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$15" @104

-			    Parent_View 	@100

-			    location   	(701, 0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"430A92530149"

-			    client     	@100

-			    supplier   	@80

-			    vertices   	(list Points

-				(1325, 2384)

-				(743, 2384))

-			    line_style 	0)))))

-	(object ClassDiagram "descriptors"

-	    quid       	"3A1015D70250"

-	    title      	"descriptors"

-	    zoom       	89

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	137

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::commonArchiveCore::WARFile" @105

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(256, 1616)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@105

-			location   	(139, 1563)

-			nlines     	1

-			max_width  	234

-			justify    	0

-			label      	"WARFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3A0DBB49018C"

-		    width      	252

-		    height     	130

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @106

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1408, 1840)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@106

-			location   	(1223, 1763)

-			nlines     	1

-			max_width  	370

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C079140251"

-		    width      	388

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebApp" @107

-		    ShowCompartmentStereotypes 	TRUE

-		    location   	(1408, 1392)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@107

-			location   	(1247, 1339)

-			nlines     	1

-			max_width  	322

-			justify    	0

-			label      	"WebApp")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@107

-			location   	(1247, 1289)

-			anchor     	10

-			nlines     	1

-			max_width  	322

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C077FB0352"

-		    width      	340

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$7" @108

-		    location   	(809, 1508)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F297D500278"

-		    roleview_list 	(list RoleViews

-			(object RoleView "deploymentDescriptor" @109

-			    Parent_View 	@108

-			    location   	(73, -316)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @110

-				Parent_View 	@109

-				location   	(1078, 1411)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	542

-				justify    	0

-				label      	"+deploymentDescriptor"

-				pctDist    	0.649222

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297D50027A"

-			    client     	@108

-			    supplier   	@107

-			    vertices   	(list Points

-				(809, 1508)

-				(1237, 1424))

-			    line_style 	0

-			    label      	(object SegLabel @111

-				Parent_View 	@109

-				location   	(1203, 1487)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "warFile" @112

-			    Parent_View 	@108

-			    location   	(73, -316)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297D500279"

-			    client     	@108

-			    supplier   	@105

-			    vertices   	(list Points

-				(809, 1508)

-				(382, 1590))

-			    line_style 	0)))

-		(object AssociationViewNew "" @113

-		    location   	(1408, 1628)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D230120"

-		    roleview_list 	(list RoleViews

-			(object RoleView "servlets" @114

-			    Parent_View 	@113

-			    location   	(-1056, -1028)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @115

-				Parent_View 	@114

-				location   	(1367, 1725)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	226

-				justify    	0

-				label      	"+servlets"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2402E4"

-			    client     	@113

-			    supplier   	@106

-			    vertices   	(list Points

-				(1408, 1628)

-				(1408, 1750))

-			    line_style 	0

-			    label      	(object SegLabel @116

-				Parent_View 	@114

-				location   	(1462, 1737)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "webApp" @117

-			    Parent_View 	@113

-			    location   	(-1056, -1028)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @118

-				Parent_View 	@117

-				location   	(1367, 1531)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	216

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2402DA"

-			    client     	@113

-			    supplier   	@107

-			    vertices   	(list Points

-				(1408, 1628)

-				(1408, 1507))

-			    line_style 	0

-			    label      	(object SegLabel @119

-				Parent_View 	@117

-				location   	(1462, 1519)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @120

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2288, 1088)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@120

-			location   	(2103, 1011)

-			nlines     	1

-			max_width  	370

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3780E71A010A"

-		    width      	388

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EJBJar" @121

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(816, 1072)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@121

-			location   	(628, 1016)

-			nlines     	1

-			max_width  	376

-			justify    	0

-			label      	"EJBJar")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@121

-			location   	(628, 966)

-			anchor     	10

-			nlines     	1

-			max_width  	376

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC55D01E1"

-		    width      	394

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "ejbJarToEnterpriseBeans" @122

-		    location   	(1553, 1079)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @123

-			Parent_View 	@122

-			location   	(1553, 1020)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	600

-			justify    	0

-			label      	"ejbJarToEnterpriseBeans"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38FF3D1F003B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbJar" @124

-			    Parent_View 	@122

-			    location   	(-1087, -505)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @125

-				Parent_View 	@124

-				location   	(1121, 1117)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	181

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3D1F03CB"

-			    client     	@122

-			    supplier   	@121

-			    vertices   	(list Points

-				(1553, 1079)

-				(1013, 1073))

-			    line_style 	0

-			    label      	(object SegLabel @126

-				Parent_View 	@124

-				location   	(1068, 1022)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "enterpriseBeans" @127

-			    Parent_View 	@122

-			    location   	(-1087, -505)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(1985, 1126)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	419

-				justify    	0

-				label      	"+enterpriseBeans"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3D1F037A"

-			    client     	@122

-			    supplier   	@120

-			    vertices   	(list Points

-				(1553, 1079)

-				(2093, 1084))

-			    line_style 	0

-			    label      	(object SegLabel @129

-				Parent_View 	@127

-				location   	(2039, 1031)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBJarFile" @130

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 704)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@130

-			location   	(201, 651)

-			nlines     	1

-			max_width  	270

-			justify    	0

-			label      	"EJBJarFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3A0DBB250022"

-		    width      	288

-		    height     	130

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$8" @131

-		    location   	(541, 861)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F297E2800B5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "deploymentDescriptor" @132

-			    Parent_View 	@131

-			    location   	(-339, -771)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @133

-				Parent_View 	@132

-				location   	(647, 875)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	542

-				justify    	0

-				label      	"+deploymentDescriptor"

-				pctDist    	0.617915

-				height     	54

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297E2800B7"

-			    client     	@131

-			    supplier   	@121

-			    vertices   	(list Points

-				(541, 861)

-				(662, 953))

-			    line_style 	0

-			    label      	(object SegLabel @134

-				Parent_View 	@132

-				location   	(690, 902)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.953052

-				height     	59

-				orientation 	0))

-			(object RoleView "ejbJarFile" @135

-			    Parent_View 	@131

-			    location   	(-339, -771)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @136

-				Parent_View 	@135

-				location   	(421, 821)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	265

-				justify    	0

-				label      	"+ejbJarFile"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297E2800B6"

-			    client     	@131

-			    supplier   	@130

-			    vertices   	(list Points

-				(541, 861)

-				(421, 769))

-			    line_style 	0)))

-		(object ClassView "Class" "Logical View::commonArchiveCore::ApplicationClientFile" @137

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(976, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@137

-			location   	(735, 587)

-			nlines     	1

-			max_width  	482

-			justify    	0

-			label      	"ApplicationClientFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3A0DBB810128"

-		    width      	500

-		    height     	130

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::client::ApplicationClient" @138

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2320, 704)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@138

-			location   	(2121, 627)

-			nlines     	1

-			max_width  	398

-			justify    	0

-			label      	"ApplicationClient")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C028AB009E"

-		    width      	416

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @139

-		    location   	(1669, 660)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F298462039D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$13" @140

-			    Parent_View 	@139

-			    location   	(-795, 100)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @141

-				Parent_View 	@140

-				location   	(1407, 655)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.591809

-				height     	6

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F298462039E"

-			    client     	@139

-			    supplier   	@137

-			    vertices   	(list Points

-				(1669, 660)

-				(1226, 660))

-			    line_style 	3

-			    origin_attachment 	(1669, 660)

-			    terminal_attachment 	(1226, 660))

-			(object RoleView "deploymentDescriptor" @142

-			    Parent_View 	@139

-			    location   	(-795, 100)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @143

-				Parent_View 	@142

-				location   	(2022, 619)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	542

-				justify    	0

-				label      	"+deploymentDescriptor"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F298462039F"

-			    client     	@139

-			    supplier   	@138

-			    vertices   	(list Points

-				(1669, 660)

-				(2112, 660))

-			    line_style 	3

-			    origin_attachment 	(1669, 660)

-			    terminal_attachment 	(2112, 660)

-			    label      	(object SegLabel @144

-				Parent_View 	@142

-				location   	(2068, 714)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::commonArchiveCore::RARFile" @145

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1888, 1600)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@145

-			location   	(1776, 1547)

-			nlines     	1

-			max_width  	224

-			justify    	0

-			label      	"RARFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3A6DEBCF03C5"

-		    width      	242

-		    height     	130

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::Connector" @146

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2544, 1648)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@146

-			location   	(2413, 1571)

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"Connector")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3C609091010F"

-		    width      	280

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$10" @147

-		    location   	(2206, 1612)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F298321035F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$11" @148

-			    Parent_View 	@147

-			    location   	(-338, -36)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @149

-				Parent_View 	@148

-				location   	(2049, 1571)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	148

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F2983220298"

-			    client     	@147

-			    supplier   	@145

-			    vertices   	(list Points

-				(2206, 1612)

-				(2009, 1612))

-			    line_style 	3

-			    origin_attachment 	(2206, 1612)

-			    terminal_attachment 	(2009, 1612))

-			(object RoleView "deploymentDescriptor" @150

-			    Parent_View 	@147

-			    location   	(-338, -36)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @151

-				Parent_View 	@150

-				location   	(2363, 1571)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	"+deploymentDescriptor"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F2983220284"

-			    client     	@147

-			    supplier   	@146

-			    vertices   	(list Points

-				(2206, 1612)

-				(2404, 1612))

-			    line_style 	3

-			    origin_attachment 	(2206, 1612)

-			    terminal_attachment 	(2404, 1612)

-			    label      	(object SegLabel @152

-				Parent_View 	@150

-				location   	(2384, 1666)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::application::Application" @153

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2608, 352)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@153

-			location   	(2456, 275)

-			nlines     	1

-			max_width  	304

-			justify    	0

-			label      	"Application")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C030A803B1"

-		    width      	322

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::EARFile" @154

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 400)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@154

-			location   	(272, 348)

-			nlines     	1

-			max_width  	224

-			justify    	0

-			label      	"EARFile")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3A0DBB79007D"

-		    width      	242

-		    height     	130

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$9" @155

-		    location   	(1476, 348)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F297F6E0245"

-		    roleview_list 	(list RoleViews

-			(object RoleView "deploymentDescriptor" @156

-			    Parent_View 	@155

-			    location   	(660, -612)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @157

-				Parent_View 	@156

-				location   	(2098, 312)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	542

-				justify    	0

-				label      	"+deploymentDescriptor"

-				pctDist    	0.641571

-				height     	37

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297F6E0247"

-			    client     	@155

-			    supplier   	@153

-			    vertices   	(list Points

-				(1476, 348)

-				(2447, 348))

-			    line_style 	3

-			    origin_attachment 	(1476, 348)

-			    terminal_attachment 	(2447, 348)

-			    label      	(object SegLabel @158

-				Parent_View 	@156

-				location   	(2313, 388)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.862061

-				height     	40

-				orientation 	1))

-			(object RoleView "earFile" @159

-			    Parent_View 	@155

-			    location   	(660, -612)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F297F6E0246"

-			    client     	@155

-			    supplier   	@154

-			    vertices   	(list Points

-				(1476, 348)

-				(505, 348))

-			    line_style 	3

-			    origin_attachment 	(1476, 348)

-			    terminal_attachment 	(505, 348))))))

-	(object ClassDiagram "ModuleRefs"

-	    quid       	"3C7125820051"

-	    title      	"ModuleRefs"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBModuleRef" @160

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(768, 416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@160

-			location   	(593, 365)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	350

-			justify    	0

-			label      	"EJBModuleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C7125A802A5"

-		    width      	368

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::WebModuleRef" @161

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(960, 592)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@161

-			location   	(779, 541)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	362

-			justify    	0

-			label      	"WebModuleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C7125B10293"

-		    width      	380

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ClientModuleRef" @162

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 784)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@162

-			location   	(931, 733)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	378

-			justify    	0

-			label      	"ClientModuleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C7125B90259"

-		    width      	396

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ConnectorModuleRef" @163

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1216, 1008)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@163

-			location   	(972, 957)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"ConnectorModuleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C7125C600E5"

-		    width      	506

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::WebModule" @164

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1760, 752)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@164

-			location   	(1516, 648)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"WebModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3904860D027B"

-		    width      	506

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::JavaClientModule" @165

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 1024)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@165

-			location   	(1823, 945)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"JavaClientModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390486730015"

-		    width      	372

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::EjbModule" @166

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1616, 512)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@166

-			location   	(1460, 433)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	312

-			justify    	0

-			label      	"EjbModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390486830253"

-		    width      	330

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::ConnectorModule" @167

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2224, 1296)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@167

-			location   	(2044, 1217)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	360

-			justify    	0

-			label      	"ConnectorModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39895BC00227"

-		    width      	378

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::WARFile" @168

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(256, 544)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@168

-			location   	(133, 493)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	246

-			justify    	0

-			label      	"WARFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB49018C"

-		    width      	264

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ApplicationClientFile" @169

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 736)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@169

-			location   	(128, 685)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	480

-			justify    	0

-			label      	"ApplicationClientFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB810128"

-		    width      	498

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::RARFile" @170

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(608, 944)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@170

-			location   	(499, 893)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	218

-			justify    	0

-			label      	"RARFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A6DEBCF03C5"

-		    width      	236

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBJarFile" @171

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(176, 352)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@171

-			location   	(36, 301)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	280

-			justify    	0

-			label      	"EJBJarFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DBB250022"

-		    width      	298

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::application::Module" @172

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 160)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@172

-			location   	(1793, 31)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	350

-			justify    	0

-			label      	"Module")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0322C0006"

-		    compartment 	(object Compartment

-			Parent_View 	@172

-			location   	(1887, 203)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	0)

-		    width      	368

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @173

-		    location   	(1968, 396)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@172

-		    vertices   	(list Points

-			(1968, 396)

-			(1968, 301)))

-		(object InheritView "" @174

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486B60379"

-		    client     	@166

-		    supplier   	@172

-		    vertices   	(list Points

-			(1675, 421)

-			(1675, 396))

-		    line_style 	3

-		    origin_attachment 	(1675, 421)

-		    terminal_attachment 	(1675, 396)

-		    drawSupplier 	@173)

-		(object InheritView "" @175

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486AE01C9"

-		    client     	@164

-		    supplier   	@172

-		    vertices   	(list Points

-			(1766, 636)

-			(1766, 396))

-		    line_style 	3

-		    origin_attachment 	(1766, 636)

-		    terminal_attachment 	(1766, 396)

-		    drawSupplier 	@173)

-		(object InheritView "" @176

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486B201F6"

-		    client     	@165

-		    supplier   	@172

-		    vertices   	(list Points

-			(2000, 933)

-			(2000, 396))

-		    line_style 	3

-		    origin_attachment 	(2000, 933)

-		    terminal_attachment 	(2000, 396)

-		    drawSupplier 	@173)

-		(object InheritView "" @177

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39895BCA0218"

-		    client     	@167

-		    supplier   	@172

-		    vertices   	(list Points

-			(2350, 1204)

-			(2350, 396))

-		    line_style 	3

-		    origin_attachment 	(2350, 1204)

-		    terminal_attachment 	(2350, 396)

-		    drawSupplier 	@173)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleRef" @178

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(928, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@178

-			location   	(798, 61)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	260

-			justify    	0

-			label      	"ModuleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C711E300115"

-		    width      	278

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleFile" @179

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@179

-			location   	(141, 61)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"ModuleFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A0DC1230136"

-		    width      	280

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @180

-		    location   	(272, 266)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@179

-		    vertices   	(list Points

-			(272, 266)

-			(272, 175)))

-		(object InheritView "" @181

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC29003E4"

-		    client     	@168

-		    supplier   	@179

-		    vertices   	(list Points

-			(319, 481)

-			(319, 266))

-		    line_style 	3

-		    origin_attachment 	(319, 481)

-		    terminal_attachment 	(319, 266)

-		    drawSupplier 	@180)

-		(object InheritView "" @182

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC2790214"

-		    client     	@169

-		    supplier   	@179

-		    vertices   	(list Points

-			(384, 673)

-			(384, 266))

-		    line_style 	3

-		    origin_attachment 	(384, 673)

-		    terminal_attachment 	(384, 266)

-		    drawSupplier 	@180)

-		(object InheritView "" @183

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A0DC27D03BE"

-		    client     	@171

-		    supplier   	@179

-		    vertices   	(list Points

-			(225, 288)

-			(225, 266))

-		    line_style 	3

-		    origin_attachment 	(225, 288)

-		    terminal_attachment 	(225, 266)

-		    drawSupplier 	@180)

-		(object InheritView "" @184

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A6DEBE701CB"

-		    client     	@170

-		    supplier   	@179

-		    vertices   	(list Points

-			(600, 881)

-			(600, 266))

-		    line_style 	3

-		    origin_attachment 	(600, 881)

-		    terminal_attachment 	(600, 266)

-		    drawSupplier 	@180)

-		(object AssociationViewNew "$UNNAMED$4" @185

-		    location   	(600, 112)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C711EF902F4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$5" @186

-			    Parent_View 	@185

-			    location   	(360, -112)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @187

-				Parent_View 	@186

-				location   	(750, 71)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C711EFA024E"

-			    client     	@185

-			    supplier   	@178

-			    vertices   	(list Points

-				(600, 112)

-				(788, 112))

-			    line_style 	0)

-			(object RoleView "moduleFile" @188

-			    Parent_View 	@185

-			    location   	(360, -112)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @189

-				Parent_View 	@188

-				location   	(489, 73)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	232

-				justify    	0

-				label      	"+moduleFile"

-				pctDist    	0.594557

-				height     	40

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C711EFA024C"

-			    client     	@185

-			    supplier   	@179

-			    vertices   	(list Points

-				(600, 112)

-				(412, 112))

-			    line_style 	0

-			    label      	(object SegLabel @190

-				Parent_View 	@188

-				location   	(432, 166)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object InheritTreeView "" @191

-		    location   	(928, 297)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@178

-		    vertices   	(list Points

-			(928, 297)

-			(928, 175)))

-		(object InheritView "" @192

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C712A1D0165"

-		    client     	@160

-		    supplier   	@178

-		    vertices   	(list Points

-			(809, 353)

-			(809, 297))

-		    line_style 	3

-		    origin_attachment 	(809, 353)

-		    terminal_attachment 	(809, 297)

-		    drawSupplier 	@191)

-		(object InheritView "" @193

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C712A2001EB"

-		    client     	@161

-		    supplier   	@178

-		    vertices   	(list Points

-			(975, 528)

-			(975, 297))

-		    line_style 	3

-		    origin_attachment 	(975, 528)

-		    terminal_attachment 	(975, 297)

-		    drawSupplier 	@191)

-		(object InheritView "" @194

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C712A2B025F"

-		    client     	@163

-		    supplier   	@178

-		    vertices   	(list Points

-			(1350, 944)

-			(1350, 297))

-		    line_style 	3

-		    origin_attachment 	(1350, 944)

-		    terminal_attachment 	(1350, 297)

-		    drawSupplier 	@191)

-		(object InheritView "" @195

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C712A23031C"

-		    client     	@162

-		    supplier   	@178

-		    vertices   	(list Points

-			(1200, 720)

-			(1200, 297))

-		    line_style 	3

-		    origin_attachment 	(1200, 720)

-		    terminal_attachment 	(1200, 297)

-		    drawSupplier 	@191)))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/ejbschema.cat b/plugins/org.eclipse.jst.j2ee.core/rose/ejbschema.cat
deleted file mode 100644
index 2bf0944a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/ejbschema.cat
+++ /dev/null
@@ -1,13576 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "ejb"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

-	    value      	(value Text "DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "ejb.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Ejb")))

-    quid       	"3780E272032D"

-    stereotype 	"metamodel"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-0001-005d9e6adec4:1")))

-	    quid       	"380567F50384"

-	    supplier   	"Logical View::java"

-	    quidu      	"36549F2C004E")

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-0002-005d9e6adec4:1")))

-	    quid       	"38FF3C1C0256"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "ContainerManagedEntity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-0003-005d9e6adec4:1")))

-	    quid       	"3780E3230174"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8a25660-8826-11e1-0004-005d9e6adec4:1")))

-		    quid       	"3780E3230175"

-		    supplier   	"Logical View::ejb::Entity"

-		    quidu      	"3780E6970351"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "version"

-		    quid       	"39BF039F01CD"

-		    documentation 	

-|Specifies the version of an entity bean with container-managed persistence.

-|

-|@invariant The cmp-version element must be one of the two following: 1.x , 2.x

-|@default 2.x

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    initv      	"2.x"

-		    exportControl 	"Public")

-		(object ClassAttribute "abstractSchemaName"

-		    quid       	"39BF1F2302C6"

-		    documentation 	

-|The abstract-schema-name element specifies the name of the abstract schema type of an entity bean with cmp-version 2.x. It is used in EJB QL queries.

-|

-|For example, the abstract-schema-name for an entity bean whose local interface is com.acme.commerce.Order might be Order.

-|

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    module     	"Component View::eBAFModels::EJBSchema::ContainerManagedEntityBean"

-	    quidu      	"3780E363009F"

-	    language   	"Java")

-	(object Class "MethodPermission"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-0005-005d9e6adec4:1"))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3780E35000D0"

-	    documentation 	"The method-permission element specifies that one or more security roles are allowed to invoke one or more enterprise bean methods. The method-permission element consists of an optional description, a list of security role names, and a list of method elements.  The security roles used in the method-permission element must be defined in the security-role element of the deployment descriptor, and the methods must be methods defined in the enterprise bean's remote and/or home interfaces."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8a25660-8826-11e1-0006-005d9e6adec4:1")))

-		    quid       	"392ED399030E"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "unchecked"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3996B52C0209"

-		    type       	"boolean"

-		    exportControl 	"Public"))

-	    module     	"Component View::eBAFModels::EJBSchema::MethodPermission"

-	    quidu      	"3780E36300A0"

-	    language   	"Java")

-	(object Class "AssemblyDescriptor"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-0007-005d9e6adec4:1"))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3780E35000D4"

-	    documentation 	"The assembly-descriptor element contains application-assembly information.  The application-assembly information consists of the following parts: the definition of security roles, the definition of method permissions, and the definition of transaction attributes for enterprise beans with container-managed transaction demarcation. All the parts are optional in the sense that they are omitted if the lists represented by them are empty. Providing an assembly-descriptor in the deployment descriptor is optional for the ejb-jar file producer."

-	    module     	"Component View::eBAFModels::EJBSchema::AssemblyDescriptor"

-	    quidu      	"3780E35B02C5"

-	    language   	"Java")

-	(object Class "MethodTransaction"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-0008-005d9e6adec4:1"))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3780E35000DE"

-	    documentation 	"Specifies how the container must manage transaction scopes for the enterprise bean's method invocations.  It consists of an optional description, a list of method elements, and a transaction attribute.The transaction attribute is to be applied to all the specified methods."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "transactionAttribute"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8a25660-8826-11e1-0009-005d9e6adec4:1"))

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E35000DF"

-		    documentation 	

-|The trans-attribute element specifies how the container must manage the transaction boundaries when delegating a method invocation to an enterprise bean's business method.

-|

-		    

-		    type       	"TransactionAttributeType"

-		    quidu      	"379F634503C0"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8a25660-8826-11e1-000a-005d9e6adec4:1")))

-		    quid       	"38055C050296"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    module     	"Component View::eBAFModels::EJBSchema::MethodTransaction"

-	    quidu      	"3780E36300A1"

-	    language   	"Java")

-	(object Class "Session"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8a25660-8826-11e1-000b-005d9e6adec4:1")))

-	    quid       	"3780E5F901EB"

-	    documentation 	

-|The session-beanType declares an session bean. The

-|declaration consists of:

-|

-|    - an optional description

-|    - an optional display name

-|    - an optional icon element that contains a small and a large

-|      icon file name

-|    - a name assigned to the enterprise bean

-|      in the deployment description

-|    - the names of the session bean's remote home and

-|      remote interfaces, if any

-|    - the names of the session bean's local home and

-|      local interfaces, if any

-|    - the name of the session bean's web service endpoint

-|      interface, if any

-|    - the session bean's implementation class

-|    - the session bean's state management type

-|    - the session bean's transaction management type

-|    - an optional declaration of the bean's

-|      environment entries

-|    - an optional declaration of the bean's EJB references

-|    - an optional declaration of the bean's local

-|      EJB references

-|    - an optional declaration of the bean's web

-|      service references

-|    - an optional declaration of the security role

-|      references

-|    - an optional declaration of the security identity

-|      to be used for the execution of the bean's methods

-|    - an optional declaration of the bean's resource

-|      manager connection factory references

-|    - an optional declaration of the bean's resource

-|      environment references.

-|    - an optional declaration of the bean's message

-|      destination references

-|

-|The elements that are optional are "optional" in the sense

-|that they are omitted when if lists represented by them are

-|empty.

-|

-|Either both the local-home and the local elements or both

-|the home and the remote elements must be specified for the

-|session bean.

-|

-|The service-endpoint element may only be specified if the

-|bean is a stateless session bean.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8a25660-8826-11e1-000c-005d9e6adec4:1")))

-		    quid       	"3780E3230120"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "transactionType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8a25660-8826-11e1-000d-005d9e6adec4:1"))

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E62403CE"

-		    documentation 	

-|The transaction-type element specifies an enterprise bean's transaction management type.

-|

-|

-		    

-		    type       	"TransactionType"

-		    quidu      	"37FCA48702EF"

-		    exportControl 	"Public")

-		(object ClassAttribute "sessionType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0000-005d9e6adec4:1"))

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E65B037D"

-		    type       	"SessionType"

-		    quidu      	"371BCA07010C"

-		    exportControl 	"Public"))

-	    module     	"Component View::eBAFModels::EJBSchema::SessionBean"

-	    quidu      	"3780E81A0159"

-	    language   	"Java")

-	(object Class "Entity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0001-005d9e6adec4:1")))

-	    quid       	"3780E6970351"

-	    documentation 	

-|The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity bean’s home and remote interfaces, if any; the names of the entity bean’s local home and local interface, if any; the entity bean’s implementation class; the entity bean’s persistence management type; the entity bean’s primary key class name; an indication of the entity bean’s reentrancy; an optional specification of the entity bean’s cmp-version; an optional specification of the entity bean’s abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the bean’s environment entries; an optional declaration of the bean’s EJB references; an optional declaration of the bean’s local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean’s methods; an optional declaration of the bean’s resource manager connection factory references; an optional declaration of the bean’s resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.

-|The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entity’s persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entity’s persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.

-|The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.

-|The optional local-home and local elements must be specified if the entity bean has a local home and local interface.

-|The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.

-|The other elements that are optional are "optional" in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if

-|the entity’s persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entity’s persistence-type is Bean.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0002-005d9e6adec4:1")))

-		    quid       	"3780E8080095"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "reentrant"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0003-005d9e6adec4:1"))

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E6A2031B"

-		    documentation 	

-|The reentrant element specifies whether an entity bean is reentrant or not.

-|

-		    

-		    type       	"boolean"

-		    exportControl 	"Public"))

-	    module     	"Component View::eBAFModels::EJBSchema::EntityBean"

-	    quidu      	"3780E81A015A"

-	    language   	"Java")

-	(object Class "EnterpriseBean"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0004-005d9e6adec4:1"))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Final"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Static"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateDefaultConstructor"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFinalizer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateStaticInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateInstanceInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateCode"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"DisableAutoSync"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ConstructorIs"

-		    value      	("Ctor_Set" 62)))

-	    quid       	"3780E71A010A"

-	    documentation 	

-|EnterpriseJavaBean is a class.  It can have instances, someone could write an 

-|instance document containing Departments and Employees.  It also has 

-|attributes, operations, and associations.  These are actually derived/filtered 

-|from its implementation classes and interfaces.  For mapping and browsing 

-|purposes, though, you would like the EJB to appear as a class.  

-|

-|In this light, even Session Beans can have associations and properties 

-|implemented by their bean.  For example, it would be meaningful to describe 

-|associations from a Session to the Entities which it uses to perform its work.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set)

-		    quid       	"3E4D54C30090"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E885D490290"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    module     	"Component View::eBAFModels::EJBSchema::EnterpriseJavaBean"

-	    quidu      	"3780E81A015B"

-	    language   	"Java"

-	    abstract   	TRUE)

-	(object Class "TransactionAttributeType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-000b-005d9e6adec4:1")))

-	    quid       	"379F634503C0"

-	    documentation 	

-|NotSupported=1

-|Supports=2

-|Required=3

-|RequiresNew=4

-|Mandatory=5

-|Never=6

-|

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NotSupported"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-000c-005d9e6adec4:1")))

-		    quid       	"3805573C007D"

-		    exportControl 	"Public")

-		(object ClassAttribute "Supports"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-000d-005d9e6adec4:1")))

-		    quid       	"3805574F0373"

-		    exportControl 	"Public")

-		(object ClassAttribute "Required"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-000e-005d9e6adec4:1")))

-		    quid       	"38055754017C"

-		    exportControl 	"Public")

-		(object ClassAttribute "RequiresNew"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-000f-005d9e6adec4:1")))

-		    quid       	"3805575D01B1"

-		    exportControl 	"Public")

-		(object ClassAttribute "Mandatory"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0010-005d9e6adec4:1")))

-		    quid       	"3805576101AC"

-		    exportControl 	"Public")

-		(object ClassAttribute "Never"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0011-005d9e6adec4:1")))

-		    quid       	"380557690122"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "TransactionType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0012-005d9e6adec4:1")))

-	    quid       	"37FCA48702EF"

-	    documentation 	

-|Bean=1

-|Container=2

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Bean"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0013-005d9e6adec4:1")))

-		    quid       	"380551D30153"

-		    exportControl 	"Public")

-		(object ClassAttribute "Container"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0014-005d9e6adec4:1")))

-		    quid       	"380551DC0138"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SessionType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0015-005d9e6adec4:1")))

-	    quid       	"371BCA07010C"

-	    documentation 	

-|Stateful=1

-|Stateless=2

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Stateful"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0016-005d9e6adec4:1")))

-		    quid       	"371BCA150080"

-		    exportControl 	"Public")

-		(object ClassAttribute "Stateless"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0017-005d9e6adec4:1")))

-		    quid       	"371BCA220115"

-		    exportControl 	"Public")))

-	(object Class "EJBMethodCategory"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0018-005d9e6adec4:1")))

-	    quid       	"3810D0380344"

-	    documentation 	"The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD."

-	    language   	"Java")

-	(object Class "EJBJar"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0019-005d9e6adec4:1")))

-	    quid       	"371BC55D01E1"

-	    documentation 	

-|The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file

-|name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar.

-	    

-	    stereotype 	"component"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B1580347"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "ejbClientJar"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-001e-005d9e6adec4:1")))

-		    quid       	"38BDA8B000E0"

-		    documentation 	

-|The optional ejb-client-jar element specifies a JAR file that contains the class files necessary for a client program to access the enterprise beans in the ejb-jar file. The Deployer should make the ejb-client JAR file accessible to the client's class-loader.  Example:<ejb-client-jar>employee_service_client.jar</ejb-client-jar>

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "version"

-		    quid       	"3E55AE3B0217"

-		    documentation 	

-|@version J2EE1.4

-|The version specifies the version of the

-|    EJB specification that the instance document must

-|    comply with. This information enables deployment tools

-|    to validate a particular EJB Deployment

-|    Descriptor with respect to a specific version of the EJB

-|    schema.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MethodElement"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-001f-005d9e6adec4:1")))

-	    quid       	"392ED22D008A"

-	    documentation 	

-|The method element is used to denote a method of an enterprise bean's

-|home or remote interface, or a set of methods. The ejb-name element

-|must be the name of one of the enterprise beans in declared in the

-|deployment descriptor; the optional method-intf element allows to

-|distinguish between a method with the same signature that is defined in

-|both the home and remote interface; the method-name element specifies

-|the method name; and the optional method-params elements identify a

-|single method among multiple methods with an overloaded method name.

-|

-|There are three possible styles of the method element syntax:

-|

-|1. 	<method>

-|		<ejb-name>EJBNAME</ejb-name>

-|   		<method-name>*</method-name>

-|	</method>

-|

-|   This style is used to refer to all the methods of the specified

-|   enterprise bean's home and remote interfaces.

-|

-|2. 	<method>

-|		<ejb-name>EJBNAME</ejb-name>

-|   		<method-name>METHOD</method-name>

-|	</method>>

-|

-|   This style is used to refer to the specified method of the

-|   specified enterprise bean. If there are multiple methods with

-|   the same overloaded name, the element of this style refers to

-|   all the methods with the overloaded name.

-|

-|

-|

-|

-|

-|3. 	<method>

-|		<ejb-name>EJBNAME</ejb-name>

-|   		<method-name>METHOD</method-name>

-|		<method-params>

-|   			<method-param>PARAM-1</method-param>

-|   			<method-param>PARAM-2</method-param>

-|          			...

-|   			<method-param>PARAM-n</method-param>

-|		</method-params>

-|	<method>	

-|

-|   This style is used to refer to a single method within a set of

-|   methods with an overloaded name. PARAM-1 through PARAM-n are the

-|   fully-qualified Java types of the method's input parameters (if

-|   the method has no input arguments, the method-params element

-|   contains no method-param elements). Arrays are specified by the

-|   array element's type, followed by one or more pair of square

-|   brackets (e.g. int[][]).

-|

-|

-|Used in: method-permission and container-transaction

-|

-|Examples:

-|

-|    Style 1: The following method element refers to all the methods of

-|		the EmployeeService bean's home and remote interfaces:

-|

-|		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>*</method-name>

-|		</method>

-|

-|	Style 2: The following method element refers to all the create

-|		methods of the EmployeeService bean's home interface:

-|

-|    		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>create</method-name>

-|		</method>

-|

-|	Style 3: The following method element refers to the

-|		create(String firstName, String LastName) method of the

-|	 	EmployeeService bean's home interface.

-|

-|    		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>create</method-name>

-|			<method-params>

-|				<method-param>java.lang.String</method-param>

-|				<method-param>java.lang.String</method-param>

-|			</method-params>

-|		</method>

-|

-|	

-|	The following example illustrates a Style 3 element with

-|	more complex parameter types. The method

-|			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,

-|				mypackage.MyClass[][] myclaar)

-|        would be specified as:

-|

-|    		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>foobar</method-name>

-|			<method-params>

-|				<method-param>char</method-param>

-|				<method-param>int</method-param>

-|				<method-param>int[]</method-param>

-|				<method-param>mypackage.MyClass</method-param>

-|				<method-param>mypackage.MyClass[][]</method-param>

-|			</method-params>

-|		</method>

-|

-|	The optional method-intf element can be used when it becomes

-|   necessary to differentiate between a method defined in the home

-|   interface and a method with the same name and signature that is

-|   defined in the remote interface.

-|

-|	For example, the method element

-|

-|   		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-intf>Remote</method-intf>

-|			<method-name>create</method-name>

-|			<method-params>

-|				<method-param>java.lang.String</method-param>

-|				<method-param>java.lang.String</method-param>

-|			</method-params>

-|		</method>

-|

-|	can be used to differentiate the create(String, String) method

-|   defined in the remote interface from the create(String, String)

-|   method defined in the home interface, which would be defined as

-|

-|   		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-intf>Home</method-intf>

-|			<method-name>create</method-name>

-|			<method-params>

-|				<method-param>java.lang.String</method-param>

-|				<method-param>java.lang.String</method-param>

-|			</method-params>

-|		</method>

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0020-005d9e6adec4:1")))

-		    quid       	"392ED2640378"

-		    documentation 	

-|The method-name element contains a name of an enterprise bean method,

-|or the asterisk (*) character. The asterisk is used when the element

-|denotes all the methods of an enterprise bean's remote and home

-|interfaces.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "parms"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0021-005d9e6adec4:1")))

-		    quid       	"392ED2640396"

-		    documentation 	

-|The method-params element contains a list of the fully-qualified Java type names of the method parameters.  In the current implementation this is a space delimitted String.  A null string indicates a generic method element that can apply to multiple methods with the same name.  An empty string indicates a method with zero parameters.  In future implementations (post V5), this field will be deprecated and migrated to use the multi-valued params field and the isZeroParams flag.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0022-005d9e6adec4:1"))

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"392ED26403B4"

-		    type       	"MethodElementKind"

-		    quidu      	"392ED2E70240"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0023-005d9e6adec4:1")))

-		    quid       	"398846C20370"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MethodElementKind"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0024-005d9e6adec4:1")))

-	    quid       	"392ED2E70240"

-	    documentation 	

-|@version J2EE1.4 added ServiceEndpoint

-|Unspecified=0

-|Remote=1

-|Home=2

-|Local=3

-|LocalHome=4

-|ServiceEndpoint=5

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Unspecified"

-		    quid       	"3CB47A280180")

-		(object ClassAttribute "Remote"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0026-005d9e6adec4:1")))

-		    quid       	"392ED311024A")

-		(object ClassAttribute "Home"

-		    quid       	"3CB47A730188")

-		(object ClassAttribute "Local"

-		    quid       	"39886E0D0301")

-		(object ClassAttribute "LocalHome"

-		    quid       	"39886E0F0209")

-		(object ClassAttribute "ServiceEndpoint"

-		    quid       	"3E4D28A10333")))

-	(object Class "CMPAttribute"

-	    quid       	"3A2288630003"

-	    documentation 	

-|Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A2288770341"

-		    supplier   	"Logical View::ecore::EAttribute"

-		    quidu      	"39238472039D"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"399ABC1500F0"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the cmr field.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "Relationships"

-	    quid       	"39BEF81703B3"

-	    documentation 	"The relationships describes the relationships in which entity beans with container managed persistence participate. The relationships element contains an optional description; and a list of ejb-relation elements, which specify the container managed relationships."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF09670239"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the collection of relationships.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "Query"

-	    quid       	"39BF02710327"

-	    documentation 	

-|The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query

-|is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF050D004D"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the query.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "ejbQL"

-		    quid       	"39BF058C0399"

-		    documentation 	

-|Contains the EJB QL query string that defines a finder or select query. This element is defined within the scope of a query element whose contents specify the finder or the select method that uses the query. The content must be a valid EJB QL query string for the entity bean for which the query is specified. The ejb-ql element must be specified for all queries that are expressible in EJB QL.

-|

-|@invariant The value must be a valid EJB QL query string for the entity bean or dependent object class for which the query is specified.

-|@invariant The ejb-ql element must be specified for all queries that are expressible in EJB QL.

-|

-|Example:

-|<query>

-|<query-method>

-|<method-name>ejbSelectPendingLineitems</method-name>

-|<method-params/>

-|</query-method>

-|<ejb-ql>SELECT ENTITY(l)

-|FROM LineItems l

-|WHERE l.shipped is FALSE

-|</ejb-ql>

-|</query>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "returnTypeMapping"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3988710702CA"

-		    documentation 	"The return-type-mapping element is used in the query element to specify whether an abstract schema type that is returned by a query for a select method is to be mapped to an EJBLocalObject or EJBObject type.  The value of the return-type-mapping element, if specified must be one of the following."

-		    stereotype 	"0..1"

-		    type       	"ReturnTypeMapping"

-		    quidu      	"398870D30276"

-		    exportControl 	"Public")))

-	(object Class "EJBRelation"

-	    quid       	"39BF0C0203BF"

-	    documentation 	

-|@version J2EE1.3

-|The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.

-|

-|@invariant The name of the relationship, if specified, is unique within the ejb-jar file.

-|@invariant self.relationshipRoles.size == 2

-|@invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name

-|

-|@migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension

-|@migration EJB1.1 added optional attribute, description:String

-|@migration EJB1.1 added optional attribute, name:String (May have been inherited from RefBaseObject previously)

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF0D4A02BC"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the ejb relation.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"39BF0D6F037E"

-		    documentation 	

-|The name of the relationship. If specified, must be unique within the ejb-jar file.

-|@invariant self.name unique within Set<collect(ejbJar.ejbRelations.name)>

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "EJBRelationshipRole"

-	    quid       	"39BF0DD0023D"

-	    documentation 	

-|@version J2EE1.3

-|The ejb-relationship-role element describes a role within a relationship.

-|There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship.

-|

-|@invariant multiplicity != null

-|@invariant roleSource != null

-|@invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. 

-|@invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.

-|

-|Example:

-|<ejb-relation>

-|  <ejb-relation-name>Product-LineItem</ejb-relation-name>

-|  <ejb-relationship-role>

-|    <ejb-relationship-role-name>product-has-lineitems</ejb-relationship-role-name>

-|    <multiplicity>One</multiplicity>

-|    <relationship-role-source>

-|      <ejb-name>ProductEJB</ejb-name>

-|    </relationship-role-source>

-|  </ejb-relationship-role>

-|...

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF102601B0"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the ejb relationship role.

-|

-|The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roleName"

-		    quid       	"39BF11580052"

-		    documentation 	

-|Defines a name for a role that is unique within an ejb-relation. Different relationships can use the same name for a role.

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "multiplicity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF12E902CF"

-		    documentation 	

-|Describes the multiplicity of the role that participates in a relation.

-|

-|The multiplicity element must be one of the two following:

-|     One

-|     Many

-|

-		    

-		    type       	"MultiplicityKind"

-		    quidu      	"399AEBCB02B7"

-		    exportControl 	"Public")

-		(object ClassAttribute "cascadeDelete"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF161E02EE"

-		    documentation 	

-|Specifies that, within a particular relationship, the lifetime of one or more entity beans is dependent upon the lifetime of another entity bean. The cascade-delete element can Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.

-|

-|

-|

-		    

-		    type       	"boolean"

-		    exportControl 	"Public")))

-	(object Class "RoleSource"

-	    quid       	"39BF147500E4"

-	    documentation 	

-|Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.

-|@invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3988849102EB"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "CMRField"

-	    quid       	"39BF1810004B"

-	    documentation 	

-|@version J2EE1.3

-|Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).

-|

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"399AD4690170"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003")))

-	(object Class "MessageDriven"

-	    quid       	"39BF3248010B"

-	    documentation 	

-|The message-driven element declares a message-driven

-|bean. The declaration consists of:

-|

-|    - an optional description

-|    - an optional display name

-|    - an optional icon element that contains a small and a large

-|      icon file name.

-|    - a name assigned to the enterprise bean in

-|      the deployment descriptor

-|    - the message-driven bean's implementation class

-|    - an optional declaration of the bean's messaging

-|      type

-|    - the message-driven bean's transaction management type

-|    - an optional declaration of the bean's

-|      message-destination-type

-|    - an optional declaration of the bean's

-|      message-destination-link

-|    - an optional declaration of the message-driven bean's

-|      activation configuration properties

-|    - an optional declaration of the bean's environment

-|      entries

-|    - an optional declaration of the bean's EJB references

-|    - an optional declaration of the bean's local EJB

-|      references

-|    - an optional declaration of the bean's web service

-|      references

-|    - an optional declaration of the security

-|      identity to be used for the execution of the bean's

-|      methods

-|    - an optional declaration of the bean's

-|      resource manager connection factory

-|      references

-|    - an optional declaration of the bean's resource

-|      environment references.

-|    - an optional declaration of the bean's message

-|      destination references

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39BF3253026F"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "transactionType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF33870164"

-		    documentation 	

-|The transaction-type element specifies an enterprise bean's transaction management type.

-|

-|The transaction-type element must be one of the two following: Bean, Container

-		    

-		    stereotype 	"0..1"

-		    type       	"TransactionType"

-		    quidu      	"37FCA48702EF"

-		    exportControl 	"Public")

-		(object ClassAttribute "messageSelector"

-		    quid       	"39BF33960133"

-		    documentation 	

-|The message-selector element is used to specify the JMS message

-|selector to be used in determining which messages a message-driven

-|bean is to receive.

-|

-|Example value: 

-|JMSType = `car' AND color = `blue' AND weight > 2500

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "acknowledgeMode"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF33AE0160"

-		    documentation 	

-|an optional declaration of the acknowledgment mode for the message-driven bean if bean-managed transaction demarcation is used (ie. self.transactionType = Bean)

-|

-|The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the onMessage message of a message-driven bean that uses bean managed transaction demarcation.

-|

-|The acknowledge-mode must be one of the two following:  Auto-acknowledge, Dups-ok-acknowledge

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"AcknowledgeMode"

-		    quidu      	"39BF36D703E4"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"4057A525008A"

-		    documentation 	

-| - an optional declaration of the bean's

-|	      message-destination-link

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDrivenDestination"

-	    quid       	"39BF33F10044"

-	    documentation 	"The message-driven-destination element provides advice to the Deployer as to whether a message-driven bean is intended for a Queue or a Topic. The declaration consists of: the type of the message-driven bean's intended destination and an optional declaration of whether a durable or non-durable subscription should be used if the destination-type is javax.jms.Topic."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF386B002D"

-		    documentation 	

-|The destination-type element specifies the type of the JMS destination. The type is specified by the Java interface expected to be implemented by the destination.

-|

-|The destination-type element must be one of the two following: javax.jms.Queue, javax.jms.Topic

-		    

-		    type       	"DestinationType"

-		    quidu      	"39978F5C0106"

-		    exportControl 	"Public")

-		(object ClassAttribute "subscriptionDurability"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF389B0087"

-		    documentation 	

-|The subscription-durability element specifies whether a JMS topic subscription is intended to be durable or nondurable.

-|

-|The subscription-durability element must be one of the two following:  Durable, NonDurable

-|

-		    

-		    type       	"SubscriptionDurabilityKind"

-		    quidu      	"39BF38F0029C"

-		    exportControl 	"Public")))

-	(object Class "AcknowledgeMode"

-	    quid       	"39BF36D703E4"

-	    documentation 	

-|Auto-acknowledge=0

-|Dups-ok-acknowledge=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "AutoAcknowledge"

-		    quid       	"39BF36FA03BC"

-		    exportControl 	"Public")

-		(object ClassAttribute "DupsOkAcknowledge"

-		    quid       	"39BF3701038A"

-		    exportControl 	"Public")))

-	(object Class "SubscriptionDurabilityKind"

-	    quid       	"39BF38F0029C"

-	    documentation 	

-|Durable=0

-|NonDurable=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Durable"

-		    quid       	"39BF391B01AD"

-		    exportControl 	"Public")

-		(object ClassAttribute "NonDurable"

-		    quid       	"39BF391D02DC"

-		    exportControl 	"Public")))

-	(object Class "ReturnTypeMapping"

-	    quid       	"398870D30276"

-	    documentation 	

-|Local=0

-|Remote=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Local"

-		    quid       	"398870E402E8"

-		    exportControl 	"Public")

-		(object ClassAttribute "Remote"

-		    quid       	"3E9B0B4F002A"

-		    exportControl 	"Public")))

-	(object Class "ExcludeList"

-	    quid       	"3997216E0147"

-	    documentation 	

-|The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.

-|

-|If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"399721A100A0"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DestinationType"

-	    quid       	"39978F5C0106"

-	    documentation 	

-|Queue=0

-|Topic=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Queue"

-		    quid       	"39978F680352"

-		    exportControl 	"Public")

-		(object ClassAttribute "Topic"

-		    quid       	"39978F7C0026"

-		    exportControl 	"Public")))

-	(object Class "QueryMethod"

-	    quid       	"399ACD9C02DF"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"399AD23802A9"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A")))

-	(object Class "MultiplicityKind"

-	    quid       	"399AEBCB02B7"

-	    documentation 	

-|One=0

-|Many=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "One"

-		    quid       	"399AEBEA0030"

-		    exportControl 	"Public")

-		(object ClassAttribute "Many"

-		    quid       	"399AEBEE0375"

-		    exportControl 	"Public")))

-	(object Class "ActivationConfigProperty"

-	    quid       	"3E4D1A1A00BF"

-	    documentation 	

-|@version J2EE1.4

-|The activation-config-propertyType contains a name/value

-|configuration property pair for a message-driven bean.

-|

-|The properties that are recognized for a particular

-|message-driven bean are determined by the messaging type.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "value"

-		    quid       	"3E4D1A36034A"

-		    documentation 	

-|The activation-config-property-value element

-|        contains the value for an activation configuration

-|        property of a message-driven bean.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3E4D1A49024D"

-		    documentation 	

-|The activation-config-property-name element contains

-|        the name for an activation configuration property of

-|        a message-driven bean.

-|

-|        For JMS message-driven beans, the following property

-|        names are recognized: acknowledgeMode,

-|        messageSelector, destinationType, subscriptionDurability

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ActivationConfig"

-	    quid       	"3E4D1A7E0131"

-	    documentation 	

-|@version J2EE1.4

-|The activation-configType defines information about the

-|expected configuration properties of the message-driven bean

-|in its operational environment. This may include information

-|about message acknowledgement, message selector, expected

-|destination type, etc.

-|

-|The configuration information is expressed in terms of

-|name/value configuration properties.

-|

-|The properties that are recognized for a particular

-|message-driven bean are determined by the messaging type.

-	    )

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0028-005d9e6adec4:1")))

-	    quid       	"3780E323012D"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0029-005d9e6adec4:1")))

-		    quid       	"3780E323012E"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)

-		(object Role "environmentProperties"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002a-005d9e6adec4:1")))

-		    quid       	"3780E323012F"

-		    label      	"environmentProperties"

-		    supplier   	"Logical View::common::EnvEntry"

-		    quidu      	"371BC77800E2"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002b-005d9e6adec4:1")))

-	    quid       	"3780E3230139"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$3"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002c-005d9e6adec4:1")))

-		    quid       	"3780E323013A"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)

-		(object Role "resourceRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002d-005d9e6adec4:1")))

-		    quid       	"3780E323013B"

-		    label      	"resourceRefs"

-		    supplier   	"Logical View::common::ResourceRef"

-		    quidu      	"371BC79303C6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "EjbToRoles"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002e-005d9e6adec4:1")))

-	    quid       	"3780E3230144"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$4"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002f-005d9e6adec4:1")))

-		    quid       	"3780E3230145"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"

-		    is_aggregate 	TRUE)

-		(object Role "securityRoleRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0030-005d9e6adec4:1")))

-		    quid       	"3780E3230146"

-		    label      	"securityRoleRefs"

-		    supplier   	"Logical View::common::SecurityRoleRef"

-		    quidu      	"371BC7A0025C"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "AssemblyDescriptorToMethodPermissions"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0031-005d9e6adec4:1")))

-	    quid       	"3780E35000D1"

-	    roles      	(list role_list

-		(object Role "assemblyDescriptor"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0032-005d9e6adec4:1")))

-		    quid       	"3780E35000D2"

-		    label      	"assemblyDescriptor"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "methodPermissions"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0033-005d9e6adec4:1")))

-		    quid       	"3780E35000D3"

-		    label      	"methodPermissions"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "MethodPermissionToMethods"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0034-005d9e6adec4:1")))

-	    quid       	"3780E35000EA"

-	    roles      	(list role_list

-		(object Role "/methods"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0035-005d9e6adec4:1")))

-		    quid       	"3780E35000EB"

-		    label      	"/methods"

-		    supplier   	"Logical View::java::Method"

-		    quidu      	"3654AE910271"

-		    client_cardinality 	(value cardinality "1..n")

-		    is_navigable 	TRUE)

-		(object Role "/methodPermission"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0036-005d9e6adec4:1")))

-		    quid       	"3780E35000EC"

-		    label      	"/methodPermission"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    client_cardinality 	(value cardinality "0..n")))

-	    derived    	TRUE)

-	(object Association "AssemblyDescriptorToMethodTransactions"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0037-005d9e6adec4:1")))

-	    quid       	"3780E35000D5"

-	    roles      	(list role_list

-		(object Role "assemblyDescriptor"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0038-005d9e6adec4:1")))

-		    quid       	"3780E35000D6"

-		    label      	"assemblyDescriptor"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "methodTransactions"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0039-005d9e6adec4:1")))

-		    quid       	"3780E35000D7"

-		    documentation 	"Specifies how the container must manage transaction scopes for the enterprise bean's method invocations.  The element consists of an optional description, a list of method elements, and a transaction attribute.The transaction attribute is to be applied to all the specified methods."

-		    label      	"methodTransactions"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$5"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003a-005d9e6adec4:1")))

-	    quid       	"3780E35000E0"

-	    roles      	(list role_list

-		(object Role "/methods"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003b-005d9e6adec4:1")))

-		    quid       	"3780E35000E1"

-		    label      	"/methods"

-		    supplier   	"Logical View::java::Method"

-		    quidu      	"3654AE910271"

-		    client_cardinality 	(value cardinality "1..n")

-		    is_navigable 	TRUE)

-		(object Role "/transactions"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003c-005d9e6adec4:1")))

-		    quid       	"3780E35000E2"

-		    label      	"/transactions"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

-		    client_cardinality 	(value cardinality "0..n"))))

-	(object Association "ejbClass"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003d-005d9e6adec4:1")))

-	    quid       	"380FDC3402C7"

-	    documentation 	"The ejb-class element contains the fully-qualified name of the enterprise bean's class.  Example: <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>"

-	    roles      	(list role_list

-		(object Role "ejbClass"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003e-005d9e6adec4:1")))

-		    quid       	"380FDC3501EC"

-		    label      	"ejbClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003f-005d9e6adec4:1")))

-		    quid       	"380FDC3501F6"

-		    label      	"ejb"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A")))

-	(object Association "homeInterface"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0040-005d9e6adec4:1")))

-	    quid       	"380FDC3701C7"

-	    documentation 	"The home element contains the fully-qualified name of the enterprise bean's home interface."

-	    roles      	(list role_list

-		(object Role "homeInterface"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0041-005d9e6adec4:1")))

-		    quid       	"380FDC440143"

-		    label      	"homeInterface"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0042-005d9e6adec4:1")))

-		    quid       	"380FDC44014D"

-		    label      	"ejb"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A")))

-	(object Association "remoteInterface"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0043-005d9e6adec4:1")))

-	    quid       	"380FDC46006A"

-	    documentation 	

-|The remote element contains the fully-qualified name of the enterprise bean's remote interface.

-|Example:	<remote>com.wombat.empl.EmployeeService</remote>

-|

-	    

-	    roles      	(list role_list

-		(object Role "remoteInterface"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0044-005d9e6adec4:1")))

-		    quid       	"380FDC470166"

-		    label      	"remoteInterface"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0045-005d9e6adec4:1")))

-		    quid       	"380FDC470167"

-		    label      	"ejb"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A")))

-	(object Association "primaryKey"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0046-005d9e6adec4:1")))

-	    quid       	"380FDDDF006B"

-	    roles      	(list role_list

-		(object Role "primaryKey"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0047-005d9e6adec4:1")))

-		    quid       	"380FDDE00117"

-		    documentation 	

-|The primkey-field element is used to specify the name of the primary key field for an entity with container-managed persistence.  The primkey-field must be one of the fields declared in the cmp-field

-|element, and the type of the field must be the same as the primary key type.  The primkey-field element is not used if the primary key maps to multiple container-managed fields (i.e. the key is a compound key). In this case, the fields of the primary key class must be public, and their names must correspond to the field names of the entity bean class that comprise the key.

-|Examples:<prim-key-class>java.lang.String</prim-key-class>

-|	<prim-key-class>com.wombat.empl.EmployeeID</prim-key-class>

-|	<prim-key-class>java.lang.Object</prim-key-class>

-|

-		    

-		    label      	"primaryKey"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0048-005d9e6adec4:1")))

-		    quid       	"380FDDE00121"

-		    label      	"ejb"

-		    supplier   	"Logical View::ejb::Entity"

-		    quidu      	"3780E6970351")))

-	(object Association "jarToAssemblyDescriptor"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0049-005d9e6adec4:1")))

-	    quid       	"38FF3CF801EE"

-	    roles      	(list role_list

-		(object Role "assemblyDescriptor"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004a-005d9e6adec4:1")))

-		    quid       	"38FF3CF90249"

-		    label      	"assemblyDescriptor"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "ejbJar"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004b-005d9e6adec4:1")))

-		    quid       	"38FF3CF90267"

-		    label      	"ejbJar"

-		    supplier   	"Logical View::ejb::EJBJar"

-		    quidu      	"371BC55D01E1"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "ejbJarToEnterpriseBeans"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004c-005d9e6adec4:1")))

-	    quid       	"38FF3D1F003B"

-	    roles      	(list role_list

-		(object Role "enterpriseBeans"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004d-005d9e6adec4:1")))

-		    quid       	"38FF3D1F037A"

-		    documentation 	"The enterprise-beans element contains the declarations of one or more enterprise beans."

-		    label      	"enterpriseBeans"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "ejbJar"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004e-005d9e6adec4:1")))

-		    quid       	"38FF3D1F03CB"

-		    label      	"ejbJar"

-		    supplier   	"Logical View::ejb::EJBJar"

-		    quidu      	"371BC55D01E1"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004f-005d9e6adec4:1")))

-	    quid       	"392ED18900FC"

-	    roles      	(list role_list

-		(object Role "roles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0050-005d9e6adec4:1")))

-		    quid       	"392ED18A028E"

-		    label      	"roles"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0051-005d9e6adec4:1")))

-		    quid       	"392ED18A02D4"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-0000-005d9e6adec4:1")))

-	    quid       	"392ED2880077"

-	    roles      	(list role_list

-		(object Role "methodElements"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0001-005d9e6adec4:1")))

-		    quid       	"392ED289001E"

-		    label      	"methodElements"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0002-005d9e6adec4:1")))

-		    quid       	"392ED2890028"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-0003-005d9e6adec4:1")))

-	    quid       	"392ED40900D4"

-	    roles      	(list role_list

-		(object Role "methodElements"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0004-005d9e6adec4:1")))

-		    quid       	"392ED40A018A"

-		    label      	"methodElements"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0005-005d9e6adec4:1")))

-		    quid       	"392ED40A019E"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-0006-005d9e6adec4:1")))

-	    quid       	"3937D6FF011D"

-	    roles      	(list role_list

-		(object Role "enterpriseBean"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0007-005d9e6adec4:1")))

-		    quid       	"3937D7000178"

-		    label      	"enterpriseBean"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "methodElement"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0008-005d9e6adec4:1")))

-		    quid       	"3937D7000218"

-		    label      	"methodElement"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$13"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-0009-005d9e6adec4:1")))

-	    quid       	"393EBFC500B4"

-	    roles      	(list role_list

-		(object Role "securityRoles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-000a-005d9e6adec4:1")))

-		    quid       	"393EBFC60083"

-		    label      	"securityRoles"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$14"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-000b-005d9e6adec4:1")))

-		    quid       	"393EBFC600C0"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$15"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-000c-005d9e6adec4:1")))

-	    quid       	"39045AE401F1"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$16"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-000d-005d9e6adec4:1")))

-		    quid       	"39045AE50080"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)

-		(object Role "ejbRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-000e-005d9e6adec4:1")))

-		    quid       	"39045AE50301"

-		    label      	"ejbRefs"

-		    supplier   	"Logical View::common::EjbRef"

-		    quidu      	"371BC78202B3"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$17"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-000f-005d9e6adec4:1")))

-	    quid       	"398831C30245"

-	    roles      	(list role_list

-		(object Role "persistentAttributes"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0010-005d9e6adec4:1")))

-		    quid       	"398831C50157"

-		    label      	"persistentAttributes"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0011-005d9e6adec4:1")))

-		    quid       	"398831C5017F"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-0012-005d9e6adec4:1")))

-	    quid       	"3988323B0355"

-	    roles      	(list role_list

-		(object Role "keyAttributes"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0013-005d9e6adec4:1")))

-		    quid       	"3988323D025E"

-		    label      	"keyAttributes"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0014-005d9e6adec4:1")))

-		    quid       	"3988323D027C"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$19"

-	    quid       	"39BEF8870378"

-	    roles      	(list role_list

-		(object Role "relationshipList"

-		    quid       	"39BEF889003C"

-		    documentation 	

-|The relationships collection describes the relationships in which container managed persistence entity beans and dependent objects participate. The relationships element contains an optional description; a list of ejb-entity-ref elements (references to entity beans that participate in container managed relationships but whose abstract persistence schemas are not included in the ejb-jar file);

-|and a list of ejb-relation elements, which specify the container managed relationships.

-		    

-		    label      	"relationshipList"

-		    supplier   	"Logical View::ejb::Relationships"

-		    quidu      	"39BEF81703B3"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "ejbJar"

-		    quid       	"39BEF889003D"

-		    label      	"ejbJar"

-		    supplier   	"Logical View::ejb::EJBJar"

-		    quidu      	"371BC55D01E1"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"39BF056702CD"

-	    roles      	(list role_list

-		(object Role "queryMethod"

-		    quid       	"39BF056901EA"

-		    documentation 	

-|The query-method element is used to specify the method (DB/SR/CM-"on the home") for a finder or

-|select query.

-|

-|The method-name element specifies the name of a finder or select

-|method in the entity bean's implementation class or a select method in

-|the dependent object class.

-|

-|Each method-param must be defined for a query-method using the

-|method-params element.

-|

-|Used in: query

-|

-|Example:

-|

-|Example:

-|<query>

-|  <description>Method finds large orders</description>

-|  <query-method>

-|    <method-name>findLargeOrders</method-name>

-|    <method-params></method-params>

-|  </query-method>

-|  <ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &gt; 1000</ejb-ql>

-|</query>

-		    

-		    label      	"queryMethod"

-		    supplier   	"Logical View::ejb::QueryMethod"

-		    quidu      	"399ACD9C02DF"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "query"

-		    quid       	"39BF056901F4"

-		    label      	"query"

-		    supplier   	"Logical View::ejb::Query"

-		    quidu      	"39BF02710327"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$21"

-	    quid       	"39BF0C400147"

-	    roles      	(list role_list

-		(object Role "ejbRelations"

-		    quid       	"39BF0C41001C"

-		    documentation 	"A list of ejb-relation elements, which specify the container managed relationships."

-		    label      	"ejbRelations"

-		    supplier   	"Logical View::ejb::EJBRelation"

-		    quidu      	"39BF0C0203BF"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "relationshipList"

-		    quid       	"39BF0C41001D"

-		    label      	"relationshipList"

-		    supplier   	"Logical View::ejb::Relationships"

-		    quidu      	"39BEF81703B3"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"39BF0DE30136"

-	    roles      	(list role_list

-		(object Role "relationshipRoles"

-		    quid       	"39BF0DE303D5"

-		    documentation 	

-|A collection containing exactly two relationship roles.

-|

-|@migration EJB1.1 Containment used to be by reference on relation--now by value.

-|

-		    

-		    label      	"relationshipRoles"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    client_cardinality 	(value cardinality "2")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "relationship"

-		    quid       	"39BF0DE303D6"

-		    label      	"relationship"

-		    supplier   	"Logical View::ejb::EJBRelation"

-		    quidu      	"39BF0C0203BF"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$23"

-	    quid       	"39BF14EA02FF"

-	    roles      	(list role_list

-		(object Role "source"

-		    quid       	"39BF14EC0059"

-		    documentation 	

-|Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.

-|@migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that may not be sufficient, as this can now refer to dependent class names or ejb refs

-		    

-		    label      	"source"

-		    supplier   	"Logical View::ejb::RoleSource"

-		    quidu      	"39BF147500E4"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "role"

-		    quid       	"39BF14EC005A"

-		    label      	"role"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"39BF182001C1"

-	    roles      	(list role_list

-		(object Role "cmrField"

-		    quid       	"39BF182100D2"

-		    documentation 	

-|A declaration of the CMRField, if any, by means of which the other side of the relationship is accessed from the perspective of the role source

-|

-|@migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list

-		    

-		    label      	"cmrField"

-		    supplier   	"Logical View::ejb::CMRField"

-		    quidu      	"39BF1810004B"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "role"

-		    quid       	"39BF182100DC"

-		    label      	"role"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$25"

-	    quid       	"39BF1BBD02ED"

-	    roles      	(list role_list

-		(object Role "/opposite"

-		    quid       	"39BF1BC0039C"

-		    label      	"/opposite"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$26"

-		    quid       	"39BF1BC003A6"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D")))

-	(object Association "$UNNAMED$27"

-	    quid       	"39BF209F00C4"

-	    roles      	(list role_list

-		(object Role "resourceEnvRefs"

-		    quid       	"39BF209F0395"

-		    documentation 	

-|A list of enterprise bean references to an administered object associated with a resource in the enterprise bean's environment. It consists of an optional description, the resource environment reference name, and an indication of the resource environment reference type expected by the enterprise bean code.

-|

-		    

-		    label      	"resourceEnvRefs"

-		    supplier   	"Logical View::common::ResourceEnvRef"

-		    quidu      	"39BF207200D3"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$28"

-		    quid       	"39BF209F0396"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$29"

-	    quid       	"39BF2C1F018F"

-	    roles      	(list role_list

-		(object Role "securityIdentity"

-		    quid       	"39BF2C200263"

-		    documentation 	

-|The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It

-|contains an optional description and a specification of the security identity to be used.

-		    

-		    label      	"securityIdentity"

-		    supplier   	"Logical View::common::SecurityIdentity"

-		    quidu      	"39BF2C040245"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$30"

-		    quid       	"39BF2C200264"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$31"

-	    quid       	"39BF340801FF"

-	    roles      	(list role_list

-		(object Role "destination"

-		    quid       	"39BF34090052"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes activationConfig

-|An optional declaration of the intended destination type of the message-driven bean

-		    

-		    label      	"destination"

-		    supplier   	"Logical View::ejb::MessageDrivenDestination"

-		    quidu      	"39BF33F10044"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "bean"

-		    quid       	"39BF3409005C"

-		    label      	"bean"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"398863840172"

-	    roles      	(list role_list

-		(object Role "ejbLocalRefs"

-		    quid       	"3988638502AA"

-		    label      	"ejbLocalRefs"

-		    supplier   	"Logical View::common::EJBLocalRef"

-		    quidu      	"398862E20101"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3988638502B4"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "localHomeInterface"

-	    quid       	"39886C2B018B"

-	    documentation 	

-|Contains the fully-qualified name of the enterprise bean’s local home interface.  

-|This reference is only used for Entity and Session beans.  Message Driven beans ignore the localHomeInterface if specified.

-	    

-	    roles      	(list role_list

-		(object Role "localHomeInterface"

-		    quid       	"39886C2C02AF"

-		    label      	"localHomeInterface"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$34"

-		    quid       	"39886C2C02D7"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A")))

-	(object Association "localInterface"

-	    quid       	"39886CC20283"

-	    documentation 	

-|Contains the fully-qualified name of the enterprise bean’s local interface.  

-|This reference is only used for Entity and Session beans.  Message Driven beans ignore the localInterface if specified.

-	    

-	    roles      	(list role_list

-		(object Role "localInterface"

-		    quid       	"39886CC600EE"

-		    label      	"localInterface"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"39886CC60120"

-		    supplier   	"Logical View::ejb::EnterpriseBean"

-		    quidu      	"3780E71A010A")))

-	(object Association "$UNNAMED$36"

-	    quid       	"398884C2036E"

-	    roles      	(list role_list

-		(object Role "entityBean"

-		    quid       	"398884C3027F"

-		    label      	"entityBean"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"398884C30289"

-		    supplier   	"Logical View::ejb::RoleSource"

-		    quidu      	"39BF147500E4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$38"

-	    quid       	"398886F503BD"

-	    roles      	(list role_list

-		(object Role "/roles"

-		    quid       	"398886F602D8"

-		    label      	"/roles"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    client_cardinality 	(value cardinality "0..n")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$39"

-		    quid       	"398886F602E2"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174")))

-	(object Association "$UNNAMED$40"

-	    quid       	"399721B602F9"

-	    roles      	(list role_list

-		(object Role "excludeList"

-		    quid       	"399721B7023C"

-		    label      	"excludeList"

-		    supplier   	"Logical View::ejb::ExcludeList"

-		    quidu      	"3997216E0147"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$41"

-		    quid       	"399721B70246"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$42"

-	    quid       	"3997226501A6"

-	    roles      	(list role_list

-		(object Role "methodElements"

-		    quid       	"399722660284"

-		    label      	"methodElements"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$43"

-		    quid       	"399722660298"

-		    supplier   	"Logical View::ejb::ExcludeList"

-		    quidu      	"3997216E0147"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$44"

-	    quid       	"399AE0FB03D3"

-	    roles      	(list role_list

-		(object Role "collectionType"

-		    quid       	"399AE0FC038F"

-		    label      	"collectionType"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$45"

-		    quid       	"399AE0FC03B7"

-		    supplier   	"Logical View::ejb::CMRField"

-		    quidu      	"39BF1810004B"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$46"

-	    quid       	"3E4D1AE2015D"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3E4D1AE20333"

-		    label      	"configProperties"

-		    supplier   	"Logical View::ejb::ActivationConfigProperty"

-		    quidu      	"3E4D1A1A00BF"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$47"

-		    quid       	"3E4D1AE20335"

-		    supplier   	"Logical View::ejb::ActivationConfig"

-		    quidu      	"3E4D1A7E0131"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$48"

-	    quid       	"3E4D1B050149"

-	    roles      	(list role_list

-		(object Role "activationConfig"

-		    quid       	"3E4D1B0700A2"

-		    documentation 	"@version J2EE1.4"

-		    label      	"activationConfig"

-		    supplier   	"Logical View::ejb::ActivationConfig"

-		    quidu      	"3E4D1A7E0131"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$49"

-		    quid       	"3E4D1B0700A4"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$50"

-	    quid       	"3E4D1BF402E7"

-	    roles      	(list role_list

-		(object Role "messageDestinations"

-		    quid       	"3E4D1BF600B9"

-		    documentation 	"@version J2EE1.4"

-		    label      	"messageDestinations"

-		    supplier   	"Logical View::common::MessageDestination"

-		    quidu      	"3E4C211001CF"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$51"

-		    quid       	"3E4D1BF600C3"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$52"

-	    quid       	"3E4D23AA024F"

-	    roles      	(list role_list

-		(object Role "messageDestinationRefs"

-		    quid       	"3E4D23AD01AA"

-		    label      	"messageDestinationRefs"

-		    supplier   	"Logical View::common::MessageDestinationRef"

-		    quidu      	"3E4C1F52028C"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$53"

-		    quid       	"3E4D23AD01B4"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$54"

-	    quid       	"3E4D25D600F0"

-	    roles      	(list role_list

-		(object Role "entity"

-		    quid       	"3E4D25D600F1"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "queries"

-		    quid       	"3E4D25D600F2"

-		    documentation 	

-|@version J2EE1.4 moved from CME

-|The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.

-|

-|@invariant see description

-|

-		    

-		    label      	"queries"

-		    supplier   	"Logical View::ejb::Query"

-		    quidu      	"39BF02710327"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$55"

-	    quid       	"3E4D298201E2"

-	    roles      	(list role_list

-		(object Role "messageDestination"

-		    quid       	"3E4D29830270"

-		    documentation 	"@version J2EE1.4"

-		    label      	"messageDestination"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$56"

-		    quid       	"3E4D2983027A"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B")))

-	(object Association "$UNNAMED$57"

-	    quid       	"3E4D2FA901C9"

-	    roles      	(list role_list

-		(object Role "serviceRefs"

-		    quid       	"3E4D2FAA02C5"

-		    label      	"serviceRefs"

-		    supplier   	"Logical View::wsclient::ServiceRef"

-		    quidu      	"3E4D2F560184"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$58"

-		    quid       	"3E4D2FAA02CF"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$59"

-	    quid       	"3E4D2FE101FC"

-	    roles      	(list role_list

-		(object Role "serviceInterface"

-		    quid       	"3E4D2FE4012E"

-		    documentation 	

-|The service-interface element declares the fully qualified class

-|        name of the JAX-RPC Service interface the client depends on.

-|        In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC

-|        generated Service Interface class may also be specified.

-		    

-		    label      	"serviceInterface"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$60"

-		    quid       	"3E4D2FE4014C"

-		    supplier   	"Logical View::wsclient::ServiceRef"

-		    quidu      	"3E4D2F560184")))

-	(object Association "$UNNAMED$61"

-	    quid       	"3E562D9E0254"

-	    roles      	(list role_list

-		(object Role "messagingType"

-		    quid       	"3E562D9F0183"

-		    documentation 	

-|@version J2EE1.4

-|The messaging-type element specifies the message

-|        listener interface of the message-driven bean. If

-|        the messaging-type element is not specified, it is

-|        assumed to be javax.jms.MessageListener.

-		    

-		    label      	"messagingType"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$62"

-		    quid       	"3E562D9F0197"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B")))

-	(object Association "$UNNAMED$63"

-	    quid       	"3E4D1AAD00AC"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1AAD03A5"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$64"

-		    quid       	"3E4D1AAD03CD"

-		    supplier   	"Logical View::ejb::ActivationConfig"

-		    quidu      	"3E4D1A7E0131"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$65"

-	    quid       	"3E4D1FCB01AA"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1FCC00C5"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$66"

-		    quid       	"3E4D1FCC00E3"

-		    supplier   	"Logical View::ejb::EJBRelation"

-		    quidu      	"39BF0C0203BF"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$67"

-	    quid       	"3E4D28600218"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D28620152"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$68"

-		    quid       	"3E4D28620198"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$69"

-	    quid       	"3E4D210300CD"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D210502EC"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$70"

-		    quid       	"3E4D2105030A"

-		    supplier   	"Logical View::ejb::RoleSource"

-		    quidu      	"39BF147500E4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$71"

-	    quid       	"3E4D1D1F0161"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1D2001DA"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$72"

-		    quid       	"3E4D1D2001EE"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$73"

-	    quid       	"3E4D1FBF01CB"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1FC1001F"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$74"

-		    quid       	"3E4D1FC10047"

-		    supplier   	"Logical View::ejb::Relationships"

-		    quidu      	"39BEF81703B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$75"

-	    quid       	"3E4D26BB00FA"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D26BC02F0"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$76"

-		    quid       	"3E4D26BC0318"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$77"

-	    quid       	"3E4D20C102C6"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D20C400CC"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$78"

-		    quid       	"3E4D20C400EA"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$79"

-	    quid       	"3E4D1F230090"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1F2303D9"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$80"

-		    quid       	"3E4D1F24000F"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$81"

-	    quid       	"3E4D26680317"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D266A00D5"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$82"

-		    quid       	"3E4D266A00F3"

-		    supplier   	"Logical View::ejb::ExcludeList"

-		    quidu      	"3997216E0147"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$83"

-	    quid       	"3E56500D0259"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E56500E0142"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$84"

-		    quid       	"3E56500E0174"

-		    supplier   	"Logical View::ejb::Query"

-		    quidu      	"39BF02710327"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$85"

-	    quid       	"3E567CA2007F"

-	    roles      	(list role_list

-		(object Role "serviceEndpoint"

-		    quid       	"3E567CA30225"

-		    documentation 	

-|@version J2EE1.4

-|The service-endpoint element contains the

-|        fully-qualified name of the enterprise bean's web

-|        service endpoint interface. The service-endpoint

-|        element may only be specified for a stateless

-|        session bean. The specified interface must be a

-|        valid JAX-RPC service endpoint interface.

-		    

-		    label      	"serviceEndpoint"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$86"

-		    quid       	"3E567CA30243"

-		    supplier   	"Logical View::ejb::Session"

-		    quidu      	"3780E5F901EB")))

-	(object Association "$UNNAMED$87"

-	    quid       	"3FA688620267"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$88"

-		    quid       	"3FA68866035D"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$89"

-		    quid       	"3FA68866035F"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174")))

-	(object Association "$UNNAMED$90"

-	    quid       	"3FA695890240"

-	    roles      	(list role_list

-		(object Role "primKeyField"

-		    quid       	"3FA6958B0008"

-		    label      	"primKeyField"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    quid       	"3FA6958B0012"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "EJB Jar"

-	    quid       	"3780E2870251"

-	    title      	"EJB Jar"

-	    documentation 	

-|Based on the Moscone DD, translating class name elements to class references.

-|

-|Note that EJB-links only appear in the deployment model, at anlysis/design time, they might be derived from the association roles for the EJB.

-|

-|Also, see notes on EnterpriseJavaBean.

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	2363

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::Session" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1133, 1756)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(766, 1625)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	734

-			justify    	0

-			label      	"Session")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E5F901EB"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(766, 1686)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	631)

-		    width      	752

-		    height     	286

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Entity" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1776, 1756)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1575, 1650)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	402

-			justify    	0

-			label      	"Entity")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E6970351"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1575, 1711)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	346)

-		    width      	420

-		    height     	236

-		    autoResize 	TRUE)

-		(object Label @3

-		    location   	(159, 47)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	1300

-		    label      	"EJB 2.1 Model (EJB2.0 & 1.1 Backward Compatible)")

-		(object NoteView @4

-		    location   	(526, 2067)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(260, 2002)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	496

-			label      	"See detail on separate class diagrams...")

-		    fill_color 	14679807

-		    width      	556

-		    height     	143)

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1773, 2140)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1537, 2099)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	472

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E3230174"

-		    width      	490

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @6

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"3780E3230175"

-		    client     	@5

-		    supplier   	@2

-		    vertices   	(list Points

-			(1775, 2087)

-			(1775, 1874))

-		    line_style 	3

-		    origin_attachment 	(1775, 2087)

-		    terminal_attachment 	(1775, 1874))

-		(object ClassView "Class" "Logical View::ejb::MessageDriven" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2275, 1683)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(2119, 1642)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	312

-			justify    	0

-			label      	"MessageDriven")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF3248010B"

-		    width      	330

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @8

-		    location   	(2431, 1971)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(2218, 1865)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	390

-			label      	"See EJB2.0 Message Driven Bean diagram for details.")

-		    fill_color 	14679807

-		    width      	450

-		    height     	225)

-		(object AttachView "" @9

-		    stereotype 	TRUE

-		    client     	@8

-		    supplier   	@7

-		    vertices   	(list Points

-			(2369, 1858)

-			(2303, 1736))

-		    line_style 	0)

-		(object NoteView @10

-		    location   	(1597, 2412)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@10

-			location   	(1394, 2306)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	371

-			label      	"See Container Managed Entity diagram for details.")

-		    fill_color 	14679807

-		    width      	431

-		    height     	225)

-		(object AttachView "" @11

-		    stereotype 	TRUE

-		    client     	@10

-		    supplier   	@5

-		    vertices   	(list Points

-			(1669, 2299)

-			(1738, 2193))

-		    line_style 	0)

-		(object NoteView @12

-		    location   	(845, 1388)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@12

-			location   	(617, 1307)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	421

-			label      	"Added ejbJar back reference")

-		    fill_color 	14679807

-		    width      	481

-		    height     	175)

-		(object NoteView @13

-		    location   	(381, 378)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@13

-			location   	(62, 134)

-			fill_color 	13434879

-			nlines     	9

-			max_width  	603

-			label      	

-|Deprecations:

-|EJBJar::description

-|EJBJar::displayName

-|EJBJar::smallIcon

-|EJBJar::largeIcon

-|EnterpriseBean::description

-|EnterpriseBean::displayName

-|EnterpriseBean::smallIcon

-|EnterpriseBean::largeIcon

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	663

-		    height     	500)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @14

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2250, 1040)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@14

-			location   	(2072, 961)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::AssemblyDescriptor" @15

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1322, 842)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(1212, 776)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	220

-			justify    	0

-			label      	"AssemblyDescriptor")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E35000D4"

-		    width      	238

-		    height     	157

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Relationships" @16

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(334, 1742)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@16

-			location   	(253, 1676)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"Relationships")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BEF81703B3"

-		    height     	157

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @17

-		    stereotype 	TRUE

-		    client     	@4

-		    supplier   	@16

-		    vertices   	(list Points

-			(484, 1995)

-			(380, 1820))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @18

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1404, 1259)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@18

-			location   	(1182, 1078)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	444

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@18

-			location   	(1182, 1139)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	253)

-		    width      	462

-		    height     	386

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @19

-		    location   	(1404, 1547)

-		    line_color 	10485760

-		    fill_color 	14472649

-		    supplier   	@18

-		    vertices   	(list Points

-			(1404, 1547)

-			(1404, 1452)))

-		(object InheritView "" @20

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"3780E8080095"

-		    client     	@2

-		    supplier   	@18

-		    vertices   	(list Points

-			(1847, 1637)

-			(1847, 1547))

-		    line_style 	3

-		    origin_attachment 	(1847, 1637)

-		    terminal_attachment 	(1847, 1547)

-		    drawSupplier 	@19)

-		(object InheritView "" @21

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"3780E3230120"

-		    client     	@1

-		    supplier   	@18

-		    vertices   	(list Points

-			(1153, 1613)

-			(1153, 1547))

-		    line_style 	3

-		    origin_attachment 	(1153, 1613)

-		    terminal_attachment 	(1153, 1547)

-		    drawSupplier 	@19)

-		(object ClassView "Class" "Logical View::ejb::EJBJar" @22

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(367, 936)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@22

-			location   	(130, 752)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	474

-			justify    	0

-			label      	"EJBJar")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@22

-			location   	(130, 702)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	474

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"371BC55D01E1"

-		    compartment 	(object Compartment

-			Parent_View 	@22

-			location   	(130, 813)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	412)

-		    width      	492

-		    height     	492

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "jarToAssemblyDescriptor" @23

-		    location   	(908, 810)

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"38FF3CF801EE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "assemblyDescriptor" @24

-			    Parent_View 	@23

-			    location   	(684, 570)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @25

-				Parent_View 	@24

-				location   	(1007, 768)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	383

-				justify    	0

-				label      	"+assemblyDescriptor"

-				pctDist    	0.335385

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3CF90249"

-			    client     	@23

-			    supplier   	@15

-			    vertices   	(list Points

-				(908, 810)

-				(1203, 810))

-			    line_style 	3

-			    origin_attachment 	(908, 810)

-			    terminal_attachment 	(1203, 810)

-			    label      	(object SegLabel @26

-				Parent_View 	@24

-				location   	(1143, 863)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.795107

-				height     	53

-				orientation 	1))

-			(object RoleView "ejbJar" @27

-			    Parent_View 	@23

-			    location   	(684, 570)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3CF90267"

-			    client     	@23

-			    supplier   	@22

-			    vertices   	(list Points

-				(908, 810)

-				(613, 810))

-			    line_style 	3

-			    origin_attachment 	(908, 810)

-			    terminal_attachment 	(613, 810))))

-		(object AssociationViewNew "$UNNAMED$19" @28

-		    location   	(278, 1422)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BEF8870378"

-		    roleview_list 	(list RoleViews

-			(object RoleView "relationshipList" @29

-			    Parent_View 	@28

-			    location   	(-58, 1022)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @30

-				Parent_View 	@29

-				location   	(450, 1566)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+relationshipList"

-				pctDist    	0.597510

-				height     	172

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003C"

-			    client     	@28

-			    supplier   	@16

-			    vertices   	(list Points

-				(278, 1422)

-				(278, 1663))

-			    line_style 	3

-			    origin_attachment 	(278, 1422)

-			    terminal_attachment 	(278, 1663)

-			    label      	(object SegLabel @31

-				Parent_View 	@29

-				location   	(348, 1616)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.805031

-				height     	70

-				orientation 	0))

-			(object RoleView "ejbJar" @32

-			    Parent_View 	@28

-			    location   	(-58, 1022)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @33

-				Parent_View 	@32

-				location   	(384, 1253)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.707602

-				height     	106

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003D"

-			    client     	@28

-			    supplier   	@22

-			    vertices   	(list Points

-				(278, 1422)

-				(278, 1182))

-			    line_style 	3

-			    origin_attachment 	(278, 1422)

-			    terminal_attachment 	(278, 1182)

-			    label      	(object SegLabel @34

-				Parent_View 	@32

-				location   	(332, 1207)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "ejbJarToEnterpriseBeans" @35

-		    location   	(893, 1122)

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"38FF3D1F003B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "enterpriseBeans" @36

-			    Parent_View 	@35

-			    location   	(669, 882)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @37

-				Parent_View 	@36

-				location   	(1005, 1159)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	335

-				justify    	0

-				label      	"+enterpriseBeans"

-				pctDist    	0.403279

-				height     	37

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3D1F037A"

-			    client     	@35

-			    supplier   	@18

-			    vertices   	(list Points

-				(893, 1122)

-				(1173, 1122))

-			    line_style 	3

-			    origin_attachment 	(893, 1122)

-			    terminal_attachment 	(1173, 1122)

-			    label      	(object SegLabel @38

-				Parent_View 	@36

-				location   	(1080, 1085)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.666113

-				height     	38

-				orientation 	0))

-			(object RoleView "ejbJar" @39

-			    Parent_View 	@35

-			    location   	(669, 882)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @40

-				Parent_View 	@39

-				location   	(669, 1081)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3D1F03CB"

-			    client     	@35

-			    supplier   	@22

-			    vertices   	(list Points

-				(893, 1122)

-				(613, 1122))

-			    line_style 	3

-			    origin_attachment 	(893, 1122)

-			    terminal_attachment 	(613, 1122)

-			    label      	(object SegLabel @41

-				Parent_View 	@39

-				location   	(642, 1176)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AttachView "" @42

-		    stereotype 	TRUE

-		    client     	@12

-		    supplier   	@40

-		    vertices   	(list Points

-			(794, 1300)

-			(684, 1107))

-		    line_style 	0)

-		(object InheritView "" @43

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF3253026F"

-		    client     	@7

-		    supplier   	@18

-		    vertices   	(list Points

-			(2269, 1630)

-			(2269, 1519)

-			(1397, 1519)

-			(1397, 1452))

-		    line_style 	3

-		    origin_attachment 	(2269, 1630)

-		    terminal_attachment 	(1397, 1452))))

-	(object ClassDiagram "Enterprise Bean"

-	    quid       	"3805531D02C3"

-	    title      	"Enterprise Bean"

-	    documentation 	

-|Roles are shared by multiple EJBs.

-|

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	2388

-	    origin_y   	656

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::JNDIEnvRefsGroup" @44

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(478, 418)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@44

-			location   	(281, 339)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"JNDIEnvRefsGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D53950349"

-		    width      	412

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @45

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2868, 765)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@45

-			location   	(2646, 680)

-			nlines     	2

-			max_width  	444

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC7A0025C"

-		    width      	462

-		    height     	194

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @46

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2817, 389)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@46

-			location   	(2703, 335)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	246

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @47

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(944, 928)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@47

-			location   	(791, 850)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	306

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@47

-			location   	(791, 911)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	244)

-		    width      	324

-		    height     	180

-		    autoResize 	TRUE)

-		(object AssociationViewNew "EjbToRoles" @48

-		    location   	(1871, 841)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @49

-			Parent_View 	@48

-			location   	(1867, 751)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"EjbToRoles"

-			pctDist    	0.450000

-			height     	91

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230144"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityRoleRefs" @50

-			    Parent_View 	@48

-			    location   	(991, 297)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @51

-				Parent_View 	@50

-				location   	(2367, 801)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	454

-				justify    	0

-				label      	"+securityRoleRefs"

-				pctDist    	0.648529

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E3230146"

-			    client     	@48

-			    supplier   	@45

-			    vertices   	(list Points

-				(1871, 841)

-				(2637, 841))

-			    line_style 	3

-			    origin_attachment 	(1871, 841)

-			    terminal_attachment 	(2637, 841)

-			    label      	(object SegLabel @52

-				Parent_View 	@50

-				location   	(2537, 878)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.870629

-				height     	37

-				orientation 	1))

-			(object RoleView "$UNNAMED$4" @53

-			    Parent_View 	@48

-			    location   	(991, 297)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @54

-				Parent_View 	@53

-				location   	(1259, 800)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E3230145"

-			    client     	@48

-			    supplier   	@47

-			    vertices   	(list Points

-				(1871, 841)

-				(1106, 841))

-			    line_style 	3

-			    origin_attachment 	(1871, 841)

-			    terminal_attachment 	(1106, 841))))

-		(object AssociationViewNew "ejbClass" @55

-		    location   	(1791, 538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @56

-			Parent_View 	@55

-			location   	(1791, 479)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"ejbClass"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3402C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejb" @57

-			    Parent_View 	@55

-			    location   	(1521, -572)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @58

-				Parent_View 	@57

-				location   	(1083, 628)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"+ejb"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501F6"

-			    client     	@55

-			    supplier   	@47

-			    vertices   	(list Points

-				(1791, 538)

-				(1041, 538)

-				(1041, 838))

-			    line_style 	3

-			    origin_attachment 	(1791, 538)

-			    terminal_attachment 	(1041, 838))

-			(object RoleView "ejbClass" @59

-			    Parent_View 	@55

-			    location   	(1521, -572)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @60

-				Parent_View 	@59

-				location   	(2630, 580)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+ejbClass"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501EC"

-			    client     	@55

-			    supplier   	@46

-			    vertices   	(list Points

-				(1791, 538)

-				(2757, 538)

-				(2757, 455))

-			    line_style 	3

-			    origin_attachment 	(1791, 538)

-			    terminal_attachment 	(2757, 455)

-			    label      	(object SegLabel @61

-				Parent_View 	@59

-				location   	(2734, 485)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "homeInterface" @62

-		    location   	(1991, 634)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @63

-			Parent_View 	@62

-			location   	(1991, 575)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"homeInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3701C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejb" @64

-			    Parent_View 	@62

-			    location   	(1721, -476)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @65

-				Parent_View 	@64

-				location   	(1116, 676)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"+ejb"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC44014D"

-			    client     	@62

-			    supplier   	@47

-			    vertices   	(list Points

-				(1991, 634)

-				(1100, 634)

-				(1100, 838))

-			    line_style 	3

-			    origin_attachment 	(1991, 634)

-			    terminal_attachment 	(1100, 838))

-			(object RoleView "homeInterface" @66

-			    Parent_View 	@62

-			    location   	(1721, -476)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @67

-				Parent_View 	@66

-				location   	(2732, 512)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	283

-				justify    	0

-				label      	"+homeInterface"

-				pctDist    	0.948617

-				height     	176

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC440143"

-			    client     	@62

-			    supplier   	@46

-			    vertices   	(list Points

-				(1991, 634)

-				(2907, 634)

-				(2907, 455))

-			    line_style 	3

-			    origin_attachment 	(1991, 634)

-			    terminal_attachment 	(2907, 455)

-			    label      	(object SegLabel @68

-				Parent_View 	@66

-				location   	(2854, 565)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "remoteInterface" @69

-		    location   	(1611, 406)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @70

-			Parent_View 	@69

-			location   	(1611, 347)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"remoteInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC46006A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejb" @71

-			    Parent_View 	@69

-			    location   	(1341, -704)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @72

-				Parent_View 	@71

-				location   	(1002, 621)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"+ejb"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470167"

-			    client     	@69

-			    supplier   	@47

-			    vertices   	(list Points

-				(1611, 406)

-				(960, 406)

-				(960, 838))

-			    line_style 	3

-			    origin_attachment 	(1611, 406)

-			    terminal_attachment 	(960, 838))

-			(object RoleView "remoteInterface" @73

-			    Parent_View 	@69

-			    location   	(1341, -704)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @74

-				Parent_View 	@73

-				location   	(2476, 448)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+remoteInterface"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470166"

-			    client     	@69

-			    supplier   	@46

-			    vertices   	(list Points

-				(1611, 406)

-				(2694, 406))

-			    line_style 	3

-			    origin_attachment 	(1611, 406)

-			    terminal_attachment 	(2694, 406)

-			    label      	(object SegLabel @75

-				Parent_View 	@73

-				location   	(2586, 353)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "localHomeInterface" @76

-		    location   	(1554, 256)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @77

-			Parent_View 	@76

-			location   	(1554, 197)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"localHomeInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39886C2B018B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$34" @78

-			    Parent_View 	@76

-			    location   	(1284, -854)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @79

-				Parent_View 	@78

-				location   	(967, 596)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02D7"

-			    client     	@76

-			    supplier   	@47

-			    vertices   	(list Points

-				(1554, 256)

-				(925, 256)

-				(925, 838))

-			    line_style 	3

-			    origin_attachment 	(1554, 256)

-			    terminal_attachment 	(925, 838))

-			(object RoleView "localHomeInterface" @80

-			    Parent_View 	@76

-			    location   	(1284, -854)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @81

-				Parent_View 	@80

-				location   	(2522, 298)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	374

-				justify    	0

-				label      	"+localHomeInterface"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02AF"

-			    client     	@76

-			    supplier   	@46

-			    vertices   	(list Points

-				(1554, 256)

-				(2698, 256)

-				(2698, 323))

-			    line_style 	3

-			    origin_attachment 	(1554, 256)

-			    terminal_attachment 	(2698, 323)

-			    label      	(object SegLabel @82

-				Parent_View 	@80

-				location   	(2643, 203)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "localInterface" @83

-		    location   	(1609, 113)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @84

-			Parent_View 	@83

-			location   	(1609, 54)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"localInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39886CC20283"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$35" @85

-			    Parent_View 	@83

-			    location   	(1339, -997)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @86

-				Parent_View 	@85

-				location   	(930, 549)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC60120"

-			    client     	@83

-			    supplier   	@47

-			    vertices   	(list Points

-				(1609, 113)

-				(888, 113)

-				(888, 838))

-			    line_style 	3

-			    origin_attachment 	(1609, 113)

-			    terminal_attachment 	(888, 838))

-			(object RoleView "localInterface" @87

-			    Parent_View 	@83

-			    location   	(1339, -997)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(2766, 155)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	261

-				justify    	0

-				label      	"+localInterface"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC600EE"

-			    client     	@83

-			    supplier   	@46

-			    vertices   	(list Points

-				(1609, 113)

-				(2845, 113)

-				(2845, 323))

-			    line_style 	3

-			    origin_attachment 	(1609, 113)

-			    terminal_attachment 	(2845, 323)

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(2899, 178)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object InheritView "" @90

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D54C30090"

-		    client     	@47

-		    supplier   	@44

-		    vertices   	(list Points

-			(860, 837)

-			(561, 509))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::SecurityIdentity" @91

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1725, 1368)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@91

-			location   	(1547, 1262)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityIdentity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BF2C040245"

-		    compartment 	(object Compartment

-			Parent_View 	@91

-			location   	(1547, 1377)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	391)

-		    width      	374

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$29" @92

-		    location   	(1321, 1139)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39BF2C1F018F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$30" @93

-			    Parent_View 	@92

-			    location   	(-114, -670)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1128, 1079)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200264"

-			    client     	@92

-			    supplier   	@47

-			    vertices   	(list Points

-				(1321, 1139)

-				(1105, 1018))

-			    line_style 	0)

-			(object RoleView "securityIdentity" @95

-			    Parent_View 	@92

-			    location   	(-114, -670)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @96

-				Parent_View 	@95

-				location   	(1268, 1344)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	299

-				justify    	0

-				label      	"+securityIdentity"

-				pctDist    	0.219644

-				height     	205

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200263"

-			    client     	@92

-			    supplier   	@91

-			    vertices   	(list Points

-				(1321, 1139)

-				(1537, 1261))

-			    line_style 	0

-			    label      	(object SegLabel @97

-				Parent_View 	@95

-				location   	(1566, 1185)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.957062

-				height     	81

-				orientation 	0))))))

-	(object ClassDiagram "Container Managed Entity"

-	    quid       	"3805550C008A"

-	    title      	"Container Managed Entity"

-	    documentation 	

-|The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.

-|

-	    

-	    zoom       	95

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1198

-	    items      	(list diagram_item_list

-		(object NoteView @98

-		    location   	(2288, 400)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@98

-			location   	(1932, 216)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	677

-			label      	"The keyFeatures relationship also determines the primkey-field setting.  If there is a single key feature, we will deploy that using primkey-field.  Conversely, if a descriptor uses primkey-field, we will set a single keyFeature.  (? BMP case ?)")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	737

-		    height     	381)

-		(object NoteView @99

-		    location   	(1472, 1568)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@99

-			location   	(1070, 1390)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	769

-			label      	"We have switched from explicitly referring from an Entity to its Java Fields to deriving that from its attributes and association ends.  The implementation should still support listing the key fields and persistent fields, but not adding or removing them.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	829

-		    height     	369)

-		(object NoteView @100

-		    location   	(608, 1600)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@100

-			location   	(189, 1465)

-			fill_color 	13434879

-			nlines     	6

-			max_width  	802

-			label      	"Leaving the keyAttributes and persistentAttributes relationships typed to eAttribute for compatibility purposes.  This may change in the future to be typed to CMPAttribute.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	862

-		    height     	283)

-		(object NoteView @101

-		    location   	(480, 1152)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@101

-			location   	(65, 990)

-			fill_color 	13434879

-			nlines     	6

-			max_width  	795

-			label      	

-|EJB2.0 - 

-|  Added version:String

-|  Added abstractSchemaName:String

-|TODO: Other new attrs:

-|  SecurityIdentity

-			)

-		    line_color 	4227072

-		    fill_color 	13434833

-		    width      	855

-		    height     	336)

-		(object NoteView @102

-		    location   	(624, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@102

-			location   	(426, 743)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	361

-			label      	"See further detail in EJB2.0 - Query diagram")

-		    line_color 	4227072

-		    fill_color 	13434833

-		    width      	421

-		    height     	191)

-		(object ClassView "Class" "Logical View::ejb::Query" @103

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(448, 576)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@103

-			location   	(367, 525)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"Query")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF02710327"

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @104

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@102

-		    supplier   	@103

-		    vertices   	(list Points

-			(558, 736)

-			(491, 639))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ecore::EAttribute" @105

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1581, 233)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@105

-			location   	(1369, 77)

-			nlines     	2

-			max_width  	424

-			justify    	0

-			label      	"EAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"39238472039D"

-		    compartment 	(object Compartment

-			Parent_View 	@105

-			location   	(1369, 191)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	2

-			max_width  	275)

-		    width      	442

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::CMRField" @106

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1595, 929)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@106

-			location   	(1485, 878)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	220

-			justify    	0

-			label      	"CMRField")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"39BF1810004B"

-		    width      	238

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @107

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1600, 1232)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@107

-			location   	(1503, 1154)

-			nlines     	2

-			max_width  	194

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	212

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$44" @108

-		    location   	(1596, 1066)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"399AE0FB03D3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$45" @109

-			    Parent_View 	@108

-			    location   	(-4, -166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @110

-				Parent_View 	@109

-				location   	(1554, 1008)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC03B7"

-			    client     	@108

-			    supplier   	@106

-			    vertices   	(list Points

-				(1596, 1066)

-				(1595, 992))

-			    line_style 	0)

-			(object RoleView "collectionType" @111

-			    Parent_View 	@108

-			    location   	(-4, -166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @112

-				Parent_View 	@111

-				location   	(1432, 1113)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	291

-				justify    	0

-				label      	"+collectionType"

-				pctDist    	0.597227

-				height     	166

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC038F"

-			    client     	@108

-			    supplier   	@107

-			    vertices   	(list Points

-				(1596, 1066)

-				(1597, 1141))

-			    line_style 	0

-			    label      	(object SegLabel @113

-				Parent_View 	@111

-				location   	(1668, 1111)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.599360

-				height     	71

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::Description" @114

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2871, 729)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@114

-			location   	(2704, 598)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	334

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@114

-			location   	(2704, 712)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	283)

-		    width      	352

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::CMPAttribute" @115

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1581, 630)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@115

-			location   	(1297, 526)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	568

-			justify    	0

-			label      	"CMPAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A2288630003"

-		    compartment 	(object Compartment

-			Parent_View 	@115

-			location   	(1297, 586)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	565)

-		    width      	586

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @116

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A2288770341"

-		    client     	@115

-		    supplier   	@105

-		    vertices   	(list Points

-			(1536, 514)

-			(1536, 400))

-		    line_style 	3

-		    origin_attachment 	(1536, 514)

-		    terminal_attachment 	(1536, 400))

-		(object InheritView "" @117

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AD4690170"

-		    client     	@106

-		    supplier   	@115

-		    vertices   	(list Points

-			(1563, 866)

-			(1563, 745))

-		    line_style 	3

-		    origin_attachment 	(1563, 866)

-		    terminal_attachment 	(1563, 745))

-		(object AssociationViewNew "$UNNAMED$71" @118

-		    location   	(2284, 674)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1D1F0161"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @119

-			    Parent_View 	@118

-			    location   	(674, 51)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @120

-				Parent_View 	@119

-				location   	(2569, 734)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.695136

-				height     	60

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1D2001DA"

-			    client     	@118

-			    supplier   	@114

-			    vertices   	(list Points

-				(2284, 674)

-				(2695, 674))

-			    line_style 	3

-			    origin_attachment 	(2284, 674)

-			    terminal_attachment 	(2695, 674)

-			    label      	(object SegLabel @121

-				Parent_View 	@119

-				location   	(2562, 611)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.677276

-				height     	64

-				orientation 	0))

-			(object RoleView "$UNNAMED$72" @122

-			    Parent_View 	@118

-			    location   	(674, 51)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1D2001EE"

-			    client     	@118

-			    supplier   	@115

-			    vertices   	(list Points

-				(2284, 674)

-				(1874, 674))

-			    line_style 	3

-			    origin_attachment 	(2284, 674)

-			    terminal_attachment 	(1874, 674))))

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @123

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(447, 176)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@123

-			location   	(76, 73)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	742

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E3230174"

-		    compartment 	(object Compartment

-			Parent_View 	@123

-			location   	(76, 133)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	739)

-		    width      	760

-		    height     	230

-		    autoResize 	TRUE)

-		(object AttachView "" @124

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@101

-		    supplier   	@123

-		    vertices   	(list Points

-			(171, 983)

-			(171, 291))

-		    line_style 	3

-		    origin_attachment 	(171, 983)

-		    terminal_attachment 	(171, 291))

-		(object AssociationViewNew "$UNNAMED$17" @125

-		    location   	(759, 709)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398831C30245"

-		    roleview_list 	(list RoleViews

-			(object RoleView "persistentAttributes" @126

-			    Parent_View 	@125

-			    location   	(407, -43)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @127

-				Parent_View 	@126

-				location   	(959, 672)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	453

-				justify    	0

-				label      	"+persistentAttributes"

-				pctDist    	0.378601

-				height     	38

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398831C50157"

-			    client     	@125

-			    supplier   	@115

-			    vertices   	(list Points

-				(759, 709)

-				(1288, 709))

-			    line_style 	3

-			    origin_attachment 	(759, 709)

-			    terminal_attachment 	(1288, 709)

-			    label      	(object SegLabel @128

-				Parent_View 	@126

-				location   	(1238, 747)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.905340

-				height     	38

-				orientation 	1))

-			(object RoleView "entity" @129

-			    Parent_View 	@125

-			    location   	(407, -43)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398831C5017F"

-			    client     	@125

-			    supplier   	@123

-			    vertices   	(list Points

-				(759, 709)

-				(648, 709)

-				(648, 291))

-			    line_style 	3

-			    origin_attachment 	(759, 709)

-			    terminal_attachment 	(648, 291))))

-		(object AssociationViewNew "$UNNAMED$90" @130

-		    location   	(939, 527)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3FA695890240"

-		    roleview_list 	(list RoleViews

-			(object RoleView "primKeyField" @131

-			    Parent_View 	@130

-			    location   	(492, 351)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @132

-				Parent_View 	@131

-				location   	(1099, 489)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	272

-				justify    	0

-				label      	"+primKeyField"

-				pctDist    	0.462046

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3FA6958B0008"

-			    client     	@130

-			    supplier   	@115

-			    vertices   	(list Points

-				(939, 527)

-				(1288, 527))

-			    line_style 	3

-			    origin_attachment 	(939, 527)

-			    terminal_attachment 	(1288, 527)

-			    label      	(object SegLabel @133

-				Parent_View 	@131

-				location   	(1228, 567)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.831683

-				height     	40

-				orientation 	1))

-			(object RoleView "entity" @134

-			    Parent_View 	@130

-			    location   	(492, 351)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3FA6958B0012"

-			    client     	@130

-			    supplier   	@123

-			    vertices   	(list Points

-				(939, 527)

-				(825, 527)

-				(825, 291))

-			    line_style 	3

-			    origin_attachment 	(939, 527)

-			    terminal_attachment 	(825, 291))))

-		(object AssociationViewNew "$UNNAMED$18" @135

-		    location   	(844, 632)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3988323B0355"

-		    roleview_list 	(list RoleViews

-			(object RoleView "keyAttributes" @136

-			    Parent_View 	@135

-			    location   	(492, 408)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @137

-				Parent_View 	@136

-				location   	(1100, 602)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	315

-				justify    	0

-				label      	"+keyAttributes"

-				pctDist    	0.579070

-				height     	31

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988323D025E"

-			    client     	@135

-			    supplier   	@115

-			    vertices   	(list Points

-				(844, 632)

-				(1288, 632))

-			    line_style 	3

-			    origin_attachment 	(844, 632)

-			    terminal_attachment 	(1288, 632)

-			    label      	(object SegLabel @138

-				Parent_View 	@136

-				location   	(1236, 663)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.885942

-				height     	31

-				orientation 	1))

-			(object RoleView "entity" @139

-			    Parent_View 	@135

-			    location   	(492, 408)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988323D027C"

-			    client     	@135

-			    supplier   	@123

-			    vertices   	(list Points

-				(844, 632)

-				(740, 632)

-				(740, 291))

-			    line_style 	3

-			    origin_attachment 	(844, 632)

-			    terminal_attachment 	(740, 291))))))

-	(object ClassDiagram "Assembly"

-	    quid       	"3780E28E01B1"

-	    title      	"Assembly"

-	    documentation 	

-|I kept this portion of the model separate to reflect the spec.  It might be easier to work with if we integrated it more closely with the beans we are assembling.  On the other hand, this separation supports splitting the creation and assembly roles.

-|

-|An assembly descriptor basically contains method permissions and "Container Transactions".  

-|

-|In order to support the full power of the method element in the XML DD, we need to hold these method elements.  The actual methods will be derived.  Keeping with the method element, all method will be designated by the name "*".

-|

-|The methods relationship from MethodPermission and MethodTransaction will be derived in helper methods.

-|

-|

-	    

-	    zoom       	87

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1834

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::TransactionAttributeType" @140

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2147, 2019)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@140

-			location   	(1866, 1819)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"TransactionAttributeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@140

-			location   	(1866, 1769)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"379F634503C0"

-		    compartment 	(object Compartment

-			Parent_View 	@140

-			location   	(1866, 1884)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	256)

-		    width      	580

-		    height     	524

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MethodElementKind" @141

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1239, 2445)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@141

-			location   	(1003, 2245)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	472

-			justify    	0

-			label      	"MethodElementKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@141

-			location   	(1003, 2195)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	472

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"392ED2E70240"

-		    compartment 	(object Compartment

-			Parent_View 	@141

-			location   	(1003, 2310)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	300)

-		    width      	490

-		    height     	524

-		    autoResize 	TRUE)

-		(object NoteView @142

-		    location   	(3407, 808)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@142

-			location   	(3117, 728)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	544

-			label      	"This is the container-transaction element")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	604

-		    height     	172)

-		(object NoteView @143

-		    location   	(594, 2267)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@143

-			location   	(247, 2173)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	659

-			label      	"Local, LocalHome have been added for EJB2.0.  These correspond to the valid values for the methodIntf (methodType) field.")

-		    line_color 	16384

-		    fill_color 	13434833

-		    width      	719

-		    height     	201)

-		(object AttachView "" @144

-		    stereotype 	TRUE

-		    line_color 	16384

-		    client     	@143

-		    supplier   	@141

-		    vertices   	(list Points

-			(953, 2335)

-			(994, 2335))

-		    line_style 	3

-		    origin_attachment 	(953, 2335)

-		    terminal_attachment 	(994, 2335))

-		(object NoteView @145

-		    location   	(675, 1976)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@145

-			location   	(425, 1914)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	464

-			label      	"EJB2.0 pfd 2 added unchecked attribute.")

-		    line_color 	32768

-		    fill_color 	13434833

-		    width      	524

-		    height     	137)

-		(object NoteView @146

-		    location   	(431, 2626)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@146

-			location   	(141, 2503)

-			fill_color 	13434879

-			nlines     	5

-			max_width  	544

-			label      	

-|@version J2EE1.4 

-|

-|Added ServiceEndpoint

-			)

-		    line_color 	10949559

-		    fill_color 	15778042

-		    width      	604

-		    height     	258)

-		(object AttachView "" @147

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@146

-		    supplier   	@141

-		    vertices   	(list Points

-			(733, 2557)

-			(993, 2498))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::Description" @148

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(206, 208)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@148

-			location   	(38, 77)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@148

-			location   	(38, 196)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	308)

-		    width      	354

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestination" @149

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2945, 424)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@149

-			location   	(2739, 317)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	412

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C211001CF"

-		    compartment 	(object Compartment

-			Parent_View 	@149

-			location   	(2739, 436)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	319)

-		    width      	430

-		    height     	238

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRole" @150

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1028, 787)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@150

-			location   	(860, 733)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Label"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"38C031FE012D"

-		    width      	354

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @151

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1470, 767)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@151

-			location   	(1360, 691)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	220

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	238

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MethodPermission" @152

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(467, 1122)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@152

-			location   	(256, 994)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	422

-			justify    	0

-			label      	"MethodPermission")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E35000D0"

-		    compartment 	(object Compartment

-			Parent_View 	@152

-			location   	(256, 1059)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	467)

-		    width      	440

-		    height     	280

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @153

-		    stereotype 	TRUE

-		    line_color 	32768

-		    client     	@145

-		    supplier   	@152

-		    vertices   	(list Points

-			(535, 1907)

-			(535, 1262))

-		    line_style 	3

-		    origin_attachment 	(535, 1907)

-		    terminal_attachment 	(535, 1262))

-		(object AssociationViewNew "$UNNAMED$6" @154

-		    location   	(640, 842)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"392ED18900FC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "roles" @155

-			    Parent_View 	@154

-			    location   	(320, 330)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @156

-				Parent_View 	@155

-				location   	(745, 879)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	159

-				justify    	0

-				label      	"+roles"

-				pctDist    	0.500000

-				height     	37

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED18A028E"

-			    client     	@154

-			    supplier   	@150

-			    vertices   	(list Points

-				(640, 842)

-				(851, 842))

-			    line_style 	3

-			    origin_attachment 	(640, 842)

-			    terminal_attachment 	(851, 842)

-			    label      	(object SegLabel @157

-				Parent_View 	@155

-				location   	(770, 805)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.620690

-				height     	38

-				orientation 	0))

-			(object RoleView "$UNNAMED$7" @158

-			    Parent_View 	@154

-			    location   	(320, 330)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @159

-				Parent_View 	@158

-				location   	(528, 939)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED18A02D4"

-			    client     	@154

-			    supplier   	@152

-			    vertices   	(list Points

-				(640, 842)

-				(569, 842)

-				(569, 982))

-			    line_style 	3

-			    origin_attachment 	(640, 842)

-			    terminal_attachment 	(569, 982))))

-		(object AssociationViewNew "$UNNAMED$75" @160

-		    location   	(68, 828)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D26BB00FA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @161

-			    Parent_View 	@160

-			    location   	(-399, -294)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @162

-				Parent_View 	@161

-				location   	(215, 391)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.917184

-				height     	147

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26BC02F0"

-			    client     	@160

-			    supplier   	@148

-			    vertices   	(list Points

-				(68, 828)

-				(68, 351))

-			    line_style 	3

-			    origin_attachment 	(68, 828)

-			    terminal_attachment 	(68, 351)

-			    label      	(object SegLabel @163

-				Parent_View 	@161

-				location   	(134, 443)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.807453

-				height     	66

-				orientation 	1))

-			(object RoleView "$UNNAMED$76" @164

-			    Parent_View 	@160

-			    location   	(-399, -294)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26BC0318"

-			    client     	@160

-			    supplier   	@152

-			    vertices   	(list Points

-				(68, 828)

-				(68, 1127)

-				(247, 1127))

-			    line_style 	3

-			    origin_attachment 	(68, 828)

-			    terminal_attachment 	(247, 1127))))

-		(object ClassView "Class" "Logical View::ejb::ExcludeList" @165

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1940, 659)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@165

-			location   	(1748, 555)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	384

-			justify    	0

-			label      	"ExcludeList")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"3997216E0147"

-		    compartment 	(object Compartment

-			Parent_View 	@165

-			location   	(1748, 620)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	423)

-		    width      	402

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::Method" @166

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1329, 1826)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@166

-			location   	(1034, 1551)

-			nlines     	1

-			max_width  	590

-			justify    	0

-			label      	"Method")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3654AE910271"

-		    compartment 	(object Compartment

-			Parent_View 	@166

-			location   	(1034, 1670)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	9

-			max_width  	646)

-		    width      	608

-		    height     	574

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "MethodPermissionToMethods" @167

-		    location   	(624, 1612)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000EA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/methods" @168

-			    Parent_View 	@167

-			    location   	(299, 1172)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @169

-				Parent_View 	@168

-				location   	(761, 1568)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	256

-				justify    	0

-				label      	"+/methods"

-				pctDist    	0.342105

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000EB"

-			    client     	@167

-			    supplier   	@166

-			    vertices   	(list Points

-				(624, 1612)

-				(1025, 1612))

-			    line_style 	3

-			    origin_attachment 	(624, 1612)

-			    terminal_attachment 	(1025, 1612)

-			    label      	(object SegLabel @170

-				Parent_View 	@168

-				location   	(953, 1670)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.822680

-				height     	58

-				orientation 	1))

-			(object RoleView "/methodPermission" @171

-			    Parent_View 	@167

-			    location   	(299, 1172)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000EC"

-			    client     	@167

-			    supplier   	@152

-			    vertices   	(list Points

-				(624, 1612)

-				(564, 1612)

-				(564, 1262))

-			    line_style 	3

-			    origin_attachment 	(624, 1612)

-			    terminal_attachment 	(564, 1262)

-			    label      	(object SegLabel @172

-				Parent_View 	@171

-				location   	(528, 1333)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.826923

-				height     	37

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::ejb::AssemblyDescriptor" @173

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1172, 419)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@173

-			location   	(971, 368)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	402

-			justify    	0

-			label      	"AssemblyDescriptor")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E35000D4"

-		    width      	420

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$50" @174

-		    location   	(2056, 381)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1BF402E7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinations" @175

-			    Parent_View 	@174

-			    location   	(1048, 253)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @176

-				Parent_View 	@175

-				location   	(2523, 337)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+messageDestinations"

-				pctDist    	0.692762

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1BF600B9"

-			    client     	@174

-			    supplier   	@149

-			    vertices   	(list Points

-				(2056, 381)

-				(2730, 381))

-			    line_style 	3

-			    origin_attachment 	(2056, 381)

-			    terminal_attachment 	(2730, 381)

-			    label      	(object SegLabel @177

-				Parent_View 	@175

-				location   	(2662, 435)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$51" @178

-			    Parent_View 	@174

-			    location   	(1048, 253)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1BF600C3"

-			    client     	@174

-			    supplier   	@173

-			    vertices   	(list Points

-				(2056, 381)

-				(1382, 381))

-			    line_style 	3

-			    origin_attachment 	(2056, 381)

-			    terminal_attachment 	(1382, 381))))

-		(object AssociationViewNew "$UNNAMED$13" @179

-		    location   	(1116, 601)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"393EBFC500B4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityRoles" @180

-			    Parent_View 	@179

-			    location   	(108, 473)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @181

-				Parent_View 	@180

-				location   	(969, 675)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	364

-				justify    	0

-				label      	"+securityRoles"

-				pctDist    	0.617284

-				height     	148

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"393EBFC60083"

-			    client     	@179

-			    supplier   	@150

-			    vertices   	(list Points

-				(1116, 601)

-				(1116, 721))

-			    line_style 	3

-			    origin_attachment 	(1116, 601)

-			    terminal_attachment 	(1116, 721)

-			    label      	(object SegLabel @182

-				Parent_View 	@180

-				location   	(1175, 684)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.703704

-				height     	59

-				orientation 	0))

-			(object RoleView "$UNNAMED$14" @183

-			    Parent_View 	@179

-			    location   	(108, 473)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @184

-				Parent_View 	@183

-				location   	(1075, 506)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"393EBFC600C0"

-			    client     	@179

-			    supplier   	@173

-			    vertices   	(list Points

-				(1116, 601)

-				(1116, 482))

-			    line_style 	3

-			    origin_attachment 	(1116, 601)

-			    terminal_attachment 	(1116, 482))))

-		(object AssociationViewNew "AssemblyDescriptorToMethodPermissions" @185

-		    location   	(399, 451)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000D1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "assemblyDescriptor" @186

-			    Parent_View 	@185

-			    location   	(74, 11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @187

-				Parent_View 	@186

-				location   	(632, 348)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	512

-				justify    	0

-				label      	"+assemblyDescriptor"

-				pctDist    	0.471564

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D2"

-			    client     	@185

-			    supplier   	@173

-			    vertices   	(list Points

-				(399, 451)

-				(399, 391)

-				(962, 391))

-			    line_style 	3

-			    origin_attachment 	(399, 451)

-			    terminal_attachment 	(962, 391)

-			    label      	(object SegLabel @188

-				Parent_View 	@186

-				location   	(899, 445)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	72

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "methodPermissions" @189

-			    Parent_View 	@185

-			    location   	(74, 11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @190

-				Parent_View 	@189

-				location   	(388, 907)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	508

-				justify    	0

-				label      	"+methodPermissions"

-				pctDist    	0.859155

-				height     	12

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D3"

-			    client     	@185

-			    supplier   	@152

-			    vertices   	(list Points

-				(399, 451)

-				(399, 982))

-			    line_style 	3

-			    origin_attachment 	(399, 451)

-			    terminal_attachment 	(399, 982)

-			    label      	(object SegLabel @191

-				Parent_View 	@189

-				location   	(453, 944)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.929577

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$40" @192

-		    location   	(1498, 589)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399721B602F9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "excludeList" @193

-			    Parent_View 	@192

-			    location   	(490, 461)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @194

-				Parent_View 	@193

-				location   	(1626, 548)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	310

-				justify    	0

-				label      	"+excludeList"

-				pctDist    	0.530120

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399721B7023C"

-			    client     	@192

-			    supplier   	@165

-			    vertices   	(list Points

-				(1498, 589)

-				(1739, 589))

-			    line_style 	3

-			    origin_attachment 	(1498, 589)

-			    terminal_attachment 	(1739, 589)

-			    label      	(object SegLabel @195

-				Parent_View 	@193

-				location   	(1683, 629)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.767068

-				height     	40

-				orientation 	1))

-			(object RoleView "$UNNAMED$41" @196

-			    Parent_View 	@192

-			    location   	(490, 461)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399721B70246"

-			    client     	@192

-			    supplier   	@173

-			    vertices   	(list Points

-				(1498, 589)

-				(1364, 589)

-				(1364, 482))

-			    line_style 	3

-			    origin_attachment 	(1498, 589)

-			    terminal_attachment 	(1364, 482))))

-		(object ClassView "Class" "Logical View::ejb::MethodElement" @197

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1270, 1223)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@197

-			location   	(1008, 1072)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	524

-			justify    	0

-			label      	"MethodElement")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"392ED22D008A"

-		    compartment 	(object Compartment

-			Parent_View 	@197

-			location   	(1008, 1137)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	567)

-		    width      	542

-		    height     	326

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @198

-		    location   	(1356, 957)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3937D6FF011D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "enterpriseBean" @199

-			    Parent_View 	@198

-			    location   	(-468, 480)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000178"

-			    client     	@198

-			    supplier   	@151

-			    vertices   	(list Points

-				(1356, 957)

-				(1356, 855))

-			    line_style 	3

-			    origin_attachment 	(1356, 957)

-			    terminal_attachment 	(1356, 855)

-			    label      	(object SegLabel @200

-				Parent_View 	@199

-				location   	(1396, 891)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.648649

-				height     	40

-				orientation 	1))

-			(object RoleView "methodElement" @201

-			    Parent_View 	@198

-			    location   	(-468, 480)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000218"

-			    client     	@198

-			    supplier   	@197

-			    vertices   	(list Points

-				(1356, 957)

-				(1356, 1060))

-			    line_style 	3

-			    origin_attachment 	(1356, 957)

-			    terminal_attachment 	(1356, 1060)

-			    label      	(object SegLabel @202

-				Parent_View 	@201

-				location   	(1428, 1027)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.693333

-				height     	72

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$8" @203

-		    location   	(936, 2428)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"392ED2880077"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElements" @204

-			    Parent_View 	@203

-			    location   	(616, 1916)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @205

-				Parent_View 	@204

-				location   	(1191, 2389)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	433

-				justify    	0

-				label      	"+methodElements"

-				pctDist    	0.179688

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED289001E"

-			    client     	@203

-			    supplier   	@197

-			    vertices   	(list Points

-				(936, 2428)

-				(1311, 2428)

-				(1311, 1386))

-			    line_style 	3

-			    origin_attachment 	(936, 2428)

-			    terminal_attachment 	(1311, 1386)

-			    label      	(object SegLabel @206

-				Parent_View 	@204

-				location   	(1357, 1757)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.738636

-				height     	46

-				orientation 	1))

-			(object RoleView "$UNNAMED$9" @207

-			    Parent_View 	@203

-			    location   	(616, 1916)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED2890028"

-			    client     	@203

-			    supplier   	@152

-			    vertices   	(list Points

-				(936, 2428)

-				(685, 2428)

-				(685, 1262))

-			    line_style 	3

-			    origin_attachment 	(936, 2428)

-			    terminal_attachment 	(685, 1262))))

-		(object AssociationViewNew "$UNNAMED$42" @208

-		    location   	(1853, 1037)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3997226501A6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElements" @209

-			    Parent_View 	@208

-			    location   	(77, 669)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @210

-				Parent_View 	@209

-				location   	(1764, 1139)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	433

-				justify    	0

-				label      	"+methodElements"

-				pctDist    	0.400000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399722660284"

-			    client     	@208

-			    supplier   	@197

-			    vertices   	(list Points

-				(1853, 1037)

-				(1853, 1097)

-				(1541, 1097))

-			    line_style 	3

-			    origin_attachment 	(1853, 1037)

-			    terminal_attachment 	(1541, 1097)

-			    label      	(object SegLabel @211

-				Parent_View 	@209

-				location   	(1630, 1073)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.761719

-				height     	25

-				orientation 	1))

-			(object RoleView "$UNNAMED$43" @212

-			    Parent_View 	@208

-			    location   	(77, 669)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399722660298"

-			    client     	@208

-			    supplier   	@165

-			    vertices   	(list Points

-				(1853, 1037)

-				(1853, 775))

-			    line_style 	3

-			    origin_attachment 	(1853, 1037)

-			    terminal_attachment 	(1853, 775))))

-		(object ClassView "Class" "Logical View::common::Description" @213

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2782, 1692)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@213

-			location   	(2614, 1561)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@213

-			location   	(2614, 1680)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	309)

-		    width      	354

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$67" @214

-		    location   	(1953, 1623)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D28600218"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @215

-			    Parent_View 	@214

-			    location   	(649, 438)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @216

-				Parent_View 	@215

-				location   	(2475, 1582)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D28620152"

-			    client     	@214

-			    supplier   	@213

-			    vertices   	(list Points

-				(1953, 1623)

-				(2605, 1623))

-			    line_style 	3

-			    origin_attachment 	(1953, 1623)

-			    terminal_attachment 	(2605, 1623)

-			    label      	(object SegLabel @217

-				Parent_View 	@215

-				location   	(2540, 1677)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$68" @218

-			    Parent_View 	@214

-			    location   	(649, 438)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D28620198"

-			    client     	@214

-			    supplier   	@197

-			    vertices   	(list Points

-				(1953, 1623)

-				(1810, 1623)

-				(1810, 1383)

-				(1541, 1383))

-			    line_style 	3

-			    origin_attachment 	(1953, 1623)

-			    terminal_attachment 	(1541, 1383))))

-		(object AssociationViewNew "$UNNAMED$81" @219

-		    location   	(2874, 737)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D26680317"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @220

-			    Parent_View 	@219

-			    location   	(934, 78)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @221

-				Parent_View 	@220

-				location   	(3017, 1493)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.932432

-				height     	143

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D266A00D5"

-			    client     	@219

-			    supplier   	@213

-			    vertices   	(list Points

-				(2874, 737)

-				(2874, 1549))

-			    line_style 	3

-			    origin_attachment 	(2874, 737)

-			    terminal_attachment 	(2874, 1549)

-			    label      	(object SegLabel @222

-				Parent_View 	@220

-				location   	(2928, 1468)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$82" @223

-			    Parent_View 	@219

-			    location   	(934, 78)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D266A00F3"

-			    client     	@219

-			    supplier   	@165

-			    vertices   	(list Points

-				(2874, 737)

-				(2874, 659)

-				(2141, 659))

-			    line_style 	3

-			    origin_attachment 	(2874, 737)

-			    terminal_attachment 	(2141, 659))))

-		(object ClassView "Class" "Logical View::ejb::MethodTransaction" @224

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2752, 1159)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@224

-			location   	(2305, 1031)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	894

-			justify    	0

-			label      	"MethodTransaction")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E35000DE"

-		    compartment 	(object Compartment

-			Parent_View 	@224

-			location   	(2305, 1096)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	952)

-		    width      	912

-		    height     	280

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$5" @225

-		    location   	(2293, 1612)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000E0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/methods" @226

-			    Parent_View 	@225

-			    location   	(548, 1243)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @227

-				Parent_View 	@226

-				location   	(2060, 1561)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	256

-				justify    	0

-				label      	"+/methods"

-				pctDist    	0.355263

-				height     	52

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000E1"

-			    client     	@225

-			    supplier   	@166

-			    vertices   	(list Points

-				(2293, 1612)

-				(1633, 1612))

-			    line_style 	3

-			    origin_attachment 	(2293, 1612)

-			    terminal_attachment 	(1633, 1612)

-			    label      	(object SegLabel @228

-				Parent_View 	@226

-				location   	(1805, 1666)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.738775

-				height     	54

-				orientation 	0))

-			(object RoleView "/transactions" @229

-			    Parent_View 	@225

-			    location   	(548, 1243)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000E2"

-			    client     	@225

-			    supplier   	@224

-			    vertices   	(list Points

-				(2293, 1612)

-				(2640, 1612)

-				(2640, 1299))

-			    line_style 	3

-			    origin_attachment 	(2293, 1612)

-			    terminal_attachment 	(2640, 1299)

-			    label      	(object SegLabel @230

-				Parent_View 	@229

-				location   	(2587, 1394)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.858086

-				height     	54

-				orientation 	0))))

-		(object AttachView "" @231

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@142

-		    supplier   	@224

-		    vertices   	(list Points

-			(3244, 894)

-			(3010, 1018))

-		    line_style 	0)

-		(object AssociationViewNew "AssemblyDescriptorToMethodTransactions" @232

-		    location   	(2318, 456)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000D5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "assemblyDescriptor" @233

-			    Parent_View 	@232

-			    location   	(573, 87)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @234

-				Parent_View 	@233

-				location   	(1818, 417)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	512

-				justify    	0

-				label      	"+assemblyDescriptor"

-				pctDist    	0.535519

-				height     	40

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D6"

-			    client     	@232

-			    supplier   	@173

-			    vertices   	(list Points

-				(2318, 456)

-				(1382, 456))

-			    line_style 	3

-			    origin_attachment 	(2318, 456)

-			    terminal_attachment 	(1382, 456)

-			    label      	(object SegLabel @235

-				Parent_View 	@233

-				location   	(1476, 510)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "methodTransactions" @236

-			    Parent_View 	@232

-			    location   	(573, 87)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @237

-				Parent_View 	@236

-				location   	(2923, 947)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	515

-				justify    	0

-				label      	"+methodTransactions"

-				pctDist    	0.923684

-				height     	232

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D7"

-			    client     	@232

-			    supplier   	@224

-			    vertices   	(list Points

-				(2318, 456)

-				(2691, 456)

-				(2691, 1019))

-			    line_style 	3

-			    origin_attachment 	(2318, 456)

-			    terminal_attachment 	(2691, 1019)

-			    label      	(object SegLabel @238

-				Parent_View 	@236

-				location   	(2603, 961)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.938326

-				height     	89

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$10" @239

-		    location   	(1918, 1261)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"392ED40900D4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElements" @240

-			    Parent_View 	@239

-			    location   	(94, 781)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @241

-				Parent_View 	@240

-				location   	(1906, 1223)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	433

-				justify    	0

-				label      	"+methodElements"

-				pctDist    	0.035294

-				height     	39

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED40A018A"

-			    client     	@239

-			    supplier   	@197

-			    vertices   	(list Points

-				(1918, 1261)

-				(1541, 1261))

-			    line_style 	3

-			    origin_attachment 	(1918, 1261)

-			    terminal_attachment 	(1541, 1261)

-			    label      	(object SegLabel @242

-				Parent_View 	@240

-				location   	(1673, 1314)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.653846

-				height     	53

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @243

-			    Parent_View 	@239

-			    location   	(94, 781)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED40A019E"

-			    client     	@239

-			    supplier   	@224

-			    vertices   	(list Points

-				(1918, 1261)

-				(2296, 1261))

-			    line_style 	3

-			    origin_attachment 	(1918, 1261)

-			    terminal_attachment 	(2296, 1261))))

-		(object AssociationViewNew "$UNNAMED$79" @244

-		    location   	(3119, 1485)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1F230090"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @245

-			    Parent_View 	@244

-			    location   	(779, 298)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @246

-				Parent_View 	@245

-				location   	(3031, 1405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.677966

-				height     	141

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1F2303D9"

-			    client     	@244

-			    supplier   	@213

-			    vertices   	(list Points

-				(3119, 1485)

-				(3119, 1545)

-				(2959, 1545))

-			    line_style 	3

-			    origin_attachment 	(3119, 1485)

-			    terminal_attachment 	(2959, 1545)

-			    label      	(object SegLabel @247

-				Parent_View 	@245

-				location   	(3031, 1613)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.675214

-				height     	68

-				orientation 	0))

-			(object RoleView "$UNNAMED$80" @248

-			    Parent_View 	@244

-			    location   	(779, 298)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1F24000F"

-			    client     	@244

-			    supplier   	@224

-			    vertices   	(list Points

-				(3119, 1485)

-				(3119, 1299))

-			    line_style 	3

-			    origin_attachment 	(3119, 1485)

-			    terminal_attachment 	(3119, 1299))))))

-	(object ClassDiagram "EJB Implementation"

-	    quid       	"380FDB7B01DA"

-	    title      	"EJB Implementation"

-	    documentation 	"The session-type element describes whether the session bean is a stateful session, or stateless session."

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1631

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::EJBMethodCategory" @249

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(306, 261)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@249

-			location   	(193, 185)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	226

-			justify    	0

-			label      	"EJBMethodCategory")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3810D0380344"

-		    width      	244

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Entity" @250

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1771, 1761)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@250

-			location   	(1690, 1685)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"Entity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E6970351"

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @251

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(982, 1194)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@251

-			location   	(828, 1144)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	308

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	326

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @252

-		    location   	(982, 1481)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@251

-		    vertices   	(list Points

-			(982, 1481)

-			(982, 1256)))

-		(object InheritView "" @253

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E8080095"

-		    client     	@250

-		    supplier   	@251

-		    vertices   	(list Points

-			(1713, 1673)

-			(1713, 1481))

-		    line_style 	3

-		    origin_attachment 	(1713, 1673)

-		    terminal_attachment 	(1713, 1481)

-		    drawSupplier 	@252)

-		(object ClassView "Class" "Logical View::java::JavaClass" @254

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1035, 545)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@254

-			location   	(881, 390)

-			nlines     	2

-			max_width  	308

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    compartment 	(object Compartment

-			Parent_View 	@254

-			location   	(881, 505)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	3

-			max_width  	335)

-		    width      	326

-		    height     	334

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "primaryKey" @255

-		    location   	(1820, 753)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @256

-			Parent_View 	@255

-			location   	(1937, 414)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	204

-			justify    	0

-			label      	"primaryKey"

-			pctDist    	2.450000

-			height     	340

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDDDF006B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "primaryKey" @257

-			    Parent_View 	@255

-			    location   	(364, -751)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDDE00117"

-			    client     	@255

-			    supplier   	@254

-			    vertices   	(list Points

-				(1820, 753)

-				(1820, 455)

-				(1198, 455))

-			    line_style 	3

-			    origin_attachment 	(1820, 753)

-			    terminal_attachment 	(1198, 455)

-			    label      	(object SegLabel @258

-				Parent_View 	@257

-				location   	(1290, 402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "ejb" @259

-			    Parent_View 	@255

-			    location   	(364, -751)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDDE00121"

-			    client     	@255

-			    supplier   	@250

-			    vertices   	(list Points

-				(1820, 753)

-				(1820, 1673))

-			    line_style 	3

-			    origin_attachment 	(1820, 753)

-			    terminal_attachment 	(1820, 1673))))

-		(object AssociationViewNew "remoteInterface" @260

-		    location   	(934, 921)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @261

-			Parent_View 	@260

-			location   	(974, 920)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	600

-			justify    	0

-			label      	"remoteInterface"

-			pctDist    	1.183333

-			height     	2

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC46006A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "remoteInterface" @262

-			    Parent_View 	@260

-			    location   	(335, 192)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470166"

-			    client     	@260

-			    supplier   	@254

-			    vertices   	(list Points

-				(934, 921)

-				(934, 711))

-			    line_style 	3

-			    origin_attachment 	(934, 921)

-			    terminal_attachment 	(934, 711)

-			    label      	(object SegLabel @263

-				Parent_View 	@262

-				location   	(881, 733)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "ejb" @264

-			    Parent_View 	@260

-			    location   	(335, 192)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470167"

-			    client     	@260

-			    supplier   	@251

-			    vertices   	(list Points

-				(934, 921)

-				(934, 1132))

-			    line_style 	3

-			    origin_attachment 	(934, 921)

-			    terminal_attachment 	(934, 1132))))

-		(object AssociationViewNew "homeInterface" @265

-		    location   	(819, 864)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @266

-			Parent_View 	@265

-			location   	(841, 1013)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"homeInterface"

-			pctDist    	0.883333

-			height     	149

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3701C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "homeInterface" @267

-			    Parent_View 	@265

-			    location   	(227, 128)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC440143"

-			    client     	@265

-			    supplier   	@254

-			    vertices   	(list Points

-				(819, 864)

-				(819, 804)

-				(766, 804)

-				(766, 699)

-				(872, 699))

-			    line_style 	3

-			    origin_attachment 	(819, 864)

-			    terminal_attachment 	(872, 699)

-			    label      	(object SegLabel @268

-				Parent_View 	@267

-				location   	(833, 667)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.881919

-				height     	33

-				orientation 	0))

-			(object RoleView "ejb" @269

-			    Parent_View 	@265

-			    location   	(227, 128)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC44014D"

-			    client     	@265

-			    supplier   	@251

-			    vertices   	(list Points

-				(819, 864)

-				(819, 1132))

-			    line_style 	3

-			    origin_attachment 	(819, 864)

-			    terminal_attachment 	(819, 1132))))

-		(object AssociationViewNew "ejbClass" @270

-		    location   	(1131, 921)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @271

-			Parent_View 	@270

-			location   	(1125, 1031)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	157

-			justify    	0

-			label      	"ejbClass"

-			pctDist    	0.400000

-			height     	110

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3402C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbClass" @272

-			    Parent_View 	@270

-			    location   	(539, 185)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501EC"

-			    client     	@270

-			    supplier   	@254

-			    vertices   	(list Points

-				(1131, 921)

-				(1131, 712))

-			    line_style 	3

-			    origin_attachment 	(1131, 921)

-			    terminal_attachment 	(1131, 712)

-			    label      	(object SegLabel @273

-				Parent_View 	@272

-				location   	(1091, 740)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.870550

-				height     	41

-				orientation 	0))

-			(object RoleView "ejb" @274

-			    Parent_View 	@270

-			    location   	(539, 185)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501F6"

-			    client     	@270

-			    supplier   	@251

-			    vertices   	(list Points

-				(1131, 921)

-				(1131, 1131))

-			    line_style 	3

-			    origin_attachment 	(1131, 921)

-			    terminal_attachment 	(1131, 1131))))

-		(object AssociationViewNew "localHomeInterface" @275

-		    location   	(1431, 941)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @276

-			Parent_View 	@275

-			location   	(1385, 978)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	32768

-			    default_color 	FALSE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"localHomeInterface"

-			pctDist    	-0.266667

-			height     	37

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39886C2B018B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localHomeInterface" @277

-			    Parent_View 	@275

-			    location   	(439, -275)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02AF"

-			    client     	@275

-			    supplier   	@254

-			    vertices   	(list Points

-				(1431, 941)

-				(1431, 625)

-				(1198, 625))

-			    line_style 	3

-			    origin_attachment 	(1431, 941)

-			    terminal_attachment 	(1198, 625)

-			    label      	(object SegLabel @278

-				Parent_View 	@277

-				location   	(1290, 696)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	32768

-				    default_color 	FALSE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.834746

-				height     	71

-				orientation 	0))

-			(object RoleView "$UNNAMED$34" @279

-			    Parent_View 	@275

-			    location   	(439, -275)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02D7"

-			    client     	@275

-			    supplier   	@251

-			    vertices   	(list Points

-				(1431, 941)

-				(1431, 1204)

-				(1145, 1204))

-			    line_style 	3

-			    origin_attachment 	(1431, 941)

-			    terminal_attachment 	(1145, 1204))))

-		(object AssociationViewNew "localInterface" @280

-		    location   	(481, 874)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @281

-			Parent_View 	@280

-			location   	(450, 831)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	32768

-			    default_color 	FALSE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	243

-			justify    	0

-			label      	"localInterface"

-			pctDist    	-0.016667

-			height     	44

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39886CC20283"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localInterface" @282

-			    Parent_View 	@280

-			    location   	(-511, -342)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC600EE"

-			    client     	@280

-			    supplier   	@254

-			    vertices   	(list Points

-				(481, 874)

-				(481, 606)

-				(872, 606))

-			    line_style 	3

-			    origin_attachment 	(481, 874)

-			    terminal_attachment 	(872, 606)

-			    label      	(object SegLabel @283

-				Parent_View 	@282

-				location   	(736, 648)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	32768

-				    default_color 	FALSE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.793375

-				height     	42

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @284

-			    Parent_View 	@280

-			    location   	(-511, -342)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC60120"

-			    client     	@280

-			    supplier   	@251

-			    vertices   	(list Points

-				(481, 874)

-				(481, 1194)

-				(819, 1194))

-			    line_style 	3

-			    origin_attachment 	(481, 874)

-			    terminal_attachment 	(819, 1194))))

-		(object ClassView "Class" "Logical View::ejb::Session" @285

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(696, 1762)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@285

-			location   	(371, 1660)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	650

-			justify    	0

-			label      	"Session")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E5F901EB"

-		    compartment 	(object Compartment

-			Parent_View 	@285

-			location   	(371, 1721)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	672)

-		    width      	668

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @286

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230120"

-		    client     	@285

-		    supplier   	@251

-		    vertices   	(list Points

-			(719, 1648)

-			(719, 1481))

-		    line_style 	3

-		    origin_attachment 	(719, 1648)

-		    terminal_attachment 	(719, 1481)

-		    drawSupplier 	@252)

-		(object AssociationViewNew "$UNNAMED$85" @287

-		    location   	(97, 860)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E567CA2007F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceEndpoint" @288

-			    Parent_View 	@287

-			    location   	(-630, -686)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @289

-				Parent_View 	@288

-				location   	(701, 477)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	310

-				justify    	0

-				label      	"+serviceEndpoint"

-				pctDist    	0.847826

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E567CA30225"

-			    client     	@287

-			    supplier   	@254

-			    vertices   	(list Points

-				(97, 860)

-				(97, 519)

-				(872, 519))

-			    line_style 	3

-			    origin_attachment 	(97, 860)

-			    terminal_attachment 	(872, 519)

-			    label      	(object SegLabel @290

-				Parent_View 	@288

-				location   	(771, 557)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.909420

-				height     	38

-				orientation 	1))

-			(object RoleView "$UNNAMED$86" @291

-			    Parent_View 	@287

-			    location   	(-630, -686)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E567CA30243"

-			    client     	@287

-			    supplier   	@285

-			    vertices   	(list Points

-				(97, 860)

-				(97, 1711)

-				(362, 1711))

-			    line_style 	3

-			    origin_attachment 	(97, 860)

-			    terminal_attachment 	(362, 1711))))))

-	(object ClassDiagram "Data Types"

-	    quid       	"3810D69C01E4"

-	    title      	"Data Types"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::SessionType" @292

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 176)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@292

-			location   	(109, 92)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"SessionType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@292

-			location   	(109, 42)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BCA07010C"

-		    compartment 	(object Compartment

-			Parent_View 	@292

-			location   	(109, 153)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	231)

-		    width      	344

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::TransactionType" @293

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(704, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@293

-			location   	(541, 108)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"TransactionType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@293

-			location   	(541, 58)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37FCA48702EF"

-		    compartment 	(object Compartment

-			Parent_View 	@293

-			location   	(541, 169)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	231)

-		    width      	344

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::TransactionAttributeType" @294

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1216, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@294

-			location   	(978, 88)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"TransactionAttributeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@294

-			location   	(978, 38)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"379F634503C0"

-		    compartment 	(object Compartment

-			Parent_View 	@294

-			location   	(978, 149)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	306)

-		    width      	494

-		    height     	492

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "EJB2.1 - Relationships"

-	    quid       	"39BEF9C4039C"

-	    title      	"EJB2.1 - Relationships"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1876

-	    items      	(list diagram_item_list

-		(object Label @295

-		    location   	(31, 31)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"EJB 2.1 Relationships")

-		(object Label @296

-		    location   	(90, 3042)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	39

-		    max_width  	1925

-		    label      	

-|An entity bean may have relationships with other entity beans with container managed persistence.

-|Relationships may be one-to-one, one-to-many, or many-to-many relationships.

-|Container managed relationships can exist only among entity beans within the same local relationship

-|scope, as defined by the relationships element in the deployment descriptor. Container managed

-|relationships are defined in terms of the local interfaces of the related beans.

-|

-|Relationships may be either bidirectional or unidirectional. If a relationship is bidirectional, it can be

-|navigated in both directions, whereas a unidirectional relationship can be navigated in one direction

-|only.

-|

-|A unidirectional relationship is implemented with a cmr-field on the entity bean instance from which

-|navigation can take place, and no related cmr-field on the entity bean instance that is the target of the

-|relationship. Unidirectional relationships are typically used when the Bean Provider wishes to restrict

-|the visibility of a relationship.

-|

-|An entity bean that does not have a local interface can have only unidirectional relationships from itself

-|to other entity beans. The lack of a local interface prevents other entity beans from having a relationship

-|to it.

-|

-|The bean developer navigates or manipulates logical relationships by using the get and set accessor

-|methods for the container managed relationship fields and the java.util.Collection API for

-|collection-valued container managed relationship fields.

-|

-|The bean provider must consider the type and cardinality of relationships when the entity bean classes

-|are programmed. The get method for a cmr-field must return either the local interface of the entity bean

-|or a collection (more precisely, either java.util.Collection or java.util.Set) of the

-|same. The set method for the relationship must take as an argument the entity bean’s local interface or a

-|collection of the same.

-		    )

-		(object Label @297

-		    location   	(90, 2962)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"Regarding Relationships")

-		(object ClassView "Class" "Logical View::ejb::CMPAttribute" @298

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(880, 2816)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@298

-			location   	(615, 2713)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	530

-			justify    	0

-			label      	"CMPAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A2288630003"

-		    compartment 	(object Compartment

-			Parent_View 	@298

-			location   	(615, 2774)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	572)

-		    width      	548

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MultiplicityKind" @299

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2690, 1532)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@299

-			location   	(2528, 1448)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	324

-			justify    	0

-			label      	"MultiplicityKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@299

-			location   	(2528, 1398)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	321

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"399AEBCB02B7"

-		    compartment 	(object Compartment

-			Parent_View 	@299

-			location   	(2528, 1509)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	159)

-		    width      	342

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @300

-		    location   	(3339, 2015)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@300

-			location   	(2583, 1871)

-			fill_color 	13434879

-			nlines     	5

-			max_width  	1477

-			label      	"CCM - This was originally modeled as an eMultiplicity, but has been simplified to a specific set of enum values.  The enumeration type is different from eMultiplicity, which captures much more information, like upper and lower bounds.  If we find that the additional information captured by eMultiplicity is required, it can be added in an extension to RelationshipRole.")

-		    line_color 	32768

-		    fill_color 	13434833

-		    width      	1537

-		    height     	300)

-		(object NoteView @301

-		    location   	(1924, 2428)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@301

-			location   	(1367, 2156)

-			fill_color 	13434879

-			nlines     	10

-			max_width  	1078

-			label      	

-|The cmr-field-name element specifies the name of a logical relationship field in the entity bean class. The name of the cmr-field must begin with a lowercase letter. This field is accessed by methods whose names consists of the name of the field specified by cmr-field-name in which the first letter is uppercased, prefixed by "get" or "set".

-|

-|@invariant The name of the cmr-field must begin with a lowercase letter.

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1138

-		    height     	556)

-		(object AttachView "" @302

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@300

-		    supplier   	@299

-		    vertices   	(list Points

-			(2748, 1864)

-			(2748, 1678))

-		    line_style 	3

-		    origin_attachment 	(2748, 1864)

-		    terminal_attachment 	(2748, 1678))

-		(object ClassView "Class" "Logical View::java::JavaClass" @303

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(416, 2656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@303

-			location   	(323, 2577)

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EJBJar" @304

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(544, 256)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@304

-			location   	(384, 233)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	320

-			justify    	0

-			label      	"EJBJar")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@304

-			location   	(384, 183)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	317

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC55D01E1"

-		    width      	338

-		    height     	170

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::CMRField" @305

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(432, 2304)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@305

-			location   	(328, 2254)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	208

-			justify    	0

-			label      	"CMRField")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF1810004B"

-		    width      	226

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @306

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AD4690170"

-		    client     	@305

-		    supplier   	@298

-		    vertices   	(list Points

-			(486, 2366)

-			(778, 2700))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$44" @307

-		    location   	(416, 2465)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AE0FB03D3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "collectionType" @308

-			    Parent_View 	@307

-			    location   	(0, 593)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @309

-				Parent_View 	@308

-				location   	(247, 2529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	291

-				justify    	0

-				label      	"+collectionType"

-				pctDist    	0.650813

-				height     	170

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC038F"

-			    client     	@307

-			    supplier   	@303

-			    vertices   	(list Points

-				(416, 2465)

-				(416, 2565))

-			    line_style 	3

-			    origin_attachment 	(416, 2465)

-			    terminal_attachment 	(416, 2565)

-			    label      	(object SegLabel @310

-				Parent_View 	@308

-				location   	(471, 2540)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.747475

-				height     	55

-				orientation 	0))

-			(object RoleView "$UNNAMED$45" @311

-			    Parent_View 	@307

-			    location   	(0, 593)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC03B7"

-			    client     	@307

-			    supplier   	@305

-			    vertices   	(list Points

-				(416, 2465)

-				(416, 2366))

-			    line_style 	3

-			    origin_attachment 	(416, 2465)

-			    terminal_attachment 	(416, 2366))))

-		(object ClassView "Class" "Logical View::ejb::EJBRelation" @312

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(616, 992)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@312

-			location   	(351, 865)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	530

-			justify    	0

-			label      	"EJBRelation")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF0C0203BF"

-		    compartment 	(object Compartment

-			Parent_View 	@312

-			location   	(351, 926)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	548

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Relationships" @313

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(528, 577)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@313

-			location   	(263, 499)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"Relationships")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BEF81703B3"

-		    compartment 	(object Compartment

-			Parent_View 	@313

-			location   	(263, 560)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	572)

-		    width      	548

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$19" @314

-		    location   	(550, 413)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BEF8870378"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbJar" @315

-			    Parent_View 	@314

-			    location   	(54, 109)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @316

-				Parent_View 	@315

-				location   	(653, 369)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.608108

-				height     	103

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003D"

-			    client     	@314

-			    supplier   	@304

-			    vertices   	(list Points

-				(550, 413)

-				(550, 340))

-			    line_style 	3

-			    origin_attachment 	(550, 413)

-			    terminal_attachment 	(550, 340)

-			    label      	(object SegLabel @317

-				Parent_View 	@315

-				location   	(493, 364)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.675676

-				height     	58

-				orientation 	0))

-			(object RoleView "relationshipList" @318

-			    Parent_View 	@314

-			    location   	(54, 109)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @319

-				Parent_View 	@318

-				location   	(725, 459)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+relationshipList"

-				pctDist    	0.637363

-				height     	175

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003C"

-			    client     	@314

-			    supplier   	@313

-			    vertices   	(list Points

-				(550, 413)

-				(550, 487))

-			    line_style 	3

-			    origin_attachment 	(550, 413)

-			    terminal_attachment 	(550, 487)

-			    label      	(object SegLabel @320

-				Parent_View 	@318

-				location   	(487, 463)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.670330

-				height     	64

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$21" @321

-		    location   	(641, 759)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF0C400147"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbRelations" @322

-			    Parent_View 	@321

-			    location   	(273, 503)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @323

-				Parent_View 	@322

-				location   	(492, 793)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"+ejbRelations"

-				pctDist    	0.379310

-				height     	150

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0C41001C"

-			    client     	@321

-			    supplier   	@312

-			    vertices   	(list Points

-				(641, 759)

-				(641, 852))

-			    line_style 	3

-			    origin_attachment 	(641, 759)

-			    terminal_attachment 	(641, 852)

-			    label      	(object SegLabel @324

-				Parent_View 	@322

-				location   	(697, 805)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.500000

-				height     	56

-				orientation 	0))

-			(object RoleView "relationshipList" @325

-			    Parent_View 	@321

-			    location   	(273, 503)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @326

-				Parent_View 	@325

-				location   	(840, 701)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+relationshipList"

-				pctDist    	0.622222

-				height     	199

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0C41001D"

-			    client     	@321

-			    supplier   	@313

-			    vertices   	(list Points

-				(641, 759)

-				(641, 666))

-			    line_style 	3

-			    origin_attachment 	(641, 759)

-			    terminal_attachment 	(641, 666)

-			    label      	(object SegLabel @327

-				Parent_View 	@325

-				location   	(568, 694)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.711111

-				height     	74

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::ejb::EJBRelationshipRole" @328

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(537, 1569)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@328

-			location   	(272, 1420)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"EJBRelationshipRole")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF0DD0023D"

-		    compartment 	(object Compartment

-			Parent_View 	@328

-			location   	(272, 1481)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	572)

-		    width      	548

-		    height     	322

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$25" @329

-		    location   	(101, 1910)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF1BBD02ED"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/opposite" @330

-			    Parent_View 	@329

-			    location   	(-411, 774)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @331

-				Parent_View 	@330

-				location   	(493, 1785)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	188

-				justify    	0

-				label      	"+/opposite"

-				pctDist    	0.905192

-				height     	124

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF1BC0039C"

-			    client     	@329

-			    supplier   	@328

-			    vertices   	(list Points

-				(101, 1910)

-				(101, 1970)

-				(369, 1970)

-				(369, 1730))

-			    line_style 	3

-			    origin_attachment 	(101, 1910)

-			    terminal_attachment 	(369, 1730))

-			(object RoleView "$UNNAMED$26" @332

-			    Parent_View 	@329

-			    location   	(-411, 774)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF1BC003A6"

-			    client     	@329

-			    supplier   	@328

-			    vertices   	(list Points

-				(101, 1910)

-				(101, 1590)

-				(263, 1590))

-			    line_style 	3

-			    origin_attachment 	(101, 1910)

-			    terminal_attachment 	(263, 1590))))

-		(object AssociationViewNew "$UNNAMED$24" @333

-		    location   	(500, 1986)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF182001C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "cmrField" @334

-			    Parent_View 	@333

-			    location   	(-12, 850)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @335

-				Parent_View 	@334

-				location   	(383, 2193)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	182

-				justify    	0

-				label      	"+cmrField"

-				pctDist    	0.809524

-				height     	118

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF182100D2"

-			    client     	@333

-			    supplier   	@305

-			    vertices   	(list Points

-				(500, 1986)

-				(500, 2242))

-			    line_style 	3

-			    origin_attachment 	(500, 1986)

-			    terminal_attachment 	(500, 2242)

-			    label      	(object SegLabel @336

-				Parent_View 	@334

-				location   	(539, 2179)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.752294

-				height     	39

-				orientation 	0))

-			(object RoleView "role" @337

-			    Parent_View 	@333

-			    location   	(-12, 850)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @338

-				Parent_View 	@337

-				location   	(572, 1780)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	104

-				justify    	0

-				label      	"+role"

-				pctDist    	0.805714

-				height     	72

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF182100DC"

-			    client     	@333

-			    supplier   	@328

-			    vertices   	(list Points

-				(500, 1986)

-				(500, 1730))

-			    line_style 	3

-			    origin_attachment 	(500, 1986)

-			    terminal_attachment 	(500, 1730))))

-		(object AssociationViewNew "$UNNAMED$22" @339

-		    location   	(647, 1268)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF0DE30136"

-		    roleview_list 	(list RoleViews

-			(object RoleView "relationshipRoles" @340

-			    Parent_View 	@339

-			    location   	(151, 564)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @341

-				Parent_View 	@340

-				location   	(460, 1363)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	332

-				justify    	0

-				label      	"+relationshipRoles"

-				pctDist    	0.685185

-				height     	188

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0DE303D5"

-			    client     	@339

-			    supplier   	@328

-			    vertices   	(list Points

-				(647, 1268)

-				(647, 1407))

-			    line_style 	3

-			    origin_attachment 	(647, 1268)

-			    terminal_attachment 	(647, 1407)

-			    label      	(object SegLabel @342

-				Parent_View 	@340

-				location   	(684, 1374)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"2"

-				pctDist    	0.761905

-				height     	37

-				orientation 	0))

-			(object RoleView "relationship" @343

-			    Parent_View 	@339

-			    location   	(151, 564)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @344

-				Parent_View 	@343

-				location   	(494, 1190)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	236

-				justify    	0

-				label      	"+relationship"

-				pctDist    	0.575342

-				height     	154

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0DE303D6"

-			    client     	@339

-			    supplier   	@312

-			    vertices   	(list Points

-				(647, 1268)

-				(647, 1130))

-			    line_style 	3

-			    origin_attachment 	(647, 1268)

-			    terminal_attachment 	(647, 1130)

-			    label      	(object SegLabel @345

-				Parent_View 	@343

-				location   	(686, 1172)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.698630

-				height     	39

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::Description" @346

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1596, 471)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@346

-			location   	(1468, 342)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@346

-			location   	(1468, 457)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$65" @347

-		    location   	(1042, 613)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1FCB01AA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @348

-			    Parent_View 	@347

-			    location   	(531, -379)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @349

-				Parent_View 	@348

-				location   	(1310, 597)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.645621

-				height     	17

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FCC00C5"

-			    client     	@347

-			    supplier   	@346

-			    vertices   	(list Points

-				(1042, 613)

-				(1459, 613))

-			    line_style 	3

-			    origin_attachment 	(1042, 613)

-			    terminal_attachment 	(1459, 613)

-			    label      	(object SegLabel @350

-				Parent_View 	@348

-				location   	(1366, 654)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.775967

-				height     	41

-				orientation 	1))

-			(object RoleView "$UNNAMED$66" @351

-			    Parent_View 	@347

-			    location   	(531, -379)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FCC00E3"

-			    client     	@347

-			    supplier   	@312

-			    vertices   	(list Points

-				(1042, 613)

-				(865, 613)

-				(865, 853))

-			    line_style 	3

-			    origin_attachment 	(1042, 613)

-			    terminal_attachment 	(865, 853))))

-		(object AssociationViewNew "$UNNAMED$73" @352

-		    location   	(1130, 506)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1FBF01CB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @353

-			    Parent_View 	@352

-			    location   	(602, -70)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @354

-				Parent_View 	@353

-				location   	(1299, 463)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.512903

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FC1001F"

-			    client     	@352

-			    supplier   	@346

-			    vertices   	(list Points

-				(1130, 506)

-				(1459, 506))

-			    line_style 	3

-			    origin_attachment 	(1130, 506)

-			    terminal_attachment 	(1459, 506)

-			    label      	(object SegLabel @355

-				Parent_View 	@353

-				location   	(1344, 542)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.654839

-				height     	36

-				orientation 	1))

-			(object RoleView "$UNNAMED$74" @356

-			    Parent_View 	@352

-			    location   	(602, -70)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FC10047"

-			    client     	@352

-			    supplier   	@313

-			    vertices   	(list Points

-				(1130, 506)

-				(802, 506))

-			    line_style 	3

-			    origin_attachment 	(1130, 506)

-			    terminal_attachment 	(802, 506))))

-		(object AssociationViewNew "$UNNAMED$77" @357

-		    location   	(1285, 1169)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D20C102C6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @358

-			    Parent_View 	@357

-			    location   	(748, -400)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @359

-				Parent_View 	@358

-				location   	(1409, 724)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.861596

-				height     	125

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D20C400CC"

-			    client     	@357

-			    supplier   	@346

-			    vertices   	(list Points

-				(1285, 1169)

-				(1533, 1169)

-				(1533, 612))

-			    line_style 	3

-			    origin_attachment 	(1285, 1169)

-			    terminal_attachment 	(1533, 612)

-			    label      	(object SegLabel @360

-				Parent_View 	@358

-				location   	(1481, 676)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.921446

-				height     	53

-				orientation 	0))

-			(object RoleView "$UNNAMED$78" @361

-			    Parent_View 	@357

-			    location   	(748, -400)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D20C400EA"

-			    client     	@357

-			    supplier   	@328

-			    vertices   	(list Points

-				(1285, 1169)

-				(719, 1169)

-				(719, 1408))

-			    line_style 	3

-			    origin_attachment 	(1285, 1169)

-			    terminal_attachment 	(719, 1408))))

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @362

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2321, 1138)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@362

-			location   	(1949, 1036)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	744

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E3230174"

-		    compartment 	(object Compartment

-			Parent_View 	@362

-			location   	(1949, 1097)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	779)

-		    width      	762

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$38" @363

-		    location   	(1290, 1233)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398886F503BD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/roles" @364

-			    Parent_View 	@363

-			    location   	(-966, -143)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @365

-				Parent_View 	@364

-				location   	(882, 1363)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	140

-				justify    	0

-				label      	"+/roles"

-				pctDist    	0.892857

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398886F602D8"

-			    client     	@363

-			    supplier   	@328

-			    vertices   	(list Points

-				(1290, 1233)

-				(1079, 1233)

-				(1079, 1403)

-				(811, 1403))

-			    line_style 	3

-			    origin_attachment 	(1290, 1233)

-			    terminal_attachment 	(811, 1403)

-			    label      	(object SegLabel @366

-				Parent_View 	@364

-				location   	(875, 1440)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900794

-				height     	37

-				orientation 	0))

-			(object RoleView "$UNNAMED$39" @367

-			    Parent_View 	@363

-			    location   	(-966, -143)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398886F602E2"

-			    client     	@363

-			    supplier   	@362

-			    vertices   	(list Points

-				(1290, 1233)

-				(1940, 1233))

-			    line_style 	3

-			    origin_attachment 	(1290, 1233)

-			    terminal_attachment 	(1940, 1233))))

-		(object ClassView "Class" "Logical View::ejb::RoleSource" @368

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1456, 1808)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@368

-			location   	(1278, 1705)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	356

-			justify    	0

-			label      	"RoleSource")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF147500E4"

-		    compartment 	(object Compartment

-			Parent_View 	@368

-			location   	(1278, 1766)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	391)

-		    width      	374

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$23" @369

-		    location   	(1040, 1717)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF14EA02FF"

-		    roleview_list 	(list RoleViews

-			(object RoleView "source" @370

-			    Parent_View 	@369

-			    location   	(528, 581)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @371

-				Parent_View 	@370

-				location   	(1191, 1663)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	145

-				justify    	0

-				label      	"+source"

-				pctDist    	0.659389

-				height     	55

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF14EC0059"

-			    client     	@369

-			    supplier   	@368

-			    vertices   	(list Points

-				(1040, 1717)

-				(1269, 1717))

-			    line_style 	3

-			    origin_attachment 	(1040, 1717)

-			    terminal_attachment 	(1269, 1717)

-			    label      	(object SegLabel @372

-				Parent_View 	@370

-				location   	(1245, 1771)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "role" @373

-			    Parent_View 	@369

-			    location   	(528, 581)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @374

-				Parent_View 	@373

-				location   	(888, 1661)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	104

-				justify    	0

-				label      	"+role"

-				pctDist    	0.663755

-				height     	57

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF14EC005A"

-			    client     	@369

-			    supplier   	@328

-			    vertices   	(list Points

-				(1040, 1717)

-				(811, 1717))

-			    line_style 	3

-			    origin_attachment 	(1040, 1717)

-			    terminal_attachment 	(811, 1717)

-			    label      	(object SegLabel @375

-				Parent_View 	@373

-				location   	(835, 1771)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$69" @376

-		    location   	(1644, 1152)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D210300CD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @377

-			    Parent_View 	@376

-			    location   	(188, -656)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @378

-				Parent_View 	@377

-				location   	(1797, 726)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.790657

-				height     	153

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D210502EC"

-			    client     	@376

-			    supplier   	@346

-			    vertices   	(list Points

-				(1644, 1152)

-				(1644, 612))

-			    line_style 	3

-			    origin_attachment 	(1644, 1152)

-			    terminal_attachment 	(1644, 612)

-			    label      	(object SegLabel @379

-				Parent_View 	@377

-				location   	(1698, 667)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$70" @380

-			    Parent_View 	@376

-			    location   	(188, -656)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2105030A"

-			    client     	@376

-			    supplier   	@368

-			    vertices   	(list Points

-				(1644, 1152)

-				(1644, 1693))

-			    line_style 	3

-			    origin_attachment 	(1644, 1152)

-			    terminal_attachment 	(1644, 1693))))

-		(object AssociationViewNew "$UNNAMED$36" @381

-		    location   	(1942, 1652)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398884C2036E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "entityBean" @382

-			    Parent_View 	@381

-			    location   	(710, 260)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @383

-				Parent_View 	@382

-				location   	(1964, 1917)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+entityBean"

-				pctDist    	-0.664634

-				height     	22

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398884C3027F"

-			    client     	@381

-			    supplier   	@362

-			    vertices   	(list Points

-				(1942, 1652)

-				(1942, 1252))

-			    line_style 	3

-			    origin_attachment 	(1942, 1652)

-			    terminal_attachment 	(1942, 1252)

-			    label      	(object SegLabel @384

-				Parent_View 	@382

-				location   	(1996, 1293)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$37" @385

-			    Parent_View 	@381

-			    location   	(710, 260)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398884C30289"

-			    client     	@381

-			    supplier   	@368

-			    vertices   	(list Points

-				(1942, 1652)

-				(1942, 1754)

-				(1643, 1754))

-			    line_style 	3

-			    origin_attachment 	(1942, 1652)

-			    terminal_attachment 	(1643, 1754))))))

-	(object ClassDiagram "EJB2.1 - Query"

-	    quid       	"39BF241E0193"

-	    title      	"EJB2.1 - Query"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	338

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::ReturnTypeMapping" @386

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 1891)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@386

-			location   	(168, 1807)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"ReturnTypeMapping")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@386

-			location   	(168, 1757)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	16384

-		    fill_color 	13434833

-		    quidu      	"398870D30276"

-		    compartment 	(object Compartment

-			Parent_View 	@386

-			location   	(168, 1868)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	200)

-		    width      	418

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object Label @387

-		    location   	(199, 56)

-		    font       	(object Font

-			size       	14

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"EJB2.1 Query")

-		(object ClassView "Class" "Logical View::ejb::MethodElement" @388

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1754, 1063)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@388

-			location   	(1505, 914)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	498

-			justify    	0

-			label      	"MethodElement")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"392ED22D008A"

-		    compartment 	(object Compartment

-			Parent_View 	@388

-			location   	(1505, 975)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	532)

-		    width      	516

-		    height     	322

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @389

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3072, 983)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@389

-			location   	(2858, 802)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	428

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@389

-			location   	(2858, 863)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	303)

-		    width      	446

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @390

-		    location   	(2446, 945)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3937D6FF011D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElement" @391

-			    Parent_View 	@390

-			    location   	(-164, 465)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @392

-				Parent_View 	@391

-				location   	(2198, 932)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	322

-				justify    	0

-				label      	"+methodElement"

-				pctDist    	0.600998

-				height     	47

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000218"

-			    client     	@390

-			    supplier   	@388

-			    vertices   	(list Points

-				(2446, 945)

-				(2446, 978)

-				(2012, 978))

-			    line_style 	3

-			    origin_attachment 	(2446, 945)

-			    terminal_attachment 	(2012, 978)

-			    label      	(object SegLabel @393

-				Parent_View 	@391

-				location   	(2083, 1029)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.850374

-				height     	51

-				orientation 	0))

-			(object RoleView "enterpriseBean" @394

-			    Parent_View 	@390

-			    location   	(-164, 465)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @395

-				Parent_View 	@394

-				location   	(2673, 866)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	299

-				justify    	0

-				label      	"+enterpriseBean"

-				pctDist    	0.599503

-				height     	47

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000178"

-			    client     	@390

-			    supplier   	@389

-			    vertices   	(list Points

-				(2446, 945)

-				(2446, 912)

-				(2849, 912))

-			    line_style 	3

-			    origin_attachment 	(2446, 945)

-			    terminal_attachment 	(2849, 912)

-			    label      	(object SegLabel @396

-				Parent_View 	@394

-				location   	(2804, 966)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::ejb::Entity" @397

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1591, 361)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@397

-			location   	(1408, 258)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	366

-			justify    	0

-			label      	"Entity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E6970351"

-		    compartment 	(object Compartment

-			Parent_View 	@397

-			location   	(1408, 319)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	388)

-		    width      	384

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @398

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E8080095"

-		    client     	@397

-		    supplier   	@389

-		    vertices   	(list Points

-			(1783, 440)

-			(2848, 889))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ejb::QueryMethod" @399

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1984, 1481)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@399

-			location   	(1896, 1405)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	176

-			justify    	0

-			label      	"QueryMethod")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"399ACD9C02DF"

-		    width      	194

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @400

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AD23802A9"

-		    client     	@399

-		    supplier   	@388

-		    vertices   	(list Points

-			(1953, 1392)

-			(1953, 1224))

-		    line_style 	3

-		    origin_attachment 	(1953, 1392)

-		    terminal_attachment 	(1953, 1224))

-		(object ClassView "Class" "Logical View::common::Description" @401

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(918, 2037)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@401

-			location   	(790, 1907)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@401

-			location   	(790, 2022)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	284

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @402

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(660, 397)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@402

-			location   	(288, 270)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	744

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E3230174"

-		    compartment 	(object Compartment

-			Parent_View 	@402

-			location   	(288, 331)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	779)

-		    width      	762

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @403

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230175"

-		    client     	@402

-		    supplier   	@397

-		    vertices   	(list Points

-			(1041, 366)

-			(1399, 366))

-		    line_style 	3

-		    origin_attachment 	(1041, 366)

-		    terminal_attachment 	(1399, 366))

-		(object ClassView "Class" "Logical View::ejb::Query" @404

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(782, 1478)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@404

-			location   	(305, 1353)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	954

-			justify    	0

-			label      	"Query")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF02710327"

-		    compartment 	(object Compartment

-			Parent_View 	@404

-			location   	(305, 1414)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	973)

-		    width      	972

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$20" @405

-		    location   	(1577, 1475)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF056702CD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "queryMethod" @406

-			    Parent_View 	@405

-			    location   	(1257, 131)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @407

-				Parent_View 	@406

-				location   	(1729, 1438)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	262

-				justify    	0

-				label      	"+queryMethod"

-				pctDist    	0.491525

-				height     	38

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF056901EA"

-			    client     	@405

-			    supplier   	@399

-			    vertices   	(list Points

-				(1577, 1475)

-				(1887, 1475))

-			    line_style 	3

-			    origin_attachment 	(1577, 1475)

-			    terminal_attachment 	(1887, 1475)

-			    label      	(object SegLabel @408

-				Parent_View 	@406

-				location   	(1855, 1529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "query" @409

-			    Parent_View 	@405

-			    location   	(1257, 131)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @410

-				Parent_View 	@409

-				location   	(1330, 1434)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	138

-				justify    	0

-				label      	"+query"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF056901F4"

-			    client     	@405

-			    supplier   	@404

-			    vertices   	(list Points

-				(1577, 1475)

-				(1268, 1475))

-			    line_style 	3

-			    origin_attachment 	(1577, 1475)

-			    terminal_attachment 	(1268, 1475)

-			    label      	(object SegLabel @411

-				Parent_View 	@409

-				location   	(1299, 1529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$83" @412

-		    location   	(849, 1754)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E56500D0259"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @413

-			    Parent_View 	@412

-			    location   	(67, 276)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @414

-				Parent_View 	@413

-				location   	(1015, 1844)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.874408

-				height     	140

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E56500E0142"

-			    client     	@412

-			    supplier   	@401

-			    vertices   	(list Points

-				(849, 1754)

-				(883, 1894))

-			    line_style 	0

-			    label      	(object SegLabel @415

-				Parent_View 	@413

-				location   	(818, 1852)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.607463

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$84" @416

-			    Parent_View 	@412

-			    location   	(67, 276)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E56500E0174"

-			    client     	@412

-			    supplier   	@404

-			    vertices   	(list Points

-				(849, 1754)

-				(815, 1615))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$54" @417

-		    location   	(638, 1013)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E4D25D600F0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "entity" @418

-			    Parent_View 	@417

-			    location   	(174, -171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @419

-				Parent_View 	@418

-				location   	(696, 570)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+entity"

-				pctDist    	0.938272

-				height     	118

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D25D600F1"

-			    client     	@417

-			    supplier   	@402

-			    vertices   	(list Points

-				(638, 1013)

-				(578, 1013)

-				(578, 536))

-			    line_style 	3

-			    origin_attachment 	(638, 1013)

-			    terminal_attachment 	(578, 536)

-			    label      	(object SegLabel @420

-				Parent_View 	@418

-				location   	(509, 572)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.934568

-				height     	70

-				orientation 	0))

-			(object RoleView "queries" @421

-			    Parent_View 	@417

-			    location   	(174, -171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @422

-				Parent_View 	@421

-				location   	(910, 1283)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	158

-				justify    	0

-				label      	"+queries"

-				pctDist    	0.883951

-				height     	113

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D25D600F2"

-			    client     	@417

-			    supplier   	@404

-			    vertices   	(list Points

-				(638, 1013)

-				(797, 1013)

-				(797, 1341))

-			    line_style 	3

-			    origin_attachment 	(638, 1013)

-			    terminal_attachment 	(797, 1341)

-			    label      	(object SegLabel @423

-				Parent_View 	@421

-				location   	(883, 1320)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.958025

-				height     	86

-				orientation 	0))))))

-	(object ClassDiagram "EJB2.1 - Message Driven Bean"

-	    quid       	"39BF2749030C"

-	    title      	"EJB2.1 - Message Driven Bean"

-	    documentation 	

-|@version J2EE1.4

-|The messaging-type element specifies the message

-|        listener interface of the message-driven bean. If

-|        the messaging-type element is not specified, it is

-|        assumed to be javax.jms.MessageListener.

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1931

-	    items      	(list diagram_item_list

-		(object Label @424

-		    location   	(50, 41)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	762

-		    label      	"EJB2.1 Message Driven Bean")

-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @425

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(396, 361)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@425

-			location   	(242, 315)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	308

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	326

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::TransactionType" @426

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1825, 497)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@426

-			location   	(1659, 413)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	332

-			justify    	0

-			label      	"TransactionType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@426

-			location   	(1659, 363)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	332

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37FCA48702EF"

-		    compartment 	(object Compartment

-			Parent_View 	@426

-			location   	(1659, 474)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	231)

-		    width      	350

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @427

-		    location   	(1626, 897)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@427

-			location   	(1488, 797)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	240

-			label      	"Was already used/defined by Session bean")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	300

-		    height     	212)

-		(object AttachView "" @428

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@427

-		    supplier   	@426

-		    vertices   	(list Points

-			(1678, 790)

-			(1751, 643))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ejb::AcknowledgeMode" @429

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(784, 1169)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@429

-			location   	(564, 1085)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	440

-			justify    	0

-			label      	"AcknowledgeMode")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@429

-			location   	(564, 1035)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	440

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF36D703E4"

-		    compartment 	(object Compartment

-			Parent_View 	@429

-			location   	(564, 1146)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	446)

-		    width      	458

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::SubscriptionDurabilityKind" @430

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 1968)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@430

-			location   	(805, 1884)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	502

-			justify    	0

-			label      	"SubscriptionDurabilityKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@430

-			location   	(805, 1834)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	502

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF38F0029C"

-		    compartment 	(object Compartment

-			Parent_View 	@430

-			location   	(805, 1945)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	268)

-		    width      	520

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::DestinationType" @431

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(544, 1968)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@431

-			location   	(376, 1884)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"DestinationType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@431

-			location   	(376, 1834)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"39978F5C0106"

-		    compartment 	(object Compartment

-			Parent_View 	@431

-			location   	(376, 1945)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	178)

-		    width      	354

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MessageDrivenDestination" @432

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(568, 1616)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@432

-			location   	(112, 1489)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	912

-			justify    	0

-			label      	"MessageDrivenDestination")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF33F10044"

-		    compartment 	(object Compartment

-			Parent_View 	@432

-			location   	(112, 1550)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	951)

-		    width      	930

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @433

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1428, 547)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@433

-			location   	(1303, 450)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	251

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	269

-		    height     	219

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::ActivationConfigProperty" @434

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2620, 1797)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@434

-			location   	(2488, 1670)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	264

-			justify    	0

-			label      	"ActivationConfigProperty")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D1A1A00BF"

-		    compartment 	(object Compartment

-			Parent_View 	@434

-			location   	(2488, 1781)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	294)

-		    width      	282

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MessageDriven" @435

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(564, 799)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@435

-			location   	(104, 650)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	920

-			justify    	0

-			label      	"MessageDriven")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF3248010B"

-		    compartment 	(object Compartment

-			Parent_View 	@435

-			location   	(104, 711)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	944)

-		    width      	938

-		    height     	322

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @436

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF3253026F"

-		    client     	@435

-		    supplier   	@425

-		    vertices   	(list Points

-			(406, 637)

-			(406, 419))

-		    line_style 	3

-		    origin_attachment 	(406, 637)

-		    terminal_attachment 	(406, 419))

-		(object AssociationViewNew "$UNNAMED$31" @437

-		    location   	(353, 1218)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF340801FF"

-		    roleview_list 	(list RoleViews

-			(object RoleView "destination" @438

-			    Parent_View 	@437

-			    location   	(-47, 418)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @439

-				Parent_View 	@438

-				location   	(502, 1436)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+destination"

-				pctDist    	0.849817

-				height     	149

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF34090052"

-			    client     	@437

-			    supplier   	@432

-			    vertices   	(list Points

-				(353, 1218)

-				(353, 1476))

-			    line_style 	3

-			    origin_attachment 	(353, 1218)

-			    terminal_attachment 	(353, 1476)

-			    label      	(object SegLabel @440

-				Parent_View 	@438

-				location   	(316, 1422)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.790984

-				height     	38

-				orientation 	1))

-			(object RoleView "bean" @441

-			    Parent_View 	@437

-			    location   	(-47, 418)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @442

-				Parent_View 	@441

-				location   	(440, 998)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	128

-				justify    	0

-				label      	"+bean"

-				pctDist    	0.857143

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF3409005C"

-			    client     	@437

-			    supplier   	@435

-			    vertices   	(list Points

-				(353, 1218)

-				(353, 960))

-			    line_style 	3

-			    origin_attachment 	(353, 1218)

-			    terminal_attachment 	(353, 960)

-			    label      	(object SegLabel @443

-				Parent_View 	@441

-				location   	(296, 1001)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.845865

-				height     	58

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$55" @444

-		    location   	(951, 340)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D298201E2"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestination" @445

-			    Parent_View 	@444

-			    location   	(454, -460)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @446

-				Parent_View 	@445

-				location   	(1179, 292)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	396

-				justify    	0

-				label      	"+messageDestination"

-				pctDist    	0.424176

-				height     	49

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D29830270"

-			    client     	@444

-			    supplier   	@433

-			    vertices   	(list Points

-				(951, 340)

-				(1393, 340)

-				(1393, 438))

-			    line_style 	3

-			    origin_attachment 	(951, 340)

-			    terminal_attachment 	(1393, 438)

-			    label      	(object SegLabel @447

-				Parent_View 	@445

-				location   	(1340, 383)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$56" @448

-			    Parent_View 	@444

-			    location   	(454, -460)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2983027A"

-			    client     	@444

-			    supplier   	@435

-			    vertices   	(list Points

-				(951, 340)

-				(708, 340)

-				(708, 638))

-			    line_style 	3

-			    origin_attachment 	(951, 340)

-			    terminal_attachment 	(708, 638))))

-		(object AssociationViewNew "$UNNAMED$61" @449

-		    location   	(1077, 584)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E562D9E0254"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messagingType" @450

-			    Parent_View 	@449

-			    location   	(580, -216)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @451

-				Parent_View 	@450

-				location   	(1129, 552)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	312

-				justify    	0

-				label      	"+messagingType"

-				pctDist    	0.245455

-				height     	33

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E562D9F0183"

-			    client     	@449

-			    supplier   	@433

-			    vertices   	(list Points

-				(1077, 584)

-				(1294, 584))

-			    line_style 	3

-			    origin_attachment 	(1077, 584)

-			    terminal_attachment 	(1294, 584)

-			    label      	(object SegLabel @452

-				Parent_View 	@450

-				location   	(1243, 639)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.768182

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$62" @453

-			    Parent_View 	@449

-			    location   	(580, -216)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E562D9F0197"

-			    client     	@449

-			    supplier   	@435

-			    vertices   	(list Points

-				(1077, 584)

-				(914, 584)

-				(914, 638))

-			    line_style 	3

-			    origin_attachment 	(1077, 584)

-			    terminal_attachment 	(914, 638))))

-		(object ClassView "Class" "Logical View::common::Description" @454

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2490, 687)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@454

-			location   	(2362, 558)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@454

-			location   	(2362, 673)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::ActivationConfig" @455

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1848, 1387)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@455

-			location   	(1752, 1311)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	192

-			justify    	0

-			label      	"ActivationConfig")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D1A7E0131"

-		    width      	210

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$46" @456

-		    location   	(2044, 1713)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1AE2015D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @457

-			    Parent_View 	@456

-			    location   	(196, 326)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @458

-				Parent_View 	@457

-				location   	(2299, 1776)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	0.585480

-				height     	63

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AE20333"

-			    client     	@456

-			    supplier   	@434

-			    vertices   	(list Points

-				(2044, 1713)

-				(2479, 1713))

-			    line_style 	3

-			    origin_attachment 	(2044, 1713)

-			    terminal_attachment 	(2479, 1713)

-			    label      	(object SegLabel @459

-				Parent_View 	@457

-				location   	(2322, 1656)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.641164

-				height     	58

-				orientation 	0))

-			(object RoleView "$UNNAMED$47" @460

-			    Parent_View 	@456

-			    location   	(196, 326)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AE20335"

-			    client     	@456

-			    supplier   	@455

-			    vertices   	(list Points

-				(2044, 1713)

-				(1847, 1713)

-				(1847, 1475))

-			    line_style 	3

-			    origin_attachment 	(2044, 1713)

-			    terminal_attachment 	(1847, 1475))))

-		(object AssociationViewNew "$UNNAMED$48" @461

-		    location   	(1318, 1145)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1B050149"

-		    roleview_list 	(list RoleViews

-			(object RoleView "activationConfig" @462

-			    Parent_View 	@461

-			    location   	(822, 345)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @463

-				Parent_View 	@462

-				location   	(1574, 1318)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	309

-				justify    	0

-				label      	"+activationConfig"

-				pctDist    	0.737631

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1B0700A2"

-			    client     	@461

-			    supplier   	@455

-			    vertices   	(list Points

-				(1318, 1145)

-				(1318, 1362)

-				(1743, 1362))

-			    line_style 	3

-			    origin_attachment 	(1318, 1145)

-			    terminal_attachment 	(1743, 1362)

-			    label      	(object SegLabel @464

-				Parent_View 	@462

-				location   	(1679, 1416)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$49" @465

-			    Parent_View 	@461

-			    location   	(822, 345)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1B0700A4"

-			    client     	@461

-			    supplier   	@435

-			    vertices   	(list Points

-				(1318, 1145)

-				(1318, 787)

-				(1033, 787))

-			    line_style 	3

-			    origin_attachment 	(1318, 1145)

-			    terminal_attachment 	(1033, 787))))

-		(object AssociationViewNew "$UNNAMED$63" @466

-		    location   	(1949, 807)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1AAD00AC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @467

-			    Parent_View 	@466

-			    location   	(101, -580)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @468

-				Parent_View 	@467

-				location   	(2200, 668)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.691023

-				height     	51

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AAD03A5"

-			    client     	@466

-			    supplier   	@454

-			    vertices   	(list Points

-				(1949, 807)

-				(1949, 718)

-				(2353, 718))

-			    line_style 	3

-			    origin_attachment 	(1949, 807)

-			    terminal_attachment 	(2353, 718)

-			    label      	(object SegLabel @469

-				Parent_View 	@467

-				location   	(2290, 772)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.872651

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$64" @470

-			    Parent_View 	@466

-			    location   	(101, -580)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AAD03CD"

-			    client     	@466

-			    supplier   	@455

-			    vertices   	(list Points

-				(1949, 807)

-				(1949, 1299))

-			    line_style 	3

-			    origin_attachment 	(1949, 807)

-			    terminal_attachment 	(1949, 1299))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.mdl b/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.mdl
deleted file mode 100644
index f4aa4d5f2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.mdl
+++ /dev/null
@@ -1,5834 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Design "Logical View"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Java"

-	    name       	"IDE"

-	    value      	"Internal Editor")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagName1"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagText1"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagApply1"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagName2"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagText2"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagApply2"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagName3"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagText3"

-	    value      	"")

-	(object Attribute

-	    tool       	"Java"

-	    name       	"UserDefineTagApply3"

-	    value      	""))

-    quid       	"39EE0E7F014C"

-    enforceClosureAutoLoad 	FALSE

-    defaults   	(object defaults

-	rightMargin 	0.250000

-	leftMargin 	0.250000

-	topMargin  	0.250000

-	bottomMargin 	0.500000

-	pageOverlap 	0.250000

-	clipIconLabels 	TRUE

-	autoResize 	TRUE

-	snapToGrid 	FALSE

-	gridX      	16

-	gridY      	16

-	defaultFont 	(object Font

-	    size       	10

-	    face       	"Arial"

-	    bold       	FALSE

-	    italics    	FALSE

-	    underline  	FALSE

-	    strike     	FALSE

-	    color      	0

-	    default_color 	TRUE)

-	showMessageNum 	1

-	showClassOfObject 	TRUE

-	notation   	"Unified")

-    root_usecase_package 	(object Class_Category "Use Case View"

-	quid       	"39EE0E7F014E"

-	exportControl 	"Public"

-	global     	TRUE

-	logical_models 	(list unit_reference_list)

-	logical_presentations 	(list unit_reference_list

-	    (object UseCaseDiagram "Main"

-		quid       	"39EE0E8001F9"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    root_category 	(object Class_Category "Logical View"

-	quid       	"39EE0E7F014D"

-	exportControl 	"Public"

-	global     	TRUE

-	subsystem  	"Component View"

-	quidu      	"39EE0E7F014F"

-	logical_models 	(list unit_reference_list

-	    (object Class_Category "ecore"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"

-		quid       	"39A5ED04004E")

-	    (object Class_Category "java"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jem\\rose\\edocjava2.cat"

-		quid       	"36549F2C004E")

-	    (object Class_Category "client"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\client.cat"

-		quid       	"38C0280700C0")

-	    (object Class_Category "application"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\application.cat"

-		quid       	"38C03008014E")

-	    (object Class_Category "common"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\common.cat"

-		quid       	"38C08F0F038D")

-	    (object Class_Category "ejb"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\ejbschema.cat"

-		quid       	"3780E272032D")

-	    (object Class_Category "taglib"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\taglib_1_1.cat"

-		quid       	"39A6BA5F0070")

-	    (object Class_Category "webapplication"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webapplication.cat"

-		quid       	"38C076D603DD")

-	    (object Class_Category "jca"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jca1_0.cat"

-		quid       	"3C60904200BB")

-	    (object Class_Category "wsclient"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webservices_client_1_0.cat"

-		quid       	"3E4D2F4B02AA")

-	    (object Class_Category "jsp"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jsp_2_0.cat"

-		quid       	"3E4D4F69036B")

-	    (object Class_Category "wscommon"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wscommon.cat"

-		quid       	"3E15B4C0016F")

-	    (object Class_Category "wsdd"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wsdd.cat"

-		quid       	"3E109EAD0319"))

-	logical_presentations 	(list unit_reference_list

-	    (object ClassDiagram "Main"

-		quid       	"39EE0E8001FA"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list

-		    (object CategoryView "Logical View::ecore" @1

-			location   	(225, 218)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@1

-			    location   	(81, 134)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"ecore")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"39A5ED04004E"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::java" @2

-			location   	(687, 222)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@2

-			    location   	(533, 187)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	308

-			    justify    	0

-			    label      	"java")

-			stereotype 	(object ItemLabel

-			    Parent_View 	@2

-			    location   	(533, 137)

-			    fill_color 	13434879

-			    anchor     	10

-			    nlines     	1

-			    max_width  	308

-			    justify    	0

-			    label      	"<<metamodel>>")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"36549F2C004E"

-			width      	320

-			height     	182)

-		    (object CategoryView "Logical View::client" @3

-			location   	(1109, 231)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@3

-			    location   	(965, 147)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"client")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C0280700C0"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::application" @4

-			location   	(1543, 222)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@4

-			    location   	(1399, 138)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"application")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C03008014E"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::common" @5

-			location   	(1965, 218)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@5

-			    location   	(1821, 134)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"common")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C08F0F038D"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::ejb" @6

-			location   	(1189, 609)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@6

-			    location   	(1035, 574)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	308

-			    justify    	0

-			    label      	"ejb")

-			stereotype 	(object ItemLabel

-			    Parent_View 	@6

-			    location   	(1035, 524)

-			    fill_color 	13434879

-			    anchor     	10

-			    nlines     	1

-			    max_width  	308

-			    justify    	0

-			    label      	"<<metamodel>>")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3780E272032D"

-			width      	320

-			height     	182)

-		    (object CategoryView "Logical View::taglib" @7

-			location   	(1621, 612)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@7

-			    location   	(1477, 528)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"taglib")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"39A6BA5F0070"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::webapplication" @8

-			location   	(303, 614)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@8

-			    location   	(159, 530)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"webapplication")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C076D603DD"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::jca" @9

-			location   	(737, 627)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@9

-			    location   	(593, 543)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"jca")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3C60904200BB"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::wsclient" @10

-			location   	(2009, 618)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@10

-			    location   	(1865, 534)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"wsclient")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3E4D2F4B02AA"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::wscommon" @11

-			location   	(325, 934)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@11

-			    location   	(181, 850)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"wscommon")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3E15B4C0016F"

-			width      	300

-			height     	180)

-		    (object CategoryView "Logical View::wsdd" @12

-			location   	(750, 940)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@12

-			    location   	(606, 856)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"wsdd")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"3E109EAD0319"

-			width      	300

-			height     	180)))))

-    root_subsystem 	(object SubSystem "Component View"

-	quid       	"39EE0E7F014F"

-	physical_models 	(list unit_reference_list)

-	physical_presentations 	(list unit_reference_list

-	    (object Module_Diagram "Main"

-		quid       	"39EE0E8001F8"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list)))

-	category   	"Logical View"

-	quidu      	"4307861E0238")

-    process_structure 	(object Processes

-	quid       	"39EE0E7F0150"

-	ProcsNDevs 	(list

-	    (object Process_Diagram "Deployment View"

-		quid       	"39EE0E7F0152"

-		title      	"Deployment View"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    properties 	(object Properties

-	attributes 	(list Attribute_Set

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"propertyId"

-		value      	"809135969")

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"annotation"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"classifierName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlContentKind"

-			value      	("ContentKind" 0))

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"ContentKind"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Unspecified"

-				value      	0)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Empty"

-				value      	1)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Simple"

-				value      	2)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Mixed"

-				value      	3)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"ElementOnly"

-				value      	4)))

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"annotation"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"operationName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"annotation"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"attributeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnique"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isID"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlNamespace"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlFeatureKind"

-			value      	("FeatureKind" 0))

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"FeatureKind"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Unspecified"

-				value      	0)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Simple"

-				value      	1)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Attribute"

-				value      	2)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Element"

-				value      	4)))

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"annotation"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"referenceName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isResolveProxies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlNamespace"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"xmlFeatureKind"

-			value      	("FeatureKind" 0))

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"FeatureKind"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Unspecified"

-				value      	0)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Simple"

-				value      	1)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Attribute"

-				value      	2)

-			    (object Attribute

-				tool       	"Ecore"

-				name       	"Element"

-				value      	4)))

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"annotation"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialValue"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngRootDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RootPackage"

-			value      	"C++ Reverse Engineered")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngDirectoriesAsPackages"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderFileExtension"

-			value      	".h")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationFileExtension"

-			value      	".cpp")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewHeaderFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewImplementationFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalization"

-			value      	("FileCapitalizationSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectories"

-			value      	("CodeGenExtraDirectoriesSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"StripClassPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"TabWidth"

-			value      	8)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IndentWidth"

-			value      	4)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"AccessIndentation"

-			value      	-2)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CreateBackupFiles"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRules"

-			value      	("ModelIdCommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRules"

-			value      	("CommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"PageWidth"

-			value      	80)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassMemberOrder"

-			value      	("MemberOrderSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"OneParameterPerLine"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NamespaceBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FunctionBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Copyright"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialHeaderIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialBodyIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectoriesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Namespaces"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Packages"

-				value      	2)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalizationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Same as model"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Upper case"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case with underscores"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BraceStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B1"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B2"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B3"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B4"

-				value      	4)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B5"

-				value      	5)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"MemberOrderSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Public First"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Private First"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Order by kind"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Unordered"

-				value      	4)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation and reverse engineering"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never generate model IDs"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Always synchronize"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Reverse engineering only"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never synchronize"

-				value      	4)))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngRootDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RootPackage"

-			value      	"C++ Reverse Engineered")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RevEngDirectoriesAsPackages"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderFileExtension"

-			value      	".h")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationFileExtension"

-			value      	".cpp")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewHeaderFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NewImplementationFileDirectory"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalization"

-			value      	("FileCapitalizationSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectories"

-			value      	("CodeGenExtraDirectoriesSet" 0))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"StripClassPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"TabWidth"

-			value      	8)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IndentWidth"

-			value      	4)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"AccessIndentation"

-			value      	-2)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CreateBackupFiles"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRules"

-			value      	("ModelIdCommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRules"

-			value      	("CommentRulesSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"PageWidth"

-			value      	80)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassMemberOrder"

-			value      	("MemberOrderSet" 1))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"OneParameterPerLine"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"NamespaceBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ClassBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FunctionBraceStyle"

-			value      	("BraceStyleSet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Copyright"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialHeaderIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialBodyIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeGenExtraDirectoriesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Namespaces"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Packages"

-				value      	2)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"FileCapitalizationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Same as model"

-				value      	0)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Upper case"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Lower case with underscores"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BraceStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B1"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B2"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B3"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B4"

-				value      	4)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"B5"

-				value      	5)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"MemberOrderSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Public First"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Private First"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Order by kind"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Unordered"

-				value      	4)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ModelIdCommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation and reverse engineering"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never generate model IDs"

-				value      	3)))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CommentRulesSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Always synchronize"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Code generation only"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Reverse engineering only"

-				value      	3)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Never synchronize"

-				value      	4)))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialCodeBody"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"GenerateFunctionBody"

-			value      	("GenerateFunctionBodySet" 2))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"GenerateFunctionBodySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"Default"

-				value      	2)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"Cplusplus"

-				name       	"False"

-				value      	0)))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderSourceFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BodySourceFile"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IsNamespace"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BodyReferenceOnly"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSIConvert"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultCodeBody"

-			value      	"[statement]")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"$ROSEADA83_SOURCE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassAccess"

-			value      	("ImplementationSet" 43))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationType"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"PolymorphicUnit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleAccess"

-			value      	("ImplementationSet" 45))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Discriminant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsTask"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"LimitedPrivate"

-				value      	200)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ConstructorKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubunit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialCodeBody"

-			value      	"${default}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Spec"

-				value      	224)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Renaming"

-				value      	222)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Separate"

-				value      	223)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Default"

-				value      	232)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"FunctionReturn"

-				value      	206)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Mode"

-			value      	("ParameterModeSet" 232))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Default"

-				value      	232)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"InOut"

-				value      	203)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormal"

-			value      	("GenericFormalSet" 1))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociationMapping"

-			value      	("AssociationMappingSet" 1))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormalSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Default"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Object"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Type"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	4)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	5)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociationMappingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Name"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Type"

-				value      	2)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"After"

-				value      	234)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"After"

-				value      	234)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"After"

-				value      	234)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseColonNotation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultCodeBody"

-			value      	"[statement]")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"$ROSEADA95_SOURCE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibility"

-			value      	("TypeVisibilitySet" 43))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementation"

-			value      	("TypeImplementationSet" 208))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IncompleteType"

-			value      	("IncompleteTypeSet" 1))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControl"

-			value      	("TypeControlSet" 225))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlName"

-			value      	"Controlled_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlVisibility"

-			value      	("TypeVisibilitySet" 43))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementation"

-			value      	("RecordImplementationSet" 209))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordKindPackageName"

-			value      	"${class}_Record_Kinds")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsLimited"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessType"

-			value      	("GenerateAccessTypeSet" 230))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeVisibility"

-			value      	("TypeVisibilitySet" 45))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessClassWide"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"MaybeAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementation"

-			value      	("ParameterizedImplementationSet" 11))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParentClassName"

-			value      	"Superclass")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfTypeName"

-			value      	"Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfTypeName"

-			value      	"Access_Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfAccessTypeName"

-			value      	"Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfAccessTypeName"

-			value      	"Access_Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayIndexDefinition"

-			value      	"Positive range <>")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDefaultConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateCopyConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDestructor"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateTypeEquality"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeEqualityName"

-			value      	(value Text 

-|"="

-			))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Tagged"

-				value      	208)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Record"

-				value      	210)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Mixin"

-				value      	211)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Task"

-				value      	212)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IncompleteTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotDeclare"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"NoDiscriminantPart"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"UnknownDiscriminantPart"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"KnownDiscriminantPart"

-				value      	4)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"SingleType"

-				value      	209)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"MultipleTypes"

-				value      	213)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Unconstrained"

-				value      	214)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Private"

-				value      	43)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"None"

-				value      	225)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InitializationOnly"

-				value      	226)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AssignmentFinalizationOnly"

-				value      	227)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"All"

-				value      	228)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Always"

-				value      	229)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Auto"

-				value      	230)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IndefiniteType"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsPrivate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubunit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalUses"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateOverriding"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialCodeBody"

-			value      	"${default}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryBarrierCondition"

-			value      	"True")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Spec"

-				value      	224)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Abstract"

-				value      	221)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Renaming"

-				value      	222)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"RenamingAsBody"

-				value      	231)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Separate"

-				value      	223)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Default"

-				value      	232)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Access"

-				value      	220)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Mode"

-			value      	("ParameterModeSet" 232))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Default"

-				value      	232)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Access"

-				value      	220)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormal"

-			value      	("GenericFormalSet" 1))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociationMapping"

-			value      	("AssociationMappingSet" 1))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormalSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Default"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Object"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Type"

-				value      	3)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	4)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	5)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Package"

-				value      	6)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociationMappingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Name"

-				value      	1)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Type"

-				value      	2)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessDiscriminantClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessDiscriminantClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessDiscriminantClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Declare"

-			value      	("DeclareSet" 234))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DeclareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Before"

-				value      	233)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"After"

-				value      	234)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IncludePath"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"WindowsShell"

-				value      	101)))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"PathSeparator"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ConstValue"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ImplementationType"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Context"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"OperationIsOneWay"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"BoundedRoleType"

-			value      	("AssocTypeSet" 47))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Direction"

-			value      	("ParamDirectionTypeSet" 102))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ParamDirectionTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"in"

-				value      	102)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"inout"

-				value      	103)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"out"

-				value      	104)))))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"project"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ViewCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SPPackageCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedureCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"JoinCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"cONTAINERCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ViewPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedurePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpacePrefix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDatabase"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TargetDatabase"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Location"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTableSpace"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeault"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"BufferPool"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExtentSize"

-			value      	1)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrefetchSize"

-			value      	1)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PageSize"

-			value      	4)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ManagedBy"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ContainerList"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmSchema"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmDomainPackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchemaPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DatabaseID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DBMS"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsView"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomain"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSPPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Synonymns"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpaceID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CorrelationName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SelectClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckOption"

-			value      	"None")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSnapShot"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDistinct"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PersistToServer"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsPackage"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIdentity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"NullsAllowed"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ColumnType"

-			value      	"Native")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OID"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRelationship"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RIMethod"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrict"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrictName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicityName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsConstraint"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTrigger"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsStoredProcedure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsCluster"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpace"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"FillFactor"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"KeyList"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckPredicate"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DeferalMode"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"InitialCheckTime"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInsertEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeleteEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRow"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"WhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Language"

-			value      	"SQL")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ProcType"

-			value      	"Procedure")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeterministic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParameterStyle"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ReturnedNull"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExternalName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Parameter"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsOutParameter"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OperationID"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler Communicator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Deploy"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Java"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"RootDir"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UsePrefixes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"NotShowRoseIDDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ShowCodegenDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateRoseID"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultJ2EEJavadoc"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultReturnLine"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultAuthor"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultSince"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"UserDefineJavaDocTags"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocNumAsterisks"

-			value      	0)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MaxNumChars"

-			value      	80)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VM"

-			value      	("VMType" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassPath"

-			value      	";D:\\j2sdk1.4.2_08\\jre\\lib\\charsets.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\jce.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\jsse.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\rt.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\sunrsasign.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\dnsns.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\ldapsec.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\localedata.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\ext\\sunjce_provider.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\security\\local_policy.jar;D:\\j2sdk1.4.2_08\\jre\\lib\\security\\US_export_policy.jar;D:\\j2sdk1.4.2_08\\lib\\dt.jar;D:\\j2sdk1.4.2_08\\lib\\htmlconverter.jar;D:\\j2sdk1.4.2_08\\lib\\tools.jar")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReferenceClasspath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"BuiltIn"

-				value      	100)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VMType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Sun"

-				value      	200)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VAJavaWorkingFolder"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"InstanceVariablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassVariablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultAttributeDataType"

-			value      	"int")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultOperationReturnType"

-			value      	"void")

-		    (object Attribute

-			tool       	"Java"

-			name       	"NoClassCustomDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GlobalImports"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceClassStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceMethodStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseSpaces"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SpacingItems"

-			value      	3)

-		    (object Attribute

-			tool       	"Java"

-			name       	"RoseDefaultCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AsteriskCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavaCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocAuthor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocSince"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"RemotePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"RemoteSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"HomePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"HomeSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalHomePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"LocalHomeSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"PrimaryKeySuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBDTDLocation"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDTDLocation"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultEJBVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultServletVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"SourceControl"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCSelected"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCProjectSourceRoot"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCProjectName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"SCCComment"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"FundamentalType"

-			value      	"boolean; char; byte; short; int; long; float; double; Boolean; Byte; Character; Double; Float; Integer; Long; Object; Short; String; StringBuffer; Void; java.math.BigDecimal; java.math.BigInteger; java.sql.Date; java.sql.Time; java.sql.Timestamp; java.util.AbstractCollection; java.util.AbstractList;java.util.AbstractMap; java.util.AbstractSequentialList; java.util.AbstractSet; java.util.ArrayList; java.util.Arrays; java.util.BitSet; java.util.Calendar; java.util.Collections; java.util.Date; java.util.Date; java.util.Dictionary; java.util.EventObject; java.util.GregorianCalendar; java.util.HashMap; java.util.HashSet; java.util.Hashtable; java.util.LinkedList; java.util.ListResourceBundle; java.util.Locale; java.util.Observable; java.util.Properties; java.util.PropertyPermission; java.util.PropertyResourceBundle; java.util.Random; java.util.ResourceBundle; java.util.SimpleTimeZone; java.util.Stack; java.util.StringTokenizer; java.util.Timer; java.util.TimerTask; java.util.TimeZone; java.util.TreeMap; java.util.TreeSet; java.util.Vector; java.util.WeakHashMap")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletXMLFilePath"

-			value      	"")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Http_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_EJB__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion"

-			value      	("EJBVersion_Set" 230))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBVersion_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"2.0"

-				value      	230)

-			    (object Attribute

-				tool       	"Java"

-				name       	"1.x"

-				value      	231)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBXMLFilePath"

-			value      	"")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Abstract"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Native"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Synchronized"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedReturn"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ReplaceExistingCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Strictfp"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsNavigable"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"propertyId"

-		value      	"360000002")

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DDLScriptFilename"

-			value      	"DDL1.SQL")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DropClause"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnName"

-			value      	"_ID")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnType"

-			value      	"NUMBER(5,0)")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNameSuffix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSchema"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"WhereClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeLength"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypePrecision"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeScale"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionOfREFS"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKind"

-			value      	("MethodKindSet" 1903))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OverloadID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSelfish"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerType"

-			value      	("TriggerTypeSet" 1801))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEvent"

-			value      	("TriggerEventSet" 1601))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerText"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerReferencingNames"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEach"

-			value      	("TriggerForEachSet" 1701))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerWhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"MapMethod"

-				value      	1901)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"OrderMethod"

-				value      	1902)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Function"

-				value      	1903)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Procedure"

-				value      	1904)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Operator"

-				value      	1905)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Constructor"

-				value      	1906)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Destructor"

-				value      	1907)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Trigger"

-				value      	1908)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Calculated"

-				value      	1909)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"AFTER"

-				value      	1801)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"BEFORE"

-				value      	1802)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSTEAD OF"

-				value      	1803)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEachSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"ROW"

-				value      	1701)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"STATEMENT"

-				value      	1702)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEventSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT"

-				value      	1601)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE"

-				value      	1602)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"DELETE"

-				value      	1603)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE"

-				value      	1604)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR DELETE"

-				value      	1605)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE OR DELETE"

-				value      	1606)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE OR DELETE"

-				value      	1607)))))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NullsAllowed"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Precision"

-			value      	"2")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Scale"

-			value      	"6")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsPrimaryKey"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CompositeUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ComponentTest"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Model Integrator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Web Publisher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"TopLink"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"COM"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"TypeKinds"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"COM"

-				name       	"enum"

-				value      	100)

-			    (object Attribute

-				tool       	"COM"

-				name       	"record"

-				value      	101)

-			    (object Attribute

-				tool       	"COM"

-				name       	"module"

-				value      	102)

-			    (object Attribute

-				tool       	"COM"

-				name       	"interface"

-				value      	103)

-			    (object Attribute

-				tool       	"COM"

-				name       	"dispinterface"

-				value      	104)

-			    (object Attribute

-				tool       	"COM"

-				name       	"coclass"

-				value      	105)

-			    (object Attribute

-				tool       	"COM"

-				name       	"alias"

-				value      	106)

-			    (object Attribute

-				tool       	"COM"

-				name       	"union"

-				value      	107)

-			    (object Attribute

-				tool       	"COM"

-				name       	"max"

-				value      	108)

-			    (object Attribute

-				tool       	"COM"

-				name       	"(none)"

-				value      	109)))

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"kind"

-			value      	("TypeKinds" 109))

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"dllname"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"alias"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"filename"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"library"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpfile"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"lcid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Version Control"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"InstancingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Private"

-				value      	221)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"PublicNotCreatable"

-				value      	213)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"SingleUse"

-				value      	214)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalSingleUse"

-				value      	215)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"MultiUse"

-				value      	219)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalMultiUse"

-				value      	220)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"BaseSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	222)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"0"

-				value      	223)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"1"

-				value      	224)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionBase"

-			value      	("BaseSet" 222))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionExplicit"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionCompare"

-			value      	("CompareSet" 202))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Instancing"

-			value      	("InstancingSet" 219))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"CompareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	202)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Binary"

-				value      	203)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Text"

-				value      	204)))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"LibraryName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"AliasName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"IsStatic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ReplaceExistingBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"DefaultBody"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImplementsDelegation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByVal"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Optional"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ParamArray"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProjectFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportReferences"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"QuickImport"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportBinary"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"VisualStudio"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Web Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"WindowsShell"

-				value      	101)))))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_PublicID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"NotationValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"InternalValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ParameterEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ExternalEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_PublicID"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"DefaultDeclType"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Assign All"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ComponentPath"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"framework"

-		name       	"HiddenTool"

-		value      	FALSE))

-	quid       	"39EE0E7F0151"))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee_codegen.scrapbook b/plugins/org.eclipse.jst.j2ee.core/rose/j2ee_codegen.scrapbook
deleted file mode 100644
index 78057e161..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee_codegen.scrapbook
+++ /dev/null
@@ -1,28 +0,0 @@
-//WebSphere Config Model generation

-String[] args = {"R2X", 

-"(-file", "j2ee.mdl", 

-"-xmiDir", "umlxmi", 

-"-nameuuid", "true", 

-"-extensions", "true",

-"-pathMap", "ECLIPSE_RESOURCES=C:/dev/eclipse35/IDE/project_resources)"};

-//String[] args = {"?"};

-com.ibm.etools.java.init.JavaInit.executeToolkit(args)

-

-// Copy files up one dir then execute...

-

-String[] args = {

-"-modelPrefix","JavaRef","java",

-"-model", "j2ee.xml", 

-"-dir", "C:/dev/eclipse35/IDE/project_resources/eTools EJB Libraries/src", 

-"-package", "com.ibm.etools", 

-// Logical names of level-1 packages within the model which will be generated.  Nesting not supported.

-"-genAdapters", 

-"-genPackage", "common", "com.ibm.etools.j2ee","common","common.xmi",

-"-genPackage", "ejb","com.ibm.etools", "ejb","ejb.xmi",

-"-genPackage", "client","com.ibm.etools","client","client.xmi",

-"-genPackage", "application","com.ibm.etools","application","application.xmi",

-"-genPackage", "webapplication","com.ibm.etools","webapplication","webapplication.xmi",

-"-genPackage", "taglib","com.ibm.etools","taglib","taglib.xmi",

-"-refPackage", "ecore", "com.ibm.etools.emf", 

-"-4"};

-com.ibm.etools.java.init.JavaInit.executeU2M(args)
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/jaxrpcmap.cat b/plugins/org.eclipse.jst.j2ee.core/rose/jaxrpcmap.cat
deleted file mode 100644
index ff51a2057..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jaxrpcmap.cat
+++ /dev/null
@@ -1,4728 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "jaxrpcmap"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	(value Text "Jaxrpcmap"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	(value Text "jaxrpcmap.xmi")))
-    quid       	"3E161FA90266"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "JavaWSDLMapping"
-	    quid       	"3E1621C30168"
-	    documentation 	
-|The element describes the Java mapping to a known WSDL document.It contains the mapping between package names and XML namespaces, 
-|WSDL root types and Java artifacts, and the set of mappings for services.
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626A800F4"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "PackageMapping"
-	    quid       	"3E1621DB0360"
-	    documentation 	
-|The package-mapping indicates the mapping between java-package-name and XML namespace in the WSDL document.
-|
-|Used in: java-wsdl-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626B101A1"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "packageType"
-		    quid       	"3E5B83B50174"
-		    documentation 	
-|The package-type indicates the Java package name. It must be a fully qualified name.
-|
-|Used in: package-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3E5B83C100D1"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaXMLTypeMapping"
-	    quid       	"3E1621EB016D"
-	    documentation 	
-|The java-xml-type-mapping element contains a class-type that is the fully qualified name of the Java class, QName of the XML root type, the WSDL type scope the QName applies to and the set of variable 
-|mappings for each public variable within the Java class.
-|
-|Used in: java-wsdl-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626BE0068"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "classType"
-		    quid       	"3E5B84D500EC"
-		    documentation 	
-|The class-type element is the fully qualified class name of a Java class.
-|
-|Used in: java-xml-type-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "qnameScope"
-		    quid       	"3E5B85280290"
-		    documentation 	
-|The qname-scope elements scopes the reference of a QName to the WSDL element type it applies to. The value of qname-scope may be simpleType, complexType, or element.
-|
-|Used in: java-xml-type-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "anonymousTypeQname"
-		    quid       	"3F9EFC4C00FF"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ExceptionMapping"
-	    quid       	"3E16220001C6"
-	    documentation 	
-|The exception-mapping element defines the mapping between the service specific exception types and the wsdl faults.
-|
-|This element should be interpreted with respect to the
-|mapping between a method and an operation which provides the mapping context.
-|
-|Used in: service-endpoint-method-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626E4010A"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "exceptionType"
-		    quid       	"3E5B8B9602F1"
-		    documentation 	
-|The exception-type element defines Java type of the exception. It may be a service specific exception.
-|
-|It must be a fully qualified class name.
-|
-|Used in: exception-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3F75E65F0303"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ServiceInterfaceMapping"
-	    quid       	"3E16222D009B"
-	    documentation 	
-|The service-interface-mapping element defines how a Java type for the service interface maps to a WSDL service.
-|
-|Used in: java-wsdl-mapping
-|
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E5B9B670325"
-		    supplier   	"Logical View::jaxrpcmap::InterfaceMapping"
-		    quidu      	"3E162BC200DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626EB01AA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "serviceInterface"
-		    quid       	"3E5B9D3F033C"
-		    documentation 	
-|The service-interface element defines the Java type for the service. For static services, it is javax.xml.rpc.Service interface. For generated service, it would be the generated interface name.
-|
-|The name must be a fully qualified class name.
-|
-|Used in: service-interface-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ServiceEndpointInterfaceMapping"
-	    quid       	"3E1622380259"
-	    documentation 	
-|The service-endpoint-interface-mapping defines a tuple
-|to specify Service Endpoint Interfaces to WSDL port types and WSDL bindings.
-|
-|An interface may be mapped to a port-type and binding multiple times. This happens rarely.
-|
-|Used in: java-wsdl-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E5B9C9202ED"
-		    supplier   	"Logical View::jaxrpcmap::InterfaceMapping"
-		    quidu      	"3E162BC200DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16271302F9"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "serviceEndpointInterface"
-		    quid       	"3E5B9FC501DE"
-		    documentation 	
-|The service-endpoint-interface element defines the Java type for the endpoint interface. The name must be a fully qualified class name.
-|
-|Used in: service-endpoint-interface-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "PackageType"
-	    quid       	"3E16226900F7"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16271B005B"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "packageType"
-		    quid       	"3E19B21C023A"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ClassType"
-	    quid       	"3E16227C005D"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162721024E"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "classType"
-		    quid       	"3E19B26600D3"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "RootTypeQname"
-	    quid       	"3E16229B00C3"
-	    documentation 	
-|The root-type-qname identifies the WSDL QName of an XML type.
-|
-|Used in: java-xml-type-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F46744A027C"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "QnameScope"
-	    quid       	"3E1622AA0273"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162732005D"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "qnameScope"
-		    quid       	"3E19B2AA03E3"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "VariableMapping"
-	    quid       	"3E1622B9033B"
-	    documentation 	
-|The variable-mapping element defines the correlation between a Java class data member or JavaBeans property to an XML element name of an XML root type. If the data-member element is present, the Java variable name is a public data member.  If data-member
-|is not present, the Java variable name is a JavaBeans property.
-|
-|Used in: java-xml-type-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627390048"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaVariableName"
-		    quid       	"3E5B861D0346"
-		    documentation 	
-|The java-variable-name defines the name of a public data member or  JavaBeans property within a Java class. 
-|
-|Used in: variable-mapping
-|
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlElementName"
-		    quid       	"3E5B86300037"
-		    documentation 	
-|The xml-element-name element defines name attribute value of a WSDL element within a root type.
-|
-|Used in: variable-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "dataMember"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F467518029C"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlAttributeName"
-		    quid       	"3F75E92900A7"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlWildcard"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F75EA0202B2"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ExceptionType"
-	    quid       	"3E1622D301E2"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16273F017D"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "name"
-		    quid       	"3E19B571022D"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLMessage"
-	    quid       	"3E1622E002BD"
-	    documentation 	
-|The wsdl-message  element defines a WSDL message by a QNAME.
-|
-|Used in: wsdl-message-mapping, wsdl-return-value-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F46722B03CB"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "ConstructorParameterOrder"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"Java"
-		    name       	"DisableAutoSync"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Final"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Static"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Strictfp"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateDefaultConstructor"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFinalizer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateStaticInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateInstanceInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateCode"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ReadOnly"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedExtends"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedImplements"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ConstructorIs"
-		    value      	("Ctor_Set" 62)))
-	    quid       	"3E1622EC01A1"
-	    documentation 	
-|The constructor-parameter-order element defines the order that complexType element values are applied to a Java exception constructor. Element names are specified for each parameter of the constructor, including element names of inherited types if necessary.
-|
-|Used in: exception-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16274F023D"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaVariableName"
-	    quid       	"3E16235C0262"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162756039B"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaVariableName"
-		    quid       	"3E19B362029A"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "XMLElementName"
-	    quid       	"3E1623A1039D"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627620366"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlElementName"
-		    quid       	"3E19B37D039B"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ElementName"
-	    quid       	"3E1623B9006B"
-	    documentation 	
-|The element-name element defines the name of a complexType element name attribute value.
-|
-|Used in: constructor-parameter-order
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627680115"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "text"
-		    quid       	"3E19B5A202D4"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLServiceName"
-	    quid       	"3E16242903AD"
-	    documentation 	
-|The wsdl-service-name element defines the wsdl service name by a QNAME which uniquely identifies  the service.
-|
-|Used in: service-interface-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F4672A70143"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "PortMapping"
-	    quid       	"3E16243E03A2"
-	    documentation 	
-|The port-mapping defines the mapping of the WSDL port name attribute to the Java name used to generate the Generated Service Interface method get<java-name>.
-|
-|Used in: service-interface-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162772030D"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "portName"
-		    quid       	"3E5B9EC702EC"
-		    documentation 	
-|The port-name is the attribute value of a name attribute of a WSDL port element.
-|
-|Used in: port-mapping
-|
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaPortName"
-		    quid       	"3E5B9ECE0075"
-		    documentation 	
-|The java-port-name element is the string to use as the port name in Java.  It is used in generating the Generated Service Interface method
-|get<java-port-name>.
-|
-|Used in: port-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaPortName"
-	    quid       	"3E1624A301C9"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627780063"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaPortName"
-		    quid       	"3E19C09800E9"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLPortType"
-	    quid       	"3E1624EB0326"
-	    documentation 	
-|The wsdl-port-type element defines the wsdl port type
-|by a QNAME which uniquely identifies  the port type.
-|
-|Used in: service-endpoint-interface-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F4672C40083"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "WSDLBinding"
-	    quid       	"3E16250602A1"
-	    documentation 	
-|The wsdl-binding element defines the wsdl binding
-|by a QNAME which uniquely identifies  the binding.
-|
-|Used in: service-endpoint-interface-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F46737A0033"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "ServiceEndpointMethodMapping"
-	    quid       	"3E1625140124"
-	    documentation 	
-|The service-endpoint-method-mapping element defines the mapping of Java methods to operations (which are not uniquely qualified by qnames).
-|
-|The wsdl-operation should be interpreted with respect to the portType and binding in which this definition is embedded within. See the definitions for service-endpoint-interface-mapping and 
-|service-interface-mapping to acquire the proper context. The wrapped-element indicator should only be specified when a WSDL message wraps an element type.  The wsdl-return-value-mapping is not specified for one-way operations.
-|
-|Used in: service-endpoint-interface-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16278A031A"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaMethodName"
-		    quid       	"3E5BA15D0077"
-		    documentation 	
-|The java-method-name element defines the name of a Java method within an interface.
-|
-|Used in: service-endpoint-method-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlOperation"
-		    quid       	"3E5BA16502F9"
-		    documentation 	
-|The wsdl-operation element defines an operation within a WSDL document. It must be interpreted with respect to a port type.
-|
-|Used in: service-endpoint-method-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wrappedElement"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F4675BF0274"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaMethodName"
-	    quid       	"3E16252900BE"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162790030E"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaMethodName"
-		    quid       	"3E19C3110121"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLOperation"
-	    quid       	"3E16253603C9"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627970340"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlOperation"
-		    quid       	"3E19C2B4019C"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "MethodParamPartsMapping"
-	    quid       	"3E16256A0171"
-	    documentation 	
-|The method-param-parts-mapping element defines the mapping between a Java method parameters and a wsdl-message.
-|
-|Used in: service-endpoint-method-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627A703BA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramPosition"
-		    quid       	"3E5BA26002C3"
-		    documentation 	
-|The param-position element defines the position of a parameter within a Java method.  It must be an integer starting from 0.
-|
-|Used in: method-param-parts-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramType"
-		    quid       	"3E5BA2690366"
-		    documentation 	
-|The param-type element defines the Java type of a parameter within a Java method. It must be defined by a fully qualified name of a class.
-|
-|Used in: method-param-parts-mapping
-|
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLReturnValueMapping"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"Java"
-		    name       	"DisableAutoSync"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Final"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Static"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Strictfp"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateDefaultConstructor"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFinalizer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateStaticInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateInstanceInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateCode"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ReadOnly"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedExtends"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedImplements"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ConstructorIs"
-		    value      	("Ctor_Set" 62)))
-	    quid       	"3E1625870243"
-	    documentation 	
-|The wsdl-return-value-mapping  element defines the mapping for the method's return value. It defines the mapping to a specific message and its part.  Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely 
-|identified with their names. The wsdl-message-part-name is not
-|specified if there is no return value or OUT parameters.
-|
-|Used in: service-endpoint-method-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627AD0174"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "methodReturnValue"
-		    quid       	"3E5BA4F601E9"
-		    documentation 	
-|The method-return-value  element defines a fully qualified class name or void type for the method's return value type.
-|
-|Used in: wsdl-return-value-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3E5BA41D02B2"
-		    documentation 	
-|Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element
-|name of the element type.
-|
-|Used in: wsdl-message-mapping, wsdl-return-value-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ParamPosition"
-	    quid       	"3E1625CF02F6"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627B300D2"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramPosition"
-		    quid       	"3E19C4110059"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ParamType"
-	    quid       	"3E1625E20085"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627BC01C4"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramType"
-		    quid       	"3E19C41A03C2"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLMessageMapping"
-	    quid       	"3E1625FA038B"
-	    documentation 	
-|The wsdl-message-mapping element defines the mapping to a specific message and its part. Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely 
-|identified with their names.
-|
-|The parameter-mode is defined by the mapping to indicate whether the mapping will be IN, OUT, or INOUT..  The presence of the soap-header
-|element indicates that the parameter is mapped to a soap header only. When absent, it means that the wsdl-message is mapped to a Java parameter. The soap headers are interpreted in the order they are
-|provided in the mapping.
-|
-|Used in: method-param-parts-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627C3000B"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3E5BA2AD019D"
-		    documentation 	
-|Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element
-|name of the element type.
-|
-|Used in: wsdl-message-mapping, wsdl-return-value-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "parameterMode"
-		    quid       	"3E5BA32F01C4"
-		    documentation 	
-|The parameter-mode  element defines the mode of the parameter. It can have only three values, IN, OUT, INOUT.
-|
-|Used in: wsdl-message-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "soapHeader"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F46765B00CB"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLMessagePartName"
-	    quid       	"3E1626250394"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627DA01C5"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3E19B4B3004C"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ParameterMode"
-	    quid       	"3E16264800C1"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627E10161"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "parameterMode"
-		    quid       	"3E19B4CB0190"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "MethodReturnValue"
-	    quid       	"3E16267A02F0"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627F002CA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "methodReturnValue"
-		    quid       	"3E19C3360117"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "InterfaceMapping"
-	    quid       	"3E162BC200DD"
-	    language   	"Java")
-	(object Association "$UNNAMED$0"
-	    quid       	"3E188B0E0371"
-	    roles      	(list role_list
-		(object Role "packageMappings"
-		    quid       	"3E188B1002AC"
-		    label      	"packageMappings"
-		    supplier   	"Logical View::jaxrpcmap::PackageMapping"
-		    quidu      	"3E1621DB0360"
-		    client_cardinality 	(value cardinality "1..n")
-		    Constraints 	"1"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3E188B1002B6"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3E188EAF01F6"
-	    roles      	(list role_list
-		(object Role "rootTypeQname"
-		    quid       	"3E188EB003A6"
-		    label      	"rootTypeQname"
-		    supplier   	"Logical View::jaxrpcmap::RootTypeQname"
-		    quidu      	"3E16229B00C3"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3E188EB003A8"
-		    supplier   	"Logical View::jaxrpcmap::JavaXMLTypeMapping"
-		    quidu      	"3E1621EB016D"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$4"
-	    quid       	"3E188EC50084"
-	    roles      	(list role_list
-		(object Role "variableMappings"
-		    quid       	"3E188EC70271"
-		    label      	"variableMappings"
-		    supplier   	"Logical View::jaxrpcmap::VariableMapping"
-		    quidu      	"3E1622B9033B"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3E188EC70273"
-		    supplier   	"Logical View::jaxrpcmap::JavaXMLTypeMapping"
-		    quidu      	"3E1621EB016D"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    quid       	"3E18919400B9"
-	    roles      	(list role_list
-		(object Role "javaXMLTypeMappings"
-		    quid       	"3E1891950382"
-		    label      	"javaXMLTypeMappings"
-		    supplier   	"Logical View::jaxrpcmap::JavaXMLTypeMapping"
-		    quidu      	"3E1621EB016D"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"3E1891950384"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$8"
-	    quid       	"3E18A1AE00EB"
-	    roles      	(list role_list
-		(object Role "exceptionMappings"
-		    quid       	"3E18A1AF001A"
-		    label      	"exceptionMappings"
-		    supplier   	"Logical View::jaxrpcmap::ExceptionMapping"
-		    quidu      	"3E16220001C6"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$9"
-		    quid       	"3E18A1AF001C"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$10"
-	    quid       	"3E18A1B5019F"
-	    roles      	(list role_list
-		(object Role "wsdlMessage"
-		    quid       	"3E18A1B6020E"
-		    label      	"wsdlMessage"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessage"
-		    quidu      	"3E1622E002BD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3E18A1B60210"
-		    supplier   	"Logical View::jaxrpcmap::ExceptionMapping"
-		    quidu      	"3E16220001C6"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$12"
-	    quid       	"3E18A1BB03E2"
-	    roles      	(list role_list
-		(object Role "constructorParameterOrder"
-		    quid       	"3E18A1BD0037"
-		    label      	"constructorParameterOrder"
-		    supplier   	"Logical View::jaxrpcmap::ConstructorParameterOrder"
-		    quidu      	"3E1622EC01A1"
-		    client_cardinality 	(value cardinality "0..1")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$13"
-		    quid       	"3E18A1BD0039"
-		    supplier   	"Logical View::jaxrpcmap::ExceptionMapping"
-		    quidu      	"3E16220001C6"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$14"
-	    quid       	"3E18A1D80066"
-	    roles      	(list role_list
-		(object Role "elementNames"
-		    quid       	"3E18A1DA0023"
-		    label      	"elementNames"
-		    supplier   	"Logical View::jaxrpcmap::ElementName"
-		    quidu      	"3E1623B9006B"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$15"
-		    quid       	"3E18A1DA0025"
-		    supplier   	"Logical View::jaxrpcmap::ConstructorParameterOrder"
-		    quidu      	"3E1622EC01A1"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$16"
-	    quid       	"3E18A543024E"
-	    roles      	(list role_list
-		(object Role "interfaceMappings"
-		    quid       	"3E18A5440322"
-		    label      	"interfaceMappings"
-		    supplier   	"Logical View::jaxrpcmap::InterfaceMapping"
-		    quidu      	"3E162BC200DD"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$17"
-		    quid       	"3E18A5440324"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$18"
-	    quid       	"3E18A5680096"
-	    roles      	(list role_list
-		(object Role "wsdlServiceName"
-		    quid       	"3E18A56803AD"
-		    label      	"wsdlServiceName"
-		    supplier   	"Logical View::jaxrpcmap::WSDLServiceName"
-		    quidu      	"3E16242903AD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$19"
-		    quid       	"3E18A56803AF"
-		    supplier   	"Logical View::jaxrpcmap::ServiceInterfaceMapping"
-		    quidu      	"3E16222D009B"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$20"
-	    quid       	"3E18A575004E"
-	    roles      	(list role_list
-		(object Role "portMappings"
-		    quid       	"3E18A576001D"
-		    label      	"portMappings"
-		    supplier   	"Logical View::jaxrpcmap::PortMapping"
-		    quidu      	"3E16243E03A2"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$21"
-		    quid       	"3E18A5760027"
-		    supplier   	"Logical View::jaxrpcmap::ServiceInterfaceMapping"
-		    quidu      	"3E16222D009B"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$22"
-	    quid       	"3E18A583022D"
-	    roles      	(list role_list
-		(object Role "wsdlPortType"
-		    quid       	"3E18A587014D"
-		    label      	"wsdlPortType"
-		    supplier   	"Logical View::jaxrpcmap::WSDLPortType"
-		    quidu      	"3E1624EB0326"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$23"
-		    quid       	"3E18A5870157"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping"
-		    quidu      	"3E1622380259"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$24"
-	    quid       	"3E18A5BD036D"
-	    roles      	(list role_list
-		(object Role "wsdlBinding"
-		    quid       	"3E18A5BE038D"
-		    label      	"wsdlBinding"
-		    supplier   	"Logical View::jaxrpcmap::WSDLBinding"
-		    quidu      	"3E16250602A1"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$25"
-		    quid       	"3E18A5BE0397"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping"
-		    quidu      	"3E1622380259"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$26"
-	    quid       	"3E18A5E30351"
-	    roles      	(list role_list
-		(object Role "serviceEndpointMethodMappings"
-		    quid       	"3E18A5E502D2"
-		    label      	"serviceEndpointMethodMappings"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointMethodMapping"
-		    quidu      	"3E1625140124"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$27"
-		    quid       	"3E18A5E502DC"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping"
-		    quidu      	"3E1622380259"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$28"
-	    quid       	"3E19A09E005D"
-	    roles      	(list role_list
-		(object Role "methodParamPartsMappings"
-		    quid       	"3E19A09F004A"
-		    label      	"methodParamPartsMappings"
-		    supplier   	"Logical View::jaxrpcmap::MethodParamPartsMapping"
-		    quidu      	"3E16256A0171"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$29"
-		    quid       	"3E19A09F004C"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointMethodMapping"
-		    quidu      	"3E1625140124"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$30"
-	    quid       	"3E19A0A3028A"
-	    roles      	(list role_list
-		(object Role "wsdlReturnValueMapping"
-		    quid       	"3E19A0A40354"
-		    label      	"wsdlReturnValueMapping"
-		    supplier   	"Logical View::jaxrpcmap::WSDLReturnValueMapping"
-		    quidu      	"3E1625870243"
-		    client_cardinality 	(value cardinality "0..1")
-		    Constraints 	"5"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$31"
-		    quid       	"3E19A0A4035E"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointMethodMapping"
-		    quidu      	"3E1625140124"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$32"
-	    quid       	"3E19A121008E"
-	    roles      	(list role_list
-		(object Role "wsdlMessage"
-		    quid       	"3E19A1220017"
-		    label      	"wsdlMessage"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessage"
-		    quidu      	"3E1622E002BD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$33"
-		    quid       	"3E19A1220022"
-		    supplier   	"Logical View::jaxrpcmap::WSDLReturnValueMapping"
-		    quidu      	"3E1625870243"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$34"
-	    quid       	"3E19A5D401CA"
-	    roles      	(list role_list
-		(object Role "wsdlMessageMapping"
-		    quid       	"3E19A5D5008B"
-		    label      	"wsdlMessageMapping"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessageMapping"
-		    quidu      	"3E1625FA038B"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$35"
-		    quid       	"3E19A5D5008D"
-		    supplier   	"Logical View::jaxrpcmap::MethodParamPartsMapping"
-		    quidu      	"3E16256A0171"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$36"
-	    quid       	"3E19A5DB0011"
-	    roles      	(list role_list
-		(object Role "wsdlMessage"
-		    quid       	"3E19A5DB0383"
-		    label      	"wsdlMessage"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessage"
-		    quidu      	"3E1622E002BD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"1"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$37"
-		    quid       	"3E19A5DB038E"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessageMapping"
-		    quidu      	"3E1625FA038B"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "PackageMapping"
-	    quid       	"3E188A5A02CB"
-	    title      	"PackageMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::PackageMapping" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 208)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(826, 100)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	460
-			justify    	0
-			label      	"PackageMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621DB0360"
-		    width      	478
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 208)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(109, 141)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @3
-		    location   	(662, 208)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E188B0E0371"
-		    roleview_list 	(list RoleViews
-			(object RoleView "packageMappings" @4
-			    Parent_View 	@3
-			    location   	(362, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @5
-				Parent_View 	@4
-				location   	(716, 87)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	294
-				justify    	0
-				label      	"+packageMappings"
-				pctDist    	0.349727
-				height     	122
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188B1002AC"
-			    client     	@3
-			    supplier   	@1
-			    line_style 	0
-			    label      	(object SegLabel @6
-				Parent_View 	@4
-				location   	(744, 151)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.535519
-				height     	58
-				orientation 	0)
-			    label      	(object SegLabel @7
-				Parent_View 	@4
-				location   	(786, 253)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{1}"
-				pctDist    	0.814208
-				height     	45
-				orientation 	1))
-			(object RoleView "$UNNAMED$1" @8
-			    Parent_View 	@3
-			    location   	(362, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188B1002B6"
-			    client     	@3
-			    supplier   	@2
-			    line_style 	0
-			    label      	(object SegLabel @9
-				Parent_View 	@8
-				location   	(523, 262)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.901099
-				height     	54
-				orientation 	0))))))
-	(object ClassDiagram "JavaXMLTypeMapping"
-	    quid       	"3E188BF0014A"
-	    title      	"JavaXMLTypeMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::RootTypeQname" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1184, 720)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(1018, 678)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	332
-			justify    	0
-			label      	"RootTypeQname")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16229B00C3"
-		    width      	350
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::VariableMapping" @11
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1184, 1232)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@11
-			location   	(923, 1063)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	522
-			justify    	0
-			label      	"VariableMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622B9033B"
-		    width      	540
-		    height     	358
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaXMLTypeMapping" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(320, 848)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(14, 720)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	612
-			justify    	0
-			label      	"JavaXMLTypeMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621EB016D"
-		    width      	630
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @13
-		    location   	(821, 773)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E188EAF01F6"
-		    roleview_list 	(list RoleViews
-			(object RoleView "rootTypeQname" @14
-			    Parent_View 	@13
-			    location   	(505, -75)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @15
-				Parent_View 	@14
-				location   	(890, 720)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	262
-				justify    	0
-				label      	"+rootTypeQname"
-				pctDist    	0.403230
-				height     	43
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EB003A6"
-			    client     	@13
-			    supplier   	@10
-			    line_style 	0
-			    label      	(object SegLabel @16
-				Parent_View 	@14
-				location   	(956, 690)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.767360
-				height     	64
-				orientation 	0)
-			    label      	(object SegLabel @17
-				Parent_View 	@14
-				location   	(984, 682)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.925304
-				height     	68
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @18
-			    Parent_View 	@13
-			    location   	(505, -75)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EB003A8"
-			    client     	@13
-			    supplier   	@12
-			    line_style 	0
-			    label      	(object SegLabel @19
-				Parent_View 	@18
-				location   	(663, 851)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896000
-				height     	54
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$4" @20
-		    location   	(771, 1048)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E188EC50084"
-		    roleview_list 	(list RoleViews
-			(object RoleView "variableMappings" @21
-			    Parent_View 	@20
-			    location   	(450, 199)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @22
-				Parent_View 	@21
-				location   	(812, 1149)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	292
-				justify    	0
-				label      	"+variableMappings"
-				pctDist    	0.510648
-				height     	76
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EC70271"
-			    client     	@20
-			    supplier   	@11
-			    line_style 	0
-			    label      	(object SegLabel @23
-				Parent_View 	@21
-				location   	(847, 1103)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.594874
-				height     	20
-				orientation 	1)
-			    label      	(object SegLabel @24
-				Parent_View 	@21
-				location   	(794, 1117)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{4}"
-				pctDist    	0.310863
-				height     	55
-				orientation 	1))
-			(object RoleView "$UNNAMED$5" @25
-			    Parent_View 	@20
-			    location   	(450, 199)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EC70273"
-			    client     	@20
-			    supplier   	@12
-			    line_style 	0
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(666, 944)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896312
-				height     	53
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @27
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 160)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@27
-			location   	(77, 93)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @28
-		    location   	(293, 473)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18919400B9"
-		    roleview_list 	(list RoleViews
-			(object RoleView "javaXMLTypeMappings" @29
-			    Parent_View 	@28
-			    location   	(21, 320)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(267, 665)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	370
-				justify    	0
-				label      	"+javaXMLTypeMappings"
-				pctDist    	0.797753
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E1891950382"
-			    client     	@28
-			    supplier   	@12
-			    line_style 	0
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(362, 681)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.898876
-				height     	54
-				orientation 	0)
-			    label      	(object SegLabel @32
-				Parent_View 	@29
-				location   	(416, 677)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.898876
-				height     	108
-				orientation 	0))
-			(object RoleView "$UNNAMED$7" @33
-			    Parent_View 	@28
-			    location   	(21, 320)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E1891950384"
-			    client     	@28
-			    supplier   	@27
-			    line_style 	0
-			    label      	(object SegLabel @34
-				Parent_View 	@33
-				location   	(333, 258)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898496
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::common::QName" @35
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1184, 224)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@35
-			location   	(898, 77)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	572
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16766421
-		    quidu      	"3F3BEF5D02C0"
-		    width      	590
-		    height     	314
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @36
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F46744A027C"
-		    client     	@10
-		    supplier   	@35
-		    line_style 	0)))
-	(object ClassDiagram "ExceptionMapping"
-	    quid       	"3E18934B039F"
-	    title      	"ExceptionMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @37
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 128)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@37
-			location   	(109, 61)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessage" @38
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 656)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@38
-			location   	(923, 614)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"WSDLMessage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622E002BD"
-		    width      	316
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ExceptionMapping" @39
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 656)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@39
-			location   	(7, 548)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	594
-			justify    	0
-			label      	"ExceptionMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16220001C6"
-		    width      	612
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$8" @40
-		    location   	(304, 371)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1AE00EB"
-		    roleview_list 	(list RoleViews
-			(object RoleView "exceptionMappings" @41
-			    Parent_View 	@40
-			    location   	(0, 250)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @42
-				Parent_View 	@41
-				location   	(265, 475)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	323
-				justify    	0
-				label      	"+exceptionMappings"
-				pctDist    	0.631016
-				height     	40
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1AF001A"
-			    client     	@40
-			    supplier   	@39
-			    line_style 	0
-			    label      	(object SegLabel @43
-				Parent_View 	@41
-				location   	(358, 519)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.893048
-				height     	54
-				orientation 	0)
-			    label      	(object SegLabel @44
-				Parent_View 	@41
-				location   	(412, 519)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.893048
-				height     	108
-				orientation 	0))
-			(object RoleView "$UNNAMED$9" @45
-			    Parent_View 	@40
-			    location   	(0, 250)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1AF001C"
-			    client     	@40
-			    supplier   	@37
-			    line_style 	0
-			    label      	(object SegLabel @46
-				Parent_View 	@45
-				location   	(358, 223)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.892473
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$10" @47
-		    location   	(761, 656)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1B5019F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessage" @48
-			    Parent_View 	@47
-			    location   	(461, -6)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @49
-				Parent_View 	@48
-				location   	(784, 618)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	230
-				justify    	0
-				label      	"+wsdlMessage"
-				pctDist    	0.156463
-				height     	39
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1B6020E"
-			    client     	@47
-			    supplier   	@38
-			    line_style 	0
-			    label      	(object SegLabel @50
-				Parent_View 	@48
-				location   	(896, 710)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896552
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @51
-				Parent_View 	@48
-				location   	(862, 701)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.666667
-				height     	45
-				orientation 	1))
-			(object RoleView "$UNNAMED$11" @52
-			    Parent_View 	@47
-			    location   	(461, -6)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1B60210"
-			    client     	@47
-			    supplier   	@39
-			    line_style 	0
-			    label      	(object SegLabel @53
-				Parent_View 	@52
-				location   	(626, 710)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898635
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::ElementName" @54
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 1424)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@54
-			location   	(1738, 1336)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	300
-			justify    	0
-			label      	"ElementName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1623B9006B"
-		    width      	318
-		    height     	196
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ConstructorParameterOrder" @55
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1152, 1088)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@55
-			location   	(902, 1021)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	500
-			justify    	0
-			label      	"ConstructorParameterOrder")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622EC01A1"
-		    width      	518
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$12" @56
-		    location   	(768, 892)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1BB03E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "constructorParameterOrder" @57
-			    Parent_View 	@56
-			    location   	(463, 235)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @58
-				Parent_View 	@57
-				location   	(688, 997)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	422
-				justify    	0
-				label      	"+constructorParameterOrder"
-				pctDist    	-0.102003
-				height     	130
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1BD0037"
-			    client     	@56
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @59
-				Parent_View 	@57
-				location   	(1039, 980)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..1"
-				pctDist    	1.082131
-				height     	45
-				orientation 	0)
-			    label      	(object SegLabel @60
-				Parent_View 	@57
-				location   	(983, 940)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.817677
-				height     	55
-				orientation 	0))
-			(object RoleView "$UNNAMED$13" @61
-			    Parent_View 	@56
-			    location   	(463, 235)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1BD0039"
-			    client     	@56
-			    supplier   	@39
-			    line_style 	0
-			    label      	(object SegLabel @62
-				Parent_View 	@61
-				location   	(584, 739)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896194
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$14" @63
-		    location   	(1525, 1257)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1D80066"
-		    roleview_list 	(list RoleViews
-			(object RoleView "elementNames" @64
-			    Parent_View 	@63
-			    location   	(323, -167)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1718, 1264)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+elementNames"
-				pctDist    	0.804782
-				height     	75
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1DA0023"
-			    client     	@63
-			    supplier   	@54
-			    line_style 	0
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1672, 1374)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.810582
-				height     	46
-				orientation 	1))
-			(object RoleView "$UNNAMED$15" @67
-			    Parent_View 	@63
-			    location   	(323, -167)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1DA0025"
-			    client     	@63
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @68
-				Parent_View 	@67
-				location   	(1321, 1223)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.902256
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::common::QName" @69
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1600, 192)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@69
-			location   	(1314, 45)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	572
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16766421
-		    quidu      	"3F3BEF5D02C0"
-		    width      	590
-		    height     	314
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @70
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F46722B03CB"
-		    client     	@38
-		    supplier   	@69
-		    line_style 	0)))
-	(object ClassDiagram "InterfaceMapping"
-	    quid       	"3E18A3F50002"
-	    title      	"InterfaceMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	2001
-	    origin_y   	1669
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceEndpointMethodMapping" @71
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2112, 2336)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@71
-			location   	(1806, 2208)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	612
-			justify    	0
-			label      	"ServiceEndpointMethodMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625140124"
-		    width      	630
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLPortType" @72
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2064, 1504)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@72
-			location   	(1909, 1462)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"WSDLPortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1624EB0326"
-		    width      	328
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLBinding" @73
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2064, 1888)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@73
-			location   	(1921, 1846)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	286
-			justify    	0
-			label      	"WSDLBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16250602A1"
-		    width      	304
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping" @74
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1120, 1504)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@74
-			location   	(801, 1416)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	638
-			justify    	0
-			label      	"ServiceEndpointInterfaceMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622380259"
-		    width      	656
-		    height     	196
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$26" @75
-		    location   	(1592, 1899)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A5E30351"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceEndpointMethodMappings" @76
-			    Parent_View 	@75
-			    location   	(479, 394)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @77
-				Parent_View 	@76
-				location   	(1672, 2194)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	508
-				justify    	0
-				label      	"+serviceEndpointMethodMappings"
-				pctDist    	0.543006
-				height     	175
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5E502D2"
-			    client     	@75
-			    supplier   	@71
-			    line_style 	0
-			    label      	(object SegLabel @78
-				Parent_View 	@76
-				location   	(1692, 2158)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.522836
-				height     	134
-				orientation 	1)
-			    label      	(object SegLabel @79
-				Parent_View 	@76
-				location   	(1843, 2152)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{4}"
-				pctDist    	0.765691
-				height     	33
-				orientation 	1))
-			(object RoleView "$UNNAMED$27" @80
-			    Parent_View 	@75
-			    location   	(479, 394)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5E502DC"
-			    client     	@75
-			    supplier   	@74
-			    line_style 	0
-			    label      	(object SegLabel @81
-				Parent_View 	@80
-				location   	(1308, 1594)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.895582
-				height     	52
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$22" @82
-		    location   	(1673, 1504)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A583022D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlPortType" @83
-			    Parent_View 	@82
-			    location   	(547, 2)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @84
-				Parent_View 	@83
-				location   	(1843, 1433)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	231
-				justify    	0
-				label      	"+wsdlPortType"
-				pctDist    	0.755187
-				height     	72
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A587014D"
-			    client     	@82
-			    supplier   	@72
-			    line_style 	0
-			    label      	(object SegLabel @85
-				Parent_View 	@83
-				location   	(1877, 1543)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.906704
-				height     	39
-				orientation 	1)
-			    label      	(object SegLabel @86
-				Parent_View 	@83
-				location   	(1839, 1471)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.734016
-				height     	34
-				orientation 	0))
-			(object RoleView "$UNNAMED$23" @87
-			    Parent_View 	@82
-			    location   	(547, 2)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5870157"
-			    client     	@82
-			    supplier   	@74
-			    line_style 	0
-			    label      	(object SegLabel @88
-				Parent_View 	@87
-				location   	(1471, 1452)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.901961
-				height     	53
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$24" @89
-		    location   	(1648, 1718)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @90
-			Parent_View 	@89
-			location   	(1648, 1659)
-			font       	(object Font
-			    size       	8
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			hidden     	TRUE
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	60
-			justify    	0
-			label      	""
-			pctDist    	0.500000
-			height     	60
-			orientation 	0)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A5BD036D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlBinding" @91
-			    Parent_View 	@89
-			    location   	(520, 221)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @92
-				Parent_View 	@91
-				location   	(2051, 1792)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+wsdlBinding"
-				pctDist    	1.297847
-				height     	84
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5BE038D"
-			    client     	@89
-			    supplier   	@73
-			    line_style 	0
-			    label      	(object SegLabel @93
-				Parent_View 	@91
-				location   	(1888, 1848)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.869694
-				height     	30
-				orientation 	1)
-			    label      	(object SegLabel @94
-				Parent_View 	@91
-				location   	(1891, 1782)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.801582
-				height     	34
-				orientation 	0))
-			(object RoleView "$UNNAMED$25" @95
-			    Parent_View 	@89
-			    location   	(520, 221)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5BE0397"
-			    client     	@89
-			    supplier   	@74
-			    line_style 	0
-			    label      	(object SegLabel @96
-				Parent_View 	@95
-				location   	(1413, 1567)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.891640
-				height     	53
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::InterfaceMapping" @97
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(288, 1088)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@97
-			location   	(113, 1046)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	350
-			justify    	0
-			label      	"InterfaceMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E162BC200DD"
-		    width      	368
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @98
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(288, 128)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@98
-			location   	(93, 61)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$16" @99
-		    location   	(288, 620)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A543024E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "interfaceMappings" @100
-			    Parent_View 	@99
-			    location   	(0, 496)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @101
-				Parent_View 	@100
-				location   	(248, 951)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	296
-				justify    	0
-				label      	"+interfaceMappings"
-				pctDist    	0.798526
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5440322"
-			    client     	@99
-			    supplier   	@97
-			    line_style 	0
-			    label      	(object SegLabel @102
-				Parent_View 	@100
-				location   	(342, 993)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.899263
-				height     	54
-				orientation 	0)
-			    label      	(object SegLabel @103
-				Parent_View 	@100
-				location   	(396, 993)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{4}"
-				pctDist    	0.899263
-				height     	108
-				orientation 	0))
-			(object RoleView "$UNNAMED$17" @104
-			    Parent_View 	@99
-			    location   	(0, 496)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5440324"
-			    client     	@99
-			    supplier   	@98
-			    line_style 	0
-			    label      	(object SegLabel @105
-				Parent_View 	@104
-				location   	(342, 247)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.899263
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLServiceName" @106
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1984, 736)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@106
-			location   	(1795, 694)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	378
-			justify    	0
-			label      	"WSDLServiceName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16242903AD"
-		    width      	396
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::PortMapping" @107
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1920, 1072)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@107
-			location   	(1698, 964)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	444
-			justify    	0
-			label      	"PortMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16243E03A2"
-		    width      	462
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceInterfaceMapping" @108
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 736)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@108
-			location   	(799, 649)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"ServiceInterfaceMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16222D009B"
-		    width      	500
-		    height     	194
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$18" @109
-		    location   	(1537, 736)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A5680096"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlServiceName" @110
-			    Parent_View 	@109
-			    location   	(487, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @111
-				Parent_View 	@110
-				location   	(1733, 632)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	290
-				justify    	0
-				label      	"+wsdlServiceName"
-				pctDist    	0.788546
-				height     	105
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A56803AD"
-			    client     	@109
-			    supplier   	@106
-			    line_style 	0
-			    label      	(object SegLabel @112
-				Parent_View 	@110
-				location   	(1758, 790)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.893750
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @113
-				Parent_View 	@110
-				location   	(1741, 702)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.828194
-				height     	35
-				orientation 	0))
-			(object RoleView "$UNNAMED$19" @114
-			    Parent_View 	@109
-			    location   	(487, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A56803AF"
-			    client     	@109
-			    supplier   	@108
-			    line_style 	0
-			    label      	(object SegLabel @115
-				Parent_View 	@114
-				location   	(1316, 790)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.899371
-				height     	54
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$20" @116
-		    location   	(1489, 906)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A575004E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "portMappings" @117
-			    Parent_View 	@116
-			    location   	(456, 168)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @118
-				Parent_View 	@117
-				location   	(1660, 930)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	221
-				justify    	0
-				label      	"+portMappings"
-				pctDist    	0.793804
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A576001D"
-			    client     	@116
-			    supplier   	@107
-			    line_style 	0
-			    label      	(object SegLabel @119
-				Parent_View 	@117
-				location   	(1649, 1023)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.899322
-				height     	52
-				orientation 	1)
-			    label      	(object SegLabel @120
-				Parent_View 	@117
-				location   	(1630, 1074)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.899516
-				height     	107
-				orientation 	1))
-			(object RoleView "$UNNAMED$21" @121
-			    Parent_View 	@116
-			    location   	(456, 168)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5760027"
-			    client     	@116
-			    supplier   	@108
-			    line_style 	0
-			    label      	(object SegLabel @122
-				Parent_View 	@121
-				location   	(1329, 791)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898004
-				height     	52
-				orientation 	1))))
-		(object InheritView "" @123
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E5B9B670325"
-		    client     	@108
-		    supplier   	@97
-		    line_style 	0)
-		(object InheritView "" @124
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E5B9C9202ED"
-		    client     	@74
-		    supplier   	@97
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::common::QName" @125
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1984, 240)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@125
-			location   	(1697, 93)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	574
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16766421
-		    quidu      	"3F3BEF5D02C0"
-		    width      	592
-		    height     	314
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @126
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F4672A70143"
-		    client     	@106
-		    supplier   	@125
-		    line_style 	0)
-		(object InheritView "" @127
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F4672C40083"
-		    client     	@72
-		    supplier   	@125
-		    vertices   	(list Points
-			(2228, 1504)
-			(2686, 1504)
-			(2679, 238)
-			(2280, 239))
-		    line_style 	0)
-		(object InheritView "" @128
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F46737A0033"
-		    client     	@73
-		    supplier   	@125
-		    vertices   	(list Points
-			(2216, 1887)
-			(2586, 1887)
-			(2586, 237)
-			(2280, 238))
-		    line_style 	0)))
-	(object ClassDiagram "ServiceEndpointMethodMapping"
-	    quid       	"3E199C510009"
-	    title      	"ServiceEndpointMethodMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	1589
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::MethodParamPartsMapping" @129
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1744, 576)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@129
-			location   	(1478, 468)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	532
-			justify    	0
-			label      	"MethodParamPartsMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16256A0171"
-		    width      	550
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceEndpointMethodMapping" @130
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 576)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@130
-			location   	(62, 448)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	612
-			justify    	0
-			label      	"ServiceEndpointMethodMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625140124"
-		    width      	630
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$28" @131
-		    location   	(1075, 576)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A09E005D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "methodParamPartsMappings" @132
-			    Parent_View 	@131
-			    location   	(699, -305)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @133
-				Parent_View 	@132
-				location   	(1020, 594)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	451
-				justify    	0
-				label      	"+methodParamPartsMappings"
-				pctDist    	-0.144160
-				height     	18
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A09F004A"
-			    client     	@131
-			    supplier   	@129
-			    line_style 	0
-			    label      	(object SegLabel @134
-				Parent_View 	@132
-				location   	(1400, 608)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.830508
-				height     	32
-				orientation 	1)
-			    label      	(object SegLabel @135
-				Parent_View 	@132
-				location   	(1073, 560)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{4}"
-				pctDist    	-0.006768
-				height     	17
-				orientation 	0))
-			(object RoleView "$UNNAMED$29" @136
-			    Parent_View 	@131
-			    location   	(699, -305)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A09F004C"
-			    client     	@131
-			    supplier   	@130
-			    line_style 	0
-			    label      	(object SegLabel @137
-				Parent_View 	@136
-				location   	(723, 524)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.900100
-				height     	53
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessage" @138
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1776, 1664)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@138
-			location   	(1627, 1622)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"WSDLMessage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622E002BD"
-		    width      	316
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLReturnValueMapping" @139
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1776, 992)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@139
-			location   	(1479, 884)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	594
-			justify    	0
-			label      	"WSDLReturnValueMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625870243"
-		    width      	612
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$30" @140
-		    location   	(1076, 784)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A0A3028A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlReturnValueMapping" @141
-			    Parent_View 	@140
-			    location   	(715, -89)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @142
-				Parent_View 	@141
-				location   	(1029, 831)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	406
-				justify    	0
-				label      	"+wsdlReturnValueMapping"
-				pctDist    	-0.082016
-				height     	58
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A0A40354"
-			    client     	@140
-			    supplier   	@139
-			    line_style 	0
-			    label      	(object SegLabel @143
-				Parent_View 	@141
-				location   	(1334, 902)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.683353
-				height     	40
-				orientation 	1)
-			    label      	(object SegLabel @144
-				Parent_View 	@141
-				location   	(1239, 899)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{5}"
-				pctDist    	0.459699
-				height     	64
-				orientation 	1))
-			(object RoleView "$UNNAMED$31" @145
-			    Parent_View 	@140
-			    location   	(715, -89)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A0A4035E"
-			    client     	@140
-			    supplier   	@130
-			    line_style 	0
-			    label      	(object SegLabel @146
-				Parent_View 	@145
-				location   	(739, 631)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898596
-				height     	52
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$32" @147
-		    location   	(1776, 1360)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A121008E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessage" @148
-			    Parent_View 	@147
-			    location   	(116, -432)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @149
-				Parent_View 	@148
-				location   	(1817, 1560)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	230
-				justify    	0
-				label      	"+wsdlMessage"
-				pctDist    	0.798165
-				height     	41
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A1220017"
-			    client     	@147
-			    supplier   	@138
-			    line_style 	0
-			    label      	(object SegLabel @150
-				Parent_View 	@148
-				location   	(1723, 1584)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896024
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @151
-				Parent_View 	@148
-				location   	(1669, 1584)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.896024
-				height     	108
-				orientation 	1))
-			(object RoleView "$UNNAMED$33" @152
-			    Parent_View 	@147
-			    location   	(116, -432)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A1220022"
-			    client     	@147
-			    supplier   	@139
-			    line_style 	0
-			    label      	(object SegLabel @153
-				Parent_View 	@152
-				location   	(1723, 1136)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896024
-				height     	54
-				orientation 	0))))))
-	(object ClassDiagram "MethodParamPartsMapping"
-	    quid       	"3E19A4EF0073"
-	    title      	"MethodParamPartsMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	431
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::MethodParamPartsMapping" @154
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 672)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@154
-			location   	(70, 564)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	532
-			justify    	0
-			label      	"MethodParamPartsMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16256A0171"
-		    width      	550
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessage" @155
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2064, 688)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@155
-			location   	(1915, 646)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"WSDLMessage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622E002BD"
-		    width      	316
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessageMapping" @156
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1232, 912)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@156
-			location   	(935, 784)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	594
-			justify    	0
-			label      	"WSDLMessageMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625FA038B"
-		    width      	612
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$34" @157
-		    location   	(768, 787)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A5D401CA"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessageMapping" @158
-			    Parent_View 	@157
-			    location   	(431, 114)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @159
-				Parent_View 	@158
-				location   	(728, 852)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	348
-				justify    	0
-				label      	"+wsdlMessageMapping"
-				pctDist    	-0.144660
-				height     	74
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5D5008B"
-			    client     	@157
-			    supplier   	@156
-			    line_style 	0
-			    label      	(object SegLabel @160
-				Parent_View 	@158
-				location   	(924, 775)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.899024
-				height     	53
-				orientation 	0)
-			    label      	(object SegLabel @161
-				Parent_View 	@158
-				location   	(893, 774)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.720715
-				height     	46
-				orientation 	0))
-			(object RoleView "$UNNAMED$35" @162
-			    Parent_View 	@157
-			    location   	(431, 114)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5D5008D"
-			    client     	@157
-			    supplier   	@154
-			    line_style 	0
-			    label      	(object SegLabel @163
-				Parent_View 	@162
-				location   	(642, 700)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.893115
-				height     	53
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$36" @164
-		    location   	(1721, 779)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A5DB0011"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessage" @165
-			    Parent_View 	@164
-			    location   	(782, -113)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @166
-				Parent_View 	@165
-				location   	(1775, 698)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	230
-				justify    	0
-				label      	"+wsdlMessage"
-				pctDist    	0.378885
-				height     	65
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5DB0383"
-			    client     	@164
-			    supplier   	@155
-			    line_style 	0
-			    label      	(object SegLabel @167
-				Parent_View 	@165
-				location   	(1882, 678)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.952522
-				height     	57
-				orientation 	0)
-			    label      	(object SegLabel @168
-				Parent_View 	@165
-				location   	(1789, 656)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{1}"
-				pctDist    	0.512327
-				height     	102
-				orientation 	0))
-			(object RoleView "$UNNAMED$37" @169
-			    Parent_View 	@164
-			    location   	(782, -113)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5DB038E"
-			    client     	@164
-			    supplier   	@156
-			    line_style 	0
-			    label      	(object SegLabel @170
-				Parent_View 	@169
-				location   	(1573, 874)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.892489
-				height     	54
-				orientation 	0))))))))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/jca1_0.cat b/plugins/org.eclipse.jst.j2ee.core/rose/jca1_0.cat
deleted file mode 100644
index 63e0bf170..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jca1_0.cat
+++ /dev/null
@@ -1,4353 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "jca"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "jca.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Jca")))

-    quid       	"3C60904200BB"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "Connector"

-	    quid       	"3C609091010F"

-	    documentation 	

-|The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B0790134"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "vendorName"

-		    quid       	"3C6090F3021E"

-		    documentation 	

-|Specifies the name of resource adapter provider vendor.

-|Example: Wombat Corp.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "specVersion"

-		    quid       	"3C6090FC019F"

-		    documentation 	

-|Specifies the version of the connector architecture specification that is supported by this resource adapter. This information enables deployer to configure the resource adapter to support deployment and runtime requirements of the corresponding connector architecture specification.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "eisType"

-		    quid       	"3C6091000123"

-		    documentation 	

-|Contains information about the type of the EIS. For example, the type of an EIS can be product name of EIS independent of any version info.

-|

-|This helps in identifying EIS instances that can be used with

-|this resource adapter.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "version"

-		    quid       	"3C609106010D"

-		    documentation 	

-|Specifies a string-based version of the resource adapter from the resource adapter provider.

-|

-|Example: 1.5

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ResourceAdapter"

-	    quid       	"3C60912A02A9"

-	    documentation 	

-|Specifies information about the resource adapter. The information includes fully-qualified names of class/interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional

-|required security permissions.

-|

-|If there is no authentication-mechanism specified as part of

-|resource adapter element then the resource adapter does not

-|support any standard security authentication mechanisms as part

-|of security contract. The application server ignores the security

-|part of the system contracts in this case.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "managedConnectionFactoryClass"

-		    quid       	"3C60936003DA"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.managedConnectionFactoryClass

-|Specifies the fully qualified name of the Java class that implements the javax.resource.spi.Managed-ConnectionFactory interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryInterface"

-		    quid       	"3C60936C00C0"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionFactoryInterface

-|Specifies the fully-qualified name of the ConnectionFactory interface supported by the resource adapter.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryImplClass"

-		    quid       	"3C609375013B"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionFactoryImplClass

-|Specifies the fully-qualified name of the ConnectionFactory class that implements resource adapter specific ConnectionFactory interface.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionInterface"

-		    quid       	"3C60937E021A"

-		    documentation 	"@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionInterface"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionImplClass"

-		    quid       	"3C60939503D6"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionImplClass

-|Specifies the fully-qualified name of the Connection interface supported by the resource adapter.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "transactionSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C60939F03DA"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes outboundResourceAdapter.transactionSupport

-|The transaction-support element specifies the level of transaction

-|support provided by the resource adapter.

-|The value of transaction-support must be one of the following:

-|  NoTransaction

-|  LocalTransaction

-|  XATransaction

-		    

-		    type       	"TransactionSupportKind"

-		    quidu      	"3C6098C80394"

-		    exportControl 	"Public")

-		(object ClassAttribute "reauthenticationSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C6093A8031F"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes outboundResourceAdapter.reauthenticationSupport

-|Specifies whether the resource adapter implementation supports re-authentication of existing Managed-Connection instance. Note that this information is for the resource adapter implementation and not for the underlying EIS instance.

-		    

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "resourceAdapterClass"

-		    quid       	"3E4AAD3302DC"

-		    documentation 	

-|The element resourceadapter-class specifies the

-|        fully qualified name of a Java class that implements

-|        the javax.resource.spi.ResourceAdapter

-|        interface. This Java class is provided as part of

-|        resource adapter's implementation of connector

-|        architecture specified contracts. The implementation

-|        of this class is required to be a JavaBean.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "AuthenticationMechanism"

-	    quid       	"3C60914003CE"

-	    documentation 	

-|The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.

-|

-|Note that BasicPassword mechanism type should support the

-|javax.resource.spi.security.PasswordCredential interface.

-|The Kerbv5 mechanism type should support the

-|javax.resource.spi.security.GenericCredential interface.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C6091760371"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "authenticationMechanism"

-		    quid       	"3E4AA98F0368"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "authenticationMechanismType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C6091820057"

-		    documentation 	

-|@deprecated See authenticationMechanism

-|

-|The authentication-mechanism-type specifies type of an authentication mechanism.

-|

-|The example values are:

-|  - BasicPassword

-|  - Kerbv5

-|

-|Any additional security mechanisms are outside the scope of the

-|Connector architecture specification.

-|

-		    

-		    type       	"AuthenticationMechanismType"

-		    quidu      	"3C6091C302A9"

-		    exportControl 	"Public")

-		(object ClassAttribute "credentialInterface"

-		    quid       	"3C6091AA0380"

-		    documentation 	

-|Specifies the interface that the resource adapter implementation supports for the representation of the credentials. This element should be used by application server to find out the Credential interface it should use as part of the security contract.

-|

-|The possible values are:

-|   javax.resource.spi.security.PasswordCredential

-|   javax.resource.spi.security.GenericCredential

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "customAuthMechType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"3D99E208038A"

-		    documentation 	

-|@deprecated

-|This is an internal variable used to store the AthenticationMechanismType when it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType is set to 'Custom' in those cases.  This attribute should not be used by runtime.  It is only used by the writer to write back out the custom AuthenticationMechanismType string in the case of custom AuthenticationMechanismType's.  

-|This variable is internal, used only by the reader/writer classes, and can change or disappear without notice.  

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "AuthenticationMechanismType"

-	    quid       	"3C6091C302A9"

-	    documentation 	

-|@version J2EE1.4

-|BasicPassword=0

-|Kerbv5=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "BasicPassword"

-		    quid       	"3C6091D000DC"

-		    exportControl 	"Public")

-		(object ClassAttribute "Kerbv5"

-		    quid       	"3C6091D5011F"

-		    exportControl 	"Public")))

-	(object Class "ConfigProperty"

-	    quid       	"3C60922C0188"

-	    documentation 	

-|The config property contains a declaration of a single

-|configuration property for a ManagedConnectionFactory instance.

-|

-|Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).

-|

-|The declaration consists of an optional description, name, type

-|and an optional value of the configuration property. If the resource

-|adapter provider does not specify a value than the deployer is

-|responsible for providing a valid value for a configuration property.

-|

-|Any bounds or well-defined values of properties should be described in the description.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C60923203B7"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3C60923F0199"

-		    documentation 	

-|Contains the name of a configuration property.

-|

-|The connector architecture defines a set of well-defined properties all of type java.lang.String. These are as follows:

-|

-|     ServerName

-|     PortNumber

-|     UserName

-|     Password

-|     ConnectionURL

-|

-|A resource adapter provider can extend this property set to include properties specific to the resource adapter and its underlying EIS.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    quid       	"3C6092450198"

-		    documentation 	

-|Contains the fully qualified Java type of a configuration property as required by ManagedConnection-Factory instance.

-|

-|The following are the legal values of config-property-type:

-|   java.lang.Boolean, java.lang.String, java.lang.Integer,

-|   java.lang.Double, java.lang.Byte, java.lang.Short,

-|   java.lang.Long, java.lang.Float, java.lang.Character

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3C60924802DD"

-		    documentation 	

-|The element config-property-value contains the value

-|        of a configuration entry. Note, it is possible for a

-|        resource adapter deployer to override this

-|        configuration information during deployment.

-|

-|        Example:

-|        <config-property-value>WombatServer</config-property-value>

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "SecurityPermission"

-	    quid       	"3C6093C100F4"

-	    documentation 	

-|Specifies a security permission that is required by the resource adapter code.

-|

-|The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C6097E90162"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "specification"

-		    quid       	"3C6097F503CC"

-		    documentation 	

-|The element permission-spec specifies a security permission based on the Security policy file syntax. 

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "License"

-	    quid       	"3C609529008E"

-	    documentation 	"Specifies licensing requirements for the resource adapter module. Specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions)."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C60953E0084"

-		    documentation 	

-|@deprecated Replaced with descriptions

-|The description is used to provide text describing the license.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "required"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C60959F017E"

-		    type       	"boolean"

-		    exportControl 	"Public")))

-	(object Class "TransactionSupportKind"

-	    quid       	"3C6098C80394"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NoTransaction"

-		    quid       	"3C6098D201FE"

-		    exportControl 	"Public")

-		(object ClassAttribute "LocalTransaction"

-		    quid       	"3C6098D60235"

-		    exportControl 	"Public")

-		(object ClassAttribute "XATransaction"

-		    quid       	"3C6098DB0233"

-		    exportControl 	"Public")))

-	(object Class "InboundResourceAdapter"

-	    quid       	"3E4AA1DD0257"

-	    documentation 	

-|@version J2EE1.4

-|The inbound-resourceadapterType specifies information

-|about an inbound resource adapter. This contains information

-|specific to the implementation of the resource adapter

-|library as specified through the messageadapter element.

-	    )

-	(object Class "OutboundResourceAdapter"

-	    quid       	"3E4AA1E6023C"

-	    documentation 	

-|@version J2EE1.4

-|The outbound-resourceadapterType specifies information about

-|an outbound resource adapter. The information includes fully

-|qualified names of classes/interfaces required as part of

-|the connector architecture specified contracts for

-|connection management, level of transaction support

-|provided, one or more authentication mechanisms supported

-|and additional required security permissions.

-|

-|If there is no authentication-mechanism specified as part of

-|resource adapter element then the resource adapter does not

-|support any standard security authentication mechanisms as

-|part of security contract. The application server ignores

-|the security part of the system contracts in this case.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "reauthenticationSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4AA5BA003C"

-		    documentation 	

-|The element reauthentication-support specifies

-|        whether the resource adapter implementation supports

-|        re-authentication of existing Managed- Connection

-|        instance. Note that this information is for the

-|        resource adapter implementation and not for the

-|        underlying EIS instance. This element must have

-|        either a "true" or "false" value.

-		    

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "transactionSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4AA862026B"

-		    type       	"TransactionSupportKind"

-		    quidu      	"3C6098C80394"

-		    exportControl 	"Public")))

-	(object Class "MessageAdapter"

-	    quid       	"3E4AA2D601F1"

-	    documentation 	

-|@version J2EE1.4

-|The messageadapterType specifies information about the

-|messaging capabilities of the resource adapter. This

-|contains information specific to the implementation of the

-|resource adapter library as specified through the

-|messagelistener element.

-	    )

-	(object Class "ConnectionDefinition"

-	    quid       	"3E4AA4CF00F2"

-	    documentation 	

-|@version J2EE1.4

-|The connection-definitionType defines a set of connection

-|interfaces and classes pertaining to a particular connection

-|type. This also includes configurable properties for

-|ManagedConnectionFactory instances that may be produced out

-|of this set.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "managedConnectionFactoryClass"

-		    quid       	"3E4AA6C203AD"

-		    documentation 	

-|The element managedconnectionfactory-class specifies

-|        the fully qualified name of the Java class that

-|        implements the

-|        javax.resource.spi.ManagedConnectionFactory interface.

-|        This Java class is provided as part of resource

-|        adapter's implementation of connector architecture

-|        specified contracts. The implementation of this

-|        class is required to be a JavaBean.

-|

-|        Example:

-|        <managedconnectionfactory-class>

-|            com.wombat.ManagedConnectionFactoryImpl

-|        </managedconnectionfactory-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryInterface"

-		    quid       	"3E4AA7480388"

-		    documentation 	

-|The element connectionfactory-interface specifies

-|        the fully qualified name of the ConnectionFactory

-|        interface supported by the resource adapter.

-|

-|        Example:

-|        <connectionfactory-interface>com.wombat.ConnectionFactory

-|        </connectionfactory-interface>

-|

-|        OR

-|

-|        <connectionfactory-interface>javax.resource.cci.ConnectionFactory

-|        </connectionfactory-interface>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryImplClass"

-		    quid       	"3E4AA7500180"

-		    documentation 	

-|The element connectionfactory-impl-class specifies

-|        the fully qualified name of the ConnectionFactory

-|        class that implements resource adapter

-|        specific ConnectionFactory interface.

-|

-|        Example:

-|

-|        <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl

-|        </connectionfactory-impl-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionInterface"

-		    quid       	"3E4AA75E01BD"

-		    documentation 	

-|The connection-interface element specifies the fully

-|        qualified name of the Connection interface supported

-|        by the resource adapter.

-|

-|        Example:

-|

-|            <connection-interface>javax.resource.cci.Connection

-|            </connection-interface>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionImplClass"

-		    quid       	"3E4AA7770118"

-		    documentation 	

-|The connection-impl-classType specifies the fully

-|        qualified name of the Connection class that

-|        implements resource adapter specific Connection

-|        interface.  It is used by the connection-impl-class

-|        elements.

-|

-|        Example:

-|

-|            <connection-impl-class>com.wombat.ConnectionImpl

-|            </connection-impl-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "AdminObject"

-	    quid       	"3E4AADD6004B"

-	    documentation 	

-|@version J2EE1.4

-|The adminobjectType specifies information about an

-|administered object.  Administered objects are specific to a

-|messaging style or message provider.  This contains

-|information on the Java type of the interface implemented by

-|an administered object, its Java class name and its

-|configuration properties.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "adminObjectInterface"

-		    quid       	"3E4AB12B0188"

-		    documentation 	

-|The element adminobject-interface specifies the

-|        fully qualified name of the Java type of the

-|        interface implemented by an administered object.

-|

-|        Example:

-|          <adminobject-interface>javax.jms.Destination

-|          </adminobject-interface>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "adminObjectClass"

-		    quid       	"3E4AB1310000"

-		    documentation 	

-|The element adminobject-class specifies the fully

-|        qualified Java class name of an administered object.

-|

-|        Example:

-|            <adminobject-class>com.wombat.DestinationImpl

-|            </adminobject-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageListener"

-	    quid       	"3E4AAEC102FC"

-	    documentation 	

-|@version J2EE1.4

-|The messagelistenerType specifies information about a

-|specific message listener supported by the messaging

-|resource adapter. It contains information on the Java type

-|of the message listener interface and an activation

-|specification.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "messageListenerType"

-		    quid       	"3E4AAEF901A8"

-		    documentation 	

-|The element messagelistener-type specifies the fully

-|        qualified name of the Java type of a message

-|        listener interface.

-|

-|        Example:

-|

-|          <messagelistener-type>javax.jms.MessageListener

-|          </messagelistener-type>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ActivationSpec"

-	    quid       	"3E4AAF320042"

-	    documentation 	

-|@version J2EE1.4

-|The activationspecType specifies an activation

-|specification.  The information includes fully qualified

-|Java class name of an activation specification and a set of

-|required configuration property names.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "activationSpecClass"

-		    quid       	"3E4AAF9403AA"

-		    documentation 	

-|The element activationspec-class specifies the fully

-|        qualified Java class name of the activation

-|        specification class. This class must implement the

-|        javax.resource.spi.ActivationSpec interface. The

-|        implementation of this class is required to be a

-|        JavaBean.

-|

-|        Example:

-|            <activationspec-class>com.wombat.ActivationSpecImpl

-|            </activationspec-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "RequiredConfigPropertyType"

-	    quid       	"3E4AAFD601A6"

-	    documentation 	

-|@version J2EE1.4

-|The required-config-propertyType contains a declaration

-|of a single configuration property used for specifying a

-|required configuration property name. It is used

-|by required-config-property elements.

-|

-|Example:

-|

-|<required-config-property>Destination</required-config-property>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4AB01F01BF"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3C6093CC001E"

-	    roles      	(list role_list

-		(object Role "securityPermissions"

-		    quid       	"3C6093CC0367"

-		    documentation 	"@deprecated"

-		    label      	"securityPermissions"

-		    supplier   	"Logical View::jca::SecurityPermission"

-		    quidu      	"3C6093C100F4"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3C6093CC0369"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"3C6094120028"

-	    roles      	(list role_list

-		(object Role "authenticationMechanisms"

-		    quid       	"3C6094120390"

-		    label      	"authenticationMechanisms"

-		    supplier   	"Logical View::jca::AuthenticationMechanism"

-		    quidu      	"3C60914003CE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"3C6094120392"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3C60944C00D6"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3C60944D0196"

-		    label      	"configProperties"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3C60944D0198"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"3C6095310180"

-	    roles      	(list role_list

-		(object Role "license"

-		    quid       	"3C609532000E"

-		    documentation 	

-|Specifies licensing requirements for the resource adapter module. This element specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of

-|connection restrictions).

-		    

-		    label      	"license"

-		    supplier   	"Logical View::jca::License"

-		    quidu      	"3C609529008E"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"3C6095320010"

-		    supplier   	"Logical View::jca::Connector"

-		    quidu      	"3C609091010F"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3C60998900C0"

-	    roles      	(list role_list

-		(object Role "resourceAdapter"

-		    quid       	"3C60998902AB"

-		    label      	"resourceAdapter"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"3C60998902B5"

-		    supplier   	"Logical View::jca::Connector"

-		    quidu      	"3C609091010F"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E4AA3630302"

-	    roles      	(list role_list

-		(object Role "outboundResourceAdapter"

-		    quid       	"3E4AA3650369"

-		    documentation 	

-|@version J2EE1.4

-|The connectionfactory-interface element content must be

-|        unique in the outbound-resourceadapter. Multiple connection-definitions

-|        can not use the same connectionfactory-type.

-		    

-		    label      	"outboundResourceAdapter"

-		    supplier   	"Logical View::jca::OutboundResourceAdapter"

-		    quidu      	"3E4AA1E6023C"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E4AA365036B"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E4AA4DC026E"

-	    roles      	(list role_list

-		(object Role "connectionDefinitions"

-		    quid       	"3E4AA4DD005C"

-		    label      	"connectionDefinitions"

-		    supplier   	"Logical View::jca::ConnectionDefinition"

-		    quidu      	"3E4AA4CF00F2"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E4AA4DD0066"

-		    supplier   	"Logical View::jca::OutboundResourceAdapter"

-		    quidu      	"3E4AA1E6023C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E4AA54400FB"

-	    roles      	(list role_list

-		(object Role "authenticationMechanisms"

-		    quid       	"3E4AA545028D"

-		    label      	"authenticationMechanisms"

-		    supplier   	"Logical View::jca::AuthenticationMechanism"

-		    quidu      	"3C60914003CE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E4AA545028F"

-		    supplier   	"Logical View::jca::OutboundResourceAdapter"

-		    quidu      	"3E4AA1E6023C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3E4AA6F20117"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3E4AA6F30169"

-		    label      	"configProperties"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3E4AA6F30173"

-		    supplier   	"Logical View::jca::ConnectionDefinition"

-		    quidu      	"3E4AA4CF00F2"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"3E4AADCD036A"

-	    roles      	(list role_list

-		(object Role "inboundResourceAdapter"

-		    quid       	"3E4AADCF0312"

-		    documentation 	"@version J2EE1.4"

-		    label      	"inboundResourceAdapter"

-		    supplier   	"Logical View::jca::InboundResourceAdapter"

-		    quidu      	"3E4AA1DD0257"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"3E4AADCF0314"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E4AAE020320"

-	    roles      	(list role_list

-		(object Role "adminObjects"

-		    quid       	"3E4AAE040160"

-		    documentation 	"@version J2EE1.4"

-		    label      	"adminObjects"

-		    supplier   	"Logical View::jca::AdminObject"

-		    quidu      	"3E4AADD6004B"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E4AAE04016B"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3E4AAE38025F"

-	    roles      	(list role_list

-		(object Role "messageAdapter"

-		    quid       	"3E4AAE390094"

-		    documentation 	

-|The messagelistener-type element content must be

-|        unique in the messageadapter. Several messagelisteners

-|        can not use the same messagelistener-type.

-		    

-		    label      	"messageAdapter"

-		    supplier   	"Logical View::jca::MessageAdapter"

-		    quidu      	"3E4AA2D601F1"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3E4AAE39009E"

-		    supplier   	"Logical View::jca::InboundResourceAdapter"

-		    quidu      	"3E4AA1DD0257"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"3E4AAECC0077"

-	    roles      	(list role_list

-		(object Role "messageListeners"

-		    quid       	"3E4AAECC03A2"

-		    label      	"messageListeners"

-		    supplier   	"Logical View::jca::MessageListener"

-		    quidu      	"3E4AAEC102FC"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"3E4AAECC03A4"

-		    supplier   	"Logical View::jca::MessageAdapter"

-		    quidu      	"3E4AA2D601F1"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$26"

-	    quid       	"3E4AAF480011"

-	    roles      	(list role_list

-		(object Role "activationSpec"

-		    quid       	"3E4AAF490103"

-		    label      	"activationSpec"

-		    supplier   	"Logical View::jca::ActivationSpec"

-		    quidu      	"3E4AAF320042"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"3E4AAF490105"

-		    supplier   	"Logical View::jca::MessageListener"

-		    quidu      	"3E4AAEC102FC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"3E4AAFAA027F"

-	    roles      	(list role_list

-		(object Role "requiredConfigProperties"

-		    quid       	"3E4AAFAB0349"

-		    label      	"requiredConfigProperties"

-		    supplier   	"Logical View::jca::RequiredConfigPropertyType"

-		    quidu      	"3E4AAFD601A6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"3E4AAFAB0353"

-		    supplier   	"Logical View::jca::ActivationSpec"

-		    quidu      	"3E4AAF320042"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"3E4AB14A02B9"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3E4AB14B0347"

-		    label      	"configProperties"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"3E4AB14B0351"

-		    supplier   	"Logical View::jca::AdminObject"

-		    quidu      	"3E4AADD6004B"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"3E4AA8A2001E"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AA8A30033"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3E4AA8A3003D"

-		    supplier   	"Logical View::jca::AuthenticationMechanism"

-		    quidu      	"3C60914003CE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"3E4A9C86002A"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4A9C8603B0"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"3E4A9C8603B2"

-		    supplier   	"Logical View::jca::License"

-		    quidu      	"3C609529008E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$36"

-	    quid       	"3E4AAFEC01BC"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AAFF40019"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"3E4AAFF40024"

-		    supplier   	"Logical View::jca::RequiredConfigPropertyType"

-		    quidu      	"3E4AAFD601A6"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$38"

-	    quid       	"3E4AAB5A034A"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AAB6100BF"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$39"

-		    quid       	"3E4AAB6100C9"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$40"

-	    quid       	"3E4AAA3202FE"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AAA340012"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$41"

-		    quid       	"3E4AAA34001C"

-		    supplier   	"Logical View::jca::SecurityPermission"

-		    quidu      	"3C6093C100F4"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Connector Details"

-	    quid       	"3C60905E00E4"

-	    title      	"Connector Details"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1808

-	    items      	(list diagram_item_list

-		(object Label @1

-		    location   	(53, 44)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	981

-		    label      	"JCA 1.5 Deployment Descriptor")

-		(object NoteView @2

-		    location   	(871, 368)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(71, 187)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	1565

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list with new J2EE type)

-|displayName replaced with displayNames:List<DisplayName>

-|description replaced with descriptions:List<DescriptionType>

-|smallIcon replaced with icons:List<IconType>

-|largeIcon replaced with icons:List<IconType>

-|version replaced with resourceVersion:String

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1625

-		    height     	375)

-		(object NoteView @3

-		    location   	(1350, 1628)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(843, 1516)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	978

-			label      	"The real XML tag for specVersion in JCA1.5 is <version>. In JCA1.0 it was <spec-version>.  In other words, JCA1.5 version elements will deserialize into the specVersion attribute.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1038

-		    height     	237)

-		(object NoteView @4

-		    location   	(2200, 356)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1709, 240)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	946

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list version)

-|description replaced with descriptions:List<String>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1006

-		    height     	244)

-		(object NoteView @5

-		    location   	(2421, 125)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1708, 34)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	1390

-			label      	"Many descriptive attributes have been changed to 'n' multiplicity to support localization of text and icons")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1450

-		    height     	194)

-		(object Label @6

-		    location   	(163, 2084)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	3

-		    max_width  	894

-		    label      	

-|SEE "RESOURCEADAPTER DETAILS" DIAGRAM

-		    )

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1749, 973)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(1571, 894)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::ResourceAdapter" @8

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(577, 1967)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(402, 1916)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	350

-			justify    	0

-			label      	"ResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60912A02A9"

-		    width      	368

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::Connector" @9

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(616, 1059)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@9

-			location   	(309, 803)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	614

-			justify    	0

-			label      	"Connector")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C609091010F"

-		    compartment 	(object Compartment

-			Parent_View 	@9

-			location   	(309, 864)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	428)

-		    width      	632

-		    height     	536

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @10

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@2

-		    supplier   	@9

-		    vertices   	(list Points

-			(801, 555)

-			(714, 790))

-		    line_style 	0)

-		(object AttachView "" @11

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@3

-		    supplier   	@9

-		    vertices   	(list Points

-			(1198, 1509)

-			(932, 1303))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$8" @12

-		    location   	(522, 1615)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C60998900C0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resourceAdapter" @13

-			    Parent_View 	@12

-			    location   	(-22, 1023)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @14

-				Parent_View 	@13

-				location   	(325, 1688)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	332

-				justify    	0

-				label      	"+resourceAdapter"

-				pctDist    	0.256881

-				height     	198

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60998902AB"

-			    client     	@12

-			    supplier   	@8

-			    vertices   	(list Points

-				(522, 1615)

-				(522, 1904))

-			    line_style 	3

-			    origin_attachment 	(522, 1615)

-			    terminal_attachment 	(522, 1904)

-			    label      	(object SegLabel @15

-				Parent_View 	@13

-				location   	(561, 1715)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.350877

-				height     	39

-				orientation 	0))

-			(object RoleView "$UNNAMED$9" @16

-			    Parent_View 	@12

-			    location   	(-22, 1023)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60998902B5"

-			    client     	@12

-			    supplier   	@9

-			    vertices   	(list Points

-				(522, 1615)

-				(522, 1326))

-			    line_style 	3

-			    origin_attachment 	(522, 1615)

-			    terminal_attachment 	(522, 1326))))

-		(object ClassView "Class" "Logical View::common::Description" @17

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2624, 706)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@17

-			location   	(2480, 552)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	288

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@17

-			location   	(2480, 657)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	306

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::License" @18

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1810, 700)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@18

-			location   	(1522, 594)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	576

-			justify    	0

-			label      	"License")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C609529008E"

-		    compartment 	(object Compartment

-			Parent_View 	@18

-			location   	(1522, 655)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	594

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @19

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@4

-		    supplier   	@18

-		    vertices   	(list Points

-			(2059, 478)

-			(1942, 581))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$6" @20

-		    location   	(1222, 796)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C6095310180"

-		    roleview_list 	(list RoleViews

-			(object RoleView "license" @21

-			    Parent_View 	@20

-			    location   	(870, 348)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @22

-				Parent_View 	@21

-				location   	(1354, 758)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	151

-				justify    	0

-				label      	"+license"

-				pctDist    	0.457447

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C609532000E"

-			    client     	@20

-			    supplier   	@18

-			    vertices   	(list Points

-				(1222, 796)

-				(1513, 796))

-			    line_style 	3

-			    origin_attachment 	(1222, 796)

-			    terminal_attachment 	(1513, 796)

-			    label      	(object SegLabel @23

-				Parent_View 	@21

-				location   	(1466, 850)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.841549

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$7" @24

-			    Parent_View 	@20

-			    location   	(870, 348)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6095320010"

-			    client     	@20

-			    supplier   	@9

-			    vertices   	(list Points

-				(1222, 796)

-				(932, 796))

-			    line_style 	3

-			    origin_attachment 	(1222, 796)

-			    terminal_attachment 	(932, 796))))

-		(object AssociationViewNew "$UNNAMED$34" @25

-		    location   	(2289, 653)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4A9C86002A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @26

-			    Parent_View 	@25

-			    location   	(473, -50)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @27

-				Parent_View 	@26

-				location   	(2354, 604)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.356886

-				height     	50

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4A9C8603B0"

-			    client     	@25

-			    supplier   	@17

-			    vertices   	(list Points

-				(2289, 653)

-				(2471, 653))

-			    line_style 	3

-			    origin_attachment 	(2289, 653)

-			    terminal_attachment 	(2471, 653)

-			    label      	(object SegLabel @28

-				Parent_View 	@26

-				location   	(2429, 704)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.767123

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @29

-			    Parent_View 	@25

-			    location   	(473, -50)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4A9C8603B2"

-			    client     	@25

-			    supplier   	@18

-			    vertices   	(list Points

-				(2289, 653)

-				(2107, 653))

-			    line_style 	3

-			    origin_attachment 	(2289, 653)

-			    terminal_attachment 	(2107, 653))))))

-	(object ClassDiagram "Resource Adapter Details"

-	    quid       	"3E4AB21901B3"

-	    title      	"Resource Adapter Details"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	7305

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::jca::AuthenticationMechanismType" @30

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3365, 1379)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@30

-			location   	(3070, 1295)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	590

-			justify    	0

-			label      	"AuthenticationMechanismType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@30

-			location   	(3070, 1245)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	590

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C6091C302A9"

-		    compartment 	(object Compartment

-			Parent_View 	@30

-			location   	(3070, 1356)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	340)

-		    width      	608

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::TransactionSupportKind" @31

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3348, 2338)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@31

-			location   	(3118, 2229)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"TransactionSupportKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@31

-			location   	(3118, 2179)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C6098C80394"

-		    compartment 	(object Compartment

-			Parent_View 	@31

-			location   	(3118, 2290)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	365)

-		    width      	478

-		    height     	342

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object Label @32

-		    location   	(53, 44)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	981

-		    label      	

-|JCA 1.5 Deployment Descriptor

-|Resource Adapter Details

-		    )

-		(object NoteView @33

-		    location   	(875, 362)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(75, 181)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	1565

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list with new J2EE type)

-|displayName replaced with displayNames:List<DisplayName>

-|description replaced with descriptions:List<DescriptionType>

-|smallIcon replaced with icons:List<IconType>

-|largeIcon replaced with icons:List<IconType>

-|version replaced with resourceVersion:String

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1625

-		    height     	375)

-		(object NoteView @34

-		    location   	(2200, 356)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@34

-			location   	(1709, 240)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	946

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list version)

-|description replaced with descriptions:List<String>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1006

-		    height     	244)

-		(object NoteView @35

-		    location   	(2421, 125)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@35

-			location   	(1708, 34)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	1390

-			label      	"Many descriptive attributes have been changed to 'n' multiplicity to support localization of text and icons")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1450

-		    height     	194)

-		(object NoteView @36

-		    location   	(4017, 1845)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@36

-			location   	(3782, 1729)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	434

-			label      	"Need to check collapseWhitespace attribute")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	494

-		    height     	244)

-		(object NoteView @37

-		    location   	(2132, 2082)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@37

-			location   	(1903, 1945)

-			fill_color 	13434879

-			nlines     	5

-			max_width  	422

-			label      	

-|Need basic type, AnyURI (place this in same package as new Password--maybe "common-datatypes")

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	482

-		    height     	287)

-		(object NoteView @38

-		    location   	(1175, 4758)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@38

-			location   	(178, 4514)

-			fill_color 	13434879

-			nlines     	9

-			max_width  	1959

-			label      	

-|managedConnectionFactoryClass is replaced by ra.outboundRA.connectionDefinitions.managedConnectionFactoryClass

-|connectionFactoryInterface is replaced by ra.outboundRA.connectionDefinitions.connectionFactoryInterface

-|connectionFactoryImplClass is replaced by ra.outboundRA.connectionDefinitions.connectionFactoryImplClass

-|transactionSupport is replaced by ra.outboundRA.transactionSupport 

-|connectionInterface is replaced by ra.outboundRA.connectionDefinitions.connectionInterface

-|connectionImplClass is replaced by ra.outboundRA.connectionDefinitions.connectionImplClass

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	2019

-		    height     	500)

-		(object NoteView @39

-		    location   	(1156, 5175)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@39

-			location   	(34, 5097)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	2209

-			label      	"Readers will need to determine if the string type can be converted to the datatype specified. See the spec. Or maybe instead provide helpers to retrieve the value converted to the specified type?")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	2269

-		    height     	169)

-		(object Label @40

-		    location   	(244, 2353)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	5

-		    max_width  	488

-		    label      	"There are some uniqueness constraints that must be validated here.")

-		(object NoteView @41

-		    location   	(3386, 625)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@41

-			location   	(2717, 522)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	1303

-			label      	

-|Deprecations

-|customAuthMechType replaced by authenticationMechanism

-|authenticationMechanismType replaced by authenticationMechanism

-|description replaced with descriptions:List<DescriptionType>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1363

-		    height     	219)

-		(object ClassView "Class" "Logical View::jca::MessageListener" @42

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2774, 3537)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@42

-			location   	(2477, 3456)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	594

-			justify    	0

-			label      	"MessageListener")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AAEC102FC"

-		    compartment 	(object Compartment

-			Parent_View 	@42

-			location   	(2477, 3517)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	591)

-		    width      	612

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::MessageAdapter" @43

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2792, 3139)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@43

-			location   	(2625, 3088)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	334

-			justify    	0

-			label      	"MessageAdapter")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA2D601F1"

-		    width      	352

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$24" @44

-		    location   	(2746, 3322)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAECC0077"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageListeners" @45

-			    Parent_View 	@44

-			    location   	(-31, -446)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(2534, 3402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	367

-				justify    	0

-				label      	"+messageListeners"

-				pctDist    	0.666667

-				height     	213

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAECC03A2"

-			    client     	@44

-			    supplier   	@42

-			    vertices   	(list Points

-				(2746, 3322)

-				(2746, 3444))

-			    line_style 	3

-			    origin_attachment 	(2746, 3322)

-			    terminal_attachment 	(2746, 3444)

-			    label      	(object SegLabel @47

-				Parent_View 	@45

-				location   	(2838, 3405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.677778

-				height     	92

-				orientation 	0))

-			(object RoleView "$UNNAMED$25" @48

-			    Parent_View 	@44

-			    location   	(-31, -446)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAECC03A4"

-			    client     	@44

-			    supplier   	@43

-			    vertices   	(list Points

-				(2746, 3322)

-				(2746, 3201))

-			    line_style 	3

-			    origin_attachment 	(2746, 3322)

-			    terminal_attachment 	(2746, 3201))))

-		(object ClassView "Class" "Logical View::jca::ActivationSpec" @49

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2749, 3959)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@49

-			location   	(2468, 3878)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"ActivationSpec")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AAF320042"

-		    compartment 	(object Compartment

-			Parent_View 	@49

-			location   	(2468, 3939)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	560)

-		    width      	580

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$26" @50

-		    location   	(2753, 3747)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAF480011"

-		    roleview_list 	(list RoleViews

-			(object RoleView "activationSpec" @51

-			    Parent_View 	@50

-			    location   	(-87, -371)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @52

-				Parent_View 	@51

-				location   	(2578, 3835)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	294

-				justify    	0

-				label      	"+activationSpec"

-				pctDist    	0.741657

-				height     	176

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAF490103"

-			    client     	@50

-			    supplier   	@49

-			    vertices   	(list Points

-				(2753, 3747)

-				(2753, 3866))

-			    line_style 	3

-			    origin_attachment 	(2753, 3747)

-			    terminal_attachment 	(2753, 3866)

-			    label      	(object SegLabel @53

-				Parent_View 	@51

-				location   	(2801, 3838)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.761905

-				height     	48

-				orientation 	0))

-			(object RoleView "$UNNAMED$27" @54

-			    Parent_View 	@50

-			    location   	(-87, -371)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAF490105"

-			    client     	@50

-			    supplier   	@42

-			    vertices   	(list Points

-				(2753, 3747)

-				(2753, 3629))

-			    line_style 	3

-			    origin_attachment 	(2753, 3747)

-			    terminal_attachment 	(2753, 3629))))

-		(object ClassView "Class" "Logical View::jca::ConnectionDefinition" @55

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3021, 1915)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@55

-			location   	(2618, 1734)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	806

-			justify    	0

-			label      	"ConnectionDefinition")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA4CF00F2"

-		    compartment 	(object Compartment

-			Parent_View 	@55

-			location   	(2618, 1795)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	803)

-		    width      	824

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::InboundResourceAdapter" @56

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1720, 3126)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@56

-			location   	(1475, 3075)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	490

-			justify    	0

-			label      	"InboundResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA1DD0257"

-		    width      	508

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @57

-		    location   	(2295, 3134)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAE38025F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageAdapter" @58

-			    Parent_View 	@57

-			    location   	(317, -634)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @59

-				Parent_View 	@58

-				location   	(2431, 3090)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	340

-				justify    	0

-				label      	"+messageAdapter"

-				pctDist    	0.425000

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE390094"

-			    client     	@57

-			    supplier   	@43

-			    vertices   	(list Points

-				(2295, 3134)

-				(2616, 3134))

-			    line_style 	3

-			    origin_attachment 	(2295, 3134)

-			    terminal_attachment 	(2616, 3134)

-			    label      	(object SegLabel @60

-				Parent_View 	@58

-				location   	(2567, 3179)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.851803

-				height     	45

-				orientation 	1))

-			(object RoleView "$UNNAMED$23" @61

-			    Parent_View 	@57

-			    location   	(317, -634)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @62

-				Parent_View 	@61

-				location   	(2038, 3093)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE39009E"

-			    client     	@57

-			    supplier   	@56

-			    vertices   	(list Points

-				(2295, 3134)

-				(1974, 3134))

-			    line_style 	3

-			    origin_attachment 	(2295, 3134)

-			    terminal_attachment 	(1974, 3134))))

-		(object ClassView "Class" "Logical View::jca::AdminObject" @63

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1026, 4060)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@63

-			location   	(737, 3954)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	578

-			justify    	0

-			label      	"AdminObject")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AADD6004B"

-		    compartment 	(object Compartment

-			Parent_View 	@63

-			location   	(737, 4015)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	575)

-		    width      	596

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::RequiredConfigPropertyType" @64

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3798, 3913)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@64

-			location   	(3527, 3832)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	542

-			justify    	0

-			label      	"RequiredConfigPropertyType")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AAFD601A6"

-		    compartment 	(object Compartment

-			Parent_View 	@64

-			location   	(3527, 3893)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	294)

-		    width      	560

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$28" @65

-		    location   	(3278, 3984)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAFAA027F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "requiredConfigProperties" @66

-			    Parent_View 	@65

-			    location   	(422, -597)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @67

-				Parent_View 	@66

-				location   	(3312, 3938)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+requiredConfigProperties"

-				pctDist    	0.145695

-				height     	47

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFAB0349"

-			    client     	@65

-			    supplier   	@64

-			    vertices   	(list Points

-				(3278, 3984)

-				(3518, 3984))

-			    line_style 	3

-			    origin_attachment 	(3278, 3984)

-			    terminal_attachment 	(3518, 3984)

-			    label      	(object SegLabel @68

-				Parent_View 	@66

-				location   	(3470, 4032)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.801324

-				height     	48

-				orientation 	1))

-			(object RoleView "$UNNAMED$29" @69

-			    Parent_View 	@65

-			    location   	(422, -597)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFAB0353"

-			    client     	@65

-			    supplier   	@49

-			    vertices   	(list Points

-				(3278, 3984)

-				(3039, 3984))

-			    line_style 	3

-			    origin_attachment 	(3278, 3984)

-			    terminal_attachment 	(3039, 3984))))

-		(object ClassView "Class" "Logical View::jca::ConfigProperty" @70

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(346, 3777)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@70

-			location   	(58, 3621)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	576

-			justify    	0

-			label      	"ConfigProperty")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60922C0188"

-		    compartment 	(object Compartment

-			Parent_View 	@70

-			location   	(58, 3682)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	572)

-		    width      	594

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$16" @71

-		    location   	(723, 1903)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA6F20117"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @72

-			    Parent_View 	@71

-			    location   	(-2159, -1529)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @73

-				Parent_View 	@72

-				location   	(578, 3385)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	0.881853

-				height     	36

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA6F30169"

-			    client     	@71

-			    supplier   	@70

-			    vertices   	(list Points

-				(723, 1903)

-				(542, 1903)

-				(542, 3609))

-			    line_style 	3

-			    origin_attachment 	(723, 1903)

-			    terminal_attachment 	(542, 3609)

-			    label      	(object SegLabel @74

-				Parent_View 	@72

-				location   	(596, 3419)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$17" @75

-			    Parent_View 	@71

-			    location   	(-2159, -1529)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA6F30173"

-			    client     	@71

-			    supplier   	@55

-			    vertices   	(list Points

-				(723, 1903)

-				(2609, 1903))

-			    line_style 	3

-			    origin_attachment 	(723, 1903)

-			    terminal_attachment 	(2609, 1903))))

-		(object AttachView "" @76

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@39

-		    supplier   	@70

-		    vertices   	(list Points

-			(125, 5090)

-			(125, 3944))

-		    line_style 	3

-		    origin_attachment 	(125, 5090)

-		    terminal_attachment 	(125, 3944))

-		(object AssociationViewNew "$UNNAMED$30" @77

-		    location   	(491, 4071)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AB14A02B9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @78

-			    Parent_View 	@77

-			    location   	(-404, -143)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @79

-				Parent_View 	@78

-				location   	(546, 4032)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	-0.240876

-				height     	40

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AB14B0347"

-			    client     	@77

-			    supplier   	@70

-			    vertices   	(list Points

-				(491, 4071)

-				(381, 4071)

-				(381, 3945))

-			    line_style 	3

-			    origin_attachment 	(491, 4071)

-			    terminal_attachment 	(381, 3945)

-			    label      	(object SegLabel @80

-				Parent_View 	@78

-				location   	(435, 3969)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$31" @81

-			    Parent_View 	@77

-			    location   	(-404, -143)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AB14B0351"

-			    client     	@77

-			    supplier   	@63

-			    vertices   	(list Points

-				(491, 4071)

-				(728, 4071))

-			    line_style 	3

-			    origin_attachment 	(491, 4071)

-			    terminal_attachment 	(728, 4071))))

-		(object ClassView "Class" "Logical View::jca::SecurityPermission" @82

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1781, 2528)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@82

-			location   	(1494, 2422)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	574

-			justify    	0

-			label      	"SecurityPermission")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C6093C100F4"

-		    compartment 	(object Compartment

-			Parent_View 	@82

-			location   	(1494, 2483)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	592

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::OutboundResourceAdapter" @83

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1881, 1657)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@83

-			location   	(1450, 1551)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	862

-			justify    	0

-			label      	"OutboundResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA1E6023C"

-		    compartment 	(object Compartment

-			Parent_View 	@83

-			location   	(1450, 1612)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	860)

-		    width      	880

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @84

-		    location   	(2581, 1622)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA4DC026E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "connectionDefinitions" @85

-			    Parent_View 	@84

-			    location   	(925, -1807)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @86

-				Parent_View 	@85

-				location   	(2648, 1580)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	420

-				justify    	0

-				label      	"+connectionDefinitions"

-				pctDist    	0.262548

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA4DD005C"

-			    client     	@84

-			    supplier   	@55

-			    vertices   	(list Points

-				(2581, 1622)

-				(2740, 1622)

-				(2740, 1722))

-			    line_style 	3

-			    origin_attachment 	(2581, 1622)

-			    terminal_attachment 	(2740, 1722)

-			    label      	(object SegLabel @87

-				Parent_View 	@85

-				location   	(2694, 1656)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.439516

-				height     	34

-				orientation 	1))

-			(object RoleView "$UNNAMED$13" @88

-			    Parent_View 	@84

-			    location   	(925, -1807)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA4DD0066"

-			    client     	@84

-			    supplier   	@83

-			    vertices   	(list Points

-				(2581, 1622)

-				(2321, 1622))

-			    line_style 	3

-			    origin_attachment 	(2581, 1622)

-			    terminal_attachment 	(2321, 1622))))

-		(object ClassView "Class" "Logical View::jca::ResourceAdapter" @89

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(612, 1045)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@89

-			location   	(181, 789)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	862

-			justify    	0

-			label      	"ResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60912A02A9"

-		    compartment 	(object Compartment

-			Parent_View 	@89

-			location   	(181, 850)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	9

-			max_width  	860)

-		    width      	880

-		    height     	536

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$10" @90

-		    location   	(1060, 1643)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA3630302"

-		    roleview_list 	(list RoleViews

-			(object RoleView "outboundResourceAdapter" @91

-			    Parent_View 	@90

-			    location   	(483, -324)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @92

-				Parent_View 	@91

-				location   	(1168, 1741)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	500

-				justify    	0

-				label      	"+outboundResourceAdapter"

-				pctDist    	0.283465

-				height     	98

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA3650369"

-			    client     	@90

-			    supplier   	@83

-			    vertices   	(list Points

-				(1060, 1643)

-				(1441, 1643))

-			    line_style 	3

-			    origin_attachment 	(1060, 1643)

-			    terminal_attachment 	(1441, 1643)

-			    label      	(object SegLabel @93

-				Parent_View 	@91

-				location   	(1403, 1697)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$11" @94

-			    Parent_View 	@90

-			    location   	(483, -324)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA365036B"

-			    client     	@90

-			    supplier   	@89

-			    vertices   	(list Points

-				(1060, 1643)

-				(1000, 1643)

-				(1000, 1313))

-			    line_style 	3

-			    origin_attachment 	(1060, 1643)

-			    terminal_attachment 	(1000, 1313))))

-		(object AttachView "" @95

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@38

-		    supplier   	@89

-		    vertices   	(list Points

-			(291, 4507)

-			(291, 1313))

-		    line_style 	3

-		    origin_attachment 	(291, 4507)

-		    terminal_attachment 	(291, 1313))

-		(object AssociationViewNew "$UNNAMED$18" @96

-		    location   	(834, 2535)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AADCD036A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "inboundResourceAdapter" @97

-			    Parent_View 	@96

-			    location   	(257, 568)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @98

-				Parent_View 	@97

-				location   	(1199, 3079)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	489

-				justify    	0

-				label      	"+inboundResourceAdapter"

-				pctDist    	0.781739

-				height     	46

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AADCF0312"

-			    client     	@96

-			    supplier   	@56

-			    vertices   	(list Points

-				(834, 2535)

-				(834, 3124)

-				(1466, 3124))

-			    line_style 	3

-			    origin_attachment 	(834, 2535)

-			    terminal_attachment 	(1466, 3124)

-			    label      	(object SegLabel @99

-				Parent_View 	@97

-				location   	(1343, 3178)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$19" @100

-			    Parent_View 	@96

-			    location   	(257, 568)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AADCF0314"

-			    client     	@96

-			    supplier   	@89

-			    vertices   	(list Points

-				(834, 2535)

-				(834, 1313))

-			    line_style 	3

-			    origin_attachment 	(834, 2535)

-			    terminal_attachment 	(834, 1313))))

-		(object AssociationViewNew "$UNNAMED$20" @101

-		    location   	(787, 2626)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AAE020320"

-		    roleview_list 	(list RoleViews

-			(object RoleView "adminObjects" @102

-			    Parent_View 	@101

-			    location   	(210, 659)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @103

-				Parent_View 	@102

-				location   	(963, 3896)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+adminObjects"

-				pctDist    	0.966472

-				height     	176

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE040160"

-			    client     	@101

-			    supplier   	@63

-			    vertices   	(list Points

-				(787, 2626)

-				(787, 3941))

-			    line_style 	3

-			    origin_attachment 	(787, 2626)

-			    terminal_attachment 	(787, 3941)

-			    label      	(object SegLabel @104

-				Parent_View 	@102

-				location   	(728, 3913)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.978863

-				height     	60

-				orientation 	1))

-			(object RoleView "$UNNAMED$21" @105

-			    Parent_View 	@101

-			    location   	(210, 659)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE04016B"

-			    client     	@101

-			    supplier   	@89

-			    vertices   	(list Points

-				(787, 2626)

-				(787, 1312))

-			    line_style 	3

-			    origin_attachment 	(787, 2626)

-			    terminal_attachment 	(787, 1312))))

-		(object AssociationViewNew "$UNNAMED$4" @106

-		    location   	(244, 2461)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C60944C00D6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @107

-			    Parent_View 	@106

-			    location   	(-348, 1245)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @108

-				Parent_View 	@107

-				location   	(246, 3406)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	0.823782

-				height     	2

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60944D0196"

-			    client     	@106

-			    supplier   	@70

-			    vertices   	(list Points

-				(244, 2461)

-				(244, 3609))

-			    line_style 	3

-			    origin_attachment 	(244, 2461)

-			    terminal_attachment 	(244, 3609)

-			    label      	(object SegLabel @109

-				Parent_View 	@107

-				location   	(192, 3494)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.899727

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$5" @110

-			    Parent_View 	@106

-			    location   	(-348, 1245)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60944D0198"

-			    client     	@106

-			    supplier   	@89

-			    vertices   	(list Points

-				(244, 2461)

-				(244, 1313))

-			    line_style 	3

-			    origin_attachment 	(244, 2461)

-			    terminal_attachment 	(244, 1313))))

-		(object AssociationViewNew "$UNNAMED$0" @111

-		    location   	(931, 2174)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C6093CC001E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityPermissions" @112

-			    Parent_View 	@111

-			    location   	(339, 958)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @113

-				Parent_View 	@112

-				location   	(1271, 2442)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	407

-				justify    	0

-				label      	"+securityPermissions"

-				pctDist    	0.752688

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6093CC0367"

-			    client     	@111

-			    supplier   	@82

-			    vertices   	(list Points

-				(931, 2174)

-				(931, 2480)

-				(1485, 2480))

-			    line_style 	3

-			    origin_attachment 	(931, 2174)

-			    terminal_attachment 	(1485, 2480)

-			    label      	(object SegLabel @114

-				Parent_View 	@112

-				location   	(1408, 2533)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.910000

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$1" @115

-			    Parent_View 	@111

-			    location   	(339, 958)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6093CC0369"

-			    client     	@111

-			    supplier   	@89

-			    vertices   	(list Points

-				(931, 2174)

-				(931, 1313))

-			    line_style 	3

-			    origin_attachment 	(931, 2174)

-			    terminal_attachment 	(931, 1313))))

-		(object ClassView "Class" "Logical View::common::Description" @116

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2775, 2668)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@116

-			location   	(2631, 2539)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	288

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@116

-			location   	(2631, 2644)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	284)

-		    width      	306

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$36" @117

-		    location   	(3856, 2786)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAFEC01BC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @118

-			    Parent_View 	@117

-			    location   	(3375, -2308)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @119

-				Parent_View 	@118

-				location   	(3066, 2712)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.867906

-				height     	32

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFF40019"

-			    client     	@117

-			    supplier   	@116

-			    vertices   	(list Points

-				(3856, 2786)

-				(3856, 2680)

-				(2928, 2680))

-			    line_style 	3

-			    origin_attachment 	(3856, 2786)

-			    terminal_attachment 	(2928, 2680)

-			    label      	(object SegLabel @120

-				Parent_View 	@118

-				location   	(2990, 2758)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.941292

-				height     	78

-				orientation 	0))

-			(object RoleView "$UNNAMED$37" @121

-			    Parent_View 	@117

-			    location   	(3375, -2308)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFF40024"

-			    client     	@117

-			    supplier   	@64

-			    vertices   	(list Points

-				(3856, 2786)

-				(3856, 3820))

-			    line_style 	3

-			    origin_attachment 	(3856, 2786)

-			    terminal_attachment 	(3856, 3820))))

-		(object AssociationViewNew "$UNNAMED$38" @122

-		    location   	(1193, 2734)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AAB5A034A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @123

-			    Parent_View 	@122

-			    location   	(887, -1040)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @124

-				Parent_View 	@123

-				location   	(2463, 2634)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.889044

-				height     	101

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAB6100BF"

-			    client     	@122

-			    supplier   	@116

-			    vertices   	(list Points

-				(1193, 2734)

-				(2622, 2734))

-			    line_style 	3

-			    origin_attachment 	(1193, 2734)

-			    terminal_attachment 	(2622, 2734)

-			    label      	(object SegLabel @125

-				Parent_View 	@123

-				location   	(2550, 2785)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.949756

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$39" @126

-			    Parent_View 	@122

-			    location   	(887, -1040)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAB6100C9"

-			    client     	@122

-			    supplier   	@70

-			    vertices   	(list Points

-				(1193, 2734)

-				(640, 2734)

-				(640, 3609))

-			    line_style 	3

-			    origin_attachment 	(1193, 2734)

-			    terminal_attachment 	(640, 3609))))

-		(object AssociationViewNew "$UNNAMED$40" @127

-		    location   	(2349, 2600)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAA3202FE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @128

-			    Parent_View 	@127

-			    location   	(738, -240)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @129

-				Parent_View 	@128

-				location   	(3081, 2580)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	2.684982

-				height     	21

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAA340012"

-			    client     	@127

-			    supplier   	@116

-			    vertices   	(list Points

-				(2349, 2600)

-				(2622, 2600))

-			    line_style 	3

-			    origin_attachment 	(2349, 2600)

-			    terminal_attachment 	(2622, 2600)

-			    label      	(object SegLabel @130

-				Parent_View 	@128

-				location   	(2563, 2557)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.783883

-				height     	44

-				orientation 	0))

-			(object RoleView "$UNNAMED$41" @131

-			    Parent_View 	@127

-			    location   	(738, -240)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAA34001C"

-			    client     	@127

-			    supplier   	@82

-			    vertices   	(list Points

-				(2349, 2600)

-				(2077, 2600))

-			    line_style 	3

-			    origin_attachment 	(2349, 2600)

-			    terminal_attachment 	(2077, 2600))))

-		(object ClassView "Class" "Logical View::jca::AuthenticationMechanism" @132

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2231, 1040)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@132

-			location   	(1633, 859)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	1196

-			justify    	0

-			label      	"AuthenticationMechanism")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60914003CE"

-		    compartment 	(object Compartment

-			Parent_View 	@132

-			location   	(1633, 920)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	1194)

-		    width      	1214

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @133

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@33

-		    supplier   	@132

-		    vertices   	(list Points

-			(1250, 549)

-			(1846, 846))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$14" @134

-		    location   	(2041, 1386)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AA54400FB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "authenticationMechanisms" @135

-			    Parent_View 	@134

-			    location   	(385, -2043)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @136

-				Parent_View 	@135

-				location   	(2359, 1318)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	509

-				justify    	0

-				label      	"+authenticationMechanisms"

-				pctDist    	0.444444

-				height     	318

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA545028D"

-			    client     	@134

-			    supplier   	@132

-			    vertices   	(list Points

-				(2041, 1386)

-				(2041, 1233))

-			    line_style 	3

-			    origin_attachment 	(2041, 1386)

-			    terminal_attachment 	(2041, 1233)

-			    label      	(object SegLabel @137

-				Parent_View 	@135

-				location   	(2142, 1258)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.834370

-				height     	101

-				orientation 	1))

-			(object RoleView "$UNNAMED$15" @138

-			    Parent_View 	@134

-			    location   	(385, -2043)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA545028F"

-			    client     	@134

-			    supplier   	@83

-			    vertices   	(list Points

-				(2041, 1386)

-				(2041, 1539))

-			    line_style 	3

-			    origin_attachment 	(2041, 1386)

-			    terminal_attachment 	(2041, 1539))))

-		(object AssociationViewNew "$UNNAMED$2" @139

-		    location   	(1338, 1050)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C6094120028"

-		    roleview_list 	(list RoleViews

-			(object RoleView "authenticationMechanisms" @140

-			    Parent_View 	@139

-			    location   	(746, -166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @141

-				Parent_View 	@140

-				location   	(1410, 1018)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	509

-				justify    	0

-				label      	"+authenticationMechanisms"

-				pctDist    	0.253394

-				height     	33

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6094120390"

-			    client     	@139

-			    supplier   	@132

-			    vertices   	(list Points

-				(1338, 1050)

-				(1624, 1050))

-			    line_style 	3

-			    origin_attachment 	(1338, 1050)

-			    terminal_attachment 	(1624, 1050)

-			    label      	(object SegLabel @142

-				Parent_View 	@140

-				location   	(1595, 1104)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.898601

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$3" @143

-			    Parent_View 	@139

-			    location   	(746, -166)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6094120392"

-			    client     	@139

-			    supplier   	@89

-			    vertices   	(list Points

-				(1338, 1050)

-				(1052, 1050))

-			    line_style 	3

-			    origin_attachment 	(1338, 1050)

-			    terminal_attachment 	(1052, 1050))))

-		(object AttachView "" @144

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@41

-		    supplier   	@132

-		    vertices   	(list Points

-			(3078, 734)

-			(2765, 846))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$32" @145

-		    location   	(3734, 1703)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA8A2001E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @146

-			    Parent_View 	@145

-			    location   	(1463, -801)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @147

-				Parent_View 	@146

-				location   	(0, 2830)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	6.560976

-				height     	205

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA8A30033"

-			    client     	@145

-			    supplier   	@116

-			    vertices   	(list Points

-				(3734, 1703)

-				(3734, 2625)

-				(2928, 2625))

-			    line_style 	3

-			    origin_attachment 	(3734, 1703)

-			    terminal_attachment 	(2928, 2625)

-			    label      	(object SegLabel @148

-				Parent_View 	@146

-				location   	(2993, 2515)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.962138

-				height     	111

-				orientation 	1))

-			(object RoleView "$UNNAMED$33" @149

-			    Parent_View 	@145

-			    location   	(1463, -801)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA8A3003D"

-			    client     	@145

-			    supplier   	@132

-			    vertices   	(list Points

-				(3734, 1703)

-				(3734, 871)

-				(2838, 871))

-			    line_style 	3

-			    origin_attachment 	(3734, 1703)

-			    terminal_attachment 	(2838, 871))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/jsp_2_0.cat b/plugins/org.eclipse.jst.j2ee.core/rose/jsp_2_0.cat
deleted file mode 100644
index ab6eb7ffe..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jsp_2_0.cat
+++ /dev/null
@@ -1,618 +0,0 @@
-

-(object Petal

-    version    	47

-    _written   	"Rose 8.0.0303.1400"

-    charSet    	0)

-

-(object Class_Category "jsp"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Jsp"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "jsp.xmi")))

-    quid       	"3E4D4F69036B"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "JSPConfig"

-	    quid       	"3E4D4A3A01C8"

-	    documentation 	

-|@version J2EE1.4

-|The jsp-configType is used to provide global configuration

-|information for the JSP files in a web application. It has

-|two subelements, taglib and jsp-property-group.

-	    )

-	(object Class "JSPPropertyGroup"

-	    quid       	"3E4D4A970353"

-	    documentation 	

-|@version J2EE1.4

-|The jsp-property-groupType is used to group a number of

-|files so they can be given global property information.

-|All files so described are deemed to be JSP files. The

-|following additional properties can be described:

-|

-|- Control enabling of EL evaluation. - Control enabling

-|of Scripting elements. - Indicate pageEncoding

-|information. - Indicating that a resource is a JSP

-|document - Prelude and Coda automatic includes.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E4D4CCD0144"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"3E4D4CDC0236"

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "elIgnored"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4D4CE302B8"

-		    documentation 	

-|Can be used to easily set the isELIgnored

-|	property of a group of JSP pages. By default,

-|	the EL evaluation is enabled for Web

-|	Applications using a Servlet 2.4 or greater

-|	web.xml, and disabled otherwise.

-		    

-		    type       	"boolean"

-		    initv      	"true"

-		    exportControl 	"Public")

-		(object ClassAttribute "pageEncoding"

-		    quid       	"3E4D4D33010E"

-		    documentation 	

-|The valid values of page-encoding are those of

-|	the pageEncoding page directive. It is a

-|	translation-time error to name different

-|	encodings in the pageEncoding attribute of the

-|	page directive of a JSP page and in a JSP

-|	configuration element matching the page. It is

-|	also a translation-time error to name different

-|	encodings in the prolog of a document in XML

-|	syntax and in a JSP configuration element

-|	matching the document. It is legal to name the

-|	same encoding through mulitple mechanisms.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "scriptingInvalid"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4D4D5803E3"

-		    documentation 	

-|Can be used to easily disable scripting in a

-|	group of JSP pages. By default, scripting is

-|	enabled.

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    initv      	"true"

-		    exportControl 	"Public")

-		(object ClassAttribute "isXML"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4D4DBA0018"

-		    documentation 	

-|If true, denotes that the group of resources

-|	that match the URL pattern are JSP documents,

-|	and thus must be interpreted as XML documents.

-|	If false, the resources are assumed to not be

-|	JSP documents, unless there is another property

-|	group that indicates otherwise.

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    initv      	"false"

-		    exportControl 	"Public")

-		(object ClassAttribute "includePreludes"

-		    quid       	"3E4D4E1700EE"

-		    documentation 	

-|The include-prelude element is a

-|	context-relative path that must correspond to

-|	an element in the Web Application. When the

-|	element is present, the given path will be

-|	automatically included (as in an include

-|	directive) at the beginning of each JSP page in

-|	this jsp-property-group.

-		    

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "includeCodas"

-		    quid       	"3E4D4E370235"

-		    documentation 	

-|The include-coda element is a context-relative

-|	path that must correspond to an element in the

-|	Web Application. When the element is present,

-|	the given path will be automatically included

-|	(as in an include directive) at the end of each

-|	JSP page in this jsp-property-group.

-		    

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "TagLibRefType"

-	    quid       	"3E4D4C370148"

-	    documentation 	

-|@version J2EE1.4

-|A taglib can be used to provide information on a tag

-|library that is used by a JSP page within the Web

-|Application.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "taglibURI"

-		    quid       	"3E4D4C4A02CC"

-		    documentation 	

-| A taglib-uri element describes a URI identifying a

-|        tag library used in the web application.  The body

-|        of the taglib-uri element may be either an

-|        absolute URI specification, or a relative URI.

-|        There should be no entries in web.xml with the

-|        same taglib-uri value.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "taglibLocation"

-		    quid       	"3E4D4C4F03B0"

-		    documentation 	

-|the taglib-location element contains the location

-|        (as a resource relative to the root of the web

-|        application) where to find the Tag Library

-|        Description file for the tag library.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3E4D4B560249"

-	    roles      	(list role_list

-		(object Role "tagLibs"

-		    quid       	"3E4D4B570074"

-		    label      	"tagLibs"

-		    supplier   	"Logical View::jsp::TagLibRefType"

-		    quidu      	"3E4D4C370148"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3E4D4B570076"

-		    supplier   	"Logical View::jsp::JSPConfig"

-		    quidu      	"3E4D4A3A01C8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"3E4D4C9D03DA"

-	    roles      	(list role_list

-		(object Role "propertyGroups"

-		    quid       	"3E4D4C9E034F"

-		    label      	"propertyGroups"

-		    supplier   	"Logical View::jsp::JSPPropertyGroup"

-		    quidu      	"3E4D4A970353"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"3E4D4C9E0351"

-		    supplier   	"Logical View::jsp::JSPConfig"

-		    quidu      	"3E4D4A3A01C8"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "JSP_2_0"

-	    quid       	"3E4D4FA203A9"

-	    title      	"JSP_2_0"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	531

-	    origin_y   	1684

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::jsp::JSPPropertyGroup" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 1791)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(591, 1560)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	930

-			justify    	0

-			label      	"JSPPropertyGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D4A970353"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(591, 1621)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	800)

-		    width      	948

-		    height     	486

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jsp::TagLibRefType" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 1680)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1737, 1574)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	526

-			justify    	0

-			label      	"TagLibRefType")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D4C370148"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1737, 1635)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	444)

-		    width      	544

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jsp::JSPConfig" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 1184)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(1383, 1133)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"JSPConfig")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D4A3A01C8"

-		    width      	292

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$2" @4

-		    location   	(1054, 1168)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4C9D03DA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$3" @5

-			    Parent_View 	@4

-			    location   	(173, -1612)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @6

-				Parent_View 	@5

-				location   	(1310, 1127)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C9E0351"

-			    client     	@4

-			    supplier   	@3

-			    line_style 	3

-			    origin_attachment 	(1054, 1168)

-			    terminal_attachment 	(1374, 1168))

-			(object RoleView "propertyGroups" @7

-			    Parent_View 	@4

-			    location   	(173, -1612)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @8

-				Parent_View 	@7

-				location   	(819, 1504)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	308

-				justify    	0

-				label      	"+propertyGroups"

-				pctDist    	0.899498

-				height     	176

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C9E034F"

-			    client     	@4

-			    supplier   	@1

-			    vertices   	(list Points

-				(1054, 1168)

-				(994, 1168)

-				(994, 1548))

-			    line_style 	3

-			    origin_attachment 	(1054, 1168)

-			    terminal_attachment 	(994, 1548)

-			    label      	(object SegLabel @9

-				Parent_View 	@7

-				location   	(1061, 1509)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.912060

-				height     	67

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$0" @10

-		    location   	(2006, 1222)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4B560249"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tagLibs" @11

-			    Parent_View 	@10

-			    location   	(1676, 916)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @12

-				Parent_View 	@11

-				location   	(1901, 1516)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	172

-				justify    	0

-				label      	"+tagLibs"

-				pctDist    	0.866995

-				height     	106

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4B570074"

-			    client     	@10

-			    supplier   	@2

-			    line_style 	3

-			    origin_attachment 	(2006, 1222)

-			    terminal_attachment 	(2006, 1562)

-			    label      	(object SegLabel @13

-				Parent_View 	@11

-				location   	(2070, 1514)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.859606

-				height     	64

-				orientation 	0))

-			(object RoleView "$UNNAMED$1" @14

-			    Parent_View 	@10

-			    location   	(1676, 916)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4B570076"

-			    client     	@10

-			    supplier   	@3

-			    vertices   	(list Points

-				(2006, 1222)

-				(2006, 1162)

-				(1666, 1162))

-			    line_style 	3

-			    origin_attachment 	(2006, 1222)

-			    terminal_attachment 	(1666, 1162))))

-		(object ClassView "Class" "Logical View::common::CompatibilityDescriptionGroup" @15

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(411, 1233)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(65, 1054)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"4023ADF20197"

-		    compartment 	(object Compartment

-			Parent_View 	@15

-			location   	(65, 1159)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	13434879

-			anchor     	2

-			nlines     	5

-			max_width  	437)

-		    width      	710

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @16

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4CCD0144"

-		    client     	@1

-		    supplier   	@15

-		    vertices   	(list Points

-			(582, 1548)

-			(509, 1548)

-			(509, 1424))

-		    line_style 	3

-		    origin_attachment 	(582, 1548)

-		    terminal_attachment 	(509, 1424))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/taglib_1_1.cat b/plugins/org.eclipse.jst.j2ee.core/rose/taglib_1_1.cat
deleted file mode 100644
index d0cd58014..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/taglib_1_1.cat
+++ /dev/null
@@ -1,3446 +0,0 @@
-

-(object Petal

-    version    	47

-    _written   	"Rose 8.0.0303.1400"

-    charSet    	0)

-

-(object Class_Category "taglib"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "taglib.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Taglib")))

-    quid       	"39A6BA5F0070"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "TagLib"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F00E8"

-	    documentation 	

-|The taglib tag is the document root, it defines:

-|

-|description     a simple string describing the "use" of this taglib,

-|                should be user discernable

-|

-|display-name    the display-name element contains a

-|                short name that is intended to be displayed

-|                by tools

-|

-|icon            optional icon that can be used by tools

-|

-|tlib-version    the version of the tag library implementation

-|

-|short-name      a simple default short name that could be

-|                used by a JSP authoring tool to create

-|                names with a mnemonic value; for example,

-|                the it may be used as the prefered prefix

-|                value in taglib directives

-|

-|uri             a uri uniquely identifying this taglib

-|

-|validator       optional TagLibraryValidator information

-|

-|listener        optional event listener specification

-|

-|tag             one or more tags in the tag library

-|

-|tag-file        one or more tag files in the tag library

-|

-|function        zero or more EL functions defined in this

-|                tag library

-|

-|taglib-extension zero or more extensions that provide extra

-|		information about this taglib, for tool

-|		consumption

-	    

-	    stereotype 	"component"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B12101F3"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "tagLibVersion"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"XML_DTD"

-			    name       	"DefaultDeclType"

-			    value      	"#IMPLIED"))

-		    quid       	"39A6BA5F0160"

-		    documentation 	

-|Describes this version number of the tag library (dewey decimal).

-|@regexp [0-9]*{ "."[0-9] }0..3

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "jspVersion"

-		    quid       	"39A6C5FA0221"

-		    documentation 	

-|Describes the JSP version (number) this tag library requires in order to function (dewey decimal).  Default is 1.2

-|@regexp [0-9]*{ "."[0-9] }0..3

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "shortName"

-		    quid       	"39A6C60001A7"

-		    documentation 	"The value of the short-name element is a name that could be used by a JSP authoring tool to create names with a mnemonic value; for example, it may be used as the prefered prefix value in taglib directives. Do not use white space, and do not start with digits or underscore."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "uri"

-		    quid       	"39A6C60600C9"

-		    documentation 	"The value of the uri element is a public URI that uniquely identifies the exact semantics of this taglibrary."

-		    type       	"String"

-		    exportControl 	"Public"))

-	    module     	"Component View::web-jsptaglibrary_1_1"

-	    quidu      	"39A6BA5F00C1"

-	    language   	"XML_DTD")

-	(object Class "JSPTag"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F0108"

-	    documentation 	

-|The tag element defines an action in this tag library. The tag element has one attribute, id.

-|The tag element may have several subelements defining:

-|name -- The unique action name

-|tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag

-|tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo

-|body-content -- The body content type

-|display-name -- A short name that is intended to be displayed by tools

-|small-icon -- Optional small-icon that can be used by tools

-|large-icon -- Optional large-icon that can be used by tools

-|description -- Optional tag-specific information

-|variable -- Optional scripting variable information

-|attribute -- All attributes of this action

-|example -- Optional informal description of an example of a use of this action.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E5A978E00CA"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "bodyContent"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39A6C904016B"

-		    documentation 	

-|Provides a hint as to the content of the body of this tag. Primarily intended for use by page composition tools.There are currently three values specified:

-|

-|tagdependent - The body of the tag is interpreted by the tag implementation itself, and is most likely in a		different "langage", e.g embedded SQL statements.

-|

-|JSP - The body of the tag contains nested JSP syntax

-|

-|empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::=  tagdependent | JSP | empty

-		    

-		    stereotype 	"0..1"

-		    type       	"BodyContentType"

-		    quidu      	"39ABE974027D"

-		    exportControl 	"Public")

-		(object ClassAttribute "example"

-		    quid       	"398967990188"

-		    documentation 	"The example element provides an informal description of an example of the use of a tag."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3E5A97D50127"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "dynamicAttributes"

-		    quid       	"3E5A9A11009D"

-		    type       	"boolean"

-		    exportControl 	"Public"))

-	    module     	"Component View::web-jsptaglibrary_1_1"

-	    quidu      	"39A6BA5F00C1"

-	    language   	"XML_DTD")

-	(object Class "JSPTagAttribute"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F0114"

-	    documentation 	"The attribute tag defines an attribute for the nesting tag"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"39A6C76E01F3"

-		    documentation 	"Defines the canonical name of a tag or attribute being defined (required)."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "required"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39A6C7720181"

-		    documentation 	"Defines if the nesting attribute is required or optional."

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "rtExprValue"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39A6C7760209"

-		    documentation 	

-|Defines if the nesting attribute can have scriptlet expressions asa value, i.e the value of the attribute may be dynamically calculatedat request time, as opposed to a static value determined at translationtime. (optional)

-|Default = false

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    initv      	"false"

-		    exportControl 	"Public")

-		(object ClassAttribute "fragment"

-		    quid       	"3E67B8AE0095"

-		    documentation 	"@version J2EE1.4"

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    exportControl 	"Public"))

-	    module     	"Component View::web-jsptaglibrary_1_1"

-	    quidu      	"39A6BA5F00C1"

-	    language   	"XML_DTD")

-	(object Class "BodyContentType"

-	    quid       	"39ABE974027D"

-	    documentation 	

-|@version J2EE1.4, added TAGDEPENDENT,EMPTY,scriptless,SCRIPTLESS

-|Provides a hint as to the content of the body of this tag.

-|Primarily intended for use by page composition tools.

-|

-|There are currently four values specified:

-|

-|tagdependent    The body of the tag is interpreted by the tag

-|                implementation itself, and is most likely

-|                in a different "langage", e.g embedded SQL

-|                statements.

-|

-|JSP             The body of the tag contains nested JSP

-|                syntax.

-|

-|empty           The body must be empty

-|

-|scriptless      The body accepts only template text, EL

-|                Expressions, and JSP action elements.  No

-|                scripting elements are allowed.

-|JSP=0

-|empty=1

-|tagdependent=2

-|TAGDEPENDENT=3

-|EMPTY=4

-|scriptless=5

-|SCRIPTLESS=6

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "tagdependent"

-		    quid       	"3ECD280702B0")

-		(object ClassAttribute "JSP"

-		    quid       	"3ECD28150094")

-		(object ClassAttribute "empty"

-		    quid       	"3ECD281A0005")

-		(object ClassAttribute "scriptless"

-		    quid       	"3ECD282002C0")))

-	(object Class "Validator"

-	    quid       	"398962CA014C"

-	    documentation 	

-|The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.

-|

-	    )

-	(object Class "JSPVariable"

-	    quid       	"398965A900B3"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "nameGiven"

-		    quid       	"398967F80384"

-		    documentation 	

-|The name-given element provides the name for the scripting variable.

-|

-|One of name-given or name-from-attribute is required.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "nameFromAttribute"

-		    quid       	"398968440134"

-		    documentation 	"The name of an attribute whose (translation-time) value will give the name of the variable."

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "declare"

-		    quid       	"398968CA0295"

-		    documentation 	

-|The value of the declare element indicates whether the scripting variable is to be defined or not. See TagExtraInfo for details.

-|This element is optional and is the default is true.

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "scope"

-		    quid       	"3989692A03AC"

-		    stereotype 	"0..1"

-		    type       	"JSPScriptingVariableScope"

-		    quidu      	"398968FD025D"

-		    exportControl 	"Public")))

-	(object Class "JSPScriptingVariableScope"

-	    quid       	"398968FD025D"

-	    documentation 	

-|NESTED=0

-|AT_BEGIN=1

-|AT_END=2

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NESTED"

-		    quid       	"398969100105"

-		    exportControl 	"Public")

-		(object ClassAttribute "AT_BEGIN"

-		    quid       	"398969130164"

-		    exportControl 	"Public")

-		(object ClassAttribute "AT_END"

-		    quid       	"3989691702D2"

-		    exportControl 	"Public")))

-	(object Class "Function"

-	    quid       	"3E5A875400E5"

-	    documentation 	

-|@version J2EE1.4

-|The function element is used to provide information on each

-|function in the tag library that is to be exposed to the EL.

-|

-|The function element may have several subelements defining:

-|

-|description         Optional tag-specific information

-|

-|display-name        A short name that is intended to be

-|                    displayed by tools

-|

-|icon                Optional icon element that can be used

-|                    by tools

-|

-|name                A unique name for this function

-|

-|function-class      Provides the name of the Java class that

-|                    implements the function

-|

-|function-signature  Provides the signature, as in the Java

-|                    Language Specification, of the Java

-|                    method that is to be used to implement

-|                    the function.

-|

-|example             Optional informal description of an

-|                    example of a use of this function

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E5A876A0340"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E5A87870066"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "signature"

-		    quid       	"3E5A898B039E"

-		    documentation 	

-|Provides the signature, as in the Java Language

-|        Specification, of the static Java method that is

-|        to be used to implement the function.

-|

-|        Example:

-|

-|        java.lang.String nickName( java.lang.String, int )

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "example"

-		    quid       	"3E5A8AAE0306"

-		    documentation 	

-|The example element contains an informal description

-|        of an example of the use of this function.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "TagFile"

-	    quid       	"3E5A96DE029E"

-	    documentation 	

-|@version J2EE1.4

-|Defines an action in this tag library that is implemented

-|as a .tag file.

-|

-|The tag-file element has two required subelements:

-|

-|name    The unique action name

-|

-|path    Where to find the .tag file implementing this

-|        action, relative to the root of the web application or

-|	the root of the JAR file for a tag library packaged in

-|	a JAR.  This must begin with /WEB-INF/tags if the .tag

-|	file resides in the WAR, or /META-INF/tags if the .tag

-|	file resides in a JAR.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3ECD2DE4011E"

-		    supplier   	"Logical View::common::DescriptionGroup"

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E5A96F803C8"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "path"

-		    quid       	"3E5A970E00E4"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "example"

-		    quid       	"3ECD2DFF022B"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "TldExtension"

-	    quid       	"3ECD2A8D016F"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "namespace"

-		    quid       	"3ECD2CD202C9"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ExtensibleType"

-	    quid       	"3ECD2C2A00F1"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "value"

-		    quid       	"3ECD2C3801E1"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    abstract   	TRUE)

-	(object Association "tag"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F0156"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$0"

-		    quid       	"39A6BA5F0157"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)

-		(object Role "tags"

-		    quid       	"39A6BA5F0158"

-		    label      	"tags"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "attribute"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F01BA"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    quid       	"39A6BA5F01BB"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    Containment 	"By Value"

-		    is_aggregate 	TRUE)

-		(object Role "attributes"

-		    quid       	"39A6BA5F01BC"

-		    label      	"attributes"

-		    supplier   	"Logical View::taglib::JSPTagAttribute"

-		    quidu      	"39A6BA5F0114"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"398962E3003A"

-	    roles      	(list role_list

-		(object Role "validator"

-		    quid       	"398962E3033D"

-		    documentation 	

-|The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.

-|

-		    

-		    label      	"validator"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"398962E30347"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3989632E01A0"

-	    roles      	(list role_list

-		(object Role "validatorClass"

-		    quid       	"3989632E039F"

-		    documentation 	

-|defines the TagLibraryValidator class that can be

-|used to validate the conformance of a JSP page to using this tag library.

-		    

-		    label      	"validatorClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3989632E03D1"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"398963F40082"

-	    roles      	(list role_list

-		(object Role "initParams"

-		    quid       	"398963F4032B"

-		    label      	"initParams"

-		    supplier   	"Logical View::webapplication::InitParam"

-		    quidu      	"38C08E9D0325"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"398963F4032C"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"398964E80322"

-	    roles      	(list role_list

-		(object Role "listeners"

-		    quid       	"398964E90279"

-		    label      	"listeners"

-		    supplier   	"Logical View::common::Listener"

-		    quidu      	"39BFB26001BD"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"398964E90283"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"398965BE00F9"

-	    roles      	(list role_list

-		(object Role "variables"

-		    quid       	"398965BF00E7"

-		    documentation 	

-|The variable element provides information on the scripting variables defined by this tag.

-|It is a (translation time) error for an action that has one or more variable subelements to have a TagExtraInfo class that returns a non-null object.

-|The subelements of variable are of the form:

-|name-given -- The variable name as a constant

-|name-from-attribute -- The name of an attribute whose (translation time) value will give the name of the variable. One of name-given or namefrom-attribute is required.

-|variable-class -- Name of the class of the variable. java.lang.String is default.

-|declare -- Whether the variable is declared or not. True is the default.

-|scope -- The scope of the scripting variable defined. NESTED is default.

-|

-		    

-		    label      	"variables"

-		    supplier   	"Logical View::taglib::JSPVariable"

-		    quidu      	"398965A900B3"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"398965BF00E8"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"398966A3031F"

-	    roles      	(list role_list

-		(object Role "tagClass"

-		    quid       	"398966A4028A"

-		    documentation 	

-|The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag that implements the request time semantics for this tag. This element is required.

-|@regexp fully qualified Java class name

-|

-		    

-		    label      	"tagClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"398966A402C7"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"398966C20175"

-	    roles      	(list role_list

-		(object Role "teiClass"

-		    quid       	"398966C3005E"

-		    documentation 	

-|The tei-class element indicates the subclass of javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated at translation time. This element is optional.

-|@regexp fully qualified Java class name

-		    

-		    label      	"teiClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"398966C3009A"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3989688A0366"

-	    documentation 	

-|The name of the class for the scripting variable.

-|This element is optional; the default is java.lang.String.

-|

-	    

-	    roles      	(list role_list

-		(object Role "variableClass"

-		    quid       	"3989688D002B"

-		    label      	"variableClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3989688D0067"

-		    supplier   	"Logical View::taglib::JSPVariable"

-		    quidu      	"398965A900B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"398969910273"

-	    roles      	(list role_list

-		(object Role "type"

-		    quid       	"3989699200EE"

-		    documentation 	

-|The value of the type element describes the Java type of the attributes value.

-|For static values (those determined at translation time) the type is always java.lang.String.

-		    

-		    label      	"type"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"39896992013E"

-		    supplier   	"Logical View::taglib::JSPTagAttribute"

-		    quidu      	"39A6BA5F0114"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E5A87CE03C6"

-	    roles      	(list role_list

-		(object Role "functionClass"

-		    quid       	"3E5A87CF034F"

-		    documentation 	

-|Provides the fully-qualified class name of the Java

-|        class containing the static method that implements

-|        the function.

-		    

-		    label      	"functionClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E5A87CF036D"

-		    supplier   	"Logical View::taglib::Function"

-		    quidu      	"3E5A875400E5"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3E5A9881000C"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E5A9881025A"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3E5A98810282"

-		    supplier   	"Logical View::taglib::JSPTagAttribute"

-		    quidu      	"39A6BA5F0114"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"3E67B391027D"

-	    roles      	(list role_list

-		(object Role "functions"

-		    quid       	"3E67B3920329"

-		    documentation 	"@version J2EE1.4"

-		    label      	"functions"

-		    supplier   	"Logical View::taglib::Function"

-		    quidu      	"3E5A875400E5"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"3E67B392032B"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$26"

-	    quid       	"3E67B9FE034B"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E67B9FF0392"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"3E67B9FF03B0"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"3E67BAA402B3"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E67BAA50297"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"3E67BAA502B5"

-		    supplier   	"Logical View::taglib::JSPVariable"

-		    quidu      	"398965A900B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"3ECD2C970011"

-	    roles      	(list role_list

-		(object Role "extensionElements"

-		    quid       	"3ECD2C9701CA"

-		    label      	"extensionElements"

-		    supplier   	"Logical View::taglib::ExtensibleType"

-		    quidu      	"3ECD2C2A00F1"

-		    client_cardinality 	(value cardinality "1..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"3ECD2C9701CC"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"3ECD2D5701DA"

-	    roles      	(list role_list

-		(object Role "functionExtensions"

-		    quid       	"3ECD2D58016D"

-		    label      	"functionExtensions"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3ECD2D580178"

-		    supplier   	"Logical View::taglib::Function"

-		    quidu      	"3E5A875400E5"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"3ECD2E5403C8"

-	    roles      	(list role_list

-		(object Role "tagExtensions"

-		    quid       	"3ECD2E590072"

-		    label      	"tagExtensions"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"3ECD2E59007C"

-		    supplier   	"Logical View::taglib::TagFile"

-		    quidu      	"3E5A96DE029E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$36"

-	    quid       	"3ECD2EE3003F"

-	    roles      	(list role_list

-		(object Role "taglibExtensions"

-		    quid       	"3ECD2EE503D1"

-		    label      	"taglibExtensions"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"3ECD2EE503DB"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "TagLib"

-	    quid       	"39A6BA810155"

-	    title      	"TagLib"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	1962

-	    origin_y   	1318

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::taglib::BodyContentType" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2589, 366)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(2374, 232)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	430

-			justify    	0

-			label      	"BodyContentType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@1

-			location   	(2374, 182)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	430

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39ABE974027D"

-		    width      	448

-		    height     	392

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::taglib::JSPScriptingVariableScope" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3254, 2227)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(2983, 2124)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	542

-			justify    	0

-			label      	"JSPScriptingVariableScope")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@2

-			location   	(2983, 2074)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	542

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398968FD025D"

-		    width      	560

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(284, 572)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(106, 493)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::InitParam" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(914, 1967)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(670, 1788)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	488

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C08E9D0325"

-		    width      	506

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1295, 2418)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1126, 2289)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	338

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4A98D602E0"

-		    width      	356

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1381, 1453)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(1268, 1371)

-			nlines     	2

-			max_width  	226

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    quidu      	"36549FCC00FA"

-		    width      	244

-		    height     	188

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::taglib::JSPTagAttribute" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2024, 1723)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(1579, 1567)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	890

-			justify    	0

-			label      	"JSPTagAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39A6BA5F0114"

-		    width      	908

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @8

-		    location   	(1297, 1949)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E5A9881000C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @9

-			    Parent_View 	@8

-			    location   	(-727, 226)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @10

-				Parent_View 	@9

-				location   	(1430, 2151)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.615854

-				height     	133

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A9881025A"

-			    client     	@8

-			    supplier   	@5

-			    line_style 	3

-			    origin_attachment 	(1297, 1949)

-			    terminal_attachment 	(1297, 2277)

-			    label      	(object SegLabel @11

-				Parent_View 	@9

-				location   	(1248, 2154)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.625000

-				height     	50

-				orientation 	1))

-			(object RoleView "$UNNAMED$23" @12

-			    Parent_View 	@8

-			    location   	(-727, 226)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A98810282"

-			    client     	@8

-			    supplier   	@7

-			    vertices   	(list Points

-				(1297, 1949)

-				(1297, 1889)

-				(1570, 1889))

-			    line_style 	3

-			    origin_attachment 	(1297, 1949)

-			    terminal_attachment 	(1570, 1889))))

-		(object AssociationViewNew "$UNNAMED$18" @13

-		    location   	(1403, 1745)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398969910273"

-		    roleview_list 	(list RoleViews

-			(object RoleView "type" @14

-			    Parent_View 	@13

-			    location   	(-197, 241)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @15

-				Parent_View 	@14

-				location   	(1474, 1637)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+type"

-				pctDist    	0.551587

-				height     	71

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989699200EE"

-			    client     	@13

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1403, 1745)

-			    terminal_attachment 	(1403, 1546)

-			    label      	(object SegLabel @16

-				Parent_View 	@14

-				location   	(1457, 1567)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$19" @17

-			    Parent_View 	@13

-			    location   	(-197, 241)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39896992013E"

-			    client     	@13

-			    supplier   	@7

-			    vertices   	(list Points

-				(1403, 1745)

-				(1403, 1805)

-				(1570, 1805))

-			    line_style 	3

-			    origin_attachment 	(1403, 1745)

-			    terminal_attachment 	(1570, 1805)

-			    label      	(object SegLabel @18

-				Parent_View 	@17

-				location   	(1508, 0)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	-7.929577

-				height     	105

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::taglib::JSPVariable" @19

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3093, 1712)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@19

-			location   	(2578, 1531)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	1030

-			justify    	0

-			label      	"JSPVariable")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398965A900B3"

-		    width      	1048

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$28" @20

-		    location   	(2387, 2351)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E67BAA402B3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @21

-			    Parent_View 	@20

-			    location   	(-593, 639)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @22

-				Parent_View 	@21

-				location   	(1715, 2306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.736734

-				height     	46

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67BAA50297"

-			    client     	@20

-			    supplier   	@5

-			    line_style 	3

-			    origin_attachment 	(2387, 2351)

-			    terminal_attachment 	(1473, 2351)

-			    label      	(object SegLabel @23

-				Parent_View 	@21

-				location   	(1564, 2405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$29" @24

-			    Parent_View 	@20

-			    location   	(-593, 639)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67BAA502B5"

-			    client     	@20

-			    supplier   	@19

-			    vertices   	(list Points

-				(2387, 2351)

-				(2856, 2351)

-				(2856, 1905))

-			    line_style 	3

-			    origin_attachment 	(2387, 2351)

-			    terminal_attachment 	(2856, 1905))))

-		(object AssociationViewNew "$UNNAMED$16" @25

-		    location   	(1859, 2002)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3989688A0366"

-		    roleview_list 	(list RoleViews

-			(object RoleView "variableClass" @26

-			    Parent_View 	@25

-			    location   	(-413, 530)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @27

-				Parent_View 	@26

-				location   	(1192, 1616)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+variableClass"

-				pctDist    	0.930155

-				height     	137

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989688D002B"

-			    client     	@25

-			    supplier   	@6

-			    vertices   	(list Points

-				(1859, 2002)

-				(1328, 2002)

-				(1328, 1547))

-			    line_style 	3

-			    origin_attachment 	(1859, 2002)

-			    terminal_attachment 	(1328, 1547)

-			    label      	(object SegLabel @28

-				Parent_View 	@26

-				location   	(1287, 1660)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.885809

-				height     	42

-				orientation 	0))

-			(object RoleView "$UNNAMED$17" @29

-			    Parent_View 	@25

-			    location   	(-413, 530)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989688D0067"

-			    client     	@25

-			    supplier   	@19

-			    vertices   	(list Points

-				(1859, 2002)

-				(2749, 2002)

-				(2749, 1905))

-			    line_style 	3

-			    origin_attachment 	(1859, 2002)

-			    terminal_attachment 	(2749, 1905))))

-		(object ClassView "Class" "Logical View::taglib::ExtensibleType" @30

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(887, 2544)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@30

-			location   	(706, 2463)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	362

-			justify    	0

-			label      	"ExtensibleType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3ECD2C2A00F1"

-		    width      	380

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::taglib::TagFile" @31

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1946, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@31

-			location   	(1634, 109)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	624

-			justify    	0

-			label      	"TagFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E5A96DE029E"

-		    width      	642

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @32

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2DE4011E"

-		    client     	@31

-		    supplier   	@3

-		    vertices   	(list Points

-			(1625, 162)

-			(417, 162)

-			(417, 481))

-		    line_style 	3

-		    origin_attachment 	(1625, 162)

-		    terminal_attachment 	(417, 481))

-		(object ClassView "Class" "Logical View::common::Listener" @33

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1312, 1073)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(1180, 974)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	264

-			justify    	0

-			label      	"Listener")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BFB26001BD"

-		    width      	282

-		    height     	222

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @34

-		    location   	(1425, 1271)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39C03E6C035A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @35

-			    Parent_View 	@34

-			    location   	(1041, -169)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @36

-				Parent_View 	@35

-				location   	(1384, 1202)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02CF"

-			    client     	@34

-			    supplier   	@33

-			    vertices   	(list Points

-				(1425, 1271)

-				(1441, 1271)

-				(1441, 1184))

-			    line_style 	3

-			    origin_attachment 	(1425, 1271)

-			    terminal_attachment 	(1441, 1184))

-			(object RoleView "listenerClass" @37

-			    Parent_View 	@34

-			    location   	(1041, -169)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @38

-				Parent_View 	@37

-				location   	(1513, 1325)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	262

-				justify    	0

-				label      	"+listenerClass"

-				pctDist    	0.608696

-				height     	88

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02A7"

-			    client     	@34

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1425, 1271)

-			    terminal_attachment 	(1425, 1359)

-			    label      	(object SegLabel @39

-				Parent_View 	@37

-				location   	(1463, 1301)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.335404

-				height     	38

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::taglib::Function" @40

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(321, 1415)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@40

-			location   	(9, 1284)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	624

-			justify    	0

-			label      	"Function")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E5A875400E5"

-		    width      	642

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @41

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5A876A0340"

-		    client     	@40

-		    supplier   	@3

-		    line_style 	3

-		    origin_attachment 	(281, 1272)

-		    terminal_attachment 	(281, 663))

-		(object AssociationViewNew "$UNNAMED$20" @42

-		    location   	(950, 1484)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5A87CE03C6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "functionClass" @43

-			    Parent_View 	@42

-			    location   	(628, 75)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @44

-				Parent_View 	@43

-				location   	(1197, 1443)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+functionClass"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A87CF034F"

-			    client     	@42

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(950, 1484)

-			    terminal_attachment 	(1259, 1484)

-			    label      	(object SegLabel @45

-				Parent_View 	@43

-				location   	(1228, 1538)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$21" @46

-			    Parent_View 	@42

-			    location   	(628, 75)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A87CF036D"

-			    client     	@42

-			    supplier   	@40

-			    line_style 	3

-			    origin_attachment 	(950, 1484)

-			    terminal_attachment 	(642, 1484))))

-		(object ClassView "Class" "Logical View::taglib::Validator" @47

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(848, 1259)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@47

-			location   	(734, 1208)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"Validator")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398962CA014C"

-		    width      	246

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$6" @48

-		    location   	(953, 1548)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398963F40082"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams" @49

-			    Parent_View 	@48

-			    location   	(409, 492)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @50

-				Parent_View 	@49

-				location   	(816, 1741)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+initParams"

-				pctDist    	0.852761

-				height     	138

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398963F4032B"

-			    client     	@48

-			    supplier   	@4

-			    line_style 	3

-			    origin_attachment 	(953, 1548)

-			    terminal_attachment 	(953, 1775)

-			    label      	(object SegLabel @51

-				Parent_View 	@49

-				location   	(1007, 1752)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$7" @52

-			    Parent_View 	@48

-			    location   	(409, 492)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398963F4032C"

-			    client     	@48

-			    supplier   	@47

-			    line_style 	3

-			    origin_attachment 	(953, 1548)

-			    terminal_attachment 	(953, 1322))))

-		(object AssociationViewNew "$UNNAMED$4" @53

-		    location   	(1215, 1222)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3989632E01A0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "validatorClass" @54

-			    Parent_View 	@53

-			    location   	(671, 166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @55

-				Parent_View 	@54

-				location   	(1233, 1309)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	291

-				justify    	0

-				label      	"+validatorClass"

-				pctDist    	0.078067

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989632E039F"

-			    client     	@53

-			    supplier   	@6

-			    vertices   	(list Points

-				(1215, 1222)

-				(1322, 1222)

-				(1322, 1359))

-			    line_style 	3

-			    origin_attachment 	(1215, 1222)

-			    terminal_attachment 	(1322, 1359)

-			    label      	(object SegLabel @56

-				Parent_View 	@54

-				location   	(1291, 1283)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.692568

-				height     	32

-				orientation 	1))

-			(object RoleView "$UNNAMED$5" @57

-			    Parent_View 	@53

-			    location   	(671, 166)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989632E03D1"

-			    client     	@53

-			    supplier   	@47

-			    line_style 	3

-			    origin_attachment 	(1215, 1222)

-			    terminal_attachment 	(971, 1222))))

-		(object AssociationViewNew "$UNNAMED$26" @58

-		    location   	(1112, 1694)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E67B9FE034B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @59

-			    Parent_View 	@58

-			    location   	(264, 435)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @60

-				Parent_View 	@59

-				location   	(1029, 2230)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.928460

-				height     	144

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B9FF0392"

-			    client     	@58

-			    supplier   	@5

-			    vertices   	(list Points

-				(1112, 1694)

-				(1172, 1694)

-				(1172, 2277))

-			    line_style 	3

-			    origin_attachment 	(1112, 1694)

-			    terminal_attachment 	(1172, 2277)

-			    label      	(object SegLabel @61

-				Parent_View 	@59

-				location   	(1226, 2212)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$27" @62

-			    Parent_View 	@58

-			    location   	(264, 435)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B9FF03B0"

-			    client     	@58

-			    supplier   	@47

-			    vertices   	(list Points

-				(1112, 1694)

-				(894, 1694)

-				(894, 1322))

-			    line_style 	3

-			    origin_attachment 	(1112, 1694)

-			    terminal_attachment 	(894, 1322))))

-		(object ClassView "Class" "Logical View::taglib::JSPTag" @63

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1998, 1021)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@63

-			location   	(1516, 865)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	964

-			justify    	0

-			label      	"JSPTag")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39A6BA5F0108"

-		    width      	982

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @64

-		    location   	(1762, 1398)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398966A3031F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tagClass" @65

-			    Parent_View 	@64

-			    location   	(178, 598)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @66

-				Parent_View 	@65

-				location   	(1689, 1433)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+tagClass"

-				pctDist    	0.283262

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966A4028A"

-			    client     	@64

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1762, 1398)

-			    terminal_attachment 	(1503, 1398)

-			    label      	(object SegLabel @67

-				Parent_View 	@65

-				location   	(1563, 1433)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.771930

-				height     	35

-				orientation 	0))

-			(object RoleView "$UNNAMED$13" @68

-			    Parent_View 	@64

-			    location   	(178, 598)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966A402C7"

-			    client     	@64

-			    supplier   	@63

-			    vertices   	(list Points

-				(1762, 1398)

-				(1822, 1398)

-				(1822, 1189))

-			    line_style 	3

-			    origin_attachment 	(1762, 1398)

-			    terminal_attachment 	(1822, 1189))))

-		(object AssociationViewNew "$UNNAMED$14" @69

-		    location   	(1858, 1481)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398966C20175"

-		    roleview_list 	(list RoleViews

-			(object RoleView "teiClass" @70

-			    Parent_View 	@69

-			    location   	(274, 681)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @71

-				Parent_View 	@70

-				location   	(1649, 1535)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	178

-				justify    	0

-				label      	"+teiClass"

-				pctDist    	0.589286

-				height     	54

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966C3005E"

-			    client     	@69

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1858, 1481)

-			    terminal_attachment 	(1503, 1481)

-			    label      	(object SegLabel @72

-				Parent_View 	@70

-				location   	(1539, 1535)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$15" @73

-			    Parent_View 	@69

-			    location   	(274, 681)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966C3009A"

-			    client     	@69

-			    supplier   	@63

-			    vertices   	(list Points

-				(1858, 1481)

-				(1922, 1481)

-				(1922, 1189))

-			    line_style 	3

-			    origin_attachment 	(1858, 1481)

-			    terminal_attachment 	(1922, 1189))))

-		(object InheritView "" @74

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5A978E00CA"

-		    client     	@63

-		    supplier   	@3

-		    vertices   	(list Points

-			(1562, 853)

-			(1562, 109)

-			(287, 109)

-			(287, 481))

-		    line_style 	3

-		    origin_attachment 	(1562, 853)

-		    terminal_attachment 	(287, 481))

-		(object AssociationViewNew "attribute" @75

-		    location   	(2031, 1371)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39A6BA5F01BA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "attributes" @76

-			    Parent_View 	@75

-			    location   	(815, 363)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @77

-				Parent_View 	@76

-				location   	(2151, 1514)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	193

-				justify    	0

-				label      	"+attributes"

-				pctDist    	0.780488

-				height     	120

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F01BC"

-			    client     	@75

-			    supplier   	@7

-			    line_style 	3

-			    origin_attachment 	(2031, 1371)

-			    terminal_attachment 	(2031, 1555)

-			    label      	(object SegLabel @78

-				Parent_View 	@76

-				location   	(1978, 1537)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$1" @79

-			    Parent_View 	@75

-			    location   	(815, 363)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @80

-				Parent_View 	@79

-				location   	(2073, 1226)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F01BB"

-			    client     	@75

-			    supplier   	@63

-			    line_style 	3

-			    origin_attachment 	(2031, 1371)

-			    terminal_attachment 	(2031, 1188))))

-		(object AssociationViewNew "$UNNAMED$10" @81

-		    location   	(2946, 1104)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398965BE00F9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "variables" @82

-			    Parent_View 	@81

-			    location   	(1362, 304)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @83

-				Parent_View 	@82

-				location   	(3128, 1449)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	181

-				justify    	0

-				label      	"+variables"

-				pctDist    	0.854671

-				height     	122

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398965BF00E7"

-			    client     	@81

-			    supplier   	@19

-			    vertices   	(list Points

-				(2946, 1104)

-				(3006, 1104)

-				(3006, 1519))

-			    line_style 	3

-			    origin_attachment 	(2946, 1104)

-			    terminal_attachment 	(3006, 1519)

-			    label      	(object SegLabel @84

-				Parent_View 	@82

-				location   	(3076, 1389)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.726644

-				height     	70

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @85

-			    Parent_View 	@81

-			    location   	(1362, 304)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398965BF00E8"

-			    client     	@81

-			    supplier   	@63

-			    line_style 	3

-			    origin_attachment 	(2946, 1104)

-			    terminal_attachment 	(2489, 1104))))

-		(object ClassView "Class" "Logical View::taglib::TldExtension" @86

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(271, 2221)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@86

-			location   	(32, 2140)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	478

-			justify    	0

-			label      	"TldExtension")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3ECD2A8D016F"

-		    width      	496

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$30" @87

-		    location   	(580, 2382)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2C970011"

-		    roleview_list 	(list RoleViews

-			(object RoleView "extensionElements" @88

-			    Parent_View 	@87

-			    location   	(309, 161)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @89

-				Parent_View 	@88

-				location   	(905, 2405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	378

-				justify    	0

-				label      	"+extensionElements"

-				pctDist    	2.034346

-				height     	131

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2C9701CA"

-			    client     	@87

-			    supplier   	@30

-			    line_style 	0

-			    label      	(object SegLabel @90

-				Parent_View 	@88

-				location   	(641, 2470)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..*"

-				pctDist    	0.639913

-				height     	50

-				orientation 	1))

-			(object RoleView "$UNNAMED$31" @91

-			    Parent_View 	@87

-			    location   	(309, 161)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2C9701CC"

-			    client     	@87

-			    supplier   	@86

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$32" @92

-		    location   	(293, 1842)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2D5701DA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "functionExtensions" @93

-			    Parent_View 	@92

-			    location   	(-19, 427)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(194, 2021)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	371

-				justify    	0

-				label      	"+functionExtensions"

-				pctDist    	0.643493

-				height     	89

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2D58016D"

-			    client     	@92

-			    supplier   	@86

-			    line_style 	0

-			    label      	(object SegLabel @95

-				Parent_View 	@93

-				location   	(214, 2077)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.834111

-				height     	66

-				orientation 	1))

-			(object RoleView "$UNNAMED$33" @96

-			    Parent_View 	@92

-			    location   	(-19, 427)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2D580178"

-			    client     	@92

-			    supplier   	@40

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$34" @97

-		    location   	(684, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2E5403C8"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tagExtensions" @98

-			    Parent_View 	@97

-			    location   	(-1262, 592)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @99

-				Parent_View 	@98

-				location   	(484, 2226)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+tagExtensions"

-				pctDist    	1.022972

-				height     	1

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2E590072"

-			    client     	@97

-			    supplier   	@86

-			    vertices   	(list Points

-				(684, 832)

-				(684, 2225)

-				(519, 2225))

-			    line_style 	3

-			    origin_attachment 	(684, 832)

-			    terminal_attachment 	(519, 2225)

-			    label      	(object SegLabel @100

-				Parent_View 	@98

-				location   	(608, 2200)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.942839

-				height     	26

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @101

-			    Parent_View 	@97

-			    location   	(-1262, 592)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2E59007C"

-			    client     	@97

-			    supplier   	@31

-			    vertices   	(list Points

-				(684, 832)

-				(684, 216)

-				(1625, 216))

-			    line_style 	3

-			    origin_attachment 	(684, 832)

-			    terminal_attachment 	(1625, 216))))

-		(object ClassView "Class" "Logical View::taglib::TagLib" @102

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1228, 534)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@102

-			location   	(967, 300)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	522

-			justify    	0

-			label      	"TagLib")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@102

-			location   	(967, 250)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	522

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39A6BA5F00E8"

-		    compartment 	(object Compartment

-			Parent_View 	@102

-			location   	(967, 361)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	0)

-		    width      	540

-		    height     	592

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$8" @103

-		    location   	(1231, 895)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398964E80322"

-		    roleview_list 	(list RoleViews

-			(object RoleView "listeners" @104

-			    Parent_View 	@103

-			    location   	(527, 543)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @105

-				Parent_View 	@104

-				location   	(1350, 902)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	186

-				justify    	0

-				label      	"+listeners"

-				pctDist    	0.103448

-				height     	119

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398964E90279"

-			    client     	@103

-			    supplier   	@33

-			    line_style 	3

-			    origin_attachment 	(1231, 895)

-			    terminal_attachment 	(1231, 961)

-			    label      	(object SegLabel @106

-				Parent_View 	@104

-				location   	(1287, 941)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.712121

-				height     	56

-				orientation 	0))

-			(object RoleView "$UNNAMED$9" @107

-			    Parent_View 	@103

-			    location   	(527, 543)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @108

-				Parent_View 	@107

-				location   	(1190, 842)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	200

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398964E90283"

-			    client     	@103

-			    supplier   	@102

-			    line_style 	3

-			    origin_attachment 	(1231, 895)

-			    terminal_attachment 	(1231, 829))))

-		(object AssociationViewNew "$UNNAMED$24" @109

-		    location   	(503, 755)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E67B391027D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "functions" @110

-			    Parent_View 	@109

-			    location   	(-725, 255)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @111

-				Parent_View 	@110

-				location   	(410, 1157)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+functions"

-				pctDist    	0.802444

-				height     	34

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B3920329"

-			    client     	@109

-			    supplier   	@40

-			    vertices   	(list Points

-				(503, 755)

-				(443, 755)

-				(443, 1272))

-			    line_style 	3

-			    origin_attachment 	(503, 755)

-			    terminal_attachment 	(443, 1272)

-			    label      	(object SegLabel @112

-				Parent_View 	@110

-				location   	(497, 1214)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$25" @113

-			    Parent_View 	@109

-			    location   	(-725, 255)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B392032B"

-			    client     	@109

-			    supplier   	@102

-			    line_style 	3

-			    origin_attachment 	(503, 755)

-			    terminal_attachment 	(958, 755))))

-		(object AssociationViewNew "$UNNAMED$2" @114

-		    location   	(869, 953)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398962E3003A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "validator" @115

-			    Parent_View 	@114

-			    location   	(165, 601)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @116

-				Parent_View 	@115

-				location   	(751, 1126)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	183

-				justify    	0

-				label      	"+validator"

-				pctDist    	0.716763

-				height     	119

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398962E3033D"

-			    client     	@114

-			    supplier   	@47

-			    line_style 	3

-			    origin_attachment 	(869, 953)

-			    terminal_attachment 	(869, 1196)

-			    label      	(object SegLabel @117

-				Parent_View 	@115

-				location   	(953, 1147)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.803468

-				height     	84

-				orientation 	0))

-			(object RoleView "$UNNAMED$3" @118

-			    Parent_View 	@114

-			    location   	(165, 601)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398962E30347"

-			    client     	@114

-			    supplier   	@102

-			    vertices   	(list Points

-				(869, 953)

-				(869, 799)

-				(958, 799))

-			    line_style 	3

-			    origin_attachment 	(869, 953)

-			    terminal_attachment 	(958, 799))))

-		(object AssociationViewNew "tag" @119

-		    location   	(1910, 518)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @120

-			Parent_View 	@119

-			location   	(1910, 459)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	600

-			justify    	0

-			label      	"tag"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39A6BA5F0156"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tags" @121

-			    Parent_View 	@119

-			    location   	(1638, -234)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @122

-				Parent_View 	@121

-				location   	(2059, 811)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+tags"

-				pctDist    	0.898190

-				height     	72

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F0158"

-			    client     	@119

-			    supplier   	@63

-			    vertices   	(list Points

-				(1910, 518)

-				(1987, 518)

-				(1987, 853))

-			    line_style 	3

-			    origin_attachment 	(1910, 518)

-			    terminal_attachment 	(1987, 853)

-			    label      	(object SegLabel @123

-				Parent_View 	@121

-				location   	(1933, 815)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.907240

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$0" @124

-			    Parent_View 	@119

-			    location   	(1638, -234)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @125

-				Parent_View 	@124

-				location   	(1581, 477)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F0157"

-			    client     	@119

-			    supplier   	@102

-			    line_style 	3

-			    origin_attachment 	(1910, 518)

-			    terminal_attachment 	(1498, 518))))

-		(object AssociationViewNew "$UNNAMED$36" @126

-		    location   	(665, 1456)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2EE3003F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "taglibExtensions" @127

-			    Parent_View 	@126

-			    location   	(-563, 922)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(581, 2057)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	325

-				justify    	0

-				label      	"+taglibExtensions"

-				pctDist    	0.922742

-				height     	163

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2EE503D1"

-			    client     	@126

-			    supplier   	@86

-			    vertices   	(list Points

-				(665, 1456)

-				(665, 1781)

-				(418, 1781)

-				(418, 2128))

-			    line_style 	3

-			    origin_attachment 	(665, 1456)

-			    terminal_attachment 	(418, 2128)

-			    label      	(object SegLabel @129

-				Parent_View 	@127

-				location   	(380, 2069)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.935800

-				height     	38

-				orientation 	1))

-			(object RoleView "$UNNAMED$37" @130

-			    Parent_View 	@126

-			    location   	(-563, 922)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2EE503DB"

-			    client     	@126

-			    supplier   	@102

-			    vertices   	(list Points

-				(665, 1456)

-				(665, 831)

-				(958, 831))

-			    line_style 	3

-			    origin_attachment 	(665, 1456)

-			    terminal_attachment 	(958, 831))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/tcg.pty b/plugins/org.eclipse.jst.j2ee.core/rose/tcg.pty
deleted file mode 100644
index 67523e030..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/tcg.pty
+++ /dev/null
@@ -1,590 +0,0 @@
-#
-# Copyright (c) 2001, International Business Machines Corporation. ALL RIGHTS RESERVED
-# Thin Client Generator (TCG) properties file
-#
-(object Petal version 42)
-
-(list Attribute_Set
-	(object Attribute
-		tool       	"TCG"
-		name       	"roseId"
-		value      	"837263636"
-	)
-	(object Attribute
-		tool       	"TCG"
-		name       	"propertyId"
-		value      	"984747394"
-	)
-	#
-	# Class properties
-	#	
-	(object Attribute
-		tool       	"TCG"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-			# A description to use when displaying this class' name on panels or within text.
-			(object Attribute
-				tool       	"TCG"
-				name       	"DisplayName"
-				value      	""
-			)
-			# A comma delimited list of user roles which this field is used by 
-			(object Attribute
-				tool       	"TCG"
-				name       	"AppliesToRoles"
-				value      	""
-			)
-			# A classification of user experience level which would use this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"UserExperienceLevel"
-				value      	("UserExpLevel_Set" 100)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"UserExpLevel_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"BASIC"
-						value      	100
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ADVANCED"
-						value      	101
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"EXPERT"
-						value      	102
-					)
-				)
-			)
-			# A description to use for the title of detail panels containing an object of this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdDetailPanelTitle"
-				value      	""
-			)
-			# Contains a comma-separated list of attribute id's in the order they should appear on the
-			# default detail panel for this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdDetailPanelFieldsInOrder"
-				value      	""
-			)
-			# A description to use for the title of collection panels containing elements of this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdCollectionPanelTitle"
-				value      	""
-			)
-			# Contains a comma-separated list of attribute id's in the order they should appear on the
-			# default collection panel for this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdCollectionPanelFieldsInOrder"
-				value      	""
-			)
-			# A string containing attribute name parameter slots which will be filled in with values from the attributes.
-			# Typically used to calculate a tree node description for an object.
-			(object Attribute
-				tool       	"TCG"
-				name       	"DescriptionPattern"
-				value      	""
-			)
-			# A uri to content which will be included just above the description area of the detail page for this class
-			(object Attribute
-				tool       	"TCG"
-				name       	"PreDescriptionIncludeURI"
-				value      	""
-			)
-			# A uri to content which will be included just above the form area of the detail page for this class
-			(object Attribute
-				tool       	"TCG"
-				name       	"PreFormIncludeURI"
-				value      	""
-			)
-			# A uri to content which will be included in the footer area of the detail page for this class
-			(object Attribute
-				tool       	"TCG"
-				name       	"FooterIncludeURI"
-				value      	""
-			)
-			# Whether views should be generated for this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"SkipViewGeneration"
-				value      	FALSE
-			)
-			# The icon file uri for small 16x16 icon representing this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"SmallIcon"
-				value      	""
-			)
-			# The icon file uri for large 32x32 icon representing this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"LargeIcon"
-				value      	""
-			)
-			# An alternate uri (absolute or relative to web app root) to include as the description in the 
-			# detail panel.
-			(object Attribute
-				tool       	"TCG"
-				name       	"AltDescriptionURI"
-				value      	""
-			)
-		)
-	)
-	#
-	# Class Attribute Properties
-	#
-	(object Attribute
-		tool       	"TCG"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-			# The label text to use when displaying this attribute (without ':')
-			(object Attribute
-				tool       	"TCG"
-				name       	"DisplayName"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IsRequired"
-				value      	TRUE
-			)
-			# A string which can be used to group this field with other fields with the same categoryId
-			(object Attribute
-				tool       	"TCG"
-				name       	"CategoryId"
-				value      	""
-			)
-			# A comma delimited list of user roles which this field is used by 
-			(object Attribute
-				tool       	"TCG"
-				name       	"AppliesToRoles"
-				value      	""
-			)
-			# A classification of user experience level which would use this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"UserExperienceLevel"
-				value      	("UserExpLevel_Set" 100)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"UserExpLevel_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"BASIC"
-						value      	100
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ADVANCED"
-						value      	101
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"EXPERT"
-						value      	102
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"FieldType"
-				value      	("FieldType_Set" 71)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"FieldType_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_FIELD"
-						value      	71
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_AREA"
-						value      	72
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"COMBO_BOX"
-						value      	73
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"LIST_BOX"
-						value      	74
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CHECK_BOX"
-						value      	75
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"OPTION"
-						value      	76
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_READ_ONLY"
-						value      	77
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CUSTOM"
-						value      	78
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"FILE"
-						value      	79
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"URI"
-						value      	80
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"PASSWORD"
-						value      	81
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"MaxLength"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"BooleanValueKind"
-				value      	("BooleanValueKind_Set" 91)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"BooleanValueKind_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TRUE_FALSE"
-						value      	91
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ENABLE_DISABLE"
-						value      	92
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"YES_NO"
-						value      	93
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ON_OFF"
-						value      	94
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ColumnWidthPercent"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"VisibleSize"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeActionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeJSPURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"AltDescriptionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMinValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMaxValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationPattern"
-				value      	""
-			)
-			# A text description of special validation requirements that apply to this field
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationReqs"
-				value      	""
-			)
-			# The validation class which implements the special validation requirements for this field.
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationClass"
-				value      	""
-			)
-		)
-	)
-	
-	#
-	# Role Properties
-	#
-	(object Attribute
-		tool       	"TCG"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-			# The label text to use when displaying this attribute (without ':')
-			(object Attribute
-				tool       	"TCG"
-				name       	"DisplayName"
-				value      	""
-			)
-			# Specifies that this field should not appear in any views
-			(object Attribute
-				tool       	"TCG"
-				name       	"SkipGeneration"
-				value      	FALSE
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IsRequired"
-				value      	TRUE
-			)
-			# Whether or not to show this field in the tree if it is a composite field with card 0..1 or 1
-			# When FALSE, the code generator should embed the detail page of the contained type within
-			# the detail page of the container type.
-			(object Attribute
-				tool       	"TCG"
-				name       	"ShowCompositeInTree"
-				value      	TRUE
-			)
-			# When TRUE, the code generator should embed the collection page of the contained types within
-			# the properties page of the detail page of the container type.
-			(object Attribute
-				tool       	"TCG"
-				name       	"ShowAsPropertiesPage"
-				value      	FALSE
-			)
-			# A comma delimited list of user roles which this field is used by 
-			(object Attribute
-				tool       	"TCG"
-				name       	"AppliesToRoles"
-				value      	""
-			)
-			# A classification of user experience level which would use this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"UserExperienceLevel"
-				value      	("UserExpLevel_Set" 100)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"UserExpLevel_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"BASIC"
-						value      	100
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ADVANCED"
-						value      	101
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"EXPERT"
-						value      	102
-					)
-				)
-			)
-			# A string which can be used to group this field with other fields with the same categoryId
-			(object Attribute
-				tool       	"TCG"
-				name       	"CategoryId"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"FieldType"
-				value      	("FieldType_Set" 71)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"FieldType_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_FIELD"
-						value      	71
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_AREA"
-						value      	72
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"COMBO_BOX"
-						value      	73
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"LIST_BOX"
-						value      	74
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CHECK_BOX"
-						value      	75
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"OPTION"
-						value      	76
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_READ_ONLY"
-						value      	77
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CUSTOM"
-						value      	78
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"FILE"
-						value      	79
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"URI"
-						value      	80
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"PASSWORD"
-						value      	81
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"MaxLength"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"BooleanValueKind"
-				value      	("BooleanValueKind_Set" 91)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"BooleanValueKind_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TRUE_FALSE"
-						value      	91
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ENABLE_DISABLE"
-						value      	92
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"YES_NO"
-						value      	93
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ON_OFF"
-						value      	94
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ColumnWidthPercent"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"VisibleSize"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeActionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeJSPURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"AltDescriptionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMinValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMaxValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationPattern"
-				value      	""
-			)
-			# A text description of special validation requirements that apply to this field
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationReqs"
-				value      	""
-			)
-			# The validation class which implements the special validation requirements for this field.
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationClass"
-				value      	""
-			)
-		)
-	)
-)
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.cat b/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.cat
deleted file mode 100644
index 83e1e0b75..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.cat
+++ /dev/null
@@ -1,10347 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "webapplication"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "webapplication.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Webapplication")))

-    quid       	"38C076D603DD"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    quid       	"38FF3C150151"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "WebApp"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C077FB0352"

-	    documentation 	

-|The web-app element is the root of the deployment descriptor for

-|a web application.

-	    

-	    stereotype 	"component"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E4D55CA03E2"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "distributable"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C0782D0231"

-		    documentation 	"The distributable element, by its presence in a web application deployment descriptor, indicates that this web application is programmed appropriately to be deployed into a distributed servlet container"

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "version"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Final"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Volatile"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Transient"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"IndividualChangeMgt"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"GenerateFullyQualifiedTypes"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"PropertyType"

-			    value      	("BeanProperty_Set" 71))

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Read/Write"

-			    value      	("Read/Write_Set" 81)))

-		    quid       	"3E4D57C20179"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ContextParam"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C078B602A6"

-	    documentation 	

-|@version J2EE1.4 deprecated

-|The context-param element contains the declaration of a web application's servlet context initialization parameters.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "paramName"

-		    quid       	"38C078C602F0"

-		    documentation 	

-|@deprecated

-|The param-name element contains the name of a parameter.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "paramValue"

-		    quid       	"38C078DB039A"

-		    documentation 	

-|@deprecated

-|The param-value element contains the value of a parameter.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38C078EA0319"

-		    documentation 	"@deprecated"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Servlet"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C079140251"

-	    documentation 	"The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded."

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B1040300"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "servletName"

-		    quid       	"38C079300067"

-		    documentation 	"The servlet-name element contains the canonical name of the servlet."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "loadOnStartup"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C079550147"

-		    documentation 	

-|The load-on-startup element indicates that this servlet should be loaded on the startup of the web application. The optional contents of these element must be a positive integer indicating the order in which the servlet should be loaded. Lower integers are loaded before higher integers. If no value is specified, or if the value specified is not a positive integer, the container is free to load it at any time in the startup sequence.

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"Integer"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ServletMapping"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C079BD02B9"

-	    documentation 	"The servlet-mapping element defines a mapping between a servlet and a url pattern"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"38C079DD0391"

-		    documentation 	"The url-pattern element contains the url pattern of the mapping. Must follow the rules specified in Section 10 of the Servlet API Specification."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3E67C27A00D7"

-		    documentation 	

-|@version J2EE1.4

-|The servlet-name element contains the canonical name of the

-|servlet. Each servlet name is unique within the web

-|application.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SessionConfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07A5301BD"

-	    documentation 	"The session-config element defines the session parameters for this web application."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "sessionTimeout"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C07A5B0205"

-		    documentation 	

-|The session-timeout element defines the default

-|        session timeout interval for all sessions created

-|        in this web application. The specified timeout

-|        must be expressed in a whole number of minutes.

-|        If the timeout is 0 or less, the container ensures

-|        the default behaviour of sessions is never to time

-|        out. If this element is not specified, the container

-|        must set its default timeout period.

-		    

-		    type       	"int"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "MimeMapping"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07A7500FE"

-	    documentation 	

-|The mime-mapping element defines a mapping between an extension and a mime type.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "extension"

-		    quid       	"38C07A830017"

-		    documentation 	

-|The extension element contains a string describing an extension. example: "txt"

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "mimeType"

-		    quid       	"38C07A8C01BF"

-		    documentation 	

-|The mime-type element contains a defined mime type. example: "text/plain"

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WelcomeFileList"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07AAD01A8"

-	    documentation 	"The welcome-file-list contains an ordered list of welcome files elements."

-	    language   	"Java")

-	(object Class "ErrorPage"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07ACF03E2"

-	    documentation 	"The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "location"

-		    quid       	"38C07AEB02AC"

-		    documentation 	"The location element contains the location of the resource in the web application"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "TagLibRef"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07B3002E7"

-	    documentation 	

-|@version J2EE1.4 deprecated, becomes jsp::TagLibRef

-|The taglib element is used to describe a JSP tag library.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "taglibURI"

-		    quid       	"38C07B3700A2"

-		    documentation 	

-|@deprecated See jsp::TagLibRef

-|

-|The taglib-uri element describes a URI, relative to the location of the web.xml document, identifying a Tag Library used in the Web Application.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "taglibLocation"

-		    quid       	"38C07B4B0318"

-		    documentation 	

-|@deprecated See jsp::TagLibRef

-|

-|The taglib-location element contains the location (as a resource relative to the root of the web application) where to find the Tag Libary Description file for the tag library.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SecurityConstraint"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07B6A02AE"

-	    documentation 	"The security-constraint element is used to associate security constraints with one or more web resource collections"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "displayName"

-		    quid       	"3E89D7E8012D"

-		    documentation 	"@version J2EE1.4 deprecated, becomes displayNames"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WebResourceCollection"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07B8703AB"

-	    documentation 	

-|The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "webResourceName"

-		    quid       	"38C07BA303D3"

-		    documentation 	"The web-resource-name contains the name of this web resource collection"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38C07BB80152"

-		    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "urlPattern"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnique"

-			    value      	FALSE))

-		    quid       	"3E4D51EA0345"

-		    documentation 	"@version J2EE1.4"

-		    stereotype 	"1..*"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "httpMethod"

-		    quid       	"3E4D52020123"

-		    documentation 	"@version J2EE1.4"

-		    stereotype 	"0..*"

-		    type       	"HTTPMethodTypeEnum"

-		    quidu      	"38C0A2E200C6"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "AuthConstraint"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07C8001A0"

-	    documentation 	

-|The auth-constraintType indicates the user roles that

-|should be permitted access to this resource

-|collection. The role-name used here must either correspond

-|to the role-name of one of the security-role elements

-|defined for this web application, or be the specially

-|reserved role-name "*" that is a compact syntax for

-|indicating all roles in the web application. If both "*"

-|and rolenames appear, the container interprets this as all

-|roles.  If no roles are defined, no user is allowed access

-|to the portion of the web application described by the

-|containing security-constraint.  The container matches

-|role names case sensitively when determining access.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"38C07C9703B6"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|A description of the auth constraint.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roles"

-		    quid       	"39C7AA9403D9"

-		    documentation 	

-|A list of role names for the auth constraint.  Each element specifies the name of a security role (a String).

-|

-		    

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "UserDataConstraint"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07CB800B0"

-	    documentation 	"The user-data-constraint element is used to indicate how data communicated between the client and container should be protected"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"38C07CC6002E"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes descriptions

-|A description for the user data constraint.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "transportGuarantee"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C07CD8035F"

-		    documentation 	

-|The transport-guarantee element specifies that the communication between client and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the application does not require any

-|transport guarantees. A value of INTEGRAL means that the application requires that the data sent between the client and server be sent in such a way that it can't be changed in transit. CONFIDENTIAL means that the application requires that the data be transmitted in a fashion that prevents other entities from observing the contents of the transmission. In most cases, the presence of the INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required.

-		    

-		    type       	"TransportGuaranteeType"

-		    quidu      	"390461A9018F"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "LoginConfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07D0F006F"

-	    documentation 	

-|The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login

-|mechanism.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "authMethod"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C07D170066"

-		    documentation 	

-|@version J2EE1.4  deprecated, becomes initParamValues

-|

-|

-|The auth-method element is used to configure the authentication mechanism for the web application. As a prerequisite to gaining access to any web resources which are protected by an authorization constraint, a user must have authenticated using the configured mechanism. Legal values for this element are "BASIC", "DIGEST", "FORM", or "CLIENT-CERT".

-		    

-		    type       	"AuthMethodKind"

-		    quidu      	"3EE0A2D8029A"

-		    exportControl 	"Public")

-		(object ClassAttribute "realmName"

-		    quid       	"38C07D26034D"

-		    documentation 	"The realm name element specifies the realm name to use in HTTP Basic authorization"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "authorizationMethod"

-		    quid       	"3EE0A4300014"

-		    documentation 	"@version J2EE1.4"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "FormLoginConfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07D390296"

-	    documentation 	"The form-login-config element specifies the login and error pages that should be used in form based login. If form based authentication is not used, these elements are ignored."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "formLoginPage"

-		    quid       	"38C07D44017A"

-		    documentation 	"The form-login-page element defines the location in the web app where the page that can be used for login can be found"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "formErrorPage"

-		    quid       	"38C07D570235"

-		    documentation 	"The form-error-page element defines the location in the web app where the error page that is displayed when login is not successful can be found"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "InitParam"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C08E9D0325"

-	    documentation 	

-|@version J2EE1.4 deprecated

-|The init-param element contains a name/value pair as an initialization param of the servlet

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "paramName"

-		    quid       	"38C08EB30330"

-		    documentation 	

-|@deprecated

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "paramValue"

-		    quid       	"38C08EC70221"

-		    documentation 	"@deprecated"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38C08ED901D7"

-		    documentation 	"@deprecated"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ResAuthServletType"

-	    quid       	"38C09EEA0265"

-	    documentation 	

-|CONTAINER=0

-|SERVLET=1

-|

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "CONTAINER"

-		    quid       	"399301960226"

-		    exportControl 	"Public")

-		(object ClassAttribute "SERVLET"

-		    quid       	"39930198000C"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WebType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0A1F70294"

-	    language   	"Java"

-	    abstract   	TRUE)

-	(object Class "ServletType"

-	    quid       	"38C0A2320311"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"38C0A28C02AD"

-		    supplier   	"Logical View::webapplication::WebType"

-		    quidu      	"38C0A1F70294"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "className"

-		    quid       	"3904604200D5"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "JSPType"

-	    quid       	"38C0A2640273"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"38C0A2900258"

-		    supplier   	"Logical View::webapplication::WebType"

-		    quidu      	"38C0A1F70294"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "jspFile"

-		    quid       	"38C0A2760355"

-		    documentation 	

-|The jsp-file element contains the full path to a JSP file within the web application.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "URLPatternType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0A2C50042"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"38C0A2CF0136"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "HTTPMethodTypeEnum"

-	    quid       	"38C0A2E200C6"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "GET"

-		    quid       	"38C0A2FC004B"

-		    documentation 	"The http-method contains an HTTP method (GET | POST |...)"

-		    exportControl 	"Public")

-		(object ClassAttribute "POST"

-		    quid       	"3E4D52380134"

-		    exportControl 	"Public")

-		(object ClassAttribute "PUT"

-		    quid       	"3E4D52390352"

-		    exportControl 	"Public")

-		(object ClassAttribute "DELETE"

-		    quid       	"3E4D523B00DE"

-		    exportControl 	"Public")

-		(object ClassAttribute "HEAD"

-		    quid       	"3E4D523C0393"

-		    exportControl 	"Public")

-		(object ClassAttribute "OPTIONS"

-		    quid       	"3E4D523F0012"

-		    exportControl 	"Public")

-		(object ClassAttribute "TRACE"

-		    quid       	"3E4D524001CC"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "RoleNameType"

-	    quid       	"38C0A3400139"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "roleName"

-		    quid       	"38C0A347003F"

-		    type       	"String"))

-	    language   	"Java")

-	(object Class "WelcomeFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0A5A800E9"

-	    documentation 	

-|The welcome-file element contains file name to use as a default welcome file, such as index.html

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "welcomeFile"

-		    quid       	"38C0A5B1016E"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "TransportGuaranteeType"

-	    quid       	"390461A9018F"

-	    documentation 	

-|NONE=1

-|INTEGRAL=2

-|CONFIDENTIAL=3

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NONE"

-		    quid       	"399301820214"

-		    exportControl 	"Public")

-		(object ClassAttribute "INTEGRAL"

-		    quid       	"39930183032D"

-		    exportControl 	"Public")

-		(object ClassAttribute "CONFIDENTIAL"

-		    quid       	"3993018E00E4"

-		    exportControl 	"Public")))

-	(object Class "ExceptionTypeErrorPage"

-	    quid       	"39883E110154"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39883E3A0058"

-		    supplier   	"Logical View::webapplication::ErrorPage"

-		    quidu      	"38C07ACF03E2")))

-	(object Class "ErrorCodeErrorPage"

-	    quid       	"39883E6C0209"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39883E9400A8"

-		    supplier   	"Logical View::webapplication::ErrorPage"

-		    quidu      	"38C07ACF03E2"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "errorCode"

-		    quid       	"39883E8202AB"

-		    documentation 	

-|The error-code contains an HTTP error code, ex: 404

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "FilterMapping"

-	    quid       	"39BFB14C03DD"

-	    documentation 	

-|Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the <filtername> sub-elements of one of the <filter> declarations in the deployment descriptor.

-|

-|@invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"39BFB1890236"

-		    documentation 	"The url-pattern element contains the url pattern of the mapping. Must follow the rules specified in Section 10 of the Servlet API Specification."

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "dispatcherType"

-		    quid       	"3E4D447E0376"

-		    stereotype 	"0..4"

-		    type       	"DispatcherType"

-		    quidu      	"3E4D445B0376"

-		    exportControl 	"Public")))

-	(object Class "Filter"

-	    quid       	"39BFB15503CC"

-	    documentation 	

-|Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B08E0379"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"39BFB1BC032A"

-		    documentation 	"The logical name of the filter. This name is used to map the filter."

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DispatcherType"

-	    quid       	"3E4D445B0376"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "FORWARD"

-		    quid       	"3E4D446400BC"

-		    exportControl 	"Public")

-		(object ClassAttribute "INCLUDE"

-		    quid       	"3E4D446703A5"

-		    exportControl 	"Public")

-		(object ClassAttribute "REQUEST"

-		    quid       	"3E4D446902AE"

-		    exportControl 	"Public")

-		(object ClassAttribute "ERROR"

-		    quid       	"3E4D446B0152"

-		    exportControl 	"Public")))

-	(object Class "LocalEncodingMappingList"

-	    quid       	"3E4D56DA023E")

-	(object Class "LocalEncodingMapping"

-	    quid       	"3E4D56F20170"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "locale"

-		    quid       	"3E4D570501F0"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "encoding"

-		    quid       	"3E4D57080276"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "HTTPMethodType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E930B050065"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "httpMethod"

-		    quid       	"3E930B050066"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "AuthMethodKind"

-	    quid       	"3EE0A2D8029A"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "UNSPECIFIED"

-		    quid       	"3EE0A2FE037B"

-		    exportControl 	"Public")

-		(object ClassAttribute "BASIC"

-		    quid       	"3EE0A30F033A"

-		    exportControl 	"Public")

-		(object ClassAttribute "DIGEST"

-		    quid       	"3EE0A313023B"

-		    exportControl 	"Public")

-		(object ClassAttribute "FORM"

-		    quid       	"3EE0A31801F2"

-		    exportControl 	"Public")

-		(object ClassAttribute "CLIENT_CERT"

-		    quid       	"3EE0A31A0390"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"38C11CE60213"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CE8000D"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "contexts"

-		    quid       	"38C11CE8000E"

-		    documentation 	"@deprecated see contextParams"

-		    label      	"contexts"

-		    supplier   	"Logical View::webapplication::ContextParam"

-		    quidu      	"38C078B602A6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$1"

-	    quid       	"38C11CF301A3"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CF4026D"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "errorPages"

-		    quid       	"38C11CF40277"

-		    label      	"errorPages"

-		    supplier   	"Logical View::webapplication::ErrorPage"

-		    quidu      	"38C07ACF03E2"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"38C11CF7034E"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CF803B3"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "fileList"

-		    quid       	"38C11CF803B4"

-		    label      	"fileList"

-		    supplier   	"Logical View::webapplication::WelcomeFileList"

-		    quidu      	"38C07AAD01A8"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$3"

-	    quid       	"38C11CFB0281"

-	    documentation 	"@version J2EE14 deprecated, replaced by tagLibRefs"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CFD00A3"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "tagLibs"

-		    quid       	"38C11CFD00A4"

-		    documentation 	

-|@deprecated See jsp::TagLibRef

-|

-		    

-		    label      	"tagLibs"

-		    supplier   	"Logical View::webapplication::TagLibRef"

-		    quidu      	"38C07B3002E7"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"38C11D000134"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D01018F"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "constraints"

-		    quid       	"38C11D010199"

-		    label      	"constraints"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Constraints 	"ordered"

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$5"

-	    quid       	"38C11D110188"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D120067"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "loginConfig"

-		    quid       	"38C11D120071"

-		    label      	"loginConfig"

-		    supplier   	"Logical View::webapplication::LoginConfig"

-		    quidu      	"38C07D0F006F"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"38C11D1501C0"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D17023B"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "mimeMappings"

-		    quid       	"38C11D170245"

-		    label      	"mimeMappings"

-		    supplier   	"Logical View::webapplication::MimeMapping"

-		    quidu      	"38C07A7500FE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$7"

-	    quid       	"38C11D1B0327"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D1C01F2"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "sessionConfig"

-		    quid       	"38C11D1C01F3"

-		    label      	"sessionConfig"

-		    supplier   	"Logical View::webapplication::SessionConfig"

-		    quidu      	"38C07A5301BD"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"38C11D1F02AB"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D200298"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "servletMappings"

-		    quid       	"38C11D2002A2"

-		    label      	"servletMappings"

-		    supplier   	"Logical View::webapplication::ServletMapping"

-		    quidu      	"38C079BD02B9"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$9"

-	    quid       	"38C11D230120"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D2402DA"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "servlets"

-		    quid       	"38C11D2402E4"

-		    label      	"servlets"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"38C11D2701DA"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$11"

-		    quid       	"38C11D2802C2"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "securityRoles"

-		    quid       	"38C11D2802CC"

-		    label      	"securityRoles"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"38C121ED02D6"

-	    roles      	(list role_list

-		(object Role "secConstraint"

-		    quid       	"38C121EE01E7"

-		    label      	"secConstraint"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "webResourceCollections"

-		    quid       	"38C121EE01F1"

-		    label      	"webResourceCollections"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$13"

-	    quid       	"38C121F200E9"

-	    roles      	(list role_list

-		(object Role "secConstraint"

-		    quid       	"38C121F3039D"

-		    label      	"secConstraint"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "authConstraint"

-		    quid       	"38C121F303A7"

-		    label      	"authConstraint"

-		    supplier   	"Logical View::webapplication::AuthConstraint"

-		    quidu      	"38C07C8001A0"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"38C121F70208"

-	    roles      	(list role_list

-		(object Role "secConstraint"

-		    quid       	"38C121F801EC"

-		    label      	"secConstraint"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "userDataConstraint"

-		    quid       	"38C121F801ED"

-		    label      	"userDataConstraint"

-		    supplier   	"Logical View::webapplication::UserDataConstraint"

-		    quidu      	"38C07CB800B0"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$15"

-	    quid       	"38C122AC014A"

-	    roles      	(list role_list

-		(object Role "servlet"

-		    quid       	"38C122AD0001"

-		    label      	"servlet"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_aggregate 	TRUE)

-		(object Role "webType"

-		    quid       	"38C122AD0015"

-		    label      	"webType"

-		    supplier   	"Logical View::webapplication::WebType"

-		    quidu      	"38C0A1F70294"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"38C122B501BB"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$17"

-		    quid       	"38C122B60145"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "params"

-		    quid       	"38C122B60159"

-		    documentation 	"@version J2EE1.4 deprecated, becomes initParams"

-		    label      	"params"

-		    supplier   	"Logical View::webapplication::InitParam"

-		    quidu      	"38C08E9D0325"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"38C122C00199"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$19"

-		    quid       	"38C122C1028B"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    is_aggregate 	TRUE)

-		(object Role "securityRoleRefs"

-		    quid       	"38C122C1029F"

-		    label      	"securityRoleRefs"

-		    supplier   	"Logical View::common::SecurityRoleRef"

-		    quidu      	"371BC7A0025C"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"38C123AF02C4"

-	    roles      	(list role_list

-		(object Role "fileList"

-		    quid       	"38C123B30111"

-		    label      	"fileList"

-		    supplier   	"Logical View::webapplication::WelcomeFileList"

-		    quidu      	"38C07AAD01A8"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "file"

-		    quid       	"38C123B3011B"

-		    label      	"file"

-		    supplier   	"Logical View::webapplication::WelcomeFile"

-		    quidu      	"38C0A5A800E9"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$21"

-	    quid       	"38C124090179"

-	    roles      	(list role_list

-		(object Role "resCollection"

-		    quid       	"38C1240A0256"

-		    label      	"resCollection"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "URLs"

-		    quid       	"38C1240A0260"

-		    documentation 	"@version J2EE1.4 deprecated, becomes urlPattern"

-		    label      	"URLs"

-		    supplier   	"Logical View::webapplication::URLPatternType"

-		    quidu      	"38C0A2C50042"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"38C1248900BE"

-	    roles      	(list role_list

-		(object Role "loginConfig"

-		    quid       	"38C124890303"

-		    label      	"loginConfig"

-		    supplier   	"Logical View::webapplication::LoginConfig"

-		    quidu      	"38C07D0F006F"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "formLoginConfig"

-		    quid       	"38C12489030D"

-		    label      	"formLoginConfig"

-		    supplier   	"Logical View::webapplication::FormLoginConfig"

-		    quidu      	"38C07D390296"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$23"

-	    quid       	"39045E720204"

-	    roles      	(list role_list

-		(object Role "exceptionType"

-		    quid       	"39045E730364"

-		    documentation 	"The exception type contains a fully qualified class name of a Java exception type."

-		    label      	"exceptionType"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "errorPage"

-		    quid       	"39045E7401C1"

-		    label      	"errorPage"

-		    supplier   	"Logical View::webapplication::ExceptionTypeErrorPage"

-		    quidu      	"39883E110154"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"390460AA0189"

-	    roles      	(list role_list

-		(object Role "servlet"

-		    quid       	"390460AB0234"

-		    label      	"servlet"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"390460AB02B6"

-		    supplier   	"Logical View::webapplication::ServletMapping"

-		    quidu      	"38C079BD02B9")))

-	(object Association "$UNNAMED$26"

-	    quid       	"39BFB3B101CC"

-	    roles      	(list role_list

-		(object Role "filters"

-		    quid       	"39BFB3B20123"

-		    label      	"filters"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"39BFB3B2012D"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"39BFB4150298"

-	    roles      	(list role_list

-		(object Role "filterMappings"

-		    quid       	"39BFB4160127"

-		    documentation 	"Filter mappings defined for the web app"

-		    label      	"filterMappings"

-		    supplier   	"Logical View::webapplication::FilterMapping"

-		    quidu      	"39BFB14C03DD"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"39BFB4160128"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"39BFB54D01EC"

-	    roles      	(list role_list

-		(object Role "listeners"

-		    quid       	"39BFB54E0215"

-		    documentation 	"The listeners collection contains deployment properties for a web application listener beans in the web app."

-		    label      	"listeners"

-		    supplier   	"Logical View::common::Listener"

-		    quidu      	"39BFB26001BD"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"39BFB54E0220"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"39C0026E02D1"

-	    roles      	(list role_list

-		(object Role "initParams"

-		    quid       	"39C0026F0160"

-		    documentation 	

-|@version J2EE1.4 deprecated, becomes initParamValues

-|The init-params contain a name/value pairs as initialization params for the filter

-|

-		    

-		    label      	"initParams"

-		    supplier   	"Logical View::webapplication::InitParam"

-		    quidu      	"38C08E9D0325"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"39C0026F016A"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"39C0056A0293"

-	    roles      	(list role_list

-		(object Role "filter"

-		    quid       	"39C0056B0321"

-		    documentation 	"The filter being mapped"

-		    label      	"filter"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"39C0056B032B"

-		    supplier   	"Logical View::webapplication::FilterMapping"

-		    quidu      	"39BFB14C03DD"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$36"

-	    quid       	"39C005BB00B9"

-	    roles      	(list role_list

-		(object Role "servlet"

-		    quid       	"39C005BC004D"

-		    documentation 	"An optional servlet that is mapped by a filter mapping.  servletName is used to resolve the servlet reference."

-		    label      	"servlet"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"39C005BC0061"

-		    supplier   	"Logical View::webapplication::FilterMapping"

-		    quidu      	"39BFB14C03DD"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$38"

-	    quid       	"39C03C280356"

-	    roles      	(list role_list

-		(object Role "filterClass"

-		    quid       	"39C03C290267"

-		    documentation 	"The fully qualified classname of the filter."

-		    label      	"filterClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$39"

-		    quid       	"39C03C29028F"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$40"

-	    quid       	"39C03E6C035A"

-	    roles      	(list role_list

-		(object Role "listenerClass"

-		    quid       	"39C03E6D02A7"

-		    documentation 	"The listener-class element declares a class in the application must be registered as a web application listener bean."

-		    label      	"listenerClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$41"

-		    quid       	"39C03E6D02CF"

-		    supplier   	"Logical View::common::Listener"

-		    quidu      	"39BFB26001BD"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$42"

-	    quid       	"39982A2E0255"

-	    roles      	(list role_list

-		(object Role "runAs"

-		    quid       	"39982A2F0184"

-		    documentation 	"If defined for a servlet, overrides the security identity used to call an EJB by that servlet in this web application. The role-name is one of the security roles already defined for this web application."

-		    label      	"runAs"

-		    supplier   	"Logical View::common::RunAsSpecifiedIdentity"

-		    quidu      	"39BF2C9E02C8"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$43"

-		    quid       	"39982A2F018E"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$44"

-	    quid       	"3E4D42CA027F"

-	    roles      	(list role_list

-		(object Role "contextParams"

-		    quid       	"3E4D42CB0118"

-		    label      	"contextParams"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$45"

-		    quid       	"3E4D42CB0122"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$46"

-	    quid       	"3E4D43AA000A"

-	    roles      	(list role_list

-		(object Role "initParamValues"

-		    quid       	"3E4D43AA0245"

-		    documentation 	

-|@version J2EE1.4

-|The init-param element contains a name/value pair as

-|        an initialization param of a servlet filter

-		    

-		    label      	"initParamValues"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$47"

-		    quid       	"3E4D43AA024F"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$48"

-	    quid       	"3E4D46E70387"

-	    roles      	(list role_list

-		(object Role "initParams"

-		    quid       	"3E4D46E90005"

-		    label      	"initParams"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$49"

-		    quid       	"3E4D46E90019"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$50"

-	    quid       	"3E4D4BFF01C0"

-	    roles      	(list role_list

-		(object Role "jspConfig"

-		    quid       	"3E4D4C000225"

-		    label      	"jspConfig"

-		    supplier   	"Logical View::jsp::JSPConfig"

-		    quidu      	"3E4D4A3A01C8"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$51"

-		    quid       	"3E4D4C000227"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$52"

-	    quid       	"3E4D51010264"

-	    roles      	(list role_list

-		(object Role "displayNames"

-		    quid       	"3E4D5102025B"

-		    label      	"displayNames"

-		    supplier   	"Logical View::common::DisplayName"

-		    quidu      	"3E4A9922000E"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$53"

-		    quid       	"3E4D51020265"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$54"

-	    quid       	"3E4D56A50224"

-	    roles      	(list role_list

-		(object Role "messageDestinations"

-		    quid       	"3E4D56A60257"

-		    label      	"messageDestinations"

-		    supplier   	"Logical View::common::MessageDestination"

-		    quidu      	"3E4C211001CF"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$55"

-		    quid       	"3E4D56A60261"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$56"

-	    quid       	"3E4D57140378"

-	    roles      	(list role_list

-		(object Role "localEncodingMappings"

-		    quid       	"3E4D57150135"

-		    label      	"localEncodingMappings"

-		    supplier   	"Logical View::webapplication::LocalEncodingMapping"

-		    quidu      	"3E4D56F20170"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$57"

-		    quid       	"3E4D5715013F"

-		    supplier   	"Logical View::webapplication::LocalEncodingMappingList"

-		    quidu      	"3E4D56DA023E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$58"

-	    quid       	"3E4D572C0083"

-	    roles      	(list role_list

-		(object Role "localEncodingMappingList"

-		    quid       	"3E4D572C02DC"

-		    label      	"localEncodingMappingList"

-		    supplier   	"Logical View::webapplication::LocalEncodingMappingList"

-		    quidu      	"3E4D56DA023E"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$59"

-		    quid       	"3E4D572C02DE"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$60"

-	    quid       	"3E4D515001BD"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D515101BE"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$61"

-		    quid       	"3E4D515101DC"

-		    supplier   	"Logical View::webapplication::UserDataConstraint"

-		    quidu      	"38C07CB800B0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$62"

-	    quid       	"3E4D514D0317"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D514E0106"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$63"

-		    quid       	"3E4D514E0124"

-		    supplier   	"Logical View::webapplication::AuthConstraint"

-		    quidu      	"38C07C8001A0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$64"

-	    quid       	"3E4D514B0089"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D514B03AA"

-		    documentation 	"@version J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$65"

-		    quid       	"3E4D514B03C8"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$66"

-	    quid       	"3E930B11030B"

-	    roles      	(list role_list

-		(object Role "HTTPs"

-		    quid       	"3E930B1200DC"

-		    documentation 	"@version J2EE1.4 deprecated, becomes httpMethod"

-		    label      	"HTTPs"

-		    supplier   	"Logical View::webapplication::HTTPMethodType"

-		    quidu      	"3E930B050065"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "resCollection"

-		    quid       	"3E930B1200E6"

-		    label      	"resCollection"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Web Application"

-	    quid       	"38C08C880292"

-	    title      	"Web Application"

-	    documentation 	"@version J2EE1.4 deprecated, becomes descriptions"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @1

-		    location   	(781, 3113)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(455, 2987)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	617

-			label      	

-|the servlet class reference is resolved via Beans.instantiate(),

-|this is probably a reference to a JavaBean object

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	677

-		    height     	264)

-		(object ClassView "Class" "Logical View::webapplication::ServletType" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 2832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1320, 2751)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"ServletType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2320311"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1320, 2812)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	397)

-		    width      	418

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::JSPType" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 2832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(1843, 2751)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	314

-			justify    	0

-			label      	"JSPType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2640273"

-		    compartment 	(object Compartment

-			Parent_View 	@3

-			location   	(1843, 2812)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	313)

-		    width      	332

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ErrorCodeErrorPage" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(240, 960)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(39, 879)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	402

-			justify    	0

-			label      	"ErrorCodeErrorPage")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39883E6C0209"

-		    compartment 	(object Compartment

-			Parent_View 	@4

-			location   	(39, 940)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	369)

-		    width      	420

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @5

-		    location   	(1125, 1431)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(834, 1368)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	546

-			label      	

-|DEPRECATED:

-|ContextParam

-			)

-		    line_color 	10949559

-		    fill_color 	15778042

-		    width      	606

-		    height     	138)

-		(object ClassView "Class" "Logical View::common::JNDIEnvRefsGroup" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2987, 848)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(2790, 769)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"JNDIEnvRefsGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D53950349"

-		    width      	412

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(669, 1522)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(576, 1443)

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ExceptionTypeErrorPage" @8

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(448, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(205, 1165)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	486

-			justify    	0

-			label      	"ExceptionTypeErrorPage")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39883E110154"

-		    width      	504

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$23" @9

-		    location   	(588, 1354)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39045E720204"

-		    roleview_list 	(list RoleViews

-			(object RoleView "exceptionType" @10

-			    Parent_View 	@9

-			    location   	(-132, 410)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @11

-				Parent_View 	@10

-				location   	(417, 1397)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	480

-				justify    	0

-				label      	"+exceptionType"

-				pctDist    	0.555556

-				height     	172

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045E730364"

-			    client     	@9

-			    supplier   	@7

-			    vertices   	(list Points

-				(588, 1354)

-				(588, 1431))

-			    line_style 	3

-			    origin_attachment 	(588, 1354)

-			    terminal_attachment 	(588, 1431)

-			    label      	(object SegLabel @12

-				Parent_View 	@10

-				location   	(642, 1423)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "errorPage" @13

-			    Parent_View 	@9

-			    location   	(-132, 410)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045E7401C1"

-			    client     	@9

-			    supplier   	@8

-			    vertices   	(list Points

-				(588, 1354)

-				(588, 1278))

-			    line_style 	3

-			    origin_attachment 	(588, 1354)

-			    terminal_attachment 	(588, 1278))))

-		(object ClassView "Class" "Logical View::webapplication::FormLoginConfig" @14

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3936, 2448)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@14

-			location   	(3704, 2342)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	464

-			justify    	0

-			label      	"FormLoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D390296"

-		    compartment 	(object Compartment

-			Parent_View 	@14

-			location   	(3704, 2403)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	463)

-		    width      	482

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebType" @15

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1776, 2480)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(1674, 2429)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	204

-			justify    	0

-			label      	"WebType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A1F70294"

-		    width      	222

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @16

-		    location   	(1776, 2635)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@15

-		    vertices   	(list Points

-			(1776, 2635)

-			(1776, 2543)))

-		(object InheritView "" @17

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A2900258"

-		    client     	@3

-		    supplier   	@15

-		    vertices   	(list Points

-			(1949, 2739)

-			(1949, 2635))

-		    line_style 	3

-		    origin_attachment 	(1949, 2739)

-		    terminal_attachment 	(1949, 2635)

-		    drawSupplier 	@16)

-		(object InheritView "" @18

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A28C02AD"

-		    client     	@2

-		    supplier   	@15

-		    vertices   	(list Points

-			(1519, 2739)

-			(1519, 2635))

-		    line_style 	3

-		    origin_attachment 	(1519, 2739)

-		    terminal_attachment 	(1519, 2635)

-		    drawSupplier 	@16)

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @19

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(241, 1782)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@19

-			location   	(44, 1603)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	394

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC7A0025C"

-		    compartment 	(object Compartment

-			Parent_View 	@19

-			location   	(44, 1708)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	412

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::LocalEncodingMapping" @20

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3248, 256)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@20

-			location   	(3022, 150)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	452

-			justify    	0

-			label      	"LocalEncodingMapping")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D56F20170"

-		    compartment 	(object Compartment

-			Parent_View 	@20

-			location   	(3022, 211)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	356)

-		    width      	470

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ContextParam" @21

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 1296)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@21

-			location   	(943, 1255)

-			nlines     	1

-			max_width  	290

-			justify    	0

-			label      	"ContextParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C078B602A6"

-		    width      	308

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ErrorPage" @22

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(304, 592)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@22

-			location   	(136, 511)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"ErrorPage")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07ACF03E2"

-		    compartment 	(object Compartment

-			Parent_View 	@22

-			location   	(136, 572)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	335)

-		    width      	354

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @23

-		    location   	(304, 800)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@22

-		    vertices   	(list Points

-			(304, 800)

-			(304, 685)))

-		(object InheritView "" @24

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39883E3A0058"

-		    client     	@8

-		    supplier   	@22

-		    vertices   	(list Points

-			(447, 1153)

-			(447, 800))

-		    line_style 	3

-		    origin_attachment 	(447, 1153)

-		    terminal_attachment 	(447, 800)

-		    drawSupplier 	@23)

-		(object InheritView "" @25

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39883E9400A8"

-		    client     	@4

-		    supplier   	@22

-		    vertices   	(list Points

-			(209, 867)

-			(209, 800))

-		    line_style 	3

-		    origin_attachment 	(209, 867)

-		    terminal_attachment 	(209, 800)

-		    drawSupplier 	@23)

-		(object ClassView "Class" "Logical View::webapplication::WelcomeFileList" @26

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 320)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@26

-			location   	(100, 279)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	344

-			justify    	0

-			label      	"WelcomeFileList")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07AAD01A8"

-		    width      	362

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::TagLibRef" @27

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1280, 144)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@27

-			location   	(1057, 38)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	446

-			justify    	0

-			label      	"TagLibRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B3002E7"

-		    compartment 	(object Compartment

-			Parent_View 	@27

-			location   	(1057, 99)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	444)

-		    width      	464

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::SecurityConstraint" @28

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1712, 128)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@28

-			location   	(1528, 87)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	368

-			justify    	0

-			label      	"SecurityConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B6A02AE"

-		    width      	386

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::LoginConfig" @29

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3840, 1792)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@29

-			location   	(3469, 1661)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	742

-			justify    	0

-			label      	"LoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D0F006F"

-		    compartment 	(object Compartment

-			Parent_View 	@29

-			location   	(3469, 1722)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	741)

-		    width      	760

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @30

-		    location   	(3918, 2132)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C1248900BE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "formLoginConfig" @31

-			    Parent_View 	@30

-			    location   	(291, 263)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @32

-				Parent_View 	@31

-				location   	(4103, 2263)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	327

-				justify    	0

-				label      	"+formLoginConfig"

-				pctDist    	0.671498

-				height     	185

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C12489030D"

-			    client     	@30

-			    supplier   	@14

-			    vertices   	(list Points

-				(3918, 2132)

-				(3918, 2329))

-			    line_style 	3

-			    origin_attachment 	(3918, 2132)

-			    terminal_attachment 	(3918, 2329)

-			    label      	(object SegLabel @33

-				Parent_View 	@31

-				location   	(3972, 2308)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "loginConfig" @34

-			    Parent_View 	@30

-			    location   	(291, 263)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @35

-				Parent_View 	@34

-				location   	(4089, 2033)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	229

-				justify    	0

-				label      	"+loginConfig"

-				pctDist    	0.500139

-				height     	171

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C124890303"

-			    client     	@30

-			    supplier   	@29

-			    vertices   	(list Points

-				(3918, 2132)

-				(3918, 1935))

-			    line_style 	3

-			    origin_attachment 	(3918, 2132)

-			    terminal_attachment 	(3918, 1935)

-			    label      	(object SegLabel @36

-				Parent_View 	@34

-				location   	(3992, 1971)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.820777

-				height     	74

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::webapplication::MimeMapping" @37

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2848, 1888)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@37

-			location   	(2656, 1782)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	384

-			justify    	0

-			label      	"MimeMapping")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07A7500FE"

-		    compartment 	(object Compartment

-			Parent_View 	@37

-			location   	(2656, 1843)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	381)

-		    width      	402

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::SessionConfig" @38

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2640, 2304)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@38

-			location   	(2431, 2223)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	418

-			justify    	0

-			label      	"SessionConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07A5301BD"

-		    compartment 	(object Compartment

-			Parent_View 	@38

-			location   	(2431, 2284)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	416)

-		    width      	436

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ServletMapping" @39

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 2192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@39

-			location   	(1782, 2086)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	372

-			justify    	0

-			label      	"ServletMapping")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079BD02B9"

-		    compartment 	(object Compartment

-			Parent_View 	@39

-			location   	(1782, 2147)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	369)

-		    width      	390

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @40

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(992, 2416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@40

-			location   	(666, 2310)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	652

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    compartment 	(object Compartment

-			Parent_View 	@40

-			location   	(666, 2371)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	650)

-		    width      	670

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$15" @41

-		    location   	(1496, 2475)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122AC014A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webType" @42

-			    Parent_View 	@41

-			    location   	(760, 171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @43

-				Parent_View 	@42

-				location   	(1523, 2509)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	"+webType"

-				pctDist    	0.166667

-				height     	34

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0015"

-			    client     	@41

-			    supplier   	@15

-			    vertices   	(list Points

-				(1496, 2475)

-				(1665, 2475))

-			    line_style 	3

-			    origin_attachment 	(1496, 2475)

-			    terminal_attachment 	(1665, 2475)

-			    label      	(object SegLabel @44

-				Parent_View 	@42

-				location   	(1647, 2529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "servlet" @45

-			    Parent_View 	@41

-			    location   	(760, 171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0001"

-			    client     	@41

-			    supplier   	@40

-			    vertices   	(list Points

-				(1496, 2475)

-				(1327, 2475))

-			    line_style 	3

-			    origin_attachment 	(1496, 2475)

-			    terminal_attachment 	(1327, 2475)

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(1368, 2526)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.763636

-				height     	51

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$24" @47

-		    location   	(1609, 2352)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390460AA0189"

-		    roleview_list 	(list RoleViews

-			(object RoleView "servlet" @48

-			    Parent_View 	@47

-			    location   	(-39, 144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @49

-				Parent_View 	@48

-				location   	(1457, 2312)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	245

-				justify    	0

-				label      	"+servlet"

-				pctDist    	0.543478

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"390460AB0234"

-			    client     	@47

-			    supplier   	@40

-			    vertices   	(list Points

-				(1609, 2352)

-				(1327, 2352))

-			    line_style 	3

-			    origin_attachment 	(1609, 2352)

-			    terminal_attachment 	(1327, 2352)

-			    label      	(object SegLabel @50

-				Parent_View 	@48

-				location   	(1356, 2406)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$25" @51

-			    Parent_View 	@47

-			    location   	(-39, 144)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"390460AB02B6"

-			    client     	@47

-			    supplier   	@39

-			    vertices   	(list Points

-				(1609, 2352)

-				(1848, 2352)

-				(1848, 2310))

-			    line_style 	3

-			    origin_attachment 	(1609, 2352)

-			    terminal_attachment 	(1848, 2310))))

-		(object AssociationViewNew "$UNNAMED$18" @52

-		    location   	(368, 2293)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122C00199"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityRoleRefs" @53

-			    Parent_View 	@52

-			    location   	(-688, -11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @54

-				Parent_View 	@53

-				location   	(551, 2046)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	540

-				justify    	0

-				label      	"+securityRoleRefs"

-				pctDist    	0.770492

-				height     	183

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1029F"

-			    client     	@52

-			    supplier   	@19

-			    vertices   	(list Points

-				(368, 2293)

-				(368, 1973))

-			    line_style 	3

-			    origin_attachment 	(368, 2293)

-			    terminal_attachment 	(368, 1973)

-			    label      	(object SegLabel @55

-				Parent_View 	@53

-				location   	(439, 2172)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.377049

-				height     	71

-				orientation 	1))

-			(object RoleView "$UNNAMED$19" @56

-			    Parent_View 	@52

-			    location   	(-688, -11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @57

-				Parent_View 	@56

-				location   	(467, 2257)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	245

-				justify    	0

-				label      	""

-				pctDist    	0.455285

-				height     	97

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1028B"

-			    client     	@52

-			    supplier   	@40

-			    vertices   	(list Points

-				(368, 2293)

-				(368, 2353)

-				(657, 2353))

-			    line_style 	3

-			    origin_attachment 	(368, 2293)

-			    terminal_attachment 	(657, 2353))))

-		(object ClassView "Class" "Logical View::common::SecurityRole" @58

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1238, 1770)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@58

-			location   	(1041, 1641)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C031FE012D"

-		    compartment 	(object Compartment

-			Parent_View 	@58

-			location   	(1041, 1746)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	391)

-		    width      	412

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @59

-		    location   	(716, 1835)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3904632A005C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @60

-			    Parent_View 	@59

-			    location   	(-372, 139)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @61

-				Parent_View 	@60

-				location   	(541, 1789)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	505

-				justify    	0

-				label      	""

-				pctDist    	0.671141

-				height     	63

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B01BC"

-			    client     	@59

-			    supplier   	@19

-			    vertices   	(list Points

-				(716, 1835)

-				(716, 1851)

-				(447, 1851))

-			    line_style 	3

-			    origin_attachment 	(716, 1835)

-			    terminal_attachment 	(447, 1851)

-			    label      	(object SegLabel @62

-				Parent_View 	@60

-				location   	(588, 1851)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))

-			(object RoleView "/linkedSecurityRole" @63

-			    Parent_View 	@59

-			    location   	(-372, 139)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @64

-				Parent_View 	@63

-				location   	(866, 1728)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	602

-				justify    	0

-				label      	"+/linkedSecurityRole"

-				pctDist    	0.500000

-				height     	92

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B016C"

-			    client     	@59

-			    supplier   	@58

-			    vertices   	(list Points

-				(716, 1835)

-				(716, 1819)

-				(1032, 1819))

-			    line_style 	3

-			    origin_attachment 	(716, 1835)

-			    terminal_attachment 	(1032, 1819)

-			    label      	(object SegLabel @65

-				Parent_View 	@63

-				location   	(999, 1873)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::ParamValue" @66

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(778, 969)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@66

-			location   	(581, 815)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@66

-			location   	(581, 920)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	412

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jsp::JSPConfig" @67

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(688, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@67

-			location   	(551, 114)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"JSPConfig")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D4A3A01C8"

-		    width      	292

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestination" @68

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3040, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@68

-			location   	(2837, 1064)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	406

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C211001CF"

-		    compartment 	(object Compartment

-			Parent_View 	@68

-			location   	(2837, 1169)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	294)

-		    width      	424

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::LocalEncodingMappingList" @69

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2032, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@69

-			location   	(1769, 221)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	526

-			justify    	0

-			label      	"LocalEncodingMappingList")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	16711935

-		    quidu      	"3E4D56DA023E"

-		    width      	544

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$56" @70

-		    location   	(2658, 263)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D57140378"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localEncodingMappings" @71

-			    Parent_View 	@70

-			    location   	(604, 13)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @72

-				Parent_View 	@71

-				location   	(2704, 208)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	460

-				justify    	0

-				label      	"+localEncodingMappings"

-				pctDist    	0.130252

-				height     	55

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D57150135"

-			    client     	@70

-			    supplier   	@20

-			    vertices   	(list Points

-				(2658, 263)

-				(3012, 259))

-			    line_style 	0

-			    label      	(object SegLabel @73

-				Parent_View 	@71

-				location   	(2926, 313)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.755633

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$57" @74

-			    Parent_View 	@70

-			    location   	(604, 13)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D5715013F"

-			    client     	@70

-			    supplier   	@69

-			    vertices   	(list Points

-				(2658, 263)

-				(2304, 268))

-			    line_style 	0)))

-		(object ClassView "Class" "Logical View::webapplication::WebApp" @75

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1904, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@75

-			location   	(1679, 1084)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"WebApp")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@75

-			location   	(1679, 1034)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C077FB0352"

-		    compartment 	(object Compartment

-			Parent_View 	@75

-			location   	(1679, 1145)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	447)

-		    width      	468

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @76

-		    location   	(1455, 1237)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CE60213"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @77

-			    Parent_View 	@76

-			    location   	(1135, -155)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @78

-				Parent_View 	@77

-				location   	(1622, 1169)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CE8000D"

-			    client     	@76

-			    supplier   	@75

-			    vertices   	(list Points

-				(1455, 1237)

-				(1669, 1204))

-			    line_style 	0

-			    label      	(object SegLabel @79

-				Parent_View 	@77

-				location   	(1655, 1260)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "contexts" @80

-			    Parent_View 	@76

-			    location   	(1135, -155)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @81

-				Parent_View 	@80

-				location   	(1363, 1205)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	289

-				justify    	0

-				label      	"+contexts"

-				pctDist    	0.396886

-				height     	48

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CE8000E"

-			    client     	@76

-			    supplier   	@21

-			    vertices   	(list Points

-				(1455, 1237)

-				(1242, 1271))

-			    line_style 	0

-			    label      	(object SegLabel @82

-				Parent_View 	@80

-				location   	(1312, 1306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.707751

-				height     	46

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$1" @83

-		    location   	(1075, 869)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CF301A3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @84

-			    Parent_View 	@83

-			    location   	(707, -75)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @85

-				Parent_View 	@84

-				location   	(1563, 1001)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF4026D"

-			    client     	@83

-			    supplier   	@75

-			    vertices   	(list Points

-				(1075, 869)

-				(1669, 1083))

-			    line_style 	0

-			    label      	(object SegLabel @86

-				Parent_View 	@84

-				location   	(1591, 1112)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "errorPages" @87

-			    Parent_View 	@83

-			    location   	(707, -75)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(615, 659)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	364

-				justify    	0

-				label      	"+errorPages"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF40277"

-			    client     	@83

-			    supplier   	@22

-			    vertices   	(list Points

-				(1075, 869)

-				(481, 655))

-			    line_style 	0

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(525, 728)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$2" @90

-		    location   	(1021, 709)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CF7034E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @91

-			    Parent_View 	@90

-			    location   	(669, 149)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @92

-				Parent_View 	@91

-				location   	(1558, 942)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF803B3"

-			    client     	@90

-			    supplier   	@75

-			    vertices   	(list Points

-				(1021, 709)

-				(1669, 1045))

-			    line_style 	0

-			    label      	(object SegLabel @93

-				Parent_View 	@91

-				location   	(1579, 1059)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "fileList" @94

-			    Parent_View 	@90

-			    location   	(669, 149)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @95

-				Parent_View 	@94

-				location   	(523, 404)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	241

-				justify    	0

-				label      	"+fileList"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF803B4"

-			    client     	@90

-			    supplier   	@26

-			    vertices   	(list Points

-				(1021, 709)

-				(374, 373))

-			    line_style 	0

-			    label      	(object SegLabel @96

-				Parent_View 	@94

-				location   	(386, 423)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.954993

-				height     	39

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$3" @97

-		    location   	(1582, 641)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CFB0281"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @98

-			    Parent_View 	@97

-			    location   	(1086, 401)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @99

-				Parent_View 	@98

-				location   	(1803, 924)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CFD00A3"

-			    client     	@97

-			    supplier   	@75

-			    vertices   	(list Points

-				(1582, 641)

-				(1813, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @100

-				Parent_View 	@98

-				location   	(1745, 1011)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "tagLibs" @101

-			    Parent_View 	@97

-			    location   	(1086, 401)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @102

-				Parent_View 	@101

-				location   	(1434, 318)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	258

-				justify    	0

-				label      	"+tagLibs"

-				pctDist    	0.799648

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CFD00A4"

-			    client     	@97

-			    supplier   	@27

-			    vertices   	(list Points

-				(1582, 641)

-				(1351, 262))

-			    line_style 	0

-			    label      	(object SegLabel @103

-				Parent_View 	@101

-				location   	(1329, 328)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$4" @104

-		    location   	(1799, 601)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D000134"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @105

-			    Parent_View 	@104

-			    location   	(647, 329)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @106

-				Parent_View 	@105

-				location   	(1821, 944)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D01018F"

-			    client     	@104

-			    supplier   	@75

-			    vertices   	(list Points

-				(1799, 601)

-				(1877, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @107

-				Parent_View 	@105

-				location   	(1922, 969)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "constraints" @108

-			    Parent_View 	@104

-			    location   	(647, 329)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @109

-				Parent_View 	@108

-				location   	(1869, 348)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	364

-				justify    	0

-				label      	"+constraints"

-				pctDist    	0.558074

-				height     	115

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D010199"

-			    client     	@104

-			    supplier   	@28

-			    vertices   	(list Points

-				(1799, 601)

-				(1721, 181))

-			    line_style 	0

-			    label      	(object SegLabel @110

-				Parent_View 	@108

-				location   	(1837, 400)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.449356

-				height     	74

-				orientation 	1)

-			    label      	(object SegLabel @111

-				Parent_View 	@108

-				location   	(1854, 290)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	3

-				anchor_loc 	1

-				nlines     	1

-				max_width  	163

-				justify    	0

-				label      	"{ordered}"

-				pctDist    	0.697317

-				height     	111

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$5" @112

-		    location   	(2798, 1456)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D110188"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @113

-			    Parent_View 	@112

-			    location   	(30, -48)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @114

-				Parent_View 	@113

-				location   	(2283, 1247)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D120067"

-			    client     	@112

-			    supplier   	@75

-			    vertices   	(list Points

-				(2798, 1456)

-				(2138, 1243))

-			    line_style 	0

-			    label      	(object SegLabel @115

-				Parent_View 	@113

-				location   	(2188, 1315)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "loginConfig" @116

-			    Parent_View 	@112

-			    location   	(30, -48)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @117

-				Parent_View 	@116

-				location   	(3339, 1587)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	369

-				justify    	0

-				label      	"+loginConfig"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D120071"

-			    client     	@112

-			    supplier   	@29

-			    vertices   	(list Points

-				(2798, 1456)

-				(3459, 1669))

-			    line_style 	0

-			    label      	(object SegLabel @118

-				Parent_View 	@116

-				location   	(3376, 1698)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$6" @119

-		    location   	(2394, 1541)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D1501C0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @120

-			    Parent_View 	@119

-			    location   	(-262, -411)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @121

-				Parent_View 	@120

-				location   	(2180, 1328)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D17023B"

-			    client     	@119

-			    supplier   	@75

-			    vertices   	(list Points

-				(2394, 1541)

-				(2095, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @122

-				Parent_View 	@120

-				location   	(2094, 1380)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "mimeMappings" @123

-			    Parent_View 	@119

-			    location   	(-262, -411)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @124

-				Parent_View 	@123

-				location   	(2869, 1728)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	502

-				justify    	0

-				label      	"+mimeMappings"

-				pctDist    	1.308311

-				height     	141

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D170245"

-			    client     	@119

-			    supplier   	@37

-			    vertices   	(list Points

-				(2394, 1541)

-				(2693, 1769))

-			    line_style 	0

-			    label      	(object SegLabel @125

-				Parent_View 	@123

-				location   	(2615, 1774)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.839808

-				height     	51

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$7" @126

-		    location   	(2288, 1762)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D1B0327"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @127

-			    Parent_View 	@126

-			    location   	(192, -622)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(2023, 1427)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D1C01F2"

-			    client     	@126

-			    supplier   	@75

-			    vertices   	(list Points

-				(2288, 1762)

-				(1998, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @129

-				Parent_View 	@127

-				location   	(2072, 1330)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "sessionConfig" @130

-			    Parent_View 	@126

-			    location   	(192, -622)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @131

-				Parent_View 	@130

-				location   	(2361, 2141)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	492

-				justify    	0

-				label      	"+sessionConfig"

-				pctDist    	0.668862

-				height     	146

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D1C01F3"

-			    client     	@126

-			    supplier   	@38

-			    vertices   	(list Points

-				(2288, 1762)

-				(2579, 2210))

-			    line_style 	0

-			    label      	(object SegLabel @132

-				Parent_View 	@130

-				location   	(2437, 2089)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.665477

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$8" @133

-		    location   	(1936, 1693)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D1F02AB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @134

-			    Parent_View 	@133

-			    location   	(496, -723)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @135

-				Parent_View 	@134

-				location   	(1877, 1393)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	303

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D200298"

-			    client     	@133

-			    supplier   	@75

-			    vertices   	(list Points

-				(1936, 1693)

-				(1913, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @136

-				Parent_View 	@134

-				location   	(1969, 1351)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "servletMappings" @137

-			    Parent_View 	@133

-			    location   	(496, -723)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @138

-				Parent_View 	@137

-				location   	(1787, 2031)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	543

-				justify    	0

-				label      	"+servletMappings"

-				pctDist    	0.859756

-				height     	171

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2002A2"

-			    client     	@133

-			    supplier   	@39

-			    vertices   	(list Points

-				(1936, 1693)

-				(1960, 2073))

-			    line_style 	0

-			    label      	(object SegLabel @139

-				Parent_View 	@137

-				location   	(1916, 1977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.745715

-				height     	39

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$9" @140

-		    location   	(1437, 1805)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D230120"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @141

-			    Parent_View 	@140

-			    location   	(637, -643)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @142

-				Parent_View 	@141

-				location   	(1691, 1389)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2402DA"

-			    client     	@140

-			    supplier   	@75

-			    vertices   	(list Points

-				(1437, 1805)

-				(1797, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @143

-				Parent_View 	@141

-				location   	(1805, 1395)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "servlets" @144

-			    Parent_View 	@140

-			    location   	(637, -643)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @145

-				Parent_View 	@144

-				location   	(1233, 2207)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	281

-				justify    	0

-				label      	"+servlets"

-				pctDist    	0.730379

-				height     	73

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2402E4"

-			    client     	@140

-			    supplier   	@40

-			    vertices   	(list Points

-				(1437, 1805)

-				(1077, 2297))

-			    line_style 	0

-			    label      	(object SegLabel @146

-				Parent_View 	@144

-				location   	(1195, 2256)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.833390

-				height     	71

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$10" @147

-		    location   	(1566, 1471)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D2701DA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$11" @148

-			    Parent_View 	@147

-			    location   	(1198, -417)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @149

-				Parent_View 	@148

-				location   	(1677, 1316)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2802C2"

-			    client     	@147

-			    supplier   	@75

-			    vertices   	(list Points

-				(1566, 1471)

-				(1740, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @150

-				Parent_View 	@148

-				location   	(1758, 1370)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "securityRoles" @151

-			    Parent_View 	@147

-			    location   	(1198, -417)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @152

-				Parent_View 	@151

-				location   	(1401, 1566)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	457

-				justify    	0

-				label      	"+securityRoles"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2802CC"

-			    client     	@147

-			    supplier   	@58

-			    vertices   	(list Points

-				(1566, 1471)

-				(1392, 1628))

-			    line_style 	0

-			    label      	(object SegLabel @153

-				Parent_View 	@151

-				location   	(1446, 1652)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$44" @154

-		    location   	(1326, 1065)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4D42CA027F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "contextParams" @155

-			    Parent_View 	@154

-			    location   	(-577, -102)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @156

-				Parent_View 	@155

-				location   	(1186, 981)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	316

-				justify    	0

-				label      	"+contextParams"

-				pctDist    	0.437430

-				height     	59

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D42CB0118"

-			    client     	@154

-			    supplier   	@66

-			    vertices   	(list Points

-				(1326, 1065)

-				(984, 1004))

-			    line_style 	0

-			    label      	(object SegLabel @157

-				Parent_View 	@155

-				location   	(1011, 1063)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$45" @158

-			    Parent_View 	@154

-			    location   	(-577, -102)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D42CB0122"

-			    client     	@154

-			    supplier   	@75

-			    vertices   	(list Points

-				(1326, 1065)

-				(1669, 1126))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$50" @159

-		    location   	(1261, 651)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4BFF01C0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "jspConfig" @160

-			    Parent_View 	@159

-			    location   	(-642, -516)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @161

-				Parent_View 	@160

-				location   	(827, 382)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+jspConfig"

-				pctDist    	0.861516

-				height     	62

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C000225"

-			    client     	@159

-			    supplier   	@67

-			    vertices   	(list Points

-				(1261, 651)

-				(800, 282))

-			    line_style 	0

-			    label      	(object SegLabel @162

-				Parent_View 	@160

-				location   	(760, 323)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	1.012447

-				height     	57

-				orientation 	0))

-			(object RoleView "$UNNAMED$51" @163

-			    Parent_View 	@159

-			    location   	(-642, -516)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C000227"

-			    client     	@159

-			    supplier   	@75

-			    vertices   	(list Points

-				(1261, 651)

-				(1722, 1021))

-			    line_style 	0)))

-		(object InheritView "" @164

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D55CA03E2"

-		    client     	@75

-		    supplier   	@6

-		    vertices   	(list Points

-			(2138, 1098)

-			(2780, 908))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$54" @165

-		    location   	(2482, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D56A50224"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinations" @166

-			    Parent_View 	@165

-			    location   	(579, 1)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @167

-				Parent_View 	@166

-				location   	(2562, 1122)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	424

-				justify    	0

-				label      	"+messageDestinations"

-				pctDist    	0.231859

-				height     	47

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D56A60257"

-			    client     	@165

-			    supplier   	@68

-			    vertices   	(list Points

-				(2482, 1168)

-				(2827, 1168))

-			    line_style 	0

-			    label      	(object SegLabel @168

-				Parent_View 	@166

-				location   	(2768, 1219)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.827856

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$55" @169

-			    Parent_View 	@165

-			    location   	(579, 1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D56A60261"

-			    client     	@165

-			    supplier   	@75

-			    vertices   	(list Points

-				(2482, 1168)

-				(2138, 1168))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$58" @170

-		    location   	(1974, 678)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D572C0083"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localEncodingMappingList" @171

-			    Parent_View 	@170

-			    location   	(71, -489)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @172

-				Parent_View 	@171

-				location   	(2300, 370)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	496

-				justify    	0

-				label      	"+localEncodingMappingList"

-				pctDist    	1.015374

-				height     	279

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D572C02DC"

-			    client     	@170

-			    supplier   	@69

-			    vertices   	(list Points

-				(1974, 678)

-				(2023, 335))

-			    line_style 	0

-			    label      	(object SegLabel @173

-				Parent_View 	@171

-				location   	(1953, 375)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.861045

-				height     	65

-				orientation 	0))

-			(object RoleView "$UNNAMED$59" @174

-			    Parent_View 	@170

-			    location   	(71, -489)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D572C02DE"

-			    client     	@170

-			    supplier   	@75

-			    vertices   	(list Points

-				(1974, 678)

-				(1925, 1021))

-			    line_style 	0)))))

-	(object ClassDiagram "Security Constraint"

-	    quid       	"38C08DCB020A"

-	    title      	"Security Constraint"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::HTTPMethodTypeEnum" @175

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(304, 1840)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@175

-			location   	(74, 1643)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"HTTPMethodTypeEnum")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@175

-			location   	(74, 1593)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"38C0A2E200C6"

-		    compartment 	(object Compartment

-			Parent_View 	@175

-			location   	(74, 1704)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	228)

-		    width      	478

-		    height     	518

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @176

-		    location   	(234, 1187)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@176

-			location   	(56, 1009)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	321

-			label      	

-|@version J2EE1.4

-|urlPattern

-|httpMethod

-			)

-		    line_color 	10949559

-		    fill_color 	15778042

-		    width      	381

-		    height     	369)

-		(object ClassView "Class" "Logical View::webapplication::TransportGuaranteeType" @177

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2752, 688)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@177

-			location   	(2514, 585)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"TransportGuaranteeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@177

-			location   	(2514, 535)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390461A9018F"

-		    compartment 	(object Compartment

-			Parent_View 	@177

-			location   	(2514, 646)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	338)

-		    width      	494

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DisplayName" @178

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2503, 175)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@178

-			location   	(2287, 46)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@178

-			location   	(2287, 161)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	466)

-		    width      	450

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::UserDataConstraint" @179

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2208, 1248)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@179

-			location   	(1772, 1147)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	872

-			justify    	0

-			label      	"UserDataConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07CB800B0"

-		    compartment 	(object Compartment

-			Parent_View 	@179

-			location   	(1772, 1208)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	878)

-		    width      	890

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::AuthConstraint" @180

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@180

-			location   	(1280, 731)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	416

-			justify    	0

-			label      	"AuthConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07C8001A0"

-		    compartment 	(object Compartment

-			Parent_View 	@180

-			location   	(1280, 792)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	456)

-		    width      	434

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::SecurityConstraint" @181

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 128)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@181

-			location   	(890, 50)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	396

-			justify    	0

-			label      	"SecurityConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B6A02AE"

-		    compartment 	(object Compartment

-			Parent_View 	@181

-			location   	(890, 111)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	428)

-		    width      	414

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$52" @182

-		    location   	(1786, 88)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D51010264"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNames" @183

-			    Parent_View 	@182

-			    location   	(698, -40)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @184

-				Parent_View 	@183

-				location   	(2118, 45)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+displayNames"

-				pctDist    	0.675510

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D5102025B"

-			    client     	@182

-			    supplier   	@178

-			    vertices   	(list Points

-				(1786, 88)

-				(2278, 88))

-			    line_style 	3

-			    origin_attachment 	(1786, 88)

-			    terminal_attachment 	(2278, 88)

-			    label      	(object SegLabel @185

-				Parent_View 	@183

-				location   	(2228, 142)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$53" @186

-			    Parent_View 	@182

-			    location   	(698, -40)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D51020265"

-			    client     	@182

-			    supplier   	@181

-			    vertices   	(list Points

-				(1786, 88)

-				(1295, 88))

-			    line_style 	3

-			    origin_attachment 	(1786, 88)

-			    terminal_attachment 	(1295, 88))))

-		(object AssociationViewNew "$UNNAMED$14" @187

-		    location   	(2097, 234)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C121F70208"

-		    roleview_list 	(list RoleViews

-			(object RoleView "secConstraint" @188

-			    Parent_View 	@187

-			    location   	(257, -582)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @189

-				Parent_View 	@188

-				location   	(1599, 208)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	276

-				justify    	0

-				label      	"+secConstraint"

-				pctDist    	0.662192

-				height     	73

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F801EC"

-			    client     	@187

-			    supplier   	@181

-			    vertices   	(list Points

-				(2097, 234)

-				(2097, 135)

-				(1295, 135))

-			    line_style 	3

-			    origin_attachment 	(2097, 234)

-			    terminal_attachment 	(1295, 135)

-			    label      	(object SegLabel @190

-				Parent_View 	@188

-				location   	(1479, 121)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.796421

-				height     	15

-				orientation 	1))

-			(object RoleView "userDataConstraint" @191

-			    Parent_View 	@187

-			    location   	(257, -582)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @192

-				Parent_View 	@191

-				location   	(2296, 959)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"+userDataConstraint"

-				pctDist    	0.805369

-				height     	199

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F801ED"

-			    client     	@187

-			    supplier   	@179

-			    vertices   	(list Points

-				(2097, 234)

-				(2097, 1135))

-			    line_style 	3

-			    origin_attachment 	(2097, 234)

-			    terminal_attachment 	(2097, 1135)

-			    label      	(object SegLabel @193

-				Parent_View 	@191

-				location   	(2151, 1044)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$13" @194

-		    location   	(1412, 422)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C121F200E9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "secConstraint" @195

-			    Parent_View 	@194

-			    location   	(324, -362)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @196

-				Parent_View 	@195

-				location   	(1540, 216)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	276

-				justify    	0

-				label      	"+secConstraint"

-				pctDist    	0.648069

-				height     	149

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F3039D"

-			    client     	@194

-			    supplier   	@181

-			    vertices   	(list Points

-				(1412, 422)

-				(1391, 422)

-				(1391, 188)

-				(1295, 188))

-			    line_style 	3

-			    origin_attachment 	(1412, 422)

-			    terminal_attachment 	(1295, 188)

-			    label      	(object SegLabel @197

-				Parent_View 	@195

-				location   	(1330, 135)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "authConstraint" @198

-			    Parent_View 	@194

-			    location   	(324, -362)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @199

-				Parent_View 	@198

-				location   	(1586, 610)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	288

-				justify    	0

-				label      	"+authConstraint"

-				pctDist    	0.662393

-				height     	152

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F303A7"

-			    client     	@194

-			    supplier   	@180

-			    vertices   	(list Points

-				(1412, 422)

-				(1434, 422)

-				(1434, 719))

-			    line_style 	3

-			    origin_attachment 	(1412, 422)

-			    terminal_attachment 	(1434, 719)

-			    label      	(object SegLabel @200

-				Parent_View 	@198

-				location   	(1488, 687)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::Description" @201

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1247, 1695)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@201

-			location   	(1119, 1566)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@201

-			location   	(1119, 1681)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	284)

-		    width      	274

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$60" @202

-		    location   	(1860, 1625)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	8421504

-		    quidu      	"3E4D515001BD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @203

-			    Parent_View 	@202

-			    location   	(-44, 889)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @204

-				Parent_View 	@203

-				location   	(1615, 1699)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.516224

-				height     	74

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D515101BE"

-			    client     	@202

-			    supplier   	@201

-			    vertices   	(list Points

-				(1860, 1625)

-				(1384, 1625))

-			    line_style 	3

-			    origin_attachment 	(1860, 1625)

-			    terminal_attachment 	(1384, 1625)

-			    label      	(object SegLabel @205

-				Parent_View 	@203

-				location   	(1432, 1679)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$61" @206

-			    Parent_View 	@202

-			    location   	(-44, 889)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D515101DC"

-			    client     	@202

-			    supplier   	@179

-			    vertices   	(list Points

-				(1860, 1625)

-				(2071, 1625)

-				(2071, 1361))

-			    line_style 	3

-			    origin_attachment 	(1860, 1625)

-			    terminal_attachment 	(2071, 1361))))

-		(object AssociationViewNew "$UNNAMED$62" @207

-		    location   	(1331, 1263)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	8421504

-		    quidu      	"3E4D514D0317"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @208

-			    Parent_View 	@207

-			    location   	(195, 495)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @209

-				Parent_View 	@208

-				location   	(1149, 1437)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.649007

-				height     	143

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514E0106"

-			    client     	@207

-			    supplier   	@201

-			    vertices   	(list Points

-				(1331, 1263)

-				(1291, 1263)

-				(1291, 1554))

-			    line_style 	3

-			    origin_attachment 	(1331, 1263)

-			    terminal_attachment 	(1291, 1554)

-			    label      	(object SegLabel @210

-				Parent_View 	@208

-				location   	(1372, 1462)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.721854

-				height     	81

-				orientation 	0))

-			(object RoleView "$UNNAMED$63" @211

-			    Parent_View 	@207

-			    location   	(195, 495)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514E0124"

-			    client     	@207

-			    supplier   	@180

-			    vertices   	(list Points

-				(1331, 1263)

-				(1371, 1263)

-				(1371, 945))

-			    line_style 	3

-			    origin_attachment 	(1331, 1263)

-			    terminal_attachment 	(1371, 945))))

-		(object ClassView "Class" "Logical View::webapplication::WebResourceCollection" @212

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(592, 720)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@212

-			location   	(158, 572)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	868

-			justify    	0

-			label      	"WebResourceCollection")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B8703AB"

-		    compartment 	(object Compartment

-			Parent_View 	@212

-			location   	(158, 633)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	894)

-		    width      	886

-		    height     	320

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @213

-		    location   	(494, 110)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C121ED02D6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "secConstraint" @214

-			    Parent_View 	@213

-			    location   	(174, -658)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @215

-				Parent_View 	@214

-				location   	(770, 71)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	276

-				justify    	0

-				label      	"+secConstraint"

-				pctDist    	0.715719

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121EE01E7"

-			    client     	@213

-			    supplier   	@181

-			    vertices   	(list Points

-				(494, 110)

-				(881, 110))

-			    line_style 	3

-			    origin_attachment 	(494, 110)

-			    terminal_attachment 	(881, 110)

-			    label      	(object SegLabel @216

-				Parent_View 	@214

-				location   	(842, 164)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "webResourceCollections" @217

-			    Parent_View 	@213

-			    location   	(174, -658)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @218

-				Parent_View 	@217

-				location   	(685, 528)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+webResourceCollections"

-				pctDist    	0.939655

-				height     	251

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121EE01F1"

-			    client     	@213

-			    supplier   	@212

-			    vertices   	(list Points

-				(494, 110)

-				(434, 110)

-				(434, 560))

-			    line_style 	3

-			    origin_attachment 	(494, 110)

-			    terminal_attachment 	(434, 560)

-			    label      	(object SegLabel @219

-				Parent_View 	@217

-				location   	(501, 481)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.847769

-				height     	67

-				orientation 	0))))

-		(object AttachView "" @220

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@176

-		    supplier   	@212

-		    vertices   	(list Points

-			(373, 1002)

-			(466, 880))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$64" @221

-		    location   	(691, 1474)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	8421504

-		    quidu      	"3E4D514B0089"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @222

-			    Parent_View 	@221

-			    location   	(307, 722)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @223

-				Parent_View 	@222

-				location   	(889, 1610)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.627204

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514B03AA"

-			    client     	@221

-			    supplier   	@201

-			    vertices   	(list Points

-				(691, 1474)

-				(691, 1648)

-				(1110, 1648))

-			    line_style 	3

-			    origin_attachment 	(691, 1474)

-			    terminal_attachment 	(1110, 1648)

-			    label      	(object SegLabel @224

-				Parent_View 	@222

-				location   	(1008, 1690)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.828715

-				height     	42

-				orientation 	1))

-			(object RoleView "$UNNAMED$65" @225

-			    Parent_View 	@221

-			    location   	(307, 722)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514B03C8"

-			    client     	@221

-			    supplier   	@212

-			    vertices   	(list Points

-				(691, 1474)

-				(691, 880))

-			    line_style 	3

-			    origin_attachment 	(691, 1474)

-			    terminal_attachment 	(691, 880))))))

-	(object ClassDiagram "Servlet Descriptors"

-	    quid       	"38C08E5C01F5"

-	    title      	"Servlet Descriptors"

-	    documentation 	"The servlet-class element contains the fully qualified class name of the servlet."

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	1220

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @226

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(837, 2048)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@226

-			location   	(659, 1970)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ServletType" @227

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 96)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@227

-			location   	(1818, 18)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	364

-			justify    	0

-			label      	"ServletType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2320311"

-		    compartment 	(object Compartment

-			Parent_View 	@227

-			location   	(1818, 79)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	397)

-		    width      	382

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::JSPType" @228

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1424, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@228

-			location   	(1286, 34)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	276

-			justify    	0

-			label      	"JSPType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2640273"

-		    compartment 	(object Compartment

-			Parent_View 	@228

-			location   	(1286, 95)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	313)

-		    width      	294

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::InitParam" @229

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(288, 1136)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@229

-			location   	(94, 1011)

-			nlines     	1

-			max_width  	388

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C08E9D0325"

-		    compartment 	(object Compartment

-			Parent_View 	@229

-			location   	(94, 1072)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	4

-			max_width  	413)

-		    width      	406

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @230

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1824, 752)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@230

-			location   	(1646, 574)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	356

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"371BC7A0025C"

-		    compartment 	(object Compartment

-			Parent_View 	@230

-			location   	(1646, 689)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	374

-		    height     	380

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebType" @231

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1792, 416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@231

-			location   	(1690, 366)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	204

-			justify    	0

-			label      	"WebType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A1F70294"

-		    width      	222

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @232

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A28C02AD"

-		    client     	@227

-		    supplier   	@231

-		    vertices   	(list Points

-			(1941, 186)

-			(1832, 353))

-		    line_style 	0)

-		(object InheritView "" @233

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A2900258"

-		    client     	@228

-		    supplier   	@231

-		    vertices   	(list Points

-			(1533, 202)

-			(1716, 353))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::RunAsSpecifiedIdentity" @234

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1847, 1164)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@234

-			location   	(1622, 1055)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"RunAsSpecifiedIdentity")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"39BF2C9E02C8"

-		    width      	468

-		    height     	242

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ParamValue" @235

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(484, 1637)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@235

-			location   	(307, 1484)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@235

-			location   	(307, 1599)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	372

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @236

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(496, 336)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@236

-			location   	(186, 235)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	620

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    compartment 	(object Compartment

-			Parent_View 	@236

-			location   	(186, 296)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	650)

-		    width      	638

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$16" @237

-		    location   	(393, 723)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122B501BB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$17" @238

-			    Parent_View 	@237

-			    location   	(73, -413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @239

-				Parent_View 	@238

-				location   	(309, 532)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	144

-				justify    	0

-				label      	""

-				pctDist    	0.698718

-				height     	85

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122B60145"

-			    client     	@237

-			    supplier   	@236

-			    vertices   	(list Points

-				(393, 723)

-				(393, 448))

-			    line_style 	3

-			    origin_attachment 	(393, 723)

-			    terminal_attachment 	(393, 448)

-			    label      	(object SegLabel @240

-				Parent_View 	@238

-				location   	(465, 532)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.698718

-				height     	72

-				orientation 	1))

-			(object RoleView "params" @241

-			    Parent_View 	@237

-			    location   	(73, -413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @242

-				Parent_View 	@241

-				location   	(486, 916)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	165

-				justify    	0

-				label      	"+params"

-				pctDist    	0.707182

-				height     	93

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122B60159"

-			    client     	@237

-			    supplier   	@229

-			    vertices   	(list Points

-				(393, 723)

-				(393, 998))

-			    line_style 	3

-			    origin_attachment 	(393, 723)

-			    terminal_attachment 	(393, 998)

-			    label      	(object SegLabel @243

-				Parent_View 	@241

-				location   	(350, 915)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.700637

-				height     	44

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$18" @244

-		    location   	(1310, 396)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122C00199"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$19" @245

-			    Parent_View 	@244

-			    location   	(-594, -772)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @246

-				Parent_View 	@245

-				location   	(897, 360)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.836449

-				height     	37

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1028B"

-			    client     	@244

-			    supplier   	@236

-			    vertices   	(list Points

-				(1310, 396)

-				(815, 396))

-			    line_style 	3

-			    origin_attachment 	(1310, 396)

-			    terminal_attachment 	(815, 396))

-			(object RoleView "securityRoleRefs" @247

-			    Parent_View 	@244

-			    location   	(-594, -772)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @248

-				Parent_View 	@247

-				location   	(1573, 365)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	336

-				justify    	0

-				label      	"+securityRoleRefs"

-				pctDist    	0.533816

-				height     	32

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1029F"

-			    client     	@244

-			    supplier   	@230

-			    vertices   	(list Points

-				(1310, 396)

-				(1639, 396)

-				(1639, 562))

-			    line_style 	3

-			    origin_attachment 	(1310, 396)

-			    terminal_attachment 	(1639, 562)

-			    label      	(object SegLabel @249

-				Parent_View 	@247

-				location   	(1603, 448)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.770531

-				height     	37

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$15" @250

-		    location   	(1248, 359)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122AC014A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webType" @251

-			    Parent_View 	@250

-			    location   	(112, 39)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @252

-				Parent_View 	@251

-				location   	(1562, 402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	188

-				justify    	0

-				label      	"+webType"

-				pctDist    	0.724390

-				height     	43

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0015"

-			    client     	@250

-			    supplier   	@231

-			    vertices   	(list Points

-				(1248, 359)

-				(1681, 359))

-			    line_style 	3

-			    origin_attachment 	(1248, 359)

-			    terminal_attachment 	(1681, 359)

-			    label      	(object SegLabel @253

-				Parent_View 	@251

-				location   	(1637, 306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "servlet" @254

-			    Parent_View 	@250

-			    location   	(112, 39)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @255

-				Parent_View 	@254

-				location   	(903, 401)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	141

-				justify    	0

-				label      	"+servlet"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0001"

-			    client     	@250

-			    supplier   	@236

-			    vertices   	(list Points

-				(1248, 359)

-				(815, 359))

-			    line_style 	3

-			    origin_attachment 	(1248, 359)

-			    terminal_attachment 	(815, 359)

-			    label      	(object SegLabel @256

-				Parent_View 	@254

-				location   	(877, 322)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.858537

-				height     	38

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$42" @257

-		    location   	(746, 1169)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39982A2E0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$43" @258

-			    Parent_View 	@257

-			    location   	(-334, 239)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @259

-				Parent_View 	@258

-				location   	(558, 622)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F018E"

-			    client     	@257

-			    supplier   	@236

-			    vertices   	(list Points

-				(746, 1169)

-				(599, 1169)

-				(599, 449))

-			    line_style 	3

-			    origin_attachment 	(746, 1169)

-			    terminal_attachment 	(599, 449))

-			(object RoleView "runAs" @260

-			    Parent_View 	@257

-			    location   	(-334, 239)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @261

-				Parent_View 	@260

-				location   	(1516, 1223)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+runAs"

-				pctDist    	0.889843

-				height     	54

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F0184"

-			    client     	@257

-			    supplier   	@234

-			    vertices   	(list Points

-				(746, 1169)

-				(1613, 1169))

-			    line_style 	3

-			    origin_attachment 	(746, 1169)

-			    terminal_attachment 	(1613, 1169)

-			    label      	(object SegLabel @262

-				Parent_View 	@260

-				location   	(1543, 1126)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.919886

-				height     	44

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$48" @263

-		    location   	(528, 960)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D46E70387"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams" @264

-			    Parent_View 	@263

-			    location   	(14, 570)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @265

-				Parent_View 	@264

-				location   	(404, 1406)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+initParams"

-				pctDist    	0.871622

-				height     	125

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D46E90005"

-			    client     	@263

-			    supplier   	@235

-			    vertices   	(list Points

-				(528, 960)

-				(528, 1472))

-			    line_style 	3

-			    origin_attachment 	(528, 960)

-			    terminal_attachment 	(528, 1472)

-			    label      	(object SegLabel @266

-				Parent_View 	@264

-				location   	(582, 1421)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$49" @267

-			    Parent_View 	@263

-			    location   	(14, 570)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D46E90019"

-			    client     	@263

-			    supplier   	@236

-			    vertices   	(list Points

-				(528, 960)

-				(528, 449))

-			    line_style 	3

-			    origin_attachment 	(528, 960)

-			    terminal_attachment 	(528, 449))))))

-	(object ClassDiagram "WelcomeFile Relation"

-	    quid       	"38C0A8210287"

-	    title      	"WelcomeFile Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::WelcomeFileList" @268

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@268

-			location   	(948, 142)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	344

-			justify    	0

-			label      	"WelcomeFileList")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07AAD01A8"

-		    width      	362

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WelcomeFile" @269

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 672)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@269

-			location   	(894, 594)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	388

-			justify    	0

-			label      	"WelcomeFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A5A800E9"

-		    compartment 	(object Compartment

-			Parent_View 	@269

-			location   	(894, 655)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	419)

-		    width      	406

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$20" @270

-		    location   	(1003, 417)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C123AF02C4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "fileList" @271

-			    Parent_View 	@270

-			    location   	(-69, -191)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @272

-				Parent_View 	@271

-				location   	(899, 287)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	144

-				justify    	0

-				label      	"+fileList"

-				pctDist    	0.797101

-				height     	105

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C123B30111"

-			    client     	@270

-			    supplier   	@268

-			    vertices   	(list Points

-				(1003, 417)

-				(1003, 254))

-			    line_style 	3

-			    origin_attachment 	(1003, 417)

-			    terminal_attachment 	(1003, 254)

-			    label      	(object SegLabel @273

-				Parent_View 	@271

-				location   	(1074, 291)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.775362

-				height     	71

-				orientation 	1))

-			(object RoleView "file" @274

-			    Parent_View 	@270

-			    location   	(-69, -191)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @275

-				Parent_View 	@274

-				location   	(962, 548)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	72

-				justify    	0

-				label      	"+file"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C123B3011B"

-			    client     	@270

-			    supplier   	@269

-			    vertices   	(list Points

-				(1003, 417)

-				(1003, 581))

-			    line_style 	3

-			    origin_attachment 	(1003, 417)

-			    terminal_attachment 	(1003, 581)

-			    label      	(object SegLabel @276

-				Parent_View 	@274

-				location   	(1058, 543)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.776978

-				height     	55

-				orientation 	0))))))

-	(object ClassDiagram "WebResourceCollection Relation"

-	    quid       	"38C0A8600241"

-	    title      	"WebResourceCollection Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	175

-	    origin_y   	106

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::HTTPMethodTypeEnum" @277

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1888, 688)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@277

-			location   	(1658, 479)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"HTTPMethodTypeEnum")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@277

-			location   	(1658, 429)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2E200C6"

-		    compartment 	(object Compartment

-			Parent_View 	@277

-			location   	(1658, 540)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	228)

-		    width      	478

-		    height     	542

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::URLPatternType" @278

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(656, 864)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@278

-			location   	(470, 783)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	372

-			justify    	0

-			label      	"URLPatternType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2C50042"

-		    compartment 	(object Compartment

-			Parent_View 	@278

-			location   	(470, 844)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	369)

-		    width      	390

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::HTTPMethodType" @279

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1376, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@279

-			location   	(1176, 751)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"HTTPMethodType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E930B050065"

-		    compartment 	(object Compartment

-			Parent_View 	@279

-			location   	(1176, 812)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	397)

-		    width      	418

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebResourceCollection" @280

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1040, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@280

-			location   	(592, 84)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	896

-			justify    	0

-			label      	"WebResourceCollection")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B8703AB"

-		    compartment 	(object Compartment

-			Parent_View 	@280

-			location   	(592, 145)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	894)

-		    width      	914

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$21" @281

-		    location   	(824, 589)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C124090179"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resCollection" @282

-			    Parent_View 	@281

-			    location   	(136, -115)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @283

-				Parent_View 	@282

-				location   	(750, 472)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	264

-				justify    	0

-				label      	"+resCollection"

-				pctDist    	0.289589

-				height     	126

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C1240A0256"

-			    client     	@281

-			    supplier   	@280

-			    vertices   	(list Points

-				(824, 589)

-				(935, 408))

-			    line_style 	0

-			    label      	(object SegLabel @284

-				Parent_View 	@282

-				location   	(810, 513)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.274733

-				height     	53

-				orientation 	0))

-			(object RoleView "URLs" @285

-			    Parent_View 	@281

-			    location   	(136, -115)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @286

-				Parent_View 	@285

-				location   	(627, 711)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	132

-				justify    	0

-				label      	"+URLs"

-				pctDist    	0.976229

-				height     	106

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C1240A0260"

-			    client     	@281

-			    supplier   	@278

-			    vertices   	(list Points

-				(824, 589)

-				(713, 770))

-			    line_style 	0

-			    label      	(object SegLabel @287

-				Parent_View 	@285

-				location   	(802, 739)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.663320

-				height     	60

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$66" @288

-		    location   	(1228, 573)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E930B11030B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "HTTPs" @289

-			    Parent_View 	@288

-			    location   	(183, 328)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @290

-				Parent_View 	@289

-				location   	(1189, 679)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	145

-				justify    	0

-				label      	"+HTTPs"

-				pctDist    	0.381010

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E930B1200DC"

-			    client     	@288

-			    supplier   	@279

-			    vertices   	(list Points

-				(1228, 573)

-				(1322, 738))

-			    line_style 	0

-			    label      	(object SegLabel @291

-				Parent_View 	@289

-				location   	(1359, 695)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "resCollection" @292

-			    Parent_View 	@288

-			    location   	(183, 328)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @293

-				Parent_View 	@292

-				location   	(1332, 468)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	257

-				justify    	0

-				label      	"+resCollection"

-				pctDist    	0.218163

-				height     	142

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E930B1200E6"

-			    client     	@288

-			    supplier   	@280

-			    vertices   	(list Points

-				(1228, 573)

-				(1135, 408))

-			    line_style 	0

-			    label      	(object SegLabel @294

-				Parent_View 	@292

-				location   	(1100, 466)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.827573

-				height     	60

-				orientation 	0))))))

-	(object ClassDiagram "loginConfig Relation"

-	    quid       	"38C0A8BF03E2"

-	    title      	"loginConfig Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	13

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::LoginConfig" @295

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1104, 208)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@295

-			location   	(753, 83)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	702

-			justify    	0

-			label      	"LoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D0F006F"

-		    compartment 	(object Compartment

-			Parent_View 	@295

-			location   	(753, 144)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	742)

-		    width      	720

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::FormLoginConfig" @296

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1136, 896)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@296

-			location   	(917, 795)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	438

-			justify    	0

-			label      	"FormLoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D390296"

-		    compartment 	(object Compartment

-			Parent_View 	@296

-			location   	(917, 856)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	463)

-		    width      	456

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @297

-		    location   	(1136, 564)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C1248900BE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "loginConfig" @298

-			    Parent_View 	@297

-			    location   	(0, -332)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @299

-				Parent_View 	@298

-				location   	(1004, 369)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+loginConfig"

-				pctDist    	0.892952

-				height     	133

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C124890303"

-			    client     	@297

-			    supplier   	@295

-			    vertices   	(list Points

-				(1136, 564)

-				(1136, 345))

-			    line_style 	3

-			    origin_attachment 	(1136, 564)

-			    terminal_attachment 	(1136, 345)

-			    label      	(object SegLabel @300

-				Parent_View 	@298

-				location   	(1190, 367)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "formLoginConfig" @301

-			    Parent_View 	@297

-			    location   	(0, -332)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @302

-				Parent_View 	@301

-				location   	(968, 748)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	327

-				justify    	0

-				label      	"+formLoginConfig"

-				pctDist    	0.844073

-				height     	169

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C12489030D"

-			    client     	@297

-			    supplier   	@296

-			    vertices   	(list Points

-				(1136, 564)

-				(1136, 783))

-			    line_style 	3

-			    origin_attachment 	(1136, 564)

-			    terminal_attachment 	(1136, 783)

-			    label      	(object SegLabel @303

-				Parent_View 	@301

-				location   	(1190, 761)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::webapplication::AuthMethodKind" @304

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@304

-			location   	(190, 490)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"AuthMethodKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@304

-			location   	(190, 440)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	353

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3EE0A2D8029A"

-		    compartment 	(object Compartment

-			Parent_View 	@304

-			location   	(190, 551)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	319)

-		    width      	374

-		    height     	424

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "data types"

-	    quid       	"39048A240321"

-	    title      	"data types"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::TransportGuaranteeType" @305

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(352, 432)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@305

-			location   	(114, 329)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"TransportGuaranteeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@305

-			location   	(114, 279)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390461A9018F"

-		    compartment 	(object Compartment

-			Parent_View 	@305

-			location   	(114, 390)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	338)

-		    width      	494

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResAuthTypeBase" @306

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(944, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@306

-			location   	(755, 108)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	378

-			justify    	0

-			label      	"ResAuthTypeBase")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@306

-			location   	(755, 58)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	378

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C09ED400B4"

-		    compartment 	(object Compartment

-			Parent_View 	@306

-			location   	(755, 223)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	259)

-		    width      	396

-		    height     	388

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ResAuthServletType" @307

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(944, 736)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@307

-			location   	(741, 657)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	406

-			justify    	0

-			label      	"ResAuthServletType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@307

-			location   	(741, 607)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	406

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C09EEA0265"

-		    compartment 	(object Compartment

-			Parent_View 	@307

-			location   	(741, 718)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	281)

-		    width      	424

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "Servlet2.4 - Filters"

-	    quid       	"39BFB13E021A"

-	    title      	"Servlet2.4 - Filters"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @308

-		    location   	(3070, 200)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	16777215

-			default_color 	FALSE)

-		    label      	(object ItemLabel

-			Parent_View 	@308

-			location   	(2691, 81)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	722

-			label      	"TODO: Implement helpers for resolution of Servlet and Filter for FilterMapping by servletName and name.  Since we have refs, we may want to remove the names.")

-		    line_color 	3342489

-		    fill_color 	255

-		    width      	782

-		    height     	250)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @309

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2160, 544)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@309

-			location   	(2079, 498)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	162

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Listener" @310

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2267, 115)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@310

-			location   	(2147, 37)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	240

-			justify    	0

-			label      	"Listener")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434833

-		    quidu      	"39BFB26001BD"

-		    width      	258

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @311

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@308

-		    supplier   	@310

-		    vertices   	(list Points

-			(2678, 157)

-			(2396, 127))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::webapplication::InitParam" @312

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(256, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@312

-			location   	(62, 1067)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	388

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C08E9D0325"

-		    compartment 	(object Compartment

-			Parent_View 	@312

-			location   	(62, 1128)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	413)

-		    width      	406

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::FilterMapping" @313

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1408, 576)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@313

-			location   	(1011, 475)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	794

-			justify    	0

-			label      	"FilterMapping")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BFB14C03DD"

-		    compartment 	(object Compartment

-			Parent_View 	@313

-			location   	(1011, 536)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	826)

-		    width      	812

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$36" @314

-		    location   	(1942, 538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C005BB00B9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "servlet" @315

-			    Parent_View 	@314

-			    location   	(694, -6)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @316

-				Parent_View 	@315

-				location   	(2006, 499)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	141

-				justify    	0

-				label      	"+servlet"

-				pctDist    	0.497041

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C005BC004D"

-			    client     	@314

-			    supplier   	@309

-			    vertices   	(list Points

-				(1942, 538)

-				(2070, 538))

-			    line_style 	3

-			    origin_attachment 	(1942, 538)

-			    terminal_attachment 	(2070, 538)

-			    label      	(object SegLabel @317

-				Parent_View 	@315

-				location   	(2034, 591)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.715976

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$37" @318

-			    Parent_View 	@314

-			    location   	(694, -6)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C005BC0061"

-			    client     	@314

-			    supplier   	@313

-			    vertices   	(list Points

-				(1942, 538)

-				(1814, 538))

-			    line_style 	3

-			    origin_attachment 	(1942, 538)

-			    terminal_attachment 	(1814, 538))))

-		(object ClassView "Class" "Logical View::webapplication::WebApp" @319

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(912, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@319

-			location   	(818, 66)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	188

-			justify    	0

-			label      	"WebApp")

-		    icon_style 	"None"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C077FB0352"

-		    width      	206

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$28" @320

-		    location   	(1233, 207)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BFB4150298"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filterMappings" @321

-			    Parent_View 	@320

-			    location   	(321, 95)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @322

-				Parent_View 	@321

-				location   	(1398, 401)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+filterMappings"

-				pctDist    	0.757813

-				height     	165

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB4160127"

-			    client     	@320

-			    supplier   	@313

-			    vertices   	(list Points

-				(1233, 207)

-				(1233, 463))

-			    line_style 	3

-			    origin_attachment 	(1233, 207)

-			    terminal_attachment 	(1233, 463)

-			    label      	(object SegLabel @323

-				Parent_View 	@321

-				location   	(1179, 393)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.726563

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$29" @324

-			    Parent_View 	@320

-			    location   	(321, 95)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @325

-				Parent_View 	@324

-				location   	(1072, 189)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB4160128"

-			    client     	@320

-			    supplier   	@319

-			    vertices   	(list Points

-				(1233, 207)

-				(1233, 147)

-				(1015, 147))

-			    line_style 	3

-			    origin_attachment 	(1233, 207)

-			    terminal_attachment 	(1015, 147))))

-		(object AssociationViewNew "$UNNAMED$30" @326

-		    location   	(1576, 119)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BFB54D01EC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "listeners" @327

-			    Parent_View 	@326

-			    location   	(664, 7)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @328

-				Parent_View 	@327

-				location   	(1915, 179)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	186

-				justify    	0

-				label      	"+listeners"

-				pctDist    	0.605735

-				height     	60

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB54E0215"

-			    client     	@326

-			    supplier   	@310

-			    vertices   	(list Points

-				(1576, 119)

-				(2138, 119))

-			    line_style 	3

-			    origin_attachment 	(1576, 119)

-			    terminal_attachment 	(2138, 119)

-			    label      	(object SegLabel @329

-				Parent_View 	@327

-				location   	(2083, 49)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.904412

-				height     	71

-				orientation 	0))

-			(object RoleView "$UNNAMED$31" @330

-			    Parent_View 	@326

-			    location   	(664, 7)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB54E0220"

-			    client     	@326

-			    supplier   	@319

-			    vertices   	(list Points

-				(1576, 119)

-				(1015, 119))

-			    line_style 	3

-			    origin_attachment 	(1576, 119)

-			    terminal_attachment 	(1015, 119))))

-		(object ClassView "Class" "Logical View::java::JavaClass" @331

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2258, 922)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@331

-			location   	(2165, 843)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$40" @332

-		    location   	(2328, 518)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C03E6C035A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "listenerClass" @333

-			    Parent_View 	@332

-			    location   	(424, 358)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @334

-				Parent_View 	@333

-				location   	(2191, 785)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	275

-				justify    	0

-				label      	"+listenerClass"

-				pctDist    	0.856269

-				height     	138

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02A7"

-			    client     	@332

-			    supplier   	@331

-			    vertices   	(list Points

-				(2328, 518)

-				(2328, 831))

-			    line_style 	3

-			    origin_attachment 	(2328, 518)

-			    terminal_attachment 	(2328, 831)

-			    label      	(object SegLabel @335

-				Parent_View 	@333

-				location   	(2382, 775)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.821918

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$41" @336

-			    Parent_View 	@332

-			    location   	(424, 358)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02CF"

-			    client     	@332

-			    supplier   	@310

-			    vertices   	(list Points

-				(2328, 518)

-				(2328, 205))

-			    line_style 	3

-			    origin_attachment 	(2328, 518)

-			    terminal_attachment 	(2328, 205))))

-		(object ClassView "Class" "Logical View::common::ParamValue" @337

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 1538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@337

-			location   	(207, 1385)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@337

-			location   	(207, 1500)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	372

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Filter" @338

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 576)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@338

-			location   	(237, 498)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"Filter")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BFB15503CC"

-		    compartment 	(object Compartment

-			Parent_View 	@338

-			location   	(237, 559)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	294)

-		    width      	280

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$32" @339

-		    location   	(265, 860)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C0026E02D1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams" @340

-			    Parent_View 	@339

-			    location   	(-87, 284)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @341

-				Parent_View 	@340

-				location   	(122, 977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+initParams"

-				pctDist    	0.600000

-				height     	144

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0026F0160"

-			    client     	@339

-			    supplier   	@312

-			    vertices   	(list Points

-				(265, 860)

-				(265, 1055))

-			    line_style 	3

-			    origin_attachment 	(265, 860)

-			    terminal_attachment 	(265, 1055)

-			    label      	(object SegLabel @342

-				Parent_View 	@340

-				location   	(320, 977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.600000

-				height     	55

-				orientation 	0))

-			(object RoleView "$UNNAMED$33" @343

-			    Parent_View 	@339

-			    location   	(-87, 284)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0026F016A"

-			    client     	@339

-			    supplier   	@338

-			    vertices   	(list Points

-				(265, 860)

-				(265, 666))

-			    line_style 	3

-			    origin_attachment 	(265, 860)

-			    terminal_attachment 	(265, 666))))

-		(object AssociationViewNew "$UNNAMED$34" @344

-		    location   	(755, 538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C0056A0293"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filter" @345

-			    Parent_View 	@344

-			    location   	(-493, -6)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @346

-				Parent_View 	@345

-				location   	(616, 498)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	106

-				justify    	0

-				label      	"+filter"

-				pctDist    	0.566176

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0056B0321"

-			    client     	@344

-			    supplier   	@338

-			    vertices   	(list Points

-				(755, 538)

-				(508, 538))

-			    line_style 	3

-			    origin_attachment 	(755, 538)

-			    terminal_attachment 	(508, 538)

-			    label      	(object SegLabel @347

-				Parent_View 	@345

-				location   	(561, 591)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.786765

-				height     	53

-				orientation 	0))

-			(object RoleView "$UNNAMED$35" @348

-			    Parent_View 	@344

-			    location   	(-493, -6)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0056B032B"

-			    client     	@344

-			    supplier   	@313

-			    vertices   	(list Points

-				(755, 538)

-				(1002, 538))

-			    line_style 	3

-			    origin_attachment 	(755, 538)

-			    terminal_attachment 	(1002, 538))))

-		(object AssociationViewNew "$UNNAMED$26" @349

-		    location   	(475, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BFB3B101CC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filters" @350

-			    Parent_View 	@349

-			    location   	(-437, 0)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @351

-				Parent_View 	@350

-				location   	(502, 439)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	134

-				justify    	0

-				label      	"+filters"

-				pctDist    	0.893891

-				height     	87

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB3B20123"

-			    client     	@349

-			    supplier   	@338

-			    vertices   	(list Points

-				(475, 112)

-				(415, 112)

-				(415, 486))

-			    line_style 	3

-			    origin_attachment 	(475, 112)

-			    terminal_attachment 	(415, 486)

-			    label      	(object SegLabel @352

-				Parent_View 	@350

-				location   	(358, 439)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.893891

-				height     	58

-				orientation 	1))

-			(object RoleView "$UNNAMED$27" @353

-			    Parent_View 	@349

-			    location   	(-437, 0)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @354

-				Parent_View 	@353

-				location   	(672, 72)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.589342

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB3B2012D"

-			    client     	@349

-			    supplier   	@319

-			    vertices   	(list Points

-				(475, 112)

-				(809, 112))

-			    line_style 	3

-			    origin_attachment 	(475, 112)

-			    terminal_attachment 	(809, 112))))

-		(object AssociationViewNew "$UNNAMED$38" @355

-		    location   	(1211, 871)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C03C280356"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filterClass" @356

-			    Parent_View 	@355

-			    location   	(859, 295)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @357

-				Parent_View 	@356

-				location   	(1886, 925)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	215

-				justify    	0

-				label      	"+filterClass"

-				pctDist    	0.714542

-				height     	54

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03C290267"

-			    client     	@355

-			    supplier   	@331

-			    vertices   	(list Points

-				(1211, 871)

-				(2156, 871))

-			    line_style 	3

-			    origin_attachment 	(1211, 871)

-			    terminal_attachment 	(2156, 871)

-			    label      	(object SegLabel @358

-				Parent_View 	@356

-				location   	(2061, 925)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$39" @359

-			    Parent_View 	@355

-			    location   	(859, 295)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03C29028F"

-			    client     	@355

-			    supplier   	@338

-			    vertices   	(list Points

-				(1211, 871)

-				(922, 871)

-				(922, 629)

-				(508, 629))

-			    line_style 	3

-			    origin_attachment 	(1211, 871)

-			    terminal_attachment 	(508, 629))))

-		(object AttachView "" @360

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@308

-		    supplier   	@338

-		    vertices   	(list Points

-			(2678, 253)

-			(508, 555))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$46" @361

-		    location   	(384, 1019)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D43AA000A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParamValues" @362

-			    Parent_View 	@361

-			    location   	(32, 443)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @363

-				Parent_View 	@362

-				location   	(219, 1311)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	320

-				justify    	0

-				label      	"+initParamValues"

-				pctDist    	0.825420

-				height     	166

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43AA0245"

-			    client     	@361

-			    supplier   	@337

-			    vertices   	(list Points

-				(384, 1019)

-				(384, 1373))

-			    line_style 	3

-			    origin_attachment 	(384, 1019)

-			    terminal_attachment 	(384, 1373)

-			    label      	(object SegLabel @364

-				Parent_View 	@362

-				location   	(438, 1338)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$47" @365

-			    Parent_View 	@361

-			    location   	(32, 443)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43AA024F"

-			    client     	@361

-			    supplier   	@338

-			    vertices   	(list Points

-				(384, 1019)

-				(384, 666))

-			    line_style 	3

-			    origin_attachment 	(384, 1019)

-			    terminal_attachment 	(384, 666))))

-		(object ClassView "Class" "Logical View::webapplication::DispatcherType" @366

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2736, 624)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@366

-			location   	(2558, 498)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DispatcherType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@366

-			location   	(2558, 448)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	353

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D445B0376"

-		    compartment 	(object Compartment

-			Parent_View 	@366

-			location   	(2558, 559)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	260)

-		    width      	374

-		    height     	376

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @367

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1553, 1188)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@367

-			location   	(1374, 1110)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "Servlet2.4 - Security"

-	    quid       	"399829CD0197"

-	    title      	"Servlet2.4 - Security"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @368

-		    location   	(1104, 704)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@368

-			location   	(825, 641)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	522

-			label      	"See common::Security diagram for further details.")

-		    line_color 	3342489

-		    fill_color 	13434833

-		    width      	582

-		    height     	138)

-		(object ClassView "Class" "Logical View::common::RunAsSpecifiedIdentity" @369

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 368)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@369

-			location   	(919, 289)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	274

-			justify    	0

-			label      	"RunAsSpecifiedIdentity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BF2C9E02C8"

-		    width      	292

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @370

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@368

-		    supplier   	@369

-		    vertices   	(list Points

-			(1093, 634)

-			(1068, 459))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @371

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(320, 352)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@371

-			location   	(239, 306)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	162

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$42" @372

-		    location   	(660, 347)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39982A2E0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "runAs" @373

-			    Parent_View 	@372

-			    location   	(340, -5)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @374

-				Parent_View 	@373

-				location   	(803, 306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+runAs"

-				pctDist    	0.572816

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F0184"

-			    client     	@372

-			    supplier   	@369

-			    vertices   	(list Points

-				(660, 347)

-				(910, 347))

-			    line_style 	3

-			    origin_attachment 	(660, 347)

-			    terminal_attachment 	(910, 347)

-			    label      	(object SegLabel @375

-				Parent_View 	@373

-				location   	(847, 383)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.747573

-				height     	36

-				orientation 	1))

-			(object RoleView "$UNNAMED$43" @376

-			    Parent_View 	@372

-			    location   	(340, -5)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F018E"

-			    client     	@372

-			    supplier   	@371

-			    vertices   	(list Points

-				(660, 347)

-				(410, 347))

-			    line_style 	3

-			    origin_attachment 	(660, 347)

-			    terminal_attachment 	(410, 347))))

-		(object Label @377

-		    location   	(80, 80)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	1173

-		    label      	"Servlet 2.3 has introduced RunAs security identity for Servlets:")))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webservice-j2ee.mdl b/plugins/org.eclipse.jst.j2ee.core/rose/webservice-j2ee.mdl
deleted file mode 100644
index b0c003f6b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webservice-j2ee.mdl
+++ /dev/null
@@ -1,8928 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"3E109E88030F"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3E109E880311"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3E109E8A0178"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3E109E880310"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3E109E880312"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "wscommon"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wscommon.cat"
-		quid       	"3E15B4C0016F")
-	    (object Class_Category "jaxrpcmap"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jaxrpcmap.cat"
-		quid       	"3E161FA90266")
-	    (object Class_Category "wsdd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wsdd.cat"
-		quid       	"3E109EAD0319")
-	    (object Class_Category "common"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\common.cat"
-		quid       	"38C08F0F038D")
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\src-ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "ejb"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\ejbschema.cat"
-		quid       	"3780E272032D")
-	    (object Class_Category "webapplication"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webapplication.cat"
-		quid       	"38C076D603DD")
-	    (object Class_Category "wsclient"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webservices_client_1_0.cat"
-		quid       	"3E4D2F4B02AA")
-	    (object Class_Category "jsp"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jsp_2_0.cat"
-		quid       	"3E4D4F69036B"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3E15B47D02E0"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::common" @1
-			location   	(688, 768)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(544, 684)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"common")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C08F0F038D"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::ecore" @2
-			location   	(1104, 496)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(960, 412)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::ejb" @3
-			location   	(1104, 496)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(960, 462)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ejb")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(960, 412)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	288
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3780E272032D"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3E109E880312"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3E109E8A0177"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3E109E880313"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3E109E880315"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Const"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteType"
-			value      	("IncompleteTypeSet" 1))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotDeclare"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"NoDiscriminantPart"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"UnknownDiscriminantPart"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"KnownDiscriminantPart"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM, 6.0.0-td-h"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM, 6.0.0-td-h"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdatable"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM60TD"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM60TD"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SpecialDeclReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Direction"
-			value      	("ParamDirectionTypeSet" 102))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ParamDirectionTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"in"
-				value      	102)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"inout"
-				value      	103)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"out"
-				value      	104)))))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969"))
-	quid       	"3E109E880314"))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webservices_client_1_0.cat b/plugins/org.eclipse.jst.j2ee.core/rose/webservices_client_1_0.cat
deleted file mode 100644
index 6840cdb42..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webservices_client_1_0.cat
+++ /dev/null
@@ -1,1815 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "wsclient"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	(value Text "Webservice_client"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	(value Text "webservice_client.xmi")))
-    quid       	"3E4D2F4B02AA"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "ServiceRef"
-	    quid       	"3E4D2F560184"
-	    documentation 	
-|The service-ref element declares a reference to a Web
-|    service. It contains optional description, display name and
-|    icons, a declaration of the required Service interface,
-|    an optional WSDL document location, an optional set
-|    of JAX-RPC mappings, an optional QName for the service element,
-|    an optional set of Service Endpoint Interfaces to be resolved
-|    by the container to a WSDL port, and an optional set of handlers.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4023AF2C001C"
-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"
-		    quidu      	"4023ADF20197"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "serviceRefName"
-		    quid       	"3E4D2FD301A1"
-		    documentation 	
-|The service-ref-name element declares logical name that the
-|        components in the module use to look up the Web service. It
-|        is recommended that all service reference names start with
-|        "service/".
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlFile"
-		    quid       	"3E4D30050199"
-		    documentation 	
-| The wsdl-file element contains the URI location of a WSDL file. The
-|        location is relative to the root of the module.
-		    
-		    stereotype 	"0..1"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "jaxrpcMappingFile"
-		    quid       	"3E4D301C03CD"
-		    documentation 	
-|The jaxrpc-mapping-file element contains the name of a file that
-|        describes the JAX-RPC mapping between the Java interaces used by
-|        the application and the WSDL description in the wsdl-file.  The
-|        file name is a relative path within the module file.
-		    
-		    stereotype 	"0..1"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PortComponentRef"
-	    quid       	"3E4D30D903A7"
-	    documentation 	
-|The port-component-ref element declares a client dependency
-|    on the container for resolving a Service Endpoint Interface
-|    to a WSDL port. It optionally associates the Service Endpoint
-|    Interface with a particular port-component. This is only used
-|    by the container for a Service.getPort(Class) method call.
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "portComponentLink"
-		    quid       	"3E4D31220348"
-		    documentation 	
-|The port-component-link element links a port-component-ref to a
-|        specific port-component required to be made available by a service
-|        reference.
-|
-|        The value of a port-component-link must be the port-component-name
-|        of a port-component in the same module or another module in the same
-|        application unit. The syntax for specification follows the syntax
-|        defined for ejb-link in the EJB 2.0 specification.
-		    
-		    stereotype 	"0..1"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "Handler"
-	    quid       	"3E4D31640072"
-	    documentation 	
-|Declares the handler for a port-component. Handlers can access the
-|    init-param name/value pairs using the HandlerInfo interface. If
-|    port-name is not specified, the handler is assumed to be associated
-|    with all ports of the service.
-|
-|    Used in: service-ref
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4023B0080005"
-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"
-		    quidu      	"4023ADF20197"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "handlerName"
-		    quid       	"3E4D31ED0097"
-		    documentation 	"Defines the name of the handler. The name must be unique within the module."
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "soapRoles"
-		    quid       	"3E4D32660285"
-		    documentation 	"The soap-role element contains a SOAP actor definition that the Handler will play as a role."
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "portNames"
-		    quid       	"3E4D328A0331"
-		    documentation 	"The port-name element defines the WSDL port-name that a handler should be associated with."
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "WebServicesClient"
-	    quid       	"3F2EB3090267"
-	    documentation 	"@version J2EE1.4 deprecated")
-	(object Class "ComponentScopedRefs"
-	    quid       	"3F2EB42A00AA"
-	    documentation 	"@version J2EE1.4 deprecated"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "componentName"
-		    quid       	"3F2EB454015F"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3E4D310700E6"
-	    roles      	(list role_list
-		(object Role "serviceEndpointInterface"
-		    quid       	"3E4D31080354"
-		    documentation 	
-|The service-endpoint-interface element defines a fully qualified
-|        Java class that represents the Service Endpoint Interface of a
-|        WSDL port.
-		    
-		    label      	"serviceEndpointInterface"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3E4D31080372"
-		    supplier   	"Logical View::wsclient::PortComponentRef"
-		    quidu      	"3E4D30D903A7")))
-	(object Association "$UNNAMED$2"
-	    quid       	"3E4D313C039F"
-	    roles      	(list role_list
-		(object Role "portComponentRefs"
-		    quid       	"3E4D313D0256"
-		    documentation 	
-|The port-component-ref element declares a client dependency
-|        on the container for resolving a Service Endpoint Interface
-|        to a WSDL port. It optionally associates the Service Endpoint
-|        Interface with a particular port-component. This is only used
-|        by the container for a Service.getPort(Class) method call.
-		    
-		    label      	"portComponentRefs"
-		    supplier   	"Logical View::wsclient::PortComponentRef"
-		    quidu      	"3E4D30D903A7"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3E4D313D0260"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$4"
-	    quid       	"3E4D316E031F"
-	    roles      	(list role_list
-		(object Role "handlers"
-		    quid       	"3E4D316F0258"
-		    documentation 	
-| Declares the handler for a port-component. Handlers can access the
-|        init-param name/value pairs using the HandlerInfo interface. If
-|        port-name is not specified, the handler is assumed to be associated
-|        with all ports of the service.
-		    
-		    label      	"handlers"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3E4D316F0262"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    quid       	"3E4D31F9012A"
-	    roles      	(list role_list
-		(object Role "handlerClass"
-		    quid       	"3E4D31FA0280"
-		    documentation 	"Defines a fully qualified class name for the handler implementation."
-		    label      	"handlerClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"3E4D31FA02A8"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072")))
-	(object Association "$UNNAMED$8"
-	    quid       	"3E4D3221002D"
-	    roles      	(list role_list
-		(object Role "initParams"
-		    quid       	"3E4D322101E6"
-		    label      	"initParams"
-		    supplier   	"Logical View::common::ParamValue"
-		    quidu      	"3E4C221202C1"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$9"
-		    quid       	"3E4D322101E8"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$10"
-	    quid       	"3F2EB48E0271"
-	    roles      	(list role_list
-		(object Role "componentScopedRefs"
-		    quid       	"3F2EB4910275"
-		    label      	"componentScopedRefs"
-		    supplier   	"Logical View::wsclient::ComponentScopedRefs"
-		    quidu      	"3F2EB42A00AA"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3F2EB4910277"
-		    supplier   	"Logical View::wsclient::WebServicesClient"
-		    quidu      	"3F2EB3090267"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$12"
-	    quid       	"3F2EB52403D5"
-	    roles      	(list role_list
-		(object Role "serviceRefs"
-		    quid       	"3F2EB5270158"
-		    label      	"serviceRefs"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$13"
-		    quid       	"3F2EB527016C"
-		    supplier   	"Logical View::wsclient::ComponentScopedRefs"
-		    quidu      	"3F2EB42A00AA"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$14"
-	    quid       	"3F2EB59B006F"
-	    roles      	(list role_list
-		(object Role "serviceRefs"
-		    quid       	"3F2EB59B0354"
-		    label      	"serviceRefs"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$15"
-		    quid       	"3F2EB59B0368"
-		    supplier   	"Logical View::wsclient::WebServicesClient"
-		    quidu      	"3F2EB3090267"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$16"
-	    quid       	"3F4392CC02FA"
-	    roles      	(list role_list
-		(object Role "serviceQname"
-		    quid       	"3F4392CD02F1"
-		    label      	"serviceQname"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$17"
-		    quid       	"3F4392CD02FB"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$18"
-	    quid       	"3F43933C02A0"
-	    roles      	(list role_list
-		(object Role "soapHeaders"
-		    quid       	"3F43933D0193"
-		    label      	"soapHeaders"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$19"
-		    quid       	"3F43933D019D"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072"
-		    is_aggregate 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Service Ref"
-	    quid       	"3E4D30A20131"
-	    title      	"Service Ref"
-	    documentation 	
-|Declares the handler for a port-component. Handlers can access the
-|    init-param name/value pairs using the HandlerInfo interface. If
-|    port-name is not specified, the handler is assumed to be associated
-|    with all ports of the service.
-|
-|    Used in: service-ref
-	    
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	1050
-	    origin_y   	138
-	    items      	(list diagram_item_list
-		(object Label @1
-		    location   	(53, 56)
-		    font       	(object Font
-			size       	14
-			face       	"Arial"
-			bold       	TRUE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    nlines     	1
-		    max_width  	1006
-		    label      	"Web Services Client DD V1.1")
-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2820, 1918)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(2642, 1839)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	356
-			justify    	0
-			label      	"DescriptionGroup")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12632256
-		    quidu      	"3E4D451F01FB"
-		    width      	374
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::PortComponentRef" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 464)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(1607, 414)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	434
-			justify    	0
-			label      	"PortComponentRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E4D30D903A7"
-		    width      	452
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::ComponentScopedRefs" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 1136)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(212, 1086)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	536
-			justify    	0
-			label      	"ComponentScopedRefs")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16745727
-		    quidu      	"3F2EB42A00AA"
-		    width      	554
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::WebServicesClient" @5
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(576, 304)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@5
-			location   	(352, 254)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	448
-			justify    	0
-			label      	"WebServicesClient")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16745727
-		    quidu      	"3F2EB3090267"
-		    width      	466
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$10" @6
-		    location   	(527, 719)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F2EB48E0271"
-		    roleview_list 	(list RoleViews
-			(object RoleView "componentScopedRefs" @7
-			    Parent_View 	@6
-			    location   	(-1687, 291)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @8
-				Parent_View 	@7
-				location   	(453, 997)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	"+componentScopedRefs"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB4910275"
-			    client     	@6
-			    supplier   	@4
-			    line_style 	0
-			    label      	(object SegLabel @9
-				Parent_View 	@7
-				location   	(544, 1043)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$11" @10
-			    Parent_View 	@6
-			    location   	(-1687, 291)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @11
-				Parent_View 	@10
-				location   	(519, 433)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	359
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB4910277"
-			    client     	@6
-			    supplier   	@5
-			    line_style 	0
-			    label      	(object SegLabel @12
-				Parent_View 	@10
-				location   	(618, 408)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::java::JavaClass" @13
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2767, 868)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@13
-			location   	(2633, 818)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	268
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12632256
-		    quidu      	"36549FCC00FA"
-		    width      	286
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @14
-		    location   	(2558, 491)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D310700E6"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceEndpointInterface" @15
-			    Parent_View 	@14
-			    location   	(1515, -93)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @16
-				Parent_View 	@15
-				location   	(2999, 698)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	470
-				justify    	0
-				label      	"+serviceEndpointInterface"
-				pctDist    	0.786070
-				height     	249
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31080354"
-			    client     	@14
-			    supplier   	@13
-			    vertices   	(list Points
-				(2558, 491)
-				(2750, 491)
-				(2750, 806))
-			    line_style 	3
-			    origin_attachment 	(2558, 491)
-			    terminal_attachment 	(2750, 806)
-			    label      	(object SegLabel @17
-				Parent_View 	@15
-				location   	(2718, 692)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.776119
-				height     	33
-				orientation 	1))
-			(object RoleView "$UNNAMED$1" @18
-			    Parent_View 	@14
-			    location   	(1515, -93)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31080372"
-			    client     	@14
-			    supplier   	@3
-			    line_style 	3
-			    origin_attachment 	(2558, 491)
-			    terminal_attachment 	(2050, 491))))
-		(object ClassView "Class" "Logical View::common::ParamValue" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1887, 2570)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@19
-			location   	(1655, 2416)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	464
-			justify    	0
-			label      	"ParamValue")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12632256
-		    quidu      	"3E4C221202C1"
-		    width      	482
-		    height     	332
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::ServiceRef" @20
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 1120)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@20
-			location   	(1694, 1070)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"ServiceRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E4D2F560184"
-		    compartment 	(object Compartment
-			Parent_View 	@20
-			location   	(1694, 1131)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	0)
-		    width      	278
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @21
-		    location   	(1824, 791)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D313C039F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "portComponentRefs" @22
-			    Parent_View 	@21
-			    location   	(759, -387)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @23
-				Parent_View 	@22
-				location   	(1618, 622)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	380
-				justify    	0
-				label      	"+portComponentRefs"
-				pctDist    	0.643080
-				height     	207
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D313D0256"
-			    client     	@21
-			    supplier   	@3
-			    line_style 	0
-			    label      	(object SegLabel @24
-				Parent_View 	@22
-				location   	(1892, 599)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.726080
-				height     	68
-				orientation 	1))
-			(object RoleView "$UNNAMED$3" @25
-			    Parent_View 	@21
-			    location   	(759, -387)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D313D0260"
-			    client     	@21
-			    supplier   	@20
-			    line_style 	0)))
-		(object AssociationViewNew "" @26
-		    location   	(2370, 1060)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D2FE101FC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "" @27
-			    Parent_View 	@26
-			    location   	(750, 940)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @28
-				Parent_View 	@27
-				location   	(2045, 1019)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D2FE4014C"
-			    client     	@26
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(2370, 1060)
-			    terminal_attachment 	(1963, 1060))
-			(object RoleView "serviceInterface" @29
-			    Parent_View 	@26
-			    location   	(750, 940)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(2296, 1168)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	304
-				justify    	0
-				label      	"+serviceInterface"
-				pctDist    	-0.185484
-				height     	108
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D2FE4012E"
-			    client     	@26
-			    supplier   	@13
-			    vertices   	(list Points
-				(2370, 1060)
-				(2647, 1060)
-				(2647, 930))
-			    line_style 	3
-			    origin_attachment 	(2370, 1060)
-			    terminal_attachment 	(2647, 930)
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(2701, 972)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$12" @32
-		    location   	(1220, 1126)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F2EB52403D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceRefs" @33
-			    Parent_View 	@32
-			    location   	(-1581, -20)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @34
-				Parent_View 	@33
-				location   	(1590, 1081)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+serviceRefs"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB5270158"
-			    client     	@32
-			    supplier   	@20
-			    line_style 	0
-			    label      	(object SegLabel @35
-				Parent_View 	@33
-				location   	(1639, 1175)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$13" @36
-			    Parent_View 	@32
-			    location   	(-1581, -20)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @37
-				Parent_View 	@36
-				location   	(851, 1090)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB527016C"
-			    client     	@32
-			    supplier   	@4
-			    line_style 	0
-			    label      	(object SegLabel @38
-				Parent_View 	@36
-				location   	(805, 1185)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$14" @39
-		    location   	(1199, 711)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F2EB59B006F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceRefs" @40
-			    Parent_View 	@39
-			    location   	(843, 424)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @41
-				Parent_View 	@40
-				location   	(1645, 953)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+serviceRefs"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB59B0354"
-			    client     	@39
-			    supplier   	@20
-			    line_style 	0
-			    label      	(object SegLabel @42
-				Parent_View 	@40
-				location   	(1646, 1067)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$15" @43
-			    Parent_View 	@39
-			    location   	(843, 424)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @44
-				Parent_View 	@43
-				location   	(755, 470)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	359
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB59B0368"
-			    client     	@39
-			    supplier   	@5
-			    line_style 	0
-			    label      	(object SegLabel @45
-				Parent_View 	@43
-				location   	(754, 357)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::common::QName" @46
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(934, 1813)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@46
-			location   	(587, 1634)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	694
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3F3BEF5D02C0"
-		    width      	712
-		    height     	382
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$16" @47
-		    location   	(1183, 1184)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F4392CC02FA"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceQname" @48
-			    Parent_View 	@47
-			    location   	(-647, 63)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @49
-				Parent_View 	@48
-				location   	(1078, 1521)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	300
-				justify    	0
-				label      	"+serviceQname"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F4392CD02F1"
-			    client     	@47
-			    supplier   	@46
-			    vertices   	(list Points
-				(1183, 1184)
-				(1119, 1184)
-				(1119, 1622))
-			    line_style 	3
-			    origin_attachment 	(1183, 1184)
-			    terminal_attachment 	(1119, 1622)
-			    label      	(object SegLabel @50
-				Parent_View 	@48
-				location   	(1150, 1458)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.675299
-				height     	31
-				orientation 	0))
-			(object RoleView "$UNNAMED$17" @51
-			    Parent_View 	@47
-			    location   	(-647, 63)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F4392CD02FB"
-			    client     	@47
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(1183, 1184)
-			    terminal_attachment 	(1685, 1184))))
-		(object ClassView "Class" "Logical View::wsclient::Handler" @52
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 1952)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@52
-			location   	(1754, 1902)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	204
-			justify    	0
-			label      	"Handler")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E4D31640072"
-		    compartment 	(object Compartment
-			Parent_View 	@52
-			location   	(1754, 1963)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	0)
-		    width      	222
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @53
-		    location   	(2385, 1447)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D31F9012A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "handlerClass" @54
-			    Parent_View 	@53
-			    location   	(1407, -594)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @55
-				Parent_View 	@54
-				location   	(2613, 1025)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	276
-				justify    	0
-				label      	"+handlerClass"
-				pctDist    	0.895404
-				height     	154
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31FA0280"
-			    client     	@53
-			    supplier   	@13
-			    vertices   	(list Points
-				(2385, 1447)
-				(2766, 1447)
-				(2766, 930))
-			    line_style 	3
-			    origin_attachment 	(2385, 1447)
-			    terminal_attachment 	(2766, 930)
-			    label      	(object SegLabel @56
-				Parent_View 	@54
-				location   	(2820, 1021)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$7" @57
-			    Parent_View 	@53
-			    location   	(1407, -594)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31FA02A8"
-			    client     	@53
-			    supplier   	@52
-			    vertices   	(list Points
-				(2385, 1447)
-				(1930, 1447)
-				(1930, 1890))
-			    line_style 	3
-			    origin_attachment 	(2385, 1447)
-			    terminal_attachment 	(1930, 1890))))
-		(object AssociationViewNew "$UNNAMED$8" @58
-		    location   	(1885, 2209)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D3221002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "initParams" @59
-			    Parent_View 	@58
-			    location   	(907, 168)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @60
-				Parent_View 	@59
-				location   	(1757, 2309)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	228
-				justify    	0
-				label      	"+initParams"
-				pctDist    	0.515152
-				height     	129
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D322101E6"
-			    client     	@58
-			    supplier   	@19
-			    line_style 	3
-			    origin_attachment 	(1885, 2209)
-			    terminal_attachment 	(1885, 2404)
-			    label      	(object SegLabel @61
-				Parent_View 	@59
-				location   	(1958, 2345)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.697987
-				height     	73
-				orientation 	0))
-			(object RoleView "$UNNAMED$9" @62
-			    Parent_View 	@58
-			    location   	(907, 168)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D322101E8"
-			    client     	@58
-			    supplier   	@52
-			    line_style 	3
-			    origin_attachment 	(1885, 2209)
-			    terminal_attachment 	(1885, 2014))))
-		(object AssociationViewNew "$UNNAMED$4" @63
-		    location   	(1750, 1535)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D316E031F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "handlers" @64
-			    Parent_View 	@63
-			    location   	(685, 357)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1607, 1778)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	186
-				justify    	0
-				label      	"+handlers"
-				pctDist    	0.685185
-				height     	144
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D316F0258"
-			    client     	@63
-			    supplier   	@52
-			    line_style 	3
-			    origin_attachment 	(1750, 1535)
-			    terminal_attachment 	(1750, 1889)
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1817, 1797)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.740741
-				height     	67
-				orientation 	0))
-			(object RoleView "$UNNAMED$5" @67
-			    Parent_View 	@63
-			    location   	(685, 357)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D316F0262"
-			    client     	@63
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(1750, 1535)
-			    terminal_attachment 	(1750, 1181))))
-		(object AssociationViewNew "$UNNAMED$18" @68
-		    location   	(1194, 2007)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F43933C02A0"
-		    roleview_list 	(list RoleViews
-			(object RoleView "soapHeaders" @69
-			    Parent_View 	@68
-			    location   	(-668, 54)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @70
-				Parent_View 	@69
-				location   	(865, 2123)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	271
-				justify    	0
-				label      	"+soapHeaders"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F43933D0193"
-			    client     	@68
-			    supplier   	@46
-			    vertices   	(list Points
-				(1194, 2007)
-				(1134, 2007)
-				(1134, 2159)
-				(906, 2159)
-				(906, 2004))
-			    line_style 	3
-			    origin_attachment 	(1194, 2007)
-			    terminal_attachment 	(906, 2004)
-			    label      	(object SegLabel @71
-				Parent_View 	@69
-				location   	(960, 2064)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$19" @72
-			    Parent_View 	@68
-			    location   	(-668, 54)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F43933D019D"
-			    client     	@68
-			    supplier   	@52
-			    line_style 	3
-			    origin_attachment 	(1194, 2007)
-			    terminal_attachment 	(1745, 2007))))))))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.cat b/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.cat
deleted file mode 100644
index bfe1b7694..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.cat
+++ /dev/null
@@ -1,103 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "wscommon"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Wscommon"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "wscommon.xmi")))

-    quid       	"3E15B4C0016F"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "InitParam"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC6E0280"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "paramName"

-		    quid       	"3E526C580355"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "paramValue"

-		    quid       	"3E526C5D0013"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3E526C63017A"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SOAPHeader"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC99022F"

-	    documentation 	

-|Defines the QName of a SOAP header that will be processed by the handler.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F4671870049"

-		    supplier   	"Logical View::common::QName"

-		    quidu      	"3F3BEF5D02C0"))

-	    language   	"Java")

-	(object Class "SOAPRole"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10ACBC0164"

-	    documentation 	

-|The soap-role element contains a SOAP actor definition that the Handler will play as a role.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "soapRole"

-		    quid       	"3E11E9AD02D7"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "PortName"

-	    quid       	"3E15BBC90209"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "portName"

-		    quid       	"3E15E4F70076"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "DescriptionType"

-	    quid       	"3F5CBC6D0353"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F5DDB7E00C1"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0")))

-	(object Class "DisplayNameType"

-	    quid       	"3F5CBC780236"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F5DDB82033D"

-		    supplier   	"Logical View::common::DisplayName"

-		    quidu      	"3E4A9922000E"))))

-    logical_presentations 	(list unit_reference_list))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.cat b/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.cat
deleted file mode 100644
index d4d557712..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.cat
+++ /dev/null
@@ -1,4011 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "wsdd"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Wsdd"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "wsdd.xmi")))

-    quid       	"3E109EAD0319"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "WebServices"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E109EEF012F"

-	    documentation 	

-|The webservices element is the root element for the web services deployment descriptor.  It specifies the set of Web service descriptions that are to be deployed into the J2EE Application Server and the dependencies they have on container resources and services.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B0DD00DD"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    language   	"Java")

-	(object Class "WebServiceDescription"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10A1500313"

-	    documentation 	

-|The webservice-description element defines a WSDL document file and the set of Port components associated with the WSDL ports defined in the WSDL document.  There may be multiple webservice-descriptions defined within a module.

-|

-|All WSDL file ports must have a corresponding port-component element defined.

-|

-|Used in: webservices

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "jaxrpcMappingFile"

-		    quid       	"3E526A81010C"

-		    documentation 	

-|The jaxrpc-mapping-file element contains the name of a file that describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "webServiceDescriptionName"

-		    quid       	"3E526A8F021A"

-		    documentation 	

-|The webservice-description-name identifies the collection of port-components associated with a WSDL file and JAX-RPC mapping. The name must be unique within the deployment descriptor.

-|

-|

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "wsdlFile"

-		    quid       	"3E526AA20392"

-		    documentation 	

-|The wsdl-file element contains the name of a WSDL file in the module. The file name is a relative path within the module.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "smallIcon"

-		    quid       	"3F5C91820023"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"3F5C91930276"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3F5CE5260163"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "displayName"

-		    quid       	"3F5CE531003C"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "PortComponent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AB8D01F6"

-	    documentation 	

-|The port-component element associates a WSDL port with a Web service interface and implementation.  It defines the name of the port as a component, optional description, optional display name, optional iconic representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "portComponentName"

-		    quid       	"3E526B110344"

-		    documentation 	

-|The port-component-name element specifies a port component's name. This name is assigned by the module producer to name the service implementation bean in the module's deployment descriptor. The name must be unique among the port component names defined in the same module.

-|

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "serviceEndpointInterface"

-		    quid       	"3E526B180177"

-		    documentation 	

-|The service-endpoint-interface element contains the fully-qualified name of the port component's Service Endpoint Interface.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "smallIcon"

-		    quid       	"3F5C91D1038D"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"3F5C91E3019F"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3F5CE85902BC"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "displayName"

-		    quid       	"3F5CE8620070"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WSDLPort"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10ABC40205"

-	    documentation 	

-|Defines the name space and local name part of the WSDL port QName.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F438C890363"

-		    supplier   	"Logical View::common::QName"

-		    quidu      	"3F3BEF5D02C0"))

-	    language   	"Java")

-	(object Class "ServiceImplBean"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC0A0016"

-	    documentation 	

-|The service-impl-bean element defines the Web service implementation.A service implementation can be an EJB bean class or JAX-RPC web component. Existing EJB implementations are exposed as a Web service using an ejb-link.

-|

-|Used in: port-component

-|

-	    

-	    language   	"Java")

-	(object Class "ServletLink"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"DisableAutoSync"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Final"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Static"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Strictfp"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateDefaultConstructor"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFinalizer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateStaticInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateInstanceInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateCode"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ReadOnly"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedExtends"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedImplements"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ConstructorIs"

-		    value      	("Ctor_Set" 62))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC1502E2"

-	    documentation 	

-|The servlet-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a JAX-RPC Service Endpoint.

-|

-|The value of the servlet-link element must be the servlet-name of a JAX-RPC Service Endpoint in the same WAR file.

-|

-|Used in: service-impl-bean

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set)

-		    quid       	"3E3953A5010A"

-		    supplier   	"Logical View::wsdd::BeanLink"

-		    quidu      	"3E3952E700EC"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "servletLink"

-		    quid       	"3E11E935039B"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "EJBLink"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"DisableAutoSync"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Final"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Static"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Strictfp"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateDefaultConstructor"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFinalizer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateStaticInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateInstanceInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateCode"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ReadOnly"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedExtends"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedImplements"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ConstructorIs"

-		    value      	("Ctor_Set" 62))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC20028D"

-	    documentation 	

-|The ejb-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a Web Service Endpoint.

-|

-|The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file.

-|

-|Used in: service-impl-bean

-|

-|Examples:

-|<ejb-link>EmployeeRecord</ejb-link>

-|	<ejb-link>../products/product.jar#ProductEJB</ejb-link>

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set)

-		    quid       	"3E39538B014B"

-		    supplier   	"Logical View::wsdd::BeanLink"

-		    quidu      	"3E3952E700EC"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "ejbLink"

-		    quid       	"3E11E9240095"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Handler"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC3B01D6"

-	    documentation 	

-|Declares the handler for a port-component. Handlers can access the init-param name/value pairs using the HandlerInfo interface.

-|

-|Used in: port-component

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AFA0007D"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "handlerName"

-		    quid       	"3E526BFE0348"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "handlerClass"

-		    quid       	"3E526C050103"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "BeanLink"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E3952E700EC"

-	    language   	"Java")

-	(object Association "$UNNAMED$0"

-	    quid       	"3E11BD6900E8"

-	    roles      	(list role_list

-		(object Role "wsdlPort"

-		    quid       	"3E11BD6A034C"

-		    label      	"wsdlPort"

-		    supplier   	"Logical View::wsdd::WSDLPort"

-		    quidu      	"3E10ABC40205"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3E11BD6A0356"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"3E11BD74029C"

-	    roles      	(list role_list

-		(object Role "serviceImplBean"

-		    quid       	"3E11BD7602F8"

-		    label      	"serviceImplBean"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"3E11BD7602FA"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3E11BD80037E"

-	    roles      	(list role_list

-		(object Role "handlers "

-		    quid       	"3E11BD840293"

-		    label      	"handlers "

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3E11BD840295"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"3E11C37103CF"

-	    roles      	(list role_list

-		(object Role "eEJBLink"

-		    quid       	"3E11C373015B"

-		    label      	"eEJBLink"

-		    supplier   	"Logical View::wsdd::EJBLink"

-		    quidu      	"3E10AC20028D"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"3E11C373015D"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3E11C379038A"

-	    roles      	(list role_list

-		(object Role "eServletLink"

-		    quid       	"3E11C37C00D1"

-		    label      	"eServletLink"

-		    supplier   	"Logical View::wsdd::ServletLink"

-		    quidu      	"3E10AC1502E2"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"3E11C37C00DC"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E10CA7303C5"

-	    roles      	(list role_list

-		(object Role "webServiceDescriptions"

-		    quid       	"3E10CA760351"

-		    label      	"webServiceDescriptions"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E10CA76035B"

-		    supplier   	"Logical View::wsdd::WebServices"

-		    quidu      	"3E109EEF012F"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E11B7C8033F"

-	    roles      	(list role_list

-		(object Role "portComponents"

-		    quid       	"3E11B7CC02C3"

-		    label      	"portComponents"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E11B7CC02CD"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E11CEDE031E"

-	    roles      	(list role_list

-		(object Role "initParams "

-		    quid       	"3E11CEE00371"

-		    label      	"initParams "

-		    supplier   	"Logical View::wscommon::InitParam"

-		    quidu      	"3E10AC6E0280"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E11CEE00373"

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3E11CEE80001"

-	    roles      	(list role_list

-		(object Role "soapHeaders"

-		    quid       	"3E11CEEA0298"

-		    label      	"soapHeaders"

-		    supplier   	"Logical View::wscommon::SOAPHeader"

-		    quidu      	"3E10AC99022F"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3E11CEEA02A2"

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"3E3953020189"

-	    roles      	(list role_list

-		(object Role "beanLink"

-		    quid       	"3E3953050007"

-		    label      	"beanLink"

-		    supplier   	"Logical View::wsdd::BeanLink"

-		    quidu      	"3E3952E700EC"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"3E3953050011"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E5276360293"

-	    roles      	(list role_list

-		(object Role "soapRoles"

-		    quid       	"3E5276380227"

-		    label      	"soapRoles"

-		    supplier   	"Logical View::wscommon::SOAPRole"

-		    quidu      	"3E10ACBC0164"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E5276380231"

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3F5CBEA10235"

-	    roles      	(list role_list

-		(object Role "descriptionType"

-		    quid       	"3F5CBEA200D8"

-		    label      	"descriptionType"

-		    supplier   	"Logical View::wscommon::DescriptionType"

-		    quidu      	"3F5CBC6D0353"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3F5CBEA200E2"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"3F5CBEA700C1"

-	    roles      	(list role_list

-		(object Role "displayNameType"

-		    quid       	"3F5CBEA8031B"

-		    label      	"displayNameType"

-		    supplier   	"Logical View::wscommon::DisplayNameType"

-		    quidu      	"3F5CBC780236"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"3F5CBEA80325"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$26"

-	    quid       	"3F5CBF8A0114"

-	    roles      	(list role_list

-		(object Role "descriptionTypes"

-		    quid       	"3F5CBF8B0075"

-		    label      	"descriptionTypes"

-		    supplier   	"Logical View::wscommon::DescriptionType"

-		    quidu      	"3F5CBC6D0353"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"3F5CBF8B0089"

-		    supplier   	"Logical View::wscommon::InitParam"

-		    quidu      	"3E10AC6E0280"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"3F5DDBB70311"

-	    roles      	(list role_list

-		(object Role "descriptionType"

-		    quid       	"3F5DDBB80255"

-		    label      	"descriptionType"

-		    supplier   	"Logical View::wscommon::DescriptionType"

-		    quidu      	"3F5CBC6D0353"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"3F5DDBB80269"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"3F5DDBBE039E"

-	    roles      	(list role_list

-		(object Role "displayNameType"

-		    quid       	"3F5DDBBF0309"

-		    label      	"displayNameType"

-		    supplier   	"Logical View::wscommon::DisplayNameType"

-		    quidu      	"3F5CBC780236"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"3F5DDBBF0313"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"3F5DDC4500F9"

-	    roles      	(list role_list

-		(object Role "iconType"

-		    quid       	"3F5DDC460046"

-		    label      	"iconType"

-		    supplier   	"Logical View::common::IconType"

-		    quidu      	"3E4A99EE003A"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3F5DDC460050"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"3F5DDE950122"

-	    roles      	(list role_list

-		(object Role "iconType"

-		    quid       	"3F5DDE96016A"

-		    label      	"iconType"

-		    supplier   	"Logical View::common::IconType"

-		    quidu      	"3E4A99EE003A"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"3F5DDE96017E"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "PortComponent"

-	    quid       	"3E11BAD902A3"

-	    title      	"PortComponent"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::wsdd::EJBLink" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(870, 2734)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(725, 2661)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	290

-			justify    	0

-			label      	"EJBLink")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC20028D"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(725, 2713)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	286)

-		    width      	308

-		    height     	166

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::ServletLink" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1567, 2719)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1390, 2646)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"ServletLink")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC1502E2"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1390, 2698)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	350)

-		    width      	372

-		    height     	166

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::QName" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1856, 672)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(1575, 506)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"QName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3F3BEF5D02C0"

-		    compartment 	(object Compartment

-			Parent_View 	@3

-			location   	(1575, 602)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	558)

-		    width      	580

-		    height     	352

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(192, 129)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(64, 10)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@4

-			location   	(64, 106)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	253)

-		    width      	274

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DisplayName" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(640, 129)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(424, 10)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@5

-			location   	(424, 106)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	428)

-		    width      	450

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::BeanLink" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1241, 2426)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(1154, 2381)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	174

-			justify    	0

-			label      	"BeanLink")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E3952E700EC"

-		    width      	192

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @7

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E39538B014B"

-		    client     	@1

-		    supplier   	@6

-		    vertices   	(list Points

-			(968, 2650)

-			(1172, 2481))

-		    line_style 	0)

-		(object InheritView "" @8

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E3953A5010A"

-		    client     	@2

-		    supplier   	@6

-		    vertices   	(list Points

-			(1474, 2635)

-			(1302, 2481))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wsdd::Handler" @9

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 2239)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@9

-			location   	(119, 2069)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	434

-			justify    	0

-			label      	"Handler")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC3B01D6"

-		    compartment 	(object Compartment

-			Parent_View 	@9

-			location   	(119, 2121)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	375)

-		    width      	452

-		    height     	360

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::WSDLPort" @10

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1839, 1038)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@10

-			location   	(1747, 993)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	184

-			justify    	0

-			label      	"WSDLPort")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10ABC40205"

-		    width      	202

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @11

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F438C890363"

-		    client     	@10

-		    supplier   	@3

-		    vertices   	(list Points

-			(1841, 983)

-			(1841, 848))

-		    line_style 	3

-		    origin_attachment 	(1841, 983)

-		    terminal_attachment 	(1841, 848))

-		(object ClassView "Class" "Logical View::wsdd::ServiceImplBean" @12

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1231, 1409)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@12

-			location   	(1088, 1364)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	286

-			justify    	0

-			label      	"ServiceImplBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC0A0016"

-		    width      	304

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$18" @13

-		    location   	(1235, 1917)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E3953020189"

-		    roleview_list 	(list RoleViews

-			(object RoleView "beanLink" @14

-			    Parent_View 	@13

-			    location   	(19, 121)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @15

-				Parent_View 	@14

-				location   	(1102, 2172)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	162

-				justify    	0

-				label      	"+beanLink"

-				pctDist    	0.559441

-				height     	137

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E3953050007"

-			    client     	@13

-			    supplier   	@6

-			    vertices   	(list Points

-				(1235, 1917)

-				(1240, 2370))

-			    line_style 	0

-			    label      	(object SegLabel @16

-				Parent_View 	@14

-				location   	(1325, 2272)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.783217

-				height     	86

-				orientation 	0))

-			(object RoleView "$UNNAMED$19" @17

-			    Parent_View 	@13

-			    location   	(19, 121)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E3953050011"

-			    client     	@13

-			    supplier   	@12

-			    vertices   	(list Points

-				(1235, 1917)

-				(1231, 1464))

-			    line_style 	0

-			    label      	(object SegLabel @18

-				Parent_View 	@17

-				location   	(1285, 1512)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.895105

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::wscommon::DescriptionType" @19

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(192, 464)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@19

-			location   	(55, 396)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"DescriptionType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC6D0353"

-		    width      	292

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::DisplayNameType" @20

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(640, 464)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@20

-			location   	(491, 396)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	298

-			justify    	0

-			label      	"DisplayNameType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC780236"

-		    width      	316

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::IconType" @21

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1216, 400)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@21

-			location   	(961, 257)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	510

-			justify    	0

-			label      	"IconType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A99EE003A"

-		    compartment 	(object Compartment

-			Parent_View 	@21

-			location   	(961, 353)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	506)

-		    width      	528

-		    height     	306

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::PortComponent" @22

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 1040)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@22

-			location   	(32, 850)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	608

-			justify    	0

-			label      	"PortComponent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AB8D01F6"

-		    compartment 	(object Compartment

-			Parent_View 	@22

-			location   	(32, 902)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	604)

-		    width      	626

-		    height     	400

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$4" @23

-		    location   	(336, 1649)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11BD80037E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "handlers " @24

-			    Parent_View 	@23

-			    location   	(48, 1541)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @25

-				Parent_View 	@24

-				location   	(296, 1976)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	149

-				justify    	0

-				label      	"+handlers "

-				pctDist    	0.799082

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD840293"

-			    client     	@23

-			    supplier   	@9

-			    vertices   	(list Points

-				(336, 1649)

-				(336, 2058))

-			    line_style 	0

-			    label      	(object SegLabel @26

-				Parent_View 	@24

-				location   	(390, 2016)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900115

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$5" @27

-			    Parent_View 	@23

-			    location   	(48, 1541)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD840295"

-			    client     	@23

-			    supplier   	@22

-			    vertices   	(list Points

-				(336, 1649)

-				(336, 1240))

-			    line_style 	0

-			    label      	(object SegLabel @28

-				Parent_View 	@27

-				location   	(390, 1282)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.900115

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$0" @29

-		    location   	(1193, 1038)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11BD6900E8"

-		    roleview_list 	(list RoleViews

-			(object RoleView "wsdlPort" @30

-			    Parent_View 	@29

-			    location   	(909, 922)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @31

-				Parent_View 	@30

-				location   	(1422, 1083)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	192

-				justify    	0

-				label      	"+wsdlPort"

-				pctDist    	0.421296

-				height     	45

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD6A034C"

-			    client     	@29

-			    supplier   	@10

-			    vertices   	(list Points

-				(1193, 1038)

-				(1737, 1038))

-			    line_style 	0

-			    label      	(object SegLabel @32

-				Parent_View 	@30

-				location   	(1737, 998)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	1.003623

-				height     	41

-				orientation 	0))

-			(object RoleView "$UNNAMED$1" @33

-			    Parent_View 	@29

-			    location   	(909, 922)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD6A0356"

-			    client     	@29

-			    supplier   	@22

-			    vertices   	(list Points

-				(1193, 1038)

-				(649, 1039))

-			    line_style 	0

-			    label      	(object SegLabel @34

-				Parent_View 	@33

-				location   	(707, 988)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.894737

-				height     	52

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$2" @35

-		    location   	(874, 1260)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11BD74029C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceImplBean" @36

-			    Parent_View 	@35

-			    location   	(591, 1144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @37

-				Parent_View 	@36

-				location   	(971, 1539)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	273

-				justify    	0

-				label      	"+serviceImplBean"

-				pctDist    	0.797507

-				height     	222

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD7602F8"

-			    client     	@35

-			    supplier   	@12

-			    vertices   	(list Points

-				(874, 1260)

-				(1100, 1353))

-			    line_style 	0

-			    label      	(object SegLabel @38

-				Parent_View 	@36

-				location   	(1067, 1376)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.913571

-				height     	35

-				orientation 	1))

-			(object RoleView "$UNNAMED$3" @39

-			    Parent_View 	@35

-			    location   	(591, 1144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD7602FA"

-			    client     	@35

-			    supplier   	@22

-			    vertices   	(list Points

-				(874, 1260)

-				(649, 1168))

-			    line_style 	0

-			    label      	(object SegLabel @40

-				Parent_View 	@39

-				location   	(692, 1129)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.897595

-				height     	53

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$22" @41

-		    location   	(248, 690)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5CBEA10235"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptionType" @42

-			    Parent_View 	@41

-			    location   	(-72, -132)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @43

-				Parent_View 	@42

-				location   	(179, 628)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	255

-				justify    	0

-				label      	"+descriptionType"

-				pctDist    	0.501320

-				height     	53

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA200D8"

-			    client     	@41

-			    supplier   	@19

-			    vertices   	(list Points

-				(248, 690)

-				(211, 542))

-			    line_style 	0

-			    label      	(object SegLabel @44

-				Parent_View 	@42

-				location   	(267, 581)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.668995

-				height     	45

-				orientation 	1))

-			(object RoleView "$UNNAMED$23" @45

-			    Parent_View 	@41

-			    location   	(-72, -132)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA200E2"

-			    client     	@41

-			    supplier   	@22

-			    vertices   	(list Points

-				(248, 690)

-				(285, 839))

-			    line_style 	0

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(333, 811)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.890954

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$24" @47

-		    location   	(519, 690)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5CBEA700C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNameType" @48

-			    Parent_View 	@47

-			    location   	(192, -124)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @49

-				Parent_View 	@48

-				location   	(534, 662)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+displayNameType"

-				pctDist    	0.194674

-				height     	1

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA8031B"

-			    client     	@47

-			    supplier   	@20

-			    vertices   	(list Points

-				(519, 690)

-				(598, 542))

-			    line_style 	0

-			    label      	(object SegLabel @50

-				Parent_View 	@48

-				location   	(652, 612)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	157

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.778527

-				height     	81

-				orientation 	1))

-			(object RoleView "$UNNAMED$25" @51

-			    Parent_View 	@47

-			    location   	(192, -124)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA80325"

-			    client     	@47

-			    supplier   	@22

-			    vertices   	(list Points

-				(519, 690)

-				(441, 839))

-			    line_style 	0

-			    label      	(object SegLabel @52

-				Parent_View 	@51

-				location   	(497, 849)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.898276

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$34" @53

-		    location   	(807, 696)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDE950122"

-		    roleview_list 	(list RoleViews

-			(object RoleView "iconType" @54

-			    Parent_View 	@53

-			    location   	(474, -345)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @55

-				Parent_View 	@54

-				location   	(941, 550)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+iconType"

-				pctDist    	0.799329

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDE96016A"

-			    client     	@53

-			    supplier   	@21

-			    vertices   	(list Points

-				(807, 696)

-				(1003, 553))

-			    line_style 	0

-			    label      	(object SegLabel @56

-				Parent_View 	@54

-				location   	(1015, 612)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900575

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @57

-			    Parent_View 	@53

-			    location   	(474, -345)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDE96017E"

-			    client     	@53

-			    supplier   	@22

-			    vertices   	(list Points

-				(807, 696)

-				(611, 839))

-			    line_style 	0

-			    label      	(object SegLabel @58

-				Parent_View 	@57

-				location   	(663, 868)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object InheritView "" @59

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB7E00C1"

-		    client     	@19

-		    supplier   	@4

-		    vertices   	(list Points

-			(192, 385)

-			(192, 258))

-		    line_style 	0)

-		(object InheritView "" @60

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB82033D"

-		    client     	@20

-		    supplier   	@5

-		    vertices   	(list Points

-			(640, 385)

-			(640, 258))

-		    line_style 	0)))

-	(object ClassDiagram "WebServices"

-	    quid       	"3E109E8A0181"

-	    title      	"WebServices"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::wsdd::WebServiceDescription" @61

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(484, 1216)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@61

-			location   	(142, 1002)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	684

-			justify    	0

-			label      	"WebServiceDescription")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10A1500313"

-		    compartment 	(object Compartment

-			Parent_View 	@61

-			location   	(142, 1054)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	681)

-		    width      	702

-		    height     	448

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::WebServices" @62

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(487, 690)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@62

-			location   	(374, 645)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	226

-			justify    	0

-			label      	"WebServices")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E109EEF012F"

-		    width      	244

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$10" @63

-		    location   	(485, 868)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E10CA7303C5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webServiceDescriptions" @64

-			    Parent_View 	@63

-			    location   	(-123, 563)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @65

-				Parent_View 	@64

-				location   	(239, 982)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	374

-				justify    	0

-				label      	"+webServiceDescriptions"

-				pctDist    	0.938416

-				height     	246

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E10CA760351"

-			    client     	@63

-			    supplier   	@61

-			    vertices   	(list Points

-				(485, 868)

-				(484, 991))

-			    line_style 	0

-			    label      	(object SegLabel @66

-				Parent_View 	@64

-				location   	(538, 978)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	62

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.898827

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @67

-			    Parent_View 	@63

-			    location   	(-123, 563)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E10CA76035B"

-			    client     	@63

-			    supplier   	@62

-			    vertices   	(list Points

-				(485, 868)

-				(486, 745))

-			    line_style 	0

-			    label      	(object SegLabel @68

-				Parent_View 	@67

-				location   	(540, 758)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.898678

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::CompatibilityDescriptionGroup" @69

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(487, 281)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@69

-			location   	(141, 102)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"4023ADF20197"

-		    compartment 	(object Compartment

-			Parent_View 	@69

-			location   	(141, 217)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	13434879

-			anchor     	2

-			nlines     	5

-			max_width  	437)

-		    width      	710

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @70

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4023B0DD00DD"

-		    client     	@62

-		    supplier   	@69

-		    vertices   	(list Points

-			(487, 634)

-			(487, 472))

-		    line_style 	0)))

-	(object ClassDiagram "WebServiceDescription"

-	    quid       	"3E10D66B02EA"

-	    title      	"WebServiceDescription"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	26

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::DisplayName" @71

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2176, 640)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@71

-			location   	(1960, 521)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@71

-			location   	(1960, 617)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	428)

-		    width      	450

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @72

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2096, 320)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@72

-			location   	(1968, 201)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@72

-			location   	(1968, 297)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	253)

-		    width      	274

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::PortComponent" @73

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(395, 1621)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@73

-			location   	(91, 1431)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	608

-			justify    	0

-			label      	"PortComponent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AB8D01F6"

-		    compartment 	(object Compartment

-			Parent_View 	@73

-			location   	(91, 1483)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	604)

-		    width      	626

-		    height     	400

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::DescriptionType" @74

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1408, 320)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@74

-			location   	(1271, 252)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"DescriptionType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC6D0353"

-		    width      	292

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @75

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB7E00C1"

-		    client     	@74

-		    supplier   	@72

-		    vertices   	(list Points

-			(1554, 320)

-			(1958, 320))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wscommon::DisplayNameType" @76

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1424, 640)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@76

-			location   	(1275, 572)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	298

-			justify    	0

-			label      	"DisplayNameType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC780236"

-		    width      	316

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @77

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB82033D"

-		    client     	@76

-		    supplier   	@71

-		    vertices   	(list Points

-			(1582, 640)

-			(1950, 640))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::IconType" @78

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 992)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@78

-			location   	(1233, 849)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	510

-			justify    	0

-			label      	"IconType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A99EE003A"

-		    compartment 	(object Compartment

-			Parent_View 	@78

-			location   	(1233, 945)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	506)

-		    width      	528

-		    height     	306

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::WebServiceDescription" @79

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(395, 644)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@79

-			location   	(53, 430)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	684

-			justify    	0

-			label      	"WebServiceDescription")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10A1500313"

-		    compartment 	(object Compartment

-			Parent_View 	@79

-			location   	(53, 482)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	681)

-		    width      	702

-		    height     	448

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @80

-		    location   	(395, 1144)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11B7C8033F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "portComponents" @81

-			    Parent_View 	@80

-			    location   	(107, 983)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @82

-				Parent_View 	@81

-				location   	(355, 1363)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	270

-				justify    	0

-				label      	"+portComponents"

-				pctDist    	0.797920

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11B7CC02C3"

-			    client     	@80

-			    supplier   	@73

-			    vertices   	(list Points

-				(395, 1144)

-				(395, 1420))

-			    line_style 	0

-			    label      	(object SegLabel @83

-				Parent_View 	@81

-				location   	(449, 1392)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.898960

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$13" @84

-			    Parent_View 	@80

-			    location   	(107, 983)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11B7CC02CD"

-			    client     	@80

-			    supplier   	@79

-			    vertices   	(list Points

-				(395, 1144)

-				(395, 868))

-			    line_style 	0

-			    label      	(object SegLabel @85

-				Parent_View 	@84

-				location   	(449, 896)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.900298

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$28" @86

-		    location   	(1003, 448)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDBB70311"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptionType" @87

-			    Parent_View 	@86

-			    location   	(648, -189)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(1198, 346)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	264

-				justify    	0

-				label      	"+descriptionType"

-				pctDist    	0.796532

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBB80255"

-			    client     	@86

-			    supplier   	@74

-			    vertices   	(list Points

-				(1003, 448)

-				(1261, 366))

-			    line_style 	0

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(1251, 425)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.896416

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$29" @90

-			    Parent_View 	@86

-			    location   	(648, -189)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBB80269"

-			    client     	@86

-			    supplier   	@79

-			    vertices   	(list Points

-				(1003, 448)

-				(746, 530))

-			    line_style 	0

-			    label      	(object SegLabel @91

-				Parent_View 	@90

-				location   	(789, 574)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.894875

-				height     	55

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$30" @92

-		    location   	(1005, 641)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDBBE039E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNameType" @93

-			    Parent_View 	@92

-			    location   	(649, 1)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1211, 600)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	296

-				justify    	0

-				label      	"+displayNameType"

-				pctDist    	0.796992

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBBF0309"

-			    client     	@92

-			    supplier   	@76

-			    vertices   	(list Points

-				(1005, 641)

-				(1265, 640))

-			    line_style 	0

-			    label      	(object SegLabel @95

-				Parent_View 	@93

-				location   	(1238, 694)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.898496

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$31" @96

-			    Parent_View 	@92

-			    location   	(649, 1)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBBF0313"

-			    client     	@92

-			    supplier   	@79

-			    vertices   	(list Points

-				(1005, 641)

-				(746, 642))

-			    line_style 	0

-			    label      	(object SegLabel @97

-				Parent_View 	@96

-				location   	(772, 696)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.898496

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$32" @98

-		    location   	(984, 830)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDC4500F9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "iconType" @99

-			    Parent_View 	@98

-			    location   	(631, 185)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @100

-				Parent_View 	@99

-				location   	(1187, 853)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+iconType"

-				pctDist    	0.795003

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDC460046"

-			    client     	@98

-			    supplier   	@78

-			    vertices   	(list Points

-				(984, 830)

-				(1223, 907))

-			    line_style 	0

-			    label      	(object SegLabel @101

-				Parent_View 	@99

-				location   	(1183, 950)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.901946

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$33" @102

-			    Parent_View 	@98

-			    location   	(631, 185)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDC460050"

-			    client     	@98

-			    supplier   	@79

-			    vertices   	(list Points

-				(984, 830)

-				(746, 754))

-			    line_style 	0

-			    label      	(object SegLabel @103

-				Parent_View 	@102

-				location   	(758, 812)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.889918

-				height     	53

-				orientation 	0))))))

-	(object ClassDiagram "Handler"

-	    quid       	"3E11CC500304"

-	    title      	"Handler"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	694

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::QName" @104

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1836, 1012)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@104

-			location   	(1555, 846)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"QName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3F3BEF5D02C0"

-		    compartment 	(object Compartment

-			Parent_View 	@104

-			location   	(1555, 942)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	558)

-		    width      	580

-		    height     	352

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::SOAPHeader" @105

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 1456)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@105

-			location   	(975, 1375)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	226

-			justify    	0

-			label      	"SOAPHeader")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC99022F"

-		    width      	244

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @106

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F4671870049"

-		    client     	@105

-		    supplier   	@104

-		    vertices   	(list Points

-			(1210, 1382)

-			(1545, 1183))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wscommon::SOAPRole" @107

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(528, 1840)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@107

-			location   	(348, 1734)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	360

-			justify    	0

-			label      	"SOAPRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10ACBC0164"

-		    compartment 	(object Compartment

-			Parent_View 	@107

-			location   	(348, 1830)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	312)

-		    width      	378

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::Handler" @108

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(281, 884)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@108

-			location   	(62, 757)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	438

-			justify    	0

-			label      	"Handler")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC3B01D6"

-		    compartment 	(object Compartment

-			Parent_View 	@108

-			location   	(62, 809)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	375)

-		    width      	456

-		    height     	275

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$16" @109

-		    location   	(719, 1195)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11CEE80001"

-		    roleview_list 	(list RoleViews

-			(object RoleView "soapHeaders" @110

-			    Parent_View 	@109

-			    location   	(582, 1090)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @111

-				Parent_View 	@110

-				location   	(892, 1367)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	213

-				justify    	0

-				label      	"+soapHeaders"

-				pctDist    	0.799970

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEEA0298"

-			    client     	@109

-			    supplier   	@105

-			    vertices   	(list Points

-				(719, 1195)

-				(965, 1368))

-			    line_style 	0

-			    label      	(object SegLabel @112

-				Parent_View 	@110

-				location   	(970, 1308)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.901260

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$17" @113

-			    Parent_View 	@109

-			    location   	(582, 1090)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEEA02A2"

-			    client     	@109

-			    supplier   	@108

-			    vertices   	(list Points

-				(719, 1195)

-				(475, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @114

-				Parent_View 	@113

-				location   	(530, 996)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.897959

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$20" @115

-		    location   	(406, 1372)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5276360293"

-		    roleview_list 	(list RoleViews

-			(object RoleView "soapRoles" @116

-			    Parent_View 	@115

-			    location   	(187, 413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @117

-				Parent_View 	@116

-				location   	(375, 1655)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	180

-				justify    	0

-				label      	"+soapRoles"

-				pctDist    	0.732968

-				height     	102

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5276380227"

-			    client     	@115

-			    supplier   	@107

-			    vertices   	(list Points

-				(406, 1372)

-				(497, 1723))

-			    line_style 	0

-			    label      	(object SegLabel @118

-				Parent_View 	@116

-				location   	(574, 1680)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.940086

-				height     	86

-				orientation 	0))

-			(object RoleView "$UNNAMED$21" @119

-			    Parent_View 	@115

-			    location   	(187, 413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5276380231"

-			    client     	@115

-			    supplier   	@108

-			    vertices   	(list Points

-				(406, 1372)

-				(315, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @120

-				Parent_View 	@119

-				location   	(376, 1042)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::wscommon::DescriptionType" @121

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1728, 528)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@121

-			location   	(1591, 460)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"DescriptionType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC6D0353"

-		    width      	292

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::InitParam" @122

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 960)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@122

-			location   	(850, 813)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	412

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC6E0280"

-		    compartment 	(object Compartment

-			Parent_View 	@122

-			location   	(850, 909)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	356)

-		    width      	430

-		    height     	314

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$14" @123

-		    location   	(674, 921)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11CEDE031E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams " @124

-			    Parent_View 	@123

-			    location   	(537, 808)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @125

-				Parent_View 	@124

-				location   	(696, 949)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	183

-				justify    	0

-				label      	"+initParams "

-				pctDist    	0.143590

-				height     	26

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEE00371"

-			    client     	@123

-			    supplier   	@122

-			    vertices   	(list Points

-				(674, 921)

-				(840, 936))

-			    line_style 	0

-			    label      	(object SegLabel @126

-				Parent_View 	@124

-				location   	(828, 885)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.899359

-				height     	52

-				orientation 	0))

-			(object RoleView "$UNNAMED$15" @127

-			    Parent_View 	@123

-			    location   	(537, 808)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEE00373"

-			    client     	@123

-			    supplier   	@108

-			    vertices   	(list Points

-				(674, 921)

-				(509, 904))

-			    line_style 	0

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(532, 855)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.899125

-				height     	53

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$26" @129

-		    location   	(1438, 713)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5CBF8A0114"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptionTypes" @130

-			    Parent_View 	@129

-			    location   	(386, -242)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @131

-				Parent_View 	@130

-				location   	(1552, 595)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	278

-				justify    	0

-				label      	"+descriptionTypes"

-				pctDist    	0.803692

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBF8B0075"

-			    client     	@129

-			    supplier   	@121

-			    vertices   	(list Points

-				(1438, 713)

-				(1605, 606))

-			    line_style 	0

-			    label      	(object SegLabel @132

-				Parent_View 	@130

-				location   	(1615, 663)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.895290

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$27" @133

-			    Parent_View 	@129

-			    location   	(386, -242)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBF8B0089"

-			    client     	@129

-			    supplier   	@122

-			    vertices   	(list Points

-				(1438, 713)

-				(1271, 821))

-			    line_style 	0

-			    label      	(object SegLabel @134

-				Parent_View 	@133

-				location   	(1319, 854)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.891508

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::Description" @135

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2368, 528)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@135

-			location   	(2240, 409)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@135

-			location   	(2240, 505)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	253)

-		    width      	274

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @136

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(224, 496)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@136

-			location   	(82, 428)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	284

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4D451F01FB"

-		    width      	302

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @137

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB7E00C1"

-		    client     	@121

-		    supplier   	@135

-		    vertices   	(list Points

-			(1874, 528)

-			(2230, 528))

-		    line_style 	0)))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/schema/ejbModelExtender.exsd b/plugins/org.eclipse.jst.j2ee.core/schema/ejbModelExtender.exsd
deleted file mode 100644
index dc014a5b7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/schema/ejbModelExtender.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.j2ee.core" id="ejbModelExtender" name="EJB Model Extender"/>
-      </appInfo>
-      <documentation>
-         This extension point allows for a helper to be contributed for deriving the JNDI name of enterprise beans, and for inheritance support.  The helper can be plugged in by application
-server vendors.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="ejbModelExtender"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ejbModelExtender">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier for this instance of the model extender
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="extensionClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the qualified name of the class to use to extend the EJB model
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.core/schema/jndiBindingsHelpers.exsd b/plugins/org.eclipse.jst.j2ee.core/schema/jndiBindingsHelpers.exsd
deleted file mode 100644
index d1c041517..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/schema/jndiBindingsHelpers.exsd
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.j2ee.core" id="jndiBindingsHelpers" name="jndiBindingsHelpers"/>
-      </appInfo>
-      <documentation>
-         This extension point allows for a helper to be contributed for deriving the JNDI binding information for enterprise beans.  The helper can be plugged in by application server vendors.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="jndiBindingsHelper"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="jndiBindingsHelper">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the identifier for this instance of the bindings helper
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The qualified class name for the helper class uses in this extension
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jst.j2ee.core.internal.bindings.AbstractBindingsHelper"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ConstructorParameterOrder.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ConstructorParameterOrder.java
deleted file mode 100644
index 20328796d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ConstructorParameterOrder.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constructor Parameter Order</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The constructor-parameter-order element defines the order that complexType element values are applied to a Java exception constructor. Element names are specified for each parameter of the constructor, including element names of inherited types if necessary.
- * 
- * Used in: exception-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getElementNames <em>Element Names</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getConstructorParameterOrder()
- * @model
- * @generated
- */
-public interface ConstructorParameterOrder extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getConstructorParameterOrder_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Element Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Element Names</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element Names</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getConstructorParameterOrder_ElementNames()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName" containment="true" required="true"
-	 * @generated
-	 */
-  EList getElementNames();
-
-} // ConstructorParameterOrder
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ElementName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ElementName.java
deleted file mode 100644
index ec57e81d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ElementName.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The element-name element defines the name of a complexType element name attribute value.
- * 
- * Used in: constructor-parameter-order
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getElementName()
- * @model
- * @generated
- */
-public interface ElementName extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getElementName_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Text</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Text</em>' attribute.
-	 * @see #setText(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getElementName_Text()
-	 * @model
-	 * @generated
-	 */
-  String getText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getText <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Text</em>' attribute.
-	 * @see #getText()
-	 * @generated
-	 */
-  void setText(String value);
-
-} // ElementName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionMapping.java
deleted file mode 100644
index 15899129e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionMapping.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exception Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The exception-mapping element defines the mapping between the service specific exception types and the wsdl faults.
- * 
- * This element should be interpreted with respect to the
- * mapping between a method and an operation which provides the mapping context.
- * 
- * Used in: service-endpoint-method-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getExceptionType <em>Exception Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage <em>Wsdl Message</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder <em>Constructor Parameter Order</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping()
- * @model
- * @generated
- */
-public interface ExceptionMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Exception Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exception Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The exception-type element defines Java type of the exception. It may be a service specific exception.
-	 * 
-	 * It must be a fully qualified class name.
-	 * 
-	 * Used in: exception-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Exception Type</em>' attribute.
-	 * @see #setExceptionType(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_ExceptionType()
-	 * @model
-	 * @generated
-	 */
-  String getExceptionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getExceptionType <em>Exception Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exception Type</em>' attribute.
-	 * @see #getExceptionType()
-	 * @generated
-	 */
-  void setExceptionType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #setWsdlMessagePartName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_WsdlMessagePartName()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlMessagePartName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 */
-  void setWsdlMessagePartName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Message</em>' containment reference.
-	 * @see #setWsdlMessage(WSDLMessage)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_WsdlMessage()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLMessage getWsdlMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage <em>Wsdl Message</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message</em>' containment reference.
-	 * @see #getWsdlMessage()
-	 * @generated
-	 */
-  void setWsdlMessage(WSDLMessage value);
-
-	/**
-	 * Returns the value of the '<em><b>Constructor Parameter Order</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Constructor Parameter Order</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constructor Parameter Order</em>' containment reference.
-	 * @see #setConstructorParameterOrder(ConstructorParameterOrder)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_ConstructorParameterOrder()
-	 * @model containment="true"
-	 * @generated
-	 */
-  ConstructorParameterOrder getConstructorParameterOrder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder <em>Constructor Parameter Order</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constructor Parameter Order</em>' containment reference.
-	 * @see #getConstructorParameterOrder()
-	 * @generated
-	 */
-  void setConstructorParameterOrder(ConstructorParameterOrder value);
-
-} // ExceptionMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/InterfaceMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/InterfaceMapping.java
deleted file mode 100644
index 36fd611ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/InterfaceMapping.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getInterfaceMapping()
- * @model
- * @generated
- */
-public interface InterfaceMapping extends J2EEEObject {
- // InterfaceMapping
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaWSDLMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaWSDLMapping.java
deleted file mode 100644
index d866dedec..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaWSDLMapping.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java WSDL Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The element describes the Java mapping to a known WSDL document.It contains the mapping between package names and XML namespaces, 
- * WSDL root types and Java artifacts, and the set of mappings for services.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getPackageMappings <em>Package Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getJavaXMLTypeMappings <em>Java XML Type Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getExceptionMappings <em>Exception Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getInterfaceMappings <em>Interface Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping()
- * @model
- * @generated
- */
-public interface JavaWSDLMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Package Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Package Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_PackageMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping" containment="true" required="true"
-	 * @generated
-	 */
-  EList getPackageMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Java XML Type Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java XML Type Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Java XML Type Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_JavaXMLTypeMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping" containment="true"
-	 * @generated
-	 */
-  EList getJavaXMLTypeMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Exception Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exception Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exception Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_ExceptionMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping" containment="true"
-	 * @generated
-	 */
-  EList getExceptionMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Interface Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Interface Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interface Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_InterfaceMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping" containment="true"
-	 * @generated
-	 */
-  EList getInterfaceMappings();
-
-} // JavaWSDLMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaXMLTypeMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaXMLTypeMapping.java
deleted file mode 100644
index 828d7e075..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaXMLTypeMapping.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java XML Type Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The java-xml-type-mapping element contains a class-type that is the fully qualified name of the Java class, QName of the XML root type, the WSDL type scope the QName applies to and the set of variable 
- * mappings for each public variable within the Java class.
- * 
- * Used in: java-wsdl-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType <em>Class Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope <em>Qname Scope</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname <em>Anonymous Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname <em>Root Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getVariableMappings <em>Variable Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping()
- * @model
- * @generated
- */
-public interface JavaXMLTypeMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Class Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Class Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The class-type element is the fully qualified class name of a Java class.
-	 * 
-	 * Used in: java-xml-type-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Class Type</em>' attribute.
-	 * @see #setClassType(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_ClassType()
-	 * @model
-	 * @generated
-	 */
-  String getClassType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType <em>Class Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Type</em>' attribute.
-	 * @see #getClassType()
-	 * @generated
-	 */
-  void setClassType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Qname Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Qname Scope</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The qname-scope elements scopes the reference of a QName to the WSDL element type it applies to. The value of qname-scope may be simpleType, complexType, or element.
-	 * 
-	 * Used in: java-xml-type-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Qname Scope</em>' attribute.
-	 * @see #setQnameScope(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_QnameScope()
-	 * @model
-	 * @generated
-	 */
-  String getQnameScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope <em>Qname Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Qname Scope</em>' attribute.
-	 * @see #getQnameScope()
-	 * @generated
-	 */
-  void setQnameScope(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Anonymous Type Qname</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Anonymous Type Qname</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Anonymous Type Qname</em>' attribute.
-	 * @see #setAnonymousTypeQname(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_AnonymousTypeQname()
-	 * @model
-	 * @generated
-	 */
-  String getAnonymousTypeQname();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname <em>Anonymous Type Qname</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Anonymous Type Qname</em>' attribute.
-	 * @see #getAnonymousTypeQname()
-	 * @generated
-	 */
-  void setAnonymousTypeQname(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Root Type Qname</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Root Type Qname</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Root Type Qname</em>' containment reference.
-	 * @see #setRootTypeQname(RootTypeQname)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_RootTypeQname()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  RootTypeQname getRootTypeQname();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname <em>Root Type Qname</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Root Type Qname</em>' containment reference.
-	 * @see #getRootTypeQname()
-	 * @generated
-	 */
-  void setRootTypeQname(RootTypeQname value);
-
-	/**
-	 * Returns the value of the '<em><b>Variable Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Variable Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variable Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_VariableMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping" containment="true"
-	 * @generated
-	 */
-  EList getVariableMappings();
-
-} // JavaXMLTypeMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapFactory.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapFactory.java
deleted file mode 100644
index 4ae41c9aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapFactory.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage
- * @generated
- */
-public interface JaxrpcmapFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  JaxrpcmapFactory eINSTANCE = org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Java WSDL Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Java WSDL Mapping</em>'.
-	 * @generated
-	 */
-  JavaWSDLMapping createJavaWSDLMapping();
-
-	/**
-	 * Returns a new object of class '<em>Package Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Package Mapping</em>'.
-	 * @generated
-	 */
-  PackageMapping createPackageMapping();
-
-	/**
-	 * Returns a new object of class '<em>Java XML Type Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Java XML Type Mapping</em>'.
-	 * @generated
-	 */
-  JavaXMLTypeMapping createJavaXMLTypeMapping();
-
-	/**
-	 * Returns a new object of class '<em>Exception Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Exception Mapping</em>'.
-	 * @generated
-	 */
-  ExceptionMapping createExceptionMapping();
-
-	/**
-	 * Returns a new object of class '<em>Service Interface Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Interface Mapping</em>'.
-	 * @generated
-	 */
-  ServiceInterfaceMapping createServiceInterfaceMapping();
-
-	/**
-	 * Returns a new object of class '<em>Service Endpoint Interface Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Endpoint Interface Mapping</em>'.
-	 * @generated
-	 */
-  ServiceEndpointInterfaceMapping createServiceEndpointInterfaceMapping();
-
-	/**
-	 * Returns a new object of class '<em>Root Type Qname</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Root Type Qname</em>'.
-	 * @generated
-	 */
-  RootTypeQname createRootTypeQname();
-
-	/**
-	 * Returns a new object of class '<em>Variable Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Variable Mapping</em>'.
-	 * @generated
-	 */
-  VariableMapping createVariableMapping();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Message</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Message</em>'.
-	 * @generated
-	 */
-  WSDLMessage createWSDLMessage();
-
-	/**
-	 * Returns a new object of class '<em>Constructor Parameter Order</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constructor Parameter Order</em>'.
-	 * @generated
-	 */
-  ConstructorParameterOrder createConstructorParameterOrder();
-
-	/**
-	 * Returns a new object of class '<em>Element Name</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Element Name</em>'.
-	 * @generated
-	 */
-  ElementName createElementName();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Service Name</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Service Name</em>'.
-	 * @generated
-	 */
-  WSDLServiceName createWSDLServiceName();
-
-	/**
-	 * Returns a new object of class '<em>Port Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Mapping</em>'.
-	 * @generated
-	 */
-  PortMapping createPortMapping();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Port Type</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Port Type</em>'.
-	 * @generated
-	 */
-  WSDLPortType createWSDLPortType();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Binding</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Binding</em>'.
-	 * @generated
-	 */
-  WSDLBinding createWSDLBinding();
-
-	/**
-	 * Returns a new object of class '<em>Service Endpoint Method Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Endpoint Method Mapping</em>'.
-	 * @generated
-	 */
-  ServiceEndpointMethodMapping createServiceEndpointMethodMapping();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Operation</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Operation</em>'.
-	 * @generated
-	 */
-  WSDLOperation createWSDLOperation();
-
-	/**
-	 * Returns a new object of class '<em>Method Param Parts Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Param Parts Mapping</em>'.
-	 * @generated
-	 */
-  MethodParamPartsMapping createMethodParamPartsMapping();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Return Value Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Return Value Mapping</em>'.
-	 * @generated
-	 */
-  WSDLReturnValueMapping createWSDLReturnValueMapping();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Message Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Message Mapping</em>'.
-	 * @generated
-	 */
-  WSDLMessageMapping createWSDLMessageMapping();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Message Part Name</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Message Part Name</em>'.
-	 * @generated
-	 */
-  WSDLMessagePartName createWSDLMessagePartName();
-
-	/**
-	 * Returns a new object of class '<em>Interface Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Interface Mapping</em>'.
-	 * @generated
-	 */
-  InterfaceMapping createInterfaceMapping();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * This method is NOT api, and may change in future releases.  
-	 * EMF package classes should be access via their "eINSTANCE" static fields
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-  JaxrpcmapPackage getJaxrpcmapPackage();
-
-} //JaxrpcmapFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapPackage.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapPackage.java
deleted file mode 100644
index fbbe5a88c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapPackage.java
+++ /dev/null
@@ -1,2921 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory
- * @model kind="package"
- * @generated
- */
-public interface JaxrpcmapPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNAME = "jaxrpcmap";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_URI = "jaxrpcmap.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_PREFIX = "org.eclipse.jst.j2ee.webservice.jaxrpcmap";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  JaxrpcmapPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl <em>Java WSDL Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getJavaWSDLMapping()
-	 * @generated
-	 */
-  int JAVA_WSDL_MAPPING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_WSDL_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Package Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Java XML Type Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Exception Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Interface Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Java WSDL Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_WSDL_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl <em>Package Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getPackageMapping()
-	 * @generated
-	 */
-  int PACKAGE_MAPPING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PACKAGE_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Package Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PACKAGE_MAPPING__PACKAGE_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PACKAGE_MAPPING__NAMESPACE_URI = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Package Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PACKAGE_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl <em>Java XML Type Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  int JAVA_XML_TYPE_MAPPING = 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Class Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING__CLASS_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Qname Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING__QNAME_SCOPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Anonymous Type Qname</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Root Type Qname</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Variable Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Java XML Type Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int JAVA_XML_TYPE_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl <em>Exception Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getExceptionMapping()
-	 * @generated
-	 */
-  int EXCEPTION_MAPPING = 3;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EXCEPTION_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Exception Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EXCEPTION_MAPPING__EXCEPTION_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EXCEPTION_MAPPING__WSDL_MESSAGE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Constructor Parameter Order</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Exception Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EXCEPTION_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.InterfaceMappingImpl <em>Interface Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.InterfaceMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getInterfaceMapping()
-	 * @generated
-	 */
-  int INTERFACE_MAPPING = 21;
-
-	/**
-	 * The number of structural features of the '<em>Interface Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INTERFACE_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl <em>Service Interface Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getServiceInterfaceMapping()
-	 * @generated
-	 */
-  int SERVICE_INTERFACE_MAPPING = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_INTERFACE_MAPPING__ID = INTERFACE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE = INTERFACE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Service Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME = INTERFACE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Port Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS = INTERFACE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Service Interface Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_INTERFACE_MAPPING_FEATURE_COUNT = INTERFACE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl <em>Service Endpoint Interface Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getServiceEndpointInterfaceMapping()
-	 * @generated
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING = 5;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__ID = INTERFACE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE = INTERFACE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Port Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE = INTERFACE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Binding</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING = INTERFACE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Method Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS = INTERFACE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Service Endpoint Interface Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING_FEATURE_COUNT = INTERFACE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.RootTypeQnameImpl <em>Root Type Qname</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.RootTypeQnameImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getRootTypeQname()
-	 * @generated
-	 */
-  int ROOT_TYPE_QNAME = 6;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ROOT_TYPE_QNAME__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ROOT_TYPE_QNAME__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ROOT_TYPE_QNAME__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ROOT_TYPE_QNAME__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>Root Type Qname</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ROOT_TYPE_QNAME_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl <em>Variable Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getVariableMapping()
-	 * @generated
-	 */
-  int VARIABLE_MAPPING = 7;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Java Variable Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING__JAVA_VARIABLE_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Xml Element Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING__XML_ELEMENT_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Data Member</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING__DATA_MEMBER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Xml Attribute Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING__XML_ATTRIBUTE_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Xml Wildcard</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING__XML_WILDCARD = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Variable Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int VARIABLE_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageImpl <em>WSDL Message</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLMessage()
-	 * @generated
-	 */
-  int WSDL_MESSAGE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Message</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ConstructorParameterOrderImpl <em>Constructor Parameter Order</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ConstructorParameterOrderImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getConstructorParameterOrder()
-	 * @generated
-	 */
-  int CONSTRUCTOR_PARAMETER_ORDER = 9;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int CONSTRUCTOR_PARAMETER_ORDER__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Element Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Constructor Parameter Order</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int CONSTRUCTOR_PARAMETER_ORDER_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ElementNameImpl <em>Element Name</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ElementNameImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getElementName()
-	 * @generated
-	 */
-  int ELEMENT_NAME = 10;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ELEMENT_NAME__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ELEMENT_NAME__TEXT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Element Name</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int ELEMENT_NAME_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLServiceNameImpl <em>WSDL Service Name</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLServiceNameImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLServiceName()
-	 * @generated
-	 */
-  int WSDL_SERVICE_NAME = 11;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_SERVICE_NAME__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_SERVICE_NAME__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_SERVICE_NAME__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_SERVICE_NAME__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Service Name</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_SERVICE_NAME_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl <em>Port Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getPortMapping()
-	 * @generated
-	 */
-  int PORT_MAPPING = 12;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_MAPPING__PORT_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Java Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_MAPPING__JAVA_PORT_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Port Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLPortTypeImpl <em>WSDL Port Type</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLPortTypeImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLPortType()
-	 * @generated
-	 */
-  int WSDL_PORT_TYPE = 13;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_TYPE__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_TYPE__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_TYPE__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_TYPE__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Port Type</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_TYPE_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLBindingImpl <em>WSDL Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLBindingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLBinding()
-	 * @generated
-	 */
-  int WSDL_BINDING = 14;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_BINDING__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_BINDING__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_BINDING__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_BINDING__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Binding</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_BINDING_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl <em>Service Endpoint Method Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING = 15;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Java Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Operation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Wrapped Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Method Param Parts Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Return Value Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Service Endpoint Method Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_ENDPOINT_METHOD_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLOperationImpl <em>WSDL Operation</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLOperationImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLOperation()
-	 * @generated
-	 */
-  int WSDL_OPERATION = 16;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_OPERATION__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Operation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_OPERATION__WSDL_OPERATION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Operation</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_OPERATION_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl <em>Method Param Parts Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getMethodParamPartsMapping()
-	 * @generated
-	 */
-  int METHOD_PARAM_PARTS_MAPPING = 17;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int METHOD_PARAM_PARTS_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Param Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Param Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Method Param Parts Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int METHOD_PARAM_PARTS_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl <em>WSDL Return Value Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLReturnValueMapping()
-	 * @generated
-	 */
-  int WSDL_RETURN_VALUE_MAPPING = 18;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_RETURN_VALUE_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Return Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Return Value Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_RETURN_VALUE_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl <em>WSDL Message Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLMessageMapping()
-	 * @generated
-	 */
-  int WSDL_MESSAGE_MAPPING = 19;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_MAPPING__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_MAPPING__PARAMETER_MODE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Soap Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_MAPPING__SOAP_HEADER = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_MAPPING__WSDL_MESSAGE = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Message Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_MAPPING_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessagePartNameImpl <em>WSDL Message Part Name</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessagePartNameImpl
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLMessagePartName()
-	 * @generated
-	 */
-  int WSDL_MESSAGE_PART_NAME = 20;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_PART_NAME__ID = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>WSDL Message Part Name</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_MESSAGE_PART_NAME_FEATURE_COUNT = CommonPackage.J2EEE_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping <em>Java WSDL Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Java WSDL Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping
-	 * @generated
-	 */
-  EClass getJavaWSDLMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getId()
-	 * @see #getJavaWSDLMapping()
-	 * @generated
-	 */
-  EAttribute getJavaWSDLMapping_Id();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getPackageMappings <em>Package Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Package Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getPackageMappings()
-	 * @see #getJavaWSDLMapping()
-	 * @generated
-	 */
-  EReference getJavaWSDLMapping_PackageMappings();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getJavaXMLTypeMappings <em>Java XML Type Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Java XML Type Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getJavaXMLTypeMappings()
-	 * @see #getJavaWSDLMapping()
-	 * @generated
-	 */
-  EReference getJavaWSDLMapping_JavaXMLTypeMappings();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getExceptionMappings <em>Exception Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Exception Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getExceptionMappings()
-	 * @see #getJavaWSDLMapping()
-	 * @generated
-	 */
-  EReference getJavaWSDLMapping_ExceptionMappings();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getInterfaceMappings <em>Interface Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interface Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping#getInterfaceMappings()
-	 * @see #getJavaWSDLMapping()
-	 * @generated
-	 */
-  EReference getJavaWSDLMapping_InterfaceMappings();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping <em>Package Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Package Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping
-	 * @generated
-	 */
-  EClass getPackageMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getId()
-	 * @see #getPackageMapping()
-	 * @generated
-	 */
-  EAttribute getPackageMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getPackageType <em>Package Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Package Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getPackageType()
-	 * @see #getPackageMapping()
-	 * @generated
-	 */
-  EAttribute getPackageMapping_PackageType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getNamespaceURI <em>Namespace URI</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Namespace URI</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getNamespaceURI()
-	 * @see #getPackageMapping()
-	 * @generated
-	 */
-  EAttribute getPackageMapping_NamespaceURI();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping <em>Java XML Type Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Java XML Type Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping
-	 * @generated
-	 */
-  EClass getJavaXMLTypeMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getId()
-	 * @see #getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  EAttribute getJavaXMLTypeMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType <em>Class Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType()
-	 * @see #getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  EAttribute getJavaXMLTypeMapping_ClassType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope <em>Qname Scope</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Qname Scope</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope()
-	 * @see #getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  EAttribute getJavaXMLTypeMapping_QnameScope();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname <em>Anonymous Type Qname</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Anonymous Type Qname</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname()
-	 * @see #getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  EAttribute getJavaXMLTypeMapping_AnonymousTypeQname();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname <em>Root Type Qname</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Root Type Qname</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname()
-	 * @see #getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  EReference getJavaXMLTypeMapping_RootTypeQname();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getVariableMappings <em>Variable Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Variable Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping#getVariableMappings()
-	 * @see #getJavaXMLTypeMapping()
-	 * @generated
-	 */
-  EReference getJavaXMLTypeMapping_VariableMappings();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping <em>Exception Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Exception Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping
-	 * @generated
-	 */
-  EClass getExceptionMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getId()
-	 * @see #getExceptionMapping()
-	 * @generated
-	 */
-  EAttribute getExceptionMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getExceptionType <em>Exception Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exception Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getExceptionType()
-	 * @see #getExceptionMapping()
-	 * @generated
-	 */
-  EAttribute getExceptionMapping_ExceptionType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName()
-	 * @see #getExceptionMapping()
-	 * @generated
-	 */
-  EAttribute getExceptionMapping_WsdlMessagePartName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage <em>Wsdl Message</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Message</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage()
-	 * @see #getExceptionMapping()
-	 * @generated
-	 */
-  EReference getExceptionMapping_WsdlMessage();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder <em>Constructor Parameter Order</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Constructor Parameter Order</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder()
-	 * @see #getExceptionMapping()
-	 * @generated
-	 */
-  EReference getExceptionMapping_ConstructorParameterOrder();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping <em>Service Interface Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Interface Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping
-	 * @generated
-	 */
-  EClass getServiceInterfaceMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getId()
-	 * @see #getServiceInterfaceMapping()
-	 * @generated
-	 */
-  EAttribute getServiceInterfaceMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface <em>Service Interface</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface()
-	 * @see #getServiceInterfaceMapping()
-	 * @generated
-	 */
-  EAttribute getServiceInterfaceMapping_ServiceInterface();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName <em>Wsdl Service Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Service Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName()
-	 * @see #getServiceInterfaceMapping()
-	 * @generated
-	 */
-  EReference getServiceInterfaceMapping_WsdlServiceName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getPortMappings <em>Port Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Port Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getPortMappings()
-	 * @see #getServiceInterfaceMapping()
-	 * @generated
-	 */
-  EReference getServiceInterfaceMapping_PortMappings();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping <em>Service Endpoint Interface Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Endpoint Interface Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping
-	 * @generated
-	 */
-  EClass getServiceEndpointInterfaceMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId()
-	 * @see #getServiceEndpointInterfaceMapping()
-	 * @generated
-	 */
-  EAttribute getServiceEndpointInterfaceMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Endpoint Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface()
-	 * @see #getServiceEndpointInterfaceMapping()
-	 * @generated
-	 */
-  EAttribute getServiceEndpointInterfaceMapping_ServiceEndpointInterface();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType <em>Wsdl Port Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Port Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType()
-	 * @see #getServiceEndpointInterfaceMapping()
-	 * @generated
-	 */
-  EReference getServiceEndpointInterfaceMapping_WsdlPortType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding <em>Wsdl Binding</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Binding</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding()
-	 * @see #getServiceEndpointInterfaceMapping()
-	 * @generated
-	 */
-  EReference getServiceEndpointInterfaceMapping_WsdlBinding();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointMethodMappings <em>Service Endpoint Method Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Endpoint Method Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointMethodMappings()
-	 * @see #getServiceEndpointInterfaceMapping()
-	 * @generated
-	 */
-  EReference getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname <em>Root Type Qname</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Root Type Qname</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname
-	 * @generated
-	 */
-  EClass getRootTypeQname();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping <em>Variable Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Variable Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping
-	 * @generated
-	 */
-  EClass getVariableMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getId()
-	 * @see #getVariableMapping()
-	 * @generated
-	 */
-  EAttribute getVariableMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getJavaVariableName <em>Java Variable Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Java Variable Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getJavaVariableName()
-	 * @see #getVariableMapping()
-	 * @generated
-	 */
-  EAttribute getVariableMapping_JavaVariableName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlElementName <em>Xml Element Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Xml Element Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlElementName()
-	 * @see #getVariableMapping()
-	 * @generated
-	 */
-  EAttribute getVariableMapping_XmlElementName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Data Member</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isDataMember()
-	 * @see #getVariableMapping()
-	 * @generated
-	 */
-  EAttribute getVariableMapping_DataMember();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName <em>Xml Attribute Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Xml Attribute Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName()
-	 * @see #getVariableMapping()
-	 * @generated
-	 */
-  EAttribute getVariableMapping_XmlAttributeName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Xml Wildcard</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isXmlWildcard()
-	 * @see #getVariableMapping()
-	 * @generated
-	 */
-  EAttribute getVariableMapping_XmlWildcard();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage <em>WSDL Message</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Message</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage
-	 * @generated
-	 */
-  EClass getWSDLMessage();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder <em>Constructor Parameter Order</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constructor Parameter Order</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder
-	 * @generated
-	 */
-  EClass getConstructorParameterOrder();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getId()
-	 * @see #getConstructorParameterOrder()
-	 * @generated
-	 */
-  EAttribute getConstructorParameterOrder_Id();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getElementNames <em>Element Names</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Element Names</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder#getElementNames()
-	 * @see #getConstructorParameterOrder()
-	 * @generated
-	 */
-  EReference getConstructorParameterOrder_ElementNames();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName <em>Element Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName
-	 * @generated
-	 */
-  EClass getElementName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getId()
-	 * @see #getElementName()
-	 * @generated
-	 */
-  EAttribute getElementName_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getText <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Text</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName#getText()
-	 * @see #getElementName()
-	 * @generated
-	 */
-  EAttribute getElementName_Text();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName <em>WSDL Service Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Service Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName
-	 * @generated
-	 */
-  EClass getWSDLServiceName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping <em>Port Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping
-	 * @generated
-	 */
-  EClass getPortMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getId()
-	 * @see #getPortMapping()
-	 * @generated
-	 */
-  EAttribute getPortMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getPortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getPortName()
-	 * @see #getPortMapping()
-	 * @generated
-	 */
-  EAttribute getPortMapping_PortName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getJavaPortName <em>Java Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Java Port Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getJavaPortName()
-	 * @see #getPortMapping()
-	 * @generated
-	 */
-  EAttribute getPortMapping_JavaPortName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType <em>WSDL Port Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Port Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType
-	 * @generated
-	 */
-  EClass getWSDLPortType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding <em>WSDL Binding</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Binding</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding
-	 * @generated
-	 */
-  EClass getWSDLBinding();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping <em>Service Endpoint Method Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Endpoint Method Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping
-	 * @generated
-	 */
-  EClass getServiceEndpointMethodMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId()
-	 * @see #getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  EAttribute getServiceEndpointMethodMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName <em>Java Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Java Method Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName()
-	 * @see #getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  EAttribute getServiceEndpointMethodMapping_JavaMethodName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation <em>Wsdl Operation</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl Operation</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation()
-	 * @see #getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  EAttribute getServiceEndpointMethodMapping_WsdlOperation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wrapped Element</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement()
-	 * @see #getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  EAttribute getServiceEndpointMethodMapping_WrappedElement();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getMethodParamPartsMappings <em>Method Param Parts Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Param Parts Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getMethodParamPartsMappings()
-	 * @see #getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  EReference getServiceEndpointMethodMapping_MethodParamPartsMappings();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Return Value Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping()
-	 * @see #getServiceEndpointMethodMapping()
-	 * @generated
-	 */
-  EReference getServiceEndpointMethodMapping_WsdlReturnValueMapping();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation <em>WSDL Operation</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Operation</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation
-	 * @generated
-	 */
-  EClass getWSDLOperation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getId()
-	 * @see #getWSDLOperation()
-	 * @generated
-	 */
-  EAttribute getWSDLOperation_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation <em>Wsdl Operation</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl Operation</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation()
-	 * @see #getWSDLOperation()
-	 * @generated
-	 */
-  EAttribute getWSDLOperation_WsdlOperation();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping <em>Method Param Parts Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Param Parts Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping
-	 * @generated
-	 */
-  EClass getMethodParamPartsMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getId()
-	 * @see #getMethodParamPartsMapping()
-	 * @generated
-	 */
-  EAttribute getMethodParamPartsMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition <em>Param Position</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Position</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition()
-	 * @see #getMethodParamPartsMapping()
-	 * @generated
-	 */
-  EAttribute getMethodParamPartsMapping_ParamPosition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType <em>Param Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Type</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType()
-	 * @see #getMethodParamPartsMapping()
-	 * @generated
-	 */
-  EAttribute getMethodParamPartsMapping_ParamType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Message Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping()
-	 * @see #getMethodParamPartsMapping()
-	 * @generated
-	 */
-  EReference getMethodParamPartsMapping_WsdlMessageMapping();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping <em>WSDL Return Value Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Return Value Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping
-	 * @generated
-	 */
-  EClass getWSDLReturnValueMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getId()
-	 * @see #getWSDLReturnValueMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLReturnValueMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue <em>Method Return Value</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Return Value</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue()
-	 * @see #getWSDLReturnValueMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLReturnValueMapping_MethodReturnValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName()
-	 * @see #getWSDLReturnValueMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLReturnValueMapping_WsdlMessagePartName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage <em>Wsdl Message</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Message</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage()
-	 * @see #getWSDLReturnValueMapping()
-	 * @generated
-	 */
-  EReference getWSDLReturnValueMapping_WsdlMessage();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping <em>WSDL Message Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Message Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping
-	 * @generated
-	 */
-  EClass getWSDLMessageMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getId()
-	 * @see #getWSDLMessageMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLMessageMapping_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName()
-	 * @see #getWSDLMessageMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLMessageMapping_WsdlMessagePartName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode <em>Parameter Mode</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parameter Mode</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode()
-	 * @see #getWSDLMessageMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLMessageMapping_ParameterMode();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage <em>Wsdl Message</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Message</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage()
-	 * @see #getWSDLMessageMapping()
-	 * @generated
-	 */
-  EReference getWSDLMessageMapping_WsdlMessage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Soap Header</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader()
-	 * @see #getWSDLMessageMapping()
-	 * @generated
-	 */
-  EAttribute getWSDLMessageMapping_SoapHeader();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName <em>WSDL Message Part Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Message Part Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName
-	 * @generated
-	 */
-  EClass getWSDLMessagePartName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getId()
-	 * @see #getWSDLMessagePartName()
-	 * @generated
-	 */
-  EAttribute getWSDLMessagePartName_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName()
-	 * @see #getWSDLMessagePartName()
-	 * @generated
-	 */
-  EAttribute getWSDLMessagePartName_WsdlMessagePartName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping <em>Interface Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Interface Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping
-	 * @generated
-	 */
-  EClass getInterfaceMapping();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-  JaxrpcmapFactory getJaxrpcmapFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl <em>Java WSDL Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getJavaWSDLMapping()
-		 * @generated
-		 */
-		EClass JAVA_WSDL_MAPPING = eINSTANCE.getJavaWSDLMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_WSDL_MAPPING__ID = eINSTANCE.getJavaWSDLMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Package Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS = eINSTANCE.getJavaWSDLMapping_PackageMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Java XML Type Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS = eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Exception Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS = eINSTANCE.getJavaWSDLMapping_ExceptionMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Interface Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS = eINSTANCE.getJavaWSDLMapping_InterfaceMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl <em>Package Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getPackageMapping()
-		 * @generated
-		 */
-		EClass PACKAGE_MAPPING = eINSTANCE.getPackageMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PACKAGE_MAPPING__ID = eINSTANCE.getPackageMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Package Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PACKAGE_MAPPING__PACKAGE_TYPE = eINSTANCE.getPackageMapping_PackageType();
-
-		/**
-		 * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PACKAGE_MAPPING__NAMESPACE_URI = eINSTANCE.getPackageMapping_NamespaceURI();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl <em>Java XML Type Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getJavaXMLTypeMapping()
-		 * @generated
-		 */
-		EClass JAVA_XML_TYPE_MAPPING = eINSTANCE.getJavaXMLTypeMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_XML_TYPE_MAPPING__ID = eINSTANCE.getJavaXMLTypeMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_XML_TYPE_MAPPING__CLASS_TYPE = eINSTANCE.getJavaXMLTypeMapping_ClassType();
-
-		/**
-		 * The meta object literal for the '<em><b>Qname Scope</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_XML_TYPE_MAPPING__QNAME_SCOPE = eINSTANCE.getJavaXMLTypeMapping_QnameScope();
-
-		/**
-		 * The meta object literal for the '<em><b>Anonymous Type Qname</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME = eINSTANCE.getJavaXMLTypeMapping_AnonymousTypeQname();
-
-		/**
-		 * The meta object literal for the '<em><b>Root Type Qname</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME = eINSTANCE.getJavaXMLTypeMapping_RootTypeQname();
-
-		/**
-		 * The meta object literal for the '<em><b>Variable Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS = eINSTANCE.getJavaXMLTypeMapping_VariableMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl <em>Exception Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getExceptionMapping()
-		 * @generated
-		 */
-		EClass EXCEPTION_MAPPING = eINSTANCE.getExceptionMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXCEPTION_MAPPING__ID = eINSTANCE.getExceptionMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Exception Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXCEPTION_MAPPING__EXCEPTION_TYPE = eINSTANCE.getExceptionMapping_ExceptionType();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message Part Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME = eINSTANCE.getExceptionMapping_WsdlMessagePartName();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCEPTION_MAPPING__WSDL_MESSAGE = eINSTANCE.getExceptionMapping_WsdlMessage();
-
-		/**
-		 * The meta object literal for the '<em><b>Constructor Parameter Order</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER = eINSTANCE.getExceptionMapping_ConstructorParameterOrder();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl <em>Service Interface Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getServiceInterfaceMapping()
-		 * @generated
-		 */
-		EClass SERVICE_INTERFACE_MAPPING = eINSTANCE.getServiceInterfaceMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_INTERFACE_MAPPING__ID = eINSTANCE.getServiceInterfaceMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE = eINSTANCE.getServiceInterfaceMapping_ServiceInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Service Name</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME = eINSTANCE.getServiceInterfaceMapping_WsdlServiceName();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS = eINSTANCE.getServiceInterfaceMapping_PortMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl <em>Service Endpoint Interface Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getServiceEndpointInterfaceMapping()
-		 * @generated
-		 */
-		EClass SERVICE_ENDPOINT_INTERFACE_MAPPING = eINSTANCE.getServiceEndpointInterfaceMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_ENDPOINT_INTERFACE_MAPPING__ID = eINSTANCE.getServiceEndpointInterfaceMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint Interface</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Port Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE = eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Binding</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING = eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Endpoint Method Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS = eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.RootTypeQnameImpl <em>Root Type Qname</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.RootTypeQnameImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getRootTypeQname()
-		 * @generated
-		 */
-		EClass ROOT_TYPE_QNAME = eINSTANCE.getRootTypeQname();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl <em>Variable Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getVariableMapping()
-		 * @generated
-		 */
-		EClass VARIABLE_MAPPING = eINSTANCE.getVariableMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE_MAPPING__ID = eINSTANCE.getVariableMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Java Variable Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE_MAPPING__JAVA_VARIABLE_NAME = eINSTANCE.getVariableMapping_JavaVariableName();
-
-		/**
-		 * The meta object literal for the '<em><b>Xml Element Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE_MAPPING__XML_ELEMENT_NAME = eINSTANCE.getVariableMapping_XmlElementName();
-
-		/**
-		 * The meta object literal for the '<em><b>Data Member</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE_MAPPING__DATA_MEMBER = eINSTANCE.getVariableMapping_DataMember();
-
-		/**
-		 * The meta object literal for the '<em><b>Xml Attribute Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE_MAPPING__XML_ATTRIBUTE_NAME = eINSTANCE.getVariableMapping_XmlAttributeName();
-
-		/**
-		 * The meta object literal for the '<em><b>Xml Wildcard</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABLE_MAPPING__XML_WILDCARD = eINSTANCE.getVariableMapping_XmlWildcard();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageImpl <em>WSDL Message</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLMessage()
-		 * @generated
-		 */
-		EClass WSDL_MESSAGE = eINSTANCE.getWSDLMessage();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ConstructorParameterOrderImpl <em>Constructor Parameter Order</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ConstructorParameterOrderImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getConstructorParameterOrder()
-		 * @generated
-		 */
-		EClass CONSTRUCTOR_PARAMETER_ORDER = eINSTANCE.getConstructorParameterOrder();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONSTRUCTOR_PARAMETER_ORDER__ID = eINSTANCE.getConstructorParameterOrder_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Element Names</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES = eINSTANCE.getConstructorParameterOrder_ElementNames();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ElementNameImpl <em>Element Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ElementNameImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getElementName()
-		 * @generated
-		 */
-		EClass ELEMENT_NAME = eINSTANCE.getElementName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELEMENT_NAME__ID = eINSTANCE.getElementName_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Text</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELEMENT_NAME__TEXT = eINSTANCE.getElementName_Text();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLServiceNameImpl <em>WSDL Service Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLServiceNameImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLServiceName()
-		 * @generated
-		 */
-		EClass WSDL_SERVICE_NAME = eINSTANCE.getWSDLServiceName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl <em>Port Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getPortMapping()
-		 * @generated
-		 */
-		EClass PORT_MAPPING = eINSTANCE.getPortMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_MAPPING__ID = eINSTANCE.getPortMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Port Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_MAPPING__PORT_NAME = eINSTANCE.getPortMapping_PortName();
-
-		/**
-		 * The meta object literal for the '<em><b>Java Port Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PORT_MAPPING__JAVA_PORT_NAME = eINSTANCE.getPortMapping_JavaPortName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLPortTypeImpl <em>WSDL Port Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLPortTypeImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLPortType()
-		 * @generated
-		 */
-		EClass WSDL_PORT_TYPE = eINSTANCE.getWSDLPortType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLBindingImpl <em>WSDL Binding</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLBindingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLBinding()
-		 * @generated
-		 */
-		EClass WSDL_BINDING = eINSTANCE.getWSDLBinding();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl <em>Service Endpoint Method Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getServiceEndpointMethodMapping()
-		 * @generated
-		 */
-		EClass SERVICE_ENDPOINT_METHOD_MAPPING = eINSTANCE.getServiceEndpointMethodMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_ENDPOINT_METHOD_MAPPING__ID = eINSTANCE.getServiceEndpointMethodMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Java Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME = eINSTANCE.getServiceEndpointMethodMapping_JavaMethodName();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Operation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION = eINSTANCE.getServiceEndpointMethodMapping_WsdlOperation();
-
-		/**
-		 * The meta object literal for the '<em><b>Wrapped Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT = eINSTANCE.getServiceEndpointMethodMapping_WrappedElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Param Parts Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS = eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Return Value Mapping</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING = eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLOperationImpl <em>WSDL Operation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLOperationImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLOperation()
-		 * @generated
-		 */
-		EClass WSDL_OPERATION = eINSTANCE.getWSDLOperation();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_OPERATION__ID = eINSTANCE.getWSDLOperation_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Operation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_OPERATION__WSDL_OPERATION = eINSTANCE.getWSDLOperation_WsdlOperation();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl <em>Method Param Parts Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getMethodParamPartsMapping()
-		 * @generated
-		 */
-		EClass METHOD_PARAM_PARTS_MAPPING = eINSTANCE.getMethodParamPartsMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PARAM_PARTS_MAPPING__ID = eINSTANCE.getMethodParamPartsMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Position</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION = eINSTANCE.getMethodParamPartsMapping_ParamPosition();
-
-		/**
-		 * The meta object literal for the '<em><b>Param Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE = eINSTANCE.getMethodParamPartsMapping_ParamType();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message Mapping</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING = eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl <em>WSDL Return Value Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLReturnValueMapping()
-		 * @generated
-		 */
-		EClass WSDL_RETURN_VALUE_MAPPING = eINSTANCE.getWSDLReturnValueMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_RETURN_VALUE_MAPPING__ID = eINSTANCE.getWSDLReturnValueMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Return Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE = eINSTANCE.getWSDLReturnValueMapping_MethodReturnValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message Part Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME = eINSTANCE.getWSDLReturnValueMapping_WsdlMessagePartName();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE = eINSTANCE.getWSDLReturnValueMapping_WsdlMessage();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl <em>WSDL Message Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLMessageMapping()
-		 * @generated
-		 */
-		EClass WSDL_MESSAGE_MAPPING = eINSTANCE.getWSDLMessageMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_MESSAGE_MAPPING__ID = eINSTANCE.getWSDLMessageMapping_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message Part Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME = eINSTANCE.getWSDLMessageMapping_WsdlMessagePartName();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameter Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_MESSAGE_MAPPING__PARAMETER_MODE = eINSTANCE.getWSDLMessageMapping_ParameterMode();
-
-		/**
-		 * The meta object literal for the '<em><b>Soap Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_MESSAGE_MAPPING__SOAP_HEADER = eINSTANCE.getWSDLMessageMapping_SoapHeader();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WSDL_MESSAGE_MAPPING__WSDL_MESSAGE = eINSTANCE.getWSDLMessageMapping_WsdlMessage();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessagePartNameImpl <em>WSDL Message Part Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessagePartNameImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getWSDLMessagePartName()
-		 * @generated
-		 */
-		EClass WSDL_MESSAGE_PART_NAME = eINSTANCE.getWSDLMessagePartName();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_MESSAGE_PART_NAME__ID = eINSTANCE.getWSDLMessagePartName_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Wsdl Message Part Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME = eINSTANCE.getWSDLMessagePartName_WsdlMessagePartName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.InterfaceMappingImpl <em>Interface Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.InterfaceMappingImpl
-		 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapPackageImpl#getInterfaceMapping()
-		 * @generated
-		 */
-		EClass INTERFACE_MAPPING = eINSTANCE.getInterfaceMapping();
-
-	}
-
-} //JaxrpcmapPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResource.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResource.java
deleted file mode 100644
index e907d86eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResource.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface JaxrpcmapResource extends XMLResource
-{
-  public static final int JAXRPC_MAP_TYPE = 8;
-
-  JavaWSDLMapping getJavaWSDLMapping();
-  public boolean isJaxrpcmap1_0();
-  public boolean isJaxrpcmap1_1();
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResourceFactory.java
deleted file mode 100644
index 7a71c79d8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResourceFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JaxrpcmapResourceImpl;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class JaxrpcmapResourceFactory extends TranslatorResourceFactory
-{
-  /**
-  * JaxrpcmapResourceFactory constructor comment.
-  */
-  public JaxrpcmapResourceFactory(RendererFactory aRendererFactory) 
-  {
-	  super(aRendererFactory);
-  }
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new JaxrpcmapResourceImpl(uri, aRenderer);
-	}
-
-  /**
-   * Register myself with the Resource.Factory.Registry
-   */
-  public static void registerWith(RendererFactory aRendererFactory) {
-    //Do nothing since the jaxrpc mapping file has no standard name.
-  	//J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(aRendererFactory));
-  }
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-	    //Do nothing since the jaxrpc mapping file has no standard name.
-		//registerWith(EMF2DOMRendererFactory.INSTANCE);
-	}
-
-  /**
-   * Method registerDtds.
-  */
-  public static void registerDtds() 
-  {
-  	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.JAXRPCMAP_SYSTEMID, "j2ee_jaxrpc_mapping_1_0.dtd");//$NON-NLS-1$
-	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.JAXRPCMAP_SCHEMA_LOC, "j2ee_jaxrpc_mapping_1_1.xsd"); //$NON-NLS-1$  	
-	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.JAXRPCMAP_SCHEMA_LOC_SUN, "j2ee_jaxrpc_mapping_1_1.xsd"); //$NON-NLS-1$  			
-  }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodParamPartsMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodParamPartsMapping.java
deleted file mode 100644
index d39353aa2..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodParamPartsMapping.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Param Parts Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The method-param-parts-mapping element defines the mapping between a Java method parameters and a wsdl-message.
- * 
- * Used in: service-endpoint-method-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition <em>Param Position</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType <em>Param Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping()
- * @model
- * @generated
- */
-public interface MethodParamPartsMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Param Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Position</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The param-position element defines the position of a parameter within a Java method.  It must be an integer starting from 0.
-	 * 
-	 * Used in: method-param-parts-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Param Position</em>' attribute.
-	 * @see #setParamPosition(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_ParamPosition()
-	 * @model
-	 * @generated
-	 */
-  String getParamPosition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition <em>Param Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Position</em>' attribute.
-	 * @see #getParamPosition()
-	 * @generated
-	 */
-  void setParamPosition(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Param Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The param-type element defines the Java type of a parameter within a Java method. It must be defined by a fully qualified name of a class.
-	 * 
-	 * Used in: method-param-parts-mapping
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Param Type</em>' attribute.
-	 * @see #setParamType(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_ParamType()
-	 * @model
-	 * @generated
-	 */
-  String getParamType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType <em>Param Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Type</em>' attribute.
-	 * @see #getParamType()
-	 * @generated
-	 */
-  void setParamType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Mapping</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Message Mapping</em>' containment reference.
-	 * @see #setWsdlMessageMapping(WSDLMessageMapping)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_WsdlMessageMapping()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLMessageMapping getWsdlMessageMapping();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message Mapping</em>' containment reference.
-	 * @see #getWsdlMessageMapping()
-	 * @generated
-	 */
-  void setWsdlMessageMapping(WSDLMessageMapping value);
-
-} // MethodParamPartsMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageMapping.java
deleted file mode 100644
index f6c3980c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageMapping.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Package Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The package-mapping indicates the mapping between java-package-name and XML namespace in the WSDL document.
- * 
- * Used in: java-wsdl-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getPackageType <em>Package Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getNamespaceURI <em>Namespace URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping()
- * @model
- * @generated
- */
-public interface PackageMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Package Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The package-type indicates the Java package name. It must be a fully qualified name.
-	 * 
-	 * Used in: package-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Package Type</em>' attribute.
-	 * @see #setPackageType(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping_PackageType()
-	 * @model
-	 * @generated
-	 */
-  String getPackageType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getPackageType <em>Package Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Package Type</em>' attribute.
-	 * @see #getPackageType()
-	 * @generated
-	 */
-  void setPackageType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Namespace URI</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Namespace URI</em>' attribute.
-	 * @see #setNamespaceURI(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping_NamespaceURI()
-	 * @model
-	 * @generated
-	 */
-  String getNamespaceURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping#getNamespaceURI <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace URI</em>' attribute.
-	 * @see #getNamespaceURI()
-	 * @generated
-	 */
-  void setNamespaceURI(String value);
-
-} // PackageMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PortMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PortMapping.java
deleted file mode 100644
index 3272d2a2c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PortMapping.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The port-mapping defines the mapping of the WSDL port name attribute to the Java name used to generate the Generated Service Interface method get<java-name>.
- * 
- * Used in: service-interface-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getPortName <em>Port Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getJavaPortName <em>Java Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping()
- * @model
- * @generated
- */
-public interface PortMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-name is the attribute value of a name attribute of a WSDL port element.
-	 * 
-	 * Used in: port-mapping
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Name</em>' attribute.
-	 * @see #setPortName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping_PortName()
-	 * @model
-	 * @generated
-	 */
-  String getPortName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getPortName <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Name</em>' attribute.
-	 * @see #getPortName()
-	 * @generated
-	 */
-  void setPortName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Java Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The java-port-name element is the string to use as the port name in Java.  It is used in generating the Generated Service Interface method
-	 * get<java-port-name>.
-	 * 
-	 * Used in: port-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Java Port Name</em>' attribute.
-	 * @see #setJavaPortName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping_JavaPortName()
-	 * @model
-	 * @generated
-	 */
-  String getJavaPortName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping#getJavaPortName <em>Java Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Port Name</em>' attribute.
-	 * @see #getJavaPortName()
-	 * @generated
-	 */
-  void setJavaPortName(String value);
-
-} // PortMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/RootTypeQname.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/RootTypeQname.java
deleted file mode 100644
index ccecfed42..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/RootTypeQname.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Root Type Qname</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The root-type-qname identifies the WSDL QName of an XML type.
- * 
- * Used in: java-xml-type-mapping
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getRootTypeQname()
- * @model
- * @generated
- */
-public interface RootTypeQname extends QName {
-// RootTypeQname
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointInterfaceMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointInterfaceMapping.java
deleted file mode 100644
index a8d287757..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointInterfaceMapping.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Endpoint Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-endpoint-interface-mapping defines a tuple
- * to specify Service Endpoint Interfaces to WSDL port types and WSDL bindings.
- * 
- * An interface may be mapped to a port-type and binding multiple times. This happens rarely.
- * 
- * Used in: java-wsdl-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType <em>Wsdl Port Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding <em>Wsdl Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointMethodMappings <em>Service Endpoint Method Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping()
- * @model
- * @generated
- */
-public interface ServiceEndpointInterfaceMapping extends InterfaceMapping {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Endpoint Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-endpoint-interface element defines the Java type for the endpoint interface. The name must be a fully qualified class name.
-	 * 
-	 * Used in: service-endpoint-interface-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #setServiceEndpointInterface(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_ServiceEndpointInterface()
-	 * @model
-	 * @generated
-	 */
-  String getServiceEndpointInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 */
-  void setServiceEndpointInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Port Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Port Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Port Type</em>' containment reference.
-	 * @see #setWsdlPortType(WSDLPortType)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_WsdlPortType()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLPortType getWsdlPortType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType <em>Wsdl Port Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Port Type</em>' containment reference.
-	 * @see #getWsdlPortType()
-	 * @generated
-	 */
-  void setWsdlPortType(WSDLPortType value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Binding</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Binding</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Binding</em>' containment reference.
-	 * @see #setWsdlBinding(WSDLBinding)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_WsdlBinding()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLBinding getWsdlBinding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding <em>Wsdl Binding</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Binding</em>' containment reference.
-	 * @see #getWsdlBinding()
-	 * @generated
-	 */
-  void setWsdlBinding(WSDLBinding value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Method Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Endpoint Method Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Endpoint Method Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping" containment="true"
-	 * @generated
-	 */
-  EList getServiceEndpointMethodMappings();
-
-} // ServiceEndpointInterfaceMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointMethodMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointMethodMapping.java
deleted file mode 100644
index 70000f1dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointMethodMapping.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Endpoint Method Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-endpoint-method-mapping element defines the mapping of Java methods to operations (which are not uniquely qualified by qnames).
- * 
- * The wsdl-operation should be interpreted with respect to the portType and binding in which this definition is embedded within. See the definitions for service-endpoint-interface-mapping and 
- * service-interface-mapping to acquire the proper context. The wrapped-element indicator should only be specified when a WSDL message wraps an element type.  The wsdl-return-value-mapping is not specified for one-way operations.
- * 
- * Used in: service-endpoint-interface-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName <em>Java Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation <em>Wsdl Operation</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getMethodParamPartsMappings <em>Method Param Parts Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping()
- * @model
- * @generated
- */
-public interface ServiceEndpointMethodMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Java Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Method Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The java-method-name element defines the name of a Java method within an interface.
-	 * 
-	 * Used in: service-endpoint-method-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Java Method Name</em>' attribute.
-	 * @see #setJavaMethodName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_JavaMethodName()
-	 * @model
-	 * @generated
-	 */
-  String getJavaMethodName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName <em>Java Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Method Name</em>' attribute.
-	 * @see #getJavaMethodName()
-	 * @generated
-	 */
-  void setJavaMethodName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Operation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Operation</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The wsdl-operation element defines an operation within a WSDL document. It must be interpreted with respect to a port type.
-	 * 
-	 * Used in: service-endpoint-method-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl Operation</em>' attribute.
-	 * @see #setWsdlOperation(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_WsdlOperation()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlOperation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation <em>Wsdl Operation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Operation</em>' attribute.
-	 * @see #getWsdlOperation()
-	 * @generated
-	 */
-  void setWsdlOperation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wrapped Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wrapped Element</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wrapped Element</em>' attribute.
-	 * @see #isSetWrappedElement()
-	 * @see #unsetWrappedElement()
-	 * @see #setWrappedElement(boolean)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_WrappedElement()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-  boolean isWrappedElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wrapped Element</em>' attribute.
-	 * @see #isSetWrappedElement()
-	 * @see #unsetWrappedElement()
-	 * @see #isWrappedElement()
-	 * @generated
-	 */
-  void setWrappedElement(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetWrappedElement()
-	 * @see #isWrappedElement()
-	 * @see #setWrappedElement(boolean)
-	 * @generated
-	 */
-  void unsetWrappedElement();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Wrapped Element</em>' attribute is set.
-	 * @see #unsetWrappedElement()
-	 * @see #isWrappedElement()
-	 * @see #setWrappedElement(boolean)
-	 * @generated
-	 */
-  boolean isSetWrappedElement();
-
-	/**
-	 * Returns the value of the '<em><b>Method Param Parts Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Method Param Parts Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Param Parts Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_MethodParamPartsMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping" containment="true"
-	 * @generated
-	 */
-  EList getMethodParamPartsMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Return Value Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Return Value Mapping</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Return Value Mapping</em>' containment reference.
-	 * @see #setWsdlReturnValueMapping(WSDLReturnValueMapping)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_WsdlReturnValueMapping()
-	 * @model containment="true"
-	 * @generated
-	 */
-  WSDLReturnValueMapping getWsdlReturnValueMapping();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Return Value Mapping</em>' containment reference.
-	 * @see #getWsdlReturnValueMapping()
-	 * @generated
-	 */
-  void setWsdlReturnValueMapping(WSDLReturnValueMapping value);
-
-} // ServiceEndpointMethodMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceInterfaceMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceInterfaceMapping.java
deleted file mode 100644
index 783ac7465..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceInterfaceMapping.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-interface-mapping element defines how a Java type for the service interface maps to a WSDL service.
- * 
- * Used in: java-wsdl-mapping
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName <em>Wsdl Service Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getPortMappings <em>Port Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping()
- * @model
- * @generated
- */
-public interface ServiceInterfaceMapping extends InterfaceMapping {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-interface element defines the Java type for the service. For static services, it is javax.xml.rpc.Service interface. For generated service, it would be the generated interface name.
-	 * 
-	 * The name must be a fully qualified class name.
-	 * 
-	 * Used in: service-interface-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Interface</em>' attribute.
-	 * @see #setServiceInterface(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_ServiceInterface()
-	 * @model
-	 * @generated
-	 */
-  String getServiceInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface <em>Service Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Interface</em>' attribute.
-	 * @see #getServiceInterface()
-	 * @generated
-	 */
-  void setServiceInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Service Name</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Service Name</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Service Name</em>' containment reference.
-	 * @see #setWsdlServiceName(WSDLServiceName)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_WsdlServiceName()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLServiceName getWsdlServiceName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName <em>Wsdl Service Name</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Service Name</em>' containment reference.
-	 * @see #getWsdlServiceName()
-	 * @generated
-	 */
-  void setWsdlServiceName(WSDLServiceName value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_PortMappings()
-	 * @model type="org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping" containment="true"
-	 * @generated
-	 */
-  EList getPortMappings();
-
-} // ServiceInterfaceMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/VariableMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/VariableMapping.java
deleted file mode 100644
index 97b5b5845..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/VariableMapping.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The variable-mapping element defines the correlation between a Java class data member or JavaBeans property to an XML element name of an XML root type. If the data-member element is present, the Java variable name is a public data member.  If data-member
- * is not present, the Java variable name is a JavaBeans property.
- * 
- * Used in: java-xml-type-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getJavaVariableName <em>Java Variable Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlElementName <em>Xml Element Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName <em>Xml Attribute Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping()
- * @model
- * @generated
- */
-public interface VariableMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Java Variable Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Variable Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The java-variable-name defines the name of a public data member or  JavaBeans property within a Java class. 
-	 * 
-	 * Used in: variable-mapping
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Java Variable Name</em>' attribute.
-	 * @see #setJavaVariableName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_JavaVariableName()
-	 * @model
-	 * @generated
-	 */
-  String getJavaVariableName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getJavaVariableName <em>Java Variable Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Variable Name</em>' attribute.
-	 * @see #getJavaVariableName()
-	 * @generated
-	 */
-  void setJavaVariableName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Xml Element Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Element Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The xml-element-name element defines name attribute value of a WSDL element within a root type.
-	 * 
-	 * Used in: variable-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Xml Element Name</em>' attribute.
-	 * @see #setXmlElementName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_XmlElementName()
-	 * @model
-	 * @generated
-	 */
-  String getXmlElementName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlElementName <em>Xml Element Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Element Name</em>' attribute.
-	 * @see #getXmlElementName()
-	 * @generated
-	 */
-  void setXmlElementName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Data Member</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Data Member</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Data Member</em>' attribute.
-	 * @see #isSetDataMember()
-	 * @see #unsetDataMember()
-	 * @see #setDataMember(boolean)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_DataMember()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-  boolean isDataMember();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data Member</em>' attribute.
-	 * @see #isSetDataMember()
-	 * @see #unsetDataMember()
-	 * @see #isDataMember()
-	 * @generated
-	 */
-  void setDataMember(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetDataMember()
-	 * @see #isDataMember()
-	 * @see #setDataMember(boolean)
-	 * @generated
-	 */
-  void unsetDataMember();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Data Member</em>' attribute is set.
-	 * @see #unsetDataMember()
-	 * @see #isDataMember()
-	 * @see #setDataMember(boolean)
-	 * @generated
-	 */
-  boolean isSetDataMember();
-
-	/**
-	 * Returns the value of the '<em><b>Xml Attribute Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Attribute Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xml Attribute Name</em>' attribute.
-	 * @see #setXmlAttributeName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_XmlAttributeName()
-	 * @model
-	 * @generated
-	 */
-  String getXmlAttributeName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName <em>Xml Attribute Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Attribute Name</em>' attribute.
-	 * @see #getXmlAttributeName()
-	 * @generated
-	 */
-  void setXmlAttributeName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Xml Wildcard</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Wildcard</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xml Wildcard</em>' attribute.
-	 * @see #isSetXmlWildcard()
-	 * @see #unsetXmlWildcard()
-	 * @see #setXmlWildcard(boolean)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_XmlWildcard()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-  boolean isXmlWildcard();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Wildcard</em>' attribute.
-	 * @see #isSetXmlWildcard()
-	 * @see #unsetXmlWildcard()
-	 * @see #isXmlWildcard()
-	 * @generated
-	 */
-  void setXmlWildcard(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetXmlWildcard()
-	 * @see #isXmlWildcard()
-	 * @see #setXmlWildcard(boolean)
-	 * @generated
-	 */
-  void unsetXmlWildcard();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Xml Wildcard</em>' attribute is set.
-	 * @see #unsetXmlWildcard()
-	 * @see #isXmlWildcard()
-	 * @see #setXmlWildcard(boolean)
-	 * @generated
-	 */
-  boolean isSetXmlWildcard();
-
-} // VariableMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLBinding.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLBinding.java
deleted file mode 100644
index 484a83a7a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLBinding.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The wsdl-binding element defines the wsdl binding
- * by a QNAME which uniquely identifies  the binding.
- * 
- * Used in: service-endpoint-interface-mapping
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLBinding()
- * @model
- * @generated
- */
-public interface WSDLBinding extends QName {
-// WSDLBinding
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessage.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessage.java
deleted file mode 100644
index d87252555..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Message</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The wsdl-message  element defines a WSDL message by a QNAME.
- * 
- * Used in: wsdl-message-mapping, wsdl-return-value-mapping
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessage()
- * @model
- * @generated
- */
-public interface WSDLMessage extends QName {
-// WSDLMessage
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessageMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessageMapping.java
deleted file mode 100644
index 7c406b9bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessageMapping.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Message Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The wsdl-message-mapping element defines the mapping to a specific message and its part. Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely 
- * identified with their names.
- * 
- * The parameter-mode is defined by the mapping to indicate whether the mapping will be IN, OUT, or INOUT..  The presence of the soap-header
- * element indicates that the parameter is mapped to a soap header only. When absent, it means that the wsdl-message is mapped to a Java parameter. The soap headers are interpreted in the order they are
- * provided in the mapping.
- * 
- * Used in: method-param-parts-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode <em>Parameter Mode</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping()
- * @model
- * @generated
- */
-public interface WSDLMessageMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element
-	 * name of the element type.
-	 * 
-	 * Used in: wsdl-message-mapping, wsdl-return-value-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #setWsdlMessagePartName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_WsdlMessagePartName()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlMessagePartName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 */
-  void setWsdlMessagePartName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Parameter Mode</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The parameter-mode  element defines the mode of the parameter. It can have only three values, IN, OUT, INOUT.
-	 * 
-	 * Used in: wsdl-message-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter Mode</em>' attribute.
-	 * @see #setParameterMode(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_ParameterMode()
-	 * @model
-	 * @generated
-	 */
-  String getParameterMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode <em>Parameter Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Mode</em>' attribute.
-	 * @see #getParameterMode()
-	 * @generated
-	 */
-  void setParameterMode(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Soap Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Header</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Header</em>' attribute.
-	 * @see #isSetSoapHeader()
-	 * @see #unsetSoapHeader()
-	 * @see #setSoapHeader(boolean)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_SoapHeader()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-  boolean isSoapHeader();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Soap Header</em>' attribute.
-	 * @see #isSetSoapHeader()
-	 * @see #unsetSoapHeader()
-	 * @see #isSoapHeader()
-	 * @generated
-	 */
-  void setSoapHeader(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetSoapHeader()
-	 * @see #isSoapHeader()
-	 * @see #setSoapHeader(boolean)
-	 * @generated
-	 */
-  void unsetSoapHeader();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Soap Header</em>' attribute is set.
-	 * @see #unsetSoapHeader()
-	 * @see #isSoapHeader()
-	 * @see #setSoapHeader(boolean)
-	 * @generated
-	 */
-  boolean isSetSoapHeader();
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Message</em>' containment reference.
-	 * @see #setWsdlMessage(WSDLMessage)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_WsdlMessage()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLMessage getWsdlMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage <em>Wsdl Message</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message</em>' containment reference.
-	 * @see #getWsdlMessage()
-	 * @generated
-	 */
-  void setWsdlMessage(WSDLMessage value);
-
-} // WSDLMessageMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessagePartName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessagePartName.java
deleted file mode 100644
index b025e278d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessagePartName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Message Part Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessagePartName()
- * @model
- * @generated
- */
-public interface WSDLMessagePartName extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessagePartName_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #setWsdlMessagePartName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessagePartName_WsdlMessagePartName()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlMessagePartName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 */
-  void setWsdlMessagePartName(String value);
-
-} // WSDLMessagePartName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLOperation.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLOperation.java
deleted file mode 100644
index 9c9849b03..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLOperation.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation <em>Wsdl Operation</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLOperation()
- * @model
- * @generated
- */
-public interface WSDLOperation extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLOperation_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Operation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Operation</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Operation</em>' attribute.
-	 * @see #setWsdlOperation(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLOperation_WsdlOperation()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlOperation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation <em>Wsdl Operation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Operation</em>' attribute.
-	 * @see #getWsdlOperation()
-	 * @generated
-	 */
-  void setWsdlOperation(String value);
-
-} // WSDLOperation
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLPortType.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLPortType.java
deleted file mode 100644
index a6528984b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLPortType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Port Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The wsdl-port-type element defines the wsdl port type
- * by a QNAME which uniquely identifies  the port type.
- * 
- * Used in: service-endpoint-interface-mapping
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLPortType()
- * @model
- * @generated
- */
-public interface WSDLPortType extends QName {
-//	 WSDLPortType
-} 
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLReturnValueMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLReturnValueMapping.java
deleted file mode 100644
index 4ac71e1c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLReturnValueMapping.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Return Value Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The wsdl-return-value-mapping  element defines the mapping for the method's return value. It defines the mapping to a specific message and its part.  Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely 
- * identified with their names. The wsdl-message-part-name is not
- * specified if there is no return value or OUT parameters.
- * 
- * Used in: service-endpoint-method-mapping
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue <em>Method Return Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping()
- * @model
- * @generated
- */
-public interface WSDLReturnValueMapping extends J2EEEObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_Id()
-	 * @model
-	 * @generated
-	 */
-  String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-  void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Return Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Method Return Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The method-return-value  element defines a fully qualified class name or void type for the method's return value type.
-	 * 
-	 * Used in: wsdl-return-value-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Method Return Value</em>' attribute.
-	 * @see #setMethodReturnValue(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_MethodReturnValue()
-	 * @model
-	 * @generated
-	 */
-  String getMethodReturnValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue <em>Method Return Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Return Value</em>' attribute.
-	 * @see #getMethodReturnValue()
-	 * @generated
-	 */
-  void setMethodReturnValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element
-	 * name of the element type.
-	 * 
-	 * Used in: wsdl-message-mapping, wsdl-return-value-mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #setWsdlMessagePartName(String)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_WsdlMessagePartName()
-	 * @model
-	 * @generated
-	 */
-  String getWsdlMessagePartName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 */
-  void setWsdlMessagePartName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Message</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Message</em>' containment reference.
-	 * @see #setWsdlMessage(WSDLMessage)
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_WsdlMessage()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLMessage getWsdlMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage <em>Wsdl Message</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Message</em>' containment reference.
-	 * @see #getWsdlMessage()
-	 * @generated
-	 */
-  void setWsdlMessage(WSDLMessage value);
-
-} // WSDLReturnValueMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLServiceName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLServiceName.java
deleted file mode 100644
index c5c736abb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLServiceName.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Service Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The wsdl-service-name element defines the wsdl service name by a QNAME which uniquely identifies  the service.
- * 
- * Used in: service-interface-mapping
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLServiceName()
- * @model
- * @generated
- */
-public interface WSDLServiceName extends QName {
-	//Default
-} // WSDLServiceName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ConstructorParameterOrderImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ConstructorParameterOrderImpl.java
deleted file mode 100644
index 5bb72a39c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ConstructorParameterOrderImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constructor Parameter Order</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ConstructorParameterOrderImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ConstructorParameterOrderImpl#getElementNames <em>Element Names</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstructorParameterOrderImpl extends J2EEEObjectImpl implements ConstructorParameterOrder
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getElementNames() <em>Element Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getElementNames()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList elementNames = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ConstructorParameterOrderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.CONSTRUCTOR_PARAMETER_ORDER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getElementNames() {
-		if (elementNames == null) {
-			elementNames = new EObjectContainmentEList(ElementName.class, this, JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES);
-		}
-		return elementNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-				return ((InternalEList)getElementNames()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-				return getId();
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-				return getElementNames();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-				getElementNames().clear();
-				getElementNames().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-				getElementNames().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-				return elementNames != null && !elementNames.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ConstructorParameterOrderImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ElementNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ElementNameImpl.java
deleted file mode 100644
index 9cf1c785d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ElementNameImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ElementNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ElementNameImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ElementNameImpl extends J2EEEObjectImpl implements ElementName
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String TEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-  protected String text = TEXT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ElementNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.ELEMENT_NAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.ELEMENT_NAME__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getText() {
-		return text;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setText(String newText) {
-		String oldText = text;
-		text = newText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.ELEMENT_NAME__TEXT, oldText, text));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.ELEMENT_NAME__ID:
-				return getId();
-			case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-				return getText();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.ELEMENT_NAME__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-				setText((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.ELEMENT_NAME__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-				setText(TEXT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.ELEMENT_NAME__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-				return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", text: ");
-		result.append(text);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ElementNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ExceptionMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ExceptionMappingImpl.java
deleted file mode 100644
index 4bf36f104..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ExceptionMappingImpl.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exception Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl#getExceptionType <em>Exception Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl#getWsdlMessage <em>Wsdl Message</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ExceptionMappingImpl#getConstructorParameterOrder <em>Constructor Parameter Order</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExceptionMappingImpl extends J2EEEObjectImpl implements ExceptionMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExceptionType() <em>Exception Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getExceptionType()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String EXCEPTION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExceptionType() <em>Exception Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getExceptionType()
-	 * @generated
-	 * @ordered
-	 */
-  protected String exceptionType = EXCEPTION_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessage() <em>Wsdl Message</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessage()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLMessage wsdlMessage = null;
-
-	/**
-	 * The cached value of the '{@link #getConstructorParameterOrder() <em>Constructor Parameter Order</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getConstructorParameterOrder()
-	 * @generated
-	 * @ordered
-	 */
-  protected ConstructorParameterOrder constructorParameterOrder = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ExceptionMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.EXCEPTION_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getExceptionType() {
-		return exceptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setExceptionType(String newExceptionType) {
-		String oldExceptionType = exceptionType;
-		exceptionType = newExceptionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlMessagePartName() {
-		return wsdlMessagePartName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName) {
-		String oldWsdlMessagePartName = wsdlMessagePartName;
-		wsdlMessagePartName = newWsdlMessagePartName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessage getWsdlMessage() {
-		return wsdlMessage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlMessage(WSDLMessage newWsdlMessage, NotificationChain msgs) {
-		WSDLMessage oldWsdlMessage = wsdlMessage;
-		wsdlMessage = newWsdlMessage;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, oldWsdlMessage, newWsdlMessage);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessage(WSDLMessage newWsdlMessage) {
-		if (newWsdlMessage != wsdlMessage) {
-			NotificationChain msgs = null;
-			if (wsdlMessage != null)
-				msgs = ((InternalEObject)wsdlMessage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, null, msgs);
-			if (newWsdlMessage != null)
-				msgs = ((InternalEObject)newWsdlMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, null, msgs);
-			msgs = basicSetWsdlMessage(newWsdlMessage, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, newWsdlMessage, newWsdlMessage));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ConstructorParameterOrder getConstructorParameterOrder() {
-		return constructorParameterOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetConstructorParameterOrder(ConstructorParameterOrder newConstructorParameterOrder, NotificationChain msgs) {
-		ConstructorParameterOrder oldConstructorParameterOrder = constructorParameterOrder;
-		constructorParameterOrder = newConstructorParameterOrder;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, oldConstructorParameterOrder, newConstructorParameterOrder);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setConstructorParameterOrder(ConstructorParameterOrder newConstructorParameterOrder) {
-		if (newConstructorParameterOrder != constructorParameterOrder) {
-			NotificationChain msgs = null;
-			if (constructorParameterOrder != null)
-				msgs = ((InternalEObject)constructorParameterOrder).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, null, msgs);
-			if (newConstructorParameterOrder != null)
-				msgs = ((InternalEObject)newConstructorParameterOrder).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, null, msgs);
-			msgs = basicSetConstructorParameterOrder(newConstructorParameterOrder, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, newConstructorParameterOrder, newConstructorParameterOrder));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-				return basicSetWsdlMessage(null, msgs);
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-				return basicSetConstructorParameterOrder(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-				return getExceptionType();
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-				return getWsdlMessagePartName();
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-				return getWsdlMessage();
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-				return getConstructorParameterOrder();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-				setExceptionType((String)newValue);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName((String)newValue);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-				setWsdlMessage((WSDLMessage)newValue);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-				setConstructorParameterOrder((ConstructorParameterOrder)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-				setExceptionType(EXCEPTION_TYPE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-				setWsdlMessage((WSDLMessage)null);
-				return;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-				setConstructorParameterOrder((ConstructorParameterOrder)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-				return EXCEPTION_TYPE_EDEFAULT == null ? exceptionType != null : !EXCEPTION_TYPE_EDEFAULT.equals(exceptionType);
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-				return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-				return wsdlMessage != null;
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-				return constructorParameterOrder != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", exceptionType: ");
-		result.append(exceptionType);
-		result.append(", wsdlMessagePartName: ");
-		result.append(wsdlMessagePartName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExceptionMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/InterfaceMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/InterfaceMappingImpl.java
deleted file mode 100644
index 868db65c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/InterfaceMappingImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InterfaceMappingImpl extends J2EEEObjectImpl implements InterfaceMapping
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected InterfaceMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.INTERFACE_MAPPING;
-	}
-
-} //InterfaceMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JavaWSDLMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JavaWSDLMappingImpl.java
deleted file mode 100644
index c15d5c345..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JavaWSDLMappingImpl.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java WSDL Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl#getPackageMappings <em>Package Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl#getJavaXMLTypeMappings <em>Java XML Type Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl#getExceptionMappings <em>Exception Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaWSDLMappingImpl#getInterfaceMappings <em>Interface Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaWSDLMappingImpl extends J2EEEObjectImpl implements JavaWSDLMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPackageMappings() <em>Package Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPackageMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList packageMappings = null;
-
-	/**
-	 * The cached value of the '{@link #getJavaXMLTypeMappings() <em>Java XML Type Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaXMLTypeMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList javaXMLTypeMappings = null;
-
-	/**
-	 * The cached value of the '{@link #getExceptionMappings() <em>Exception Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getExceptionMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList exceptionMappings = null;
-
-	/**
-	 * The cached value of the '{@link #getInterfaceMappings() <em>Interface Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getInterfaceMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList interfaceMappings = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected JavaWSDLMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.JAVA_WSDL_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getPackageMappings() {
-		if (packageMappings == null) {
-			packageMappings = new EObjectContainmentEList(PackageMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS);
-		}
-		return packageMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getJavaXMLTypeMappings() {
-		if (javaXMLTypeMappings == null) {
-			javaXMLTypeMappings = new EObjectContainmentEList(JavaXMLTypeMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS);
-		}
-		return javaXMLTypeMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getExceptionMappings() {
-		if (exceptionMappings == null) {
-			exceptionMappings = new EObjectContainmentEList(ExceptionMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS);
-		}
-		return exceptionMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getInterfaceMappings() {
-		if (interfaceMappings == null) {
-			interfaceMappings = new EObjectContainmentEList(InterfaceMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS);
-		}
-		return interfaceMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-				return ((InternalEList)getPackageMappings()).basicRemove(otherEnd, msgs);
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-				return ((InternalEList)getJavaXMLTypeMappings()).basicRemove(otherEnd, msgs);
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-				return ((InternalEList)getExceptionMappings()).basicRemove(otherEnd, msgs);
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-				return ((InternalEList)getInterfaceMappings()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-				return getPackageMappings();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-				return getJavaXMLTypeMappings();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-				return getExceptionMappings();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-				return getInterfaceMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-				getPackageMappings().clear();
-				getPackageMappings().addAll((Collection)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-				getJavaXMLTypeMappings().clear();
-				getJavaXMLTypeMappings().addAll((Collection)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-				getExceptionMappings().clear();
-				getExceptionMappings().addAll((Collection)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-				getInterfaceMappings().clear();
-				getInterfaceMappings().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-				getPackageMappings().clear();
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-				getJavaXMLTypeMappings().clear();
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-				getExceptionMappings().clear();
-				return;
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-				getInterfaceMappings().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-				return packageMappings != null && !packageMappings.isEmpty();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-				return javaXMLTypeMappings != null && !javaXMLTypeMappings.isEmpty();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-				return exceptionMappings != null && !exceptionMappings.isEmpty();
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-				return interfaceMappings != null && !interfaceMappings.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JavaWSDLMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JavaXMLTypeMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JavaXMLTypeMappingImpl.java
deleted file mode 100644
index 2fa2c4fcf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JavaXMLTypeMappingImpl.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java XML Type Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl#getClassType <em>Class Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl#getQnameScope <em>Qname Scope</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl#getAnonymousTypeQname <em>Anonymous Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl#getRootTypeQname <em>Root Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.JavaXMLTypeMappingImpl#getVariableMappings <em>Variable Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaXMLTypeMappingImpl extends J2EEEObjectImpl implements JavaXMLTypeMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getClassType() <em>Class Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getClassType()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String CLASS_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassType() <em>Class Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getClassType()
-	 * @generated
-	 * @ordered
-	 */
-  protected String classType = CLASS_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getQnameScope() <em>Qname Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getQnameScope()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String QNAME_SCOPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQnameScope() <em>Qname Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getQnameScope()
-	 * @generated
-	 * @ordered
-	 */
-  protected String qnameScope = QNAME_SCOPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAnonymousTypeQname() <em>Anonymous Type Qname</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getAnonymousTypeQname()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ANONYMOUS_TYPE_QNAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAnonymousTypeQname() <em>Anonymous Type Qname</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getAnonymousTypeQname()
-	 * @generated
-	 * @ordered
-	 */
-  protected String anonymousTypeQname = ANONYMOUS_TYPE_QNAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRootTypeQname() <em>Root Type Qname</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getRootTypeQname()
-	 * @generated
-	 * @ordered
-	 */
-  protected RootTypeQname rootTypeQname = null;
-
-	/**
-	 * The cached value of the '{@link #getVariableMappings() <em>Variable Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getVariableMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList variableMappings = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected JavaXMLTypeMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.JAVA_XML_TYPE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getClassType() {
-		return classType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setClassType(String newClassType) {
-		String oldClassType = classType;
-		classType = newClassType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE, oldClassType, classType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getQnameScope() {
-		return qnameScope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setQnameScope(String newQnameScope) {
-		String oldQnameScope = qnameScope;
-		qnameScope = newQnameScope;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE, oldQnameScope, qnameScope));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getAnonymousTypeQname() {
-		return anonymousTypeQname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setAnonymousTypeQname(String newAnonymousTypeQname) {
-		String oldAnonymousTypeQname = anonymousTypeQname;
-		anonymousTypeQname = newAnonymousTypeQname;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME, oldAnonymousTypeQname, anonymousTypeQname));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public RootTypeQname getRootTypeQname() {
-		return rootTypeQname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetRootTypeQname(RootTypeQname newRootTypeQname, NotificationChain msgs) {
-		RootTypeQname oldRootTypeQname = rootTypeQname;
-		rootTypeQname = newRootTypeQname;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, oldRootTypeQname, newRootTypeQname);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setRootTypeQname(RootTypeQname newRootTypeQname) {
-		if (newRootTypeQname != rootTypeQname) {
-			NotificationChain msgs = null;
-			if (rootTypeQname != null)
-				msgs = ((InternalEObject)rootTypeQname).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, null, msgs);
-			if (newRootTypeQname != null)
-				msgs = ((InternalEObject)newRootTypeQname).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, null, msgs);
-			msgs = basicSetRootTypeQname(newRootTypeQname, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, newRootTypeQname, newRootTypeQname));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getVariableMappings() {
-		if (variableMappings == null) {
-			variableMappings = new EObjectContainmentEList(VariableMapping.class, this, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS);
-		}
-		return variableMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-				return basicSetRootTypeQname(null, msgs);
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-				return ((InternalEList)getVariableMappings()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-				return getClassType();
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-				return getQnameScope();
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-				return getAnonymousTypeQname();
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-				return getRootTypeQname();
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-				return getVariableMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-				setClassType((String)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-				setQnameScope((String)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-				setAnonymousTypeQname((String)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-				setRootTypeQname((RootTypeQname)newValue);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-				getVariableMappings().clear();
-				getVariableMappings().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-				setClassType(CLASS_TYPE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-				setQnameScope(QNAME_SCOPE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-				setAnonymousTypeQname(ANONYMOUS_TYPE_QNAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-				setRootTypeQname((RootTypeQname)null);
-				return;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-				getVariableMappings().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-				return CLASS_TYPE_EDEFAULT == null ? classType != null : !CLASS_TYPE_EDEFAULT.equals(classType);
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-				return QNAME_SCOPE_EDEFAULT == null ? qnameScope != null : !QNAME_SCOPE_EDEFAULT.equals(qnameScope);
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-				return ANONYMOUS_TYPE_QNAME_EDEFAULT == null ? anonymousTypeQname != null : !ANONYMOUS_TYPE_QNAME_EDEFAULT.equals(anonymousTypeQname);
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-				return rootTypeQname != null;
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-				return variableMappings != null && !variableMappings.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", classType: ");
-		result.append(classType);
-		result.append(", qnameScope: ");
-		result.append(qnameScope);
-		result.append(", anonymousTypeQname: ");
-		result.append(anonymousTypeQname);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JavaXMLTypeMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapFactoryImpl.java
deleted file mode 100644
index 8e050438f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapFactoryImpl.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JaxrpcmapFactoryImpl extends EFactoryImpl implements JaxrpcmapFactory
-{
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JaxrpcmapFactory init() {
-		try {
-			JaxrpcmapFactory theJaxrpcmapFactory = (JaxrpcmapFactory)EPackage.Registry.INSTANCE.getEFactory("jaxrpcmap.xmi"); 
-			if (theJaxrpcmapFactory != null) {
-				return theJaxrpcmapFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new JaxrpcmapFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JaxrpcmapFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING: return createJavaWSDLMapping();
-			case JaxrpcmapPackage.PACKAGE_MAPPING: return createPackageMapping();
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING: return createJavaXMLTypeMapping();
-			case JaxrpcmapPackage.EXCEPTION_MAPPING: return createExceptionMapping();
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING: return createServiceInterfaceMapping();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING: return createServiceEndpointInterfaceMapping();
-			case JaxrpcmapPackage.ROOT_TYPE_QNAME: return createRootTypeQname();
-			case JaxrpcmapPackage.VARIABLE_MAPPING: return createVariableMapping();
-			case JaxrpcmapPackage.WSDL_MESSAGE: return createWSDLMessage();
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER: return createConstructorParameterOrder();
-			case JaxrpcmapPackage.ELEMENT_NAME: return createElementName();
-			case JaxrpcmapPackage.WSDL_SERVICE_NAME: return createWSDLServiceName();
-			case JaxrpcmapPackage.PORT_MAPPING: return createPortMapping();
-			case JaxrpcmapPackage.WSDL_PORT_TYPE: return createWSDLPortType();
-			case JaxrpcmapPackage.WSDL_BINDING: return createWSDLBinding();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING: return createServiceEndpointMethodMapping();
-			case JaxrpcmapPackage.WSDL_OPERATION: return createWSDLOperation();
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING: return createMethodParamPartsMapping();
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING: return createWSDLReturnValueMapping();
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING: return createWSDLMessageMapping();
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME: return createWSDLMessagePartName();
-			case JaxrpcmapPackage.INTERFACE_MAPPING: return createInterfaceMapping();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JavaWSDLMapping createJavaWSDLMapping() {
-		JavaWSDLMappingImpl javaWSDLMapping = new JavaWSDLMappingImpl();
-		return javaWSDLMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public PackageMapping createPackageMapping() {
-		PackageMappingImpl packageMapping = new PackageMappingImpl();
-		return packageMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JavaXMLTypeMapping createJavaXMLTypeMapping() {
-		JavaXMLTypeMappingImpl javaXMLTypeMapping = new JavaXMLTypeMappingImpl();
-		return javaXMLTypeMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ExceptionMapping createExceptionMapping() {
-		ExceptionMappingImpl exceptionMapping = new ExceptionMappingImpl();
-		return exceptionMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceInterfaceMapping createServiceInterfaceMapping() {
-		ServiceInterfaceMappingImpl serviceInterfaceMapping = new ServiceInterfaceMappingImpl();
-		return serviceInterfaceMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceEndpointInterfaceMapping createServiceEndpointInterfaceMapping() {
-		ServiceEndpointInterfaceMappingImpl serviceEndpointInterfaceMapping = new ServiceEndpointInterfaceMappingImpl();
-		return serviceEndpointInterfaceMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public RootTypeQname createRootTypeQname() {
-		RootTypeQnameImpl rootTypeQname = new RootTypeQnameImpl();
-		return rootTypeQname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public VariableMapping createVariableMapping() {
-		VariableMappingImpl variableMapping = new VariableMappingImpl();
-		return variableMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessage createWSDLMessage() {
-		WSDLMessageImpl wsdlMessage = new WSDLMessageImpl();
-		return wsdlMessage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ConstructorParameterOrder createConstructorParameterOrder() {
-		ConstructorParameterOrderImpl constructorParameterOrder = new ConstructorParameterOrderImpl();
-		return constructorParameterOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ElementName createElementName() {
-		ElementNameImpl elementName = new ElementNameImpl();
-		return elementName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLServiceName createWSDLServiceName() {
-		WSDLServiceNameImpl wsdlServiceName = new WSDLServiceNameImpl();
-		return wsdlServiceName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public PortMapping createPortMapping() {
-		PortMappingImpl portMapping = new PortMappingImpl();
-		return portMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLPortType createWSDLPortType() {
-		WSDLPortTypeImpl wsdlPortType = new WSDLPortTypeImpl();
-		return wsdlPortType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLBinding createWSDLBinding() {
-		WSDLBindingImpl wsdlBinding = new WSDLBindingImpl();
-		return wsdlBinding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceEndpointMethodMapping createServiceEndpointMethodMapping() {
-		ServiceEndpointMethodMappingImpl serviceEndpointMethodMapping = new ServiceEndpointMethodMappingImpl();
-		return serviceEndpointMethodMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLOperation createWSDLOperation() {
-		WSDLOperationImpl wsdlOperation = new WSDLOperationImpl();
-		return wsdlOperation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public MethodParamPartsMapping createMethodParamPartsMapping() {
-		MethodParamPartsMappingImpl methodParamPartsMapping = new MethodParamPartsMappingImpl();
-		return methodParamPartsMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLReturnValueMapping createWSDLReturnValueMapping() {
-		WSDLReturnValueMappingImpl wsdlReturnValueMapping = new WSDLReturnValueMappingImpl();
-		return wsdlReturnValueMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessageMapping createWSDLMessageMapping() {
-		WSDLMessageMappingImpl wsdlMessageMapping = new WSDLMessageMappingImpl();
-		return wsdlMessageMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessagePartName createWSDLMessagePartName() {
-		WSDLMessagePartNameImpl wsdlMessagePartName = new WSDLMessagePartNameImpl();
-		return wsdlMessagePartName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public InterfaceMapping createInterfaceMapping() {
-		InterfaceMappingImpl interfaceMapping = new InterfaceMappingImpl();
-		return interfaceMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JaxrpcmapPackage getJaxrpcmapPackage() {
-		return (JaxrpcmapPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-  public static JaxrpcmapPackage getPackage() {
-		return JaxrpcmapPackage.eINSTANCE;
-	}
-
-} //JaxrpcmapFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java
deleted file mode 100644
index f9988a9a7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java
+++ /dev/null
@@ -1,1372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JaxrpcmapPackageImpl extends EPackageImpl implements JaxrpcmapPackage
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass javaWSDLMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass packageMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass javaXMLTypeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass exceptionMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass serviceInterfaceMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass serviceEndpointInterfaceMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass rootTypeQnameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass variableMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlMessageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass constructorParameterOrderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass elementNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlServiceNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass portMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlPortTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlBindingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass serviceEndpointMethodMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlOperationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass methodParamPartsMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlReturnValueMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlMessageMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlMessagePartNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass interfaceMappingEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-  private JaxrpcmapPackageImpl() {
-		super(eNS_URI, JaxrpcmapFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-  public static JaxrpcmapPackage init() {
-		if (isInited) return (JaxrpcmapPackage)EPackage.Registry.INSTANCE.getEPackage(JaxrpcmapPackage.eNS_URI);
-
-		// Obtain or create and register package
-		JaxrpcmapPackageImpl theJaxrpcmapPackage = (JaxrpcmapPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JaxrpcmapPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JaxrpcmapPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ClientPackage.eINSTANCE.eClass();
-		ApplicationPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		EjbPackage.eINSTANCE.eClass();
-		WebapplicationPackage.eINSTANCE.eClass();
-		Webservice_clientPackage.eINSTANCE.eClass();
-		JspPackage.eINSTANCE.eClass();
-		WscommonPackage.eINSTANCE.eClass();
-		WsddPackage.eINSTANCE.eClass();
-		EcorePackage.eINSTANCE.eClass();
-		JavaRefPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theJaxrpcmapPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theJaxrpcmapPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theJaxrpcmapPackage.freeze();
-
-		return theJaxrpcmapPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getJavaWSDLMapping() {
-		return javaWSDLMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getJavaWSDLMapping_Id() {
-		return (EAttribute)javaWSDLMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getJavaWSDLMapping_PackageMappings() {
-		return (EReference)javaWSDLMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getJavaWSDLMapping_JavaXMLTypeMappings() {
-		return (EReference)javaWSDLMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getJavaWSDLMapping_ExceptionMappings() {
-		return (EReference)javaWSDLMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getJavaWSDLMapping_InterfaceMappings() {
-		return (EReference)javaWSDLMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getPackageMapping() {
-		return packageMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPackageMapping_Id() {
-		return (EAttribute)packageMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPackageMapping_PackageType() {
-		return (EAttribute)packageMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPackageMapping_NamespaceURI() {
-		return (EAttribute)packageMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getJavaXMLTypeMapping() {
-		return javaXMLTypeMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getJavaXMLTypeMapping_Id() {
-		return (EAttribute)javaXMLTypeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getJavaXMLTypeMapping_ClassType() {
-		return (EAttribute)javaXMLTypeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getJavaXMLTypeMapping_QnameScope() {
-		return (EAttribute)javaXMLTypeMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getJavaXMLTypeMapping_AnonymousTypeQname() {
-		return (EAttribute)javaXMLTypeMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getJavaXMLTypeMapping_RootTypeQname() {
-		return (EReference)javaXMLTypeMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getJavaXMLTypeMapping_VariableMappings() {
-		return (EReference)javaXMLTypeMappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getExceptionMapping() {
-		return exceptionMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getExceptionMapping_Id() {
-		return (EAttribute)exceptionMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getExceptionMapping_ExceptionType() {
-		return (EAttribute)exceptionMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getExceptionMapping_WsdlMessagePartName() {
-		return (EAttribute)exceptionMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getExceptionMapping_WsdlMessage() {
-		return (EReference)exceptionMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getExceptionMapping_ConstructorParameterOrder() {
-		return (EReference)exceptionMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServiceInterfaceMapping() {
-		return serviceInterfaceMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceInterfaceMapping_Id() {
-		return (EAttribute)serviceInterfaceMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceInterfaceMapping_ServiceInterface() {
-		return (EAttribute)serviceInterfaceMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceInterfaceMapping_WsdlServiceName() {
-		return (EReference)serviceInterfaceMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceInterfaceMapping_PortMappings() {
-		return (EReference)serviceInterfaceMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServiceEndpointInterfaceMapping() {
-		return serviceEndpointInterfaceMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceEndpointInterfaceMapping_Id() {
-		return (EAttribute)serviceEndpointInterfaceMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceEndpointInterfaceMapping_ServiceEndpointInterface() {
-		return (EAttribute)serviceEndpointInterfaceMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceEndpointInterfaceMapping_WsdlPortType() {
-		return (EReference)serviceEndpointInterfaceMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceEndpointInterfaceMapping_WsdlBinding() {
-		return (EReference)serviceEndpointInterfaceMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings() {
-		return (EReference)serviceEndpointInterfaceMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getRootTypeQname() {
-		return rootTypeQnameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getVariableMapping() {
-		return variableMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getVariableMapping_Id() {
-		return (EAttribute)variableMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getVariableMapping_JavaVariableName() {
-		return (EAttribute)variableMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getVariableMapping_XmlElementName() {
-		return (EAttribute)variableMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getVariableMapping_DataMember() {
-		return (EAttribute)variableMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getVariableMapping_XmlAttributeName() {
-		return (EAttribute)variableMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getVariableMapping_XmlWildcard() {
-		return (EAttribute)variableMappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLMessage() {
-		return wsdlMessageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getConstructorParameterOrder() {
-		return constructorParameterOrderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getConstructorParameterOrder_Id() {
-		return (EAttribute)constructorParameterOrderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getConstructorParameterOrder_ElementNames() {
-		return (EReference)constructorParameterOrderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getElementName() {
-		return elementNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getElementName_Id() {
-		return (EAttribute)elementNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getElementName_Text() {
-		return (EAttribute)elementNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLServiceName() {
-		return wsdlServiceNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getPortMapping() {
-		return portMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortMapping_Id() {
-		return (EAttribute)portMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortMapping_PortName() {
-		return (EAttribute)portMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortMapping_JavaPortName() {
-		return (EAttribute)portMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLPortType() {
-		return wsdlPortTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLBinding() {
-		return wsdlBindingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServiceEndpointMethodMapping() {
-		return serviceEndpointMethodMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceEndpointMethodMapping_Id() {
-		return (EAttribute)serviceEndpointMethodMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceEndpointMethodMapping_JavaMethodName() {
-		return (EAttribute)serviceEndpointMethodMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceEndpointMethodMapping_WsdlOperation() {
-		return (EAttribute)serviceEndpointMethodMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServiceEndpointMethodMapping_WrappedElement() {
-		return (EAttribute)serviceEndpointMethodMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceEndpointMethodMapping_MethodParamPartsMappings() {
-		return (EReference)serviceEndpointMethodMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceEndpointMethodMapping_WsdlReturnValueMapping() {
-		return (EReference)serviceEndpointMethodMappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLOperation() {
-		return wsdlOperationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLOperation_Id() {
-		return (EAttribute)wsdlOperationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLOperation_WsdlOperation() {
-		return (EAttribute)wsdlOperationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getMethodParamPartsMapping() {
-		return methodParamPartsMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getMethodParamPartsMapping_Id() {
-		return (EAttribute)methodParamPartsMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getMethodParamPartsMapping_ParamPosition() {
-		return (EAttribute)methodParamPartsMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getMethodParamPartsMapping_ParamType() {
-		return (EAttribute)methodParamPartsMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getMethodParamPartsMapping_WsdlMessageMapping() {
-		return (EReference)methodParamPartsMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLReturnValueMapping() {
-		return wsdlReturnValueMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLReturnValueMapping_Id() {
-		return (EAttribute)wsdlReturnValueMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLReturnValueMapping_MethodReturnValue() {
-		return (EAttribute)wsdlReturnValueMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLReturnValueMapping_WsdlMessagePartName() {
-		return (EAttribute)wsdlReturnValueMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWSDLReturnValueMapping_WsdlMessage() {
-		return (EReference)wsdlReturnValueMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLMessageMapping() {
-		return wsdlMessageMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLMessageMapping_Id() {
-		return (EAttribute)wsdlMessageMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLMessageMapping_WsdlMessagePartName() {
-		return (EAttribute)wsdlMessageMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLMessageMapping_ParameterMode() {
-		return (EAttribute)wsdlMessageMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLMessageMapping_SoapHeader() {
-		return (EAttribute)wsdlMessageMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWSDLMessageMapping_WsdlMessage() {
-		return (EReference)wsdlMessageMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLMessagePartName() {
-		return wsdlMessagePartNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLMessagePartName_Id() {
-		return (EAttribute)wsdlMessagePartNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWSDLMessagePartName_WsdlMessagePartName() {
-		return (EAttribute)wsdlMessagePartNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getInterfaceMapping() {
-		return interfaceMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JaxrpcmapFactory getJaxrpcmapFactory() {
-		return (JaxrpcmapFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		javaWSDLMappingEClass = createEClass(JAVA_WSDL_MAPPING);
-		createEAttribute(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__ID);
-		createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS);
-		createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS);
-		createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS);
-		createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS);
-
-		packageMappingEClass = createEClass(PACKAGE_MAPPING);
-		createEAttribute(packageMappingEClass, PACKAGE_MAPPING__ID);
-		createEAttribute(packageMappingEClass, PACKAGE_MAPPING__PACKAGE_TYPE);
-		createEAttribute(packageMappingEClass, PACKAGE_MAPPING__NAMESPACE_URI);
-
-		javaXMLTypeMappingEClass = createEClass(JAVA_XML_TYPE_MAPPING);
-		createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__ID);
-		createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__CLASS_TYPE);
-		createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__QNAME_SCOPE);
-		createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME);
-		createEReference(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME);
-		createEReference(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS);
-
-		exceptionMappingEClass = createEClass(EXCEPTION_MAPPING);
-		createEAttribute(exceptionMappingEClass, EXCEPTION_MAPPING__ID);
-		createEAttribute(exceptionMappingEClass, EXCEPTION_MAPPING__EXCEPTION_TYPE);
-		createEAttribute(exceptionMappingEClass, EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME);
-		createEReference(exceptionMappingEClass, EXCEPTION_MAPPING__WSDL_MESSAGE);
-		createEReference(exceptionMappingEClass, EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER);
-
-		serviceInterfaceMappingEClass = createEClass(SERVICE_INTERFACE_MAPPING);
-		createEAttribute(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__ID);
-		createEAttribute(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE);
-		createEReference(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME);
-		createEReference(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS);
-
-		serviceEndpointInterfaceMappingEClass = createEClass(SERVICE_ENDPOINT_INTERFACE_MAPPING);
-		createEAttribute(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__ID);
-		createEAttribute(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE);
-		createEReference(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE);
-		createEReference(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING);
-		createEReference(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS);
-
-		rootTypeQnameEClass = createEClass(ROOT_TYPE_QNAME);
-
-		variableMappingEClass = createEClass(VARIABLE_MAPPING);
-		createEAttribute(variableMappingEClass, VARIABLE_MAPPING__ID);
-		createEAttribute(variableMappingEClass, VARIABLE_MAPPING__JAVA_VARIABLE_NAME);
-		createEAttribute(variableMappingEClass, VARIABLE_MAPPING__XML_ELEMENT_NAME);
-		createEAttribute(variableMappingEClass, VARIABLE_MAPPING__DATA_MEMBER);
-		createEAttribute(variableMappingEClass, VARIABLE_MAPPING__XML_ATTRIBUTE_NAME);
-		createEAttribute(variableMappingEClass, VARIABLE_MAPPING__XML_WILDCARD);
-
-		wsdlMessageEClass = createEClass(WSDL_MESSAGE);
-
-		constructorParameterOrderEClass = createEClass(CONSTRUCTOR_PARAMETER_ORDER);
-		createEAttribute(constructorParameterOrderEClass, CONSTRUCTOR_PARAMETER_ORDER__ID);
-		createEReference(constructorParameterOrderEClass, CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES);
-
-		elementNameEClass = createEClass(ELEMENT_NAME);
-		createEAttribute(elementNameEClass, ELEMENT_NAME__ID);
-		createEAttribute(elementNameEClass, ELEMENT_NAME__TEXT);
-
-		wsdlServiceNameEClass = createEClass(WSDL_SERVICE_NAME);
-
-		portMappingEClass = createEClass(PORT_MAPPING);
-		createEAttribute(portMappingEClass, PORT_MAPPING__ID);
-		createEAttribute(portMappingEClass, PORT_MAPPING__PORT_NAME);
-		createEAttribute(portMappingEClass, PORT_MAPPING__JAVA_PORT_NAME);
-
-		wsdlPortTypeEClass = createEClass(WSDL_PORT_TYPE);
-
-		wsdlBindingEClass = createEClass(WSDL_BINDING);
-
-		serviceEndpointMethodMappingEClass = createEClass(SERVICE_ENDPOINT_METHOD_MAPPING);
-		createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__ID);
-		createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME);
-		createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION);
-		createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT);
-		createEReference(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS);
-		createEReference(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING);
-
-		wsdlOperationEClass = createEClass(WSDL_OPERATION);
-		createEAttribute(wsdlOperationEClass, WSDL_OPERATION__ID);
-		createEAttribute(wsdlOperationEClass, WSDL_OPERATION__WSDL_OPERATION);
-
-		methodParamPartsMappingEClass = createEClass(METHOD_PARAM_PARTS_MAPPING);
-		createEAttribute(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__ID);
-		createEAttribute(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION);
-		createEAttribute(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE);
-		createEReference(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING);
-
-		wsdlReturnValueMappingEClass = createEClass(WSDL_RETURN_VALUE_MAPPING);
-		createEAttribute(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__ID);
-		createEAttribute(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE);
-		createEAttribute(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME);
-		createEReference(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE);
-
-		wsdlMessageMappingEClass = createEClass(WSDL_MESSAGE_MAPPING);
-		createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__ID);
-		createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME);
-		createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__PARAMETER_MODE);
-		createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__SOAP_HEADER);
-		createEReference(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__WSDL_MESSAGE);
-
-		wsdlMessagePartNameEClass = createEClass(WSDL_MESSAGE_PART_NAME);
-		createEAttribute(wsdlMessagePartNameEClass, WSDL_MESSAGE_PART_NAME__ID);
-		createEAttribute(wsdlMessagePartNameEClass, WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME);
-
-		interfaceMappingEClass = createEClass(INTERFACE_MAPPING);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		javaWSDLMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		packageMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		javaXMLTypeMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		exceptionMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		serviceInterfaceMappingEClass.getESuperTypes().add(this.getInterfaceMapping());
-		serviceEndpointInterfaceMappingEClass.getESuperTypes().add(this.getInterfaceMapping());
-		rootTypeQnameEClass.getESuperTypes().add(theCommonPackage.getQName());
-		variableMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlMessageEClass.getESuperTypes().add(theCommonPackage.getQName());
-		constructorParameterOrderEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		elementNameEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlServiceNameEClass.getESuperTypes().add(theCommonPackage.getQName());
-		portMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlPortTypeEClass.getESuperTypes().add(theCommonPackage.getQName());
-		wsdlBindingEClass.getESuperTypes().add(theCommonPackage.getQName());
-		serviceEndpointMethodMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlOperationEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		methodParamPartsMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlReturnValueMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlMessageMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		wsdlMessagePartNameEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-		interfaceMappingEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(javaWSDLMappingEClass, JavaWSDLMapping.class, "JavaWSDLMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJavaWSDLMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, JavaWSDLMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaWSDLMapping_PackageMappings(), this.getPackageMapping(), null, "packageMappings", null, 1, -1, JavaWSDLMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaWSDLMapping_JavaXMLTypeMappings(), this.getJavaXMLTypeMapping(), null, "javaXMLTypeMappings", null, 0, -1, JavaWSDLMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaWSDLMapping_ExceptionMappings(), this.getExceptionMapping(), null, "exceptionMappings", null, 0, -1, JavaWSDLMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaWSDLMapping_InterfaceMappings(), this.getInterfaceMapping(), null, "interfaceMappings", null, 0, -1, JavaWSDLMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(packageMappingEClass, PackageMapping.class, "PackageMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPackageMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, PackageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPackageMapping_PackageType(), ecorePackage.getEString(), "packageType", null, 0, 1, PackageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPackageMapping_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, PackageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(javaXMLTypeMappingEClass, JavaXMLTypeMapping.class, "JavaXMLTypeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJavaXMLTypeMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, JavaXMLTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaXMLTypeMapping_ClassType(), ecorePackage.getEString(), "classType", null, 0, 1, JavaXMLTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaXMLTypeMapping_QnameScope(), ecorePackage.getEString(), "qnameScope", null, 0, 1, JavaXMLTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaXMLTypeMapping_AnonymousTypeQname(), ecorePackage.getEString(), "anonymousTypeQname", null, 0, 1, JavaXMLTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaXMLTypeMapping_RootTypeQname(), this.getRootTypeQname(), null, "rootTypeQname", null, 1, 1, JavaXMLTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaXMLTypeMapping_VariableMappings(), this.getVariableMapping(), null, "variableMappings", null, 0, -1, JavaXMLTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(exceptionMappingEClass, ExceptionMapping.class, "ExceptionMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getExceptionMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, ExceptionMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getExceptionMapping_ExceptionType(), ecorePackage.getEString(), "exceptionType", null, 0, 1, ExceptionMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getExceptionMapping_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, ExceptionMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExceptionMapping_WsdlMessage(), this.getWSDLMessage(), null, "wsdlMessage", null, 1, 1, ExceptionMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExceptionMapping_ConstructorParameterOrder(), this.getConstructorParameterOrder(), null, "constructorParameterOrder", null, 0, 1, ExceptionMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(serviceInterfaceMappingEClass, ServiceInterfaceMapping.class, "ServiceInterfaceMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServiceInterfaceMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, ServiceInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceInterfaceMapping_ServiceInterface(), ecorePackage.getEString(), "serviceInterface", null, 0, 1, ServiceInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceInterfaceMapping_WsdlServiceName(), this.getWSDLServiceName(), null, "wsdlServiceName", null, 1, 1, ServiceInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceInterfaceMapping_PortMappings(), this.getPortMapping(), null, "portMappings", null, 0, -1, ServiceInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(serviceEndpointInterfaceMappingEClass, ServiceEndpointInterfaceMapping.class, "ServiceEndpointInterfaceMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServiceEndpointInterfaceMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, ServiceEndpointInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceEndpointInterfaceMapping_ServiceEndpointInterface(), ecorePackage.getEString(), "serviceEndpointInterface", null, 0, 1, ServiceEndpointInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceEndpointInterfaceMapping_WsdlPortType(), this.getWSDLPortType(), null, "wsdlPortType", null, 1, 1, ServiceEndpointInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceEndpointInterfaceMapping_WsdlBinding(), this.getWSDLBinding(), null, "wsdlBinding", null, 1, 1, ServiceEndpointInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings(), this.getServiceEndpointMethodMapping(), null, "serviceEndpointMethodMappings", null, 0, -1, ServiceEndpointInterfaceMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(rootTypeQnameEClass, RootTypeQname.class, "RootTypeQname", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(variableMappingEClass, VariableMapping.class, "VariableMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getVariableMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, VariableMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getVariableMapping_JavaVariableName(), ecorePackage.getEString(), "javaVariableName", null, 0, 1, VariableMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getVariableMapping_XmlElementName(), ecorePackage.getEString(), "xmlElementName", null, 0, 1, VariableMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getVariableMapping_DataMember(), ecorePackage.getEBoolean(), "dataMember", null, 0, 1, VariableMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getVariableMapping_XmlAttributeName(), ecorePackage.getEString(), "xmlAttributeName", null, 0, 1, VariableMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getVariableMapping_XmlWildcard(), ecorePackage.getEBoolean(), "xmlWildcard", null, 0, 1, VariableMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlMessageEClass, WSDLMessage.class, "WSDLMessage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(constructorParameterOrderEClass, ConstructorParameterOrder.class, "ConstructorParameterOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConstructorParameterOrder_Id(), ecorePackage.getEString(), "id", null, 0, 1, ConstructorParameterOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getConstructorParameterOrder_ElementNames(), this.getElementName(), null, "elementNames", null, 1, -1, ConstructorParameterOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(elementNameEClass, ElementName.class, "ElementName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getElementName_Id(), ecorePackage.getEString(), "id", null, 0, 1, ElementName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getElementName_Text(), ecorePackage.getEString(), "text", null, 0, 1, ElementName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlServiceNameEClass, WSDLServiceName.class, "WSDLServiceName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(portMappingEClass, PortMapping.class, "PortMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPortMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, PortMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortMapping_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, PortMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPortMapping_JavaPortName(), ecorePackage.getEString(), "javaPortName", null, 0, 1, PortMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlPortTypeEClass, WSDLPortType.class, "WSDLPortType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(wsdlBindingEClass, WSDLBinding.class, "WSDLBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(serviceEndpointMethodMappingEClass, ServiceEndpointMethodMapping.class, "ServiceEndpointMethodMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getServiceEndpointMethodMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, ServiceEndpointMethodMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceEndpointMethodMapping_JavaMethodName(), ecorePackage.getEString(), "javaMethodName", null, 0, 1, ServiceEndpointMethodMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceEndpointMethodMapping_WsdlOperation(), ecorePackage.getEString(), "wsdlOperation", null, 0, 1, ServiceEndpointMethodMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getServiceEndpointMethodMapping_WrappedElement(), ecorePackage.getEBoolean(), "wrappedElement", null, 0, 1, ServiceEndpointMethodMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceEndpointMethodMapping_MethodParamPartsMappings(), this.getMethodParamPartsMapping(), null, "methodParamPartsMappings", null, 0, -1, ServiceEndpointMethodMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getServiceEndpointMethodMapping_WsdlReturnValueMapping(), this.getWSDLReturnValueMapping(), null, "wsdlReturnValueMapping", null, 0, 1, ServiceEndpointMethodMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlOperationEClass, WSDLOperation.class, "WSDLOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWSDLOperation_Id(), ecorePackage.getEString(), "id", null, 0, 1, WSDLOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLOperation_WsdlOperation(), ecorePackage.getEString(), "wsdlOperation", null, 0, 1, WSDLOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodParamPartsMappingEClass, MethodParamPartsMapping.class, "MethodParamPartsMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodParamPartsMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, MethodParamPartsMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodParamPartsMapping_ParamPosition(), ecorePackage.getEString(), "paramPosition", null, 0, 1, MethodParamPartsMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodParamPartsMapping_ParamType(), ecorePackage.getEString(), "paramType", null, 0, 1, MethodParamPartsMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodParamPartsMapping_WsdlMessageMapping(), this.getWSDLMessageMapping(), null, "wsdlMessageMapping", null, 1, 1, MethodParamPartsMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlReturnValueMappingEClass, WSDLReturnValueMapping.class, "WSDLReturnValueMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWSDLReturnValueMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, WSDLReturnValueMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLReturnValueMapping_MethodReturnValue(), ecorePackage.getEString(), "methodReturnValue", null, 0, 1, WSDLReturnValueMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLReturnValueMapping_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, WSDLReturnValueMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWSDLReturnValueMapping_WsdlMessage(), this.getWSDLMessage(), null, "wsdlMessage", null, 1, 1, WSDLReturnValueMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlMessageMappingEClass, WSDLMessageMapping.class, "WSDLMessageMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWSDLMessageMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, WSDLMessageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLMessageMapping_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, WSDLMessageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLMessageMapping_ParameterMode(), ecorePackage.getEString(), "parameterMode", null, 0, 1, WSDLMessageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLMessageMapping_SoapHeader(), ecorePackage.getEBoolean(), "soapHeader", null, 0, 1, WSDLMessageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWSDLMessageMapping_WsdlMessage(), this.getWSDLMessage(), null, "wsdlMessage", null, 1, 1, WSDLMessageMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wsdlMessagePartNameEClass, WSDLMessagePartName.class, "WSDLMessagePartName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWSDLMessagePartName_Id(), ecorePackage.getEString(), "id", null, 0, 1, WSDLMessagePartName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWSDLMessagePartName_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, WSDLMessagePartName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(interfaceMappingEClass, InterfaceMapping.class, "InterfaceMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //JaxrpcmapPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapResourceImpl.java
deleted file mode 100644
index ab78fec18..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapResourceImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.common.internal.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.model.translator.webservices.JaxrpcmapTranslator;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class JaxrpcmapResourceImpl extends XMLResourceImpl implements JaxrpcmapResource
-{
-	public JaxrpcmapResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	public JaxrpcmapResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public JavaWSDLMapping getJavaWSDLMapping() {
-		return (JavaWSDLMapping) getRootObject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return JaxrpcmapTranslator.INSTANCE;
-	}
-	
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.XMLResource#getType()
-	 */
-	public int getType() {
-		return JAXRPC_MAP_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() 
-	{
-	  switch (getJ2EEVersionID()) 
-	  {
-	    case (J2EE_1_2_ID) :
-	    case (J2EE_1_3_ID) :	
-	      return WebServiceConstants.JAXRPCMAP_DOCTYPE;
-	    default :
-    		return null;
-      }
-	}
-
-
-   public boolean isJaxrpcmap1_0()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_0_ID);
-   }
-
-   public boolean isJaxrpcmap1_1()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_1_ID) ;   
-   }
-
-
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-	super.setVersionID(id);
-	switch (id) {
-			case (WebServiceConstants.WEBSERVICE_1_1_ID) :
-				super.setDoctypeValues(null, null);
-				break;
-			case (WebServiceConstants.WEBSERVICE_1_0_ID) :
-				super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-				break;			
-		}
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) 
-  {
-    switch (id) {
-    	case (J2EE_1_4_ID) :
-    				primSetDoctypeValues(null, null);
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_1_ID);
-    				break;
-    	case (J2EE_1_3_ID) :
-    				primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    				break;
-    	case (J2EE_1_2_ID) :
-    				primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-	  return  WebServiceConstants.JAXRPCMAP_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-	  return WebServiceConstants.JAXRPCMAP_SYSTEMID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-	  return WebServiceConstants.JAXRPCMAP_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-    return WebServiceConstants.JAXRPCMAP_SYSTEMID;
-	}
-
-	/* Return J2EE version based on module version
-	*/
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case WebServiceConstants.WEBSERVICE_1_0_ID:
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case WebServiceConstants.WEBSERVICE_1_1_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WebServiceConstants.WEBSERVICE_1_1_ID;
-	}
-
-  protected void syncVersionOfRootObject()
-  {
-    //Do nothing for now since the root object does not have a version.
-  }
-
-    
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/MethodParamPartsMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/MethodParamPartsMappingImpl.java
deleted file mode 100644
index dbdba9afa..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/MethodParamPartsMappingImpl.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Param Parts Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl#getParamPosition <em>Param Position</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl#getParamType <em>Param Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.MethodParamPartsMappingImpl#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodParamPartsMappingImpl extends J2EEEObjectImpl implements MethodParamPartsMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParamPosition() <em>Param Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamPosition()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAM_POSITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamPosition() <em>Param Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamPosition()
-	 * @generated
-	 * @ordered
-	 */
-  protected String paramPosition = PARAM_POSITION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParamType() <em>Param Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamType()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAM_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamType() <em>Param Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamType()
-	 * @generated
-	 * @ordered
-	 */
-  protected String paramType = PARAM_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessageMapping() <em>Wsdl Message Mapping</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessageMapping()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLMessageMapping wsdlMessageMapping = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected MethodParamPartsMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.METHOD_PARAM_PARTS_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParamPosition() {
-		return paramPosition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParamPosition(String newParamPosition) {
-		String oldParamPosition = paramPosition;
-		paramPosition = newParamPosition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION, oldParamPosition, paramPosition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParamType() {
-		return paramType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParamType(String newParamType) {
-		String oldParamType = paramType;
-		paramType = newParamType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE, oldParamType, paramType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessageMapping getWsdlMessageMapping() {
-		return wsdlMessageMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlMessageMapping(WSDLMessageMapping newWsdlMessageMapping, NotificationChain msgs) {
-		WSDLMessageMapping oldWsdlMessageMapping = wsdlMessageMapping;
-		wsdlMessageMapping = newWsdlMessageMapping;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, oldWsdlMessageMapping, newWsdlMessageMapping);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessageMapping(WSDLMessageMapping newWsdlMessageMapping) {
-		if (newWsdlMessageMapping != wsdlMessageMapping) {
-			NotificationChain msgs = null;
-			if (wsdlMessageMapping != null)
-				msgs = ((InternalEObject)wsdlMessageMapping).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, null, msgs);
-			if (newWsdlMessageMapping != null)
-				msgs = ((InternalEObject)newWsdlMessageMapping).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, null, msgs);
-			msgs = basicSetWsdlMessageMapping(newWsdlMessageMapping, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, newWsdlMessageMapping, newWsdlMessageMapping));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-				return basicSetWsdlMessageMapping(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-				return getParamPosition();
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-				return getParamType();
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-				return getWsdlMessageMapping();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-				setParamPosition((String)newValue);
-				return;
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-				setParamType((String)newValue);
-				return;
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-				setWsdlMessageMapping((WSDLMessageMapping)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-				setParamPosition(PARAM_POSITION_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-				setParamType(PARAM_TYPE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-				setWsdlMessageMapping((WSDLMessageMapping)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-				return PARAM_POSITION_EDEFAULT == null ? paramPosition != null : !PARAM_POSITION_EDEFAULT.equals(paramPosition);
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-				return PARAM_TYPE_EDEFAULT == null ? paramType != null : !PARAM_TYPE_EDEFAULT.equals(paramType);
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-				return wsdlMessageMapping != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", paramPosition: ");
-		result.append(paramPosition);
-		result.append(", paramType: ");
-		result.append(paramType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodParamPartsMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/PackageMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/PackageMappingImpl.java
deleted file mode 100644
index cfc3e82a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/PackageMappingImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Package Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl#getPackageType <em>Package Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PackageMappingImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PackageMappingImpl extends J2EEEObjectImpl implements PackageMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPackageType() <em>Package Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPackageType()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PACKAGE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPackageType() <em>Package Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPackageType()
-	 * @generated
-	 * @ordered
-	 */
-  protected String packageType = PACKAGE_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getNamespaceURI()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getNamespaceURI()
-	 * @generated
-	 * @ordered
-	 */
-  protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected PackageMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.PACKAGE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getPackageType() {
-		return packageType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setPackageType(String newPackageType) {
-		String oldPackageType = packageType;
-		packageType = newPackageType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE, oldPackageType, packageType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getNamespaceURI() {
-		return namespaceURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setNamespaceURI(String newNamespaceURI) {
-		String oldNamespaceURI = namespaceURI;
-		namespaceURI = newNamespaceURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-				return getPackageType();
-			case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-				return getNamespaceURI();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-				setPackageType((String)newValue);
-				return;
-			case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-				setNamespaceURI((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-				setPackageType(PACKAGE_TYPE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-				setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-				return PACKAGE_TYPE_EDEFAULT == null ? packageType != null : !PACKAGE_TYPE_EDEFAULT.equals(packageType);
-			case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-				return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", packageType: ");
-		result.append(packageType);
-		result.append(", namespaceURI: ");
-		result.append(namespaceURI);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PackageMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/PortMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/PortMappingImpl.java
deleted file mode 100644
index 116d163eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/PortMappingImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl#getPortName <em>Port Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.PortMappingImpl#getJavaPortName <em>Java Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortMappingImpl extends J2EEEObjectImpl implements PortMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PORT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String portName = PORT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJavaPortName() <em>Java Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String JAVA_PORT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJavaPortName() <em>Java Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String javaPortName = JAVA_PORT_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected PortMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.PORT_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PORT_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getPortName() {
-		return portName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setPortName(String newPortName) {
-		String oldPortName = portName;
-		portName = newPortName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PORT_MAPPING__PORT_NAME, oldPortName, portName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getJavaPortName() {
-		return javaPortName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setJavaPortName(String newJavaPortName) {
-		String oldJavaPortName = javaPortName;
-		javaPortName = newJavaPortName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME, oldJavaPortName, javaPortName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PORT_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-				return getPortName();
-			case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-				return getJavaPortName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PORT_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-				setPortName((String)newValue);
-				return;
-			case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-				setJavaPortName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PORT_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-				setPortName(PORT_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-				setJavaPortName(JAVA_PORT_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.PORT_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-				return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
-			case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-				return JAVA_PORT_NAME_EDEFAULT == null ? javaPortName != null : !JAVA_PORT_NAME_EDEFAULT.equals(javaPortName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", portName: ");
-		result.append(portName);
-		result.append(", javaPortName: ");
-		result.append(javaPortName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/RootTypeQnameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/RootTypeQnameImpl.java
deleted file mode 100644
index b00769c1e..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/RootTypeQnameImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Root Type Qname</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RootTypeQnameImpl extends QNameImpl implements RootTypeQname
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected RootTypeQnameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.ROOT_TYPE_QNAME;
-	}
-
-} //RootTypeQnameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceEndpointInterfaceMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceEndpointInterfaceMappingImpl.java
deleted file mode 100644
index 0c36bd6c6..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceEndpointInterfaceMappingImpl.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Endpoint Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl#getWsdlPortType <em>Wsdl Port Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl#getWsdlBinding <em>Wsdl Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointInterfaceMappingImpl#getServiceEndpointMethodMappings <em>Service Endpoint Method Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceEndpointInterfaceMappingImpl extends InterfaceMappingImpl implements ServiceEndpointInterfaceMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SERVICE_ENDPOINT_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected String serviceEndpointInterface = SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlPortType() <em>Wsdl Port Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlPortType()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLPortType wsdlPortType = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlBinding() <em>Wsdl Binding</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlBinding()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLBinding wsdlBinding = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointMethodMappings() <em>Service Endpoint Method Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointMethodMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList serviceEndpointMethodMappings = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServiceEndpointInterfaceMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.SERVICE_ENDPOINT_INTERFACE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getServiceEndpointInterface() {
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServiceEndpointInterface(String newServiceEndpointInterface) {
-		String oldServiceEndpointInterface = serviceEndpointInterface;
-		serviceEndpointInterface = newServiceEndpointInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLPortType getWsdlPortType() {
-		return wsdlPortType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlPortType(WSDLPortType newWsdlPortType, NotificationChain msgs) {
-		WSDLPortType oldWsdlPortType = wsdlPortType;
-		wsdlPortType = newWsdlPortType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, oldWsdlPortType, newWsdlPortType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlPortType(WSDLPortType newWsdlPortType) {
-		if (newWsdlPortType != wsdlPortType) {
-			NotificationChain msgs = null;
-			if (wsdlPortType != null)
-				msgs = ((InternalEObject)wsdlPortType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, null, msgs);
-			if (newWsdlPortType != null)
-				msgs = ((InternalEObject)newWsdlPortType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, null, msgs);
-			msgs = basicSetWsdlPortType(newWsdlPortType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, newWsdlPortType, newWsdlPortType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLBinding getWsdlBinding() {
-		return wsdlBinding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlBinding(WSDLBinding newWsdlBinding, NotificationChain msgs) {
-		WSDLBinding oldWsdlBinding = wsdlBinding;
-		wsdlBinding = newWsdlBinding;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, oldWsdlBinding, newWsdlBinding);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlBinding(WSDLBinding newWsdlBinding) {
-		if (newWsdlBinding != wsdlBinding) {
-			NotificationChain msgs = null;
-			if (wsdlBinding != null)
-				msgs = ((InternalEObject)wsdlBinding).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, null, msgs);
-			if (newWsdlBinding != null)
-				msgs = ((InternalEObject)newWsdlBinding).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, null, msgs);
-			msgs = basicSetWsdlBinding(newWsdlBinding, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, newWsdlBinding, newWsdlBinding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getServiceEndpointMethodMappings() {
-		if (serviceEndpointMethodMappings == null) {
-			serviceEndpointMethodMappings = new EObjectContainmentEList(ServiceEndpointMethodMapping.class, this, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS);
-		}
-		return serviceEndpointMethodMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-				return basicSetWsdlPortType(null, msgs);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-				return basicSetWsdlBinding(null, msgs);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-				return ((InternalEList)getServiceEndpointMethodMappings()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-				return getServiceEndpointInterface();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-				return getWsdlPortType();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-				return getWsdlBinding();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-				return getServiceEndpointMethodMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-				setWsdlPortType((WSDLPortType)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-				setWsdlBinding((WSDLBinding)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-				getServiceEndpointMethodMappings().clear();
-				getServiceEndpointMethodMappings().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface(SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-				setWsdlPortType((WSDLPortType)null);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-				setWsdlBinding((WSDLBinding)null);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-				getServiceEndpointMethodMappings().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-				return SERVICE_ENDPOINT_INTERFACE_EDEFAULT == null ? serviceEndpointInterface != null : !SERVICE_ENDPOINT_INTERFACE_EDEFAULT.equals(serviceEndpointInterface);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-				return wsdlPortType != null;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-				return wsdlBinding != null;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-				return serviceEndpointMethodMappings != null && !serviceEndpointMethodMappings.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", serviceEndpointInterface: ");
-		result.append(serviceEndpointInterface);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceEndpointInterfaceMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceEndpointMethodMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceEndpointMethodMappingImpl.java
deleted file mode 100644
index a4ef91368..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceEndpointMethodMappingImpl.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Endpoint Method Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl#getJavaMethodName <em>Java Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl#getWsdlOperation <em>Wsdl Operation</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl#isWrappedElement <em>Wrapped Element</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl#getMethodParamPartsMappings <em>Method Param Parts Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceEndpointMethodMappingImpl#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceEndpointMethodMappingImpl extends J2EEEObjectImpl implements ServiceEndpointMethodMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJavaMethodName() <em>Java Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaMethodName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String JAVA_METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJavaMethodName() <em>Java Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaMethodName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String javaMethodName = JAVA_METHOD_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlOperation()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_OPERATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlOperation()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlOperation = WSDL_OPERATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isWrappedElement() <em>Wrapped Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isWrappedElement()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final boolean WRAPPED_ELEMENT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isWrappedElement() <em>Wrapped Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isWrappedElement()
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean wrappedElement = WRAPPED_ELEMENT_EDEFAULT;
-
-	/**
-	 * This is true if the Wrapped Element attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean wrappedElementESet = false;
-
-	/**
-	 * The cached value of the '{@link #getMethodParamPartsMappings() <em>Method Param Parts Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getMethodParamPartsMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList methodParamPartsMappings = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlReturnValueMapping() <em>Wsdl Return Value Mapping</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlReturnValueMapping()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLReturnValueMapping wsdlReturnValueMapping = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServiceEndpointMethodMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.SERVICE_ENDPOINT_METHOD_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getJavaMethodName() {
-		return javaMethodName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setJavaMethodName(String newJavaMethodName) {
-		String oldJavaMethodName = javaMethodName;
-		javaMethodName = newJavaMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME, oldJavaMethodName, javaMethodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlOperation() {
-		return wsdlOperation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlOperation(String newWsdlOperation) {
-		String oldWsdlOperation = wsdlOperation;
-		wsdlOperation = newWsdlOperation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION, oldWsdlOperation, wsdlOperation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isWrappedElement() {
-		return wrappedElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWrappedElement(boolean newWrappedElement) {
-		boolean oldWrappedElement = wrappedElement;
-		wrappedElement = newWrappedElement;
-		boolean oldWrappedElementESet = wrappedElementESet;
-		wrappedElementESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT, oldWrappedElement, wrappedElement, !oldWrappedElementESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetWrappedElement() {
-		boolean oldWrappedElement = wrappedElement;
-		boolean oldWrappedElementESet = wrappedElementESet;
-		wrappedElement = WRAPPED_ELEMENT_EDEFAULT;
-		wrappedElementESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT, oldWrappedElement, WRAPPED_ELEMENT_EDEFAULT, oldWrappedElementESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetWrappedElement() {
-		return wrappedElementESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getMethodParamPartsMappings() {
-		if (methodParamPartsMappings == null) {
-			methodParamPartsMappings = new EObjectContainmentEList(MethodParamPartsMapping.class, this, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS);
-		}
-		return methodParamPartsMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLReturnValueMapping getWsdlReturnValueMapping() {
-		return wsdlReturnValueMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlReturnValueMapping(WSDLReturnValueMapping newWsdlReturnValueMapping, NotificationChain msgs) {
-		WSDLReturnValueMapping oldWsdlReturnValueMapping = wsdlReturnValueMapping;
-		wsdlReturnValueMapping = newWsdlReturnValueMapping;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, oldWsdlReturnValueMapping, newWsdlReturnValueMapping);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlReturnValueMapping(WSDLReturnValueMapping newWsdlReturnValueMapping) {
-		if (newWsdlReturnValueMapping != wsdlReturnValueMapping) {
-			NotificationChain msgs = null;
-			if (wsdlReturnValueMapping != null)
-				msgs = ((InternalEObject)wsdlReturnValueMapping).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, null, msgs);
-			if (newWsdlReturnValueMapping != null)
-				msgs = ((InternalEObject)newWsdlReturnValueMapping).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, null, msgs);
-			msgs = basicSetWsdlReturnValueMapping(newWsdlReturnValueMapping, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, newWsdlReturnValueMapping, newWsdlReturnValueMapping));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-				return ((InternalEList)getMethodParamPartsMappings()).basicRemove(otherEnd, msgs);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-				return basicSetWsdlReturnValueMapping(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-				return getJavaMethodName();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-				return getWsdlOperation();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-				return isWrappedElement() ? Boolean.TRUE : Boolean.FALSE;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-				return getMethodParamPartsMappings();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-				return getWsdlReturnValueMapping();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-				setJavaMethodName((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-				setWsdlOperation((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-				setWrappedElement(((Boolean)newValue).booleanValue());
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-				getMethodParamPartsMappings().clear();
-				getMethodParamPartsMappings().addAll((Collection)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-				setWsdlReturnValueMapping((WSDLReturnValueMapping)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-				setJavaMethodName(JAVA_METHOD_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-				setWsdlOperation(WSDL_OPERATION_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-				unsetWrappedElement();
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-				getMethodParamPartsMappings().clear();
-				return;
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-				setWsdlReturnValueMapping((WSDLReturnValueMapping)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-				return JAVA_METHOD_NAME_EDEFAULT == null ? javaMethodName != null : !JAVA_METHOD_NAME_EDEFAULT.equals(javaMethodName);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-				return WSDL_OPERATION_EDEFAULT == null ? wsdlOperation != null : !WSDL_OPERATION_EDEFAULT.equals(wsdlOperation);
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-				return isSetWrappedElement();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-				return methodParamPartsMappings != null && !methodParamPartsMappings.isEmpty();
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-				return wsdlReturnValueMapping != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", javaMethodName: ");
-		result.append(javaMethodName);
-		result.append(", wsdlOperation: ");
-		result.append(wsdlOperation);
-		result.append(", wrappedElement: ");
-		if (wrappedElementESet) result.append(wrappedElement); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceEndpointMethodMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceInterfaceMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceInterfaceMappingImpl.java
deleted file mode 100644
index 663f26ce1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/ServiceInterfaceMappingImpl.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl#getWsdlServiceName <em>Wsdl Service Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.ServiceInterfaceMappingImpl#getPortMappings <em>Port Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceInterfaceMappingImpl extends InterfaceMappingImpl implements ServiceInterfaceMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceInterface() <em>Service Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SERVICE_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceInterface() <em>Service Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected String serviceInterface = SERVICE_INTERFACE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlServiceName() <em>Wsdl Service Name</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlServiceName()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLServiceName wsdlServiceName = null;
-
-	/**
-	 * The cached value of the '{@link #getPortMappings() <em>Port Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortMappings()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList portMappings = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServiceInterfaceMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.SERVICE_INTERFACE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getServiceInterface() {
-		return serviceInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServiceInterface(String newServiceInterface) {
-		String oldServiceInterface = serviceInterface;
-		serviceInterface = newServiceInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLServiceName getWsdlServiceName() {
-		return wsdlServiceName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlServiceName(WSDLServiceName newWsdlServiceName, NotificationChain msgs) {
-		WSDLServiceName oldWsdlServiceName = wsdlServiceName;
-		wsdlServiceName = newWsdlServiceName;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, oldWsdlServiceName, newWsdlServiceName);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlServiceName(WSDLServiceName newWsdlServiceName) {
-		if (newWsdlServiceName != wsdlServiceName) {
-			NotificationChain msgs = null;
-			if (wsdlServiceName != null)
-				msgs = ((InternalEObject)wsdlServiceName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, null, msgs);
-			if (newWsdlServiceName != null)
-				msgs = ((InternalEObject)newWsdlServiceName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, null, msgs);
-			msgs = basicSetWsdlServiceName(newWsdlServiceName, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, newWsdlServiceName, newWsdlServiceName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getPortMappings() {
-		if (portMappings == null) {
-			portMappings = new EObjectContainmentEList(PortMapping.class, this, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS);
-		}
-		return portMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-				return basicSetWsdlServiceName(null, msgs);
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-				return ((InternalEList)getPortMappings()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-				return getServiceInterface();
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-				return getWsdlServiceName();
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-				return getPortMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-				setServiceInterface((String)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-				setWsdlServiceName((WSDLServiceName)newValue);
-				return;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-				getPortMappings().clear();
-				getPortMappings().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-				setServiceInterface(SERVICE_INTERFACE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-				setWsdlServiceName((WSDLServiceName)null);
-				return;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-				getPortMappings().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-				return SERVICE_INTERFACE_EDEFAULT == null ? serviceInterface != null : !SERVICE_INTERFACE_EDEFAULT.equals(serviceInterface);
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-				return wsdlServiceName != null;
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-				return portMappings != null && !portMappings.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", serviceInterface: ");
-		result.append(serviceInterface);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceInterfaceMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/VariableMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/VariableMappingImpl.java
deleted file mode 100644
index 91ea156cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/VariableMappingImpl.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Variable Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl#getJavaVariableName <em>Java Variable Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl#getXmlElementName <em>Xml Element Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl#isDataMember <em>Data Member</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl#getXmlAttributeName <em>Xml Attribute Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.VariableMappingImpl#isXmlWildcard <em>Xml Wildcard</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VariableMappingImpl extends J2EEEObjectImpl implements VariableMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJavaVariableName() <em>Java Variable Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaVariableName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String JAVA_VARIABLE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJavaVariableName() <em>Java Variable Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJavaVariableName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String javaVariableName = JAVA_VARIABLE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getXmlElementName() <em>Xml Element Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getXmlElementName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String XML_ELEMENT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getXmlElementName() <em>Xml Element Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getXmlElementName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String xmlElementName = XML_ELEMENT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDataMember() <em>Data Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isDataMember()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final boolean DATA_MEMBER_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDataMember() <em>Data Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isDataMember()
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean dataMember = DATA_MEMBER_EDEFAULT;
-
-	/**
-	 * This is true if the Data Member attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean dataMemberESet = false;
-
-	/**
-	 * The default value of the '{@link #getXmlAttributeName() <em>Xml Attribute Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getXmlAttributeName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String XML_ATTRIBUTE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getXmlAttributeName() <em>Xml Attribute Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getXmlAttributeName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String xmlAttributeName = XML_ATTRIBUTE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isXmlWildcard() <em>Xml Wildcard</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isXmlWildcard()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final boolean XML_WILDCARD_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isXmlWildcard() <em>Xml Wildcard</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isXmlWildcard()
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean xmlWildcard = XML_WILDCARD_EDEFAULT;
-
-	/**
-	 * This is true if the Xml Wildcard attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean xmlWildcardESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected VariableMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.VARIABLE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getJavaVariableName() {
-		return javaVariableName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setJavaVariableName(String newJavaVariableName) {
-		String oldJavaVariableName = javaVariableName;
-		javaVariableName = newJavaVariableName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME, oldJavaVariableName, javaVariableName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getXmlElementName() {
-		return xmlElementName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setXmlElementName(String newXmlElementName) {
-		String oldXmlElementName = xmlElementName;
-		xmlElementName = newXmlElementName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME, oldXmlElementName, xmlElementName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isDataMember() {
-		return dataMember;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDataMember(boolean newDataMember) {
-		boolean oldDataMember = dataMember;
-		dataMember = newDataMember;
-		boolean oldDataMemberESet = dataMemberESet;
-		dataMemberESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER, oldDataMember, dataMember, !oldDataMemberESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetDataMember() {
-		boolean oldDataMember = dataMember;
-		boolean oldDataMemberESet = dataMemberESet;
-		dataMember = DATA_MEMBER_EDEFAULT;
-		dataMemberESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER, oldDataMember, DATA_MEMBER_EDEFAULT, oldDataMemberESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetDataMember() {
-		return dataMemberESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getXmlAttributeName() {
-		return xmlAttributeName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setXmlAttributeName(String newXmlAttributeName) {
-		String oldXmlAttributeName = xmlAttributeName;
-		xmlAttributeName = newXmlAttributeName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME, oldXmlAttributeName, xmlAttributeName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isXmlWildcard() {
-		return xmlWildcard;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setXmlWildcard(boolean newXmlWildcard) {
-		boolean oldXmlWildcard = xmlWildcard;
-		xmlWildcard = newXmlWildcard;
-		boolean oldXmlWildcardESet = xmlWildcardESet;
-		xmlWildcardESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD, oldXmlWildcard, xmlWildcard, !oldXmlWildcardESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetXmlWildcard() {
-		boolean oldXmlWildcard = xmlWildcard;
-		boolean oldXmlWildcardESet = xmlWildcardESet;
-		xmlWildcard = XML_WILDCARD_EDEFAULT;
-		xmlWildcardESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD, oldXmlWildcard, XML_WILDCARD_EDEFAULT, oldXmlWildcardESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetXmlWildcard() {
-		return xmlWildcardESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-				return getJavaVariableName();
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-				return getXmlElementName();
-			case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-				return isDataMember() ? Boolean.TRUE : Boolean.FALSE;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-				return getXmlAttributeName();
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-				return isXmlWildcard() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-				setJavaVariableName((String)newValue);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-				setXmlElementName((String)newValue);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-				setDataMember(((Boolean)newValue).booleanValue());
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-				setXmlAttributeName((String)newValue);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-				setXmlWildcard(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-				setJavaVariableName(JAVA_VARIABLE_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-				setXmlElementName(XML_ELEMENT_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-				unsetDataMember();
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-				setXmlAttributeName(XML_ATTRIBUTE_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-				unsetXmlWildcard();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-				return JAVA_VARIABLE_NAME_EDEFAULT == null ? javaVariableName != null : !JAVA_VARIABLE_NAME_EDEFAULT.equals(javaVariableName);
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-				return XML_ELEMENT_NAME_EDEFAULT == null ? xmlElementName != null : !XML_ELEMENT_NAME_EDEFAULT.equals(xmlElementName);
-			case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-				return isSetDataMember();
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-				return XML_ATTRIBUTE_NAME_EDEFAULT == null ? xmlAttributeName != null : !XML_ATTRIBUTE_NAME_EDEFAULT.equals(xmlAttributeName);
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-				return isSetXmlWildcard();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", javaVariableName: ");
-		result.append(javaVariableName);
-		result.append(", xmlElementName: ");
-		result.append(xmlElementName);
-		result.append(", dataMember: ");
-		if (dataMemberESet) result.append(dataMember); else result.append("<unset>");
-		result.append(", xmlAttributeName: ");
-		result.append(xmlAttributeName);
-		result.append(", xmlWildcard: ");
-		if (xmlWildcardESet) result.append(xmlWildcard); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //VariableMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLBindingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLBindingImpl.java
deleted file mode 100644
index 6a157147d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLBindingImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLBindingImpl extends QNameImpl implements WSDLBinding
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLBindingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_BINDING;
-	}
-
-} //WSDLBindingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessageImpl.java
deleted file mode 100644
index c0314d471..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessageImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Message</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLMessageImpl extends QNameImpl implements WSDLMessage
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLMessageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_MESSAGE;
-	}
-
-} //WSDLMessageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessageMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessageMappingImpl.java
deleted file mode 100644
index 6a20f9d08..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessageMappingImpl.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Message Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl#getParameterMode <em>Parameter Mode</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl#isSoapHeader <em>Soap Header</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessageMappingImpl#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLMessageMappingImpl extends J2EEEObjectImpl implements WSDLMessageMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParameterMode()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAMETER_MODE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParameterMode()
-	 * @generated
-	 * @ordered
-	 */
-  protected String parameterMode = PARAMETER_MODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isSoapHeader() <em>Soap Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSoapHeader()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final boolean SOAP_HEADER_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSoapHeader() <em>Soap Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSoapHeader()
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean soapHeader = SOAP_HEADER_EDEFAULT;
-
-	/**
-	 * This is true if the Soap Header attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean soapHeaderESet = false;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessage() <em>Wsdl Message</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessage()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLMessage wsdlMessage = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLMessageMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_MESSAGE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlMessagePartName() {
-		return wsdlMessagePartName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName) {
-		String oldWsdlMessagePartName = wsdlMessagePartName;
-		wsdlMessagePartName = newWsdlMessagePartName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParameterMode() {
-		return parameterMode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParameterMode(String newParameterMode) {
-		String oldParameterMode = parameterMode;
-		parameterMode = newParameterMode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE, oldParameterMode, parameterMode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSoapHeader() {
-		return soapHeader;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSoapHeader(boolean newSoapHeader) {
-		boolean oldSoapHeader = soapHeader;
-		soapHeader = newSoapHeader;
-		boolean oldSoapHeaderESet = soapHeaderESet;
-		soapHeaderESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER, oldSoapHeader, soapHeader, !oldSoapHeaderESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetSoapHeader() {
-		boolean oldSoapHeader = soapHeader;
-		boolean oldSoapHeaderESet = soapHeaderESet;
-		soapHeader = SOAP_HEADER_EDEFAULT;
-		soapHeaderESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER, oldSoapHeader, SOAP_HEADER_EDEFAULT, oldSoapHeaderESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetSoapHeader() {
-		return soapHeaderESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessage getWsdlMessage() {
-		return wsdlMessage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlMessage(WSDLMessage newWsdlMessage, NotificationChain msgs) {
-		WSDLMessage oldWsdlMessage = wsdlMessage;
-		wsdlMessage = newWsdlMessage;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, oldWsdlMessage, newWsdlMessage);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessage(WSDLMessage newWsdlMessage) {
-		if (newWsdlMessage != wsdlMessage) {
-			NotificationChain msgs = null;
-			if (wsdlMessage != null)
-				msgs = ((InternalEObject)wsdlMessage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, null, msgs);
-			if (newWsdlMessage != null)
-				msgs = ((InternalEObject)newWsdlMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, null, msgs);
-			msgs = basicSetWsdlMessage(newWsdlMessage, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, newWsdlMessage, newWsdlMessage));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-				return basicSetWsdlMessage(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				return getWsdlMessagePartName();
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-				return getParameterMode();
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-				return isSoapHeader() ? Boolean.TRUE : Boolean.FALSE;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-				return getWsdlMessage();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-				setParameterMode((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-				setSoapHeader(((Boolean)newValue).booleanValue());
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-				setWsdlMessage((WSDLMessage)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-				setParameterMode(PARAMETER_MODE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-				unsetSoapHeader();
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-				setWsdlMessage((WSDLMessage)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-				return PARAMETER_MODE_EDEFAULT == null ? parameterMode != null : !PARAMETER_MODE_EDEFAULT.equals(parameterMode);
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-				return isSetSoapHeader();
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-				return wsdlMessage != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", wsdlMessagePartName: ");
-		result.append(wsdlMessagePartName);
-		result.append(", parameterMode: ");
-		result.append(parameterMode);
-		result.append(", soapHeader: ");
-		if (soapHeaderESet) result.append(soapHeader); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //WSDLMessageMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessagePartNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessagePartNameImpl.java
deleted file mode 100644
index a221b8751..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLMessagePartNameImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Message Part Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessagePartNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLMessagePartNameImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLMessagePartNameImpl extends J2EEEObjectImpl implements WSDLMessagePartName
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLMessagePartNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_MESSAGE_PART_NAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlMessagePartName() {
-		return wsdlMessagePartName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName) {
-		String oldWsdlMessagePartName = wsdlMessagePartName;
-		wsdlMessagePartName = newWsdlMessagePartName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-				return getId();
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-				return getWsdlMessagePartName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-				return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", wsdlMessagePartName: ");
-		result.append(wsdlMessagePartName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WSDLMessagePartNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLOperationImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLOperationImpl.java
deleted file mode 100644
index 363da04cc..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLOperationImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLOperationImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLOperationImpl#getWsdlOperation <em>Wsdl Operation</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLOperationImpl extends J2EEEObjectImpl implements WSDLOperation
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlOperation()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_OPERATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlOperation()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlOperation = WSDL_OPERATION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLOperationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_OPERATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_OPERATION__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlOperation() {
-		return wsdlOperation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlOperation(String newWsdlOperation) {
-		String oldWsdlOperation = wsdlOperation;
-		wsdlOperation = newWsdlOperation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION, oldWsdlOperation, wsdlOperation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_OPERATION__ID:
-				return getId();
-			case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-				return getWsdlOperation();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_OPERATION__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-				setWsdlOperation((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_OPERATION__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-				setWsdlOperation(WSDL_OPERATION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_OPERATION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-				return WSDL_OPERATION_EDEFAULT == null ? wsdlOperation != null : !WSDL_OPERATION_EDEFAULT.equals(wsdlOperation);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", wsdlOperation: ");
-		result.append(wsdlOperation);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WSDLOperationImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLPortTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLPortTypeImpl.java
deleted file mode 100644
index 40fd97c40..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLPortTypeImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Port Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLPortTypeImpl extends QNameImpl implements WSDLPortType
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLPortTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_PORT_TYPE;
-	}
-
-} //WSDLPortTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLReturnValueMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLReturnValueMappingImpl.java
deleted file mode 100644
index 5fd3306d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLReturnValueMappingImpl.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEEObjectImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Return Value Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl#getMethodReturnValue <em>Method Return Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl.WSDLReturnValueMappingImpl#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLReturnValueMappingImpl extends J2EEEObjectImpl implements WSDLReturnValueMapping
-{
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-  protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMethodReturnValue() <em>Method Return Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getMethodReturnValue()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String METHOD_RETURN_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodReturnValue() <em>Method Return Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getMethodReturnValue()
-	 * @generated
-	 * @ordered
-	 */
-  protected String methodReturnValue = METHOD_RETURN_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessagePartName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlMessage() <em>Wsdl Message</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlMessage()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLMessage wsdlMessage = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLReturnValueMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_RETURN_VALUE_MAPPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getMethodReturnValue() {
-		return methodReturnValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setMethodReturnValue(String newMethodReturnValue) {
-		String oldMethodReturnValue = methodReturnValue;
-		methodReturnValue = newMethodReturnValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE, oldMethodReturnValue, methodReturnValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlMessagePartName() {
-		return wsdlMessagePartName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName) {
-		String oldWsdlMessagePartName = wsdlMessagePartName;
-		wsdlMessagePartName = newWsdlMessagePartName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLMessage getWsdlMessage() {
-		return wsdlMessage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlMessage(WSDLMessage newWsdlMessage, NotificationChain msgs) {
-		WSDLMessage oldWsdlMessage = wsdlMessage;
-		wsdlMessage = newWsdlMessage;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, oldWsdlMessage, newWsdlMessage);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlMessage(WSDLMessage newWsdlMessage) {
-		if (newWsdlMessage != wsdlMessage) {
-			NotificationChain msgs = null;
-			if (wsdlMessage != null)
-				msgs = ((InternalEObject)wsdlMessage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, null, msgs);
-			if (newWsdlMessage != null)
-				msgs = ((InternalEObject)newWsdlMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, null, msgs);
-			msgs = basicSetWsdlMessage(newWsdlMessage, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, newWsdlMessage, newWsdlMessage));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-				return basicSetWsdlMessage(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-				return getId();
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-				return getMethodReturnValue();
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				return getWsdlMessagePartName();
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-				return getWsdlMessage();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-				setId((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-				setMethodReturnValue((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName((String)newValue);
-				return;
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-				setWsdlMessage((WSDLMessage)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-				setMethodReturnValue(METHOD_RETURN_VALUE_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-				return;
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-				setWsdlMessage((WSDLMessage)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-				return METHOD_RETURN_VALUE_EDEFAULT == null ? methodReturnValue != null : !METHOD_RETURN_VALUE_EDEFAULT.equals(methodReturnValue);
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-				return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-				return wsdlMessage != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", methodReturnValue: ");
-		result.append(methodReturnValue);
-		result.append(", wsdlMessagePartName: ");
-		result.append(wsdlMessagePartName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WSDLReturnValueMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLServiceNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLServiceNameImpl.java
deleted file mode 100644
index 89e2dc1ea..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/WSDLServiceNameImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.common.internal.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Service Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLServiceNameImpl extends QNameImpl implements WSDLServiceName
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLServiceNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return JaxrpcmapPackage.Literals.WSDL_SERVICE_NAME;
-	}
-
-} //WSDLServiceNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/util/JaxrpcmapAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/util/JaxrpcmapAdapterFactory.java
deleted file mode 100644
index 1568c9f85..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/util/JaxrpcmapAdapterFactory.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage
- * @generated
- */
-public class JaxrpcmapAdapterFactory extends AdapterFactoryImpl
-{
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static JaxrpcmapPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JaxrpcmapAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = JaxrpcmapPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-  public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected JaxrpcmapSwitch modelSwitch =
-		new JaxrpcmapSwitch() {
-			public Object caseJavaWSDLMapping(JavaWSDLMapping object) {
-				return createJavaWSDLMappingAdapter();
-			}
-			public Object casePackageMapping(PackageMapping object) {
-				return createPackageMappingAdapter();
-			}
-			public Object caseJavaXMLTypeMapping(JavaXMLTypeMapping object) {
-				return createJavaXMLTypeMappingAdapter();
-			}
-			public Object caseExceptionMapping(ExceptionMapping object) {
-				return createExceptionMappingAdapter();
-			}
-			public Object caseServiceInterfaceMapping(ServiceInterfaceMapping object) {
-				return createServiceInterfaceMappingAdapter();
-			}
-			public Object caseServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping object) {
-				return createServiceEndpointInterfaceMappingAdapter();
-			}
-			public Object caseRootTypeQname(RootTypeQname object) {
-				return createRootTypeQnameAdapter();
-			}
-			public Object caseVariableMapping(VariableMapping object) {
-				return createVariableMappingAdapter();
-			}
-			public Object caseWSDLMessage(WSDLMessage object) {
-				return createWSDLMessageAdapter();
-			}
-			public Object caseConstructorParameterOrder(ConstructorParameterOrder object) {
-				return createConstructorParameterOrderAdapter();
-			}
-			public Object caseElementName(ElementName object) {
-				return createElementNameAdapter();
-			}
-			public Object caseWSDLServiceName(WSDLServiceName object) {
-				return createWSDLServiceNameAdapter();
-			}
-			public Object casePortMapping(PortMapping object) {
-				return createPortMappingAdapter();
-			}
-			public Object caseWSDLPortType(WSDLPortType object) {
-				return createWSDLPortTypeAdapter();
-			}
-			public Object caseWSDLBinding(WSDLBinding object) {
-				return createWSDLBindingAdapter();
-			}
-			public Object caseServiceEndpointMethodMapping(ServiceEndpointMethodMapping object) {
-				return createServiceEndpointMethodMappingAdapter();
-			}
-			public Object caseWSDLOperation(WSDLOperation object) {
-				return createWSDLOperationAdapter();
-			}
-			public Object caseMethodParamPartsMapping(MethodParamPartsMapping object) {
-				return createMethodParamPartsMappingAdapter();
-			}
-			public Object caseWSDLReturnValueMapping(WSDLReturnValueMapping object) {
-				return createWSDLReturnValueMappingAdapter();
-			}
-			public Object caseWSDLMessageMapping(WSDLMessageMapping object) {
-				return createWSDLMessageMappingAdapter();
-			}
-			public Object caseWSDLMessagePartName(WSDLMessagePartName object) {
-				return createWSDLMessagePartNameAdapter();
-			}
-			public Object caseInterfaceMapping(InterfaceMapping object) {
-				return createInterfaceMappingAdapter();
-			}
-			public Object caseJ2EEEObject(J2EEEObject object) {
-				return createJ2EEEObjectAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-  public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping <em>Java WSDL Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping
-	 * @generated
-	 */
-  public Adapter createJavaWSDLMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping <em>Package Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping
-	 * @generated
-	 */
-  public Adapter createPackageMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping <em>Java XML Type Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping
-	 * @generated
-	 */
-  public Adapter createJavaXMLTypeMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping <em>Exception Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping
-	 * @generated
-	 */
-  public Adapter createExceptionMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping <em>Service Interface Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping
-	 * @generated
-	 */
-  public Adapter createServiceInterfaceMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping <em>Service Endpoint Interface Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping
-	 * @generated
-	 */
-  public Adapter createServiceEndpointInterfaceMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname <em>Root Type Qname</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname
-	 * @generated
-	 */
-  public Adapter createRootTypeQnameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping <em>Variable Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping
-	 * @generated
-	 */
-  public Adapter createVariableMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage <em>WSDL Message</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage
-	 * @generated
-	 */
-  public Adapter createWSDLMessageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder <em>Constructor Parameter Order</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder
-	 * @generated
-	 */
-  public Adapter createConstructorParameterOrderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName <em>Element Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName
-	 * @generated
-	 */
-  public Adapter createElementNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName <em>WSDL Service Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName
-	 * @generated
-	 */
-  public Adapter createWSDLServiceNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping <em>Port Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping
-	 * @generated
-	 */
-  public Adapter createPortMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType <em>WSDL Port Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType
-	 * @generated
-	 */
-  public Adapter createWSDLPortTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding <em>WSDL Binding</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding
-	 * @generated
-	 */
-  public Adapter createWSDLBindingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping <em>Service Endpoint Method Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping
-	 * @generated
-	 */
-  public Adapter createServiceEndpointMethodMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation <em>WSDL Operation</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation
-	 * @generated
-	 */
-  public Adapter createWSDLOperationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping <em>Method Param Parts Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping
-	 * @generated
-	 */
-  public Adapter createMethodParamPartsMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping <em>WSDL Return Value Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping
-	 * @generated
-	 */
-  public Adapter createWSDLReturnValueMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping <em>WSDL Message Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping
-	 * @generated
-	 */
-  public Adapter createWSDLMessageMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName <em>WSDL Message Part Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName
-	 * @generated
-	 */
-  public Adapter createWSDLMessagePartNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping <em>Interface Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping
-	 * @generated
-	 */
-  public Adapter createInterfaceMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.J2EEEObject <em>J2EEE Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.J2EEEObject
-	 * @generated
-	 */
-	public Adapter createJ2EEEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.common.QName
-	 * @generated
-	 */
-  public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-  public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //JaxrpcmapAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/util/JaxrpcmapSwitch.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/util/JaxrpcmapSwitch.java
deleted file mode 100644
index 6eeb83921..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/util/JaxrpcmapSwitch.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.J2EEEObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage
- * @generated
- */
-public class JaxrpcmapSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static JaxrpcmapPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public JaxrpcmapSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JaxrpcmapPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-  public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING: {
-				JavaWSDLMapping javaWSDLMapping = (JavaWSDLMapping)theEObject;
-				Object result = caseJavaWSDLMapping(javaWSDLMapping);
-				if (result == null) result = caseJ2EEEObject(javaWSDLMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.PACKAGE_MAPPING: {
-				PackageMapping packageMapping = (PackageMapping)theEObject;
-				Object result = casePackageMapping(packageMapping);
-				if (result == null) result = caseJ2EEEObject(packageMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING: {
-				JavaXMLTypeMapping javaXMLTypeMapping = (JavaXMLTypeMapping)theEObject;
-				Object result = caseJavaXMLTypeMapping(javaXMLTypeMapping);
-				if (result == null) result = caseJ2EEEObject(javaXMLTypeMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.EXCEPTION_MAPPING: {
-				ExceptionMapping exceptionMapping = (ExceptionMapping)theEObject;
-				Object result = caseExceptionMapping(exceptionMapping);
-				if (result == null) result = caseJ2EEEObject(exceptionMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING: {
-				ServiceInterfaceMapping serviceInterfaceMapping = (ServiceInterfaceMapping)theEObject;
-				Object result = caseServiceInterfaceMapping(serviceInterfaceMapping);
-				if (result == null) result = caseInterfaceMapping(serviceInterfaceMapping);
-				if (result == null) result = caseJ2EEEObject(serviceInterfaceMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING: {
-				ServiceEndpointInterfaceMapping serviceEndpointInterfaceMapping = (ServiceEndpointInterfaceMapping)theEObject;
-				Object result = caseServiceEndpointInterfaceMapping(serviceEndpointInterfaceMapping);
-				if (result == null) result = caseInterfaceMapping(serviceEndpointInterfaceMapping);
-				if (result == null) result = caseJ2EEEObject(serviceEndpointInterfaceMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.ROOT_TYPE_QNAME: {
-				RootTypeQname rootTypeQname = (RootTypeQname)theEObject;
-				Object result = caseRootTypeQname(rootTypeQname);
-				if (result == null) result = caseQName(rootTypeQname);
-				if (result == null) result = caseJ2EEEObject(rootTypeQname);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.VARIABLE_MAPPING: {
-				VariableMapping variableMapping = (VariableMapping)theEObject;
-				Object result = caseVariableMapping(variableMapping);
-				if (result == null) result = caseJ2EEEObject(variableMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_MESSAGE: {
-				WSDLMessage wsdlMessage = (WSDLMessage)theEObject;
-				Object result = caseWSDLMessage(wsdlMessage);
-				if (result == null) result = caseQName(wsdlMessage);
-				if (result == null) result = caseJ2EEEObject(wsdlMessage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER: {
-				ConstructorParameterOrder constructorParameterOrder = (ConstructorParameterOrder)theEObject;
-				Object result = caseConstructorParameterOrder(constructorParameterOrder);
-				if (result == null) result = caseJ2EEEObject(constructorParameterOrder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.ELEMENT_NAME: {
-				ElementName elementName = (ElementName)theEObject;
-				Object result = caseElementName(elementName);
-				if (result == null) result = caseJ2EEEObject(elementName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_SERVICE_NAME: {
-				WSDLServiceName wsdlServiceName = (WSDLServiceName)theEObject;
-				Object result = caseWSDLServiceName(wsdlServiceName);
-				if (result == null) result = caseQName(wsdlServiceName);
-				if (result == null) result = caseJ2EEEObject(wsdlServiceName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.PORT_MAPPING: {
-				PortMapping portMapping = (PortMapping)theEObject;
-				Object result = casePortMapping(portMapping);
-				if (result == null) result = caseJ2EEEObject(portMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_PORT_TYPE: {
-				WSDLPortType wsdlPortType = (WSDLPortType)theEObject;
-				Object result = caseWSDLPortType(wsdlPortType);
-				if (result == null) result = caseQName(wsdlPortType);
-				if (result == null) result = caseJ2EEEObject(wsdlPortType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_BINDING: {
-				WSDLBinding wsdlBinding = (WSDLBinding)theEObject;
-				Object result = caseWSDLBinding(wsdlBinding);
-				if (result == null) result = caseQName(wsdlBinding);
-				if (result == null) result = caseJ2EEEObject(wsdlBinding);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING: {
-				ServiceEndpointMethodMapping serviceEndpointMethodMapping = (ServiceEndpointMethodMapping)theEObject;
-				Object result = caseServiceEndpointMethodMapping(serviceEndpointMethodMapping);
-				if (result == null) result = caseJ2EEEObject(serviceEndpointMethodMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_OPERATION: {
-				WSDLOperation wsdlOperation = (WSDLOperation)theEObject;
-				Object result = caseWSDLOperation(wsdlOperation);
-				if (result == null) result = caseJ2EEEObject(wsdlOperation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING: {
-				MethodParamPartsMapping methodParamPartsMapping = (MethodParamPartsMapping)theEObject;
-				Object result = caseMethodParamPartsMapping(methodParamPartsMapping);
-				if (result == null) result = caseJ2EEEObject(methodParamPartsMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING: {
-				WSDLReturnValueMapping wsdlReturnValueMapping = (WSDLReturnValueMapping)theEObject;
-				Object result = caseWSDLReturnValueMapping(wsdlReturnValueMapping);
-				if (result == null) result = caseJ2EEEObject(wsdlReturnValueMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING: {
-				WSDLMessageMapping wsdlMessageMapping = (WSDLMessageMapping)theEObject;
-				Object result = caseWSDLMessageMapping(wsdlMessageMapping);
-				if (result == null) result = caseJ2EEEObject(wsdlMessageMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME: {
-				WSDLMessagePartName wsdlMessagePartName = (WSDLMessagePartName)theEObject;
-				Object result = caseWSDLMessagePartName(wsdlMessagePartName);
-				if (result == null) result = caseJ2EEEObject(wsdlMessagePartName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case JaxrpcmapPackage.INTERFACE_MAPPING: {
-				InterfaceMapping interfaceMapping = (InterfaceMapping)theEObject;
-				Object result = caseInterfaceMapping(interfaceMapping);
-				if (result == null) result = caseJ2EEEObject(interfaceMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java WSDL Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java WSDL Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseJavaWSDLMapping(JavaWSDLMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Package Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Package Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object casePackageMapping(PackageMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Java XML Type Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Java XML Type Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseJavaXMLTypeMapping(JavaXMLTypeMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Exception Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Exception Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseExceptionMapping(ExceptionMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Interface Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Interface Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServiceInterfaceMapping(ServiceInterfaceMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Endpoint Interface Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Endpoint Interface Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Root Type Qname</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Root Type Qname</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseRootTypeQname(RootTypeQname object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Variable Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Variable Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseVariableMapping(VariableMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Message</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Message</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLMessage(WSDLMessage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Constructor Parameter Order</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Constructor Parameter Order</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseConstructorParameterOrder(ConstructorParameterOrder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseElementName(ElementName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Service Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Service Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLServiceName(WSDLServiceName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object casePortMapping(PortMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Port Type</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Port Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLPortType(WSDLPortType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Binding</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Binding</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLBinding(WSDLBinding object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Endpoint Method Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Endpoint Method Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServiceEndpointMethodMapping(ServiceEndpointMethodMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Operation</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Operation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLOperation(WSDLOperation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Param Parts Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Param Parts Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseMethodParamPartsMapping(MethodParamPartsMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Return Value Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Return Value Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLReturnValueMapping(WSDLReturnValueMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Message Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Message Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLMessageMapping(WSDLMessageMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Message Part Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Message Part Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLMessagePartName(WSDLMessagePartName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Interface Mapping</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Interface Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseInterfaceMapping(InterfaceMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>J2EEE Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJ2EEEObject(J2EEEObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-  public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JaxrpcmapSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath b/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath
deleted file mode 100644
index e04d8ebc9..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="jca_ui"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore
deleted file mode 100644
index b90d68040..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-jcaui.jar
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.project b/plugins/org.eclipse.jst.j2ee.jca.ui/.project
deleted file mode 100644
index 56ec9d254..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.jca.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.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 571d11702..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.jca.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.jca.ui.internal.plugin.JCAUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.jca.ui.internal.actions;x-internal:=true,
- org.eclipse.jst.j2ee.jca.ui.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.jca.ui.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.jca.ui.internal.wizard;x-internal:=true
-Require-Bundle: org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.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.jst.j2ee;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.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.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)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/about.html b/plugins/org.eclipse.jst.j2ee.jca.ui/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties
deleted file mode 100644
index f57586f43..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-source.. = jca_ui/,\
-                   property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html
-src.includes = plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba83..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java
deleted file mode 100644
index b970f2537..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java
+++ /dev/null
@@ -1,59 +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.jca.ui.internal.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.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard;
-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 ExportRARAction extends BaseAction {
-
-	private String label = JCAUIMessages.connector_export_action_label_ui_;
-	private static final String ICON = "export_rar_wiz"; //$NON-NLS-1$
-
-	public ExportRARAction() {
-		super();
-		setText(label);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void primRun(Shell shell) {
-		ConnectorComponentExportWizard wizard = new ConnectorComponentExportWizard();
-		J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-		wizard.init(plugin.getWorkbench(), selection);
-		wizard.setDialogSettings(plugin.getDialogSettings());
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java
deleted file mode 100644
index b2c5fc5aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java
+++ /dev/null
@@ -1,64 +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.jca.ui.internal.actions;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-
-/**
- * Defines constants for Connector Archive operations.
- */
-public interface IConnectorArchiveConstants {
-
-	//Actions
-	public static final String CONNECTOR_EXPORT_ACTION_LABEL = "%connector.export.action.label_ui_"; //$NON-NLS-1$
-
-	//General
-	public static final String CONNECTOR_PROJECT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Project_UI_"); //$NON-NLS-1$
-	public static final String CONNECTOR_FILE_UI_ = RARArchiveUIResourceHandler.getString("Connector_File_UI_"); //$NON-NLS-1$
-	public static final String STORE_CONNECTOR_FILE_NAMES_ID = "EJBImportWizardPage1.STORE_CONNECTOR_FILE_NAMES_ID"; //$NON-NLS-1$
-	public static final String STORE_CONNECTOR_EXPORT_FILE_NAMES = "ConenctorExportWizardPage1.STORE_CONNECTOR_EXPORT_FILE_NAMES"; //$NON-NLS-1$
-	public static final String WIZ_IMAGE = "connector_import_wiz"; //$NON-NLS-1$
-	public static final String ID = "id"; //$NON-NLS-1$
-	public static final String RAR_BROWSE_BUTTON_FILTER = "*.rar"; //$NON-NLS-1$
-	public static final String TARGET_EXTENSION = "rar"; //$NON-NLS-1$
-	public static final String YES_UI_ = RARArchiveUIResourceHandler.getString("Yes_UI_"); //$NON-NLS-1$
-	public static final String NO_UI_ = RARArchiveUIResourceHandler.getString("No_UI_"); //$NON-NLS-1$
-	public static final String QUESTION_UI_ = RARArchiveUIResourceHandler.getString("Question_UI_"); //$NON-NLS-1$
-	public static final String RESOURCE__UI_ = "Resource_{0}_already_exists.__Would_you_like_to_overwrite_it_UI_"; //$NON-NLS-1$
-	//Import
-	public static final String IMPORT_UI_ = RARArchiveUIResourceHandler.getString("Import_UI_"); //$NON-NLS-1$
-	public static final String IMPORT_A_CONNECTOR_UI_ = RARArchiveUIResourceHandler.getString("Import_a_Connector_project_from_the_file_system_UI_"); //$NON-NLS-1$
-	public static final String IMPORT_INTO_NEW_OR_EXISTING_UI_ = RARArchiveUIResourceHandler.getString("Import_into_new_or_existing_Enterprise_Application_project_UI_"); //$NON-NLS-1$
-	public static final String CONNECTOR_IMPORT_ID_ = "ConnectorProjectImportPage1"; //$NON-NLS-1$
-	public static final String CONNECTOR_IMPORT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Import_UI_"); //$NON-NLS-1$
-	public static final String IRAR1000 = J2EEUIPlugin.PLUGIN_ID + ".irar1000"; //$NON-NLS-1$
-
-	//Export
-	public static final String CONNECTOR_EXPORT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Export_UI_"); //$NON-NLS-1$
-	public static final String EXPORT_CONNECTOR__UI_ = RARArchiveUIResourceHandler.getString("Export_Connector_Project_to_the_local_file_system_UI_"); //$NON-NLS-1$
-	public static final String WORKBENCH_ID = "ConnectorExportPage1"; //$NON-NLS-1$
-	public static final String EXPORT_UI_ = RARArchiveUIResourceHandler.getString("Export_UI_"); //$NON-NLS-1$
-	public static final String EX_WIZ_IMAGE = "connector_export_wiz"; //$NON-NLS-1$
-	public static final String ERAR1000 = J2EEUIPlugin.PLUGIN_ID + ".erar1000"; //$NON-NLS-1$
-
-	//Errors
-	public static final String UNABLE_TO_COMPLETE_THE_OPEN_ERROR_ = RARArchiveUIResourceHandler.getString("Unable_to_complete_the_operationdump_caused_by_this_UI_"); //$NON-NLS-1$
-	public static final String IMPORT_PROBLEMS_UI_ = RARArchiveUIResourceHandler.getString("Import_Problems_UI_"); //$NON-NLS-1$
-	public static final String CONNECTOR_IMPORT__UI_ = RARArchiveUIResourceHandler.getString("Connector_Import_Error_UI_"); //$NON-NLS-1$
-	public static final String IMPORT_ERROR_UI_ = RARArchiveUIResourceHandler.getString("Import_Error_UI_"); //$NON-NLS-1$
-	public static final String THE_JAR_FILE_DOES_NOT_EXIST_UI_ = RARArchiveUIResourceHandler.getString("The_jar_file_does_not_exist_or_cannot_be_opened,_UI_") + //$NON-NLS-1$
-				RARArchiveUIResourceHandler.getString("Click_browse_to_select_a_valid_jar_or_enter_a_valid_jar_UI_"); //$NON-NLS-1$
-	public static final String CONNECTOR_EXPORT_ERROR_UI_ = RARArchiveUIResourceHandler.getString("Connector_Export_Error_UI_"); //$NON-NLS-1$
-	public static final String CANNOT_EXPORT_CLOSED_PROJECT_UI_ = RARArchiveUIResourceHandler.getString("Cannot_export_closed_projects_UI_"); //$NON-NLS-1$
-	public static final String Rar_File_Name_Needed_UI_ = RARArchiveUIResourceHandler.getString("Rar_File_Name_Needed_UI_"); //$NON-NLS-1$
-
-}// IConnectorArchiveConstants
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java
deleted file mode 100644
index 93d0d6687..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java
+++ /dev/null
@@ -1,59 +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.jca.ui.internal.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.jca.ui.internal.wizard.ConnectorComponentImportWizard;
-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 ImportRARAction extends BaseAction {
-	public static String LABEL = RARArchiveUIResourceHandler.getString("Import_RAR"); //$NON-NLS-1$
-	private static final String ICON = "import_rar_wiz"; //$NON-NLS-1$
-
-	public ImportRARAction() {
-		super();
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void primRun(Shell shell) {
-
-		ConnectorComponentImportWizard wizard = new ConnectorComponentImportWizard();
-
-		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.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java
deleted file mode 100644
index 884a2f997..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java
+++ /dev/null
@@ -1,77 +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.jca.ui.internal.actions;
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-
-/**
- * Creates an action for the Connector project
- */
-public class NewConnectorComponentAction extends AbstractOpenWizardWorkbenchAction {
-
-	// TODO MDE 02-28 Find correct label
-	public static String LABEL = JCAUIMessages.JCA_MODULE_WIZ_TITLE;
-	private static final String ICON = "newear_wiz"; //$NON-NLS-1$
-
-	/**
-	 * Default constructor
-	 */
-	public NewConnectorComponentAction() {
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}// NewConnectorProjectAction
-
-	/**
-	 * Constructor initialization.
-	 * 
-	 * @param IWorkbench
-	 *            workbench - Workbench to add to this wizard too.
-	 * @param String
-	 *            label - Label for project.
-	 * @param Class[]
-	 *            acceptedTypes - List of accepted types for this wizard
-	 */
-	public NewConnectorComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
-		super(workbench, label, acceptedTypes, false);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}// NewConnectorProjectAction
-
-	/**
-	 * Creates the wizard
-	 * 
-	 * @return Wizard
-	 */
-	protected Wizard createWizard() {
-		return new ConnectorProjectWizard();
-	}// createWizard
-
-	/**
-	 * shouldAcceptElement - Always true
-	 * 
-	 * @param Object
-	 *            obj
-	 */
-	protected boolean shouldAcceptElement(Object obj) {
-		return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
-	}// shouldAcceptElement
-
-	protected String getDialogText() {
-		return null;
-	}
-}// NewConnectorProjectAction
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java
deleted file mode 100644
index 61a7967c1..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,64 +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.jca.ui.internal.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class RARArchiveUIResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("rararchiveui");//$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);
-		}
-
-	}
-
-	public static String getString(String key, Object[] args, int x) {
-
-		return getString(key);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
deleted file mode 100644
index 083a42d88..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
+++ /dev/null
@@ -1,58 +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 Nov 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class JCAUIPlugin extends AbstractUIPlugin {
-	
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca.ui"; //$NON-NLS-1$
-	
-	
-	//	The shared instance.
-	private static JCAUIPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public JCAUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JCAUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java
deleted file mode 100644
index 9d747f323..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java
+++ /dev/null
@@ -1,54 +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.jca.ui.internal.util;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class JCAUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "jca_ui";//$NON-NLS-1$
-
-	private JCAUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String connector_export_action_label_ui_;
-	public static String _9;
-	public static String _8;
-	public static String _7;
-	public static String _6;
-	public static String _5;
-	public static String _4;
-	public static String _3;
-	public static String _2;
-	public static String _10;
-	public static String _1;
-	public static String _0;
-	public static String _11;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, JCAUIMessages.class);
-	}
-
-	public static final String IMAGE_LOAD_ERROR = _0;
-	public static final String JCA_MODULE_WIZ_TITLE = _1;
-	public static final String JCA_VERSION_LBL = _2;
-	public static final String JCA_MODULE_MAIN_PG_TITLE = _3;
-	public static final String JCA_MODULE_MAIN_PG_DESC = _4;
-	public static final String JCA_IMPORT_MAIN_PG_DESC = _5;
-	public static final String JCA_IMPORT_MAIN_PG_TITLE = _6;
-	public static final String JCA_FILE_LBL = _7;
-	public static final String JCA_MODULE_LBL = _8;
-	public static final String JCA_EXPORT_MAIN_PG_TITLE = _9;
-	public static final String JCA_EXPORT_MAIN_PG_DESC = _10;
-	public static final String JCA_FACET_CONFIGURATION= _11;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java
deleted file mode 100644
index ef2ea4011..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java
+++ /dev/null
@@ -1,77 +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.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Connector module structures 
- * from the Eclipse Workbench to a deployable Connector 
- * Archive *.rar file.  
- * </p>
- */
-public final class ConnectorComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, 
-	 * no model instance, and no operation instance. The model and 
-	 * operation will be created as needed.
-	 * </p>
-	 */
-	public ConnectorComponentExportWizard() {
-		super();
-	}
-	
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls
-	 * and interface with the operation.
-	 * </p>
-	 * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
-	 */
-	public ConnectorComponentExportWizard(IDataModel model) {
-		super(model);
-	}
-
-    protected IDataModelProvider getDefaultProvider() {
-        return new ConnectorComponentExportDataModelProvider();
-    }
-	/**
-	 * <p>
-	 * Adds the following pages:
-	 * <ul>
-	 * 	<li> {@link RARExportPage} as the main wizard page ({@link #MAIN_PG}) 
-	 * </ul>
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new RARExportPage(getDataModel(), MAIN_PG, getSelection()));
-	}
-
-	/**
-	 * {@inheritDoc}   
-	 * 
-	 * <p>
-	 * Sets up the default wizard page image. 
-	 * </p>
-	 */
-	protected void doInit() {
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
-	} 
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java
deleted file mode 100644
index aac6599b3..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java
+++ /dev/null
@@ -1,58 +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.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentImportPage extends J2EEModuleImportPage {
-
-	public ConnectorComponentImportPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(JCAUIMessages.JCA_IMPORT_MAIN_PG_TITLE);
-		setDescription(JCAUIMessages.JCA_IMPORT_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_IMPORT_WIZARD_BANNER));
-	}
-
-	protected String getFileImportLabel() {
-		return JCAUIMessages.JCA_FILE_LBL;
-	}
-
-	protected String[] getFilterExpression() {
-		return new String[]{"*.rar"}; //$NON-NLS-1$
-	}
-
-	protected String getFileNamesStoreID() {
-		return "RAR";//$NON-NLS-1$
-	}
-
-	protected String getProjectImportLabel() {
-		return JCAUIMessages.JCA_MODULE_LBL;
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		return super.createTopLevelComposite(parent);
-	}
-
-	protected String getInfopopID() {
-		return IJ2EEUIContextIds.IMPORT_RAR_WIZARD_PAGE;
-	}
-	
-	protected String getModuleFacetID(){
-		return J2EEProjectUtilities.JCA;
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java
deleted file mode 100644
index 6dfc113ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java
+++ /dev/null
@@ -1,88 +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.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Connector module structures into the Eclipse Workbench from an
- * existing Connector *.rar file.
- * </p>
- */
-public final class ConnectorComponentImportWizard extends J2EEComponentImportWizard {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public ConnectorComponentImportWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public ConnectorComponentImportWizard(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Adds an {@link RARImportPage} as the main wizard page ({@link #MAIN_PG}).
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new ConnectorComponentImportPage(getDataModel(), MAIN_PG));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Sets up the dialog window title and default wizard page image.
-	 * </p>
-	 */
-	public final void doInit() {
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_IMPORT_WIZARD_BANNER));
-		// updateEARToModelFromSelection(getSpecificDataModel());
-	}
-
-	protected String[] getModuleValidatorStrings() {
-		return new String[]{"org.eclipse.jst.j2ee.internal.jca.validation.UIConnectorValidator"}; //$NON-NLS-1$
-	}
-
-	protected IDataModelProvider getDefaultProvider() {
-		return new ConnectorComponentImportDataModelProvider();
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_JCA);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java
deleted file mode 100644
index 16cc3ffa0..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-public class ConnectorFacetInstallPage extends J2EEModuleFacetInstallPage implements IConnectorFacetInstallDataModelProperties {
-
-	private Label configFolderLabel;
-	private Text configFolder;
-	
-	public ConnectorFacetInstallPage() {
-		super(IModuleConstants.JST_CONNECTOR_MODULE);
-		setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
-		setDescription(JCAUIMessages.JCA_FACET_CONFIGURATION);
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{EAR_PROJECT_NAME, CONFIG_FOLDER};
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		setInfopopID(IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P3);
-		final Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-
-		//setupEarControl(composite);
-		
-		configFolderLabel = new Label(composite, SWT.NONE);
-		configFolderLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER));
-		configFolderLabel.setLayoutData(gdhfill());
-
-		configFolder = new Text(composite, SWT.BORDER);
-		configFolder.setLayoutData(gdhfill());
-		configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
-		synchHelper.synchText(configFolder, CONFIG_FOLDER, null);
-		
-		return composite;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
deleted file mode 100644
index 16e4f390b..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
-	public ConnectorProjectFirstPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
-		setDescription(JCAUIMessages.JCA_MODULE_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_PROJECT_WIZARD_BANNER));
-		setInfopopID(IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P1);
-	}
-
-	protected String getModuleFacetID() {
-		return J2EEProjectUtilities.JCA;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java
deleted file mode 100644
index 748ed9eb9..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class ConnectorProjectWizard extends NewProjectDataModelFacetWizard {
-
-	public ConnectorProjectWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
-	}
-	
-	public ConnectorProjectWizard() {
-		super();
-		setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
-	}
-
-	protected IDataModel createDataModel() {
-		return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
-	}
-
-	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		final Bundle bundle = Platform.getBundle(J2EEUIPlugin.PLUGIN_ID);
-		final URL url = bundle.getEntry("icons/full/wizban/connector_wiz.gif"); //$NON-NLS-1$
-		return ImageDescriptor.createFromURL(url);
-	}
-
-	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("template.jst.connector"); //$NON-NLS-1$
-	}
-
-	protected IWizardPage createFirstPage() {
-		return new ConnectorProjectFirstPage(model, "first.page"); //$NON-NLS-1$
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_JCA);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
deleted file mode 100644
index d15736878..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
+++ /dev/null
@@ -1,87 +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 Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class RARExportPage extends J2EEModuleExportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public RARExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName, selection);
-		setTitle(JCAUIMessages.JCA_EXPORT_MAIN_PG_TITLE);
-		setDescription(JCAUIMessages.JCA_EXPORT_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
-	 */
-	protected String getComponentLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.JCA_PROJ_LBL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
-	 */
-	protected String[] getFilterExpression() {
-		return new String[]{"*.rar"}; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
-	 */
-	protected boolean isMetaTypeSupported(Object o) {
-		return o instanceof Connector;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getInfopopID()
-	 */
-	protected String getInfopopID() {
-		return IJ2EEUIContextIds.EXPORT_RAR_WIZARD_PAGE;
-	}
-
-    protected String getCompnentID() {
-        return "JST_CONNECTOR"; //$NON-NLS-1$
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties
deleted file mode 100644
index fba1375a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-providerName=Eclipse.org
-pluginName=WTP JCA UI Plug-in
-jca.module_ui_=Connector Module
-new.jca.module.description_ui_=Create a Connector module
-connector.import.description_ui_=Import an external Connector RAR file into a Connector project
-connector.export.description_ui_=Export a Connector project into a Connector RAR file
-connector.jar.file_ui_=RAR file
-connector.module_ui_=Connector Module
-new.connector.module.description_ui_=Create a Connector project
-connector.import.action.label_ui_=Import RAR File...
-connector.export.action.label_ui_=Export RAR File...
-connector_module_ui_=Connector Project
-new.connector.module.description_ui_=Create a J2EE connector project
-connectors.actionSet=J2C
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
deleted file mode 100644
index a01a794c3..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-<!-- ====================================================== -->
-<!--                                                        -->
-<!-- Purpose: Extension for the J2EE ACtion Sets            -->
-<!-- Extension point: org.eclipse.ui.actionSets             -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%connectors.actionSet"
-            description="%connectors.actionSet"
-            visible="false"
-            id="org.eclipse.jst.j2ee.J2eeMainActionSet4">
-         <action
-               label="%new.jca.module.description_ui_"
-               icon="icons/full/ctool16/newconnectionprj_wiz.gif"
-               tooltip="%new.jca.module.description_ui_"
-               class="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponentAction"
-               toolbarPath="J2EEMain4"
-               id="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponent">
-         </action>
-      </actionSet>
-	</extension>
-   <!-- Connector Module Wizard -->
-    <extension
-         id="J2EEUIProjectWizards"
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%connector_module_ui_"
-            icon="icons/full/ctool16/newconnectionprj_wiz.gif"
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"
-            project="true"
-            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
-            id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
-         <description>
-            %new.connector.module.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-    </extension>
-<!-- JCA Import Wizard --> 
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"
-            icon="icons/full/ctool16/import_rar.gif"
-            id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"
-            name="%connector.jar.file_ui_">
-         <description>
-            %connector.import.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-       </wizard>
-     </extension>
-
-<!-- JCA Export Wizard --> 
-    <extension
-         point="org.eclipse.ui.exportWizards">
-     <wizard
-           category="org.eclipse.jst.j2ee.internal"
-           class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"
-           icon="icons/full/ctool16/export_rar.gif"
-           id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"
-           name="%connector.jar.file_ui_">
-         <description>
-            %connector.export.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-       </wizard>
-     </extension>
-    
-    <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-      <wizard-pages action="jst.connector.install">
-        <page class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorFacetInstallPage"/>
-      </wizard-pages>
-    </extension>
-    
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties
deleted file mode 100644
index f8ff5fa15..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties
+++ /dev/null
@@ -1,23 +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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Connector Project
-_2=J2C version:
-_3=Connector Project
-_4=Create a standalone Connector module or add it to a new or existing Enterprise Application project.
-_5=Import a Connector module from the file system
-_6=Connector Import
-_7=Connector file:
-_8=Connector module:
-_9=Connector Export
-_10=Export Connector module to the local file system.
-_11=Configure Connector module settings.
-connector_export_action_label_ui_=Export RAR File...
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.classpath b/plugins/org.eclipse.jst.j2ee.jca/.classpath
deleted file mode 100644
index 87800a367..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="jca/"/>
-	<classpathentry kind="src" path="rarproject/"/>
-	<classpathentry kind="src" path="jcaedit/"/>
-	<classpathentry kind="src" path="jca-validation/"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.cvsignore b/plugins/org.eclipse.jst.j2ee.jca/.cvsignore
deleted file mode 100644
index 9b9b366cd..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.project b/plugins/org.eclipse.jst.j2ee.jca/.project
deleted file mode 100644
index 7185aae17..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.jca</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
deleted file mode 100644
index 70c238c54..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.jca; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.jca.archive.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.jca.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.jca.providers;x-internal:=true,
- org.eclipse.jst.j2ee.internal.jca.validation;x-internal:=true,
- org.eclipse.jst.j2ee.jca.internal.module.util;x-internal:=true,
- org.eclipse.jst.j2ee.jca.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.jca.modulecore.util,
- org.eclipse.jst.j2ee.jca.project.facet
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.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,2.3.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca/about.html b/plugins/org.eclipse.jst.j2ee.jca/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build.properties b/plugins/org.eclipse.jst.j2ee.jca/build.properties
deleted file mode 100644
index cdbdb399e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build.properties
+++ /dev/null
@@ -1,24 +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
-###############################################################################
-source.. = jca/,\
-                         rarproject/,\
-                         jcaedit/,\
-                         jca-validation/,\
-                         property_files/
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               .,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties b/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties
deleted file mode 100644
index 3270ed037..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-CONTACT=danberg@us.ibm.com
-ComponentShortName=ejb
-ComponentFullName=EJB
-ComponentCompetency=EMF
-JavaCompile.1=srcjar
-BuildVerification.1=dir
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/package.xml b/plugins/org.eclipse.jst.j2ee.jca/build/package.xml
deleted file mode 100644
index 154d2fa21..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/package.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="com.ibm.etools.emf.workbench" default="packagingPlugin" basedir="./..">
-    <target name="init">
-        <property name="packageDir" value=""/>
-        <property name="plugin.directory"  value="${basedir}"/>
-        <property name="plugin.id" value="com.ibm.etools.ejb"/>
-        <property name="plugin.version"  value=""/>
-    </target>
-    <target name="packagingPlugin" depends="init">
-        <echo message="${plugin.id}"/>
-        <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
-            <fileset dir="${plugin.directory}">
-                <include name="plugin.xml"/>
-                <include name="runtime/ejb.jar"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml b/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml
deleted file mode 100644
index 77c0b82d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
-	<!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
-	<antcall target="buildjar">
-		<param name="jarname" value="${defaultjarname}"/>
-		<param name="jarclasspath" value="${plugin.classpath}"/>
-	</antcall>
-</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/component.xml b/plugins/org.eclipse.jst.j2ee.jca/component.xml
deleted file mode 100644
index 073e1d112..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.jca"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.jca" fragment="false"/><plugin id="org.eclipse.jst.j2ee.jca.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif
deleted file mode 100644
index 06f14338e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif
deleted file mode 100644
index 2987b606b..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif
deleted file mode 100644
index 2b2b1ed07..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif
deleted file mode 100644
index e67f4f0d4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif
deleted file mode 100644
index 867e05283..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif
deleted file mode 100644
index 42fdffa2b..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif
deleted file mode 100644
index 927efe43b..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif
deleted file mode 100644
index 2dff48538..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif
deleted file mode 100644
index 98bbc526f..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index a1338ffe6..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 5e33d45c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index 1b51ca07a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 2730bbf9c..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index bae88bd0d..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif
deleted file mode 100644
index 6c01e2f79..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif
deleted file mode 100644
index db7eee079..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif
deleted file mode 100644
index b8d18844e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif
deleted file mode 100644
index ae50504c7..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif
deleted file mode 100644
index acf304363..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
deleted file mode 100644
index 3c4caa5c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif
deleted file mode 100644
index f3d6138e4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif
deleted file mode 100644
index db7eee079..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif
deleted file mode 100644
index b8d18844e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif
deleted file mode 100644
index eb192b411..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
deleted file mode 100644
index 28e46766f..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif
deleted file mode 100644
index 46a149b4a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif
deleted file mode 100644
index 3857de16a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif
deleted file mode 100644
index 204a12cd1..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif
deleted file mode 100644
index ce94aff4e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif
deleted file mode 100644
index ba25bed1a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif
deleted file mode 100644
index 7828f47e2..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif
deleted file mode 100644
index 739ebbfa6..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif
deleted file mode 100644
index b3643da04..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif
deleted file mode 100644
index 106881e5d..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif
deleted file mode 100644
index 48e3cf226..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif
deleted file mode 100644
index be22463d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif
deleted file mode 100644
index ed8747474..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif
deleted file mode 100644
index 338fb8d9a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif
deleted file mode 100644
index c414fe9f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif
deleted file mode 100644
index 134551bff..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif
deleted file mode 100644
index be22463d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif
deleted file mode 100644
index afb82ea48..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif
deleted file mode 100644
index c414fe9f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif
deleted file mode 100644
index 2124f3e3a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif
deleted file mode 100644
index 136e3b272..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif
deleted file mode 100644
index e8efe69dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java b/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java
deleted file mode 100644
index c92d3f96d..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java
+++ /dev/null
@@ -1,91 +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 Jan 22, 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.jca.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.validation.J2EEValidationHelper;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.model.internal.validation.ConnectorMessageConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ConnectorHelper extends J2EEValidationHelper {
-	protected RARFile rarFile;
-
-	/**
-	 *  
-	 */
-	public ConnectorHelper() {
-		super();
-		registerModel(ConnectorMessageConstants.CONNECTOR_MODEL_NAME, "loadRarFile"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the Rar file for validation
-	 */
-	public EObject loadRarFile() {
-
-		IVirtualComponent comp = ComponentCore.createComponent(getProject());
-		ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-		
-		try {
-			rarFile = (RARFile)((ConnectorArtifactEdit) edit).asArchive(false);
-			return rarFile;
-		} catch (OpenFailureException e1) {
-			Logger.getLogger().log(e1);
-		}finally {
-			if (edit != null) {
-				edit.dispose();
-			}
-		}
-		return null;
-	}		
-	/**
-	 * Given a resource, return its non-eclipse-specific location. If this resource, or type of
-	 * resource, isn't handled by this helper, return null.
-	 */
-	public String getPortableName(IResource resource) {
-		if (!(resource instanceof IFile)) {
-			return null;
-		}
-		return "rar.xml"; //$NON-NLS-1$
-	}
-	public void cleanup(WorkbenchReporter reporter) {
-		if(rarFile != null){
-			rarFile.close();
-			rarFile = null;
-		}
-		
-		super.cleanup(reporter);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java b/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java
deleted file mode 100644
index 4ddf084d4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java
+++ /dev/null
@@ -1,94 +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 Jan 22, 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.jca.validation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.ConnectorValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class UIConnectorValidator extends ConnectorValidator {
-	/**
-	 *  
-	 */
-	public UIConnectorValidator() {
-		super();
-	}
-
-	/**
-	 * Does the validation.
-	 */
-	public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException{
-		
-		IProject proj = ((IWorkbenchContext) helper).getProject();
-		IVirtualComponent wbModule = ComponentCore.createComponent(proj);
-		
-        if(J2EEProjectUtilities.isJCAProject(proj)) {
-			IVirtualFile rarDD = wbModule.getRootFolder().getFile(J2EEConstants.RAR_DD_URI);
-			if( rarDD.exists()) {			
-				status =  super.validateInJob(helper, reporter);
-			}else{
-				IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_INVALID_CONNECTOR_FILE);
-				status = WTPCommonPlugin.createErrorStatus( errorMsg.getText( getClass().getClassLoader()));
-				throw new ValidationException(errorMsg);
-			}
-			//validateJ2EE14DocType(helper, editModel);
-		}
-        return status;
-	}
-
-
-	/**
-	 * Checks if the nature is consistent with doc type.
-	 */
-//	protected void validateJ2EE14DocType(ConnectorHelper helper, ConnectorEditModel editModel) {
-//
-//		if (editModel.getConnectorNature().getJ2EEVersion() == J2EEVersionConstants.J2EE_1_4_ID && getConnectorDD().getVersionID() < J2EEVersionConstants.JCA_1_5_ID) {
-//			String[] params = new String[3];
-//			params[0] = DOCTYPE_1_4;
-//			params[1] = helper.getProject().getName();
-//			params[2] = DOCTYPE_1_3;
-//			addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-//		} else if (editModel.getConnectorNature().getJ2EEVersion() == J2EEVersionConstants.J2EE_1_3_ID && getConnectorDD().getVersionID() != J2EEVersionConstants.JCA_1_0_ID) {
-//			String[] params = new String[3];
-//			params[0] = DOCTYPE_1_3;
-//			params[1] = helper.getProject().getName();
-//			params[2] = DOCTYPE_1_4;
-//			addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-//		}// if
-//	}// validateDocTypeVsNature
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java
deleted file mode 100644
index 98429cfa7..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class JCAResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "rar";//$NON-NLS-1$
-
-	private JCAResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String LicenseItemProvider_UI_0;
-	public static String SecurityPermissionItemProvider_UI_0;
-	public static String ConfigPropertyItemProvider_UI_0;
-	public static String _UI_ResourceAdapter_type;
-	public static String _UI_OutboundResourceAdapter_type;
-	public static String _UI_ConnectionDefinition_type;
-	public static String _UI_InboundResourceAdapter_type;
-	public static String _UI_MessageAdapter_type;
-	public static String _UI_MessageListener_type;
-	public static String _UI_ActivationSpec_type;
-	public static String _UI_RequiredConfigPropertyType_type;
-	public static String _UI_AdminObject_type;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, JCAResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java
deleted file mode 100644
index 27df27099..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.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
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- * 
- * To change the template for this generated file go to Window&gt;Preferences&gt;Java&gt;Code
- * Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.internal.plugin;
-
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class JcaModuleExtensionImpl extends EarModuleExtensionImpl implements JcaModuleExtension {
-
-	/**
-	 *  
-	 */
-	public JcaModuleExtensionImpl() {
-		super();
-	}
-
-	
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.JcaModuleExtension#createProjectInfo()
-	 */
-	//	public J2EEJavaProjectInfo createProjectInfo() {
-	//		return new ConnectorProjectInfo();
-	//	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.JcaModuleExtension#createImportOperation(org.eclipse.core.resources.IProject,
-	 *      org.eclipse.jst.j2ee.internal.internal.commonarchivecore.RARFile)
-	 */
-	//	public J2EEImportOperation createImportOperation(IProject proj, RARFile rarFile){
-	//		return new RARImportOperation(proj, rarFile);
-	//	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
-	 */
-	public IDataModel createProjectDataModel() {
-		return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
-	 */
-	public IDataModel createImportDataModel() {
-		return DataModelFactory.createDataModel(new ConnectorComponentImportDataModelProvider());
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java
deleted file mode 100644
index 7feb60873..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java
+++ /dev/null
@@ -1,156 +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.jca.internal.plugin;
-
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- * 
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class JcaPlugin extends WTPPlugin implements ResourceLocator {
-	// Default instance of the receiver
-	private static JcaPlugin inst;
-	protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
-
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca"; //$NON-NLS-1$
-	// Validation part of the plugin
-	//Global ResourceSet (somewhat global)
-
-	public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
-				"icons/full/cview16", //$NON-NLS-1$
-				"icons/full/ctool16", //$NON-NLS-1$
-				"icons/full/clcl16", //$NON-NLS-1$
-				"icons/full/ovr16", //$NON-NLS-1$
-				"icons/full/extra", //$NON-NLS-1$
-				"icons/full/wizban", //$NON-NLS-1$
-				"icons", //$NON-NLS-1$
-				""}; //$NON-NLS-1$
-
-	/**
-	 * Create the J2EE plugin and cache its default instance
-	 */
-	public JcaPlugin() {
-		super();
-		if (inst == null)
-			inst = this;
-	}
-
-
-	/**
-	 * Get the plugin singleton.
-	 */
-	static public JcaPlugin getDefault() {
-		return inst;
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public URL getBaseURL() {
-		return getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public Object getImage(String key) {
-		return J2EEPlugin.getImageURL(key, getBundle());
-	}
-
-
-	public static URL getInstallURL() {
-		return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the singleton instance.
-	 */
-	public static JcaPlugin getPlugin() {
-		return inst;
-	}
-
-	/**
-	 * Return the plugin directory location- the directory that all the plugins are located in (i.e.
-	 * d:\installdir\plugin)
-	 */
-	public static IPath getPluginLocation(String pluginId) {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		Bundle bundle = Platform.getBundle(pluginId);
-		if (bundle != null) {
-			try {
-				IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator(); //$NON-NLS-1$
-				String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-				return new Path(installStr);
-			} catch (IOException e) {
-				//Ignore
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public String getString(String key) {
-		return Platform.getResourceString(getBundle(), key);
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public String getString(String key, Object[] substitutions) {
-		return MessageFormat.format(getString(key), substitutions);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
-	 */
-	public String getPluginID() {
-		return PLUGIN_ID;
-	}
-	
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		ConnectorResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
-	}	
-	public String getString(String key, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key);
-	}
-
-	public String getString(String key, Object[] substitutions, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key,substitutions);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
deleted file mode 100644
index 4d7d2dad5..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IConnectorFacetInstallDataModelProperties {
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(FACET_ID)) {
-			return J2EEProjectUtilities.JCA;
-		} else if (propertyName.equals(CONFIG_FOLDER))
-			return CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER;
-		else if (propertyName.equals(MODULE_URI)) {
-			String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ','_');
-			return projectName + IJ2EEModuleConstants.RAR_EXT; 
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
-		return J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(version.getVersionString());
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
deleted file mode 100644
index 7ec6fb2b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public static final String CONNECTOR_XML_TEMPLATE_10		= "rartp10.xml";								//$NON-NLS-1$
-	public static final String CONNECTOR_XML_TEMPLATE_15		= "rartp15.xml"; //$NON-NLS-1$
-	
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-			IDataModel model = (IDataModel) config;
-
-			final IJavaProject jproj = JavaCore.create(project);
-
-			// Add WTP natures.
-
-			WtpUtils.addNatures(project);
-
-			// Create the directory structure.
-
-			final IWorkspace ws = ResourcesPlugin.getWorkspace();
-			final IPath pjpath = project.getFullPath();
-
-			// Setup the flexible project structure.
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-
-			c.create(0, null);
-			setOutputFolder(model, c);
-
-			final IVirtualFolder root = c.getRootFolder();
-			IFolder sourceFolder = null;
-			String configFolder = null;
-			configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-			root.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
-			String configFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-			IPath configFolderpath = pjpath.append(configFolderName);
-			sourceFolder = ws.getRoot().getFolder(configFolderpath);
-
-			if (!sourceFolder.getFile(J2EEConstants.RAR_DD_URI).exists()) {
-				String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
-				int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
-				
-				IFile aFile = sourceFolder.getFile(new Path(J2EEConstants.RAR_DD_URI));
-				OutputStream out = new WorkbenchByteArrayOutputStream(aFile);
-				String template = nVer == J2EEVersionConstants.JCA_1_0_ID
-						? CONNECTOR_XML_TEMPLATE_10
-						: CONNECTOR_XML_TEMPLATE_15;
-				InputStream in = getClass().getResourceAsStream(template);
-				if (in != null & out != null) {
-					try {
-						ArchiveUtil.copy(in, out);
-					} catch (IOException ioe) {
-						Logger.getLogger().logError(ioe);
-					} finally{
-						try{
-							if(null != out){
-								out.close();
-							} if(null != in){
-								in.close();
-							}
-						}catch (IOException ioe) {
-							Logger.getLogger().logError(ioe);
-						} 
-					}
-					
-					ConnectorArtifactEdit edit = new ConnectorArtifactEdit(project, false, true);
-					try{
-						if( edit != null ){
-							Connector connector = edit.getConnector();
-							connector.setDisplayName(project.getName());
-							edit.saveIfNecessary(new NullProgressMonitor());
-						}
-					}finally{
-						if( edit != null ){
-							edit.dispose();
-						}
-					}
-				} else {
-					//without a template
-					ConnectorArtifactEdit.createDeploymentDescriptor(project, nVer);
-				} // if				
-			}
-			
-			// add source folder maps
-			final IClasspathEntry[] cp = jproj.getRawClasspath();
-			for (int i = 0; i < cp.length; i++) {
-				final IClasspathEntry cpe = cp[i];
-				if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					root.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
-				}
-			}
-			
-			IVirtualFile vf = c.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
-			IFile manifestmf = vf.getUnderlyingFile();
-			if (manifestmf == null || !manifestmf.exists()) {
-				try {
-					createManifest(project, c.getRootFolder().getUnderlyingFolder(), monitor);
-				} catch (InvocationTargetException e) {
-					Logger.getLogger().logError(e);
-				} catch (InterruptedException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-
-			// Setup the classpath.
-			ClasspathHelper.removeClasspathEntries(project, fv);
-
-			if (!ClasspathHelper.addClasspathEntries(project, fv)) {
-				// TODO: Support the no runtime case.
-				// ClasspathHelper.addClasspathEntries( project, fv, <something> );
-			}
-
-
-
-			try {
-				((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java
deleted file mode 100644
index cf3b259e9..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-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;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class ConnectorFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public static final String CONNECTOR_XML_TEMPLATE_10		= "rartp10.xml";								//$NON-NLS-1$
-	public static final String CONNECTOR_XML_TEMPLATE_15		= "rartp15.xml"; //$NON-NLS-1$
-	
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-			IDataModel model = (IDataModel) config;
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-
-			// Associate with an EAR, if necessary.
-
-			final String earProjectName = (String) model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-			if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
-				if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
-
-					String ver = fv.getVersionString();
-					String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString
-					(J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(ver));
-					
-					final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-					
-					IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-					installAndAddModuletoEAR( j2eeVersionText,
-								earProjectName,
-								(IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME),
-								project,
-								moduleURI,
-								monitor );
-
-
-				}
-			}
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index e9b5bf338..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class ConnectorFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
-	public ConnectorFacetProjectCreationDataModelProvider() {
-		super();
-	}
-	
-	public void init() {
-		super.init();
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-		map.add(javaFacet);
-		IDataModel jcaFacet = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
-		map.add(jcaFacet);
-		String jcaRoot = jcaFacet.getStringProperty(IConnectorFacetInstallDataModelProperties.CONFIG_FOLDER);
-		javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, jcaRoot);
-		// If using optimized single root structure, set the output folder to the content folder
-		if (ProductManager.shouldUseSingleRootStructure())
-			javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME, jcaRoot);
-		jcaFacet.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
-					if (isPropertySet(EAR_PROJECT_NAME))
-						setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
-					else
-						model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
-				}else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
-					setProperty(ADD_TO_EAR, event.getProperty());
-				}
-			}
-		});	
-		
-		Collection requiredFacets = new ArrayList();
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(javaFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(jcaFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if( propertyName.equals( MODULE_URI )){
-			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-			IDataModel rarFacet = map.getFacetDataModel( J2EEProjectUtilities.JCA );	
-			rarFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java
deleted file mode 100644
index fbdf2baaf..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IConnectorFacetInstallDataModelProperties
- extends IJ2EEModuleFacetInstallDataModelProperties{
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp10.xml b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp10.xml
deleted file mode 100644
index 6d5bc9c65..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp10.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" "http://java.sun.com/dtd/connector_1_0.dtd">
-<connector>
-	<display-name></display-name>
-	<description></description>
- 	<vendor-name></vendor-name>
-  	<spec-version></spec-version>
-  	<eis-type></eis-type>
-  	<version></version>
-  	<license>
-  		<description></description>   
-    	<license-required>false</license-required>   
-    </license>                                      
-  	<resourceadapter>
-  		<managedconnectionfactory-class></managedconnectionfactory-class>
-  		<connectionfactory-interface></connectionfactory-interface>
-    	<connectionfactory-impl-class></connectionfactory-impl-class>
-    	<connection-interface></connection-interface>
-    	<connection-impl-class></connection-impl-class>
-    	<transaction-support></transaction-support>
-  		<config-property>
-     		<description></description>
-      		<config-property-name></config-property-name>
-      		<config-property-type></config-property-type>
-      		<config-property-value></config-property-value>
-    	 </config-property>
-    	<authentication-mechanism>
-      	 	<description></description>
-      	 	<authentication-mechanism-type></authentication-mechanism-type>
-     	 	<credential-interface></credential-interface>
-    	</authentication-mechanism>
-    	<reauthentication-support>false</reauthentication-support>
-    	<security-permission>
-    		<description></description>
-    		<security-permission-spec>
-      		</security-permission-spec>
-    	</security-permission>
-  	</resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp15.xml b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp15.xml
deleted file mode 100644
index 029561d8b..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp15.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector id="Connector_ID" version="1.5" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"> 
-	<description></description>
-	<display-name></display-name>
- 	<vendor-name></vendor-name>
-  	<eis-type></eis-type>
-  	<resourceadapter-version></resourceadapter-version>                                  
-  	<resourceadapter>
-  	</resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java
deleted file mode 100644
index 11c0ed7f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.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.jca.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentExportOperation extends J2EEArtifactExportOperation {
-
-	public ConnectorComponentExportOperation() {
-		super();
-	}
-
-	public ConnectorComponentExportOperation(IDataModel model) {
-		super(model);
-	}
-
-	protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
-		try {
-			CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
-			ConnectorComponentLoadStrategyImpl ls = new ConnectorComponentLoadStrategyImpl(getComponent());
-			ls.setExportSource(isExportSource());
-			setModuleFile(caf.openRARFile(ls, getDestinationPath().toOSString()));
-			getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
-		} catch (Exception e) {
-			throw new SaveFailureException(J2EEPluginResourceHandler.Error_opening_archive_for_export_2, e);
-		}
-	}
-
-	protected String archiveString() {
-		//TODO fill in string
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java
deleted file mode 100644
index 79288e45a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,280 +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.jca.archive.operations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ConnectorComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
-	private int dotJavaLength = ArchiveUtil.DOT_JAVA.length();
-	private List alreadyIndexed = new ArrayList();
-	private Map classesMap;
-	private IFile knownDD;
-
-	public static String[] knownLibExtensions = {".jar", //$NON-NLS-1$
-				".zip", //$NON-NLS-1$
-				".so", //$NON-NLS-1$
-				".o", //$NON-NLS-1$
-				".sl", //$NON-NLS-1$
-				".dll", //$NON-NLS-1$
-	};
-
-	public ConnectorComponentLoadStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-		knownDD = vComponent.getRootFolder().getFile(J2EEConstants.RAR_DD_URI).getUnderlyingFile();
-	}
-
-	public List getFiles() {
-		addNestedJARsFromSourceRoots();
-		aggregateSourceFiles();
-		return filesHolder.getFiles();
-	}
-
-	private void addNestedJARsFromSourceRoots() {
-		IPackageFragmentRoot[] sourceRoots = J2EEProjectUtilities.getSourceContainers(vComponent.getProject());
-		for (int i = 0; i < sourceRoots.length; i++) {
-			File aFile;
-			try {
-				aFile = getNestedJar(sourceRoots[i]);
-				if (null != aFile) {
-					filesHolder.addFile(aFile);
-				}
-			} catch (JavaModelException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-	}
-
-
-
-	private File getNestedJar(IPackageFragmentRoot sourceRoot) throws JavaModelException {
-		IPath outputPath = sourceRoot.getRawClasspathEntry().getOutputLocation();
-		if (outputPath == null) {
-			IProject project = vComponent.getProject();
-			try {
-				if (project.hasNature(JavaCore.NATURE_ID)) {
-					IJavaProject javaProject = JavaCore.create(project);
-					outputPath = javaProject.getOutputLocation();
-				}
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-			if (outputPath == null) {
-				return null;
-			}
-		}
-
-		IFolder javaOutputFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(outputPath);
-		indexClassesForOutputFolder(javaOutputFolder);
-		IContainer sourceContainer = (IContainer) sourceRoot.getResource();
-
-		int sourceContainerSegmentCount = sourceContainer.getProjectRelativePath().segmentCount();
-		boolean isModuleRoot = knownDD.getProjectRelativePath().toString().startsWith(sourceContainer.getProjectRelativePath().toString());
-		List iFiles = new ArrayList();
-		boolean foundJava = gatherFilesForJAR(iFiles, sourceContainer, isModuleRoot, false, sourceContainerSegmentCount);
-		if (!isModuleRoot || foundJava) {
-			for (int i = 0; i < iFiles.size(); i++) {
-				filesHolder.removeIFile((IFile) iFiles.get(i));
-			}
-			File nestedArchive = createNestedArchive(iFiles, sourceContainer, javaOutputFolder);
-			return nestedArchive;
-		}
-		return null;
-	}
-
-	private boolean gatherFilesForJAR(List iFiles, IContainer current, boolean isModuleRoot, boolean foundJava, int sourceContainerSegmentCount) {
-		IResource[] members;
-		try {
-			members = current.members();
-		} catch (CoreException core) {
-			throw new ArchiveRuntimeException(core);
-		}
-		for (int i = 0; i < members.length; i++) {
-			IResource res = members[i];
-			if (res.getType() == IResource.FOLDER) {
-				foundJava = gatherFilesForJAR(iFiles, (IFolder) res, isModuleRoot, foundJava, sourceContainerSegmentCount) || foundJava;
-			} else {// it must be a file
-				IFile srcFile = (IFile) res;
-				if (belongsInNestedJAR(srcFile, isModuleRoot)) {
-					if (isJava(srcFile)) {
-						if (exportSource) {
-							iFiles.add(srcFile);
-						}
-						String className = srcFile.getProjectRelativePath().removeFirstSegments(sourceContainerSegmentCount).toString();
-						className = className.substring(0, className.length() - dotJavaLength);
-						List classes = retrieveClasses(className);
-						if (null != classes) {
-							Iterator iterator = classes.iterator();
-							while (iterator.hasNext()) {
-								IFile clazz = (IFile) iterator.next();
-								iFiles.add(clazz);
-							}
-						}
-					} else {
-						iFiles.add(srcFile);
-					}
-					if (isModuleRoot)
-						foundJava = foundJava || isJava(srcFile) || isClass(srcFile);
-				}
-			}
-		}
-		return foundJava;
-	}
-
-	private File createNestedArchive(List files, IContainer sourceContainer, IFolder javaOutputFolder) {
-		ConnectorComponentNestedJARLoadStrategyImpl loader = new ConnectorComponentNestedJARLoadStrategyImpl(files, sourceContainer, javaOutputFolder);
-		ArchiveOptions options = ((Archive) getContainer()).getOptions().cloneWith(loader);
-		String uri = computeUniqueArchiveURI(sourceContainer);
-		try {
-			return getArchiveFactory().primOpenArchive(options, uri);
-		} catch (OpenFailureException ex) {
-			throw new ArchiveRuntimeException(ex);
-		}
-	}
-
-	private String computeUniqueArchiveURI(IResource resource) {
-		int increment = 0;
-		String name = resource.getName();
-		StringBuffer sb = null;
-		do {
-			sb = new StringBuffer(name.length() + 5);
-			sb.append('_');
-			sb.append(name);
-			if (increment > 0)
-				sb.append(increment);
-			sb.append(".jar"); //$NON-NLS-1$
-			increment++;
-		} while (filesHolder.contains(sb.toString()));
-		return sb.toString();
-	}
-
-	private boolean belongsInNestedJAR(IFile iFile, boolean isModuleRoot) {
-		if (isModuleRoot && isDeploymentDescriptor(iFile)) {
-			return false;
-		}
-		for (int i = 0; i < knownLibExtensions.length; i++) {
-			if (hasExtension(iFile, knownLibExtensions[i]))
-				return false;
-		}
-		return true;
-	}
-
-	protected boolean shouldInclude(String uri) {
-		return !hasExtension(uri, ArchiveUtil.DOT_CLASS) && !hasExtension(uri, ArchiveUtil.DOT_JAVA);
-	}
-
-	/**
-	 * Find all the .class files and index them so inner classes can be located.
-	 */
-	private void indexClassesForOutputFolder(IFolder javaOutputFolder) {
-		if (null == javaOutputFolder || alreadyIndexed.contains(javaOutputFolder)) {
-			return;
-		}
-		alreadyIndexed.add(javaOutputFolder);
-		int segmentCount = javaOutputFolder.getProjectRelativePath().segmentCount();
-		indexClasses(javaOutputFolder, segmentCount);
-	}
-
-	private void indexClasses(IResource resource, int javaOutputSegmentCount) {
-		switch (resource.getType()) {
-			case IResource.FILE :
-				indexClass((IFile) resource, javaOutputSegmentCount);
-				break;
-			case IResource.FOLDER :
-				try {
-					IResource[] members = ((IFolder) resource).members();
-					for (int i = 0; i < members.length; i++) {
-						indexClasses(members[i], javaOutputSegmentCount);
-					}
-				} catch (CoreException e) {
-					Logger.getLogger().logError(e);
-				}
-				break;
-		}
-	}
-
-	private void indexClass(IFile iFile, int javaOutputSegmentCount) {
-		if (!isClass(iFile))
-			return;
-		if (classesMap == null)
-			classesMap = new HashMap();
-		String name = iFile.getName();
-		IPath relPath = iFile.getProjectRelativePath().removeFirstSegments(javaOutputSegmentCount);
-		String key = relPath.toString();
-		if (name.indexOf('$') != -1) {
-			key = key.substring(0, key.indexOf('$'));
-		} else {
-			key = key.substring(0, key.indexOf('.'));
-		}
-		List inners = (List) classesMap.get(key);
-		if (inners == null) {
-			inners = new ArrayList(1);
-			classesMap.put(key, inners);
-		}
-		inners.add(iFile);
-	}
-
-	public List retrieveClasses(String key) {
-		if (classesMap == null)
-			return null;
-		return (List) classesMap.get(key);
-	}
-
-	public static boolean isJava(IFile iFile) {
-		return hasExtension(iFile, ArchiveUtil.DOT_JAVA);
-	}
-
-	public static boolean isClass(IFile iFile) {
-		return hasExtension(iFile, ArchiveUtil.DOT_CLASS);
-	}
-
-	private static boolean hasExtension(IFile iFile, String ext) {
-		String name = iFile.getName();
-		return hasExtension(name, ext);
-	}
-
-	private static boolean hasExtension(String name, String ext) {
-		int offset = ext.length();
-		return name.regionMatches(true, name.length() - offset, ext, 0, offset);
-	}
-
-	private boolean isDeploymentDescriptor(IFile iFile) {
-		return knownDD.equals(iFile);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java
deleted file mode 100644
index fd4450abb..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java
+++ /dev/null
@@ -1,115 +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.jca.archive.operations;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl;
-
-
-public class ConnectorComponentNestedJARLoadStrategyImpl extends LoadStrategyImpl {
-
-	private List files;
-	private int sourceSegmentCount;
-	private int outputSegmentCount;
-	private Map urisToIFiles;
-
-	/**
-	 * Constructor for NestedJARLoadStrategyImpl.
-	 */
-	public ConnectorComponentNestedJARLoadStrategyImpl(List files, IContainer sourceContainer, IFolder javaOutputFolder) {
-		super();
-		this.files = files;
-		sourceSegmentCount = sourceContainer.getProjectRelativePath().segmentCount();
-		outputSegmentCount = javaOutputFolder.getProjectRelativePath().segmentCount();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl#primContains(String)
-	 */
-	protected boolean primContains(String uri) {
-		// Should only be used by discriminators, and we don't discriminate these archives
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl#getFiles()
-	 */
-	public List getFiles() {
-		urisToIFiles = new HashMap();
-		List result = new ArrayList();
-		int size = files.size();
-		for (int i = 0; i < size; i++) {
-			IFile iFile = (IFile) files.get(i);
-			IPath relPath;
-			if(ConnectorComponentLoadStrategyImpl.isClass(iFile)){
-				relPath = getRelativePath(iFile, outputSegmentCount);
-			} else {
-				relPath = getRelativePath(iFile, sourceSegmentCount);
-			}
-			addFile(iFile, relPath, result);
-		}
-		return result;
-	}
-
-	protected void addFile(IFile iFile, IPath relPath, List result) {
-		File cFile = createFile(iFile, relPath);
-		result.add(cFile);
-		urisToIFiles.put(cFile.getURI(), iFile);
-	}
-
-	protected long getLastModified(IResource aResource) {
-		return aResource.getLocation().toFile().lastModified();
-	}
-
-	private File createFile(IFile iFile, IPath relPath) {
-		File cFile = createFile(relPath.toString());
-		cFile.setLastModified(getLastModified(iFile));
-		return cFile;
-	}
-
-	private IPath getRelativePath(IFile file, int parentSegmentCount) {
-		return file.getProjectRelativePath().removeFirstSegments(parentSegmentCount);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy#getInputStream(String)
-	 */
-	public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
-		if (null == urisToIFiles) {
-			getFiles();
-		}
-		IFile file = (IFile) urisToIFiles.get(uri);
-		if (file != null) {
-			try {
-				return file.getContents();
-			} catch (CoreException core) {
-				throw new ArchiveRuntimeException(uri, core);
-			}
-		}
-		throw new FileNotFoundException(uri);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
deleted file mode 100644
index ef26ab184..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
+++ /dev/null
@@ -1,156 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.ActivationSpec}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ActivationSpecItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ActivationSpecItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addActivationSpecClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Activation Spec Class feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addActivationSpecClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ActivationSpec_activationSpecClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ActivationSpec_activationSpecClass_feature", "_UI_ActivationSpec_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getActivationSpec_ActivationSpecClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getActivationSpec_RequiredConfigProperties());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns ActivationSpec.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ActivationSpec"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ActivationSpec) object).getActivationSpecClass();
-		return label == null || label.length() == 0 ? JCAResourceHandler._UI_ActivationSpec_type : 
-					JCAResourceHandler._UI_ActivationSpec_type + " " + label;  //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ActivationSpec.class)) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS :
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getActivationSpec_RequiredConfigProperties(), JcaFactory.eINSTANCE.createRequiredConfigPropertyType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		//return J2EEPlugin.getDefault();
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
deleted file mode 100644
index fbd5be41d..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
+++ /dev/null
@@ -1,170 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.AdminObject}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class AdminObjectItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public AdminObjectItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAdminObjectInterfacePropertyDescriptor(object);
-			addAdminObjectClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Admin Object Interface feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAdminObjectInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AdminObject_adminObjectInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AdminObject_adminObjectInterface_feature", "_UI_AdminObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAdminObject_AdminObjectInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Admin Object Class feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAdminObjectClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AdminObject_adminObjectClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AdminObject_adminObjectClass_feature", "_UI_AdminObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAdminObject_AdminObjectClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getAdminObject_ConfigProperties());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns AdminObject.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/AdminObject"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((AdminObject) object).getAdminObjectInterface();
-		return label == null || label.length() == 0 ? JCAResourceHandler._UI_AdminObject_type : 
-					JCAResourceHandler._UI_AdminObject_type + " " + label;  //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(AdminObject.class)) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE :
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS :
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAdminObject_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		//return J2EEPlugin.getDefault();
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
deleted file mode 100644
index 108631423..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
+++ /dev/null
@@ -1,285 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for the AuthenticationMechanism for connector proejcts.
- */
-public class AuthenticationMechanismItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - Adapter factory to create.
-	 */
-	public AuthenticationMechanismItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// AuthenticationMechanismItemProvider
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescriptionPropertyDescriptor(object);
-			addAuthenticationMechanismPropertyDescriptor(object);
-			addAuthenticationMechanismTypePropertyDescriptor(object);
-			addCredentialInterfacePropertyDescriptor(object);
-			addCustomAuthMechTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_description_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAuthenticationMechanism_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Authentication Mechanism feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAuthenticationMechanismPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_authenticationMechanism_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_authenticationMechanism_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAuthenticationMechanism_AuthenticationMechanism(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Authentication Mechanism Type feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAuthenticationMechanismTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_authenticationMechanismType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_authenticationMechanismType_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAuthenticationMechanism_AuthenticationMechanismType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Credential Interface feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addCredentialInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_credentialInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_credentialInterface_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAuthenticationMechanism_CredentialInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Custom Auth Mech Type feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addCustomAuthMechTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_customAuthMechType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_customAuthMechType_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getAuthenticationMechanism_CustomAuthMechType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return List
-	 */
-	/*
-	 * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
-	 * super.getPropertyDescriptors(object);
-	 * 
-	 * AuthenticationMechanism f_authenticationMechanism = ((AuthenticationMechanism)object);
-	 * JcaPackage pkg = JcaPackage.eINSTANCE;; // This is for the description feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
-	 * description property of the authentication mechanism",
-	 * pkg.getAuthenticationMechanism_Description(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the authenticationMechanismType
-	 * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Authentication
-	 * Mechanism Type", "The authentication mechanism type property of the authentication
-	 * mechanism", pkg.getAuthenticationMechanism_AuthenticationMechanismType(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); // This is for the credentialInterface feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Credential Interface",
-	 * "The credential interface property of the authentication mechanism",
-	 * pkg.getAuthenticationMechanism_CredentialInterface(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-	 * 
-	 * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
-	 */
-	/**
-	 * This returns the parent of the AuthenticationMechanism.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return Object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns AuthenticationMechanism.gif.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return Object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/auth_mechanism_obj"); //$NON-NLS-1$
-	}// getImage
-
-	/**
-	 * Returns the display name.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return String
-	 */
-	public String getText(Object object) {
-		AuthenticationMechanism authenticationMechanism = ((AuthenticationMechanism) object);
-		return "AuthenticationMechanism " + authenticationMechanism.getDescription(); //$NON-NLS-1$
-	}// getText
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(AuthenticationMechanism.class)) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION :
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM :
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE :
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE :
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE :
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This handles notification.
-	 * 
-	 * @param Notifier
-	 *            notifier - Notifies of change.
-	 * @param int
-	 *            eventType - The event type.
-	 * @param EObject
-	 *            feature - The reference object.
-	 * @param Object
-	 *            oldValue - The old object reference.
-	 * @param Object
-	 *            newValue - The new object reference.
-	 * @param int
-	 *            index - The current of the object.
-	 */
-	public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
-		JcaPackage pkg = JcaPackage.eINSTANCE;
-		Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
-		if (feature == pkg.getAuthenticationMechanism_Description() || feature == pkg.getAuthenticationMechanism_AuthenticationMechanismType() || feature == pkg.getAuthenticationMechanism_CredentialInterface()) {
-			fireNotifyChanged(msg);
-			return;
-		}// if
-		super.notifyChanged(msg);
-	}// notifyChanged
-
-}// AuthenticationMechanismItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
deleted file mode 100644
index 97cad08d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
+++ /dev/null
@@ -1,275 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a Config property object.
- */
-public class ConfigPropertyItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - Adapt factory
-	 */
-	public ConfigPropertyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// ConfigPropertyItemProvider
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescriptionPropertyDescriptor(object);
-			addNamePropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_description_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConfigProperty_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_name_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConfigProperty_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_type_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_type_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConfigProperty_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_value_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_value_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConfigProperty_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return List
-	 */
-	/*
-	 * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
-	 * super.getPropertyDescriptors(object);
-	 * 
-	 * ConfigProperty f_configProperty = ((ConfigProperty)object); JcaPackage pkg =
-	 * JcaPackage.eINSTANCE;; // This is for the description feature. // itemPropertyDescriptors.add
-	 * (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
-	 * description property of the config property", pkg.getConfigProperty_Description(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the name feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Name", "The name
-	 * property of the config property", pkg.getConfigProperty_Name(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the type feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Type", "The type
-	 * property of the config property", pkg.getConfigProperty_Type(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the value feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Value", "The value
-	 * property of the config property", pkg.getConfigProperty_Value(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-	 * 
-	 * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
-	 */
-	/**
-	 * This returns the parent of the ConfigProperty.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns ConfigProperty.gif.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/config_prop_obj"); //$NON-NLS-1$
-	}// getImage
-
-	/**
-	 * This returns text base on the object.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return object
-	 */
-	public String getText(Object object) {
-		ConfigProperty configProperty = ((ConfigProperty) object);
-		if (configProperty.getName() == null)
-			return JCAResourceHandler.ConfigPropertyItemProvider_UI_0; 
-		return "ConfigProperty: " + configProperty.getName(); //$NON-NLS-1$
-	}// getText
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ConfigProperty.class)) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION :
-			case JcaPackage.CONFIG_PROPERTY__NAME :
-			case JcaPackage.CONFIG_PROPERTY__TYPE :
-			case JcaPackage.CONFIG_PROPERTY__VALUE :
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConfigProperty_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConfigProperty_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This handles notification.
-	 * 
-	 * @param Notifier
-	 *            notifier - Notifies of change.
-	 * @param int
-	 *            eventType - The event type.
-	 * @param EObject
-	 *            feature - The reference object.
-	 * @param Object
-	 *            oldValue - The old object reference.
-	 * @param Object
-	 *            newValue - The new object reference.
-	 * @param int
-	 *            index - The current of the object.
-	 */
-	public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
-		JcaPackage pkg = JcaPackage.eINSTANCE;
-		Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
-		if (feature == pkg.getConfigProperty_Description() || feature == pkg.getConfigProperty_Name() || feature == pkg.getConfigProperty_Type() || feature == pkg.getConfigProperty_Value()) {
-
-			fireNotifyChanged(msg);
-			return;
-		}// if
-		super.notifyChanged(msg);
-	}// notifyChanged
-
-}// ConfigPropertyItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
deleted file mode 100644
index 906ad73bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
+++ /dev/null
@@ -1,214 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.ConnectionDefinition}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ConnectionDefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ConnectionDefinitionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addManagedConnectionFactoryClassPropertyDescriptor(object);
-			addConnectionFactoryInterfacePropertyDescriptor(object);
-			addConnectionFactoryImplClassPropertyDescriptor(object);
-			addConnectionInterfacePropertyDescriptor(object);
-			addConnectionImplClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Managed Connection Factory Class feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addManagedConnectionFactoryClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_managedConnectionFactoryClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_managedConnectionFactoryClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnectionDefinition_ManagedConnectionFactoryClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Factory Interface feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionFactoryInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionFactoryInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionFactoryInterface_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionFactoryInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Factory Impl Class feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionFactoryImplClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionFactoryImplClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionFactoryImplClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionFactoryImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Interface feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionInterface_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Impl Class feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionImplClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionImplClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionImplClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getConnectionDefinition_ConfigProperties());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns ConnectionDefinition.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ConnectionDefinition"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-
-
-	public String getText(Object object) {
-		String label = ((ConnectionDefinition) object).getManagedConnectionFactoryClass();
-		return label == null || label.length() == 0 ? JCAResourceHandler._UI_ConnectionDefinition_type : 
-					JCAResourceHandler._UI_ConnectionDefinition_type + " " + label;  //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ConnectionDefinition.class)) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS :
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE :
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS :
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE :
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS :
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnectionDefinition_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		//return J2EEPlugin.getDefault();
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java
deleted file mode 100644
index f280f7721..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java
+++ /dev/null
@@ -1,280 +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.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * This is the item provider adpater for a Conenctor projects
- */
-public class ConnectorItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - An adapter factory.
-	 */
-	public ConnectorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// ConnectorItemProvider
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addVendorNamePropertyDescriptor(object);
-			addSpecVersionPropertyDescriptor(object);
-			addEisTypePropertyDescriptor(object);
-			addVersionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Vendor Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addVendorNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_vendorName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Connector_vendorName_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnector_VendorName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Spec Version feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSpecVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_specVersion_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Connector_specVersion_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnector_SpecVersion(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Eis Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addEisTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_eisType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Connector_eisType_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnector_EisType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_version_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Connector_version_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getConnector_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - The current property
-	 * @return List
-	 */
-	/*
-	 * public List getPropertyDescriptors(Object object) {
-	 * 
-	 * if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object);
-	 * 
-	 * Connector f_connector = ((Connector)object); JcaPackage pkg = JcaPackage.eINSTANCE;; // This
-	 * is for the displayName feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Display Name", "The
-	 * display name property of the connector", pkg.getConnector_DisplayName(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the description feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
-	 * description property of the connector", pkg.getConnector_Description(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the smallIcon feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Small Icon", "The
-	 * small icon property of the connector", pkg.getConnector_SmallIcon(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the largeIcon feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Large Icon", "The
-	 * large icon property of the connector", pkg.getConnector_LargeIcon(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the vendorName feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Vendor Name", "The
-	 * vendor name property of the connector", pkg.getConnector_VendorName(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the specVersion feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Spec Version", "The
-	 * spec version property of the connector", pkg.getConnector_SpecVersion(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the eisType feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Eis Type", "The eis
-	 * type property of the connector", pkg.getConnector_EisType(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the version feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Version", "The version
-	 * property of the connector", pkg.getConnector_Version(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the license feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "License", "The license
-	 * of the connector", pkg.getConnector_License(), false)); // This is for the resourceAdapter
-	 * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Resource Adapter",
-	 * "The resource adapter of the connector", pkg.getConnector_ResourceAdapter(), false)); }
-	 * return itemPropertyDescriptors; }// getPropertyDescriptors
-	 */
-	/**
-	 * Returns a collection of children references.
-	 * 
-	 * @param Object
-	 *            object - Object to get children references of.
-	 * @return Colelction
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getConnector_License());
-			childrenReferences.add(JcaPackage.eINSTANCE.getConnector_ResourceAdapter());
-		}// if
-		return childrenReferences;
-	}// getChildrenReferences
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the parent of the Connector.
-	 * 
-	 * @param Object
-	 *            object - Object to return the parent of.
-	 * @return Object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns Connector.gif.
-	 * 
-	 * @param Object -
-	 *            The object to get the image for.
-	 * @return Object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/connection_obj"); //$NON-NLS-1$
-	}// getImage
-
-	/**
-	 * Get the display name.
-	 * 
-	 * @param Object
-	 *            object - The object to get the name for.
-	 * @return String
-	 */
-	public String getText(Object object) {
-		Connector connector = ((Connector) object);
-		return "Connector " + connector.getDisplayName(); //$NON-NLS-1$
-	}// getText
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Connector.class)) {
-			case JcaPackage.CONNECTOR__VENDOR_NAME :
-			case JcaPackage.CONNECTOR__SPEC_VERSION :
-			case JcaPackage.CONNECTOR__EIS_TYPE :
-			case JcaPackage.CONNECTOR__VERSION :
-			case JcaPackage.CONNECTOR__LICENSE :
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnector_License(), JcaFactory.eINSTANCE.createLicense()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnector_ResourceAdapter(), JcaFactory.eINSTANCE.createResourceAdapter()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-}// ConenctorItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
deleted file mode 100644
index 4f1310a6a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,139 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.InboundResourceAdapter}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class InboundResourceAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public InboundResourceAdapterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getInboundResourceAdapter_MessageAdapter());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns InboundResourceAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/InboundResourceAdapter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return JCAResourceHandler._UI_InboundResourceAdapter_type; 
-		//return getString("_UI_InboundResourceAdapter_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(InboundResourceAdapter.class)) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getInboundResourceAdapter_MessageAdapter(), JcaFactory.eINSTANCE.createMessageAdapter()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return JcaPlugin.getPlugin();
-		//return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java
deleted file mode 100644
index aa87cba31..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaFactoryImpl;
-
-
-/**
- * This is the central singleton for the jca plugin.
- */
-public class JcaEditPlugin extends Plugin {
-	/**
-	 * Keep track of the singleton.
-	 */
-	protected static JcaEditPlugin plugin;
-
-	/**
-	 * Keep track of the jca package.
-	 */
-	protected JcaPackage jcaPackage;
-
-	/**
-	 * Create the instance.
-	 */
-	public JcaEditPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-
-		// Remember the static instance.
-		//
-		plugin = this;
-	}
-
-	/**
-	 * Get the one jca package.
-	 */
-	public JcaPackage getJcaPackage() {
-		return jcaPackage;
-	}
-
-	/**
-	 * Get the one jca factory.
-	 */
-	public JcaFactory getJcaFactory() {
-		return (JcaFactory) jcaPackage.getEFactoryInstance();
-	}
-
-	/**
-	 * Do initialization stuff here.
-	 */
-	public void startup() throws CoreException {
-		super.startup();
-		jcaPackage = JcaFactoryImpl.getPackage();
-	}
-
-	/**
-	 * Get the singleton instance.
-	 */
-	public static JcaEditPlugin getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * Get a .gif from the icons folder.
-	 */
-	public Object getImage(String key) {
-		try {
-			return new URL(getDescriptor().getInstallURL(), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (MalformedURLException exception) {
-			System.out.println("Failed to load image for '" + key + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-			exception.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get a translated string from the resource bundle.
-	 */
-	public String getString(String key) {
-		return getDescriptor().getResourceBundle().getString(key);
-	}
-
-	/**
-	 * Get a translated string from the resource bundle, with an object substitution.
-	 */
-	public String getString(String key, Object s1) {
-		return MessageFormat.format(getString(key), new Object[]{s1});
-	}
-
-	/**
-	 * Get a translated string from the resource bundle, with two object substitutions.
-	 */
-	public String getString(String key, Object s1, Object s2) {
-		return MessageFormat.format(getString(key), new Object[]{s1, s2});
-	}
-
-	/**
-	 * Get a translated string from the resource bundle, with three object substitutions.
-	 */
-	public String getString(String key, Object s1, Object s2, Object s3) {
-		return MessageFormat.format(getString(key), new Object[]{s1, s2, s3});
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java
deleted file mode 100644
index 4e4067f9a..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java
+++ /dev/null
@@ -1,69 +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.jca.providers;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * This extended item provider supports the following commands:
- * <ul>
- * <li>{@link CreateChildCommand}
- * </ul>
- * <p>
- * The commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class JcaItemProviderAdapter extends ItemProviderAdapter {
-
-	/**
-	 * This is the package for the jca model.
-	 */
-	protected static final JcaPackage jcaPackage = (JcaPackage) EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
-	/**
-	 * This is the factory for the jca model.
-	 */
-	protected static final JcaFactory jcaFactory = jcaPackage.getJcaFactory();
-
-	/**
-	 * This creates an instance from an adapter factory and a domain notifier.
-	 */
-	protected JcaItemProviderAdapter(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// JcaItemProviderAdapter
-
-	/**
-	 * This creates the supported commands.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @param EditingDomain -
-	 *            The current editing domain.
-	 * @param commandClass -
-	 *            The current command class.
-	 * @param commandParameter -
-	 *            The current commandParameter.
-	 * @return Command
-	 */
-	public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
-		return super.createCommand(object, editingDomain, commandClass, commandParameter);
-	}// createCommand
-
-}// JcaItemProviderAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
deleted file mode 100644
index be845151e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,468 +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.jca.providers;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.jca.internal.util.JcaAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class JcaItemProviderAdapterFactory extends JcaAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement IChangeNotifier.
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by isFactoryForType
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance.
-	 */
-	public JcaItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}// JcaItemProviderAdapterFactory
-
-	/**
-	 * This keeps track of the one adapter used for all Connector instances.
-	 */
-	protected ConnectorItemProvider connectorItemProvider;
-
-	/**
-	 * This creates an adapter for a Connector.
-	 * 
-	 * @return Adapter
-	 */
-	public Adapter createConnectorAdapter() {
-		if (connectorItemProvider == null) {
-			connectorItemProvider = new ConnectorItemProvider(this);
-		}// if
-
-		return connectorItemProvider;
-	}// createConnectorAdapter
-
-	/**
-	 * This keeps track of the one adapter used for all License instances.
-	 */
-	protected LicenseItemProvider licenseItemProvider;
-
-	/**
-	 * This creates an adapter for a License.
-	 * 
-	 * @return Adapter
-	 */
-	public Adapter createLicenseAdapter() {
-		if (licenseItemProvider == null) {
-			licenseItemProvider = new LicenseItemProvider(this);
-		}// if
-
-		return licenseItemProvider;
-	}// createLicenseAdapter
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.InboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected InboundResourceAdapterItemProvider inboundResourceAdapterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.InboundResourceAdapter}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createInboundResourceAdapterAdapter() {
-		if (inboundResourceAdapterItemProvider == null) {
-			inboundResourceAdapterItemProvider = new InboundResourceAdapterItemProvider(this);
-		}
-
-		return inboundResourceAdapterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.OutboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected OutboundResourceAdapterItemProvider outboundResourceAdapterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.OutboundResourceAdapter}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createOutboundResourceAdapterAdapter() {
-		if (outboundResourceAdapterItemProvider == null) {
-			outboundResourceAdapterItemProvider = new OutboundResourceAdapterItemProvider(this);
-		}
-
-		return outboundResourceAdapterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.MessageAdapter}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected MessageAdapterItemProvider messageAdapterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.MessageAdapter}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createMessageAdapterAdapter() {
-		if (messageAdapterItemProvider == null) {
-			messageAdapterItemProvider = new MessageAdapterItemProvider(this);
-		}
-
-		return messageAdapterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.ConnectionDefinition}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ConnectionDefinitionItemProvider connectionDefinitionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.ConnectionDefinition}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createConnectionDefinitionAdapter() {
-		if (connectionDefinitionItemProvider == null) {
-			connectionDefinitionItemProvider = new ConnectionDefinitionItemProvider(this);
-		}
-
-		return connectionDefinitionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.AdminObject}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected AdminObjectItemProvider adminObjectItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.AdminObject}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createAdminObjectAdapter() {
-		if (adminObjectItemProvider == null) {
-			adminObjectItemProvider = new AdminObjectItemProvider(this);
-		}
-
-		return adminObjectItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.MessageListener}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected MessageListenerItemProvider messageListenerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.MessageListener}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createMessageListenerAdapter() {
-		if (messageListenerItemProvider == null) {
-			messageListenerItemProvider = new MessageListenerItemProvider(this);
-		}
-
-		return messageListenerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.ActivationSpec}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ActivationSpecItemProvider activationSpecItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.ActivationSpec}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createActivationSpecAdapter() {
-		if (activationSpecItemProvider == null) {
-			activationSpecItemProvider = new ActivationSpecItemProvider(this);
-		}
-
-		return activationSpecItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.RequiredConfigPropertyType}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected RequiredConfigPropertyTypeItemProvider requiredConfigPropertyTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.RequiredConfigPropertyType}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createRequiredConfigPropertyTypeAdapter() {
-		if (requiredConfigPropertyTypeItemProvider == null) {
-			requiredConfigPropertyTypeItemProvider = new RequiredConfigPropertyTypeItemProvider(this);
-		}
-
-		return requiredConfigPropertyTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all ResourceAdapter instances.
-	 */
-	protected ResourceAdapterItemProvider resourceAdapterItemProvider;
-
-	/**
-	 * This creates an adapter for a ResourceAdapter.
-	 * 
-	 * @return Adapter
-	 */
-	public Adapter createResourceAdapterAdapter() {
-		if (resourceAdapterItemProvider == null) {
-			resourceAdapterItemProvider = new ResourceAdapterItemProvider(this);
-		}// if
-
-		return resourceAdapterItemProvider;
-	}// createResourceAdapterAdapter
-
-	/**
-	 * This keeps track of the one adapter used for all SecurityPermission instances.
-	 */
-	protected SecurityPermissionItemProvider securityPermissionItemProvider;
-
-	/**
-	 * This creates an adapter for a SecurityPermission.
-	 * 
-	 * @return Adapter
-	 */
-	public Adapter createSecurityPermissionAdapter() {
-		if (securityPermissionItemProvider == null) {
-			securityPermissionItemProvider = new SecurityPermissionItemProvider(this);
-		}// if
-
-		return securityPermissionItemProvider;
-	}// createSecurityPermissionAdapter
-
-	/**
-	 * This keeps track of the one adapter used for all AuthenticationMechanism instances
-	 */
-	protected AuthenticationMechanismItemProvider authenticationMechanismItemProvider;
-
-	/**
-	 * This creates an adapter for a AuthenticationMechanism.
-	 * 
-	 * @return Adapter
-	 */
-	public Adapter createAuthenticationMechanismAdapter() {
-		if (authenticationMechanismItemProvider == null) {
-			authenticationMechanismItemProvider = new AuthenticationMechanismItemProvider(this);
-		}// if
-
-		return authenticationMechanismItemProvider;
-	}// createAuthenticationMechanismAdapter
-
-	/**
-	 * This keeps track of the one adapter used for all ConfigProperty instances.
-	 */
-	protected ConfigPropertyItemProvider configPropertyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jca.ConfigProperty}.
-	 */
-	public Adapter createConfigPropertyAdapter() {
-		if (configPropertyItemProvider == null) {
-			configPropertyItemProvider = new ConfigPropertyItemProvider(this);
-		}// if
-
-		return configPropertyItemProvider;
-	}// createConfigPropertyAdapter
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * 
-	 * @return ComposeableAdapterFactory
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}// getRootAdapterFactory
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * 
-	 * @return ComposedAdapterFactory
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}// setParentAdapterFactory
-
-	/**
-	 * Checks if it is a factory type
-	 * 
-	 * @param Object
-	 *            type - The given type
-	 * @return boolean
-	 */
-	public boolean isFactoryForType(Object type) {
-		return super.isFactoryForType(type) || supportedTypes.contains(type);
-	}// isFactoryForType
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * 
-	 * @param Notifier
-	 *            notifier - The given notifer.
-	 * @param Object
-	 *            type - The given type
-	 * @return Adapter
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}// adapt
-
-	/**
-	 * Does adapting.
-	 * 
-	 * @param Object
-	 *            object - The given object.
-	 * @param Oject
-	 *            type - The given type.
-	 * @return Object
-	 */
-	public Object adapt(Object object, Object type) {
-		// This is a kludge to deal with enumerators, which crash the doSwitch.
-		//
-		if (object instanceof EObject && ((EObject) object).eClass() == null) {
-			return null;
-		}// if
-
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}// if
-		}// if
-
-		return null;
-	}// adapt
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}// removeListener
-
-	/**
-	 * This delegates to change Notifier and to parent AdapterFactory.
-	 * 
-	 * @param Object
-	 *            object - The given object.
-	 * @param int
-	 *            eventType - The given type of event.
-	 * @param Object
-	 *            feature - The given feature.
-	 * @param Object
-	 *            oldValue - The old value of the event.
-	 * @param Object
-	 *            nreValue - The new value of the event.
-	 * @param int
-	 *            index - The current index
-	 */
-	public void fireNotifyChanged(Notification msg) {
-		changeNotifier.fireNotifyChanged(msg);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(msg);
-		}// if
-	}// fireNotifyChanged
-
-}// JcaItemProviderAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
deleted file mode 100644
index 88e7a7fc2..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
+++ /dev/null
@@ -1,241 +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.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a License object.
- */
-public class LicenseItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - The adapt class.
-	 */
-	public LicenseItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// LicenseItemProvider
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescriptionPropertyDescriptor(object);
-			addRequiredPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_License_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_License_description_feature", "_UI_License_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getLicense_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Required feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRequiredPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_License_required_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_License_required_feature", "_UI_License_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getLicense_Required(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getLicense_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return List
-	 */
-	/*
-	 * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
-	 * super.getPropertyDescriptors(object);
-	 * 
-	 * License f_license = ((License)object); JcaPackage pkg = JcaPackage.eINSTANCE;; // This is for
-	 * the description feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
-	 * description property of the license", pkg.getLicense_Description(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the required feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Required", "The
-	 * required property of the license", pkg.getLicense_Required(), true,
-	 * ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	 * 
-	 * }// if
-	 * 
-	 * return itemPropertyDescriptors; }// getPropertyDescriptors
-	 */
-	/**
-	 * This returns the parent of the License.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return Object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns License.gif.
-	 * 
-	 * @param Object
-	 *            object - The adapt class
-	 * @return Object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/license_obj"); //$NON-NLS-1$
-	}// getImage
-
-	/**
-	 * Get the display name.
-	 * 
-	 * @param Object
-	 *            object - The object to get the name for.
-	 * @return String
-	 */
-	public String getText(Object object) {
-		License license = ((License) object);
-		if (license.getDescription() == null)
-			return JCAResourceHandler.LicenseItemProvider_UI_0; 
-		return JCAResourceHandler.LicenseItemProvider_UI_0 + ":" + license.getDescription();  //$NON-NLS-1$
-	}// getText
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(License.class)) {
-			case JcaPackage.LICENSE__DESCRIPTION :
-			case JcaPackage.LICENSE__REQUIRED :
-			case JcaPackage.LICENSE__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getLicense_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getLicense_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This handles notification.
-	 * 
-	 * @param Notifier
-	 *            notifier - Notifies of change.
-	 * @param int
-	 *            eventType - The event type.
-	 * @param EObject
-	 *            feature - The reference object.
-	 * @param Object
-	 *            oldValue - The old object reference.
-	 * @param Object
-	 *            newValue - The new object reference.
-	 * @param int
-	 *            index - The current of the object.
-	 */
-	public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
-		JcaPackage pkg = JcaPackage.eINSTANCE;
-		Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
-		if (feature == pkg.getLicense_Description() || feature == pkg.getLicense_Required()) {
-			fireNotifyChanged(msg);
-			return;
-		}// if
-		super.notifyChanged(msg);
-	}// notifyChanged
-
-}// LicenseItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
deleted file mode 100644
index de1344a09..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
+++ /dev/null
@@ -1,139 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.MessageAdapter}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class MessageAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public MessageAdapterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getMessageAdapter_MessageListeners());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns MessageAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/MessageAdapter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return JCAResourceHandler._UI_MessageAdapter_type; 
-		//return getString("_UI_MessageAdapter_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(MessageAdapter.class)) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getMessageAdapter_MessageListeners(), JcaFactory.eINSTANCE.createMessageListener()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		//return J2EEPlugin.getDefault();
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
deleted file mode 100644
index bbe4ce4b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
+++ /dev/null
@@ -1,156 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.MessageListener}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class MessageListenerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public MessageListenerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMessageListenerTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Message Listener Type feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addMessageListenerTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageListener_messageListenerType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MessageListener_messageListenerType_feature", "_UI_MessageListener_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getMessageListener_MessageListenerType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getMessageListener_ActivationSpec());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns MessageListener.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/MessageListener"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MessageListener) object).getMessageListenerType();
-		return label == null || label.length() == 0 ? JCAResourceHandler._UI_MessageListener_type : 
-					JCAResourceHandler._UI_MessageListener_type + " " + label;  //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(MessageListener.class)) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE :
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getMessageListener_ActivationSpec(), JcaFactory.eINSTANCE.createActivationSpec()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		//return J2EEPlugin.getDefault();
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
deleted file mode 100644
index 95f9324f4..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,187 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.OutboundResourceAdapter}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class OutboundResourceAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public OutboundResourceAdapterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addReauthenticationSupportPropertyDescriptor(object);
-			addTransactionSupportPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Reauthentication Support feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addReauthenticationSupportPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_OutboundResourceAdapter_reauthenticationSupport_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_OutboundResourceAdapter_reauthenticationSupport_feature", "_UI_OutboundResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getOutboundResourceAdapter_ReauthenticationSupport(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Transaction Support feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTransactionSupportPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_OutboundResourceAdapter_transactionSupport_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_OutboundResourceAdapter_transactionSupport_feature", "_UI_OutboundResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getOutboundResourceAdapter_TransactionSupport(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns OutboundResourceAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/OutboundResourceAdapter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		//		OutboundResourceAdapter outboundResourceAdapter = (OutboundResourceAdapter) object;
-
-		return JCAResourceHandler._UI_OutboundResourceAdapter_type; 
-		//return getString("_UI_OutboundResourceAdapter_type") /*+ " " +
-		// outboundResourceAdapter.isReauthenticationSupport()*/; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(OutboundResourceAdapter.class)) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT :
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT :
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS :
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions(), JcaFactory.eINSTANCE.createConnectionDefinition()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getOutboundResourceAdapter_AuthenticationMechanisms(), JcaFactory.eINSTANCE.createAuthenticationMechanism()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
deleted file mode 100644
index 95820118e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
+++ /dev/null
@@ -1,159 +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.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.RequiredConfigPropertyType}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class RequiredConfigPropertyTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public RequiredConfigPropertyTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RequiredConfigPropertyType_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_RequiredConfigPropertyType_name_feature", "_UI_RequiredConfigPropertyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns RequiredConfigPropertyType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/RequiredConfigPropertyType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((RequiredConfigPropertyType) object).getName();
-		return label == null || label.length() == 0 ? JCAResourceHandler._UI_RequiredConfigPropertyType_type : 
-					JCAResourceHandler._UI_RequiredConfigPropertyType_type + " " + label;  //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(RequiredConfigPropertyType.class)) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME :
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		//return J2EEPlugin.getDefault();
-		return JcaPlugin.getPlugin();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java
deleted file mode 100644
index 75915a6be..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,399 +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.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a ResourceAdapter object.
- */
-public class ResourceAdapterItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - The adapt factory
-	 */
-	public ResourceAdapterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// ResourceAdapterItemProvider
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addManagedConnectionFactoryClassPropertyDescriptor(object);
-			addConnectionFactoryInterfacePropertyDescriptor(object);
-			addConnectionFactoryImplClassPropertyDescriptor(object);
-			addConnectionInterfacePropertyDescriptor(object);
-			addConnectionImplClassPropertyDescriptor(object);
-			addTransactionSupportPropertyDescriptor(object);
-			addReauthenticationSupportPropertyDescriptor(object);
-			addResourceAdapterClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Managed Connection Factory Class feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addManagedConnectionFactoryClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_managedConnectionFactoryClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_managedConnectionFactoryClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ManagedConnectionFactoryClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Factory Interface feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionFactoryInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionFactoryInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionFactoryInterface_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ConnectionFactoryInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Factory Impl Class feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionFactoryImplClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionFactoryImplClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionFactoryImplClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ConnectionFactoryImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Interface feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionInterface_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ConnectionInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Connection Impl Class feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addConnectionImplClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionImplClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionImplClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ConnectionImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Transaction Support feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTransactionSupportPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_transactionSupport_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_transactionSupport_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_TransactionSupport(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Reauthentication Support feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addReauthenticationSupportPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_reauthenticationSupport_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_reauthenticationSupport_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ReauthenticationSupport(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Resource Adapter Class feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addResourceAdapterClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_resourceAdapterClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_resourceAdapterClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getResourceAdapter_ResourceAdapterClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return List
-	 */
-	/*
-	 * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
-	 * super.getPropertyDescriptors(object);
-	 * 
-	 * ResourceAdapter f_resourceAdapter = ((ResourceAdapter)object); JcaPackage pkg =
-	 * JcaPackage.eINSTANCE;; // This is for the managedConnectionFactoryClass feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Managed Connection
-	 * Factory Class", "The managed connection factory class property of the resource adapter",
-	 * pkg.getResourceAdapter_ManagedConnectionFactoryClass(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionFactoryInterface
-	 * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Factory
-	 * Interface", "The connection factory interface property of the resource adapter",
-	 * pkg.getResourceAdapter_ConnectionFactoryInterface(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionFactoryImplClass
-	 * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Factory
-	 * Impl Class", "The connection factory impl class property of the resource adapter",
-	 * pkg.getResourceAdapter_ConnectionFactoryImplClass(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionInterface feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Interface",
-	 * "The connection interface property of the resource adapter",
-	 * pkg.getResourceAdapter_ConnectionInterface(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionImplClass feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Impl
-	 * Class", "The connection impl class property of the resource adapter",
-	 * pkg.getResourceAdapter_ConnectionImplClass(), true,
-	 * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the transactionSupport feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Transaction Support",
-	 * "The transaction support property of the resource adapter",
-	 * pkg.getResourceAdapter_TransactionSupport(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); // This is for the reauthenticationSupport
-	 * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Reauthentication
-	 * Support", "The reauthentication support property of the resource adapter",
-	 * pkg.getResourceAdapter_ReauthenticationSupport(), true,
-	 * ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	 * 
-	 * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
-	 */
-	/**
-	 * This specifies how to implement AddCommand and RemoveCommand support in createCommand.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return Collection
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			int version = J2EEVersionConstants.JCA_1_0_ID;
-			if (object instanceof ResourceAdapter)
-				version = ((Connector) ((EObject) object).eContainer()).getVersionID();
-
-			switch (version) {
-				case J2EEVersionConstants.JCA_1_0_ID :
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties());
-					break;
-				case J2EEVersionConstants.JCA_1_5_ID :
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_InboundResourceAdapter());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AdminObjects());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms());
-					childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties());
-					break;
-			}
-
-		}// if
-		return childrenReferences;
-	}// getChildrenReferences
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the parent of the ResourceAdapter.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return Object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns ResourceAdapter.gif.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return Object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/resource_adapter_obj"); //$NON-NLS-1$
-	}// getImage
-
-	/**
-	 * Get the display name.
-	 * 
-	 * @param Object
-	 *            object - The object to get the name for.
-	 * @return String
-	 */
-	public String getText(Object object) {
-		//		ResourceAdapter resourceAdapter = ((ResourceAdapter) object);
-		//return "ResourceAdapter: " + resourceAdapter.getManagedConnectionFactoryClass();
-		// //$NON-NLS-1$
-		return JCAResourceHandler._UI_ResourceAdapter_type; 
-
-	}// getText
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ResourceAdapter.class)) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS :
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE :
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS :
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE :
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS :
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT :
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT :
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS :
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS :
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS :
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES :
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER :
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER :
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions(), JcaFactory.eINSTANCE.createSecurityPermission()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms(), JcaFactory.eINSTANCE.createAuthenticationMechanism()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter(), JcaFactory.eINSTANCE.createOutboundResourceAdapter()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_InboundResourceAdapter(), JcaFactory.eINSTANCE.createInboundResourceAdapter()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_AdminObjects(), JcaFactory.eINSTANCE.createAdminObject()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return JcaPlugin.getDefault();
-	}
-
-	/**
-	 * This handles notification.
-	 * 
-	 * @param Notifier
-	 *            notifier - Notifies of change.
-	 * @param int
-	 *            eventType - The event type.
-	 * @param EObject
-	 *            feature - The reference object.
-	 * @param Object
-	 *            oldValue - The old object reference.
-	 * @param Object
-	 *            newValue - The new object reference.
-	 * @param int
-	 *            index - The current of the object.
-	 */
-	public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
-		JcaPackage pkg = JcaPackage.eINSTANCE;
-		Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
-		if (feature == pkg.getResourceAdapter_ManagedConnectionFactoryClass() || feature == pkg.getResourceAdapter_ConnectionFactoryInterface() || feature == pkg.getResourceAdapter_ConnectionFactoryImplClass() || feature == pkg.getResourceAdapter_ConnectionInterface() || feature == pkg.getResourceAdapter_ConnectionImplClass() || feature == pkg.getResourceAdapter_TransactionSupport() || feature == pkg.getResourceAdapter_ReauthenticationSupport() || feature == pkg.getResourceAdapter_SecurityPermissions() || feature == pkg.getResourceAdapter_AuthenticationMechanisms() || feature == pkg.getResourceAdapter_ConfigProperties()) {
-			fireNotifyChanged(msg);
-			return;
-		}// if
-		super.notifyChanged(msg);
-	}// notifyChanged
-
-}// ResourceAdapterItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
deleted file mode 100644
index 17c4c9a9f..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
+++ /dev/null
@@ -1,242 +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.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a SecurityPermission object.
- */
-public class SecurityPermissionItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - The adapt factory.
-	 */
-	public SecurityPermissionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// SecurityPermissionItemProvider
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescriptionPropertyDescriptor(object);
-			addSpecificationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityPermission_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityPermission_description_feature", "_UI_SecurityPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getSecurityPermission_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Specification feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSpecificationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityPermission_specification_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityPermission_specification_feature", "_UI_SecurityPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JcaPackage.eINSTANCE.getSecurityPermission_Specification(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - The adapted class.
-	 * @return List
-	 */
-	/*
-	 * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
-	 * super.getPropertyDescriptors(object);
-	 * 
-	 * SecurityPermission f_securityPermission = ((SecurityPermission)object); JcaPackage pkg =
-	 * JcaPackage.eINSTANCE;; // This is for the description feature. // itemPropertyDescriptors.add
-	 * (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
-	 * description property of the security permission", pkg.getSecurityPermission_Description(),
-	 * true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the specification feature. //
-	 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-	 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Specification", "The
-	 * specification property of the security permission",
-	 * pkg.getSecurityPermission_Specification(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-	 * 
-	 * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
-	 */
-	/**
-	 * This returns the parent of the SecurityPermission.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return Object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns SecurityPermission.gif.
-	 * 
-	 * @param Object
-	 *            object - The adapt class.
-	 * @return object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/security_permission_obj"); //$NON-NLS-1$
-	}// getImage
-
-
-	/**
-	 * Get the display name.
-	 * 
-	 * @param Object
-	 *            object - The object to get the name for.
-	 * @return String
-	 */
-	public String getText(Object object) {
-		SecurityPermission securityPermission = ((SecurityPermission) object);
-		if (securityPermission.getDescription() == null)
-			return JCAResourceHandler.SecurityPermissionItemProvider_UI_0; 
-		return JCAResourceHandler.SecurityPermissionItemProvider_UI_0 + ": " + securityPermission.getDescription();  //$NON-NLS-1$
-	}// getText
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SecurityPermission.class)) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION :
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION :
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This handles notification.
-	 * 
-	 * @param Notifier
-	 *            notifier - Notifies of change.
-	 * @param int
-	 *            eventType - The event type.
-	 * @param EObject
-	 *            feature - The reference object.
-	 * @param Object
-	 *            oldValue - The old object reference.
-	 * @param Object
-	 *            newValue - The new object reference.
-	 * @param int
-	 *            index - The current of the object.
-	 */
-	public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
-		JcaPackage pkg = JcaPackage.eINSTANCE;
-		Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
-		if (feature == pkg.getSecurityPermission_Description() || feature == pkg.getSecurityPermission_Specification()) {
-			fireNotifyChanged(msg);
-			return;
-		}// if
-		super.notifyChanged(msg);
-	}// notifyChanged
-
-}// SecurityPermissionItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.properties b/plugins/org.eclipse.jst.j2ee.jca/plugin.properties
deleted file mode 100644
index 26d59a469..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-connector_validator_UI_=Connector Validator
-CONN_FACET_LABEL=J2C Module
-CONN_FACET_DESCRIPTION=Enables the project to be deployed as a J2C module.
-CONN_FACET_TEMPLATE=J2C Project
-pluginName=JCA Plug-in
-pluginVendor=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
deleted file mode 100644
index 5f8592bb3..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-   <extension
-         id="JcaModuleExtension"
-         name="JcaModuleExtension"
-         point="org.eclipse.jst.j2ee.EARModuleExtension">
-      <earModuleExtension
-            extensionClass="org.eclipse.jst.j2ee.jca.internal.plugin.JcaModuleExtensionImpl">
-      </earModuleExtension>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.jca.providers.JcaItemProviderAdapterFactory"
-            packageURI="jca.xmi"
-            id="org.eclipse.jst.j2ee.jca.providers.JcaItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         id="ConnectorValidator"
-         name="%connector_validator_UI_"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <facet
-               facetId="jst.connector">
-         </facet>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="MANIFEST.MF">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="rar.xml">
-         </filter>
-         <helper
-               class="org.eclipse.jst.j2ee.internal.jca.validation.ConnectorHelper">
-         </helper>
-         <run
-               class="org.eclipse.jst.j2ee.internal.jca.validation.UIConnectorValidator">
-         </run>
-      </validator>
-   </extension>
-   
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModel">
-      <editModel
-            editModelID="jst.connector"
-            factoryClass="org.eclipse.wst.common.componentcore.internal.impl.ArtifactEditModelFactory">
-         <editModelResource
-               autoload="false"
-               URI="META-INF/ra.xml"/>
-      </editModel>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.modulecore.artifactedit">
-      <artifactedit
-            typeID="jst.connector"
-            class="org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit">
-      </artifactedit>
-   </extension> 
-   
-   <!--============================-->
-   <!-- Builder Provider registrations-->
-   <!--============================-->
-   <extension
-         point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
-     	<ProviderDefinesType
-      		providerType="jst.connector.builder"
-      		providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
-	</extension>
-	
-	
-  <!-- Project Facets -->
-	<extension point="org.eclipse.wst.common.project.facet.core.facets">
-
-    <project-facet id="jst.connector">
-      <label>%CONN_FACET_LABEL</label>
-      <description>%CONN_FACET_DESCRIPTION</description>
-      <icon>icons/full/obj16/Connector.gif</icon>
-    </project-facet>
-
-    <project-facet-version facet="jst.connector" version="1.0">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>
-    </project-facet-version>
-
-    <project-facet-version facet="jst.connector" version="1.5">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>
-    </project-facet-version>
-
-    <action facet="jst.connector" version="1.0,1.5" type="INSTALL" id="jst.connector.install">
-      <delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDelegate"/>
-      <config-factory class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider"/>
-    </action>
-    
-    <event-handler facet="jst.connector" version="1.0,1.5" type="POST_INSTALL">
-      <delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetPostInstallDelegate"/>
-    </event-handler>
-    
-    <event-handler facet="jst.connector" version="1.0,1.5" type="RUNTIME_CHANGED">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
-    </event-handler>
-    
-    <template id="template.jst.connector">
-      <label>%CONN_FACET_TEMPLATE</label>
-      <fixed facet="jst.java"/>
-      <fixed facet="jst.connector"/>
-    </template>
-
-  </extension>	
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml
deleted file mode 100644
index f22ea3d88..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.jca"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties b/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties
deleted file mode 100644
index a2016825d..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.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
-###############################################################################
-LicenseItemProvider_UI_0=License
-SecurityPermissionItemProvider_UI_0=SecurityPermission
-ConfigPropertyItemProvider_UI_0=ConfigProperty
-_UI_ResourceAdapter_type=ResourceAdapter
-_UI_OutboundResourceAdapter_type=OutboundResourceAdapter
-_UI_ConnectionDefinition_type=ConnectionDefinition
-_UI_InboundResourceAdapter_type=InboundResourceAdapter
-_UI_MessageAdapter_type=MessageAdapter
-_UI_MessageListener_type=MessageListener
-_UI_ActivationSpec_type=ActivationSpec
-_UI_RequiredConfigPropertyType_type=RequiredConfigProperty
-_UI_AdminObject_type=AdminObject
diff --git a/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties b/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties
deleted file mode 100644
index 3b8ccad52..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E Document type version "{0}" for rar.xml in project "{1}" needs to be version "{2}".
-ERROR_INVALID_CONNECTOR_FILE="Invalid RAR File".
-ERROR_CONNECTOR_VALIDATION_FAILED="RAR Validation failed".
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModelProvider.java
deleted file mode 100644
index d85995394..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,168 +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.jca.operations;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * @see ConnectorFacetProjectCreationDataModelProvider
- */
-public class ConnectorComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IConnectorComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-	public ConnectorComponentCreationDataModelProvider() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.application.operations.FlexibleJ2EEModuleCreationDataModel#getDefaultJ2EEModuleVersion()
-	 */
-	protected Integer getDefaultComponentVersion() {
-		int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-		switch (highestJ2EEPref) {
-			case (J2EEVersionConstants.J2EE_1_4_ID) :
-				return new Integer(J2EEVersionConstants.JCA_1_5_ID);
-			case (J2EEVersionConstants.J2EE_1_3_ID) :
-				return new Integer(J2EEVersionConstants.JCA_1_0_ID);
-			case (J2EEVersionConstants.J2EE_1_2_ID) :
-				return null;
-			default :
-				return new Integer(J2EEVersionConstants.JCA_1_5_ID);
-		}
-	}
-
-	protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
-		int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-		DataModelPropertyDescriptor[] descriptors = null;
-		switch (highestJ2EEPref) {
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				descriptors = new DataModelPropertyDescriptor[1];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.JCA_1_0_ID), J2EEVersionConstants.VERSION_1_0_TEXT);
-				break;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-			default :
-				descriptors = new DataModelPropertyDescriptor[2];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.JCA_1_0_ID), J2EEVersionConstants.VERSION_1_0_TEXT);
-				descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.JCA_1_5_ID), J2EEVersionConstants.VERSION_1_5_TEXT);
-				break;
-		}
-		return descriptors;
-	}
-
-	protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
-		switch (moduleVersion) {
-			case J2EEVersionConstants.JCA_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.JCA_1_5_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-		return 0;
-	}
-
-	protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
-		switch (j2eeVersion.intValue()) {
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return new Integer(J2EEVersionConstants.JCA_1_0_ID);
-			case J2EEVersionConstants.J2EE_1_4_ID :
-				return new Integer(J2EEVersionConstants.JCA_1_5_ID);
-		}
-		return super.convertJ2EEVersionToModuleVersion(j2eeVersion);
-	}
-
-	protected EClass getComponentType() {
-		return CommonarchivePackage.eINSTANCE.getRARFile();
-	}
-
-	protected String getComponentExtension() {
-		return ".rar"; //$NON-NLS-1$
-	}
-
-	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
-		if (propertyName.equals(COMPONENT_VERSION)) {
-			Integer propertyValue = (Integer) getProperty(propertyName);
-			String description = null;
-			switch (propertyValue.intValue()) {
-				case J2EEVersionConstants.JCA_1_0_ID :
-					description = J2EEVersionConstants.VERSION_1_0_TEXT;
-					break;
-				case J2EEVersionConstants.JCA_1_5_ID :
-				default :
-					description = J2EEVersionConstants.VERSION_1_5_TEXT;
-					break;
-			}
-			return new DataModelPropertyDescriptor(propertyValue, description);
-		}
-		return super.getPropertyDescriptor(propertyName);
-	}
-
-
-	public IDataModelOperation getDefaultOperation() {
-		//return new ConnectorComponentCreationOperation(model);
-		return new ConnectorComponentCreationFacetOperation(model);
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(MANIFEST_FOLDER)) {
-			return IPath.SEPARATOR + CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER  + IPath.SEPARATOR + J2EEConstants.META_INF;
-		}
-		if (propertyName.equals(ADD_TO_EAR)) {
-			return Boolean.TRUE;
-		}
-		if (propertyName.equals(DD_FOLDER)) {
-			return IPath.SEPARATOR + CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
-		}
-		if (propertyName.equals(JAVASOURCE_FOLDER)) {
-			return CreationConstants.DEFAULT_CONNECTOR_SOURCE_FOLDER;
-		} else if (propertyName.equals(MODULE_URI)) {
-			return getProject().getName()+IJ2EEModuleConstants.RAR_EXT;
-		}
-
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	public IStatus validate(String propertyName) {
-		return super.validate(propertyName);
-	}
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean doSet = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(JAVASOURCE_FOLDER)){
-			//unless MANIFEST folder is opened up, it is set as same as Java source folder
-			setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF); //$NON-NLS-1$
-		}		
-		return doSet;
-	}	
-	
-	protected String getJ2EEProjectType() {
-		return J2EEProjectUtilities.JCA;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationFacetOperation.java
deleted file mode 100644
index 5e00aa842..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-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.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see ConnectorFacetProjectCreationDataModelProvider
- */
-public class ConnectorComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation implements DoNotUseMeThisWillBeDeletedPost15 {
-
-	public ConnectorComponentCreationFacetOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-		dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		map.add(setupJavaInstallAction());
-		IDataModel newModel = setupConnectorInstallAction();
-		map.add(newModel);
-		setRuntime(newModel, dm); // Setting runtime property
-		setAddToEARFromWizard(newModel);
-		IStatus stat = dm.getDefaultOperation().execute(monitor, info);
-		if (stat.isOK()) {
-			String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
-			IProject earProject = ProjectUtilities.getProject(earProjectName);
-			if (earProject != null && earProject.exists())
-				stat = addtoEar(projectName, earProjectName);
-		}
-
-		return stat;
-	}
-
-	protected IDataModel setupConnectorInstallAction() {
-		String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
-		IDataModel connectorFacetInstallDataModel = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
-		connectorFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-		connectorFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
-		connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
-		connectorFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
-		if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR))
-			connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
-		connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, model.getProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
-		connectorFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
-		return connectorFacetInstallDataModel;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java
deleted file mode 100644
index 968405838..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,70 +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.jca.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ConnectorComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider {
-
-    public ConnectorComponentExportDataModelProvider() {
-        super();
-    }
-
-    public IDataModelOperation getDefaultOperation() {
-        return new ConnectorComponentExportOperation(model);
-    }
-    
-    protected String getProjectType() {
-        return J2EEProjectUtilities.JCA;
-    }
-
-    protected String getWrongComponentTypeString(String projectName) {
-        return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_A_RAR, new Object[]{projectName});       
-    }
-
-    protected String getModuleExtension() {
-        return ".rar"; //$NON-NLS-1$
-    }
-    /**
-     * Exports the specified Connector Module project to the specified Connector RAR file.
-     * 
-     * @param connectorProjectName
-     *            The name of the Connector Module project to export.
-     * @param rarFileName
-     *            The fully qualified Connector RAR file location to export the specified Connector
-     *            Module project.
-     * @param overwriteExisting
-     *            If this is <code>true</code> then an existing file at the location specified by
-     *            <code>earFileName</code> will be overwritten.
-     * @param exportSource
-     *            If this is <code>true</code> then all source files in the specified Connector
-     *            Module will be included in the resulting Connector RAR file.
-     * @plannedfor WTP 1.0
-     */
-//    public static void exportProject(String connectorProjectName, String rarFileName, boolean overwriteExisting, boolean exportSource) {
-//        ConnectorModuleExportDataModel dataModel = new ConnectorModuleExportDataModel();
-//        dataModel.setProperty(PROJECT_NAME, connectorProjectName);
-//        dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-//        dataModel.setProperty(ARCHIVE_DESTINATION, rarFileName);
-//        dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-//        try {
-//            dataModel.getDefaultOperation().run(null);
-//        } catch (InvocationTargetException e) {
-//            Logger.getLogger().logError(e);
-//        } catch (InterruptedException e) {
-//            Logger.getLogger().logError(e);
-//        }
-//    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java
deleted file mode 100644
index fea9af07f..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,76 +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.jca.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-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.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * This dataModel is used for to import Connector Modules (from RAR files) into the workspace.
- * 
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- * 
- * @plannedfor WTP 1.0
- */
-public final class ConnectorComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider {
-
-	public void init() {
-		super.init();
-		//setIntProperty(IConnectorComponentCreationDataModelProperties.COMPONENT_VERSION, J2EEVersionConstants.J2EE_1_3_ID);
-	}
-
-	protected int getType() {
-		return XMLResource.RAR_TYPE;
-	}
-
-	protected Archive openArchive(String uri) throws OpenFailureException {
-		Archive archive = CommonarchiveFactory.eINSTANCE.openRARFile(getArchiveOptions(), uri);
-		return archive;
-	}
-
-	protected IDataModel createJ2EEComponentCreationDataModel() {
-		return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());		
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new ConnectorComponentImportOperation(model);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean set = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(FILE)) {
-			IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-			if (getModuleFile() != null) {
-				FacetDataModelMap map = (FacetDataModelMap) moduleDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-				IDataModel jcaFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.JCA );
-
-				int version = getModuleSpecVersion();
-				String versionText = J2EEVersionUtil.getJCATextVersion( version );
-				jcaFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
-				model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-			}
-		}
-		return set;
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java
deleted file mode 100644
index 8c54b6b50..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java
+++ /dev/null
@@ -1,114 +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.jca.operations;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.ConnectorComponentSaveStrategyImpl;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentImportOperation extends J2EEArtifactImportOperation {
-
-	private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
-
-	public ConnectorComponentImportOperation(IDataModel model) {
-		super(model);
-	}
-
-	protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
-		super.doExecute(monitor);
-		addAssociateArchivesToClassPath();
-	}
-
-	/**
-	 * Adds all jar within the file to the classpath.
-	 */
-	protected void addAssociateArchivesToClassPath() {
-		List extraEntries = new ArrayList();
-		List archiveList = moduleFile.getArchiveFiles();
-		Iterator iterator = archiveList.iterator();
-		IVirtualFile vFile = null;
-		IFile file = null;
-		while (iterator.hasNext()) {
-			Archive anArchive = (Archive) iterator.next();
-			if (anArchive.getName().endsWith(JAR_EXTENSION)) {
-				vFile = virtualComponent.getRootFolder().getFile(anArchive.getURI());
-				if (vFile.exists()) {
-					file = vFile.getUnderlyingFile();
-					extraEntries.add(JavaCore.newLibraryEntry(file.getFullPath(), file.getFullPath(), null, true));
-				}
-			}
-		}
-		try {
-			addToClasspath(getDataModel(), extraEntries);
-		} catch (JavaModelException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-	
-	protected static void addToClasspath(IDataModel importModel, List extraEntries) throws JavaModelException {
-		if (extraEntries.size() > 0) {
-			IJavaProject javaProject = JavaCore.create(((IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT)).getProject());
-			addToClasspath(extraEntries, javaProject);
-		}
-	}
-	
-	protected static void addToClasspath(List extraEntries, IJavaProject javaProject) throws JavaModelException {
-		if (extraEntries.size() > 0) {
-			IClasspathEntry[] javaClasspath = javaProject.getRawClasspath();
-			List nonDuplicateList = new ArrayList();
-			for (int i = 0; i < extraEntries.size(); i++) {
-				IClasspathEntry extraEntry = (IClasspathEntry) extraEntries.get(i);
-				boolean include = true;
-				for (int j = 0; include && j < javaClasspath.length; j++) {
-					if (extraEntry.equals(javaClasspath[j])) {
-						include = false;
-					}
-				}
-				if (include) {
-					nonDuplicateList.add(extraEntry);
-				}
-			}
-			if (nonDuplicateList.size() > 0) {
-				IClasspathEntry[] newJavaClasspath = new IClasspathEntry[javaClasspath.length + nonDuplicateList.size()];
-				System.arraycopy(javaClasspath, 0, newJavaClasspath, 0, javaClasspath.length);
-				for (int j = 0; j < nonDuplicateList.size(); j++) {
-					newJavaClasspath[javaClasspath.length + j] = (IClasspathEntry) nonDuplicateList.get(j);
-				}
-				javaProject.setRawClasspath(newJavaClasspath, new NullProgressMonitor());
-			}
-		}
-	}
-	
-	
-	protected SaveStrategy createSaveStrategy(IVirtualComponent component) {
-		ConnectorComponentSaveStrategyImpl saveStrat = new ConnectorComponentSaveStrategyImpl(component);
-		return saveStrat;
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentCreationDataModelProperties.java
deleted file mode 100644
index e3d61b51e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,44 +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.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-/**
- * <p>
- * IConnectorComponentCreationDataModelProperties provides properties to the 
- * ConnectorComponentCreationDataModelProvider as well as all extending interfaces extending 
- * IConnectorComponentCreationDataModelProperties 
- * @see org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IConnectorFacetInstallDataModelProperties
- */
-public interface IConnectorComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java
deleted file mode 100644
index fc5a54a17..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,32 +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.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IConnectorComponentExportDataModel provides properties to the IDataModel associated with the 
- * ConnectorComponentExportDataModelProvider.\
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IConnectorComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java
deleted file mode 100644
index f1728462c..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,32 +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.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-/**
- * <p>
- * IConnectorComponentImportDataModelProperties provides properties to the IDataModel associated with the 
- * ConnectorComponentImportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IConnectorComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java
deleted file mode 100644
index 52d9ed6b6..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.module.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-public class ConnectorEditAdapterFactory implements IAdapterFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType == ConnectorArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
-			ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
-			if (J2EEProjectUtilities.isJCAProject(editModel.getProject()))
-				return new ConnectorArtifactEdit((ArtifactEditModel) adaptableObject);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[]{ArtifactEdit.class, ConnectorEditAdapterFactory.class};
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
deleted file mode 100644
index 4ec25776e..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.modulecore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.componentcore.EnterpriseBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.JCABinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-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.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Provides access to J2EE Connector models using the ArtifactEdit pattern.
- * <p>
- * Clients should use getConnectorArtifactForRead/Write() to acquire an instance of the correct
- * artifact edit class.
- * </p>
- */
-public class ConnectorArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-	/**
-	 * <p>
-	 * Identifier used to link ConnectorArtifactEdit to a ConnectorEditAdapterFactory
-	 * {@see ConnectorEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
-	 * </p>
-	 */
-
-	public static final Class ADAPTER_TYPE = ConnectorArtifactEdit.class;
-
-	/**
-	 * 
-	 */
-	public ConnectorArtifactEdit() {
-		super();
-	}
-
-	public ConnectorArtifactEdit(IVirtualComponent aModule) {
-		super(aModule);
-	}
-
-	protected BinaryComponentHelper initBinaryComponentHelper(IVirtualComponent binaryModule) {
-		return new JCABinaryComponentHelper(binaryModule);
-	}
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public ConnectorArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-
-	public ConnectorArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.JCA);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 */
-
-	public ConnectorArtifactEdit(ArtifactEditModel anArtifactEditModel) {
-		super(anArtifactEditModel);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}pointing to a module from the given
-	 *            {@see ModuleCoreNature}
-	 */
-
-	protected ConnectorArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-
-	/**
-	 * @return ConnectorResource from (@link getDeploymentDescriptorResource())
-	 */
-
-	public ConnectorResource getConnectorXmiResource() {
-		return (ConnectorResource) getDeploymentDescriptorResource();
-	}
-
-	/**
-	 * <p>
-	 * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
-	 * </p>
-	 * 
-	 * @return Resource
-	 */
-
-	public Resource getDeploymentDescriptorResource() {
-		if (isBinary()) {
-			return getBinaryComponentHelper().getResource(J2EEConstants.RAR_DD_URI_OBJ);
-		}
-		return getArtifactEditModel().getResource(J2EEConstants.RAR_DD_URI_OBJ);
-	}
-
-	/**
-	 * <p>
-	 * Obtains the Connector (@see Connector) root object from the ConnectorResource. If the root
-	 * object does not exist, then one is created (@link
-	 * addConnectorIfNecessary(getConnectorXmiResource())). The root object contains all other
-	 * resource defined objects.
-	 * </p>
-	 * 
-	 * @return EObject
-	 */
-	public EObject getDeploymentDescriptorRoot() {
-		List contents = getDeploymentDescriptorResource().getContents();
-		if (contents.size() > 0)
-			return (EObject) contents.get(0);
-		if (isBinary()) {
-			return null;
-		}
-		addConnectorIfNecessary(getConnectorXmiResource());
-		return (EObject) contents.get(0);
-	}
-
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (Connector) and populates with data. Adds the
-	 * root object to the deployment descriptor resource.
-	 * </p>
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource} Note: This method is typically used
-	 *            for JUNIT - move?
-	 *            </p>
-	 */
-	protected void addConnectorIfNecessary(XMLResource aResource) {
-		if (isBinary()) {
-			throwAttemptedBinaryEditModelAccess();
-		}
-		if (aResource != null && aResource.getContents().isEmpty()) {
-			Connector connector = JcaFactory.eINSTANCE.createConnector();
-			aResource.getContents().add(connector);
-			URI moduleURI = getArtifactEditModel().getModuleURI();
-			try {
-				connector.setDisplayName(StructureEdit.getDeployedName(moduleURI));
-			} catch (UnresolveableURIException e) {
-				// Ignore
-			}
-			aResource.setID(connector, J2EEConstants.CONNECTOR_ID);
-			// TODO add more mandatory elements
-		}
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 */
-	public static ConnectorArtifactEdit getConnectorArtifactEditForRead(IProject aProject) {
-		ConnectorArtifactEdit artifactEdit = null;
-		try {
-			if (isValidConnectorModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new ConnectorArtifactEdit(aProject, true, false);
-		} catch (Exception e) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(IProject aProject) {
-		ConnectorArtifactEdit artifactEdit = null;
-		try {
-			if (isValidConnectorModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new ConnectorArtifactEdit(aProject, false, false);
-		} catch (Exception e) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ConnectorArtifactEdit that are returned through this
-	 * method must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ConnectorArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ConnectorArtifactEdit that may only be used to read the underlying
-	 *         content model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static ConnectorArtifactEdit getConnectorArtifactEditForRead(IVirtualComponent aModule) {
-		if (aModule == null)
-			return null;
-		if (aModule.isBinary()) {
-			return new ConnectorArtifactEdit(aModule);
-		}
-		return getConnectorArtifactEditForRead(aModule.getProject());
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ConnectorArtifactEdit that are returned through this
-	 * method must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ConnectorArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ConnectorArtifactEdit that may be used to modify and persist changes
-	 *         to the underlying content model
-	 */
-	public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(IVirtualComponent aModule) {
-		if (aModule == null || aModule.isBinary())
-			return null;
-		return getConnectorArtifactEditForWrite(aModule.getProject());
-	}
-
-	/**
-	 * @param module
-	 *            A {@see WorkbenchComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
-	 *         a JST module
-	 */
-	public static boolean isValidConnectorModule(IVirtualComponent aModule) throws UnresolveableURIException {
-		if (!isValidEditableModule(aModule))
-			return false;
-		/* and match the JST_Connector_MODULE type */
-		return J2EEProjectUtilities.isJCAProject(aModule.getProject());
-	}
-
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from ConnectorResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 */
-
-	public int getJ2EEVersion() {
-		return getConnectorXmiResource().getJ2EEVersionID();
-	}
-
-	/**
-	 * @return Connector from (@link getDeploymentDescriptorRoot())
-	 */
-	public Connector getConnector() {
-		return (Connector) getDeploymentDescriptorRoot();
-	}
-
-	public EObject createModelRoot() {
-		if (isBinary()) {
-			throwAttemptedBinaryEditModelAccess();
-		}
-		return createModelRoot(getJ2EEVersion());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
-	 */
-	public EObject createModelRoot(int version) {
-		if (isBinary()) {
-			throwAttemptedBinaryEditModelAccess();
-		}
-		ConnectorResource res = (ConnectorResource) getDeploymentDescriptorResource();
-		res.setModuleVersionID(version);
-		addConnectorIfNecessary(res);
-		return ((ConnectorResource) getDeploymentDescriptorResource()).getRootObject();
-	}
-
-	public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-		return getConnectorArtifactEditForRead(aComponent);
-	}
-
-	public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
-		return getConnectorArtifactEditForWrite(aComponent);
-	}
-
-	public Archive asArchive(boolean includeSource) throws OpenFailureException {
-		if (isBinary()) {
-			return ((EnterpriseBinaryComponentHelper) getBinaryComponentHelper()).accessArchive();
-		} else {
-			ConnectorComponentLoadStrategyImpl loader = new ConnectorComponentLoadStrategyImpl(getComponent());
-			loader.setExportSource(includeSource);
-			String uri = ModuleURIUtil.getHandleString(getComponent());
-			return CommonarchiveFactory.eINSTANCE.openRARFile(loader, uri);
-		}
-	}
-
-	public static void createDeploymentDescriptor(IProject project, int version) {
-		ConnectorArtifactEdit jcaEdit = new ConnectorArtifactEdit(project, false, true);
-		try {
-			jcaEdit.createModelRoot(version);
-			jcaEdit.save(null);
-		} finally {
-			jcaEdit.dispose();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml
deleted file mode 100644
index b428bb6eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>WebArtifactEdit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the ConnectorArtifactEdit api. This api is used to work with the emf model
-        of a flexible connector module. It contains api to read and serialize out the emf model for connector modules.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject b/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject
deleted file mode 100644
index 8e388b2da..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse-cdt version="2.0"?>

-

-<cdtproject>

-<data>

-<item id="cdt_indexer">

-<indexEnabled indexValue="true"/>

-</item>

-</data>

-</cdtproject>

diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath b/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath
deleted file mode 100644
index 724dc5c34..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="j2ee-navigator/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore
deleted file mode 100644
index e8246ca0f..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-j2ee-navigator.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project b/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
deleted file mode 100644
index d856d104c..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.navigator.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.navigator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.navigator.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4034322e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,52 +0,0 @@
-#Fri Apr 07 12:49:29 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-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=error
-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=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.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
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b6d1909f..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.j2ee.navigator.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.navigator.internal;x-internal:=true,
- org.eclipse.jst.j2ee.navigator.internal.dnd;x-internal:=true,
- org.eclipse.jst.j2ee.navigator.internal.plugin;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.ejb.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.servlet.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.jca.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;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.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true; exceptions="org.eclipse.jst.j2ee.navigator.internal"
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html b/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties
deleted file mode 100644
index f4d950e89..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties
+++ /dev/null
@@ -1,19 +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,\
-               *.jar,\
-               .,\
-               icons/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
-src.includes = icons/
-source.. = j2ee-navigator/
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif
deleted file mode 100644
index c45656801..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 276842824..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c65..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef01..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e59..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b1717..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201bb5..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48df..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a13a..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba83..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b507..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22bf9..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading1.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading1.gif
deleted file mode 100644
index eae118ad1..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading1.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading2.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading2.gif
deleted file mode 100644
index c37f13d7c..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading2.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading3.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading3.gif
deleted file mode 100644
index 10a87c200..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading3.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading4.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading4.gif
deleted file mode 100644
index 7c6cfa8a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading4.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e39b..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca57e..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc69..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d66..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c473c..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e96177a..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa704..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3e7..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763c9..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e05..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 351539638..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa68a..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79ef0..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1adc..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d25124251..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31dc9..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754deee..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519da..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d38..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e56..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ace2..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a82e..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3fe6..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361ca..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/Messages.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/Messages.java
deleted file mode 100644
index 608c6f8a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/Messages.java
+++ /dev/null
@@ -1,32 +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.navigator.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	public static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.navigator.ui.messages"; //$NON-NLS-1$
-	public static String LoadingDDNode_Loading_0_;
-	public static String ClearPlaceHolderJob_Removing_place_holder_;
-	public static String AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_;
-	public static String AddModuleToEarDropAssistant_Adding_module_to_ea_;
-	public static String AddUtilityJarToEarDropAssistant_Add_Utility_Jar_to_0_; 
-	public static String ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts;
-	public static String ImportJ2EEModuleDropAssistant_Could_not_recognize_extension_0_;
-	public static String AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_;
-	public static String AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/messages.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/messages.properties
deleted file mode 100644
index f44a42057..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#String externalization, key=value
-#Sat Apr 15 16:12:10 EDT 2006
-AddModuleToEarDropAssistant_Adding_module_to_ea_=Adding module to {0}
-ClearPlaceHolderJob_Removing_place_holder_=Removing place holder ...
-ImportJ2EEModuleDropAssistant_Could_not_recognize_extension_0_=Could not recognize extension "{0}" as a Java Enterprise Edition artifact.
-AddUtilityJarToEarDropAssistant_Add_Utility_Jar_to_0_=Add Utility Jar to {0}
-ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts=Importing Java Enterprise Edition artifacts ...
-AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_=The project "{0}" cannot be accessed
-AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_=The dragged project cannot be added to the *.ear because it is closed.
-AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_=Could not add module to Enterprise Application.
-LoadingDDNode_Loading_0_=Loading descriptor for {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ApplicationViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ApplicationViewerSorter.java
deleted file mode 100644
index 906add951..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ApplicationViewerSorter.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.navigator.internal;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.provider.J2EEBinaryModulesItemProvider;
-
-public class ApplicationViewerSorter extends J2EEViewerSorter {
-
-	public ApplicationViewerSorter() {
-		super();
-	}
-	
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		if(e1 instanceof J2EEBinaryModulesItemProvider){
-			return 1;
-		} else if(e2 instanceof J2EEBinaryModulesItemProvider){
-			return -1;
-		}
-		return super.compare(viewer, e1, e2);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ClearPlaceHolderJob.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ClearPlaceHolderJob.java
deleted file mode 100644
index 0d6ca2724..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ClearPlaceHolderJob.java
+++ /dev/null
@@ -1,48 +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.navigator.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.ui.progress.UIJob;
-
-public class ClearPlaceHolderJob extends UIJob {
-
-	private AbstractTreeViewer viewer;
-	private LoadingDDNode placeHolder;
-	private Object[] children;
-	private Object parent;
-
-	public ClearPlaceHolderJob(AbstractTreeViewer viewer, LoadingDDNode placeHolder, Object parent, Object[] children) {
-		super(Messages.ClearPlaceHolderJob_Removing_place_holder_);
-		this.viewer = viewer;
-		this.placeHolder = placeHolder; 
-		this.parent = parent;
-		this.children = children;
-		setRule(new NonConflictingRule());
-	}
-	
-	public IStatus runInUIThread(IProgressMonitor monitor) {
-
-		try {
-			viewer.getControl().setRedraw(false);
-			viewer.remove(placeHolder);
-			viewer.add(parent, children);
-		} finally {
-			viewer.getControl().setRedraw(true);
-		}
-		return Status.OK_STATUS;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EARContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EARContentProvider.java
deleted file mode 100644
index 23b1fdd5c..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EARContentProvider.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-
-/**
- * This class handles the EAR navigator content to the project explorer
- */
-public class EARContentProvider extends J2EEContentProvider {
-	
-	/**
-	 * Default constructor
-	 */
-	public EARContentProvider() {
-		super();
-	}
-	
-	/**
-	 * Constructor
-	 * @param aViewerId
-	 */
-	public EARContentProvider(String aViewerId) {
-		super(aViewerId);
-	}
-	
-	/**
-	 * This method will filter out any non Application DD objects so as not to duplicate meta nodes in
-	 * the binary modules case.
-	 */
-	public Object[] getChildren(Object aParentElement) {
-		if (aParentElement instanceof EObject) {
-			EObject eObject = (EObject)aParentElement;
-			String emfPackage = eObject.eClass().getEPackage().getNsURI();
-			if (!emfPackage.equals(ApplicationPackage.eNS_URI)&&
-					!emfPackage.equals(CommonPackage.eNS_URI)&&!emfPackage.equals(ModulemapPackage.eNS_URI))
-				return new Object[]{};
-		}
-		return super.getChildren(aParentElement);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java
deleted file mode 100644
index e42c31e7f..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java
+++ /dev/null
@@ -1,53 +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 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.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public abstract class EMFModelManager {
-	private final IProject project;
-	private final EMFRootObjectProvider provider;
-	public abstract Object[] getModels();
-	public final IProject getProject() {
-		return project;
-	}
-	public final EMFRootObjectProvider getEMFRootObjectProvider(){
-		return provider;
-	}
-	public EMFModelManager(IProject aProject, EMFRootObjectProvider aProvider) {
-		project = aProject;
-		provider = aProvider;
-	}
-	
-	/**
-	 * @param affectedProject
-	 */
-	protected void notifyListeners(IProject affectedProject) {
-		provider.notifyListeners(affectedProject);
-	}
-	/**
-	 * 
-	 */
-	public abstract void dispose();
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java
deleted file mode 100644
index bbbda1414..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.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 Feb 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.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EMFModelManagerFactory {
-	public static EMFModelManager createEMFModelManager(IProject project, EMFRootObjectProvider provider) {
-		boolean flexible =  (ModuleCoreNature.getModuleCoreNature(project) != null);
-		EMFModelManager modelManager = null;
-		if (flexible)
-			modelManager = new FlexibleEMFModelManager(project,provider);
-		else
-			modelManager = new NonFlexibleEMFModelManager(project,provider);
-		return modelManager;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java
deleted file mode 100644
index 163345659..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java
+++ /dev/null
@@ -1,253 +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.navigator.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.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class EMFRootObjectManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
-
-
-	private final Map projectEditModels = new HashMap();
-	private final Map projectRootObjects = new HashMap();
-
-	private final List listeners = new ArrayList();
-
-	public interface IRefreshHandlerListener {
-		void onRefresh(Object element);
-	}
-
-	/**
-	 *  
-	 */
-	public EMFRootObjectManager() {
-		super();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-
-
-
-	public void dispose() {
-		if (projectEditModels == null)
-			return;
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		EditModel editModel = null;
-		Object[] keys = projectEditModels.keySet().toArray();
-		for (int i = 0; i < keys.length; i++) {
-			editModel = (EditModel) projectEditModels.remove(keys[i]);
-			if (editModel != null) {
-				editModel.removeListener(this);
-				editModel.releaseAccess(this);
-			}
-		}
-	}
-
-	public Object getRootObject(IProject project) {
-		if (project == null || !project.isAccessible())
-			return null;
-
-		Object rootObject = null;
-		synchronized (projectRootObjects) {
-			rootObject = projectRootObjects.get(project);
-
-			if (rootObject == null || ((EObject) rootObject).eResource() == null) {
-				EditModel editModel = getEditModelForProject(project);
-				if (editModel != null) {
-					rootObject = editModel.getPrimaryRootObject();
-					projectRootObjects.put(project, rootObject);
-				}
-			}
-		}
-		return rootObject;
-	}
-
-
-	protected EditModel getEditModelForProject(IProject project) {
-		if (project == null)
-			return null;
-		EditModel editModel = null;
-		synchronized (projectEditModels) {
-			editModel = (EditModel) projectEditModels.get(project);
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			ArtifactEdit artifactEdit = null;
-			try {
-				if (editModel == null && project.isAccessible()) {
-					artifactEdit = ArtifactEdit.getArtifactEditForRead(component);
-					if (artifactEdit != null) {
-						editModel = (EditModel) artifactEdit.getAdapter(EditModel.class);
-						if (editModel != null) {
-							editModel.addListener(this);
-							addMapping(project, editModel);
-						}
-					}
-				}
-			} finally {
-				if (artifactEdit!=null)
-					artifactEdit.dispose();
-			}
-		}
-		return editModel;
-	}
-
-	protected void addMapping(IProject project, EditModel editModel) {
-		projectEditModels.put(project, editModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-	 */
-	public void editModelChanged(EditModelEvent anEvent) {
-		IProject affectedProject = anEvent.getEditModel().getProject();
-		switch (anEvent.getEventCode()) {
-			case EditModelEvent.UNLOADED_RESOURCE :
-			case EditModelEvent.REMOVED_RESOURCE : {
-				Object oldRootObject = projectRootObjects.remove(affectedProject);
-				if (oldRootObject != null)
-					notifyListeners(affectedProject);
-			}
-				break;
-			case EditModelEvent.SAVE : {
-				Object oldRootObject = projectRootObjects.get(affectedProject);
-				if (oldRootObject == null)
-					notifyListeners(affectedProject);
-			}
-				break;
-			case EditModelEvent.PRE_DISPOSE :
-				disposeCache(affectedProject);
-				break;
-			default :
-				break;
-		}
-	}
-
-
-	/**
-	 * @param aProject
-	 */
-	private void notifyListeners(IProject aProject) {
-		for (int x = 0; x < listeners.size(); ++x) {
-			IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x);
-			refreshHandler.onRefresh(aProject);
-		}
-
-	}
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		final IResourceDelta delta = event.getDelta();
-
-		if (delta != null) {
-			try {
-				delta.accept(EMFRootObjectManager.this);
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			} catch (SWTException swte) {
-				Logger.getLogger().logError(swte);
-			} catch (SWTError swte) {
-				Logger.getLogger().logError(swte);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-	 */
-	public boolean visit(IResourceDelta delta) throws CoreException {
-		IResource resource = delta.getResource();
-		if (resource != null) {
-			switch (resource.getType()) {
-				case IResource.ROOT :
-					return true;
-				case IResource.PROJECT :
-					boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0);
-					if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged)
-						disposeCache((IProject) resource);
-					return false;
-			}
-		}
-		return false;
-	}
-
-
-	protected void disposeCache(IProject affectedProject) {
-		synchronized (projectEditModels) {
-			projectRootObjects.remove(affectedProject);
-			//System.out.println("REMOVING edit model: " + affectedProject.getName());
-			EditModel editModel = (EditModel) projectEditModels.remove(affectedProject);
-			//System.out.println("REMOVED edit model " + affectedProject.getName());
-			if (editModel != null) {
-				editModel.removeListener(this);
-				editModel.releaseAccess(this);
-				//System.out.println("RELEASED edit model " + affectedProject.getName());
-			}
-		}
-	}
-
-	public void addRefreshHandlerListener(IRefreshHandlerListener aListener) {
-		synchronized (getListeners()) {
-			if (aListener != null && !getListeners().contains(aListener))
-				getListeners().add(aListener);
-		}
-	}
-
-	public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) {
-		synchronized (listeners) {
-			listeners.remove(aListener);
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	protected java.util.List getListeners() {
-		return listeners;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java
deleted file mode 100644
index d20bf758c..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java
+++ /dev/null
@@ -1,173 +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 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.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EMFRootObjectProvider implements  IResourceChangeListener, IResourceDeltaVisitor{
-	private final HashMap emfModelCache = new HashMap();
-	private final List listeners = new ArrayList();
-	
-	public interface IRefreshHandlerListener {
-		void onRefresh(Object element);
-	}
-	
-	/**
-	 *  
-	 */
-	public EMFRootObjectProvider() {
-		super();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-	
-	public synchronized Object[] getModels(IProject project){
-		try {
-		EMFModelManager modelManager = (EMFModelManager) emfModelCache.get(project);
-		if (modelManager == null) {
-			synchronized (emfModelCache) {
-				modelManager= EMFModelManagerFactory.createEMFModelManager(project,this) ;
-				emfModelCache.put(project,modelManager);
-			}
-		}
-		return modelManager.getModels();
-		} catch (Exception ex) {
-			//ex.printStackTrace();
-			return null;
-		}
-	}
-	
-	public synchronized boolean hasLoadedModels(IProject project) {
-		return emfModelCache.get(project) != null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		final IResourceDelta delta = event.getDelta();
-
-		if (delta != null) {
-			try {
-				delta.accept(EMFRootObjectProvider.this);
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			} catch (SWTException swte) {
-				Logger.getLogger().logError(swte);
-			} catch (SWTError swte) {
-				Logger.getLogger().logError(swte);
-			}
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-	 */
-	public boolean visit(IResourceDelta delta) throws CoreException {
-		IResource resource = delta.getResource();
-		if (resource != null) {
-			switch (resource.getType()) {
-				case IResource.ROOT :
-					return true;
-				case IResource.PROJECT :
-					boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0);
-					if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged) {
-						IProject project = (IProject) resource;
-						dispose(project);
-					}
-					return false;
-			}
-		}
-		return false;
-	}
-	
-	private void dispose(IProject project) {
-		if (project == null) return;
-		EMFModelManager modelManager = (EMFModelManager) emfModelCache.remove(project);
-		if (modelManager != null) {
-			modelManager.dispose();
-			modelManager = null;
-		}
-	}
-	public void dispose() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		EMFModelManager modelManager = null;
-		Object[] keys = emfModelCache.keySet().toArray();
-		for (int i = 0; i < keys.length; i++) {
-			modelManager = (EMFModelManager) emfModelCache.remove(keys[i]);
-			if (modelManager != null) {
-				modelManager.dispose();
-			}
-		}
-	}
-	
-
-	/**
-	 * @param aProject
-	 */
-	public void notifyListeners(IProject aProject) {
-		for (int x = 0; x < listeners.size(); ++x) {
-			IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x);
-			refreshHandler.onRefresh(aProject);
-		}
-
-	}
-	
-	public void addRefreshHandlerListener(IRefreshHandlerListener aListener) {
-		synchronized (getListeners()) {
-			if (aListener != null && !getListeners().contains(aListener))
-				getListeners().add(aListener);
-		}
-	}
-
-	public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) {
-		synchronized (listeners) {
-			listeners.remove(aListener);
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	protected java.util.List getListeners() {
-		return listeners;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java
deleted file mode 100644
index f5cf432a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java
+++ /dev/null
@@ -1,252 +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 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.navigator.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.emf.ecore.EObject;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FlexibleEMFModelManager extends EMFModelManager implements EditModelListener{
-
-	private List rootObjects = new ArrayList();
-	private static final Object[] EMPTY_OBJECT = new Object[0];
-	private final List artifactEdits = new ArrayList();
-	private StructureEdit moduleCore;
-	private final Map artifactEditToRootObject = new HashMap();
-	
-	/**
-	 * @param aProject
-	 * @param provider
-	 */
-	public FlexibleEMFModelManager(IProject aProject, EMFRootObjectProvider provider) {
-		super(aProject,provider);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#getModels()
-	 */
-	public Object[] getModels() {
-		try {
-		
-			IProject project = getProject();
-			if ( project== null || !project.isAccessible())
-				return EMPTY_OBJECT;
-			
-			synchronized (rootObjects) {
-				if (!isValid(rootObjects)) {
-					rootObjects = getRootObjects();
-				}
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		if (rootObjects != null) {
-			 return rootObjects.toArray() ;
-		}
-		return EMPTY_OBJECT;
-				
-	}
-	
-	private boolean isValid(List rootObjects) {
-		if (rootObjects == null || rootObjects.size()==0) 
-			return false;
-		for (int x=0; x< rootObjects.size(); ++x) {
-			EObject eObject = (EObject) rootObjects.get(x);
-			if (eObject != null && eObject.eResource() == null) 
-				return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * @param project
-	 * @return
-	 */
-	private List getRootObjects() {
-	  	  List artifacts = getArtifactEdits();
-	  	  List flexibleObjects = new ArrayList();
-	  	  ArtifactEdit artifactEdit = null;
-	  	  EObject contentModelRoot = null;
-	  	  for (int x=0; x< artifacts.size(); ++x) {
-	  	  	 artifactEdit = (ArtifactEdit)artifacts.get(x);
-	  	     contentModelRoot = artifactEdit.getContentModelRoot();
-			 if (contentModelRoot != null) {
-		  	     flexibleObjects.add(contentModelRoot);
-		  	     if (!rootObjects.contains(contentModelRoot))
-		  	    	 rootObjects.add(contentModelRoot);
-		  	     artifactEditToRootObject.put(artifactEdit,contentModelRoot);
-			 }
-	  	  }
-	  	  return flexibleObjects;
-	}
-	
-	protected List getArtifactEdits() {
-		
-		IProject project = getProject();
-		if (project == null)
-			return null;
-		synchronized (artifactEdits) {
-			if (artifactEdits.size() ==0 && project.isAccessible()) {
-				StructureEdit moduleCore = getModuleCore();
-				WorkbenchComponent[] workBenchModules = moduleCore.getWorkbenchModules(); 
-			    for (int i = 0; i < workBenchModules.length; i++) {
-	                 WorkbenchComponent module = workBenchModules[i];
-	                 ArtifactEdit artifactEdit = null;
-	                 try{
-	                  	   artifactEdit = ArtifactEdit.getArtifactEditForRead(project);
-		                   if(artifactEdit != null) {
-		                   	artifactEdits.add(artifactEdit);
-			                artifactEdit.addListener(this);
-		                   }
-	                 }  catch(Exception e){
-	                      e.printStackTrace();
-	                 } 
-			    }
-			
-			}
-		}
-		return artifactEdits;
-	}
-	
-	private StructureEdit getModuleCore() {
-		if (moduleCore == null) {
-			moduleCore = StructureEdit.getStructureEditForRead(getProject());
-		}
-		return moduleCore;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#dispose()
-	 */
-	public void dispose() {
-		if (artifactEdits != null) {
-			for (int x=0; x< artifactEdits.size(); ++x) {
-				ArtifactEdit artifactEdit = (ArtifactEdit)artifactEdits.get(x);
-				if (artifactEdit != null) {
-					artifactEdit.removeListener(this);
-					artifactEdit.dispose();
-				}
-				
-			}
-		}
-		if (moduleCore != null)
-			moduleCore.dispose();
-		rootObjects.clear();
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-	 */
-	public void editModelChanged(EditModelEvent anEvent) {
-		IProject affectedProject = anEvent.getEditModel().getProject();
-		
-		switch (anEvent.getEventCode()) {
-			case EditModelEvent.UNLOADED_RESOURCE :
-			case EditModelEvent.REMOVED_RESOURCE : {
-				Object oldRootObject = removeRootObject(anEvent.getEditModel(),affectedProject);
-				getRootObjects();
-				if (oldRootObject != null)
-					notifyListeners(affectedProject);
-				}
-				break;
-			case EditModelEvent.SAVE : {
-				Object oldRootObject = getRootObject(anEvent.getEditModel(),affectedProject);
-				if (oldRootObject == null)
-					notifyListeners(affectedProject);
-			}
-				break;
-			case EditModelEvent.PRE_DISPOSE :
-					dispose(anEvent.getEditModel(),affectedProject);
-				break;
-			default :
-				break;
-		}
-		
-	}
-
-	
-
-	/**
-	 * @param editModel
-	 * @param affectedProject
-	 * @return
-	 */
-	private Object getRootObject(EditModel editModel, IProject project) {
-		ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
-		if (artifactEdit != null) {
-			return artifactEditToRootObject.get(artifactEdit);
-		}
-		return null;
-	}
-
-	/**
-	 * @param editModel
-	 * @param affectedProject
-	 * @return
-	 */
-	private Object removeRootObject(EditModel editModel, IProject project) {
-		ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
-		if (artifactEdit != null) {
-			rootObjects.remove(artifactEditToRootObject.get(artifactEdit));
-			artifactEditToRootObject.remove(artifactEdit);
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * @param affectedProject
-	 * @param editModel
-	 */
-	private void dispose( EditModel editModel, IProject project) {
-		ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
-		if (artifactEdit != null) {
-			artifactEdit.removeListener(this);
-			artifactEdits.remove(artifactEdit);
-			artifactEditToRootObject.remove(artifactEdit);
-		}
-		
-	}
-	
-	private ArtifactEdit getArtifactEdit(EditModel editModel, IProject project) {
-		if (artifactEdits != null) {
-			for (int x=0; x<artifactEdits.size(); ++x) {
-				ArtifactEdit artifactEdit = (ArtifactEdit)artifactEdits.get(x);
-				if (artifactEdit.hasEditModel(editModel)) 
-					return artifactEdit;
-			}
-		}
-		return null;
-	}
-	 
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
deleted file mode 100644
index 0123016ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
+++ /dev/null
@@ -1,29 +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.navigator.internal;
-
-
-/**
- * @author mdelder
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface IJ2EENavigatorConstants {
-
-	String VIEWER_ID = "org.eclipse.ui.navigator.ProjectExplorer";//$NON-NLS-1$ 
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java
deleted file mode 100644
index 9b4d81f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java
+++ /dev/null
@@ -1,69 +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.navigator.internal;
-
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard;
-import org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard;
-import org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard;
-import org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- * <p>
- * The Creation IDs are used for activity filtering and as such are declared on the individual
- * wizards. All other IDs must be maintained to stay in sync with the values found in the plugin.xml
- * files of the respective module UI plugins.
- */
-public interface IJ2EEWizardConstants {
-
-//	String NEW_EAR_PROJECT_WIZARD_ID = EARComponentCreationWizard.WIZARD_ID;
-
-//	String NEW_APPCLIENT_PROJECT_WIZARD_ID = AppClientComponentCreationWizard.WIZARD_ID;
-//
-//	String NEW_JCA_PROJECT_WIZARD_ID = ConnectorComponentCreationWizard.WIZARD_ID;
-//
-//	String NEW_EJB_PROJECT_WIZARD_ID = EJBComponentCreationWizard.WIZARD_ID;
-//
-//	String NEW_WEB_PROJECT_WIZARD_ID = WebComponentCreationWizard.WIZARD_ID;
-
-	String NEW_ENTERPRISE_BEAN_WIZARD_ID = "org.eclipse.jst.j2ee.ejb.ui.util.createEJBWizard"; //$NON-NLS-1$
-
-	String IMPORT_EAR_WIZARD_ID = EARComponentImportWizard.class.getName();
-
-	String IMPORT_APPCLIENT_WIZARD_ID = AppClientComponentImportWizard.class.getName();
-
-	String IMPORT_CONNECTOR_WIZARD_ID = ConnectorComponentImportWizard.class.getName();
-
-	String IMPORT_ENTERPRISE_BEAN_WIZARD_ID = EJBComponentImportWizard.class.getName();
-
-	String IMPORT_WEB_MODULE_WIZARD_ID = WebComponentImportWizard.class.getName();
-
-	String IMPORT_UTILITY_JAR_WIZARD_ID = J2EEUtilityJarImportWizardNew.class.getName();
-
-	String EXPORT_EAR_WIZARD_ID = EARComponentExportWizard.class.getName();
-
-	String EXPORT_APPCLIENT_WIZARD_ID = AppClientComponentExportWizard.class.getName();
-
-	String EXPORT_CONNECTOR_WIZARD_ID = ConnectorComponentExportWizard.class.getName();
-
-	String EXPORT_ENTERPRISE_BEAN_WIZARD_ID = EJBComponentExportWizard.class.getName();
-
-	String EXPORT_WEB_MODULE_WIZARD_ID = WebComponentExportWizard.class.getName();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
deleted file mode 100644
index 9821d7b45..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
+++ /dev/null
@@ -1,134 +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.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-
-public class J2EEActionProvider extends CommonActionProvider  {
-
-	private static final Class IRESOURCE_CLASS = IResource.class;
-	
-	private OpenJ2EEResourceAction openAction; 
-	
-	/**
-	 * 
-	 */
-	public J2EEActionProvider() {
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#init(org.eclipse.ui.IViewPart,
-	 *      org.eclipse.jface.viewers.StructuredViewer,
-	 *      org.eclipse.wst.common.navigator.internal.views.extensions.NavigatorContentService)
-	 */
-	public void init(ICommonActionExtensionSite aConfig) { 
-		openAction = new OpenJ2EEResourceAction(); 
-		
-//		renameAction = new J2EERenameAction(aConfig.getViewSite(), aConfig.getViewSite().getShell());
-
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#setActionContext(org.eclipse.ui.actions.ActionContext)
-	 */
-	public void setContext(ActionContext aContext) {
-		
-		if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
-
-			openAction.selectionChanged(selection);
-//			renameAction.selectionChanged(selection);
-
-			Object[] array = selection.toArray();
-			if (isUtilityJars(array)) {
-				J2EEUtilityJarItemProvider utilityJarItemProvider = null;
-				List newSelection = new ArrayList();
-				for (int i = 0; i < array.length; i++) {
-					utilityJarItemProvider = (J2EEUtilityJarItemProvider) array[i];
-					newSelection.addAll(utilityJarItemProvider.getChildren(null));
-				}
-				selection = new StructuredSelection(newSelection);
-			}
-			//genericDelete.selectionChanged(genericDelete, selection);
-		}
-		super.setContext(aContext);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillActionBars(org.eclipse.ui.IActionBars)
-	 */
-	public void fillActionBars(IActionBars theActionBars) {
-//		if (genericDelete.isEnabled())
-//			theActionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), genericDelete);
-		if(openAction.isEnabled()) 
-			theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
-		return;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void fillContextMenu(IMenuManager aMenu) {
-		if (getContext()==null || getContext().getSelection().isEmpty())
-			return;
-		IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
-		if(!adaptsToResource(selection.toArray())) {
-			openAction.selectionChanged(selection);
-			if (openAction.isEnabled())
-				aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
-		}
-	}
-
-	private boolean adaptsToResource(Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if(objects[i] instanceof IResource) {
-				return true;
-			} else if (objects[i] instanceof IAdaptable && (((IAdaptable)objects[i]).getAdapter(IRESOURCE_CLASS) != null)) {
-				return true;
-			}			
-		}
-		return false;
-	}
-	private boolean isUtilityJars(Object[] items) {
-		if (items != null) {
-			for (int i = 0; i < items.length; i++) {
-				if (items[i] == null || items[i].getClass() != J2EEUtilityJarItemProvider.class)
-					return false;
-			}
-			return true;
-		}
-		return false;
-	} 
-	 
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java
deleted file mode 100644
index 33d2ab606..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 22, 2005
- * 
- * TODO To change the template for this generated file go to Window - Preferences - Java - Code
- * Style - Code Templates
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.Comparator;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-
-
-public class J2EEComparator implements Comparator {
-
-	private J2EEViewerSorter j2eeViewSorter = new J2EEViewerSorter();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-	 */
-	public int compare(Object o1, Object o2) {
-		J2EEJavaClassProviderHelper providerHelperLeftArg = null;
-		J2EEJavaClassProviderHelper providerHelperRightArg = null;
-
-		if (o1 instanceof J2EEJavaClassProviderHelper)
-			providerHelperLeftArg = (J2EEJavaClassProviderHelper) o1;
-		if (o2 instanceof J2EEJavaClassProviderHelper)
-			providerHelperRightArg = (J2EEJavaClassProviderHelper) o2;
-
-
-		/* if both arguments are J2EEJavaClassProviderHelpers */
-		if (providerHelperLeftArg != null && providerHelperRightArg != null)
-			return providerHelperLeftArg.getText().compareTo(providerHelperRightArg.getText());
-		/* if exactly one of the arguments are J2EEJavaClassProviderHelpers */
-		else if (providerHelperLeftArg != null && o2 instanceof EnterpriseBean)
-			return 1;
-		else if (providerHelperRightArg != null && o1 instanceof EnterpriseBean)
-			return -1;
-		return j2eeViewSorter.compare(null, o1, o2);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Comparator#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		return obj instanceof J2EEComparator;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java
deleted file mode 100644
index 3e7fc011a..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java
+++ /dev/null
@@ -1,244 +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.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.provider.MethodsProviderDelegate;
-import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectProvider.IRefreshHandlerListener;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class J2EEContentProvider implements ITreeContentProvider, IRefreshHandlerListener {
-
-	private static final Class IPROJECT_CLASS = IProject.class;
-
-	private final EMFRootObjectProvider rootObjectProvider;
-
-	private AdapterFactoryContentProvider delegateContentProvider;
-	private MethodsProviderDelegate delegateMethodsProvider;
-
-	private String viewerId = null;
-	private AbstractTreeViewer viewer;
-
-	/**
-	 *  
-	 */
-	public J2EEContentProvider() {
-		rootObjectProvider = new EMFRootObjectProvider();
-		rootObjectProvider.addRefreshHandlerListener(this);
-	}
-
-	/**
-	 *  
-	 */
-	public J2EEContentProvider(String aViewerId) {
-		rootObjectProvider = new EMFRootObjectProvider();
-		updateContentProviders(aViewerId);
-		rootObjectProvider.addRefreshHandlerListener(this);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object anInputElement) {
-		return getChildren(anInputElement);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object aParentElement) {
-		IProject project = null;
-		List children = new ArrayList();
-		if (aParentElement instanceof IAdaptable && !(aParentElement instanceof EObject) && !(aParentElement instanceof ItemProvider)) {
-			project = (IProject) ((IAdaptable) aParentElement).getAdapter(IPROJECT_CLASS); 
-			 
-	 			
-			// Verify if the model *is being* 
-			//			loaded and just return the place holder 			
-			if(LoadingDDNode.isBeingLoaded(project)) {
-				children.add(LoadingDDNode.createPlaceHolder(project)); 
-				
-			// Verify if the model has been loaded, just return it  
-			} else if (rootObjectProvider.hasLoadedModels(project)) {
-				/* model already loaded, just return the model */ 
-				children.addAll(Arrays.asList(rootObjectProvider.getModels(project)));
-			
-			// Otherwise return a place holder node and start loading job
-			} else { 
-				LoadingDDNode placeHolder = LoadingDDNode.createPlaceHolder(project);
-				/* we need to load the model; possible long running operation */					
-				if(LoadingDDNode.canBeginLoading(project))
-					new LoadingDDJob(viewer, placeHolder, (IAdaptable) aParentElement, rootObjectProvider)
-						.schedule();
-				children.add(placeHolder);
-			}
-//			if (project != null) {
-//				LoadingDDNode placeHolder = new LoadingDDNode(project.getName());				
-//				LoadingDDJob loadJob = new LoadingDDJob(viewer, placeHolder, (IAdaptable) aParentElement, rootObjectProvider);
-//				loadJob.schedule();
-//				children.add(placeHolder);
-//			}
-		} else if (MethodsProviderDelegate.providesContentFor(aParentElement))
-			return delegateMethodsProvider.getChildren(aParentElement);
-		else /* if (isEMFEditObject(aParentElement)) */{
-			Object[] siblings = delegateContentProvider.getChildren(aParentElement);
-			if (siblings != null)
-				children.addAll(Arrays.asList(siblings));
-		}
-		return children.toArray();
-	}
-
-	public Object getParent(Object object) {
-		if (MethodsProviderDelegate.providesContentFor(object))
-			return delegateMethodsProvider.getParent(object);
-		Object parent = delegateContentProvider.getParent(object);
-		if(parent instanceof Resource) {
-			parent = ProjectUtilities.getProject((EObject) object);
-		} else if (parent == null) {
-			if(object instanceof BeanClassProviderHelper)
-				parent = ((BeanClassProviderHelper) object).getEjb();
-			else if (object instanceof EObject) {
-				parent = ProjectUtilities.getProject((EObject) object);	
-			}
-		} 
-		return parent;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-		rootObjectProvider.removeRefreshHandlerListener(this);
-		delegateContentProvider.dispose();
-		rootObjectProvider.dispose();
-		delegateMethodsProvider.dispose();
-
-	}
-
-	/*
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (MethodsProviderDelegate.providesContentFor(element))
-			return delegateMethodsProvider.hasChildren(element);
-		/* else if (isEMFEditObject(element)) */
-		if(element instanceof ItemProvider)
-			return true;
-		return delegateContentProvider.hasChildren(element); 
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer aViewer, Object anOldInput, Object aNewInput) {
-		String newViewerId = null;
-		viewer = (AbstractTreeViewer) aViewer;
-		if (aViewer instanceof CommonViewer)
-			newViewerId = ((CommonViewer) aViewer).getNavigatorContentService().getViewerId();
-
-		if (newViewerId != null && (viewerId == null || !viewerId.equals(newViewerId)))
-			updateContentProviders(newViewerId);
-
-		delegateContentProvider.inputChanged(aViewer, anOldInput, aNewInput);
-		delegateMethodsProvider.inputChanged(aViewer, anOldInput, aNewInput);
-	}
-
-	/**
-	 * @param viewerId2
-	 */
-	private void updateContentProviders(String aViewerId) {
-
-		/* Dispose of the existing content providers */
-		if (delegateContentProvider != null)
-			delegateContentProvider.dispose();
-		if (delegateMethodsProvider != null)
-			delegateMethodsProvider.dispose();
-
-		/* Create new content providers using the new viewer id */
-		DynamicAdapterFactory adapterFactory = new DynamicAdapterFactory(aViewerId);
-		delegateContentProvider = new AdapterFactoryContentProvider(adapterFactory);
-		delegateMethodsProvider = new MethodsProviderDelegate(adapterFactory);
-
-		/* Remember the viewer id */
-		viewerId = aViewerId;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectManager.IRefreshHandlerListener#onRefresh(java.lang.Object)
-	 */
-	public void onRefresh(final Object element) {
-		if (viewer instanceof AbstractTreeViewer) {
-			if (Display.getCurrent() != null) {
-				((AbstractTreeViewer) viewer).refresh(element, true);
-			} else {
-				/* Create and schedule a UI Job to update the Navigator Content Viewer */
-				Job job = new UIJob("Update the Navigator Content Viewer Job") { //$NON-NLS-1$
-					public IStatus runInUIThread(IProgressMonitor monitor) {
-						((AbstractTreeViewer) viewer).refresh(element, true);
-						return Status.OK_STATUS;
-					}
-				};
-				ISchedulingRule rule = new ISchedulingRule() {
-					public boolean contains(ISchedulingRule rule) {
-						return rule == this;	
-					}
-					public boolean isConflicting(ISchedulingRule rule) {
-						return rule == this;
-					}
-				};
-				if (rule != null) {
-					job.setRule(rule);
-				}
-				job.schedule();
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java
deleted file mode 100644
index 83b5cb2b7..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java
+++ /dev/null
@@ -1,66 +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 Feb 25, 2004
- *  
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author mdelder
- *  
- */
-public class J2EEEMFAdapterFactory implements IAdapterFactory {
-
-	protected static final Class IPROJECT_CLASS = IProject.class;
-	protected static final Class IRESOURCE_CLASS = IResource.class;
-	protected static final Class IFILE_CLASS = IFile.class;
-	protected static final Class EOBJECT_CLASS = EObject.class;
-
-	/**
-	 *  
-	 */
-	public J2EEEMFAdapterFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adaptableObject instanceof EObject) {
-			if (adapterType == IFILE_CLASS || adapterType == IRESOURCE_CLASS)
-				return WorkbenchResourceHelper.getFile((EObject) adaptableObject);
-			//else if (adapterType == IPROJECT_CLASS)
-			//	return ProjectUtilities.getProject((EObject) adaptableObject);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[]{IRESOURCE_CLASS, IFILE_CLASS};
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
deleted file mode 100644
index c9b753b9f..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
+++ /dev/null
@@ -1,259 +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.navigator.internal;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.navigator.ICommonContentExtensionSite;
-import org.eclipse.ui.navigator.ICommonLabelProvider;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class J2EELabelProvider implements ICommonLabelProvider {
-
-	private AdapterFactoryLabelProvider delegateLabelProvider;
-
-	/**
-	 *  
-	 */
-	public J2EELabelProvider() {
-		super();
-	}
-
-	/**
-	 *  
-	 */
-	public J2EELabelProvider(String aViewerId) {
-		super();
-		initialize(aViewerId);
-	}
-
-	public void initialize(String aViewerId) {
-		delegateLabelProvider = new J2EEAdapterFactoryLabelProvider(new DynamicAdapterFactory(aViewerId));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.extensions.ICommonLabelProvider#getDescription(java.lang.Object)
-	 */
-	public String getDescription(Object anElement) {
-		if (anElement != null && anElement instanceof EObject) {
-			EObject eObj = (EObject) anElement;
-			if (CommonUtil.isDeploymentDescriptorRoot(eObj, true /* include ears */)) {
-				IProject parent = ProjectUtilities.getProject(eObj);
-				if(eObj.eResource() != null) {
-					String path = new Path(eObj.eResource().getURI().toString()).makeRelative().toString();
-					if (parent == null)
-						return path;
-					int startIndex = path.indexOf(parent.getFullPath().toString());
-					return -1 == startIndex ? path : path.substring(startIndex);
-				} else {
-					return getText(eObj);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		if (delegateLabelProvider != null)
-			delegateLabelProvider.addListener(listener);
-	}
-
-	/**
-	 *  
-	 */
-	public void dispose() {
-		if (delegateLabelProvider != null)
-			delegateLabelProvider.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.equals(obj);
-		return false;
-	}
-
-	/**
-	 *  
-	 */
-	public void fireLabelProviderChanged() {
-		if (delegateLabelProvider != null)
-			delegateLabelProvider.fireLabelProviderChanged();
-	}
-
-	/**
-	 * @return
-	 */
-	public AdapterFactory getAdapterFactory() {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.getAdapterFactory();
-		return null;
-	}
-
-	/**
-	 * @param object
-	 * @param columnIndex
-	 * @return
-	 */
-	public Image getColumnImage(Object object, int columnIndex) {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.getColumnImage(object, columnIndex);
-		return null;
-	}
-
-	/**
-	 * @param object
-	 * @param columnIndex
-	 * @return
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.getColumnText(object, columnIndex);
-		return null;
-	}
-
-	/**
-	 * @param element
-	 * @return
-	 */
-	public Image getImage(Object element) {
-		if(element instanceof J2EEJavaClassProviderHelper)
-			return ((J2EEJavaClassProviderHelper) element).getImage();
-		if (element instanceof File)
-			return J2EEUIPlugin.getDefault().getImage("jar_obj"); //$NON-NLS-1$
-		if(element instanceof LoadingDDNode)
-			return ((LoadingDDNode)element).getImage();
-		if (element instanceof IProject || element instanceof IJavaProject)
-			return null;
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.getImage(element);
-		return null;
-	}
-
-	/**
-	 * @param element
-	 * @return
-	 */
-	public String getText(Object element) {
-		if(element instanceof J2EEJavaClassProviderHelper)
-			return ((J2EEJavaClassProviderHelper) element).getText();
-		if (element instanceof File)
-			return ((File)element).getName();
-		if (element instanceof IProject)
-			return ((IProject)element).getName();
-		if(element instanceof LoadingDDNode)
-			return ((LoadingDDNode)element).getText();
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.getText(element);
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.hashCode();
-		return super.hashCode();
-	}
-
-	/**
-	 * @param object
-	 * @param id
-	 * @return
-	 */
-	public boolean isLabelProperty(Object object, String id) {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.isLabelProperty(object, id);
-		return false;
-	}
-
-	/**
-	 * @param notification
-	 */
-	public void notifyChanged(Notification notification) {
-		if (delegateLabelProvider != null)
-			delegateLabelProvider.notifyChanged(notification);
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		if (delegateLabelProvider != null)
-			delegateLabelProvider.removeListener(listener);
-	}
-
-	/**
-	 * @param adapterFactory
-	 */
-	public void setAdapterFactory(AdapterFactory adapterFactory) {
-		if (delegateLabelProvider != null)
-			delegateLabelProvider.setAdapterFactory(adapterFactory);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (delegateLabelProvider != null)
-			return delegateLabelProvider.toString();
-		return super.toString();
-	}
-
-	public void init(ICommonContentExtensionSite aSite) {
-		initialize(IJ2EENavigatorConstants.VIEWER_ID);
-		
-	}
-
-	public void restoreState(IMemento aMemento) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void saveState(IMemento aMemento) {
-		// TODO Auto-generated method stub
-		
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java
deleted file mode 100644
index 0820d939a..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java
+++ /dev/null
@@ -1,33 +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 Nov 21, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-
-/**
- * @author Administrator
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EENavigationLabelProvider extends J2EEAdapterFactoryLabelProvider {
-
-	public J2EENavigationLabelProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEProjectDecorator.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEProjectDecorator.java
deleted file mode 100644
index acae0c579..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEProjectDecorator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-/**
- * J2EEProjectDecorator
- */
-public class J2EEProjectDecorator extends LabelProvider implements ILightweightLabelDecorator {
-
-    private static ImageDescriptor EAR;
-    private static ImageDescriptor APPCLIENT;
-    private static ImageDescriptor DYNAMICWEB;
-    private static ImageDescriptor EJB;
-    private static ImageDescriptor CONNECTOR;
-      
-    /* The constants are duplicated here to avoid plugin loading. */
-    private static final String EAR_FACET = "jst.ear"; //$NON-NLS-1$ 
-    private static final String APPCLIENT_FACET = "jst.appclient"; //$NON-NLS-1$ 
-    private static final String WEB_FACET = "jst.web"; //$NON-NLS-1$ 
-    private static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$ 
-    private static final String UTILITY_FACET = "jst.utility"; //$NON-NLS-1$ 
-    private static final String CONNECTOR_FACET = "jst.connector"; //$NON-NLS-1$ 
-    private static final String STATIC_WEB_FACET = "wst.web"; //$NON-NLS-1$ 
-    
-    private static final String ICON_DIR = "icons/full/ovr16"; //$NON-NLS-1$
-    
-    
-    public J2EEProjectDecorator() {
-        super();
-    }
-    
-    public void decorate(Object element, IDecoration decoration) {
-    	
-    	if(element instanceof IJavaProject) {
-    		element = ((IJavaProject)element).getProject();
-    	}
-        if (element instanceof IProject) {  
-    	
-        	IProject project = (IProject) element;
-        	ImageDescriptor overlay = null;
-			if (hasFacet(project, EAR_FACET))
-				overlay=getEAR();
-			else if (hasFacet(project, APPCLIENT_FACET))
-				overlay=getAPPCLIENT();
-			else if (hasFacet(project, WEB_FACET))
-				overlay=getDYNAMICWEB();
-			else if (hasFacet(project, EJB_FACET))
-				overlay=getEJB();
-			else if (hasFacet(project, CONNECTOR_FACET))
-				overlay=getCONNECTOR();
-			else if (hasFacet(project, STATIC_WEB_FACET))
-				overlay=getDYNAMICWEB();
-			else if (hasFacet(project, UTILITY_FACET))
-				overlay=null;
-			
-			if (overlay != null)
-				decoration.addOverlay(overlay); 
-        }
-	}
-
-    private boolean hasFacet(IProject project, String facet) {
-		try {
-			return FacetedProjectFramework.hasProjectFacet(project, facet);
-		} catch (CoreException e) { 
-			J2EENavigatorPlugin.logError(0, e.getMessage(), e);
-			return false;
-		}
-	}
-    
-    /**
-	 * This gets a .gif from the icons folder.
-	 */
-	private static ImageDescriptor getImageDescriptor(String key) {
-		ImageDescriptor imageDescriptor = null;
-		if (key != null) {
-			String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
-			IPath path = new Path(ICON_DIR).append(gif);
-			URL gifImageURL = FileLocator.find(Platform.getBundle(J2EENavigatorPlugin.PLUGIN_ID), path, null);
-			if (gifImageURL != null)
-				imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
-		}
-		return imageDescriptor;
-	}
-
-    private static ImageDescriptor getEAR() {
-    	if (EAR == null) {
-    		EAR = getImageDescriptor("enterprise_app_ovr"); //$NON-NLS-1$
-    	}
-    	return EAR;
-    }
-    
-    private static ImageDescriptor getAPPCLIENT() {
-    	if (APPCLIENT == null) {
-    		APPCLIENT = getImageDescriptor("client_app_ovr"); //$NON-NLS-1$
-    	}
-    	return APPCLIENT;
-    }
-    
-    private static ImageDescriptor getDYNAMICWEB() {
-    	if (DYNAMICWEB == null) {
-    		DYNAMICWEB = getImageDescriptor("web_module_ovr"); //$NON-NLS-1$
-    	}
-    	return DYNAMICWEB;
-    }
-    
-    private static ImageDescriptor getEJB() {
-    	if (EJB == null) {
-    		EJB = getImageDescriptor("ejb_module_ovr"); //$NON-NLS-1$
-    	}
-    	return EJB;
-    }
-    
-    private static ImageDescriptor getCONNECTOR() {
-    	if (CONNECTOR == null) {
-    		CONNECTOR = getImageDescriptor("connector_ovr"); //$NON-NLS-1$
-    	}
-    	return CONNECTOR;
-    }
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java
deleted file mode 100644
index a3b13d2c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.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.navigator.internal;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-public class J2EEViewerSorter extends ViewerSorter {
-
-	/**
-	 * Constructor for J2EEViewerSorter.
-	 */
-	public J2EEViewerSorter() {
-		super();
-	}
-
-	private static final String WST = "org.eclipse.wst"; //$NON-NLS-1$
-	private static final String JST = "org.eclipse.jst"; //$NON-NLS-1$
-
-	/**
-	 * @see ViewerSorter#compare(Viewer, Object, Object)
-	 */
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		// Check to see if each object is a base WST or JST core contribution
-		boolean e1_isCore = isCore(e1);
-		boolean e2_isCore = isCore(e2);
-		// If both elements are from the same category, do default comparison
-		if (e1_isCore == e2_isCore)
-			return super.compare(viewer, e1, e2);
-		// If e1 is core, but not e2, e1 is less than e2
-		else if (e1_isCore)
-			return -1;
-		// If e1 is not core, but e2 is, e1 is greater than e2
-		else
-			return 1;
-	}
-	
-	/**
-	 * Any contribution from the base JST or WST packages is considered core, everything else is
-	 * an extension
-	 * @param element
-	 * @return boolean is Contribution Core?
-	 */
-	private boolean isCore(Object element) {
-		if (element != null) {
-			Class clazz = element.getClass();
-			if (clazz != null) {
-				Package pack = clazz.getPackage();
-				if (pack != null) {
-					String packageName = pack.getName();
-					return packageName!=null && (packageName.startsWith(WST) || packageName.startsWith(JST));
-				}
-			}
-		}
-		return false;
-	}
-
-	protected boolean isEnterpriseBean(Object o) {
-		return o instanceof EnterpriseBean;
-	}
-
-	protected boolean isDeploymentDescriptorRoot(Object o) {
-		return CommonUtil.isDeploymentDescriptorRoot(o);
-	}
-
-	protected boolean shouldSort(Object e1, Object e2) {
-		return (isDeploymentDescriptorRoot(e1) && isDeploymentDescriptorRoot(e2)) || (isEnterpriseBean(e1) && isEnterpriseBean(e2)) || ((e1 instanceof IFile) && (e2 instanceof IFile));
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDJob.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDJob.java
deleted file mode 100644
index 745f17c7b..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDJob.java
+++ /dev/null
@@ -1,68 +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.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-
-public class LoadingDDJob extends Job {
-
-	private static final Class IPROJECT_CLASS = IProject.class;
-
-	private EMFRootObjectProvider rootObjectProvider;
-	private LoadingDDNode placeHolder;
-	private AbstractTreeViewer viewer;
-	private IAdaptable parent;
-
-	public LoadingDDJob(AbstractTreeViewer viewer, LoadingDDNode placeHolder, IAdaptable parent, EMFRootObjectProvider rootObjectProvider) {
-		super(placeHolder.getText());
-		this.viewer = viewer;
-		this.placeHolder = placeHolder;
-		this.parent = parent;
-		this.rootObjectProvider = rootObjectProvider;
-		setRule(new NonConflictingRule());
-	}
-
-	protected IStatus run(IProgressMonitor monitor) { 
-
-		LoadingDDUIJob updateUIJob = new LoadingDDUIJob(viewer, placeHolder);
-		updateUIJob.schedule();
-
-		List children = new ArrayList();
-		
-		try {
-			IProject project =  (IProject)  parent.getAdapter(IPROJECT_CLASS);
-			Object[] rootObjects = (rootObjectProvider != null) ? rootObjectProvider.getModels(project) : null;
-			if (rootObjects != null) {
-				for (int x=0; x< rootObjects.length ; ++x) {
-					children.add(rootObjects[x]);
-				}
-				
-			}		
-		} finally { 
-			/* dispose of the place holder, causes the termination of the animation job */
-			placeHolder.dispose(); 
-			new ClearPlaceHolderJob(viewer, placeHolder, parent, children.toArray()).schedule();
-		}
-		
-		 
-		return Status.OK_STATUS;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDNode.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDNode.java
deleted file mode 100644
index f95486de6..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDNode.java
+++ /dev/null
@@ -1,157 +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.navigator.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-public class LoadingDDNode {
-
-	private static ImageDescriptor loadingOne;
-	private static ImageDescriptor loadingTwo;
-	private static ImageDescriptor loadingThree;
-	private static ImageDescriptor loadingFour;
-	
-
-	private static final Set loadingFiles = new HashSet();
-	private static final Map placeHolders = new HashMap();
-
-	static {
-		try {
-			loadingOne = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading1.gif"); //$NON-NLS-1$
-			loadingTwo = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading2.gif"); //$NON-NLS-1$
-			loadingThree = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading3.gif"); //$NON-NLS-1$
-			loadingFour = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading4.gif"); //$NON-NLS-1$
-		} catch (RuntimeException e) {
-			String msg = e.getMessage() != null ? e.getMessage() : e.toString();
-			J2EENavigatorPlugin.logError(0, msg, e);
-			loadingOne = ImageDescriptor.getMissingImageDescriptor();
-			loadingTwo = ImageDescriptor.getMissingImageDescriptor();
-			loadingThree = ImageDescriptor.getMissingImageDescriptor();
-			loadingFour = ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
- 
-	private String text; 
-	private String text1;
-	private String text2;
-	private String text3;
-	private int count = 0;
-
-	private boolean disposed = false;
-	private IProject modelProject;
-	
-
-	/**
-	 * Return a place holder node to sit in the tree until data is available.
-	 * This place holder node will be animated for the user's enjoyment. 
-	 *  
-	 * @param modelFile The modelFile to be loaded
-	 * @return A new unique place holder for this file for a given load cycle
-	 */
-	public static LoadingDDNode createPlaceHolder(IProject modelFile) {
-		LoadingDDNode node = null;
-		synchronized (LoadingDDNode.class) {
-			if(placeHolders.containsKey(modelFile))
-				node = (LoadingDDNode) placeHolders.get(modelFile);
-			else 			
-				placeHolders.put(modelFile, node = new LoadingDDNode(modelFile));
-		}
-		return node;
-	}
-	
-	public LoadingDDNode(IProject model) {
-		text = NLS.bind(Messages.LoadingDDNode_Loading_0_, model.getName());
-		text1 = text  + "."; //$NON-NLS-1$
-		text2 = text  + ".."; //$NON-NLS-1$
-		text3 = text  + "..."; //$NON-NLS-1$
-		modelProject = model;
-	}
-
-	public String getText() {
-
-		switch ( count % 4) {
-			case 0 :
-				return text;
-			case 1 :
-				return text1;
-			case 2 :
-				return text2;
-			case 3 :
-			default :
-				return text3;
-		} 
-	}
-
-	public Image getImage() {
-		switch ( count = (++count % 4)) {
-			case 0 :
-				return J2EENavigatorPlugin.getDefault().getImage(loadingOne);
-			case 1 :
-				return J2EENavigatorPlugin.getDefault().getImage(loadingTwo);
-			case 2 :
-				return J2EENavigatorPlugin.getDefault().getImage(loadingThree);
-			case 3 :
-			default :
-				return J2EENavigatorPlugin.getDefault().getImage(loadingFour);
-		}
-	} 
-	
-	
-	
-	public boolean isDisposed() {
-		return disposed;
-	}
-	
-	public void dispose() {
-		synchronized (LoadingDDNode.class) {
-			disposed = true;
-			placeHolders.remove(modelProject);	
-			loadingFiles.remove(modelProject);
-		}
-	}
-
-	/**
-	 * Employ a Test and Set (TST) primitive to ensure 
-	 * that only job is spawned to load the model file
-	 *   
-	 * 
-	 * @return True only if no other jobs are trying to load this model.
-	 */
-	public static boolean canBeginLoading(IProject modelProject) {
-		synchronized (LoadingDDNode.class) {  
-			if(loadingFiles.contains(modelProject))
-				return false;
-			loadingFiles.add(modelProject);
-			return true;
-		}
-
-	}
-
-	/**
-	 * Return true if a job has requested permission to load the model file   
-	 * @param modelFile The model file that should be loaded
-	 * @return True only if a job is trying to load the model.
-	 */
-	public static boolean isBeingLoaded(IProject modelProject) {
-		synchronized (LoadingDDNode.class) {  
-			return loadingFiles.contains(modelProject);
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDUIJob.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDUIJob.java
deleted file mode 100644
index 9718a6479..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDUIJob.java
+++ /dev/null
@@ -1,47 +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.navigator.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.ui.progress.UIJob;
-
-public class LoadingDDUIJob extends UIJob {
-	
-	private static final String[] NO_PROPERTIES = new String[0];
-
-	private static final long DELAY = 200;
-	  
-	private LoadingDDNode placeHolder;
-	private StructuredViewer viewer; 
-	 
-	public LoadingDDUIJob(StructuredViewer viewer, LoadingDDNode placeHolder) {
-		super(placeHolder.getText()); 
-		this.viewer = viewer;
-		this.placeHolder = placeHolder;
-		setSystem(true);
-		setRule(new NonConflictingRule());
-	}
-
-	public IStatus runInUIThread(IProgressMonitor monitor) {  
-
-		if(!placeHolder.isDisposed()) {
-			viewer.refresh(placeHolder, true);			
-			schedule(DELAY);		
-		}
-		return Status.OK_STATUS;
-		
-	}
- 
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonConflictingRule.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonConflictingRule.java
deleted file mode 100644
index fe72e53fe..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonConflictingRule.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.navigator.internal;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-public class NonConflictingRule implements ISchedulingRule {
-	
-	public static final NonConflictingRule INSTANCE = new NonConflictingRule();
-
-	public boolean contains(ISchedulingRule rule) { 
-		return rule == this;
-	}
-
-	public boolean isConflicting(ISchedulingRule rule) { 
-		return rule == this;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java
deleted file mode 100644
index 221299c0c..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java
+++ /dev/null
@@ -1,141 +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 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.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class NonFlexibleEMFModelManager extends EMFModelManager implements EditModelListener{
-
-	private EditModel editModel;
-	private Object rootObject;
-	private static final Object[] EMPTY_OBJECT = new Object[0];
-	/**
-	 * @param aProject
-	 * @param provider
-	 */
-	public NonFlexibleEMFModelManager(IProject aProject, EMFRootObjectProvider provider) {
-		super(aProject, provider);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#getModels()
-	 */
-	public Object[] getModels() {
-		// TODO Auto-generated method stub
-		if (getProject() == null || !getProject().isAccessible())
-			return EMPTY_OBJECT;
-		
-		//synchronized (rootObject) {
-			if (rootObject == null || ((EObject) rootObject).eResource() == null) {
-				EditModel editModel = getEditModel();
-				if (editModel != null) {
-					rootObject = editModel.getPrimaryRootObject();
-				}
-			}
-		//}
-		if (rootObject==null) 
-			return EMPTY_OBJECT;
-		else {
-			Object[] objects = new Object[1];
-			objects[0] = rootObject;
-			return objects;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#dispose()
-	 */
-	public void dispose() {
-		if (editModel != null) {
-			editModel.removeListener(this);
-			editModel.releaseAccess(this);
-			editModel = null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-	 */
-	public void editModelChanged(EditModelEvent anEvent) {
-		IProject affectedProject = anEvent.getEditModel().getProject();
-		switch (anEvent.getEventCode()) {
-			case EditModelEvent.UNLOADED_RESOURCE :
-			case EditModelEvent.REMOVED_RESOURCE : 
-				if (rootObject != null){
-					notifyListeners(affectedProject);
-			     }
-				break;
-			case EditModelEvent.SAVE : {
-				if (rootObject == null)
-					notifyListeners(affectedProject);
-				}
-				break;
-			case EditModelEvent.PRE_DISPOSE :
-					dispose();
-				break;
-			default :
-				break;
-		}
-		
-	}
-	
-	
-
-	protected EditModel getEditModel() {
-		IProject project = getProject();
-		if (project == null)
-			return null;
-		
-		//TODO fix up
-		//synchronized (editModel) {
-//			if (editModel == null && project.isAccessible()) {
-//				//System.out.println("getEditModelForProject " + project.getName());
-//				J2EENature nature = J2EENature.getRegisteredRuntime(project);
-//				if (nature != null) {
-//					editModel = nature.getJ2EEEditModelForRead(this);
-//					if (editModel != null) {
-//						editModel.addListener(this);
-//					}
-//				}
-//			}
-		//}
-		return editModel;
-	}
-	
-	protected void disposeCache(IProject affectedProject) {
-		//synchronized (editModel) {
-			if (editModel != null) {
-				editModel.removeListener(this);
-				editModel.releaseAccess(this);
-				editModel = null;
-			}
-		//}
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java
deleted file mode 100644
index a32ffefad..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.resources.ResourceDropAdapterAssistant;
-
-/**
- * @author mdelder
- *  
- */
-public class AddExternalUtilityJarDropAction extends ResourceDropAdapterAssistant {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.workbench.navigator.dnd.ResourceDropAction#validateDrop(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter,
-	 *      java.lang.Object, int, org.eclipse.swt.dnd.TransferData)
-	 */
-	public boolean validateDrop(CommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) {
-		//TODO redo with components
-//		if (FileTransfer.getInstance().isSupportedType(transferType)) {
-//			IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
-//			try {
-//				if (project.hasNature(IEARNatureConstants.NATURE_ID)) {
-//					String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType);
-//					if (sourceNames == null)
-//						return true;
-//
-//					boolean result = true;
-//					for (int i = 0; i < sourceNames.length; i++)
-//						if (!(result = sourceNames[0].endsWith(".jar")))break; //$NON-NLS-1$
-//					return result;
-//				}
-//				return false;
-//			} catch (CoreException e) {
-//				return false;
-//			}
-//		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEARDropAssistant.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEARDropAssistant.java
deleted file mode 100644
index 6cbf09ae2..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEARDropAssistant.java
+++ /dev/null
@@ -1,283 +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.navigator.internal.dnd;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.facet.EARFacetUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
-import org.eclipse.ui.part.PluginTransfer;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class AddProjectToEARDropAssistant extends CommonDropAdapterAssistant {
-
-	private static final Class IPROJECT_CLASS = IProject.class;
-
-	public AddProjectToEARDropAssistant() {
-		super();
-	}
-	
-	public boolean isSupportedType(TransferData aTransferType) {	
-		return LocalSelectionTransfer.getTransfer().isSupportedType(aTransferType);
-	}
-
-	public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, final Object aTarget) {
-
-		if (LocalSelectionTransfer.getTransfer().isSupportedType(aDropAdapter.getCurrentTransfer())) {
-
-			final IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
-			IProgressService service = PlatformUI.getWorkbench().getProgressService();
-			
-			IProject earProject = getProject(aTarget);
-			IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
-
-			Job addProjectToEarJob = new Job(getJobTitle(earComponent)) {
-				protected IStatus run(IProgressMonitor monitor) {
-
-					IStatus status = null;
-					try {
-						IProject earProject = getProject(aTarget);
-
-						List projects = new ArrayList();
-						 
-						for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
-							Object sourceObject = selectionIterator.next();
-
-							IProject projectToAdd = getProject(sourceObject);
-							if (projectToAdd != null) 
-								projects.add(projectToAdd); 
-						}
-
-						IDataModel dataModel = getAddModuleDataModel(earProject, projects);
-						IUndoableOperation dropOperation = dataModel.getDefaultOperation();
-						status = dropOperation.execute(monitor, null);
-
-						if (!status.isOK())
-							return status;
-					} catch (ExecutionException e) {
-						String msg = e.getMessage() != null ? e.getMessage() : e.toString();
-						status = J2EENavigatorPlugin.createErrorStatus(0, msg, e);
-					}
-					return status;
-				}
-			};
-			service.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), addProjectToEarJob);
-			addProjectToEarJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
-			addProjectToEarJob.schedule();
-		}
-		return Status.OK_STATUS;
-	}
-
-	public IStatus validateDrop(Object target, int operation, TransferData transferType) {
-
-		if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType) || PluginTransfer.getInstance().isSupportedType(transferType)) {
-			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
-			if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-				
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				IProject earProject = getProject(target);
-				int earVersion = getEarVersion(earProject);
-				IStatus status = null;
-				for(Iterator iterator = structuredSelection.iterator(); iterator.hasNext();) {
-					Object next = iterator.next();
-					IProject projectToAdd = getProject(next);
-					if( (status = validateProjectMayBeAdded(earProject, projectToAdd, earVersion)).isOK()) 
-						return status;
-				}
-			}
-			
-		}
-		return Status.CANCEL_STATUS;
-	}
-
-	/**
-	 * @param target
-	 */
-	private IStatus validateProjectMayBeAdded(IProject earProject, IProject projectToAdd, int earVersion) {
-		
-		if(earProject == null || projectToAdd == null || earVersion < 0)
-			return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_, null);
-		else if (!earProject.isAccessible()) {
-			return J2EENavigatorPlugin.createErrorStatus(0, NLS.bind(Messages.AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_, earProject.getName()), null);
-		} else if (!projectToAdd.isAccessible()) {
-			return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_, null);
-		}
-
-		IStatus isValid = validateProjectToAdd(projectToAdd, earVersion);
-		if (!isValid.isOK()) {
-			return isValid;
-		}
-		// TODO Check if the project is already attached to the *.ear
-		// if (editModel.hasMappingToProject(projectToAdd)) {
-		// return false;
-		// } 
-		return Status.OK_STATUS;
-	}	
-	
-	/**
-	 * 
-	 * @return -1 on error 
-	 */
-	protected final int getEarVersion(IProject earProject) {
-		int earVersion = -1;
-		EARArtifactEdit earArtifactEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-		try {
-			if(earArtifactEdit != null)
-				earVersion = earArtifactEdit.getJ2EEVersion();
-			else {
-				J2EENavigatorPlugin.logError(0, "Could not acquire model elements for project \""+earProject.getName()+"\".", null); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		} finally {
-			if (earArtifactEdit != null) {
-				earArtifactEdit.dispose();
-			}
-		}
-		return earVersion;
-	}
-
-	/**
-	 * @param facetedProject
-	 * @return
-	 */
-	protected final boolean hasEarFacet(IProject project) {
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(project);
-		} catch (CoreException e1) { 
-		}
-		return facetedProject != null && facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET);
-	}
-
-	protected final String calculateValidProjectName(final String originalName) { 
-
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		String validName = originalName;
-		int count = 1;
-		while (root.getProject(validName).exists()) {
-			validName = originalName + count++;
-		}
-		return validName;					
-	}
-	
-	protected IDataModel getAddModuleDataModel(IProject earProject, List projects) {
-		IDataModel datamodel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-		
-		IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
-		Map componentToURIMap = new HashMap();
-		List components = new ArrayList();
-		IVirtualComponent moduleComponent = null;
-		for(Iterator itr = projects.iterator(); itr.hasNext(); ) {
-			moduleComponent = ComponentCore.createComponent((IProject)itr.next()); 
-			components.add(moduleComponent);
-			componentToURIMap.put(moduleComponent, getDefaultURI(moduleComponent)); 
-		}		
-		datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
-		datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);		
-		datamodel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
-		return datamodel;
-	}
-
-	protected String getJobTitle(IVirtualComponent earComponent) { 
-		return NLS.bind(Messages.AddModuleToEarDropAssistant_Adding_module_to_ea_, earComponent.getName());
-	}  
-	
-	protected IStatus validateProjectToAdd(IProject projectToAdd, int earVersion) {
-		IStatus status = null;
-		try {
-			IFacetedProject facetedProject = ProjectFacetsManager.create(projectToAdd);  
-			if( facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET) ) 
-				status = Status.CANCEL_STATUS;
-			else 
-				status = Status.OK_STATUS;
-		} catch (CoreException e) {
-			String msg = e.getMessage() != null ? e.getMessage() : e.toString();
-			status = J2EENavigatorPlugin.createErrorStatus(0, msg, e);
-		}
-		return status;
-		 
-	}
-
-	protected static IProject getProject(Object element) {
-		if (element == null)
-			return null;
-		IProject project = null;
-		if (element instanceof IAdaptable)
-			project = (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
-		else
-			project = (IProject) Platform.getAdapterManager().getAdapter(element, IPROJECT_CLASS);
-		if (project == null) {
-			if(element instanceof EObject) {
-				project = ProjectUtilities.getProject((EObject) element);
-			} else if (element instanceof J2EEItemProvider) {
-				IFile associatedFile = ((J2EEItemProvider)element).getAssociatedFile();
-				if(associatedFile != null)
-					project = associatedFile.getProject();				
-			}
-		}
-		return project;
-	}
-
-	protected static String getDefaultURI(IVirtualComponent component) {
-		IProject project = component.getProject();
-		String name = component.getName();
-
-		if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-			name += IModuleExtensions.DOT_WAR;
-		} else if (J2EEProjectUtilities.isEARProject(project)) {
-			name += IModuleExtensions.DOT_EAR;
-		} else if (J2EEProjectUtilities.isJCAProject(project)) {
-			name += IModuleExtensions.DOT_RAR;
-		} else {
-			name += IModuleExtensions.DOT_JAR;
-		}
-		return name;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/IModuleExtensions.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/IModuleExtensions.java
deleted file mode 100644
index 7d540db60..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/IModuleExtensions.java
+++ /dev/null
@@ -1,19 +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.navigator.internal.dnd;
-
-public interface IModuleExtensions {
-
-	String DOT_WAR = ".war"; //$NON-NLS-1$
-	String DOT_JAR =".jar"; //$NON-NLS-1$ 
-	String DOT_RAR = ".rar"; //$NON-NLS-1$
-	String DOT_EAR = ".ear"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ImportJ2EEModuleDropAssistant.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ImportJ2EEModuleDropAssistant.java
deleted file mode 100644
index ea85dc057..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ImportJ2EEModuleDropAssistant.java
+++ /dev/null
@@ -1,183 +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.navigator.internal.dnd;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.facet.EARFacetUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class ImportJ2EEModuleDropAssistant extends AddProjectToEARDropAssistant {
-	
-	public boolean isSupportedType(TransferData aTransferType) { 
-		return FileTransfer.getInstance().isSupportedType(aTransferType);
-	}
-
-	public IStatus handleDrop(CommonDropAdapter aDropAdapter, final DropTargetEvent aDropTargetEvent, final Object aTarget) {		
-		if(FileTransfer.getInstance().isSupportedType(aDropAdapter.getCurrentTransfer())) {
-			
-			IProgressService service = PlatformUI.getWorkbench().getProgressService();	 
-			Job importArtifactsJob = new Job(Messages.ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts) {
-				protected IStatus run(IProgressMonitor monitor) {					
-					
-					IProject targetEARProject = getProject(aTarget);
-					if(targetEARProject != null) { 
-						/* If this isn't an ear project, we can't add the newly created modules to it. */
-						if(!hasEarFacet(targetEARProject))
-							targetEARProject = null;
-					} /* otherwise we assume the IWorkspaceRoot and just don't add the new modules an an existing ear */
-
-					String[] names = (String[]) aDropTargetEvent.data;
-					
-					monitor.beginTask(Messages.ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts, names.length);
-					final MultiStatus status = new MultiStatus(J2EENavigatorPlugin.PLUGIN_ID, 0, Messages.ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts, null);
-					
-					SubProgressMonitor submonitor = new SubProgressMonitor(monitor, 10);
-					IDataModel importDataModel = null;
-					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-					List createdComponents = new ArrayList();
-					for(int i=0; i<names.length && !monitor.isCanceled(); i++) {
-						try {
-							int separatorIndex = names[i].lastIndexOf(File.separatorChar);
-							int dotIndex = names[i].lastIndexOf('.');
-							if(separatorIndex > 0 && separatorIndex+1 < dotIndex) {
-								String filename = names[i].substring(separatorIndex+1, dotIndex);
-								if(root.getProject(filename).exists()) {
-									filename = calculateValidProjectName(filename);
-								}
-								String extension = names[i].substring(dotIndex);
-								if(IModuleExtensions.DOT_WAR.equals(extension)) {
-									importDataModel = DataModelFactory.createDataModel(new WebComponentImportDataModelProvider());
-								} else if(IModuleExtensions.DOT_RAR.equals(extension)) {
-									importDataModel = DataModelFactory.createDataModel(new ConnectorComponentImportDataModelProvider());
-								} else if(IModuleExtensions.DOT_EAR.equals(extension)) {
-									importDataModel = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
-								} else if(IModuleExtensions.DOT_JAR.equals(extension)) {  									
-									Archive archive = null;
-									try {
-										archive = CommonarchiveFactory.eINSTANCE.openArchive(names[i]);
-										if(archive.isApplicationClientFile())
-											importDataModel = DataModelFactory.createDataModel(new AppClientComponentImportDataModelProvider());
-										else if(archive.isEJBJarFile())
-											importDataModel = DataModelFactory.createDataModel(new EJBComponentImportDataModelProvider());
-										else 
-											importDataModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider());										
-									} finally {
-										if(archive != null)
-											archive.close();
-									}
-								} 
-								
-								if(importDataModel != null) {
-									importDataModel.setStringProperty(IJ2EEComponentImportDataModelProperties.FILE_NAME, names[i]);
-									importDataModel.setStringProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME, filename);
-									importDataModel.getDefaultOperation().execute(submonitor, null);
-									
-									createdComponents.add((IVirtualComponent) importDataModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT));
-									
-								} else {
-									status.add(J2EENavigatorPlugin.createErrorStatus(0, NLS.bind(Messages.ImportJ2EEModuleDropAssistant_Could_not_recognize_extension_0_, extension), null));
-								}
-								
-							} 
-						} catch (Throwable e) {
-							String msg = e.getMessage() != null ? e.getMessage() : e.toString();
-							status.add(J2EENavigatorPlugin.createErrorStatus(0, msg, e));
-						} 						
-					}
-					if(targetEARProject != null) {
-						List createdModuleProjects = new ArrayList();
-						for(int i=0; i<createdComponents.size(); i++) {
-							IVirtualComponent component = (IVirtualComponent) createdComponents.get(i);							
-							/* If this isn't an ear project, we can't add the newly created modules to it. */
-							if(!hasEarFacet(component.getProject())) {
-								createdModuleProjects.add(component.getProject());
-							}
-						}
-						IDataModel dataModel = getAddModuleDataModel(targetEARProject, createdModuleProjects);
-						IUndoableOperation dropOperation = dataModel.getDefaultOperation();
-						IStatus addProjectsStatus = null;
-						try {
-							addProjectsStatus = dropOperation.execute(monitor, null);
-							if(addProjectsStatus != null)
-								status.add(addProjectsStatus);
-						} catch (ExecutionException e) { 
-							String msg = e.getMessage() != null ? e.getMessage() : e.toString();
-							status.add(J2EENavigatorPlugin.createErrorStatus(0, msg, null));
-						}
-						
-					}
-					return status;
-				}
-
-			};
-			service.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), importArtifactsJob);
-			importArtifactsJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
-			importArtifactsJob.schedule();
-			
-			
-			return Status.OK_STATUS;
-		}
-		return Status.CANCEL_STATUS;
-	}
-	
-	
-
-	public IStatus validateDrop(Object target, int operation, TransferData transferType) {
-		IStatus status = Status.CANCEL_STATUS;
-		if(FileTransfer.getInstance().isSupportedType(transferType)) {
-			IProject project = null;
-			if(target instanceof IWorkspaceRoot)		
-				status = Status.OK_STATUS;
-			else if( (project = getProject(target)) != null && hasEarFacet(project))
-				status = Status.OK_STATUS;
-		}
-		return status;
-	}
-
- 
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java
deleted file mode 100644
index 6ba709389..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java
+++ /dev/null
@@ -1,247 +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 6, 2004
- * 
- */
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.ImportUtil;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.part.IDropActionDelegate;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * @author jsholl
- *  
- */
-public class J2EEImportDropAction implements IDropActionDelegate {
-	private ArchiveOptions readOnlyArchiveOptions;
-
-	public J2EEImportDropAction() {
-		readOnlyArchiveOptions = new ArchiveOptions();
-		readOnlyArchiveOptions.setIsReadOnly(true);
-	}
-
-	private boolean fileExistsOnDisk(String fileName) {
-		if (fileName != null && fileName.length() > 0) {
-			java.io.File file = new java.io.File(fileName);
-			return file.exists() && !file.isDirectory();
-		}
-		return false;
-	}
-
-	public boolean validateDrop(CommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) {
-		if (FileTransfer.getInstance().isSupportedType(transferType)) {
-			String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType);
-			if (sourceNames == null || sourceNames.length != 1) { //only handle one file for now
-				return false;
-			}
-			String fileName = sourceNames[0];
-			if (!(fileName.endsWith(".ear") || fileName.endsWith(".jar") || fileName.endsWith(".war") || fileName.endsWith(".rar"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				return false;
-			}
-			if (!fileExistsOnDisk(fileName)) {
-				return false;
-			}
-			int archiveType = ImportUtil.UNKNOWN;
-			Archive archive = null;
-			try {
-//				archive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
-//				archiveType = ImportUtil.getArchiveType(archive);
-//				String[] possibleNatures = null;
-//				switch (archiveType) {
-//					case ImportUtil.EARFILE :
-//						possibleNatures = new String[]{IEARNatureConstants.NATURE_ID};
-//						break;
-//					case ImportUtil.EJBJARFILE :
-//						possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IEJBNatureConstants.NATURE_ID};
-//						break;
-//					case ImportUtil.CLIENTJARFILE :
-//						possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IApplicationClientNatureConstants.NATURE_ID};
-//						break;
-//					case ImportUtil.WARFILE :
-//						possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IWebNatureConstants.J2EE_NATURE_ID};
-//						break;
-//					case ImportUtil.RARFILE :
-//						possibleNatures = new String[]{IEARNatureConstants.NATURE_ID, IConnectorNatureConstants.NATURE_ID};
-//						break;
-//					default :
-//						return false;
-//				}
-//
-//				IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
-				//TODO fix up to use components and artifact edits
-//				if (null != project) {
-//					try {
-//						boolean foundNature = false;
-//						for (int i = 0; !foundNature && i < possibleNatures.length; i++) {
-//							if (project.hasNature(possibleNatures[i])) {
-//								foundNature = true;
-//								J2EENature nature = (J2EENature) project.getNature(possibleNatures[i]);
-//								int projectJ2EEVersion = nature.getJ2EEVersion();
-//								int archiveModuleVersion = ArchiveUtil.getFastSpecVersion((ModuleFile) archive);
-//								boolean fail = false;
-//								switch (archiveType) {
-//									case ImportUtil.EARFILE :
-//									case ImportUtil.CLIENTJARFILE :
-//										if (projectJ2EEVersion < archiveModuleVersion) {
-//											fail = true;
-//										}
-//										break;
-//									case ImportUtil.EJBJARFILE :
-//										if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_2_ID && archiveModuleVersion > J2EEVersionConstants.EJB_1_1_ID) {
-//											fail = true;
-//										} else if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_3_ID && archiveModuleVersion > J2EEVersionConstants.EJB_2_0_ID) {
-//											fail = true;
-//										}
-//										break;
-//									case ImportUtil.WARFILE :
-//										if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_2_ID && archiveModuleVersion > J2EEVersionConstants.WEB_2_2_ID) {
-//											fail = true;
-//										} else if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_3_ID && archiveModuleVersion > J2EEVersionConstants.WEB_2_3_ID) {
-//											fail = true;
-//										}
-//										break;
-//									case ImportUtil.RARFILE :
-//										if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_2_ID) {
-//											fail = true;
-//										} else if (projectJ2EEVersion == J2EEVersionConstants.J2EE_1_3_ID && archiveModuleVersion > J2EEVersionConstants.JCA_1_0_ID) {
-//											fail = true;
-//										}
-//										break;
-//								}
-//								if (fail) {
-//									return false;
-//								}
-//								return true;
-//							}
-//						}
-//						if (!foundNature) {
-//							return false;
-//						}
-//					} catch (CoreException e) {
-//						return false;
-//					}
-//				}
-
-			} catch (Exception e) {
-				return false;
-			} finally {
-				if (null != archive && archive.isOpen()) {
-					archive.close();
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.NavigatorDropActionDelegate#run(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public boolean run(Object source, Object target) {
-		//TODO fix up drag and drop transfer
-		TransferData currentTransfer = null; //dropAdapter.getCurrentTransfer();
-		if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
-			final String[] fileNames = (String[]) source;
-			final String fileName = fileNames[0];
-			DataModelWizard wizard = null;
-			IDataModel dataModel = null;
-
-			int archiveType = ImportUtil.UNKNOWN;
-			Archive archive = null;
-			try {
-				archive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
-				archiveType = ImportUtil.getArchiveType(archive);
-				switch (archiveType) {
-					case ImportUtil.EARFILE :
-						dataModel = null;//new EnterpriseApplicationImportDataModel();
-						break;
-					case ImportUtil.EJBJARFILE :
-						dataModel = null;//new EJBModuleImportDataModel();
-						break;
-					case ImportUtil.CLIENTJARFILE :
-						dataModel = null;//new AppClientModuleImportDataModel();
-						break;
-					case ImportUtil.WARFILE :
-						dataModel = null;//new WebModuleImportDataModel();
-						break;
-					case ImportUtil.RARFILE :
-						dataModel = null;//new ConnectorModuleImportDataModel();
-						break;
-					default :
-						return false;
-				}
-			} catch (OpenFailureException e) {
-				return false;
-			} finally {
-				if (null != archive && archive.isOpen()) {
-					archive.close();
-				}
-			}
-
-			dataModel.setProperty(IJ2EEModuleImportDataModelProperties.FILE_NAME, fileName);
-
-			IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
-			if (null != project) {
-				try {
-					if (archiveType == ImportUtil.EARFILE ) {
-						dataModel.setProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME, project.getName());
-					} else {
-						dataModel.setProperty(IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME, project.getName());
-						dataModel.setBooleanProperty(IJ2EEModuleImportDataModelProperties.ADD_TO_EAR, true);
-					}
-				} catch (Exception e) {
-					return false;
-				}
-			}
-			switch (archiveType) {
-				case ImportUtil.EARFILE :
-					wizard = null;//new EnterpriseApplicationImportWizard((EnterpriseApplicationImportDataModel) dataModel);
-					break;
-				case ImportUtil.EJBJARFILE :
-					wizard = null;//new EJBModuleImportWizard((EJBModuleImportDataModel) dataModel);
-					break;
-				case ImportUtil.CLIENTJARFILE :
-					wizard = null;//new AppClientModuleImportWizard((AppClientModuleImportDataModel) dataModel);
-					break;
-				case ImportUtil.WARFILE :
-					wizard = null;//new WebModuleImportWizard((WebModuleImportDataModel) dataModel);
-					break;
-				case ImportUtil.RARFILE :
-					wizard = null;//new ConnectorModuleImportWizard((ConnectorModuleImportDataModel) dataModel);
-					break;
-			}
-
-			if (null != wizard) {
-				//TODO fix up wizard for drag and drop
-//				WizardDialog dialog = new WizardDialog(getShell(), wizard);
-//				dialog.open();
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java
deleted file mode 100644
index f8c26c90b..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.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.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class ModuleIdentifierSerializer {
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.ISerializer#toByteArray(java.lang.Object)
-	 */
-	public byte[] toByteArray(Object data) {
-		IProject project = (IProject) AdaptabilityUtility.getAdapter(data, IProject.class);
-		if (project != null)
-			return project.getName().getBytes();
-		return null;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.ISerializer#fromByteArray(byte[])
-	 */
-	public Object fromByteArray(byte[] data) {
-		String name = new String(data);
-		return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java
deleted file mode 100644
index 3bd4110bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java
+++ /dev/null
@@ -1,171 +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.navigator.internal.plugin;
-
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class J2EENavigatorPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static J2EENavigatorPlugin plugin;
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.navigator.ui"; //$NON-NLS-1$
-	private static final String ICONS = "icons/"; //$NON-NLS-1$
-	
-	private ImageRegistry images;
-
-
-	/**
-	 * The constructor.
-	 */
-	public J2EENavigatorPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static J2EENavigatorPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		images = new ImageRegistry(Display.getDefault());
-	}
-	
-	public ImageDescriptor getImageDescriptor(String relativePath) {
-		ImageDescriptor descriptor = images.getDescriptor(relativePath);
-		if(descriptor == null) {
-			synchronized (this) {
-				descriptor = images.getDescriptor(relativePath);
-				if(descriptor == null) {
-					URL imageUrl = FileLocator.find(getBundle(), new Path(ICONS+relativePath), Collections.EMPTY_MAP);
-					descriptor = ImageDescriptor.createFromURL(imageUrl);
-				} 
-			}
-		}
-		return descriptor; 
-	}
-	
-	
-	public Image getImage(ImageDescriptor descriptor) { 
-
-		Image image = images.get(descriptor.toString());		
-		if(image == null) {
-			synchronized (this) {
-				image = images.get(descriptor.toString());
-				if(image == null) { 
-					images.put(descriptor.toString(), (image = descriptor.createImage(true)));
-				} 
-			}
-		}
-		return image; 
-	}
-	
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		images.dispose();
-	}
-	
-
-	/**
-	 * Record an error against this plugin's log. 
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param anException
-	 */
-	public static void logError(int aCode, String aMessage,
-			Throwable anException) {
-		getDefault().getLog().log(
-				createErrorStatus(aCode, aMessage, anException));
-	}
-
-	/**
-	 * 
-	 * Record a message against this plugin's log. 
-	 * 
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 */
-	public static void log(int severity, int aCode, String aMessage,
-			Throwable exception) {
-		log(createStatus(severity, aCode, aMessage, exception));
-	}
-
-	/**
-	 * 
-	 * Record a status against this plugin's log. 
-	 * 
-	 * @param aStatus
-	 */
-	public static void log(IStatus aStatus) {
-		getDefault().getLog().log(aStatus);
-	}
-
-	/**
-	 * Create a status associated with this plugin.
-	 *  
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createStatus(int severity, int aCode,
-			String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode,
-				aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createErrorStatus(int aCode, String aMessage,
-			Throwable exception) {
-		return createStatus(IStatus.ERROR, aCode, aMessage, exception);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties
deleted file mode 100644
index c00dcc899..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties
+++ /dev/null
@@ -1,40 +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
-###############################################################################
-Plugin.name=J2EE Extensions to Common Navigator
-Plugin.providerName=Eclipse.org
-Plugin.description=Contains J2EE Extensions built on the Common Navigator Framework
-j2ee=J2EE
-j2ee.view_ui_=Project Explorer 
-j2ee.category_ui_=J2EE
-Enterprise_Applications=Enterprise Applications
-Application_Client_Projects=Application Client Projects
-Connector_Projects=Connector Projects
-EJB_Projects=EJB Projects
-Web_Projects=Dynamic Web Projects
-Other_Projects=Other Projects
-J2EE_Add_Module=J2EE Add Module
-Adds_J2EE_modules_to_EAR_projects=Adds J2EE modules to EAR projects
-J2EE_Add_Utility_Jar=J2EE Add Utility Jar
-Adds_Utility_Jars_to_EAR_projects=Adds Utility Jars to EAR projects
-J2EE_Utility_Jar_Import=J2EE Utility Jar Import
-Import_a_jar_file_UI_=Import a jar file into an EAR project as a J2EE Utility Jar
-J2EE_Import=J2EE Import
-J2EE_IMPORT_MESSAGE=Imports J2EE artifacts: EARs, EJB Jars, Application Client Jars, RARs and WARs
-j2eeProjectDecorator=J2EE Project Decorator
-j2eeProjectDecorator.description=Adds a version decorator to J2EE projects.
-extension.j2ee.name=J2EE Deployment Descriptors
-extension.application.name=J2EE Application Deployment Descriptors
-extension.appclient.name=J2EE Application Client Deployment Descriptors
-extension.connector.name=J2EE Connector Deployment Descriptors
-extension.ejb.name=J2EE EJB Deployment Descriptors
-extension.web.name=J2EE Web Deployment Descriptors
-filter.jetemitters.name=.JETEmitters
-filter.jetemitters.description=Hide .JETEmitters project
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
deleted file mode 100644
index 1a6ec26f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
+++ /dev/null
@@ -1,1037 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-   		 point="org.eclipse.ui.navigator.viewer">
-      <viewerContentBinding
-         viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-         <includes>
-           <contentExtension pattern="org.eclipse.jst.navigator.j2ee.ui.*"/>
-           <contentExtension pattern="org.eclipse.jst.j2ee.navigator.ui.filters.*"/>
-         </includes>
-      </viewerContentBinding>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.navigator.navigatorContent">
-	<navigatorContent name="%extension.application.name"
-		priority="highest" icon="icons/eargroup_obj.gif"
-		activeByDefault="true"
-		contentProvider="org.eclipse.jst.j2ee.navigator.internal.EARContentProvider"
-		labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
-		id="org.eclipse.jst.navigator.j2ee.ui.EARDDContent">
-		<triggerPoints>
-			<or>
-				<instanceof value="java.io.File" />
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="common.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="application.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="modulemap.xmi" />
-					</or>
-				</and>
-				<and>
-					<adapt type="org.eclipse.core.resources.IProject">
-						<or>
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.project.facet.core.projectFacet"
-								value="jst.ear" />
-						</or>
-					</adapt>
-				</and>
-			</or>
-		</triggerPoints>
-		<!--  The possibleChildren is more verbose to allow the drop handlers to be invoked for 
-			children not provided by this extension
-		-->
-		<possibleChildren>
-			<or>
-				<instanceof value="java.io.File" />
-				<adapt type="org.eclipse.core.resources.IProject">
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.web" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ejb" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.utility" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ear" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.appclient" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.connector" />
-					</or>
-				</adapt>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="common.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="application.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="client.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="modulemap.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="ejb.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="jca.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="webapplication.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="jsp.xmi" />
-					</or>
-				</and>
-			</or>
-		</possibleChildren>
-		<commonSorter
-		    id="org.eclipse.jst.j2ee.navigator.internal.ApplicationViewerSorter"
-			class="org.eclipse.jst.j2ee.navigator.internal.ApplicationViewerSorter" />
-		<!--  Handle open requests -->
-		<actionProvider
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.ui.EARActionProvider">
-			<enablement>
-				<or>
-					<and>
-						<instanceof
-							value="org.eclipse.emf.ecore.EObject" />
-						<or>
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-								value="common.xmi" />
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-								value="application.xmi" />
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-								value="modulemap.xmi" />
-						</or>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" />
-				</or>
-			</enablement>
-		</actionProvider>
-		<dropAssistant
-			class="org.eclipse.jst.j2ee.navigator.internal.dnd.AddProjectToEARDropAssistant"
-			id="org.eclipse.jst.j2ee.navigator.ui.AddModulesToEAR">
-			<possibleDropTargets>
-				<or>
-					<adapt type="org.eclipse.core.resources.IProject">
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ear" />
-					</adapt>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-				</or>
-			</possibleDropTargets>
-		</dropAssistant>
-		<dropAssistant
-			class="org.eclipse.jst.j2ee.navigator.internal.dnd.ImportJ2EEModuleDropAssistant"
-			id="org.eclipse.jst.j2ee.navigator.ui.ImportJ2EEModule">
-			<possibleDropTargets>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<adapt type="org.eclipse.core.resources.IProject">
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ear" />
-					</adapt>
-				</or>
-			</possibleDropTargets>
-		</dropAssistant>
-
-		<!-- EAR New -->
-		<commonWizard
-        menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
-        type="new"
-        wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ejb" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.connector" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.utility" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- EAR Import -->
-		<commonWizard type="import"
-			wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- Utility Jar Import -->
-		<commonWizard type="import"
-			wizardId="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Module" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-
-		<!-- EAR export -->
-		<commonWizard type="export"
-			wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-				</or>
-			</enablement>
-		</commonWizard>
-	</navigatorContent>
-	
-	<navigatorContent name="%extension.appclient.name" priority="highest"
-		icon="icons/appclientgroup_obj.gif" activeByDefault="true"
-		contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
-		labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
-		id="org.eclipse.jst.navigator.j2ee.ui.AppClientContent">
-		<triggerPoints>
-			<or>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="client.xmi" />
-					</or>
-				</and>
-				<adapt type="org.eclipse.core.resources.IProject">
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.project.facet.core.projectFacet"
-						value="jst.appclient" />
-				</adapt>
-			</or>
-		</triggerPoints>
-		<possibleChildren>
-			<and>
-				<instanceof value="org.eclipse.emf.ecore.EObject" />
-				<or>
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-						value="client.xmi" />
-				</or>
-			</and>
-		</possibleChildren>
-		<commonSorter
-		    id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
-		<!--  Handle open requests -->
-		<actionProvider
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.ui.AppClientActionProvider">
-			<enablement>
-				<or>
-					<and>
-						<instanceof
-							value="org.eclipse.emf.ecore.EObject" />
-						<or>
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-								value="client.xmi" />
-						</or>
-					</and>
-				</or>
-			</enablement>
-		</actionProvider>
-		
-		<!-- AppClient New -->
-		<commonWizard
-        menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
-        type="new"
-        wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.appclient" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- App Client Import -->
-		<commonWizard type="import"
-			wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- App Client export -->
-		<commonWizard type="export"
-			wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.appclient" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.client.ApplicationClient" />
-				</or>
-			</enablement>
-		</commonWizard>
-	</navigatorContent>
-		
-	<navigatorContent name="%extension.web.name" priority="highest"
-		icon="icons/webgroup_obj.gif" activeByDefault="true"
-		contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
-		labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
-		id="org.eclipse.jst.navigator.j2ee.ui.WebDDContent">
-		<triggerPoints>
-			<or>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="webapplication.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="jsp.xmi" />
-					</or>
-				</and>
-				<adapt type="org.eclipse.core.resources.IProject">
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.project.facet.core.projectFacet"
-						value="jst.web" />
-				</adapt>
-			</or>
-		</triggerPoints>
-		<possibleChildren>
-		  <or>
-			<and>
-				<instanceof value="org.eclipse.emf.ecore.EObject"/>
-				<or>
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-						value="webapplication.xmi" />
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-						value="jsp.xmi" />
-				</or>
-			</and>
-		  </or>
-		</possibleChildren>
-		<commonSorter
-		    id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
-		<!--  Handle open requests -->
-		<actionProvider
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.ui.WebActionProvider">
-			<enablement>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="webapplication.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="jsp.xmi" />
-					</or>
-				</and>
-			</enablement>
-		</actionProvider>
-		<actionProvider
-			class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.internal.WebNewActionProvider">
-			<enablement>
-				<instanceof value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"/>
-			</enablement>
-		</actionProvider>
-
-		<!-- Web New -->
-		<commonWizard
-        menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
-        type="new"
-        wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-
-		<!-- Web Import -->
-		<commonWizard type="import"
-			wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- Web Export -->
-		<commonWizard type="export"
-			wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.webapplication.WebApp" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider" />
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- New Servlet -->
-		<commonWizard
-        menuGroupId="org.eclipse.wst.web.ui"
-        type="new"
-        wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.web" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.webapplication.WebApp" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider" />
-				</or>
-			</enablement>
-		</commonWizard>
-
-		<!-- The contribution of the New *.jsp wizard to Files, Folders, and Projects 
-			is handled in org.eclipse.jst.jsp.ui. This contribution adds the 
-			wizard to the model elements contributed by the J2EE Content Provider -->
-		<commonWizard
-        menuGroupId="org.eclipse.wst.web.ui"
-        type="new"
-        wizardId="org.eclipse.jst.jsp.ui.internal.wizard.NewJSPWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider" />
-
-					<instanceof
-						value="org.eclipse.jst.j2ee.webapplication.WebApp" />
-
-				</or>
-			</enablement>
-		</commonWizard>
-
-		<!-- The contribution of the New *.html wizard to Files, Folders, and Projects 
-			is handled in org.eclipse.jst.html.ui. This contribution adds the 
-			wizard to the model elements contributed by the J2EE Content Provider -->
-		<commonWizard
-        menuGroupId="org.eclipse.wst.web.ui"
-        type="new"
-        wizardId="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.webapplication.WebApp" />
-				</or>
-			</enablement>
-		</commonWizard>
-	</navigatorContent>
-	<navigatorContent name="%extension.ejb.name" priority="highest"
-		icon="icons/ejbgroup_obj.gif" activeByDefault="true"
-		contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
-		labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
-		id="org.eclipse.jst.navigator.j2ee.ui.EJBDDContent">
-		<triggerPoints>
-			<or>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-						value="ejb.xmi" />
-				</and>
-				<and>
-					<adapt type="org.eclipse.core.resources.IProject"> 
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ejb" />
-					</adapt>
-				</and>
-			</or>
-		</triggerPoints>
-		<possibleChildren>
-			<or>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="ejb.xmi" />
-					</or>
-				</and>
-				<instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper"/>
-    <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider"/>
-			</or>
-   <instanceof value="org.eclipse.jst.j2ee.navigator.internal.LoadingDDNode"/>
-		</possibleChildren>
-		<commonSorter
-		    id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
-		<!--  Handle open requests -->
-		<actionProvider
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.ui.EJBActionProvider">
-			<enablement>
-				<or>
-					<and>
-						<instanceof value="org.eclipse.emf.ecore.EObject" />
-						<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-								value="ejb.xmi" />
-					</and>
-					<instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper"/>
-				</or>
-			</enablement>
-		</actionProvider>
-		<!--  By default, anything that can adapt to an IResource gets  New Action Provider (from the Resources extension),
-			so we just need to add one for the EJB Item Providers (the groupings in the tree) 
-		-->
-		<actionProvider
-			class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.internal.EjbNewActionProvider">
-			<enablement>
-				<instanceof
-					value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider" />
-			</enablement>
-		</actionProvider>
-
-		<!-- EJB New -->
-		<commonWizard
-        menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
-        type="new"
-        wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ejb" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- EJB Import -->
-		<commonWizard type="import"
-			wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ejb" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- EJB Export -->
-		<commonWizard type="export"
-			wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ejb" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof value="org.eclipse.jst.j2ee.ejb.EJBJar" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider" />
-				</or>
-			</enablement>
-		</commonWizard>
-
-		<!-- Add Enterprise Bean -->
-		<commonWizard
-        menuGroupId="org.eclipse.jst.ejb.ui"
-        type="new"
-        wizardId="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard">
-			<enablement>
-				<or>
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<test forcePluginActivation="true"
-								property="org.eclipse.wst.common.project.facet.core.projectFacet"
-								value="jst.ejb" />
-						</adapt>
-					</and>
-					<instanceof value="org.eclipse.jst.j2ee.ejb.EJBJar" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider" />
-				</or>
-			</enablement>
-		</commonWizard>
-	</navigatorContent>
-	<navigatorContent name="%extension.connector.name"
-		priority="highest" icon="icons/connectorgroup_obj.gif"
-		activeByDefault="true"
-		contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
-		labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
-		id="org.eclipse.jst.navigator.j2ee.ui.ConnectorDDContent">
-		<triggerPoints>
-			<or>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-						value="jca.xmi" />
-				</and>
-				<adapt type="org.eclipse.core.resources.IProject">
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.project.facet.core.projectFacet"
-						value="jst.connector" />
-				</adapt>
-			</or>
-		</triggerPoints>
-		<possibleChildren>
-			<and>
-				<instanceof value="org.eclipse.emf.ecore.EObject" />
-				<test forcePluginActivation="true"
-					property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-					value="jca.xmi" />
-			</and>
-		</possibleChildren>
-		<commonSorter
-		    id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
-		<!--  Handle open requests -->
-		<actionProvider
-			class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
-			id="org.eclipse.jst.j2ee.navigator.ui.ConnectorActionProvider">
-			<enablement>
-				<and>
-					<instanceof value="org.eclipse.emf.ecore.EObject" />
-					<test forcePluginActivation="true"
-						property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-						value="jca.xmi" />
-				</and>
-			</enablement>
-		</actionProvider>
-
-		<!-- Connector New -->
-		<commonWizard
-        menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
-        type="new"
-        wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.connector" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- Connector import -->
-		<commonWizard type="import"
-			wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.ear" />
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.connector" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.application.Application" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl" />
-					<and>
-					  <instanceof value="java.util.Collection"/>
-					  <count value="0" />
-					</and>
-				</or>
-			</enablement>
-		</commonWizard>
-		<!-- Connector Export -->
-		<commonWizard type="export"
-			wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard">
-			<enablement>
-				<or>
-					<instanceof
-						value="org.eclipse.core.resources.IWorkspaceRoot" />
-					<and>
-						<adapt
-							type="org.eclipse.core.resources.IProject">
-							<or>
-								<test forcePluginActivation="true"
-									property="org.eclipse.wst.common.project.facet.core.projectFacet"
-									value="jst.connector" />
-							</or>
-						</adapt>
-					</and>
-					<instanceof
-						value="org.eclipse.jst.j2ee.jca.Connector" />
-					<instanceof
-						value="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl" />
-				</or>
-			</enablement>
-		</commonWizard>
-	</navigatorContent>
- <commonFilter
-       activeByDefault="true"
-       description="%filter.jetemitters.description"
-       id="org.eclipse.jst.j2ee.navigator.ui.filters.jetemitters"
-       name="%filter.jetemitters.name">
-    <filterExpression>
-       <adapt type="org.eclipse.core.resources.IProject">
-          <test
-                forcePluginActivation="true"
-                property="org.eclipse.core.resources.name"
-                value=".JETEmitters"/>
-       </adapt>
-    </filterExpression>
- </commonFilter>			
- 
-   </extension>
-   
-  <extension 
-  		point="org.eclipse.core.runtime.adapters">
-    <factory
-          adaptableType="org.eclipse.jst.j2ee.common.J2EEEObject"
-          class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory">
-       <adapter type="org.eclipse.core.resources.IFile"/>
-       <adapter type="org.eclipse.core.resources.IResource"/>
-    </factory>
-    <factory
-          adaptableType="org.eclipse.jst.j2ee.common.J2EEEAttribute"
-          class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory">
-       <adapter type="org.eclipse.core.resources.IFile"/>
-       <adapter type="org.eclipse.core.resources.IResource"/>
-    </factory>
-  </extension>
-     
-<!-- ====================================================== -->
-<!--           Label Decorators                             -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            adaptable="true"
-            location="TOP_LEFT"
-            lightweight="true"
-            label="%j2eeProjectDecorator"
-            state="true"
-            class="org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator"
-            id="org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator">
-         <enablement>
-           <or>
-            <objectClass name="org.eclipse.core.resources.IProject"/>
-            <objectClass name="org.eclipse.jdt.core.IJavaProject"/>
-           </or>
-         </enablement>
-         <description>
-            %j2eeProjectDecorator.description
-         </description>
-      </decorator>
-   </extension>
-     
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml
deleted file mode 100644
index f6732071f..000000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.j2ee.ui.navigator"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ui/.classpath
deleted file mode 100644
index ae39a9925..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"/>
-	<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.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0ab424468..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu Jun 08 00:49:36 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
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 0cd513144..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,72 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WTP J2EE UI Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin
-Bundle-Vendor: Eclipse.org
-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.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.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,2.3.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.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.ui.workbench;bundle-version="[3.2.1,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.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,1.1.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.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.xml.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="[1.2.0,1.3.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.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.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,3.5.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)"
-Eclipse-LazyStart: true
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 4ec598958..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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/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/java.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/java.gif
deleted file mode 100644
index 37cb4e72c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/java.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 7b005f8bc..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, 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.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 888c85786..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
+++ /dev/null
@@ -1,687 +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.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Arrays;
-
-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.ResourcesPlugin;
-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.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.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-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.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.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;
-
-/**
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-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 Composite buttonColumn;
-
-	protected List j2eeComponentList = new ArrayList();
-	protected List javaProjectsList = new ArrayList();
-	protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS;
-
-	/**
-	 * Constructor for AddModulestoEARPropertiesControl.
-	 */
-	public AddModulestoEARPropertiesPage(final IProject project, final J2EEDependenciesPage page) { 
-		this.project = project;
-		this.propPage = page;
-		earComponent = ComponentCore.createComponent(project);
-	}
-	
-	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();
-		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();
-		addModulesToEAR(monitor);
-		removeModulesFromEAR(monitor);
-		return true;
-	}
-	
-	public void performDefaults() {
-	}
-	
-	public boolean performCancel() {
-		return true;
-	}
-	
-	public void dispose() {
-	}
-
-	public void setVisible(boolean visible) {
-	}
-	
-	private List newJ2EEModulesToAdd(){
-		List newComps = new ArrayList();
-		if (j2eeComponentList != null && !j2eeComponentList.isEmpty()){
-			for (int i = 0; i < j2eeComponentList.size(); i++){
-				IVirtualComponent handle = (IVirtualComponent)j2eeComponentList.get(i);
-				if( !inEARAlready(handle))
-					newComps.add(handle);
-			}
-		}
-		return newComps;
-	}
-	
-	private IStatus addModulesToEAR(IProgressMonitor monitor) {
-		IStatus stat = OK_STATUS;
-		try {
-			if( earComponent != null ){
-				List list = newJ2EEModulesToAdd();				
-				if (list != null && !list.isEmpty()) {
-					IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-					
-					dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);					
-					dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, list);
-					stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-					if (stat != OK_STATUS)
-						return stat;
-					dm.getDefaultOperation().execute(monitor, null);
-				}
-				
-				if (!javaProjectsList.isEmpty()) {
-	
-					for (int i = 0; i < javaProjectsList.size(); i++) {
-						IProject proj = (IProject) javaProjectsList.get(i);
-						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);
-						refdm.getDefaultOperation().execute(monitor, null);
-						j2eeComponentList.add(targetcomponent);
-					}
-				}
-			}
-
-		} catch (Exception e) {
-			Logger.getLogger().log(e);
-		}
-		return OK_STATUS;
-	}
-	
-	private IStatus removeModulesFromEAR(IProgressMonitor monitor) {
-		IStatus stat = OK_STATUS;
-		if( earComponent != null && j2eeComponentList != null){
-			List list = getComponentsToRemove();
-			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);
-					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);
-				}
-			}
-		}
-		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();
-		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 );
-	}
-	
-	protected IDataModelOperation removeComponentFromEAROperation(IVirtualComponent sourceComponent, List targetComponentsHandles) {
-		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);
-		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)){
-					list.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();		
-	}
-
-	private void handleSelectAllButtonPressed() {
-		availableComponentsViewer.setAllChecked(true);
-		j2eeComponentList = getCheckedJ2EEElementsAsList();
-		javaProjectsList = getCheckedJavaProjectsAsList();
-	}
-
-	private void handleDeselectAllButtonPressed() {
-		availableComponentsViewer.setAllChecked(false);
-		j2eeComponentList = new ArrayList();
-		javaProjectsList = new ArrayList();
-	}
-	
-	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());
-				
-				ArrayList vlist = new ArrayList();
-			
-				//To do: check if archive component already exists
-				IVirtualReference ref = ComponentCore.createReference( earComponent, archive );
-				vlist.add(ref);	
-				
-				IVirtualReference[] refs = (IVirtualReference[]) vlist.toArray(new IVirtualReference[vlist.size()]);
-				earComponent.addReferences(refs);
-				j2eeComponentList.add(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());
-					
-					ArrayList vlist = new ArrayList();
-					IVirtualReference[] oldrefs = earComponent.getReferences();
-					for (int j = 0; j < oldrefs.length; j++) {
-						IVirtualReference ref = oldrefs[j];
-						vlist.add(ref);
-					}		
-				
-					//To do: check if archive component already exists
-					IVirtualReference ref = ComponentCore.createReference( earComponent, archive );
-					vlist.add(ref);	
-					
-					IVirtualReference[] refs = new IVirtualReference[vlist.size()];
-					for (int j = 0; j < vlist.size(); j++) {
-						IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
-						refs[j] = tmpref;
-					}				
-					earComponent.setReferences(refs);
-					j2eeComponentList.add(archive);
-				}else{
-					//display error
-				}
-			}
-			refresh();
-		}	
-	}
-	
-	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("PROJECT_JAR"));//$NON-NLS-1$
-		externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR"));//$NON-NLS-1$
-		addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$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) {
-				j2eeComponentList = getCheckedJ2EEElementsAsList();
-				javaProjectsList = getCheckedJavaProjectsAsList();
-
-			}
-		});
-	}
-
-	protected Object[] getComponentsInEar() {
-		List list = new ArrayList();
-		IVirtualReference refs[] = earComponent.getReferences();
-		for( int i=0; i< refs.length; i++){
-			IVirtualReference ref = refs[i];
-			list.add(ref.getReferencedComponent());
-		}
-		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;
-	}
-	
-	protected List getCheckedJ2EEElementsAsList() {
-		Object[] elements = availableComponentsViewer.getCheckedElements();
-		List list;
-		if (elements == null || elements.length == 0)
-			list = Collections.EMPTY_LIST;
-		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() {
-		Object[] elements = availableComponentsViewer.getCheckedElements();
-		List list;
-		if (elements == null || elements.length == 0)
-			list = Collections.EMPTY_LIST;
-		else {
-			list = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IProject) {
-					list.add(elements[i]);
-				}
-			}
-		}
-		return list;
-	}
-
-	public CheckboxTableViewer createavailableComponentsViewer(Composite parent) {
-		int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
-		Table table = new Table(parent, flags);
-		availableComponentsViewer = 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);
-		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);
-		tableLayout.layout(table, true);
-		return availableComponentsViewer;
-
-	}
-
-	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);
-
-		TableItem [] items = availableComponentsViewer.getTable().getItems();
-		List list = new ArrayList();
-		//Object[] comps = getComponentsInEar();
-		
-		if( j2eeComponentList.isEmpty() ){
-			Object[] comps = getComponentsInEar();
-			j2eeComponentList.addAll( Arrays.asList(comps));
-			}
-			Object[] comps = j2eeComponentList.toArray();
-		
-		for( int i=0; i< items.length; i++ ){
-			Object element = items[i].getData();
-			if( element instanceof IVirtualComponent){
-				IVirtualComponent comp = (IVirtualComponent)element;
-				for( int j=0; j< comps.length; j++ ){
-					IVirtualComponent tempcomp = (IVirtualComponent)comps[j];
-					if( comp.equals(tempcomp)){
-						list.add(comp);
-					}
-				}
-			}	
-		}
-		
-		availableComponentsViewer.setCheckedElements(list.toArray());
-	//	j2eeComponentList.addAll(list);
-		GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		buttonColumn.setLayoutData(btndata);
-
-	}
-
-	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());
-				
-				ArrayList vlist = new ArrayList();
-			
-				//To do: check if archive component already exists
-				IVirtualReference ref = ComponentCore.createReference( earComponent, archive );
-				vlist.add(ref);	
-				
-				IVirtualReference[] refs = (IVirtualReference[]) vlist.toArray(new IVirtualReference[vlist.size()]);
-				earComponent.addReferences(refs);
-				j2eeComponentList.add(archive);
-			}
-			refresh();
-		}
-		
-	}
-}
\ No newline at end of file
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 cc61f91f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
+++ /dev/null
@@ -1,189 +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 Mar 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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-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.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-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.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class AvailableJ2EEComponentsForEARContentProvider implements IStructuredContentProvider, ITableLabelProvider {
-	private int j2eeVersion;
-	private IVirtualComponent earComponent;
-
-	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) {
-		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();
-		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.getProject());
-						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 enclosingcomp = tmpref.getEnclosingComponent();
-							//boolean isBinary = enclosingcomp.isBinary();
-							IVirtualComponent referencedcomp = tmpref.getReferencedComponent();		
-							boolean isBinary = referencedcomp.isBinary();
-							if( isBinary ){
-								validCompList.add(referencedcomp);
-								//validCompList.add(referencedcomp.getProject());
-								//IPath path = ComponentUtilities.getResolvedPathForArchiveComponent(name);
-							}	
-						}	
-					}
-				}
-			} 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();
-	}
-
-	/*
-	 * (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 ){
-				EARArtifactEdit earEdit = null;
-				try{
-					earEdit = EARArtifactEdit.getEARArtifactEditForRead(earComponent.getProject());
-					name = earEdit.getModuleURI( comp );
-				}finally{
-					if (earEdit != null)
-						earEdit.dispose();
-				}
-				if( name == null || name == "" ){ //$NON-NLS-1$
-					name = comp.getName();
-				}
-				return name;
-			}
-			if( columnIndex == 1  )
-				return comp.getProject().getName();
-		}else if(element instanceof IProject){
-			return ((IProject)element).getName();
-		}		
-		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() {
-	}
-}
\ No newline at end of file
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 76a97a8d2..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, 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;
-
-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 d34d28b1f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
+++ /dev/null
@@ -1,518 +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.Arrays;
-
-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.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.jst.j2ee.internal.common.ClasspathModelEvent;
-
-/**
- * @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;
-	protected boolean isWLPEntry;
-	protected Group radioGroup;
-	
-	protected boolean readOnly;
-	protected AvailableJarsProvider availableJarsProvider;
-	protected Button externalJarButton;
-	protected Button projectJarButton;
-	protected Button addVariableButton;	
-
-	/**
-	 * Constructor for ButtonBarManager.
-	 */
-	public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model) {
-		super();
-		this.owner = owner;
-		this.model = model;
-	}
-	
-	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);
-	}
-	
-	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 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 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);
-		ClasspathModelEvent evt = new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED);
-		
-	}
-
-	protected void selectAllButtonSelected() {
-		if (!validatateEdit())
-			return;
-		availableJARsViewer.setAllChecked(true);
-		model.setAllClasspathElementsSelected(Arrays.asList(availableJARsViewer.getCheckedElements()), true);
-	}
-
-	protected java.util.List getSelectionAsList() {
-		return ((IStructuredSelection) availableJARsViewer.getSelection()).toList();
-	}
-
-	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);
-			}
-		});
-	}
-
-	protected void availableJARCheckStateChanged(CheckStateChangedEvent event) {
-		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());
-	}
-
-	/**
-	 * @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());
-		}
-	}
-
-	public void refresh() {
-		if (!isWLPEntry() && !J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject())) {
-			availableJARsViewer.setInput(getClasspathSelection());
-			model.setWLPModel(false);
-			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());
-			model.setWLPModel(true);
-			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());
-			}
-		}
-	}
-
-	/**
-	 * 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 isWLPEntry;
-	}
-
-	public void setWLPEntry(boolean isWLPEntry) {
-		this.isWLPEntry = isWLPEntry;
-	}
-
-
-}
\ No newline at end of file
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 536efdbaa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
+++ /dev/null
@@ -1,644 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.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.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-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.CreationConstants;
-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.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.jst.server.core.FacetUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.internal.Workbench;
-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.project.facet.SimpleWebFacetInstallDataModelProvider;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-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()) {
-			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 = Workbench.getInstance().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,CreationConstants.DEFAULT_CONNECTOR_SOURCE_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,CreationConstants.DEFAULT_APPCLIENT_SOURCE_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,CreationConstants.DEFAULT_EJB_SOURCE_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,CreationConstants.DEFAULT_WEB_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();
-				for (int i = 0; i < current.length; i++) {
-					IClasspathEntry entry = current[i];
-					if ((entry.getPath().toString().indexOf(WEB_LIB_CONTAINER) == -1) && (entry.getPath().toString().indexOf(WEB_LIB_PATH) == -1))
-						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;
-		}
-		/**@deprecated 
-		 * If this method is not used it should be removed at a later time, marking as deprecated
-		 * Warning cleanup 12/07/2005
-		 */
-		private void setRuntime(IProject aProject,IDataModel facetModel) {
-
-			IRuntime runtime = ServerCore.getProjectProperties(aProject).getRuntimeTarget();
-			try {
-				if (runtime != null) {
-					IRuntime run = getRuntimeByID(runtime.getId());
-					org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = null;
-					try {
-						if (run != null)
-							facetRuntime = FacetUtil.getRuntime(run);
-					}
-					catch (IllegalArgumentException ex)
-					{}
-					if (facetRuntime != null) {
-						facetModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME,facetRuntime);
-					}
-				}
-				} catch (IllegalArgumentException e) {
-				Logger.getLogger().logError(e);
-			}
-		
-			
-		}
-
-		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, CreationConstants.DEFAULT_EJB_SOURCE_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 d8ceb656b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc, IBM Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 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];
-		controls[0] = new JARDependencyPropertiesPage(project, this);
-		return controls[0].createContents(parent);
-	}
-	
-	/* (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();
-		data.horizontalSpan = 1;
-		data.horizontalIndent = 5;
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 250;
-		Text text = new Text(c, SWT.MULTI | SWT.WRAP);
-		text.setLayoutData(data);
-		text.setTextLimit(80);
-		text.setEditable(false);
-		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 6a5606fc3..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
+++ /dev/null
@@ -1,784 +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.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-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.project.J2EEProjectUtilities;
-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.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.internal.impl.ModuleURIUtil;
-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.IVirtualReference;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-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 {
-
-	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;
-
-	/**
-	 * Constructor for JARDependencyPropertiesControl
-	 */
-	public JARDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
-		super();
-		J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
-		this.project = project;
-		this.propPage = page;
-	}
-
-	/**
-	 * Returns false if page should not be displayed for the project.
-	 */
-	protected void initialize() {
-		model = new ClasspathModel(null);
-		model.setProject(project);
-		if (model.getComponent() != null) {
-			model.addListener(this);
-			updateModelManifest();
-			initializeValidateEditListener();
-		}
-	}
-
-	public void dispose() {
-		J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
-		if (model.earArtifactEdit != null) {
-			model.earArtifactEdit.dispose();
-			model.earArtifactEdit = null;
-		}
-	}
-
-	private void updateModelManifest() {
-		if (JemProjectUtilities.isBinaryProject(project) || model.getAvailableEARComponents().length == 0)
-			return;
-		IContainer root = null;
-		IFile manifestFile = null;
-		if (project != null)
-			root = project;
-		else
-			root = JemProjectUtilities.getSourceFolderOrFirst(project, null);
-
-		if (root != null)
-			manifestFile = root.getFile(new Path(J2EEConstants.MANIFEST_URI));
-
-		if (manifestFile == null || !manifestFile.exists())
-			return;
-
-		InputStream in = null;
-		try {
-			in = manifestFile.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 && caughtManifestException != null && !model.isDirty())
-			ManifestErrorPrompter.showManifestException(propPage.getShell(), ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE, false, caughtManifestException);
-
-	}
-
-	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();
-		}
-		return composite;
-	}
-
-	/**
-	 * @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.setReadOnly(isReadOnly());
-		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);
-		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();
-		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 IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		if (!isDirty)
-			return true;
-		WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createManifestOperation());
-		
-		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;
-	}
-
-	// private boolean runWLPOp(WorkspaceModifyComposedOperation composed) {
-	// try {
-	// if (composed != null)
-	// new ProgressMonitorDialog(getShell()).run(true, true, composed);
-	// } catch (InvocationTargetException ex) {
-	// String title = ManifestUIResourceHandler.getString("An_internal_error_occurred_ERROR_");
-	// //$NON-NLS-1$
-	// String msg = title;
-	// if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
-	// msg = ex.getTargetException().getMessage();
-	// MessageDialog.openError(this.getShell(), title, msg);
-	// org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-	// return false;
-	// } catch (InterruptedException e) {
-	// // cancelled
-	// return 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;
-	}
-
-
-	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;
-	}
-
-
-	protected WorkspaceModifyComposedOperation createComponentDependencyOperations() {
-		WorkspaceModifyComposedOperation composedOp = null;
-		List selected = getSelectedClassPathSelectionForWLPs().getClasspathElements();
-		List unselected = getUnSelectedClassPathElementsForWebDependency();
-
-		List targetComponentsHandles = new ArrayList();
-		for (int i = 0; i < selected.size(); i++) {
-			ClasspathElement element = (ClasspathElement) selected.get(i);
-			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);
-			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)));
-		}
-		return composedOp;
-	}
-
-	protected WorkspaceModifyComposedOperation createFlexProjectOperations() {
-		WorkspaceModifyComposedOperation composedOp = null;
-		try {
-			Object[] elements = tableManager.availableJARsViewer.getCheckedElements();
-			for (int i = 0; i < elements.length; i++) {
-				ClasspathElement element = (ClasspathElement) elements[i];
-				IProject elementProject = element.getProject();
-				if (elementProject != null && !elementProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-					if (composedOp == null)
-						composedOp = new WorkspaceModifyComposedOperation();
-					composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(elementProject)));
-				}
-			}
-		} catch (CoreException ce) {
-		}
-		return composedOp;
-	}
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 * @deprecated
-	 * @return
-	 */
-	protected IRunnableWithProgress createBuildPathOperation() {
-		// IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-		// return WTPUIPlugin.getRunnableWithProgress(new
-		// UpdateJavaBuildPathOperation(javaProject,getSelectedClassPathSelectionForWLPs(),
-		// getUnSelectedClassPathElementsForJ2EEDependency()));
-		return null;
-	}
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 * @deprecated
-	 * @return
-	 */
-	protected IRunnableWithProgress createWLPBuildPathOperation() {
-		// IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-		// return WTPUIPlugin.getRunnableWithProgress(new
-		// UpdateJavaBuildPathOperation(javaProject,getSelectedClassPathSelectionForWLPs(),getUnSelectedClassPathElementsForWebDependency()));
-		return null;
-	}
-
-	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 boolean isReadOnly() {
-		return JemProjectUtilities.isBinaryProject(project);
-	}
-
-}
\ No newline at end of file
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 22c140b54..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-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 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 EAR_Module_Dep_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;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ManifestUIResourceHandler.class);
-	}
-}
\ No newline at end of file
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 a01b35e78..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.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.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelListener;
-import org.eclipse.jst.j2ee.internal.common.operations.UpdateJavaBuildPathOperation;
-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.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-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);
-	}
-
-	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();
-			model.setWLPModel(true);
-			setEnablement();
-		}
-		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.setReadOnly(isReadOnly());
-		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() {
-		tableManager.setWLPEntry(true);
-		availableDependentJars.setText(ManifestUIResourceHandler.WEB_LIB_LIST_DESCRIPTION);
-		tableManager.refresh();
-	}
-
-	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;
-			}
-			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();
-			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;
-	}
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 * @deprecated
-	 * @param selection
-	 * @return
-	 */
-	protected IRunnableWithProgress createBuildPathOperationForExternalJar(ClassPathSelection selection) {
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-		return WTPUIPlugin.getRunnableWithProgress(new UpdateJavaBuildPathOperation(javaProject, 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/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index f0c7021ab..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,88 +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.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.ui.actions.WorkspaceModifyOperation {
-	
-	protected List fRunnables;
-
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-	
-	/**
-	 * Creates a new operation which will delegate its work to the given runnable.
-	 */
-	public WorkspaceModifyComposedOperation() {
-		super();
-	}
-
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
-		super(rule);
-		fRunnables = nestedRunnablesWithProgress;
-	}
-
-	public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
-		super();
-		fRunnables = nestedRunnablesWithProgress;
-	}
-
-	/**
-	 * Creates a new operation which will delegate its work to the given runnable.
-	 * 
-	 * @param content
-	 *            the runnable to delegate to when this operation is executed
-	 */
-	public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
-		super();
-		getRunnables().add(nestedOp);
-	}
-
-	public boolean addRunnable(IRunnableWithProgress nestedOp) {
-		return getRunnables().add(nestedOp);
-	}
-
-	protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		int size = fRunnables.size();
-		monitor.beginTask("", size);//$NON-NLS-1$
-		for (int i = 0; i < fRunnables.size(); i++) {
-			IRunnableWithProgress op = (IRunnableWithProgress) fRunnables.get(i);
-			op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
-		}
-	}
-
-	protected List getRunnables() {
-		if (fRunnables == null)
-			fRunnables = new ArrayList(3);
-		return fRunnables;
-	}
-}
\ 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 f40852177..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, 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.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 e99b0b96f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
+++ /dev/null
@@ -1,123 +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.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.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 {
-
-	private final static String ERROR_OCCURRED_TITLE = "!!!!Error"; //$NON-NLS-1$
-
-	private final static String ERROR_OCCURRED_MESSAGE = "!!@!!Error"; //$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) {
-			Logger.getLogger().logError(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();
-	}
-
-}
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 61d93f458..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, 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.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 dcf94e928..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, 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.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 6697cf6d0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java
+++ /dev/null
@@ -1,421 +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.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.action.IAction;
-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.ui.actions.SelectionListenerAction;
-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 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 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 ad4da30d6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
+++ /dev/null
@@ -1,165 +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 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.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-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.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 modules = DeployerRegistry.getSelectedModules(selection.toArray());
-			for (int i = 0; i < modules.size(); i++) {
-				EObject module = (EObject) modules.get(i);
-				IProject proj = ProjectUtilities.getProject(module);
-				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(module, 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 da682a432..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.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
- *******************************************************************************/
-/*
- * 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 java.util.Collections;
-
-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.internal.rename.RenameOptions;
-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 b5f6df41b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java
+++ /dev/null
@@ -1,393 +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.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.action.IAction;
-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.ui.actions.SelectionListenerAction;
-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 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 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/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
deleted file mode 100644
index e496a977d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
+++ /dev/null
@@ -1,268 +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.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-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.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.componentcore.ComponentArchiveOptions;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-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.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-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.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();
-			editor = page.openEditor(new ComponentEditorInput(c), 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 (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){
-				openAppropriateEditor(resource);
-			} else {
-				ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
-				ArchiveOptions options = moduleFile.getOptions();
-				if(options instanceof ComponentArchiveOptions) {
-					IVirtualComponent component = ((ComponentArchiveOptions)options).getComponent();
-					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 (obj instanceof EObject) {
-			IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-			IFile file = WorkbenchResourceHelper.getFile((EObject)obj);
-			if(file != null) {
-				IContentType contentType = IDE.getContentType(file);
-				currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
-			} else {
-				String name = (new Path(((EObject)obj).eResource().getURI().toString())).lastSegment();
-				currentDescriptor = registry.getDefaultEditor(name, null);
-			}
-		}
-		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) {
-			cantOpen.printStackTrace();
-		}
-	}
-
-	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;
-	}
-}
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 021b9315a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,82 +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.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * An operation which delegates its work to a runnable that modifies the workspace.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.ui.actions.WorkspaceModifyOperation {
-	protected List fRunnables;
-
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	/**
-	 * Creates a new operation which will delegate its work to the given runnable.
-	 */
-	public WorkspaceModifyComposedOperation() {
-		super();
-	}
-
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
-		super(rule);
-		fRunnables = nestedRunnablesWithProgress;
-	}
-
-	public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
-		super();
-		fRunnables = nestedRunnablesWithProgress;
-	}
-
-	/**
-	 * Creates a new operation which will delegate its work to the given runnable.
-	 * 
-	 * @param content
-	 *            the runnable to delegate to when this operation is executed
-	 */
-	public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
-		super();
-		getRunnables().add(nestedOp);
-	}
-
-	public boolean addRunnable(IRunnableWithProgress nestedOp) {
-		return getRunnables().add(nestedOp);
-	}
-
-	protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		int size = fRunnables.size();
-		monitor.beginTask("", size);//$NON-NLS-1$
-		for (int i = 0; i < fRunnables.size(); i++) {
-			IRunnableWithProgress op = (IRunnableWithProgress) fRunnables.get(i);
-			op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
-		}
-	}
-
-	protected List getRunnables() {
-		if (fRunnables == null)
-			fRunnables = new ArrayList(3);
-		return fRunnables;
-	}
-}
\ 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 ea1fcca98..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java
+++ /dev/null
@@ -1,81 +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.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();
-	}
-}
\ No newline at end of file
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/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 76ca21418..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java
+++ /dev/null
@@ -1,67 +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.Set;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-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 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/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 e9cc80ead..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.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.dialogs;
-
-
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-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 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 01e97f5ad..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * 
- */
-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.HyperlinkEvent;
-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 hyperlinkUpdate(HyperlinkEvent e) {
-			}
-
-			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 2b106e5a9..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, 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.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);
-}
\ No newline at end of file
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 d0e7ce203..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, 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.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 5660abfb7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
+++ /dev/null
@@ -1,143 +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;
-
-	/**
-	 * 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());
-		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 311342d83..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
+++ /dev/null
@@ -1,328 +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.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.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.Workbench;
-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;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-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() {
-					IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-					if (window == null && Workbench.getInstance().getWorkbenchWindowCount()>0) {
-						for (int i=0; i<Workbench.getInstance().getWorkbenchWindows().length; i++) {
-							window = Workbench.getInstance().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 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 ResourceStateValidatorPresenter#getValidateEditContext()
-	 */
-	public Object getValidateEditContext() {
-		return getShell();
-	}
-
-	/**
-	 * @see 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 IPartListener#partBroughtToTop(IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-		//do nothing
-	}
-
-	/**
-	 * @see IPartListener#partClosed(IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part == fPart)
-			part.getSite().getPage().removePartListener(this);
-		if (getShell() != null)
-			getShell().removeShellListener(this);
-	}
-
-	/**
-	 * @see 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 IPartListener#partOpened(IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-		//do nothing
-	}
-
-	public IStatus validateState() {
-		if ((fShell==null) && (Workbench.getInstance().getActiveWorkbenchWindow() != null))
-			fShell=Workbench.getInstance().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 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
index b3a7a2b4c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
+++ /dev/null
@@ -1,137 +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 Dec 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.perspective;
-
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.progress.IProgressConstants;
-
-/**
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EEPerspective implements org.eclipse.ui.IPerspectiveFactory {
-
-	protected static String ID_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$
-	protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
-
-	private static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$	
-	private static String ID_EJB_PROJECT_WIZARD = "org.eclipse.jst.ejb.ui.EJBComponentCreationWizard"; //$NON-NLS-1$
-	private static String ID_RAR_PROJECT_WIZARD = "org.eclipse.jst.j2ee.jca.ui.ConnectorComponentCreationWizard"; //$NON-NLS-1$
-	private static String ID_APPCLIENT_PROJECT_WIZARD = "org.eclipse.jst.j2ee.internal.wizard.AppClientComponentCreationWizard"; //$NON-NLS-1$
-	private static String ID_EAR_PROJECT_WIZARD = "org.eclipse.jst.j2ee.internal.wizard.EARComponentCreationWizard"; //$NON-NLS-1$
-    private static String ID_DYNAMIC_WEB_COMPONENT_WIZARD = "org.eclipse.jst.servlet.ui.WebComponentCreationWizard"; //$NON-NLS-1$
-	private static String ID_STATIC_WEB_COMPONENT_WIZARD = "org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreation"; //$NON-NLS-1$
-	private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
-	private static final String ID_DATA_VIEW = "org.eclipse.wst.rdb.server.ui.navigator.serverExplorer"; //$NON-NLS-1$
-	public static final String ID_CONSOLE_VIEW= "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
-
-	public J2EEPerspective() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
-	 */
-	public void createInitialLayout(IPageLayout layout) {
-		defineLayout(layout);
-		defineActions(layout);
-	}
-	
-	
-
-	public void defineActions(IPageLayout layout) {
-		layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet"); //$NON-NLS-1$
-		layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet2"); //$NON-NLS-1$
-		layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet3"); //$NON-NLS-1$
-		layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet4"); //$NON-NLS-1$
-		layout.addActionSet("org.eclipse.jdt.ui.JavaActionSet"); //$NON-NLS-1$
-
-		layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-		layout.addActionSet(IDebugUIConstants.DEBUG_ACTION_SET);
-
-		layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
-
-		layout.addShowViewShortcut(ID_J2EE_HIERARCHY_VIEW);
-		layout.addShowViewShortcut(ID_SERVERS_VIEW);
-		layout.addShowViewShortcut(ID_DATA_VIEW);
-		layout.addShowViewShortcut(IPageLayout.ID_BOOKMARKS);
-		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-		layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
-		layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-		layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
-		layout.addShowViewShortcut(ID_WST_SNIPPETS_VIEW);
-		
-		// views - search
-		layout.addShowViewShortcut(ID_SEARCH_VIEW);
-				// views - debugging
-		layout.addShowViewShortcut(ID_CONSOLE_VIEW);
-
-		layout.addNewWizardShortcut(ID_DYNAMIC_WEB_COMPONENT_WIZARD);
-        layout.addNewWizardShortcut(ID_STATIC_WEB_COMPONENT_WIZARD);
-		layout.addNewWizardShortcut(ID_EJB_PROJECT_WIZARD);
-        layout.addNewWizardShortcut(ID_RAR_PROJECT_WIZARD);
-        layout.addNewWizardShortcut(ID_APPCLIENT_PROJECT_WIZARD);
-        layout.addNewWizardShortcut(ID_EAR_PROJECT_WIZARD);
-
-		// Add "new wizards"
-        layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.project");//$NON-NLS-1$
-        layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
-        layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
-
-		layout.addShowInPart(ID_J2EE_HIERARCHY_VIEW);
-	}
-
-	public void defineLayout(IPageLayout layout) {
-		// Editors are placed for free.
-		String editorArea = layout.getEditorArea();
-
-		// Top left.
-		IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f, editorArea);//$NON-NLS-1$
-		topLeft.addView(ID_J2EE_HIERARCHY_VIEW);
-		topLeft.addPlaceholder(IPageLayout.ID_RES_NAV);
-		topLeft.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY);
-		topLeft.addPlaceholder(JavaUI.ID_PACKAGES_VIEW);
-
-		// Bottom right.
-		IFolderLayout bottomRight = layout.createFolder("bottomRight", IPageLayout.BOTTOM, 0.7f, editorArea);//$NON-NLS-1$
-		bottomRight.addView(IPageLayout.ID_PROBLEM_VIEW);
-		bottomRight.addView(IPageLayout.ID_TASK_LIST);
-		bottomRight.addView(IPageLayout.ID_PROP_SHEET);
-		bottomRight.addView(ID_SERVERS_VIEW);
-		bottomRight.addView(ID_DATA_VIEW);
-		bottomRight.addView(ID_WST_SNIPPETS_VIEW);
-		
-		bottomRight.addPlaceholder(ID_CONSOLE_VIEW);
-		bottomRight.addPlaceholder(IPageLayout.ID_BOOKMARKS);
-		bottomRight.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
-		bottomRight.addPlaceholder(ID_SEARCH_VIEW);
-
-		// Top right.
-		IFolderLayout topRight = layout.createFolder("topRight", IPageLayout.RIGHT, 0.7f, editorArea);//$NON-NLS-1$
-		topRight.addView(IPageLayout.ID_OUTLINE);
-	}
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
deleted file mode 100644
index f576609a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
+++ /dev/null
@@ -1,101 +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.plugin;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.EditorManager;
-
-
-
-public class CommonEditorUtility {
-
-	public static final Class IRESOURCE_CLASS = IResource.class;
-
-	private CommonEditorUtility() {
-		super();
-	}
-
-	/**
-	 * Returns an array of all editors that have an unsaved content. If the identical content is
-	 * presented in more than one editor, only one of those editor parts is part of the result.
-	 * 
-	 * @return an array of all dirty editor parts.
-	 */
-	public static IEditorPart[] getDirtyEditors() {
-		return getDirtyEditors(null);
-	}
-
-	/**
-	 * Returns an array of all editors that have an unsaved content, where the content is include in
-	 * one of the projects in the List parameter. If the identical content is presented in more than
-	 * one editor, only one of those editor parts is part of the result.
-	 * 
-	 * @return an array of all dirty editor parts.
-	 */
-	public static IEditorPart[] getDirtyEditors(List projects) {
-		Set inputs = new HashSet();
-		List result = new ArrayList(0);
-		IWorkbench workbench = J2EEUIPlugin.getPluginWorkbench();
-		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		for (int i = 0; i < windows.length; i++) {
-			IWorkbenchPage[] pages = windows[i].getPages();
-			for (int x = 0; x < pages.length; x++) {
-				IEditorPart[] editors = pages[x].getDirtyEditors();
-				for (int z = 0; z < editors.length; z++) {
-					IEditorPart ep = editors[z];
-					IEditorInput input = ep.getEditorInput();
-					if (!inputs.contains(input) && (projects == null || inputInProjects(input, projects))) {
-						inputs.add(input);
-						result.add(ep);
-					}
-				}
-			}
-		}
-		return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
-	}
-
-	public static boolean inputInProjects(IEditorInput input, List projects) {
-		IResource res = (IResource) input.getAdapter(IRESOURCE_CLASS);
-		IProject project = res == null ? null : res.getProject();
-		if (project == null)
-			return false;
-		for (int i = 0; i < projects.size(); i++) {
-			if (project.equals(projects.get(i)))
-				return true;
-		}
-		return false;
-	}
-
-	public static boolean promptToSaveAllDirtyEditors() {
-		return promptToSaveDirtyEditors(Arrays.asList(getDirtyEditors()));
-	}
-
-	public static boolean promptToSaveDirtyEditors(List dirtyEditors) {
-		if (dirtyEditors.isEmpty())
-			return true;
-		return EditorManager.saveAll(dirtyEditors, true, true,false, J2EEUIPlugin.getActiveWorkbenchWindow());
-	}
-
-	public static boolean promptToSaveDirtyEditorsInProjects(List projects) {
-		return promptToSaveDirtyEditors(Arrays.asList(getDirtyEditors(projects)));
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java
deleted file mode 100644
index 60f11eef6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java
+++ /dev/null
@@ -1,192 +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.plugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Added a Details button to the MessageDialog to show the exception stack trace.
- * 
- * Borrowed from an eclipse InternalErrorDialog
- */
-public class ErrorDialog extends MessageDialog {
-	protected static final String[] LABELS_OK = {IDialogConstants.OK_LABEL};
-	protected static final String[] LABELS_OK_CANCEL = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL};
-	protected static final String[] LABELS_OK_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
-	protected static final String[] LABELS_OK_CANCEL_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
-	private Throwable detail;
-	private int detailButtonID = -1;
-	private Text text;
-	private String message;
-	//Workaround. SWT does not seem to set the default button if
-	//there is not control with focus. Bug: 14668
-	private int defaultButtonIndex = 0;
-	/**
-	 * Size of the text in lines.
-	 */
-	private static final int TEXT_LINE_COUNT = 15;
-
-	public ErrorDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, Throwable detail, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
-		super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
-		defaultButtonIndex = defaultIndex;
-		this.detail = detail;
-		message = dialogMessage;
-		setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.RESIZE);
-	}
-
-	//Workaround. SWT does not seem to set rigth the default button if
-	//there is not control with focus. Bug: 14668
-	public int open() {
-		create();
-		Button b = getButton(defaultButtonIndex);
-		b.setFocus();
-		b.getShell().setDefaultButton(b);
-		return super.open();
-	}
-
-	/**
-	 * Set the detail button;
-	 */
-	public void setDetailButton(int index) {
-		detailButtonID = index;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog.
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == detailButtonID) {
-			toggleDetailsArea();
-		} else {
-			setReturnCode(buttonId);
-			close();
-		}
-	}
-
-	/**
-	 * 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 (text != null) {
-			text.dispose();
-			text = null;
-			getButton(detailButtonID).setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		} else {
-			createDropDownText((Composite) getContents());
-			getButton(detailButtonID).setText(IDialogConstants.HIDE_DETAILS_LABEL);
-		}
-		Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
-	}
-
-	/**
-	 * Create this dialog's drop-down list component.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @return the drop-down list component
-	 */
-	protected void createDropDownText(Composite parent) {
-		// create the list
-		text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		// print the stacktrace in the text field
-		try {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			PrintStream ps = new PrintStream(baos);
-			detail.printStackTrace(ps);
-			if ((detail instanceof SWTError) && (((SWTError) detail).throwable != null)) {
-				ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
-				((SWTError) detail).throwable.printStackTrace(ps);
-			} else if ((detail instanceof SWTException) && (((SWTException) detail).throwable != null)) {
-				ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
-				((SWTException) detail).throwable.printStackTrace(ps);
-			}
-			ps.flush();
-			baos.flush();
-			text.setText(baos.toString());
-		} catch (IOException e) {
-			//Ignore
-		}
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-		data.heightHint = text.getLineHeight() * TEXT_LINE_COUNT;
-		text.setLayoutData(data);
-	}
-
-	public static boolean openError(Shell parent, String title, String message, Throwable detail, int defaultIndex, boolean showCancel) {
-		String[] labels;
-		if (detail == null)
-			labels = showCancel ? LABELS_OK_CANCEL : LABELS_OK;
-		else
-			labels = showCancel ? LABELS_OK_CANCEL_DETAILS : LABELS_OK_DETAILS;
-		ErrorDialog dialog = new ErrorDialog(parent, title, null, // accept
-					// the
-					// default
-					// window
-					// icon
-					message, detail, ERROR, labels, defaultIndex);
-		if (detail != null)
-			dialog.setDetailButton(labels.length - 1);
-		return dialog.open() == 0;
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		// create a composite with standard margins and spacing
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
-		((GridLayout) composite.getLayout()).numColumns = 2;
-		// create image
-		Image image = composite.getDisplay().getSystemImage(SWT.ICON_ERROR);
-		if (image != null) {
-			Label label = new Label(composite, 0);
-			image.setBackground(label.getBackground());
-			label.setImage(image);
-			label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING));
-		}
-		// create message
-		if (message != null) {
-			Label label = new Label(composite, SWT.WRAP);
-			label.setText(message);
-			GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-			label.setLayoutData(data);
-			label.setFont(parent.getFont());
-		}
-		return composite;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectActionFilter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectActionFilter.java
deleted file mode 100644
index 844f4de72..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectActionFilter.java
+++ /dev/null
@@ -1,108 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.ui.IActionFilter;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class FacetedProjectActionFilter
-
-    implements IActionFilter
-    
-{
-    public boolean testAttribute( final Object target, 
-                                  final String name, 
-                                  final String value )
-    {
-    	
-        if( name.equals( "facet" ) ) //$NON-NLS-1$
-        {
-        	IProject project = (IProject)target;
-        	IFacetedProject fproj = null;
-        	if(project.isAccessible()){
-				try {
-					fproj = ProjectFacetsManager.create( project );
-				} catch (CoreException e1) {
-					Logger.getLogger().logError(e1);
-				}
-        	}
-
-            if( fproj != null ){
-	            final int colon = value.indexOf( ':' );
-	            final String fid;
-	            final String vexprstr;
-	            
-	            if( colon == -1 || colon == value.length() - 1 )
-	            {
-	                fid = value;
-	                vexprstr = null;
-	            }
-	            else
-	            {
-	                fid = value.substring( 0, colon );
-	                vexprstr = value.substring( colon + 1 );
-	            }
-	            
-	            if( ! ProjectFacetsManager.isProjectFacetDefined( fid ) )
-	            {
-	                return false;
-	            }
-	            
-	            final IProjectFacet f = ProjectFacetsManager.getProjectFacet( fid );
-	            
-	            if( ! fproj.hasProjectFacet( f ) )
-	            {
-	                return false;
-	            }
-	            
-	            if( vexprstr == null )
-	            {
-	                return true;
-	            }
-	            else
-	            {
-	                final IProjectFacetVersion fv = fproj.getInstalledVersion( f );
-	                
-	                try
-	                {
-	                    if( f.getVersions( vexprstr ).contains( fv ) )
-	                    {
-	                        return true;
-	                    }
-	                }
-	                catch( CoreException e )
-	                {
-	                	//EJBUIPlugin.getDefault().log
-	                }
-	            }
-	            
-	            return false;
-	        }
-	        else
-	        {
-	            return false;
-	        }
-        }
-        return true;
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectAdapterFactory.java
deleted file mode 100644
index 5adfa200f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectAdapterFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.IActionFilter;
-
-public class FacetedProjectAdapterFactory implements IAdapterFactory {
-
-
-    private static final Class[] ADAPTER_TYPES = { IActionFilter.class };
-    
-    public Object getAdapter( final Object adaptable, 
-                              final Class adapterType )
-    {
-        if( adapterType == IActionFilter.class )
-        {
-            return new FacetedProjectActionFilter();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public Class[] getAdapterList()
-    {
-        return ADAPTER_TYPES;
-    }
-    
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
deleted file mode 100644
index b6a89c42f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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.plugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jem.internal.adapters.jdom.JavaClassJDOMAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * A number of routines for working with JavaElements in editors
- * 
- * Use 'isOpenInEditor' to test if an element is already open in a editor Use 'openInEditor' to
- * force opening an element in a editor With 'getWorkingCopy' you get the working copy (element in
- * the editor) of an element
- */
-public class J2EEEditorUtility {
-	// //$NON-NLS-1$
-	public static final String EJB_JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.misc.EJBJavaEditor"; //$NON-NLS-1$
-
-	public static ICompilationUnit getCompilationUnit(JavaClass javaClass) {
-		IProject project = ProjectUtilities.getProject(javaClass);
-		if (project == null)
-			return null;
-		return getCompilationUnit(javaClass, project);
-	}
-
-	public static ICompilationUnit getCompilationUnit(JavaClass javaClass, IProject project) {
-		if (javaClass == null)
-			return null;
-		IJavaProject javaProj = getJavaProject(project);
-		if (javaProj == null)
-			return null;
-		return getCompilationUnit(javaClass, javaProj);
-	}
-
-	public static ICompilationUnit getCompilationUnit(JavaClass javaClass, IJavaProject javaProject) {
-		if (javaClass == null)
-			return null;
-		IType type = getType(javaClass);
-		if (type != null)
-			return type.getCompilationUnit();
-		return null;
-	}
-
-	public static IType getType(JavaClass javaClass) {
-		if (javaClass != null) {
-			JavaClassJDOMAdaptor adaptor = (JavaClassJDOMAdaptor) EcoreUtil.getRegisteredAdapter(javaClass, ReadAdaptor.TYPE_KEY);
-			if (adaptor != null)
-				return adaptor.getSourceType();
-		}
-		return null;
-	}
-
-	public static IEditorInput getEditorInput(Object input) {
-		if (input instanceof EObject)
-			return new FileEditorInput(WorkbenchResourceHelper.getFile((EObject) input));
-		if (input instanceof IFile)
-			return new FileEditorInput((IFile) input);
-		return null;
-	}
-
-	public static IFile getFile(JavaClass javaClass) {
-		ICompilationUnit comp = getCompilationUnit(javaClass);
-		if (comp == null)
-			return null;
-		IEditorInput input = null;
-		try {
-			input = EditorUtility.getEditorInput(comp);
-		} catch (JavaModelException ex) {
-			return null;
-		}
-		if (input != null) {
-			return (IFile) input.getAdapter(IFile.class);
-		}
-		return null;
-	}
-
-	public static IJavaProject getJavaProject(IProject aProject) {
-		if (aProject == null)
-			return null;
-		IJavaModel javaModel = JemProjectUtilities.getJavaModel();
-		return javaModel.getJavaProject(aProject.getName());
-	}
-
-	/**
-	 * Return the IPackageFragment for the JavaPackage for
-	 * 
-	 * @javaClass.
-	 */
-	public static IPackageFragment getPackageFragment(JavaClass javaClass, IJavaProject javaProject) {
-		if (javaProject != null) {
-			try {
-				JavaPackage javaPackage = (JavaPackage) javaClass.eContainer();
-				String packageName = javaPackage.getName();
-				IPackageFragment[] pkgFrags = javaProject.getPackageFragments();
-				for (int i = 0; i < pkgFrags.length; i++) {
-					if ((pkgFrags[i].getElementName().equals(packageName)))
-						return pkgFrags[i];
-				}
-			} catch (JavaModelException e) {
-				//Ignore
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
-	 * class file.
-	 * 
-	 * @return the IEditorPart or null if wrong element type or opening failed
-	 */
-	public static IEditorPart openInEditor(JavaClass javaClass, IProject aProject) throws JavaModelException, PartInitException {
-		return openInEditor(javaClass, getJavaProject(aProject));
-	}
-
-	/**
-	 * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
-	 * class file.
-	 * 
-	 * @return the IEditorPart or null if wrong element type or opening failed
-	 */
-	public static IEditorPart openInEditor(JavaClass javaClass, IJavaProject javaProject) throws JavaModelException, PartInitException {
-		if (javaClass == null || javaProject == null)
-			return null;
-		IType type = getType(javaClass);
-		if (type == null)
-			return openInEditor(getCompilationUnit(javaClass, javaProject));
-		return EditorUtility.openInEditor(type);
-	}
-
-
-	/**
-	 * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
-	 * class file.
-	 * 
-	 * @return the IEditorPart or null if wrong element type or opening failed
-	 */
-	public static IEditorPart openInEditor(JavaClass javaClass, IJavaProject javaProject, String editorId) throws JavaModelException, PartInitException {
-		return openInEditor(getCompilationUnit(javaClass, javaProject), editorId);
-	}
-
-	/**
-	 * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
-	 * class file.
-	 * 
-	 * @return the IEditorPart or null if wrong element type or opening failed
-	 */
-	public static IEditorPart openInEditor(ICompilationUnit aCompilationUnit) throws JavaModelException, PartInitException {
-		return EditorUtility.openInEditor(aCompilationUnit);
-	}
-
-	/**
-	 * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
-	 * class file.
-	 * 
-	 * @return the IEditorPart or null if wrong element type or opening failed
-	 */
-	public static IEditorPart openInEditor(ICompilationUnit aCompilationUnit, String editorId) throws JavaModelException, PartInitException {
-		return openInEditor(EditorUtility.getEditorInput(aCompilationUnit), editorId);
-	}
-
-	private static IEditorPart openInEditor(IEditorInput input, String editorID) throws PartInitException {
-		if (input != null) {
-			IWorkbenchPage p = J2EEUIPlugin.getActiveWorkbenchWindow().getActivePage();
-			if (p != null)
-				return p.openEditor(input, editorID, true);
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java
deleted file mode 100644
index 372f44c2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.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 Jun 30, 2004
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author jlanuti
- */
-public class J2EEUIAdapterFactory implements IAdapterFactory {
-
-	protected static final Class ILAUNCHABLE_CLASS = ILaunchable.class;
-
-	/**
-	 * Default Constructor
-	 */
-	public J2EEUIAdapterFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adaptableObject instanceof EObject) {
-			if (adapterType == ILAUNCHABLE_CLASS)
-				return adaptableObject;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[]{ILAUNCHABLE_CLASS};
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java
deleted file mode 100644
index 7d8053c05..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java
+++ /dev/null
@@ -1,30 +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 Feb 27, 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.plugin;
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface J2EEUIContextIds {
-
-	//	Delete Enterprise Bean Dialog
-	public static final String DELETE_ENTERPRISE_BEAN_DIALOG = J2EEUIPlugin.PLUGIN_ID + ".delb1000"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
deleted file mode 100644
index 28509660b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
+++ /dev/null
@@ -1,217 +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.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.common.frameworks.internal.Messages;
-
-
-public class J2EEUIMessages extends Messages {
-	
-	private static final J2EEUIMessages INSTANCE = new J2EEUIMessages();
-
-	public static final String PROJECT_LOC_LBL = "1"; //$NON-NLS-1$
-	public static final String TARGET_RUNTIME_LBL = "2"; //$NON-NLS-1$
-	public static final String J2EE_VERSION_LBL = "3"; //$NON-NLS-1$
-	public static final String IMAGE_LOAD_ERROR = "4"; //$NON-NLS-1$
-	public static final String APP_PROJECT_WIZ_TITLE = "5"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MAIN_PG_TITLE = "6"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MAIN_PG_DESC = "7"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MODULES_PG_TITLE = "8"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MODULES_PG_DESC = "9"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MODULES_PG_SELECT = "10"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MODULES_PG_DESELECT = "11"; //$NON-NLS-1$
-	public static final String APP_PROJECT_MODULES_PG_NEW = "12"; //$NON-NLS-1$
-	public static final String EAR_PROJECT_FOR_MODULE_CREATION = "13"; //$NON-NLS-1$
-	public static final String NEW_THREE_DOTS_E = "14"; //$NON-NLS-1$
-	public static final String NEW_THREE_DOTS_W = "14a"; //$NON-NLS-1$
-	public static final String LINK_MODULETO_EAR_PROJECT = "15"; //$NON-NLS-1$
-	public static final String NEW_MOD_SEL_PG_TITLE = "16"; //$NON-NLS-1$
-	public static final String NEW_MOD_SEL_PG_DESC = "17"; //$NON-NLS-1$
-	public static final String NEW_MOD_WIZ_TITLE = "18"; //$NON-NLS-1$
-	public static final String NEW_MOD_SEL_PG_DEF_BTN = "19"; //$NON-NLS-1$
-	public static final String APP_CLIENT_PROJ_LBL = "20"; //$NON-NLS-1$
-	public static final String EJB_PROJ_LBL = "21"; //$NON-NLS-1$
-	public static final String WEB_PROJ_LBL = "22"; //$NON-NLS-1$
-	public static final String JCA_PROJ_LBL = "23"; //$NON-NLS-1$
-
-	public static final String APP_CLIENT_PROJECT_WIZ_TITLE = "24"; //$NON-NLS-1$
-	public static final String APP_CLIENT_VERSION_LBL = "3"; //$NON-NLS-1$
-	public static final String APP_CLIENT_PROJECT_MAIN_PG_TITLE = "25"; //$NON-NLS-1$
-	public static final String APP_CLIENT_SETTINGS = "101"; //$NON-NLS-1$
-
-	public static final String APP_CLIENT_PROJECT_MAIN_PG_DESC = "26"; //$NON-NLS-1$
-	public static final String MODULES_DEPENDENCY_PAGE_TITLE = "27"; //$NON-NLS-1$
-
-	public static final String MODULES_DEPENDENCY_PAGE_DESC = "28"; //$NON-NLS-1$
-	public static final String MODULES_DEPENDENCY_PAGE_AVAILABLE_JARS = "29"; //$NON-NLS-1$
-	public static final String MODULES_DEPENDENCY_PAGE_CLASSPATH = "30"; //$NON-NLS-1$
-	public static final String MODULES_DEPENDENCY_PAGE_TABLE_MODULE = "31"; //$NON-NLS-1$
-	public static final String MODULES_DEPENDENCY_PAGE_TABLE_PROJECT = "32"; //$NON-NLS-1$
-	public static final String NEW_LBL = "33"; //$NON-NLS-1$
-	public static final String APP_CLIENT_IMPORT_MAIN_PG_DESC = "34"; //$NON-NLS-1$
-	public static final String APP_CLIENT_IMPORT_MAIN_PG_TITLE = "35"; //$NON-NLS-1$
-	public static final String APP_CLIENT_IMPORT_FILE_LABEL = "36"; //$NON-NLS-1$
-
-	public static final String APP_CLIENT_IMPORT_PROJECT_LABEL = "37"; //$NON-NLS-1$
-
-	public static final String IMPORT_WIZ_TITLE = "38"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_MAIN_PG_DESC = "39"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_MAIN_PG_TITLE = "40"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_FILE_LABEL = "41"; //$NON-NLS-1$
-	public static final String OVERWRITE_RESOURCES = "42"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECT_TYPE = "43"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECT_TYPE_BINARY = "44"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECT_TYPE_SOURCE = "45"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PARTIAL_DEVELOPMENT = "46"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON = "48"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_SELECT_ALL_UTIL_BUTTON = "47"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_JARS_GROUP = "49"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS = "50"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECT_PG_DESC = "51"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECT_PG_TITLE = "52"; //$NON-NLS-1$
-	public static final String PROJECT_LOCATIONS_GROUP = "53"; //$NON-NLS-1$
-	public static final String NEW_PROJECT_GROUP_DESCRIPTION = "54"; //$NON-NLS-1$
-	public static final String USE_DEFAULT_ROOT_RADIO = "55"; //$NON-NLS-1$
-	public static final String USE_ALTERNATE_ROOT_RADIO = "56"; //$NON-NLS-1$
-	public static final String SELECT_DIRECTORY_DLG = "57"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_Modules_in_EAR = "58"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_New_Project_Name = "59"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_FILENAMES = "60"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECTNAMES = "61"; //$NON-NLS-1$
-	public static final String J2EE_EXPORT_DESTINATION = "62"; //$NON-NLS-1$
-	public static final String J2EE_EXPORT_OVERWRITE_CHECKBOX = "63"; //$NON-NLS-1$
-	public static final String J2EE_EXPORT_SOURCE_CHECKBOX = "64"; //$NON-NLS-1$
-	public static final String APP_CLIENT_EXPORT_MAIN_PG_TITLE = "65"; //$NON-NLS-1$
-	public static final String APP_CLIENT_EXPORT_MAIN_PG_DESC = "66"; //$NON-NLS-1$
-	public static final String EXPORT_WIZ_TITLE = "67"; //$NON-NLS-1$
-	public static final String EAR_EXPORT_MAIN_PG_TITLE = "68"; //$NON-NLS-1$
-	public static final String EAR_EXPORT_MAIN_PG_DESC = "69"; //$NON-NLS-1$
-	public static final String EAR_EXPORT_INCLUDE_PROJECT_FILES = "70"; //$NON-NLS-1$
-	public static final String EAR_EXPORT_INCLUDE_PROJECT_FILES_DESC = "71"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_INCLUDE_PROJECT = "72"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_OVERWRITE_NESTED = "74"; //$NON-NLS-1$
-	public static final String DELETE_PROJECT = "75"; //$NON-NLS-1$
-	public static final String EAR_IMPORT_PROJECT_LABEL = "76"; //$NON-NLS-1$
-
-	//string for migration
-	public static final String ERROR_OCCURRED_TITLE = "77"; //$NON-NLS-1$
-	public static final String ERROR_OCCURRED_MESSAGE = "78"; //$NON-NLS-1$
-	public static final String BINARY_PROJECT = "79"; //$NON-NLS-1$
-	public static final String ACTION_CANNOT_BE_PERFORMED_ON_BIN_PROJECT = "80"; //$NON-NLS-1$
-	public static final String INFORMATION_UI_ = "81"; //$NON-NLS-1$
-	public static final String CHOSEN_OP_NOT_AVAILABLE = "82"; //$NON-NLS-1$
-
-	public static final String CREATE_EJB_CLIENT_JAR = "90"; //$NON-NLS-1$
-	public static final String USE_ANNOTATIONS = "91"; //$NON-NLS-1$
-	public static final String USE_ANNOTATIONS_SERVLET = "98"; //$NON-NLS-1$
-	public static final String ADD_ANNOTATIONS_SUPPORT = "92"; //$NON-NLS-1$
-	public static final String BROWSE_LABEL = "93"; //$NON-NLS-1$
-	public static final String NAME_LABEL = "94"; //$NON-NLS-1$
-
-	public static final String APP_CLIENT_CREATE_MAIN = "95"; //$NON-NLS-1$
-	public static final String CREATE_DEFAULT_SESSION_BEAN = "96"; //$NON-NLS-1$
-	
-	public static final String MODULE_NAME = "99"; //$NON-NLS-1$
-	public static final String MODULE_VERSION_LABEL = "100"; //$NON-NLS-1$
-
-	public static final String J2EE_UTILITY_JAR_LISTEAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS = "97"; //$NON-NLS-1$
-
-	public static final String FLEXIBLE_PROJECT_WIZ_TITLE = "FlexibleProjectCreationWizard.title"; //$NON-NLS-1$
-	public static final String FLEXIBLE_PROJECT_MAIN_PG_TITLE = "FlexibleProjectCreationWizard.mainPage.title"; //$NON-NLS-1$
-	public static final String FLEXIBLE_PROJECT_MAIN_PG_DESC = "FlexibleProjectCreationWizard.mainPage.desc"; //$NON-NLS-1$
-	public static final String EAR_COMPONENT_WIZ_TITLE = "EARComponentCreationWizard.title"; //$NON-NLS-1$
-	public static final String EAR_COMPONENT_MAIN_PG_TITLE = "EARComponentCreationWizard.mainPage.title"; //$NON-NLS-1$
-	public static final String EAR_COMPONENT_MAIN_PG_DESC = "EARComponentCreationWizard.mainPage.desc"; //$NON-NLS-1$
-	public static final String EAR_COMPONENT_SECOND_PG_TITLE = "EARComponentCreationWizard.secondPage.title"; //$NON-NLS-1$
-	public static final String EAR_COMPONENT_SECOND_PG_DESC = "EARComponentCreationWizard.secondPage.desc"; //$NON-NLS-1$
-	public static final String APPCLIENT_COMPONENT_WIZ_TITLE = "AppClientComponentCreationWizard.title"; //$NON-NLS-1$
-	public static final String APPCLIENT_COMPONENT_MAIN_PG_TITLE = "AppClientComponentCreationWizard.mainPage.title"; //$NON-NLS-1$
-	public static final String APPCLIENT_COMPONENT_MAIN_PG_DESC = "AppClientComponentCreationWizard.mainPage.desc"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_WIZ_TITLE = "DefaultJ2EEComponentCreationWizard.title"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_TITLE = "DefaultJ2EEComponentCreationWizard.page.title"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_DESC = "DefaultJ2EEComponentCreationWizard.page.desc"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_EJB_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.ejb"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_WEB_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.web"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_JCA_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.jca"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_APPCLIENT_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.appclient"; //$NON-NLS-1$
-	public static final String DEFAULT_COMPONENT_PAGE_NEW_MOD_SEL_PG_DEF_BTN = "DefaultJ2EEComponentCreationWizard.page.button.select"; //$NON-NLS-1$
-	
-	public final static String EMPTY_STRING = ""; //$NON-NLS-1$
-	public final static String FOLDER_LABEL = getResourceString("FOLDER_LABEL"); //$NON-NLS-1$
-	public final static String BROWSE_BUTTON_LABEL = getResourceString("BROWSE_BUTTON_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_PACKAGE_LABEL = getResourceString("JAVA_PACKAGE_LABEL"); //$NON-NLS-1$
-	public final static String CLASS_NAME_LABEL = getResourceString("CLASS_NAME_LABEL"); //$NON-NLS-1$
-	public final static String SUPERCLASS_LABEL = getResourceString("SUPERCLASS_LABEL"); //$NON-NLS-1$
-	public final static String CONTAINER_SELECTION_DIALOG_TITLE = getResourceString("CONTAINER_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
-	public final static String CONTAINER_SELECTION_DIALOG_DESC = getResourceString("CONTAINER_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
-	public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = getResourceString("CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG"); //$NON-NLS-1$
-	public final static String PACKAGE_SELECTION_DIALOG_TITLE = getResourceString("PACKAGE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
-	public final static String PACKAGE_SELECTION_DIALOG_DESC = getResourceString("PACKAGE_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
-	public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = getResourceString("PACKAGE_SELECTION_DIALOG_MSG_NONE"); //$NON-NLS-1$
-	public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = getResourceString("SUPERCLASS_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
-	public final static String SUPERCLASS_SELECTION_DIALOG_DESC = getResourceString("SUPERCLASS_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_MODIFIERS_LABEL = getResourceString("JAVA_CLASS_MODIFIERS_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_INTERFACES_LABEL = getResourceString("JAVA_CLASS_INTERFACES_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_METHOD_STUBS_LABEL = getResourceString("JAVA_CLASS_METHOD_STUBS_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_PUBLIC_CHECKBOX_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_FINAL_CHECKBOX_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_MAIN_CHECKBOX_LABEL"); //$NON-NLS-1$
-	public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_INHERIT_CHECKBOX_LABEL"); //$NON-NLS-1$
-	public final static String ADD_BUTTON_LABEL = getResourceString("ADD_BUTTON_LABEL"); //$NON-NLS-1$
-	public static final String REMOVE_BUTTON = getResourceString("REMOVE_BUTTON"); //$NON-NLS-1$
-	public static final String BINARY = getResourceString("BINARY"); //$NON-NLS-1$
-	public final static String INTERFACE_SELECTION_DIALOG_TITLE = getResourceString("INTERFACE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
-
-	public static final String JAVAUTIL_COMPONENT_WIZ_TITLE="JAVAUTIL_COMPONENT_WIZ_TITLE"; //$NON-NLS-1$
-	public static final String JAVAUTILITY_MAIN_PG_TITLE = "JAVAUTILITY_MAIN_PG_TITLE";//$NON-NLS-1$
-	public final static String JAVAUTILITY_MAIN_PG_DESC = "JAVAUTILITY_MAIN_PG_DESC";//$NON-NLS-1$
-	public static final String AVAILABLE_J2EE_COMPONENTS="AVAILABLE_J2EE_COMPONENTS"; //$NON-NLS-1$
-	public static final String EXTERNAL_JAR="EXTERNAL_JAR";//$NON-NLS-1$
-	public static final String PROJECT_JAR="PROJECT_JAR";//$NON-NLS-1$
-	public static final String ADDVARIABLE="ADDVARIABLE";//$NON-NLS-1$
-	public static final String SUPPORTMULTIPLEMODULES="SUPPORTMULTIPLEMODULES";//$NON-NLS-1$
-	public static final String SOURCEFOLDER="SOURCEFOLDER";//$NON-NLS-1$
-	public static final String CONTENT_FOLDER = "102"; //$NON-NLS-1$
-
-	/**
-	 * Returns the string from the resource bundle, or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		return INSTANCE.doGetResourceString(key);
-	}
-
-	public static String getResourceString(String key, Object[] args) {
-		return INSTANCE.doGetResourceString(key, args);
-	}
-
-	private J2EEUIMessages() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.Messages#initializeBundle()
-	 */
-	protected void initializeBundle() {
-		try {
-			resourceBundle = ResourceBundle.getBundle("j2ee_ui"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			//Ignore
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java
deleted file mode 100644
index 0a4045952..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java
+++ /dev/null
@@ -1,335 +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.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashSet;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.internal.wizard.ImportUtil;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class J2EEUIPlugin extends AbstractUIPlugin {
-
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.ui"; //$NON-NLS-1$
-
-	//The shared instance.
-	private static J2EEUIPlugin plugin;
-	private static IPath location;
-
-	/**
-	 * The constructor.
-	 */
-	public J2EEUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static J2EEUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	public static IPath getInstallLocation() {
-		if (location == null) {
-			URL url = getInstallURL();
-			try {
-				String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
-				location = new Path(installLocation);
-			} catch (IOException e) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
-			}
-		}
-		return location;
-	}
-
-	public static URL getInstallURL() {
-		return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-	public static String getArchiveDefaultProjectName(Archive anArchive) {
-		if (anArchive == null)
-			return null;
-		int type = getArchiveType(anArchive);
-		return getTypeDefaultProjectName(anArchive.getURI(), type);
-	}
-
-	public static String getArchiveDefaultUtilProjectName(Archive anArchive) {
-		if (anArchive == null)
-			return null;
-		int type = getArchiveType(anArchive);
-		return getTypeDefaultUtilProjectName(anArchive.getName(), type);
-	}
-
-	public static String getArchiveDefaultProjectName(Archive anArchive, HashSet moduleNames) {
-		if (anArchive == null)
-			return null;
-		int type = getArchiveType(anArchive);
-		return getTypeDefaultProjectName(anArchive.getURI(), type, moduleNames);
-	}
-
-	public static int getArchiveType(Archive anArchive) {
-		int type = ImportUtil.UNKNOWN;
-		try {
-			try {
-				if (anArchive.isEJBJarFile())
-					type = ImportUtil.EJBJARFILE;
-				else if (anArchive.isWARFile())
-					type = ImportUtil.WARFILE;
-				else if (anArchive.isApplicationClientFile())
-					type = ImportUtil.CLIENTJARFILE;
-				else if (anArchive.isRARFile())
-					type = ImportUtil.RARFILE;
-				else if (anArchive.isEARFile())
-					type = ImportUtil.EARFILE;
-			} catch (Exception e) {
-				//Ignore
-			}
-		} finally {
-			if (anArchive != null)
-				anArchive.close();
-		}
-		return type;
-	}
-
-	public static String getTypeDefaultProjectName(String text, int type) {
-		IPath path = new Path(text);
-		text = path.makeRelative().removeFileExtension().lastSegment();
-
-		boolean exists = false;
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(text);
-		if (project != null && project.exists())
-			exists = true;
-		if (exists && text.toLowerCase().indexOf(ImportUtil.SUFFIXES[type].toLowerCase()) == -1)
-			text = text + ImportUtil.SUFFIXES[type];
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int j = 1; j < 10; j++) {
-			boolean found = false;
-			String iteratedProjectName = text + ((j == 1) ? "" : Integer.toString(j)); //$NON-NLS-1$
-			for (int i = 0; !found && (i < projects.length); i++) {
-				if ((projects[i]).getName().equalsIgnoreCase(iteratedProjectName)) {
-					found = true;
-				}
-			}
-			if (!found)
-				return iteratedProjectName;
-		}
-		return text;
-	}
-
-	private static String getTypeDefaultProjectName(String text, int type, HashSet moduleNames) {
-		IPath path = new Path(text);
-		text = path.makeRelative().removeFileExtension().lastSegment();
-
-		boolean isValidName = moduleNames.add(text);
-		boolean exists = false;
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(text);
-		if (project != null && project.exists())
-			exists = true;
-		if (!isValidName || (exists && text.toLowerCase().indexOf(ImportUtil.SUFFIXES[type].toLowerCase()) == -1))
-			text = text + ImportUtil.SUFFIXES[type];
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int j = 1; j < 10; j++) {
-			boolean found = false;
-			String iteratedProjectName = text + ((j == 1) ? "" : Integer.toString(j)); //$NON-NLS-1$
-			for (int i = 0; !found && (i < projects.length); i++) {
-				if ((projects[i]).getName().equalsIgnoreCase(iteratedProjectName)) {
-					found = true;
-				}
-			}
-			if (!found)
-				return iteratedProjectName;
-		}
-		return text;
-	}
-
-	// the following two methods are used by web editor
-
-	private static String getTypeDefaultUtilProjectName(String text, int type) {
-		text = text.substring(text.lastIndexOf(java.io.File.separator) + 1);
-		int i = text.lastIndexOf('.');
-		if (i > 0)
-			text = text.substring(0, i);
-		if (text.toLowerCase().indexOf(ImportUtil.SUFFIXES[type].toLowerCase()) == -1)
-			text = text + ImportUtil.SUFFIXES[type];
-		IProject[] projects = getWorkspace().getRoot().getProjects();
-		for (int j = 0; j < 10; j++) {
-			boolean found = false;
-			String iteratedProjectName = text + ((j == 0) ? "" : Integer.toString(j)); //$NON-NLS-1$
-			for (i = 0; !found && (i < projects.length); i++) {
-				if ((projects[i]).getName().equalsIgnoreCase(iteratedProjectName)) {
-					found = true;
-				}
-			}
-			if (!found)
-				return iteratedProjectName;
-		}
-		return text;
-	}
-
-	/**
-	 * Get a .gif from the image registry.
-	 */
-	public Image getImage(String key) {
-		ImageRegistry imageRegistry = getImageRegistry();
-		Image image = imageRegistry.get(key);
-		if (image == null || image.isDisposed()) {
-			ImageDescriptor descriptor = getImageDescriptor(key);
-			if (descriptor != null) {
-				image = descriptor.createImage();
-				imageRegistry.put(key, image);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public ImageDescriptor getImageDescriptor(String key) {
-		ImageDescriptor imageDescriptor = null;
-		URL gifImageURL = getImageURL(key);
-		if (gifImageURL != null)
-			imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
-		return imageDescriptor;
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	private URL getImageURL(String key) {
-		return J2EEPlugin.getImageURL(key, getBundle());
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getPluginWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Return the workbench
-	 * 
-	 * This method is internal to the j2ee plugin and must not be called by any other plugins.
-	 */
-
-	public static IWorkbench getPluginWorkbench() {
-		return getDefault().getWorkbench();
-
-	}
-
-	public static IStructuredSelection getCurrentSelection() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null) {
-			ISelection selection = window.getSelectionService().getSelection();
-			if (selection instanceof IStructuredSelection) {
-				return (IStructuredSelection) selection;
-			}
-
-		}
-		return null;
-	}
-
-	
-	/**
-	 * Record an error against this plugin's log. 
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param anException
-	 */
-	public static void logError(int aCode, String aMessage,
-			Throwable anException) {
-		getDefault().getLog().log(
-				createErrorStatus(aCode, aMessage, anException));
-	}
-
-	/**
-	 * 
-	 * Record a message against this plugin's log. 
-	 * 
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 */
-	public static void log(int severity, int aCode, String aMessage,
-			Throwable exception) {
-		log(createStatus(severity, aCode, aMessage, exception));
-	}
-
-	/**
-	 * 
-	 * Record a status against this plugin's log. 
-	 * 
-	 * @param aStatus
-	 */
-	public static void log(IStatus aStatus) {
-		getDefault().getLog().log(aStatus);
-	}
-
-	/**
-	 * Create a status associated with this plugin.
-	 *  
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createStatus(int severity, int aCode,
-			String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode,
-				aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createErrorStatus(int aCode, String aMessage,
-			Throwable exception) {
-		return createStatus(IStatus.ERROR, aCode, aMessage, exception);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java
deleted file mode 100644
index 674084238..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java
+++ /dev/null
@@ -1,55 +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 Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class J2EEUIPluginIcons {
-
-	public static String EAR_IMPORT_WIZARD_BANNER = "import_ear_wiz"; //$NON-NLS-1$
-	public static final String JCA_IMPORT_WIZARD_BANNER = "import_rar_wiz"; //$NON-NLS-1$
-	public static final String EJB_IMPORT_WIZARD_BANNER = "import_ejbjar_wiz"; //$NON-NLS-1$
-	public static final String APP_CLIENT_IMPORT_WIZARD_BANNER = "import_appclient_wiz"; //$NON-NLS-1$
-	public static final String WEB_IMPORT_WIZARD_BANNER = "import_war_wiz"; //$NON-NLS-1$
-	public static final String EAR_WIZ_BANNER = "ear_wiz"; //$NON-NLS-1$
-	public static final String APP_CLIENT_PROJECT_WIZARD_BANNER = "appclient_wiz"; //$NON-NLS-1$
-	//EJB Icons
-	public static final String EJB_PROJECT_WIZARD_BANNER = "ejbproject_wiz"; //$NON-NLS-1$
-	//WEB Icons
-	public static final String WEB_PROJECT_WIZARD_BANNER = "war_wiz"; //$NON-NLS-1$
-	//JCA Icons
-	public static final String JCA_PROJECT_WIZARD_BANNER = "connector_wiz"; //$NON-NLS-1$
-	public static final String APP_CLIENT_EXPORT_WIZARD_BANNER = "export_appclient_wiz"; //$NON-NLS-1$
-	public static final String EJB_EXPORT_WIZARD_BANNER = "export_ejbjar_obj"; //$NON-NLS-1$;
-	public static final String WEB_EXPORT_WIZARD_BANNER = "export_war_wiz"; //$NON-NLS-1$;
-	public static final String JCA_EXPORT_WIZARD_BANNER = "export_rar_wiz"; //$NON-NLS-1$;
-	public static final String EAR_EXPORT_WIZARD_BANNER = "export_ear_wiz"; //$NON-NLS-1$;
-
-	//Migration Wizard Icons
-
-	public static final String WARNING_TASK = "showwarn_tsk"; //$NON-NLS-1$
-
-	public static final String CLIENT_BANNER = "ejbclientjar_wizban"; //$NON-NLS-1$
-
-	public static final String MIGRATION_WIZARD_BANNER = "versionmigrate3_wiz"; //$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/plugin/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java
deleted file mode 100644
index 27dcf804b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java
+++ /dev/null
@@ -1,53 +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.plugin;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-public class J2EEViewerSorter extends ViewerSorter {
-
-	/**
-	 * Constructor for J2EEViewerSorter.
-	 */
-	public J2EEViewerSorter() {
-		super();
-	}
-
-
-
-	/**
-	 * @see ViewerSorter#compare(Viewer, Object, Object)
-	 */
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		if (shouldSort(e1, e2))
-			return super.compare(viewer, e1, e2);
-		return 0;
-	}
-
-	protected boolean isEnterpriseBean(Object o) {
-		return o instanceof EnterpriseBean;
-	}
-
-	protected boolean isDeploymentDescriptorRoot(Object o) {
-		return CommonUtil.isDeploymentDescriptorRoot(o);
-	}
-
-	protected boolean shouldSort(Object e1, Object e2) {
-		return (isDeploymentDescriptorRoot(e1) && isDeploymentDescriptorRoot(e2)) || (isEnterpriseBean(e1) && isEnterpriseBean(e2)) || ((e1 instanceof IFile) && (e2 instanceof IFile));
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
deleted file mode 100644
index 6b9405082..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
+++ /dev/null
@@ -1,154 +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 Feb 2, 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.plugin;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Utility class for retrieving the project from the specified selection
- */
-public class UIProjectUtilities {
-
-	/**
-	 * @param selection
-	 *            The current selection
-	 * @return The first project (regardless of nature) in the selection
-	 */
-	public static IProject getSelectedProject(IStructuredSelection selection) {
-		return getSelectedProject(selection, (String[]) null);
-	}
-
-	/**
-	 * @param selection
-	 *            The current selection
-	 * @param expectedNatureId
-	 *            The required Nature ID
-	 * @return The first project, only if the first project has the given nature
-	 */
-	public static IProject getSelectedProject(IStructuredSelection selection, String expectedNatureId) {
-		return getSelectedProject(selection, new String[] {expectedNatureId});
-	}
-
-	/**
-	 * 
-	 * @param selection
-	 *            The current selection
-	 * @param possibleNatureIds
-	 *            A list of possible nature ids
-	 * @return The first project selected, only if it has AT LEAST ONE of the possible nature ids
-	 */
-	public static IProject getSelectedProject(IStructuredSelection selection, String[] possibleNatureIds) {
-		IProject[] projects = getAllSelectedProjects(selection, possibleNatureIds);
-		if (projects == null || projects.length==0)
-			return null;
-		return projects[0];
-	}
-
-	/**
-	 * 
-	 * @param selection
-	 *            The current selection
-	 * @return All selected Projects, regardless of nature
-	 */
-	public static IProject[] getAllSelectedProjects(IStructuredSelection selection) {
-		return getAllSelectedProjects(selection, (String[]) null);
-	}
-
-	/**
-	 * 
-	 * @param selection
-	 *            The current selection
-	 * @param expectedNatureId
-	 *            The expected nature id
-	 * @return All selected Projects which have the expected nature id
-	 */
-	public static IProject[] getAllSelectedProjects(IStructuredSelection selection, String expectedNatureId) {
-		return getAllSelectedProjects(selection, new String[] {expectedNatureId});
-	}
-
-	/**
-	 * 
-	 * @param selection
-	 *            The current selection
-	 * @param possibleNatureIds
-	 *            a list of possible nature ids
-	 * @return All selected Projects which have AT LEAST ONE of the given nature ids
-	 */
-	public static IProject[] getAllSelectedProjects(IStructuredSelection selection, String[] possibleNatureIds) {
-		if (selection != null && !selection.isEmpty()) {
-			Object obj = null;
-			List projects = new ArrayList();
-			Iterator selectionIterator = selection.iterator();
-			while (selectionIterator.hasNext()) {
-				obj = selectionIterator.next();
-				IProject project = null;
-				if (obj instanceof IProject)
-					project = (IProject) obj;
-				else if (obj instanceof IAdaptable) {
-					project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class);
-					if (project == null) {
-						//Check for IJavaElements.
-						IJavaElement javaElement = (IJavaElement) ((IAdaptable) obj).getAdapter(IJavaElement.class);
-						if (javaElement != null) {
-							project = javaElement.getJavaProject().getProject();
-						}
-					}
-				}
-				// Selection may not be adaptable to a project so continue trying to get selected project
-				if (project == null && obj instanceof EObject)
-					project = ProjectUtilities.getProject((EObject) obj);
-				else if (project == null && obj instanceof ItemProvider) {
-					Object temp = ((ItemProvider) obj).getParent(EObject.class);
-					if (temp != null && temp instanceof EObject)
-						project = ProjectUtilities.getProject((EObject) temp);
-				}
-				else if (project == null && obj instanceof IFile) 
-					project = ProjectUtilities.getProject(obj);
-
-				if (project != null && possibleNatureIds != null && possibleNatureIds.length > 0) {
-					try {
-						for (int i = 0; i < possibleNatureIds.length; i++)
-							if (project.hasNature(possibleNatureIds[i]))
-								projects.add(project);
-					} catch (CoreException e) {
-						//Ignore
-					}
-				} 
-				
-				else
-					projects.add(project);
-			}
-			IProject[] finalProjects = new IProject[projects.size()];
-			projects.toArray(finalProjects);
-			return finalProjects;
-		}
-		return new IProject[0];
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java
deleted file mode 100644
index f71fc3026..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java
+++ /dev/null
@@ -1,131 +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.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBJarItemProvider;
-
-
-public class J2EEAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-	protected MethodsProviderDelegate methodsProviderDelegate;
-	protected static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
-	protected List roots = new ArrayList();
-
-	/**
-	 * J2EEAdapterFactoryContentProvider constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 */
-	public J2EEAdapterFactoryContentProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
-		super(adapterFactory);
-		methodsProviderDelegate = new MethodsProviderDelegate(adapterFactory);
-	}
-
-	public Object getParent(Object object) {
-
-		if (MethodsProviderDelegate.providesContentFor(object))
-			return methodsProviderDelegate.getParent(object);
-
-		//Added so internalExpand() in AbstractTreeViewer knows that EJB's parent is now instance
-		// of J2EEItemProvider
-		//rather than EJBJar only if bean is root bean
-		if (object instanceof EnterpriseBean && GroupedEJBJarItemProvider.isRootBean((EnterpriseBean) object)) {
-			J2EEItemProvider provider = GroupedEJBJarItemProvider.getEJBItemProvider((EnterpriseBean) object);
-			if (provider != null) {
-				return provider;
-			}
-		}
-
-		Object parent = super.getParent(object);
-
-		//		if (parent == null) {
-		//			if (object instanceof EObject)
-		//				return J2EERoot.instance().groupFor((EObject) object);
-		//		}
-		return parent;
-	}
-
-	protected boolean isEMFEditObject(Object object) {
-		ITreeItemContentProvider treeItemContentProvider = (ITreeItemContentProvider) adapterFactory.adapt(object, ITreeItemContentProviderClass);
-		return treeItemContentProvider != null;
-	}
-
-	/*
-	 * @see ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-
-		if (MethodsProviderDelegate.providesContentFor(parentElement))
-			return methodsProviderDelegate.getChildren(parentElement);
-		else if (isEMFEditObject(parentElement))
-			return super.getChildren(parentElement);
-		else
-			return null;
-	}
-
-	/*
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getRoots(inputElement);
-		//		else if (MethodsProviderDelegate.providesContentFor(inputElement))
-		//			return methodsProviderDelegate.getChildren(inputElement);
-		//		return super.getElements(inputElement);
-	}
-
-	public Object[] getRoots(Object parent) {
-		if (roots.isEmpty()) {
-			Object[] j2eeGroups = super.getChildren(parent);
-			roots.addAll(Arrays.asList(j2eeGroups));
-		}
-		return roots.toArray();
-	}
-
-	/*
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (MethodsProviderDelegate.providesContentFor(element))
-			return methodsProviderDelegate.hasChildren(element);
-		else if (isEMFEditObject(element))
-			return super.hasChildren(element);
-		else
-			return false;
-	}
-
-	/**
-	 * @see IContentProvider#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (methodsProviderDelegate != null)
-			methodsProviderDelegate.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-	 */
-	public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
-		super.inputChanged(aViewer, oldInput, newInput);
-		methodsProviderDelegate.inputChanged(aViewer, oldInput, newInput);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java
deleted file mode 100644
index 5c2728ae4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java
+++ /dev/null
@@ -1,101 +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.provider;
-
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 10:40:41 PM)
- * 
- * @author: Administrator
- */
-public class J2EEAdapterFactoryLabelProvider extends AdapterFactoryLabelProvider {
-	// //$NON-NLS-1$
-	protected static final Class IItemLabelProviderClass = IItemLabelProvider.class;
-	private static final EStructuralFeature ROLE_NAME_SF = CommonPackage.eINSTANCE.getSecurityRole_RoleName();
-	private static final EStructuralFeature ROLES_SF = EjbFactoryImpl.getPackage().getMethodPermission_Roles();
-
-
-	/**
-	 * This is used for delegation to get labels for server objects, which don't fit into EMF edit
-	 */
-	protected WorkbenchLabelProvider wbLabelProvider;
-
-	public J2EEAdapterFactoryLabelProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
-		super(adapterFactory);
-		wbLabelProvider = new WorkbenchLabelProvider();
-	}
-
-	public Image getImage(Object object) {
-		if (object instanceof J2EEJavaClassProviderHelper)
-			return ((J2EEJavaClassProviderHelper) object).getImage();
-		else if (isEMFEditObject(object))
-			return super.getImage(object);
-		else if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
-			return super.getImage(((AbstractMethodsContentProvider.EJBMethodItem) object).ejb);
-		else if (object instanceof File) {
-			URL url = (URL) J2EEPlugin.getPlugin().getImage("jar_obj"); //$NON-NLS-1$
-			return ImageDescriptor.createFromURL(url).createImage();
-		}
-		return wbLabelProvider.getImage(object);
-	}
-
-	public String getText(Object object) {
-
-		if (object instanceof J2EEJavaClassProviderHelper)
-			return ((J2EEJavaClassProviderHelper) object).getText();
-		else if (isEMFEditObject(object)) {
-			if (CommonUtil.isDeploymentDescriptorRoot(object))
-				return J2EEUIMessages.getResourceString("Deployment_Descriptor_UI_") + ": " + super.getText(object); //$NON-NLS-1$ //$NON-NLS-2$ 
-			return super.getText(object);
-		} else if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
-			return super.getText(((AbstractMethodsContentProvider.EJBMethodItem) object).ejb);
-		else if (object instanceof IFile) {
-			return ((IFile) object).getName();
-		} else if (object instanceof File) {
-			return ((File)object).getName();
-		}
-		return wbLabelProvider.getText(object);
-	}
-
-	protected boolean isEMFEditObject(Object object) {
-		IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProviderClass);
-		return itemLabelProvider != null;
-	}
-
-	/*
-	 * @see INotifyChangedListener#notifyChanged(new ENotificationImpl((InternalEObject)Object,
-	 *      int,(EStructuralFeature) Object, Object, Object, int))
-	 */
-	public void notifyChanged(Notification notification) {
-		Object feature = notification.getFeature();
-		if (feature == ROLE_NAME_SF || feature == ROLES_SF)
-			fireLabelProviderChanged();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java
deleted file mode 100644
index 4da17fc59..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java
+++ /dev/null
@@ -1,194 +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.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EENotificationImpl;
-
-public class J2EEApplicationItemProvider extends ApplicationItemProvider implements IAdaptable {
-
-	protected static final Class IRESOURCE_CLASS = IResource.class;
-	protected static final Class IPROJECT_CLASS = IProject.class;
-
-	protected Map children = new HashMap();
-	protected List resourceAdapters = null;
-
-	/**
-	 * Constructor for J2EEApplicationItemProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public J2EEApplicationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * @see ItemProviderAdapter#getChildren(Object)
-	 */
-	public Collection getChildren(Object object) {
-		List localChildren = (List) children.get(object);
-		if (localChildren == null)
-			return initChildren(object);
-		return localChildren;
-	}
-
-	protected List initChildren(Object object) {
-		Application app = (Application) object;
-		List localChildren = new ArrayList(2);
-		// MDE: changed getParent(object) to just app
-		localChildren.add(new ModulesItemProvider(getAdapterFactory(), null, null, app));
-
-		// IProject project = ProjectUtilities.getProject(app);
-		// IVirtualComponent ear = ComponentUtilities.findComponent(app);
-		// TODO switch to retrieve referenceComponents
-		// EAREditModel editModel = null;
-		// try {
-		// EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-		// if (runtime != null) {
-		// editModel = runtime.getEarEditModelForRead(this);
-		// EARProjectMap map = editModel.getEARProjectMap();
-		// localChildren.add(map);
-		// map.eResource().eAdapters().add(getNewAdapter(app));
-		// }
-		// } finally {
-		// if (editModel != null)
-		// editModel.releaseAccess(this);
-		// }
-		localChildren.add(new J2EEUtilityJarItemProvider(app, getAdapterFactory(), this));
-
-		children.put(object, localChildren);
-		return localChildren;
-	}
-
-	protected ModulesItemProvider getModulesNode(Object object) {
-		return (ModulesItemProvider) ((List) getChildren(object)).get(0);
-	}
-
-
-	/**
-	 * @see Adapter#notifyChanged(new ENotificationImpl((InternalEObject)Notifier,
-	 *      int,(EStructuralFeature) EObject, Object, Object, int))
-	 * @deprecated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Application.class)) {
-			case ApplicationPackage.APPLICATION__MODULES :
-				break;
-			default :
-				super.notifyChanged(notification);
-		}
-		if (notification.getEventType() == Notification.REMOVING_ADAPTER && notification.getOldValue() == this)
-			children.remove(notification.getNotifier());
-		else if (notification.getFeature() == ApplicationFactoryImpl.getPackage().getApplication_Modules())
-			modulesChanged((Application) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
-	}
-
-	protected void modulesChanged(Application app, int eventType, Object oldValue, Object newValue, int pos) {
-		ModulesItemProvider provider = getModulesNode(app);
-		Collection grandChildren = provider.getChildren();
-		switch (eventType) {
-			case Notification.ADD : {
-				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;
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		List adapters = getResourceAdapters();
-		ResourceAdapter adapter = null;
-		for (int i = 0; i < adapters.size(); i++) {
-			adapter = (ResourceAdapter) adapters.get(i);
-			adapter.getTarget().eAdapters().remove(adapter);
-		}
-	}
-
-	protected class ResourceAdapter extends AdapterImpl {
-
-		private Application app = null;
-
-		public ResourceAdapter(Application app) {
-			this.app = app;
-		}
-
-		public void notifyChanged(Notification notification) {
-
-			Resource res = (Resource) notification.getNotifier();
-			if (notification.getEventType() == Notification.SET && notification.getFeatureID(null) == Resource.RESOURCE__IS_LOADED && !res.isLoaded()) {
-				J2EEApplicationItemProvider.this.children.remove(app);
-				res.eAdapters().remove(ResourceAdapter.this);
-				fireNotifyChanged(new J2EENotificationImpl(app, Notification.MOVE, (Object) null, (Object) null, 0));
-
-			}
-		}
-	}
-
-	protected ResourceAdapter getNewAdapter(Application key) {
-		ResourceAdapter adapter = new ResourceAdapter(key);
-		getResourceAdapters().add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * @return Returns the resourceAdapters.
-	 */
-	protected List getResourceAdapters() {
-		if (resourceAdapters == null)
-			resourceAdapters = new ArrayList();
-		return resourceAdapters;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java
deleted file mode 100644
index 0434b30f5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,34 +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.provider;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProviderAdapterFactory;
-
-
-public class J2EEApplicationItemProviderAdapterFactory extends ApplicationItemProviderAdapterFactory {
-
-	/**
-	 * Constructor for J2EEApplicationAdapterFactory.
-	 */
-	public J2EEApplicationItemProviderAdapterFactory() {
-		super();
-	}
-
-	/**
-	 * @see ApplicationAdapterFactory#createApplicationAdapter()
-	 */
-	public Adapter createApplicationAdapter() {
-		return new J2EEApplicationItemProvider(this);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEBinaryModulesItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEBinaryModulesItemProvider.java
deleted file mode 100644
index 3efcf0b21..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEBinaryModulesItemProvider.java
+++ /dev/null
@@ -1,34 +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.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public class J2EEBinaryModulesItemProvider extends J2EEItemProvider {
-
-	public J2EEBinaryModulesItemProvider(Application app, AdapterFactory adapterFactory, Collection children) {
-		super(adapterFactory, children);
-	}
-
-	public String getText(Object obj) {
-		return J2EEUIMessages.BINARY;
-	}
-
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java
deleted file mode 100644
index ab07bd12f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java
+++ /dev/null
@@ -1,152 +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.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.CreateCopyCommand;
-import org.eclipse.emf.edit.command.DragAndDropCommand;
-import org.eclipse.emf.edit.command.InitializeCopyCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.OverrideableCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.ReplaceCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-
-/**
- * Custom editing domain which provides hooks for creating override commands; should not be used
- * directly but can be subclassed to override commands as necessary. All the override methods by
- * default return null, so a subclass may override only a subset of the commands.
- */
-public class J2EEEditingDomain extends AdapterFactoryEditingDomain {
-	/**
-	 * J2EEEditingDomain constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 * @param commandStack
-	 *            CommandStack
-	 */
-	public J2EEEditingDomain(org.eclipse.emf.common.notify.AdapterFactory adapterFactory, CommandStack commandStack) {
-		super(adapterFactory, commandStack);
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createAddOverrideCommand(AddCommand addCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createCopyToClipboardOverrideCommand(CopyToClipboardCommand copyToClipboardCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createCreateCopyOverrideCommand(CreateCopyCommand createCopyCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createDragAndDropOverrideCommand(DragAndDropCommand dragAndDropCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createInitializeCopyOverrideCommand(InitializeCopyCommand initializeCopyCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createMoveOverrideCommand(MoveCommand moveCommand) {
-		return null;
-	}
-
-	public Command createOverrideCommand(OverrideableCommand command) {
-		if (command instanceof AddCommand) {
-			AddCommand addCommand = (AddCommand) command;
-			return createAddOverrideCommand(addCommand);
-		} else if (command instanceof RemoveCommand) {
-			RemoveCommand removeCommand = (RemoveCommand) command;
-			return createRemoveOverrideCommand(removeCommand);
-		} else if (command instanceof SetCommand) {
-			SetCommand setCommand = (SetCommand) command;
-			return createSetOverrideCommand(setCommand);
-		} else if (command instanceof ReplaceCommand) {
-			ReplaceCommand replaceCommand = (ReplaceCommand) command;
-			return createReplaceOverrideCommand(replaceCommand);
-		} else if (command instanceof MoveCommand) {
-			MoveCommand moveCommand = (MoveCommand) command;
-			return createMoveOverrideCommand(moveCommand);
-		} else if (command instanceof CreateCopyCommand) {
-			CreateCopyCommand createCopyCommand = (CreateCopyCommand) command;
-			return createCreateCopyOverrideCommand(createCopyCommand);
-		} else if (command instanceof InitializeCopyCommand) {
-			InitializeCopyCommand initializeCopyCommand = (InitializeCopyCommand) command;
-			return createInitializeCopyOverrideCommand(initializeCopyCommand);
-		} else if (command instanceof CopyToClipboardCommand) {
-			CopyToClipboardCommand copyToClipboardCommand = (CopyToClipboardCommand) command;
-			return createCopyToClipboardOverrideCommand(copyToClipboardCommand);
-		} else if (command instanceof PasteFromClipboardCommand) {
-			PasteFromClipboardCommand pasteFromClipboardCommand = (PasteFromClipboardCommand) command;
-			return createPasteFromClipboardOverrideCommand(pasteFromClipboardCommand);
-		} else if (command instanceof DragAndDropCommand) {
-			DragAndDropCommand dragAndDropCommand = (DragAndDropCommand) command;
-			return createDragAndDropOverrideCommand(dragAndDropCommand);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createPasteFromClipboardOverrideCommand(PasteFromClipboardCommand pasteFromClipboardCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createRemoveOverrideCommand(RemoveCommand removeCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createReplaceOverrideCommand(ReplaceCommand replaceCommand) {
-		return null;
-	}
-
-	/**
-	 * The default is not to override this command; subclasses can override if necessary
-	 */
-	protected Command createSetOverrideCommand(SetCommand setCommand) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEModulemapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEModulemapItemProviderAdapterFactory.java
deleted file mode 100644
index 4d620b019..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEModulemapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,32 +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.provider;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-
-public class J2EEModulemapItemProviderAdapterFactory extends ModulemapItemProviderAdapterFactory {
-
-	/**
-	 * Constructor for J2EEModulemapItemProviderAdapterFactory.
-	 */
-	public J2EEModulemapItemProviderAdapterFactory() {
-		super();
-	}
-
-	/**
-	 * @see ModulemapAdapterFactory#createEARProjectMapAdapter()
-	 */
-	public Adapter createEARProjectMapAdapter() {
-		return new J2EEUtilityJavaProjectsItemProvider(this, false);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java
deleted file mode 100644
index 3839ba39c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.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.provider;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-public class J2EEProviderUtility {
-
-	private J2EEProviderUtility() {
-		super();
-	}
-
-	public static String prependProjectName(EObject object, String label) {
-		String projectName = null;
-		if (object.eResource() != null) {
-			IProject proj = WorkbenchResourceHelper.getProject(object.eResource());
-			if (proj != null)
-				projectName = proj.getName();
-		}
-
-		if (projectName == null || projectName.equals(label))
-			return label;
-		else if (label == null || label.length() == 0)
-			return projectName;
-		else
-			return projectName + ": " + label; //$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/provider/J2EEUIEditingDomain.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java
deleted file mode 100644
index 4ce6309ac..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java
+++ /dev/null
@@ -1,73 +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.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EEClipboard;
-import org.eclipse.jst.j2ee.internal.command.J2EECopyToClipboardOverrideCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EEPasteFromClipboardOverrideCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EERemoveOverrideCommand;
-
-
-public class J2EEUIEditingDomain extends J2EEEditingDomain {
-	/**
-	 * J2EEUIEditingDomain constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 * @param commandStack
-	 *            CommandStack
-	 */
-	public J2EEUIEditingDomain(org.eclipse.emf.common.notify.AdapterFactory adapterFactory, CommandStack commandStack) {
-		super(adapterFactory, commandStack);
-		turnTraceOnIfDebugging();
-	}
-
-	protected Command createCopyToClipboardOverrideCommand(CopyToClipboardCommand copyToClipboardCommand) {
-
-		if (copyToClipboardCommand instanceof J2EECopyToClipboardOverrideCommand)
-			return null;
-		return new J2EECopyToClipboardOverrideCommand(copyToClipboardCommand);
-	}
-
-	protected Command createPasteFromClipboardOverrideCommand(PasteFromClipboardCommand pasteFromClipboardCommand) {
-		if (pasteFromClipboardCommand instanceof J2EEPasteFromClipboardOverrideCommand)
-			return null;
-		if (!(getClipboard() instanceof J2EEClipboard))
-			return null;
-		return new J2EEPasteFromClipboardOverrideCommand(pasteFromClipboardCommand);
-	}
-
-	protected Command createRemoveOverrideCommand(RemoveCommand removeCommand) {
-		return new J2EERemoveOverrideCommand(removeCommand);
-	}
-
-	public J2EEClipboard getJ2EEClipboard() {
-		return (J2EEClipboard) getClipboard();
-	}
-
-	public Object getParent(Object object) {
-		Object parent = super.getParent(object);
-		if (parent != null)
-			return parent;
-		if (object instanceof EObject)
-			return ((EObject) object).eContainer();
-		return null;
-	}
-
-	protected void turnTraceOnIfDebugging() {
-		//AbstractCommand.Trace.enable();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
deleted file mode 100644
index 8f9d0d6ec..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
+++ /dev/null
@@ -1,301 +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.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-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.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-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.IVirtualReference;
-
-/**
- * @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 J2EEUtilityJarItemProvider extends J2EEItemProvider {
-
-	public final static String UTILITY_JARS = J2EEUIMessages.getResourceString("Utility_JARs_UI_"); //$NON-NLS-1$
-
-	private boolean childrenLoaded = false;
-	private Application application = null;
-
-	/**
-	 * Constructor for J2EEUtilityJarItemProvider.
-	 */
-	public J2EEUtilityJarItemProvider(Application app, AdapterFactory adapterFactory, Object parent) {
-		super(adapterFactory);
-		setParent(parent);
-		application = app;
-		UtilityJarResourceChangeListener.INSTANCE.addUtilityJarItemProvider(ProjectUtilities.getProject(application), this);
-	}
-
-	public boolean hasChildren(Object object) {
-		getChildren(object);
-		return !children.isEmpty();
-	}
-
-	public Collection getChildren(final Object object) {
-		if (!childrenLoaded) {
-			try {
-				disableNotification();
-				org.eclipse.swt.custom.BusyIndicator.showWhile(null, new Runnable() {
-					public void run() {
-						computeChildren();
-					}
-				});
-			} finally {
-				enableNotification();
-			}
-		}
-		return children;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		UtilityJarResourceChangeListener.INSTANCE.removeUtilityJarItemProvider(ProjectUtilities.getProject(application), this);
-
-	}
-
-	/**
-	 * @see ItemProvider#getChildren(Object)
-	 */
-	private void computeChildren() {
-		childrenLoaded = true;
-		IVirtualComponent ear = ComponentUtilities.findComponent(application);
-		if (ear != null) {
-			EARArtifactEdit earEdit = null;
-			try {
-				earEdit = EARArtifactEdit.getEARArtifactEditForRead(ear);
-				IVirtualReference[] modules = earEdit.getUtilityModuleReferences();
-				for (int i = 0; i < modules.length; i++) {
-					IVirtualComponent module = modules[i].getReferencedComponent();
-					if (module.isBinary()) {
-						VirtualArchiveComponent virtualArchiveComponent = (VirtualArchiveComponent) module;
-						java.io.File diskFile = virtualArchiveComponent.getUnderlyingDiskFile();
-						if (diskFile.exists())
-							children.add(diskFile);
-						else {
-							// we will assume the component name is in synch with the module uri
-							IFile utilityJar = virtualArchiveComponent.getUnderlyingWorkbenchFile();
-							if (utilityJar != null)
-								children.add(utilityJar);
-						}
-					} else {
-
-					}
-					if (module.getProject() == null || !module.getProject().isAccessible())
-						continue;
-					// return only jars for utility components
-					if (J2EEProjectUtilities.isUtilityProject(module.getProject())) {
-						IProject project = ProjectUtilities.getProject(application);
-						if (project == null)
-							continue;
-						// we will assume the component name is in synch with the module uri
-						IFile utilityJar = project.getFile(module.getName() + ".jar"); //$NON-NLS-1$
-						if (utilityJar != null)
-							children.add(utilityJar);
-					}
-				}
-			} finally {
-				if (earEdit != null) {
-					earEdit.dispose();
-				}
-			}
-		}
-	}
-
-	// private Collection getJars(List list, IResource[] members) {
-	// for (int i = 0; i < members.length; i++) {
-	// if (isJarFile(members[i])) {
-	// list.add(members[i]);
-	// } else if (members[i].getType() == IResource.FOLDER) {
-	// try {
-	// getJars(list, ((IFolder) members[i]).members());
-	// } catch (CoreException e) {
-	// Logger.getLogger().logError(e);
-	// }
-	// }
-	// }
-	// return list;
-	// }
-
-	public static boolean isJarFile(IResource member) {
-		return member.getType() == IResource.FILE && member.getName().toLowerCase().endsWith(".jar"); //$NON-NLS-1$
-	}
-
-	public static boolean isComponentFile(IResource member) {
-		return member.getType() == IResource.FILE && member.getName().toLowerCase().endsWith(IModuleConstants.COMPONENT_FILE_NAME);
-	}
-
-
-	/**
-	 * @see ItemProviderAdapter#getImage(Object)
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ItemProviderAdapter#getText(Object)
-	 */
-	public String getText(Object object) {
-		return UTILITY_JARS;
-	}
-
-	// assume this resource is a jar resource
-	public void utilityJarChanged(IResource resource, IResourceDelta delta) {
-		if (childrenLoaded) {
-			if (delta.getKind() == IResourceDelta.ADDED && !children.contains(resource)) {
-				children.add(resource);
-			} else if (delta.getKind() == IResourceDelta.REMOVED && children.contains(resource)) {
-				children.remove(resource);
-			}
-		}
-	}
-
-	protected static class UtilityJarResourceChangeListener implements IResourceChangeListener, IResourceDeltaVisitor {
-
-		protected static final UtilityJarResourceChangeListener INSTANCE = new UtilityJarResourceChangeListener();
-
-		private boolean listening = false;
-		private Map earProjectsToUtilityJarProviderMap;
-
-		public void addUtilityJarItemProvider(IProject project, J2EEUtilityJarItemProvider utilityJarItemProvider) {
-			List providers = getProviders(project);
-			if (providers != null)
-				providers.add(utilityJarItemProvider);
-			if (!listening) {
-				ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-				listening = true;
-			}
-		}
-
-		/**
-		 * @param project
-		 * @return
-		 */
-		private List getProviders(IProject project) {
-			List result = (List) getEarProjectsToUtilityJarProviderMap().get(project);
-			if (result == null && project != null)
-				getEarProjectsToUtilityJarProviderMap().put(project, (result = new ArrayList()));
-			return result;
-		}
-
-		/**
-		 * @return
-		 */
-		private Map getEarProjectsToUtilityJarProviderMap() {
-			if (earProjectsToUtilityJarProviderMap == null)
-				earProjectsToUtilityJarProviderMap = new HashMap();
-			return earProjectsToUtilityJarProviderMap;
-		}
-
-		public void removeUtilityJarItemProvider(IProject project, J2EEUtilityJarItemProvider utilityJarItemProvider) {
-			List providers = getProviders(project);
-			providers.remove(utilityJarItemProvider);
-			if (providers.isEmpty())
-				getEarProjectsToUtilityJarProviderMap().remove(project);
-
-			if (getEarProjectsToUtilityJarProviderMap().isEmpty()) {
-				ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-				listening = false;
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-		public void resourceChanged(IResourceChangeEvent event) {
-			try {
-				event.getDelta().accept(this);
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) {
-			switch (delta.getResource().getType()) {
-				case IResource.ROOT :
-				case IResource.FOLDER :
-					return true;
-
-				case IResource.PROJECT :
-					return getEarProjectsToUtilityJarProviderMap().containsKey(delta.getResource());
-				case IResource.FILE : {
-					IResource resource = delta.getResource();
-					if (isComponentFile(resource)) {
-						List utilityJarItemProviders = getProviders(resource.getProject());
-						for (int i = 0; i < utilityJarItemProviders.size(); i++) {
-							((J2EEUtilityJarItemProvider) utilityJarItemProviders.get(i)).getChildren().clear();
-							((J2EEUtilityJarItemProvider) utilityJarItemProviders.get(i)).computeChildren();
-						}
-					}
-					return false;
-				}
-
-			}
-			return false;
-		}
-	}
-
-	public IFile getAssociatedFile() {
-
-		try {
-			if (application != null && application.eResource() != null) {
-				return WorkbenchResourceHelperBase.getIFile(application.eResource().getURI());
-			}
-		} catch (Throwable t) {
-
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java
deleted file mode 100644
index 7a2fe62c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java
+++ /dev/null
@@ -1,54 +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.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public class J2EEUtilityJavaProjectsItemProvider extends EARProjectMapItemProvider {
-
-	public final static String UTILITY_JAVA_PROJECTS = J2EEUIMessages.getResourceString("Utility_Java_Projects_UI_"); //$NON-NLS-1$
-
-	/**
-	 * Constructor for UtilityJARsItemProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public J2EEUtilityJavaProjectsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * Constructor for UtilityJARsItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param includeModules
-	 */
-	public J2EEUtilityJavaProjectsItemProvider(AdapterFactory adapterFactory, boolean includeModules) {
-		super(adapterFactory, includeModules);
-	}
-
-	/**
-	 * @see ItemProviderAdapter#getImage(Object)
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ItemProviderAdapter#getText(Object)
-	 */
-	public String getText(Object object) {
-		return UTILITY_JAVA_PROJECTS;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java
deleted file mode 100644
index 1200806d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java
+++ /dev/null
@@ -1,119 +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.provider;
-
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.ExcludeListContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.MethodPermissionsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.MethodTransactionContentProvider;
-
-
-public class MethodsProviderDelegate implements ITreeContentProvider {
-
-	protected ExcludeListContentProvider excludeListContentProvider;
-	protected MethodPermissionsContentProvider methodPermissionsContentProvider;
-	protected MethodTransactionContentProvider methodTransactionContentProvider;
-
-	protected static EObject EL_META = EjbFactoryImpl.getPackage().getExcludeList();
-	protected static EObject MP_META = EjbFactoryImpl.getPackage().getMethodPermission();
-	protected static EObject MT_META = EjbFactoryImpl.getPackage().getMethodTransaction();
-
-	public static boolean providesContentFor(Object object) {
-		return object instanceof AbstractMethodsContentProvider.EJBMethodItem || object instanceof MethodPermission || object instanceof MethodTransaction || object instanceof ExcludeList;
-	}
-
-	public MethodsProviderDelegate(AdapterFactory adapterFactory) {
-		super();
-		excludeListContentProvider = new ExcludeListContentProvider(adapterFactory, false);
-		methodPermissionsContentProvider = new MethodPermissionsContentProvider(adapterFactory, false);
-		methodTransactionContentProvider = new MethodTransactionContentProvider(adapterFactory, false);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		if (excludeListContentProvider != null)
-			excludeListContentProvider.dispose();
-		if (methodPermissionsContentProvider != null)
-			methodPermissionsContentProvider.dispose();
-		if (methodTransactionContentProvider != null)
-			methodTransactionContentProvider.dispose();
-	}
-
-	public AbstractMethodsContentProvider getContentProvider(Object object) {
-		EObject metaClass = null;
-		if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
-			metaClass = ((AbstractMethodsContentProvider.EJBMethodItem) object).refObject.eClass();
-		else
-			metaClass = ((EObject) object).eClass();
-
-		if (metaClass == EL_META)
-			return excludeListContentProvider;
-		else if (metaClass == MP_META)
-			return methodPermissionsContentProvider;
-		else if (metaClass == MT_META)
-			return methodTransactionContentProvider;
-
-		return null;
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		excludeListContentProvider.inputChanged(viewer, oldInput, newInput);
-		methodPermissionsContentProvider.inputChanged(viewer, oldInput, newInput);
-		methodTransactionContentProvider.inputChanged(viewer, oldInput, newInput);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		AbstractMethodsContentProvider prov = getContentProvider(parentElement);
-		return prov == null ? null : prov.getChildren(parentElement);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		AbstractMethodsContentProvider prov = getContentProvider(element);
-		return prov == null ? null : prov.getParent(element);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		AbstractMethodsContentProvider prov = getContentProvider(element);
-		return prov != null && prov.hasChildren(element);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		AbstractMethodsContentProvider prov = getContentProvider(inputElement);
-		return prov == null ? null : prov.getElements(inputElement);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
deleted file mode 100644
index eed33a1e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
+++ /dev/null
@@ -1,317 +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.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class ModulesItemProvider extends J2EEItemProvider {
-	public static final String MODULES = J2EEUIMessages.getResourceString("Modules_UI_"); //$NON-NLS-1$
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 */
-	public ModulesItemProvider() {
-		super();
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param children
-	 */
-	public ModulesItemProvider(Collection children) {
-		super(children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param text
-	 */
-	public ModulesItemProvider(String text) {
-		super(text);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param text
-	 * @param children
-	 */
-	public ModulesItemProvider(String text, Collection children) {
-		super(text, children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 */
-	public ModulesItemProvider(String text, Object image) {
-		super(text, image);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 * @param children
-	 */
-	public ModulesItemProvider(String text, Object image, Collection children) {
-		super(text, image, children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 * @param parent
-	 */
-	public ModulesItemProvider(String text, Object image, Object parent) {
-		super(text, image, parent);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 * @param parent
-	 * @param children
-	 */
-	public ModulesItemProvider(String text, Object image, Object parent, Collection children) {
-		super(text, image, parent, children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, String text) {
-		super(adapterFactory, text);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image) {
-		super(adapterFactory, text, image);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 * @param parent
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent) {
-		super(adapterFactory, text, image, parent);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param children
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, Collection children) {
-		super(adapterFactory, children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param children
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, String text, Collection children) {
-		super(adapterFactory, text, children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 * @param children
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Collection children) {
-		super(adapterFactory, text, image, children);
-	}
-
-	/**
-	 * Constructor for ModulesItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 * @param parent
-	 * @param children
-	 */
-	public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
-		super(adapterFactory, text, image, parent, children);
-	}
-
-
-	/**
-	 * @see ItemProviderAdapter#getImage(Object)
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
-	}
-
-	public Application getParentApplication() {
-		return (Application) getParent();
-	}
-
-	public IFile getAssociatedFile() {
-
-		try {
-			Application application = getParentApplication();
-			if (application != null && application.eResource() != null) {
-				return WorkbenchResourceHelperBase.getIFile(application.eResource().getURI());
-			}
-		} catch (Throwable t) {
-
-		}
-		return null;
-	}
-
-
-	/**
-	 * @see IItemLabelProvider#getText(Object)
-	 */
-	public String getText(Object object) {
-		return MODULES;
-	}
-
-	public boolean hasChildren(Object object) {
-		getChildren(object);
-		return !localChildren.isEmpty();
-	}
-
-	private List localChildren = null;
-
-	public Collection getChildren(Object object) {
-		return initChildren(object);
-	}
-
-	protected List initChildren(Object object) {
-		localChildren = new ArrayList();
-		Application app = (Application) getParent();
-		IVirtualComponent ear = ComponentUtilities.findComponent(app);
-		List modules = app.getModules();
-		List binaryModules = new ArrayList();
-		IVirtualReference[] refs = ear.getReferences();
-		for (int i = 0; i < modules.size(); i++) {
-			Module module = (Module) modules.get(i);
-			String moduleURI = module.getUri();
-			boolean foundBinary = false;
-			for (int j = 0; j < refs.length && !foundBinary; j++) {
-				IVirtualComponent component = refs[j].getReferencedComponent();
-				if (component.isBinary()) {
-					if (refs[j].getArchiveName().equals(moduleURI)) {
-						ArtifactEdit edit = null;
-						try {
-							foundBinary = true;
-							Object binaryModule = null;
-							if (module.isWebModule()) {
-								WebArtifactEdit webEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
-								if (webEdit != null) {
-									edit = webEdit;
-									binaryModule = webEdit.getWebApp();
-								}
-							} else if (module.isJavaModule()) {
-								AppClientArtifactEdit appClientEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(component);
-								if (appClientEdit != null) {
-									edit = appClientEdit;
-									binaryModule = appClientEdit.getApplicationClient();
-								}
-							} else if (module.isEjbModule()) {
-								EJBArtifactEdit ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(component);
-								if (ejbEdit != null) {
-									edit = ejbEdit;
-									binaryModule = ejbEdit.getEJBJar();
-								}
-							} else if (module.isConnectorModule()) {
-								ConnectorArtifactEdit connectorEdit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(component);
-								if (connectorEdit != null) {
-									edit = connectorEdit;
-									binaryModule = connectorEdit.getConnector();
-								}
-							}
-							if (binaryModule != null) {
-								binaryModules.add(binaryModule);
-							}
-						} finally {
-							if (null != edit) {
-								edit.dispose();
-							}
-						}
-					}
-				}
-			}
-			if (!foundBinary) {
-				localChildren.add(module);
-			}
-		}
-
-		if (!binaryModules.isEmpty()) {
-			localChildren.add(new J2EEBinaryModulesItemProvider(app, getAdapterFactory(), binaryModules));
-		}
-
-		return localChildren;
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java
deleted file mode 100644
index 34d3fed83..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEPropertiesConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.internal.operation.IWebProjectPropertiesUpdateDataModelProperties;
-import org.eclipse.wst.web.internal.operation.WebProjectPropertiesUpdateDataModelProvider;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * 
- * 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 J2EEPropertiesPage extends PropertyPage implements J2EEPropertiesConstants  {
-	private int newSelectedIndex;
-	protected IProject project = null;
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	Text contextRootNameField, webContentFolderField;
-
-	
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Control control = null;
-		project = getProject();
-		if (project != null) {
-			Composite containerGroup = new Composite(parent, SWT.NONE );
-			control = containerGroup;
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 2;
-			
-			containerGroup.setLayout(layout);
-			
-			fillInformation(project, containerGroup);
-		}
-		return control;
-	}
-	
-	private void fillInformation(IProject p, Composite c) {
-		try {
-			if( J2EEProjectUtilities.getJ2EEProjectType(p).equals( J2EEProjectUtilities.DYNAMIC_WEB) ||
-						J2EEProjectUtilities.getJ2EEProjectType(p).equals( J2EEProjectUtilities.STATIC_WEB)	){
-				fillContextRoot(p,c);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	
-	
-	/**
-	 * @param p
-	 * @param c
-	 */
-
-	private void fillContextRoot(IProject p, Composite c) {
-		Label contextRootLabel = new Label(c, SWT.NULL);
-		contextRootLabel.setText(J2EEPropertiesConstants.WEB_CONTEXT_ROOT);
-		GridData data = new GridData();
-		data.horizontalIndent = 15;
-		contextRootLabel.setLayoutData(data);
-		
-		contextRootNameField = new Text(c, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		contextRootNameField.setLayoutData(data);
-		contextRootNameField.setEditable(true);
-		
-		String s = J2EEProjectUtilities.getServerContextRoot(p);
-		if( s == null ){
-			s = ""; //$NON-NLS-1$
-		}
-		contextRootNameField.setText(s);
-		
-		contextRootNameField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String newContextRoot = contextRootNameField.getText();
-				validateContextRoot(newContextRoot);
-			}
-        });
-		
-		
-	}
-
-
-	private IProject getProject() {
-		if (project == null) {
-			Object element = getElement();
-			if (element == null) {
-				return null;
-			}
-			if (element instanceof IProject) {
-				project = (IProject)element;
-				return project;
-			}
-			return null;
-		}
-		return project;
-	}
-
-	/**
-	 * @return
-	 */
-	private String getContextRoot() {
-		return (contextRootNameField != null) ? contextRootNameField.getText() : null;
-	}
-
-	protected boolean hasUpdatedInformation() {
-		return hasContextRootChanged();
- 	
-	 }
-	
-	private boolean hasContextRootChanged() {
-		String oldContextRoot = J2EEProjectUtilities.getServerContextRoot( project );
-		if (oldContextRoot == null) return true;
-		return !oldContextRoot.equals(getContextRoot());
-	}
-	
-
-	
-	protected void performDefaults() {
-		super.performDefaults();
-	
-		if (this.contextRootNameField != null)
-			contextRootNameField.setText(J2EEProjectUtilities.getServerContextRoot(project));
-		
-	}
-	
-	
-	public boolean performOk() {
-		boolean retVal = true;
-
-		IDataModel model = DataModelFactory.createDataModel( new WebProjectPropertiesUpdateDataModelProvider());
-		model.setProperty( IWebProjectPropertiesUpdateDataModelProperties.PROJECT, project );
-		model.setStringProperty( IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT, getContextRoot() );
-		try {
-			model.getDefaultOperation().execute( new NullProgressMonitor(), null );
-		} catch (ExecutionException e) {
-			Logger.getLogger().logError( e );
-		}
-		return retVal;
-	}
-	
-
-	 
-	 public void validateContextRoot(String name) {  
-        boolean bValid = true;
-        if (name == null) { 
-            //  this was added because the error message shouldnt be shown initially. It should be shown only if context
-            // root field is edited to
-            this.setErrorMessage(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2, new Object[0]));
-            bValid = false;
-        }
-
-        if (!(name.indexOf(' ') > -1)) {
-            StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
-            outer : while (stok.hasMoreTokens()) {
-                String token = stok.nextToken();
-                for (int i = 0; i < token.length(); i++) {
-                    if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
-                        if (Character.isWhitespace(token.charAt(i)) == false) {
-                        	this.setErrorMessage( ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root , new Object[] {(new Character(token.charAt(i))).toString()}));
-                        	bValid = false;
-                        }
-                    }
-                }
-            }
-        } // en/ end of if(name.trim
-        else {
-        	this.setErrorMessage(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_contain_whitespace_, new Object[0]));
-        	bValid = false;
-        }
-        if (bValid)   	this.setErrorMessage(null);
-        this.setValid(bValid);
-     
-    }
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java
deleted file mode 100644
index 5722db06e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java
+++ /dev/null
@@ -1,119 +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 Aug 18, 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.ui.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerHelper;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Add overlay for annotated objects
- */
-public class AnnotationIconDecorator extends LabelProvider implements ILightweightLabelDecorator {
-	
-	protected static final String ANNOTATION_IMAGE_DESC_STRING = "annotation_bean_overlay"; //$NON-NLS-1$
-	protected static final String ANNOTATION_DISABLED_IMAGE_DESC_STRING = "dis_annotation_bean_overlay"; //$NON-NLS-1$
-	private static final ImageDescriptor ANNOTATION_IMG_DESC = getImageDescriptor(ANNOTATION_IMAGE_DESC_STRING);
-	private static final ImageDescriptor ANNOTATION_DISABLED_IMG_DESC = getImageDescriptor(ANNOTATION_DISABLED_IMAGE_DESC_STRING);
-
-	public AnnotationIconDecorator() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object,
-	 *      org.eclipse.jface.viewers.IDecoration)
-	 */
-	private boolean isAnnotatedSupported(EObject target) {
-		boolean bAnnotationSupported = false;
-		if (AnnotationsControllerHelper.INSTANCE.isAnnotated(target)) {
-			bAnnotationSupported = true;
-		}
-		return bAnnotationSupported;
-	}
-
-	private AnnotationsController getControllerForProject(IProject targetProject) {
-		AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(targetProject);
-		return controller;
-	}
-
-	public void decorate(Object element, IDecoration decoration) {
-		EObject eObject = null;
-		if (element instanceof BeanClassProviderHelper) {
-			BeanClassProviderHelper beanClassHelper = (BeanClassProviderHelper) element;
-			eObject = beanClassHelper.getEjb();
-		} else if (element instanceof EnterpriseBean || element instanceof Servlet)
-			eObject = (EObject) element;
-		if (eObject == null)
-			return;
-		if (isAnnotatedSupported(eObject)) {
-			if (isAnnotationEnabled(eObject)) {
-				if (ANNOTATION_IMG_DESC != null)
-					decoration.addOverlay(ANNOTATION_IMG_DESC);
-			} else {
-				if (ANNOTATION_DISABLED_IMG_DESC != null)
-					decoration.addOverlay(ANNOTATION_DISABLED_IMG_DESC);
-			}
-		}
-	}
-
-	/**
-	 * @param bean
-	 * @return
-	 */
-	private boolean isAnnotationEnabled(EObject eObject) {
-		IFile annotatedSource = null;
-		/* short circuit if possible */
-		if (AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported()) {
-			IProject targetProject = ProjectUtilities.getProject(eObject);
-			AnnotationsController controller = getControllerForProject(targetProject);
-			if (controller != null)
-				annotatedSource = controller.getEnabledAnnotationFile(eObject);
-		}
-		return (annotatedSource != null) ? true : false;
-	}
-
-	public Image decorateImage(Image image, Object element) {
-		return image;
-	}
-
-	/**
-	 * @see ILabelDecorator#decorateText(String, Object)
-	 */
-	public String decorateText(String text, Object element) {
-		return text;
-	}
-
-	protected static ImageDescriptor getImageDescriptor(String imageFileName) {
-		if (imageFileName != null)
-			return J2EEUIPlugin.getDefault().getImageDescriptor(imageFileName);
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java
deleted file mode 100644
index 42056563f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java
+++ /dev/null
@@ -1,44 +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.ui.util;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-
-public class BinaryProjectUIHelper {
-
-	public static final String DIALOG_TITLE = J2EEUIMessages.getResourceString("BINARY_PROJECT"); //$NON-NLS-1$
-	public static final String DIALOG_MESSAGE = J2EEUIMessages.getResourceString("ACTION_CANNOT_BE_PERFORMED_ON_BIN_PROJECT"); //$NON-NLS-1$
-
-	/**
-	 * Constructor for BinaryProjectUIHelper.
-	 */
-	public BinaryProjectUIHelper() {
-		super();
-	}
-
-	public static void displayError(Shell parent) {
-		MessageDialog.openError(parent, DIALOG_TITLE, DIALOG_MESSAGE);
-		return;
-	}
-
-	public static boolean displayErrorIfBinaryProject(Shell parent, IProject aProject) {
-		boolean isBinary = JemProjectUtilities.isBinaryProject(aProject);
-		if (isBinary)
-			displayError(parent);
-		return isBinary;
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
deleted file mode 100644
index 25bf4b637..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
+++ /dev/null
@@ -1,241 +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 29, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-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.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppItemProvider;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEWebAppItemProvider extends WebAppItemProvider {
-
-	private List children = new ArrayList();
-	private boolean isInitializing = false;
-	private WebServletGroupItemProvider webServletGroup;
-	private WebServletMappingGroupItemProvider webServletMappingGroup;
-	private WebFiltersGroupItemProvider webFiltersGroup;
-	private WebFilterMappingGroupItemProvider webFilterMappingGroup;
-	private WebReferencesGroupItemProvider webRefsGroup;
-	private WebSecurityGroupItemProvider webSecurityGroup;
-	private J2EEWebServiceClientDDManager clientMgr;
-	private WebListenerGroupItemProvider webListenerGroup;
-
-	/**
-	 * Listen and fire updates for 1.3 web service clients
-	 */
-	private class J2EEWebServiceClientDDManager extends AdapterImpl implements EditModelListener {
-		private WeakReference weakWebApp;
-		WebServicesClient client;
-
-		public J2EEWebServiceClientDDManager(WeakReference weakWebApp) {
-			this.weakWebApp = weakWebApp;
-			init();
-		}
-
-		
-
-		public void init() {
-			// TODO fix up notification
-			// editModel = webServiceMgr.getWSEditModel(ProjectUtilities.getProject(webApp));
-			// if (editModel != null) {
-			// editModel.addListener(this);
-			// if (editModel.get13WebServicesClientResource() != null) {
-			// client = editModel.get13WebServicesClientResource().getWebServicesClient();
-			// if (client != null)
-			// client.eAdapters().add(this);
-			// }
-			// }
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-		 */
-		public void editModelChanged(EditModelEvent anEvent) {
-			// TODO fix up notification
-			// if (editModel == null)
-			// init();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification notification) {
-			if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
-				if (notification.getFeatureID(WebServicesClient.class) == Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS) {
-					NotificationWrapper notificationWrapper = new NotificationWrapper(webRefsGroup, notification);
-					fireNotifyChanged(notificationWrapper);
-				}
-			}
-			super.notifyChanged(notification);
-		}
-
-		public void dispose() {
-			// TODO fix up notification
-			
-			webServletGroup.dispose();
-			webServletMappingGroup.dispose();
-			webFiltersGroup.dispose();
-			webFilterMappingGroup.dispose();
-			webRefsGroup.dispose();
-			webSecurityGroup.dispose();
-			webListenerGroup.dispose();
-			
-			weakWebApp = null;
-			 if (client != null)
-				 client.eAdapters().remove(this);
-			 children.clear();
-			
-		}
-	}
-
-	/**
-	 * Default constructor
-	 */
-	public J2EEWebAppItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * Initialize the list of children
-	 */
-	private void initChildren() {
-		if (isInitializing)
-			return;
-		
-		isInitializing = true;
-		try {
-			children.clear();
-			if (clientMgr == null)
-				clientMgr = new J2EEWebServiceClientDDManager(weakWebApp);
-			children.add(webServletGroup = new WebServletGroupItemProvider(adapterFactory, weakWebApp));
-			children.add(webServletMappingGroup = new WebServletMappingGroupItemProvider(adapterFactory, weakWebApp));
-			children.add(webFiltersGroup = new WebFiltersGroupItemProvider(adapterFactory, weakWebApp));
-			children.add(webFilterMappingGroup = new WebFilterMappingGroupItemProvider(adapterFactory, weakWebApp));
-			children.add(webRefsGroup = new WebReferencesGroupItemProvider(adapterFactory, weakWebApp));
-			children.add(webSecurityGroup = new WebSecurityGroupItemProvider(adapterFactory, weakWebApp));
-			children.add(webListenerGroup = new WebListenerGroupItemProvider(adapterFactory, weakWebApp));
-		} finally {
-			isInitializing = false;
-		}
-	}
-
-	protected WeakReference weakWebApp = null;
-
-	public Collection getChildren(Object object) {		
-		if (object instanceof WebApp) {
-			WebApp webApp = (WebApp) object;
-			// If uninitialized or web app needs to re-initialize, init the children
-			if(weakWebApp == null || children.isEmpty() || webApp != weakWebApp.get()) {
-				weakWebApp = new WeakReference(webApp);
-				initChildren();
-			}
-			return children;			
-		} 
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-	 */
-	public void notifyChanged(Notification notification) {
-		// We only care about adds and removes for the different item provider
-		// groups
-		if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
-			Object notifier = null;
-			switch (notification.getFeatureID(WebApp.class)) {
-				case WebapplicationPackage.WEB_APP__SERVLETS :
-					notifier = webServletGroup;
-					break;
-				case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS :
-					notifier = webServletMappingGroup;
-					break;
-				case WebapplicationPackage.WEB_APP__FILTERS :
-					notifier = webFiltersGroup;
-					break;
-				case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS :
-					notifier = webFilterMappingGroup;
-					break;
-				case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS :
-				case WebapplicationPackage.WEB_APP__EJB_REFS :
-				case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS :
-				case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS :
-				case WebapplicationPackage.WEB_APP__RESOURCE_REFS :
-				case WebapplicationPackage.WEB_APP__SERVICE_REFS :
-					notifier = webRefsGroup;
-					break;
-				case WebapplicationPackage.WEB_APP__SECURITY_ROLES :
-				case WebapplicationPackage.WEB_APP__CONSTRAINTS :
-					notifier = webSecurityGroup;
-					break;
-				case WebapplicationPackage.WEB_APP__LISTENERS :
-					notifier = webListenerGroup;
-					break;
-			}
-			if (notifier != null) {
-				NotificationWrapper notificationWrapper = new NotificationWrapper(notifier, notification);
-				fireNotifyChanged(notificationWrapper);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.IDisposable#dispose()
-	 */
-	public void dispose() {
-		if (clientMgr != null)
-			clientMgr.dispose();
-		super.dispose();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java
deleted file mode 100644
index 1b67ce5cd..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.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 Mar 29, 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.war.ui.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebapplicationItemProviderAdapterFactory;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEWebItemProviderAdapterFactory extends WebapplicationItemProviderAdapterFactory {
-
-	/**
-	 * Default constructor
-	 */
-	public J2EEWebItemProviderAdapterFactory() {
-		super();
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.webapplication.util.WebapplicationAdapterFactory#createWebAppAdapter()
-	 */
-	public Adapter createWebAppAdapter() {
-		if (webAppItemProvider == null)
-			webAppItemProvider = new J2EEWebAppItemProvider(this);
-		return webAppItemProvider;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java
deleted file mode 100644
index 7a5695f01..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.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
- *******************************************************************************/
-/*
- * Created on Jun 11, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WebFilterMappingGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebFilterMappingGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory,weakWebApp);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		Object webApp = weakWebApp.get();
-		if(null != webApp){
-			return ((WebApp)webApp).getFilterMappings();
-		}
-		return Collections.EMPTY_LIST;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("filter_mapping"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("FILTER_MAPPING"); //$NON-NLS-1$ 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java
deleted file mode 100644
index d3809b12f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.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
- *******************************************************************************/
-/*
- * Created on Mar 29, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebFiltersGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebFiltersGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory, weakWebApp);
-	}
-	
-	/**
-	 * This returns Filter.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("filter"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-	    List result = new ArrayList();
-	    Object webApp = weakWebApp.get();
-	    if(webApp != null){
-	    	result.addAll(((WebApp)webApp).getFilters());
-	    }
-		return getSortedChildren(result);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("Filters_1"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java
deleted file mode 100644
index a62568168..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java
+++ /dev/null
@@ -1,100 +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 Aug 11, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-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.common.Listener;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @author jlanuti
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public abstract class WebGroupItemProvider extends J2EEItemProvider {
-
-	class WebGroupComparator implements Comparator {
-        public int compare(Object o1, Object o2) {
-            if (o1 instanceof Servlet) {
-                Servlet s1 = (Servlet)o1;
-                Servlet s2 = (Servlet)o2;
-                if (s1.getServletName() != null && s2.getServletName() != null)
-                	return s1.getServletName().compareTo(s2.getServletName());
-                return -1;
-            }
-            else if (o1 instanceof Filter) {
-                Filter f1 = (Filter) o1;
-                Filter f2 = (Filter) o2;
-                if (f1.getName() != null && f2.getName() != null)
-                	return f1.getName().compareTo(f2.getName());
-                return -1;
-            }
-            else if (o1 instanceof Listener) {
-                Listener l1 = (Listener) o1;
-                Listener l2 = (Listener) o2;
-                if (l1.getListenerClassName() != null && l2.getListenerClassName() !=null)
-                	return l1.getListenerClassName().compareTo(l2.getListenerClassName());
-                return -1;
-            }
-            else return -1;
-        }
-	}
-    
-    protected WeakReference weakWebApp;
-    
-    public WebGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory);
-		this.weakWebApp = weakWebApp;
-	}
-    
-    public Collection getSortedChildren(List theChildren) {
-		Collections.sort(theChildren, new WebGroupComparator());
-		return theChildren;
-    }
-
-	public void dispose() {
-		// TODO Auto-generated method stub
-		super.dispose();
-		weakWebApp = null;
-	}
-	
-
-	public IFile getAssociatedFile() {
-
-		try { 
-			WebApp webapp = (WebApp) weakWebApp.get();
-			if(webapp != null && webapp.eResource() != null) {
-				return WorkbenchResourceHelperBase.getIFile(webapp.eResource().getURI());
-			}
-		} catch (Throwable t) {
-			
-		}
-		return null;		
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java
deleted file mode 100644
index d58e81fd5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.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
- *******************************************************************************/
-/*
- * Created on Jun 11, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WebListenerGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebListenerGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory, weakWebApp);
-	}
-	
-	/**
-	 * This returns Filter.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getDefault().getImage("listener"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-	    List result = new ArrayList();
-	    Object webApp = weakWebApp.get();
-	    if(webApp != null){
-	    	result.addAll(((WebApp)webApp).getListeners());
-	    }
-	    return getSortedChildren(result);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("LISTENER"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
deleted file mode 100644
index a5fcbbcbe..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
+++ /dev/null
@@ -1,119 +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 29, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebReferencesGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebReferencesGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory, weakWebApp);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		Object obj = weakWebApp.get();
-		if (null != obj) {
-			WebApp webApp = (WebApp) obj;
-			if (!webApp.getEjbLocalRefs().isEmpty())
-				result.addAll(webApp.getEjbLocalRefs());
-			if (!webApp.getEjbRefs().isEmpty())
-				result.addAll(webApp.getEjbRefs());
-			if (!webApp.getResourceEnvRefs().isEmpty())
-				result.addAll(webApp.getResourceEnvRefs());
-			if (!webApp.getResourceRefs().isEmpty())
-				result.addAll(webApp.getResourceRefs());
-			if (!webApp.getMessageDestinationRefs().isEmpty())
-				result.addAll(webApp.getMessageDestinationRefs());
-			if (!webApp.getServiceRefs().isEmpty())
-				result.addAll(webApp.getServiceRefs());
-			Collection serviceRefs = null;
-			try {
-				WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-				serviceRefs = serviceHelper.get13ServiceRefs(webApp);
-			} catch (Exception re) {
-				serviceRefs = Collections.EMPTY_LIST;
-			}
-
-			if (serviceRefs != null && !serviceRefs.isEmpty())
-				result.addAll(serviceRefs);
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getDefault().getImage("resourceRef_obj"); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("References_1"); //$NON-NLS-1$ 
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java
deleted file mode 100644
index 9da0aad4a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java
+++ /dev/null
@@ -1,98 +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 29, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebSecurityGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebSecurityGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory, weakWebApp);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("Security_1"); //$NON-NLS-1$ 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		Object obj = weakWebApp.get();
-		if (null != obj) {
-			WebApp webApp = (WebApp) obj;
-			if (!webApp.getSecurityRoles().isEmpty())
-				result.addAll(webApp.getSecurityRoles());
-			if (!webApp.getConstraints().isEmpty())
-				result.addAll(webApp.getConstraints());
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("security_role");//$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java
deleted file mode 100644
index b31303287..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.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
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServletGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebServletGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory, weakWebApp);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		if (weakWebApp!=null) {
-			Object webApp = weakWebApp.get();
-			if(null != webApp){
-				result.addAll(((WebApp)webApp).getServlets());
-			}
-		}
-		return getSortedChildren(result);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("servlet"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("Servlets_1"); //$NON-NLS-1$ 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java
deleted file mode 100644
index 536b0ac28..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java
+++ /dev/null
@@ -1,92 +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 11, 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.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WebServletMappingGroupItemProvider extends WebGroupItemProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public WebServletMappingGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
-		super(adapterFactory, weakWebApp);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		Object webApp = weakWebApp.get();
-		if (null != webApp) {
-			return ((WebApp) webApp).getServletMappings();
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("servlet_mapping"); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("Servlet_Mappings_2"); //$NON-NLS-1$ 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object object) {
-		return !getChildren(object).isEmpty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object object) {
-		return weakWebApp.get();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java
deleted file mode 100644
index 05acae62f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java
+++ /dev/null
@@ -1,110 +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 29, 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.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-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.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationsStandaloneGroup {
-
-	protected Object model;
-	protected Object synchHelper;
-	protected Button useAnnotations;
-	private boolean isForBean;
-	private boolean useServletString = false;
-	public static final String EJBTAGSET = "ejb"; //$NON-NLS-1$
-
-	/**
-	 * Constructor
-	 */
-	public AnnotationsStandaloneGroup(Composite parent, Object model, boolean forBean) {
-		this(parent, model, forBean, false);
-	}
-
-	/**
-	 * Constructor
-	 */
-	public AnnotationsStandaloneGroup(Composite parent, Object model, boolean forBean, boolean useServlet) {
-		super();
-		synchHelper = new DataModelSynchHelper((IDataModel)model);
-		this.model = model;
-		this.isForBean = forBean;
-		this.useServletString = useServlet;
-		
-		buildComposites(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	protected void buildComposites(Composite parent) {
-		// Add separator
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		separator.setLayoutData(gd);
-		// Add spacer
-		Label spacer = new Label(parent, SWT.NONE);
-		GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
-		gd1.horizontalSpan = 3;
-		spacer.setLayoutData(gd1);
-		// Add annotations checkbox and label
-		useAnnotations = new Button(parent, SWT.CHECK);
-		String labelText;
-		if (useServletString)
-			labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS_SERVLET);
-		else if (isForBean)
-			labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS);
-		else
-			labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.ADD_ANNOTATIONS_SUPPORT);
-		useAnnotations.setText(labelText);
-		((DataModelSynchHelper)synchHelper).synchCheckbox(useAnnotations, IAnnotationsDataModel.USE_ANNOTATIONS, null);
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-		gd2.horizontalSpan = 2;
-		useAnnotations.setLayoutData(gd2);
-	}
-
-	public void dispose() {
-		((IDataModel)model).removeListener((DataModelSynchHelper)synchHelper);
-		synchHelper = null;
-		model = null;
-	}
-
-	public void setEnablement(IProject project) {
-		//TODO Remove - this is to be handled by the provider of the DataModel.
-	}
-	
-	
-
-	public void setUseServlet(boolean aBoolean) {
-		useServletString = aBoolean;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java
deleted file mode 100644
index 9fe83e20f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java
+++ /dev/null
@@ -1,76 +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.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.AppClientComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Application Client module structures from the Eclipse Workbench to a
- * deployable Application Client Archive *.jar file.
- * </p>
- */
-public final class AppClientComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public AppClientComponentExportWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public AppClientComponentExportWizard(IDataModel model) {
-		super(model);
-	}
-    protected IDataModelProvider getDefaultProvider() {
-        return new AppClientComponentExportDataModelProvider();
-    }
-
-	/**
-	 * <p>
-	 * Adds the following pages:
-	 * <ul>
-	 * <li>{@link AppClientExportPage}as the main wizard page ({@link #MAIN_PG})
-	 * </ul>
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new AppClientExportPage(getDataModel(), MAIN_PG, getSelection()));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Sets up the default wizard page image.
-	 * </p>
-	 */
-	protected void doInit() {
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_EXPORT_WIZARD_BANNER));
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java
deleted file mode 100644
index 7f875dcf8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.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.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentImportPage extends J2EEModuleImportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public AppClientComponentImportPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_IMPORT_WIZARD_BANNER));
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
-	 */
-	protected String getFileImportLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_FILE_LABEL);
-	}
-
-	protected String getFileNamesStoreID() {
-		return "APP_CLIENT"; //$NON-NLS-1$;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
-	 */
-	protected String[] getFilterExpression() {
-		return new String[]{"*.jar"}; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
-	 */
-	protected String getProjectImportLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_PROJECT_LABEL);
-	}
-
-	// protected J2EEComponentCreationDataModel getNewProjectCreationDataModel() {
-	// return getAppClientDataModel().getJ2eeArtifactCreationDataModel();
-	// }
-	//
-	// private AppClientModuleImportDataModel getAppClientDataModel() {
-	// return (AppClientModuleImportDataModel) model;
-	//	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		setInfopopID(IJ2EEUIContextIds.IMPORT_APPCLIENT_WIZARD_P1);
-		return super.createTopLevelComposite(parent);
-	}
-	
-	protected String getModuleFacetID(){
-		return J2EEProjectUtilities.APPLICATION_CLIENT;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java
deleted file mode 100644
index 3846f4069..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java
+++ /dev/null
@@ -1,85 +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.wizard;
-
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Application Client module structures into the Eclipse Workbench from
- * an existing Application Client *.jar file.
- * </p>
- */
-public final class AppClientComponentImportWizard extends J2EEComponentImportWizard {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public AppClientComponentImportWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public AppClientComponentImportWizard(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Adds an {@link AppClientImportPage}as the main wizard page ({@link #MAIN_PG}).
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new AppClientComponentImportPage(getDataModel(), MAIN_PG));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Sets up the dialog window title and default wizard page image.
-	 * </p>
-	 */
-	public final void doInit() {
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_IMPORT_WIZARD_BANNER));
-	}
-
-	protected String[] getModuleValidatorStrings() {
-		return new String[]{"org.eclipse.jst.j2ee.internal.validation.UIApplicationClientValidator"}; //$NON-NLS-1$
-	}
-
-	protected IDataModelProvider getDefaultProvider() {
-		return new AppClientComponentImportDataModelProvider();
-	}
-
-	protected String getFinalPerspectiveID() {
-		return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java
deleted file mode 100644
index c0750d723..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.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
- *******************************************************************************/
-/*
- * Created on Dec 3, 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.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AppClientExportPage extends J2EEModuleExportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public AppClientExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName, selection);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_EXPORT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_EXPORT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_EXPORT_WIZARD_BANNER));
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
-	 */
-	protected String getComponentLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_PROJECT_LABEL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
-	 */
-	protected String[] getFilterExpression() {
-		return new String[]{"*.jar"}; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
-	 */
-	protected boolean isMetaTypeSupported(Object o) {
-		return o instanceof ApplicationClient;
-	}
-
-	protected String getInfopopID() {
-		return IJ2EEUIContextIds.EXPORT_APPCLIENT_WIZARD_P1;
-	}
-	
-    protected String getCompnentID() {
-        return "JST_APPCLIENT"; //$NON-NLS-1$
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJ2EEComponentsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJ2EEComponentsContentProvider.java
deleted file mode 100644
index 171b447f9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJ2EEComponentsContentProvider.java
+++ /dev/null
@@ -1,147 +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 Mar 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.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-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.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This interface is being used to track code slated for removal. Any class or interface
- * implementing or extending this interface respectively should not be used. All such classes and
- * interfaces have been deprecated and are no longer supported and will be deleted post WTP 1.5.
- * 
- * Any method or field with javadoc referencing this interface should not be used and will be
- * deleted post WTP 1.5
- * 
- * @deprecated
- */
-public class AvailableJ2EEComponentsContentProvider implements IStructuredContentProvider, ITableLabelProvider, DoNotUseMeThisWillBeDeletedPost15 {
-
-	public AvailableJ2EEComponentsContentProvider(int j2eeVersion) {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		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();
-		for (int i = 0; i < projects.length; i++) {
-			// get flexible project
-			IProject project = projects[i];
-			if(ModuleCoreNature.isFlexibleProject(project)){
-				if (J2EEProjectUtilities.isApplicationClientProject(project) ||
-						J2EEProjectUtilities.isEJBProject(project) ||
-						J2EEProjectUtilities.isDynamicWebProject(project) ||
-						J2EEProjectUtilities.isJCAProject(project) ||
-						J2EEProjectUtilities.isUtilityProject(project) )
-					validCompList.add(project);
-			} else
-				try {
-					if (project.exists() && project.isAccessible() && project.hasNature("org.eclipse.jdt.core.javanature")){ //$NON-NLS-1$
-						validCompList.add(project);
-					}
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-		}
-		return validCompList.toArray();
-	}
-
-	/*
-	 * (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) {
-		return ((IVirtualComponent) element).getName();
-	}
-
-	/*
-	 * (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() {
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java
deleted file mode 100644
index 23bf01e2f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java
+++ /dev/null
@@ -1,237 +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.wizard;
-
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon;
-
-
-public class AvailableJarsProvider implements org.eclipse.jface.viewers.IStructuredContentProvider, org.eclipse.jface.viewers.ITableLabelProvider {
-	protected static Image utilImage;
-	protected static Image invalidImage;
-	protected static Image ejbImage;
-	protected static Image ejbClientImage;
-
-	/**
-	 * AvailableJarsContentProvider constructor comment.
-	 */
-	public AvailableJarsProvider() {
-		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 label provider. When a label provider is attached to a viewer, the viewer
-	 * will automatically call this method when the viewer is being closed. When label providers are
-	 * used outside of the context of a viewer, it is the client's responsibility to ensure that
-	 * this method is called when the provider is no longer needed.
-	 */
-	public void dispose() {
-		//dispose
-	}
-
-	/**
-	 * Returns the label image for the given column of the given element.
-	 * 
-	 * @param element
-	 *            the object representing the entire row, or <code>null</code> indicating that no
-	 *            input object is set in the viewer
-	 * @param columnIndex
-	 *            the zero-based index of the column in which the label appears
-	 */
-	public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
-		if (columnIndex > 0)
-			return null;
-		ClasspathElement cp = (ClasspathElement) element;
-		if (!cp.isValid())
-			return getInvalidImage();
-
-		switch (cp.getJarType()) {
-			case ClasspathElement.EJB_JAR :
-				return getEjbImage();
-			case ClasspathElement.EJB_CLIENT_JAR :
-				return getEjbClientImage();
-			default :
-				return getUtilImage();
-		}
-	}
-
-	/**
-	 * Returns the label text for the given column of the given element.
-	 * 
-	 * @param element
-	 *            the object representing the entire row, or <code>null</code> indicating that no
-	 *            input object is set in the viewer
-	 * @param columnIndex
-	 *            the zero-based index of the column in which the label appears
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		String value = null;
-		switch (columnIndex) {
-			case 0 : {
-				value = ((ClasspathElement) element).getText();
-				break;
-			}
-			case 1 :
-				value = ((ClasspathElement) element).getProjectName();
-		}
-		return value == null ? "" : value;//$NON-NLS-1$
-	}
-
-	protected static Image getEjbImage() {
-		if (ejbImage == null)
-			ejbImage = getImageDescriptor("EJBJar").createImage();//$NON-NLS-1$
-		return ejbImage;
-	}
-
-	protected static Image getEjbClientImage() {
-		if (ejbClientImage == null)
-			ejbClientImage = getImageDescriptor("ejbclientjar_obj").createImage();//$NON-NLS-1$
-		return ejbClientImage;
-	}
-
-	/**
-	 * 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) {
-		ClassPathSelection selection = (ClassPathSelection) inputElement;
-		return filter(selection, selection.getFilterLevel()).toArray();
-	}
-
-	/**
-	 * @param list
-	 */
-	private List filter(ClassPathSelection selection, int filterLevel) {
-		List list = selection.getClasspathElements();
-		List result = new ArrayList(list.size());
-		for (int i = 0; i < list.size(); i++) {
-			ClasspathElement element = (ClasspathElement) list.get(i);
-			if (!element.isSelected()) {
-				switch (filterLevel) {
-					case (ClassPathSelection.FILTER_EJB_CLIENT_JARS) :
-						if (element.isEJBClientJar())
-							continue;
-						break;
-					case (ClassPathSelection.FILTER_EJB_SERVER_JARS) :
-						if (element.isEJBJar() && selection.getOppositeElement(element) != null)
-							continue;
-				}
-			}
-			result.add(element);
-		}
-		return result;
-	}
-
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	protected static ImageDescriptor getImageDescriptor(String key) {
-		ImageDescriptor imageDescriptor = null;
-
-		URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage(key);
-		imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
-		return imageDescriptor;
-	}
-
-	protected static Image getInvalidImage() {
-		if (invalidImage == null) {
-			ImageDescriptor base = getImageDescriptor("jar_nonexist_obj");//$NON-NLS-1$
-			ImageDescriptor overlay = getImageDescriptor("warning_co");//$NON-NLS-1$
-			invalidImage = new OverlayIcon(base, new ImageDescriptor[][]{{overlay}}).createImage();
-		}
-		return invalidImage;
-	}
-
-	public static Image getUtilImage() {
-		if (utilImage == null)
-			utilImage = getImageDescriptor("jar_obj").createImage();//$NON-NLS-1$
-		return utilImage;
-	}
-
-	/**
-	 * 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/wizard/AvailableModuleProjectsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java
deleted file mode 100644
index 38eec7550..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java
+++ /dev/null
@@ -1,157 +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 9, 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.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class AvailableModuleProjectsProvider implements IStructuredContentProvider, ITableLabelProvider, DoNotUseMeThisWillBeDeletedPost15 {
-	private IDataModel model;
-
-	public AvailableModuleProjectsProvider(IDataModel dataModel) {
-		super();
-		model = dataModel;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		List validModuleProjects = null;
-		if (inputElement instanceof IWorkspaceRoot) {
-			IProject[] projects = ((IWorkspaceRoot) inputElement).getProjects();
-			if (projects.length > 0) {
-				int j2eeVersion = model.getIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION);
-				for (int i = 0; i < projects.length; i++) {
-					if (isValid(projects[i], j2eeVersion)) {
-						if (validModuleProjects == null)
-							validModuleProjects = new ArrayList();
-						validModuleProjects.add(projects[i]);
-					}
-				}
-			}
-		}
-		if (validModuleProjects == null)
-			return new Object[0];
-		return validModuleProjects.toArray();
-	}
-
-	private boolean isValid(IProject project, int j2eeVersion) {
-		//migrate to artifact edits
-//		try {
-//			if (project.hasNature(IEARNatureConstants.NATURE_ID))
-//				return false;
-//			J2EENature j2eeNature = J2EENature.getRegisteredRuntime(project);
-//			if (j2eeNature != null) {
-//				return j2eeNature.getJ2EEVersion() <= j2eeVersion;
-//			} else if (project.hasNature(JavaCore.NATURE_ID))
-//				return true;
-//		} catch (CoreException e) {
-//			//Ignore
-//		}
-		return false;
-	}
-
-	/*
-	 * (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) {
-		return ((IProject) element).getName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		model = 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
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java
deleted file mode 100644
index 28714010b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java
+++ /dev/null
@@ -1,181 +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 Apr 22, 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.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-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.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableUtilJarsAndWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
-	public AvailableUtilJarsAndWebLibProvider() {
-		//Default constructor
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof EARFile) {
-			Object[] array = EARComponentImportDataModelProvider.getAllUtilities((EARFile) inputElement).toArray();
-
-			List filteredProjects = new ArrayList();
-			if (array != null && array.length != 0)
-				filteredProjects = filterEJBClientJars(array, ((EARFile) inputElement));
-			else
-				return new Object[0];
-
-			array = filteredProjects.toArray();
-			Arrays.sort(array, new Comparator() {
-				public int compare(Object o1, Object o2) {
-					return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
-				}
-
-			});
-			return array;
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * @param array
-	 * @return
-	 */
-	private List filterEJBClientJars(Object[] array, EARFile ear) {
-		List utilities = new ArrayList(array.length);
-		for (int i = 0; i < array.length; i++) {
-			utilities.add(array[i]);
-		}
-		List ejbJars = ear.getEJBJarFiles();
-		if (ejbJars != null) {
-			List clientNames = new ArrayList(ejbJars.size());
-			for (int j = 0; j < ejbJars.size(); j++) {
-				EJBJar jar = ((EJBJarFile) ejbJars.get(j)).getDeploymentDescriptor();
-				if (jar != null) {
-					clientNames.add(jar.getEjbClientJar());
-				}
-			}
-			if (clientNames != null && !clientNames.isEmpty()) {
-				List toRemove = new ArrayList();
-				for (int k = 0; k < clientNames.size(); k++) {
-					String projectName = (String) clientNames.get(k);
-					for (int l = 0; l < utilities.size(); l++) {
-						File file = (File) utilities.get(l);
-						if (file.getName().equals(projectName))
-							toRemove.add(utilities.get(l));
-					}
-				}
-				utilities.removeAll(toRemove);
-			}
-		}
-		return utilities;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		return AvailableJarsProvider.getUtilImage();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		FileImpl file = (FileImpl) element;
-		if (file.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) {
-			String parentWarFileName = ((WARFile) file.eContainer()).getName();
-			return parentWarFileName + "#" + file.getURI(); //$NON-NLS-1$
-		}
-		return file.getName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		//Auto-generated method stub
-	}
-
-	/*
-	 * (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) {
-		//Auto-generated method stub
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		//Auto-generated method stub
-	}
-
-	/*
-	 * (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) {
-		//Auto-generated method stub
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java
deleted file mode 100644
index 4629cc77b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java
+++ /dev/null
@@ -1,162 +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 Apr 22, 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.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-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.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableUtilityJarsProvider implements IStructuredContentProvider, ITableLabelProvider {
-
-	public AvailableUtilityJarsProvider() {
-		//default constructor
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		/*
-		 * Object[] array = EARImportDataModel.getAllUtilities((EARFile) inputElement).toArray();
-		 */
-		Object[] array = getJarFilesFromDirectory(inputElement);
-		Arrays.sort(array, new Comparator() {
-
-			public int compare(Object o1, Object o2) {
-				return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
-			}
-
-		});
-		return array;
-	}
-
-	/**
-	 * @param inputElement
-	 * @return
-	 */
-	private Object[] getJarFilesFromDirectory(Object inputElement) {
-
-		List collectedJars = new ArrayList();
-		IDataModel model = null;
-		if (inputElement instanceof IDataModel)
-			model = (IDataModel) inputElement;
-		if (model != null) {
-
-			String fileName = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY);
-			File directory = new File(fileName);
-			if (directory.exists() && directory.canRead() && directory.isDirectory()) {
-				File[] availableFiles = directory.listFiles();
-
-				if (availableFiles == null)
-					return new File[0];
-
-				for (int i = 0; i < availableFiles.length; i++)
-					if (availableFiles[i] != null && availableFiles[i].getName().endsWith(".jar"))collectedJars.add(availableFiles[i]); //$NON-NLS-1$
-			}
-		}
-		return collectedJars.toArray();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		return AvailableJarsProvider.getUtilImage();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		/*
-		 * FileImpl file = (FileImpl) element; if
-		 * (file.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) { String parentWarFileName =
-		 * ((WARFile) file.eContainer()).getName(); return parentWarFileName + "#" + file.getURI();
-		 * //$NON-NLS-1$ } else return file.getName();
-		 */
-		return element.toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		//dispose
-	}
-
-	/*
-	 * (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
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ClassesImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ClassesImportWizard.java
deleted file mode 100644
index ac07f233f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ClassesImportWizard.java
+++ /dev/null
@@ -1,177 +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.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class ClassesImportWizard extends Wizard implements IImportWizard {
-
-	public WizardClassesImportMainPage mainPage = null;
-
-	public WizardClassesImportPage1 page1 = null;
-
-	private IWorkbench workbench;
-
-	private IStructuredSelection selection;
-
-	private IPath importedClassesPath;
-
-	private IJavaProject javaProject = null;
-
-	private IProject project = null;
-
-	protected ArrayList fileNames = null;
-
-	public ClassesImportWizard() {
-		super();
-	}
-
-	public ClassesImportWizard(IProject project) {
-		super();
-		this.project = project;
-
-	}
-
-	public ClassesImportWizard(IProject project, String fileName, List otherFileNames) {
-		this(project);
-		this.fileNames = new ArrayList();
-		this.fileNames.add(fileName);
-		int i = fileName.lastIndexOf(java.io.File.separatorChar);
-		String parentDir = fileName.substring(0, i);
-		if (otherFileNames != null)
-			for (int j = otherFileNames.size() - 1; j >= 0; j--) {
-				if (otherFileNames.get(j) != null) {
-					int k = ((String) otherFileNames.get(j)).lastIndexOf(java.io.File.separatorChar);
-					if (k == i && parentDir.equals(((String) otherFileNames.get(j)).substring(0, k))) {
-						fileNames.add(otherFileNames.remove(j));
-					}
-				}
-			}
-
-	}
-
-	public void setFolderPath(IPath path) {
-		importedClassesPath = path;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		return page1.finish();
-	}
-
-	public void createImportedClassesFolder(IProject aProject) {
-		//Create imported_classes folder selected project
-		IContainer container = aProject;
-		IFolder folder = container.getFolder(new Path("imported_classes")); //$NON-NLS-1$
-		javaProject = getIJavaProject(aProject);
-
-		IPath importedFoldersClass = folder.getFullPath();
-
-		CPListElement entry = newCPLibraryElement(folder);
-		IClasspathEntry newEntry = entry.getClasspathEntry();
-
-		IResource res = entry.getResource();
-		if ((res instanceof IFolder) && !res.exists()) {
-			try {
-				CoreUtility.createFolder((IFolder) res, true, true, null);
-
-			} catch (CoreException e) {
-				//Ignore
-			}
-		}
-
-		try {
-			IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
-			IClasspathEntry[] newClasspath = new IClasspathEntry[classpathEntries.length + 1];
-
-			for (int i = 0; i < classpathEntries.length; i++) {
-				newClasspath[i] = classpathEntries[i];
-			}
-			newClasspath[classpathEntries.length] = newEntry;
-
-			javaProject.setRawClasspath(newClasspath, null);
-
-		} catch (JavaModelException e) {
-			//Ignore
-		}
-
-		setFolderPath(importedFoldersClass);
-	}
-
-	private IJavaProject getIJavaProject(IProject projectHandle) {
-		IJavaModel javaModel = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-		return javaModel.getJavaProject(projectHandle.getName());
-	}
-
-	private CPListElement newCPLibraryElement(IResource res) {
-
-		return new CPListElement(javaProject, IClasspathEntry.CPE_LIBRARY, res.getFullPath(), res);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
-		setWindowTitle(J2EEUIMessages.getResourceString("Import_Class_Files_UI")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
-
-		workbench = aWorkbench;
-		selection = aSelection;
-		if (!aSelection.isEmpty() && aSelection.getFirstElement() instanceof IProject)
-			project = (IProject) aSelection.getFirstElement();
-
-		if (project != null)
-			createImportedClassesFolder(project);
-	}
-
-	public void addPages() {
-		try {
-			super.addPages();
-			mainPage = new WizardClassesImportMainPage("id", fileNames); //$NON-NLS-1$
-			mainPage.setWizard(this);
-			if (fileNames == null || fileNames.size() == 0)
-				addPage(mainPage);
-			page1 = new WizardClassesImportPage1(workbench, selection, importedClassesPath, fileNames);
-			page1.setWizard(this);
-			addPage(page1);
-		} catch (Throwable ex) {
-			ex.printStackTrace();
-		}
-
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DataModelAnnotationsStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DataModelAnnotationsStandaloneGroup.java
deleted file mode 100644
index feb612234..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DataModelAnnotationsStandaloneGroup.java
+++ /dev/null
@@ -1,166 +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.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class DataModelAnnotationsStandaloneGroup implements DoNotUseMeThisWillBeDeletedPost15{
-
-    protected IDataModel model;
-    protected DataModelSynchHelper synchHelper;
-    protected Button useAnnotations;
-    private boolean isForBean;
-    private boolean useServletString = false;
-
-    public static final String EJBTAGSET = "ejb"; //$NON-NLS-1$
-    public static boolean shouldBeanDefaultUseAnnotations = false;
-    public static boolean shouldProjectDefaultUseAnnotations = false;
-
-
-    private class CheckboxSelectionListener implements SelectionListener {
-        public void widgetSelected(SelectionEvent e) {
-            Button button = (Button) e.getSource();
-            if (isForBean)
-                shouldBeanDefaultUseAnnotations = button.getSelection();
-            else
-                shouldProjectDefaultUseAnnotations = button.getSelection();
-        }
-
-        public void widgetDefaultSelected(SelectionEvent e) {
-            //do nothing
-        }
-    }
-
-    private CheckboxSelectionListener checkboxSelectionListener = new CheckboxSelectionListener();
-
-    /**
-     * Constructor
-     */
-    public DataModelAnnotationsStandaloneGroup(Composite parent, IDataModel model, boolean forBean, DataModelSynchHelper syncHelp) {
-        this(parent, model, forBean, false, syncHelp);
-    }
-
-    /**
-     * Constructor
-     */
-    public DataModelAnnotationsStandaloneGroup(Composite parent, IDataModel model, boolean forBean, boolean useServlet, DataModelSynchHelper syncHelp) {
-        super();
-        this.model = model;
-        this.isForBean = forBean;
-        this.useServletString = useServlet;
-        synchHelper = syncHelp;
-        buildComposites(parent);
-    }
-
-    /**
-     * @param parent
-     */
-    protected void buildComposites(Composite parent) {
-        // Add separator
-        Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-        gd.horizontalSpan = 3;
-        separator.setLayoutData(gd);
-        // Add spacer
-        Label spacer = new Label(parent, SWT.NONE);
-        GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
-        gd1.horizontalSpan = 3;
-        spacer.setLayoutData(gd1);
-        // Add annotations checkbox and label
-        useAnnotations = new Button(parent, SWT.CHECK);
-        String labelText;
-        if (useServletString)
-            labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS_SERVLET);
-        else if (isForBean)
-            labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS);
-        else
-            labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.ADD_ANNOTATIONS_SUPPORT);
-        useAnnotations.setText(labelText);
-        synchHelper.synchCheckbox(useAnnotations, IAnnotationsDataModel.USE_ANNOTATIONS, null);
-        useAnnotations.addSelectionListener(checkboxSelectionListener);
-        GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-        gd2.horizontalSpan = 2;
-        useAnnotations.setLayoutData(gd2);
-        // If for project, set the global annotations supported
-        if (!isForBean)
-            setEnablement(null);
-    }
-
-    public void dispose() {
-        model.removeListener(synchHelper);
-        synchHelper = null;
-        model = null;
-    }
-
-    public boolean isAnnotationsSupported(IProject project) {
-        //TODO clean up to be module based, not project based
-        try {
-            //          if (isForBean) {
-            //              AnnotationsController controller =
-            // AnnotationsControllerManager.INSTANCE.getAnnotationsController(project);
-            //              return (controller !=null && controller.isTagHandlerInstalled(EJBTAGSET));
-            //          }
-//          J2EEModuleNature nature = null;
-//          if (project != null && project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-//              nature = (J2EEModuleNature) project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
-//          else if (project != null && project.hasNature(IEJBNatureConstants.NATURE_ID))
-//              nature = (J2EEModuleNature) project.getNature(IEJBNatureConstants.NATURE_ID);
-//
-//          if (!isForBean || (nature != null && nature.getJ2EEVersion() > J2EEVersionConstants.VERSION_1_2))
-                return true;
-//          return false;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            return false;
-        }
-    }
-
-    public void setEnablement(IProject project) {
-        //TODO
-        //boolean isEnabled = isAnnotationsSupported(project);
-        useAnnotations.setEnabled(true);
-//      if (!isEnabled || (!isForBean && !shouldProjectDefaultUseAnnotations) || (isForBean && !shouldBeanDefaultUseAnnotations)) {
-//          useAnnotations.setSelection(false);
-//          model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.FALSE);
-//      } else {
-//          useAnnotations.setSelection(true);
-//          model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, Boolean.TRUE);
-//      }
-    }
-
-    public void setUseServlet(boolean aBoolean) {
-        useServletString = aBoolean;
-    }
-    
-    public void setUseAnnotations(boolean aBoolean) {
-        if (useAnnotations != null) {
-            useAnnotations.setSelection(aBoolean);
-            model.setProperty(IAnnotationsDataModel.USE_ANNOTATIONS, new Boolean(aBoolean));
-        }
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java
deleted file mode 100644
index cd181f42f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java
+++ /dev/null
@@ -1,87 +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 Mar 23, 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.wizard;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class DefaultJ2EEComponentCreationWizard extends DataModelWizard {
-	private static final String SELECTION_PG = "selection"; //$NON-NLS-1$
-
-	/**
-	 * @param model
-	 */
-	public DefaultJ2EEComponentCreationWizard(IDataModel model) {
-		super(model);
-		initialize();
-	}
-
-	/**
-	 *  
-	 */
-	public DefaultJ2EEComponentCreationWizard() {
-		super();
-		initialize();
-	}
-
-	/**
-	 *  
-	 */
-	private void initialize() {
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_WIZ_TITLE));
-		String iconPath = "icons/full/"; //$NON-NLS-1$
-		try {
-			URL installURL = IDEWorkbenchPlugin.getDefault().getDescriptor().getInstallURL();
-			URL url = new URL(installURL, iconPath + "wizban/new_wiz.png"); //$NON-NLS-1$
-			ImageDescriptor desc = ImageDescriptor.createFromURL(url);
-			setDefaultPageImageDescriptor(desc);
-		} catch (MalformedURLException e) {
-			// Should not happen. Ignore.
-		}
-		setNeedsProgressMonitor(true);
-		setForcePreviousAndNextButtons(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void doAddPages() {
-		addPage(new NewJ2EEComponentSelectionPage(getDataModel(), SELECTION_PG));
-	}
-
-	public boolean canFinish() {
-		if (!super.canFinish()) {
-			return false;
-		}
-		return getDataModel().getBooleanProperty(IDefaultJ2EEComponentCreationDataModelProperties.ENABLED);
-	}
-
-    protected IDataModelProvider getDefaultProvider() {
-        return new DefaultJ2EEComponentCreationDataModelProvider();
-    }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java
deleted file mode 100644
index 9fe8a4b98..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java
+++ /dev/null
@@ -1,93 +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 Dec 3, 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.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentExportPage extends J2EEExportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public EARComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName, selection);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_EXPORT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_EXPORT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_EXPORT_WIZARD_BANNER));
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
-	 */
-	protected String getComponentLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
-	 */
-	protected String[] getFilterExpression() {
-		return new String[]{"*.ear"}; //$NON-NLS-1$
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean shouldShowProjectFilesCheckbox() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
-	 */
-	protected boolean isMetaTypeSupported(Object o) {
-		return o instanceof Application;
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IJ2EEComponentExportDataModelProperties.PROJECT_NAME, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING};
-	}
-
-	protected String getInfopopID() {
-		return IJ2EEUIContextIds.EXPORT_EAR_WIZARD_P1;
-	}
-
-    protected String getCompnentID() {
-        return "JST_EAR";  //$NON-NLS-1$
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java
deleted file mode 100644
index a9b261117..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java
+++ /dev/null
@@ -1,78 +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.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Enterprise Application structures from the Eclipse Workbench to a
- * deployable Enterprise Application Archive *.ear file.
- * </p>
- */
-public final class EARComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public EARComponentExportWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public EARComponentExportWizard(IDataModel model) {
-		super(model);
-	}
-
-    protected IDataModelProvider getDefaultProvider() {
-        return new EARComponentExportDataModelProvider();
-    }
-
-	/**
-	 * <p>
-	 * Adds the following pages:
-	 * <ul>
-	 * <li>{@link EARComponentExportPage}as the main wizard page ({@link #MAIN_PG})
-	 * </ul>
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new EARComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Sets up the default wizard page image.
-	 * </p>
-	 */
-	protected void doInit() {
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_EXPORT_WIZARD_BANNER));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java
deleted file mode 100644
index d50c52c35..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java
+++ /dev/null
@@ -1,320 +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 Dec 8, 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.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentImportOptionsPage extends DataModelWizardPage {
-	private Button deselectAllButton;
-	private Button selectAllButton;
-	private Label moduleProjectLocationLabel;
-	protected Button browseButton;
-	protected Button useAlternateRootBtn;
-	protected Text systemDefaultText;
-	protected EARFile earFile;
-	public CheckboxTableViewer availableJARsViewer;
-	public boolean utilJarSelectionChanged = false;
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public EARComponentImportOptionsPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P2);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		createJARsComposite(composite);
-		createProjectRootComposite(composite);
-
-		return composite;
-	}
-
-	/*
-	 * Updates the enable state of the all buttons
-	 */
-	protected void updateButtonEnablements() {
-		utilJarSelectionChanged = true;
-	}
-
-	protected void createAvailableJarsList(Composite listGroup) {
-		availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gData.widthHint = 200;
-		gData.heightHint = 80;
-		availableJARsViewer.getControl().setLayoutData(gData);
-		AvailableUtilJarsAndWebLibProvider availableUtilJARsProvider = new AvailableUtilJarsAndWebLibProvider();
-		availableJARsViewer.setContentProvider(availableUtilJARsProvider);
-		availableJARsViewer.setLabelProvider(availableUtilJARsProvider);
-		availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				availableJARCheckStateChanged(event);
-			}
-		});
-		availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonEnablements();
-			}
-		});
-		TableLayout tableLayout = new TableLayout();
-		availableJARsViewer.getTable().setLayout(tableLayout);
-		availableJARsViewer.getTable().setHeaderVisible(false);
-		availableJARsViewer.getTable().setLinesVisible(false);
-
-		model.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (event.getPropertyName().equals(IEARComponentImportDataModelProperties.UTILITY_LIST)) {
-					availableJARsViewer.setCheckedElements(((List) model.getProperty(IEARComponentImportDataModelProperties.UTILITY_LIST)).toArray());
-				}
-			}
-		});
-	}
-
-	private void handleDeselectAllButtonPressed() {
-		ArrayList emptySelection = new ArrayList(2);
-		model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, emptySelection);
-		validatePage();
-	}
-
-	private void handleSelectAllButtonPressed() {
-		ArrayList allSelection = new ArrayList(2);
-		Object selection = null;
-		for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
-			allSelection.add(selection);
-		}
-		model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, allSelection);
-		validatePage();
-	}
-
-	/**
-	 * Open an appropriate directory browser
-	 */
-	protected void handleBrowseButtonPressed() {
-		DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
-		dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
-		String dirName = getBrowseStartLocation();
-
-		if (!isNullOrEmpty(dirName)) {
-			File path = new File(dirName);
-			if (path.exists())
-				dialog.setFilterPath(dirName);
-		}
-
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null)
-			systemDefaultText.setText(selectedDirectory);
-
-	}
-
-	protected String getBrowseStartLocation() {
-		String text = systemDefaultText.getText();
-		return text;
-	}
-
-	protected void createButtonsGroup(Composite parent) {
-		Composite buttonGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		selectAllButton = new Button(buttonGroup, SWT.PUSH);
-		selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON));
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		gd.widthHint = 140;
-		selectAllButton.setLayoutData(gd);
-		selectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelectAllButtonPressed();
-			}
-		});
-
-		deselectAllButton = new Button(buttonGroup, SWT.PUSH);
-		deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON));
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		gd.widthHint = 140;
-		deselectAllButton.setLayoutData(gd);
-		deselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleDeselectAllButtonPressed();
-			}
-		});
-	}
-
-	protected void createJARsComposite(Composite parent) {
-		Group group = new Group(parent, SWT.NULL);
-		group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_JARS_GROUP));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label description = new Label(group, SWT.NULL);
-		description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS));
-		GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd2.horizontalSpan = 3;
-		description.setLayoutData(gd2);
-
-		// create jars check box viewer
-		createAvailableJarsList(group);
-		createButtonsGroup(group);
-	}
-
-	protected void createProjectRootComposite(Composite parent) {
-		Group group = new Group(parent, SWT.NULL);
-		group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOCATIONS_GROUP));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label description = new Label(group, SWT.NULL);
-		description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_PROJECT_GROUP_DESCRIPTION));
-		GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd2.horizontalSpan = 3;
-		description.setLayoutData(gd2);
-
-		moduleProjectLocationLabel = new Label(group, SWT.NULL);
-		moduleProjectLocationLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.USE_DEFAULT_ROOT_RADIO));
-		moduleProjectLocationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		systemDefaultText = new Text(group, SWT.READ_ONLY | SWT.WRAP | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		systemDefaultText.setLayoutData(gd);
-		synchHelper.synchText(systemDefaultText, IEARComponentImportDataModelProperties.NESTED_MODULE_ROOT, null);
-
-		browseButton = new Button(group, SWT.PUSH);
-		browseButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL));
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		browseButton.setLayoutData(gd);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowseButtonPressed();
-			}
-		});
-	}
-
-	private void refreshEARFileIfNecessary() {
-		if (isEARFileChanged()) {
-			earFile = (EARFile) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-			refresh();
-		}
-	}
-
-	protected void setJARsCompositeEnabled(boolean enabled) {
-		availableJARsViewer.getTable().setEnabled(enabled);
-		availableJARsViewer.setAllChecked(false);
-		availableJARsViewer.setAllGrayed(!enabled);
-		selectAllButton.setEnabled(enabled);
-		deselectAllButton.setEnabled(enabled);
-	}
-
-	private void refresh() {
-		availableJARsViewer.setInput(earFile);
-	}
-
-	public boolean isEARFileChanged() {
-		return earFile != model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-	}
-
-	protected void enter() {
-		super.enter();
-		refreshEARFileIfNecessary();
-	}
-
-	public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
-		model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, getJARsForProjects());
-		validatePage();
-	}
-
-	public List getJARsForProjects() {
-		refreshEARFileIfNecessary();
-		List result = new ArrayList();
-		result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
-		return result;
-	}
-
-	protected boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.length() == 0;
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{};
-	}
-
-	protected void restoreWidgetValues() {
-		// This page doesn't implement...
-	}
-
-	public void storeDefaultSettings() {
-		// This page doesn't implement...
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java
deleted file mode 100644
index 262f3c2e2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java
+++ /dev/null
@@ -1,127 +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 Dec 8, 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.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentImportPage extends J2EEImportPage {
-	protected Combo serverTargetCombo;
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public EARComponentImportPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P1);
-		GridLayout layout = new GridLayout(3, false);
-		composite.setLayout(layout);
-		createFileNameComposite(composite);
-		createProjectNameComposite(composite);
-		createAnnotationsStandaloneGroup(composite);
-		restoreWidgetValues();
-		return composite;
-	}
-
-	protected String getProjectImportLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_LABEL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
-	 */
-	protected String getFileImportLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_FILE_LABEL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
-	 */
-	protected String[] getFilterExpression() {
-		return new String[]{"*.ear"}; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleImportPage#createAnnotationsStandaloneGroup(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createAnnotationsStandaloneGroup(Composite composite) {
-		// new AnnotationsStandaloneGroup(composite, model, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IJ2EEComponentImportDataModelProperties.FILE_NAME,
-					IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME,
-					EARComponentImportDataModelProvider.EAR_NAME_VALIDATION,
-					IFacetProjectCreationDataModelProperties.FACET_RUNTIME,
-					IAnnotationsDataModel.USE_ANNOTATIONS,
-					J2EEArtifactImportDataModelProvider.FACET_RUNTIME};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileNamesStoreID()
-	 */
-	protected String getFileNamesStoreID() {
-		return "EAR";//$NON-NLS-1$
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java
deleted file mode 100644
index 2771f99b5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java
+++ /dev/null
@@ -1,111 +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.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Application structures into the Eclipse Workbench from an existing
- * Enterprise Application Archive *.ear file.
- * </p>
- */
-public final class EARComponentImportWizard extends J2EEArtifactImportWizard implements IExecutableExtension, IImportWizard {
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the Projects page of the Wizard.
-	 * </p>
-	 */
-	protected static final String PROJECT_PG = "projects"; //$NON-NLS-1$
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the Options page of the Wizard.
-	 * </p>
-	 */
-	protected static final String OPTIONS_PG = "options"; //$NON-NLS-1$	
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public EARComponentImportWizard() {
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public EARComponentImportWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <p>
-	 * Adds the following pages:
-	 * <ul>
-	 * <li>{@link EARComponentImportPage}as the main wizard page ({@link #MAIN_PG})
-	 * <li>{@link EARComponentImportOptionsPage}as the options wizard page ({@link #OPTIONS_PG})
-	 * <li>{@link EARComponentProjectsPage}as the project wizard page ({@link #PROJECT_PG})
-	 * </ul>
-	 * 
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new EARComponentImportPage(getDataModel(), MAIN_PG));
-		addPage(new EARComponentImportOptionsPage(getDataModel(), OPTIONS_PG));
-		addPage(new EARComponentProjectsPage(getDataModel(), PROJECT_PG));
-	}
-
-
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Sets up the dialog window title and default wizard page image.
-	 * </p>
-	 */
-	protected void doInit() {
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-		
-	}
-
-	protected IDataModelProvider getDefaultProvider() {
-		return new EARComponentImportDataModelProvider();
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_EAR);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java
deleted file mode 100644
index a6ab5bf47..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java
+++ /dev/null
@@ -1,295 +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 Dec 8, 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.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentProjectsPage extends DataModelWizardPage {
-
-	private CheckboxTableViewer earFileListViewer;
-
-	public static final String INCLUDE_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_0"); //$NON-NLS-1$
-	public static final String FILE_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_1"); //$NON-NLS-1$
-	public static final String PROJECT_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_2"); //$NON-NLS-1$
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public EARComponentProjectsPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P3);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		createListGroup(composite);
-		createButtonsGroup(composite);
-
-		return composite;
-	}
-
-	protected void setColumnEditors() {
-		Table t = earFileListViewer.getTable();
-		CellEditor[] columnEditors = new CellEditor[t.getColumnCount()];
-		columnEditors[1] = new TextCellEditor(t);
-
-		earFileListViewer.setCellEditors(columnEditors);
-	}
-
-	protected void createButtonsGroup(Composite parent) {
-		Composite buttonGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Button selectNotInWorkspace = new Button(buttonGroup, SWT.PUSH);
-		selectNotInWorkspace.setText(J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_3")); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		//gd.horizontalSpan = 1;
-		//gd.heightHint = 22;
-		gd.widthHint = 140;
-		selectNotInWorkspace.setLayoutData(gd);
-		selectNotInWorkspace.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				List list = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
-				List selectedList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
-				List newList = new ArrayList();
-				newList.addAll(selectedList);
-				IDataModel importDM = null;
-				for (int i = 0; i < list.size(); i++) {
-					importDM = (IDataModel) list.get(i);
-					if (!newList.contains(importDM) && !((IVirtualComponent) importDM.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT)).exists()) {
-						newList.add(importDM);
-					}
-				}
-				model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
-			}
-		});
-
-		Button selectAllButton = new Button(buttonGroup, SWT.PUSH);
-		selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON));
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		//gd.horizontalSpan = 1;
-		//gd.heightHint = 22;
-		gd.widthHint = 140;
-		selectAllButton.setLayoutData(gd);
-		selectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				List list = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
-				List newList = new ArrayList();
-				newList.addAll(list);
-				model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
-			}
-		});
-
-		Button deselectAllButton = new Button(buttonGroup, SWT.PUSH);
-		deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON));
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		////gd.horizontalSpan = 1;
-		//gd.heightHint = 22;
-		gd.widthHint = 140;
-		deselectAllButton.setLayoutData(gd);
-		deselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				List newList = new ArrayList();
-				model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
-			}
-		});
-	}
-
-	public void propertyChanged(DataModelEvent event) {
-		if (event.getPropertyName().equals(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST)) {
-			if(earFileListViewer != null){
-				updateGUICheckSelection();
-			}
-		}
-		super.propertyChanged(event);
-	}
-
-	public void setFileListViewerInput() {
-		TableObjects files = new TableObjects();
-		Iterator iterator = ((List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST)).iterator();
-		while (iterator.hasNext()) {
-			files.tableObjectsList.add(iterator.next());
-		}
-		earFileListViewer.setInput(files);
-		updateGUICheckSelection();
-	}
-
-	private void updateGUICheckSelection() {
-		List selectedList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
-		List projectList = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
-		Object currentElement = null;
-		for (int i = 0; i < projectList.size(); i++) {
-			currentElement = projectList.get(i);
-			earFileListViewer.setChecked(currentElement, selectedList.contains(currentElement));
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.wizard.J2EEWizardPage#enter()
-	 */
-	protected void enter() {
-		super.enter();
-		setFileListViewerInput();
-		validatePage();
-	}
-
-	/**
-	 * Creates the import source specification widgets. <b>Subclasses </b> must override this hook
-	 * method.
-	 * 
-	 * @param parent
-	 *            a <code>Composite</code> that is to be used as the parent of this group's
-	 *            collection of visual components
-	 * @see org.eclipse.swt.widgets.Composite
-	 */
-	protected void createListGroup(org.eclipse.swt.widgets.Composite parent) {
-		Composite listGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		listGroup.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		listGroup.setLayoutData(gd);
-
-		earFileListViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-		EARImportListContentProvider provider = new EARImportListContentProvider();
-		earFileListViewer.setContentProvider(provider);
-		earFileListViewer.setLabelProvider(provider);
-		earFileListViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				IDataModel matchingModel = null;// getEARImportDataModel().getMatchingEJBJarOrClient(aModel);
-				if (null != matchingModel) {
-					earFileListViewer.setChecked(matchingModel, event.getChecked());
-				}
-				List result = new ArrayList();
-				result.addAll(Arrays.asList(earFileListViewer.getCheckedElements()));
-				model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, result);
-
-			}
-		});
-
-		Table earFileListTable = (Table) earFileListViewer.getControl();
-		earFileListTable.setHeaderVisible(true);
-		earFileListTable.setLinesVisible(true);
-		// set up table layout
-		TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
-		tableLayout.addColumnData(new ColumnWeightData(100, true));
-		tableLayout.addColumnData(new ColumnWeightData(200, true));
-		earFileListTable.setLayout(tableLayout);
-
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gd.widthHint = 400;
-		earFileListTable.setLayoutData(gd);
-
-
-		TableColumn fileNameColumns = new TableColumn(earFileListTable, SWT.NONE);
-		fileNameColumns.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_Modules_in_EAR)); //$NON-NLS-1$ = "Modules in EAR"
-		fileNameColumns.setResizable(true);
-
-		TableColumn importNameColumn = new TableColumn(earFileListTable, SWT.NONE);
-		importNameColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_New_Project_Name)); //$NON-NLS-1$ = "New Project Name"
-		importNameColumn.setResizable(true);
-
-		String[] columnProperties = new String[2];
-		columnProperties[0] = FILE_COLUMN;
-		columnProperties[1] = PROJECT_COLUMN;
-		earFileListViewer.setColumnProperties(columnProperties);
-
-		setColumnEditors();
-		earFileListViewer.setCellModifier(new ICellModifier() {
-			public boolean canModify(Object element, String property) {
-				return PROJECT_COLUMN.equals(property);
-			}
-
-			public Object getValue(Object element, String property) {
-				TableItem[] items = earFileListViewer.getTable().getSelection();
-				TableItem item = items[0];
-				return item.getText(1);
-			}
-
-			public void modify(Object element, String property, Object value) {
-				TableItem elementHolder = (TableItem) element;
-				if (property.equals(PROJECT_COLUMN)) {
-					elementHolder.setText(1, (String) value);
-					((IDataModel) elementHolder.getData()).setProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME, value);
-				}
-			}
-		});
-	}
-
-
-	protected void restoreWidgetValues() {
-		// This page doesn't implement...
-	}
-
-	public void storeDefaultSettings() {
-		// This page doesn't implement...
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, EARComponentImportDataModelProvider.NESTED_PROJECTS_VALIDATION};
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java
deleted file mode 100644
index 31474d947..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java
+++ /dev/null
@@ -1,108 +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.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-/**
- * Insert the type's description here. Creation date: (5/7/2001 11:39:11 AM)
- * 
- * @author: Administrator
- */
-public class EARImportListContentProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider {
-	/**
-	 * EARImportListContentProvider constructor comment.
-	 */
-	public EARImportListContentProvider() {
-		super();
-	}
-
-	/**
-	 * 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) {
-			Object[] array = ((TableObjects) inputElement).getTableObjects().toArray();
-			Arrays.sort(array, new Comparator() {
-				public int compare(Object o1, Object o2) {
-					return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
-				}
-			});
-			return array;
-		}
-		return new Object[0]; // should throw exception instead
-	}
-
-	/**
-	 * Returns the label image for the given column of the given element.
-	 * 
-	 * @param element
-	 *            the object representing the entire row, or <code>null</code> indicating that no
-	 *            input object is set in the viewer
-	 * @param columnIndex
-	 *            the zero-based index of the column in which the label appears
-	 */
-	public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
-		return null;
-	}
-
-	/**
-	 * Returns the label text for the given column of the given element.
-	 * 
-	 * @param element
-	 *            the object representing the entire row, or <code>null</code> indicating that no
-	 *            input object is set in the viewer
-	 * @param columnIndex
-	 *            the zero-based index of the column in which the label appears
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		IDataModel dataModel = (IDataModel) element;
-		if (columnIndex == 0) {
-			Archive archive = (Archive) dataModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-			if (archive.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) {
-				String parentWarFileName = ((WARFile) archive.eContainer()).getName();
-				return parentWarFileName + "#" + archive.getURI(); //$NON-NLS-1$
-			}
-			return archive.getURI();
-		} else if (columnIndex == 1) {
-			return dataModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// do nothing
-	}
-
-	public void dispose() {
-		// dispose
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java
deleted file mode 100644
index 7b3772c15..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java
+++ /dev/null
@@ -1,92 +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.wizard;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.validation.UIEarValidator;
-import org.eclipse.wst.common.frameworks.internal.ui.RunnableWithProgressWrapper;
-import org.eclipse.wst.validation.internal.operations.OneValidatorOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-
-public class EARValidationHelper {
-
-	/**
-	 * Constructor for EARValidationHelper.
-	 */
-	private EARValidationHelper() {
-		super();
-	}
-
-	/**
-	 * Return a list of runnable validation operations for all EAR projects which have auto validate
-	 * enabled, and are impacted by the list of projects; If the ear project itself is in the list,
-	 * then it is skipped.
-	 */
-	public static IRunnableWithProgress[] getEARValidationOperations(List modifiedProjects) {
-		List earProjects = Arrays.asList(J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.ENTERPRISE_APPLICATION));
-		List result = new ArrayList(earProjects.size());
-		for (int i = 0; i < earProjects.size(); i++) {
-			IProject earProj = (IProject) earProjects.get(i);
-			if (willEARProjectNeedValidation(earProj, modifiedProjects)) {
-				result.add(createValidationRunnable(earProj));
-			}
-		}
-		return (IRunnableWithProgress[]) result.toArray(new IRunnableWithProgress[result.size()]);
-	}
-
-	/**
-	 * Return a list of runnable validation operations for all EAR projects which have auto validate
-	 * enabled, and are impacted by the j2ee project
-	 */
-	public static IRunnableWithProgress[] getEARValidationOperations(IProject modifiedJ2EEProject) {
-		return getEARValidationOperations(Collections.singletonList(modifiedJ2EEProject));
-	}
-
-	public static boolean isEARValidationAutoEnabled(IProject earProj) {
-		return ValidatorManager.getManager().isAutoValidate(earProj) && ValidatorManager.getManager().isEnabled(earProj, UIEarValidator.VALIDATOR_ID);
-	}
-
-	private static boolean willEARProjectNeedValidation(IProject earProj, List modifiedProjects) {
-		if (modifiedProjects.contains(earProj) || !isEARValidationAutoEnabled(earProj))
-			return false;
-		//TODO migrate to use artifact edits and components
-//		Object accessorKey = new Object();
-//		EAREditModel editModel = runtime.getEarEditModelForRead(accessorKey);
-//		try {
-//			for (int i = 0; i < modifiedProjects.size(); i++) {
-//				if (editModel.hasMappingToProject((IProject) modifiedProjects.get(i)))
-//					return true;
-//			}
-//		} finally {
-//			if (editModel != null)
-//				editModel.releaseAccess(accessorKey);
-//		}
-		return false;
-	}
-
-	/**
-	 * Creates a new IRunnableWithProgress which runs a one validator operation on the EAR project
-	 */
-	public static IRunnableWithProgress createValidationRunnable(IProject earProj) {
-		OneValidatorOperation op = new OneValidatorOperation(earProj, UIEarValidator.VALIDATOR_ID, true, false);
-
-		return new RunnableWithProgressWrapper(op);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ImportUtil.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ImportUtil.java
deleted file mode 100644
index afa712e5e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ImportUtil.java
+++ /dev/null
@@ -1,216 +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.wizard;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-
-
-
-/**
- * @author Sachin
- * 
- * 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 ImportUtil {
-
-	public static final int UNKNOWN = 0;
-	public static final int EARFILE = 1;
-	public static final int EJBJARFILE = 2;
-	public static final int WARFILE = 3;
-	public static final int CLIENTJARFILE = 4;
-	public static final int RARFILE = 5;
-	public static final int IMPORTCLASSTYPE = 6;
-	public static final int J2EE14 = 256;
-	public static final int J2EE13 = 128;
-	public static final int J2EE12 = 64;
-	public static final int J2EESpec = J2EE12 + J2EE13 + J2EE14;
-	public static final String EAR = "EAR"; //$NON-NLS-1$
-	public static final String EJB = "EJB"; //$NON-NLS-1$
-	public static final String WAR = "WEB"; //$NON-NLS-1$
-	public static final String JAR = "CLIENT"; //$NON-NLS-1$
-	public static final String RAR = "RAR"; //$NON-NLS-1$
-	public static final String[] SUFFIXES = {"", EAR, EJB, WAR, JAR, RAR, ""}; //$NON-NLS-1$ //$NON-NLS-2$
-
-	public static int getFileType(String fileName) {
-		Archive anArchive = null;
-		try {
-			try {
-				anArchive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
-				int archiveType = getArchiveType(anArchive);
-				if (archiveType == UNKNOWN && isImportClassType(fileName))
-					return IMPORTCLASSTYPE;
-				return archiveType;
-			} catch (Exception e) {
-				if (isImportClassType(fileName))
-					return IMPORTCLASSTYPE;
-				return UNKNOWN;
-			}
-		} finally {
-			if (anArchive != null && anArchive.isOpen())
-				anArchive.close();
-		}
-	}
-
-	//TODO: use new getJ2EEVerions switch statements
-	public static int getVersionedFileType(String fileName) {
-		Archive anArchive = null;
-		try {
-			int archiveType = UNKNOWN;
-			try {
-				anArchive = CommonarchiveFactoryImpl.getActiveFactory().openArchive(fileName);
-				try {
-					if (anArchive.isEJBJarFile()) {
-						archiveType = EJBJARFILE;
-						EJBJar ejbJar = ((EJBJarFile) anArchive).getDeploymentDescriptor();
-						if (ejbJar.getVersionID() == J2EEVersionConstants.EJB_1_1_ID)
-							archiveType |= J2EE12;
-						else if (ejbJar.getVersionID() == J2EEVersionConstants.EJB_2_0_ID)
-							archiveType |= J2EE13;
-						else if (ejbJar.getVersionID() == J2EEVersionConstants.EJB_2_1_ID)
-							archiveType |= J2EE14;
-					} else if (anArchive.isWARFile()) {
-						archiveType = WARFILE;
-						WebApp war = ((WARFile) anArchive).getDeploymentDescriptor();
-						if (war.getVersionID() == J2EEVersionConstants.WEB_2_2_ID)
-							archiveType |= J2EE12;
-						else if (war.getVersionID() == J2EEVersionConstants.WEB_2_3_ID)
-							archiveType |= J2EE13;
-						else if (war.getVersionID() == J2EEVersionConstants.WEB_2_4_ID)
-							archiveType |= J2EE14;
-					} else if (anArchive.isApplicationClientFile()) {
-						archiveType = CLIENTJARFILE;
-						ApplicationClient appClient = ((ApplicationClientFile) anArchive).getDeploymentDescriptor();
-						if (appClient.getVersionID() == J2EEVersionConstants.J2EE_1_2_ID)
-							archiveType |= J2EE12;
-						else if (appClient.getVersionID() == J2EEVersionConstants.J2EE_1_3_ID)
-							archiveType |= J2EE13;
-						else if (appClient.getVersionID() == J2EEVersionConstants.J2EE_1_4_ID)
-							archiveType |= J2EE14;
-					} else if (anArchive.isRARFile()) {
-						archiveType = RARFILE | J2EE13;
-					} else if (anArchive.isEARFile()) {
-						archiveType = EARFILE;
-						Application app = ((EARFile) anArchive).getDeploymentDescriptor();
-						if (app.getVersionID() == J2EEVersionConstants.J2EE_1_2_ID)
-							archiveType |= J2EE12;
-						else if (app.getVersionID() == J2EEVersionConstants.J2EE_1_3_ID)
-							archiveType |= J2EE13;
-						else if (app.getVersionID() == J2EEVersionConstants.J2EE_1_4_ID)
-							archiveType |= J2EE14;
-					}
-				} catch (Exception e) {
-					//Ignore
-				}
-
-			} catch (Exception e) {
-				//Ignore
-			}
-			if (archiveType == UNKNOWN && isImportClassType(fileName))
-				archiveType = IMPORTCLASSTYPE;
-			return archiveType;
-		} finally {
-			if (anArchive != null && anArchive.isOpen())
-				anArchive.close();
-		}
-	}
-
-	public static int getArchiveType(Archive anArchive) {
-		int type = UNKNOWN;
-		try {
-			if (anArchive.isEJBJarFile())
-				type = EJBJARFILE;
-			else if (anArchive.isWARFile())
-				type = WARFILE;
-			else if (anArchive.isApplicationClientFile())
-				type = CLIENTJARFILE;
-			else if (anArchive.isRARFile())
-				type = RARFILE;
-			else if (anArchive.isEARFile())
-				type = EARFILE;
-		} catch (Exception e) {
-			//Ignore
-		}
-		return type;
-	}
-
-	public static boolean isImportClassType(String fileName) {
-		File file = new File(fileName);
-		String fileExtension = getExtension(file);
-		if (file.isFile()) {
-			if (fileExtension.equalsIgnoreCase("jar") || //$NON-NLS-1$
-						fileExtension.equalsIgnoreCase("zip") || //$NON-NLS-1$
-						fileExtension.equalsIgnoreCase("class")) //$NON-NLS-1$
-				return true;
-		} else if (file.isDirectory()) { //disable/enable drag/drop directories
-			return false;
-		}
-		return false;
-	}
-
-	public static String getExtension(File f) {
-		String ext = null;
-		String s = f.getName();
-		int i = s.lastIndexOf('.');
-
-		if (i > 0 && i < s.length() - 1) {
-			ext = s.substring(i + 1).toLowerCase();
-		}
-		return ext;
-	}
-
-
-	public static String findMatchingProjectName(String projectName) {
-		if (projectName.trim().length() > 0) {
-			IWorkspaceRoot root = J2EEPlugin.getWorkspace().getRoot();
-			IProject[] projects = root.getProjects();
-			String lowerCaseName = projectName.toLowerCase();
-			// iterate through all projects a compare lowercase names
-			if (projectName == null || projectName.length() == 0) {
-				if (projects.length == 1)
-					return projects[0].getName();
-				return null;
-			}
-			for (int i = 0; i < projects.length; i++) {
-				if (projects[i].exists()) {
-					if (WTPPlugin.isPlatformCaseSensitive()) {
-						if (projects[i].getName().equals(projectName))
-							return projects[i].getName();
-					} else {
-						if (projects[i].getName().toLowerCase().equals(lowerCaseName))
-							return projects[i].getName();
-					}
-				}
-			}
-		}
-		return projectName;
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java
deleted file mode 100644
index 9a1208f0c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java
+++ /dev/null
@@ -1,291 +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.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-
-/**
- * <p>
- * Serves as a base class for the Wizards which create J2EE artifact structures. An Artifact can be
- * a J2EE application, module, or utility component.
- * </p>
- * <p>
- * Creation wizards must define the abstract methods from
- * {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard}which include the following:
- * <ul>
- * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#doAddPages()}
- * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#canFinish()}
- * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#createBaseOperation()}
- * <li>{@link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#createDefaultModel()}
- * </ul>
- * </p>
- * <p>
- * And optionally, they can override the following methods:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()}
- * <li>{@link #doDispose()}
- * <li>{@link #doSetInitializeData(IConfigurationElement, String, Object)}
- * </ul>
- * 
- * @see org.eclipse.wst.common.frameworks.ui.ExtendableWizard
- */
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public abstract class J2EEArtifactCreationWizard extends DataModelWizard implements INewWizard, IExecutableExtension, IPluginContribution, DoNotUseMeThisWillBeDeletedPost15 {
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the main page of the Wizard.
-	 * </p>
-	 */
-	protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
-	private IStructuredSelection selection;
-	private IConfigurationElement configurationElement;
-
-	/**
-	 * <p>
-	 * Creates a default instance of the wizard with no configuration data, no selection, and no
-	 * operation data model.
-	 * </p>
-	 */
-	public J2EEArtifactCreationWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate wizard controls and to collect data from the user. The model
-	 * will eventually be used to run the operation, if the user does not cancel the Wizard.
-	 * </p>
-	 * 
-	 * @param model
-	 *            used to collect information and interface with the WTP Operation
-	 */
-	public J2EEArtifactCreationWizard(IDataModel model) {
-		super(model);
-	}
-
-
-	/**
-	 * <p>
-	 * The selection is used to pre-populate values in the Wizard dialog controls.
-	 * </p>
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 * 
-	 * @param workbench
-	 *            the current workbench parent of the wizard
-	 * @param aSelection
-	 *            the selection from the view used to start the wizard (if any)
-	 */
-	public final void init(IWorkbench workbench, IStructuredSelection aSelection) {
-		setNeedsProgressMonitor(true);
-		this.selection = aSelection;
-		doInit();
-	}
-
-	/**
-	 * <p>
-	 * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
-	 * wizard completes.
-	 * </p>
-	 * 
-	 * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
-	 */
-	public final void dispose() {
-		super.dispose();
-		doDispose();
-		this.selection = null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * The configuration element is saved to use when the wizard completes in order to change the
-	 * current perspective using either (1) the value specified by {@link #getFinalPerspectiveID()}
-	 * or (2) the value specified by the finalPerspective attribute in the Wizard's configuration
-	 * element.
-	 * </p>
-	 * 
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public final void setInitializationData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) throws CoreException {
-		configurationElement = aConfigurationElement;
-		doSetInitializeData(aConfigurationElement, aPropertyName, theData);
-
-	}
-
-	/**
-	 * <p>
-	 * Override method for clients that wish to take advantage of the information provided by
-	 * {@see #setInitializationData(IConfigurationElement, String, Object)}.
-	 * </p>
-	 * 
-	 * @param aConfigurationElement
-	 *            The configuration element provided from the templated method.
-	 * @param aPropertyName
-	 *            The property name provided from the templated method.
-	 * @param theData
-	 *            The data provided from the templated method.
-	 */
-	protected void doSetInitializeData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) {
-		// Default do nothing
-	}
-
-	/**
-	 * <p>
-	 * Invoked from init(IWorkbench, IStructuredSelection) once the workbench and selection have
-	 * been safely stored away.
-	 * </p>
-	 * <p>
-	 * No-op by default.
-	 * </p>
-	 */
-	protected void doInit() {
-		// init
-	}
-
-	/**
-	 * <p>
-	 * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
-	 * </p>
-	 */
-	protected void doDispose() {
-		// dispose
-	}
-
-	/**
-	 * <p>
-	 * Override to return the final perspective ID (if any). The final perspective ID can be
-	 * hardcoded by the subclass or determined programmatically (possibly using the value of a field
-	 * on the Wizard's WTP Operation Data Model).
-	 * </p>
-	 * <p>
-	 * Default return value is <b>null </b>.
-	 * </p>
-	 * 
-	 * @return Returns the ID of the Perspective which is preferred by this wizard upon completion.
-	 */
-	protected String getFinalPerspectiveID() {
-		return null;
-	}
-
-	/**
-	 * 
-	 * <p>
-	 * Invoked after the user has clicked the "Finish" button of the wizard. The default
-	 * implementation will attempt to update the final perspective to the value specified by
-	 * {@link #getFinalPerspectiveID() }
-	 * </p>
-	 * 
-	 * @throws InvocationTargetException
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
-	 */
-	protected void postPerformFinish() throws InvocationTargetException {
-		super.postPerformFinish();
-		if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
-
-			IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
-				public String getAttribute(String aName) {
-					if (aName.equals("finalPerspective")) { //$NON-NLS-1$
-						return getFinalPerspectiveID();
-					}
-					return super.getAttribute(aName);
-				}
-			};
-			BasicNewProjectResourceWizard.updatePerspective(element);
-		} else
-			BasicNewProjectResourceWizard.updatePerspective(configurationElement);
-		String projName = getDataModel().getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-		BasicNewResourceWizard.selectAndReveal(ProjectUtilities.getProject(projName), J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
-	 * @return Returns the saved settings from the previous use of the Wizard
-	 */
-	public final IDialogSettings getDialogSettings() {
-		return J2EEUIPlugin.getDefault().getDialogSettings();
-	}
-
-	/**
-	 * @return Returns the selection from the current view used to spawn the wizard
-	 */
-	protected final IStructuredSelection getSelection() {
-		return selection;
-	}
-
-
-	/**
-	 * <p>
-	 * Returns the value specified by {@link #getWizardId()}
-	 * </p>
-	 * 
-	 * @return Returns the an id component used for Activity filtering.
-	 */
-	public final String getLocalId() {
-		return getWizardID();
-	}
-
-	/**
-	 * <p>
-	 * Returns the an id component used for Activity filtering.
-	 * </p>
-	 * 
-	 * <p>
-	 * The Plugin ID is determined from the configuration element specified in
-	 * {@see #setInitializationData(IConfigurationElement, String, Object)}.
-	 * </p>
-	 * 
-	 * @return Returns the plugin id associated with this wizard
-	 */
-	public final String getPluginId() {
-		return (configurationElement != null) ? configurationElement.getNamespace() : ""; //$NON-NLS-1$
-	}
-
-
-
-	protected final IConfigurationElement getConfigurationElement() {
-		return configurationElement;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
deleted file mode 100644
index 3b7f1ec3f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
+++ /dev/null
@@ -1,172 +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.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * <p>
- * Serves as a base class for Wizards which export J2EE artifact structures from Eclipse projects
- * into a deployable form.
- * </p>
- * <p>
- * Subclasses must provide the methods that are required by
- * {@link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard}.
- * </p>
- * <p>
- * Optionally, subclasses may also override the following methods:
- * <ul>
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- * </p>
- * <p>
- * The base class will ensure that the Wizard is not spawned unless all open editors are in a
- * non-dirty state. Additionally, the selection from the active view which spanwed the wizard will
- * be made available to subclasses via {@link #getSelection()}.
- * </p>
- */
-public abstract class J2EEArtifactExportWizard extends DataModelWizard {
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the main page of the Wizard.
-	 * </p>
-	 */
-	protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
-	private IStructuredSelection currentSelection;
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public J2EEArtifactExportWizard() {
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString("67"));//$NON-NLS-1$ 
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public J2EEArtifactExportWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString("67"));//$NON-NLS-1$ 
-	}
-
-	/**
-	 * <p>
-	 * Invoked from init(IWorkbench, IStructuredSelection) once the workbench and selection have
-	 * been safely stored away.
-	 * </p>
-	 * <p>
-	 * No-op by default.
-	 * </p>
-	 */
-	protected void doInit() {
-		//init
-	}
-
-	/**
-	 * <p>
-	 * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
-	 * </p>
-	 */
-	private void doDispose() {
-		//dispose
-	}
-
-	/**
-	 * <p>
-	 * The selection is used to pre-populate values in the Wizard dialog controls.
-	 * </p>
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 * 
-	 * @param workbench
-	 *            the current workbench parent of the wizard
-	 * @param aSelection
-	 *            the selection from the view used to start the wizard (if any)
-	 */
-	public final void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EXPORT_WIZ_TITLE));
-		this.currentSelection = selection;
-
-//TODO: enable selection defaults
-//		if (this.currentSelection.size() > 0) {
-//			Object element = this.currentSelection.getFirstElement();
-//			IProject project = ProjectUtilities.getProject(element);
-//			if (project != null) {
-//				IDataModel m = getDataModel();
-//				Object originalProjectName = m.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME);
-//				m.setProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, project.getName());
-//				if (!m.validateProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME).isOK()) {
-//					m.setProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, originalProjectName);
-//				}
-//			}
-//		}
-		setNeedsProgressMonitor(true);
-		doInit();
-	}
-
-	/**
-	 * <p>
-	 * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
-	 * wizard completes.
-	 * </p>
-	 * 
-	 * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
-	 */
-	public final void dispose() {
-		super.dispose();
-		doDispose();
-		this.currentSelection = null;
-	}
-
-	protected final boolean prePerformFinish() {
-		if (!CommonEditorUtility.promptToSaveAllDirtyEditors()) {
-			return false;
-		}
-		if (CommonEditorUtility.getDirtyEditors().length != 0) { // all checkboxes were not selected
-			return false;
-		}
-		return super.prePerformFinish();
-	}
-
-	/**
-	 * @return Returns the currentSelection.
-	 */
-	protected final IStructuredSelection getSelection() {
-		return currentSelection;
-	}
-
-	/**
-	 * @return
-	 */
-	protected final J2EEExportPage getMainPage() {
-		return (J2EEExportPage) getPage(MAIN_PG);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
deleted file mode 100644
index 7e99cb717..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
+++ /dev/null
@@ -1,229 +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.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-
-/**
- * <p>
- * Serves as a base class for Wizards which import J2EE artifact structures into Eclipse projects.
- * </p>
- * <p>
- * Subclasses must provide the methods that are required by
- * {@see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard}.
- * </p>
- * <p>
- * Optionally, subclasses may also override the following methods:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- * </p>
- * <p>
- * The base class will ensure that the Wizard is not spawned unless all open editors are in a
- * non-dirty state. Additionally, the selection from the active view which spanwed the wizard will
- * be made available to subclasses via {@link #getCurrentSelection()}.
- * </p>
- */
-public abstract class J2EEArtifactImportWizard extends DataModelWizard implements IImportWizard, IExecutableExtension {
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the main page of the Wizard.
-	 * </p>
-	 */
-	protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
-	private IConfigurationElement configurationElement;
-	private IStructuredSelection selection;
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public J2EEArtifactImportWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public J2EEArtifactImportWizard(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * The selection is used to pre-populate values in the Wizard dialog controls.
-	 * </p>
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 * 
-	 * @param workbench
-	 *            the current workbench parent of the wizard
-	 * @param aSelection
-	 *            the selection from the view used to start the wizard (if any)
-	 */
-	public final void init(IWorkbench workbench, IStructuredSelection aSelection) {
-		this.selection = aSelection;
-		setNeedsProgressMonitor(true);
-		doInit();
-	}
-
-	/**
-	 * <p>
-	 * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
-	 * wizard completes.
-	 * </p>
-	 * 
-	 * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
-	 */
-	public final void dispose() {
-		super.dispose();
-		doDispose();
-		this.selection = null;
-		this.configurationElement = null;
-	}
-
-	/**
-	 * <p>
-	 * Invoked after the selection has been saved off in
-	 * {@link #init(IWorkbench, IStructuredSelection)}. Should be used to handle any specific
-	 * Wizard initialization.
-	 * </p>
-	 */
-	protected void doInit() {
-		// init
-	}
-
-	/**
-	 * <p>
-	 * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
-	 * </p>
-	 */
-	protected void doDispose() {
-		// dispose
-	}
-
-	/**
-	 * <p>
-	 * The return value of this method will be used to suggest a final perspective to the user once
-	 * the wizard completes.
-	 * </p>
-	 * 
-	 * @return Returns the J2EE Perpsective ID by default
-	 */
-	protected String getFinalPerspectiveID() {
-		return null;
-	}
-
-	/**
-	 * <p>
-	 * Prompts the user to save open, dirty editors.
-	 * </p>
-	 * 
-	 * @return true only if all editors are saved
-	 */
-	protected final boolean prePerformFinish() {
-		if (!CommonEditorUtility.promptToSaveAllDirtyEditors()) {
-			return false;
-		}
-		if (CommonEditorUtility.getDirtyEditors().length != 0) { // all checkboxes were not
-			// selected
-			return false;
-		}
-		return super.prePerformFinish();
-	}
-
-	/**
-	 * <p>
-	 * Invoked after the user has clicked the "Finish" button of the wizard. The default
-	 * implementation will attempt to update the final perspective to the value specified by
-	 * {@link #getFinalPerspectiveID() }
-	 * </p>
-	 * 
-	 * @throws InvocationTargetException
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
-	 */
-	protected final void postPerformFinish() throws InvocationTargetException {
-		super.postPerformFinish();
-		if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
-			final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
-				public String getAttribute(String aName) {
-					if (aName.equals("finalPerspective")) { //$NON-NLS-1$
-						return getFinalPerspectiveID();
-					}
-					return super.getAttribute(aName);
-				}
-			};
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					BasicNewProjectResourceWizard.updatePerspective(element);
-				}
-			});
-		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					BasicNewProjectResourceWizard.updatePerspective(configurationElement);
-				}
-			});
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * The configuration element is saved to use when the wizard completes in order to change the
-	 * current perspective using either (1) the value specified by {@see #getFinalPerspectiveID()}
-	 * or (2) the value specified by the finalPerspective attribute in the Wizard's configuration
-	 * element.
-	 * </p>
-	 * 
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public final void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-		this.configurationElement = config;
-	}
-
-	/**
-	 * @return Returns the selection.
-	 */
-	protected final IStructuredSelection getSelection() {
-		return selection;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java
deleted file mode 100644
index 09316e980..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java
+++ /dev/null
@@ -1,202 +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.wizard;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-
-/**
- * <p>
- * Serves as a base class for Wizards which create J2EE module structures in Eclipse projects.
- * </p>
- * <p>
- * The EAR will be pre-populated in the Wizard controls if any selection was provided to the Wizard.
- * </p>
- * <p>
- * Refer to {@link org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactCreationWizard}for information
- * on how to extend this class.
- * </p>
- * 
- * @see org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactCreationWizard
- */
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public abstract class J2EEComponentCreationWizard extends J2EEArtifactCreationWizard implements IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the main page of the Wizard.
-	 * </p>
-	 */
-	protected static final String MODULE_PG = "module"; //$NON-NLS-1$
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public J2EEComponentCreationWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public J2EEComponentCreationWizard(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * The selection stored in
-	 * {@link J2EEArtifactCreationWizard#init(IWorkbench, IStructuredSelection)}is used to
-	 * pre-populate the EAR project in the Wizard dialog controls.
-	 * </p>
-	 * 
-	 * @see J2EEArtifactCreationWizard#init(IWorkbench, IStructuredSelection)
-	 * @see J2EEArtifactCreationWizard#doInit()
-	 */
-	protected void doInit() {
-		preFillSelectedEARProject();
-	}
-
-	/**
-	 * <p>
-	 * Subclasses which override this method should always call super.addModulesPageIfNecessary()
-	 * ahead of before their own pages.
-	 * </p>
-	 * 
-	 */
-	protected void addModulesPageIfNecessary() {
-		// TODO: add modules page back for 0.7
-		// if (getDataModel().getBooleanProperty(UI_SHOW_EAR_SECTION)) {
-		// addPage(new J2EEModulesDependencyPage(getDataModel(), MODULE_PG));
-		// }
-	}
-
-	/**
-	 * @inheritDoc
-	 * 
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
-	protected void doAddPages() {
-		addModulesPageIfNecessary();
-	}
-
-	/**
-	 * <p>
-	 * Skips the page identified by the MODULE_PG name if
-	 * {@link J2EEComponentCreationWizard#shouldShowModulesPage()}is false.
-	 * </p>
-	 */
-	public String getPreviousPage(String currentPageName, String expectedPreviousPageName) {
-		if (!shouldShowModulesPage() && expectedPreviousPageName.equals(MODULE_PG)) {
-			return IDMPageHandler.PAGE_BEFORE;
-		}
-		return super.getPreviousPage(currentPageName, expectedPreviousPageName);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Skips the page identified by the MODULE_PG name if
-	 * {@link J2EEModuleProjectCreationWizard#shouldShowModulesPage()}is false.
-	 * </p>
-	 */
-	public String getNextPage(String currentPageName, String expectedNextPageName) {
-		if (!shouldShowModulesPage() && (null != expectedNextPageName && expectedNextPageName.equals(MODULE_PG))) {
-			return IDMPageHandler.PAGE_AFTER;
-		}
-		return super.getNextPage(currentPageName, expectedNextPageName);
-	}
-
-	/**
-	 * <p>
-	 * Uses the model to determine if the module page should be shown. The default is to AND the
-	 * values of model.getBooleanProperty(J2EEModuleCreationDataModel.ADD_TO_EAR) and
-	 * shouldShowModulesPageForEAR().
-	 * </p>
-	 * 
-	 * @return Returns a boolean true if the module page should be shown.
-	 */
-	protected final boolean shouldShowModulesPage() {
-		return getDataModel().getBooleanProperty(ADD_TO_EAR) && shouldShowModulesPageForEAR();
-	}
-
-	/**
-	 * <p>
-	 * Uses the model to determine if the module page should be shown for the EAR. If no modules are
-	 * present in the classpath selection of the model, the method will return false.
-	 * </p>
-	 * 
-	 * @return true only if the
-	 * @see J2EEModuleCreationDataModelOld#getClassPathSelection() is non-empty.
-	 */
-	protected final boolean shouldShowModulesPageForEAR() {
-		// TODO is this what we want here?
-		return true;
-	}
-
-	/**
-	 * @return Returns the EAR module selected in the view used to launch the wizard.
-	 */
-	protected IVirtualComponent getSelectedEARModule() {
-		IStructuredSelection selection = getSelection();
-		if (null != selection) {
-			Object obj = selection.getFirstElement();
-			if (obj instanceof EObject) {
-				IVirtualComponent comp = ComponentUtilities.findComponent((EObject) obj);
-				if (null != comp && J2EEProjectUtilities.isEARProject(comp.getProject())) {
-					return comp;
-				}
-			}
-		}
-		return null;
-	}
-
-	protected void preFillSelectedEARProject() {
-		IVirtualComponent earComponent = getSelectedEARModule();
-		if (earComponent != null) {
-			EARArtifactEdit earEdit = null;
-			int j2eeVersion = 0;
-			try {
-				earEdit = EARArtifactEdit.getEARArtifactEditForRead(earComponent);
-				j2eeVersion = earEdit.getJ2EEVersion();
-			} finally {
-				if (earEdit != null)
-					earEdit.dispose();
-			}
-			IDataModel dm = getDataModel();
-			dm.setIntProperty(COMPONENT_VERSION, j2eeVersion);
-			dm.setProperty(EAR_COMPONENT_NAME, earComponent.getName());
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
deleted file mode 100644
index 28802c3ce..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
+++ /dev/null
@@ -1,565 +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 Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public abstract class J2EEComponentCreationWizardPage extends DataModelWizardPage implements IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-    private static final boolean isWindows = SWT.getPlatform().toLowerCase().startsWith("win"); //$NON-NLS-1$
-    protected static final String MODULE_VERSION = J2EEUIMessages.MODULE_VERSION_LABEL;
-    protected NewModuleGroup projectNameGroup;
-    protected Composite advancedComposite;
-    protected Button advancedButton;
-    protected boolean showAdvanced = false;
-    protected AdvancedSizeController advancedController;
-    protected boolean advancedControlsBuilt = false;
-    protected ServerEarAndStandaloneGroup earGroup;
-    protected Combo serverTargetCombo;
-    protected Text moduleNameText = null;
-    protected Text locationPathField = null;
-    protected Button browseButton = null;
-	protected Button supportMultipleModules = null;
-    protected Combo projectNameCombo = null;
-    protected Text sourceFolderNameText = null;
-    
-    private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-//    private static final String NEW_LABEL_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
-    private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL); //$NON-NLS-1$
-    private String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
-    private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
-    /**
-     *  This type is responsible for setting the Shell size based on the showAdvanced flag. It will
-     * track the original size of the Shell even if the user resizes it. One problem that we may
-     * face is that the Shell size could change by the framework prior to the Shell being made
-     * visible but the page will already get an enter call. This means that we will need to set the
-     * Shell size based on the showAdvanced flag when the Shell resize event is called and the Shell
-     * is visible.
-     */
-    private class AdvancedSizeController implements ControlListener {
-        private int advancedHeight = -1;
-        private Point originalSize;
-        private boolean ignoreShellResize = false;
-
-        private AdvancedSizeController(Shell aShell) {
-            originalSize = aShell.getSize();
-            aShell.addControlListener(this);
-        }
-
-        public void controlMoved(ControlEvent e) {
-            //do nothing
-        }
-
-        public void controlResized(ControlEvent e) {
-            if (!ignoreShellResize) {
-                Control control = (Control) e.getSource();
-                if (control.isVisible()) {
-                    originalSize = control.getSize();
-                    if (advancedHeight == -1)
-                        setShellSizeForAdvanced();
-                }
-            }
-        }
-
-        protected void resetOriginalShellSize() {
-            setShellSize(originalSize.x, originalSize.y);
-        }
-
-        private void setShellSize(int x, int y) {
-            ignoreShellResize = true;
-            try {
-                getShell().setSize(x, y);
-            } finally {
-                ignoreShellResize = false;
-            }
-        }
-
-        protected void setShellSizeForAdvanced() {
-            int height = calculateAdvancedShellHeight();
-            if (height != -1)
-                setShellSize(getShell().getSize().x, height);
-        }
-
-        private int calculateAdvancedShellHeight() {
-            Point advancedCompSize = advancedComposite.getSize();
-            if (advancedCompSize.x == 0)
-                return -1;
-            int height = computeAdvancedHeight();
-            if (!showAdvanced && height != -1)
-                height = height - advancedComposite.getSize().y;
-            return height;
-        }
-
-        /*
-         * Compute the height with the advanced section showing. @return
-         */
-        private int computeAdvancedHeight() {
-            if (advancedHeight == -1) {
-                Point controlSize = getControl().getSize();
-                if (controlSize.x != 0) {
-                	Point pageSize = getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-                    int minHeight = originalSize.y - controlSize.y;
-                    advancedHeight = pageSize.y + minHeight;
-                }
-            }
-            return advancedHeight;
-        }
-    }
-    
-    public J2EEComponentCreationWizardPage(IDataModel dataModel, String pageName) {
-        super(dataModel, pageName);
-    }
-    
-    protected Composite createTopLevelComposite(Composite parent) {
-        Composite top = new Composite(parent, SWT.NONE);
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID());
-        top.setLayout(new GridLayout());
-        top.setData(new GridData(GridData.FILL_BOTH));
-        Composite composite = new Composite(top, SWT.NONE);
-        GridLayout layout = new GridLayout(3, false);
-        composite.setLayout(layout);
-        createModuleGroup(composite);
-        Composite detail = new Composite(top, SWT.NONE);
-        detail.setLayout(new GridLayout());
-        detail.setData(new GridData(GridData.FILL_BOTH));
-        createAdvancedComposite(detail);
-        return top;
-    }
-
-    protected Composite createAdvancedComposite(Composite parent) {
-        advancedControlsBuilt = true;
-        advancedButton = new Button(parent, SWT.TOGGLE);
-        setAdvancedLabelText();
-        final Cursor hand = new Cursor(advancedButton.getDisplay(), SWT.CURSOR_HAND);
-        advancedButton.addDisposeListener(new DisposeListener() {
-            public void widgetDisposed(DisposeEvent e) {
-                hand.dispose();
-            }
-        });
-        advancedComposite = new Composite(parent, SWT.NONE);
-        //toggleAdvanced(false);
-        GridLayout layout = new GridLayout(3, false);
-        GridData data = new GridData();
-        advancedComposite.setData(data);
-        advancedComposite.setLayout(layout);
-        advancedButton.addSelectionListener(new SelectionListener() {
-            public void widgetSelected(SelectionEvent e) {
-                toggleAdvanced(true);
-            }
-
-            public void widgetDefaultSelected(SelectionEvent e) {
-                //do nothing
-            }
-        });
-        advancedButton.addListener(SWT.MouseHover, new Listener() {
-            public void handleEvent(Event event) {
-                if (event.type == SWT.MouseHover)
-                    advancedButton.setCursor(hand);
-            }
-        });
-        addToAdvancedComposite(advancedComposite);
-        return advancedComposite;
-    }
-    
-    protected void createModuleGroup(Composite parent) {
-        createProjectNameGroup(parent);
-        createProjectLocationGroup(parent);
-    }
-    
-    /**
-     *  
-     */
-    private void createProjectNameGroup(Composite parent) {
-        // set up project name label
-        Label projectNameLabel = new Label(parent, SWT.NONE);
-        projectNameLabel.setText(MODULE_NAME_UI);
-        GridData data = new GridData();
-        projectNameLabel.setLayoutData(data);
-        // set up project name entry field
-        moduleNameText = new Text(parent, SWT.BORDER);
-        data = new GridData(GridData.FILL_HORIZONTAL);
-        data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-        moduleNameText.setLayoutData(data);
-        new Label(parent, SWT.NONE); // pad
-        synchHelper.synchText(moduleNameText, COMPONENT_NAME, new Control[]{projectNameLabel});
-        moduleNameText.setFocus();
-    }
-
-    /**
-     *  
-     */
-    private void createProjectLocationGroup(Composite parent) {
-        //      set up location path label
-        Label locationPathLabel = new Label(parent, SWT.NONE);
-        locationPathLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOC_LBL));
-        GridData data = new GridData();
-        locationPathLabel.setLayoutData(data);
-        // set up location path entry field
-        locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
-        data = new GridData(GridData.FILL_HORIZONTAL);
-        data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-        locationPathField.setLayoutData(data);
-        // set up browse button
-        browseButton = new Button(parent, SWT.PUSH);
-        browseButton.setText(defBrowseButtonLabel);
-        browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-        browseButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                handleLocationBrowseButtonPressed();
-            }
-        });
-        browseButton.setEnabled(true);
-        locationPathField.setEditable(true);
-        synchHelper.synchText(locationPathField, LOCATION, null);
-    }
-    /**
-     * Open an appropriate directory browser
-     */
-    protected void handleLocationBrowseButtonPressed() {
-        DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
-        dialog.setMessage(defDirDialogLabel);
-        String dirName = getDataModel().getStringProperty(LOCATION);
-        if ((dirName != null) && (dirName.length() != 0)) {
-            File path = new File(dirName);
-            if (path.exists()) {
-                dialog.setFilterPath(dirName);
-            }
-        }
-        String selectedDirectory = dialog.open();
-        if (selectedDirectory != null) {
-            getDataModel().setProperty(LOCATION, selectedDirectory);
-        }
-    }
-
-    protected void addToAdvancedComposite(Composite advanced) {
-        createServerTargetComposite(advanced);
-        createVersionComposite(advanced);
-        createServerEarAndStandaloneGroup(advanced);
-    }
-
-
-    protected void createServerTargetComposite(Composite parent) {
-        Label label = new Label(parent, SWT.NONE);
-        label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
-        serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-        serverTargetCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        Button newServerTargetButton = new Button(parent, SWT.NONE);
-        newServerTargetButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
-        newServerTargetButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                if(!J2EEComponentCreationWizardPage.launchNewRuntimeWizard(getShell(), model)){
-                	setErrorMessage(J2EECreationResourceHandler.ServerTargetDataModel_UI_9);
-                }
-            }
-        });
-        Control[] deps = new Control[]{label, newServerTargetButton};
-        synchHelper.synchCombo(serverTargetCombo, RUNTIME_TARGET_ID, deps);
-        if(serverTargetCombo.getSelectionIndex() == -1 && serverTargetCombo.getVisibleItemCount() != 0)
-            serverTargetCombo.select(0);
-    }
-
-    protected void createServerEarAndStandaloneGroup(Composite parent) {
-        earGroup = new ServerEarAndStandaloneGroup(parent, getDataModel(), synchHelper);
-    }
-    /**@deprecated 
-	 * If this method is not used it should be removed at a later time, marking as deprecated
-	 * Warning cleanup 12/07/2005
-	 */
-	private void createProjectsComboGroup(Composite parent) {
-		// set up project name label
-		
-		Label projectNameLabel = new Label(parent, SWT.NONE);
-		projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT));
-		
-		// set up project name entry field
-		projectNameCombo = new Combo(parent, SWT.NONE | SWT.READ_ONLY);
-		projectNameCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		projectNameCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				String projectName = projectNameCombo.getText();
-
-				//update the project location with this information, make it readable
-				//update Server info RUNTIME_TARGET_ID, make it readable
-				if (projectName!=null && projectName.length()!=0) {
-					IProject project = ProjectUtilities.getProject(projectName);
-					if (project !=null) {
-						IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-						if (runtime != null){
-							//serverTargetText.setText(runtime.getName());
-							synchHelper.getDataModel().setProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID, runtime.getName());
-						}
-						synchHelper.getDataModel().setProperty(IComponentCreationDataModelProperties.PROJECT_NAME, projectName);
-						synchHelper.getDataModel().setProperty(IComponentCreationDataModelProperties.LOCATION, project.getLocation().toOSString());
-					}
-				}				
-
-			}
-		});
-	}
-
-	/**
-	 * @return
-	 */
-//	private IProject getSelectedProject() {
-//		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-//		if (window == null)
-//			return null;
-//		ISelection selection = window.getSelectionService().getSelection();
-//		if (selection == null || !(selection instanceof StructuredSelection))
-//			return null;
-//		StructuredSelection stucturedSelection = (StructuredSelection) selection;
-//		Object obj = stucturedSelection.getFirstElement();
-//		if (obj instanceof IProject)
-//			return (IProject) obj;
-//		return null;
-//	}
-	
-    protected String[] getValidationPropertyNames() {
-        return new String[]{IComponentCreationDataModelProperties.PROJECT_NAME, RUNTIME_TARGET_ID, COMPONENT_VERSION, COMPONENT_NAME, LOCATION, EAR_COMPONENT_NAME, ADD_TO_EAR, JAVASOURCE_FOLDER };    }
-
-    protected void createSourceFolderComposite(Composite parent) {
-        
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		separator.setLayoutData(gd);
-		
-        Label label = new Label(parent, SWT.NONE);
-        label.setText(getSourceFolderLabel());
-        GridData data = new GridData();      
-        label.setLayoutData(data);
-        // set up project name entry field
-        sourceFolderNameText = new Text(parent, SWT.BORDER);
-        data = new GridData(GridData.FILL_HORIZONTAL);
-        data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-        sourceFolderNameText.setLayoutData(data);
-        new Label(parent, SWT.NONE); // pad
-        synchHelper.synchText(sourceFolderNameText, JAVASOURCE_FOLDER, null);
-    }	
-
-    
-    protected void createVersionComposite(Composite parent) {
-        createVersionComposite(parent, getVersionLabel(), COMPONENT_VERSION);
-    }
-
-    protected String getVersionLabel() {
-        return J2EEUIMessages.getResourceString(J2EEUIMessages.MODULE_VERSION_LABEL);
-    }
-
-    protected String getSourceFolderLabel() {
-        return J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER);
-    }
-    
-    public void dispose() {
-        super.dispose();
-        if (earGroup != null)
-            earGroup.dispose();
-        if (projectNameGroup != null)
-            projectNameGroup.dispose();
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
-     */
-    protected void enter() {
-        if (advancedControlsBuilt) {
-            if (isFirstTimeToPage)
-                initializeAdvancedController();
-            if (isWindows) {
-                advancedController.setShellSizeForAdvanced();
-            }
-        }
-        super.enter();
-    }
-
-    private void initializeAdvancedController() {
-        advancedController = new AdvancedSizeController(getShell());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#exit()
-     */
-    protected void exit() {
-        if (advancedControlsBuilt && isWindows && advancedController!=null) {
-            advancedController.resetOriginalShellSize();
-        }
-        super.exit();
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#storeDefaultSettings()
-     */
-    public void storeDefaultSettings() {
-        super.storeDefaultSettings();
-        if (advancedControlsBuilt) {
-            IDialogSettings settings = getDialogSettings();
-            if (settings != null)
-                settings.put(getShowAdvancedKey(), showAdvanced);
-        }
-    }
-
-    protected String getShowAdvancedKey() {
-        return getClass().getName() + "_SHOW_ADVANCED"; //$NON-NLS-1$
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#restoreDefaultSettings()
-     */
-    protected void restoreDefaultSettings() {
-        super.restoreDefaultSettings();
-        if (advancedControlsBuilt) {
-            IDialogSettings settings = getDialogSettings();
-            if (settings != null)
-                showAdvanced = !settings.getBoolean(getShowAdvancedKey());
-            advancedButton.setSelection(!showAdvanced); //set opposite b/c toggleAdvanced(boolean)
-            // will flip it
-            toggleAdvanced(false);
-        }
-    }
-
-    /**
-     * @param advancedLabel
-     */
-    private void setAdvancedLabelText() {
-        if (advancedControlsBuilt) {
-            if (showAdvanced)
-                advancedButton.setText(J2EEUIMessages.getResourceString("J2EEProjectCreationPage_UI_0")); //$NON-NLS-1$
-            else
-                advancedButton.setText(J2EEUIMessages.getResourceString("J2EEProjectCreationPage_UI_1")); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * @param advancedLabel
-     */
-    protected void toggleAdvanced(boolean setSize) {
-        if (advancedControlsBuilt) {
-            showAdvanced = !showAdvanced;
-            advancedComposite.setVisible(showAdvanced);
-            setAdvancedLabelText();
-            if (setSize && isWindows) {
-                if (advancedControlsBuilt) {
-                    if (advancedController == null)
-                        initializeAdvancedController();
-                    if (isWindows) {
-                        advancedController.setShellSizeForAdvanced();
-                    }
-                }
-//                advancedController.setShellSizeForAdvanced();
-            }   
-        }
-    }
-
-    protected void createVersionComposite(Composite parent, String labelText, String versionProp) {
-        Label label = new Label(parent, SWT.NONE);
-        label.setText(labelText);
-        Combo versionCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-        GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.widthHint = 305;
-        versionCombo.setLayoutData(gridData);
-        Control[] deps = new Control[]{label};
-        synchHelper.synchCombo(versionCombo, versionProp, deps);
-        if (versionCombo.getSelectionIndex() == -1) {
-	        String[] items = versionCombo.getItems();
-	        if (items != null && items.length > 0)
-	            versionCombo.select(items.length - 1);
-        }
-        new Label(parent, SWT.NONE); //pad
-    }   
-    
-
-    
-    public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
-        DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
-        boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, "", "");  //$NON-NLS-1$  //$NON-NLS-2$
-        if (isOK && model != null) {
-
-            DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
-            Object[] preAddition = new Object[preAdditionDescriptors.length];
-            for (int i = 0; i < preAddition.length; i++) {
-                preAddition[i] = preAdditionDescriptors[i].getPropertyValue();
-            }
-            Object[] postAddition = new Object[postAdditionDescriptors.length];
-            for (int i = 0; i < postAddition.length; i++) {
-                postAddition[i] = postAdditionDescriptors[i].getPropertyValue();
-            }
-            Object newAddition = ProjectUtilities.getNewObject(preAddition, postAddition);
-
-            model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.VALID_VALUES_CHG);
-            if (newAddition != null)
-                model.setProperty(RUNTIME_TARGET_ID, newAddition);
-            else
-            	return false;
-        }
-        return isOK;
-    }   
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
deleted file mode 100644
index 3f4928c45..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
+++ /dev/null
@@ -1,108 +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 Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public abstract class J2EEComponentFacetCreationWizardPage extends DataModelFacetCreationWizardPage implements IFacetProjectCreationDataModelProperties {
-
-    private static final String STORE_LABEL = "LASTEARNAME_"; //$NON-NLS-1$
-    
-	protected EarSelectionPanel earPanel;
-  
-	public J2EEComponentFacetCreationWizardPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-        final Composite top = super.createTopLevelComposite( parent );
-		createEarComposite(top);
-		return top;
-	}
-
-	private void createEarComposite(Composite top) {
-		FacetDataModelMap map = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
-		IDataModel facetModel = (IDataModel) map.get(getModuleFacetID());
-		earPanel = new EarSelectionPanel(facetModel, top);
-	}
-
-	protected abstract String getModuleFacetID();
-
-	protected String getModuleTypeID() {
-		return getModuleFacetID();
-	}
-	
-	public void dispose() {
-		super.dispose();
-		if (earPanel != null)
-			earPanel.dispose();
-	}
-	
-    public void storeDefaultSettings() {
-    	super.storeDefaultSettings();
-        IDialogSettings settings = getDialogSettings();
-        if (settings != null) {
-        	FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-	    	String facetID = getModuleFacetID();
-	    	IDataModel j2eeModel = map.getFacetDataModel(facetID);
-        	if(j2eeModel.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)){
-	        	String lastEARName = j2eeModel.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-	            settings.put(STORE_LABEL, lastEARName);
-        	}
-        }
-    }
-    
-    public void restoreDefaultSettings() {
-    	super.restoreDefaultSettings();
-        IDialogSettings settings = getDialogSettings();
-        if (settings != null) {
-            String lastEARName = settings.get(STORE_LABEL);
-            if (lastEARName != null){
-            	FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-            	String facetID = getModuleFacetID();
-            	IDataModel j2eeModel = map.getFacetDataModel(facetID);
-                j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME, lastEARName);
-            }
-		}
-	}
-    
-	protected IDialogSettings getDialogSettings() {
-        return J2EEUIPlugin.getDefault().getDialogSettings();
-    }
-	
-	protected String[] getValidationPropertyNames() {
-		String[] superProperties = super.getValidationPropertyNames();
-		List list = Arrays.asList(superProperties);
-		ArrayList arrayList = new ArrayList();
-		arrayList.addAll( list );
-		arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME );
-		arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR );
-		return (String[])arrayList.toArray( new String[0] );
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java
deleted file mode 100644
index e80bf53b1..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java
+++ /dev/null
@@ -1,76 +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.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <p>
- * Serves as a base class for Wizards which import J2EE module structures into Eclipse projects.
- * </p>
- * <p>
- * Import wizards must define the following methods:
- * <ul>
- * <li>{@link #getImportOperation()}
- * <li>{@link #getModuleValidatorStrings()}
- * </ul>
- * </p>
- * <p>
- * And optionally, they may override the following methods from
- * {@see org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactImportWizard}:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- */
-public abstract class J2EEComponentImportWizard extends J2EEArtifactImportWizard implements IImportWizard, IExecutableExtension {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public J2EEComponentImportWizard() {
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public J2EEComponentImportWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString("38"));//$NON-NLS-1$ 
-	}
-
-	/**
-	 * <p>
-	 * The Import Wizards can run arbitrary validators once the module has been created. These
-	 * validators ensure that the structure created by the Import operation and the contents of that
-	 * structure are valid. Any errors will be announced to the Problems view in Eclipse.
-	 * </p>
-	 * 
-	 * @return An array of validator IDs that should be used for this module type
-	 */
-	protected abstract String[] getModuleValidatorStrings();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java
deleted file mode 100644
index 86b6cdafc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java
+++ /dev/null
@@ -1,91 +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 Mar 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.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEComponentLabelProvider implements ILabelProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		if(element instanceof IVirtualComponent){
-			IVirtualComponent comp = (IVirtualComponent)element;
-			return comp.getProject().getName();
-		}
-		
-		if (element instanceof IProject) {
-			IProject handle = (IProject)element;
-			return handle.getName();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java
deleted file mode 100644
index 35cb1b8f9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java
+++ /dev/null
@@ -1,401 +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 Dec 3, 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.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEExportPage extends DataModelWizardPage {
-
-	public static boolean isWindows = SWT.getPlatform().toLowerCase().startsWith("win"); //$NON-NLS-1$
-
-	protected IStructuredSelection currentResourceSelection;
-	private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-	private static final String STORE_LABEL = "J2EE_EXPORT_"; //$NON-NLS-1$
-	private static final String OVERWRITE_LABEL = "OVERWRITE"; //$NON-NLS-1$
-	private static final String SOURCE_LABEL = "SOURCE"; //$NON-NLS-1$
-	protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL);
-	protected String LABEL_DESTINATION = J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_DESTINATION);
-	private Combo resourceNameCombo;
-	private Combo destinationNameCombo;
-	private Button destinationBrowseButton;
-	protected Button overwriteExistingFilesCheckbox;
-	private Button sourceFilesCheckbox;
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public J2EEExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName);
-		currentResourceSelection = selection;
-		Object element = currentResourceSelection.getFirstElement();
-		IProject project = ProjectUtilities.getProject(element);
-		if (project != null) {
-			String projectName = project.getName();
-			DataModelPropertyDescriptor [] validProjectNames = model.getValidPropertyDescriptors(IJ2EEComponentExportDataModelProperties.PROJECT_NAME);
-			boolean projectNameSet = false;
-			for(int i=0;i<validProjectNames.length && !projectNameSet; i++){
-				if(projectName.equals(validProjectNames[i].getPropertyDescription())){
-					projectNameSet = true;
-					model.setProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME, projectName);
-				}
-			}
-			if(!projectNameSet && validProjectNames.length > 0){
-				model.setProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME, validProjectNames[0].getPropertyDescription());
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-		//WorkbenchHelp.setHelp(composite, getInfopopID());
-		GridLayout layout = new GridLayout(1, false);
-		composite.setLayout(layout);
-
-		createSourceAndDestinationGroup(composite);
-		createOptionsGroup(composite);
-
-		//setupBasedOnInitialSelections();
-		setupInfopop(composite);
-		restoreWidgetValues();
-		return composite;
-	}
-
-	/**
-	 * @param composite
-	 */
-	private void createSourceAndDestinationGroup(Composite parent) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(3, false);
-		composite.setLayout(layout);
-		createExportComponentGroup(composite);
-		createDestinationGroup(composite);
-
-	}
-    /**
-     * Creates the export source resource specification widgets.
-     * 
-     * @param parent
-     *            a <code>Composite</code> that is to be used as the parent of this group's
-     *            collection of visual components
-     * @see org.eclipse.swt.widgets.Composite
-     */
-    protected void createExportComponentGroup(Composite parent) {
-        //Project label
-        Label projectLabel = new Label(parent, SWT.NONE);
-        projectLabel.setText(getComponentLabel());
-        //Project combo
-        resourceNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
-        GridData data = new GridData(GridData.FILL_HORIZONTAL);
-        data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-        resourceNameCombo.setLayoutData(data);
-        synchHelper.synchCombo(resourceNameCombo, IJ2EEComponentExportDataModelProperties.PROJECT_NAME, null);
-        new Label(parent, SWT.NONE);//Pad label
-    }
-
-    /**
-     * @return
-     */
-    protected abstract String getComponentLabel();
-
-    protected void createDestinationGroup(org.eclipse.swt.widgets.Composite parent) {
-
-        //Destination label
-        Label destinationLabel = new Label(parent, SWT.NONE);
-        destinationLabel.setText(LABEL_DESTINATION);
-        // destination name combo field
-        destinationNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
-        destinationNameCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        synchHelper.synchCombo(destinationNameCombo, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, null);
-
-        // destination browse button
-        destinationBrowseButton = new Button(parent, SWT.PUSH);
-        destinationBrowseButton.setText(defBrowseButtonLabel); //$NON-NLS-1$
-        destinationBrowseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-        destinationBrowseButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                handleDestinationBrowseButtonPressed();
-            }
-        });
-        destinationBrowseButton.setEnabled(true);
-
-    }
-    
-    /**
-     * Create the export options specification widgets.
-     * 
-     * @param parent
-     *            org.eclipse.swt.widgets.Composite
-     */
-    protected void createOptionsGroup(Composite parent) {
-
-        // options group
-        Composite optionsGroup = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout(1, false);
-        optionsGroup.setLayout(layout);
-
-
-        // source files... checkbox
-        createSourceFilesCheckbox(optionsGroup);
-
-        // overwrite... checkbox
-        createOverwriteExistingFilesCheckbox(optionsGroup);
-
-        // advanced button
-        if (shouldShowProjectFilesCheckbox()) {
-            createProjectFilesCheckbox(optionsGroup);
-        }
-    }
-    
-	protected void createOverwriteExistingFilesCheckbox(Composite optionsGroup) {
-		//Overwrite checkbox
-		overwriteExistingFilesCheckbox = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
-		overwriteExistingFilesCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_OVERWRITE_CHECKBOX)); //$NON-NLS-1$ = "Overwrite existing files without warning"
-		overwriteExistingFilesCheckbox.setEnabled(true);
-		synchHelper.synchCheckbox(overwriteExistingFilesCheckbox, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING, null);
-	}
-
-	protected void createSourceFilesCheckbox(Composite optionsGroup) {
-		sourceFilesCheckbox = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
-		sourceFilesCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_SOURCE_CHECKBOX)); //$NON-NLS-1$
-		synchHelper.synchCheckbox(sourceFilesCheckbox, IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES, null);
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean shouldShowProjectFilesCheckbox() {
-		return false;
-	}
-
-	protected void createProjectFilesCheckbox(Composite composite) {
-		//do nothing
-	}
-
-	/**
-	 * Populates the resource name field based upon the currently-selected resources.
-	 */
-	protected void setupBasedOnInitialSelections() {
-
-		if (currentResourceSelection.isEmpty() || setupBasedOnRefObjectSelection())
-			return; // no setup needed
-
-		java.util.List selections = new ArrayList();
-		Iterator aenum = currentResourceSelection.iterator();
-		while (aenum.hasNext()) {
-			IResource currentResource = (IResource) aenum.next();
-			// do not add inaccessible elements
-			if (currentResource.isAccessible())
-				selections.add(currentResource);
-		}
-		if (selections.isEmpty())
-			return; // setup not needed anymore
-
-//		int selectedResourceCount = selections.size();
-//TODO: find a way to select an existing component
-//		if (selectedResourceCount == 1) {
-//			IResource resource = (IResource) selections.get(0);
-//			if ((resource instanceof IProject) && checkForNature((IProject) resource)) {
-//				resourceNameCombo.setText(resource.getName().toString());
-//			}
-//		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected String getProjectImportLabel() {
-		return null;
-	}
-
-	/**
-	 *  
-	 */
-	protected void handleDestinationBrowseButtonPressed() {
-
-		FileDialog dialog = new FileDialog(destinationNameCombo.getShell(), SWT.SAVE);
-		String fileName = getDataModel().getStringProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME);
-		String[] filters = getFilterExpression();
-		if (!isWindows) {
-			if (filters.length != 0 && filters[0] != null && filters[0].indexOf('.') != -1) {
-				fileName += filters[0].substring(filters[0].indexOf('.'));
-			}
-		}
-		dialog.setFileName(fileName);
-		if (isWindows) {
-			dialog.setFilterExtensions(filters);
-		}
-		String filename = dialog.open();
-		if (filename != null)
-			destinationNameCombo.setText(filename);
-	}
-
-	protected void restoreWidgetValues() {
-
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
-			if (sourceNames == null)
-				return; // ie.- no settings stored
-			for (int i = 0; i < sourceNames.length; i++) {
-				if (sourceNames[i] == null)
-					sourceNames[i] = ""; //$NON-NLS-1$
-			}
-			destinationNameCombo.setItems(sourceNames);
-			boolean overwrite = settings.getBoolean(STORE_LABEL + OVERWRITE_LABEL);
-			model.setBooleanProperty(IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING, overwrite);
-			boolean includeSource = settings.getBoolean(STORE_LABEL + SOURCE_LABEL);
-			model.setBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES, includeSource);
-		}
-	}
-
-	public void storeDefaultSettings() {
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			// update source names history
-			String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
-			if (sourceNames == null) {
-				sourceNames = new String[0];
-			}
-
-			String newName = destinationNameCombo.getText();
-
-			//rip out any empty filenames and trim length to 5
-			ArrayList newNames = new ArrayList();
-			for (int i = 0; i < sourceNames.length && i < 5; i++) {
-				if (sourceNames[i].trim().length() > 0 && !newName.equals(sourceNames[i])) {
-					newNames.add(sourceNames[i]);
-				}
-			}
-			newNames.add(0, destinationNameCombo.getText());
-			sourceNames = new String[newNames.size()];
-			newNames.toArray(sourceNames);
-
-			settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
-			settings.put(STORE_LABEL + OVERWRITE_LABEL, model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING));
-			settings.put(STORE_LABEL + SOURCE_LABEL, model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES));
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected String getFileNamesStoreID() {
-		return getCompnentID();
-	}
-	protected abstract String getCompnentID();
-
-    /**
-	 * @return
-	 */
-	protected String[] getFilterExpression() {
-		return new String[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
-	 */
-	protected void enter() {
-		super.enter();
-		restoreWidgetValues();
-	}
-
-	/**
-	 * @return
-	 */
-	//protected abstract String getNatureID();
-
-	protected abstract boolean isMetaTypeSupported(Object o);
-
-	/**
-	 * Populates the resource name field based upon the currently-selected resources.
-	 */
-	protected boolean setupBasedOnRefObjectSelection() {
-
-		if (currentResourceSelection.size() != 1)
-			return false;
-
-		Object o = currentResourceSelection.getFirstElement();
-		if (!isMetaTypeSupported(o))
-			return false;
-
-		EObject ref = (EObject) o;
-		IResource resource = ProjectUtilities.getProject(ref);
-		if (resource != null) {
-			resourceNameCombo.setText(resource.getName().toString());
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
-	 */
-	protected IDialogSettings getDialogSettings() {
-		return J2EEUIPlugin.getDefault().getDialogSettings();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
deleted file mode 100644
index 7333e1ccc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
+++ /dev/null
@@ -1,279 +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.wizard;
-
-import java.util.ArrayList;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public abstract class J2EEImportPage extends DataModelWizardPage {
-
-	private Combo componentCombo;
-	private Combo fileNameCombo;
-	private static final String STORE_LABEL = "J2EE_IMPORT_"; //$NON-NLS-1$
-	private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-	protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL);
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public J2EEImportPage(IDataModel model, String pageName) {
-		super(model, pageName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(3, false);
-		composite.setLayout(layout);
-		createFileNameComposite(composite);
-		createProjectNameComposite(composite);
-		restoreWidgetValues();
-		return composite;
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createProjectNameComposite(Composite parent) {
-//		if (FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp()) {
-//			new NewModuleDataModelGroup(parent, getDataModel(), synchHelper);
-//		} else {
-			Label componentLabel = new Label(parent, SWT.NONE);
-
-			componentLabel.setText(getProjectImportLabel());
-			componentLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-			// setting up combo
-			componentCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
-			GridData data = new GridData(GridData.FILL_HORIZONTAL);
-			data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-			componentCombo.setLayoutData(data);
-
-			// // setting up button
-			// Button newProjectButton = new Button(parent, SWT.PUSH);
-			// newProjectButton.setText(defNewButtonLabel); //$NON-NLS-1$
-			// newProjectButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-			// newProjectButton.addSelectionListener(new SelectionAdapter() {
-			// public void widgetSelected(SelectionEvent e) {
-			// // handleNewProjectButtonPressed();
-			// }
-			// });
-			// newProjectButton.setEnabled(true);
-			synchHelper.synchCombo(componentCombo, IJ2EEComponentImportDataModelProperties.PROJECT_NAME, new Control[]{componentLabel});
-			new Label(parent, SWT.NULL);
-			createServerTargetComposite(parent);
-		//}
-	}
-
-	
-	
-	protected void createServerTargetComposite(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
-		Combo serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-		serverTargetCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Button newServerTargetButton = new Button(parent, SWT.NONE);
-		newServerTargetButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
-		newServerTargetButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		newServerTargetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				//FlexibleProjectCreationWizardPage.launchNewRuntimeWizard(getShell(), model);
-				launchNewRuntimeWizard(getShell(), model);
-			}
-		});
-		Control[] deps = new Control[]{label, newServerTargetButton};
-		synchHelper.synchCombo(serverTargetCombo, IFacetProjectCreationDataModelProperties.FACET_RUNTIME, deps);
-	}
-
-	protected IDialogSettings getDialogSettings() {
-		return J2EEUIPlugin.getDefault().getDialogSettings();
-	}
-
-	protected String getProjectImportLabel() {
-		return null;
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createFileNameComposite(Composite parent) {
-		Label fileLabel = new Label(parent, SWT.NONE);
-		fileLabel.setText(getFileImportLabel());
-
-		// setup combo
-		fileNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
-		fileNameCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
-		// setup browse button
-		Button browseButton = new Button(parent, SWT.PUSH);
-		browseButton.setText(defBrowseButtonLabel);
-		browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleFileBrowseButtonPressed();
-			}
-		});
-		browseButton.setEnabled(true);
-
-		synchHelper.synchCombo(fileNameCombo, IJ2EEComponentImportDataModelProperties.FILE_NAME, new Control[]{fileLabel, browseButton});
-	}
-
-	/**
-	 * 
-	 */
-	protected void handleFileBrowseButtonPressed() {
-
-		FileDialog dialog = new FileDialog(fileNameCombo.getShell());
-		dialog.setFilterExtensions(getFilterExpression());
-		String filename = dialog.open();
-		if (filename != null)
-			model.setProperty(IJ2EEComponentImportDataModelProperties.FILE_NAME, filename);
-	}
-
-	/**
-	 * @return
-	 */
-	protected String[] getFilterExpression() {
-		return new String[0];
-	}
-
-	protected void restoreWidgetValues() {
-
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
-			if (sourceNames == null)
-				return; // ie.- no settings stored
-			for (int i = 0; i < sourceNames.length; i++) {
-				if (sourceNames[i] == null)
-					sourceNames[i] = ""; //$NON-NLS-1$
-			}
-			fileNameCombo.setItems(sourceNames);
-		}
-	}
-
-	public void storeDefaultSettings() {
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			// update source names history
-			String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
-			if (sourceNames == null) {
-				sourceNames = new String[0];
-			}
-			// rip out any empty filenames and trim length to 5
-			ArrayList newNames = new ArrayList();
-			for (int i = 0; i < sourceNames.length && i < 5; i++) {
-				if (sourceNames[i].trim().length() > 0) {
-					newNames.add(sourceNames[i]);
-				}
-			}
-			String text = fileNameCombo.getText();
-			newNames.remove(text);
-			newNames.add(0, text);
-			sourceNames = new String[newNames.size()];
-			newNames.toArray(sourceNames);
-
-			// sourceNames = addToHistory(sourceNames,
-			// getJ2EEImportDataModel().getStringProperty(J2EEImportDataModel.FILE_NAME));
-			settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
-			
-			DataModelFacetCreationWizardPage.saveRuntimeSettings(settings, model);
-		}
-	}
-
-	public void restoreDefaultSettings() {
-		IDialogSettings settings = getDialogSettings();
-		DataModelFacetCreationWizardPage.restoreRuntimeSettings(settings, model);
-	}
-	
-	/**
-	 * @return
-	 */
-	protected String getFileNamesStoreID() {
-		return null;
-	}
-
-	/**
-	 * Must override
-	 */
-	protected String getFileImportLabel() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
-	 */
-	protected void enter() {
-		super.enter();
-	}
-
-	private boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
-		DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
-		boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, "", "");  //$NON-NLS-1$  //$NON-NLS-2$
-		if (isOK && model != null) {
-			DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
-			Object[] preAddition = new Object[preAdditionDescriptors.length];
-			for (int i = 0; i < preAddition.length; i++) {
-				preAddition[i] = preAdditionDescriptors[i].getPropertyValue();
-			}
-			Object[] postAddition = new Object[postAdditionDescriptors.length];
-			for (int i = 0; i < postAddition.length; i++) {
-				postAddition[i] = postAdditionDescriptors[i].getPropertyValue();
-			}
-			Object newAddition = ProjectUtilities.getNewObject(preAddition, postAddition);
-
-            model.notifyPropertyChange(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
-			if (newAddition != null)
-				model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, newAddition);
-		}
-		return isOK;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java
deleted file mode 100644
index ac47ee2ca..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java
+++ /dev/null
@@ -1,42 +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 Dec 4, 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.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEModuleExportPage extends J2EEExportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public J2EEModuleExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName, selection);
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IJ2EEComponentExportDataModelProperties.PROJECT_NAME, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING};
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
deleted file mode 100644
index d10565962..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
+++ /dev/null
@@ -1,45 +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.wizard;
-
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
-
-public abstract class J2EEModuleFacetInstallPage extends DataModelFacetInstallPage implements IJ2EEModuleFacetInstallDataModelProperties {
-
-	public J2EEModuleFacetInstallPage(String pageName) {
-		super(pageName);
-	}
-
-	protected EarSelectionPanel earPanel;
-
-	public void dispose() {
-		if (null != earPanel) {
-			earPanel.dispose();
-		}
-		super.dispose();
-	}
-
-	protected void setupEarControl(final Composite parent) {
-		Composite c = new Composite(parent, SWT.NONE);
-		c.setLayoutData(gdhfill());
-		final GridLayout layout = new GridLayout(3, false);
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		c.setLayout(layout);
-		this.earPanel = new EarSelectionPanel(model, c);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java
deleted file mode 100644
index 16cf450e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java
+++ /dev/null
@@ -1,102 +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 Dec 4, 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.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-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.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEModuleImportPage extends J2EEImportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	
-	protected EarSelectionPanel earPanel;
-	
-	public J2EEModuleImportPage(IDataModel model, String pageName) {
-		super(model, pageName);
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = super.createTopLevelComposite(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
-		createServerEarAndStandaloneGroup(composite);
-		createAnnotationsStandaloneGroup(composite);
-		return composite;
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createAnnotationsStandaloneGroup(Composite composite) {
-	}
-
-	protected abstract String getModuleFacetID();	
-	/**
-	 * @param composite
-	 */
-	
-	private void createServerEarAndStandaloneGroup(Composite composite) {
-		IDataModel creationDM = getDataModel().getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION);
-		FacetDataModelMap map = (FacetDataModelMap) creationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		IDataModel facetModel = (IDataModel) map.get(getModuleFacetID());
-		
-		Composite c = new Composite(composite, SWT.NONE);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		c.setLayoutData(data);
-		final GridLayout layout = new GridLayout(3, false);
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.horizontalSpacing = 0;
-		c.setLayout(layout);
-		earPanel = new EarSelectionPanel(facetModel, c);
-	}
-
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IJ2EEComponentImportDataModelProperties.FILE_NAME,
-					IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME,
-					IFacetProjectCreationDataModelProperties.FACET_RUNTIME,
-					IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME,
-					IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR,
-					J2EEArtifactImportDataModelProvider.FACET_RUNTIME};
-	}
-
-	public void dispose() {
-		super.dispose();
-		if (earPanel != null)
-			earPanel.dispose();
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java
deleted file mode 100644
index e951e1162..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java
+++ /dev/null
@@ -1,234 +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.wizard;
-
-import java.util.List;
-
-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.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.internal.WorkbenchMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/*
- * Created on Nov 13, 2003
- * 
- * To change the template for this generated file go to Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and
- * Comments
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class J2EEModulesDependencyPage extends DataModelWizardPage implements IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	private CheckboxTableViewer availableJarsViewer;
-
-	public J2EEModulesDependencyPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_DESC));
-	}
-
-	protected void enter() {
-		super.enter();
-		updateJarViewer();
-	}
-
-
-	private void updateJarViewer() {
-        ClassPathSelection classPathSelection = (ClassPathSelection)getDataModel().getProperty(CLASSPATH_SELECTION);
-
-		if (availableJarsViewer.getInput() != classPathSelection) {
-			availableJarsViewer.setInput(classPathSelection);
-		}
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return null;
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		composite.setLayout(layout);
-		setInfopopID(IJ2EEUIContextIds.NEW_EJB_WIZARD_P3);
-		Label projectLabel = new Label(composite, SWT.NONE);
-		projectLabel.setText(WorkbenchMessages.NewProject_title); //$NON-NLS-1$
-		Text projectText = new Text(composite, SWT.BORDER | SWT.READ_ONLY);
-		synchHelper.synchText(projectText, PROJECT_NAME, null);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		projectText.setLayoutData(gd);
-
-		Label earLabel = new Label(composite, SWT.NONE);
-		earLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION));
-		Text earText = new Text(composite, SWT.BORDER | SWT.READ_ONLY);
-		synchHelper.synchText(earText, EAR_COMPONENT_NAME, null);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		earText.setLayoutData(gd);
-
-		Label spacerLabel = new Label(composite, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		spacerLabel.setLayoutData(gd);
-
-		Label jarsLabel = new Label(composite, SWT.NONE);
-		jarsLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_AVAILABLE_JARS));
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		jarsLabel.setLayoutData(gd);
-
-		Composite tableComposite = new Composite(composite, SWT.NONE);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		gd.horizontalIndent = 0;
-		gd.heightHint = 60;
-		gd.widthHint = 200;
-		tableComposite.setLayoutData(gd);
-		GridLayout tableLayout = new GridLayout();
-		tableLayout.marginWidth = 0;
-		tableComposite.setLayout(tableLayout);
-		createAvailableJarsList(tableComposite);
-
-		spacerLabel = new Label(composite, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		spacerLabel.setLayoutData(gd);
-
-		Label classpathLabel = new Label(composite, SWT.NONE);
-		classpathLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_CLASSPATH));
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		classpathLabel.setLayoutData(gd);
-
-		Text classpathText = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.READ_ONLY);
-		//TODO synchhelper work with flexible project
-		//synchHelper.synchText(classpathText, FlexibleJ2EEModuleCreationDataModel.JAR_LIST_TEXT_UI, null);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 30;
-		classpathText.setLayoutData(gd);
-
-		return composite;
-	}
-
-	protected void createAvailableJarsList(Composite listGroup) {
-		availableJarsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.CHECK | SWT.FULL_SELECTION | SWT.BORDER);
-		addResizeListenerToTable();
-		AvailableJarsProvider provider = new AvailableJarsProvider();
-		availableJarsViewer.setContentProvider(provider);
-		availableJarsViewer.setLabelProvider(provider);
-		availableJarsViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				availableJARCheckStateChanged(event);
-			}
-		});
-		Table table = availableJarsViewer.getTable();
-		// 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);
-		availableJarsViewer.setSorter(null);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		table.setLayoutData(gd);
-
-		// table columns
-		TableColumn fileNameColumn = new TableColumn(table, SWT.NONE);
-		fileNameColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_MODULE));
-		fileNameColumn.setResizable(true);
-
-		TableColumn projectColumn = new TableColumn(table, SWT.NONE);
-		projectColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT));
-		projectColumn.setResizable(true);
-
-		updateJarViewer();
-	}
-
-	public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
-		ClasspathElement element = (ClasspathElement) event.getElement();
-		element.setSelected(event.getChecked());
-		String classEntry = element.getText();
-		IDataModel updateManifest = (IDataModel) model.getProperty(NESTED_UPDATE_MANIFEST_DM);
-		List classpathList = (List) updateManifest.getProperty(UpdateManifestDataModelProperties.JAR_LIST);
-		if (event.getChecked()) {
-			if (!classpathList.contains(classEntry)) {
-				classpathList.add(classEntry);
-			}
-		} else if (classpathList.contains(classEntry)) {
-			classpathList.remove(classEntry);
-		}
-		updateManifest.setProperty(UpdateManifestDataModelProperties.JAR_LIST, classpathList);
-//		updateManifest.propertyChanged(new WTPOperationDataModelEvent(updateManifest, UpdateManifestDataModel.JAR_LIST, WTPOperationDataModelEvent.PROPERTY_CHG));
-	}
-
-	protected void addResizeListenerToTable() {
-		Table aTable = availableJarsViewer.getTable();
-		aTable.addControlListener(new ControlAdapter() {
-			boolean fResized = false;
-
-			public void controlResized(ControlEvent e) {
-				if (e.widget instanceof Table && !fResized) {
-					final Table table = (Table) e.widget;
-					Display.getDefault().asyncExec(new Runnable() {
-						public void run() {
-							if (table.isDisposed() || fResized)
-								return;
-							Point size = table.getSize();
-							if (size.x > 4) {
-								setResized(table);
-								int newSize = size.x / 2 - 2;
-								TableColumn column = table.getColumn(0);
-								if (column != null && !column.isDisposed())
-									column.setWidth(newSize);
-								column = table.getColumn(1);
-								if (column != null && !column.isDisposed())
-									column.setWidth(newSize);
-							}
-						}
-					});
-				}
-			}
-
-			public void setResized(Table table) {
-				fResized = true;
-				table.removeControlListener(this);
-			}
-		});
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
deleted file mode 100644
index 88e4c74d6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
+++ /dev/null
@@ -1,407 +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 Dec 8, 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.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author mdelder
- */
-public class J2EEUtilityJarImportPageNew extends J2EEImportPage {
-
-	private static final String STORE_LABEL = "J2EE_UTILITY_JAR_LIST_IMPORT_"; //$NON-NLS-1$
-	// private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
-	private Button deselectAllButton;
-
-	private Button selectAllButton;
-
-	protected Button browseButton;
-
-	protected Button useAlternateRootBtn;
-
-	private Button overwriteProjectCheckbox;
-
-	protected CheckboxTableViewer availableJARsViewer;
-
-	protected boolean utilJarSelectionChanged = false;
-
-	private Combo availableJarsCombo;
-
-	protected Button linkedPathCheckbox;  
-
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public J2EEUtilityJarImportPageNew(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_0")); //$NON-NLS-1$
-		setDescription(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_1")); //$NON-NLS-1$
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-		setInfopopID(IJ2EEUIContextIds.IMPORT_UTILITY_JAR_WIZARD_P1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createUtilityJarFileNameComposite(composite);
-		createLinkedPathVariable(composite);
-		createJARsComposite(composite);
-		createOverwriteCheckbox(composite); 
-
-		restoreWidgetValues();
-		return composite;
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createUtilityJarFileNameComposite(Composite parent) {
-		Group fileNameGroup = new Group(parent, SWT.NULL);
-		fileNameGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_2")); //$NON-NLS-1$
-		GridLayout layout = new GridLayout(3, false);
-		fileNameGroup.setLayout(layout);
-		fileNameGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label fileLabel = new Label(fileNameGroup, SWT.NONE);
-		fileLabel.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_3")); //$NON-NLS-1$
-		fileLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		// setup combo
-		availableJarsCombo = new Combo(fileNameGroup, SWT.SINGLE | SWT.BORDER);
-		availableJarsCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
-		// setup browse button
-		browseButton = new Button(fileNameGroup, SWT.PUSH);
-		browseButton.setText(defBrowseButtonLabel);
-		browseButton.setLayoutData((new GridData(GridData.HORIZONTAL_ALIGN_END)));
-		browseButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowseButtonPressed();
-			}
-		});
-		browseButton.setEnabled(true);
-
-		synchHelper.synchCombo(availableJarsCombo, IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY, new Control[]{fileLabel, browseButton});
-	}
-
-	protected void createLinkedPathVariable(Composite parent) {
-
-
-		Group linkedPathGroup = new Group(parent, SWT.NULL);
-		linkedPathGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_4")); //$NON-NLS-1$
-
-		GridLayout layout = new GridLayout(1, true);
-		linkedPathGroup.setLayout(layout);
-		linkedPathGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite checkboxGroup = new Composite(linkedPathGroup, SWT.NULL);
-		GridLayout checkboxLayout = new GridLayout(2, false);
-		checkboxGroup.setLayout(checkboxLayout);
-		checkboxGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		linkedPathCheckbox = new Button(checkboxGroup, SWT.CHECK);
-		linkedPathCheckbox.setText(" "); //$NON-NLS-1$
-		final Text linkedPathText = new Text(checkboxGroup, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-		linkedPathText.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_5")); //$NON-NLS-1$
-		linkedPathText.setEnabled(getDataModel().isPropertyEnabled(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE));
-		
-		getDataModel().addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE.equals(event.getPropertyName())) {
-					linkedPathText.setEnabled(getDataModel().isPropertyEnabled(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE));
-				}
-				
-			}
-		});
-		
-		GridData textGridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
-		textGridData.heightHint = 50;
-		textGridData.widthHint = 350;
-		linkedPathText.setLayoutData(textGridData);
-		linkedPathText.setBackground(checkboxGroup.getBackground());
-
-		// setup combo
-		Combo availableLinkedPathsCombo = new Combo(linkedPathGroup, SWT.SINGLE | SWT.BORDER);
-		availableLinkedPathsCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
-		synchHelper.synchCombo(availableLinkedPathsCombo, IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE, new Control[]{availableLinkedPathsCombo});
-
-		synchHelper.synchCheckbox(linkedPathCheckbox, IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE, new Control[]{availableLinkedPathsCombo});
-
-	}
-
-	/**
-	 * Open an appropriate directory browser
-	 */
-	protected void handleBrowseButtonPressed() {
-		DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
-		dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
-		String dirName = getBrowseStartLocation();
-
-		if (!isNullOrEmpty(dirName)) {
-			File path = new File(dirName);
-			if (path.exists())
-				dialog.setFilterPath(dirName);
-		}
-
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null)
-			availableJarsCombo.setText(selectedDirectory);
-	}
-
-	/**
-	 * @return
-	 */
-	protected String getBrowseStartLocation() {
-		if (availableJarsCombo.getText() != null && availableJarsCombo.getText().length() > 0)
-			return availableJarsCombo.getText();
-		return null;
-	}
-
-	protected boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.length() == 0;
-	}
-
-	/*
-	 * Updates the enable state of the all buttons
-	 */
-	protected void updateButtonEnablements() {
-
-		utilJarSelectionChanged = true;
-	}
-
-	protected void createAvailableJarsList(Composite listGroup) {
-		availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-		GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gData.widthHint = 200;
-		gData.heightHint = 80;
-		availableJARsViewer.getControl().setLayoutData(gData);
-		AvailableUtilityJarsProvider availableUtilJARsProvider = new AvailableUtilityJarsProvider();
-		availableJARsViewer.setContentProvider(availableUtilJARsProvider);
-		availableJARsViewer.setLabelProvider(availableUtilJARsProvider);
-
-		availableJARsViewer.getTable().setHeaderVisible(false);
-		availableJARsViewer.getTable().setLinesVisible(false);
-
-		availableJARsViewer.setInput(model);
-
-		/* getModel().addListener(getOperationDataModelListener()); */
-		synchHelper.synchCheckBoxTableViewer(availableJARsViewer, IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, null);
-
-
-		model.addListener(new IDataModelListener() {
-
-			public void propertyChanged(DataModelEvent event) {
-				if (IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY.equals(event.getPropertyName()))
-					availableJARsViewer.setInput(model);
-			}
-		});
-	}
-
-	private void handleDeselectAllButtonPressed() {
-		model.setProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, new Object[0]);
-	}
-
-	private void handleSelectAllButtonPressed() {
-		Object[] selection = new Object[availableJARsViewer.getTable().getItemCount()];
-		for (int i = 0; i < selection.length; i++) {
-			selection[i] = availableJARsViewer.getElementAt(i);
-		}
-		model.setProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, selection);
-	}
-
-	protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
-		Composite buttonGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 4;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		selectAllButton = new Button(buttonGroup, SWT.PUSH);
-		selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON)); //$NON-NLS-1$ = "Select All"
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 1;
-		gd.heightHint = 22;
-		gd.widthHint = 120;
-		selectAllButton.setLayoutData(gd);
-		selectAllButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				handleSelectAllButtonPressed();
-			}
-		});
-
-		deselectAllButton = new Button(buttonGroup, SWT.PUSH);
-		deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON)); //$NON-NLS-1$ = "Deselect All"
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 22;
-		gd.widthHint = 120;
-		deselectAllButton.setLayoutData(gd);
-		deselectAllButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				handleDeselectAllButtonPressed();
-			}
-		});
-	}
-
-	protected void createJARsComposite(Composite parent) {
-		Group group = new Group(parent, SWT.NULL);
-		group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_JARS_GROUP));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label description = new Label(group, SWT.NULL);
-		description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_UTILITY_JAR_LISTEAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS));
-		GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd2.horizontalSpan = 2;
-		description.setLayoutData(gd2);
-
-		// create jars check box viewer
-		createAvailableJarsList(group);
-		createButtonsGroup(group);
-	}
-
-	/**
-	 * @param projectOptionsGroup
-	 */
-	protected void createOverwriteCheckbox(Composite parent) {
-
-		overwriteProjectCheckbox = new Button(parent, SWT.CHECK);
-		overwriteProjectCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_6")); //$NON-NLS-1$
-		synchHelper.synchCheckbox(overwriteProjectCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, null);
-	}
-
-	protected void setJARsCompositeEnabled(boolean enabled) {
-		availableJARsViewer.getTable().setEnabled(enabled);
-		availableJARsViewer.setAllChecked(false);
-		availableJARsViewer.setAllGrayed(!enabled);
-		selectAllButton.setEnabled(enabled);
-		deselectAllButton.setEnabled(enabled);
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE};
-	}
-
-	protected void restoreWidgetValues() {
-
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
-			if (sourceNames == null)
-				return; // ie.- no settings stored
-			for (int i = 0; i < sourceNames.length; i++) {
-				if (sourceNames[i] == null)
-					sourceNames[i] = ""; //$NON-NLS-1$
-			}
-			availableJarsCombo.setItems(sourceNames);
-		}
-	}
-
-	public void storeDefaultSettings() {
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			// update source names history
-			String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
-			if (sourceNames == null) {
-				sourceNames = new String[0];
-			}
-
-			String newName = availableJarsCombo.getText();
-
-			// rip out any empty filenames and trim length to 5
-			ArrayList newNames = new ArrayList();
-			for (int i = 0; i < sourceNames.length && i < 5; i++) {
-				if (sourceNames[i].trim().length() > 0 && !newName.equals(sourceNames[i])) {
-					newNames.add(sourceNames[i]);
-				}
-			}
-			newNames.add(0, availableJarsCombo.getText());
-			sourceNames = new String[newNames.size()];
-			newNames.toArray(sourceNames);
-
-			settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileNamesStoreID()
-	 */
-	protected String getFileNamesStoreID() {
-		return "UTIL";//$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
-	 */
-	protected String getFileImportLabel() {
-		return J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_7"); //$NON-NLS-1$
-	}
-	
-	
-	public void restoreDefaultSettings() {
-	}
- 
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java
deleted file mode 100644
index b8fd2455d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java
+++ /dev/null
@@ -1,372 +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 13, 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.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author mdelder
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class J2EEUtilityJarImportTypePageNew extends DataModelWizardPage {
-
-	protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL); //$NON-NLS-1$
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
-	protected IStructuredSelection currentResourceSelection;
-
-	private Combo resourceNameCombo;
-
-	private Button copyJarIntoEAR;
-
-	private Button linkJarIntoEAR;
-
-	private Button createLinkedProjects;
-
-	private Button createProjects;
-
-	protected Button browseButton;
-
-	private Button overrideProjectRootCheckbox;
-
-
-	protected Text projectRootLocationText;
-
-	private Label moduleProjectLocationLabel;
-
-	protected boolean synching;
-
-	public static final String TITLE = J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_0"); //$NON-NLS-1$
-	public static final String DESCRIPTION = J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_1"); //$NON-NLS-1$
-
-	private Group projectRootComposite;
-
-
-	/**
-	 * @param model
-	 * @param pageName
-	 * @param title
-	 * @param titleImage
-	 */
-	public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName, String title, ImageDescriptor titleImage) {
-		super(model, pageName, title, titleImage);
-		setTitle(""); //$NON-NLS-1$
-		setDescription(""); //$NON-NLS-1$
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-		setInfopopID(IJ2EEUIContextIds.IMPORT_UTILITY_JAR_WIZARD_P2);
-	}
-
-	public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName);
-		this.currentResourceSelection = selection;
-		setTitle(TITLE);
-		setDescription(DESCRIPTION);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-	}
-
-	public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(TITLE);
-		setDescription(DESCRIPTION);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME, IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createEARProjectGroup(composite);
-		createUtilityJarImportTypes(composite);
-		// TODO The binary / project location options are not yet (re-) supported by the import operations. 
-		createProjectCreationOptions(composite);
-
-		setupBasedOnInitialSelections();
-		return composite;
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createUtilityJarImportTypes(Composite parent) {
-		Group typesGroup = new Group(parent, SWT.NULL);
-		typesGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_2")); //$NON-NLS-1$
-
-		GridLayout layout = new GridLayout(1, false);
-		typesGroup.setLayout(layout);
-		typesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createProjects = new Button(typesGroup, SWT.RADIO);
-		createProjects.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_3")); //$NON-NLS-1$
-		synchHelper.synchRadio(createProjects, IJ2EEUtilityJarListImportDataModelProperties.CREATE_PROJECT, null);
-
-		createLinkedProjects = new Button(typesGroup, SWT.RADIO);
-		createLinkedProjects.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_4")); //$NON-NLS-1$
-		synchHelper.synchRadio(createLinkedProjects, IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PROJECT, null);
-
-		copyJarIntoEAR = new Button(typesGroup, SWT.RADIO);
-		copyJarIntoEAR.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_5")); //$NON-NLS-1$
-		synchHelper.synchRadio(copyJarIntoEAR, IJ2EEUtilityJarListImportDataModelProperties.COPY, null);
-
-		linkJarIntoEAR = new Button(typesGroup, SWT.RADIO);
-		linkJarIntoEAR.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_6")); //$NON-NLS-1$
-		/* linkJarIntoEAR.addSelectionListener(getTypeSelectionListener()); */
-		synchHelper.synchRadio(linkJarIntoEAR, IJ2EEUtilityJarListImportDataModelProperties.LINK_IMPORT, null);
-
-	}
-
-	protected void createProjectCreationOptions(Composite parent) {
-
-		Group projectOptionsGroup = new Group(parent, SWT.NULL);
-		projectOptionsGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_7")); //$NON-NLS-1$
-
-		GridLayout layout = new GridLayout(1, false);
-		projectOptionsGroup.setLayout(layout);
-		projectOptionsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); 
-
-		overrideProjectRootCheckbox = new Button(projectOptionsGroup, SWT.CHECK);
-		overrideProjectRootCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_11")); //$NON-NLS-1$
-		createProjectRootComposite(projectOptionsGroup);
-
-		synchHelper.synchCheckbox(overrideProjectRootCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERRIDE_PROJECT_ROOT, new Control[]{/*
-																																					 * moduleProjectLocationLabel,
-																																					 * projectRootLocationText,
-																																					 * browseButton
-																																					 */});
-	}
-
-	/**
-	 * 
-	 * @param parent
-	 *            a <code>Composite</code> that is to be used as the parent of this group's
-	 *            collection of visual components
-	 * @see org.eclipse.swt.widgets.Composite
-	 */
-	protected void createEARProjectGroup(Composite parent) {
-
-		Group earGroup = new Group(parent, SWT.NULL);
-		earGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_8")); //$NON-NLS-1$
-
-		GridLayout layout = new GridLayout(2, false);
-		earGroup.setLayout(layout);
-		earGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Project label
-		Label projectLabel = new Label(earGroup, SWT.NONE);
-		projectLabel.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_9")); //$NON-NLS-1$
-		// Project combo
-		resourceNameCombo = new Combo(earGroup, SWT.SINGLE | SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		resourceNameCombo.setLayoutData(data);
-		synchHelper.synchCombo(resourceNameCombo, IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME, null);
-
-	}
-
-	protected void createProjectRootComposite(Composite parent) {
-		projectRootComposite = new Group(parent, SWT.NULL);
-		projectRootComposite.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOCATIONS_GROUP));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		projectRootComposite.setLayout(layout);
-		projectRootComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label description = new Label(projectRootComposite, SWT.NULL);
-		description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_PROJECT_GROUP_DESCRIPTION));
-		GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd2.horizontalSpan = 3;
-		description.setLayoutData(gd2);
-
-		moduleProjectLocationLabel = new Label(projectRootComposite, SWT.NULL);
-		moduleProjectLocationLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.USE_DEFAULT_ROOT_RADIO));
-		moduleProjectLocationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		projectRootLocationText = new Text(projectRootComposite, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		projectRootLocationText.setLayoutData(gd);
-		projectRootLocationText.setText(ResourcesPlugin.getWorkspace().getRoot().getFullPath().toOSString());
-		projectRootLocationText.setEnabled(false); /* disabled by default */
-
-		browseButton = new Button(projectRootComposite, SWT.PUSH);
-		browseButton.setText(defBrowseButtonLabel);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		browseButton.setLayoutData(gd);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				handleRootProjectBrowseButtonPressed();
-			}
-		});
-
-		synchHelper.synchText(projectRootLocationText, IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT, new Control[]{moduleProjectLocationLabel, projectRootLocationText, browseButton});
-	}
-
-
-	/**
-	 * Open an appropriate directory browser
-	 */
-	protected void handleRootProjectBrowseButtonPressed() {
-		DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
-		dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
-		String dirName = getBrowseStartLocation();
-
-		if (!isNullOrEmpty(dirName)) {
-			File path = new File(dirName);
-			if (path.exists())
-				dialog.setFilterPath(dirName);
-		}
-
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null)
-			projectRootLocationText.setText(selectedDirectory);
-
-	}
-
-	protected String getBrowseStartLocation() {
-		String text = projectRootLocationText.getText();
-		return text;
-	}
-
-
-	protected boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.length() == 0;
-	}
-
-	/**
-	 * Populates the resource name field based upon the currently-selected resources.
-	 */
-	protected void setupBasedOnInitialSelections() {
-
-		if (null == currentResourceSelection || currentResourceSelection.isEmpty() || setupBasedOnRefObjectSelection())
-			return; // no
-		// setup
-		// needed
-
-		java.util.List selections = new ArrayList();
-		Iterator aenum = currentResourceSelection.iterator();
-		while (aenum.hasNext()) {
-			IResource currentResource = (IResource) aenum.next();
-			// do not add inaccessible elements
-			if (currentResource.isAccessible())
-				selections.add(currentResource);
-		}
-		if (selections.isEmpty())
-			return; // setup not needed anymore
-
-		int selectedResourceCount = selections.size();
-		if (selectedResourceCount == 1) {
-			IResource resource = (IResource) selections.get(0);
-			if (resource instanceof IProject ) {
-				resourceNameCombo.setText(resource.getName().toString());
-			}
-		}
-	}
-
-	/**
-	 * Populates the resource name field based upon the currently-selected resources.
-	 */
-	protected boolean setupBasedOnRefObjectSelection() {
-
-		if (currentResourceSelection.size() != 1)
-			return false;
-
-		Object o = currentResourceSelection.getFirstElement();
-		if (!isMetaTypeSupported(o))
-			return false;
-
-		EObject ref = (EObject) o;
-		IResource resource = ProjectUtilities.getProject(ref);
-		if (resource != null)
-			resourceNameCombo.setText(resource.getName().toString());
-		return true;
-	}
-
-	protected boolean isMetaTypeSupported(Object o) {
-		return o instanceof EARFile || o instanceof Application;
-	}
-
-	protected void enableProjectOptions(boolean enabled) { 
-		overrideProjectRootCheckbox.setEnabled(enabled);
-
-		if (overrideProjectRootCheckbox.getSelection() && enabled)
-			projectRootLocationText.setEnabled(true);
-		else
-			projectRootLocationText.setEnabled(false);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return model.validateProperty(IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME).isOK();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java
deleted file mode 100644
index d2b9d2f83..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarListImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-
-/**
- * <p>
- * Used to import Utility Jars into several Eclipse workbench configurations. These can be extracted
- * as editable projects, binary projects, linked resources in the EAR module or actual resources in
- * the EAR module.
- * </p>
- */
-public final class J2EEUtilityJarImportWizardNew extends J2EEArtifactImportWizard implements IImportWizard {
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the page of the Wizard which allows users to define the
-	 * type of import they would like to carry out.
-	 * </p>
-	 */
-	private static final String IMPORT_TYPE = "IMPORT_TYPE"; //$NON-NLS-1$
-
-	/**
-	 * <p>
-	 * Constant used to identify the key of the page of the Wizard that allows users to select jar
-	 * files for import
-	 * </p>
-	 */
-	private static final String SELECT_JARS = "SELECT_JARS"; //$NON-NLS-1$
- 
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public J2EEUtilityJarImportWizardNew() {
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public J2EEUtilityJarImportWizardNew(IDataModel model) {
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <p>
-	 * Adds the following pages:
-	 * <ul>
-	 * <li>{@link J2EEUtilityJarImportTypePageNew}as the main wizard page ({@link #IMPORT_TYPE})
-	 * <li>{@link J2EEUtilityJarImportPageNew}as the main wizard page ({@link #SELECT_JARS})
-	 * </ul>
-	 * </p>
-	 */
-	public void doAddPages() {
-		this.addPage(new J2EEUtilityJarImportTypePageNew(getDataModel(), IMPORT_TYPE, getSelection()));
-		this.addPage(new J2EEUtilityJarImportPageNew(getDataModel(), SELECT_JARS));
-	}
-
-	protected IDataModelProvider getDefaultProvider() {
-		return new J2EEUtilityJarListImportDataModelProvider();
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_UTILITY);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/MinimizedFileSystemElement.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/MinimizedFileSystemElement.java
deleted file mode 100644
index eb878c0bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/MinimizedFileSystemElement.java
+++ /dev/null
@@ -1,131 +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.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ui.dialogs.FileSystemElement;
-import org.eclipse.ui.model.AdaptableList;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-
-/**
- * The <code>MinimizedFileSystemElement</code> is a <code>FileSystemElement</code> that knows if
- * it has been populated or not.
- */
-class MinimizedFileSystemElement extends FileSystemElement {
-	private boolean populated = false;
-	private String packageBaseDirName = null;
-
-
-	/**
-	 * Create a <code>MinimizedFileSystemElement</code> with the supplied name and parent.
-	 * 
-	 * @param name
-	 *            the name of the file element this represents
-	 * @param parent
-	 *            the containing parent
-	 * @param isDirectory
-	 *            indicated if this could have children or not
-	 */
-	MinimizedFileSystemElement(String name, org.eclipse.ui.dialogs.FileSystemElement parent, boolean isDirectory) {
-		super(name, parent, isDirectory);
-	}
-
-	public void setPackageBaseDirName(String s) {
-		packageBaseDirName = s;
-	}
-
-	public void addChild(FileSystemElement child) {
-		if (child.isDirectory()) {
-			super.addChild(child);
-		} else {
-			if (child.getFileNameExtension().equals("class")) { //$NON-NLS-1$
-				super.addChild(child);
-			}
-		}
-	}
-
-	/**
-	 * Returns a list of the files that are immediate children. Use the supplied provider if it
-	 * needs to be populated. of this folder.
-	 */
-	public AdaptableList getFiles(IImportStructureProvider provider) {
-		if (!populated)
-			populate(provider);
-
-		return super.getFiles();
-
-	}
-
-	/**
-	 * Returns a list of the folders that are immediate children. Use the supplied provider if it
-	 * needs to be populated. of this folder.
-	 */
-	public AdaptableList getFolders(IImportStructureProvider provider) {
-		if (!populated)
-			populate(provider);
-
-		return super.getFolders();
-
-	}
-
-	/**
-	 * Return whether or not population has happened for the receiver.
-	 */
-	boolean isPopulated() {
-		return this.populated;
-	}
-
-	/**
-	 * Return whether or not population has not happened for the receiver.
-	 */
-	boolean notPopulated() {
-		return !this.populated;
-	}
-
-	/**
-	 * Populate the files and folders of the receiver using the suppliec structure provider.
-	 * 
-	 * @param provider
-	 *            org.eclipse.ui.wizards.datatransfer.IImportStructureProvider
-	 */
-	private void populate(IImportStructureProvider provider) {
-
-		Object fileSystemObject = getFileSystemObject();
-
-		List children = provider.getChildren(fileSystemObject);
-		if (children == null)
-			children = new ArrayList(1);
-		Iterator childrenEnum = children.iterator();
-		while (childrenEnum.hasNext()) {
-			Object child = childrenEnum.next();
-
-			String elementLabel = provider.getLabel(child);
-			if (elementLabel.equals(packageBaseDirName) || packageBaseDirName == null) {
-				//Create one level below
-
-				MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, this, provider.isFolder(child));
-				result.setFileSystemObject(child);
-			}
-		}
-		setPopulated();
-
-	}
-
-	/**
-	 * Set whether or not population has happened for the receiver to true.
-	 */
-	void setPopulated() {
-		this.populated = true;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
deleted file mode 100644
index 46e2e7599..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
+++ /dev/null
@@ -1,565 +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 Mar 23, 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.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-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.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-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.Text;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.wizards.IWizardDescriptor;
-import org.eclipse.ui.wizards.IWizardRegistry;
-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.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.ui.GenericWizardNode;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-
-public class NewJ2EEComponentSelectionPage extends DataModelWizardPage implements IDefaultJ2EEComponentCreationDataModelProperties {
-    private Button defaultModulesButton;
-
-    private Composite defaultModulesComposite;
-
-    private Composite newModulesComposite;
-
-    private Button appClientRadioButton;
-
-    private Button ejbRadioButton;
-
-    private Button webRadioButton;
-
-    private Button connectorRadioButton;
-
-    private GenericWizardNode appClientNode;
-
-    private GenericWizardNode ejbNode;
-
-    private GenericWizardNode webNode;
-
-    private GenericWizardNode connectorNode;
-
-    private GenericWizardNode selectedNode;
-
-    private StackLayout stackLayout;
-
-    /**
-     * @param model
-     * @param pageName
-     */
-    protected NewJ2EEComponentSelectionPage(IDataModel model, String pageName) {
-        super(model, pageName);
-        setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_TITLE));
-        setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_DESC));
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#getValidationPropertyNames()
-     */
-    protected String[] getValidationPropertyNames() {
-        return new String[] { CREATE_APPCLIENT, APPCLIENT_COMPONENT_NAME, CREATE_CONNECTOR, CONNECTOR_COMPONENT_NAME, CREATE_EJB, EJB_COMPONENT_NAME, CREATE_WEB, WEB_COMPONENT_NAME, MODULE_NAME_COLLISIONS_VALIDATION, ENABLED };
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-     */
-    protected Composite createTopLevelComposite(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 1;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        setInfopopID(IJ2EEUIContextIds.EAR_NEW_MODULE_PROJECTS_PAGE);
-        createDefaultCheckBox(composite);
-        Composite forStackComposite = new Composite(composite, SWT.NULL);
-        layout = new GridLayout();
-        forStackComposite.setLayout(layout);
-        forStackComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        Composite stackComposite = createStackLayoutComposite(forStackComposite);
-        createDefaultModulesComposite(stackComposite);
-        createModuleSelectionComposite(stackComposite);
-        stackLayout.topControl = defaultModulesComposite;
-        setButtonEnablement();
-        return composite;
-    }
-
-    protected Composite createStackLayoutComposite(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        stackLayout = new StackLayout();
-        composite.setLayout(stackLayout);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        return composite;
-    }
-
-    private void createDefaultModulesComposite(Composite parent) {
-        defaultModulesComposite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 2;
-        layout.marginHeight = 0;
-        defaultModulesComposite.setLayout(layout);
-        defaultModulesComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        // Default Module Controls creation
-        createAppClientDefaultModuleControl();
-        if (J2EEPlugin.isEJBSupportAvailable())
-            createEJBDefaultModuleControl();
-        createWebDefaultModuleControl();
-        if (J2EEPlugin.isEJBSupportAvailable())
-            createConnectorDefaultModuleControl();
-    }
-
-    /**
-     * @param parent
-     */
-    private void createModuleSelectionComposite(Composite parent) {
-        newModulesComposite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 1;
-        newModulesComposite.setLayout(layout);
-        newModulesComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        appClientRadioButton = new Button(newModulesComposite, SWT.RADIO);
-
-        appClientRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.appClient")); //$NON-NLS-1$
-        appClientRadioButton.addListener(SWT.Selection, this);
-        if (EarModuleManager.getEJBModuleExtension() != null) {
-            ejbRadioButton = new Button(newModulesComposite, SWT.RADIO);
-            ejbRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.ejb")); //$NON-NLS-1$
-            ejbRadioButton.addListener(SWT.Selection, this);
-        }
-        if (EarModuleManager.getWebModuleExtension() != null) {
-            webRadioButton = new Button(newModulesComposite, SWT.RADIO);
-            webRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.web")); //$NON-NLS-1$
-            webRadioButton.addListener(SWT.Selection, this);
-        }
-        if (EarModuleManager.getJCAModuleExtension() != null) {
-            connectorRadioButton = new Button(newModulesComposite, SWT.RADIO);
-            connectorRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.jca")); //$NON-NLS-1$
-            connectorRadioButton.addListener(SWT.Selection, this);
-        }
-    }
-
-    /**
-     * 
-     */
-    private void createConnectorDefaultModuleControl() {
-        if (EarModuleManager.getJCAModuleExtension() != null) {
-            String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_JCA_MODULE_LBL);
-            createJ2EEComponentControl(label, CREATE_CONNECTOR, CONNECTOR_COMPONENT_NAME);
-        }
-    }
-
-    /**
-     * 
-     */
-    private void createWebDefaultModuleControl() {
-        if (EarModuleManager.getWebModuleExtension() != null) {
-            String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_WEB_MODULE_LBL);
-            createJ2EEComponentControl(label, CREATE_WEB, WEB_COMPONENT_NAME);
-        }
-    }
-
-    /**
-     * 
-     */
-    private void createEJBDefaultModuleControl() {
-        if (EarModuleManager.getEJBModuleExtension() != null) {
-            String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_EJB_MODULE_LBL);
-            createJ2EEComponentControl(label, CREATE_EJB, EJB_COMPONENT_NAME);
-        }
-    }
-
-    private void createAppClientDefaultModuleControl() {
-        String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_APPCLIENT_MODULE_LBL);
-        createJ2EEComponentControl(label, CREATE_APPCLIENT, APPCLIENT_COMPONENT_NAME);
-    }
-
-    private void createJ2EEComponentControl(String label, String createProperty, String projectProperty) {
-        final Button checkBox = new Button(defaultModulesComposite, SWT.CHECK);
-        checkBox.setSelection(true);
-        checkBox.setText(label);
-
-        final Text textField = new Text(defaultModulesComposite, SWT.BORDER);
-        GridData data = new GridData(GridData.FILL_HORIZONTAL);
-        textField.setLayoutData(data);
-        synchHelper.synchCheckbox(checkBox, createProperty, null);
-        synchHelper.synchText(textField, projectProperty, null);
-    }
-
-    private void createDefaultCheckBox(Composite composite) {
-        Composite checkBoxComposite = new Composite(composite, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        checkBoxComposite.setLayout(layout);
-        checkBoxComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        defaultModulesButton = new Button(checkBoxComposite, SWT.CHECK);
-        GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-        data.horizontalIndent = 0;
-        defaultModulesButton.setLayoutData(data);
-        defaultModulesButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_NEW_MOD_SEL_PG_DEF_BTN));
-        defaultModulesButton.setSelection(true);
-        defaultModulesButton.addListener(SWT.Selection, this);
-        synchHelper.synchCheckbox(defaultModulesButton, ENABLED, null);
-        createControlsSeparatorLine(checkBoxComposite);    
-        }
-
-    protected void createControlsSeparatorLine(Composite parent) {
-        // add a horizontal line
-        Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-        GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-        separator.setLayoutData(data);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-     */
-    public void handleEvent(Event evt) {
-        if (evt.widget == defaultModulesButton)
-            handleDefaultModulesButtonPressed();
-        else if (!defaultModulesButton.getSelection()) {
-            if (evt.widget == appClientRadioButton && appClientRadioButton.getSelection())
-                setSelectedNode(getAppClientNode());
-            else if (evt.widget == ejbRadioButton && ejbRadioButton.getSelection())
-                setSelectedNode(getEjbNode());
-            else if (evt.widget == webRadioButton && webRadioButton.getSelection())
-                setSelectedNode(getWebNode());
-            else if (evt.widget == connectorRadioButton && connectorRadioButton.getSelection())
-                setSelectedNode(getConnectorNode());
-            validatePage();
-        }
-        super.handleEvent(evt);
-    }
-
-    /**
-     * 
-     */
-    private void handleDefaultModulesButtonPressed() {
-        if (defaultModulesButton.getSelection()) {
-            setSelectedNode(null);
-            showDefaultModulesComposite();
-            setDefaultModulesSelection(true);
-        } else {
-            setDefaultModulesSelection(false);
-            showNewModulesCompsite();
-        }
-        setButtonEnablement();
-        validatePage();
-    }
-
-    private void setDefaultModulesSelection(boolean selection) {
-        getDataModel().setBooleanProperty(CREATE_APPCLIENT, selection);
-        getDataModel().setBooleanProperty(CREATE_CONNECTOR, selection);
-        getDataModel().setBooleanProperty(CREATE_EJB, selection);
-        getDataModel().setBooleanProperty(CREATE_WEB, selection);
-    }
-
-    private void showDefaultModulesComposite() {
-        defaultModulesComposite.setVisible(true);
-        newModulesComposite.setVisible(false);
-        stackLayout.topControl = defaultModulesComposite;
-    }
-
-    /**
-     * This is done based on the J2EE version. We need to disable Connectors if
-     * not j2ee 1.3 or higher.
-     */
-    private void setButtonEnablement() {
-        if (!defaultModulesButton.getSelection() && connectorRadioButton != null) {
-            int version = getDataModel().getIntProperty(J2EE_VERSION);
-            connectorRadioButton.setEnabled(version > J2EEVersionConstants.J2EE_1_2_ID);
-        }
-    }
-
-    /**
-     * 
-     */
-    private void showNewModulesCompsite() {
-        defaultModulesComposite.setVisible(false);
-        newModulesComposite.setVisible(true);
-        if (!isAnyModuleRadioSelected())
-            appClientRadioButton.setSelection(true);
-        setSelectedNode(getWizardNodeFromSelection());
-        stackLayout.topControl = newModulesComposite;
-    }
-
-    /**
-     * @return
-     */
-    private GenericWizardNode getWizardNodeFromSelection() {
-        if (appClientRadioButton.getSelection())
-            return getAppClientNode();
-        if (connectorRadioButton != null && connectorRadioButton.getSelection())
-            return getConnectorNode();
-        if (ejbRadioButton != null && ejbRadioButton.getSelection())
-            return getEjbNode();
-        if (webRadioButton != null && webRadioButton.getSelection())
-            return getWebNode();
-        return null;
-    }
-
-    /**
-     * @return
-     */
-    private boolean isAnyModuleRadioSelected() {
-        return appClientRadioButton.getSelection() || (connectorRadioButton != null && connectorRadioButton.getSelection()) || (ejbRadioButton != null && ejbRadioButton.getSelection()) || (webRadioButton != null && webRadioButton.getSelection());
-    }
-
-    /**
-     * @return Returns the appClientNode.
-     */
-    private GenericWizardNode getAppClientNode() {
-        if (appClientNode == null) {
-            appClientNode = new GenericWizardNode() {
-                /*
-                 * (non-Javadoc)
-                 * 
-                 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
-                 */
-                protected IWizard createWizard() {
-                    IDataModel dm = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
-                    FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-                    IDataModel model = map.getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT);
-                    model.setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
-                    
-                    IDataModel nestedAppClientModel = getDataModel().getNestedModel(NESTED_MODEL_CLIENT);
-                    model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_RUNTIME, nestedAppClientModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-    				IDataModel appClientFacetModel = ((FacetDataModelMap)nestedAppClientModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT);
-                    model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_VERSION, appClientFacetModel.getProperty(IFacetDataModelProperties.FACET_VERSION));
-                    
-                    return new AppClientProjectWizard(dm);
-                }
-            };
-        }
-        return appClientNode;
-    }
-
-    /**
-     * @return Returns the connectorNode.
-     */
-    private GenericWizardNode getConnectorNode() {
-        if (connectorNode == null) {
-            connectorNode = new GenericWizardNode() {
-                /*
-                 * (non-Javadoc)
-                 * 
-                 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
-                 */
-                protected IWizard createWizard() {
-                    NewProjectDataModelFacetWizard result = null;
-
-                    IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
-                    IWizardDescriptor descriptor = newWizardRegistry.findWizard("org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"); //$NON-NLS-1$
-                    try {
-                        result = (NewProjectDataModelFacetWizard)descriptor.createWizard();
-                        IDataModel dm = result.getDataModel();
-                        FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-                        IDataModel model = map.getFacetDataModel(J2EEProjectUtilities.JCA);
-                        model.setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
-                        
-                        IDataModel nestedJCAModel = getDataModel().getNestedModel(NESTED_MODEL_JCA);
-                        model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_RUNTIME, nestedJCAModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-        				IDataModel jcaFacetModel = ((FacetDataModelMap)nestedJCAModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.JCA);
-                        model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_VERSION, jcaFacetModel.getProperty(IFacetDataModelProperties.FACET_VERSION));
-                        
-                    } catch (CoreException ce) {
-                        Logger.getLogger().log(ce);
-                    }
-                    return result;
-                }
-            };
-        }
-        return connectorNode;
-    }
-
-    /**
-     * @return Returns the ejbNode.
-     */
-    private GenericWizardNode getEjbNode() {
-        if (ejbNode == null) {
-            ejbNode = new GenericWizardNode() {
-                /*
-                 * (non-Javadoc)
-                 * 
-                 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
-                 */
-                protected IWizard createWizard() {
-                	NewProjectDataModelFacetWizard result = null;
-
-                    IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
-                    IWizardDescriptor descriptor = newWizardRegistry.findWizard("org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"); //$NON-NLS-1$
-                    try {
-                        result = (NewProjectDataModelFacetWizard)descriptor.createWizard();
-                        IDataModel dm = result.getDataModel();
-                        FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-                        IDataModel model = map.getFacetDataModel(J2EEProjectUtilities.EJB);
-                        model.setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
-                        
-                        IDataModel nestedEjbModel = getDataModel().getNestedModel(NESTED_MODEL_EJB);
-                        model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_RUNTIME, nestedEjbModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-        				IDataModel ejbFacetModel = ((FacetDataModelMap)nestedEjbModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.EJB);
-                        model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_VERSION, ejbFacetModel.getProperty(IFacetDataModelProperties.FACET_VERSION));
-                        
-                    } catch (CoreException ce) {
-                        Logger.getLogger().log(ce);
-                    }
-                    return result;
-                }
-            };
-        }
-        return ejbNode;
-    }
-
-    /**
-     * @return Returns the webNode.
-     */
-    private GenericWizardNode getWebNode() {
-        if (webNode == null) {
-            webNode = new GenericWizardNode() {
-                /*
-                 * (non-Javadoc)
-                 * 
-                 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
-                 */
-                protected IWizard createWizard() {
-                	NewProjectDataModelFacetWizard result = null;
-                    IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
-                    IWizardDescriptor servletWizardDescriptor = newWizardRegistry.findWizard("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"); //$NON-NLS-1$
-                    try {
-                        result = (NewProjectDataModelFacetWizard)servletWizardDescriptor.createWizard();
-                        IDataModel dm = result.getDataModel();
-                        FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-                        IDataModel model = map.getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
-                        model.setBooleanProperty(J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR, true);
-                        
-                        IDataModel nestedWebModel = getDataModel().getNestedModel(NESTED_MODEL_WEB);
-                        model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_RUNTIME, nestedWebModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-        				IDataModel webFacetModel = ((FacetDataModelMap)nestedWebModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
-                        model.setProperty(J2EEModuleFacetInstallDataModelProvider.FACET_VERSION, webFacetModel.getProperty(IFacetDataModelProperties.FACET_VERSION));
-                         
-                    } catch (CoreException ce) {
-                        Logger.getLogger().log(ce);
-                    }
-                    return result;
-                }
-            };
-        }
-        return webNode;
-    }
-
-    /**
-     * @param selectedNode
-     *            The selectedNode to set.
-     */
-    private void setSelectedNode(GenericWizardNode selectedNode) {
-        this.selectedNode = selectedNode;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-     */
-    public boolean canFlipToNextPage() {
-        if (!defaultModulesButton.getSelection())
-            return selectedNode != null;
-        return false;
-    }
-
-    /**
-     * The <code>WizardSelectionPage</code> implementation of this
-     * <code>IWizardPage</code> method returns the first page of the currently
-     * selected wizard if there is one.
-     */
-    public IWizardPage getNextPage() {
-        if (selectedNode == null)
-            return null;
-        IPluginContribution pluginContribution = new IPluginContribution() {
-            public String getLocalId() {
-                String id = null;
-                if (selectedNode == appClientNode) {
-                    id = "org.eclipse.jst.j2ee.internal.internal.internal.appclientProjectWizard"; //$NON-NLS-1$
-                } else if (selectedNode == ejbNode) {
-                    id = "org.eclipse.jst.j2ee.internal.internal.internal.ejb.ui.util.ejbProjectWizard"; //$NON-NLS-1$
-                } else if (selectedNode == connectorNode) {
-                    id = "org.eclipse.jst.j2ee.internal.internal.internal.jcaProjectWizard"; //$NON-NLS-1$
-                } else if (selectedNode == webNode) {
-                    id = "org.eclipse.jst.j2ee.internal.internal.internal.webProjectWizard"; //$NON-NLS-1$
-                }
-                return id;
-            }
-
-            public String getPluginId() {
-                return "org.eclipse.jst.j2ee.internal.internal.internal.ui"; //$NON-NLS-1$
-            }
-        };
-
-        if (!WorkbenchActivityHelper.allowUseOf(null,pluginContribution)) {
-            return null;
-        }
-
-        boolean isCreated = selectedNode.isContentCreated();
-        IWizard wizard = selectedNode.getWizard();
-        if (wizard == null) {
-            setSelectedNode(null);
-            return null;
-        }
-        if (!isCreated) // Allow the wizard to create its pages
-            wizard.addPages();
-
-        return wizard.getStartingPage();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#validatePage()
-     */
-    protected void validatePage() {
-        if (!defaultModulesButton.getSelection()) {
-            setPageComplete(false);
-            setErrorMessage(null);
-        } else
-            super.validatePage();
-    }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
deleted file mode 100644
index 8de017df3..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
+++ /dev/null
@@ -1,368 +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.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.internal.ui.dialogs.TypeSelectionDialog2;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author jialin
- * 
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class NewJavaClassOptionsWizardPage extends DataModelWizardPage {
-
-	protected Button publicButton;
-	protected Button abstractButton;
-	protected Button finalButton;
-	protected ListViewer interfaceViewer;
-	protected Button addButton;
-	protected Button removeButton;
-	protected Button inheritButton;
-	protected Button constructorButton;
-	protected Button mainMethodButton;
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public NewJavaClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
-		super(model, pageName);
-		setDescription(pageDesc);
-		this.setTitle(pageTitle);
-		setInfopopID(IJ2EEUIContextIds.NEW_JAVA_CLASS_OPTION_WIZARD_P1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return new String[]{INewJavaClassDataModelProperties.MODIFIER_ABSTRACT, INewJavaClassDataModelProperties.MODIFIER_FINAL};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = 300;
-		composite.setLayoutData(data);
-
-		createModifierControls(composite);
-		createInterfaceControls(composite);
-
-		// Separator label
-		Label seperator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		seperator.setLayoutData(data);
-
-		createStubsComposite(composite);
-
-		publicButton.setFocus();
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
-		return composite;
-	}
-
-	/**
-	 * Create controls for the modifiers
-	 */
-	protected void createModifierControls(Composite parent) {
-		Label modifiersLabel = new Label(parent, SWT.NONE);
-		modifiersLabel.setText(J2EEUIMessages.JAVA_CLASS_MODIFIERS_LABEL);
-		modifiersLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.makeColumnsEqualWidth = true;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		publicButton = new Button(composite, SWT.CHECK);
-		publicButton.setText(J2EEUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(publicButton, INewJavaClassDataModelProperties.MODIFIER_PUBLIC, null);
-
-		abstractButton = new Button(composite, SWT.CHECK);
-		abstractButton.setText(J2EEUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(abstractButton, INewJavaClassDataModelProperties.MODIFIER_ABSTRACT, null);
-
-		finalButton = new Button(composite, SWT.CHECK);
-		finalButton.setText(J2EEUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(finalButton, INewJavaClassDataModelProperties.MODIFIER_FINAL, null);
-	}
-
-	protected void createInterfaceControls(Composite parent) {
-		Label interfaceLabel = new Label(parent, SWT.NONE);
-		interfaceLabel.setText(J2EEUIMessages.JAVA_CLASS_INTERFACES_LABEL);
-		interfaceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING));
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		interfaceViewer = new ListViewer(composite);
-		interfaceViewer.getList().setLayoutData(new GridData(GridData.FILL_BOTH));
-		interfaceViewer.setContentProvider(getInterfaceContentProvider());
-		interfaceViewer.setLabelProvider(getInterfaceLabelProvider());
-		interfaceViewer.setInput(model.getProperty(INewJavaClassDataModelProperties.INTERFACES));
-
-		Composite buttonCompo = new Composite(composite, SWT.NULL);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		buttonCompo.setLayout(layout);
-		buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
-		addButton = new Button(buttonCompo, SWT.PUSH);
-		addButton.setText(J2EEUIMessages.ADD_BUTTON_LABEL);
-		addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
-		addButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				handleInterfaceAddButtonSelected();
-			}
-			public void widgetDefaultSelected(SelectionEvent event) {
-				//Do nothing
-			}
-		});
-
-		removeButton = new Button(buttonCompo, SWT.PUSH);
-		removeButton.setText(J2EEUIMessages.REMOVE_BUTTON);
-		removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
-		removeButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				handleInterfaceRemoveButtonSelected();
-			}
-			public void widgetDefaultSelected(SelectionEvent event) {
-				//Do nothing
-			}
-		});
-		removeButton.setEnabled(false);
-
-		interfaceViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = event.getSelection();
-				removeButton.setEnabled(!selection.isEmpty());
-			}
-		});
-
-	}
-
-	/**
-	 * Create the composite with all the stubs
-	 */
-	protected void createStubsComposite(Composite parent) {
-		Label stubLabel = new Label(parent, SWT.NONE);
-		stubLabel.setText(J2EEUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		stubLabel.setLayoutData(data);
-
-		Composite buttonCompo = new Composite(parent, SWT.NULL);
-		buttonCompo.setLayout(new GridLayout());
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		data.horizontalIndent = 15;
-		buttonCompo.setLayoutData(data);
-
-		mainMethodButton = new Button(buttonCompo, SWT.CHECK);
-		mainMethodButton.setText(J2EEUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(mainMethodButton, INewJavaClassDataModelProperties.MAIN_METHOD, null);
-
-		inheritButton = new Button(buttonCompo, SWT.CHECK);
-		inheritButton.setText(J2EEUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(inheritButton, INewJavaClassDataModelProperties.ABSTRACT_METHODS, null);
-
-		constructorButton = new Button(buttonCompo, SWT.CHECK);
-		constructorButton.setText(J2EEUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(constructorButton, INewJavaClassDataModelProperties.CONSTRUCTOR, null);
-	}
-
-	/**
-	 * @see IStatefulWizardPage#saveWidgetValues()
-	 */
-	// public void saveWidgetValues() {
-	// // TODO: do we want to do this here or in the concrete subclasses???
-	// IDialogSettings store = getDialogSettings();
-	// if (store != null)
-	// store.put(getUniqueKey(""), getUniqueKey("")); //$NON-NLS-1$
-	// //$NON-NLS-2$
-	// DialogSettingsHelper.saveButton(inheritButton,
-	// getUniqueKey(idInheritedAbstractButton), store);
-	// DialogSettingsHelper.saveButton(constructorButton,
-	// getUniqueKey(idSuperClassConstructorsButton), store);
-	// DialogSettingsHelper.saveButton(publicButton,
-	// getUniqueKey(idPublicButton), store);
-	// DialogSettingsHelper.saveButton(abstractButton,
-	// getUniqueKey(idAbstractButton), store);
-	// DialogSettingsHelper.saveButton(finalButton, getUniqueKey(idFinalButton),
-	// store);
-	//
-	// }
-	/**
-	 * @see IStatefulWizardPage#restoreWidgetValues()
-	 */
-	// public void restoreWidgetValues() {
-	// IDialogSettings store = super.getDialogSettings();
-	// if (store != null && store.get(getUniqueKey("")) != null) { //$NON-NLS-1$
-	// DialogSettingsHelper.restoreButton(inheritButton,
-	// getUniqueKey(idInheritedAbstractButton), store);
-	// DialogSettingsHelper.restoreButton(constructorButton,
-	// getUniqueKey(idSuperClassConstructorsButton), store);
-	// DialogSettingsHelper.restoreButton(publicButton,
-	// getUniqueKey(idPublicButton), store);
-	// DialogSettingsHelper.restoreButton(abstractButton,
-	// getUniqueKey(idAbstractButton), store);
-	// DialogSettingsHelper.restoreButton(finalButton,
-	// getUniqueKey(idFinalButton), store);
-	// }
-	// }
-	/**
-	 * Returns the Super Interface Content Provider
-	 */
-	protected IStructuredContentProvider getInterfaceContentProvider() {
-		return new IStructuredContentProvider() {
-			public Object[] getElements(Object inputElement) {
-				Object[] ret = new Object[0];
-				if (inputElement instanceof ArrayList) {
-					ret = ((ArrayList) inputElement).toArray();
-				}
-				return ret;
-			}
-			public void dispose() {
-				//Do nothing
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-				//Default is nothing
-			}
-		};
-	}
-
-	/**
-	 * Returns the Super Interface Label Provider
-	 */
-	protected ILabelProvider getInterfaceLabelProvider() {
-		return new ILabelProvider() {
-			public Image getImage(Object element) {
-				return J2EEUIPlugin.getDefault().getImage("full/obj16/interface_obj"); //$NON-NLS-1$
-			}
-
-			public String getText(Object element) {
-				String ret = J2EEUIMessages.EMPTY_STRING;
-				if (element instanceof String)
-					ret = (String) element;
-				return ret;
-			}
-
-			public void addListener(ILabelProviderListener listener) {
-				//Do nothing
-			}
-			public void dispose() {
-				//Do nothing
-			}
-			public boolean isLabelProperty(Object element, String property) {
-				return true;
-			}
-			public void removeListener(ILabelProviderListener listener) {
-				//Do nothing
-			}
-		};
-	}
-
-	/**
-	 * Browse for a new Super Interface Class
-	 */
-	protected void handleInterfaceAddButtonSelected() {
-		IProject project = (IProject) model.getProperty(INewJavaClassDataModelProperties.PROJECT);
-		IRunnableContext context = Workbench.getInstance().getActiveWorkbenchWindow();
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-		// this eliminates the non-exported classpath entries
-		final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(javaProject, true, true);
-		TypeSelectionDialog2 dialog = new TypeSelectionDialog2(getShell(),false, context, scope,IJavaSearchConstants.INTERFACE);
-		dialog.setTitle(J2EEUIMessages.INTERFACE_SELECTION_DIALOG_TITLE);
-		if (dialog.open() == Window.OK) {
-			IType type = (IType) dialog.getFirstResult();
-			String superclassFullPath = ""; //$NON-NLS-1$
-			if (type != null)
-				superclassFullPath = type.getFullyQualifiedName();
-			interfaceViewer.add(superclassFullPath);
-		}
-		List valueList = Arrays.asList(interfaceViewer.getList().getItems());
-		model.setProperty(INewJavaClassDataModelProperties.INTERFACES, valueList);
-	}
-
-	/**
-	 * Remove an interface from the SuperInterface List
-	 */
-	protected void handleInterfaceRemoveButtonSelected() {
-		IStructuredSelection selection = (IStructuredSelection) interfaceViewer.getSelection();
-		List items = selection.toList();
-		if (!items.isEmpty()) {
-			Object array[] = interfaceViewer.getList().getItems();
-			List valueList = new ArrayList();
-			
-			for (int i = 0; i < array.length; i++) {
-				valueList.add(array[i]);
-			}
-			for (int i=0; i<items.size(); i++) {
-				valueList.remove(items.get(i));
-			}
-			interfaceViewer.setInput(valueList);
-			model.setProperty(INewJavaClassDataModelProperties.INTERFACES, valueList);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
deleted file mode 100644
index e02940d48..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
+++ /dev/null
@@ -1,658 +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.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.dialogs.TypeSelectionDialog2;
-import org.eclipse.jdt.internal.ui.viewsupport.IViewPartInputProvider;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
-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.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- *
- */
-public class NewJavaClassWizardPage extends DataModelWizardPage {
-
-	private Text folderText;
-	private Button folderButton;
-	protected Text packageText;
-	protected Button packageButton;
-	protected Label packageLabel;
-	protected Text classText;
-	protected Label classLabel;
-	protected Text superText;
-	protected Button superButton;
-	protected Label superLabel;
-	private Combo projectNameCombo;	
-	protected String projectType;
-	private String projectName;
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public NewJavaClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle,
-			String moduleType) {
-		super(model, pageName);
-		setDescription(pageDesc);
-		this.setTitle(pageTitle);
-		setPageComplete(false);
-		this.projectType = moduleType;
-		this.projectName = null;
-	}
-
-	/**
-	 * 
-	 */
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IArtifactEditOperationDataModelProperties.PROJECT_NAME, 
-				IArtifactEditOperationDataModelProperties.COMPONENT_NAME, 
-				INewJavaClassDataModelProperties.SOURCE_FOLDER, 
-				INewJavaClassDataModelProperties.JAVA_PACKAGE, 
-				INewJavaClassDataModelProperties.CLASS_NAME, 
-				INewJavaClassDataModelProperties.SUPERCLASS};
-	}
-
-	/**
-	 * 
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		composite.setLayout(layout);
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		data.widthHint = 300;
-		composite.setLayoutData(data);
-
-		addProjectNameGroup(composite);
-		addFolderGroup(composite);
-		addSeperator(composite, 3);
-		addPackageGroup(composite);
-		addClassnameGroup(composite);
-		addSuperclassGroup(composite);
-
-		folderText.setFocus();
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
-		return composite;
-	}
-
-	/**
-	 * Add project group
-	 */
-	private void addProjectNameGroup(Composite parent) {
-		// set up project name label
-		Label projectNameLabel = new Label(parent, SWT.NONE);
-		projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)); //$NON-NLS-1$
-		GridData data = new GridData();
-		projectNameLabel.setLayoutData(data);
-		// set up project name entry field
-		projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 300;
-		data.horizontalSpan = 1;
-		projectNameCombo.setLayoutData(data);
-		projectNameCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// update source folder
-				if (folderText != null) {					
-					String sourceFolder = getDefaultJavaSourceFolder(ProjectUtilities.getProject(projectNameCombo.getText())).getFullPath().toOSString();					
-					if (sourceFolder != null)
-						folderText.setText(sourceFolder);
-				}
-			}
-		});
-		synchHelper.synchCombo(projectNameCombo, IArtifactEditOperationDataModelProperties.PROJECT_NAME, null);
-		initializeProjectList();
-		new Label(parent, SWT.NONE);
-	}
-	
-	/**
-	 * 
-	 **/
-	private IFolder getDefaultJavaSourceFolder(IProject project) {
-		
-		if (project == null)
-			return null;
-		IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
-		// Try and return the first source folder
-		if (sources.length > 0) {
-			try {
-				return (IFolder) sources[0].getCorrespondingResource();
-			} catch (Exception e) {
-				return null;
-			}
-		}
-		return null;
-	}
-	 
-	/**
-	 * 
-	 */
-	private void initializeProjectList() {
-		IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
-		List items = new ArrayList();
-		for (int i = 0; i < workspaceProjects.length; i++) {
-			IProject project = workspaceProjects[i];
-			try {
-				if (project.isAccessible() && project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-					if (J2EEProjectUtilities.getJ2EEProjectType(project).equals(projectType))
-						items.add(project.getName());
-				}
-			} catch (CoreException ce) {
-				// Ignore
-			}
-		}
-		if (items.isEmpty()) return;
-		String[] names = new String[items.size()];
-		for (int i = 0; i < items.size(); i++) {
-			names[i] = (String) items.get(i);
-		}
-		projectNameCombo.setItems(names);
-		IProject selectedProject = null;
-		try {
-			if (model !=null) {
-				String projectNameFromModel = model.getStringProperty(IArtifactEditOperationDataModelProperties.COMPONENT_NAME);
-				if (projectNameFromModel!=null && projectNameFromModel.length()>0)
-					selectedProject = ProjectUtilities.getProject(projectNameFromModel);
-			}
-		} catch (Exception e) {};
-		try {
-			if (selectedProject == null)
-				selectedProject = getSelectedProject();
-			if (selectedProject != null && selectedProject.isAccessible()
-					&& selectedProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-				projectNameCombo.setText(selectedProject.getName());
-				model.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, selectedProject.getName());
-			}
-		} catch (CoreException ce) {
-			// Ignore
-		}
-		if (projectName == null && names.length > 0)
-			projectName = names[0];
-
-		if ((projectNameCombo.getText() == null || projectNameCombo.getText().length() == 0) && projectName != null) {
-			projectNameCombo.setText(projectName);
-			model.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, projectName);
-		}
-
-	}
-
-	/**
-	 * Add folder group to composite
-	 */
-	private void addFolderGroup(Composite composite) {
-		// folder
-		Label folderLabel = new Label(composite, SWT.LEFT);
-		folderLabel.setText(J2EEUIMessages.FOLDER_LABEL);
-		folderLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		folderText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		folderText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		synchHelper.synchText(folderText, INewJavaClassDataModelProperties.SOURCE_FOLDER, null);
-		IPackageFragmentRoot root = getSelectedPackageFragmentRoot();
-		if (root != null)
-			folderText.setText(root.getPath().toString());
-		
-		folderButton = new Button(composite, SWT.PUSH);
-		folderButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
-		folderButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		folderButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				handleFolderButtonPressed();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// Do nothing
-			}
-		});
-	}
-
-	/**
-	 * Add package group to composite
-	 */
-	private void addPackageGroup(Composite composite) {
-		// package
-		packageLabel = new Label(composite, SWT.LEFT);
-		packageLabel.setText(J2EEUIMessages.JAVA_PACKAGE_LABEL);
-		packageLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		packageText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		packageText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		IPackageFragment packageFragment = getSelectedPackageFragment();
-		if (packageFragment != null && packageFragment.exists()) {
-			IPackageFragmentRoot root = getPackageFragmentRoot(packageFragment);
-			if (root != null)
-				folderText.setText(root.getPath().toString());
-			model.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE, packageFragment.getElementName());
-		}
-
-		synchHelper.synchText(packageText, INewJavaClassDataModelProperties.JAVA_PACKAGE, null);
-
-		packageButton = new Button(composite, SWT.PUSH);
-		packageButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
-		packageButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		packageButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				handlePackageButtonPressed();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// Do nothing
-			}
-		});
-	}
-	
-	protected IPackageFragmentRoot getPackageFragmentRoot(IPackageFragment packageFragment) {
-		if (packageFragment == null)
-			return null;
-		else if (packageFragment.getParent() instanceof IPackageFragment)
-			return getPackageFragmentRoot((IPackageFragment) packageFragment.getParent());
-		else if (packageFragment.getParent() instanceof IPackageFragmentRoot)
-			return (IPackageFragmentRoot) packageFragment.getParent();
-		else
-			return null;
-	}
-
-	/**
-	 * Add classname group to composite
-	 */
-	private void addClassnameGroup(Composite composite) {
-		// class name
-		classLabel = new Label(composite, SWT.LEFT);
-		classLabel.setText(J2EEUIMessages.CLASS_NAME_LABEL);
-		classLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		classText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		classText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		synchHelper.synchText(classText, INewJavaClassDataModelProperties.CLASS_NAME, null);
-
-		new Label(composite, SWT.LEFT);
-	}
-
-	/**
-	 * Add seperator to composite
-	 */
-	protected void addSeperator(Composite composite, int horSpan) {
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		data.widthHint = 300;
-		// Separator label
-		Label seperator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = horSpan;
-		seperator.setLayoutData(data);
-	}
-
-	/**
-	 * Add superclass group to the composite
-	 */
-	private void addSuperclassGroup(Composite composite) {
-		// superclass
-		superLabel = new Label(composite, SWT.LEFT);
-		superLabel.setText(J2EEUIMessages.SUPERCLASS_LABEL);
-		superLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		superText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		superText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		synchHelper.synchText(superText, INewJavaClassDataModelProperties.SUPERCLASS, null);
-
-		superButton = new Button(composite, SWT.PUSH);
-		superButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
-		superButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		superButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSuperButtonPressed();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// Do nothing
-			}
-		});
-	}
-
-	/**
-	 * Browse for a new Destination Folder
-	 */
-	protected void handleFolderButtonPressed() {
-		ISelectionStatusValidator validator = getContainerDialogSelectionValidator();
-		ViewerFilter filter = getContainerDialogViewerFilter();
-		ITreeContentProvider contentProvider = new WorkbenchContentProvider();
-		ILabelProvider labelProvider = new DecoratingLabelProvider(new WorkbenchLabelProvider(), PlatformUI.getWorkbench()
-				.getDecoratorManager().getLabelDecorator());
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), labelProvider, contentProvider);
-		dialog.setValidator(validator);
-		dialog.setTitle(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_TITLE);
-		dialog.setMessage(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_DESC);
-		dialog.addFilter(filter);
-		String projectName = model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME);
-		if (projectName==null || projectName.length()==0)
-			return;
-		IProject project = ProjectUtilities.getProject(projectName);
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
-		if (project != null)
-			dialog.setInitialSelection(project);
-		if (dialog.open() == Window.OK) {
-			Object element = dialog.getFirstResult();
-			try {
-				if (element instanceof IContainer) {
-					IContainer container = (IContainer) element;
-					folderText.setText(container.getFullPath().toString());
-					// dealWithSelectedContainerResource(container);
-				}
-			} catch (Exception ex) {
-				// Do nothing
-			}
-
-		}
-	}
-
-	protected void handlePackageButtonPressed() {
-		IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
-		if (packRoot == null)
-			return;
-		IJavaElement[] packages = null;
-		try {
-			packages = packRoot.getChildren();
-		} catch (JavaModelException e) {
-			// Do nothing
-		}
-		if (packages == null)
-			packages = new IJavaElement[0];
-
-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(
-				JavaElementLabelProvider.SHOW_DEFAULT));
-		dialog.setTitle(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_TITLE);
-		dialog.setMessage(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_DESC);
-		dialog.setEmptyListMessage(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE);
-		dialog.setElements(packages);
-		if (dialog.open() == Window.OK) {
-			IPackageFragment fragment = (IPackageFragment) dialog.getFirstResult();
-			if (fragment != null) {
-				packageText.setText(fragment.getElementName());
-			} else {
-				packageText.setText(J2EEUIMessages.EMPTY_STRING);
-			}
-		}
-	}
-
-	protected void handleSuperButtonPressed() {
-		getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
-		IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
-		if (packRoot == null)
-			return;
-
-		// this eliminates the non-exported classpath entries
-		final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(packRoot.getJavaProject(), true, true);
-
-		// This includes all entries on the classpath. This behavior is
-		// identical
-		// to the Super Class Browse Button on the Create new Java Class Wizard
-		// final IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new
-		// IJavaElement[] {root.getJavaProject()} );
-		TypeSelectionDialog2 dialog = new TypeSelectionDialog2(getShell(),false, getWizard().getContainer(), scope, IJavaSearchConstants.CLASS);
-		dialog.setTitle(J2EEUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE);
-		dialog.setMessage(J2EEUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC);
-
-		if (dialog.open() == Window.OK) {
-			IType type = (IType) dialog.getFirstResult();
-			String superclassFullPath = J2EEUIMessages.EMPTY_STRING;
-			if (type != null) {
-				superclassFullPath = type.getFullyQualifiedName();
-			}
-			superText.setText(superclassFullPath);
-			getControl().setCursor(null);
-			return;
-		}
-		getControl().setCursor(null);
-	}
-
-	/**
-	 * Returns a new instance of the Selection validator for the Container
-	 * Selection Dialog This method can be extended by subclasses, as it does
-	 * some basic validation.
-	 */
-	protected ISelectionStatusValidator getContainerDialogSelectionValidator() {
-		return new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection != null && selection[0] != null && !(selection[0] instanceof IProject))
-					return WTPCommonPlugin.OK_STATUS;
-				return WTPCommonPlugin.createErrorStatus(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG);
-			}
-		};
-	}
-
-	/**
-	 * Returns a new instance of the Selection Listner for the Container
-	 * Selection Dialog
-	 */
-	protected ViewerFilter getContainerDialogViewerFilter() {
-		return new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parent, Object element) {
-				if (element instanceof IProject) {
-					IProject project = (IProject) element;
-					return project.getName().equals(model.getProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
-				} else if (element instanceof IFolder) {
-					IFolder folder = (IFolder) element;
-					// only show source folders
-					IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
-					IPackageFragmentRoot[] sourceFolders = J2EEProjectUtilities.getSourceContainers(project);
-					for (int i = 0; i < sourceFolders.length; i++) {
-						if (sourceFolders[i].getResource()!= null && sourceFolders[i].getResource().equals(folder))
-							return true;
-					}
-				}
-				return false;
-			}
-		};
-	}
-
-	
-
-	/**
-	 * @return
-	 */
-	private IProject getSelectedProject() {
-		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-		if (window == null)
-			return null;
-		ISelection selection = window.getSelectionService().getSelection();
-		if (selection == null)
-			return null;
-		if (!(selection instanceof IStructuredSelection)) 
-			return null;
-		IStructuredSelection stucturedSelection = (IStructuredSelection) selection;
-		if (stucturedSelection.getFirstElement() instanceof EObject)
-			return ProjectUtilities.getProject(stucturedSelection.getFirstElement());
-		IJavaElement element = getInitialJavaElement(selection);
-		if (element != null && element.getJavaProject() != null)
-			return element.getJavaProject().getProject();
-		return getExtendedSelectedProject(stucturedSelection.getFirstElement());
-	}
-	
-	protected IProject getExtendedSelectedProject(Object selection) {
-		return null;
-	}
-
-	/**
-	 * @return
-	 */
-	private IPackageFragment getSelectedPackageFragment() {
-		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-		if (window == null)
-			return null;
-		ISelection selection = window.getSelectionService().getSelection();
-		if (selection == null)
-			return null;
-		// StructuredSelection stucturedSelection = (StructuredSelection)
-		// selection;
-		IJavaElement element = getInitialJavaElement(selection);
-		if (element != null) {
-			if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT)
-				return (IPackageFragment) element;
-			else if (element.getElementType() == IJavaElement.TYPE) {
-				return ((IType) element).getPackageFragment();
-			}
-		}
-		return null;
-	}
-	
-	private IPackageFragmentRoot getSelectedPackageFragmentRoot() {
-		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-		if (window == null)
-			return null;
-		ISelection selection = window.getSelectionService().getSelection();
-		if (selection == null)
-			return null;
-		// StructuredSelection stucturedSelection = (StructuredSelection)
-		// selection;
-		IJavaElement element = getInitialJavaElement(selection);
-		if (element != null) {
-			if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT)
-				return (IPackageFragmentRoot) element;
-		}
-		return null;
-	}
-
-	/**
-	 * Utility method to inspect a selection to find a Java element.
-	 * 
-	 * @param selection
-	 *            the selection to be inspected
-	 * @return a Java element to be used as the initial selection, or
-	 *         <code>null</code>, if no Java element exists in the given
-	 *         selection
-	 */
-	protected IJavaElement getInitialJavaElement(ISelection selection) {
-		IJavaElement jelem = null;
-		if (selection != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
-			if (selectedElement instanceof IAdaptable) {
-				IAdaptable adaptable = (IAdaptable) selectedElement;
-
-				jelem = (IJavaElement) adaptable.getAdapter(IJavaElement.class);
-				if (jelem == null) {
-					IResource resource = (IResource) adaptable.getAdapter(IResource.class);
-					if (resource != null && resource.getType() != IResource.ROOT) {
-						while (jelem == null && resource.getType() != IResource.PROJECT) {
-							resource = resource.getParent();
-							jelem = (IJavaElement) resource.getAdapter(IJavaElement.class);
-						}
-						if (jelem == null) {
-							jelem = JavaCore.create(resource); // java project
-						}
-					}
-				}
-			}
-		}
-		if (jelem == null) {
-			IWorkbenchPart part = JavaPlugin.getActivePage().getActivePart();
-			if (part instanceof ContentOutline) {
-				part = JavaPlugin.getActivePage().getActiveEditor();
-			}
-
-			if (part instanceof IViewPartInputProvider) {
-				Object elem = ((IViewPartInputProvider) part).getViewPartInput();
-				if (elem instanceof IJavaElement) {
-					jelem = (IJavaElement) elem;
-				}
-			}
-		}
-
-		if (jelem == null || jelem.getElementType() == IJavaElement.JAVA_MODEL) {
-			try {
-				IJavaProject[] projects = JavaCore.create(getWorkspaceRoot()).getJavaProjects();
-				if (projects.length == 1) {
-					jelem = projects[0];
-				}
-			} catch (JavaModelException e) {
-				JavaPlugin.log(e);
-			}
-		}
-		return jelem;
-	}
-
-	protected IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
deleted file mode 100644
index d23ffbb05..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
+++ /dev/null
@@ -1,259 +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 Nov 3, 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.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class NewModuleGroup implements IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-	
-	private IDataModel model;
-	protected Text moduleNameText = null;
-	protected Button newButton = null;
-	protected Text serverTargetText;
-	private DataModelSynchHelper synchHelper;
-//	private Composite parentComposite;
-	
-	private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-//	private static final String NEW_LABEL_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E); //$NON-NLS-1$
-	private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.MODULE_NAME); //$NON-NLS-1$
-	
-	/**
-	 * @param parent
-	 * @param style
-	 */
-	public NewModuleGroup(Composite parent, int style, IDataModel model, DataModelSynchHelper syncHelper) {
-		this.model = model;
-//		this.parentComposite = parent;
-		synchHelper = syncHelper;
-		buildComposites(parent);
-	}
-
-	/**
-	 * Create the controls within this composite
-	 */
-	public void buildComposites(Composite parent) {
-		//createProjectNameGroup(parent);
-		//initializeProjectList();
-        createModuleGroup(parent);
-        //addSeperator(parent,3);
-		//createServerTargetComposite(parent);
-	}
-	
-	/**
-	 * 
-	 *
-	 */
-//	public void initializeProjectList() {
-//		IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
-//		List items = new ArrayList();
-//		for (int i=0; i<workspaceProjects.length; i++) {
-//			IProject project = workspaceProjects[i];
-//			try {
-//				if (project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-//					items.add(project.getName());
-//				}
-//			} catch (CoreException ce) {
-//				//Ignore
-//			}
-//		}
-//		String[] names = new String[items.size()];
-//		for (int i=0; i<items.size(); i++) {
-//			names[i]= (String) items.get(i);
-//		}
-//		//model.IgnorePropertyChanges(true);
-//		projectNameCombo.setItems(names);
-//		//model.setIgnorePropertyChanges(false);
-//		
-//		if (!model.isPropertySet(PROJECT_NAME) || model.getStringProperty(PROJECT_NAME).length()==0) {
-//			IProject selectedProject = getSelectedProject();
-//			if (selectedProject!=null) {
-//				projectNameCombo.setText(selectedProject.getName());
-//				model.setProperty(PROJECT_NAME,selectedProject.getName());
-//			}
-//			else if (names.length>0) {
-//				projectNameCombo.setText(names[0]);
-//				model.setProperty(PROJECT_NAME,names[0]);
-//			}
-//		} else {
-//			projectNameCombo.add(model.getStringProperty(PROJECT_NAME));
-//			projectNameCombo.setText(model.getStringProperty(PROJECT_NAME));
-//		}
-//	}
-
-	/**
-	 *  
-	 */
-//	private void createProjectNameGroup(Composite parent) {
-//		// set up project name label
-//		Label projectNameLabel = new Label(parent, SWT.NONE);
-//		projectNameLabel.setText(PROJECT_NAME_UI);
-//		GridData data = new GridData();
-//		projectNameLabel.setLayoutData(data);
-//		// set up project name entry field
-//		projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-//		data = new GridData(GridData.FILL_HORIZONTAL);
-//		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-//		projectNameCombo.setLayoutData(data);
-//		projectNameCombo.addSelectionListener(new SelectionAdapter() {
-//			public void widgetSelected(SelectionEvent e) {
-//				IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
-//				IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-//				if (runtime != null)
-//					serverTargetText.setText(runtime.getName());
-//			}
-//		});
-//		newButton = new Button(parent, SWT.NONE);
-//		newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-//		newButton.setText(NEW_LABEL_UI);
-//		newButton.addSelectionListener(new SelectionAdapter() {
-//			public void widgetSelected(SelectionEvent e) {
-//				handleNewProjectSelected();
-//			}
-//		});
-//		synchHelper.synchCombo(projectNameCombo, PROJECT_NAME, new Control[]{projectNameLabel});
-//	}
-	
-	/**
-	 * @return
-	 */
-//	private IProject getSelectedProject() {
-//		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-//		if (window == null)
-//			return null;
-//		ISelection selection = window.getSelectionService().getSelection();
-//		if (selection == null || !(selection instanceof StructuredSelection))
-//			return null;
-//		StructuredSelection stucturedSelection = (StructuredSelection) selection;
-//		Object obj = stucturedSelection.getFirstElement();
-//		if (obj instanceof IProject)
-//			return (IProject) obj;
-//		return null;
-//	}
-//	
-	/**
-	 * 
-	 *
-	 */
-//	private void handleNewProjectSelected() {
-//		IDataModel projModel = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
-//		FlexibleProjectCreationWizard newProjectWizard = new FlexibleProjectCreationWizard(projModel);
-//		WizardDialog dialog = new WizardDialog(parentComposite.getShell(), newProjectWizard);
-//		if (Window.OK == dialog.open()) {
-//			String newProjectName = projModel.getStringProperty(PROJECT_NAME);
-//			projectNameCombo.add(newProjectName);
-//			projectNameCombo.setText(newProjectName);
-//			IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
-//			IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-//			if (runtime != null)
-//				serverTargetText.setText(runtime.getName());
-//		}
-//	}
-	
-	/**
-	 * 
-	 * @param parent
-	 */
-	private void createModuleGroup(Composite parent) {
-		GridData data = new GridData();
-		// Add the module name label
-		Label moduleNameLabel = new Label(parent, SWT.NONE);
-		moduleNameLabel.setText(MODULE_NAME_UI);
-		// Add the module name entry field
-		moduleNameText = new Text(parent, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		moduleNameText.setLayoutData(data);
-		synchHelper.synchText(moduleNameText,COMPONENT_NAME,new Control[] {});
-		new Label(parent,SWT.NONE);
-	}
-
-	/**
-	 * 
-	 *
-	 */
-	public void dispose() {
-		if (synchHelper != null) {
-			if (model != null)
-				model.removeListener(synchHelper);
-			synchHelper.dispose();
-		}
-		model = null;
-	}
-	
-	/**
-	 * 
-	 * @return
-	 */
-//	public String getProjectName() {
-//		return projectNameCombo.getText();
-//	}
-	
-	/**
-	 * 
-	 * @param parent
-	 * @param hSpan
-	 */
-	public void addSeperator(Composite parent, int hSpan) {
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = hSpan;
-		separator.setLayoutData(gd);
-	}
-	
-	/**
-	 * 
-	 * @param parent
-	 */
-	protected void createServerTargetComposite(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
-		serverTargetText = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
-		serverTargetText.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-		new Label(parent, SWT.NONE);
-		String projectName = moduleNameText.getText();
-		if (projectName!=null && projectName.length()!=0) {
-			IProject project = ProjectUtilities.getProject(projectName);
-			if (project !=null) {
-				IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-				if (runtime != null){
-					serverTargetText.setText(runtime.getName());
-					synchHelper.synchText(serverTargetText, RUNTIME_TARGET_ID, null);
-				}	
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/PackageNameResolver.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/PackageNameResolver.java
deleted file mode 100644
index 46ec179fc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/PackageNameResolver.java
+++ /dev/null
@@ -1,70 +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.wizard;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-/**
- * @author Sachin
- * 
- * 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 PackageNameResolver extends ClassLoader {
-
-	public PackageNameResolver() {
-		super();
-	}
-
-	public String getClassName(final String classFile) {
-		File file = new File(classFile);
-		byte[] classbuf = new byte[(int) file.length()];
-		try {
-			FileInputStream instream = new FileInputStream(file);
-			instream.read(classbuf);
-			instream.close();
-		} catch (Throwable e) {
-			return null;
-		}
-		boolean badclassname = true;
-		String classname = classFile.replace(java.io.File.separatorChar, '.');
-		int endi;
-		if (classname.endsWith(".class")) //$NON-NLS-1$
-			endi = classname.lastIndexOf('.');
-		else
-			endi = classname.length();
-		int i = classname.indexOf('.');
-		while (i < endi && badclassname == true) {
-			badclassname = false;
-			try {
-				defineClass(classname.substring(i + 1, endi), classbuf, 0, classbuf.length);
-			} catch (java.lang.NoClassDefFoundError e) {
-				String msg = e.getMessage();
-				if (msg == null || msg.indexOf(' ') > 0) {
-					badclassname = true;
-				}
-			} catch (Throwable e) {
-				badclassname = true;
-			}
-			if (badclassname) {
-				i = classname.indexOf('.', i + 1);
-				if (i == -1)
-					i = endi;
-			}
-		}
-		if (badclassname)
-			return null;
-		return classname.substring(i + 1, endi);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java
deleted file mode 100644
index 34a042345..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java
+++ /dev/null
@@ -1,154 +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.wizard;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class ServerEarAndStandaloneGroup implements IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-	
-	private Button newEAR;
-	private Combo earCombo;
-	private Label earLabel;
-	private Button addToEAR;
-	private IDataModel model;
-	private DataModelSynchHelper synchHelper;
-	private Composite parentComposite;
-
-	/**
-	 *  
-	 */
-	public ServerEarAndStandaloneGroup(Composite parent, IDataModel model, DataModelSynchHelper helper) {
-		this.model = model;
-		this.parentComposite = parent;
-		synchHelper = helper;
-		buildComposites(parent);
-	}
-
-	/**
-	 * 
-	 * @param parent
-	 */
-	public void buildComposites(Composite parent) {
-		createEarAndStandaloneComposite(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	protected void createEarAndStandaloneComposite(Composite parent) {
-
-		//if (model.getBooleanProperty(UI_SHOW_EAR_SECTION)) {
-
-			Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 3;
-			separator.setLayoutData(gd);
-
-			new Label(parent, SWT.NONE); //pad
-
-			// Create Add to EAR checkbox
-			addToEAR = new Button(parent, SWT.CHECK);
-			addToEAR.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.LINK_MODULETO_EAR_PROJECT));
-			addToEAR.setSelection(true);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			addToEAR.setLayoutData(gd);
-			synchHelper.synchCheckbox(addToEAR, ADD_TO_EAR, null);
-			
-			// Create EAR Group
-			earLabel = new Label(parent, SWT.NONE);
-			earLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION));
-
-			earCombo = new Combo(parent, SWT.NONE);
-			earCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-			newEAR = new Button(parent, SWT.NONE);
-			newEAR.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_W));
-			newEAR.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			newEAR.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent e) {
-					handleNewEarSelected();
-				}
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-					//do nothing
-				}
-
-			});
-
-			Control[] deps = new Control[]{earLabel, newEAR};
-			synchHelper.synchCombo(earCombo, EAR_COMPONENT_NAME, deps);
-		//}
-	}
-
-	/**
-	 *  
-	 */
-	protected void handleNewEarSelected() {
-		IDataModel moduleModel = model;
-		
-        IDataModel earModel = DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
-        
-		
-		earModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME,
-				moduleModel.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
-		
-		FacetDataModelMap map = (FacetDataModelMap) earModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		IDataModel earFacetDataModel = map.getFacetDataModel(J2EEProjectUtilities.ENTERPRISE_APPLICATION);
-		int j2eeVersion = moduleModel.getIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION);
-		String j2eeVerionText = J2EEVersionUtil.getJ2EETextVersion(j2eeVersion);
-		earFacetDataModel.setStringProperty(IEarFacetInstallDataModelProperties.FACET_VERSION_STR,
-					j2eeVerionText);
-		
-		
-		EarProjectWizard earWizard = new EarProjectWizard(earModel);
-		WizardDialog dialog = new WizardDialog(parentComposite.getShell(), earWizard);
-		if (Window.OK == dialog.open()) {
-			moduleModel.setProperty(EAR_COMPONENT_NAME, earModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME));
-		}		
-		
-	}
-
-	public void dispose() {
-		model.removeListener(synchHelper);
-		model.dispose();
-		synchHelper = null;
-		model = null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java
deleted file mode 100644
index d0e6af58a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java
+++ /dev/null
@@ -1,76 +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 Aug 27, 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.wizard;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-
-public class ServerTargetComboHelper {
-	private List targets;
-	public String[] items;
-	public static final String defaultId = "com.ibm.etools.websphere.serverTarget.base.v51"; //$NON-NLS-1$
-	public static final String defaultExpressId = "com.ibm.etools.websphere.serverTarget.express.v51"; //$NON-NLS-1$
-
-	ServerTargetComboHelper(List targets, String[] items) {
-		this.targets = targets;
-		this.items = items;
-	}
-
-	public IRuntime getSelectedTarget(int itemIndex) {
-		return (IRuntime) targets.get(itemIndex);
-	}
-
-	/**
-	 * @param target
-	 * @return
-	 */
-	public boolean isCompatible(IRuntime target) {
-		return targets.contains(target);
-	}
-
-	public int getDefaultServerTargetIndex() {
-		IRuntime v51TargetServer = null;
-		if (J2EEPlugin.isEJBSupportAvailable())
-			v51TargetServer = ResourceManager.getInstance().getRuntime(defaultId);
-		else
-			v51TargetServer = ResourceManager.getInstance().getRuntime(defaultExpressId);
-		if (v51TargetServer != null && targets.contains(v51TargetServer))
-			return targets.indexOf(v51TargetServer) + 1;
-		return -1;
-	}
-
-	public int getServerTargetIndexFromItems(IRuntime serverTarget) {
-		if (items != null && items.length > 0) {
-			String serverTargetLabel = serverTarget.getName() + " (" + serverTarget.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-			for (int i = 0; i < items.length; i++) {
-				String label = items[i];
-				if (label.equals(serverTargetLabel)) {
-					return i;
-				}
-			}
-		}
-		return -1;
-	}
-
-	public List getValidTargets() {
-		return targets;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java
deleted file mode 100644
index 31f6d6721..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java
+++ /dev/null
@@ -1,157 +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 Aug 17, 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.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ServerTargetUIHelper {
-	/**
-	 *  
-	 */
-	public ServerTargetUIHelper() {
-		super();
-	}
-
-	public static String getSelectedServerTargetString(Combo serverTargetCombo) {
-		if (serverTargetCombo.getSelectionIndex() != -1)
-			return serverTargetCombo.getItem(serverTargetCombo.getSelectionIndex());
-		return null;
-	}
-
-	/**
-	 * @return
-	 */
-	public static int getSelectedServerTargetStringIndex(Combo serverTargetCombo) {
-		return serverTargetCombo.getSelectionIndex();
-	}
-
-//	private static void setServerTargetForProject(Shell shell, IProject project, IRuntime runtime) {
-//		//ServerTargetHelper.cleanUpNonServerTargetClasspath(project);
-//		setServerTarget(shell, project, runtime, null);
-//	}
-
-	/**
-	 * @param earProject
-	 * @param moduleProject
-	 * @return
-	 */
-	public static boolean setModuleServerTargetIfNecessary(IProject earProject, IProject moduleProject, Shell shell) {
-		IRuntime earRuntime = getProjectRuntime(earProject);
-		if (earRuntime != null) {
-			IRuntime moduleRuntime = getProjectRuntime(moduleProject);
-			if (moduleRuntime == null) {
-				return true;
-			} else if (!earRuntime.getId().equals(moduleRuntime.getId())) {
-				String dialogMessage = CommonEditResourceHandler.getString("Change_Module_Server_Target_Dialog_Message_UI_", new Object[]{earRuntime.getName(), moduleRuntime.getName()}); //$NON-NLS-1$
-				String dialogTitle = CommonEditResourceHandler.getString("Change_Server_Target_Dialog_Title_UI_"); //$NON-NLS-1$
-				MessageDialog dialog = new MessageDialog(shell, dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0);
-				dialog.open();
-				if (dialog.getReturnCode() == 0) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return IRuntime return the existing Target runtime on a IProject
-	 */
-	public static IRuntime getProjectRuntime(IProject project) {
-		return ServerCore.getProjectProperties(project).getRuntimeTarget();
-	}
-
-	//	private static String getEARJ2EELevel(IProject earProject) {
-	//		EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject);
-	//		String j2eeLevel = null;
-	//		int natureID = nature.getJ2EEVersion();
-	//		switch (natureID) {
-	//			case (J2EEVersionConstants.J2EE_1_2_ID) :
-	//				j2eeLevel = J2EEVersionConstants.VERSION_1_2_TEXT;
-	//				break;
-	//			case (J2EEVersionConstants.J2EE_1_3_ID) :
-	//				j2eeLevel = J2EEVersionConstants.VERSION_1_3_TEXT;
-	//				break;
-	//			case (J2EEVersionConstants.J2EE_1_4_ID) :
-	//				j2eeLevel = J2EEVersionConstants.VERSION_1_4_TEXT;
-	//				break;
-	//			default :
-	//				j2eeLevel = J2EEVersionConstants.VERSION_1_4_TEXT;
-	//				break;
-	//		}
-	//		return j2eeLevel;
-	//	}
-
-	public static void setServerTarget(Shell shell, IProject project, IRuntime runtime, IProgressMonitor monitor) {
-//		try {
-//			ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
-//		} catch (CoreException e) {
-//			Logger.getLogger().logError(e);
-//		}
-	}
-
-
-	public static ServerTargetComboHelper getValidServerTargetComboItems(String j2eeType, String selectedVersion) {
-		IRuntime[] validServerTargets = ServerUtil.getRuntimes(j2eeType, selectedVersion);
-		String[] serverTargetList = null;
-		if (validServerTargets.length>0) {
-			int serverTargetListSize = validServerTargets.length;
-			serverTargetList = new String[serverTargetListSize];
-			for (int i = 0; i < validServerTargets.length; i++) {
-				IRuntime runtime = validServerTargets[i];
-				serverTargetList[i] = runtime.getName() + " (" + runtime.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		return new ServerTargetComboHelper(Arrays.asList(validServerTargets), serverTargetList);
-	}
-
-	/**
-	 * @param project
-	 */
-	public static void runEarValidation(IProject project) {
-		try {
-			IRunnableWithProgress runnable = EARValidationHelper.createValidationRunnable(project);
-			runnable.run(null);
-		} catch (InterruptedException ie) {
-			Logger.getLogger().logError(ie);
-		} catch (InvocationTargetException ite) {
-			Logger.getLogger().logError(ite);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java
deleted file mode 100644
index b75ed2175..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java
+++ /dev/null
@@ -1,354 +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.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author jialin
- * 
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class StringArrayTableWizardSection extends Composite {
-
-	protected class StringArrayListContentProvider implements IStructuredContentProvider {
-		public boolean isDeleted(Object element) {
-			return false;
-		}
-		public Object[] getElements(Object element) {
-			if (element instanceof List) {
-				return ((List) element).toArray();
-			}
-			return new Object[0];
-		}
-		public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
-			//Default nothing
-		}
-		public void dispose() {
-			//Default nothing
-		}
-	}
-	protected class StringArrayListLabelProvider extends LabelProvider {
-		public Image getImage(Object element) {
-			return labelProviderImage;
-		}
-		public String getText(Object element) {
-			String[] array = (String[]) element;
-			String s = array[0];
-			return s;
-		}
-	}
-
-	protected class AddStringArrayDialog extends Dialog {
-		protected String windowTitle;
-		protected String[] labelsForTextField;
-		protected Text[] texts;
-		protected String[] stringArray;
-		/**
-		 * CMPFieldDialog constructor comment.
-		 */
-		public AddStringArrayDialog(Shell shell, String windowTitle, String[] labelsForTextField) {
-			super(shell);
-			this.windowTitle = windowTitle;
-			this.labelsForTextField = labelsForTextField;
-		}
-		/**
-		 * CMPFieldDialog constructor comment.
-		 */
-		public Control createDialogArea(Composite parent) {
-
-			Composite composite = (Composite) super.createDialogArea(parent);
-			getShell().setText(windowTitle);
-
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 2;
-			composite.setLayout(layout);
-			GridData data = new GridData();
-			data.verticalAlignment = GridData.FILL;
-			data.horizontalAlignment = GridData.FILL;
-			data.widthHint = 300;
-			composite.setLayoutData(data);
-
-			int n = labelsForTextField.length;
-			texts = new Text[n];
-			for (int i = 0; i < n; i++) {
-				Label label = new Label(composite, SWT.LEFT);
-				label.setText(labelsForTextField[i]);
-				label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-				texts[i] = new Text(composite, SWT.SINGLE | SWT.BORDER);
-				data = new GridData(GridData.FILL_HORIZONTAL);
-				data.widthHint = 100;
-				texts[i].setLayoutData(data);
-			}
-
-			// set focus
-			texts[0].setFocus();
-			return composite;
-		}
-
-		protected void okPressed() {
-			int n = labelsForTextField.length;
-			stringArray = new String[n];
-			for (int i = 0; i < n; i++) {
-				stringArray[i] = texts[i].getText();
-			}
-			super.okPressed();
-		}
-
-		public String[] getStringArray() {
-			return stringArray;
-		}
-	}
-	
-	protected class EditStringArrayDialog extends AddStringArrayDialog {
-		protected String[] valuesForTextField;
-		/**
-		 * CMPFieldDialog constructor comment.
-		 */
-		public EditStringArrayDialog(Shell shell, String windowTitle, String[] labelsForTextField, String[] valuesForTextField) {
-			super(shell, windowTitle, labelsForTextField);
-			this.valuesForTextField = valuesForTextField;
-		}
-		/**
-		 * CMPFieldDialog constructor comment.
-		 */
-		public Control createDialogArea(Composite parent) {
-
-			Composite composite = (Composite) super.createDialogArea(parent);
-
-			int n = valuesForTextField.length;
-			for (int i = 0; i < n; i++) {
-				texts[i].setText(valuesForTextField[i]);
-			}
-			
-			return composite;
-		}
-	}
-
-	private TableViewer viewer;
-	private Button addButton;
-	private Button editButton;
-	private Button removeButton;
-	private String title;
-	private String[] labelsForText;
-	private IDataModel model;
-	private String propertyName;
-	private Image labelProviderImage;
-
-	public StringArrayTableWizardSection(Composite parent, String title, String addButtonLabel, String removeButtonLabel, 
-			String[] labelsForText, Image labelProviderImage, IDataModel model, String propertyName) {
-		this(parent, title, addButtonLabel, null, removeButtonLabel, labelsForText, labelProviderImage, model, propertyName);
-	}
-
-	public StringArrayTableWizardSection(Composite parent, String title, String addButtonLabel, String editButtonLabel, String removeButtonLabel, 
-			String[] labelsForText, Image labelProviderImage, IDataModel model, String propertyName) {
-		super(parent, SWT.NONE);
-		this.title = title;
-		this.labelsForText = labelsForText;
-		this.labelProviderImage = labelProviderImage;
-		this.model = model;
-		this.propertyName = propertyName;
-
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginHeight = 4;
-		layout.marginWidth = 0;
-		this.setLayout(layout);
-		this.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label titleLabel = new Label(this, SWT.LEFT);
-		titleLabel.setText(title);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		titleLabel.setLayoutData(data);
-
-		viewer = new TableViewer(this);
-		viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new StringArrayListContentProvider());
-		viewer.setLabelProvider(new StringArrayListLabelProvider());
-
-		Composite buttonCompo = new Composite(this, SWT.NULL);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		buttonCompo.setLayout(layout);
-		buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
-		addButton = new Button(buttonCompo, SWT.PUSH);
-		addButton.setText(addButtonLabel);
-		addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
-		addButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				handleAddButtonSelected();
-			}
-			public void widgetDefaultSelected(SelectionEvent event) {
-				//Do nothing
-			}
-		});
-
-		if (editButtonLabel != null) {
-			editButton = new Button(buttonCompo, SWT.PUSH);
-			editButton.setText(editButtonLabel);
-			editButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
-			editButton.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					handleEditButtonSelected();
-				}
-				public void widgetDefaultSelected(SelectionEvent event) {
-					//Do nothing
-				}
-			});
-			editButton.setEnabled(false);
-		}
-
-		removeButton = new Button(buttonCompo, SWT.PUSH);
-		removeButton.setText(removeButtonLabel);
-		removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
-		removeButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				handleRemoveButtonSelected();
-			}
-			public void widgetDefaultSelected(SelectionEvent event) {
-				//Do nothing
-			}
-		});
-		removeButton.setEnabled(false);
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = event.getSelection();
-				if (editButton != null) {
-					editButton.setEnabled(!selection.isEmpty());
-				}
-				removeButton.setEnabled(!selection.isEmpty());
-			}
-		});
-		
-		if (editButton != null) {
-			viewer.addDoubleClickListener(new IDoubleClickListener() {
-				public void doubleClick(DoubleClickEvent event) {
-					handleEditButtonSelected();
-				}
-			});
-		}
-	}
-
-	private void handleAddButtonSelected() {
-		AddStringArrayDialog dialog = new AddStringArrayDialog(getShell(), title, labelsForText);
-		dialog.open();
-		String[] stringArray = dialog.getStringArray();
-		addStringArray(stringArray);
-	}
-
-	private void handleEditButtonSelected() {
-		ISelection selection = viewer.getSelection();
-		if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
-			return;
-		Object selectedObj = ((IStructuredSelection) selection).getFirstElement();
-		String[] valuesForText = (String[]) selectedObj;
-		
-		EditStringArrayDialog dialog = new EditStringArrayDialog(getShell(), title, labelsForText, valuesForText);
-		dialog.open();
-		String[] stringArray = dialog.getStringArray();
-		editStringArray(valuesForText, stringArray);
-	}
-
-	private void handleRemoveButtonSelected() {
-		ISelection selection = viewer.getSelection();
-		if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
-			return;
-		Object selectedObj = ((IStructuredSelection) selection).getFirstElement();
-		removeStringArray(selectedObj);
-	}
-	
-	public void addStringArray(String[] stringArray) {
-		if (stringArray == null)
-			return;
-		List valueList = (List) viewer.getInput();
-		if (valueList == null)
-			valueList = new ArrayList();
-		valueList.add(stringArray);
-		setInput(valueList);
-	}
-
-	public void editStringArray(String[] oldStringArray, String[] newStringArray) {
-		if (newStringArray == null)
-			return;
-		
-		List valueList = (List) viewer.getInput();
-		if (valueList == null)
-			valueList = new ArrayList();
-		
-		int index = valueList.indexOf(oldStringArray);
-		if (index == -1) {
-			valueList.add(newStringArray);
-		} else {
-			valueList.set(index, newStringArray);
-		}
-		
-		setInput(valueList);
-	}
-
-	public void removeStringArray(Object selectedStringArray) {
-		List valueList = (List) viewer.getInput();
-		valueList.remove(selectedStringArray);
-		setInput(valueList);
-	}
-
-	public void setInput(List input) {
-		viewer.setInput(input);
-		// Create a new list to trigger property change
-		List newInput = new ArrayList();
-		newInput.addAll(input);
-		model.setProperty(propertyName, newInput);
-	}
-
-	public TableViewer getTableViewer() {
-		return viewer;
-	}
-
-	public Button getAddButton() {
-		return addButton;
-	}
-
-	public Button getEditButton() {
-		return editButton;
-	}
-
-	public Button getRemoveButton() {
-		return removeButton;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java
deleted file mode 100644
index c480d0bd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java
+++ /dev/null
@@ -1,42 +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.wizard;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Insert the type's description here. Creation date: (3/19/2001 5:10:14 PM)
- * 
- * @author: Administrator
- */
-public class TableObjects {
-	public List tableObjectsList;
-
-	/**
-	 * EJBs constructor comment.
-	 */
-	public TableObjects() {
-		super();
-		tableObjectsList = new ArrayList();
-	}
-
-	public List getTableObjects() {
-		return tableObjectsList;
-	}
-
-	protected void initList() {
-		if (tableObjectsList == null)
-			tableObjectsList = new ArrayList();
-
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportMainPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportMainPage.java
deleted file mode 100644
index 235f0130b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportMainPage.java
+++ /dev/null
@@ -1,135 +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 1, 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.wizard;
-
-import java.util.List;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author Sachin
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WizardClassesImportMainPage extends WizardPage {
-	Composite composite;
-
-	protected Button importFromDir;
-	protected Button importFromZip;
-
-	private List dragAndDropFileNames = null;
-
-	/**
-	 * @param pageName
-	 */
-	public WizardClassesImportMainPage(String pageName) {
-		super(pageName);
-		setTitle(J2EEUIMessages.getResourceString("DataTransfer.fileSystemTitle")); //$NON-NLS-1$
-		setDescription(J2EEUIMessages.getResourceString("FileImport.importFileSystem")); //$NON-NLS-1$
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
-	}
-
-	public WizardClassesImportMainPage(String pageName, List fileNames) {
-		super(pageName);
-		setTitle(J2EEUIMessages.getResourceString("DataTransfer.fileSystemTitle")); //$NON-NLS-1$
-		setDescription(J2EEUIMessages.getResourceString("FileImport.importFileSystem")); //$NON-NLS-1$
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
-		dragAndDropFileNames = fileNames;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.IMPORT_CLASS_WIZARD_P1);
-		initializeDialogUnits(parent);
-		Composite aComposite = new Composite(parent, SWT.NULL);
-		aComposite.setLayout(new GridLayout());
-		aComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-		aComposite.setSize(aComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		aComposite.setFont(parent.getFont());
-		createImportTypeGroup(aComposite);
-		setControl(aComposite);
-	}
-
-	protected void createImportTypeGroup(Composite parent) {
-		Composite importTypeGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		importTypeGroup.setLayout(layout);
-		importTypeGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		//importTypeGroup.setText(WorkbenchMessages.getString("WizardExportPage.options"));
-		// //$NON-NLS-1$
-
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IWizard wiz = getWizard();
-				if (((ClassesImportWizard) wiz).page1 != null) {
-					((ClassesImportWizard) wiz).page1.blankPage();
-				}
-			}
-		};
-		importFromDir = new Button(importTypeGroup, SWT.RADIO);
-		importFromDir.setText(J2EEUIMessages.getResourceString("ClassesImport.fromDir")); //$NON-NLS-1$
-		importFromDir.addSelectionListener(selectionListener);
-
-		importFromZip = new Button(importTypeGroup, SWT.RADIO);
-		importFromZip.setText(J2EEUIMessages.getResourceString("ClassesImport.fromZip")); //$NON-NLS-1$
-		importFromZip.addSelectionListener(selectionListener);
-
-		IWizard wiz = getWizard();
-		String fileName = null;
-		if (((ClassesImportWizard) wiz).fileNames != null)
-			fileName = ((ClassesImportWizard) wiz).fileNames.get(0).toString();
-		if (fileName != null && (fileName.endsWith(".zip") || fileName.endsWith(".jar"))) { //$NON-NLS-1$ //$NON-NLS-2$
-			importFromDir.setSelection(false);
-			importFromZip.setSelection(true);
-		} else {
-			importFromDir.setSelection(true);
-			importFromZip.setSelection(false);
-		}
-	}
-
-	protected boolean isSetImportFromDir() {
-		if (importFromDir != null)
-			return importFromDir.getSelection();
-
-		String fileName = dragAndDropFileNames.get(0).toString();
-		if (fileName != null && (fileName.endsWith(".zip") || fileName.endsWith(".jar"))) { //$NON-NLS-1$ //$NON-NLS-2$
-			return false;
-		}
-		return true;
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportPage1.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportPage1.java
deleted file mode 100644
index c423470aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/WizardClassesImportPage1.java
+++ /dev/null
@@ -1,1442 +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.wizard;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.FileSystemElement;
-import org.eclipse.ui.dialogs.WizardResourceImportPage;
-import org.eclipse.ui.internal.dialogs.DialogUtil;
-import org.eclipse.ui.internal.ide.dialogs.IElementFilter;
-import org.eclipse.ui.internal.ide.dialogs.ResourceTreeAndListGroup;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.model.WorkbenchViewerSorter;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-
-/**
- * Page 1 of the base resource import-from-file-system Wizard
- */
-/* package */
-class WizardClassesImportPage1 extends WizardResourceImportPage implements Listener {
-
-	// widgets
-	protected Combo sourceNameField;
-	protected Button overwriteExistingResourcesCheckbox;
-	protected Button createContainerStructureButton;
-	protected Button createOnlySelectedButton;
-	protected Button sourceBrowseButton;
-	//protected Button selectTypesButton;
-	protected Button selectAllButton;
-	protected Button deselectAllButton;
-	//A boolean to indicate if the user has typed anything
-	private boolean entryChanged = false;
-
-	// dialog store id constants
-	private final static String STORE_SOURCE_NAMES_ID = "WizardFileSystemResourceImportPage1.STORE_SOURCE_NAMES_ID"; //$NON-NLS-1$
-	//$NON-NLS-1$
-	//private final static String STORE_OVERWRITE_EXISTING_RESOURCES_ID =
-	// "WizardFileSystemResourceImportPage1.STORE_OVERWRITE_EXISTING_RESOURCES_ID"; //$NON-NLS-1$
-	//$NON-NLS-1$
-	//private final static String STORE_CREATE_CONTAINER_STRUCTURE_ID =
-	// "WizardFileSystemResourceImportPage1.STORE_CREATE_CONTAINER_STRUCTURE_ID"; //$NON-NLS-1$
-	//$NON-NLS-1$
-
-	//private static final String SELECT_TYPES_TITLE = "DataTransfer.selectTypes"; //$NON-NLS-1$
-	private static final String SELECT_ALL_TITLE = J2EEUIMessages.getResourceString("DataTransfer.selectAll"); //$NON-NLS-1$
-	private static final String DESELECT_ALL_TITLE = J2EEUIMessages.getResourceString("DataTransfer.deselectAll"); //$NON-NLS-1$
-	private static final String SELECT_SOURCE_MESSAGE = J2EEUIMessages.getResourceString("FileImport.selectSource"); //$NON-NLS-1$
-	protected static final String SOURCE_EMPTY_MESSAGE = J2EEUIMessages.getResourceString("FileImport.sourceEmpty"); //$NON-NLS-1$
-
-	private IPath importedClassesPath;
-	//protected Button importFromDir;
-	//protected Button importFromZip;
-
-
-	private ZipFileStructureProvider providerCache;
-	ZipFileStructureProvider currentProvider;
-
-	private static final String FILE_IMPORT_MASK = "*.jar;*.zip"; //$NON-NLS-1$
-
-	private List dragAndDropFileNames = null;
-
-	boolean createFullStructure = false;
-	private String packageBaseDirName = null;
-
-	//private MinimizedFileSystemElement test = null;
-
-	//private Composite dummyParent = null;
-
-	//private final static int SIZING_SELECTION_WIDGET_WIDTH = 400;
-	//private final static int SIZING_SELECTION_WIDGET_HEIGHT = 150;
-
-	private String packageDirStruc = null;
-
-	/**
-	 * Creates an instance of this class
-	 */
-	protected WizardClassesImportPage1(String name, IWorkbench aWorkbench, IStructuredSelection selection) {
-		super(name, selection);
-	}
-
-	/**
-	 * Creates an instance of this class
-	 * 
-	 * @param aWorkbench
-	 *            IWorkbench
-	 * @param selection
-	 *            IStructuredSelection
-	 */
-	public WizardClassesImportPage1(IWorkbench aWorkbench, IStructuredSelection selection, IPath importedClassesPath, List fileNames) {
-		this("fileSystemImportPage1", aWorkbench, selection); //$NON-NLS-1$
-		setTitle(J2EEUIMessages.getResourceString("DataTransfer.fileSystemTitle")); //$NON-NLS-1$
-		setDescription(J2EEUIMessages.getResourceString("FileImport.importFileSystem")); //$NON-NLS-1$
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("import_class_file_wiz_ban")); //$NON-NLS-1$
-		this.importedClassesPath = importedClassesPath;
-		if (fileNames != null && fileNames.size() != 0) {
-			dragAndDropFileNames = fileNames;
-		}
-	}
-
-	public void blankPage() {
-		if (this.selectionGroup != null)
-			this.selectionGroup.setRoot(null);
-		if (sourceNameField != null)
-			sourceNameField.setText(""); //$NON-NLS-1$
-	}
-
-	protected void createFileSelectionGroup(Composite parent) {
-
-		//Just create with a dummy root.
-		this.selectionGroup = new ResourceTreeAndListGroup(parent, new FileSystemElement("Dummy", null, true), //$NON-NLS-1$
-					getFolderProvider(), new WorkbenchLabelProvider(), getFileProvider(),
-					//new WorkbenchLabelProviderForClassImport(),
-					new WorkbenchLabelProvider(), SWT.NONE, DialogUtil.inRegularFontMode(parent));
-
-		ICheckStateListener listener = new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateWidgetEnablements();
-			}
-		};
-
-		WorkbenchViewerSorter sorter = new WorkbenchViewerSorter();
-		this.selectionGroup.setTreeSorter(sorter);
-		this.selectionGroup.setListSorter(sorter);
-		this.selectionGroup.addCheckStateListener(listener);
-	}
-
-	/**
-	 * Creates a new button with the given id.
-	 * <p>
-	 * The <code>Dialog</code> implementation of this framework method creates a standard push
-	 * button, registers for selection events including button presses and registers default buttons
-	 * with its shell. The button id is stored as the buttons client data. Note that the parent's
-	 * layout is assumed to be a GridLayout and the number of columns in this layout is incremented.
-	 * Subclasses may override.
-	 * </p>
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param id
-	 *            the id of the button (see <code>IDialogConstants.*_ID</code> constants for
-	 *            standard dialog button ids)
-	 * @param label
-	 *            the label from the button
-	 * @param defaultButton
-	 *            <code>true</code> if the button is to be the default button, and
-	 *            <code>false</code> otherwise
-	 */
-	protected Button createButton(Composite parent, int id, String label, boolean defaultButton) {
-		// increment the number of columns in the button bar
-		((GridLayout) parent.getLayout()).numColumns++;
-
-		Button button = new Button(parent, SWT.PUSH);
-
-		GridData buttonData = new GridData(GridData.FILL_HORIZONTAL);
-		button.setLayoutData(buttonData);
-
-		button.setData(new Integer(id));
-		button.setText(label);
-
-		if (defaultButton) {
-			Shell shell = parent.getShell();
-			if (shell != null) {
-				shell.setDefaultButton(button);
-			}
-			button.setFocus();
-		}
-		return button;
-	}
-
-	/**
-	 * Creates the buttons for selecting specific types or selecting all or none of the elements.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 */
-	protected final void createButtonsGroup(Composite parent) {
-		// top level group
-		Composite buttonComposite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-
-		layout.makeColumnsEqualWidth = true;
-		buttonComposite.setLayout(layout);
-		buttonComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		// types edit button
-		//		selectTypesButton = createButton(buttonComposite, IDialogConstants.SELECT_TYPES_ID,
-		// SELECT_TYPES_TITLE, false);
-
-		SelectionListener listener = new SelectionAdapter() {
-			//			public void widgetSelected(SelectionEvent e) {
-			//				handleTypesEditButtonPressed();
-			//			}
-		};
-		//		selectTypesButton.addSelectionListener(listener);
-
-		selectAllButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, SELECT_ALL_TITLE, false);
-
-		listener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setAllSelections(true);
-			}
-		};
-		selectAllButton.addSelectionListener(listener);
-
-		deselectAllButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, DESELECT_ALL_TITLE, false);
-
-		listener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setAllSelections(false);
-			}
-		};
-		deselectAllButton.addSelectionListener(listener);
-
-	}
-
-	/**
-	 * (non-Javadoc) Method declared on IDialogPage.
-	 */
-	public void createControl(Composite parent) {
-		//super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.IMPORT_CLASS_WIZARD_P2);
-		initializeDialogUnits(parent);
-
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-		composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		composite.setFont(parent.getFont());
-
-		//dummyParent = composite;
-
-		createSourceGroup(composite);
-
-		//createSpacer(composite);
-
-		//createPlainLabel(composite,
-		// WorkbenchMessages.getString("WizardImportPage.destinationLabel")); //$NON-NLS-1$
-		//createDestinationGroup(composite);
-
-		createOptionsGroup(composite);
-
-		restoreWidgetValues();
-		updateWidgetEnablements();
-		setPageComplete(determinePageCompletion());
-
-		setControl(composite);
-
-		validateSourceGroup();
-		//WorkbenchHelp.setHelp(getControl(),
-		// IDataTransferHelpContextIds.FILE_SYSTEM_IMPORT_WIZARD_PAGE);
-	}
-
-	protected void createOptionsGroup(Composite parent) {
-		Composite optionsGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		optionsGroup.setLayout(layout);
-		optionsGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
-		createOptionsGroupButtons(optionsGroup);
-
-	}
-
-	/**
-	 * Create the import options specification widgets.
-	 */
-	protected void createOptionsGroupButtons(Composite optionsGroup) {
-
-		// overwrite... checkbox
-		overwriteExistingResourcesCheckbox = new Button(optionsGroup, SWT.CHECK);
-		overwriteExistingResourcesCheckbox.setText(J2EEUIMessages.getResourceString("FileImport.overwriteExisting")); //$NON-NLS-1$
-	}
-
-	protected boolean isSetImportFromDir() {
-		ClassesImportWizard ciw = (ClassesImportWizard) getWizard();
-		return ciw.mainPage.isSetImportFromDir();
-	}
-
-	public String getClassFileDirectory(String s) {
-		int index = s.lastIndexOf(File.separatorChar);
-		return s.substring(0, index + 1);
-	}
-
-	/**
-	 * Create the group for creating the root directory
-	 */
-	protected void createRootDirectoryGroup(Composite parent) {
-		Composite sourceContainerGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		sourceContainerGroup.setLayout(layout);
-		sourceContainerGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
-		new Label(sourceContainerGroup, SWT.NONE).setText(getSourceLabel());
-
-		// source name entry field
-		sourceNameField = new Combo(sourceContainerGroup, SWT.BORDER);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		sourceNameField.setLayoutData(data);
-
-		setSourceNameFieldForDragAndDrop();
-
-		sourceNameField.addListener(SWT.Modify, this);
-
-		sourceNameField.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateFromSourceField();
-
-			}
-		});
-
-		sourceNameField.addKeyListener(new KeyListener() {
-			/*
-			 * @see KeyListener.keyPressed
-			 */
-			public void keyPressed(KeyEvent e) {
-				//If there has been a key pressed then mark as dirty
-				entryChanged = true;
-
-			}
-
-			/*
-			 * @see KeyListener.keyReleased
-			 */
-			public void keyReleased(KeyEvent e) {
-				//do nothing
-			}
-		});
-
-		sourceNameField.addFocusListener(new FocusListener() {
-			/*
-			 * @see FocusListener.focusGained(FocusEvent)
-			 */
-			public void focusGained(FocusEvent e) {
-				//Do nothing when getting focus
-				if (dragAndDropFileNames != null) {
-					sourceNameField.setEnabled(false);
-				}
-
-			}
-
-			/*
-			 * @see FocusListener.focusLost(FocusEvent)
-			 */
-			public void focusLost(FocusEvent e) {
-				//Clear the flag to prevent constant update
-				if (entryChanged) {
-
-					entryChanged = false;
-					updateFromSourceField();
-				}
-
-			}
-		});
-
-		// source browse button
-		sourceBrowseButton = new Button(sourceContainerGroup, SWT.PUSH);
-		sourceBrowseButton.setText(J2EEUIMessages.getResourceString("DataTransfer.browse")); //$NON-NLS-1$
-		sourceBrowseButton.addListener(SWT.Selection, this);
-		sourceBrowseButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		if (dragAndDropFileNames != null) {
-			sourceBrowseButton.setEnabled(false);
-		}
-
-	}
-
-	private void setSourceNameFieldForDragAndDrop() {
-		if (dragAndDropFileNames != null) {
-			String fileName = (String) (dragAndDropFileNames.get(0));
-			sourceNameField.setText(fileName);
-			File f = new File(fileName);
-			if (f.isFile()) {
-				if (ImportUtil.getExtension(f).equals("zip") || ImportUtil.getExtension(f).equals("jar")) { //$NON-NLS-1$ //$NON-NLS-2$
-					//importFromZip.setSelection(true);
-					//importFromDir.setSelection(false);
-				} else if (ImportUtil.getExtension(f).equals("class")) { //$NON-NLS-1$
-					sourceNameField.setText(getClassFileDirectory(fileName));
-
-					//get com.ibm.abc.ClassName
-					PackageNameResolver nameResolver = new PackageNameResolver();
-					String qualifiedClassName = nameResolver.getClassName(fileName);
-					if (qualifiedClassName != null) {
-
-						//get com
-						int index = qualifiedClassName.indexOf('.');
-						if (index == -1) {
-							String textToSet = fileName.substring(0, 1 + fileName.lastIndexOf(File.separatorChar));
-							sourceNameField.setText(textToSet);
-							return;
-						}
-						String baseDir = qualifiedClassName.substring(0, index);
-
-						//get com.ibm.abc
-						index = qualifiedClassName.lastIndexOf('.');
-						String packageName = qualifiedClassName.substring(0, index);
-						//get com/ibm/abc
-						packageDirStruc = packageName.replace('.', File.separatorChar);
-
-						//get C:\com
-						index = fileName.indexOf(baseDir);
-						//if packageDirStuc exists then set the sourceDir to com, else
-						//set the directory to the parent directory of the class
-						if (fileName.indexOf(packageDirStruc) != -1) {
-							int baseDirLength = baseDir.length();
-							String textToSet = fileName.substring(0, index + baseDirLength);
-							index = packageName.indexOf('.');
-							if (index == -1)
-								packageBaseDirName = packageName;
-							else
-								packageBaseDirName = packageName.substring(0, index);
-
-							f = new File(textToSet);
-							if (f.getParent() != null)
-								f = new File(f.getParent());
-							textToSet = f.getAbsolutePath(); //want to set the root directory to
-							// com's parent
-							sourceNameField.setText(textToSet);
-						}
-					}
-
-				}
-			}
-		}
-	}
-
-	/**
-	 * Update the receiver from the source name field.
-	 */
-
-	private void updateFromSourceField() {
-
-		setSourceName(sourceNameField.getText());
-		//Update enablements when this is selected
-		updateWidgetEnablements();
-	}
-
-	/**
-	 * Creates and returns a <code>FileSystemElement</code> if the specified file system object
-	 * merits one. The criteria for this are: Also create the children.
-	 */
-	protected MinimizedFileSystemElement createRootElement(Object fileSystemObject, IImportStructureProvider provider) {
-		boolean isContainer = provider.isFolder(fileSystemObject);
-		String elementLabel = provider.getLabel(fileSystemObject);
-
-		// Use an empty label so that display of the element's full name
-		// doesn't include a confusing label
-		MinimizedFileSystemElement dummyParent = new MinimizedFileSystemElement("", null, true); //$NON-NLS-1$
-		dummyParent.setPopulated();
-		MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, dummyParent, isContainer);
-
-		result.setPackageBaseDirName(packageBaseDirName);
-		result.setFileSystemObject(fileSystemObject);
-
-		//Get the files for the element so as to build the first level
-		result.getFiles(provider);
-
-		return dummyParent;
-	}
-
-	/**
-	 * Create the import source specification widgets
-	 */
-	protected void createSourceGroup(Composite parent) {
-		//createImportTypeGroup(parent);
-		createRootDirectoryGroup(parent);
-		createFileSelectionGroup(parent);
-
-		createButtonsGroup(parent);
-	}
-
-	/**
-	 * Enable or disable the button group.
-	 */
-	protected void enableButtonGroup(boolean enable) {
-		//		selectTypesButton.setEnabled(enable);
-		selectAllButton.setEnabled(enable);
-		deselectAllButton.setEnabled(enable);
-	}
-
-	/**
-	 * Answer a boolean indicating whether the specified source currently exists and is valid
-	 */
-	protected boolean ensureSourceIsValid() {
-		if (isSetImportFromDir()) {
-			if (getSourceDirectory() != null && new File(getSourceDirectoryName()).isDirectory())
-				return true;
-			displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
-			sourceNameField.setFocus();
-			return false;
-		}
-		ZipFile specifiedFile = getSpecifiedSourceFile();
-
-		if (specifiedFile == null) {
-			displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
-			sourceNameField.setFocus();
-			return false;
-		}
-		return closeZipFile(specifiedFile);
-	}
-
-	/**
-	 * Execute the passed import operation. Answer a boolean indicating success.
-	 */
-	protected boolean executeImportOperation(ImportOperation op) {
-		initializeOperation(op);
-		if (createFullStructure) {
-			op.setCreateContainerStructure(true);
-		} else {
-			op.setCreateContainerStructure(false);
-		}
-
-		try {
-			getContainer().run(true, true, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			displayErrorDialog(e.getTargetException());
-			return false;
-		}
-
-		IStatus status = op.getStatus();
-		if (!status.isOK()) {
-			ErrorDialog.openError(getContainer().getShell(), getString("FileImport.importProblems"), //$NON-NLS-1$
-						null, // no special message
-						status);
-			return false;
-		}
-
-		return true;
-	}
-
-	// need the following private stuff just because the DataTransferMessages class is not public!
-	//private static final String RESOURCE_BUNDLE = "org.eclipse.ui.wizards.datatransfer.messages";
-	// //$NON-NLS-1$
-	//private static ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-	private static String getString(String key) {
-		try {
-			return J2EEUIMessages.getResourceString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * The Finish button was pressed. Try to do the required work now and answer a boolean
-	 * indicating success. If false is returned then the wizard will not close.
-	 * 
-	 * @return boolean
-	 */
-	public boolean finish() {
-		if (!ensureSourceIsValid())
-			return false;
-
-		clearProviderCache();
-
-		saveWidgetValues();
-
-		Iterator resourcesEnum = getSelectedResources().iterator();
-		List fileSystemObjects = new ArrayList();
-		while (resourcesEnum.hasNext()) {
-			fileSystemObjects.add(((FileSystemElement) resourcesEnum.next()).getFileSystemObject());
-		}
-
-		if (fileSystemObjects.size() > 0) {
-			if (getSourceDirectory() != null) {
-				return importResources(fileSystemObjects);
-			}
-			return importResourcesFromZip(fileSystemObjects);
-		}
-
-		MessageDialog.openInformation(getContainer().getShell(), getString("DataTransfer.information"), //$NON-NLS-1$
-					getString("FileImport.noneSelected")); //$NON-NLS-1$
-
-		return false;
-	}
-
-	/**
-	 * Returns a content provider for <code>FileSystemElement</code> s that returns only files as
-	 * children.
-	 */
-
-	protected ITreeContentProvider getFileProvider() {
-		return new WorkbenchContentProvider() {
-			public Object[] getChildren(Object o) {
-				if (o instanceof MinimizedFileSystemElement) {
-					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					if (currentProvider != null) {
-						return element.getFiles(currentProvider).getChildren(element);
-					}
-					return element.getFiles(FileSystemStructureProvider.INSTANCE).getChildren(element);
-				}
-				return new Object[0];
-			}
-
-			public Object[] getElements(Object element) {
-				Object[] superObjects = super.getElements(element);
-				if (dragAndDropFileNames != null && getSourceDirectory() != null) {
-					MinimizedFileSystemElement anElement = null;
-					int newObjectsIndex = 0;
-					for (int i = 0; i < superObjects.length; i++) {
-						anElement = (MinimizedFileSystemElement) superObjects[i];
-
-						File file = (File) anElement.getFileSystemObject();
-
-						for (int k = 0; k < dragAndDropFileNames.size(); k++) {
-							if (file.getAbsolutePath().equals(dragAndDropFileNames.get(k))) {
-								newObjectsIndex++;
-							}
-						}
-					}
-					if (newObjectsIndex > 0) {
-						Object[] newObjects = new Object[newObjectsIndex];
-						newObjectsIndex = 0;
-
-						for (int i = 0; i < superObjects.length; i++) {
-							anElement = (MinimizedFileSystemElement) superObjects[i];
-
-							File file = (File) anElement.getFileSystemObject();
-
-							for (int k = 0; k < dragAndDropFileNames.size(); k++) {
-								if (file.getAbsolutePath().equals(dragAndDropFileNames.get(k))) {
-
-									newObjects[newObjectsIndex++] = anElement;
-
-								}
-							}
-
-						}
-						return newObjects;
-					}
-				}
-				return superObjects;
-			}
-		};
-	}
-
-	/**
-	 * Answer the root FileSystemElement that represents the contents of the currently-specified
-	 * source. If this FileSystemElement is not currently defined then create and return it.
-	 */
-	protected MinimizedFileSystemElement getFileSystemTree() {
-		if (isSetImportFromDir()) {
-			File sourceDirectory = getSourceDirectory();
-			if (sourceDirectory != null) {
-				return selectFiles(sourceDirectory, FileSystemStructureProvider.INSTANCE);
-			}
-			if (sourceNameField.getText().length() > 0) {
-				displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
-				sourceNameField.setFocus();
-			}
-			return null;
-		}
-		ZipFile sourceFile = getSpecifiedSourceFile();
-		if (sourceFile == null) {
-			//Clear out the provider as well
-			this.currentProvider = null;
-			if (sourceNameField.getText().length() > 0) {
-				displayErrorDialog(getString("FileImport.invalidSource")); //$NON-NLS-1$
-				sourceNameField.setFocus();
-			}
-			return null;
-		}
-
-		ZipFileStructureProvider provider = getStructureProvider(sourceFile);
-		this.currentProvider = provider;
-		return selectFiles(provider.getRoot(), provider);
-	}
-
-	/**
-	 * Returns a content provider for <code>FileSystemElement</code> s that returns only folders
-	 * as children.
-	 */
-	protected ITreeContentProvider getFolderProvider() {
-		return new WorkbenchContentProvider() {
-			public Object[] getChildren(Object o) {
-				if (o instanceof MinimizedFileSystemElement) {
-					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					if (currentProvider != null) {
-						return element.getFolders(currentProvider).getChildren(element);
-					}
-					return element.getFolders(FileSystemStructureProvider.INSTANCE).getChildren(element);
-				}
-				return new Object[0];
-			}
-
-			public boolean hasChildren(Object o) {
-				if (o instanceof MinimizedFileSystemElement) {
-					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					if (element.isPopulated())
-						return getChildren(element).length > 0;
-					//If we have not populated then wait until asked
-					return true;
-				}
-				return false;
-			}
-
-		};
-	}
-
-	/**
-	 * Returns a File object representing the currently-named source directory iff it exists as a
-	 * valid directory, or <code>null</code> otherwise.
-	 */
-	protected File getSourceDirectory() {
-		return getSourceDirectory(this.sourceNameField.getText());
-	}
-
-	/**
-	 * Returns a File object representing the currently-named source directory iff it exists as a
-	 * valid directory, or <code>null</code> otherwise.
-	 * 
-	 * @param path
-	 *            a String not yet formatted for java.io.File compatability
-	 */
-	private File getSourceDirectory(String path) {
-		if (isSetImportFromDir()) {
-			File sourceDirectory = new File(getSourceDirectoryName(path));
-			if (!sourceDirectory.exists() || !sourceDirectory.isDirectory()) {
-				return null;
-			}
-
-			return sourceDirectory;
-		}
-		return null;
-	}
-
-	/**
-	 * Answer the directory name specified as being the import source. Note that if it ends with a
-	 * separator then the separator is first removed so that java treats it as a proper directory
-	 */
-	private String getSourceDirectoryName() {
-		return getSourceDirectoryName(this.sourceNameField.getText());
-	}
-
-	/**
-	 * Answer the directory name specified as being the import source. Note that if it ends with a
-	 * separator then the separator is first removed so that java treats it as a proper directory
-	 */
-	private String getSourceDirectoryName(String sourceName) {
-		IPath result = new Path(sourceName.trim());
-
-		if (result.getDevice() != null && result.segmentCount() == 0) // something like "c:"
-			result = result.addTrailingSeparator();
-		else
-			result = result.removeTrailingSeparator();
-
-		return result.toOSString();
-	}
-
-	/**
-	 * Answer the string to display as the label for the source specification field
-	 */
-	protected String getSourceLabel() {
-		return J2EEUIMessages.getResourceString("DataTransfer.directory"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Handle all events and enablements for widgets in this dialog
-	 * 
-	 * @param event
-	 *            Event
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == sourceBrowseButton) {
-			if (isSetImportFromDir()) {
-				handleSourceBrowseButtonPressed();
-			} else {
-				handleSourceBrowseButtonPressedForZip();
-			}
-		}
-
-		super.handleEvent(event);
-
-	}
-
-	/**
-	 * Open an appropriate source browser so that the user can specify a source to import from
-	 */
-	protected void handleSourceBrowseButtonPressed() {
-		String currentSource = this.sourceNameField.getText();
-		DirectoryDialog dialog = new DirectoryDialog(sourceNameField.getShell(), SWT.SAVE);
-		dialog.setMessage(SELECT_SOURCE_MESSAGE);
-		dialog.setFilterPath(getSourceDirectoryName(currentSource));
-
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null) {
-			//Just quit if the directory is not valid
-			if ((getSourceDirectory(selectedDirectory) == null) || selectedDirectory.equals(currentSource))
-				return;
-			//If it is valid then proceed to populate
-			setErrorMessage(null);
-			setSourceName(selectedDirectory);
-			selectionGroup.setFocus();
-		}
-	}
-
-	/**
-	 * Open a registered type selection dialog and note the selections in the receivers
-	 * types-to-export field., Added here so that inner classes can have access
-	 */
-	protected void handleTypesEditButtonPressed() {
-
-		super.handleTypesEditButtonPressed();
-	}
-
-	/**
-	 * Import the resources with extensions as specified by the user
-	 */
-	protected boolean importResources(List fileSystemObjects) {
-		Iterator i = fileSystemObjects.iterator();
-		while (i.hasNext()) {
-			File f = (File) i.next();
-			List singleItemList = new ArrayList();
-			singleItemList.add(f);
-			String textToSet = getPackageName(f);
-			if (textToSet != null) {
-				File newSource = new File(textToSet);
-				executeImportOperation(new ImportOperation(getContainerFullPath(), newSource, FileSystemStructureProvider.INSTANCE, this, singleItemList));
-			} else {
-				executeImportOperation(new ImportOperation(getContainerFullPath(), getSourceDirectory(), FileSystemStructureProvider.INSTANCE, this, singleItemList));
-
-			}
-		}
-		return true;
-
-	}
-
-	protected String getPackageName(File f) {
-		if (ImportUtil.getExtension(f).equals("class")) { //$NON-NLS-1$
-			String fileName = f.getAbsolutePath();
-			//get com.ibm.abc.ClassName
-			PackageNameResolver nameResolver = new PackageNameResolver();
-			String qualifiedClassName = nameResolver.getClassName(fileName);
-			if (qualifiedClassName != null) {
-
-				//get com
-				int index = qualifiedClassName.indexOf('.');
-				if (index == -1) {
-					return fileName.substring(0, 1 + fileName.lastIndexOf(File.separatorChar));
-				}
-				String baseDir = qualifiedClassName.substring(0, index);
-
-				//get com.ibm.abc
-				index = qualifiedClassName.lastIndexOf('.');
-				String packageName = qualifiedClassName.substring(0, index);
-
-				//get com/ibm/abc
-				packageDirStruc = packageName.replace('.', File.separatorChar);
-
-				//get C:\com
-				index = fileName.indexOf(baseDir);
-				//if packageDirStuc exists then set the sourceDir to com, else
-				//set the directory to the parent directory of the class
-				if (fileName.indexOf(packageDirStruc) != -1) {
-					int baseDirLength = baseDir.length();
-					String textToSet = fileName.substring(0, index + baseDirLength);
-					index = packageName.indexOf('.');
-					if (index == -1)
-						packageBaseDirName = packageName;
-					else
-						packageBaseDirName = packageName.substring(0, index);
-
-					f = new File(textToSet);
-					if (f.getParent() != null)
-						f = new File(f.getParent());
-					textToSet = f.getAbsolutePath(); //want to set the root directory to com's
-					// parent
-					//sourceNameField.setText(textToSet);
-					return textToSet;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Initializes the specified operation appropriately.
-	 */
-	protected void initializeOperation(ImportOperation op) {
-
-		/*
-		 * op.setCreateContainerStructure( createContainerStructureButton.getSelection());
-		 */
-		op.setOverwriteResources(overwriteExistingResourcesCheckbox.getSelection());
-	}
-
-	/**
-	 * Returns whether the extension provided is an extension that has been specified for export by
-	 * the user.
-	 * 
-	 * @param extension
-	 *            the resource name
-	 * @return <code>true</code> if the resource name is suitable for export based upon its
-	 *         extension
-	 */
-	protected boolean isExportableExtension(String extension) {
-		if (selectedTypes == null) // ie.- all extensions are acceptable
-			return true;
-
-		Iterator aenum = selectedTypes.iterator();
-		while (aenum.hasNext()) {
-			if (extension.equalsIgnoreCase((String) aenum.next()))
-				return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Repopulate the view based on the currently entered directory.
-	 */
-	protected void resetSelection() {
-
-		MinimizedFileSystemElement currentRoot = getFileSystemTree();
-		this.selectionGroup.setRoot(currentRoot);
-		if (dragAndDropFileNames != null) {
-
-			if (dragAndDropFileNames.get(0).toString().endsWith(".zip") == false && dragAndDropFileNames.get(0).toString().endsWith(".jar") == false) { //$NON-NLS-1$ //$NON-NLS-2$
-				this.selectionGroup.expandAll();
-			}
-
-			MinimizedFileSystemElement temp = (MinimizedFileSystemElement) currentRoot.getFolders().getChildren()[0];
-
-			List dirList = pathToArray();
-
-			for (int i = 0; i < dirList.size(); i++) {
-				String s = (String) dirList.get(i);
-				Object[] folders = temp.getFolders().getChildren();
-				for (int k = 0; k < folders.length; k++) {
-					if (((File) ((MinimizedFileSystemElement) folders[k]).getFileSystemObject()).getName().equals(s)) {
-						temp = (MinimizedFileSystemElement) temp.getFolders().getChildren()[k];
-						break;
-					}
-				}
-
-			}
-
-			if (dragAndDropFileNames.get(0).toString().endsWith(".zip") == false && dragAndDropFileNames.get(0).toString().endsWith(".jar") == false) { //$NON-NLS-1$ //$NON-NLS-2$
-				this.selectionGroup.initialCheckTreeItem(temp);
-			}
-
-			//If can figure out how to pre-highlight dir, then use following code
-			//to check dragged files only. Also need to show all files in tree.
-			/*
-			 * String fileName = null; MinimizedFileSystemElement name = null; int numFiles =
-			 * temp.getFiles().getChildren().length; Object[] files = temp.getFiles().getChildren();
-			 * for(int i = 0; i < dragAndDropFileNames.size(); i++) { fileName = (new
-			 * File((String)dragAndDropFileNames.get(i))).getName(); for(int k = 0; k < numFiles;
-			 * k++) { if(fileName.equals(((File) ((MinimizedFileSystemElement)
-			 * files[0]).getFileSystemObject()).getName())) {
-			 * this.selectionGroup.initialCheckTreeItem(temp); break; } } }
-			 */
-
-			//this.selectionGroup.setAllSelections(true);
-		}
-	}
-
-	private List pathToArray() {
-		String s = (String) dragAndDropFileNames.get(0);
-
-		PackageNameResolver nameResolver = new PackageNameResolver();
-		String qualifiedClassName = nameResolver.getClassName(s);
-
-		int slashCounts = 0;
-		if (qualifiedClassName != null) {
-			int index = qualifiedClassName.indexOf('.');
-			if (index == -1) {
-				return Collections.EMPTY_LIST;
-			}
-			String baseDir = qualifiedClassName.substring(0, index);
-			for (int i = s.indexOf(baseDir); i < s.lastIndexOf(File.separatorChar); i++) {
-				if (s.charAt(i) == File.separatorChar)
-					slashCounts++;
-			}
-		}
-
-		List dirNamesArray = new ArrayList(slashCounts);
-		if (s.endsWith(".zip") || s.endsWith(".jar")) { //$NON-NLS-1$ //$NON-NLS-2$
-			return dirNamesArray;
-		}
-		int startIndex = 0;
-		int endIndex;
-		for (int i = 0; i <= slashCounts; i++) {
-			endIndex = qualifiedClassName.indexOf('.', startIndex);
-			dirNamesArray.add(qualifiedClassName.substring(startIndex, endIndex));
-			startIndex = endIndex + 1;
-		}
-		return dirNamesArray;
-	}
-
-	/**
-	 * Use the dialog store to restore widget values to the values that they held last time this
-	 * wizard was used to completion
-	 */
-	protected void restoreWidgetValues() {
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			String[] sourceNames = settings.getArray(STORE_SOURCE_NAMES_ID);
-			if (sourceNames == null)
-				return; // ie.- no values stored, so stop
-
-			// set filenames history
-			for (int i = 0; i < sourceNames.length; i++)
-				sourceNameField.add(sourceNames[i]);
-		}
-	}
-
-	/**
-	 * Since Finish was pressed, write widget values to the dialog store so that they will persist
-	 * into the next invocation of this wizard page
-	 */
-	protected void saveWidgetValues() {
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			// update source names history
-			String[] sourceNames = settings.getArray(STORE_SOURCE_NAMES_ID);
-			if (sourceNames == null)
-				sourceNames = new String[0];
-
-			sourceNames = addToHistory(sourceNames, getSourceDirectoryName());
-			settings.put(STORE_SOURCE_NAMES_ID, sourceNames);
-
-		}
-	}
-
-	/**
-	 * Invokes a file selection operation using the specified file system and structure provider. If
-	 * the user specifies files to be imported then this selection is cached for later retrieval and
-	 * is returned.
-	 */
-	protected MinimizedFileSystemElement selectFiles(final Object rootFileSystemObject, final IImportStructureProvider structureProvider) {
-
-		final MinimizedFileSystemElement[] results = new MinimizedFileSystemElement[1];
-
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {
-				//Create the root element from the supplied file system object
-				results[0] = createRootElement(rootFileSystemObject, structureProvider);
-			}
-		});
-
-		return results[0];
-	}
-
-	/**
-	 * Set all of the selections in the selection group to value. Implemented here to provide access
-	 * for inner classes.
-	 * 
-	 * @param value
-	 *            boolean
-	 */
-	protected void setAllSelections(boolean value) {
-		super.setAllSelections(value);
-	}
-
-	/**
-	 * Sets the source name of the import to be the supplied path. Adds the name of the path to the
-	 * list of items in the source combo and selects it.
-	 * 
-	 * @param path
-	 *            the path to be added
-	 */
-	protected void setSourceName(String path) {
-
-		if (path.length() > 0) {
-
-			String[] currentItems = this.sourceNameField.getItems();
-			int selectionIndex = -1;
-			for (int i = 0; i < currentItems.length; i++) {
-				if (currentItems[i].equals(path))
-					selectionIndex = i;
-			}
-			if (selectionIndex < 0) {
-				int oldLength = currentItems.length;
-				String[] newItems = new String[oldLength + 1];
-				System.arraycopy(currentItems, 0, newItems, 0, oldLength);
-				newItems[oldLength] = path;
-				this.sourceNameField.setItems(newItems);
-				selectionIndex = oldLength;
-			}
-			this.sourceNameField.select(selectionIndex);
-
-			resetSelection();
-		}
-	}
-
-	/**
-	 * Update the tree to only select those elements that match the selected types
-	 */
-	protected void setupSelectionsBasedOnSelectedTypes() {
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getContainer().getShell());
-		final Map selectionMap = new Hashtable();
-
-		final IElementFilter filter = new IElementFilter() {
-
-			public void filterElements(Collection files, IProgressMonitor monitor) throws InterruptedException {
-				if (files == null) {
-					throw new InterruptedException();
-				}
-				Iterator filesList = files.iterator();
-				while (filesList.hasNext()) {
-					if (monitor.isCanceled())
-						throw new InterruptedException();
-					checkFile(filesList.next());
-				}
-			}
-
-			public void filterElements(Object[] files, IProgressMonitor monitor) throws InterruptedException {
-				if (files == null) {
-					throw new InterruptedException();
-				}
-				for (int i = 0; i < files.length; i++) {
-					if (monitor.isCanceled())
-						throw new InterruptedException();
-					checkFile(files[i]);
-				}
-			}
-
-			private void checkFile(Object fileElement) {
-				MinimizedFileSystemElement file = (MinimizedFileSystemElement) fileElement;
-				if (isExportableExtension(file.getFileNameExtension())) {
-					List elements = new ArrayList();
-					FileSystemElement parent = file.getParent();
-					if (selectionMap.containsKey(parent))
-						elements = (List) selectionMap.get(parent);
-					elements.add(file);
-					selectionMap.put(parent, elements);
-				}
-			}
-
-		};
-
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(final IProgressMonitor monitor) throws InterruptedException {
-				monitor.beginTask("ImportPage.filterSelections", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-				getSelectedResources(filter, monitor);
-			}
-		};
-
-		try {
-			dialog.run(true, true, runnable);
-		} catch (InvocationTargetException exception) {
-			//Couldn't start. Do nothing.
-			return;
-		} catch (InterruptedException exception) {
-			//Got interrupted. Do nothing.
-			return;
-		}
-		// make sure that all paint operations caused by closing the progress
-		// dialog get flushed, otherwise extra pixels will remain on the screen until
-		// updateSelections is completed
-		getShell().update();
-		// The updateSelections method accesses SWT widgets so cannot be executed
-		// as part of the above progress dialog operation since the operation forks
-		// a new process.
-		if (selectionMap != null) {
-			updateSelections(selectionMap);
-		}
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on IDialogPage. Set the selection up when it becomes visible.
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		resetSelection();
-		if (visible)
-			this.sourceNameField.setFocus();
-	}
-
-	/**
-	 * Update the selections with those in map . Implemented here to give inner class visibility
-	 * 
-	 * @param map
-	 *            Map - key tree elements, values Lists of list elements
-	 */
-	protected void updateSelections(Map map) {
-		super.updateSelections(map);
-	}
-
-	/**
-	 * Check if widgets are enabled or disabled by a change in the dialog. Provided here to give
-	 * access to inner classes.
-	 * 
-	 * @param event
-	 *            Event
-	 */
-	protected void updateWidgetEnablements() {
-
-		super.updateWidgetEnablements();
-	}
-
-	/**
-	 * Answer a boolean indicating whether self's source specification widgets currently all contain
-	 * valid values.
-	 */
-	protected boolean validateSourceGroup() {
-		if (getSourceDirectory() != null) {
-			File sourceDirectory = getSourceDirectory();
-			if (sourceDirectory == null) {
-				setMessage(SOURCE_EMPTY_MESSAGE);
-				enableButtonGroup(false);
-				return false;
-			}
-
-			if (sourceConflictsWithDestination(new Path(sourceDirectory.getPath()))) {
-				setErrorMessage(getSourceConflictMessage()); //$NON-NLS-1$
-				enableButtonGroup(false);
-				return false;
-			}
-
-			enableButtonGroup(true);
-			return true;
-		}
-		//If there is nothing being provided to the input then there is a problem
-		if (this.currentProvider == null) {
-			setMessage(SOURCE_EMPTY_MESSAGE);
-			enableButtonGroup(false);
-			return false;
-		}
-		enableButtonGroup(true);
-		return true;
-	}
-
-	/**
-	 * Returns whether the source location conflicts with the destination resource. This will occur
-	 * if the source is already under the destination.
-	 * 
-	 * @param sourcePath
-	 *            the path to check
-	 * @return <code>true</code> if there is a conflict, <code>false</code> if not
-	 */
-	protected boolean sourceConflictsWithDestination(IPath sourcePath) {
-
-		IContainer container = getSpecifiedContainer();
-		if (container == null)
-			return false;
-		return getSpecifiedContainer().getLocation().isPrefixOf(sourcePath);
-	}
-
-	protected IPath getResourcePath() {
-		return importedClassesPath;
-	}
-
-	//-------------------------------------------------------------------------------------
-
-	//makesure to call mainpage.cancel()
-	public boolean cancel() {
-		clearProviderCache();
-		return true;
-	}
-
-	/**
-	 * Clears the cached structure provider after first finalizing it properly.
-	 */
-	protected void clearProviderCache() {
-		if (providerCache != null) {
-			closeZipFile(providerCache.getZipFile());
-			providerCache = null;
-		}
-	}
-
-	/**
-	 * Attempts to close the passed zip file, and answers a boolean indicating success.
-	 */
-	protected boolean closeZipFile(ZipFile file) {
-		try {
-			file.close();
-		} catch (IOException e) {
-			//displayErrorDialog(DataTransferMessages.format("ZipImport.couldNotClose", new
-			// Object[] { file.getName()})); //$NON-NLS-1$
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Answer a handle to the zip file currently specified as being the source. Return null if this
-	 * file does not exist or is not of valid format.
-	 */
-
-	protected ZipFile getSpecifiedSourceFile() {
-		return getSpecifiedSourceFile(sourceNameField.getText());
-	}
-
-	/**
-	 * Answer a handle to the zip file currently specified as being the source. Return null if this
-	 * file does not exist or is not of valid format.
-	 */
-
-	private ZipFile getSpecifiedSourceFile(String fileName) {
-		if (fileName.length() == 0)
-			return null;
-
-		try {
-			return new ZipFile(fileName);
-		} catch (ZipException e) {
-			//displayErrorDialog(DataTransferMessages.getString("ZipImport.badFormat"));
-			// //$NON-NLS-1$
-		} catch (IOException e) {
-			//displayErrorDialog(DataTransferMessages.getString("ZipImport.couldNotRead"));
-			// //$NON-NLS-1$
-		}
-
-		sourceNameField.setFocus();
-		return null;
-	}
-
-	/**
-	 * Returns a structure provider for the specified zip file.
-	 */
-	protected ZipFileStructureProvider getStructureProvider(ZipFile targetZip) {
-		if (providerCache == null)
-			providerCache = new ZipFileStructureProvider(targetZip);
-		else if (!providerCache.getZipFile().getName().equals(targetZip.getName())) {
-			clearProviderCache(); // ie.- new value, so finalize&remove old value
-			providerCache = new ZipFileStructureProvider(targetZip);
-		} else if (!providerCache.getZipFile().equals(targetZip))
-			closeZipFile(targetZip); // ie.- duplicate handle to same .zip
-
-		return providerCache;
-	}
-
-	/**
-	 * Open a FileDialog so that the user can specify the source file to import from
-	 */
-	protected void handleSourceBrowseButtonPressedForZip() {
-		String selectedFile = queryZipFileToImport();
-		if (selectedFile != null) {
-			if (!selectedFile.equals(sourceNameField.getText())) {
-				//Be sure it is valid before we go setting any names
-				ZipFile sourceFile = getSpecifiedSourceFile(selectedFile);
-				if (sourceFile != null) {
-					closeZipFile(sourceFile);
-					setSourceName(selectedFile);
-					selectionGroup.setFocus();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Import the resources with extensions as specified by the user
-	 */
-	protected boolean importResourcesFromZip(List fileSystemObjects) {
-
-		ZipFile zipFile = getSpecifiedSourceFile();
-		ZipFileStructureProvider structureProvider = getStructureProvider(zipFile);
-
-		boolean result = executeImportOperation(new ImportOperation(getContainerFullPath(), structureProvider.getRoot(), structureProvider, this, fileSystemObjects));
-
-		closeZipFile(zipFile);
-
-		return result;
-	}
-
-	/**
-	 * Opens a file selection dialog and returns a string representing the selected file, or
-	 * <code>null</code> if the dialog was canceled.
-	 */
-	protected String queryZipFileToImport() {
-		FileDialog dialog = new FileDialog(sourceNameField.getShell(), SWT.OPEN);
-		dialog.setFilterExtensions(new String[]{FILE_IMPORT_MASK});
-
-		String currentSourceString = sourceNameField.getText();
-		int lastSeparatorIndex = currentSourceString.lastIndexOf(File.separator);
-		if (lastSeparatorIndex != -1)
-			dialog.setFilterPath(currentSourceString.substring(0, lastSeparatorIndex));
-
-		return dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
deleted file mode 100644
index 2d2ff8374..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
+++ /dev/null
@@ -1,371 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-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.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-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.TableLayout;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.AvailableJ2EEComponentsForEARContentProvider;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.DefaultJ2EEComponentCreationWizard;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentLabelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetInstallPage extends DataModelFacetInstallPage implements IEarFacetInstallDataModelProperties {
-	
-	private Button selectAllButton;
-	private Button deselectAllButton;
-	private Button newModuleButton;
-	private CheckboxTableViewer moduleProjectsViewer;
-	private boolean ignoreCheckedState = false;
-	
-	
-	private Label contentDirLabel;
-	private Text contentDir;
-
-	public EarFacetInstallPage() {
-		super("ear.facet.install.page"); //$NON-NLS-1$
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{CONTENT_DIR, J2EE_PROJECTS_LIST};
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite modulesGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		modulesGroup.setLayout(layout);
-		setInfopopID(IJ2EEUIContextIds.NEW_EAR_ADD_MODULES_PAGE);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		modulesGroup.setLayoutData(gridData);
-		createModuleProjectOptions(modulesGroup);
-		createButtonsGroup(modulesGroup);
-		
-		final Composite composite = new Composite(modulesGroup, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-
-		this.contentDirLabel = new Label(composite, SWT.NONE);
-		this.contentDirLabel.setText(Resources.contentDirLabel);
-		this.contentDirLabel.setLayoutData(gdhfill());
-
-		this.contentDir = new Text(composite, SWT.BORDER);
-		this.contentDir.setLayoutData(gdhfill());
-		synchHelper.synchText(contentDir, CONTENT_DIR, null);
-
-		return modulesGroup;
-	}
-
-	protected int getJ2EEVersion() {
-		IProjectFacetVersion version = (IProjectFacetVersion)getDataModel().getProperty(FACET_VERSION);
-		return J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
-	}
-	
-	/**
-	 * @param modulesGroup
-	 */
-	private void createModuleProjectOptions(Composite modulesGroup) {
-		moduleProjectsViewer = CheckboxTableViewer.newCheckList(modulesGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		gData.widthHint = 200;
-		gData.heightHint = 80;
-		moduleProjectsViewer.getControl().setLayoutData(gData);
-		int j2eeVersion = getJ2EEVersion();
-		AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(null, j2eeVersion);
-		moduleProjectsViewer.setContentProvider(provider);
-		moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider());
-		setCheckedItemsFromModel();
-		
-		moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				if (!ignoreCheckedState) {
-					getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
-					getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
-                }
-			}
-		});
-		TableLayout tableLayout = new TableLayout();
-		moduleProjectsViewer.getTable().setLayout(tableLayout);
-		moduleProjectsViewer.getTable().setHeaderVisible(false);
-		moduleProjectsViewer.getTable().setLinesVisible(false);
-		moduleProjectsViewer.setSorter(null);
-	}
-
-	/**
-	 *  
-	 */
-	private void setCheckedItemsFromModel() {
-		List components = (List) getDataModel().getProperty(J2EE_PROJECTS_LIST);
-		
-		TableItem [] items = moduleProjectsViewer.getTable().getItems();
-
-		List list = new ArrayList();
-		
-		for( int i=0; i< items.length; i++ ){
-			Object element = items[i].getData();
-			if( element instanceof IVirtualComponent){
-				IVirtualComponent comp = (IVirtualComponent)element;				
-				Iterator it = components.iterator();
-				while( it.hasNext() ){
-					IProject project = (IProject)it.next();
-					if( comp.getProject().getName().equals(project.getName()) ){
-						list.add(comp);
-					}					
-				}
-			}	
-		}
-		moduleProjectsViewer.setCheckedElements(list.toArray());		
-	}
-
-	private void refreshModules() {
-		moduleProjectsViewer.refresh();
-		setCheckedItemsFromModel();
-	}
-
-	protected List getCheckedJ2EEElementsAsList() {
-		Object[] elements = moduleProjectsViewer.getCheckedElements();
-		List list;
-		if (elements == null || elements.length == 0)
-			list = Collections.EMPTY_LIST;
-		else{
-			list = new ArrayList(); 
-			for( int i=0; i< elements.length; i++){
-				if( elements[i] instanceof IVirtualComponent ) {
-					list.add(((IVirtualComponent)elements[i]).getProject());
-				}
-			}
-		}	
-		return list;
-	}
-	
-	protected List getCheckedJavaProjectsAsList() {
-		Object[] elements = moduleProjectsViewer.getCheckedElements();
-		List list;
-		if (elements == null || elements.length == 0)
-			list = Collections.EMPTY_LIST;
-		else{
-			list = new ArrayList(); 
-			for( int i=0; i< elements.length; i++){
-				if( elements[i] instanceof IProject ) {
-					list.add(elements[i]);
-				}
-			}
-		}	
-		return list;
-	}
-	
-	
-	protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
-		Composite buttonGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 4;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-		selectAllButton = new Button(buttonGroup, SWT.PUSH);
-		selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_SELECT));
-		selectAllButton.addListener(SWT.Selection, this);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.widthHint = SWT.DEFAULT;
-		selectAllButton.setLayoutData(gd);
-		deselectAllButton = new Button(buttonGroup, SWT.PUSH);
-		deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_DESELECT));
-		deselectAllButton.addListener(SWT.Selection, this);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.widthHint = SWT.DEFAULT;
-		deselectAllButton.setLayoutData(gd);
-		newModuleButton = new Button(buttonGroup, SWT.PUSH);
-		newModuleButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_NEW));
-		newModuleButton.addListener(SWT.Selection, this);
-		gd = new GridData(GridData.GRAB_HORIZONTAL);
-		gd.minimumWidth = SWT.DEFAULT;
-		newModuleButton.setLayoutData(gd);
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event evt) {
-		if (evt.widget == selectAllButton)
-			handleSelectAllButtonPressed();
-		else if (evt.widget == deselectAllButton)
-			handleDeselectAllButtonPressed();
-		else if (evt.widget == newModuleButton)
-			handleNewModuleButtonPressed();
-		else
-			super.handleEvent(evt);
-	}
-
-	/**
-	 *  
-	 */
-	private void handleNewModuleButtonPressed() {
-		IDataModel aModel = createNewModuleModel();
-		DefaultJ2EEComponentCreationWizard wizard = new DefaultJ2EEComponentCreationWizard(aModel);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		if (dialog.open() != IDialogConstants.CANCEL_ID) {
-			IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
-			moduleProjectsViewer.setInput(input);
-            setNewModules(aModel);
-            refreshModules();
-		}
-	}
-    /**
-     * @param model
-     */
-    private void setNewModules(IDataModel defaultModel) {
-        List newComponents = new ArrayList();
-        collectNewComponents(defaultModel, newComponents);
-        List oldComponents = (List) getDataModel().getProperty(J2EE_PROJECTS_LIST);
-        newComponents.addAll(oldComponents);
-        getDataModel().setProperty(J2EE_PROJECTS_LIST, newComponents);
-    }
-    
-    private void collectNewComponents(IDataModel defaultModel, List newProjects) {
-        collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_EJB), newProjects);
-        collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_WEB), newProjects);
-        collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_CLIENT), newProjects);
-        collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_JCA), newProjects);
-    }
-    private void collectComponents(IDataModel compDM, List newProjects) {
-        if (compDM != null) {
-        	String projectName = compDM.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
-            if(projectName == null) return;
-            IProject project = ProjectUtilities.getProject(projectName);
-            if (project != null && project.exists())
-                newProjects.add(project);
-        }
-    }
-    
-	private IDataModel createNewModuleModel() {
-		IDataModel defaultModel = DataModelFactory.createDataModel(new DefaultJ2EEComponentCreationDataModelProvider());
-		// transfer properties, project name
-		String projectName = model.getStringProperty(FACET_PROJECT_NAME);
-		defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.PROJECT_NAME, projectName);
-		// ear component name
-		String earName = model.getStringProperty(FACET_PROJECT_NAME);
-		defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earName);
-		// ear j2ee version
-		int j2eeVersion = getJ2EEVersion();
-		defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.J2EE_VERSION, new Integer(j2eeVersion));
-		
-		IRuntime rt = (IRuntime) model.getProperty(FACET_RUNTIME);
-		defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.FACET_RUNTIME, rt);
-		
-		return defaultModel;
-	}
-
-	/**
-	 *  
-	 */
-	private void handleDeselectAllButtonPressed() {
-		ignoreCheckedState = true;
-		try {
-			moduleProjectsViewer.setAllChecked(false);
-			//getDataModel().setProperty(J2EE_COMPONENT_LIST, null);
-			//IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);	
-			//(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
-			getDataModel().setProperty(J2EE_PROJECTS_LIST, null);
-			getDataModel().setProperty(JAVA_PROJECT_LIST, null);			
-		} finally {
-			ignoreCheckedState = false;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void handleSelectAllButtonPressed() {
-		ignoreCheckedState = true;
-		try {
-			moduleProjectsViewer.setAllChecked(true);
-			//getDataModel().setProperty(J2EE_COMPONENT_LIST, getCheckedElementsAsList());
-			//IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
-			//(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
-			
-			getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
-			getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
-			
-		} finally {
-			ignoreCheckedState = false;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#enter()
-	 */
-	protected void enter() {
-		IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
-		moduleProjectsViewer.setInput(input);
-		super.enter();
-	}
-	
-	
-	private static final class Resources
-
-	extends NLS
-
-	{
-		public static String pageTitle;
-		public static String pageDescription;
-		public static String contentDirLabel;
-		public static String contentDirLabelInvalid;
-
-		static {
-			initializeMessages(EarFacetInstallPage.class.getName(), Resources.class);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties
deleted file mode 100644
index 4cd1fcefe..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-pageTitle = EAR Module
-pageDescription = Configure EAR module settings.
-contentDirLabel = Content Directory:
-contentDirLabelInvalid = Content Directory (invalid):
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java
deleted file mode 100644
index ac7424cf3..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java
+++ /dev/null
@@ -1,39 +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.ui.project.facet;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public class EarProjectFirstPage extends DataModelFacetCreationWizardPage {
-
-	public EarProjectFirstPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
-		setInfopopID(IJ2EEUIContextIds.NEW_EAR_WIZARD_P1);
-	}
-
-	protected IDialogSettings getDialogSettings() {
-		return J2EEUIPlugin.getDefault().getDialogSettings();
-	}
-	
-	protected String getModuleTypeID() {
-		return IModuleConstants.JST_EAR_MODULE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java
deleted file mode 100644
index a3ea174f5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.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.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class EarProjectWizard extends NewProjectDataModelFacetWizard {
-
-	public EarProjectWizard(IDataModel model){
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
-	}
-	
-	public EarProjectWizard(){
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
-	}
-	
-	protected IDataModel createDataModel() {
-		return DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
-	}
-
-	public void setRuntimeInDataModel(IRuntime runtime){
-		model.setProperty(FACET_RUNTIME, runtime);
-	}
-	
-	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		final Bundle bundle = Platform.getBundle("org.eclipse.jst.j2ee.ui");
-		final URL url = bundle.getEntry("icons/ear-wiz-banner.gif");
-
-		return ImageDescriptor.createFromURL(url);
-	}
-
-	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("template.jst.ear");
-	}
-
-	protected IWizardPage createFirstPage() {
-		return new EarProjectFirstPage(model, "first.page"); //$NON-NLS-1$ 
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_EAR);
-	}
-
-	public void setEARName( String earName ){
-		model.setProperty(FACET_PROJECT_NAME, earName);	
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java
deleted file mode 100644
index 4d968c2ed..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java
+++ /dev/null
@@ -1,141 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarSelectionPanel implements IWebFacetInstallDataModelProperties
-    
-{
-    private final Button addToEar;
-    private final Combo combo;
-    private final Button newButton;
-    private final Label label;
-   
-    private final IDataModel model;
-    private DataModelSynchHelper synchhelper;
-    
-    public EarSelectionPanel( final IDataModel model, final Composite parent) 
-    {
-        this.model = model;
-        this.synchhelper = new DataModelSynchHelper(model);
-        
-        final Group group = new Group( parent, SWT.NONE );
-        group.setLayoutData( gdhfill() );
-        group.setLayout( new GridLayout( 3, false ) );
-        group.setText( Resources.earMemberShip );
-        
-        this.addToEar = new Button( group, SWT.CHECK );
-        this.addToEar.setText( Resources.addToEarLabel );
-        this.addToEar.setLayoutData( gdhspan( gdhfill(), 3 ) );
-        synchhelper.synchCheckbox(addToEar, ADD_TO_EAR, null);
-
-        label = new Label(group, SWT.NULL);
-        label.setText(Resources.earProjectLabel);
-        this.combo = new Combo(group, SWT.NONE);
-        this.combo.setLayoutData( gdhfill() );
-        
-        this.newButton = new Button( group, SWT.PUSH );
-        this.newButton.setText( Resources.newButtonLabel );
-        
-        this.newButton.addSelectionListener( new SelectionAdapter()
-        {
-            public void widgetSelected( final SelectionEvent event )
-            {
-                handleAddButton();
-            }
-        } );
-        
-        synchhelper.synchCombo(combo, EAR_PROJECT_NAME, new Control[]{label, newButton});
-        
-    }
-
-    private void handleAddButton()
-    {
-        final EarProjectWizard wizard = new EarProjectWizard();
-        
-        final WizardDialog dialog 
-            = new WizardDialog( newButton.getShell(), wizard );
-        
-        IRuntime runtime = (IRuntime)model.getProperty(FACET_RUNTIME);
-        String earName = model.getStringProperty( J2EEModuleFacetInstallDataModelProvider.EAR_PROJECT_NAME );
-    	wizard.setRuntimeInDataModel(runtime);
-    	wizard.setEARName( earName );
-        if( dialog.open() != SWT.CANCEL )
-        {
-            model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-            final String earproj = wizard.getProjectName();
-            model.setProperty(EAR_PROJECT_NAME, earproj);
-        }
-    }
-    
-    private static GridData gdhfill()
-    {
-        return new GridData( GridData.FILL_HORIZONTAL );
-    }
-
-    public static final GridData gdhspan( final GridData gd,
-                                          final int span )
-    {
-        gd.horizontalSpan = span;
-        return gd;
-    }
-    
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-        public static String addToEarLabel;
-        public static String newButtonLabel;
-        public static String earProjectLabel;
-        public static String earMemberShip;
-        
-        static
-        {
-            initializeMessages( EarSelectionPanel.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-    public void dispose() {
-    	if(synchhelper != null){
-    		synchhelper.dispose();
-    		synchhelper = null;
-    	}
-    }
-    
-    public String getComboText(){
-    	return combo.getText();
-    }    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties
deleted file mode 100644
index d95d9b775..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-addToEarLabel = Add project to an EAR
-newButtonLabel = New...
-earProjectLabel=EAR Project Name:
-earMemberShip=EAR Membership
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.java
deleted file mode 100644
index c6ad80687..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.java
+++ /dev/null
@@ -1,164 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import java.util.Collections;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.common.project.facet.JavaFacetValidator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-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;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaVersionMismatchMarkerResolutions
-
-    implements IMarkerResolutionGenerator
-    
-{
-    public IMarkerResolution[] getResolutions( final IMarker marker )
-    {
-        return new IMarkerResolution[] 
-        { 
-            new Resolution1( marker ), 
-            new Resolution2( marker ) 
-        };
-    }
-    
-    private static final class Resolution1
-    
-        implements IMarkerResolution
-        
-    {
-        private final IMarker marker;
-        
-        public Resolution1( final IMarker marker )
-        {
-            this.marker = marker;
-        }
-        
-        public String getLabel()
-        {
-            final IProjectFacetVersion fv = getProjectFacetVersion();
-            return NLS.bind( Resources.changeFacetVersion, fv );
-        }
-
-        public void run( final IMarker marker )
-        {
-            final Action action
-                = new Action( Action.Type.VERSION_CHANGE, 
-                              getProjectFacetVersion(), null );
-
-            final IProject proj = this.marker.getResource().getProject();
-            
-            try
-            {
-                final IFacetedProject fproj 
-                    = ProjectFacetsManager.create( proj );
-                
-                fproj.modify( Collections.singleton( action ), null );
-            }
-            catch( CoreException e )
-            {
-                ErrorDialog.openError( null, Resources.errorDialogTitle,
-                                       Resources.errorDialogMessage,
-                                       e.getStatus() );
-            }
-        }
-        
-        private IProjectFacetVersion getProjectFacetVersion()
-        {
-            final String level 
-                = this.marker.getAttribute( JavaFacetValidator.ATTR_COMPILER_LEVEL, null );
-            
-            return JavaFacetUtils.compilerLevelToFacet( level );
-        }
-    }
-
-    private static final class Resolution2
-    
-        implements IMarkerResolution
-        
-    {
-        private final IMarker marker;
-        
-        public Resolution2( final IMarker marker )
-        {
-            this.marker = marker;
-        }
-        
-        public String getLabel()
-        {
-            final String level = getCompilerLevel();
-            return NLS.bind( Resources.changeCompilerLevel, level );
-        }
-    
-        public void run( final IMarker marker )
-        {
-            final IProject project = this.marker.getResource().getProject();
-            final String level = getCompilerLevel();
-            
-            try
-            {
-                JavaFacetUtils.setCompilerLevel( project, level );
-                JavaFacetUtils.scheduleFullBuild( project );
-            }
-            catch( CoreException e )
-            {
-                ErrorDialog.openError( null, Resources.errorDialogTitle,
-                                       Resources.errorDialogMessage,
-                                       e.getStatus() );
-            }
-        }
-        
-        private String getCompilerLevel()
-        {
-            final String fvstr
-                = this.marker.getAttribute( JavaFacetValidator.ATTR_FACET_VERSION, null);
-            
-            final IProjectFacetVersion fv
-                = JavaFacetUtils.JAVA_FACET.getVersion( fvstr );
-            
-            return JavaFacetUtils.facetToCompilerLevel( fv );
-        }
-    }
-    
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-        public static String changeFacetVersion;
-        public static String changeCompilerLevel;
-        public static String errorDialogTitle;
-        public static String errorDialogMessage;
-        
-        static
-        {
-            initializeMessages( JavaVersionMismatchMarkerResolutions.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.properties
deleted file mode 100644
index 227ca0a97..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/JavaVersionMismatchMarkerResolutions.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-changeFacetVersion = Change Java project facet version to {0}
-changeCompilerLevel =Change Java compiler level to {0}
-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/ui/project/facet/RuntimeMismatchMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java
deleted file mode 100644
index 80b94a2aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java
+++ /dev/null
@@ -1,122 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class RuntimeMismatchMarkerResolutions
-
-    implements IMarkerResolutionGenerator
-    
-{
-    public IMarkerResolution[] getResolutions( final IMarker marker )
-    {
-        return new IMarkerResolution[] 
-        { 
-            new Resolution( marker, marker.getAttribute( "runtime1", null ) ), 
-            new Resolution( marker, marker.getAttribute( "runtime2", null ) ) 
-        };
-    }
-    
-    private static final class Resolution
-    
-        implements IMarkerResolution
-        
-    {
-        private final IMarker marker;
-        private final String runtimeName;
-        
-        public Resolution( final IMarker marker,
-                           final String runtimeName )
-        {
-            this.marker = marker;
-            this.runtimeName = runtimeName;
-        }
-        
-        public String getLabel()
-        {
-            return NLS.bind( Resources.useSameRuntime, this.runtimeName );
-        }
-
-        public void run( final IMarker marker )
-        {
-            final IRuntime runtime 
-                = RuntimeManager.getRuntime( this.runtimeName );
-            
-            try
-            {
-                setRuntime( this.marker.getResource().getProject(), runtime );
-                
-                final String pjname 
-                    = this.marker.getAttribute( "moduleProject", null );
-                
-                final IWorkspace ws = ResourcesPlugin.getWorkspace();
-                final IProject pj = ws.getRoot().getProject( pjname );
-                
-                setRuntime( pj, runtime );
-            }
-            catch( CoreException e )
-            {
-                ErrorDialog.openError( null, Resources.errorDialogTitle,
-                                       Resources.errorDialogMessage,
-                                       e.getStatus() );
-            }
-        }
-        
-        private void setRuntime( final IProject proj,
-                                 final IRuntime runtime )
-        
-            throws CoreException
-            
-        {
-            final IFacetedProject fproj = ProjectFacetsManager.create( proj );
-            
-            if( ! fproj.getRuntime().equals( runtime ) )
-            {
-                fproj.setRuntime( runtime, null );
-            }
-        }
-    }
-    
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-        public static String useSameRuntime;
-        public static String errorDialogTitle;
-        public static String errorDialogMessage;
-        
-        static
-        {
-            initializeMessages( RuntimeMismatchMarkerResolutions.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties
deleted file mode 100644
index d386a849b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-useSameRuntime = Swith both projects to {0}
-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/ui/project/facet/UtilityFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.java
deleted file mode 100644
index 32fa6b806..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.java
+++ /dev/null
@@ -1,51 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public final class UtilityFacetInstallPage extends J2EEModuleFacetInstallPage {
-	public UtilityFacetInstallPage() {
-		super("utility.facet.install.page"); //$NON-NLS-1$
-		setTitle(Resources.pageTitle);
-		setDescription(Resources.pageDescription);
-	}
-
-	private static final class Resources extends NLS {
-		public static String pageTitle;
-		public static String pageDescription;
-
-		static {
-			initializeMessages(UtilityFacetInstallPage.class.getName(), Resources.class);
-		}
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{EAR_PROJECT_NAME};
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		final Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-		setInfopopID(IJ2EEUIContextIds.NEW_UTILITY_WIZARD_P3);
-		//setupEarControl(composite);
-		return composite;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.properties
deleted file mode 100644
index 0a6de07aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityFacetInstallPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Utility Module
-pageDescription = Configure utility module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java
deleted file mode 100644
index e8d39d9b5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java
+++ /dev/null
@@ -1,41 +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.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class UtilityProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
-	public UtilityProjectFirstPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setTitle(Resources.pageTitle);
-		setDescription(Resources.pageDescription);
-		setInfopopID(IJ2EEUIContextIds.NEW_UTILITY_WIZARD_P1);
-	}
-
-	private static final class Resources extends NLS {
-		public static String pageTitle;
-		public static String pageDescription;
-
-		static {
-			initializeMessages(UtilityFacetInstallPage.class.getName(), Resources.class);
-		}
-	}
-
-	protected String getModuleFacetID() {
-		return J2EEProjectUtilities.UTILITY;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java
deleted file mode 100644
index 5ab42cdf7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java
+++ /dev/null
@@ -1,68 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public class UtilityProjectWizard extends NewProjectDataModelFacetWizard {
-
-	public UtilityProjectWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVAUTIL_COMPONENT_WIZ_TITLE));
-	}
-	
-	public UtilityProjectWizard(){
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVAUTIL_COMPONENT_WIZ_TITLE));
-	}
-
-	protected IDataModel createDataModel() {
-		return DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-	}
-
-	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		final Bundle bundle = Platform.getBundle("org.eclipse.jst.j2ee.ui");
-		final URL url = bundle.getEntry("icons/util-wiz-banner.gif");
-		return ImageDescriptor.createFromURL(url);
-	}
-
-	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("template.jst.utility");
-	}
-
-	protected IWizardPage createFirstPage() {
-		return new UtilityProjectFirstPage(model, "first.page"); //$NON-NLS-1$ 
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_UTILITY);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
deleted file mode 100644
index c0ba05e3b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet.appclient;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class AppClientFacetInstallPage extends J2EEModuleFacetInstallPage implements IAppClientFacetInstallDataModelProperties {
-
-	private Label configFolderLabel;
-	private Text configFolder;
-	private Button createMainClass;
-	
-	public AppClientFacetInstallPage() {
-		super("appclient.facet.install.page"); //$NON-NLS-1$
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_SETTINGS));
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{EAR_PROJECT_NAME, CONFIG_FOLDER, CREATE_DEFAULT_MAIN_CLASS};
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P3);
-		final Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-
-		//setupEarControl(composite);
-		
-		configFolderLabel = new Label(composite, SWT.NONE);
-		configFolderLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.SOURCEFOLDER));
-		configFolderLabel.setLayoutData(gdhfill());
-
-		configFolder = new Text(composite, SWT.BORDER);
-		configFolder.setLayoutData(gdhfill());
-		configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
-		synchHelper.synchText(configFolder, CONFIG_FOLDER, null);
-		
-		createMainClass = new Button(composite, SWT.CHECK);
-		createMainClass.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_CREATE_MAIN));
-		synchHelper.synchCheckbox(createMainClass, CREATE_DEFAULT_MAIN_CLASS, null);
-		
-		return composite;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
deleted file mode 100644
index f57edd7d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet.appclient;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
-	public AppClientProjectFirstPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_TITLE));
-		setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_DESC));
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_PROJECT_WIZARD_BANNER));
-		setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P1);
-	}
-
-	protected String getModuleFacetID() {
-		return J2EEProjectUtilities.APPLICATION_CLIENT;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java
deleted file mode 100644
index 1a7e3e068..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet.appclient;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class AppClientProjectWizard extends NewProjectDataModelFacetWizard {
-
-	public AppClientProjectWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_WIZ_TITLE));
-	}
-
-	public AppClientProjectWizard() {
-		super();
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_WIZ_TITLE));
-	}
-
-	protected IDataModel createDataModel() {
-		return DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
-	}
-
-	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		final Bundle bundle = Platform.getBundle(J2EEUIPlugin.PLUGIN_ID);
-		final URL url = bundle.getEntry("icons/full/wizban/appclient_wiz.gif"); //$NON-NLS-1$
-		return ImageDescriptor.createFromURL(url);
-	}
-
-	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("template.jst.appclient"); //$NON-NLS-1$
-	}
-
-	protected IWizardPage createFirstPage() {
-		return new AppClientProjectFirstPage(model, "first.page"); //$NON-NLS-1$
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml b/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml
deleted file mode 100644
index 633a03eb8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="javadoc">
-    <target name="javadoc">
-        <javadoc access="protected" author="false" classpath="../org.eclipse.jst.j2ee.web/bin;../org.eclipse.jst.common.frameworks/bin;../org.eclipse.jst.common.navigator.java/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\core.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.uriresolver_1.0.0\uriresolver.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.edit.ui_2.1.0\runtime\edit.ui.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\wsdl.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.editors_3.1.0\editors.jar;D:\Development\targets\wtp_target\eclipse\plugins\com.ibm.wtp.common.util_1.0.1\util.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore.edit_2.1.0\runtime\ecore.edit.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.xml.uriresolver_1.0.0\xmlcatalog.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.workbench_3.1.0\workbench.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.runtime.compatibility_3.0.0\compatibility.jar;D:\Development\targets\wtp_target\eclipse\plugins\com.ibm.wtp.emf.workbench_1.0.1.1\emfworkbench.jar;../org.eclipse.jst.j2ee.jca.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.edit_2.1.0\runtime\edit.jar;../org.eclipse.wst.common.emfworkbench.integration/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem.workbench_1.0.1.1\workbench.jar;../org.eclipse.wst.validation/bin;../org.eclipse.wst.web/bin;../org.eclipse.jst.ejb.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.core_3.1.0\jdtcore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\osgi.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.common.ui_2.0.1\runtime\common.ui.jar;../org.eclipse.jst.common.annotations.controller/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.codegen_2.1.0\runtime\codegen.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.ide_3.1.0\ide.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.ui_3.1.0\jdt.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem_1.0.1\javainst.jar;../org.eclipse.jst.j2ee.ejb/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\defaultAdaptor.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.swt.win32_3.1.0\ws\win32\swt.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\resolver.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\jars\wsdl4j.jar;../org.eclipse.jst.j2ee.jca/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.xsd_2.1.0\runtime\xsd.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jface.text_3.1.0\jfacetext.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.1.0\texteditor.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.views_3.1.0\views.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.resources_3.1.0\resources.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.contentmodel_1.0.0\contentmodel.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.text_3.1.0\text.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.ws.parser_1.0.0\parser.jar;../org.eclipse.jst.j2ee/bin;../org.eclipse.jst.common.annotations.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\eclipseAdaptor.jar;../org.eclipse.jst.j2ee.core/runtime/j2ee.jar;../org.eclipse.wst.sse.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.filebuffers_3.1.0\filebuffers.jar;../org.eclipse.wst.common.navigator.workbench/bin;../org.eclipse.wst.common.migration/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.webbrowser_1.0.0\webbrowser.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem_1.0.1\mofjava.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.server.core_3.0.0\servercore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.common_2.1.0\runtime\common.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.server.ui_3.0.0\serverui.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.launching_3.1.0\launching.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\jars\qname.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui_3.1.0\ui.jar;../org.eclipse.wst.common.frameworks/bin;../org.eclipse.jst.j2ee.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.codegen.ecore_2.1.0\runtime\codegen.ecore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ltk.core.refactoring_3.1.0\refcore.jar;../org.eclipse.jst.servlet.ui/bin;bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.runtime_3.1.0\runtime.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\console.jar;../org.eclipse.wst.common.emf/bin;../org.eclipse.wst.common.navigator.views/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.update.configurator_3.0.0\configurator.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore.xmi_2.1.0\runtime\ecore.xmi.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jface_3.1.0\jface.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore_2.1.0\runtime\ecore.jar;../org.eclipse.wst.common.frameworks.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jst.server.core_3.0.0\sjavacore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.encoding_1.0.0\encodingresource.jar" destdir="D:\Development\wtp_api_docs" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.jst.j2ee.jca.ui,org.eclipse.jst.servlet.ui,org.eclipse.jst.j2ee.ui,org.eclipse.jst.ejb.ui" sourcepath="j2ee_ui;../org.eclipse.jst.ejb.ui/property_files;../org.eclipse.jst.servlet.ui/property_files;property_files;../org.eclipse.jst.servlet.ui/servlet_ui;../org.eclipse.jst.ejb.ui/ejb_ui;../org.eclipse.jst.j2ee.jca.ui/property_files;../org.eclipse.jst.j2ee.jca.ui/jca_ui" splitindex="true" use="true" version="true"/>
-    </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
deleted file mode 100644
index aeeb90f37..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
+++ /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
-###############################################################################
-j2ee=J2EE
-client.jar.file_ui_=App Client JAR file
-client.import.description_ui_=Import an external Application Client JAR file into an Application Client project
-client.export.description_ui_=Export an Application Client project into an Application Client JAR file
-ear.file_ui_=EAR file
-ear.import.description_ui_=Import an external EAR file into an Enterprise Application project
-
-ear.export.description_ui_=Export an Enterprise Application project into an EAR file
-ear.export.action.description_ui_=Export EAR File...
-j2ee.category_ui_=J2EE
-client.project_ui_=Application Client Project
-ear.project_ui_=Enterprise Application Project
-j2ee.actions.description_ui_=Actions for J2EE Development
-create.enterprise.application_ui_=Create an Enterprise Application
-create.client.module_ui_=Create an Application Client project
-client.export.action.label_ui_=Export Application Client JAR...
-jar.dependencies.props_ui_=EAR Dependencies
-ejb.export.action.description_ui_=Export EJB JAR File...
-ejb.client.jar.creation.action.description_ui_=Create EJB Client Jar
-emptyEJBGroupFilter.name=Empty EJB groups
-ejb.export.action.description_ui_=Export EJB JAR File...
-utility_jar_import_wizard=J2EE Utility Jar
-deploy_ui_=Deploy
-Import_Classes=Import Class Files...
-flexible.project_ui_=Flexible Java Project
-new.flexible.project.description_ui_=Create a flexible Java project
-ear_component_ui_=Enterprise Application Project
-new.ear.component.description_ui_=Create a J2EE EAR project
-appclient_component_ui_=Application Client Project
-new.appclient.component.description_ui_=Create a J2EE application client project
-Java_Component=Java Component
-Java_Component.description=Create a Java Component
-addmodulestoear.props_ui_=EAR modules
-J2EEDependenciesPage.name = J2EE Module Dependencies
-weblib.dependencies.props_ui_=Web Libraries
-J2EE_Rename_Participant=J2EE Rename Participant
-new-projects-wizard-category-name = Web Tools (New)
-util-project-wizard-name = Utility Project
-util-project-wizard-description = Create a Utility project
-utility.import.description_ui_=Import one or more external *.jar files as J2EE Utility Projects or *.jars.
-ear-project-wizard-name = EAR Project
-ear-project-wizard-description = Create an EAR project
-Web_Project_Settings=Web Project Settings
-update-ear-libraries=Update EAR Libraries
-update-ear-libraries-tooltip=Recompute the contents of the EAR Libraries classpath container.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
deleted file mode 100644
index b847a72e7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ /dev/null
@@ -1,749 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-<!-- ====================================================== -->
-<!--                                                        -->
-<!-- Purpose: Extension for the J2EE ACtion Sets            -->
-<!-- Extension point: org.eclipse.ui.actionSets             -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%j2ee"
-            description="%j2ee.actions.description_ui_"
-            visible="false"
-            id="org.eclipse.jst.j2ee.J2eeMainActionSet">
-         <action
-               label="%create.client.module_ui_"
-               icon="icons/full/ctool16/newappclient_wiz.gif"
-               tooltip="%create.client.module_ui_"
-               class="org.eclipse.jst.j2ee.internal.actions.NewAppClientComponentAction"
-               toolbarPath="J2EEMain"
-               id="org.eclipse.jst.j2ee.internal.actions.NewAppClientComponent">
-         </action>
-         <action
-               label="%create.enterprise.application_ui_"
-               icon="icons/full/ctool16/newear_wiz.gif"
-               tooltip="%create.enterprise.application_ui_"
-               class="org.eclipse.jst.j2ee.internal.actions.NewEARComponentAction"
-               toolbarPath="J2EEMain"
-               id="org.eclipse.jst.j2ee.internal.actions.NewEARComponent">
-         </action>
-      </actionSet> 
-   </extension>
-
-<!--================================-->
-<!-- Project Wizard Contributions   -->
-<!--================================-->
-   <extension
-         id="J2EEUIProjectWizards"
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%j2ee.category_ui_"
-            id="org.eclipse.jst.j2ee.internal">
-      </category>
-<!-- Flexible Project Wizard 
-      <wizard
-            name="%flexible.project_ui_"
-            icon="icons/full/ctool16/newear_wiz.gif"
-            category="org.eclipse.jdt.ui.java"
-            class="org.eclipse.jst.j2ee.internal.wizard.FlexibleProjectCreationWizard"
-            project="true"
-            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
-            id="org.eclipse.jst.j2ee.ui.FlexibleProjectCreationWizard"
-            >
-         <description>
-            %new.flexible.project.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>-->
-<!-- EAR Component Wizard -->
-      <wizard
-            name="%ear_component_ui_"
-            icon="icons/full/ctool16/newear_wiz.gif"
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard"
-            project="true"
-            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
-            id="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
-         <description>
-            %new.ear.component.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-<!-- Application Client Component Wizard -->
-      <wizard
-            name="%appclient_component_ui_"
-            icon="icons/full/ctool16/newappclient_wiz.gif"
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"
-            project="true"
-            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
-            id="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
-         <description>
-            %new.appclient.component.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-<!-- Utility Component Wizard -->
-      <wizard
-      		name="%util-project-wizard-name"
-      		icon="icons/util-wiz-icon.gif"
-      		category="org.eclipse.jst.j2ee.internal"
-      		class="org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard"
-      		project="true"
-      		finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
-      		id="org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard">
-      <description>
-      	%util-project-wizard-description
-      </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-    </wizard>
-      
-   </extension>
-  
-<!--================================-->
-<!-- Import Wizard Contributions    -->
-<!--================================-->
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"
-            icon="icons/full/ctool16/appclient_import_wiz.gif"
-            id="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"
-            name="%client.jar.file_ui_">
-         <description>
-            %client.import.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-       <wizard
-             category="org.eclipse.jst.j2ee.internal"
-             class="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"
-             icon="icons/full/ctool16/import_ear.gif"
-             id="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"
-             name="%ear.file_ui_">
-         <description>
-            %ear.import.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-       <wizard
-             category="org.eclipse.jst.j2ee.internal"
-             class="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew"
-             icon="icons/util-wiz-icon.gif"
-             id="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew"
-             name="%utility_jar_import_wizard">
-          <description>
-          	%utility.import.description_ui_
-          </description>
-          <selection class="org.eclipse.core.resources.IResource"/>
-       </wizard>
-       <category
-             id="org.eclipse.jst.j2ee.internal"
-             name="%j2ee.category_ui_"/> 
-       </extension>
-     
-   <!--   <wizard
-            class="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizard"
-            icon="icons/jar_obj.gif"
-            name="%utility_jar_import_wizard"
-            id="org.eclipse.jst.j2ee.ui.J2EEUtilityJarImportWizard">
-            <selection
-               class="org.eclipse.core.resources.IResource">
-	        </selection>
-	  </wizard>     
-	   <wizard
-            name="%Import_Classes"
-            icon=""
-            class="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard"
-            id="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
-         
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>             
-   </extension> -->
-<!--================================-->
-<!-- Export Wizard Contributions    -->
-<!--================================-->
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"
-            icon="icons/full/ctool16/appclient_export.gif"
-            id="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"
-            name="%client.jar.file_ui_">
-         <description>
-            %client.export.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-      <wizard
-            category="org.eclipse.jst.j2ee.internal"
-            class="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"
-            icon="icons/full/ctool16/export_ear.gif"
-            id="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"
-            name="%ear.file_ui_">
-         <description>
-            %ear.export.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-      <category
-            id="org.eclipse.jst.j2ee.internal"
-            name="%j2ee.category_ui_"/>
-   </extension>
-<!-- ====================================================== -->
-<!-- Extension point: org.eclipse.ui.projectNatureImages    -->
-<!-- Purpose: Attach icon overlays for J2EE project natures -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.ide.projectNatureImages">
-      <image
-            icon="icons/full/ovr16/ejb_module_ovr.gif"
-            natureId="org.eclipse.jst.j2ee.ejb.EJBNature"
-            id="org.eclipse.ui.ejbProjectNatureImage">
-      </image>
-      <image
-            icon="icons/full/ovr16/enterprise_app_ovr.gif"
-            natureId="org.eclipse.jst.j2ee.EARNature"
-            id="org.eclipse.ui.earProjectNatureImage">
-      </image>
-      <image
-            icon="icons/full/ovr16/client_app_ovr.gif"
-            natureId="org.eclipse.jst.j2ee.ApplicationClientNature"
-            id="org.eclipse.ui.appClientModProjectNatureImage">
-      </image>
-      <image
-            icon="icons/full/ovr16/connector_ovr.gif"
-            natureId="org.eclipse.jst.j2ee.jca.ConnectorNature"
-            id="org.eclipse.ui.ConnectorModProjectNatureImage">
-      </image>
-      <image
-            icon="icons/full/ovr16/web_module_ovr.gif"
-            natureId="org.eclipse.jst.j2ee.web.WebNature"
-            id="org.eclipse.ui.webProjectNatureImage">
-      </image>
-   </extension>
-
-    <extension
-         point="org.eclipse.wst.common.frameworks.ui.wtpuiAction"> 
-      <masterOperation
-            description="Delete the dependent J2EE modules"
-            extendedGenericId="org.eclipse.wst.common.generic.Delete"
-            populatorClass="org.eclipse.jst.j2ee.internal.ui.actions.J2EEDeleteModuleActionPopulator"
-            operationClass="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IActionWTPOperation"
-            name="Delete J2EE Dependent Modules" 
-            alwaysExecute="true"
-            overrideId="org.eclipse.wst.common.actions.Java.delete">
-            <selectionEnablement>
-            	<or>
-            		<and>
-            		<objectClass name="org.eclipse.core.resources.IProject"
-            					 adaptable="true" />
-					<or>
-			            <objectState
-			                  value="org.eclipse.jst.j2ee.EARNature"
-			                  name="projectNature" /> 
-			            <objectState
-			                  value="org.eclipse.jst.j2ee.ApplicationClientNature"
-			                  name="projectNature" /> 
-			            <objectState
-			                  value="org.eclipse.jst.j2ee.jca.ConnectorNature"
-			                  name="projectNature" /> 
-			            <objectState
-			                  value="org.eclipse.jst.j2ee.ejb.EJBNature"
-			                  name="projectNature" /> 
-			            <objectState
-			                  value="org.eclipse.jst.j2ee.web.WebNature"
-			                  name="projectNature" /> 
-			            </or>            					 
-            		</and> 
-	               <objectClass
-	                    name="org.eclipse.jst.j2ee.internal.application.Application">
-	              </objectClass>
-	              <objectClass
-	                    name="org.eclipse.jst.j2ee.internal.client.ApplicationClient">
-	              </objectClass>
-	              <objectClass
-	                    name="org.eclipse.jst.j2ee.internal.jca.Connector">
-	              </objectClass>
-	              <objectClass
-	                    name="org.eclipse.jst.j2ee.internal.ejb.EJBJar">
-	              </objectClass>
-	              <objectClass
-	                    name="org.eclipse.jst.j2ee.internal.webapplication.WebApp">
-	              </objectClass>            		       		
-            	</or>
-			</selectionEnablement>
-      </masterOperation>
-	</extension>   
-	
-	
-	<extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            className="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEEjbItemProviderAdapterFactory"
-            packageURI="ejb.xmi"
-            id="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEEjbItemProviderAdapterFactory">
-         <view 
-         	   id="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-      </adapterFactory>
-      <adapterFactory
-            className="org.eclipse.jst.j2ee.internal.war.ui.util.J2EEWebItemProviderAdapterFactory"
-            packageURI="webapplication.xmi"
-            id="org.eclipse.jst.j2ee.internal.war.ui.util.J2EEWebItemProviderAdapterFactory">
-          <view 
-         	   id="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-      </adapterFactory>
-      <adapterFactory
-            className="org.eclipse.jst.j2ee.internal.provider.J2EEApplicationItemProviderAdapterFactory"
-            packageURI="application.xmi"
-            id="org.eclipse.jst.j2ee.internal.provider.J2EEApplicationItemProviderAdapterFactory">
-          <view 
-         	   id="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-      </adapterFactory>
-      <adapterFactory
-            className="org.eclipse.jst.j2ee.internal.provider.J2EEModulemapItemProviderAdapterFactory"
-            packageURI="modulemap.xmi"
-            id="org.eclipse.jst.j2ee.internal.provider.J2EEModulemapItemProviderAdapterFactory">
-          <view 
-         	   id="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-      </adapterFactory>
-   </extension>
-   
-  <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            id="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction">
-         <action
-               label="%update-ear-libraries"
-               tooltip="%update-ear-libraries-tooltip"
-               class="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction"
-               menubarPath="additions"
-               enablesFor="+"
-               icon="icons/full/obj16/library_obj.gif"
-               id="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction">
-         </action>
-         <enablement>
-		  <adapt type="org.eclipse.core.resources.IProject">
-		  		<or>
-					<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.web" />
-					<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ejb" />
-					<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.utility" />
-					<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ear" />
-					<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.appclient" />
-					<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.connector" />
-				</or>
-			</adapt>
-		</enablement>
-      </objectContribution>
-   </extension>
-   
-<!-- Navigator Object Contributions -->
-<!-- EAR Group Contributions 
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
-            id="org.eclipse.jst.j2ee.internal.ui.navigator.earProjectActions">
-         <action
-               label="%ear.file_ui_"
-               icon="icons/full/ctool16/import_ear.gif"
-               class="org.eclipse.jst.j2ee.internal.ear.actions.ImportEARAction"
-               menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
-               enablesFor="1"
-               id="org.eclipse.jst.j2ee.internal.ui.navigator.importEARAction">
-         </action>
-         <action
-               label="%ear.file_ui_"
-               icon="icons/full/ctool16/export_ear.gif"
-               class="org.eclipse.jst.j2ee.internal.ear.actions.ExportEARAction"
-               menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
-               enablesFor="1"
-               id="org.eclipse.jst.j2ee.internal.ui.navigator.exportEARAction">
-         </action>
-         <visibility>
-            <objectState
-                  name="projectNature"
-                  value="org.eclipse.jst.j2ee.EARNature">
-            </objectState>
-         </visibility>
-      </objectContribution>
-   </extension>
-   -->
-<!-- Navigator Object Contributions -->
-<!-- Application Client Group Contributions
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
-            id="org.eclipse.jst.j2ee.internal.ui.navigator.appClientProjectActions">
-         <action
-               label="%client.jar.file_ui_"
-               icon="icons/full/ctool16/appclient_import_wiz.gif"
-               class="org.eclipse.jst.j2ee.internal.client.actions.ImportApplicationClientAction"
-               menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
-               enablesFor="1"
-               id="org.eclipse.jst.j2ee.internal.ui.navigator.importAppClientAction">
-         </action>
-         <action
-               label="%client.jar.file_ui_"
-               icon="icons/full/ctool16/appclient_export.gif"
-               class="org.eclipse.jst.j2ee.internal.client.actions.ExportApplicationClientAction"
-               menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
-               enablesFor="1"
-               id="org.eclipse.jst.j2ee.internal.ui.navigator.exportAppClientAction">
-         </action>
-         <visibility>
-            <objectState
-                  name="projectNature"
-                  value="org.eclipse.jst.j2ee.ApplicationClientNature">
-            </objectState>
-         </visibility>
-      </objectContribution>
-   </extension>
-    -->
-<!-- Navigator Object Contributions -->
-<!-- ================================================== -->
-<!--          DEPLOY EXTENSIONS                         -->
-<!-- ================================================== -->
-<!--  <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="java.lang.Object"
-            nameFilter="*"
-            id="org.eclipse.jst.j2ee.internal.ui.deploy">
-         <action
-               label="%deploy_ui_"
-               icon="icons/full/ctool16/re_execute.gif"
-               class="org.eclipse.jst.j2ee.internal.actions.J2EEDeployAction"
-               menubarPath="additions"
-               id="deployAction">
-         </action>
-         <visibility>
-            <or>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.ejb.EJBJar">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.ejb.EnterpriseBean">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.webapplication.WebApp">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.jca.Connector">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.application.Application">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.client.ApplicationClient">
-               </objectClass>
-               
-                     <objectState
-                           name="projectNature"
-                           value="org.eclipse.wst.common.componentcore.ModuleCoreNature">
-                     </objectState>
-          
-            </or>
-         </visibility>
-      </objectContribution>
-   </extension> -->
-<!-- Navigator Object Contributions -->
-
-    <extension point="org.eclipse.ui.propertyPages">
- 
-     
-<!-- =========== org.eclipse.jst.j2ee.internal.J2EEDependencyPage ============ -->
-      <page
-            adaptable="true"
-      		objectClass="org.eclipse.core.resources.IProject"
-      		name="%J2EEDependenciesPage.name"
-            class="org.eclipse.jst.j2ee.internal.J2EEDependenciesPage"
-            id="org.eclipse.jst.j2ee.internal.J2EEDependenciesPage">
-           <enabledWhen>
-			<and>
-				<adapt
-					type="org.eclipse.core.resources.IProject">
-					<or> 
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.web" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ejb" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.utility" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.ear" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.appclient" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.connector" />
-					</or>
-				</adapt>
-			</and> 
-         </enabledWhen>          
-      </page>
-      
-      <page
-      		adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%Web_Project_Settings"
-            class="org.eclipse.jst.j2ee.internal.ui.J2EEPropertiesPage"
-            id="J2EEPropertiesPage">
-         <enabledWhen>
-			<and>
-				<adapt
-					type="org.eclipse.core.resources.IProject">
-					<or> 
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.web" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="wst.web" />
-					</or>
-				</adapt>
-			</and> 
-         </enabledWhen>
-      </page>
-            
-    </extension>
-
-<!--  
-	<extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-	  
-		<renameParticipant
-				class="org.eclipse.jst.j2ee.internal.actions.J2EERenameParticipant"
-				id="org.eclipse.jst.j2ee.internal.actions.J2EERenameParticipant" 
-				name="%J2EE_Rename_Participant"> 
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
-
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.core.resources.IProject" />
-
-				</with>
-			</enablement> 
-		</renameParticipant>
-	</extension>
-	
-	<extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-	  
-		<renameParticipant
-				class="org.eclipse.jst.j2ee.internal.actions.J2EEComponentRenameParticipant"
-				id="org.eclipse.jst.j2ee.internal.actions.J2EEComponentRenameParticipant" 
-				name="J2EE Rename Participant"> 
-		<enablement> 
-		   	<with variable="affectedNatures">
-            	<iterate operator="or"> 
-            			<equals value="org.eclipse.wst.common.modulecore.ModuleCoreNature" />  
-            	</iterate>
-            </with>
-            <with
-                  variable="element">
-               <instanceof
-                     value="org.eclipse.wst.common.componentcore.resources.IVirtualComponent">
-               </instanceof>
-            </with>
-         </enablement> 
-		</renameParticipant>
-	</extension> -->
-	
-  <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="%j2ee"
-            icon="icons/full/cview16/j2ee_perspective.gif"
-            class="org.eclipse.jst.j2ee.internal.perspective.J2EEPerspective"
-            id="org.eclipse.jst.j2ee.J2EEPerspective">
-      </perspective>
-   </extension>	
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension targetID="org.eclipse.jst.j2ee.J2EEPerspective">
-         <perspectiveShortcut id="org.eclipse.debug.ui.DebugPerspective"/>
-         <perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective"/>
-         <perspectiveShortcut id="org.eclipse.ui.resourcePerspective"/>
-      </perspectiveExtension>
-      <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
-         <perspectiveShortcut id="org.eclipse.jst.j2ee.J2EEPerspective"/>
-      </perspectiveExtension>
-   </extension>	
-    
-   <extension
-		point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
-		<DataModelProvider
-            class="org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider"
-            id="org.eclipse.jst.j2ee.internal.earcreation.IEarComponentCreationDataModelProperties"/>
-	</extension>
-	
-	<extension
-         id="context.Sensitive.Class.workingCopyManager"
-         name="Working Copy Manager - UI Context Class"
-         point="org.eclipse.jem.util.uiContextSensitiveClass">
-      <uiContextSensitiveClass
-            context="UI"
-            key="workingCopyManager"
-            className="org.eclipse.jst.common.jdt.internal.integration.ui.WTPUIWorkingCopyManager">
-      </uiContextSensitiveClass>
-   </extension>
-   
-    <extension point="org.eclipse.core.runtime.adapters">
-        <factory
-             class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.core.resources.IProject">
-            <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-        </factory>
-        <factory
-             class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.jst.j2ee.application.Application">
-             <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-        </factory>
-        <factory
-             class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.core.resources.IFile">
-            <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-       </factory>
-        <factory
-              adaptableType="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper"
-              class="org.eclipse.jst.j2ee.internal.ClassHelperAdapterFactory">
-           <adapter type="org.eclipse.core.resources.IFile"/>
-           <adapter type="org.eclipse.core.resources.IResource"/>
-        </factory>
-    
-    <!--
-      <factory 
-      		class="org.eclipse.jst.j2ee.internal.plugin.FacetedProjectAdapterFactory"
-            adaptableType="org.eclipse.core.resources.IProject" >
-         	<adapter type="org.eclipse.ui.IActionFilter"/>
-      </factory>    
-    -->
-   </extension> 
-   
-   <extension
-         point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-    <moduleArtifactAdapter
-           id="org.eclipse.jst.j2ee.server.ear1"
-           class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.jst.j2ee.application.Application"/>
-           </with>
-         </enablement>
-      </moduleArtifactAdapter>
-   
-     <moduleArtifactAdapter
-            id="org.eclipse.jst.j2ee.server.ear2"
-            class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IProject"/>
-           </with>
-         </enablement>
-      </moduleArtifactAdapter>
-      
-      <moduleArtifactAdapter
-            id="org.eclipse.jst.j2ee.server.ear3"
-            class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IFile"/>
-           </with>
-         </enablement>
-      </moduleArtifactAdapter>
-     </extension>
-     
-  <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-    <wizard-pages action="jst.ear.install">
-      <page class="org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage"/>
-    </wizard-pages>
-    <wizard-pages action="jst.appclient.install">
-      <page class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage"/>
-    </wizard-pages>
-  </extension>
-
-  <extension
-    point="org.eclipse.ui.ide.markerResolution">
-	<markerResolutionGenerator
-      markerType="org.eclipse.jst.common.frameworks.javaVersionMismatch"
-      class="org.eclipse.jst.j2ee.ui.project.facet.JavaVersionMismatchMarkerResolutions">
-    </markerResolutionGenerator>
-  </extension>
-
-  <extension
-    point="org.eclipse.ui.ide.markerResolution">
-	<markerResolutionGenerator
-      markerType="org.eclipse.jst.j2ee.differentRuntimesDetected"
-      class="org.eclipse.jst.j2ee.ui.project.facet.RuntimeMismatchMarkerResolutions">
-    </markerResolutionGenerator>
-  </extension>
-      
-    <extension
-          point="org.eclipse.wst.common.modulecore.ComponentProjectMigrator">
-       <migratorExtension class="org.eclipse.jst.j2ee.internal.J2EEComponentProjectMigrator"/>
-    </extension>
-   
-  <extension point="org.eclipse.wst.common.project.facet.ui.images">
-    <image facet="jst.java" path="icons/java.gif"/>
-  </extension>
-  
-   <extension 
-       point="org.eclipse.jem.util.uiContextSensitiveClass">
-       <uiContextSensitiveClass
-          key="ValidateEditContext"
-          className="org.eclipse.jst.j2ee.internal.listeners.ValidateEditListener"
-          context="UI"/>
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml
deleted file mode 100644
index d3bfda0d3..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.j2ee.ui"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties
deleted file mode 100644
index 0a6de07aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Utility Module
-pageDescription = Configure utility module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties
deleted file mode 100644
index 0ada37472..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-RelationshipPolyLine_UI_0=Navigation
-RelationshipPolyLine_UI_1=Navigation
-RelationshipPolyLine_UI_2=Cmr Field / Foreign Key
-RelationshipPolyLine_UI_3=Cmr Field / Foreign Key
-RelationshipPolyLine_UI_4=Edit left end
-RelationshipPolyLine_UI_5=Edit right
-RelationshipPolyLine_UI_6=Edit left end
-RelationshipPolyLine_UI_7=Edit right end
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties
deleted file mode 100644
index 1dd2b3697..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties
+++ /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
-###############################################################################
-KEY_0=Failed to find the image "{0}".
-KEY_1=New EJB Project
-KEY_2=EJB version:
-KEY_3=EJB Project
-KEY_4=Create an EJB project and add it to a new or existing Enterprise Application.
-KEY_5=Import an EJB jar from the file system
-KEY_6=EJB Jar Import
-KEY_7=EJB Jar file:
-KEY_8=EJB Project:
-KEY_9=EJB Jar Export
-KEY_10=Export EJB project to the local file system.
-KEY_11=EJB client JAR Creation
-KEY_12=Use this wizard to create an EJB client JAR from your existing EJB
-KEY_13=Client JAR URI:
-KEY_14=Project name:
-KEY_15=Project location:
-KEY_16=EJB Project:
-KEY_17=Delete Bean Only
-KEY_18=Delete Bean Classes
-KEY_19=Delete Access Bean
-KEY_20=Delete Deployed Code
-KEY_21=Select All
-KEY_22=Deselect All
-KEY_23=The selected enterprise bean cannot be deleted because it is involved in\nrelationships with other enterprise beans.  You must first delete these\nrelationships before deleting the bean.
-KEY_24=Delete...
-KEY_25=Cannot delete Enterprise Bean
-KEY_26=Cannot delete the bean named "{0}" because it is in a binary project.
-KEY_27=Delete Enterprise Bean(s)
-KEY_28=What options would you like when deleting the selected\nEnterprise Bean(s)?
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-NewEJBProjectAction_UI_0=EJB Project
-NewEJBModuleAction_UI_0=EJB Project
-pageTitle=Ejb Module
-pageDescription=Configure ejb module settings.
-configFolderLabel=Config Folder:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties
deleted file mode 100644
index fc3565ea0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties
+++ /dev/null
@@ -1,15 +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
-###############################################################################
-
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
deleted file mode 100644
index adf1ca7d0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
+++ /dev/null
@@ -1,331 +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
-###############################################################################
-1=Project location:
-2=Target runtime:
-3=J2EE version:
-4=Failed to find the image "{0}".
-5=New Enterprise Application Project
-6=Enterprise Application Project
-7=Create an Enterprise Application project containing one or more module projects.
-8=EAR Module Projects
-9=Select the module projects to add to the new EAR project from the list. \nSelect New Module button to create a new module project.
-10=&Select All
-11=&Deselect All
-12=New &Module...
-13=EAR application:
-14=N&ew...
-14a=Ne&w...
-15=Add module to an EAR application.
-16=New Module Project
-17=Create a new module project for the selected module type
-18=New Module Project
-19=Create default module projects.
-20=Application Client module:
-21=EJB module:
-22=Web module:
-23=Connector module:
-24=New Application Client Project
-25=Application Client module
-26=Create an Application Client project and add it to a new or existing Enterprise Application project
-27=Module Dependencies
-28=Select dependent JARs for the module within the Enterprise Application project.
-29=Available dependent JARs:
-30=Manifest Class-Path:
-31=JAR/Module
-32=Project:
-33=New
-34=Import an Application Client project from the file System
-35=Application Client Import
-36=Application Client file:
-37=Application Client project:
-38=Import
-39=Import an Enterprise Application project based on selected resources.
-40=Enterprise Application Import
-41=EAR file:
-42=Overwrite existing resources without warning.
-43=Project import
-44=Optimized: make binary projects for EJB, client, and utility JARs
-45=Expanded: extract project contents for development
-46=Import for partial EAR development
-47=Select All
-48=Deselect All
-49=Utility JARs and web libraries
-50=Select the utility JARs from the list to be imported as utility projects. Unselected JARs will be imported as \nutility JARs in the EAR.
-51=Enter the new project name that will be created for the imported module file by selecting the second column of the table for edit.
-52=EAR Module and Utility JAR Projects
-53=Project locations
-54=This is the parent directory for all referenced projects. A subdirectory will be created for each project.
-55=Module Root Location:
-
-57=Select the location directory
-58=Modules in EAR
-59=New Project Name
-60=filenames
-61=projectnames
-62=Destination:
-63=Overwrite existing file
-64=Export source files
-65=Application Client Export
-66=Export Application Client project to the local file system.
-67=Export
-68=EAR Export
-69=Export Enterprise Application project to the local file system.
-70=Include project build paths and meta-data files
-71=If you select this option, the exported EAR maintains project names and external classpath dependencies, which are useful for later importing the EAR into binary projects. If you select this option and later import the EAR, only binary projects are created.
-72=Include
-74=Allow nested projects overwrites (module and utility projects)
-75=Delete project on overwrite
-76=EAR project:
-
-#migration strings
-77=Error
-78=An internal error occurred performing the selected action.
-79=Binary Project
-80=The action cannot be performed on the selection, which is part of a binary project.
-81=Information
-82=The chosen operation is not currently available.
-
-90=Create an EJB Client JAR module to hold the client interfaces and classes.
-91=Generate an annotated bean class
-92=Add support for annotated Java classes
-93=B&rowse...
-94=Na&me:
-95=Create a default Main class
-96=Create a default stateless session bean
-98=Generate an annotated servlet class
-
-97=Select the utility JARs from the list to be imported as utility projects or jars.
-99=Project Name:
-100=Module Version:
-101=Configure Application Client module settings.
-102=Content Folder:
-Entity_UI_=Entity Beans
-Message_Driven_Beans_UI_=Message-Driven Beans
-Session_Beans_UI_=Session Beans
-EJB_Class_UI_=EJB Class: {0}
-Home_Interface_UI_=Home Interface: {0}
-Service_Endpoint_Interface_UI_=Service Endpoint Interface: {0}
-Primary_Key_Class_UI_=Primary Key Class: {0}
-Remote_Interface_UI_=Remote Interface: {0}
-Local_Interface_UI_=Local Interface: {0}
-Local_Home_Interface_UI_=Local Home Interface: {0}
-Delete_UI_=Delete...
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_EXC_=IWAE0022E Non-project in selection
-Problems_Opening_Editor_ERROR_=IWAE0052E Problems Opening Editor.
-Utility_JARs_UI_=Utility JARs
-Delete_1=Delete...
-Delete_selected_project(s)_2=Delete selected project(s)
-Remove_module(s)_from_all_Enterprise_Applications_3=Remove module(s) from all Enterprise Applications
-Remove_module(s)_from_all_other_Enterprise_Applications_4=Remove module(s) from all other Enterprise Applications
-Remove_module_dependencies_referencing_selected_project(s)_5=Remove module dependencies referencing selected project(s)
-Delete_Module_Options_6=Delete Module Options
-Delete_Enterprise_Application_Options_7=Delete Enterprise Application Options
-Delete_could_not_be_completed_8=Delete could not be completed
-Delete_error_9=Delete error
-What_would_you_like_to_delete__10=What would you like to delete?
-Delete_selected_Enterprise_Application_project(s)_only_11=Delete selected Enterprise Application project(s) only
-Also_delete_module_and_utility_Java_projects_12=Also delete module and utility Java projects
-Delete_selected_project(s)_only_13=Delete selected project(s) only
-Also_delete_references_to_selected_project(s)_14=Also delete references to selected project(s)
-CUSTOM_DELETE_MIX_MATCH_UI_=The custom J2EE delete options are not available for the selected J2EE projects.  The standard delete options will be used.
-DEPLOY_DIALOG_TITLE=J2EE Deployment
-DEPLOY_ERROR_TEXT=IWAE0001E Error:
-DEPLOY_WARNING_TEXT=Warning:
-DEPLOY_INFO_TEXT=IWAE0002I Info:
-DEPLOY_OK_TEXT=Ok:
-DEPLOYMENT_IN_PROGRESS=Deployment operation in progress...
-DEPLOY_SUCCESS_REPORT=Deployment finished successfully.
-DEPLOY_WARNINGS_REPORT=Deployment finished with warnings; see log files for details.
-DEPLOY_ERRORS_REPORT=Deployment finished with errors; see log files for details.
-DEPLOY_PROJECT_NOT_FOUND=Cannot get handle to the project.
-DEPLOY_RUNTIME_NOT_FOUND=Target runtime not configured for project {0}.
-DEPLOY_RUNTIME_CONFIGURED=Target runtime configured successfully for project {0}.
-DEPLOY_PROJECT_NOT_SUPPORTED=Project {0} cannot be deployed on the configured target runtime.
-
-NewModuleSelectionPage.appClient=Application Client
-NewModuleSelectionPage.ejb=Enterprise Java Bean
-NewModuleSelectionPage.web=Web
-NewModuleSelectionPage.jca=Connector
-
-NewApplClientModuleAction_UI_0=Application Client Module
-NewEARModuleAction_UI_0=EAR Module
-J2EEProjectCreationPage_UI_0=Hide &Advanced <<
-J2EEProjectCreationPage_UI_1=Show &Advanced >>
-J2EEUtilityJarImportPage_UI_0=Utility Jar Import
-J2EEUtilityJarImportPage_UI_1=Import dependent Utility Jars for J2EE Enterprise Applications
-J2EEUtilityJarImportPage_UI_2=Available Utility Jars Directory
-J2EEUtilityJarImportPage_UI_3=External Jar Directory:
-J2EEUtilityJarImportPage_UI_4=Linked Path Variable
-J2EEUtilityJarImportPage_UI_5=Make these imported files team-shareable by creating or re-using a Linked Path Variable (LPV). Select an existing LPV or type a new name to create one to the directory above. Other teammates should define this value through Window > Preferences | Workbench > Linked Resources. This option is only available for linked imports.
-J2EEUtilityJarImportPage_UI_6=Overwrite Existing Resources (projects and archives)
-J2EEUtilityJarImportPage_UI_7=Select Utility Jar:
-J2EEUtilityJarImportPage.0=Use Existing Linked Path Variable
-J2EEUtilityJarImportPage.1=Linked Path Variable: 
-EARImportProjectsPage_UI_0=include
-EARImportProjectsPage_UI_1=file
-EARImportProjectsPage_UI_2=project
-EARImportProjectsPage_UI_3=Select New
-
-J2EEUtilityJarImportTypePage_UI_0=Utility Jar Import
-J2EEUtilityJarImportTypePage_UI_1=Import dependent Utility Jars for J2EE Enterprise Applications
-J2EEUtilityJarImportTypePage_UI_2=Select import type
-J2EEUtilityJarImportTypePage_UI_3=Create Java Projects from Utility Jars
-J2EEUtilityJarImportTypePage_UI_4=Create linked Java Projects from Utility Jars
-J2EEUtilityJarImportTypePage_UI_5=Copy Utility Jars into an existing EAR from an external location
-J2EEUtilityJarImportTypePage_UI_6=Create Linked Utility Jars in an existing EAR from an external location
-J2EEUtilityJarImportTypePage_UI_7=Project import options
-J2EEUtilityJarImportTypePage_UI_8=Select EAR Project
-J2EEUtilityJarImportTypePage_UI_9=EAR Project:
-J2EEUtilityJarImportTypePage_UI_10=Create Binary Projects
-J2EEUtilityJarImportTypePage_UI_11=Override Project Root (Specify location below)
-
-Deployment_Descriptor_UI_=Deployment Descriptor
-
-Rename_1=Rename
-Rename_selected_project_2=Rename selected project
-Rename_module_in_all_Enterprise_Applications_3=Rename module in all Enterprise Applications
-Rename_module_in_all_other_Enterprise_Applications_4=Rename module in all other Enterprise Applications
-Rename_module_dependencies_referencing_selected_project_5=Rename module dependencies referencing selected project
-Rename_Module_Options_6=Rename Module Options
-Rename_Enterprise_Application_Options_7=Rename Enterprise Application Options
-Rename_could_not_be_completed_8=Rename could not be completed
-Rename_error_9=Rename error
-What_would_you_like_to_rename_this_to__10=What would you like to rename this to?
-Context_Root__11=Context root:
-Rename_selected_Enterprise_Application_project_only_12=Rename selected Enterprise Application project only
-Also_rename_module_and_utility_Java_projects_13=Also rename module and utility Java projects
-Project_already_exists.=Project {0} already exists.
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_ERROR_=IWAE0024E Non-project in selection
-
-
-ERROR_OCCURRED_TITLE=Error
-ERROR_OCCURRED_MESSAGE=An internal error occurred performing the selected action.
-
-Import_Class_Files_UI=Import
-FileImport.selectSource=Select a directory to import from.
-Import_Classes=Import Class Files...
-ClassesImport.fromDir=Import from Directory
-ClassesImport.fromZip=Import from Zip or Jar
-DataTransfer.browse=Browse...
-DataTransfer.directory=Source:
-DataTransfer.fileSystemTitle=Import Class Files
-FileImport.importFileSystem=Import class files from the local file system.
-FileImport.sourceEmpty=Source must not be empty.
-FileImport.overwriteExisting=Overwrite existing resources without warning
-DataTransfer.selectAll=Select All
-DataTransfer.deselectAll=Deselect All
-Import_Class_Files_UI=Import
-FileImport.selectSource=Select a directory to import from.
-Inconsistent_Files_3=Inconsistent Files
-The_following_workspace_files_are_inconsistent_with_the_editor_4=The following workspace files are inconsistent with the editor: \n
-Update_the_editor_with_the_workspace_contents__5=Update the editor with the workspace contents?
-Error_checking_out_files_10=Error checking out files
-Inconsistent_files_detected_11=Inconsistent files detected
-Modules_UI_=Modules
-Utility_Java_Projects_UI_=Project Utility JARs
-The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_=IWAE0020W The following files are inconsistent with the file system.\nDo you want to save and overwrite these files on the file system?
-J2EE_Level=J2EE Level:
-J2EE_12=1.2
-J2EE_13=1.3
-J2EE_14=1.4
-J2EE_12_DESCRIPTION=J2EE 1.2 includes Servlet Specification level 2.2, JSP Specification level 1.1, and EJB Specification level 1.1.
-J2EE_13_DESCRIPTION=J2EE 1.3 includes Connector Architecture Specification level 1.0, Servlet Specification level 2.3, JSP Specification level 1.2, and EJB Specification level 2.0.
-J2EE_14_DESCRIPTION=J2EE 1.4 includes Connector Architecture Specification level 1.5, Servlet Specification level 2.4, JSP Specification level 1.3, and EJB Specification level 2.1.
-EJB_LEVEL=EJB Level:
-EJB_11=1.1
-EJB_20=2.0
-EJB_21=2.1
-EJB_11_DESCRIPTION=EJB 1.1 includes Session Beans, BMP Beans and CMP 1.1 Beans.  EJB 1.1 modules may be included in either J2EE 1.2 or J2EE 1.3 Enterprise Applications.
-EJB_20_DESCRIPTION=EJB 2.0 includes Message-Driven Beans, BMP Beans, and CMP 1.1 and CMP 2.0 Beans.  EJB 2.0 modules may only be included in J2EE 1.3 Enterprise Applications.
-EJB_21_DESCRIPTION=EJB 2.1 includes Message-Driven Beans, BMP Beans, and CMP 1.1 and CMP 2.0 Beans.  EJB 2.1 modules may only be included in J2EE 1.4 Enterprise Applications.
-WEB_LEVEL=Web Level:
-WEB_22=2.2
-WEB_23=2.3
-WEB_24=2.4
-WEB_22_DESCRIPTION=Web 2.2 includes Servlet specification 2.2 and JSP specification 1.1.
-WEB_23_DESCRIPTION=Web 2.3 includes Servlet specification 2.3 and JSP specification 1.2.
-WEB_24_DESCRIPTION=Web 2.4 includes Servlet specification 2.4 and JSP specification 2.0.
-APP_CLIENT_LEVEL=Application Client Level:
-APP_CLIENT_12_DESCRIPTION=Application 1.2 includes the Applciation client specification level 1.2.
-APP_CLIENT_13_DESCRIPTION=Application 1.3 includes the Applciation client specification level 1.3.
-APP_CLIENT_14_DESCRIPTION=Application 1.4 includes the Applciation client specification level 1.4.
-CONNECTOR_LEVEL=Connector Architecture Level:
-CONNECTOR_10=1.0
-CONNECTOR_15=1.5
-CONNECTOR_10_DESCRIPTION=Connector Architecture 1.0 modules may only be included in J2EE 1.3 Enterprise Applications.
-CONNECTOR_15_DESCRIPTION=Connector Architecture 1.5 modules may only be included in J2EE 1.4 Enterprise Applications.
-DESCRIPTION=Description:
-WEB_CONTEXT_ROOT=Context Root:
-WEB_CONTENT_FOLDER_NAME=Web content folder name:
-FileImport.invalidSource = Source directory is not valid or has not been specified.
-FileImport.importProblems = Import Problems
-DataTransfer.information = Information
-FileImport.noneSelected = There are no resources currently selected for import.
-File_Selection_UI_=File Selection
-Select_a_file__UI_=Select a file:
-Flexible_Structure=Use flexible project structure
-FlexibleProjectCreationWizard.mainPage.title=J2EE Project
-FlexibleProjectCreationWizard.mainPage.desc=Create a J2EE project.
-FlexibleProjectCreationWizard.title=J2EE Project
-EARComponentCreationWizard.title=New EAR Application Project
-EARComponentCreationWizard.mainPage.title=EAR Application Project
-EARComponentCreationWizard.mainPage.desc=Create a EAR application.
-EARComponentCreationWizard.secondPage.title=J2EE Modules to Add to the EAR
-EARComponentCreationWizard.secondPage.desc=Select, DeSelect, or Add J2EE modules to the new EAR.
-AppClientComponentCreationWizard.title=New Application Client Project
-AppClientComponentCreationWizard.mainPage.title=Application Client Project
-AppClientComponentCreationWizard.mainPage.desc=Create a Application Client.
-DefaultJ2EEComponentCreationWizard.title=Create default J2EE modules.
-DefaultJ2EEComponentCreationWizard.page.title=New J2EE Module
-DefaultJ2EEComponentCreationWizard.page.desc=Create a new J2EE module for the selected module type
-DefaultJ2EEComponentCreationWizard.page.label.ejb=EJB module
-DefaultJ2EEComponentCreationWizard.page.label.web=Web module
-DefaultJ2EEComponentCreationWizard.page.label.jca=Connector module
-DefaultJ2EEComponentCreationWizard.page.label.appclient=Application client module
-DefaultJ2EEComponentCreationWizard.page.button.select=Create default modules
-
-FOLDER_LABEL=Folder:
-BROWSE_BUTTON_LABEL=Browse...
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class name:
-SUPERCLASS_LABEL=Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose a valid java source folder for the selected module.
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
-ADD_BUTTON_LABEL=Add...
-REMOVE_BUTTON=Remove
-BINARY=Binary
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-JAVAUTILITY_MAIN_PG_TITLE=Java Component
-JAVAUTILITY_MAIN_PG_DESC=Create a Java Component
-JAVAUTIL_COMPONENT_WIZ_TITLE=New Java Utility Module
-AVAILABLE_J2EE_COMPONENTS= Available J2EE modules
-EXTERNAL_JAR=Add External JARs...
-PROJECT_JAR=Add JARs...
-ADDVARIABLE=Add Variable...
-SUPPORTMULTIPLEMODULES=Support Multiple Modules per project
-SOURCEFOLDER=Source Folder:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties
deleted file mode 100644
index f8ff5fa15..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties
+++ /dev/null
@@ -1,23 +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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Connector Project
-_2=J2C version:
-_3=Connector Project
-_4=Create a standalone Connector module or add it to a new or existing Enterprise Application project.
-_5=Import a Connector module from the file system
-_6=Connector Import
-_7=Connector file:
-_8=Connector module:
-_9=Connector Export
-_10=Export Connector module to the local file system.
-_11=Configure Connector module settings.
-connector_export_action_label_ui_=Export RAR File...
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties
deleted file mode 100644
index 004f4c149..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties
+++ /dev/null
@@ -1,42 +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
-###############################################################################
-Up_1=&Up
-Down_2=&Down
-Select_All_3=Select &All
-Deselect_All_4=D&eselect All
-ERROR_READING_MANIFEST_DIALOG_TITLE=Error Reading Manifest
-SAVE_MANIFEST_WITH_ERROR=The manifest file contains errors and can not be parsed.  The file will be saved but the Java build path will not be updated.  Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR=The manifest file contains errors and can not be parsed.  Other pages cannot be used until these errors are corrected.  Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE=The manifest file contains errors and can not be parsed.  Following are common limitations which can cause problems:
-MANIFEST_PROBLEM_1=* Lines in the file must be no greater than 72 bytes. Continuation of long lines is indicated by a new line and a space.
-MANIFEST_PROBLEM_2=* The last line in the file must end with a new line or it will not be parsed.
-MANIFEST_PROBLEM_3=* Blank lines with extra white space may cause parse to fail.
-MANIFEST_PROBLEM_4=* The attributes must be formatted correctly.  Refer to the manifest and JAR file specification for more information.
-An_internal_error_occurred_ERROR_=IWAE0010E An internal error occurred:
-Project_name__UI_=Project name:
-EAR_Project_Name__UI__UI_=Enterprise application project name:
-Available_dependent_JARs__UI_=Available dependent JARs:
-Manifest_Class_Path__UI_=Manifest Class-Path:
-JAR_Module_UI_=JAR/Module
-Project_UI_=Project
-EAR_Modules=EAR Modules:
-EAR_Modules_Desc=This property page lets you setup the module dependencies in an Enterprise Application.
-J2EE_Modules=J2EE Modules
-J2EE_Modules_Desc=This property page lets you setup the j2ee module dependencies with other j2ee modules within an Enterprise Application.  All modules involved in the dependency need to belong to the same Enterprise Application.
-Web_Libraries=Web Libraries
-Web_Libraries_Desc=This property page lets you add the Web Library dependency to other java modules in the workpspace. This dependency resolves the java modules into the web\\lib folder of the web module at deployment time.
-EAR_Module_Dep_Error=J2EE Modules is not valid for EAR modules.
-Jar_Dep_One_Module_Error=Java Jar Dependencies is valid only for one module per flexible project.
-Web_Lib_Error=Web library settings are only valid for Web modules.
-REDIRECT_TEXT_EDITOR_UI_=REDIRECT_TEXT_EDITOR_UI_
-Error_Checking_Project_Facets=Error checking project facets.
-Error_Checking_Project_Facets=Error checking project facets.
-WEB_LIB_LIST_DESCRIPTION=Select utility projects to add as Web Library projects to the web module
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/migwizards.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/migwizards.properties
deleted file mode 100644
index 0282152aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/migwizards.properties
+++ /dev/null
@@ -1,187 +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
-###############################################################################
-#migration wizards
-Select_All=Select All
-Deselect_All=Deselect All
-Migration_Wizard_Title_=J2EE Migration Wizard
-J2EE_Migration_Wizard_Welcome_=J2EE Migration Wizard Welcome Page
-Welcome_To_The_J2EE_Migration_Wizard_=Welcome to the J2EE Migration Wizard
-Please_Read_The_Following_Information_=Please read the following information, then click Next.
-The_Migration_Wizard_Guides_The_Process_=The Migration Wizard guides the process of optionally migrating your J2EE project structures and the J2EE version of the associated projects.
-Prior_To_Proceeding_With_The_Migration_Wizard_=Prior to proceeding with the Migration Wizard it is strongly recommended you:
-Read_The_Online_Help_Section_=Read the online help on Migrating applications to J2EE 1.3 and J2EE 1.4 specification levels."
-Backup_Your_Entire_Workspace_=Backup your entire workspace.
-If_Working_With_A_Repository_=If working with a repository, "check out" or "lock" all corresponding projects.
-Once_The_Migration_Wizard_Is_Complete_=Once the Migration Wizard is complete, the details of the steps performed during migration will be presented in a results window.  This information is also written to the LoggingUtil.log file in the .metadata folder in your local workspace.
-Based_On_The_Number_Of_Projects_=Based on the number of projects, migration may take a few minutes.
-Enterprise_Application_=Enterprise Application
-The_following_enterprise_application_project_=The following enterprise application project will be migrated.  The project structure migration is optional.
-Enterprise_Application_Project_=Enterprise Application Project:
-Migrate_Project_Structure_=Migrate project structure.
-Migrate_Project_From_Version_=Migrate project J2EE specification level.
-Version_Level=J2EE version
-TARGET_SERVER=Target Server
-The_Project_Version_And_The_Deployment_Descriptor_=The project version and the deployment descriptor are migrated for the enterprise application.  This migration allows for the inclusion of J2EE 1.3 modules into the enterprise application.
-Migrate_All_Module_Projects_=Migrate all module projects
-All_EJB_Web_Application_Client_Modules_Referenced_=All EJB, web, and application client modules referenced by the enterprise application are automatically selected for migration.
-Select_The_Finish_Button_To_Accept_The_Default_=Select the Finish button to accept the default migration options for all module projects, or customize the migration options for each type of module project on the following pages.
-Migrate_Project_From_Version_EJB_=Migrate project from version level J2EE 1.2 (EJB 1.x) to J2EE 1.3 (EJB 2.x)
-EJB_Module_Migration_=EJB Module Migration
-Select_the_EJB_projects_to_be_migrated_=Select the EJB projects to be migrated.  The project structures migration is optional.
-Migrated_CMP_Beans_To_=Migrate CMP 1.x beans to CMP 2.x beans
-Add_Local_Client_Views_=Add local client views
-Available_Projects_=Projects:
-Selected_Projects_={0} of {1} projects selected.
-Selected_Beans_Migration_={0} of {1} beans selected.
-Application_Client_Projects_=Application Client Projects:
-Connector_Projects_=Connector Projects:
-Select_The_Connector_Projects_=Select the connector projects to be migrated. The project structure migration is optional.
-Select_The_Application_Client_Projects_=Select the application client projects to be migrated. The project structure migration is optional.
-WEB_MIGRATE_WIZARD_TITLE=Web Projects:
-WEB_MIGRATE_WIZARD_DESCRIPTION=Select the web projects to be migrated.  The project structure migration is optional.
-Select_the_enterprise_beans_that_will_have_=Select the enterprise beans that will have local client views added.
-Enterprise_Beans_Selection_=Enterprise Beans
-Select_All_Entity_Beans_=Select All Entity Beans
-Select_Required_Beans_=Select Required
-Delete_Remote_Client_Views_=Delete remote client views
-Local_Client_View_Naming_Scheme_=Local client view naming scheme
-Reuse_The_Deleted_Remote_Client_View_=Reuse the deleted remote client view name
-Specify_Suffix_=Specify suffix:
-EJB_Client_View_Example_=For example, EJB bean "Foo" will have local client views named: "Foo{0}" and "Foo{1}Home".
-The_Suffix_Text_Can_Not_Be_=The suffix text cannot be empty.
-A_Project_Must_Be_Selected_=A project must be selected in order to migrate.
-A_Bean_Must_Be_Selected_=A bean must be selected in order to migrate the local client view.
-#moved from mofj2ee.properties
-Stack_trace_of_nested_exce=Stack trace of nested exception:
-ERROR=Error:
-WARNING=Warning:
-INFO=Info:
-DEFAULT_COMPLETED_STATUS_MSG=Migration was completed for {0}.
-DEFAULT_NOT_NEEDED_STATUS_MSG=Migration was not required for {0}.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=Migration was not possible for {0}.
-DEFAULT_ERROR_STATUS_MSG=IWAE0003E Error migrating {0}.
-REMOVED_LOCAL_CLIENT_MSG=Removed local client view for EJB {0}.
-REMOVED_ACCESS_INTENTS_MSG=Removed {0} 1.1 method access intent(s) from CMP bean {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Removed {0} 1.1 method isolation level(s) from CMP bean {1}.
-CONVERTED_FINDER_MSG=Converted finder descripter for {0} in CMP bean {1}.  Use the EJB editor to update the query EJB QL.
-UNNAMED_EJB=<Unnamed CMP bean>
-CONVERTED_QUERY_DESCRIPTION=Converted from IBM version 1.1 extensions.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=Migrated default Datasource binding to a default CMP Connection Factory binding for EJB JAR \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=Migrated default Datasource binding to a default CMP Connection Factory binding for EJB JAR.
-J2EE_VERSION_NULL_ERROR=Unable to get J2EE version of object because it is not contained by a document.
-J2EE_VERSION_PROXY_ERROR=Unable to get J2EE version of referenced object because the proxy cannot be resolved.  Check the ids in the deployment descriptor files.  HREF = {0}.
-#moved from j2eecreation.properties
-J2EE_PROJECT_MIGRATION_TITLE_UI_=J2EE Project Migration
-ENTERPRISE_APPLICATIONS_UI_=Enterprise Applications
-WIZ_BAN_DESC_UI_=Select the {0} projects to be migrated. The project structure migration is optional.
-ENTERPRISE_APP_PROJECTS_UI_=Enterprise application projects:
-MIGRATE_J2EE_SPEC_UI_=Migrate project from version level J2EE 1.2 to J2EE 1.3
-MIGRATE_EJB_SPEC_UI_=Migrate project from version level EJB 1.1 to EJB 2.0
-MIGRATE_MODULE_PROJECTS_UI_=Migrate module projects
-APPLICATION_CLIENTS_UI_=Application Clients
-APPLICATION_CLIENT_PROJECTS_UI_=Application client projects:
-ENTERPRISE_BEANS_BAN_UI_=Enterprise Beans
-EJB_PROJECTS_UI_=EJB projects:
-ADD_LOCAL_CLIENT_VIEWS_CHECK_UI_=Add local client views
-MIGRATE_CMP_BEANS_UI_=Migrate CMP 1.1 beans to CMP 2.0 beans
-ADD_LOCAL_CLIENT_VIEWS_BAN_UI_=Add Local Client Views
-SELECT_EJB_CLIENT_VIEWS_UI_=Select the enterprise beans that will have local client views added.
-ENTERPRISE_BEANS_LIST_UI_=Enterprise beans:
-DELETE_REM_CLIENT_VIEWS_UI_=Delete remote client views
-LOCAL_CLIENT_VIEW_SCHEME_UI_=Local client view naming scheme:
-REUSE_DELETED_CLIENT_VIEW_NAME_UI_=Reuse the deleted remote client view name
-SPECIFY_SUFFIX_UI_=Specify suffix:
-SUFFIX_EXAMPLE_UI_=(For example, enterprise bean \'foo\' will have local client views named: \'fooLocal\' and \'fooLocalHome\'.)
-MIGRATION_SUCCESS_REPORT_UI_=Migration finished successfully.
-MIGRATION_WARNINGS_REPORT_UI_=Migration finished with warnings; see log files for details.
-MIGRATION_ERRORS_REPORT_UI_=Migration finished with errors; see log files for details.
-PROJECT_STRUCTURE_SUCCESS_UI_=Project structure migration successful: {0}.
-PROJECT_STRUCTURE_FAILED_UI_=Project structure migration failed: {0}.
-PROJECT_NOT_NEED_MIGRATION_UI_=Project structure did not need migration: {0}.
-J2EE_VERSION_SUCCESS_UI_=J2EE version level migration successful: {0}.
-J2EE_VERSION_FAILED_UI_=J2EE version level migration failed: {0}.
-J2EE_VERSION_NOT_NEED_MIGRATION_UI_=J2EE version level did not need migration: {0}.
-LOCAL_CLIENT_ADD_SUCCESS_UI_=Local client views added successfully: {0}.
-LOCAL_CLIENT_ADD_FAILED_UI_=Local client views failed on add: {0}.
-LOCAL_CLIENT_VIEWS_EXIST_UI_=Local client views already exist: {0}.
-REMOTE_CLIENT_DELETE_SUCCESS_UI_=Remote client views deleted successfully: {0}.
-REMOTE_CLIENT_DELETE_FAILED_UI_=Remote client views failed on delete: {0}.
-REMOTE_CLIENT_VIEWS_NOT_EXIST_UI_=Remote client views did not exist: {0}.
-JAR_11_IMPORT_20_UI_=The 1.1 JAR is being imported into an EJB 2.0 module.  The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-CMP_11_IMPORT_20_UI_=The following CMP 1.1 beans are being imported into an EJB 2.0 module. The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-OLD_PROJECT_STRUCTURE_UI_=The J2EE project {0} has an old project structure, and should be migrated.
-PROJECT_MUST_BE_SELECTED_UI_=A {0} project must be selected.
-ENTERPRISE_APPLICATION_UI_=enterprise application
-APPLICATION_CLIENT_UI_=application client
-EJB_UI_=EJB
-WEB_UI_=WEB
-EJB_MUST_BE_SELECTED_UI_=An enterprise bean must be selected.
-MIGRATE_UI_=Migrate...
-MIGRATE_J2EE_PROJECTS_UI_=Migrate J2EE Projects...
-OPEN_J2EE_MIGRATION_WIZARD_UI_=Open J2EE Migration Wizard...
-MIGRATING_PROJECT_STRUCTURES_UI_=Migrating project structure...
-MIGRATING_J2EE_VERSION_UI_=Migrating project J2EE version level...
-ADDING_LOCAL_CLIENT_VIEWS_UI_=Adding local client views...
-DELETING_REMOTE_CLIENT_VIEWS_UI_=Deleting remote client views...
-MIGRATION_NOT_NEEDED_REPORT=Migration was not needed for the selected items.
-MIGRATION_NOT_POSSIBLE_REPORT=Migration was not possible for the selected items.
-SOURCE_FOLDER_RENAME_FAILED=Unable to rename the Java source folder {0}.
-SOURCE_FOLDER_RENAME_SKIPPED=The Java source folders are not renamed when there is more than one source folder.
-WEBCONTENT_FOLDER_RENAME_FAILED=Unable to rename the web content folder {0}.
-WEBCONTENT_FOLDER_RENAME_SKIPPED=The web content folder {0} not renamed.
-WEBPROJECT_VERSION_MIGRATE_FAILED=Unable to migrate the web project version.
-ABS_PATHS_APP_EXT_REMOVED=Absolute paths were removed from the application extensions file in enterprise application project {0}.
-PROJECT_REFERENCES_UPDATED=Project references were updated in enterprise application project {0}.
-PROJECT_CLASSPATH_UPDATED=Project Java build path was updated for project {0}.
-FAILED_MIGRATING_IMPORTED_CLASSES=Unable to migrate the imported_classes JAR file.  Exception: {0}
-EXTRACTED_IMPORTED_CLASSES=Imported classes were extracted from file {0}.
-IMPORTED_CLASSES_FILE_DELETED=Imported classes file {0} was deleted.
-BACKEND_MIGRATION_FAILED=Unable to migrate the Map and Schema file structure in project {0}
-BINARY_MIGRATION_FAILED=Unable to migrate binary project {0}.
-COMPLETED_BACKEND_MIG=The backend (Map and Schema) meta-data of the {0} project migrated successfully.
-NOT_NEEDED_DEPLOYMENT_DESC_MIG=The deployment descriptor was not found in the project {0}.
-NOT_NEEDED_BACKEND_MIG=The old backend (Map and Schema) structure was not found in the project {0}.
-MIGRATION_COMPLETE=Migration Complete
-MIGRATION_ERRORS=Migration Errors
-MIGRATION_NOT_NEEDED=Migration Not Needed
-CONFIRMATION_TITLE=Confirm Migration
-OPEN_EDITORS_TITLE=Open Editors
-CONFIRM_MIGRATE_PROJECT_STRUCTURE=This will migrate the project structure for the selected items to the latest format.  Continue?
-CONFIRM_MIGRATE_J2EE_13=This will migrate the project structure for the selected items if necessary, and migrate the J2EE version of the selected items from 1.2 to 1.3.  Continue?
-INFORM_OPEN_EDITORS=Open editors exist in the workbench.  Please close all editors before running migration.\n\nDo you want to close all editors and continue migration?
-WEBCONTENT_LIBPATH_UPDATE_FAILED=Unable to remove JAR file from classpath.
-FAILED_DEPLOY_DELETE=Failed deleting deploy code in {0} project.
-COMPLETED_DEPLOY_DELETE=Completed delete of deploy code in {0} project.
-FAILED_LOCAL_CLIENT_CREATE=Failed creating local client view for {0}.
-COMPLETED_LOCAL_CLIENT_CREATE=Completed creation of a local client view for {0}.
-COMPLETED_CMP20_CODEGEN=Completed CMP 2.0 code generation in {0} project.
-LOCAL_CLIENT_NOT_NEEDED=A local client view was not created since one already exists for {0}.
-INVALID_SELECTION_TITLE=Invalid Selection
-INFORM_INVALID_J2EE_SELECTION=One or more J2EE 1.4 specification projects have been selected for migration that is not valid.\nOnly J2EE 1.2 or 1.3 specification projects can be migrated.
-INFORM_PROPER_SELECTION=Selection must be one enterprise application project or any combination of EJB, web, and application client module projects.
-REQUIRED_CLIENT_VIEW_TITLE=Client View Required
-CONFIRM_CLIENT_VIEW_REQUIRED=The following beans are required to have client views because of inheritance or relationship rules.  These beans will be automatically selected and client views will be generated.
-FILES_OUT_OF_SYNC=Cannot migrate because some resources are out-of-sync with the file system in project {0}.  Refresh the project and try again.
-SERVER_TARGET_SETTING_FAILED_UI_=Setting of target server failed: {0}.
-RemoveCompatibilityActionDelegate_UI_0=Warninig
-RemoveCompatibilityActionDelegate_UI_1=Continue Removing Backward Compatibility from Projects?
-JaxrpcmapSpecificationMigrator_UI_1=jaxrpc mapping migration completed successfully
-JaxrpcmapSpecificationMigrator_UI_2=Migration of jaxrpc mapping descriptor is not possible because the module root folder was not found.
-WebServicesClientSpecificationMigrator_UI_0=Web services client migration completed successfully.
-WebServicesClientSpecificationMigrator_UI_1=A valid project is required for Webservices Migration
-WebServicesClientSpecificationMigrator_UI_2=Could not locate Webservices.
-WebServicesClientSpecificationMigrator_UI_3=There is no webservices client file to migrate.
-WebServicesSpecificationMigrator_UI_0=Web services migration completed successfully.
-WebServicesSpecificationMigrator_UI_1=No Web services migration was required
-J2EEProjectStructureMigrationOperation_UI_4=Migration of Web Project version successful
-J2EEProjectStructureMigrationOperation_UI_0="Project {0} -- Renamed \'{1} \' to \'{2}\'.
-J2EEProjectStructureMigrationOperation_UI_1=Problem renaming java source: {0}.
-J2EEProjectStructureMigrationOperation_UI_2="Problem renaming web content: {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.web/.classpath b/plugins/org.eclipse.jst.j2ee.web/.classpath
deleted file mode 100644
index d2d07c15b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="web/"/>
-	<classpathentry kind="src" path="war-validation/"/>
-	<classpathentry kind="src" path="webedit/"/>
-	<classpathentry kind="src" path="webproject/"/>
-	<classpathentry kind="src" path="property_files/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.cvsignore b/plugins/org.eclipse.jst.j2ee.web/.cvsignore
deleted file mode 100644
index 9b9b366cd..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.web/.project b/plugins/org.eclipse.jst.j2ee.web/.project
deleted file mode 100644
index eb96e2c41..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.web</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
deleted file mode 100644
index 037702834..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.web.archive.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.classpath;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.deployables;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.jfaces.extension;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.providers;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.validation;x-internal:=true,
- org.eclipse.jst.j2ee.web.componentcore.util,
- org.eclipse.jst.j2ee.web.datamodel.properties,
- org.eclipse.jst.j2ee.web.project.facet
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.web/about.html b/plugins/org.eclipse.jst.j2ee.web/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.web/build.properties b/plugins/org.eclipse.jst.j2ee.web/build.properties
deleted file mode 100644
index a6a23c610..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/build.properties
+++ /dev/null
@@ -1,26 +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,\
-               templates/,\
-               .,\
-               META-INF/,\
-               about.html,\
-               schema/
-jars.compile.order = .
-source.. = web/,\
-           war-validation/,\
-           webedit/,\
-           webproject/,\
-           property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.web/component.xml b/plugins/org.eclipse.jst.j2ee.web/component.xml
deleted file mode 100644
index e08c4bd6b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.web" fragment="false"/><plugin id="org.eclipse.jst.servlet.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif b/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif
deleted file mode 100644
index e12289b3c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif b/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif
deleted file mode 100644
index 8450a6f0e..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif
deleted file mode 100644
index 9f75eb094..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif
deleted file mode 100644
index 5b64c4d75..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif b/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif
deleted file mode 100644
index 119dcccd5..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif b/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif
deleted file mode 100644
index 811b21bbb..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif b/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif
deleted file mode 100644
index 811b21bbb..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif b/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif
deleted file mode 100644
index 184556359..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif
deleted file mode 100644
index 3c8a0ba87..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/field.gif b/plugins/org.eclipse.jst.j2ee.web/icons/field.gif
deleted file mode 100644
index 06d38f5c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/field.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif b/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif
deleted file mode 100644
index 0712d1ed9..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif
deleted file mode 100644
index 8f2e36ba6..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif b/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif b/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif
deleted file mode 100644
index e3fcbb1e6..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif
deleted file mode 100644
index 5f2f2d958..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif
deleted file mode 100644
index 7a479e8eb..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index 225e8136c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 45ca1829c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index 346fc4980..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 1df6f5fc3..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index 518124160..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif
deleted file mode 100644
index 5397c660f..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif
deleted file mode 100644
index 34229a790..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif
deleted file mode 100644
index 256e5a0a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif
deleted file mode 100644
index e8efe69dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif
deleted file mode 100644
index 3d75cb53a..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif
deleted file mode 100644
index 52bac3646..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif
deleted file mode 100644
index fc66e9ea7..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif
deleted file mode 100644
index 400e049ed..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif
deleted file mode 100644
index 41768717c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif
deleted file mode 100644
index e33651358..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif
deleted file mode 100644
index d528595b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif
deleted file mode 100644
index 43e86dbfd..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d1c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif
deleted file mode 100644
index 31ecb7aee..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif
deleted file mode 100644
index e0dd2d85c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif
deleted file mode 100644
index 23f12fa33..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif
deleted file mode 100644
index 30f0c48da..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif
deleted file mode 100644
index 591559182..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif
deleted file mode 100644
index 53500daf9..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif
deleted file mode 100644
index ef3028807..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif
deleted file mode 100644
index 17633ae45..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f959..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif
deleted file mode 100644
index 4c54bf16c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif
deleted file mode 100644
index 49873f49e..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif
deleted file mode 100644
index d528595b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif
deleted file mode 100644
index 6912defa4..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif
deleted file mode 100644
index f5077423b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif
deleted file mode 100644
index e3539d455..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e39b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif
deleted file mode 100644
index ef3028807..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif
deleted file mode 100644
index 3764249fa..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif
deleted file mode 100644
index 9f779e421..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif
deleted file mode 100644
index 5fd9c9494..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif
deleted file mode 100644
index bda81f7da..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif
deleted file mode 100644
index ababbcafe..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif
deleted file mode 100644
index 56c8c3bb9..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif
deleted file mode 100644
index efb2bd4ec..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif
deleted file mode 100644
index 71c8182d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e924..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d25124251..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe947..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF b/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF
deleted file mode 100644
index 6331e65e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif
deleted file mode 100644
index 162a57805..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif b/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif
deleted file mode 100644
index 162a57805..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif b/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif
deleted file mode 100644
index 997b50c69..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif
deleted file mode 100644
index 8a6367542..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/key.gif b/plugins/org.eclipse.jst.j2ee.web/icons/key.gif
deleted file mode 100644
index 03af38b6b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/key.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif
deleted file mode 100644
index 307044047..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif
deleted file mode 100644
index c3e27cdec..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif
deleted file mode 100644
index b64775883..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif
deleted file mode 100644
index 6d137cd38..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif
deleted file mode 100644
index 8435ec70d..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif
deleted file mode 100644
index f45eadca8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif
deleted file mode 100644
index 8956b3d1c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif
deleted file mode 100644
index d155408e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif
deleted file mode 100644
index b5e8b3f9b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif
deleted file mode 100644
index c495ac8c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif
deleted file mode 100644
index c4a9d210b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc60689c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e997..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif
deleted file mode 100644
index b26c71d2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif
deleted file mode 100644
index 25dc9c892..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif
deleted file mode 100644
index b8797f34f..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/war.gif b/plugins/org.eclipse.jst.j2ee.web/icons/war.gif
deleted file mode 100644
index 31ecb7aee..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/war.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif
deleted file mode 100644
index e2b751dff..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif b/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif
deleted file mode 100644
index acba7cb36..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif
deleted file mode 100644
index 7646c44a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif
deleted file mode 100644
index fec24d632..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif
deleted file mode 100644
index 83f916563..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif
deleted file mode 100644
index 71bf43c76..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif
deleted file mode 100644
index 9fbce0568..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif
deleted file mode 100644
index a9045c131..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361ca..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif b/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif
deleted file mode 100644
index d7dab830d..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif b/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif
deleted file mode 100644
index f4c713273..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif b/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif
deleted file mode 100644
index 1496cba65..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.properties b/plugins/org.eclipse.jst.j2ee.web/plugin.properties
deleted file mode 100644
index a9e434253..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-war_validator_UI_=War Validator
-WEB_FACET_LABEL=Dynamic Web Module
-WEB_FACET_DESCRIPTION=Enables the project to be deployed as a dynamic web module.
-WEB_FACET_TEMPLATE_LABEL=Dynamic Web Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
deleted file mode 100644
index 52ff21f43..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-<!--============================-->
-<!-- Web JSFaces File URL extension -->
-<!--============================-->
-
-   <extension-point id="fileURL" name="FileURL" schema="schema/fileURL.exsd"/>
-
-
-<!--============================-->
-<!-- Web Validator                   -->
-<!--============================-->
-   <extension
-         id="WarValidator"
-         name="%war_validator_UI_"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <facet
-               facetId="jst.web">
-         </facet>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="web.xml">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="*.jar">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter=".websettings">
-         </filter>
-         <helper
-               class="org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper">
-         </helper>
-         <dependentValidator
-               depValValue="true">
-         </dependentValidator>
-         <run
-               class="org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator">
-         </run>
-      </validator>
-   </extension>
-
-   <extension
-         id="WebModuleExtension"
-         name="WebModuleExtension"
-         point="org.eclipse.jst.j2ee.EARModuleExtension">
-      <earModuleExtension
-            extensionClass="org.eclipse.jst.j2ee.internal.web.plugin.WebModuleExtensionImpl">
-      </earModuleExtension>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.web.providers.WebapplicationItemProviderAdapterFactory"
-            packageURI="webapplication.xmi"
-            id="org.eclipse.jst.j2ee.webapplication.provider.WebapplicationItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.web.providers.JspItemProviderAdapterFactory"
-            packageURI="jsp.xmi"
-            id="org.eclipse.jst.j2ee.internal.jsp.provider.JspItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-
-<!-- =========================================================== -->
-<!--   Web Tag set definitions for XDoclet                       -->
-<!-- =========================================================== -->
-
-   <extension
-         id="WebTagSets"
-         point="org.eclipse.jst.common.annotations.controller.AnnotationTagSet">
-      <AnnotationTagSet
-            name="web">
-      </AnnotationTagSet>
-   </extension>
-   
-   <extension
-         id="WebAnnotationInfo"
-         point="org.eclipse.jst.common.annotations.controller.AnnotationTagInfo">
-	  <AnnotationTagInfo
-            tagSet="web"
-            tagName="filter"
-            scope="type">
-         <attrib
-               use="required"
-               name="name">
-         </attrib>
-         <attrib
-               name="description">
-         </attrib>
-         <attrib
-               name="display-name">
-         </attrib>
-         <attrib
-               name="small-icon">
-         </attrib>
-         <attrib
-               name="large-icon">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="filter-init-param"
-            scope="type">
-         <attrib
-               use="required"
-               name="name">
-         </attrib>
-         <attrib
-               name="value">
-         </attrib>
-         <attrib
-               name="description">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="filter-mapping"
-            scope="type">
-         <attrib
-               name="url-pattern">
-         </attrib>
-         <attrib
-               name="servlet-name">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="servlet"
-            scope="type">
-         <attrib
-               use="required"
-               name="name">
-         </attrib>
-         <attrib
-               name="display-name">
-         </attrib>
-         <attrib
-               name="icon">
-         </attrib>
-         <attrib
-               name="description">
-         </attrib>
-         <attrib
-               name="load-on-startup">
-         </attrib>
-         <attrib
-               name="run-as">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="servlet-init-param"
-            multiplicity="*"
-            scope="type">
-         <attrib
-               use="required"
-               name="name">
-         </attrib>
-         <attrib
-               name="value">
-         </attrib>
-         <attrib
-               name="description">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="servlet-mapping"
-            multiplicity="*"
-            scope="type">
-         <attrib
-               use="required"
-               name="url-pattern">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="listener"
-            scope="type">
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="security-role-ref"
-            scope="type">
-         <attrib
-               use="required"
-               name="role-name">
-         </attrib>
-         <attrib
-               use="required"
-               name="role-link">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="resource-env-ref"
-            scope="type">
-         <attrib
-               use="required"
-               name="name">
-         </attrib>
-         <attrib
-               use="required"
-               name="type">
-         </attrib>
-         <attrib
-               name="description">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="resource-ref"
-            scope="type">
-         <attrib
-               use="required"
-               name="name">
-         </attrib>
-         <attrib
-               use="required"
-               name="type">
-         </attrib>
-         <attrib
-               use="required"
-               name="auth">
-         </attrib>
-         <attrib
-               name="description">
-         </attrib>
-         <attrib
-               name="scope">
-         </attrib>
-         <attrib
-               name="jndi-name">
-         </attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="security-role"
-            scope="type">
-            <attrib
-               use="required"
-               name="role-name">
-         	</attrib>
-         	<attrib
-               name="description">
-         	</attrib>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="env-entry"
-            scope="type">
-            <attrib name="name" use="required">
-            </attrib>
-            <attrib name="description"/>
-            <attrib name="type" type="enum">
-            	<enumValues value="java.lang.Boolean"/>
-            	<enumValues value="java.lang.Byte"/>
-				<enumValues value="java.lang.Character"/>
-				<enumValues value="java.lang.String"/>
-				<enumValues value="java.lang.Short"/>
-				<enumValues value="java.lang.Integer"/>
-				<enumValues value="java.lang.Long"/>
-				<enumValues value="java.lang.Float"/>
-				<enumValues value="java.lang.Double"/>
-			</attrib>
-            <attrib name="value"/>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="ejb-ref"
-            scope="type">
-          <attrib name="name" use="required"/>
-          <attrib name="type" type="enum" use="required">
-          	<enumValues value="Entity"/>
-          	<enumValues value="Session"/>
-          </attrib>
-          <attrib name="home" use="required"/>
-          <attrib name="remote" use="required"/>
-          <attrib name="link"/>
-          <attrib name="description"/>
-      </AnnotationTagInfo>
-      <AnnotationTagInfo
-            tagSet="web"
-            tagName="ejb-local-ref"
-            scope="type">
-            <attrib name="name" use="required"/>
-          <attrib name="type" type="enum" use="required">
-          	<enumValues value="Entity"/>
-          	<enumValues value="Session"/>
-          </attrib>
-          <attrib name="home" use="required"/>
-          <attrib name="local" use="required"/>
-          <attrib name="link"/>
-          <attrib name="description"/>
-      </AnnotationTagInfo>      
-   </extension>
-
-
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModel">
-      <editModel
-            editModelID="jst.web"
-            factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
-         <editModelResource
-               autoload="false"
-               URI="WEB-INF/web.xml"/>
-      </editModel>
-   </extension>
-   
-   <extension
-         point="org.eclipse.wst.common.modulecore.artifactedit">
-      <artifactedit
-            typeID="jst.web"
-            class="org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit">
-      </artifactedit>
-   </extension> 
-   
-   <!--============================-->
-   <!-- Builder Provider registrations-->
-   <!--============================-->
-	<extension
-         point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
-     	<ProviderDefinesType
-      		providerType="jst.web.builder"
-      		providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
-		<DataModelProvider
-            class="org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider"
-            id="org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider"/>
-	</extension>
-	
-  <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-    <classpathContainerInitializer
-      class="org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainerInitializer"
-      id="org.eclipse.jst.j2ee.internal.web.container"/>
-  </extension>
-  
-  <!-- Project Facets -->
-  
-  <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
-    <project-facet id="jst.web">
-      <label>%WEB_FACET_LABEL</label>
-      <description>%WEB_FACET_DESCRIPTION</description>
-    </project-facet>
-
-    <project-facet-version facet="jst.web" version="2.2">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>
-    </project-facet-version>
-
-    <project-facet-version facet="jst.web" version="2.3">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>
-    </project-facet-version>
-
-    <project-facet-version facet="jst.web" version="2.4">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>
-    </project-facet-version>
-    
-    <action facet="jst.web" version="[2.2-2.4]" type="INSTALL" id="jst.web.install">
-      <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>
-      <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>
-    </action>
-
-    <event-handler facet="jst.web" version="[2.2-2.4]" type="RUNTIME_CHANGED">
-      <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetRuntimeChangedDelegate"/>
-    </event-handler>
-    
-    <event-handler type="POST_INSTALL" facet="jst.web" version="[2.2-2.4]">
-      <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/>
-    </event-handler>
-    
-    <template id="template.jst.web">
-      <label>%WEB_FACET_TEMPLATE_LABEL</label>
-      <fixed facet="jst.java"/>
-      <fixed facet="jst.web"/>
-    </template>
-
-  </extension>
-	
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml
deleted file mode 100644
index 4978da741..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.web"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/warvalidation.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/warvalidation.properties
deleted file mode 100644
index 4ecfe0132..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/warvalidation.properties
+++ /dev/null
@@ -1,252 +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
-###############################################################################
-#This properties file hold all the externalised strings for eTools WAR Validation project
-# Validation project
-#
-# Messages should be according to the format at:
-#     http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-#     MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-#     CHKJ (IBM WebSphere Validation)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/warvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-
-# 2-July-2001:
-#  This file has been tested using the ProcessMsgFile tool, written by 
-#  Hany Salem and owned by Dennis Hebert.  Any future changes should 
-#  also be verified using this tool.  Please contact Dennis 
-#  (hebert@us.ibm.com or T/L 543-2520) for more information.
-#
-
-# --------------------------------
-ERROR_WAR_VALIDATION_FAILED=CHKJ3000E: WAR Validation Failed: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Duplicate security role named {0}.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: The JSP file, {0}, for the servlet \"{1}\" is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: The <small-icon> file, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: The <large-icon> file, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: The servlet mapping \"{0}\" refers to a servlet that is not defined.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Empty welcome file list entry.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Welcome file {0} is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: The Tag Library Descriptor File, {0}, is missing.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Missing or invalid WAR file.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: The filter mapping \"{0}\" refers to a filter that is not defined.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Welcome Files cannot begin or end with a /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Parsing Error: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Deployment Descriptor Parsing error.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Deployment Descriptor Parsing error.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: Cannot open the deployment descriptor. Validation cannot complete.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: The URL Mapping \"{0}\" is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Invalid Security role-link: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: Invalid HTTP method: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Invalid Transport Gurarantee.  Valid values are \"NONE\", \"INTEGRAL\", or \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: The jsp-file \"{0}\" referenced by servlet {1} must be a full absolute path.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Web Project: {0} is mapped to an invalid Context root: {1} in EAR Project: {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: The Location of the Error Page Must Begin with a /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Invalid Security role-name: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: Invalid auth method.  Valid values are: \"BASIC\", \"DIGEST\", \"FORM\", or \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  Authentication method is {0}.  The form-login-config values will be ignored unless using FORM authentication method.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  Resource ref {0} must contain res-auth of "SERVLET" or "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  Resource ref {0} must contain res-auth of "Application" or "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" is not a valid value for.res-auth in a 2.2 level deployment descriptor.  Use \"SERVLET\" instead.
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" is not a valid value for.res-auth in a 2.2 level deployment descriptor.  Use \"Application\" instead.
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E:  Invalid Exception Type {0}.  The exception type must contain a fully qualified class name of a Java exception type.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: Duplicate URL mapping {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Duplicate Servlet Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Session Timeout is not valid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Duplicate Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Empty Entry {0}.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Duplicate Filter Entry {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: Duplicate ejb-ref element named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: ERROR EAR UNCONTAINED MODULE FILE EXCEPTION
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: Unknown Error Code: {0}.  error-code must contain a valid HTTP status code.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: Invalid res-sharing-scope; valid values are \"Shareable\" or \"Unshareable\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Invalid Environment Entry Type. Valid values are \"java.lang.TYPE\", where TYPE is one of the following: Boolean, Byte, Character, String, Short, Integer, Long, Float, or Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Missing Web Library Project ({0}).  Check the properties of this project to fix this problem.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: The Web Library Project JAR ({0}) conflicts with an actual JAR in the WEB-INF/lib directory.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: The target server of the Web Library Project ({1}) does not match that of this Web Project ({0}).  Run validation on the Web Project if you think that is not the case.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type must be 'Entity' or 'Session'.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=of Type Security Role Name
-Web_Archive_Validator_8=Web Archive Validator
-of_Type_Role_Name_19=of Type Role Name
-of_Type_Parameter_Name_25=of Type Parameter Name
-of_Type_Parameter_Value_26=of Type Parameter Value
-of_Type_Parameter_Name_32=of Type Parameter Name
-of_Type_Parameter_Value_33=of Type Parameter Value
-of_Type_Parameter_Name_39=of Type Parameter Name
-of_Type_Parameter_Value_40=of Type Parameter Value
-of_Type_ejb-ref-name_44=of Type ejb-ref-name
-of_Type_Error_Location_47=of Type Error Location
-of_Type_Error_Location_49=of Type Error Location
-of_Type_Mime_Extension_54=of Type Mime Extension
-of_Type_Mime_Type_55=of Type Mime Type
-of_Type_Mime_Extension___56=of Type Mime Extension:
-of_Type_Web_Resource_Collection_64=of Type Web Resource Collection
-of_Type_Filter_Name_66=of Type Filter Name
-Invalid_URL_70=Invalid URL
-Invalid_URL_75=Invalid URL
-of_Type_Servlet_Name_77=of Type Servlet Name
-of_Type_Taglib_80=of Type Taglib
-of_Type_TagLib___81=of Type TagLib:
-of_Type_Web_Resource_Name_84=of Type Web Resource Name
-of_Type_Welcome_File_Name__87=of Type Welcome File Name
-of_Type_Env_Entry_Name___88=of Type Environment Entry Name
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties
deleted file mode 100644
index 496cf9f73..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties
+++ /dev/null
@@ -1,87 +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
-###############################################################################
-ERR_JAR_NAME_EMPTY=The JAR name cannot be empty.
-ERR_JAR_NAME_EXIST=The JAR name already exists.
-ERR_JAVA_PROJECT_NAME_EMPTY=The Java project name cannot be empty.
-ERR_JAVA_PROJECT_NAME_EXIST=The Java project name already exists.
-ERR_DUPLICATED_INIT_PARAMETER=Duplicated init parameters.
-ERR_DUPLICATED_URL_MAPPING=Duplicated URL mappings.
-
-ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY=The servlet mapping url pattern cannot be empty.
-ERR_SERVLET_MAPPING_URL_PATTERN_EXIST=The servlet mapping url pattern "{0}" already exists.
-KEY_3=The filter mapping url pattern cannot be empty.
-KEY_4=The filter mapping url pattern "{0}" already exists.
-KEY_5=The filter mapping servlet cannot be empty.
-KEY_6=The filter init param name cannot be empty.
-ERR_FILTER_PARAMETER_NAME_EXIST=The filter initialization parameter name already exists.
-ERR_FILTER_MAPPING_SERVLET_EXIST=The filter mapping servlet "{0}" already exists.
-ERR_FILTER_MAPPING_SERVLET_DISPATCHER_TYPES_EMPTY=The dispatcher types cannot be empty.
-ERR_DISPLAY_NAME_EMPTY=The name cannot be empty.
-ERR_SERVLET_NAME_EXIST=The servlet name already exists.
-ERR_SERVLET_DISPLAY_NAME_EXIST=The servlet display name already exists.
-ERR_SERVLET_CLASS_NAME_USED=The class is already associated with other servlet.
-ERR_SERVLET_JAVA_CLASS_NAME_INVALID=Cannot use Servlet as the servlet class name.
-ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY=The servlet mapping url pattern cannot be empty.
-ERR_SERVLET_MAPPING_URL_PATTERN_EXIST=The servlet URL mapping pattern already exists.
-ERR_SERVLET_MAPPING_SERVLET_NOT_EXIST=The servlet does not exist.
-ERR_SERVLET_PARAMETER_NAME_EMPTY=The servlet initialization parameter name cannot be empty.
-ERR_SERVLET_PARAMETER_NAME_EXIST=The servlet initialization parameter name already exists.
-ERR_SERVLET_PARAMETER_VALUE_EMPTY=The servlet initialization parameter value cannot be empty.
-ERR_SERVLET_PARAMETER_VALUE_EXIST=The servlet initialization parameter value already exists.
-ERR_SERVLET_ROLE_REF_NAME_EMPTY=The servlet security role reference name cannot be empty.
-ERR_SERVLET_ROLE_REF_NAME_EXIST=The servlet security role reference name already exists.
-ERR_SERVLET_ROLE_LINK_EMPTY=The servlet security role reference link cannot be empty.
-
-ERR_FILTER_DISPLAY_NAME_EXIST=The filter name already exists.
-ERR_FILTER_CLASS_NAME_USED=The class is already associated with other filter.
-ERR_FILTER_CLASS_NAME_INVALID=Cannot use Filter as the filter class name.
-ERR_LISTENER_DISPLAY_NAME_EXIST=The listener name already exists.
-ERR_LISTENER_CLASS_NAME_USED=The class is already associated with other listener.
-ERR_LISTENER_CLASS_NAME_INVALID=Cannot use Listener as the listener class name.
-
-ERR_PAGE_ENCODING_EMPTY=The page encoding cannot be empty.
-ERR_PAGE_ENCODING_EXIST=The page encoding already exists.
-ERR_URL_PATTERN_EXIST=The URL pattern exists.
-ERR_INCLUDE_PRELUDES_EXIST=The include preludes exists.
-ERR_INCLUDE_CODAS_EXIST=The include Codas exists.
-ERR_SECURITY_CONSTRAINT_NAME_EMPTY=The security constraint name cannot be empty.
-ERR_SECURITY_CONSTRAINT_NAME_EXIST=The security constraint name already exists.
-ERR_CONTEXT_PARAMETER_NAME_EMPTY=The context parameter name cannot be empty.
-ERR_CONTEXT_PARAMETER_NAME_EXIST=The context parameter name already exists.
-ERR_RESOURCE_NAME_EMPTY=The web resource name cannot be empty.
-ERR_RESOURCE_NAME_EXIST=The web resource name already exists.
-ERR_URL_PATTERNS_EMPTY=The URL patterns cannot be empty.
-ERR_MIME_MAPPING_EXTENSION_EMPTY=The Mime mapping extension cannot be empty.
-ERR_MIME_MAPPING_EXTENSION_EXIST=The Mime mapping extension already exists.
-ERR_WELCOME_PAGE_EMPTY=The Welcome file name cannot be empty.
-ERR_WELCOME_PAGE_EXIST=The Welcome file name already exists in Welcome File List.
-ERR_ENV_ENTRY_NAME_EMPTY=The environment entry name cannot be empty.
-ERR_ENV_ENTRY_NAME_EXIST=The environment entry name already exists.
-ERR_ERROR_CODE_EMPTY=The error code cannot be empty.
-ERR_ERROR_CODE_MUST_BE_3_DIGITS=The error code must be three digits.
-ERR_ERROR_PAGE_LOCATION_EMPTY=The error page location cannot be empty.
-ERR_ERROR_PAGE_LOCATION_EXIST=The error page location already exists.
-ERR_ERROR_PAGE_LOCATION_MUST_START_WITH_SLASH=The error page location must start with /.
-ERR_EXCEPTION_TYPE_EMPTY=The exception type cannot be empty.
-ERR_EXCEPTION_SECURITY_ID_NO_BEANS=The bean selection can not be empty.
-ERR_EXCEPTION_ROLE_NAME_EMPTY=The role name can not be empty.
-ERR_LOCALE_NAME_EMPTY=The locale cannot be empty.
-ERR_LOCALE_NAME_EXIST=The locale already exists.
-ERR_TAGLIBREF_URL_EMPTY=The tag lib ref URL cannot be empty.
-ERR_TAGLIBREF_URL_EXIST=The tag lib ref URL already exists.
-ERR_MESSAGE_DESTINATION_NAME_EMPTY=The message destination name cannot be empty.
-ERR_MESSAGE_DESTINATION_NAME_EXIST=The message destination name already exists.
-ERR_EXCEPTION_ROLE_NAME_EMPTY=The security role names cannot be empty.
-ERR_EXCEPTION_METHOD_ELEMENT_EMPTY=The method elements cannot be empty.
-ERR_EXCEPTION_METHOD_TRANSACTION_ATTRIBUTES_EMPTY=The method transaction attributes can not be empty.
-ERR_SERVLET_LIST_EMPTY=The list of servlets to be removed cannot be empty.
-ERR_FILTER_LIST_EMPTY=The list of filters to be removed cannot be empty.
-ERR_LISTENER_LIST_EMPTY=The list of listeners to be removed cannot be empty.
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties
deleted file mode 100644
index 1859b15f9..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties
+++ /dev/null
@@ -1,937 +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
-###############################################################################
-FILTER_MAPPING=Filter Mapping
-LISTENER=Listener
-Container_Selection_UI_=Folder Selection
-Choose_a_Container__UI_=Choose a Folder:
-Container__UI_=Folder:
-Browse..._UI_=Browse...
-Superclass_selection_UI_=Superclass selection
-Choose_a_superclass_UI_=Choose a superclass
-Add..._UI_=Add...
-Remove_UI_=Remove
-No_packages_to_choose_from_UI_=No packages to choose from.
-Error_EXC_=IWAE0015E Error
-Specify_a_name_and_package_UI_=Create a new Servlet class.
-Which_method_stubs_would_y_UI_=Which method stubs would you like to create?
-__Add_to_web.xml?_UI_=Add to web.xml?
-__Add...___UI_=Add
-__Delete___UI_=Delete
-Cancel_UI_=Cancel
-New_UI_=New
-None_UI_=None
-Create_the_Servlet_Class_UI_=Create the Servlet Class
-Define_the_Servlet_in_the__UI_=Define the Servlet in the Deployment Descriptor (web.xml) File
-Identify_any_information_t_UI_=Identify any information that should be inserted into the Deployment Descriptor (web.xml) file for the servlet.
-Create_Two_Children_UI_=Create Two Children
-Create_Child_UI_=Create Child
-Description_UI_=Description
-2concat_UI_=Create a new child for the selected {0}.
-4concat_UI_=Create a child of type {0} for the selected {1}.
-6concat_UI_=Create {0}
-7concat_UI_=Create two new children for the selected {0}.
-8concat_UI_=Create two new children of type {0} for the selected {1}.
-9concat_UI_=Create Two {0}s
-11concat_UI_=AuthConstraint {0}
-12concat_UI_=ContextParam {0}
-13concat_UI_=ErrorPage {0}
-14concat_UI_=ErrorCodeErrorPage {0}
-15concat_UI_=ExceptionTypeErrorPage {0}
-52concat_UI_=FormLoginConfig {0}
-16concat_UI_=FormLoginConfig {0}
-17concat_UI_=HTTPMethodType {0}
-18concat_UI_={0} = {1}
-21concat_UI_=LoginConfig {0}
-22concat_UI_=MimeMapping {0}
-23concat_UI_=RoleNameType {0}
-24concat=Create a child of type WebResourceCollection for the selected {0}.
-26concat_UI_=Create a child of type InitParam for the selected {0}.
-28concat_UI_=Servlet mapping ({0} -> {1})
-31concat_UI_=SessionConfig {0}
-32concat_UI_=TagLibRef {0}
-33concat_UI_=URLPatternType {0}
-34concat_UI_=UserDataConstraint {0}
-35concat_UI_=Create a child of type ContextParam for the selected {0}.
-37concat_UI_=Create a child of type URLPatternType for the selected {0}.
-38concat_UI_=WebResourceCollection {0}
-40concat_UI_=JSPType {0}
-41concat_UI_=ServletType {0}
-42concat_UI_=Create a child of type WelcomeFile for the selected {0}.
-45concat_ERROR_=IWAE0016E Error writing to web.xml:{0}
-50concat_UI_={0} Change
-New_param_UI_=New param
-value_UI_=value
-New_init_param_UI_=New init param
-(New_Security_Role)_UI_=(New Security Role)
-New_security_role_UI_=New security role
-(New_Servlet)_UI_=(New Servlet)
-packagename.classname_UI_=packagename.classname
-New_servlet_UI_=New servlet
-/url/*_UI_=/url/*
-New_servlet_mapping_UI_=New servlet mapping
-(New_filename)_UI_=(New filename)
-New_welcome_file_UI_=New welcome file
-New_welcome_file_list_UI_=New welcome file list
-Problems_Opening_Editor_ERROR_=IWAE0017E Problems Opening Editor
-Large_Icon_Chooser_Dialog_UI_=Large Icon Chooser Dialog
-Small_Icon_Chooser_Dialog_UI_=Small Icon Chooser Dialog
-Browse..._UI__UI_=Browse...
-Value__UI_=Value:
-Description_UI__UI_=Description
-Error_EXC__ERROR_=IWAE0018E Error
-root_undef_ERROR_=IWAE0019E root undef
-Package__UI_=Package:
-(default)_UI_=(default)
-Servlet_Name__UI_=Servlet Name:
-Superclass__UI_=Superclass:
-Interfaces__UI_=Interfaces:
-Modifiers__UI_=Modifiers:
-Use_Single_Thread_Model_UI_=Use Single Thread Model
-Options__UI_=Options:
-Package_Selection_UI_=Package Selection
-Choose_a_package__UI_=Choose a package:
-Superinterfaces_Selection_UI_=Superinterfaces Selection
-Choose_interfaces_UI_=Choose interfaces
-Create_the_Servlet_Class_UI__UI_=Create the Servlet Class
-Inherited_abstract_methods_UI_=Inherited abstract methods
-Constructors_from_supercla_UI_=Constructors from superclass
-Mappings__UI_=Mappings:
-URL_UI_=URL
-URL__UI_=URL:
-Add_Mapping_UI_=Add Mapping
-Display_Name__UI_=Display name:
-Init_Parameters__UI_=Init Parameters:
-Initialization_parameter_UI_=Initialization parameter
-Value_UI_=Value
-Parameter_Name__UI_=Parameter Name:
-Parameter_Value__UI_=Parameter Value:
-Add_Initialization_Paramet_UI_=Add Initialization Parameter
-OK_UI_=OK
-(default_package)_UI_=(default package)
-Authorized_Roles_UI_=Authorized roles
-Edit..._UI_=Edit...
-(New_web_resource_collecti_UI_=(New web resource collection)
-New_web_resource_collectio_UI_=New web resource collection
-Delete_web_resource_collec_UI_=Delete web resource collection
-Web_Resource_Collection_UI_=Web resource collection
-Web_Resource_Collections_UI_=Web Resource Collections
-New_UI__UI_=Add
-Delete_UI_=Remove
-User_Data_Constraint_UI_=User data constraint
-New_security_constraint_UI_=New security constraint
-Transport_guarentee_change_UI_=Transport guarentee change
-Delete_security_constraint_UI_=Delete security constraint
-Security_constraints_UI_=Security constraints
-Name_UI_=Name
-(New_Web_Resource_Collecti_UI_=(New Web Resource Collection)
-Choose_a_JSP_UI_=Choose a JSP
-Select_a_JSP_file_UI_=Select a JSP file
-Choose_a_servlet_UI_=Choose a servlet
-Select_a_servlet_class_UI_=Select a servlet class
-(New_URL)_UI_=(New URL)
-Icon_change_UI_=Icon change
-Authorized_Roles__UI_=Authorized roles:
-Delete_servlet_mappings_UI_=Delete servlet mappings
-Type__UI_=Type:
-Servlet_class_UI_=Servlet class
-JSP_file_UI_=JSP file
-Display_name__UI_=Display name:
-Description__UI_=Description:
-Initialization__UI_=Initialization...
-Icons__UI_=Icons...
-Display_name_change_UI_=Display name change
-Description_change_UI_=Description change
-Web_type_change_UI_=Web type change
-URL_Mappings__UI_=URL mappings:
-New..._UI_=New...
-Add_UI_=Add
-Delete_servlets_UI_=Delete servlets
-Servlets_UI_=Servlets
-(New_URI)_UI_=(New URI)
-/WEB-INF/tlds/(taglib.tld)_UI_=/WEB-INF/tlds/(taglib.tld)
-New_taglib_UI_=New taglib
-Delete_taglibs_UI_=Delete taglibs
-URI_UI_=URI
-Location_UI_=Location
-(New_ContextParameter)_UI_=(New ContextParameter)
-New_context_parameter_UI_=New context parameter
-Context_parameters__UI_=Context parameters:
-Context_Parameter_Name_UI_=Context Parameter Name
-(New_Extension)_UI_=(New Extension)
-New_mime_mapping_UI_=New mime mapping
-Delete_mime_mappings_UI_=Delete mime mappings
-Session_time_out__UI_=Session time out:
-Distributable_UI_=Distributable
-Display_Name_UI_=Display Name
-Session_Config_UI_=Session Config
-Session_Timeout_UI_=Session Timeout
-Mime_mappings__UI_=Mime mappings:
-File_Extension_UI_=File Extension
-Mime_Type_UI_=Mime Type
-Delete_context_parameters_UI_=Delete context parameters
-Welcome_file_name_change_UI_=Welcome file name change
-(New_Welcome_File)_UI_=(New Welcome File)
-Choose_an_Error_Page_UI_=Choose an Error Page
-Select_an_Error_Page_UI_=Select an Error Page
-Delete_welcome_files_UI_=Delete welcome files
-Delete_error_pages_UI_=Delete error pages
-Welcome_files_UI_=Welcome files
-Choose_a_Login_Page_UI_=Choose a Login Page
-Select_a_Login_Page_UI_=Select a Login Page
-Error_mapping__UI_=Error mapping:
-Error/Exception_UI_=Error/Exception
-Login_UI_=Login
-Realm_name__UI_=Realm name:
-Authentication_method__UI_=Authentication method:
-Login_page__UI_=Login page:
-Error_page__UI_=Error page:
-New_login_config_UI_=New login config
-New_auth_method_ERROR_=IWAE0020E New auth method
-New_auth_method_UI_=New auth method
-New_realm_name_UI_=New realm name
-New_form_login_config_UI_=New form login config
-New_form_error_page_UI_=New form error page
-(New_Error_Code)_UI_=(New Error Code)
-New_error_page_UI_=New error page
-Role_Name_UI_=Role Name
-Select_all_UI_=Select all
-Deselect_all_UI_=Deselect all
-Authority_constraint_chang_UI_=Authority constraint change
-Select_Auth_Constraints_UI_=Select Auth Constraints
-Load_on_startup_UI_=Load on startup
-Load_order__UI_=Load order:
-New_parameter_UI_=New parameter
-Initialization_Parameter_UI_=Initialization Parameter
-Load_on_startup_change_UI_=Load on startup change
-Delete_parameter_UI_=Delete parameter
-Initialization_Parameters_UI_=Initialization Parameters
-Security_role_changes_UI_=Security role changes
-New_security_role_referenc_UI_=New security role reference
-remove_security_role_refer_UI_=remove security role reference
-Select_Authorized_Roles_UI_=Select Authorized Roles
-Name__UI_=Name:
-Delete_URL_Patterns_UI_=Delete URL Patterns
-URL_Patterns_UI_=URL Patterns
-HTTP_Methods_UI_=HTTP Methods
-(New_URL_pattern)_UI_=(New URL pattern)
-New_URL_pattern_UI_=New URL pattern
-Web_resource_collection_na_UI_=Web resource collection name change
-Web_resource_collection_de_UI_=Web resource collection description change
-Add_http_method_type_UI_=Add http method type
-Remove_http_method_type_UI_=Remove http method type
-EJB_references_UI_=EJB references
-Resource_factory_reference_UI_=Resource references
-JSP_tag_libraries_UI_=JSP tag libraries
-References_UI_=References
-Environment_UI_=Environment
-Source_UI_=Source
-Error_creating_nested_text_ERROR_=IWAE0021E Error creating nested text editor
-Pages_UI_=Pages
-Security_UI_=Security
-General_UI_=General
-The_description_property_UI_=The description property
-Roles_UI_=Roles
-The_roles_property_UI_=The roles property
-SecConstraint_UI_=SecConstraint
-The_secConstraint_property_UI_=The secConstraint property
-ParamName_UI_=ParamName
-The_paramName_property_UI_=The paramName property
-ParamValue_UI_=ParamValue
-The_paramValue_property_UI_=The paramValue property
-WebApp_UI_=WebApp
-The_webApp_property_UI_=The webApp property
-The_location_property_UI_=The location property
-ErrorCode_UI_=ErrorCode
-The_errorCode_property_UI_=The errorCode property
-ExceptionType_UI_=ExceptionType
-The_exceptionType_property_UI_=The exceptionType property
-FormLoginPage_UI_=FormLoginPage
-The_formLoginPage_property_UI_=The formLoginPage property
-FormErrorPage_UI_=FormErrorPage
-The_formErrorPage_property_UI_=The formErrorPage property
-LoginConfig_UI_=LoginConfig
-The_loginConfig_property_UI_=The loginConfig property
-HttpMethod_UI_=HttpMethod
-The_httpMethod_property_UI_=The httpMethod property
-ResCollection_UI_=ResCollection
-The_resCollection_property_UI_=The resCollection property
-AuthMethod_UI_=AuthMethod
-The_authMethod_property_UI_=The authMethod property
-RealmName_UI_=RealmName
-The_realmName_property_UI_=The realmName property
-FormLoginConfig_UI_=FormLoginConfig
-The_formLoginConfig_proper_UI_=The formLoginConfig property
-Extension_UI_=Extension
-The_extension_property_UI_=The extension property
-MimeType_UI_=MimeType
-The_mimeType_property_UI_=The mimeType property
-RoleName_UI_=RoleName
-The_roleName_property_UI_=The roleName property
-AuthConstraint_UI_=AuthConstraint
-The_authConstraint_propert_UI_=The authConstraint property
-UserDataConstraint_UI_=UserDataConstraint
-The_userDataConstraint_pro_UI_=The userDataConstraint property
-Create_WebResourceCollecti_UI_=Create WebResourceCollection
-SecurityConstraint_UI_=SecurityConstraint
-SmallIcon_UI_=SmallIcon
-Small_Icon_UI_=Small Icon
-LargeIcon_UI_=LargeIcon
-Large_Icon_UI_=Large Icon
-ServletName_UI_=ServletName
-The_servletName_property_UI_=The servletName property
-DisplayName_UI_=DisplayName
-The_displayName_property_UI_=The displayName property
-LoadOnStartup_UI_=LoadOnStartup
-The_loadOnStartup_property_UI_=The loadOnStartup property
-Create_InitParam_UI_=Create InitParam
-<servlet>_UI_=<servlet>
-UrlPattern_UI_=UrlPattern
-The_urlPattern_property_UI_=The urlPattern property
-Servlet_UI_=Servlet
-The_servlet_property_UI_=The servlet property
-?_UI_=?
-SessionTimeout_UI_=SessionTimeout
-The_sessionTimeout_propert_UI_=The sessionTimeout property
-TaglibURI_UI_=TaglibURI
-The_taglibURI_property_UI_=The taglibURI property
-TaglibLocation_UI_=TaglibLocation
-The_taglibLocation_propert_UI_=The taglibLocation property
-TransportGuarantee_UI_=TransportGuarantee
-The_transportGuarantee_pro_UI_=The transportGuarantee property
-The_distributable_property_UI_=The distributable property
-FileList_UI_=FileList
-The_fileList_property_UI_=The fileList property
-Create_ContextParam_UI_=Create ContextParam
-<web_app>_UI_=<web app>
-WebResourceName_UI_=WebResourceName
-The_webResourceName_proper_UI_=The webResourceName property
-Create_URLPatternType_UI_=Create URLPatternType
-WebType_UI_=WebType
-JspFile_UI_=JspFile
-The_jspFile_property_UI_=The jspFile property
-ClassName_UI_=ClassName
-The_className_property_UI_=The className property
-WelcomeFile_UI_=WelcomeFile
-The_welcomeFile_property_UI_=The welcomeFile property
-<welcome-file>_UI_=<welcome-file>
-Create_WelcomeFile_UI_=Create WelcomeFile
-Welcome_File_List_UI_=Welcome File List
-Error_Message_No_WRC_Entries_UI_=At least one web resource collection is required for a security constraint. If you want to delete this web resource collection, you must delete the entire security constraint.
-Error_Title_No_WRC_Entries_UI_=Web resource collection
-required1concat=Create a child of type #CHILD_CLASS_NAME# for the selected {0}.
-(New_URL)_UI__UI_=(New URL)
-New_param_UI__UI_=New param
-value_UI__UI_=value
-Select_Servlet_or_JSP_UI_=Select Servlet or JSP
-Select_JSP_UI_=Select JSP
-Add_Servlet_or_JSP_UI_=Add Servlet or JSP
-Add_JSP_UI_=Add JSP
-New_ErrorPage_UI_=New ErrorPage
-New_ExceptionType_UI_=New ExceptionType
-Add_Servlet_UI_=Add Servlet
-Web_Nature_Runtime_does_no_EXC_=IWAE0022E Web Nature Runtime does not exist.
-Editor_Redirection_UI_=Editor Redirection
-The_selected_web.xml_file__ERROR_=IWAE0023E The selected web.xml file is not contained within a WAR Project.  Therefore, this web.xml file is not a Deployment Descriptor for a Web Archive, hence the XML editor will be opened.
-Problems_Opening_Editor_UI_=Problems Opening Editor
-Create_#CHILD_CLASS_NAME#_UI_=Create #CHILD_CLASS_NAME#
-Move_Welcome_Files_Down_UI_=Move Welcome Files Down
-Move_Welcome_Files_Up_UI_=Move Welcome Files Up
-Error_occurred_getting_web=Error occurred getting web.xml: {0}
-Select_Class_UI_=Select Class
-Could_not_uniquely_map_the_ERROR_=IWAE0024E Could not uniquely map the class name to a class.
-Information_UI_=Information
-The_chosen_operation_is_no_INFO_=IWAE0025I The chosen operation is not currently available.
-JNDI_Name_UI_=JNDI Name
-New_Servlet_UI_=New Servlet
-
-
-(New_Filter)_1=(New Filter)
-New_filter_2=New filter
-New_filter_mapping_1=New filter mapping
-New_listener_1=New listener
-The_name_property_2=The name property
-The_value_property_4=The value property
-The_target_property_2=The target property
-The_type_property_4=The type property
-The_ExternalCacheGroups_property_2=The ExternalCacheGroups property
-The_IdGenerator_property_4=The IdGenerator property
-The_InvalidateOnly_property_6=The InvalidateOnly property
-The_MetadataGenerator_property_8=The MetadataGenerator property
-The_Priority_property_10=The Priority property
-The_PropertiesGroupName_property_12=The PropertiesGroupName property
-The_Timeout_property_14=The Timeout property
-Small__1=Small:
-Large__3=Large:
-Choose_Small_Icon_5=Choose Small Icon
-Select_the_Small_Icon_6=Select the Small Icon
-Choose_Large_Icon_7=Choose Large Icon
-Select_the_Large_Icon_8=Select the Large Icon
-Caching_group_name__1=Caching group name:
-Priority__2=Priority:
-Timeout__3=Timeout:
-second(s)_4=second(s)
-Invalidate_only_5=Invalidate only
-Caching_group_members__6=Caching group members:
-_Servlet/JSP_7=\ Servlet/JSP
-Remove_9=Remove
-Use_URIs_for_cache_ID_building_1=Use URIs for cache ID building
-Use_specified_string__2=Use specified string:
-Variables__3=Variables:
-_ID_4=\ ID
-_Type_5=\ Type
-_Required_6=\ Required
-External_Cache_groups__1=External Cache groups:
-_Group_Name_2=\ Group Name
-ID_generator__3=ID generator:
-Meta_data_generator__4=Meta data generator:
-Remove_6=Remove
-Add_Servlet_Caching_Configuration_1=Add Servlet Caching Configuration
-Edit_Servlet_Caching_Configuration_2=Edit Servlet Caching Configuration
-Add_1=Add
-Remove_2=Remove
-UP_5=UP
-DOWN_6=DOWN
-Add_or_Remove_Servlet_or_JSP_1=Add or Remove Servlet or JSP
-Add_or_Remove_Security_Role_2=Add or Remove Security Role
-Add_or_Remove_Security_Constraint_3=Add or Remove Security Constraint
-Add_or_Remove_Environment_Variable_4=Add or Remove Environment Variable
-Add_or_Remove_EJB_Reference_5=Add or Remove EJB Reference
-Add_or_Remove_Resource_Reference_6=Add or Remove Resource Reference
-Add_or_Remove_JSP_Tag_Library_7=Add or Remove JSP Tag Library
-Add_or_Remove_Error_Page_8=Add or Remove Error Page
-Add_or_Remove_Exception_Page_9=Add or Remove Exception Page
-Add_or_Remove_Welcome_Page_10=Add or Remove Welcome Page
-Add_or_Remove_Context_Parameter_11=Add or Remove Context Parameter
-Add_or_Remove_Mime_Mapping_12=Add or Remove Mime Mapping
-Add_or_Remove_Filter_13=Add or Remove Filter
-Add_or_Remove_Listener_14=Add or Remove Listener
-Add_or_Remove_Mime_Filter_15=Add or Remove Mime Filter
-Add_or_Remove_File_Serving_Attribute_16=Add or Remove File Serving Attribute
-Add_or_Remove_Invoker_Attribute_17=Add or Remove Invoker Attribute
-Add_or_Remove_JSP_Attribute_18=Add or Remove JSP Attribute
-Add_or_Remove_Servlet_Caching_Configuration_19=Add or Remove Servlet Caching Configuration
-Read_Only_22=Read Only
-Writable_23=Writable
-Read_only_files____25=Read only files:
-Web_Deployment_Descriptor_28=Web Deployment Descriptor
-Environment_1=Environment
-Environment_Variables_2=Environment Variables
-Extensions_1=Extensions
-Filters_1=Filters
-Listeners_1=Listeners
-Mime_1=Mime
-Mime_Mappings_2=Mime Mappings
-Overview_1=Overview
-Pages_1=Pages
-Parameters_1=Parameters
-Context_Parameters_2=Context Parameters
-References_1=References
-References_2=References
-EJB_references_3=EJB references
-Resource_references_4=Resource references
-JSP_tag_libraries_5=JSP tag libraries
-Security_1=Security
-Security_Roles_3=Security Roles
-Security_Constraints_4=Security Constraints
-Servlets_1=Servlets
-Servlets_and_JSPs_2=Servlets and JSPs
-Details_1=Details
-Details_of_the_selected_environment_variable__2=Details of the selected environment variable:
-Type__3=Type:
-Value__13=Value:
-Mime_Type_change_14=Mime Type change
-Variables_1=Variables
-The_following_environment_variables_are_relevant_to_this_web_application__2=The following environment variables are relevant to this web application:
-(New_Variable)_3=(New Variable)
-File_Serving_Attributes_1=File Serving Attributes
-_Name_2=\ Name
-_Value_3=\ Value
-(name)_4=(name)
-(value)_5=(value)
-General_1=General
-Reloading_enabled_2=Reloading enabled
-Reload_interval__3=Reload interval:
-Default_error_page__5=Default error page:
-Additional_class_path__7=Additional class path:
-File_serving_enabled_9=File serving enabled
-Directory_browsing_enabled_10=Directory browsing enabled
-Serve_servlets_by_classname_11=Serve servlets by classname
-Precompile_JSPs_12=Precompile JSPs
-Automatic_Request_Encoding_enabled_13=Automatic Request Encoding enabled
-Automatic_Response_Encoding_enabled_14=Automatic Response Encoding enabled
-Choose_a_Default_Error_Page_15=Choose a Default Error Page
-Reload_Enabled_Changed_16=Reload Enabled Changed
-File_Serving_Enabled_Changed_17=File Serving Enabled Changed
-Directory_Browsing_Enabled_Changed_18=Directory Browsing Enabled Changed
-Serve_Servlets_by_classname_Enabled_Changed_19=Serve Servlets by classname Enabled Changed
-Precompile_JSPs_Enabled_Changed_20=Precompile JSPs Enabled Changed
-Automatic_Request_Encoding_Enabled_Changed_21=Automatic Request Encoding Enabled Changed
-Automatic_Response_Encoding_Enabled_Changed_22=Automatic Response Encoding Enabled Changed
-Reload_Interval_25=Reload Interval
-Default_Error_Page_26=Default Error Page
-Additional_Classpath_27=Additional Classpath
-Invoker_Attributes_1=Invoker Attributes
-JSP_Attributes_1=JSP Attributes
-MIME_Filters__1=MIME Filters
-_Target_2=\ Target
-_Type_3=\ Type
-(target)_4=(target)
-(type)_5=(type)
-Servlet_Caching_Configurations_1=Servlet Caching Configurations
-Details_of_the_selected_filter_2=Details of the selected filter
-Filter_class__3=Filter class:
-Display_name__5=Display name:
-Filter_Type_Selection_7=Filter Type Selection
-FilterItemProvider_UI_0=FilterName
-Choose_a_Filter_Type_8=Choose a Filter Type
-The_following_Filters_are_included_in_this_web_application__2=The following Filters are included in this web application:
-Icons_1=Icons
-The_following_icons_represent_the_selected_filter__2=The following icons represent the selected filter:
-Initialization_1=Initialization
-The_following_Filters_will_be_started_when_the_web_application_is_started__2=The following Filters will be started when the web application is started:
-_Name_3=\ Name
-_Value_4=\ Value
-Delete_Filter_Init_Param_5=Delete Filter Init Param
-(name)_6=(name)
-(value)_7=(value)
-New_Initialization_Parameter_8=New Initialization Parameter
-Servlet_Mappings_2=Servlet Mappings
-The_following_servlets_are_mapped_to_this_filter__3=The following servlets are mapped to this filter:
-Delete_filter_mappings_4=Delete filter mappings
-New_filter_mapping_5=New filter mapping
-URL_Mappings_1=URL Mappings
-The_following_URLs_are_mapped_to_this_filter__2=The following URLs are mapped to this filter:
-Delete_filter_mappings_3=Delete filter mappings
-New_filter_mapping_4=New filter mapping
-Details_of_the_selected_listener_2=Details of the selected listener
-Package__3=Package:
-(default_package)_5=(default package)
-Listeners_5=Listeners
-The_following_Listeners_are_included_in_this_web_application__6=The following Listeners are included in this web application:
-Listener_Type_Selection_10=Listener Type Selection
-Choose_a_Listener_Type_11=Choose a Listener Type
-Details_of_the_selected_file_extension__2=Details of the selected file extension:
-Mime_type__3=Mime type:
-Mime_Type_change_4=Mime Type change
-File_Extensions_1=File Extensions
-The_following_file_extensions_are_mapped_to_Mime_types__2=The following file extensions are mapped to Mime types:
-Context_Parameters_1=Context Parameters
-The_following_context_initialization_parameters_apply_to_all_servlets_in_this_web_application__2=The following context initialization parameters apply to all servlets in this web application:
-Environment_Variables_1=Environment Variables
-The_following_filters_are_used_in_this_application__2=The following filters are used in this application:
-General_Information_1=General Information
-Display_name__2=Display name:
-Description__3=Description:
-Session_time_out__4=Session time out:
-Distributable_5=Distributable
-Display_Name_6=Display Name
-Description_7=Description
-Icons_2=Icons
-The_following_icons_represent_this_web_application__3=The following icons represent this web application:
-The_following_listeners_are_used_in_this_application__2=The following listeners are used in this application:
-Mime_Type_1=Mime Type
-The_following_file_extensions_are_mapped_to_mime_types__2=The following file extensions are mapped to mime types:
-This_web_application_uses_the_following_welcome_and_error_pages__2=This web application uses the following welcome and error pages:
-This_web_application_references_the_following_resources__2=This web application references the following resources:
-The_following_security_roles_and_constraints_are_defined_for_this_web_application__2=The following security roles and constraints are defined for this web application:
-Servlets_and_JSPs_1=Servlets and JSPs
-The_following_servlets_and_JSPs_are_used_in_this_application__2=The following servlets and JSPs are used in this application:
-Usage_1=Usage
-The_following_Enterprise_Applications_use_this_web_module__2=The following Enterprise Applications use this web module:
-Error_Pages_1=Error Pages
-Resources_in_the_following_URLs_will_be_accessed_in_response_to_HTTP_error_codes__2=Resources in the following URLs will be accessed in response to HTTP error codes:
-_Error_Code_3=\ Error Code
-_URL_4=\ URL
-Java_Exception_Types_2=Java Exception Types
-Resources_in_the_following_URLs_will_be_accessed_in_response_to_Java_exception_types__3=Resources in the following URLs will be accessed in response to Java exception types:
-_Exception_Type_4=\ Exception Type
-_URL_5=\ URL
-Exception_Type_Selection_9=Exception Type Selection
-Choose_an_Exception_Type_10=Choose an Exception Type
-Login_1=Login
-The_following_Login_configuration_values_are_used_for_this_web_application__2=The following Login configuration values are used for this web application:
-Realm_name__3=Realm name:
-Authentication_method__4=Authentication method:
-Login_page__5=Login page:
-Error_page__8=Error page:
-Welcome_Pages_1=Welcome Pages
-The_server_will_search_for_the_following_pages,_in_this_order,_when_the_web_application_is_referenced__2=The server will search for the following pages, in this order, when the web application is referenced:
-The_following_context_parameters_are_included_in_this_web_application__2=The following context parameters are included in this web application:
-Details_of_the_selected_context_parameter__2=Details of the selected context parameter:
-Value__3=Value:
-Context_Param_Value_change_4=Context Param Value change
-WebSphere_Bindings_1=WebSphere Bindings
-JNDI_Name__2=JNDI Name:
-Ejb_Ref_JNDI_Name_change_3=Ejb Ref JNDI Name change
-Details_of_the_selected_EJB_reference_2=Details of the selected EJB reference
-Home__6=Home:
-Remote__7=Remote:
-Ejb_Ref_Home_change_8=Ejb Ref Home change
-Ejb_Ref_Remote_change_9=Ejb Ref Remote change
-EJB_Reference_Type_change_10=EJB Reference Type change
-EJB_References_1=EJB References
-The_following_EJB_references_are_used_in_this_web_application__2=The following EJB references are used in this web application:
-JNDI_Name_3=JNDI Name
-Details_of_the_selected_JSP_tag_library_2=Details of the selected JSP tag library
-URI__3=URI:
-Location__4=Location:
-JSP_tag_library_location_change_5=JSP tag library location change
-JSP_tag_library_URI_change_6=JSP tag library URI change
-JSP_tag_libraries_1=JSP tag libraries
-The_following_JSP_tag_libraries_are_used_in_this_web_application__2=The following JSP tag libraries are used in this web application:
-Resource_Ref_JNDI_Name_change_3=Resource Ref JNDI Name change
-Details_of_the_selected_resource_reference_2=Details of the selected resource reference
-Authentication__4=Authentication:
-Resource_Reference_Type_change_7=Resource Reference Type change
-Resource_Reference_Authentication_change_10=Resource Reference Authentication change
-Resource_References_1=Resource References
-The_following_resource_references_are_used_in_this_web_application__2=The following resource references are used in this web application:
-(New_ResourceRef)_3=(New ResourceRef)
-JNDI_Name_4=JNDI Name
-Authorized_Roles_2=Authorized Roles
-The_following_roles_are_authorized_to_access_the_web_resource_collections_in_this_security_constraint__3=The following roles are authorized to access the web resource collections in this security constraint:
-Security_Constraints_1=Security Constraints
-These_constraints_prescribe_access_policies_for_specific_web_resources_2=These constraints prescribe access policies for specific web resources
-User_Data_Constraint_1=User Data Constraint
-The_following_are_the_transport_guarantees_required_between_client_and_server_for_the_security_constraint__2=The following are the transport guarantees required between client and server for the security constraint:
-Web_Resource_Collections_1=Web Resource Collections
-The_following_define_web_resources_and_their_HTTP_method_for_this_web_application__2=The following define web resources and their HTTP method for this web application:
-Details_of_the_selected_security_role__2=Details of the selected security role:
-Security_Roles_Description_change_5=Security Roles Description change
-Security_Roles_1=Security Roles
-The_following_security_roles_are_defined_for_this_web_application__2=The following security roles are defined for this web application:
-Authorized_roles_2=Authorized roles
-The_following_roles_are_authorized_to_access_this_servlet__3=The following roles are authorized to access this servlet:
-Details_of_the_selected_servlet_or_JSP_2=Details of the selected servlet or JSP
-Servlet_class__3=Servlet class:
-WebSphere_Extensions_3=WebSphere Extensions
-Optional_WebSphere_specific_extensions_to_the_Web_Deployment_Descriptor_4=Optional WebSphere specific extensions to the Web Deployment Descriptor
-Unresolved_action__5=Unresolved action:
-Servlet_Extension_Change_6=Servlet Extension Change
-The_following_icons_represent_the_selected_servlet_or_JSP__3=The following icons represent the selected servlet or JSP:
-The_following_URLs_are_mapped_to_this_servlet__2=The following URLs are mapped to this servlet:
-The_following_servlets_and_JSPs_are_included_in_this_web_application__2=The following servlets and JSPs are included in this web application:
-The_filterName_property_3=The filterName property
-The_filter_property_2=The filter property
-The_ListenerClass_property_2=The ListenerClass property
-Details...=Details...
-Load_on_startup_5=Load on startup
-Load_order__6=Load order:
-Delete_Servlet_Init_Param_7=Delete Servlet Init Param
-(name)_8=(name)
-(value)_9=(value)
-New_Initialization_Parameter_10=New Initialization Parameter
-Filter_mapping___1=Filter mapping:
-SecurityConstraint_1=SecurityConstraint
-The_following_initialization_parameters_are_configured_for_this_servlet__1=The following initialization parameters are configured for this servlet:
-Filter_mapping_text=Filter mapping ({0} -> {1})
-Add_or_Remove_Resource_Environment_Reference_1=Add or Remove Resource Environment Reference
-MIME_1=MIME
-MIME_Mappings_2=MIME Mappings
-Resource_Environment_1=Resource Environment
-Automatic_Filter_Loading_enabled_1=Automatic Filter Loading enabled
-Automatic_Filter_Loading_Enabled_Changed_4=Automatic Filter Loading Enabled Changed
-The_following_servlets_have_this_filter_mapped_to_them_1=The following servlets have this filter mapped to them
-The_following_URLs_have_this_filter_mapped_to_them_1=The following URLs have this filter mapped to them
-MIME_type__1=MIME type:
-MIME_Type_change_2=MIME Type change
-The_following_file_extensions_are_mapped_to_MIME_types_1=The following file extensions are mapped to MIME types
-Location_1=\ Location
-Link__1=Link:
-Ejb_Ref_Link_change_2=Ejb Ref Link change
-Resource_Env_Ref_JNDI_Name_change_1=Resource Env Ref JNDI Name change
-Details_of_the_selected_resource_environment_reference_1=Details of the selected resource environment reference
-Type_Selection_2=Type Selection
-Choose_a_type_3=Choose a type
-Resource_Environment_References_1=Resource Environment References
-The_following_resource_environment_references_are_used_in_this_web_application_2=The following resource environment references are used in this web application
-New_ResourceEnvRef_3=New ResourceEnvRef
-Add_Servlet_Extension_1=Add Servlet Extension
-_ERROR_Problems_opening_editor_3=IWAE0026E Problems opening editor
-_ERROR_JSP_file_does_not_exist_4=IWAE0027E JSP file does not exist
-_ERROR_Problems_opening_editor_5=IWAE0028E Problems opening editor
-_ERROR_Could_not_find_type_within_project_6=IWAE0029E Could not find type within project
-_ERROR_Problems_opening_editor_7=IWAE0030E Problems opening editor
-_ERROR_Problems_opening_editor_8=IWAE0031E Problems opening editor
-Add_Variable_1=Add Variable
-Edit_Variable_2=Edit Variable
-Define_a_new_variable_in_this_servlet_caching_configuration_1=Define a new variable in this servlet caching configuration
-Variable_2=Variable
-ID__3=ID:
-Type__4=Type:
-Method__5=Method:
-Data_ID__6=Data ID:
-Invalid_ID__7=Invalid ID:
-Required_8=Required
-Add_External_Cache_Group_1=Add External Cache Group
-Add_an_external_cache_group_to_this_servlet_caching_configuration_1=Add an external cache group to this servlet caching configuration
-External_Cache_Group_2=External Cache Group
-Group_Name__3=Group Name:
-Group_Name_is_empty_5=Group Name is empty
-Caching_group_name_is_empty_2=Caching group name is empty
-Priority_must_be_an_integer_3=Priority must be an integer
-Timeout_must_be_an_integer_4=Timeout must be an integer
-Define_a_new_servlet_caching_configuration_1=Define a new servlet caching configuration
-Servlet_Caching_Configuration_2=Servlet Caching Configuration
-The_DefaultPage_property_2=The DefaultPage property
-The_ErrorPage_property_4=The ErrorPage property
-The_MimeType_property_6=The MimeType property
-The_Name_property_8=The Name property
-The_Pages_property_10=The Pages property
-The_ExtendedServlet_property_2=The ExtendedServlet property
-The_LocalTransaction_property_4=The LocalTransaction property
-The_MarkupLanguage_property_6=The MarkupLanguage property
-Define_Authorization_Constraint_1=Define Authorization Constraint
-Choose_a_servlet__1=Choose a servlet:
-Matching_servlets__2=Matching servlets:
-Qualifier__3=Qualifier:
-Add_or_Remove_EJB_Local_Reference_1=Add or Remove EJB Local Reference
-Add_or_Remove_Markup_Language_2=Add or Remove Markup Language
-Close_editor_3=Close editor
-File_has_been_deleted_from_the_file_system._nWhat_would_you_like_to_do__4=File has been deleted from the file system.\nWhat would you like to do?
-Save_and_close_editor_5=Save and close editor
-Close_editor_6=Close editor
-This_web.xml_file_is_not_a_valid_Deployment_Descriptor_for_a_Web_Archive,_hence_the_XML_editor_will_be_opened_7=This web.xml file is not a valid Deployment Descriptor for a Web Archive, hence the XML editor will be opened.
-EJB_1=EJB
-EJB_Local_2=EJB Local
-Resource_3=Resource
-Resource_Environment_1_4=Resource_Environment_1
-JSP_tag_libraries_5_5=JSP_tag_libraries_5
-Choose_a_filter__1=Choose a filter:
-Matching_filters__2=Matching filters:
-Choose_a_listener__1=Choose a listener:
-Matching_listener__2=Matching listener:
-Problems_opening_editor_2=Problems opening editor
-application.xml_does_not_exist_3=application.xml does not exist
-Refresh_4=Refresh
-Details_of_the_selected_EJB_Local_reference_1=Details of the selected EJB Local reference
-Local_home__2=Local home:
-Local__3=Local:
-EJB_Local_References_1=EJB Local References
-The_following_EJB_local_references_are_used_in_this_web_application_2=The following EJB local references are used in this web application
-(New_EJB_Local_Ref)_3=(New EJB Local Ref)
-(New_ResourceEnvRef)_1=(New ResourceEnvRef)
-Description__2=Description:
-Description_change_3=Description change
-Details_of_the_Servlet_Extension_of_the_selected_servlet_1=Details of the Servlet Extension of the selected servlet
-Markup_Languages_2=Markup Languages
-Local_Transaction_3=Local Transaction
-Delete_Filter_Mapping_1=Delete Filter Mapping
-Add_Filter_Mappings_2=Add Filter Mappings
-Choose_a_JSP__1=Choose a JSP:
-Name__2=Name:
-MIME_type__3=MIME type:
-Error_page__4=Error page:
-Browse_5=Browse
-Default_page__6=Default page:
-Browse_7=Browse
-Pages__8=Pages:
-_Name_9=\ Name
-_URI_10=\ URI
-(Name)_11=(Name)
-(URI)_12=(URI)
-Name_is_empty_13=Name is empty
-MIME_is_empty_14=MIME is empty
-Define_a_new_markup_language_entry_1=Define a new markup language entry
-Markup_Language_2=Markup Language
-Choose_a_Page_1=Choose a Page
-Description__1=Description:
-Environment_variable_value_change_1=Environment variable value change
-Environment_variable_description_change_2=Environment variable description change
-Description_name_change_2=Description name change
-Context_Param_Description_change_1=Context Param Description change
-Ejb_Ref_Description_change_1=Ejb Ref Description change
-Resource_Environment_Ref_Description_change_1=Resource Environment Ref Description change
-Resource_Ref_Description_change_1=Resource Ref Description change
-Details_of_the_selected_security_constraint_1=Details of the selected security constraint
-Display_Name__2=Display Name:
-Security_Constraint_DisplayName_change_3=Security Constraint DisplayName change
-Empty_List_2=Empty List
-_UI_Select_a_tag_library_to_add_to_the_deployment_descriptor_1=Select a tag library to add to the deployment descriptor
-_UI_Add_a_Tag_Library_2=Add a Tag Library
-_UI_Tag_Libraries__3=Tag Libraries:
-_UI_Available_Custom_Tags__4=Available Custom Tags:
-_UI__Tag_5=\ Tag
-_UI__Description_6=\ Description
-_UI_URI__7=URI:
-_UI_Select_a_Tag_Library_8=Select a Tag Library
-_UI_URI_cannot_be_empty_10=URI cannot be empty
-Browse..._1=Browse...
-Browse..._3=Browse...
-Browse..._4=Browse...
-Remove_Link_7=Remove Link
-Home_interface_selection_8=Home interface selection
-Local_interface_selection_13=Local interface selection
-Choose_an_interface_16=Choose an interface
-Matching_interfaces__17=Matching interfaces:
-Set_EJB_Local_Ref_Link_18=Set EJB Local Ref Link
-Remove_EJB_Local_Ref_Link_19=Remove EJB Local Ref Link
-EJB_selection_3=EJB selection
-Choose_an_EJB_4=Choose an EJB
-Matching_EJBs__5=Matching EJBs:
-Location__6=Location:
-Empty_List_11=Empty List
-Set_EJB_Ref_Link_8=Set EJB Ref Link
-Remove_EJB_Ref_Link_9=Remove EJB Ref Link
-Home_interface_selection_11=Home interface selection
-Remote_interface_selection_14=Remote interface selection
-Choose_an_interface_17=Choose an interface
-Matching_interfaces__18=Matching interfaces:
-Specify_an_Error_Code_and_Location_1=Specify an Error Code and Location
-Specify_an_Exception_Type_and_Location_2=Specify an Exception Type and Location
-Add_an_Error_Page_3=Add an Error Page
-Error_Code__4=Error Code:
-Exception_Type__5=Exception Type:
-Select..._6=Select...
-Browse..._7=Browse...
-Location__8=Location:
-Browse..._9=Browse...
-Error_Code_is_empty_13=Error Code is empty
-Exception_Type_is_empty_14=Exception Type is empty
-Location_is_empty_16=Location is empty
-Location_18=Location
-Select_a_Page_19=Select a Page
-Add_a_page_to_this_markup_language_1=Add a page to this markup language
-Page_2=Page
-Name__3=Name:
-URI__4=URI:
-Name_is_empty_8=Name is empty
-URI_is_empty_10=URI is empty
-Details_of_the_Servlet_Extension_for_the_selected_servlet_1=Details of the Servlet Extension for the selected servlet
-Delete_Markup_Language_7=Delete Markup Language
-Add_Markup_Language_entry_8=Add Markup Language entry
-Edit_Markup_Language_entry_9=Edit Markup Language entry
-The_name_property_1=The name property
-The_URI_property_2=The URI property
-Empty_List_1=Empty List
-Web_Library_Projects_1=Web Library Projects
-The_following_JARs_are_mapped_to_Java_projects__2=The following JARs are mapped to Java projects:
-_JAR_Name_3=\ JAR Name
-_Java_Project_4=\ Java Project
-Error_5=Error
-Add_Page_1=Add Page
-Up_1=Up
-Down_2=Down
-Resource_Reference_Shareable_change_3=Resource Reference Shareable change
-Environment_variable_type_change_1=Environment variable type change
-WebSphere_Extensions_1=WebSphere Extensions
-Browse..._2=Browse...
-Remove_Page_3=Remove Page
-Tag_Library_1=Tag Library
-Create_Page_1=Create Page
-Create_MarkupLanguage_1=Create MarkupLanguage
-Add_or_Remove_Servlet_Extension_1=Add or Remove Servlet Extension
-_INFO_No_security_roles_exist._1=IWAE0032I No security roles exist.
-_INFO_No_Enterprise_Beans_which_implement_the_remote_interface_exist._1=IWAE0033I No Enterprise Beans which implement the remote interface exist.
-_INFO_No_Enterprise_Beans_which_implement_the_local_interface_exist._2=IWAE0034I No Enterprise Beans which implement the local interface exist.
-_INFO_No_servlets_exist_to_add._1=IWAE0035I No servlets exist to add.
-_INFO_No_classes_which_implement_javax.servlet.Filter_exist._1=IWAE0037I No classes which implement javax.servlet.Filter exist.
-_INFO_No_filters_exist_to_add._1=IWAE0038I No filters exist to add.
-_INFO_No_listeners_exist_to_add._1=IWAE0039I No listeners exist to add.
-_ERROR_Error_updating_Web_Properties_1=IWAE0040E Error updating Web Properties
-_INFO_No_home_interfaces_exist._1=IWAE0041I No home interfaces exist.
-_INFO_No_local_interfaces_exist._2=IWAE0042I No local interfaces exist.
-_INFO_No_remote_interfaces_exist._2=IWAE0043I No remote interfaces exist.
-_INFO_No_tag_libraries_exist_to_add._1=IWAE0044I No tag libraries exist to add.
-_INFO_No_exceptions_exist_to_add._1=IWAE0045I No exceptions exist to add.
-Add_Resource_Reference_Extension_3=Add Resource Reference Extension
-Virtual_Host_Name__1=Virtual Host Name:
-Connection_management__1=Connection management:
-Isolation_level__2=Isolation level:
-_Markup_Language_1=\ Markup Language
-_Mime_Type_2=\ Mime Type
-Boundary__3=Boundary:
-Resolver__4=Resolver:
-Unresolved_Action__5=Unresolved Action:
-Select_an_Error_Code_1=Select an Error Code
-Code_2=Code
-Description_3=Description
-*_denotes_error_code_new_to_HTTP_1.1_4=* denotes error code new to HTTP 1.1
-Continue*_6=Continue*
-Switching_Protocols*_8=Switching Protocols*
-OK_10=OK
-Created_12=Created
-Accepted_14=Accepted
-Non-Authoritative_Information*_16=Non-Authoritative Information*
-No_Content_18=No Content
-Reset_Content*_20=Reset Content*
-Partial_Content*_22=Partial Content*
-Multiple_Choices_24=Multiple Choices
-Moved_Permanently_26=Moved Permanently
-Found_28=Found
-See_Other*_30=See Other*
-Not_Modified_32=Not Modified
-Use_Proxy*_34=Use Proxy*
-Temporary_Redirect*_36=Temporary Redirect*
-Bad_Request_38=Bad Request
-Unauthorized_40=Unauthorized
-Forbidden_42=Forbidden
-Not_Found_44=Not Found
-Method_Not_Allowed*_46=Method Not Allowed*
-Not_Acceptable*_48=Not Acceptable*
-Proxy_Authentication_Required*_50=Proxy Authentication Required*
-Request_Timeout*_52=Request Timeout*
-Conflict*_54=Conflict*
-Gone*_56=Gone*
-Length_Required*_58=Length Required*
-Precondition_Failed*_60=Precondition Failed*
-Request_Entity_Too_Large*_62=Request Entity Too Large*
-Request_URI_Too_Long*_64=Request URI Too Long*
-Unsupported_Media_Type*_66=Unsupported Media Type*
-Requested_Range_Not_Satisfiable*_68=Requested Range Not Satisfiable*
-Expectation_Failed*_70=Expectation Failed*
-Internal_Server_Error_72=Internal Server Error
-Not_Implemented_74=Not Implemented
-Bad_Gateway_76=Bad Gateway
-Service_Unavailable_78=Service Unavailable
-Gateway_Timeout*_80=Gateway Timeout*
-HTTP_Version_Not_Supported*_82=HTTP Version Not Supported*
-Choose_a_Servlet_1=Choose a Servlet
-Unspecified_1=Unspecified
-Sharing__1=Sharing:
-Error_Page_1=Error Page
-New_EJB_Ref=(New EJB Ref)
-selectSR=Select a Security Role
-Role_name=Role name
-NoSR=No Security Roles exist.
-RemoveUDC=Remove User Data Constraint
-UDC_desc_change=User Data Constraint description changed
-Run_As=Run As
-detRunAs=Details of the selected servlet's run-as element
-SR=Security role:
-Select=Select...
-Remove=Remove
-RemoveRA=Remove run-as
-SetRA=Set run-as
-SetRN=Set role-name
-SecurityRoleRefDialog.Security_Role_Ref=Security Role Ref
-SecurityRoleRefDialog.Role_name=Role name:
-SecurityRoleRefDialog.Role_link=Role link:
-SecurityRoleRefDialog.Description=Description:
-WebapplicationEditor.Add_or_Remove_Security_Role_Ref=Add or Remove Security Role Ref
-Ser_AuthSection._Link=\ Link
-Ser_AuthSection.Edit_Security_Role_Ref=Edit Security Role Ref
-srr_header=Security Role References
-srr_description=The following security role references are defined for this servlet:
-Local_encoding_mapping_list_UI_=Locale Encoding Mapping List
-local_encoding_mapping_UI_=Locale Encoding Mapping
-_UI_JSPConfig_type=JSP Config
-_UI_TagLibRefType_type=TagLibRefType
-_UI_JSPPropertyGroup_type=JSPPropertyGroup
-_UI_JSPPropertyGroup_urlPattern_feature=URL Pattern
-_UI_JSPPropertyGroup_elIgnored_feature=El Ignored
-_UI_JSPPropertyGroup_pageEncoding_feature=Page Encoding
-_UI_JSPPropertyGroup_scriptingInvalid_feature=Scripting Invalid
-_UI_JSPPropertyGroup_isXML_feature=Is XML
-_UI_JSPPropertyGroup_includePreludes_feature=Include Preludes
-_UI_JSPPropertyGroup_includeCodas_feature=Include Codas
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd b/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd
deleted file mode 100644
index 252f46a9e..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.web">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.j2ee.web" id="fileURL" name="File URL"/>
-      </appInfo>
-      <documentation>
-         This is for the Web JSFaces File URL extension.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="fileURL"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="fileURL">
-      <complexType>
-         <sequence>
-            <element ref="run"/>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier for this extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="run">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the qualified name of the class to run
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template
deleted file mode 100644
index 3954ec642..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template
+++ /dev/null
@@ -1,37 +0,0 @@
-<% CreateServletTemplateModel model = (CreateServletTemplateModel) argument; 

-if (model.getJavaPackageName()!=null && model.getJavaPackageName()!="") { %>package <%=model.getJavaPackageName()%>;<%}%>

-

-import java.io.IOException;

-import javax.servlet.ServletException;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-/**

- * Servlet implementation class for Servlet: <%=model.getServletClassName()%>

- *

- * @web.servlet

- *   name="<%=model.getServletName()%>"

- *   display-name="<%=model.getServletName()%>" <%

- if (model.getServletDescription() !=null && model.getServletDescription() != "") { %>

- *   description="<%=model.getServletDescription()%>" <% } %>

- *

- <% List mappings = model.getServletMappings();

- if (mappings!=null && mappings.size()>0) {

-      for (int i=0; i<mappings.size(); i++) {

-      	 String map = model.getServletMapping(i); %>

- * @web.servlet-mapping

- *   url-pattern="<%=map%>"

- *  <% } } 

- List initParams = model.getInitParams();

- if (initParams!=null && initParams.size()>0) {

-    for (int i=0; i<initParams.size(); i++) {

-      String name = model.getInitParam(i,CreateServletTemplateModel.NAME);

-      String value = model.getInitParam(i,CreateServletTemplateModel.VALUE);

-      String description = model.getInitParam(i,CreateServletTemplateModel.DESCRIPTION); %>

- * @web.servlet-init-param

- *    name="<%=name%>"

- *    value="<%=value%>" <% if (description !=null && description!="") { %>

- *    description="<%=description%>" <%} %>

- * <% } } %>

- */

- 
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template
deleted file mode 100644
index ac27405c1..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<% CreateServletTemplateModel model = (CreateServletTemplateModel) argument; 

-if (model.getJavaPackageName()!=null && model.getJavaPackageName()!="") { %>package <%=model.getJavaPackageName()%>;<%}%>

-

-import java.io.IOException;

-import javax.servlet.ServletException;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-/**

- * Servlet implementation class for Servlet: <%=model.getServletClassName()%>

- *

- */

- 
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet
deleted file mode 100644
index 8fa6b2318..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.web" 

-	imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* " 

-	class="ServletTemplate" 

-%><%@ include file="servletHeader.template" %>

-

-<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%}

-%>class <%=model.getServletClassName()%> extends <%=model.getSuperclassName()%><%

- List interfaces = model.getInterfaces(); 

- if (interfaces.size()>0) {%> implements <% }

- for (int i=0; i<interfaces.size(); i++) {

-   String INTERFACE = (String) interfaces.get(i);

-   if (i>0) { %>, <%}%><%=INTERFACE%><%}%> {

-    /* (non-Java-doc)

-	 * @see javax.servlet.http.HttpServlet#HttpServlet()

-	 */

-	public <%=model.getServletClassName()%>() {

-		super();

-	} <% if (model.shouldGenDestroy()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.Servlet#destroy()

-	 */

-	public void destroy() {

-		// TODO Auto-generated method stub

-		super.destroy();

-	} <% } %> <% if (model.shouldGenDoDelete()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)

-	 */

-	protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-		super.doDelete(request, response);

-	} <% } %> 	<% if (model.shouldGenDoGet()) { %>

-	

-	/* (non-Java-doc)

-	 * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)

-	 */

-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-	} <% } %> 	<% if (model.shouldGenDoPost()) { %>

-	

-	/* (non-Java-doc)

-	 * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)

-	 */

-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-	} <% } %>  	<% if (model.shouldGenDoPut()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)

-	 */

-	protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-		super.doPut(request, response);

-	} <% } %>  	<% if (model.shouldGenGetServletInfo()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.Servlet#getServletInfo()

-	 */

-	public String getServletInfo() {

-		// TODO Auto-generated method stub

-		return super.getServletInfo();

-	} <% } %>  <% if (model.shouldGenInit()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.GenericServlet#init()

-	 */

-	public void init() throws ServletException {

-		// TODO Auto-generated method stub

-		super.init();

-	} <% } %>  <% if (model.shouldGenToString()) { %>

-	

-	/* (non-Javadoc)

-	 * @see java.lang.Object#toString()

-	 */

-	public String toString() {

-		// TODO Auto-generated method stub

-		return super.toString();

-	} <% } %>

-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet
deleted file mode 100644
index 31b7e4800..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.web" 

-	imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* " 

-	class="ServletTemplate" 

-%><%@ include file="servletHeaderNonAnnotated.template" %>

-

-<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%}

-%>class <%=model.getServletClassName()%> extends <%=model.getSuperclassName()%><%

- List interfaces = model.getInterfaces(); 

- if (interfaces.size()>0) {%> implements <% }

- for (int i=0; i<interfaces.size(); i++) {

-   String INTERFACE = (String) interfaces.get(i);

-   if (i>0) { %>, <%}%><%=INTERFACE%><%}%> {

-    /* (non-Java-doc)

-	 * @see javax.servlet.http.HttpServlet#HttpServlet()

-	 */

-	public <%=model.getServletClassName()%>() {

-		super();

-	} <% if (model.shouldGenDestroy()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.Servlet#destroy()

-	 */

-	public void destroy() {

-		// TODO Auto-generated method stub

-		super.destroy();

-	} <% } %> <% if (model.shouldGenDoDelete()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)

-	 */

-	protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-		super.doDelete(request, response);

-	} <% } %> 	<% if (model.shouldGenDoGet()) { %>

-	

-	/* (non-Java-doc)

-	 * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)

-	 */

-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-	} <% } %> 	<% if (model.shouldGenDoPost()) { %>

-	

-	/* (non-Java-doc)

-	 * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)

-	 */

-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-	} <% } %>  	<% if (model.shouldGenDoPut()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)

-	 */

-	protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-		// TODO Auto-generated method stub

-		super.doPut(request, response);

-	} <% } %>  	<% if (model.shouldGenGetServletInfo()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.Servlet#getServletInfo()

-	 */

-	public String getServletInfo() {

-		// TODO Auto-generated method stub

-		return super.getServletInfo();

-	} <% } %>  <% if (model.shouldGenInit()) { %>

-	

-	/* (non-Javadoc)

-	 * @see javax.servlet.GenericServlet#init()

-	 */

-	public void init() throws ServletException {

-		// TODO Auto-generated method stub

-		super.init();

-	} <% } %>  <% if (model.shouldGenToString()) { %>

-	

-	/* (non-Javadoc)

-	 * @see java.lang.Object#toString()

-	 */

-	public String toString() {

-		// TODO Auto-generated method stub

-		return super.toString();

-	} <% } %>

-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java
deleted file mode 100644
index 5e401a1e9..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java
+++ /dev/null
@@ -1,26 +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.web.validation;
-
-/**
- * Insert the type's description here. Creation date: (10/2/2001 7:06:43 PM)
- * 
- * @author: Administrator
- */
-public class UIWarHelper extends WarHelper {
-
-	/**
-	 * UIWarHelper constructor comment.
-	 */
-	public UIWarHelper() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
deleted file mode 100644
index 303c1e022..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
+++ /dev/null
@@ -1,186 +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.web.validation;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.WarValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * Insert the type's description here. Creation date: (10/2/2001 6:46:56 PM)
- * 
- * @author: Administrator
- */
-public class UIWarValidator extends WarValidator {
-	
-	protected org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper warHelper;	
-
-
-
-
-	/**
-	 * UIWarValidator constructor comment.
-	 */
-	public UIWarValidator() {
-		super();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/2/2001 8:01:45 PM)
-	 * 
-	 * @return org.eclipse.wst.validation.internal.core.core.war.workbenchimpl.UIWarHelper
-	 */
-	public org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper getWarHelper() {
-		return warHelper;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/2/2001 8:01:45 PM)
-	 * 
-	 * @param newWarHelper
-	 *            org.eclipse.wst.validation.internal.core.core.war.workbenchimpl.UIWarHelper
-	 */
-	public void setWarHelper(org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper newWarHelper) {
-		warHelper = newWarHelper;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
-	 */
-	public void validate() throws ValidationException {
-		// First remove all previous msg. for this project
-		//	_reporter.removeAllMessages(this,null);
-		super.validate();
-		validateEARForContextRoot();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
-	 */
-	public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter)
-			throws org.eclipse.wst.validation.internal.core.ValidationException {
-		
-		setWarHelper((UIWarHelper) inHelper);
-		IProject proj = ((IWorkbenchContext) warHelper).getProject();
-		IVirtualComponent wbModule = ComponentCore.createComponent(proj);
-        if( wbModule != null && J2EEProjectUtilities.isDynamicWebProject(proj)) {           	
-			IVirtualFile webFile = wbModule.getRootFolder().getFile(J2EEConstants.WEBAPP_DD_URI);
-			if( webFile.exists()) {
-				status = super.validateInJob(inHelper, inReporter);				
-			}
-        }
-        return status;
-	}	
-	
-	/**
-	 * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
-	 */
-	public void validateEARForContextRoot() {
-
-//		IProject project = getWarHelper().getProject();
-//		J2EEWebNatureRuntime webNature = J2EEWebNatureRuntime.getRuntime(project);
-//		String contextRoot = webNature.getContextRoot();
-//
-//		if (webNature == null)
-//			return;
-//
-//		EARNatureRuntime earRuntimeNature[] = webNature.getReferencingEARProjects();
-
-//		for (int i = 0; i < earRuntimeNature.length; i++) {
-//			// for each Ear Project that contains this web project update the context root.
-//			// hold the model and validate the context root & release the model
-//			org.eclipse.jst.j2ee.internal.earcreation.EAREditModel editModel = null;
-//			try {
-//				editModel = earRuntimeNature[i].getEarEditModelForRead(this);
-//				if (editModel != null) {
-//					Module module = null;
-//					if ((module = earRuntimeNature[i].getModule(project)) != null) {
-//						String webModcontextRoot = ((WebModule) module).getContextRoot();
-//						if (webModcontextRoot != null && !webModcontextRoot.equals(contextRoot)) {
-//							String[] params = new String[3];
-//							params[0] = project.getName();
-//							params[1] = ((WebModule) module).getContextRoot();
-//							params[2] = earRuntimeNature[i].getProject().getName();
-//							addError(WAR_CATEGORY, ERROR_EAR_INVALID_CONTEXT_ROOT, params);
-//						}
-//					}
-//				}
-//			} finally {
-//				if (editModel != null) {
-//					editModel.releaseAccess(this);
-//					editModel = null;
-//				}
-//			}
-//
-//		}
-
-	}
-	
-	/**
-	 * Method validateLibModules.
-	 * 
-	 * 
-	 */
-	
-	//TODO create validation for modules
-/*	protected void validateLibModules(J2EEWebNatureRuntime webNature) {
-		if (webNature != null) {
-			ILibModule[] libModules = webNature.getLibModules();
-			IProject project = webNature.getProject();
-
-			for (int i = 0; i < libModules.length; i++) {
-				ILibModule lib = libModules[i];
-				IProject tProject = lib.getProject();
-				if (tProject != null) { // Project could be null if JavaProject is deleted, for
-										// example
-					if (!tProject.exists() || !tProject.isOpen()) {
-						addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT, new String[]{tProject.getName()}, webNature.getProject());
-					}
-				}
-
-				String jarName = lib.getJarName();
-				IPath jarPath = webNature.getLibraryFolder().getFullPath().append(jarName);
-				if (((Resource) project).findExistingResourceVariant(jarPath) != null)
-					addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT, new String[]{jarName}, webNature.getProject());
-			}
-		}
-	}*/	
-	
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		
-		IProject project = ((IWorkbenchContext) helper).getProject();
-		IVirtualComponent comp = ComponentCore.createComponent( project );
-		IFile webDeploymentDescriptor = null;
-		if( comp != null ){
-			IVirtualFile vf = comp.getRootFolder().getFile(new Path(J2EEConstants.WEBAPP_DD_URI));
-			if( vf!= null ){
-				webDeploymentDescriptor = vf.getUnderlyingFile();
-			}
-		}
-		return webDeploymentDescriptor;
-	}	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java
deleted file mode 100644
index 740867e5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java
+++ /dev/null
@@ -1,141 +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.web.validation;
-
-
-
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.validation.J2EEValidationHelper;
-import org.eclipse.jst.j2ee.model.internal.validation.WARMessageConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-
-public class WarHelper extends J2EEValidationHelper {
-	Hashtable warFileMap = new Hashtable();
-	ArtifactEdit edit = null;
-	WARFile warFile = null;
-	final static String HelperID = "org.eclipse.wst.validation.internal.core.war.workbenchimpl.WarHelper"; //$NON-NLS-1$
-
-
-	/**
-	 * WarHelper constructor comment.
-	 */
-
-	public WarHelper() {
-		super();
-
-		registerModel(WARMessageConstants.WAR_MODEL_NAME, "loadWarFile"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This method will be invoked indirectly from the WarValidator (via. the WorkbenchReporter). It
-	 * will expect the coming object to be a EObject for the node who generated this message. Note:
-	 * This methods may need to be implemented higher up in the class stack.
-	 */
-	public int getLineNo(Object object) {
-
-
-		if (object instanceof Integer) { // Error discovered using the XML parser
-			return ((Integer) object).intValue();
-		}
-
-		return super.getLineNo(object);
-	}
-
-	/**
-	 * Given a resource, return its non-eclipse-specific location. If this resource, or type of
-	 * resource, isn't handled by this helper, return null.
-	 */
-	public String getPortableName(IResource resource) {
-		if (!(resource instanceof IFile)) {
-			return null;
-		}
-
-		IPath resourcePath = resource.getFullPath();
-		if (resourcePath != null)
-			return resourcePath.toString();
-
-		return null;
-	}
-
-	/**
-	 * Similar to the getFile() method, we know that we are talking about web.xml, but need a unique
-	 * ID.
-	 * 
-	 * @return java.lang.String
-	 * @param object
-	 *            Object
-	 */
-	public String getTargetObjectName(Object object) {
-		
-		if( object != null && object instanceof WARFile ){
-			return J2EEConstants.WEBAPP_ID;
-		}
-		return null;
-//		String ret = null;
-//		if (object != null) {
-//			IFile warFile = (IFile) warFileMap.get(getProject().toString());// validator framework
-//																			// will call getFile()
-//																			// first.
-//			if (warFile != null) {
-//				ret = (warFile.toString() + HelperID);
-//			}
-//		}
-//		return ret;
-	}
-
-	
-	//public EObject loadWarFile(ComponentHandle handle) {
-	public EObject loadWarFile() {
-			IVirtualComponent comp = ComponentCore.createComponent(getProject());
-			edit = ComponentUtilities.getArtifactEditForRead(comp);
-			
-			try {
-				warFile = (WARFile)((WebArtifactEdit) edit).asArchive(false);
-				return warFile;
-			} catch (OpenFailureException e1) {
-				Logger.getLogger().log(e1);
-			}
-//			finally {
-//				if (edit != null) {
-//					edit.dispose();
-//				}
-//			}
-		return null;
-	}	
-	
-	public void cleanup(WorkbenchReporter reporter) {
-		if (edit != null) {
-			edit.dispose();
-			edit = null;
-		}	
-		if(warFile != null){
-			warFile.close();
-			warFile = null;
-		}
-		super.cleanup(reporter);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java
deleted file mode 100644
index 27ab2ee71..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java
+++ /dev/null
@@ -1,39 +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 8, 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.web.deployables;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-
-/**
- * @author blancett
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ModuleAdapter extends AdapterImpl {
-    
-    J2EEFlexProjDeployable delegate;
-
-    public void setModuleDelegate(J2EEFlexProjDeployable moduleDelegate) {
-        delegate = moduleDelegate;
-    }
-
-    public J2EEFlexProjDeployable getDelegate() {
-        return delegate;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
deleted file mode 100644
index f075703ec..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.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.web.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURLExtensionReader;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.WebResource;
-
-/**
- * @version 1.0
- * @author
- */
-public class WebDeployableArtifactUtil {
-	
-	private final static String GENERIC_SERVLET_CLASS_TYPE = "javax.servlet.GenericServlet"; //$NON-NLS-1$
-	private final static String CACTUS_SERVLET_CLASS_TYPE = "org.apache.cactus.server.ServletTestRedirector"; //$NON-NLS-1$
-
-	public WebDeployableArtifactUtil() {
-		super();
-	}
-
-	public static IModuleArtifact getModuleObject(Object obj) {
-		IResource resource = null;
-		if (obj instanceof IResource)
-			resource = (IResource) obj;
-		if (obj instanceof IModuleArtifact)
-			resource = ((IModuleArtifact) obj).getModule().getProject();
-		else if (obj instanceof IAdaptable)
-			resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
-		else if (obj instanceof EObject) {
-			resource = ProjectUtilities.getProject((EObject) obj);
-			if (obj instanceof Servlet) {
-				Servlet servlet = ((Servlet) obj);
-				Resource servResource = servlet.eResource();
-				IVirtualResource[] resources = null;
-				try {
-					IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
-					resources = ComponentCore.createResources(eclipeServResoruce);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-				IVirtualComponent component = null;
-				if (resources[0] != null)
-					component = resources[0].getComponent();
-				String mapping = null;
-				java.util.List mappings = ((Servlet) obj).getMappings();
-				if (mappings != null && !mappings.isEmpty()) {
-					ServletMapping map = (ServletMapping) mappings.get(0);
-					mapping = map.getUrlPattern();
-				}
-				if (mapping != null) {
-					return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
-				}
-				WebType webType = ((Servlet) obj).getWebType();
-				if (webType.isJspType()) {
-					resource = ((IProject) resource).getFile(((JSPType) webType).getJspFile()); //$NON-NLS-1$
-				} else if (webType.isServletType()) {
-					return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + ((ServletType) webType).getClassName())); //$NON-NLS-1$
-				}
-			}
-		}
-		if (resource == null)
-			return null;
-
-		if (resource instanceof IProject) {
-			IProject project = (IProject) resource;
-			if (hasInterestedComponents(project))
-				return new WebResource(getModule(project, null), project.getProjectRelativePath());
-		}
-		
-		if (!hasInterestedComponents(resource.getProject()))
-            return null;
-		if (isCactusJunitTest(resource))
-			return null;
-
-		IPath resourcePath = resource.getFullPath();
-		IVirtualResource[] resources = ComponentCore.createResources(resource);
-		IVirtualComponent component = null;
-		if (resources[0] != null || resources.length <= 0)
-			component = resources[0].getComponent();
-		String className = getServletClassName(resource);
-		if (className != null && component != null) {
-			String mapping = getServletMapping(resource, true, className, component.getName());
-			if (mapping != null) {
-				return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
-			}
-			// if there is no servlet mapping, provide direct access to the servlet
-			// through the fully qualified class name
-			return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + className)); //$NON-NLS-1$
-
-		}
-		if (className == null) {
-			WebArtifactEdit webEdit = null;
-			try {
-				webEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
-				List servlets = webEdit.getWebApp().getServlets();
-				for (int i=0; i<servlets.size(); i++) {
-					Servlet servlet = (Servlet) servlets.get(i);
-					WebType type = servlet.getWebType();
-					if (type.isJspType()) {
-						JSPType jsp = (JSPType)type;
-						String jspPath = resource.getProjectRelativePath().removeFirstSegments(1).toString();
-						if (jsp.getJspFile().equals(jspPath)) {
-							List mappings = servlet.getMappings();
-							String mapping = null;
-							if (mappings != null && !mappings.isEmpty()) {
-								ServletMapping map = (ServletMapping) mappings.get(0);
-								mapping = map.getUrlPattern();
-								if (mapping != null) 
-									return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
-							}
-						}
-					}
-				}
-			} finally {
-				if (webEdit != null)
-					webEdit.dispose();
-			}
-		}
-        resourcePath = resources[0].getRuntimePath();
-
-		// Extension read to get the correct URL for Java Server Faces file if
-		// the jsp is of type jsfaces.
-		FileURL jspURL = FileURLExtensionReader.getInstance().getFilesURL();
-		if (jspURL != null) {
-			IPath correctJSPPath = jspURL.getFileURL(resource, resourcePath);
-			if (correctJSPPath != null && correctJSPPath.toString().length() > 0)
-				return new WebResource(getModule(resource.getProject(), component), correctJSPPath);
-		}
-		// return Web resource type
-		
-		return new WebResource(getModule(resource.getProject(), component), resourcePath);
-	}
-
-	protected static IModule getModule(IProject project, IVirtualComponent component) {
-		IModule deployable = null;
-		Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.DYNAMIC_WEB)).iterator(); //$NON-NLS-1$
-		String componentName = null;
-		if (component != null)
-			componentName = component.getName();
-		else
-			return getModuleProject(project, iterator);
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			if (next instanceof IModule) {
-				deployable = (IModule) next;
-				if (deployable.getName().equals(componentName)) {
-					return deployable;
-				}
-			}
-		}
-		return null;
-	}
-
-	protected static IModule getModuleProject(IProject project, Iterator iterator) {
-		IModule deployable = null;
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			if (next instanceof IModule) {
-				deployable = (IModule) next;
-				if (deployable.getProject().equals(project))
-					return deployable;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * Very temporary api - TODO - rip this out by 1.0
-	 */
-	private static boolean isCactusJunitTest(IResource resource) {
-		return getClassNameForType(resource, CACTUS_SERVLET_CLASS_TYPE) != null;
-	}
-
-
-
-	private static IType[] getTypes(IJavaElement element) {
-		try {
-			if (element.getElementType() != IJavaElement.COMPILATION_UNIT)
-				return null;
-
-			return ((ICompilationUnit) element).getAllTypes();
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	public static String getServletClassName(IResource resource) {
-		return getClassNameForType(resource, GENERIC_SERVLET_CLASS_TYPE);
-	}
-
-	public static String getClassNameForType(IResource resource, String superType) {
-		if (resource == null)
-			return null;
-
-		try {
-			IProject project = resource.getProject();
-			IPath path = resource.getFullPath();
-			if (!project.hasNature(JavaCore.NATURE_ID) || path == null)
-				return null;
-
-			IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
-			if (!javaProject.isOpen())
-				javaProject.open(new NullProgressMonitor());
-
-			// output location may not be on classpath
-			IPath outputPath = javaProject.getOutputLocation();
-			if (outputPath != null && "class".equals(path.getFileExtension()) && outputPath.isPrefixOf(path)) { //$NON-NLS-1$
-				int count = outputPath.segmentCount();
-				path = path.removeFirstSegments(count);
-			}
-
-			// remove initial part of classpath
-			IClasspathEntry[] classPathEntry = javaProject.getResolvedClasspath(true);
-			if (classPathEntry != null) {
-				int size = classPathEntry.length;
-				for (int i = 0; i < size; i++) {
-					IPath classPath = classPathEntry[i].getPath();
-					if (classPath.isPrefixOf(path)) {
-						int count = classPath.segmentCount();
-						path = path.removeFirstSegments(count);
-						i += size;
-					}
-				}
-			}
-
-			// get java element
-			IJavaElement javaElement = javaProject.findElement(path);
-
-			IType[] types = getTypes(javaElement);
-			if (types != null) {
-				int size2 = types.length;
-				for (int i = 0; i < size2; i++) {
-					if (hasSuperclass(types[i], superType))
-						return types[i].getFullyQualifiedName();
-				}
-			}
-			return null;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	public static boolean hasSuperclass(IType type, String superClassName) {
-		try {
-			ITypeHierarchy hierarchy = type.newSupertypeHierarchy(null);
-			IType[] superClasses = hierarchy.getAllSuperclasses(type);
-
-			int size = superClasses.length;
-			for (int i = 0; i < size; i++) {
-				if (superClassName.equals(superClasses[i].getFullyQualifiedName())) //$NON-NLS-1$
-					return true;
-			}
-			return false;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	public static String getServletMapping(IResource resource, boolean isServlet, String typeName, String componentName) {
-		if (typeName == null || typeName.equals("")) //$NON-NLS-1$
-			return null;
-
-		IProject project = resource.getProject();
-		WebArtifactEdit edit = null;
-		WebApp webApp = null;
-		try {
-			edit = WebArtifactEdit.getWebArtifactEditForRead(project);
-			edit.getDeploymentDescriptorRoot();
-			webApp = edit.getWebApp();
-			if (webApp == null)
-				return null;
-			Iterator iterator = webApp.getServlets().iterator();
-			while (iterator.hasNext()) {
-				Servlet servlet = (Servlet) iterator.next();
-				boolean valid = false;
-
-				WebType webType = servlet.getWebType();
-				if (webType.isServletType() && isServlet) {
-					ServletType type = (ServletType) webType;
-					if (typeName.equals(type.getClassName()))
-						valid = true;
-				} else if (webType.isJspType() && !isServlet) {
-					JSPType type = (JSPType) webType;
-					if (typeName.equals(type.getJspFile()))
-						valid = true;
-				}
-				if (valid) {
-					java.util.List mappings = servlet.getMappings();
-					if (mappings != null && !mappings.isEmpty()) {
-						ServletMapping map = (ServletMapping) mappings.get(0);
-						return map.getUrlPattern();
-					}
-				}
-			}
-			return null;
-		} finally {
-			if (edit != null) {
-				edit.dispose();
-			}
-		}
-	}
-
-	protected static boolean hasInterestedComponents(IProject project) {
-		return J2EEProjectUtilities.isDynamicWebProject(project);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java
deleted file mode 100644
index 9f213a95d..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * 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.web.deployables;
-
-/**
- *    Key Class for adapter manager
- */
-public class WebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java
deleted file mode 100644
index 777e92514..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java
+++ /dev/null
@@ -1,31 +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 Jun 13, 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.web.jfaces.extension;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-
-
-/**
- * @author vijayb
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface FileURL {
-	public IPath getFileURL(IResource resource, IPath existingURL);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java
deleted file mode 100644
index 53e2075da..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.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
- *******************************************************************************/
-/*
- * Created on Jun 13, 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.web.jfaces.extension;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @author vijayb
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class FileURLExtension {
-	private String id = null;
-	private FileURL instance;
-	private boolean errorCondition = false;
-	private IConfigurationElement element;
-	public static final String FILE_URL_EXTENSION = "fileURL"; //$NON-NLS-1$
-	public static final String RUN = "run"; //$NON-NLS-1$
-	public static final String ATT_ID = "id"; //$NON-NLS-1$
-	public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
-
-	/**
-	 *  
-	 */
-	public FileURLExtension() {
-		super();
-	}
-
-	public FileURL getInstance() {
-		try {
-			if (this.instance == null && !this.errorCondition)
-				this.instance = (FileURL) this.element.createExecutableExtension("run"); //$NON-NLS-1$
-		} catch (Throwable e) {
-			Logger.getLogger().logError(e);
-			this.errorCondition = true;
-		}
-		return this.instance;
-	}
-
-	public FileURLExtension(IConfigurationElement element) {
-		if (!FILE_URL_EXTENSION.equals(element.getName()))
-			throw new IllegalArgumentException("Extensions must be of the type \"" + FILE_URL_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
-		this.element = element;
-		init();
-	}
-
-	private void init() {
-		this.id = this.element.getAttribute(ATT_ID);
-
-	}
-
-	/**
-	 * @return Returns the id.
-	 */
-	public String getId() {
-		return this.id;
-	}
-
-	/**
-	 * @param id
-	 *            The id to set.
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java
deleted file mode 100644
index c188cc3d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java
+++ /dev/null
@@ -1,116 +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 13, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-/**
- * @author vijayb
- * 
- * This class loads all the extensions that define the correct URL string for the Java Server Faces
- * file
- *  
- */
-public class FileURLExtensionReader extends RegistryReader {
-	static FileURLExtensionReader instance = null;
-	protected List fileURLExtensions;
-
-	/**
-	 * @param registry
-	 * @param pluginID
-	 * @param extensionPoint
-	 */
-	public FileURLExtensionReader() {
-		super(WebPlugin.PLUGIN_ID, "fileURL"); //$NON-NLS-1$
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (FileURLExtension.FILE_URL_EXTENSION.equals(element.getName())) {
-			addExtension(element);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets the extension point.
-	 * 
-	 * @param extensions
-	 *            The extensions to set
-	 */
-	protected void addExtension(IConfigurationElement newExtension) {
-		getFileURLExtensions().add(new FileURLExtension(newExtension));
-	}
-
-	/**
-	 * Sets the extension point.
-	 * 
-	 * @param extensions
-	 *            The extensions to set
-	 */
-	protected void addExtensionPoint(FileURLExtensionReader newExtension) {
-		if (this.fileURLExtensions == null)
-			this.fileURLExtensions = new ArrayList();
-		this.fileURLExtensions.add(newExtension);
-	}
-
-	/**
-	 * @return the appropriate handler for the project based on priorities of those which are
-	 *         available and enabled
-	 */
-	public FileURL getFilesURL() {
-		FileURLExtension fileURLExt;
-		for (Iterator fileURLExtItr = getFileURLExtensions().iterator(); fileURLExtItr.hasNext();) {
-			fileURLExt = (FileURLExtension) fileURLExtItr.next();
-			return fileURLExt.getInstance();
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the instance.
-	 * 
-	 * @return Returns a FileURLExtensionReader
-	 */
-	public static FileURLExtensionReader getInstance() {
-		if (instance == null) {
-			instance = new FileURLExtensionReader();
-			instance.readRegistry();
-		}
-		return instance;
-	}
-
-	/**
-	 * @return Returns the handlerExtensions.
-	 */
-	protected List getFileURLExtensions() {
-		if (this.fileURLExtensions == null)
-			this.fileURLExtensions = new ArrayList();
-		return this.fileURLExtensions;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
deleted file mode 100644
index a99465956..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
+++ /dev/null
@@ -1,307 +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.web.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * This class, AddServlet Operation is a IDataModelOperation following the IDataModel wizard and
- * operation framework.
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * 
- * This operation subclasses the ArtifactEditProviderOperation so the changes made to the deployment descriptor
- * models are saved to the artifact edit model.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- * 
- * It is the operation which should be used when adding a new servlet to
- * a web app, whether that be an annotated servlet or a non annotated servlet.  This uses the
- * NewServletClassDataModelProvider to retrieve properties set by the user in order to create the custom
- * servet.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider
- * 
- * In the non annotated case, this operation will add the metadata necessary into the web deployment
- * descriptor.  In the annotated case, it will not, it will leave this up to the parsing of the
- * annotations to build the deployment descriptor artifacts.  To actually create the java class for
- * the servlet, the operation uses the NewServletClassOperation. The NewServletClassOperation 
- * shares the same data model provider.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation
- * 
- * Clients may subclass this operation to provide their own behaviour on servlet creation.  The execute
- * method can be extended to do so. Also, generateServletMetaData and creteServletClass are exposed.
- * 
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class AddServletOperation extends ArtifactEditProviderOperation {
-	
-	/**
-	 * This is the constructor which should be used when creating the operation.
-	 * It will not accept null parameter.  It will not return null.
-	 * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
-	 * 
-	 * @param dataModel 
-	 * @return AddServletOperation
-	 */
-	public AddServletOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own actions during execution.
-	 * The implementation of the execute method drives the running of the operation. This
-	 * implementation will create the servlet class, and then if the servlet is not
-	 * annotated, it will create the servlet metadata for the web deployment descriptor.
-	 * This method will accept null as a parameter.
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 * @see AddServletOperation#createServletClass()
-	 * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
-	 * 
-	 * @param monitor IProgressMonitor
-	 * @param info IAdaptable
-	 * @throws CoreException
-	 * @throws InterruptedException
-	 * @throws InvocationTargetException
-	 */
-	public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		//Retrieve values set in the newservletclass data model
-		boolean isServletType = model.getBooleanProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE);
-		boolean useExisting = model.getBooleanProperty(INewServletClassDataModelProperties.USE_EXISTING_CLASS);
-		String qualifiedClassName = model.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
-		
-		// If it is servlet type, create the java class
-		if (isServletType && !useExisting)
-			qualifiedClassName = createServletClass();
-
-		// If the servlet is not annotated, generate the servlet metadata for the DD
-		if (!model.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS))
-			generateServletMetaData(model, qualifiedClassName, isServletType);
-		
-		return OK_STATUS;
-	}
-	
-	/**
-	 * Subclasses may extend this method to add their own creation of the actual servlet java class.
-	 * This implementation uses the NewServletClassOperation which is a subclass of the NewJavaClassOperation.
-	 * The NewServletClassOperation will use the same NewServletClassDataModelProvider to retrieve the properties in
-	 * order to create the java class accordingly.  This method will not return null.
-	 * @see NewServletClassOperation
-	 * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassOperation
-	 * @see NewServletClassDataModelProvider
-	 * 
-	 * @return String qualified servlet classname
-	 */
-	protected String createServletClass() {
-		//	Create servlet java class file using the NewServletClassOperation.  The same data model is shared.
-		NewServletClassOperation op = new NewServletClassOperation(model);
-		try {
-			op.execute(new NullProgressMonitor(), null);
-		} catch (Exception e) {
-			Logger.getLogger().log(e);
-		} 
-		// Return the qualified classname of the newly created java class for the servlet
-		return getQualifiedClassName();
-	}
-	
-	/**
-	 * This method will return the qualified java class name as specified by the class name
-	 * and package name properties in the data model.
-	 * This method should not return null.
-	 * @see INewJavaClassDataModelProperties#CLASS_NAME
-	 * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
-	 * 
-	 * @return String qualified java classname
-	 */
-	public final String getQualifiedClassName() {
-		// Use the java package name and unqualified class name to create a qualified java class name
-		String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
-		String className = model.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
-		//Ensure the class is not in the default package before adding package name to qualified name
-		if (packageName != null && packageName.trim().length() > 0)
-			return packageName + "." + className; //$NON-NLS-1$
-		return className;
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own generation steps for the creation of the
-	 * metadata for the web deployment descriptor.  This implementation uses the J2EE models to create
-	 * the Servlet model instance, any init params specified, and any servlet mappings.  It then adds 
-	 * these to the web application model.  This will then be written out to the deployment descriptor
-	 * file.  This method does not accept null parameters.
-	 * @see Servlet
-	 * @see AddServletOperation#createServlet(String, boolean)
-	 * @see AddServletOperation#setUpInitParams(List, Servlet)
-	 * @see AddServletOperation#setUpURLMappings(List, Servlet)
-	 * 
-	 * @param aModel
-	 * @param qualifiedClassName
-	 * @param isServletType
-	 */
-	protected void generateServletMetaData(IDataModel aModel, String qualifiedClassName, boolean isServletType) {
-		// Set up the servlet modelled object
-		Servlet servlet = createServlet(qualifiedClassName, isServletType);
-
-		// Set up the InitParams if any
-		List initParamList = (List) aModel.getProperty(INewServletClassDataModelProperties.INIT_PARAM);
-		if (initParamList != null)
-			setUpInitParams(initParamList,servlet);
-		
-		// Set up the servlet URL mappings if any
-		List urlMappingList = (List) aModel.getProperty(INewServletClassDataModelProperties.URL_MAPPINGS);
-		if (urlMappingList != null)
-			setUpURLMappings(urlMappingList, servlet);
-	}
-	
-	/**
-	 * This method is intended for private use only.  This method is used to create the servlet
-	 * modelled object, to set any parameters specified in the data model, and then to add the
-	 * servlet instance to the web application model.  This method does not accpet null parameters.
-	 * It will not return null.
-	 * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
-	 * @see WebapplicationFactory#createServlet()
-	 * @see Servlet
-	 * 
-	 * @param qualifiedClassName
-	 * @param isServletType
-	 * @return Servlet instance
-	 */
-	private Servlet createServlet(String qualifiedClassName, boolean isServletType) {
-		// Get values from data model
-		String displayName = model.getStringProperty(INewServletClassDataModelProperties.DISPLAY_NAME);
-		String description = model.getStringProperty(INewServletClassDataModelProperties.DESCRIPTION);
-		
-		// Create the servlet instance and set up the parameters from data model
-		Servlet servlet = WebapplicationFactory.eINSTANCE.createServlet();
-		servlet.setDisplayName(displayName);
-		servlet.setServletName(displayName);
-		servlet.setDescription(description);
-		// Handle servlet case
-		if (isServletType) {
-			ServletType servletType = WebapplicationFactory.eINSTANCE.createServletType();
-			servletType.setClassName(qualifiedClassName);
-			servlet.setWebType(servletType);
-		} 
-		// Handle JSP case
-		else {
-			JSPType jspType = WebapplicationFactory.eINSTANCE.createJSPType();
-			jspType.setJspFile(qualifiedClassName);
-			servlet.setWebType(jspType);
-		}
-		// Add the servlet to the web application model
-		WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
-		webApp.getServlets().add(servlet);
-		// Return the servlet instance
-		return servlet;
-	}
-	
-	/**
-	 * This method is intended for internal use only.  This is used to create any init params
-	 * for the new servlet metadata.  It will not accept null parameters.  The init params are
-	 * set on the servlet modelled object.
-	 * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
-	 * @see WebapplicationFactory#createInitParam()
-	 * 
-	 * @param initParamList
-	 * @param servlet
-	 */
-	private void setUpInitParams(List initParamList, Servlet servlet) {
-		// Get the web app instance from the data model
-		WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
-		int nP = initParamList.size();
-		// If J2EE 1.4, add the param value and description info instances to the servlet init params
-		if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID) {
-			for (int iP = 0; iP < nP; iP++) {
-				String[] stringArray = (String[]) initParamList.get(iP);
-				// Create 1.4 common param value
-				ParamValue param = CommonFactory.eINSTANCE.createParamValue();
-				param.setName(stringArray[0]);
-				param.setValue(stringArray[1]);
-				// Create 1.4 common descripton value
-				Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(stringArray[2]);
-				// Set the description on the param
-				param.getDescriptions().add(descriptionObj);
-				param.setDescription(stringArray[2]);
-				// Add the param to the servlet model list of init params
-				servlet.getInitParams().add(param);
-			}
-		}
-		// If J2EE 1.2 or 1.3, use the servlet specific init param instances
-		else {
-			for (int iP = 0; iP < nP; iP++) {
-				String[] stringArray = (String[]) initParamList.get(iP);
-				// Create the web init param
-				InitParam ip = WebapplicationFactory.eINSTANCE.createInitParam();
-				// Set the param name
-				ip.setParamName(stringArray[0]);
-				// Set the param value
-				ip.setParamValue(stringArray[1]);
-				// Set the param description
-				ip.setDescription(stringArray[2]);
-				// Add the init param to the servlet model list of params
-				servlet.getParams().add(ip);
-			}
-		}
-	}
-	
-	/**
-	 * This method is intended for internal use only.  This method is used to create the servlet
-	 * mapping modelled objects so the metadata for the servlet mappings is store in the web
-	 * deployment descriptor.  This method will not accept null parameters.  The servlet mappings
-	 * are added to the web application modelled object.
-	 * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
-	 * @see WebapplicationFactory#createServletMapping()
-	 * 
-	 * @param urlMappingList
-	 * @param servlet
-	 */
-	private void setUpURLMappings(List urlMappingList, Servlet servlet) {
-		// Get the web app modelled object from the data model
-		WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
-		int nM = urlMappingList.size();
-		// Create the servlet mappings if any
-		for (int iM = 0; iM < nM; iM++) {
-			String[] stringArray = (String[]) urlMappingList.get(iM);
-			// Create the servlet mapping instance from the web factory
-			ServletMapping mapping = WebapplicationFactory.eINSTANCE.createServletMapping();
-			// Set the servlet and servlet name
-			mapping.setServlet(servlet);
-			mapping.setName(servlet.getServletName());
-			// Set the URL pattern to map the servlet to
-			mapping.setUrlPattern(stringArray[0]);
-			// Add the servlet mapping to the web application modelled list
-			webApp.getServletMappings().add(mapping);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
deleted file mode 100644
index 75156c012..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
+++ /dev/null
@@ -1,173 +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 Aug 6, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jlanuti
- */
-public class CreateServletTemplateModel {
-
-	IDataModel dataModel = null;
-	public static final String INIT = "init"; //$NON-NLS-1$
-	public static final String TO_STRING = "toString"; //$NON-NLS-1$
-	public static final String GET_SERVLET_INFO = "getServletInfo"; //$NON-NLS-1$
-	public static final String DO_POST = "doPost"; //$NON-NLS-1$
-	public static final String DO_PUT = "doPut"; //$NON-NLS-1$
-	public static final String DO_DELETE = "doDelete"; //$NON-NLS-1$
-	public static final String DESTROY = "destroy"; //$NON-NLS-1$
-	public static final String DO_GET = "doGet"; //$NON-NLS-1$
-
-	public static final int NAME = 0;
-	public static final int VALUE = 1;
-	public static final int DESCRIPTION = 2;
-
-	/**
-	 * Constructor
-	 */
-	public CreateServletTemplateModel(IDataModel dataModel) {
-		super();
-		this.dataModel = dataModel;
-	}
-
-	public String getServletClassName() {
-		return getProperty(INewJavaClassDataModelProperties.CLASS_NAME);
-	}
-
-	public String getJavaPackageName() {
-		return getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
-	}
-
-	public String getQualifiedJavaClassName() {
-		return getJavaPackageName() + "." + getServletClassName(); //$NON-NLS-1$
-	}
-
-	public String getSuperclassName() {
-		return getProperty(INewJavaClassDataModelProperties.SUPERCLASS);
-	}
-
-	public String getServletName() {
-		return getProperty(INewJavaClassDataModelProperties.CLASS_NAME);
-	}
-
-	public boolean isPublic() {
-		return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC);
-	}
-
-	public boolean isFinal() {
-		return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL);
-	}
-
-	public boolean isAbstract() {
-		return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT);
-	}
-
-	protected String getProperty(String propertyName) {
-		return dataModel.getStringProperty(propertyName);
-	}
-
-	public boolean shouldGenInit() {
-		return implementImplementedMethod(INIT);
-	}
-
-	public boolean shouldGenToString() {
-		return implementImplementedMethod(TO_STRING);
-	}
-
-	public boolean shouldGenGetServletInfo() {
-		return implementImplementedMethod(GET_SERVLET_INFO);
-	}
-
-	public boolean shouldGenDoPost() {
-		return implementImplementedMethod(DO_POST);
-	}
-
-	public boolean shouldGenDoPut() {
-		return implementImplementedMethod(DO_PUT);
-	}
-
-	public boolean shouldGenDoDelete() {
-		return implementImplementedMethod(DO_DELETE);
-	}
-
-	public boolean shouldGenDestroy() {
-		return implementImplementedMethod(DESTROY);
-	}
-
-	public boolean shouldGenDoGet() {
-		return implementImplementedMethod(DO_GET);
-	}
-
-	public List getInitParams() {
-		return (List) dataModel.getProperty(INewServletClassDataModelProperties.INIT_PARAM);
-	}
-
-	public String getInitParam(int index, int type) {
-		List params = getInitParams();
-		if (index < params.size()) {
-			String[] stringArray = (String[]) params.get(index);
-			return stringArray[type];
-		}
-		return null;
-	}
-
-	public List getServletMappings() {
-		return (List) dataModel.getProperty(INewServletClassDataModelProperties.URL_MAPPINGS);
-	}
-
-	public String getServletMapping(int index) {
-		List mappings = getServletMappings();
-		if (index < mappings.size()) {
-			String[] map = (String[]) mappings.get(index);
-			return map[0];
-		}
-		return null;
-	}
-
-	public String getServletDescription() {
-		return dataModel.getStringProperty(INewServletClassDataModelProperties.DESCRIPTION);
-	}
-
-	public List getInterfaces() {
-		return (List) this.dataModel.getProperty(INewJavaClassDataModelProperties.INTERFACES);
-	}
-
-	protected boolean implementImplementedMethod(String methodName) {
-		if (dataModel.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS)) {
-			if (methodName.equals(INIT))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.INIT);
-			else if (methodName.equals(TO_STRING))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.TO_STRING);
-			else if (methodName.equals(GET_SERVLET_INFO))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.GET_SERVLET_INFO);
-			else if (methodName.equals(DO_POST))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_POST);
-			else if (methodName.equals(DO_PUT))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_PUT);
-			else if (methodName.equals(DO_DELETE))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_DELETE);
-			else if (methodName.equals(DESTROY))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DESTROY);
-			else if (methodName.equals(DO_GET))
-				return dataModel.getBooleanProperty(INewServletClassDataModelProperties.DO_GET);
-		}		
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
deleted file mode 100644
index cd739b1b7..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-
-public interface INewServletClassDataModelProperties extends INewJavaClassDataModelProperties, IAnnotationsDataModel {
-	/**
-	 * Optional, boolean property used to specify whether to generate the init method.
-	 * The default is false.
-	 */
-	public static final String INIT = "NewServletClassDataModel.INIT"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the doPost method.
-	 * The default is true.
-	 */
-	public static final String DO_POST = "NewServletClassDataModel.DO_POST"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the destroy method.
-	 * The default is false.
-	 */
-	public static final String DESTROY = "NewServletClassDataModel.DESTROY"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the toString method.
-	 * The default is false.
-	 */
-	public static final String TO_STRING = "NewServletClassDataModel.TO_STRING"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the doPut method.
-	 * The default is false.
-	 */
-	public static final String DO_PUT = "NewServletClassDataModel.DO_PUT"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the doGet method.
-	 * The default is true.
-	 */
-	public static final String DO_GET = "NewServletClassDataModel.DO_GET"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the getServletInfo method.
-	 * The default is false.
-	 */
-	public static final String GET_SERVLET_INFO = "NewServletClassDataModel.GET_SERVLET_INFO"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether to generate the doDelete method.
-	 * The default is false.
-	 */
-	public static final String DO_DELETE = "NewServletClassDataModel.DO_DELETE"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to determine if building JSP or servlet.
-	 * The default is true.
-	 */
-	public static final String IS_SERVLET_TYPE = "NewServletClassDataModel.IS_SERVLET_TYPE"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, List property used to cache all the init params defined on the servlet.
-	 */
-	public static final String INIT_PARAM = "NewServletClassDataModel.INIT_PARAM"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, List propety used to cache all the servlet mappings for this servlet on the web application.
-	 */
-	public static final String URL_MAPPINGS = "NewServletClassDataModel.URL_MAPPINGS"; //$NON-NLS-1$
-
-	/**
-	 * Required, String property of the display name for the servlet
-	 */
-	public static final String DISPLAY_NAME = "NewServletClassDataModel.DISPLAY_NAME"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, String property of the description info for the servlet
-	 */
-	public static final String DESCRIPTION = "NewServletClassDataModel.DESCRIPTION"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to specify whether or not to gen a new java class.
-	 * The default is false.
-	 */
-	public static final String USE_EXISTING_CLASS = "NewServletClassDataModel.USE_EXISTING_CLASS"; //$NON-NLS-1$
-	
-	/**
-	 * Do not set! The javajet template file used in creating the annotated servlet template class
-	 */
-	public static final String TEMPLATE_FILE = "NewServletClassDataModel.TEMPLATE_FILE"; //$NON-NLS-1$
-	
-	/**
-	 * Do not set! The javajet template file used in creating the non-annotated servlet template class
-	 */
-	public static final String NON_ANNOTATED_TEMPLATE_FILE = "NewServletClassDataModel.NON_ANNOTATED_TEMPLATE_FILE"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
deleted file mode 100644
index 4304b1fdd..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
+++ /dev/null
@@ -1,598 +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.web.operations;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-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.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-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.plugin.WTPCommonPlugin;
-
-/**
- * The NewServletClassDataModelProvider is a subclass of ArtifactEditOperationDataModelProvider and
- * follows the IDataModel Operation and Wizard frameworks.
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * 
- * This data model provider is a subclass of the NewJavaClassDataModelProvider, which stores base
- * properties necessary in the creation of a default java class.
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider
- * 
- * The NewServletClassDataModelProvider provides more specific properties for java class creation
- * that are required in creating a servlet java class. The data model provider is used to store
- * these values for the NewServletClassOperation.
- * @see org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties That
- *      operation will create the servlet java class based on the settings defined here in the data
- *      model.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation
- * 
- * This data model properties implements the IAnnotationsDataModel to get the USE_ANNOTATIONS
- * property for determining whether or not to generate an annotated java class.
- * @see org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel
- * 
- * Clients can subclass this data model provider to cache and provide their own specific attributes.
- * They should also provide their own validation methods, properties interface, and default values
- * for the properties they add.
- * 
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewServletClassDataModelProvider extends NewJavaClassDataModelProvider implements INewServletClassDataModelProperties {
-
-	/**
-	 * The fully qualified default servlet superclass: HttpServlet.
-	 */
-	private final static String SERVLET_SUPERCLASS = "javax.servlet.http.HttpServlet"; //$NON-NLS-1$ 
-	/**
-	 * String array of the default, minimum required fully qualified Servlet interfaces
-	 */
-	private final static String[] SERVLET_INTERFACES = {"javax.servlet.Servlet"}; //$NON-NLS-1$
-
-	private final static String ANNOTATED_TEMPLATE_DEFAULT = "servletXDoclet.javajet"; //$NON-NLS-1$
-
-	private final static String NON_ANNOTATED_TEMPLATE_DEFAULT = "servletXDocletNonAnnotated.javajet"; //$NON-NLS-1$
-
-	/**
-	 * The cache of all the interfaces the servlet java class will implement.
-	 */
-	private List interfaceList;
-
-	private static boolean useAnnotations = false;
-
-	/**
-	 * Subclasses may extend this method to provide their own default operation for this data model
-	 * provider. This implementation uses the AddServletOperation to drive the servlet creation. It
-	 * will not return null.
-	 * 
-	 * @see IDataModel#getDefaultOperation()
-	 * 
-	 * @return IDataModelOperation AddServletOperation
-	 */
-	public IDataModelOperation getDefaultOperation() {
-		return new AddServletOperation(getDataModel());
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own determination of whether or not
-	 * certain properties should be disabled or enabled. This method does not accept null parameter.
-	 * It will not return null. This implementation makes sure annotation support is only allowed on
-	 * web projects of J2EE version 1.3 or higher.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#isPropertyEnabled(String)
-	 * @see IAnnotationsDataModel#USE_ANNOTATIONS
-	 * 
-	 * @param propertyName
-	 * @return boolean should property be enabled?
-	 */
-	public boolean isPropertyEnabled(String propertyName) {
-		// Annotations should only be enabled on a valid j2ee project of version 1.3 or higher
-		if (USE_ANNOTATIONS.equals(propertyName)) {
-			if (getBooleanProperty(USE_EXISTING_CLASS) || !isAnnotationsSupported())
-				return false;
-			return true;
-		}
-		// Otherwise return super implementation
-		return super.isPropertyEnabled(propertyName);
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own data model's properties as valid base
-	 * properties.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
-	 */
-	public Set getPropertyNames() {
-		// Add servlet specific properties defined in this data model
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(INIT);
-		propertyNames.add(DO_POST);
-		propertyNames.add(DESTROY);
-		propertyNames.add(TO_STRING);
-		propertyNames.add(DO_PUT);
-		propertyNames.add(DO_GET);
-		propertyNames.add(GET_SERVLET_INFO);
-		propertyNames.add(DO_DELETE);
-		propertyNames.add(IS_SERVLET_TYPE);
-		propertyNames.add(INIT_PARAM);
-		propertyNames.add(URL_MAPPINGS);
-		propertyNames.add(USE_ANNOTATIONS);
-		propertyNames.add(DISPLAY_NAME);
-		propertyNames.add(DESCRIPTION);
-		propertyNames.add(NON_ANNOTATED_TEMPLATE_FILE);
-		propertyNames.add(TEMPLATE_FILE);
-		propertyNames.add(USE_EXISTING_CLASS);
-		return propertyNames;
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own default values for any of the
-	 * properties in the data model hierarchy. This method does not accept a null parameter. It may
-	 * return null. This implementation sets annotation use to be true, and to generate a servlet
-	 * with doGet and doPost.
-	 * 
-	 * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
-	 * @see IDataModelProvider#getDefaultProperty(String)
-	 * 
-	 * @param propertyName
-	 * @return Object default value of property
-	 */
-	public Object getDefaultProperty(String propertyName) {
-		// Generate a doPost method by default
-		if (propertyName.equals(DO_POST))
-			return Boolean.TRUE;
-		// Generate a doGet method by default
-		else if (propertyName.equals(DO_GET))
-			return Boolean.TRUE;
-		// Use servlet by default
-		else if (propertyName.equals(IS_SERVLET_TYPE))
-			return Boolean.TRUE;
-		// Create an annotated servlet java class by default
-		else if (propertyName.equals(USE_ANNOTATIONS))
-			return shouldDefaultAnnotations();
-		else if (propertyName.equals(DISPLAY_NAME)) {
-			String className = getStringProperty(CLASS_NAME);
-			if (className.endsWith(".jsp")) { //$NON-NLS-1$
-				int index = className.lastIndexOf("/"); //$NON-NLS-1$
-				className = className.substring(index+1,className.length()-4);
-			} else {
-				int index = className.lastIndexOf("."); //$NON-NLS-1$
-				className = className.substring(index+1);
-			}
-			return className;
-		}
-		else if (propertyName.equals(URL_MAPPINGS))
-			return getDefaultUrlMapping();
-		else if (propertyName.equals(INTERFACES))
-			return getServletInterfaces();
-		else if (propertyName.equals(SUPERCLASS))
-			return SERVLET_SUPERCLASS;
-		else if (propertyName.equals(TEMPLATE_FILE))
-			return ANNOTATED_TEMPLATE_DEFAULT;
-		else if (propertyName.equals(NON_ANNOTATED_TEMPLATE_FILE))
-			return NON_ANNOTATED_TEMPLATE_DEFAULT;
-		else if (propertyName.equals(USE_EXISTING_CLASS))
-			return Boolean.FALSE;
-		// Otherwise check super for default value for property
-		return super.getDefaultProperty(propertyName);
-	}
-
-	/**
-	 * Returns the default Url Mapping depending upon the display name of the Servlet
-	 * 
-	 * @return List containting the default Url Mapping
-	 */
-	private Object getDefaultUrlMapping() {
-		List urlMappings = null;
-		String text = (String) getProperty(DISPLAY_NAME);
-		if (text != null) {
-			urlMappings = new ArrayList();
-			urlMappings.add(new String[]{"/" + text}); //$NON-NLS-1$
-		}
-		return urlMappings;
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own specific behaviour when a certain property
-	 * in the data model heirarchy is set. This method does not accept null for the property name,
-	 * but it will for propertyValue. It will not return null. It will return false if the set
-	 * fails. This implementation verifies the display name is set to the classname, that the
-	 * annotations is disabled/enabled properly, and that the target project name is determined from
-	 * the source folder setting.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
-	 *      Object)
-	 * 
-	 * @param propertyName
-	 * @param propertyValue
-	 * @return boolean was property set?
-	 */
-	public boolean propertySet(String propertyName, Object propertyValue) {
-
-		// If annotations is changed, notify an enablement change
-		if (propertyName.equals(USE_ANNOTATIONS)) {
-			useAnnotations = ((Boolean) propertyValue).booleanValue();
-			if (useAnnotations && !isAnnotationsSupported())
-				return true;
-			getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
-		}
-		// If the source folder is changed, ensure we have the correct project name
-		if (propertyName.equals(SOURCE_FOLDER)) {
-			// Get the project name from the source folder name
-			String sourceFolder = (String) propertyValue;
-			int index = sourceFolder.indexOf(File.separator);
-			String projectName = sourceFolder;
-			if (index == 0)
-				projectName = sourceFolder.substring(1);
-			index = projectName.indexOf(File.separator);
-			if (index != -1) {
-				projectName = projectName.substring(0, index);
-				setProperty(PROJECT_NAME, projectName);
-			}
-		}
-		// Call super to set the property on the data model
-		boolean result = super.propertySet(propertyName, propertyValue);
-		// If class name is changed, update the display name to be the same
-		if (propertyName.equals(CLASS_NAME) && !getDataModel().isPropertySet(DISPLAY_NAME)) {
-			getDataModel().notifyPropertyChange(DISPLAY_NAME, IDataModel.DEFAULT_CHG);
-		}
-		// After the property is set, if project changed, update the nature and the annotations
-		// enablement
-		if (propertyName.equals(COMPONENT_NAME)) {
-			getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
-		}
-		// After property is set, if annotations is set to true, update its value based on the new
-		// level of the project
-		if (getBooleanProperty(USE_ANNOTATIONS)) {
-			if (!isAnnotationsSupported())
-				setBooleanProperty(USE_ANNOTATIONS, false);
-		}
-		if (propertyName.equals(USE_EXISTING_CLASS)) {
-			getDataModel().notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
-			if (((Boolean)propertyValue).booleanValue())
-				setProperty(USE_ANNOTATIONS,Boolean.FALSE);
-			setProperty(JAVA_PACKAGE, null);
-			setProperty(CLASS_NAME, null);
-		}
-		// Return whether property was set
-		return result;
-	}
-
-	/**
-	 * This method is used to determine if annotations should try to enable based on workspace settings
-	 * @return does any valid annotation provider or xdoclet handler exist
-	 */
-	//TODO add this method back in for defect 146696
-//	protected boolean isAnnotationProviderDefined() {
-//		boolean isControllerEnabled = AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported();
-//		final String preferred = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
-//		IAnnotationProvider annotationProvider = null;
-//		boolean isProviderEnabled = false;
-//		if (preferred != null) {
-//			try {
-//				annotationProvider = AnnotationUtilities.findAnnotationProviderByName(preferred);
-//			} catch (Exception ex) { 
-//				//Default
-//			}
-//			if (annotationProvider != null && annotationProvider.isValid())
-//				isProviderEnabled = true;
-//		}
-//		return isControllerEnabled || isProviderEnabled;
-//	}
-	
-	/**
-	 * This method checks to see if valid annotation providers exist and if valid project version levels exist.
-	 * @return should annotations be supported for this project in this workspace
-	 */
-	protected boolean isAnnotationsSupported() {
-		//TODO add this check back in for defect 146696
-//		if (!isAnnotationProviderDefined())
-//			return false;
-		if (!getDataModel().isPropertySet(IArtifactEditOperationDataModelProperties.PROJECT_NAME))
-			return true;
-		if (getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).equals("")) //$NON-NLS-1$
-			return true;
-		IProject project = ProjectUtilities.getProject(getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
-		String moduleName = getStringProperty(IArtifactEditOperationDataModelProperties.COMPONENT_NAME);
-		if (project == null || moduleName == null || moduleName.equals(""))return true; //$NON-NLS-1$
-		WebArtifactEdit webEdit = null;
-		try {
-			webEdit = WebArtifactEdit.getWebArtifactEditForRead(project);
-			if (webEdit == null)
-				return true;
-			return webEdit.getJ2EEVersion() > J2EEVersionConstants.VERSION_1_2;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		} finally {
-			if (webEdit != null)
-				webEdit.dispose();
-		}
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own validation on any of the valid data
-	 * model properties in the hierarchy. This implementation adds validation for the init params,
-	 * servlet mappings, display name, and existing class fields specific to the servlet java class
-	 * creation. It does not accept a null parameter. This method will not return null.
-	 * 
-	 * @see NewJavaClassDataModelProvider#validate(String)
-	 * 
-	 * @param propertyName
-	 * @return IStatus is property value valid?
-	 */
-	public IStatus validate(String propertyName) {
-		IStatus result = Status.OK_STATUS;
-		// If our default is the superclass, we know it is ok
-		if (propertyName.equals(SUPERCLASS) && getStringProperty(propertyName).equals(SERVLET_SUPERCLASS))
-			return WTPCommonPlugin.OK_STATUS;
-		// Validate init params
-		if (propertyName.equals(INIT_PARAM))
-			return validateInitParamList((List) getProperty(propertyName));
-		// Validate servlet mappings
-		if (propertyName.equals(URL_MAPPINGS))
-			return validateURLMappingList((List) getProperty(propertyName));
-		// Validate the servlet name in DD
-		if (propertyName.equals(DISPLAY_NAME))
-			return validateDisplayName(getStringProperty(propertyName));
-		if (propertyName.equals(CLASS_NAME)) {
-			if (getStringProperty(propertyName).length()!=0 && getBooleanProperty(USE_EXISTING_CLASS))
-				return WTPCommonPlugin.OK_STATUS;
-			result = super.validateJavaClassName(getStringProperty(propertyName));
-			if (result.isOK()) {
-				result = validateJavaClassName(getStringProperty(propertyName));
-				if (result.isOK()&&!getBooleanProperty(USE_EXISTING_CLASS))
-					result = canCreateTypeInClasspath(getStringProperty(CLASS_NAME));
-			}
-			return result;
-		}
-		// Otherwise defer to super to validate the property
-		return super.validate(propertyName);
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own validation of the specified java
-	 * classname. This implementation will ensure the class name is not set to Servlet and then will
-	 * forward on to the NewJavaClassDataModel to validate the class name as valid java. This method
-	 * does not accept null as a parameter. It will not return null.
-	 * 
-	 * @see NewServletClassDataModelProvider#validateExistingClass(boolean)
-	 * @see NewJavaClassDataModelProvider#validateJavaClassName(String)
-	 * 
-	 * @param className
-	 * @return IStatus is java classname valid?
-	 */
-	protected IStatus validateJavaClassName(String className) {
-		if (getBooleanProperty(USE_EXISTING_CLASS))
-			return WTPCommonPlugin.OK_STATUS;
-		// First use the NewJavaClassDataModel to validate the classname as proper java syntax
-		IStatus status = super.validateJavaClassName(className);
-		if (status.isOK()) {
-			// Do not allow the name to be "Servlet"
-			if (className.equals("Servlet")) { //$NON-NLS-1$
-				String msg = WebMessages.ERR_SERVLET_JAVA_CLASS_NAME_INVALID;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-			return WTPCommonPlugin.OK_STATUS;
-		}
-		// Return the status
-		return status;
-	}
-
-	/**
-	 * This method is intended for internal use only. It will be used to validate the init params
-	 * list to ensure there are not any duplicates. This method will accept a null paramter. It will
-	 * not return null.
-	 * 
-	 * @see NewServletClassDataModelProvider#validate(String)
-	 * 
-	 * @param prop
-	 * @return IStatus is init params list valid?
-	 */
-	private IStatus validateInitParamList(List prop) {
-		if (prop != null && !prop.isEmpty()) {
-			// Ensure there are not duplicate entries in the list
-			boolean dup = hasDuplicatesInStringArrayList(prop);
-			if (dup) {
-				String msg = WebMessages.ERR_DUPLICATED_INIT_PARAMETER;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-		}
-		// Return OK
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * This method is intended for internal use only. This will validate the servlet mappings list
-	 * and ensure there are not duplicate entries. It will accept a null parameter. It will not
-	 * return null.
-	 * 
-	 * @see NewServletClassDataModelProvider#validate(String)
-	 * 
-	 * @param prop
-	 * @return IStatus is servlet mapping list valid?
-	 */
-	private IStatus validateURLMappingList(List prop) {
-		if (prop != null && !prop.isEmpty()) {
-			// Ensure there are not duplicates in the mapping list
-			boolean dup = hasDuplicatesInStringArrayList(prop);
-			if (dup) {
-				String msg = WebMessages.ERR_DUPLICATED_URL_MAPPING;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-		} else {
-			String msg = WebMessages.ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// Return OK
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * This method is intended for internal use only. It provides a simple algorithm for detecting
-	 * if there are duplicate entries in a list. It will accept a null paramter. It will not return
-	 * null.
-	 * 
-	 * @see NewServletClassDataModelProvider#validateInitParamList(List)
-	 * @see NewServletClassDataModelProvider#validateURLMappingList(List)
-	 * 
-	 * @param input
-	 * @return boolean are there dups in the list?
-	 */
-	private boolean hasDuplicatesInStringArrayList(List input) {
-		// If list is null or empty return false
-		if (input == null)
-			return false;
-		int n = input.size();
-		boolean dup = false;
-		// nested for loops to check each element to see if other elements are the same
-		for (int i = 0; i < n; i++) {
-			String[] sArray1 = (String[]) input.get(i);
-			for (int j = i + 1; j < n; j++) {
-				String[] sArray2 = (String[]) input.get(j);
-				if (isTwoStringArraysEqual(sArray1, sArray2)) {
-					dup = true;
-					break;
-				}
-			}
-			if (dup)
-				break;
-		}
-		// Return boolean status for duplicates
-		return dup;
-	}
-
-	/**
-	 * This method is intended for internal use only. This checks to see if the two string arrays
-	 * are equal. If either of the arrays are null or empty, it returns false.
-	 * 
-	 * @see NewServletClassDataModelProvider#hasDuplicatesInStringArrayList(List)
-	 * 
-	 * @param sArray1
-	 * @param sArray2
-	 * @return boolean are Arrays equal?
-	 */
-	private boolean isTwoStringArraysEqual(String[] sArray1, String[] sArray2) {
-		// If either array is null, return false
-		if (sArray1 == null || sArray2 == null)
-			return false;
-		int n1 = sArray1.length;
-		int n2 = sArray1.length;
-		// If either array is empty, return false
-		if (n1 == 0 || n2 == 0)
-			return false;
-		// If they don't have the same length, return false
-		if (n1 != n2)
-			return false;
-		// If their first elements do not match, return false
-		if (!sArray1[0].equals(sArray2[0]))
-			return false;
-		// Otherwise return true
-		return true;
-	}
-
-	/**
-	 * This method will return the list of servlet interfaces to be implemented for the new servlet
-	 * java class. It will intialize the list using lazy initialization to the minimum interfaces
-	 * required by the data model SERVLET_INTERFACES. This method will not return null.
-	 * 
-	 * @see INewServletClassDataModelProperties#SERVLET_INTERFACES
-	 * 
-	 * @return List of servlet interfaces to be implemented
-	 */
-	private List getServletInterfaces() {
-		if (interfaceList == null) {
-			interfaceList = new ArrayList();
-			// Add minimum required list of servlet interfaces to be implemented
-			for (int i = 0; i < SERVLET_INTERFACES.length; i++) {
-				interfaceList.add(SERVLET_INTERFACES[i]);
-			}
-		}
-		// Return interface list
-		return interfaceList;
-	}
-
-	/**
-	 * This method is intended for internal use only. This will validate whether the display name
-	 * selected is a valid display name for the servlet in the specified web application. It will
-	 * make sure the name is not empty and that it doesn't already exist in the web app. This method
-	 * will accept null as a parameter. It will not return null.
-	 * 
-	 * @see NewServletClassDataModelProvider#validate(String)
-	 * 
-	 * @param prop
-	 * @return IStatus is servlet display name valid?
-	 */
-	private IStatus validateDisplayName(String prop) {
-		// Ensure the servlet display name is not null or empty
-		if (prop == null || prop.trim().length() == 0) {
-			String msg = WebMessages.ERR_DISPLAY_NAME_EMPTY;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		if (getTargetProject() == null || getTargetComponent() == null)
-			return WTPCommonPlugin.OK_STATUS;
-		ArtifactEdit edit = null;
-		try {
-			edit = getArtifactEditForRead();
-			if (edit == null)
-				return WTPCommonPlugin.OK_STATUS;
-			WebApp webApp = (WebApp) edit.getContentModelRoot();
-			if (webApp == null)
-				return WTPCommonPlugin.OK_STATUS;
-			List servlets = webApp.getServlets();
-			boolean exists = false;
-			// Ensure the display does not already exist in the web application
-			if (servlets != null && !servlets.isEmpty()) {
-				for (int i = 0; i < servlets.size(); i++) {
-					String name = ((Servlet) servlets.get(i)).getServletName();
-					if (prop.equals(name))
-						exists = true;
-				}
-			}
-			// If the servlet name already exists, throw an error
-			if (exists) {
-				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_DISPLAY_NAME_EXIST, new String[]{prop});
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-
-		// Otherwise, return OK
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * @return boolean should the default annotations be true?
-	 */
-	private static Boolean shouldDefaultAnnotations() {
-		if (useAnnotations)
-			return Boolean.TRUE;
-		return Boolean.FALSE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
deleted file mode 100644
index 7aeef25c6..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
+++ /dev/null
@@ -1,420 +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.web.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-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.codegen.jet.JETEmitter;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager.Descriptor;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.WTPJETEmitter;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-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.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-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;
-
-/**
- * The NewServletClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * 
- * It extends ArtifactEditProviderOperation to provide servlet specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- * 
- * This operation is used by the AddServletOperation to generate either an
- * annotated or non annotated java class for an added servlet. It shares the
- * NewServletClassDataModelProvider with the AddServletOperation to store the
- * appropriate properties required to generate the new servlet.
- * @see org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider
- * 
- * In the annotated case, a WTPJetEmitter servlet template is created and used
- * to generate the servlet java class with the embedded annotated tags.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.internal.web.operations.CreateServletTemplateModel
- * 
- * In the non annotated case, the same emitter is used to create the class with
- * the non annotated servlet template so the annotated tags are omitted.
- * 
- * Subclasses may extend this operation to provide their own specific servlet
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- * 
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewServletClassOperation extends ArtifactEditProviderOperation {
-
-	/**
-	 * XDoclet facet constants
-	 */
-	private static final String JST_WEB_XDOCLET_VERSION = "1.2.3"; //$NON-NLS-1$
-	private static final String JST_WEB_XDOCLET = "jst.web.xdoclet"; //$NON-NLS-1$
-
-	/**
-	 * The extension name for a java class
-	 */
-	private static final String DOT_JAVA = ".java"; //$NON-NLS-1$
-
-	/**
-	 * platform plugin beginning for URI string
-	 */
-	// private static final String PLATFORM_PLUGIN = "platform:/plugin/";
-	// //$NON-NLS-1$
-	/**
-	 * variable for the web plugin
-	 */
-	protected static final String WEB_PLUGIN = "WEB_PLUGIN"; //$NON-NLS-1$
-
-	/**
-	 * folder location of the servlet creation templates diretory
-	 */
-	protected static final String TEMPLATE_DIR = "/templates/"; //$NON-NLS-1$
-
-	/**
-	 * name of the template emitter to be used to generate the deployment
-	 * descriptor from the tags
-	 */
-	protected static final String TEMPLATE_EMITTER = "org.eclipse.jst.j2ee.ejb.annotations.emitter.template"; //$NON-NLS-1$
-
-	/**
-	 * id of the builder used to kick off generation of web metadata based on
-	 * parsing of annotations
-	 */
-	protected static final String BUILDER_ID = "builderId"; //$NON-NLS-1$
-
-	/**
-	 * This is the constructor which should be used when creating a
-	 * NewServletClassOperation. An instance of the NewServletClassDataModel
-	 * should be passed in. This does not accept null parameter. It will not
-	 * return null.
-	 * 
-	 * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
-	 * @see NewServletClassDataModel
-	 * 
-	 * @param dataModel
-	 * @return NewServletClassOperation
-	 */
-	public NewServletClassOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own actions during
-	 * execution. The implementation of the execute method drives the running of
-	 * the operation. This implemenatation will create the java source folder,
-	 * create the java package, and then if using annotations, will use
-	 * templates to generate an annotated servlet java class, or if it is not
-	 * annotated, the servlet java class file will be created without the
-	 * annotated tags using templates. Optionally, subclasses may extend the
-	 * generateUsingTemplates or createJavaFile method rather than extend the
-	 * execute method. This method will accept a null paramter.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor,
-	 *      IPackageFragment)
-	 * 
-	 * @param monitor
-	 * @throws CoreException
-	 * @throws InterruptedException
-	 * @throws InvocationTargetException
-	 */
-	public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// Create source folder if it does not exist
-		createJavaSourceFolder();
-		// Create java package if it does not exist
-		IPackageFragment pack = createJavaPackage();
-		// Generate using templates
-		try {
-			generateUsingTemplates(monitor, pack);
-		} catch (Exception e) {
-			return WTPCommonPlugin.createErrorStatus(e.toString());
-		}
-		return OK_STATUS;
-	}
-
-	/**
-	 * This method will return the java package as specified by the new java
-	 * class data model. If the package does not exist, it will create the
-	 * package. This method should not return null.
-	 * 
-	 * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
-	 * @see IPackageFragmentRoot#createPackageFragment(java.lang.String,
-	 *      boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 * 
-	 * @return IPackageFragment the java package
-	 */
-	protected final IPackageFragment createJavaPackage() {
-		// Retrieve the package name from the java class data model
-		String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
-		IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model
-				.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
-		IPackageFragment pack = packRoot.getPackageFragment(packageName);
-		// Handle default package
-		if (pack == null) {
-			pack = packRoot.getPackageFragment(""); //$NON-NLS-1$
-		}
-		// Create the package fragment if it does not exist
-		if (!pack.exists()) {
-			String packName = pack.getElementName();
-			try {
-				pack = packRoot.createPackageFragment(packName, true, null);
-			} catch (JavaModelException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		// Return the package
-		return pack;
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own template based
-	 * creation of an annotated servlet java class file. This implementation
-	 * uses the creation of a CreateServletTemplateModel and the WTPJetEmitter
-	 * to create the java class with the annotated tags. This method accepts
-	 * null for monitor, it does not accept null for fragment. If annotations
-	 * are not being used the tags will be omitted from the class.
-	 * 
-	 * @see CreateServletTemplateModel
-	 * @see NewServletClassOperation#generateTemplateSource(CreateServletTemplateModel,
-	 *      IProgressMonitor)
-	 * 
-	 * @param monitor
-	 * @param fragment
-	 * @throws CoreException
-	 * @throws WFTWrappedException
-	 */
-	protected void generateUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment) throws WFTWrappedException, CoreException {
-		// Create the servlet template model
-		CreateServletTemplateModel tempModel = createTemplateModel();
-		IProject project = getTargetProject();
-		String source;
-		// Using the WTPJetEmitter, generate the java source based on the servlet template model
-		try {
-			source = generateTemplateSource(tempModel, monitor);
-		} catch (Exception e) {
-			throw new WFTWrappedException(e);
-		}
-		if (fragment != null) {
-			// Create the java file
-			String javaFileName = tempModel.getServletClassName() + DOT_JAVA;
-			ICompilationUnit cu = fragment.getCompilationUnit(javaFileName);
-			// Add the compilation unit to the java file
-			if (cu == null || !cu.exists())
-				cu = fragment.createCompilationUnit(javaFileName, source, true, monitor);
-			IFile aFile = (IFile) cu.getResource();
-			// Let the annotations controller process the annotated resource
-			AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(project);
-			if (controller != null)
-				controller.process(aFile);
-		}
-		
-		// Add the xdoclet facet, if necessary, for xdoclet servlet creation
-		try {
-			installXDocletFacetIfNecessary(monitor, project);
-		} catch (Exception e) {
-			throw new WFTWrappedException(e);
-		}
-	}
-
-	/**
-	 * This method is intended for internal use only. This will add an webdoclet facet to the project.
-	 * 
-	 * @throws CoreException 
-	 * @throws ExecutionException 
-	 */
-	private void installXDocletFacet(IProgressMonitor monitor, IProject project) throws CoreException, ExecutionException {
-		IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-		Set fixedFacets = facetedProject.getFixedProjectFacets();
-		IDataModel dm = DataModelFactory.createDataModel(new FacetInstallDataModelProvider());
-		dm.setProperty(IFacetDataModelProperties.FACET_ID, JST_WEB_XDOCLET);
-		dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
-		dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, JST_WEB_XDOCLET_VERSION);
-		IDataModel fdm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		fdm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project.getName());
-
-		FacetDataModelMap map = (FacetDataModelMap) fdm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		map.add(dm);
-
-		fdm.getDefaultOperation().execute(monitor, null);
-		facetedProject.setFixedProjectFacets(fixedFacets);
-	}
-	
-	/**
-	 * This method is intended for internal use only. This will check to see if it needs to add an 
-	 * webdoclet facet to the project.
-	 * 
-	 * @throws CoreException 
-	 * @throws ExecutionException 
-	 */
-	private void installXDocletFacetIfNecessary(IProgressMonitor monitor, IProject project) throws CoreException, ExecutionException {
-
-		// If not using annotations, ignore the xdoclet facet
-		if (!model.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS))
-			return;
-		
-		// If an extended annotations processor is added, ignore the default xdoclet one
-		Descriptor descriptor = AnnotationsControllerManager.INSTANCE.getDescriptor(getTargetComponent().getProject());
-		if (descriptor != null)
-			return;
-
-		// Otherwise check and see if the xdoclet facet is on the project yet
-		IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-		Set facets = facetedProject.getProjectFacets();
-		for (Iterator iter = facets.iterator(); iter.hasNext();) {
-			IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-			String facetID = facetVersion.getProjectFacet().getId();
-			if (JST_WEB_XDOCLET.equals(facetID)) 
-				return;
-		}
-		// Install xdoclet facet
-		installXDocletFacet(monitor, project);
-	}
-
-	/**
-	 * This method is intended for internal use only. This will use the
-	 * WTPJETEmitter to create an annotated java file based on the passed in
-	 * servlet class template model. This method does not accept null
-	 * parameters. It will not return null. If annotations are not used, it will
-	 * use the non annotated template to omit the annotated tags.
-	 * 
-	 * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor,
-	 *      IPackageFragment)
-	 * @see JETEmitter#generate(org.eclipse.core.runtime.IProgressMonitor,
-	 *      java.lang.Object[])
-	 * @see CreateServletTemplateModel
-	 * 
-	 * @param tempModel
-	 * @param monitor
-	 * @return String the source for the java file
-	 * @throws JETException
-	 */
-	private String generateTemplateSource(CreateServletTemplateModel tempModel, IProgressMonitor monitor) throws JETException {
-		URL templateURL = null;
-		// If annotated, use annotated template
-		if (model.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS))
-			templateURL = WebPlugin.getDefault().find(
-					new Path(TEMPLATE_DIR + getDataModel().getStringProperty(INewServletClassDataModelProperties.TEMPLATE_FILE)));
-		// Otherwise use non annotated template
-		else
-			templateURL = WebPlugin.getDefault().find(
-					new Path(TEMPLATE_DIR
-							+ getDataModel().getStringProperty(INewServletClassDataModelProperties.NON_ANNOTATED_TEMPLATE_FILE)));
-		cleanUpOldEmitterProject();
-		WTPJETEmitter emitter = new WTPJETEmitter(templateURL.toString(), this.getClass().getClassLoader());
-		emitter.setIntelligentLinkingEnabled(true);
-		emitter.addVariable(WEB_PLUGIN, WebPlugin.PLUGIN_ID);
-		return emitter.generate(monitor, new Object[] { tempModel });
-	}
-
-	private void cleanUpOldEmitterProject() {
-		IProject project = ProjectUtilities.getProject(WTPJETEmitter.PROJECT_NAME);
-		if (project == null || !project.exists())
-			return;
-		try {
-			IMarker[] markers = project.findMarkers(IJavaModelMarker.BUILDPATH_PROBLEM_MARKER, false, IResource.DEPTH_ZERO);
-			for (int i = 0, l = markers.length; i < l; i++) {
-				if (((Integer) markers[i].getAttribute(IMarker.SEVERITY)).intValue() == IMarker.SEVERITY_ERROR) {
-					project.delete(true, new NullProgressMonitor());
-					break;
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * This method is intended for internal use only. This method will create an
-	 * instance of the CreateServletTemplate model to be used in conjunction
-	 * with the WTPJETEmitter. This method will not return null.
-	 * 
-	 * @see CreateServletTemplateModel
-	 * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor,
-	 *      IPackageFragment)
-	 * 
-	 * @return CreateServletTemplateModel
-	 */
-	private CreateServletTemplateModel createTemplateModel() {
-		// Create the CreateServletTemplateModel instance with the new servlet
-		// class data model
-		CreateServletTemplateModel templateModel = new CreateServletTemplateModel(model);
-		return templateModel;
-	}
-
-	/**
-	 * This method will return the java source folder as specified in the java
-	 * class data model. It will create the java source folder if it does not
-	 * exist. This method may return null.
-	 * 
-	 * @see INewJavaClassDataModelProperties#SOURCE_FOLDER
-	 * @see IFolder#create(boolean, boolean,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 * 
-	 * @return IFolder the java source folder
-	 */
-	protected final IFolder createJavaSourceFolder() {
-		// Get the source folder name from the data model
-		String folderFullPath = model.getStringProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER);
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IFolder folder = root.getFolder(new Path(folderFullPath));
-		// If folder does not exist, create the folder with the specified path
-		if (!folder.exists()) {
-			try {
-				folder.create(true, true, null);
-			} catch (CoreException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		// Return the source folder
-		return folder;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java
deleted file mode 100644
index 3f3721c80..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.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
- *******************************************************************************/
-/*
- * Created on Jan 13, 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.web.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * @author jialin
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebMessages extends NLS {
-	private static final String BUNDLE_NAME = "web";//$NON-NLS-1$
-
-	private WebMessages() {
-		// Do not instantiate
-	}
-
-	public static String ERR_JAR_NAME_EMPTY;
-	public static String ERR_JAR_NAME_EXIST;
-	public static String ERR_JAVA_PROJECT_NAME_EMPTY;
-	public static String ERR_JAVA_PROJECT_NAME_EXIST;
-	public static String ERR_DUPLICATED_INIT_PARAMETER;
-	public static String ERR_DUPLICATED_URL_MAPPING;
-
-	public static String ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY;
-	public static String ERR_SERVLET_MAPPING_URL_PATTERN_EXIST;
-	public static String KEY_3;
-	public static String KEY_4;
-	public static String KEY_5;
-	public static String KEY_6;
-	public static String ERR_FILTER_PARAMETER_NAME_EXIST;
-	public static String ERR_FILTER_MAPPING_SERVLET_EXIST;
-	public static String ERR_FILTER_MAPPING_SERVLET_DISPATCHER_TYPES_EMPTY;
-	public static String ERR_DISPLAY_NAME_EMPTY;
-	public static String ERR_SERVLET_NAME_EXIST;
-	public static String ERR_SERVLET_DISPLAY_NAME_EXIST;
-	public static String ERR_SERVLET_CLASS_NAME_USED;
-	public static String ERR_SERVLET_JAVA_CLASS_NAME_INVALID;
-	public static String ERR_SERVLET_MAPPING_SERVLET_NOT_EXIST;
-	public static String ERR_SERVLET_PARAMETER_NAME_EMPTY;
-	public static String ERR_SERVLET_PARAMETER_NAME_EXIST;
-	public static String ERR_SERVLET_PARAMETER_VALUE_EMPTY;
-	public static String ERR_SERVLET_PARAMETER_VALUE_EXIST;
-	public static String ERR_SERVLET_ROLE_REF_NAME_EMPTY;
-	public static String ERR_SERVLET_ROLE_REF_NAME_EXIST;
-	public static String ERR_SERVLET_ROLE_LINK_EMPTY;
-
-	public static String ERR_FILTER_DISPLAY_NAME_EXIST;
-	public static String ERR_FILTER_CLASS_NAME_USED;
-	public static String ERR_FILTER_CLASS_NAME_INVALID;
-	public static String ERR_LISTENER_DISPLAY_NAME_EXIST;
-	public static String ERR_LISTENER_CLASS_NAME_USED;
-	public static String ERR_LISTENER_CLASS_NAME_INVALID;
-
-	public static String ERR_PAGE_ENCODING_EMPTY;
-	public static String ERR_PAGE_ENCODING_EXIST;
-	public static String ERR_URL_PATTERN_EXIST;
-	public static String ERR_INCLUDE_PRELUDES_EXIST;
-	public static String ERR_INCLUDE_CODAS_EXIST;
-	public static String ERR_SECURITY_CONSTRAINT_NAME_EMPTY;
-	public static String ERR_SECURITY_CONSTRAINT_NAME_EXIST;
-	public static String ERR_CONTEXT_PARAMETER_NAME_EMPTY;
-	public static String ERR_CONTEXT_PARAMETER_NAME_EXIST;
-	public static String ERR_RESOURCE_NAME_EMPTY;
-	public static String ERR_RESOURCE_NAME_EXIST;
-	public static String ERR_URL_PATTERNS_EMPTY;
-	public static String ERR_MIME_MAPPING_EXTENSION_EMPTY;
-	public static String ERR_MIME_MAPPING_EXTENSION_EXIST;
-	public static String ERR_WELCOME_PAGE_EMPTY;
-	public static String ERR_WELCOME_PAGE_EXIST;
-	public static String ERR_ENV_ENTRY_NAME_EMPTY;
-	public static String ERR_ENV_ENTRY_NAME_EXIST;
-	public static String ERR_ERROR_CODE_EMPTY;
-	public static String ERR_ERROR_CODE_MUST_BE_3_DIGITS;
-	public static String ERR_ERROR_PAGE_LOCATION_EMPTY;
-	public static String ERR_ERROR_PAGE_LOCATION_EXIST;
-	public static String ERR_ERROR_PAGE_LOCATION_MUST_START_WITH_SLASH;
-	public static String ERR_EXCEPTION_TYPE_EMPTY;
-	public static String ERR_EXCEPTION_SECURITY_ID_NO_BEANS;
-	public static String ERR_EXCEPTION_ROLE_NAME_EMPTY;
-	public static String ERR_LOCALE_NAME_EMPTY;
-	public static String ERR_LOCALE_NAME_EXIST;
-	public static String ERR_TAGLIBREF_URL_EMPTY;
-	public static String ERR_TAGLIBREF_URL_EXIST;
-	public static String ERR_MESSAGE_DESTINATION_NAME_EMPTY;
-	public static String ERR_MESSAGE_DESTINATION_NAME_EXIST;
-	public static String ERR_EXCEPTION_METHOD_ELEMENT_EMPTY;
-	public static String ERR_EXCEPTION_METHOD_TRANSACTION_ATTRIBUTES_EMPTY;
-	public static String ERR_SERVLET_LIST_EMPTY;
-	public static String ERR_FILTER_LIST_EMPTY;
-	public static String ERR_LISTENER_LIST_EMPTY;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WebMessages.class);
-	}
-
-	public static String getResourceString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java
deleted file mode 100644
index 52d3f91de..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java
+++ /dev/null
@@ -1,196 +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 29, 2003
- * 
- * To change the template for this generated file go to Window&gt;Preferences&gt;Java&gt;Code
- * Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.web.plugin;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.jst.j2ee.internal.project.J2EEJavaProjectInfo;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-public class WebModuleExtensionImpl extends EarModuleExtensionImpl implements WebModuleExtension {
-
-	/**
-	 * 
-	 */
-	public WebModuleExtensionImpl() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#createProjectInfo()
-	 */
-	public J2EEJavaProjectInfo createProjectInfo() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#addWLPProjects(org.eclipse.core.resources.IProject,
-	 *      java.util.Set)
-	 */
-	public void addWLPProjects(IProject aProject, Set projectsToBuild) {
-		// J2EEWebNatureRuntime nature = J2EEWebNatureRuntime.getRuntime(aProject);
-		// if (nature == null)
-		// return;
-		// ILibModule[] libModules = nature.getLibModules();
-		// for (int i = 0; i < libModules.length; i++) {
-		// IProject p = libModules[i].getProject();
-		// if (p.isAccessible())
-		// projectsToBuild.add(libModules[i].getProject());
-		// }
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#setContextRootForModuleMapping(org.eclipse.jst.j2ee.internal.internal.application.WebModule,
-	 *      org.eclipse.core.resources.IProject)
-	 */
-	public void setContextRootForModuleMapping(WebModule webModule, IProject nestedProject) throws CoreException {
-		WebArtifactEdit webEdit = null;
-		try {
-			// TODO migrate to flex project
-			// webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead( nestedProject
-			// );
-			if (webEdit != null) {
-				webEdit.setServerContextRoot(webModule.getContextRoot());
-			}
-		} finally {
-			if (webEdit != null)
-				webEdit.dispose();
-		}
-		// if (wnr != null) {
-		// wnr.setContextRoot(webModule.getContextRoot());
-		// }
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#hasRuntime(org.eclipse.core.resources.IProject)
-	 */
-	public boolean hasRuntime(IProject project) {
-		// return J2EEWebNatureRuntimeUtilities.hasJ2EERuntime(project);
-		// To do: work based on module
-		return false;
-	}
-
-	// public J2EEImportOperationOLD createImportOperation(IProject
-	// nestedProject, WARFile warFile, EARImportConfiguration importConfig){
-	// WarImportOperation op = new WarImportOperation(nestedProject, warFile);
-	// //op.setServerTarget(info.getServerTarget());
-	// HashMap opMap = importConfig.createProjectOption;
-	// if(opMap != null && !opMap.isEmpty())
-	// op.createWLProjectOptions = opMap;
-	// return op;
-	// }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#getContentFolder(org.eclipse.core.resources.IProject,
-	 *      org.eclipse.jst.j2ee.internal.internal.commonarchivecore.File)
-	 */
-
-	public String getContentFolder(IProject project, IFile webSettingsFile) {
-		String contentFolder = null;
-
-		// WebSettings webSettings = new WebSettings(project, webSettingsFile);
-		// if (webSettings != null) {
-		// contentFolder = webSettings.getWebContentName();
-		// }
-		// To do: Needs work here, no content folder exists now
-		WebArtifactEdit webEdit = null;
-		try {
-			// TODO migrate to flex project
-			// webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead(project);
-			if (webEdit != null) {
-
-			}
-		} finally {
-			if (webEdit != null)
-				webEdit.dispose();
-		}
-
-		return contentFolder;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#compareWebContextRoot(org.eclipse.jst.j2ee.internal.internal.application.Module,
-	 *      org.eclipse.core.resources.IProject)
-	 */
-	public boolean compareWebContextRoot(Module module, IProject project) throws CoreException {
-		String contextRoot = ((WebModule) module).getContextRoot();
-		if (contextRoot != null)
-			return ((contextRoot).equals(getServerContextRoot(project)));
-		return false;
-	}
-
-	protected String getServerContextRoot(IProject project) {
-		WebArtifactEdit webEdit = null;
-		try {
-			// TODO migrate to flex project
-			// webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead(project);
-			if (webEdit != null) {
-				return webEdit.getServerContextRoot();
-			}
-		} finally {
-			if (webEdit != null)
-				webEdit.dispose();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
-	 */
-	public IDataModel createProjectDataModel() {
-		return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
-	 */
-	public IDataModel createImportDataModel() {
-		return DataModelFactory.createDataModel(new WebComponentImportDataModelProvider());
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
deleted file mode 100644
index 06c086621..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
+++ /dev/null
@@ -1,289 +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.web.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.util.WebEditAdapterFactory;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *  
- */
-
-public class WebPlugin extends WTPPlugin implements ResourceLocator {
-	// Default instance of the receiver
-	private static WebPlugin inst;
-	protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
-	// Links View part of the plugin
-	//public static final String LINKS_BUILDER_ID =
-	// "com.ibm.etools.links.management.linksbuilder";//$NON-NLS-1$
-	public static final String LINKS_BUILDER_ID = "com.ibm.etools.webtools.additions.linksbuilder"; //$NON-NLS-1$
-	// LibDir Change Listener
-	public static final String LIBDIRCHANGE_BUILDER_ID = "com.ibm.etools.webtools.LibDirBuilder"; //$NON-NLS-1$
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.web"; //$NON-NLS-1$
-	// LibCopy builder ID
-	public static final String LIBCOPY_BUILDER_ID = "org.eclipse.jst.j2ee.LibCopyBuilder"; //$NON-NLS-1$
-	// Validation part of the plugin
-	//Global ResourceSet (somewhat global)
-	private static IPath location;
-	public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
-				"icons/full/cview16", //$NON-NLS-1$
-				"icons/full/ctool16", //$NON-NLS-1$
-				"icons/full/clcl16", //$NON-NLS-1$
-				"icons/full/ovr16", //$NON-NLS-1$
-				"icons/full/extra", //$NON-NLS-1$
-				"icons/full/wizban", //$NON-NLS-1$
-				"icons", //$NON-NLS-1$
-				""}; //$NON-NLS-1$
-
-	/**
-	 * Create the J2EE plugin and cache its default instance
-	 */
-	public WebPlugin() {
-		super();
-		if (inst == null)
-			inst = this;
-	}
-
-	/**
-	 * Get the plugin singleton.
-	 */
-	static public WebPlugin getDefault() {
-		return inst;
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public URL getBaseURL() {
-		return getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-	public Object[] getJ2EEWebProjectMigrationExtensions() {
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint pct = registry.getExtensionPoint(getBundle().getSymbolicName(), "J2EEWebProjectMigrationExtension"); //$NON-NLS-1$
-
-		IExtension[] extension = pct.getExtensions();
-		List ret = new Vector();
-		for (int l = 0; l < extension.length; ++l) {
-			IExtension config = extension[l];
-
-			IConfigurationElement[] cElems = config.getConfigurationElements();
-			for (int i = 0; i < cElems.length; i++) {
-				IConfigurationElement d = cElems[i];
-				if (d.getName().equals("migration")) { //$NON-NLS-1$ 
-					try {
-						Object me = d.createExecutableExtension("run"); //$NON-NLS-1$
-
-						ret.add(me);
-					} catch (Exception ex) {
-						// ignore this extension, keep going
-					}
-				}
-			}
-		}
-
-		return ret.toArray();
-	}
-
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public Object getImage(String key) {
-		return J2EEPlugin.getImageURL(key, getBundle());
-	}
-
-	// ISSUE: this method is never used in WTP. Seems no need to be API
-	public static IPath getInstallLocation() {
-		if (location == null) {
-			String installLocation = getDefault().getBundle().getLocation();
-			location = new Path(installLocation);
-		}
-		return location;
-	}
-
-	public static URL getInstallURL() {
-		return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the singleton instance.
-	 */
-	public static WebPlugin getPlugin() {
-		return inst;
-	}
-
-	/**
-	 * Return the plugin directory location- the directory that all the plugins are located in (i.e.
-	 * d:\installdir\plugin)
-	 */
-	public static IPath getPluginLocation(String pluginId) {
-		Bundle bundle = Platform.getBundle(pluginId);
-		if (bundle != null) {
-			try {
-				IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator();  //$NON-NLS-1$
-				String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-				return new Path(installStr);
-			} catch (IOException e) {
-				//Do nothing
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the Servlets Jar file path preference.
-	 * 
-	 * @return String the file path to the servlets jar, or null if never specified.
-	 * @deprecated - the preference store is no longer on this plugin because of the UI dependency.
-	 */
-	public String getPreferenceServletsJar() {
-		//	return getPreferenceStore().getString(IWebToolingCoreConstants.PROP_SERVLET_JAR);
-		return "THIS IS THE WRONG PATH - NEED TO CHANGE IMPLEMENTATION!!!!!"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the Servlets Jar file path preference.
-	 * 
-	 * @return String the file path to the servlets jar, or null if never specified.
-	 * @deprecated - the preference store is no longer on this plugin because of the UI dependency.
-	 */
-	public String getPreferenceWebASJar() {
-		//return getPreferenceStore().getString(IWebToolingCoreConstants.PROP_WEBAS_JAR);
-		return "THIS IS THE WRONG PATH - NEED TO CHANGE IMPLEMENTATION!!!!!"; //$NON-NLS-1$
-	}
-
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * If this is called from an operation, in response to some other exception that was caught,
-	 * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
-	 * otherwise this can still be used to signal some other error condition within the operation,
-	 * or to throw a core exception in a context other than executing an operation
-	 * 
-	 * Create a new IStatus of type ERROR using the J2EEPlugin ID. aCode is just an internal code.
-	 */
-	public static IStatus newErrorStatus(int aCode, String aMessage, Throwable exception) {
-		return newStatus(IStatus.ERROR, aCode, aMessage, exception);
-	}
-
-	/**
-	 * If this is called from an operation, in response to some other exception that was caught,
-	 * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
-	 * otherwise this can still be used to signal some other error condition within the operation,
-	 * or to throw a core exception in a context other than executing an operation
-	 * 
-	 * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
-	 */
-	public static IStatus newErrorStatus(String aMessage, Throwable exception) {
-		return newErrorStatus(0, aMessage, exception);
-	}
-
-	/**
-	 * If this is called from an operation, in response to some other exception that was caught,
-	 * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
-	 * otherwise this can still be used to signal some other error condition within the operation.
-	 * 
-	 * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
-	 */
-	public static IStatus newOperationFailedStatus(String aMessage, Throwable exception) {
-		return newStatus(IStatus.ERROR, IResourceStatus.OPERATION_FAILED, aMessage, exception);
-	}
-
-	/**
-	 * Create a new IStatus with a severity using the J2EEPlugin ID. aCode is just an internal code.
-	 */
-	public static IStatus newStatus(int severity, int aCode, String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode, aMessage, exception);
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public String getString(String key) {
-		return Platform.getResourceString(getBundle(), key);
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public String getString(String key, Object[] substitutions) {
-		return MessageFormat.format(getString(key), substitutions);
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		//WebAppResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
-		IAdapterManager manager = Platform.getAdapterManager();
-		manager.registerAdapters(new WebEditAdapterFactory(), ArtifactEditModel.class);
-	}
-
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
-	 */
-	public String getPluginID() {
-		return PLUGIN_ID;
-	}
-	
-	public static void log( final Exception e )
-	{
-		final ILog log = WebPlugin.getDefault().getLog();
-		final String msg = "Encountered an unexpected exception.";
-		
-		log.log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
-	}
-	public String getString(String key, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key);
-	}
-
-	public String getString(String key, Object[] substitutions, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key,substitutions);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
deleted file mode 100644
index 82553e9c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}
- * object.
- */
-public class AuthConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public AuthConstraintItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns authority_constraint.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("authority_constraint");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the secConstraint of the AuthConstraint.
-	 */
-	public Object getParent(Object object) {
-		return ((AuthConstraint) object).getSecConstraint();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
-						WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
-						pkg.getAuthConstraint_Description()));
-			// This is for the roles feature.
-			//
-			WebToolingItemPropertyDescriptor propertyDescriptor = new WebToolingItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Roles_UI_"), //$NON-NLS-1$ = "Roles"
-						WebAppEditResourceHandler.getString("The_roles_property_UI_"), //$NON-NLS-1$ = "The roles property"
-						pkg.getAuthConstraint_Roles(), WebToolingItemPropertyDescriptor.AUTH_CONSTRAINT_ROLES_EDITOR);
-			itemPropertyDescriptors.add(propertyDescriptor);
-			// This is for the secConstraint feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
-						WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
-						pkg.getAuthConstraint_SecConstraint()));
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthConstraint_description_feature"), getString( //$NON-NLS-1$
-					"_UI_PropertyDescriptor_description", "_UI_AuthConstraint_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
-					"_UI_AuthConstraint_type"), WebapplicationPackage.eINSTANCE.getAuthConstraint_Description(), true, //$NON-NLS-1$
-					ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Roles feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRolesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthConstraint_roles_feature"), getString( //$NON-NLS-1$
-					"_UI_PropertyDescriptor_description", "_UI_AuthConstraint_roles_feature", "_UI_AuthConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getAuthConstraint_Roles(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-	public String getText(Object object) {
-		String description = ((AuthConstraint) object).getDescription();
-		if (description == null) {
-			List descList = ((AuthConstraint) object).getDescriptions();
-			if (descList != null && descList.size() > 0)
-				description = ((Description) descList.get(0)).getValue();
-		}
-		if (description == null)
-			description = ""; //$NON-NLS-1$
-			//		return WebAppEditResourceHandler.getString("11concat_UI_", (new
-			// Object[]{description})); //$NON-NLS-1$ = "AuthConstraint {0}"
-		return description;
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(AuthConstraint.class)) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION :
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES :
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.IEditingDomainItemProvider#createCommand(java.lang.Object,
-	 *      org.eclipse.emf.edit.domain.EditingDomain, java.lang.Class,
-	 *      org.eclipse.emf.edit.command.CommandParameter)
-	 */
-	public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
-		EStructuralFeature sf = commandParameter.getEReference();
-		if (sf == null) {
-			sf = commandParameter.getEAttribute();
-			if (sf != null && !sf.isMany())
-				sf = null;
-		}
-		if (sf != null) {
-			EObject owner = commandParameter.getEOwner();
-			Collection collection = commandParameter.getCollection();
-			if (commandClass == AddCommand.class) {
-				return createAddCommand(editingDomain, owner, sf, collection, commandParameter.getIndex());
-			} else if (commandClass == RemoveCommand.class) {
-				return createRemoveCommand(editingDomain, owner, sf, collection);
-			}
-		}
-		return super.createCommand(object, editingDomain, commandClass, commandParameter);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
deleted file mode 100644
index e110ef824..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
+++ /dev/null
@@ -1,190 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}
- * object.
- */
-public class ContextParamItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ContextParamItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns initializ_parameter_context.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("initializ_parameter_context");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the ContextParam.
-	 */
-	public Object getParent(Object object) {
-		return ((ContextParam) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the paramName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamName_UI_"), //$NON-NLS-1$ = "ParamName"
-						WebAppEditResourceHandler.getString("The_paramName_property_UI_"), //$NON-NLS-1$ = "The paramName property"
-						pkg.getContextParam_ParamName()));
-
-			// This is for the paramValue feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamValue_UI_"), //$NON-NLS-1$ = "ParamValue"
-						WebAppEditResourceHandler.getString("The_paramValue_property_UI_"), //$NON-NLS-1$ = "The paramValue property"
-						pkg.getContextParam_ParamValue()));
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
-						WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
-						pkg.getContextParam_Description()));
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
-			 * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
-			 * webApp property" pkg.getContextParam_WebApp()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParamNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_paramName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_paramName_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getContextParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParamValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_paramValue_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_paramValue_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getContextParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_description_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getContextParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("12concat_UI_", (new Object[]{((ContextParam) object).getParamName()})); //$NON-NLS-1$ = "ContextParam {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ContextParam.class)) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME :
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE :
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java
deleted file mode 100644
index 0bc355122..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java
+++ /dev/null
@@ -1,124 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}
- * object.
- */
-public class ErrorCodeErrorPageItemProvider extends ErrorPageItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ErrorCodeErrorPageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns errorcode_errorpage.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("errorcode_errorpage"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the errorCode feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ErrorCode_UI_"), //$NON-NLS-1$ = "ErrorCode"
-						WebAppEditResourceHandler.getString("The_errorCode_property_UI_"), //$NON-NLS-1$ = "The errorCode property"
-						pkg.getErrorCodeErrorPage_ErrorCode()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Error Code feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addErrorCodePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ErrorCodeErrorPage_errorCode_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ErrorCodeErrorPage_errorCode_feature", "_UI_ErrorCodeErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getErrorCodeErrorPage_ErrorCode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("14concat_UI_", (new Object[]{((ErrorCodeErrorPage) object).getErrorCode()})); //$NON-NLS-1$ = "ErrorCodeErrorPage {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ErrorCodeErrorPage.class)) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
deleted file mode 100644
index 190fa5fec..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}object.
- */
-public class ErrorPageItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ErrorPageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns error_page.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("error_page"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the ErrorPage.
-	 */
-	public Object getParent(Object object) {
-		return ((ErrorPage) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the location feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$ = "Location"
-						WebAppEditResourceHandler.getString("The_location_property_UI_"), //$NON-NLS-1$ = "The location property"
-						pkg.getErrorPage_Location()));
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Location feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLocationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ErrorPage_location_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ErrorPage_location_feature", "_UI_ErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getErrorPage_Location(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("13concat_UI_", (new Object[]{((ErrorPage) object).getLocation()})); //$NON-NLS-1$ = "ErrorPage {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ErrorPage.class)) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
deleted file mode 100644
index 2b4befc6f..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
+++ /dev/null
@@ -1,118 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}object.
- */
-public class ExceptionTypeErrorPageItemProvider extends ErrorPageItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ExceptionTypeErrorPageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns exception_type_errorpage.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("exception_type_errorpage"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the exceptionType feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ExceptionType_UI_"), //$NON-NLS-1$ = "ExceptionType"
-						WebAppEditResourceHandler.getString("The_exceptionType_property_UI_"), //$NON-NLS-1$ = "The exceptionType property"
-						pkg.getExceptionTypeErrorPage_ExceptionType()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Exception Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addExceptionTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionTypeErrorPage_exceptionType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ExceptionTypeErrorPage_exceptionType_feature", "_UI_ExceptionTypeErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getExceptionTypeErrorPage_ExceptionType(), true));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("15concat_UI_", (new Object[]{((ExceptionTypeErrorPage) object).getExceptionTypeName()})); //$NON-NLS-1$ = "ExceptionTypeErrorPage {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
deleted file mode 100644
index 89c494d90..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
+++ /dev/null
@@ -1,263 +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.web.providers;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class FilterItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public FilterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		InitParam child = WebapplicationFactory.eINSTANCE.createInitParam();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		WebApp webApp = (WebApp) ((Filter) object).eContainer();
-		if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
-			result.add(pkg.getFilter_InitParamValues());
-		else
-			result.add(pkg.getFilter_InitParams());
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateInitParam"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return "Create InitParam"; //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("26concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type InitParam for the selected {0}."
-	}
-
-	/**
-	 * This returns Filter.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("filter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the Filter.
-	 */
-	public Object getParent(Object object) {
-		return WebapplicationPackage.eINSTANCE.getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			WebapplicationPackage wap = WebapplicationPackage.eINSTANCE;
-
-			// This is for the filterName feature.
-
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FilterItemProvider_UI_0"), //$NON-NLS-1$
-						WebAppEditResourceHandler.getString("The_filterName_property_3"), wap.getFilter_Name())); //$NON-NLS-1$ //$NON-NLS-2$
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Filter_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFilter_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Filter Class feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addFilterClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Filter_filterClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Filter_filterClass_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFilter_FilterClass(), true));
-	}
-
-	/**
-	 * This implements
-	 * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
-	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public Object getPropertyValue(Object object, String property) {
-		Object ret = null;
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
-		} else
-			ret = super.getPropertyValue(object, property);
-		return ret;
-	}
-
-	public String getText(Object object) {
-		Filter filter = (Filter) object;
-		String name = filter.getName();
-		if (name == null)
-			name = "<filter>"; //$NON-NLS-1$
-		return name;
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Filter.class)) {
-			case WebapplicationPackage.FILTER__NAME :
-			case WebapplicationPackage.FILTER__INIT_PARAMS :
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getFilter_InitParams(), WebapplicationFactory.eINSTANCE.createInitParam()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getFilter_InitParamValues(), CommonFactory.eINSTANCE.createParamValue()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
-	 * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public boolean isPropertySet(Object object, String property) {
-		boolean ret = false;
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
-		} else
-			ret = super.isPropertySet(object, property);
-		return ret;
-	}
-
-	/**
-	 * This implements
-	 * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
-	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public void setPropertyValue(Object object, String property, Object value) {
-
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
-		} else
-			super.setPropertyValue(object, property, value);
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
deleted file mode 100644
index a46c2f806..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
+++ /dev/null
@@ -1,196 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}
- * object.
- */
-public class FilterMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public FilterMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns filter_mapping.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("filter_mapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the FilterMapping.
-	 */
-	public Object getParent(Object object) {
-		return WebapplicationPackage.eINSTANCE.getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			WebapplicationPackage wap = WebapplicationPackage.eINSTANCE;
-
-			// This is for the urlPattern feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
-						WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
-						wap.getFilterMapping_UrlPattern()));
-
-			// This is for the filter feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Filter", WebAppEditResourceHandler.getString("The_filter_property_2"), wap.getFilterMapping_Filter(), false)); //$NON-NLS-1$ //$NON-NLS-2$
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUrlPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_urlPattern_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_urlPattern_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFilterMapping_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Dispatcher Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDispatcherTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_dispatcherType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_dispatcherType_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFilterMapping_DispatcherType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Filter feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addFilterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_filter_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_filter_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFilterMapping_Filter(), true));
-	}
-
-	/**
-	 * This adds a property descriptor for the Servlet feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServletPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_servlet_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_servlet_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFilterMapping_Servlet(), true));
-	}
-
-
-	public String getText(Object object) {
-		FilterMapping filterMapping = (FilterMapping) object;
-		Filter filter = filterMapping.getFilter();
-		String filterStr = (filter == null) ? WebAppEditResourceHandler.getString("?_UI_") : filter.getName(); //$NON-NLS-1$ = "?"
-
-		String mapText = ((FilterMapping) object).getUrlPattern();
-		if (mapText == null) {
-			Servlet servlet = filterMapping.getServlet();
-			if (servlet != null)
-				mapText = servlet.getServletName();
-		}
-		if (mapText == null)
-			mapText = "?"; //$NON-NLS-1$
-		return WebAppEditResourceHandler.getString("Filter_mapping_text", new Object[]{filterStr, mapText}); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(FilterMapping.class)) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN :
-			case WebapplicationPackage.FILTER_MAPPING__FILTER :
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET :
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
deleted file mode 100644
index f9fe86761..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
+++ /dev/null
@@ -1,178 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}
- * object.
- */
-public class FormLoginConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public FormLoginConfigItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns form_login_config.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("form_login_config");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns form_login_config.gif.
-	 */
-	//TODO Removing the UI dependency by commenting out this method
-	/*
-	 * public Image getLabelImage(Object object) { return (Image)
-	 * WEBUIPlugin.getDefault().getImageFromRegistry("form_login_config");//$NON-NLS-1$ }
-	 */
-	public String getLabelText(Object object) {
-		return WebAppEditResourceHandler.getString("52concat_UI_", (new Object[]{((FormLoginConfig) object).getFormLoginPage()})); //$NON-NLS-1$ = "FormLoginConfig {0}"
-	}
-
-	/**
-	 * This returns the loginConfig of the FormLoginConfig.
-	 */
-	public Object getParent(Object object) {
-		return ((FormLoginConfig) object).getLoginConfig();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the formLoginPage feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormLoginPage_UI_"), //$NON-NLS-1$ = "FormLoginPage"
-						WebAppEditResourceHandler.getString("The_formLoginPage_property_UI_"), //$NON-NLS-1$ = "The formLoginPage property"
-						pkg.getFormLoginConfig_FormLoginPage()));
-
-			// This is for the formErrorPage feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormErrorPage_UI_"), //$NON-NLS-1$ = "FormErrorPage"
-						WebAppEditResourceHandler.getString("The_formErrorPage_property_UI_"), //$NON-NLS-1$ = "The formErrorPage property"
-						pkg.getFormLoginConfig_FormErrorPage()));
-
-			// This is for the loginConfig feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("LoginConfig_UI_"), //$NON-NLS-1$ = "LoginConfig"
-						WebAppEditResourceHandler.getString("The_loginConfig_property_UI_"), //$NON-NLS-1$ = "The loginConfig property"
-						pkg.getFormLoginConfig_LoginConfig()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Form Login Page feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addFormLoginPagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FormLoginConfig_formLoginPage_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_FormLoginConfig_formLoginPage_feature", "_UI_FormLoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFormLoginConfig_FormLoginPage(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Form Error Page feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addFormErrorPagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FormLoginConfig_formErrorPage_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_FormLoginConfig_formErrorPage_feature", "_UI_FormLoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getFormLoginConfig_FormErrorPage(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("16concat_UI_", (new Object[]{((FormLoginConfig) object).getFormLoginPage()})); //$NON-NLS-1$ = "FormLoginConfig {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(FormLoginConfig.class)) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE :
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
deleted file mode 100644
index 1828e70d0..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
+++ /dev/null
@@ -1,149 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}
- * object.
- */
-public class HTTPMethodTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public HTTPMethodTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns http_type.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("http_type");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the resCollection of the HTTPMethodType.
-	 */
-	public Object getParent(Object object) {
-		return ((HTTPMethodType) object).getHttpMethod();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the httpMethod feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("HttpMethod_UI_"), //$NON-NLS-1$ = "HttpMethod"
-						WebAppEditResourceHandler.getString("The_httpMethod_property_UI_"), //$NON-NLS-1$ = "The httpMethod property"
-						pkg.getHTTPMethodType_HttpMethod()));
-
-			// This is for the resCollection feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ResCollection_UI_"), //$NON-NLS-1$ = "ResCollection"
-						WebAppEditResourceHandler.getString("The_resCollection_property_UI_"), //$NON-NLS-1$ = "The resCollection property"
-						pkg.getHTTPMethodType_HttpMethod()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Http Method feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addHttpMethodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_HTTPMethodType_httpMethod_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_HTTPMethodType_httpMethod_feature", "_UI_HTTPMethodType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getHTTPMethodType_HttpMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("17concat_UI_", (new Object[]{((HTTPMethodType) object).getHttpMethod()})); //$NON-NLS-1$ = "HTTPMethodType {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(HTTPMethodType.class)) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
deleted file mode 100644
index 0a0a6d5e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
+++ /dev/null
@@ -1,223 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}object.
- */
-public class InitParamItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public InitParamItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns initializ_parameter.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("initializ_parameter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the servlet of the InitParam.
-	 */
-	public Object getParent(Object object) {
-		return ((InitParam) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the paramName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamName_UI_"), //$NON-NLS-1$ = "ParamName"
-						WebAppEditResourceHandler.getString("The_paramName_property_UI_"), //$NON-NLS-1$ = "The paramName property"
-						pkg.getInitParam_ParamName()));
-
-			// This is for the paramValue feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamValue_UI_"), //$NON-NLS-1$ = "ParamValue"
-						WebAppEditResourceHandler.getString("The_paramValue_property_UI_"), //$NON-NLS-1$ = "The paramValue property"
-						pkg.getInitParam_ParamValue()));
-
-			// This is for the description feature.
-			//
-			WebToolingItemPropertyDescriptor propertyDescriptor = new WebToolingItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
-						WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
-						pkg.getInitParam_Description(), WebToolingItemPropertyDescriptor.MULTILINE_TEXT_EDITOR);
-			itemPropertyDescriptors.add(propertyDescriptor);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParamNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_paramName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_InitParam_paramName_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getInitParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParamValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_paramValue_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_InitParam_paramValue_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getInitParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_InitParam_description_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getInitParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This implements
-	 * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
-	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public Object getPropertyValue(Object object, String property) {
-		Object ret = null;
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
-		} else
-			ret = super.getPropertyValue(object, property);
-		return ret;
-	}
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("18concat_UI_", (new Object[]{((InitParam) object).getParamName(), ((InitParam) object).getParamValue()})); //$NON-NLS-1$ = "{0} = {1}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(InitParam.class)) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME :
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE :
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-	/**
-	 * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
-	 * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public boolean isPropertySet(Object object, String property) {
-		boolean ret = false;
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
-		} else
-			ret = super.isPropertySet(object, property);
-		return ret;
-	}
-
-	/**
-	 * This implements
-	 * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
-	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public void setPropertyValue(Object object, String property, Object value) {
-
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
-		} else
-			super.setPropertyValue(object, property, value);
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java
deleted file mode 100644
index 19a4b4926..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.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.web.providers;
-
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * Insert the type's description here. Creation date: (6/18/2001 5:53:02 PM)
- * 
- * @author: Administrator
- */
-public class ItemHolder extends ItemProvider {
-	protected WebApp webApp;
-	protected WebArtifactEdit webArtifactEdit;
-
-	public ItemHolder() {
-		super();
-	}
-
-	/**
-	 * Jarholder constructor comment.
-	 */
-	public ItemHolder(WebApp webApp) {
-		super();
-		setWebApp(webApp);
-	}
-	public ItemHolder(WebArtifactEdit webArtifactEdit) {
-		super();
-		setWebArtifactEdit(webArtifactEdit);
-	}
-
-	public Collection getChildren(Object element) {
-		WebApp testElement;
-		Vector v = new Vector();
-		if (element instanceof ItemHolder) {
-			testElement = ((ItemHolder) element).getWebApp();
-			v.add(testElement);
-		}
-		return v;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/18/2001 6:00:43 PM)
-	 * 
-	 * @return org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar
-	 */
-	public WebApp getWebApp() {
-		return webApp;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/18/2001 6:00:43 PM)
-	 * 
-	 * @param newJar
-	 *            org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar
-	 */
-	public void setWebApp(WebApp aWebApp) {
-		webApp = aWebApp;
-	}
-
-	public WebArtifactEdit getWebArtifactEdit() {
-		return webArtifactEdit;
-	}
-
-	public void setWebArtifactEdit(WebArtifactEdit webArtifactEdit) {
-		this.webArtifactEdit = webArtifactEdit;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
deleted file mode 100644
index 1a59fa868..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
+++ /dev/null
@@ -1,154 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.JSPConfig}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class JSPConfigItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JSPConfigItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JspPackage.eINSTANCE.getJSPConfig_TagLibs());
-			childrenReferences.add(JspPackage.eINSTANCE.getJSPConfig_PropertyGroups());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns JSPConfig.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("full/obj16/JSPConfig"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("_UI_JSPConfig_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(JSPConfig.class)) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS :
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JspPackage.eINSTANCE.getJSPConfig_TagLibs(), JspFactory.eINSTANCE.createTagLibRefType()));
-
-		newChildDescriptors.add(createChildParameter(JspPackage.eINSTANCE.getJSPConfig_PropertyGroups(), JspFactory.eINSTANCE.createJSPPropertyGroup()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java
deleted file mode 100644
index d05194d2b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java
+++ /dev/null
@@ -1,218 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.JSPPropertyGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class JSPPropertyGroupItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JSPPropertyGroupItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addUrlPatternPropertyDescriptor(object);
-			addElIgnoredPropertyDescriptor(object);
-			addPageEncodingPropertyDescriptor(object);
-			addScriptingInvalidPropertyDescriptor(object);
-			addIsXMLPropertyDescriptor(object);
-			addIncludePreludesPropertyDescriptor(object);
-			addIncludeCodasPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUrlPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_urlPattern_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_urlPattern_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the El Ignored feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addElIgnoredPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_elIgnored_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_elIgnored_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_ElIgnored(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Page Encoding feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addPageEncodingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_pageEncoding_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_pageEncoding_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_PageEncoding(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Scripting Invalid feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addScriptingInvalidPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_scriptingInvalid_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_scriptingInvalid_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_ScriptingInvalid(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is XML feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addIsXMLPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_isXML_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_isXML_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_IsXML(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Include Preludes feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addIncludePreludesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_includePreludes_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_includePreludes_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_IncludePreludes(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Include Codas feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addIncludeCodasPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_includeCodas_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_includeCodas_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JspPackage.eINSTANCE.getJSPPropertyGroup_IncludeCodas(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns JSPPropertyGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("full/obj16/JSPPropertyGroup"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((JSPPropertyGroup) object).getDisplayName();
-		return label == null || label.length() == 0 ? getString("_UI_JSPPropertyGroup_type") : //$NON-NLS-1$
-					getString("_UI_JSPPropertyGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(JSPPropertyGroup.class)) {
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN :
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED :
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING :
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID :
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML :
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES :
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		//		return J2EEPlugin.getDefault();
-		return WebAppEditResourceHandler.RESOURCE_LOCATOR;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java
deleted file mode 100644
index 9f7ac5b57..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java
+++ /dev/null
@@ -1,123 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}object.
- */
-public class JSPTypeItemProvider extends WebTypeItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public JSPTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns jsp_type.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("jsp_type");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the jspFile feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("JspFile_UI_"), //$NON-NLS-1$ = "JspFile"
-						WebAppEditResourceHandler.getString("The_jspFile_property_UI_"), //$NON-NLS-1$ = "The jspFile property"
-						pkg.getJSPType_JspFile()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Jsp File feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addJspFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPType_jspFile_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JSPType_jspFile_feature", "_UI_JSPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getJSPType_JspFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("40concat_UI_", (new Object[]{((JSPType) object).getJspFile()})); //$NON-NLS-1$ = "JSPType {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(JSPType.class)) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
deleted file mode 100644
index 9682d7256..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,232 +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.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.jsp.internal.util.JspAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class JspItemProviderAdapterFactory extends JspAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JspItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.JSPConfig}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected JSPConfigItemProvider jspConfigItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jsp.JSPConfig}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createJSPConfigAdapter() {
-		if (jspConfigItemProvider == null) {
-			jspConfigItemProvider = new JSPConfigItemProvider(this);
-		}
-
-		return jspConfigItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.JSPPropertyGroup}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected JSPPropertyGroupItemProvider jspPropertyGroupItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jsp.JSPPropertyGroup}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createJSPPropertyGroupAdapter() {
-		if (jspPropertyGroupItemProvider == null) {
-			jspPropertyGroupItemProvider = new JSPPropertyGroupItemProvider(this);
-		}
-
-		return jspPropertyGroupItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.TagLibRefType}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.jsp.TagLibRefType}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createTagLibRefTypeAdapter() {
-		if (tagLibRefTypeItemProvider == null) {
-			tagLibRefTypeItemProvider = new TagLibRefTypeItemProvider(this);
-		}
-
-		return tagLibRefTypeItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
deleted file mode 100644
index 2f23448be..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
+++ /dev/null
@@ -1,148 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class LocalEncodingMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public LocalEncodingMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLocalePropertyDescriptor(object);
-			addEncodingPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Locale feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLocalePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LocalEncodingMapping_locale_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_LocalEncodingMapping_locale_feature", "_UI_LocalEncodingMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getLocalEncodingMapping_Locale(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Encoding feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addEncodingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LocalEncodingMapping_encoding_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_LocalEncodingMapping_encoding_feature", "_UI_LocalEncodingMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getLocalEncodingMapping_Encoding(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns LocalEncodingMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		//		return getResourceLocator().getImage("full/obj16/LocalEncodingMapping");
-		return WebPlugin.getDefault().getImage("local_encoding_mapping");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 */
-	public String getText(Object object) {
-		String lem = WebAppEditResourceHandler.getString("local_encoding_mapping_UI_"); //$NON-NLS-1$
-		String label = ((LocalEncodingMapping) object).getLocale();
-		return label == null || label.length() == 0 ? lem : lem + " " + label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(LocalEncodingMapping.class)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE :
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
deleted file mode 100644
index 986dc41af..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
+++ /dev/null
@@ -1,136 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class LocalEncodingMappingListItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public LocalEncodingMappingListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns LocalEncodingMappingList.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		//		return getResourceLocator().getImage("full/obj16/LocalEncodingMappingList");
-		return WebPlugin.getDefault().getImage("local_encoding_mapping_list");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 */
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("Local_encoding_mapping_list_UI_"); //$NON-NLS-1$ = "Welcome File List"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(LocalEncodingMappingList.class)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings(), WebapplicationFactory.eINSTANCE.createLocalEncodingMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
deleted file mode 100644
index 19bf93a33..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
+++ /dev/null
@@ -1,224 +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.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}object.
- */
-public class LoginConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public LoginConfigItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: create some child object.
-		return null;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		result.add(pkg.getLoginConfig_FormLoginConfig());
-		return result;
-	}
-
-	//TODO Removing UI dependency by commenting out method
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	/*
-	 * public ImageDescriptor getCreateChildImageDescriptor(Object object) { EObject refObject =
-	 * (EObject)object; return
-	 * WEBUIPlugin.getDefault().getImageDescriptor(refObject.eClass().getName() +
-	 * "Create#CHILD_CLASS_NAME#");//$NON-NLS-1$ }
-	 */
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return WebAppEditResourceHandler.getString("Create_#CHILD_CLASS_NAME#_UI_"); //$NON-NLS-1$ = "Create #CHILD_CLASS_NAME#"
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("1concat", (new Object[]{refObject.eClass().getName()}));//$NON-NLS-1$ = "Create a child of type #CHILD_CLASS_NAME# for the selected {0}." 
-	}
-
-	/**
-	 * This returns form_login_config.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("form_login_config");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the LoginConfig.
-	 */
-	public Object getParent(Object object) {
-		return ((LoginConfig) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the authMethod feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("AuthMethod_UI_"), //$NON-NLS-1$ = "AuthMethod"
-						WebAppEditResourceHandler.getString("The_authMethod_property_UI_"), //$NON-NLS-1$ = "The authMethod property"
-						pkg.getLoginConfig_AuthMethod()));
-
-			// This is for the realmName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("RealmName_UI_"), //$NON-NLS-1$ = "RealmName"
-						WebAppEditResourceHandler.getString("The_realmName_property_UI_"), //$NON-NLS-1$ = "The realmName property"
-						pkg.getLoginConfig_RealmName()));
-
-			// This is for the webApp feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
-						WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The webApp property"
-						pkg.getLoginConfig_WebApp()));
-
-			// This is for the formLoginConfig feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormLoginConfig_UI_"), //$NON-NLS-1$ = "FormLoginConfig"
-						WebAppEditResourceHandler.getString("The_formLoginConfig_proper_UI_"), //$NON-NLS-1$ = "The formLoginConfig property"
-						pkg.getLoginConfig_FormLoginConfig()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Auth Method feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAuthMethodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_authMethod_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_authMethod_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getLoginConfig_AuthMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Realm Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRealmNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_realmName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_realmName_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getLoginConfig_RealmName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Authorization Method feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAuthorizationMethodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_authorizationMethod_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_authorizationMethod_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getLoginConfig_AuthorizationMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("21concat_UI_", (new Object[]{((LoginConfig) object).getRealmName()})); //$NON-NLS-1$ = "LoginConfig {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(LoginConfig.class)) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD :
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME :
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD :
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getLoginConfig_FormLoginConfig(), WebapplicationFactory.eINSTANCE.createFormLoginConfig()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
deleted file mode 100644
index 6c086d2d8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
+++ /dev/null
@@ -1,171 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}object.
- */
-public class MimeMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public MimeMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns mime_mapping.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("mime_mapping");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the MimeMapping.
-	 */
-	public Object getParent(Object object) {
-		return ((MimeMapping) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the extension feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Extension_UI_"), //$NON-NLS-1$ = "Extension"
-						WebAppEditResourceHandler.getString("The_extension_property_UI_"), //$NON-NLS-1$ = "The extension property"
-						pkg.getMimeMapping_Extension()));
-
-			// This is for the mimeType feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("MimeType_UI_"), //$NON-NLS-1$ = "MimeType"
-						WebAppEditResourceHandler.getString("The_mimeType_property_UI_"), //$NON-NLS-1$ = "The mimeType property"
-						pkg.getMimeMapping_MimeType()));
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
-			 * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
-			 * webApp property" pkg.getMimeMapping_WebApp()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Extension feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addExtensionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MimeMapping_extension_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MimeMapping_extension_feature", "_UI_MimeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getMimeMapping_Extension(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Mime Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addMimeTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MimeMapping_mimeType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MimeMapping_mimeType_feature", "_UI_MimeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getMimeMapping_MimeType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("22concat_UI_", (new Object[]{((MimeMapping) object).getExtension()})); //$NON-NLS-1$ = "MimeMapping {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(MimeMapping.class)) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION :
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
deleted file mode 100644
index c91f02281..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
+++ /dev/null
@@ -1,136 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}
- * object.
- */
-public class RoleNameTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public RoleNameTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns security_role_nametype.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("security_role_nametype");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the roleName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("RoleName_UI_"), //$NON-NLS-1$ = "RoleName"
-						WebAppEditResourceHandler.getString("The_roleName_property_UI_"), //$NON-NLS-1$ = "The roleName property"
-						pkg.getRoleNameType_RoleName()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRoleNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RoleNameType_roleName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_RoleNameType_roleName_feature", "_UI_RoleNameType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getRoleNameType_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("23concat_UI_", (new Object[]{((RoleNameType) object).getRoleName()})); //$NON-NLS-1$ = "RoleNameType {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(RoleNameType.class)) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
deleted file mode 100644
index 30134bde6..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
+++ /dev/null
@@ -1,242 +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.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}
- * object.
- */
-public class SecurityConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public SecurityConstraintItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		WebResourceCollection child = WebapplicationFactory.eINSTANCE.createWebResourceCollection();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		result.add(pkg.getSecurityConstraint_WebResourceCollections());
-		result.add(pkg.getSecurityConstraint_AuthConstraint());
-		result.add(pkg.getSecurityConstraint_UserDataConstraint());
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateWebResourceCollection"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return WebAppEditResourceHandler.getString("Create_WebResourceCollecti_UI_"); //$NON-NLS-1$ = "Create WebResourceCollection"
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("24concat", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type WebResourceCollection for the selected {0}."
-	}
-
-	/**
-	 * This returns security_constraint.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("security_constraint"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the SecurityConstraint.
-	 */
-	public Object getParent(Object object) {
-		return ((SecurityConstraint) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
-			 * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
-			 * webApp property" pkg.getSecurityConstraint_WebApp()));
-			 */
-
-			// This is for the displayName feature.
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("DisplayName_UI_"), //$NON-NLS-1$ = "DisplayName"
-						WebAppEditResourceHandler.getString("The_displayName_property_UI_"), //$NON-NLS-1$ = "The displayName property"
-						pkg.getSecurityConstraint_DisplayName()));
-
-			// This is for the authConstraint feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("AuthConstraint_UI_"), //$NON-NLS-1$ = "AuthConstraint"
-						WebAppEditResourceHandler.getString("The_authConstraint_propert_UI_"), //$NON-NLS-1$ = "The authConstraint property"
-						pkg.getSecurityConstraint_AuthConstraint()));
-
-			// This is for the userDataConstraint feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UserDataConstraint_UI_"), //$NON-NLS-1$ = "UserDataConstraint"
-						WebAppEditResourceHandler.getString("The_userDataConstraint_pro_UI_"), //$NON-NLS-1$ = "The userDataConstraint property"
-						pkg.getSecurityConstraint_UserDataConstraint()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityConstraint_displayName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityConstraint_displayName_feature", "_UI_SecurityConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	public String getText(Object object) {
-		String displayName = ((SecurityConstraint) object).getDisplayName();
-		if (displayName == null) {
-			List displayNameList = ((SecurityConstraint) object).getDisplayNames();
-			if (displayNameList != null && displayNameList.size() > 0)
-				displayName = ((DisplayName) displayNameList.get(0)).getValue();
-		}
-		if (displayName == null)
-			displayName = ""; //$NON-NLS-1$
-		return " " + displayName; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SecurityConstraint.class)) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME :
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS :
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT :
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT :
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_WebResourceCollections(), WebapplicationFactory.eINSTANCE.createWebResourceCollection()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_AuthConstraint(), WebapplicationFactory.eINSTANCE.createAuthConstraint()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_UserDataConstraint(), WebapplicationFactory.eINSTANCE.createUserDataConstraint()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayNames(), CommonFactory.eINSTANCE.createDisplayName()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayNames(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
deleted file mode 100644
index 5e84866f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
+++ /dev/null
@@ -1,297 +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.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class ServletItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ServletItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		InitParam child = WebapplicationFactory.eINSTANCE.createInitParam();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		//result.add(pkg.getServlet_WebType());
-		WebApp webApp = (WebApp) ((Servlet) object).eContainer();
-		if (webApp == null)
-			return result;
-		if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
-			result.add(pkg.getServlet_InitParams());
-		else
-			result.add(pkg.getServlet_Params());
-		result.add(pkg.getServlet_SecurityRoleRefs());
-		result.add(pkg.getServlet_RunAs());
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateInitParam"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return WebAppEditResourceHandler.getString("Create_InitParam_UI_"); //$NON-NLS-1$ = "Create InitParam"
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("26concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type InitParam for the selected {0}."
-	}
-
-	/**
-	 * This returns Servlet.gif.
-	 */
-	public Object getImage(Object object) {
-		WebType wt = ((Servlet) object).getWebType();
-		if (wt != null && wt.isJspType())
-			return WebPlugin.getDefault().getImage("jsp_type"); //$NON-NLS-1$
-
-		return WebPlugin.getDefault().getImage("servlet"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the Servlet.
-	 */
-	public Object getParent(Object object) {
-		return ((Servlet) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the servletName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ServletName_UI_"), //$NON-NLS-1$
-						//$NON-NLS-1$ = "ServletName"
-						WebAppEditResourceHandler.getString("The_servletName_property_UI_"), //$NON-NLS-1$ = "The servletName property"
-						pkg.getServlet_ServletName()));
-
-
-			// This is for the loadOnStartup feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("LoadOnStartup_UI_"), //$NON-NLS-1$
-						//$NON-NLS-1$ = "LoadOnStartup"
-						WebAppEditResourceHandler.getString("The_loadOnStartup_property_UI_"), //$NON-NLS-1$ = "The loadOnStartup property"
-						pkg.getServlet_LoadOnStartup(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Servlet Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServletNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Servlet_servletName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Servlet_servletName_feature", "_UI_Servlet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getServlet_ServletName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Load On Startup feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLoadOnStartupPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Servlet_loadOnStartup_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Servlet_loadOnStartup_feature", "_UI_Servlet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getServlet_LoadOnStartup(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This implements
-	 * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
-	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public Object getPropertyValue(Object object, String property) {
-		Object ret = null;
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
-		} else
-			ret = super.getPropertyValue(object, property);
-		return ret;
-	}
-
-	public String getText(Object object) {
-		Servlet servlet = (Servlet) object;
-		String name = servlet.getServletName();
-		if (name == null)
-			name = WebAppEditResourceHandler.getString("<servlet>_UI_"); //$NON-NLS-1$ = "<servlet>"
-		return name;
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Servlet.class)) {
-			case WebapplicationPackage.SERVLET__SERVLET_NAME :
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP :
-			case WebapplicationPackage.SERVLET__WEB_TYPE :
-			case WebapplicationPackage.SERVLET__PARAMS :
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS :
-			case WebapplicationPackage.SERVLET__RUN_AS :
-			case WebapplicationPackage.SERVLET__INIT_PARAMS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_WebType(), WebapplicationFactory.eINSTANCE.createServletType()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_WebType(), WebapplicationFactory.eINSTANCE.createJSPType()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_Params(), WebapplicationFactory.eINSTANCE.createInitParam()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_SecurityRoleRefs(), CommonFactory.eINSTANCE.createSecurityRoleRef()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_RunAs(), CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_InitParams(), CommonFactory.eINSTANCE.createParamValue()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
-	 * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public boolean isPropertySet(Object object, String property) {
-		boolean ret = false;
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
-		} else
-			ret = super.isPropertySet(object, property);
-		return ret;
-	}
-
-
-	/**
-	 * This implements
-	 * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
-	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
-	 * interface
-	 */
-	public void setPropertyValue(Object object, String property, Object value) {
-
-		if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
-			((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
-		} else
-			super.setPropertyValue(object, property, value);
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
deleted file mode 100644
index 602a2da43..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
+++ /dev/null
@@ -1,177 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}
- * object.
- */
-public class ServletMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ServletMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns servlet_mapping.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("servlet_mapping");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the ServletMapping.
-	 */
-	public Object getParent(Object object) {
-		return ((ServletMapping) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the urlPattern feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
-						WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
-						pkg.getServletMapping_UrlPattern()));
-
-
-			// This is for the servlet feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Servlet_UI_"), //$NON-NLS-1$ = "Servlet"
-						WebAppEditResourceHandler.getString("The_servlet_property_UI_"), //$NON-NLS-1$ = "The servlet property"
-						pkg.getServletMapping_Servlet(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUrlPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_urlPattern_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_urlPattern_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getServletMapping_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_name_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getServletMapping_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Servlet feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServletPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_servlet_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_servlet_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getServletMapping_Servlet(), false));
-	}
-
-
-	public String getText(Object object) {
-		String urlStr = ((ServletMapping) object).getUrlPattern();
-		Servlet servlet = ((ServletMapping) object).getServlet();
-		String servletStr = (servlet == null) ? WebAppEditResourceHandler.getString("?_UI_") : servlet.getServletName(); //$NON-NLS-1$ = "?"
-		return WebAppEditResourceHandler.getString("28concat_UI_", (new Object[]{urlStr, servletStr})); //$NON-NLS-1$ = "Servlet mapping ({0} -> {1})"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServletMapping.class)) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN :
-			case WebapplicationPackage.SERVLET_MAPPING__NAME :
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java
deleted file mode 100644
index 2039a8937..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java
+++ /dev/null
@@ -1,123 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}object.
- */
-public class ServletTypeItemProvider extends WebTypeItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ServletTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns servlet_type.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("servlet_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the className feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ClassName_UI_"), //$NON-NLS-1$ = "ClassName"
-						WebAppEditResourceHandler.getString("The_className_property_UI_"), //$NON-NLS-1$ = "The className property"
-						pkg.getServletType_ClassName()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Class Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addClassNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletType_className_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServletType_className_feature", "_UI_ServletType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getServletType_ClassName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("41concat_UI_", (new Object[]{((ServletType) object).getClassName()})); //$NON-NLS-1$ = "ServletType {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServletType.class)) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
deleted file mode 100644
index e4c8b44c9..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
+++ /dev/null
@@ -1,148 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}
- * object.
- */
-public class SessionConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public SessionConfigItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns session_config.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("session_config");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the SessionConfig.
-	 */
-	public Object getParent(Object object) {
-		return ((SessionConfig) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the sessionTimeout feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SessionTimeout_UI_"), //$NON-NLS-1$ = "SessionTimeout"
-						WebAppEditResourceHandler.getString("The_sessionTimeout_propert_UI_"), //$NON-NLS-1$ = "The sessionTimeout property"
-						pkg.getSessionConfig_SessionTimeout()));
-
-			// This is for the webApp feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
-						WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The webApp property"
-						pkg.getSessionConfig_WebApp()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Session Timeout feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSessionTimeoutPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SessionConfig_sessionTimeout_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SessionConfig_sessionTimeout_feature", "_UI_SessionConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getSessionConfig_SessionTimeout(), true, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("31concat_UI_", (new Object[]{new Integer(((SessionConfig) object).getSessionTimeout())})); //$NON-NLS-1$ = "SessionConfig {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SessionConfig.class)) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
deleted file mode 100644
index ff337fe04..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
+++ /dev/null
@@ -1,170 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}object.
- */
-public class TagLibRefItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public TagLibRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns jsp_library_reference.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("jsp_library_reference");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the TagLibRef.
-	 */
-	public Object getParent(Object object) {
-		return ((TagLibRef) object).getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the taglibURI feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$ = "TaglibURI"
-						WebAppEditResourceHandler.getString("The_taglibURI_property_UI_"), //$NON-NLS-1$ = "The taglibURI property"
-						pkg.getTagLibRef_TaglibURI()));
-
-			// This is for the taglibLocation feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$ = "TaglibLocation"
-						WebAppEditResourceHandler.getString("The_taglibLocation_propert_UI_"), //$NON-NLS-1$ = "The taglibLocation property"
-						pkg.getTagLibRef_TaglibLocation()));
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
-			 * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
-			 * webApp property" pkg.getTagLibRef_WebApp()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Taglib URI feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTaglibURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_TagLibRef_taglibURI_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_TagLibRef_taglibURI_feature", "_UI_TagLibRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getTagLibRef_TaglibURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Taglib Location feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTaglibLocationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_TagLibRef_taglibLocation_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_TagLibRef_taglibLocation_feature", "_UI_TagLibRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getTagLibRef_TaglibLocation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("32concat_UI_", (new Object[]{((TagLibRef) object).getTaglibURI()})); //$NON-NLS-1$ = "TagLibRef {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(TagLibRef.class)) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI :
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java
deleted file mode 100644
index 9430cfc03..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java
+++ /dev/null
@@ -1,148 +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.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.TagLibRefType}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class TagLibRefTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public TagLibRefTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTaglibURIPropertyDescriptor(object);
-			addTaglibLocationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Taglib URI feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTaglibURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$
-					WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$
-					JspPackage.eINSTANCE.getTagLibRefType_TaglibURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Taglib Location feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTaglibLocationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$
-					WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$
-					JspPackage.eINSTANCE.getTagLibRefType_TaglibLocation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns TagLibRefType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("full/obj16/TagLibRefType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((TagLibRefType) object).getTaglibURI();
-		String tlrt = WebAppEditResourceHandler.getString("_UI_TagLibRefType_type"); //$NON-NLS-1$
-		return label == null || label.length() == 0 ? tlrt : tlrt + " " + label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(TagLibRefType.class)) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI :
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
deleted file mode 100644
index 25339c397..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
+++ /dev/null
@@ -1,148 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}
- * object.
- */
-public class URLPatternTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public URLPatternTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns url_type.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("url_type");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the resCollection of the URLPatternType.
-	 */
-	public Object getParent(Object object) {
-		return ((URLPatternType) object).getResCollection();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the urlPattern feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
-						WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
-						pkg.getURLPatternType_UrlPattern()));
-
-			// This is for the resCollection feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ResCollection_UI_"), //$NON-NLS-1$ = "ResCollection"
-						WebAppEditResourceHandler.getString("The_resCollection_property_UI_"), //$NON-NLS-1$ = "The resCollection property"
-						pkg.getURLPatternType_ResCollection()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUrlPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_URLPatternType_urlPattern_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_URLPatternType_urlPattern_feature", "_UI_URLPatternType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getURLPatternType_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("33concat_UI_", (new Object[]{((URLPatternType) object).getUrlPattern()})); //$NON-NLS-1$ = "URLPatternType {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(URLPatternType.class)) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
deleted file mode 100644
index 02c04b112..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
+++ /dev/null
@@ -1,189 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}
- * object.
- */
-public class UserDataConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public UserDataConstraintItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns user_data_constraint.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("user_data_constraint"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the secConstraint of the UserDataConstraint.
-	 */
-	public Object getParent(Object object) {
-		return ((UserDataConstraint) object).getSecConstraint();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
-						WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
-						pkg.getUserDataConstraint_Description()));
-
-			// This is for the transportGuarantee feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("TransportGuarantee_UI_"), //$NON-NLS-1$ = "TransportGuarantee"
-						WebAppEditResourceHandler.getString("The_transportGuarantee_pro_UI_"), //$NON-NLS-1$ = "The transportGuarantee property"
-						pkg.getUserDataConstraint_TransportGuarantee()));
-
-			// This is for the secConstraint feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
-						WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
-						pkg.getUserDataConstraint_SecConstraint()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UserDataConstraint_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_UserDataConstraint_description_feature", "_UI_UserDataConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getUserDataConstraint_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Transport Guarantee feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTransportGuaranteePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UserDataConstraint_transportGuarantee_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_UserDataConstraint_transportGuarantee_feature", "_UI_UserDataConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getUserDataConstraint_TransportGuarantee(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("34concat_UI_", (new Object[]{((UserDataConstraint) object).getTransportGuarantee().getName()})); //$NON-NLS-1$ = "UserDataConstraint {0}"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(UserDataConstraint.class)) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION :
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE :
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java
deleted file mode 100644
index 8e82792ec..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java
+++ /dev/null
@@ -1,97 +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.web.providers;
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-public class WebAppEditResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
-		public URL getBaseURL() {
-			return null;
-		}
-
-		public Object getImage(String arg0) {
-			return WebPlugin.getDefault().getImage(arg0);
-		}
-
-		public String getString(String arg0) {
-			return WebAppEditResourceHandler.getString(arg0);
-		}
-
-		public String getString(String arg0, Object[] arg1) {
-			return WebAppEditResourceHandler.getString(arg0, arg1);
-		}
-		public String getString(String key, boolean translate) {
-			// TODO For now...  translate not supported
-			return getString(key);
-		}
-
-		public String getString(String key, Object[] substitutions, boolean translate) {
-			// TODO For now...  translate not supported
-			return getString(key,substitutions);
-		}
-	};
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("webedit");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(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);
-		}
-
-	}
-
-	public static String getString(String key, Object[] args, int x) {
-
-		return getString(key);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
deleted file mode 100644
index 773db7ae2..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
+++ /dev/null
@@ -1,349 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.provider.JNDIEnvRefsGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}object.
- */
-public class WebAppItemProvider extends JNDIEnvRefsGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public WebAppItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		ContextParam child = WebapplicationFactory.eINSTANCE.createContextParam();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		WebApp webApp = (WebApp) object;
-		Collection myChildren = super.getChildren(object);
-		if (webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID) {
-			WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-			myChildren.addAll(serviceHelper.get13ServiceRefs(webApp));
-		}
-		return myChildren;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-
-
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Contexts());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_FileList());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_TagLibs());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Constraints());
-			//childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_LoginConfig());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_MimeMappings());
-			//childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_SessionConfig());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ServletMappings());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Servlets());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_SecurityRoles());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Filters());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_FilterMappings());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Listeners());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ContextParams());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations());
-			childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateContextParam"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return WebAppEditResourceHandler.getString("Create_ContextParam_UI_"); //$NON-NLS-1$ = "Create ContextParam"
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("35concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type ContextParam for the selected {0}."
-	}
-
-	public Object getImage(Object object) {
-		String key = null;
-		if (((WebApp) object).eResource() == null)
-			return J2EEPlugin.getPlugin().getImage("web_application"); //$NON-NLS-1$
-		switch (((WebApp) object).getVersionID()) {
-			case J2EEVersionConstants.WEB_2_2_ID :
-				key = "webapp_22"; //$NON-NLS-1$ 
-				break;
-
-			case J2EEVersionConstants.WEB_2_3_ID :
-				key = "webapp_23"; //$NON-NLS-1$ 
-				break;
-
-			case J2EEVersionConstants.WEB_2_4_ID :
-			default :
-				key = "webapp_24"; //$NON-NLS-1$
-				break;
-		}
-		return WebPlugin.getDefault().getImage(key);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the distributable feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Distributable_UI_"), //$NON-NLS-1$
-						//$NON-NLS-1$ = "Distributable"
-						WebAppEditResourceHandler.getString("The_distributable_property_UI_"), //$NON-NLS-1$ = "The distributable property"
-						pkg.getWebApp_Distributable()));
-
-
-			// This is for the fileList feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FileList_UI_"), //$NON-NLS-1$ = "FileList"
-						WebAppEditResourceHandler.getString("The_fileList_property_UI_"), //$NON-NLS-1$ = "The fileList property"
-						pkg.getWebApp_FileList()));
-
-			/*
-			 * // ccc - for usability reasons, these descriptors are removed from the property
-			 * sheet. // This is for the loginConfig feature. // itemPropertyDescriptors.add (new
-			 * ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "LoginConfig",
-			 * "The loginConfig property", pkg.getWebApp_LoginConfig()));
-			 *  // This is for the sessionConfig feature. // itemPropertyDescriptors.add (new
-			 * ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * "SessionConfig", "The sessionConfig property", pkg.getWebApp_SessionConfig()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Distributable feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDistributablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebApp_distributable_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebApp_distributable_feature", "_UI_WebApp_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWebApp_Distributable(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebApp_version_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebApp_version_feature", "_UI_WebApp_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWebApp_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	public String getText(Object object) {
-		WebApp webApp = (WebApp) object;
-		String name = webApp.getDisplayName();
-		if (name == null)
-			name = WebAppEditResourceHandler.getString("<web_app>_UI_"); //$NON-NLS-1$ = "<web app>"
-		return name;
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WebApp.class)) {
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE :
-			case WebapplicationPackage.WEB_APP__VERSION :
-			case WebapplicationPackage.WEB_APP__CONTEXTS :
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES :
-			case WebapplicationPackage.WEB_APP__FILE_LIST :
-			case WebapplicationPackage.WEB_APP__TAG_LIBS :
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS :
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG :
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS :
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG :
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS :
-			case WebapplicationPackage.WEB_APP__SERVLETS :
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES :
-			case WebapplicationPackage.WEB_APP__FILTERS :
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS :
-			case WebapplicationPackage.WEB_APP__LISTENERS :
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS :
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG :
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS :
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Contexts(), WebapplicationFactory.eINSTANCE.createContextParam()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createErrorPage()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createExceptionTypeErrorPage()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createErrorCodeErrorPage()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_FileList(), WebapplicationFactory.eINSTANCE.createWelcomeFileList()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_TagLibs(), WebapplicationFactory.eINSTANCE.createTagLibRef()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Constraints(), WebapplicationFactory.eINSTANCE.createSecurityConstraint()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_LoginConfig(), WebapplicationFactory.eINSTANCE.createLoginConfig()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_MimeMappings(), WebapplicationFactory.eINSTANCE.createMimeMapping()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_SessionConfig(), WebapplicationFactory.eINSTANCE.createSessionConfig()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ServletMappings(), WebapplicationFactory.eINSTANCE.createServletMapping()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Servlets(), WebapplicationFactory.eINSTANCE.createServlet()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_SecurityRoles(), CommonFactory.eINSTANCE.createSecurityRole()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Filters(), WebapplicationFactory.eINSTANCE.createFilter()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_FilterMappings(), WebapplicationFactory.eINSTANCE.createFilterMapping()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Listeners(), CommonFactory.eINSTANCE.createListener()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ContextParams(), CommonFactory.eINSTANCE.createParamValue()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig(), JspFactory.eINSTANCE.createJSPConfig()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations(), CommonFactory.eINSTANCE.createMessageDestination()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList(), WebapplicationFactory.eINSTANCE.createLocalEncodingMappingList()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
-		boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
-		return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
-					new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
deleted file mode 100644
index 4b294a667..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
+++ /dev/null
@@ -1,294 +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.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}object.
- */
-public class WebResourceCollectionItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public WebResourceCollectionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		URLPatternType child = WebapplicationFactory.eINSTANCE.createURLPatternType();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		result.add(pkg.getWebResourceCollection_UrlPattern());
-		result.add(pkg.getWebResourceCollection_HttpMethod());
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateURLPatternType");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return WebAppEditResourceHandler.getString("Create_URLPatternType_UI_"); //$NON-NLS-1$ = "Create URLPatternType"
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("37concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type URLPatternType for the selected {0}."
-	}
-
-	/**
-	 * This returns web_resource_collection.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("web_resource_collection");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the secConstraint of the WebResourceCollection.
-	 */
-	public Object getParent(Object object) {
-		return ((WebResourceCollection) object).getSecConstraint();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the webResourceName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebResourceName_UI_"), //$NON-NLS-1$ = "WebResourceName"
-						WebAppEditResourceHandler.getString("The_webResourceName_proper_UI_"), //$NON-NLS-1$ = "The webResourceName property"
-						pkg.getWebResourceCollection_WebResourceName()));
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
-						WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
-						pkg.getWebResourceCollection_Description()));
-
-			// This is for the secConstraint feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
-						WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
-						pkg.getWebResourceCollection_SecConstraint()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Web Resource Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWebResourceNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_webResourceName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_webResourceName_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWebResourceCollection_WebResourceName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_description_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWebResourceCollection_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUrlPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_urlPattern_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_urlPattern_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWebResourceCollection_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Http Method feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addHttpMethodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_httpMethod_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_httpMethod_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWebResourceCollection_HttpMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	public String getText(Object object) {
-		//	return WebAppEditResourceHandler.getString("38concat_UI_", (new Object[] {
-		// ((WebResourceCollection)object).getWebResourceName() })); //$NON-NLS-1$ =
-		// "WebResourceCollection {0}"
-		return ((WebResourceCollection) object).getWebResourceName();
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WebResourceCollection.class)) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME :
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION :
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN :
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD :
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS :
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS :
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(((WebResourceCollection) WebapplicationPackage.eINSTANCE.getWebResourceCollection()).getURLs(), WebapplicationFactory.eINSTANCE.createURLPatternType()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebResourceCollection_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebResourceCollection_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
-		newChildDescriptors.add(createChildParameter(((WebResourceCollection) WebapplicationPackage.eINSTANCE.getWebResourceCollection()).getHttpMethod(), WebapplicationFactory.eINSTANCE.createHTTPMethodType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.IEditingDomainItemProvider#createCommand(java.lang.Object,
-	 *      org.eclipse.emf.edit.domain.EditingDomain, java.lang.Class,
-	 *      org.eclipse.emf.edit.command.CommandParameter)
-	 */
-	public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
-		EStructuralFeature sf = commandParameter.getEReference();
-		if (sf == null) {
-			sf = commandParameter.getEAttribute();
-			if (sf != null && !sf.isMany())
-				sf = null;
-		}
-		if (sf != null) {
-			EObject owner = commandParameter.getEOwner();
-			Collection collection = commandParameter.getCollection();
-			if (commandClass == AddCommand.class) {
-				return createAddCommand(editingDomain, owner, sf, collection, commandParameter.getIndex());
-			} else if (commandClass == RemoveCommand.class) {
-				return createRemoveCommand(editingDomain, owner, sf, collection);
-			}
-		}
-		return super.createCommand(object, editingDomain, commandClass, commandParameter);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java
deleted file mode 100644
index 11a3640ba..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java
+++ /dev/null
@@ -1,142 +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.web.providers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-
-/**
- * Insert the type's description here. Creation date: (12/11/2000 5:54:28 PM)
- * 
- * @author: Administrator
- */
-public class WebToolingItemPropertyDescriptor extends ItemPropertyDescriptor {
-
-	protected int cellEditorType = -1;
-	public final static int SMALL_ICON_EDITOR = 1;
-	public final static int LARGE_ICON_EDITOR = 2;
-	public final static int MULTILINE_TEXT_EDITOR = 3;
-	public final static int AUTH_CONSTRAINT_ROLES_EDITOR = 4;
-
-	/**
-	 * This creates an instance where the category and filter flags are empty and the cell editor is
-	 * determined for the references.
-	 */
-	public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EReference[] parentReferences) {
-		super(adapterFactory, displayName, description, parentReferences);
-	}
-
-	/**
-	 * This creates an instance where the category is filter flags are empty and the cell editor is
-	 * determined from the type of the structural feature>
-	 */
-	public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EStructuralFeature feature) {
-		super(adapterFactory, displayName, description, feature);
-	}
-
-	/**
-	 * This creates an instance where the category is filter flags are empty and the cell editor is
-	 * determined from the type of the structural feature>
-	 */
-	public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EStructuralFeature feature, int newCellEditorType) {
-		super(adapterFactory, displayName, description, feature);
-		cellEditorType = newCellEditorType;
-	}
-
-	protected void executeCommand(EditingDomain editingDomain, Command command) {
-		//TODO We need to use the CommandStack from the WebEditModel.
-		//  if (editingDomain instanceof StructuredTextEditingDomain)
-		//	  ((StructuredTextEditingDomain) editingDomain).execute(command);
-		//  else
-		//	  editingDomain.getCommandStack().execute(command);
-
-	}
-
-	/**
-	 * Returns the editor type.
-	 */
-	public int getCellEditorType() {
-		return cellEditorType;
-	}
-
-	/**
-	 * This does the delegated job of setting the property to the given value. It is implemented in
-	 * a generic way using the structural feature.
-	 */
-	public void setPropertyValue(Object object, Object value) {
-		EObject refObject = (EObject) object;
-		EditingDomain editingDomain = getEditingDomain(object);
-
-		if (parentReferences != null) {
-			EObject refValue = (EObject) value;
-			Command removeCommand = null;
-			for (int i = 0; i < parentReferences.length; ++i) {
-				Object oldValue = refObject.eGet(parentReferences[i]);
-				if (oldValue != null) {
-					final EReference parentReference = parentReferences[i];
-					if (oldValue == value) {
-						return;
-					}
-					// else if (refValue.refIsInstanceOf(parentReference.getEType(), true))
-					else if (refValue.eClass() == parentReference.getEType() || refValue.eClass().getEAllSuperTypes().contains(parentReference.getEType())) {
-						if (editingDomain == null) {
-							refObject.eSet(parentReference, value);
-						} else {
-							Command setCommand = SetCommand.create(editingDomain, refObject, parentReference, value);
-							executeCommand(editingDomain, setCommand);
-						}
-						return;
-					} else {
-						if (editingDomain == null) {
-							refObject.eSet(parentReference, null);
-						} else {
-							removeCommand = SetCommand.create(editingDomain, refObject, parentReference, null);
-						}
-						break;
-					}
-				}
-			}
-
-			for (int i = 0; i < parentReferences.length; ++i) {
-				final EReference parentReference = parentReferences[i];
-				//if (refValue.refIsInstanceOf(parentReference.getEType(), true))
-				if (refValue.eClass() == parentReference.getEType() || refValue.eClass().getEAllSuperTypes().contains(parentReference.getEType())) {
-					if (editingDomain == null) {
-						refObject.eSet(parentReferences[i], value);
-					} else {
-						if (removeCommand != null) {
-							final CompoundCommand compoundCommand = new CompoundCommand(CompoundCommand.LAST_COMMAND_ALL);
-							compoundCommand.append(removeCommand);
-							compoundCommand.append(SetCommand.create(editingDomain, refObject, parentReference, value));
-							executeCommand(editingDomain, compoundCommand);
-						} else {
-							executeCommand(editingDomain, SetCommand.create(editingDomain, refObject, parentReference, value));
-						}
-					}
-					break;
-				}
-			}
-		} else {
-			if (editingDomain == null) {
-				refObject.eSet(feature, value);
-			} else {
-				executeCommand(editingDomain, SetCommand.create(editingDomain, refObject, feature, value));
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
deleted file mode 100644
index f9c7cd2ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
+++ /dev/null
@@ -1,104 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}object.
- */
-public class WebTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public WebTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns web_type.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("web_type");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			//WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;;
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("WebType_UI_"); //$NON-NLS-1$ = "WebType"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
deleted file mode 100644
index fa80205bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
+++ /dev/null
@@ -1,118 +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.web.providers;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
- * adapters using this common base class.
- */
-public class WebapplicationItemProviderAdapter extends org.eclipse.emf.edit.provider.ItemProviderAdapter {
-
-	/**
-	 * This creates and instance from an adapter factory and a domain notifier.
-	 */
-	protected WebapplicationItemProviderAdapter(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This implements the default behavior for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.command.CreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		return null;
-	}
-
-	/**
-	 * This creates the default new children for {@link CreateChildrenCommand}.
-	 */
-	public Collection createChildren(Object object) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * This returns the default create child image.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		Collection achildrenReferences = getChildrenReferences(object);
-		if (achildrenReferences.size() != 1) {
-			return WebPlugin.getDefault().getImage("create_child"); //$NON-NLS-1$
-		}
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "Create" + //$NON-NLS-1$
-					((EReference) achildrenReferences.iterator().next()).getEType().getName());
-
-	}
-
-	/**
-	 * This returns the default create children label.
-	 */
-	public String getCreateChildrenText(Object object) {
-		//EObject refObject = (EObject) object;
-		Collection achildrenReferences = getChildrenReferences(object);
-		if (achildrenReferences.size() != 1) {
-			return WebAppEditResourceHandler.getString("Create_Two_Children_UI_"); //$NON-NLS-1$ = "Create Two Children"
-		}
-		return WebAppEditResourceHandler.getString("9concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create Two {0}s"
-
-	}
-
-	/**
-	 * This returns the default create children help text.
-	 */
-	public String getCreateChildrenToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		Collection achildrenReferences = getChildrenReferences(object);
-		if (achildrenReferences.size() != 1) {
-			return WebAppEditResourceHandler.getString("7concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create two new children for the selected {0}."
-		}
-		return WebAppEditResourceHandler.getString("8concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$
-		//$NON-NLS-1$ = "Create two new children of type {0} for the selected {1}."
-
-	}
-
-	/**
-	 * This returns the default create child label.
-	 */
-	public String getCreateChildText(Object object) {
-		//EObject refObject = (EObject) object;
-		Collection achildrenReferences = getChildrenReferences(object);
-		if (achildrenReferences.size() != 1) {
-			return WebAppEditResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$ = "Create Child"
-		}
-		return WebAppEditResourceHandler.getString("6concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create {0}"
-
-	}
-
-	/**
-	 * This returns the default create child help text.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		Collection achildrenReferences = getChildrenReferences(object);
-		if (achildrenReferences.size() != 1) {
-			return WebAppEditResourceHandler.getString("2concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a new child for the selected {0}."
-		}
-		return WebAppEditResourceHandler.getString("4concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$
-		//$NON-NLS-1$ = "Create a child of type {0} for the selected {1}."
-
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
deleted file mode 100644
index 3cebe0b3a..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,686 +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.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.ListenerItemProvider;
-import org.eclipse.jst.j2ee.webapplication.internal.util.WebapplicationAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
- * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
- * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}.
- */
-public class WebapplicationItemProviderAdapterFactory extends WebapplicationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
-	 */
-	protected Collection supportedTypes = new ArrayList();
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}
-	 * instances.
-	 */
-	protected WebAppItemProvider webAppItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}instances.
-	 */
-	protected ContextParamItemProvider contextParamItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}instances.
-	 */
-	protected ErrorPageItemProvider errorPageItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}instances.
-	 */
-	protected ExceptionTypeErrorPageItemProvider exceptionTypeErrorPageItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Filter}
-	 * instances.
-	 */
-	protected FilterItemProvider filterItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}instances.
-	 */
-	protected FilterMappingItemProvider filterMappingItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}instances.
-	 */
-	protected ErrorCodeErrorPageItemProvider errorCodeErrorPageItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}instances.
-	 */
-	protected WelcomeFileListItemProvider welcomeFileListItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}instances.
-	 */
-	protected WelcomeFileItemProvider welcomeFileItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}instances.
-	 */
-	protected TagLibRefItemProvider tagLibRefItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRefType}instances.
-	 */
-	protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}instances.
-	 */
-	protected SecurityConstraintItemProvider securityConstraintItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}instances.
-	 */
-	protected WebResourceCollectionItemProvider webResourceCollectionItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances.
-	 */
-	protected URLPatternTypeItemProvider uRLPatternTypeItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances.
-	 */
-	protected HTTPMethodTypeItemProvider hTTPMethodTypeItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}instances.
-	 */
-	protected AuthConstraintItemProvider authConstraintItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}instances.
-	 */
-	protected UserDataConstraintItemProvider userDataConstraintItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}instances.
-	 */
-	protected LoginConfigItemProvider loginConfigItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}instances.
-	 */
-	protected FormLoginConfigItemProvider formLoginConfigItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}instances.
-	 */
-	protected MimeMappingItemProvider mimeMappingItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}instances.
-	 */
-	protected SessionConfigItemProvider sessionConfigItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}instances.
-	 */
-	protected ServletMappingItemProvider servletMappingItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}instances.
-	 */
-	protected ServletItemProvider servletItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}instances.
-	 */
-	protected WebTypeItemProvider webTypeItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}instances.
-	 */
-	protected ServletTypeItemProvider servletTypeItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances.
-	 */
-	protected JSPTypeItemProvider jSPTypeItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}instances.
-	 */
-	protected InitParamItemProvider initParamItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}instances.
-	 */
-	protected ListenerItemProvider listenerItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}instances.
-	 */
-	protected RoleNameTypeItemProvider roleNameTypeItemProvider;
-	protected Disposable disposable = new Disposable();
-
-	/**
-	 * This constructs an instance from a domain notifier.
-	 */
-	public WebapplicationItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	public Adapter adapt(Notifier target, Object adapterKey) {
-		return super.adapt(target, this);
-	}
-
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	public Adapter adaptNew(Notifier target, Object adapterType) {
-		Adapter adapter = super.adaptNew(target, adapterType);
-		disposable.add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}.
-	 */
-	public Adapter createAuthConstraintAdapter() {
-		if (authConstraintItemProvider == null) {
-			authConstraintItemProvider = new AuthConstraintItemProvider(this);
-		}
-
-		return authConstraintItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}.
-	 */
-	public Adapter createContextParamAdapter() {
-		if (contextParamItemProvider == null) {
-			contextParamItemProvider = new ContextParamItemProvider(this);
-		}
-
-		return contextParamItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}.
-	 */
-	public Adapter createErrorCodeErrorPageAdapter() {
-		if (errorCodeErrorPageItemProvider == null) {
-			errorCodeErrorPageItemProvider = new ErrorCodeErrorPageItemProvider(this);
-		}
-
-		return errorCodeErrorPageItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}.
-	 */
-	public Adapter createErrorPageAdapter() {
-		if (errorPageItemProvider == null) {
-			errorPageItemProvider = new ErrorPageItemProvider(this);
-		}
-
-		return errorPageItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}.
-	 */
-	public Adapter createExceptionTypeErrorPageAdapter() {
-		if (exceptionTypeErrorPageItemProvider == null) {
-			exceptionTypeErrorPageItemProvider = new ExceptionTypeErrorPageItemProvider(this);
-		}
-
-		return exceptionTypeErrorPageItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Filter}.
-	 */
-	public Adapter createFilterAdapter() {
-		if (filterItemProvider == null) {
-			filterItemProvider = new FilterItemProvider(this);
-		}
-
-		return filterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected LocalEncodingMappingListItemProvider localEncodingMappingListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createLocalEncodingMappingListAdapter() {
-		if (localEncodingMappingListItemProvider == null) {
-			localEncodingMappingListItemProvider = new LocalEncodingMappingListItemProvider(this);
-		}
-
-		return localEncodingMappingListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected LocalEncodingMappingItemProvider localEncodingMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createLocalEncodingMappingAdapter() {
-		if (localEncodingMappingItemProvider == null) {
-			localEncodingMappingItemProvider = new LocalEncodingMappingItemProvider(this);
-		}
-
-		return localEncodingMappingItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}.
-	 */
-	public Adapter createFilterMappingAdapter() {
-		if (filterMappingItemProvider == null) {
-			filterMappingItemProvider = new FilterMappingItemProvider(this);
-		}
-
-		return filterMappingItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}.
-	 */
-	public Adapter createFormLoginConfigAdapter() {
-		if (formLoginConfigItemProvider == null) {
-			formLoginConfigItemProvider = new FormLoginConfigItemProvider(this);
-		}
-
-		return formLoginConfigItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}.
-	 */
-	public Adapter createHTTPMethodTypeAdapter() {
-		if (hTTPMethodTypeItemProvider == null) {
-			hTTPMethodTypeItemProvider = new HTTPMethodTypeItemProvider(this);
-		}
-
-		return hTTPMethodTypeItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}.
-	 */
-	public Adapter createInitParamAdapter() {
-		if (initParamItemProvider == null) {
-			initParamItemProvider = new InitParamItemProvider(this);
-		}
-
-		return initParamItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}.
-	 */
-	public Adapter createListenerAdapter() {
-		if (listenerItemProvider == null) {
-			listenerItemProvider = new ListenerItemProvider(this);
-		}
-
-		return listenerItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}.
-	 */
-	public Adapter createJSPTypeAdapter() {
-		if (jSPTypeItemProvider == null) {
-			jSPTypeItemProvider = new JSPTypeItemProvider(this);
-		}
-
-		return jSPTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected URLPatternTypeItemProvider urlPatternTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}.
-	 */
-	public Adapter createLoginConfigAdapter() {
-		if (loginConfigItemProvider == null) {
-			loginConfigItemProvider = new LoginConfigItemProvider(this);
-		}
-
-		return loginConfigItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}.
-	 */
-	public Adapter createMimeMappingAdapter() {
-		if (mimeMappingItemProvider == null) {
-			mimeMappingItemProvider = new MimeMappingItemProvider(this);
-		}
-
-		return mimeMappingItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}.
-	 */
-	public Adapter createRoleNameTypeAdapter() {
-		if (roleNameTypeItemProvider == null) {
-			roleNameTypeItemProvider = new RoleNameTypeItemProvider(this);
-		}
-
-		return roleNameTypeItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}.
-	 */
-	public Adapter createSecurityConstraintAdapter() {
-		if (securityConstraintItemProvider == null) {
-			securityConstraintItemProvider = new SecurityConstraintItemProvider(this);
-		}
-
-		return securityConstraintItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}.
-	 */
-	public Adapter createServletAdapter() {
-		if (servletItemProvider == null) {
-			servletItemProvider = new ServletItemProvider(this);
-		}
-
-		return servletItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}.
-	 */
-	public Adapter createServletMappingAdapter() {
-		if (servletMappingItemProvider == null) {
-			servletMappingItemProvider = new ServletMappingItemProvider(this);
-		}
-
-		return servletMappingItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}.
-	 */
-	public Adapter createServletTypeAdapter() {
-		if (servletTypeItemProvider == null) {
-			servletTypeItemProvider = new ServletTypeItemProvider(this);
-		}
-
-		return servletTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected JSPTypeItemProvider jspTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}.
-	 */
-	public Adapter createSessionConfigAdapter() {
-		if (sessionConfigItemProvider == null) {
-			sessionConfigItemProvider = new SessionConfigItemProvider(this);
-		}
-
-		return sessionConfigItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}.
-	 */
-	public Adapter createTagLibRefAdapter() {
-		if (tagLibRefItemProvider == null) {
-			tagLibRefItemProvider = new TagLibRefItemProvider(this);
-		}
-
-		return tagLibRefItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}.
-	 */
-	public Adapter createTagLibRefTypeAdapter() {
-		if (tagLibRefTypeItemProvider == null) {
-			tagLibRefTypeItemProvider = new TagLibRefTypeItemProvider(this);
-		}
-
-		return tagLibRefTypeItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}.
-	 */
-	public Adapter createURLPatternTypeAdapter() {
-		if (uRLPatternTypeItemProvider == null) {
-			uRLPatternTypeItemProvider = new URLPatternTypeItemProvider(this);
-		}
-
-		return uRLPatternTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected HTTPMethodTypeItemProvider httpMethodTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}.
-	 */
-	public Adapter createUserDataConstraintAdapter() {
-		if (userDataConstraintItemProvider == null) {
-			userDataConstraintItemProvider = new UserDataConstraintItemProvider(this);
-		}
-
-		return userDataConstraintItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}.
-	 */
-	public Adapter createWebAppAdapter() {
-		if (webAppItemProvider == null) {
-			webAppItemProvider = new WebAppItemProvider(this);
-		}
-
-		return webAppItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}.
-	 */
-	public Adapter createWebResourceCollectionAdapter() {
-		if (webResourceCollectionItemProvider == null) {
-			webResourceCollectionItemProvider = new WebResourceCollectionItemProvider(this);
-		}
-
-		return webResourceCollectionItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}.
-	 */
-	public Adapter createWebTypeAdapter() {
-		if (webTypeItemProvider == null) {
-			webTypeItemProvider = new WebTypeItemProvider(this);
-		}
-
-		return webTypeItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}.
-	 */
-	public Adapter createWelcomeFileAdapter() {
-		if (welcomeFileItemProvider == null) {
-			welcomeFileItemProvider = new WelcomeFileItemProvider(this);
-		}
-
-		return welcomeFileItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}.
-	 */
-	public Adapter createWelcomeFileListAdapter() {
-		if (welcomeFileListItemProvider == null) {
-			welcomeFileListItemProvider = new WelcomeFileListItemProvider(this);
-		}
-
-		return welcomeFileListItemProvider;
-	}
-
-	public void dispose() {
-		disposable.dispose();
-	}
-
-	/**
-	 * This returns the root adapter factory that contains the factory.
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return (parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory());
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return super.isFactoryForType(type) || supportedTypes.contains(type);
-	}
-
-	/**
-	 * This removes a listener.
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains the factory.
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
deleted file mode 100644
index 7ea31c7d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
+++ /dev/null
@@ -1,145 +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.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}object.
- */
-public class WelcomeFileItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public WelcomeFileItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns welcome_file.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("welcome_file");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the fileList of the WelcomeFile.
-	 */
-	public Object getParent(Object object) {
-		return ((WelcomeFile) object).getFileList();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
-			// This is for the welcomeFile feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WelcomeFile_UI_"), //$NON-NLS-1$ = "WelcomeFile"
-						WebAppEditResourceHandler.getString("The_welcomeFile_property_UI_"), //$NON-NLS-1$ = "The welcomeFile property"
-						pkg.getWelcomeFile_WelcomeFile()));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Welcome File feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWelcomeFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WelcomeFile_welcomeFile_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WelcomeFile_welcomeFile_feature", "_UI_WelcomeFile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WebapplicationPackage.eINSTANCE.getWelcomeFile_WelcomeFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		WelcomeFile welcomeFile = (WelcomeFile) object;
-		String name = welcomeFile.getWelcomeFile();
-		if (name == null)
-			name = WebAppEditResourceHandler.getString("<welcome-file>_UI_"); //$NON-NLS-1$ = "<welcome-file>"
-		return name;
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WelcomeFile.class)) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
-	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
-	 * be any children, so this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
deleted file mode 100644
index 6893d0904..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
+++ /dev/null
@@ -1,161 +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.web.providers;
-
-import java.util.Collection;
-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.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}
- * object.
- */
-public class WelcomeFileListItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public WelcomeFileListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		WelcomeFile child = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		return Collections.singleton(WebapplicationPackage.eINSTANCE.getWelcomeFileList_File());
-	}
-
-	/**
-	 * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateWelcomeFile");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return WebAppEditResourceHandler.getString("Create_WelcomeFile_UI_"); //$NON-NLS-1$ = "Create WelcomeFile"
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return WebAppEditResourceHandler.getString("42concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type WelcomeFile for the selected {0}."
-	}
-
-	/**
-	 * This returns welcome_list.gif.
-	 */
-	public Object getImage(Object object) {
-		return WebPlugin.getDefault().getImage("welcome_list");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the WelcomeFileList.
-	 */
-	public Object getParent(Object object) {
-		return ((WelcomeFileList) object).getWebApp();
-	}
-
-	public String getText(Object object) {
-		return WebAppEditResourceHandler.getString("Welcome_File_List_UI_"); //$NON-NLS-1$ = "Welcome File List"
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WelcomeFileList.class)) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWelcomeFileList_File(), WebapplicationFactory.eINSTANCE.createWelcomeFile()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java
deleted file mode 100644
index 34c047791..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java
+++ /dev/null
@@ -1,90 +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.web.archive.operations;
-
-
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-public class WTProjectStrategyUtils {
-	public static File findSourceFile(Archive archive, String file) {
-		if (isClassFile(file))
-			return findSourceFileForClass(archive, file);
-
-		// Look in the CLASSES directory
-		try {
-			if (!isOutputFile(file))
-				return archive.getFile(file);
-		} catch (java.io.FileNotFoundException ex) {
-			//Do nothing
-		}
-		return null;
-	}
-
-	public static File findSourceFileForClass(Archive archive, String classFile) {
-		// Look in the CLASSES directory
-		IPath classFilePath = new Path(classFile);
-		IPath sourceFilePath = classFilePath.removeFileExtension().addFileExtension("java");//$NON-NLS-1$
-		try {
-			File file = archive.getFile(sourceFilePath.toString());
-			if (file != null)
-				return file;
-		} catch (java.io.FileNotFoundException ex) {
-			//Do nothing
-		}
-
-		// Look in the LIB directory
-		sourceFilePath = new Path(ArchiveConstants.WEBAPP_LIB_URI).append(sourceFilePath);
-		try {
-			File file = archive.getFile(sourceFilePath.toString());
-			if (file != null)
-				return file;
-		} catch (java.io.FileNotFoundException ex) {
-			//Do nothing
-		}
-		return null;
-
-	}
-
-	public static boolean isClassFile(String uri) {
-		return uri.startsWith(ArchiveConstants.WEBAPP_CLASSES_URI) && uri.endsWith(".class");//$NON-NLS-1$
-	}
-
-	public static boolean isOutputFile(String uri) {
-		return uri.startsWith(ArchiveConstants.WEBAPP_CLASSES_URI);
-	}
-
-	public static boolean isSourceFile(String uri) {
-		// A file is considered a java source file if it is in the
-		// WEB_INF directory and it does not end with .class.
-		if (uri.startsWith(J2EEConstants.WEB_INF + "/") && //$NON-NLS-1$
-					uri.endsWith(".java"))//$NON-NLS-1$
-			return true;
-		return false;
-
-	}
-
-	public static String makeRelative(String pathString, String relToPathString) {
-		IPath relToPath = new Path(relToPathString);
-		IPath path = new Path(pathString);
-
-		if (path.matchingFirstSegments(relToPath) == relToPath.segmentCount())
-			path = path.removeFirstSegments(relToPath.segmentCount());
-
-		return path.toString();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModelProvider.java
deleted file mode 100644
index 35e3a9c4b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,326 +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.web.archive.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddWebComponentToEARDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * @deprecated 
- * @see WebFacetProjectCreationDataModelProvider
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class WebComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IWebComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-	public WebComponentCreationDataModelProvider() {
-		super();
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new WebComponentCreationFacetOperation(model);
-		//return new WebComponentCreationOperation(model);
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(USE_ANNOTATIONS);
-		propertyNames.add(CONTEXT_ROOT);
-		propertyNames.add(WEBCONTENT_FOLDER);
-		return propertyNames;
-	}
-
-	/**
-	 * @return Returns the default J2EE spec level based on the Global J2EE Preference
-	 */
-	protected Integer getDefaultComponentVersion() {
-		int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-		switch (highestJ2EEPref) {
-			case (J2EEVersionConstants.J2EE_1_4_ID) :
-				return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-			case (J2EEVersionConstants.J2EE_1_3_ID) :
-				return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-			case (J2EEVersionConstants.J2EE_1_2_ID) :
-				return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-			default :
-				return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-		}
-	}
-
-	public AddComponentToEnterpriseApplicationDataModelProvider createAddComponentToEAR() {
-		return new AddWebComponentToEARDataModelProvider();
-	}
-
-	public void init() {
-		super.init();
-		// setJ2EENatureID(IWebNatureConstants.J2EE_NATURE_ID);
-		// setProperty(EDIT_MODEL_ID, IWebNatureConstants.EDIT_MODEL_ID);
-		// getProjectDataModel().setProperty(ProjectCreationDataModel.PROJECT_NATURES, new
-		// String[]{IModuleConstants.MODULE_NATURE_ID});
-		// getJavaProjectCreationDataModel().setProperty(JavaProjectCreationDataModel.SOURCE_FOLDERS,
-		// new String[]{getDefaultJavaSourceFolderName()});
-
-		updateOutputLocation();
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean retVal = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(USE_ANNOTATIONS)) {
-			model.notifyPropertyChange(COMPONENT_VERSION, DataModelEvent.ENABLE_CHG);
-		} else if (propertyName.equals(CONTEXT_ROOT)) {
-			getAddComponentToEARDataModel().setProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, propertyValue);
-		} else if (propertyName.equals(COMPONENT_NAME)) {
-			if (!isPropertySet(CONTEXT_ROOT)) {
-				model.notifyPropertyChange(CONTEXT_ROOT, DataModelEvent.VALUE_CHG);
-				getAddComponentToEARDataModel().setProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, propertyValue);
-				getAddComponentToEARDataModel().notifyPropertyChange(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, IDataModel.DEFAULT_CHG);
-			}
-		} else if (propertyName.equals(WEBCONTENT_FOLDER)) {
-			model.setProperty(DD_FOLDER, "/" + propertyValue + IPath.SEPARATOR + J2EEConstants.WEB_INF); //$NON-NLS-1$
-			model.setProperty(MANIFEST_FOLDER, "/" + propertyValue + IPath.SEPARATOR + J2EEConstants.META_INF); //$NON-NLS-1$
-
-		}
-		return retVal;
-	}
-
-	private void updateOutputLocation() {
-		// getJavaProjectCreationDataModel().setProperty(JavaProjectCreationDataModel.OUTPUT_LOCATION,
-		// getOutputLocation());
-	}
-
-	// private Object getOutputLocation() {
-	// StringBuffer buf = new StringBuffer(getStringProperty(WEB_CONTENT));
-	// buf.append(IPath.SEPARATOR);
-	// buf.append(IWebNatureConstants.INFO_DIRECTORY);
-	// buf.append(IPath.SEPARATOR);
-	// buf.append(IWebNatureConstants.CLASSES_DIRECTORY);
-	// return buf.toString();
-	// }
-
-
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(ADD_TO_EAR)) {
-			if (isEARSupported())
-				setProperty(ADD_TO_EAR, Boolean.TRUE);
-		}
-		// if (propertyName.equals(WEB_CONTENT)) {
-		// String webContentFolderPref =
-		// J2EEPlugin.getDefault().getJ2EEPreferences().getJ2EEWebContentFolderName();
-		// if (webContentFolderPref == null || webContentFolderPref.length() == 0)
-		// webContentFolderPref = IWebNatureConstants.WEB_MODULE_DIRECTORY_;
-		// return webContentFolderPref;
-		// }
-		if (propertyName.equals(CONTEXT_ROOT)) {
-			return getProperty(COMPONENT_NAME);
-		}
-		// To do: after porting
-		// if (propertyName.equals(SERVLET_VERSION)) {
-		// int moduleVersion = getIntProperty(COMPONENT_VERSION);
-		// int servletVersion = J2EEVersionConstants.SERVLET_2_2;
-		// switch (moduleVersion) {
-		// case J2EEVersionConstants.WEB_2_2_ID :
-		// servletVersion = J2EEVersionConstants.SERVLET_2_2;
-		// break;
-		// case J2EEVersionConstants.WEB_2_3_ID :
-		// case J2EEVersionConstants.WEB_2_4_ID :
-		// servletVersion = J2EEVersionConstants.SERVLET_2_3;
-		// break;
-		// }
-		// return new Integer(servletVersion);
-		// }
-		// if (propertyName.equals(JSP_VERSION)) {
-		// int moduleVersion = getIntProperty(COMPONENT_VERSION);
-		// int jspVersion = J2EEVersionConstants.JSP_1_2_ID;
-		// switch (moduleVersion) {
-		// case J2EEVersionConstants.WEB_2_2_ID :
-		// jspVersion = J2EEVersionConstants.JSP_1_2_ID;
-		// break;
-		// case J2EEVersionConstants.WEB_2_3_ID :
-		// case J2EEVersionConstants.WEB_2_4_ID :
-		// jspVersion = J2EEVersionConstants.JSP_2_0_ID;
-		// break;
-		// }
-		// return new Integer(jspVersion);
-		// }
-		if (propertyName.equals(DD_FOLDER)) {
-			return IPath.SEPARATOR + WebArtifactEdit.WEB_CONTENT + IPath.SEPARATOR + J2EEConstants.WEB_INF;
-		}
-		if (propertyName.equals(JAVASOURCE_FOLDER)) {
-			return CreationConstants.DEFAULT_WEB_SOURCE_FOLDER;
-		}
-		if (propertyName.equals(MANIFEST_FOLDER)) {
-			return IPath.SEPARATOR + WebArtifactEdit.WEB_CONTENT + IPath.SEPARATOR + J2EEConstants.META_INF;
-		} else if (propertyName.equals(WEBCONTENT_FOLDER)) {
-			return WebArtifactEdit.WEB_CONTENT;
-
-		} else if (propertyName.equals(MODULE_URI)) {
-			return getProject().getName()+IJ2EEModuleConstants.WAR_EXT;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
-		if (propertyName.equals(COMPONENT_VERSION)) {
-			Integer propertyValue = (Integer) getProperty(propertyName);
-			String description = null;
-			switch (propertyValue.intValue()) {
-				case J2EEVersionConstants.WEB_2_2_ID :
-					description = J2EEVersionConstants.VERSION_2_2_TEXT;
-					break;
-				case J2EEVersionConstants.WEB_2_3_ID :
-					description = J2EEVersionConstants.VERSION_2_3_TEXT;
-					break;
-				case J2EEVersionConstants.WEB_2_4_ID :
-				default :
-					description = J2EEVersionConstants.VERSION_2_4_TEXT;
-					break;
-			}
-			return new DataModelPropertyDescriptor(propertyValue, description);
-		}
-		return super.getPropertyDescriptor(propertyName);
-	}
-
-	protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
-		int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-		DataModelPropertyDescriptor[] descriptors = null;
-		switch (highestJ2EEPref) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				descriptors = new DataModelPropertyDescriptor[1];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_2_ID), J2EEVersionConstants.VERSION_2_2_TEXT);
-				break;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				descriptors = new DataModelPropertyDescriptor[2];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_2_ID), J2EEVersionConstants.VERSION_2_2_TEXT);
-				descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_3_ID), J2EEVersionConstants.VERSION_2_3_TEXT);
-				break;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-			default :
-				descriptors = new DataModelPropertyDescriptor[3];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_2_ID), J2EEVersionConstants.VERSION_2_2_TEXT);
-				descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_3_ID), J2EEVersionConstants.VERSION_2_3_TEXT);
-				descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.WEB_2_4_ID), J2EEVersionConstants.VERSION_2_4_TEXT);
-				break;
-		}
-		return descriptors;
-	}
-
-	protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
-		switch (moduleVersion) {
-			case J2EEVersionConstants.WEB_2_2_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.WEB_2_3_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.WEB_2_4_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-		return -1;
-	}
-
-	protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
-		switch (j2eeVersion.intValue()) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-			case J2EEVersionConstants.J2EE_1_4_ID :
-				return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-		}
-		return super.convertJ2EEVersionToModuleVersion(j2eeVersion);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEModuleCreationDataModel#getModuleType()
-	 */
-	protected EClass getComponentType() {
-		return CommonarchivePackage.eINSTANCE.getWARFile();
-	}
-
-	protected String getComponentExtension() {
-		return ".war"; //$NON-NLS-1$
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		if (USE_ANNOTATIONS.equals(propertyName)) {
-			if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
-				return false;
-			return true;
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-
-	public IStatus validate(String propertyName) {
-		if (propertyName.equals(CONTEXT_ROOT)) {
-			if (getBooleanProperty(ADD_TO_EAR)) {
-				return getAddComponentToEARDataModel().validateProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT);
-			}
-			return OK_STATUS;
-		} else if (propertyName.equals(WEBCONTENT_FOLDER)) {
-			IStatus status = OK_STATUS;
-			String webFolderName = model.getStringProperty(WEBCONTENT_FOLDER);
-			if (webFolderName == null || webFolderName.length() == 0) {
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.WEBCONTENTFOLDER_EMPTY);
-				status = WTPCommonPlugin.createErrorStatus(errorMessage);
-				return status;
-			}
-		}
-		return super.validate(propertyName);
-	}
-
-	public void propertyChanged(DataModelEvent event) {
-		super.propertyChanged(event);
-		if (event.getDataModel() == getAddComponentToEARDataModel() && event.getPropertyName().equals(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT) && event.getDataModel().isPropertySet(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT)) {
-			setProperty(CONTEXT_ROOT, event.getProperty());
-		}
-		// else if (event.getDataModel() == getServerTargetDataModel() &&
-		// event.getPropertyName().equals(ServerTargetDataModel.RUNTIME_TARGET_ID) &&
-		// event.getDataModel().isSet(ServerTargetDataModel.RUNTIME_TARGET_ID))
-		// setProperty(ADD_TO_EAR, updateAddToEar());
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-	
-	protected String getJ2EEProjectType() {
-		return J2EEProjectUtilities.DYNAMIC_WEB;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationFacetOperation.java
deleted file mode 100644
index b90a427dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationFacetOperation.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.web.archive.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-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.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class WebComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation implements DoNotUseMeThisWillBeDeletedPost15 {
-
-	public WebComponentCreationFacetOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
-		dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		map.add(setupJavaInstallAction());
-		IDataModel newModel = setupWebInstallAction();
-		map.add(newModel);
-		setRuntime(newModel, dm); // Setting runtime property
-		setAddToEARFromWizard(newModel);
-		IStatus stat = dm.getDefaultOperation().execute(monitor, info);
-		if (stat.isOK()) {
-			String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
-			IProject earProject = ProjectUtilities.getProject(earProjectName);
-			if (earProject != null && earProject.exists())
-				stat = addtoEar(projectName, earProjectName);
-		}
-
-		return stat;
-	}
-
-	protected IDataModel setupWebInstallAction() {
-		String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
-		IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
-		webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-		webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
-		webFacetInstallDataModel.setProperty(IWebFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IWebComponentCreationDataModelProperties.WEBCONTENT_FOLDER));
-		webFacetInstallDataModel.setProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT, model.getStringProperty(IWebComponentCreationDataModelProperties.CONTEXT_ROOT));
-		webFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
-		if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR)) {
-			webFacetInstallDataModel.setProperty(IWebFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
-		}
-		webFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, model.getProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
-		webFacetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
-		return webFacetInstallDataModel;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java
deleted file mode 100644
index a749b683f..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,86 +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.web.archive.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentExportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WebComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider implements IWebComponentExportDataModelProperties {
-
-	public WebComponentExportDataModelProvider() {
-		super();
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new WebComponentExportOperation(model);
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EXCLUDE_COMPILE_JSP);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (EXCLUDE_COMPILE_JSP.equals(propertyName)) {
-			return Boolean.FALSE;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	protected String getProjectType() {
-		return J2EEProjectUtilities.DYNAMIC_WEB;
-	}
-
-	protected String getWrongComponentTypeString(String projectName) {
-		return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_A_WAR, new Object[]{projectName});
-	}
-
-	protected String getModuleExtension() {
-		return ".war"; //$NON-NLS-1$
-	}
-	/**
-	 * Exports the specified Web Module project to the specified WAR file.
-	 * 
-	 * @param webProjectName
-	 *            The name of the Web Module project to export.
-	 * @param warFileName
-	 *            The fully qualified WAR file location to export the specified Web Module project.
-	 * @param overwriteExisting
-	 *            If this is <code>true</code> then an existing file at the location specified by
-	 *            <code>earFileName</code> will be overwritten.
-	 * @param exportSource
-	 *            If this is <code>true</code> then all source files in the specified Web Module
-	 *            will be included in the resulting WAR file.
-	 * @plannedfor WTP 1.0
-	 */
-	// TODO: determine plan for new DM Provider
-	// public static void exportProject(String webProjectName, String warFileName, boolean
-	// overwriteExisting, boolean exportSource) {
-	// WebModuleExportDataModel dataModel = new WebModuleExportDataModel();
-	// dataModel.setProperty(PROJECT_NAME, webProjectName);
-	// dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-	// dataModel.setProperty(ARCHIVE_DESTINATION, warFileName);
-	// dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-	// try {
-	// dataModel.getDefaultOperation().run(null);
-	// } catch (InvocationTargetException e) {
-	// Logger.getLogger().logError(e);
-	// } catch (InterruptedException e) {
-	// Logger.getLogger().logError(e);
-	// }
-	// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java
deleted file mode 100644
index 2cb7bde3b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientArchiveOpsResourceHandler;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentExportOperation extends J2EEArtifactExportOperation {
-
-	public WebComponentExportOperation() {
-		super();
-	}
-
-	public WebComponentExportOperation(IDataModel model) {
-		super(model);
-	}
-
-	protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
-		try {
-			CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
-			WebComponentLoadStrategyImpl ls = new WebComponentLoadStrategyImpl(getComponent());
-			ls.setExportSource(isExportSource());
-			setModuleFile(caf.openWARFile(ls, getDestinationPath().toOSString()));
-			getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
-		} catch (SaveFailureException ex) {
-			throw ex;
-		} catch (Exception e) {
-			throw new SaveFailureException(AppClientArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
-		}	}
-
-	protected String archiveString() {
-		return "War File";
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java
deleted file mode 100644
index 1bf14b93e..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.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.web.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-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.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.internal.plugin.WTPCommonPlugin;
-
-/**
- * This dataModel is used for to import Web Modules (from WAR files) into the workspace.
- * 
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- * 
- * @plannedfor WTP 1.0
- */
-public final class WebComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider implements IWebComponentImportDataModelProperties {
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(WEB_LIB_MODELS);
-		propertyNames.add(WEB_LIB_ARCHIVES_SELECTED);
-		propertyNames.add(CONTEXT_ROOT);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(WEB_LIB_MODELS) || propertyName.equals(WEB_LIB_ARCHIVES_SELECTED)) {
-			return Collections.EMPTY_LIST;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	protected int getType() {
-		return XMLResource.WEB_APP_TYPE;
-	}
-
-	protected IStatus validateModuleType() {
-		if (getArchiveFile() instanceof WARFile)
-			return OK_STATUS;
-
-		// TODO: STRING MOVE
-		return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString("Temp String for none WARFile")); //$NON-NLS-1$);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(FILE)) {
-			
-			IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-			if (getModuleFile() != null) {
-				
-				FacetDataModelMap map = (FacetDataModelMap) moduleDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-				IDataModel webFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.DYNAMIC_WEB );
-				
-				int version = getModuleSpecVersion();
-				String versionText = J2EEVersionUtil.getServletTextVersion( version );
-				webFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
-				model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-			}			
-			
-			Archive archive = (Archive) propertyValue;
-			if (null != archive) {
-				WARFile war = (WARFile) archive;
-				List libs = war.getLibArchives();
-				List nestedModels = new ArrayList();
-				for (int i = 0; i < libs.size(); i++) {
-					IDataModel localModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider());
-					localModel.setProperty(FILE, libs.get(i));
-					localModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-					nestedModels.add(localModel);
-				}
-				setProperty(WEB_LIB_MODELS, nestedModels);
-			}
-		}else if(propertyName.equals(CONTEXT_ROOT)){
-			IDataModel creationModel = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-			FacetDataModelMap map = (FacetDataModelMap) creationModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			IDataModel webFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.DYNAMIC_WEB );
-			webFacetDataModel.setStringProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT, (String)propertyValue);
-		}
-		return true;
-	}
-
-	protected Archive openArchive(String uri) throws OpenFailureException {
-		Archive archive = CommonarchiveFactory.eINSTANCE.openWARFile(getArchiveOptions(), uri);
-		return archive;
-	}
-
-	protected IDataModel createJ2EEComponentCreationDataModel() {
-		return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new WebComponentImportOperation(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java
deleted file mode 100644
index 9d1122981..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java
+++ /dev/null
@@ -1,106 +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.web.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentImportOperation extends J2EEArtifactImportOperation {
-	/**
-	 * @param model
-	 */
-	public WebComponentImportOperation(IDataModel model) {
-		super(model);
-	}
-
-	protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
-		super.doExecute(monitor);
-		IVirtualFolder libFolder = virtualComponent.getRootFolder().getFolder(WebArtifactEdit.WEBLIB);
-		if (!libFolder.exists()) {
-			try {
-				libFolder.create(IResource.FORCE, new NullProgressMonitor());
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-		try {
-			importWebLibraryProjects(monitor);
-		} catch (InvocationTargetException e) {
-			Logger.getLogger().logError(e);
-		} catch (InterruptedException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	private void importWebLibraryProjects(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, ExecutionException {
-		List selectedLibs = (List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED);
-		List libProjects = (List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_MODELS);
-		IDataModel importModel = null;
-		IVirtualComponent nestedComponent = null;
-		Archive libArchive = null;
-		List targetComponents = new ArrayList();
-		Map compToURIMap = new HashMap();
-		for (int i = 0; null != libProjects && i < libProjects.size(); i++) {
-			importModel = (IDataModel) libProjects.get(i);
-			libArchive = (Archive) importModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-			if (selectedLibs.contains(libArchive)) {
-				importModel.getDefaultOperation().execute(monitor, info);
-				nestedComponent = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
-				targetComponents.add(nestedComponent);
-				String archiveURI = libArchive.getURI();
-				int lastIndex = archiveURI.lastIndexOf('/');
-				if (-1 != lastIndex && lastIndex + 1 < archiveURI.length()) {
-					lastIndex++;
-					archiveURI = archiveURI.substring(lastIndex);
-				}
-				compToURIMap.put(nestedComponent, archiveURI);
-			}
-		}
-		/**
-		 * The J2EEComponentClasspathContainr will handle adding these to the classpath, so they
-		 * don't need to be added here.
-		 */
-		if (targetComponents.size() > 0) {
-			IDataModel createRefComponentsModel = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
-			createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, virtualComponent);
-			createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/WEB-INF/lib/"); //$NON-NLS-1$
-			createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetComponents);
-			createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, compToURIMap);
-			createRefComponentsModel.getDefaultOperation().execute(monitor, info);
-		}
-	}
-
-	protected SaveStrategy createSaveStrategy(IVirtualComponent aVirtualComponent) {
-		return new WebComponentSaveStrategyImpl(aVirtualComponent);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
deleted file mode 100644
index c57d25e6b..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-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.componentcore.resources.IVirtualReference;
-
-public class WebComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
-	public WebComponentLoadStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-	public List getFiles() {
-		super.getFiles();
-		addLooseLibJARsToFiles();
-		return filesHolder.getFiles();
-	}
-
-	public IVirtualReference[] getLibModules() {
-		WebArtifactEdit webArtifactEdit = null;
-		try {
-			webArtifactEdit = (WebArtifactEdit) ComponentUtilities.getArtifactEditForRead(getComponent());
-			if (webArtifactEdit != null)
-				return webArtifactEdit.getLibModules();
-		} finally {
-			if (webArtifactEdit != null)
-				webArtifactEdit.dispose();
-		}
-		return null;
-
-	}
-
-	public void addLooseLibJARsToFiles() {
-		IVirtualReference[] libModules = getLibModules();
-		for (int i = 0; i < libModules.length; i++) {
-			IVirtualReference iLibModule = libModules[i];
-			IVirtualComponent looseComponent = iLibModule.getReferencedComponent();
-			if (looseComponent.isBinary()) {
-				VirtualArchiveComponent archiveComp = (VirtualArchiveComponent) looseComponent;
-				java.io.File diskFile = archiveComp.getUnderlyingDiskFile();
-				if (!diskFile.exists()) {
-					IFile wbFile = archiveComp.getUnderlyingWorkbenchFile();
-					diskFile = new File(wbFile.getLocation().toOSString());
-				}
-				String uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + diskFile.getName(); //$NON-NLS-1$
-				addExternalFile(uri, diskFile);				
-			} else {
-				String name = null;
-				String archiveName = iLibModule.getArchiveName();
-				if (archiveName != null && archiveName.length() > 0) {
-					name = archiveName;
-				} else {
-					name = looseComponent.getName() + ".jar"; //$NON-NLS-1$
-				}
-				String prefix = iLibModule.getRuntimePath().makeRelative().toString();
-				if (prefix.length() > 0 && prefix.charAt(prefix.length() - 1)!= '/') {
-					prefix += "/"; //$NON-NLS-1$
-				}
-
-				String uri = prefix + name;
-				try {
-					Archive utilJAR = J2EEProjectUtilities.asArchive(uri, looseComponent.getProject(), isExportSource());
-					if (utilJAR == null)
-						continue;
-					filesHolder.addFile(utilJAR);
-				} catch (OpenFailureException oe) {
-					String message = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.UNABLE_TO_LOAD_MODULE_ERROR_, new Object[]{uri, getComponent().getProject().getName(), oe.getConcatenatedMessages()}); //$NON-NLS-1$
-					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logTrace(message);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java
deleted file mode 100644
index c086aa831..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,106 +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.web.archive.operations;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentSaveStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-public class WebComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
-	public WebComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-	/**
-	 * DoNotUseMeThisWillBeDeletedPost15
-	 * 
-	 * @deprecated
-	 * @param archive
-	 * @return
-	 */
-	protected boolean operationHandlesNested(Archive archive) {
-		return !shouldLinkAsComponentRef(archive);
-	}
-
-	protected boolean shouldAddImportedClassesToClasspath() {
-		return false; // never add to classpath because the web app container will pick this up.
-	}
-
-	protected String getImportedClassesURI(File aFile) {
-		String uri = aFile.getURI();
-		return WTProjectStrategyUtils.makeRelative(uri, ArchiveConstants.WEBAPP_CLASSES_URI);
-	}
-
-	protected IPath getImportedClassesRuntimePath() {
-		return new Path("/" + ArchiveConstants.WEBAPP_CLASSES_URI);
-	}
-
-	protected IPath getOutputPathForFile(File aFile) {
-		if (null != nonStandardSourceFiles && nonStandardSourceFiles.containsKey(aFile)) {
-			IVirtualFolder rootFolder = vComponent.getRootFolder();
-			IVirtualFile vFile = rootFolder.getFile((String) nonStandardSourceFiles.get(aFile));
-			IFile iFile = vFile.getUnderlyingFile();
-			return iFile.getProjectRelativePath();
-		}
-		return super.getOutputPathForFile(aFile);
-	}
-
-	/**
-	 * This map handles the case when a java source file is not in the same place as the .class
-	 * file. For example if all the source files were contained in WEB-INF/source
-	 */
-	protected Map nonStandardSourceFiles;
-
-	protected boolean isClassWithoutSource(File aFile) {
-		String javaUri = ArchiveUtil.classUriToJavaUri(aFile.getURI());
-		if (javaUri == null)
-			return false;
-		if (archive.containsFile(javaUri)) {
-			return false;
-		}
-		// see if it is a JSP
-		String jspUri = javaUri.substring(0, javaUri.indexOf(ArchiveUtil.DOT_JAVA));
-		int lastSlash = jspUri.lastIndexOf('/');
-		int _index = lastSlash == -1 ? ArchiveConstants.WEBAPP_CLASSES_URI.length() : lastSlash + 1;
-		if (jspUri.charAt(_index) == '_') {
-			jspUri = jspUri.substring(ArchiveConstants.WEBAPP_CLASSES_URI.length(), _index) + jspUri.substring(_index + 1) + ArchiveUtil.DOT_JSP;
-			if (archive.containsFile(jspUri)) {
-				return false;
-			}
-		}
-
-		// see if the source is in another directory
-		File sourceFile = ((WARFile) archive).getSourceFile(aFile);
-		if (null == sourceFile) {
-			return true;
-		}
-		if (nonStandardSourceFiles == null) {
-			nonStandardSourceFiles = new HashMap();
-		}
-		if (!nonStandardSourceFiles.containsKey(sourceFile)) {
-			nonStandardSourceFiles.put(sourceFile, javaUri);
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index db7fdb5e1..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,78 +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.web.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class WebFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
-	public WebFacetProjectCreationDataModelProvider() {
-		super();
-	}
-
-	public void init() {
-		super.init();
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-		map.add(javaFacet);
-		IDataModel webFacet = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
-		map.add(webFacet);
-		String webRoot = webFacet.getStringProperty(IWebFacetInstallDataModelProperties.CONFIG_FOLDER);
-		String webSrc = webFacet.getStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER);
-		javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, webSrc);
-		// If using optimized single root structure, set the output folder to "<content folder>/WEB-INF/classes"
-		if (ProductManager.shouldUseSingleRootStructure())
-			javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME, webRoot+"/"+J2EEConstants.WEB_INF_CLASSES); //$NON-NLS-1$
-		webFacet.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
-					if (isPropertySet(EAR_PROJECT_NAME))
-						setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
-					else
-						model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
-				}else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
-					setProperty(ADD_TO_EAR, event.getProperty());
-				}
-			}
-		});	
-		
-		Collection requiredFacets = new ArrayList();
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(javaFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(webFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if( propertyName.equals( MODULE_URI )){
-			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-			IDataModel webFacet = map.getFacetDataModel( J2EEProjectUtilities.DYNAMIC_WEB );	
-			webFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
deleted file mode 100644
index f0b00aebc..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2006 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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.web.classpath;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainer;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebAppLibrariesContainer 
-    
-    extends FlexibleProjectContainer
-    
-{
-    private static final IPath[] paths 
-        = new IPath[] { new Path( "WEB-INF/lib" ), 
-                        new Path( "WEB-INF/classes" ) };
-    
-    private static final PathType[] types 
-        = new PathType[] { PathType.LIB_DIRECTORY, PathType.CLASSES_DIRECTORY };
-    
-    public static final String CONTAINER_ID 
-        = "org.eclipse.jst.j2ee.internal.web.container";
-    
-    public WebAppLibrariesContainer( final IPath path,
-                                     final IJavaProject jproject )
-    {
-         super( path, jproject, getProject( path, jproject), paths, types );
-    }
-    
-    public String getDescription()
-    {
-        if( this.owner.getProject() != this.project )
-        {
-            return NLS.bind( Resources.labelWithProject, this.project.getName() );
-        }
-        else
-        {
-            return Resources.label;
-        }
-    }
-    
-    public void install()
-    {
-        final IJavaProject[] projects = new IJavaProject[] { this.owner };
-        final IClasspathContainer[] conts = new IClasspathContainer[] { this };
-
-        try
-        {
-            JavaCore.setClasspathContainer( path, projects, conts, null );
-        }
-        catch( JavaModelException e )
-        {
-            WebPlugin.log( e );
-        }
-    }
-    
-    public void refresh()
-    {
-        ( new WebAppLibrariesContainer( this.path, this.owner ) ).install();
-    }
-    
-    private static final IProject getProject( final IPath path,
-                                              final IJavaProject jproject )
-    {
-        if( path.segmentCount() == 1 )
-        {
-            return jproject.getProject();
-        }
-        else
-        {
-            final String name = path.segment( 1 );
-            return ResourcesPlugin.getWorkspace().getRoot().getProject( name );
-        }
-    }
-    
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-        public static String label;
-        public static String labelWithProject;
-        
-        static
-        {
-            initializeMessages( WebAppLibrariesContainer.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
deleted file mode 100644
index a2985e74d..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-label = Web App Libraries
-labelWithProject = Web App Libraries [{0}]
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainerInitializer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainerInitializer.java
deleted file mode 100644
index ed02a7d99..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainerInitializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2006 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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.web.classpath;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainerInitializer;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebAppLibrariesContainerInitializer
-
-    extends FlexibleProjectContainerInitializer
-
-{
-    public void initialize( final IPath path, 
-                            final IJavaProject jproj )
-
-	    throws CoreException
-
-	{
-	    ( new WebAppLibrariesContainer( path, jproj ) ).install();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java
deleted file mode 100644
index d9bab661a..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java
+++ /dev/null
@@ -1,66 +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.web.operations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-
-public class ClasspathUtilities {
-
-	static public IClasspathEntry[] addClasspathEntries(IClasspathEntry[] entries1, IClasspathEntry[] entries2) {
-		List list = new ArrayList(entries1.length + entries2.length);
-		list.addAll(Arrays.asList(entries1));
-
-		for (int i = 0; i < entries2.length; i++) {
-			IClasspathEntry iClasspathEntry = entries2[i];
-			if (!list.contains(iClasspathEntry))
-				list.add(iClasspathEntry);
-		}
-
-		IClasspathEntry[] ret = new IClasspathEntry[list.size()];
-		return (IClasspathEntry[]) list.toArray(ret);
-	}
-
-	static protected boolean entryExists(IClasspathEntry entry, IClasspathEntry[] col) {
-		for (int i = 0; i < col.length; i++) {
-			IClasspathEntry otherEntry = col[i];
-			if (entry.getContentKind() != otherEntry.getContentKind())
-				continue;
-
-			if (entry.getEntryKind() != otherEntry.getEntryKind())
-				continue;
-
-			if (entry.isExported() != otherEntry.isExported())
-				continue;
-
-			if (!entry.getPath().equals(otherEntry.getPath()))
-				continue;
-			return true;
-		}
-		return false;
-	}
-
-	static public IClasspathEntry[] removeClasspathEntries(IClasspathEntry[] removeFromCol, IClasspathEntry[] removeCol) {
-		List list = new ArrayList(removeFromCol.length);
-		//		list.addAll(Arrays.asList(removeFromCol));
-
-		for (int i = 0; i < removeFromCol.length; i++) {
-			IClasspathEntry iClasspathEntry = removeFromCol[i];
-			if (!entryExists(iClasspathEntry, removeCol))
-				list.add(iClasspathEntry);
-		}
-
-		IClasspathEntry[] ret = new IClasspathEntry[list.size()];
-		return (IClasspathEntry[]) list.toArray(ret);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java
deleted file mode 100644
index e8de100ce..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java
+++ /dev/null
@@ -1,63 +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.web.operations;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-
-public interface IWebProjectWizardInfo {
-	/**
-	 * Adds entries to the class path for this project
-	 */
-	public void addToClasspathEntries(IClasspathEntry[] entries);
-
-	/**
-	 * Get the name of the specified project Creation date: (11/09/00 10:05:24 AM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getProjectName();
-
-	/**
-	 * Get the Enterprise Application Project
-	 */
-	public String getEARProjectName();
-
-	/**
-	 * Get the name of the web content folder. If not set then return the current default.
-	 */
-	public String getWebContentName();
-
-	/**
-	 * Set the name of the web content folder
-	 */
-	public void setWebContentName(String name);
-
-	/**
-	 * Get the name of the Java source folder If not set then return the current default.
-	 */
-	public String getJavaSourceName();
-
-	/**
-	 * Set the name of the Java source folder
-	 */
-	public void setJavaSourceName(String name);
-
-	/**
-	 * Return an Object for the assocated properties or null
-	 */
-	public Object getProperty(String propertyName);
-
-	/**
-	 * Set an Object for the assocated properties or null
-	 */
-	public void setProperty(String propertyName, Object value);
-
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java
deleted file mode 100644
index 9c5053087..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java
+++ /dev/null
@@ -1,34 +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.web.operations;
-
-
-
-/*
- * The IConfigurationConstants are the list of tags that are usuable for specifying a web
- * application parameters via XML
- * 
- * @see WebApplicationSpecification for the full DTD
- */
-
-public interface IWebToolingConstants {
-
-	public String TRUE = "true"; //$NON-NLS-1$
-	public String FALSE = "false"; //$NON-NLS-1$
-
-	public String HTTP_PATH_PREFIX = "http://"; //$NON-NLS-1$
-	public String INDEX_FILE = "index.html"; //$NON-NLS-1$
-	public String HTTP_PARAMETER_SEPARATOR = "?"; //$NON-NLS-1$
-	public String CONTENT_LENGTH_HEADER_KEY = "Content-Length"; //$NON-NLS-1$
-
-	public String SENTENCE_TERMINATOR = "."; //$NON-NLS-1$
-
-	public String POST_COMMAND = "POST"; //$NON-NLS-1$
-	public String GET_COMMAND = "GET"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java
deleted file mode 100644
index 1d9eaaaec..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.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.web.operations;
-
-/**
- * The IWebToolingCoreConstants are the constants required by the ITP core
- */
-public interface IWebToolingCoreConstants {
-	public String PLUG_IN_ID = "com.ibm.etools.webtools"; //$NON-NLS-1$
-	public String PROP_SERVLET_JAR = "com.ibm.etools.webtools.servletjar"; //$NON-NLS-1$
-	public String PROP_WEBAS_JAR = "com.ibm.etools.webtools.webasjar"; //$NON-NLS-1$
-	public String PROP_CLIENT_NAME = "com.ibm.etools.webtools.clientname"; //$NON-NLS-1$
-	public String PROP_LINK_STYLE = "com.ibm.etools.webtools.linkstyle"; //$NON-NLS-1$
-	public String PROP_MODIFY_LINK_PROMPT = "com.ibm.etools.webtools.modifyprompt"; //$NON-NLS-1$
-	public String PROP_AUTO_MODIFY_LINK = "com.ibm.etools.webtools.automodify"; //$NON-NLS-1$
-	public String JDT_IDENTIFIER = "org.eclipse.jdt.ui"; //$NON-NLS-1$
-	public String RUNTIME_IDENTIFIER = "WebNatureRuntime"; //$NON-NLS-1$
-	public String DOC_RELATIVE = "DOC_RELATIVE"; //$NON-NLS-1$
-	public String DOC_ROOT_RELATIVE = "DOC_ROOT_RELATIVE"; //$NON-NLS-1$
-	public String ICON_PATH = "icons"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java
deleted file mode 100644
index f17c1b7ed..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java
+++ /dev/null
@@ -1,33 +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.web.operations;
-
-
-
-/**
- * Code generation class compiled from template file MasterCSS.tpl
- */
-public class MasterCSS implements WebToolingTemplate {
-	private static final String TEXT_1 = "BODY\r\n{\r\n    BACKGROUND-COLOR: #FFE4B5;\r\n    COLOR: black;\r\n    FONT-FAMILY: 'Times New Roman'\r\n}\r\nH1\r\n{\r\n    COLOR: navy;\r\n    FONT-FAMILY: 'Times New Roman';\r\n    FONT-SIZE: x-large;\r\n    FONT-WEIGHT: bolder;\r\n    TEXT-TRANSFORM: capitalize\r\n}\r\nH2\r\n{\r\n    COLOR: navy;\r\n    FONT-FAMILY: 'Times New Roman';\r\n    FONT-SIZE: large;\r\n    FONT-WEIGHT: bolder;\r\n    TEXT-TRANSFORM: capitalize\r\n}\r\nH3\r\n{\r\n    COLOR: navy;\r\n    FONT-FAMILY: 'Times New Roman';\r\n    FONT-SIZE: large;\r\n    FONT-WEIGHT: lighter;\r\n    TEXT-TRANSFORM: capitalize\r\n}";//$NON-NLS-1$
-	private static final String TEXT_2 = "\r\n";//$NON-NLS-1$
-
-	/**
-	 * Code generation method
-	 * 
-	 * @return String
-	 */
-	public String generate(TemplateData data) {
-		StringBuffer sb = new StringBuffer();
-		sb.append(TEXT_1);
-		sb.append(TEXT_2);
-		return sb.toString();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java
deleted file mode 100644
index a4826e5b2..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java
+++ /dev/null
@@ -1,994 +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.web.operations;
-
-
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-
-
-/**
- * This class stores the relationship between two files. In particular, this is an inLink and the
- * files which reference it.
- */
-public class RelationData {
-	public class Link implements Cloneable {
-
-		private String url;
-		private int occurrences = 0;
-
-		public Link(String newUrl, int occ) {
-			url = newUrl;
-			occurrences = occ;
-		}
-
-		/**
-		 * Returns an exact copy of this object.
-		 * 
-		 * @return Created clone object
-		 */
-		public Object clone() {
-			return new Link(url, occurrences);
-		}
-
-		/**
-		 * Returns the url of the file that references this inLink
-		 * 
-		 * @return String
-		 */
-		public String getURL() {
-			return url;
-		}
-
-		/**
-		 * Returns the number of times this file references the inLink
-		 * 
-		 * @return int
-		 */
-		public int getOccurrences() {
-			return occurrences;
-		}
-
-		private int addOccurrence(int add) {
-			occurrences = occurrences + add;
-			return occurrences;
-		}
-
-		public String toString() {
-			return url;
-		}
-	}
-
-	// our relationship table. Key is a string which is the path of the inLink,
-	// value is a vector of files that reference the inLink.
-	protected Hashtable inLinksTable = null;
-	protected Hashtable anchorsTable = null;
-	private static final int INIT_HASH_TABLE_SIZE = 100;
-	private static final int INIT_ANCHORS_HASH_TABLE_SIZE = 10;
-	private boolean fileOk = false;
-	private static final String LINK_STATE_FILE_NAME = "link_table_states.txt";//$NON-NLS-1$
-	private static final String LINK_SERVERCONTEXTROOT_FILE_NAME = "link_scr_states.txt";//$NON-NLS-1$
-	public static final String LINK_MISSING_FILE = "-";//$NON-NLS-1$
-	public static final String LINK_INDEX_SEPARATOR = "+";//$NON-NLS-1$
-	public static final String ANCHOR_INDEX_SEPARATOR = "#";//$NON-NLS-1$
-	public static final String LINK_OCCURENCE_SEPARATOR = "/";//$NON-NLS-1$
-	public static final String ANCHOR_SEPARATOR = "#### ANCHORS ####";//$NON-NLS-1$
-
-	/**
-	 * RelationData constructor comment.
-	 */
-	public RelationData() {
-		super();
-		inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
-		anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
-	}
-
-	public Link addInLink(String file_path, String parent_path, int occurence) {
-		Vector in_links = (Vector) inLinksTable.get(file_path);
-		if (in_links == null) {
-			return null;
-		}
-		for (int i = 0; i < in_links.size(); i++) {
-			Link inlnk = (Link) in_links.elementAt(i);
-			String url = inlnk.getURL();
-
-			//
-			// Increment the occurence and return
-			//
-
-			if (url.compareTo(parent_path) == 0) {
-				inlnk.addOccurrence(occurence);
-				return inlnk;
-			}
-		}
-
-		//
-		// The link does not exist, need to add an entry in the table for it
-		//
-
-		Link inlnk = new Link(parent_path, occurence);
-		in_links.addElement(inlnk);
-		return inlnk;
-	}
-
-	public void changeInLink(String filePath, boolean missing) {
-
-		if (missing) {
-			Vector inlinks = (Vector) inLinksTable.remove(filePath);
-			inLinksTable.put(LINK_MISSING_FILE + filePath, inlinks);
-		} else {
-			Vector inlinks = (Vector) inLinksTable.remove(LINK_MISSING_FILE + filePath);
-			inLinksTable.put(filePath, inlinks);
-		}
-	}
-
-
-	/*
-	 * returns which projects depend on this file i.e. any projects that are in this file's list of
-	 * in_links
-	 */
-	public Collection getDependentProjects(String file_path) {
-		Hashtable outProjects = new Hashtable();
-		Vector in_links = (Vector) inLinksTable.get(file_path);
-
-		if (in_links != null) {
-			for (int i = 0; i < in_links.size(); i++) {
-				Link inlnk = (Link) in_links.elementAt(i);
-				String url = inlnk.getURL();
-				// should be in the form of: /ProjName/....
-				if (url.length() > 0) {
-					// key could be the filename or the missing filename ("-" + filename)
-					// take this into account and offset the index accordingly
-					int index = 0;
-					int offset = 1;
-					if (url.charAt(0) == '-') {
-						index = url.indexOf(IPath.SEPARATOR, 2);
-						offset = 2;
-					} else {
-						index = url.indexOf(IPath.SEPARATOR, 1);
-						offset = 1;
-					}
-					if (index != -1) {
-						String projName = url.substring(offset, index);
-						outProjects.put(projName, projName);
-					}
-				}
-			}
-		}
-		return outProjects.values();
-	}
-
-	/*
-	 * returns which cross-project files depend on this file i.e. any projects that are in this
-	 * file's list of in_links
-	 */
-	public Collection getDependentProjectFiles(String projName) {
-		Hashtable outProjects = new Hashtable();
-
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String path = (String) aenum.nextElement();
-			// should be in the form of: /ProjName/....
-			if (path.length() > 0) {
-				// if path is a missing filename ("-" + filename) then it means that it had
-				// to come from this project (that is, the external nonexistent file could not have
-				// linked to this project). So, we will not add this path. Also, since it is marked
-				// broken, it probably won't exist to do anything with it anyway.
-				if (path.charAt(0) != '-') {
-					int index = path.indexOf(IPath.SEPARATOR, 1);
-					if (index != -1) {
-						String currentProjName = path.substring(1, index);
-						if (!currentProjName.equals(projName)) {
-							outProjects.put(path, path);
-						}
-					}
-				}
-			}
-		}
-		return outProjects.values();
-	}
-
-
-
-	public void createInLinkEntry(String file_path, String parent_path, int occurence) {
-
-		Vector in_links = new Vector();
-		Link inlnk = new Link(parent_path, occurence);
-		in_links.addElement(inlnk);
-		inLinksTable.put(file_path, in_links);
-	}
-
-
-
-	public void dump() {
-		if (false) {
-			if (inLinksTable != null) {
-				for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-					StringBuffer St = new StringBuffer();
-					String key = (String) aenum.nextElement();
-					St.append("\nKey=" + key + "\n");//$NON-NLS-1$//$NON-NLS-2$
-					Vector in_links = (Vector) inLinksTable.get(key);
-					int nb_of_links = in_links.size();
-
-					// Replace the string by index
-					// Add a '+'separator only for more than one links to save space
-					//
-
-
-					for (int i = 0; i < nb_of_links; i++) {
-						Link lnk = (Link) in_links.elementAt(i);
-						St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-					}
-					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logInfo(St.toString());
-				}
-			}
-		}
-	}
-
-	public void dump(boolean dump) {
-		if (dump) {
-			if (inLinksTable != null) {
-				for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-					StringBuffer St = new StringBuffer();
-					String key = (String) aenum.nextElement();
-					St.append("\nKey=" + key + "\n");//$NON-NLS-1$//$NON-NLS-2$
-					Vector in_links = (Vector) inLinksTable.get(key);
-					int nb_of_links = in_links.size();
-
-					// Replace the string by index
-					// Add a '+'separator only for more than one links to save space
-					//
-
-
-					for (int i = 0; i < nb_of_links; i++) {
-						Link lnk = (Link) in_links.elementAt(i);
-						St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-					}
-					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(St.toString());
-				}
-			}
-		}
-	}
-
-	/**
-	 * used for LinksBuilder debugging
-	 */
-	public void dump2() {
-		if (inLinksTable != null) {
-			for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-				StringBuffer St = new StringBuffer();
-				String key = (String) aenum.nextElement();
-
-				Vector in_links = (Vector) inLinksTable.get(key);
-				int nb_of_links = in_links.size();
-				St.append("\nKey=" + key + " -- num:" + nb_of_links + "\n");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-				// Replace the string by index
-				// Add a '+'separator only for more than one links to save space
-				//
-
-
-				for (int i = 0; i < nb_of_links; i++) {
-					Link lnk = (Link) in_links.elementAt(i);
-					St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-				}
-				System.out.println(St.toString());
-			}
-		}
-		System.out.println("************************************************\n\n\n\n************************************\n"); //$NON-NLS-1$
-	}
-
-
-	public Vector getInLinks(String filePath) {
-		return (Vector) inLinksTable.get(filePath);
-	}
-
-	public void getInLinks(String filePath, Vector vectInLinks) {
-
-		if (inLinksTable != null) {
-			dump();
-			Vector in_links = (Vector) inLinksTable.get(filePath);
-			if (in_links != null) {
-				for (int i = 0; i < in_links.size(); i++) {
-					Link inlnk = (Link) ((Link) in_links.elementAt(i)).clone();
-					vectInLinks.addElement(inlnk);
-				}
-			}
-		}
-	}
-
-	public Hashtable getAnchorsTable() {
-		return anchorsTable;
-	}
-
-	/**
-	 * Returns the file used to store ServerContextRoot for the project.
-	 */
-	public static File getPreviousSCRFile(IProject project) {
-		return new Path(J2EEPlugin.getDefault().getStateLocation().toString() + File.separator + project.getName() + File.separator + LINK_SERVERCONTEXTROOT_FILE_NAME).toFile();
-	}
-
-	/**
-	 * Returns the file used to store the state of the link relations for the project.
-	 * 
-	 * @return java.io.File The state file
-	 * @param project
-	 *            org.eclipse.core.resources.IProject The project to get the state file for.
-	 */
-	private File getStateFile(IProject project) {
-		return new Path(J2EEPlugin.getDefault().getStateLocation().toString() + File.separator + project.getName() + File.separator + LINK_STATE_FILE_NAME).toFile();
-	}
-
-	public boolean hasInLinkEntry(String path) {
-		return inLinksTable.containsKey(path);
-	}
-
-	/**
-	 * Run through all missing-file (-) RD entries to see if any of them closely match the path to
-	 * this class. Return all of the matches.
-	 */
-	public Vector getPossibleMissingEndingMatches(IPath classPath) {
-		Vector v = new Vector();
-
-		String match = classPath.lastSegment();
-		match = match.substring(0, match.length() - 6); // length minus ".class"
-
-		String classPathStr = classPath.toString();
-		String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String path = (String) aenum.nextElement();
-			// check if path ends with the class name that has been added/removed
-			if (path.startsWith(LINK_MISSING_FILE) && path.endsWith(match)) {
-				// OK: simple match found; now let's match with finer granularity.
-				// Take path and put it into a form where we can check if it is a
-				// close match to the class that has changed:
-				// /Proj/Web Content/com.acme.Foo --> com/acme/Foo
-				String linkPath;
-				int index = path.lastIndexOf(IPath.SEPARATOR);
-				if (index != -1 && index < path.length() - 1) {
-					linkPath = path.substring(index + 1);
-				} else {
-					linkPath = path;
-				}
-				String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
-				if (matchingClassPath.endsWith(closeMatch)) {
-					Vector in_links = (Vector) inLinksTable.get(path);
-					String nonMissingPath = path.substring(1, path.length());
-					changeInLink(nonMissingPath, false);
-					if (in_links != null) {
-						for (int i = 0; i < in_links.size(); i++) {
-							Link inlnk = (Link) in_links.elementAt(i);
-							String url = inlnk.getURL();
-							v.add(url);
-						}
-					}
-				}
-			}
-		}
-		return v;
-	}
-
-
-	/**
-	 * Run through all existing RD entries to see if any of them closely match the path to this
-	 * class. Return all of the matches.
-	 */
-	public Vector getPossibleExistingEndingMatches(IPath classPath) {
-		Vector v = new Vector();
-
-		String match = classPath.lastSegment();
-		match = match.substring(0, match.length() - 6); // length minus ".class"
-
-		String classPathStr = classPath.toString();
-		String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String path = (String) aenum.nextElement();
-			// check if path ends with the class name that has been added/removed
-			if (path.endsWith(match) && !path.startsWith(LINK_MISSING_FILE)) {
-				// OK: simple match found; now let's match with finer granularity.
-				// Take path and put it into a form where we can check if it is a
-				// close match to the class that has changed:
-				// /Proj/Web Content/com.acme.Foo --> com/acme/Foo
-				String linkPath;
-				int index = path.lastIndexOf(IPath.SEPARATOR);
-				if (index != -1 && index < path.length() - 1) {
-					linkPath = path.substring(index + 1);
-				} else {
-					linkPath = path;
-				}
-				String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
-				if (matchingClassPath.endsWith(closeMatch)) {
-					Vector in_links = (Vector) inLinksTable.get(path);
-					changeInLink(path, true);
-					if (in_links != null) {
-						for (int i = 0; i < in_links.size(); i++) {
-							Link inlnk = (Link) in_links.elementAt(i);
-							String url = inlnk.getURL();
-							v.add(url);
-						}
-					}
-				}
-			}
-		}
-		return v;
-	}
-
-	/**
-	 * Run through all existing RD entries to see if any of them closely match the path to this
-	 * class. Remove the inlinks for all the matches.
-	 */
-	public void removeInLinksPossibleExistingEndingMatches(IPath classPath) {
-		String match = classPath.lastSegment();
-		match = match.substring(0, match.length() - 6); // length minus ".class"
-
-		String classPathStr = classPath.toString();
-		String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String path = (String) aenum.nextElement();
-			if (path.endsWith(match) && !path.startsWith(LINK_MISSING_FILE)) {
-				// OK: simple match found; now let's match with finer granularity.
-				// Take path and put it into a form where we can check if it is a
-				// close match to the class that has changed:
-				// /Proj/Web Content/com.acme.Foo --> com/acme/Foo
-				String linkPath;
-				int index = path.lastIndexOf(IPath.SEPARATOR);
-				if (index != -1 && index < path.length() - 1) {
-					linkPath = path.substring(index + 1);
-				} else {
-					linkPath = path;
-				}
-				String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
-				if (matchingClassPath.endsWith(closeMatch)) {
-					removeInLinks(path);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Initialize links tables
-	 */
-	public void initialize() {
-		inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
-		anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
-
-	}
-
-	/**
-	 * Initialize links tables
-	 */
-	public void initializeAnchors() {
-		anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
-	}
-
-	/**
-	 * Initialize links tables
-	 */
-	public void initializeInLinks() {
-		inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
-	}
-
-	/**
-	 * Return true if the file to restore data from existed and was successfully read.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isFileOk() {
-		return fileOk;
-	}
-
-	public boolean isInitialized() {
-		return (inLinksTable != null);
-	}
-
-	public void newInLinkEntry(String path) {
-		if (!inLinksTable.containsKey(path))
-			inLinksTable.put(path, new Vector());
-	}
-
-	public void removeInLinks(String file_path) {
-
-		//
-		// Iterate through the fLinksTable to remove all in-links references
-		// for file_path
-		//
-
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String key = (String) aenum.nextElement();
-			Vector in_links = (Vector) inLinksTable.get(key);
-
-			for (int i = 0; i < in_links.size(); i++) {
-
-				Link inlnk = (Link) in_links.elementAt(i);
-				String url = inlnk.getURL();
-
-				if (url.compareTo(file_path) == 0) {
-					in_links.removeElementAt(i);
-					break;
-				}
-
-				//
-				// Remove the entry in the fLinksTable if the in-link
-				// of the file is not in the workbench and an orphan link
-				// otherwise update the in-links fLinksTable
-				//
-			}
-
-			if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE)) {
-				inLinksTable.remove(key);
-			}
-		}
-	}
-
-	/**
-	 * Iterate through the fLinksTable to return all out-links references for file_path
-	 * 
-	 * @param file_path
-	 * @return
-	 */
-	public List getOutLinks(String file_path) {
-		ArrayList list = new ArrayList();
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String key = (String) aenum.nextElement();
-			Vector in_links = (Vector) inLinksTable.get(key);
-
-			for (int i = 0; i < in_links.size(); i++) {
-
-				Link inlnk = (Link) in_links.elementAt(i);
-				String url = inlnk.getURL();
-
-				if (url.compareTo(file_path) == 0) {
-					list.add(key);
-					break;
-				}
-			}
-		}
-
-		return list;
-	}
-
-
-	/**
-	 * return whether other resources link to this file or not
-	 */
-	public boolean referencedByOtherLinks(String file_path) {
-
-		//
-		// Iterate through the fLinksTable to remove all in-links references
-		// for file_path
-		//
-		boolean referenced = false;
-		for (Enumeration aenum = inLinksTable.keys(); !referenced && aenum.hasMoreElements();) {
-			String key = (String) aenum.nextElement();
-			Vector in_links = (Vector) inLinksTable.get(key);
-
-			for (int i = 0; i < in_links.size(); i++) {
-				Link inlnk = (Link) in_links.elementAt(i);
-				String url = inlnk.getURL();
-
-				if (url.compareTo(file_path) == 0) {
-					referenced = true;
-					break;
-				}
-			}
-		}
-		return referenced;
-	}
-
-
-	/*
-	 * performs as removeInLinks( String ) ... But for performance reasons, this also additionally
-	 * returns a list of all the projects that this file is dependent upon. This is useful to get
-	 * this information, and then go to all of those projects' relation data and tell them to
-	 * removeInLinks for this file.
-	 */
-	public Collection removeInLinksForProjects(String file_path) {
-
-		//
-		// Iterate through the fLinksTable to remove all in-links references
-		// for file_path
-		//
-		Hashtable projects = new Hashtable();
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String key = (String) aenum.nextElement();
-			Vector in_links = (Vector) inLinksTable.get(key);
-
-			for (int i = 0; i < in_links.size(); i++) {
-
-				Link inlnk = (Link) in_links.elementAt(i);
-				String url = inlnk.getURL();
-
-				if (url.compareTo(file_path) == 0) {
-					// should be in the form of: /ProjName/....
-					if (key.length() > 0) {
-						// key could be the filename or the missing filename ("-" + filename)
-						// take this into account and offset the index accordingly
-						int index = 0;
-						int offset = 1;
-						if (key.charAt(0) == '-') {
-							index = key.indexOf(IPath.SEPARATOR, 2);
-							offset = 2;
-						} else {
-							index = key.indexOf(IPath.SEPARATOR, 1);
-							offset = 1;
-						}
-						if (index != -1) {
-							String projName = key.substring(offset, index);
-							projects.put(projName, projName);
-						}
-					}
-					in_links.removeElementAt(i);
-					break;
-				}
-
-				//
-				// Remove the entry in the fLinksTable if the in-link
-				// of the file is not in the workbench and an orphan link
-				// otherwise update the in-links fLinksTable
-				//
-			}
-
-			if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE))
-				inLinksTable.remove(key);
-		}
-
-		return projects.values();
-	}
-
-
-
-	/**
-	 * performs as removeInLinks( String ) ... But for performance reasons, it additionally returns
-	 * which projects depend on this file. i.e. any projects that are in this file's list of
-	 * in_links
-	 */
-	public Collection removeInLinksAndGetDependentProjects(String file_path) {
-		//
-		// Iterate through the fLinksTable to remove all in-links references
-		// for file_path
-		//
-		Hashtable projects = new Hashtable();
-		for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-			String key = (String) aenum.nextElement();
-			Vector in_links = (Vector) inLinksTable.get(key);
-
-			if (key.equals(RelationData.LINK_MISSING_FILE + file_path)) {
-				int index = -1;
-				for (int i = 0; i < in_links.size(); i++) {
-					Link inlnk = (Link) in_links.elementAt(i);
-					String url = inlnk.getURL();
-
-					if (url.compareTo(file_path) == 0) {
-						index = i;
-					}
-					if (url.length() > 1) {
-						int projindex = url.indexOf(IPath.SEPARATOR, 1);
-						if (projindex != -1) {
-							String projName = url.substring(1, projindex);
-							projects.put(projName, projName);
-						}
-					}
-				}
-				if (index != -1) {
-					in_links.removeElementAt(index);
-				}
-
-			} else {
-				for (int i = 0; i < in_links.size(); i++) {
-
-					Link inlnk = (Link) in_links.elementAt(i);
-					String url = inlnk.getURL();
-
-					if (url.compareTo(file_path) == 0) {
-
-						in_links.removeElementAt(i);
-						break;
-					}
-
-					//
-					// Remove the entry in the fLinksTable if the in-link
-					// of the file is not in the workbench and an orphan link
-					// otherwise update the in-links fLinksTable
-					//
-				}
-			}
-
-			if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE)) {
-				inLinksTable.remove(key);
-			}
-		}
-		return projects.values();
-	}
-
-
-	/**
-	 * remove all references to a specific inLink. When removeOrphan is true the inLink entry is
-	 * removed as well, when there are no more refereces to it
-	 */
-	public void removeInLinks(String inLinkEntry, String inLinkReference, boolean removeOrphan) {
-
-		String key = inLinkEntry;
-		Vector in_links = (Vector) inLinksTable.get(key);
-
-		for (int i = 0; i < in_links.size(); i++) {
-
-			Link inlnk = (Link) in_links.elementAt(i);
-			String url = inlnk.getURL();
-
-			if (url.compareTo(inLinkReference) == 0) {
-				in_links.removeElementAt(i);
-				break;
-			}
-		}
-
-		// If there are no more references to the inLinkEntry
-		// and the caller wants this orphan deleted then
-		// remove the key from the table
-		if (in_links.isEmpty() && removeOrphan)
-			inLinksTable.remove(key);
-
-	}
-
-	/**
-	 * Restores this builder's saved state and returns whether it was successful in doing so.
-	 */
-	public boolean restore(IProject project) {
-		if (project != null) {
-			// get the state
-			File stateFile = getStateFile(project);
-			if (stateFile.exists()) {
-				inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
-
-				// read inLinksTable from stateFile
-				Vector keys = new Vector();
-				Vector indices = new Vector();
-				BufferedReader reader = null;
-				try {
-					reader = new BufferedReader(new FileReader(stateFile));
-
-					String line = null;
-					//				while( ((line = reader.readLine()) != null) && !line.startsWith(
-					// ANCHOR_SEPARATOR ) )
-					while ((line = reader.readLine()) != null) {
-						String buffer = line;
-
-
-						// to take into account the possibility of links spanning multiple lines,
-						// keep reading until we find a line that starts with an idicator
-						// that the link is finished (a line beginning w/ LINK_INDEX_SEPARATOR)
-						line = reader.readLine();
-						while (line != null && !line.startsWith(LINK_INDEX_SEPARATOR)) {
-							buffer = buffer + line;
-							line = reader.readLine();
-						}
-						// add link string (/MyProj/file.html)
-						if (buffer != null) {
-							keys.addElement(buffer);
-						}
-						// add references line (+2/3...)
-						if (line != null) {
-							indices.addElement(line);
-						} else {
-							System.out.println(ProjectSupportResourceHandler.Syntax_Error_in_the_links_UI_); //$NON-NLS-1$ = "Syntax Error in the links state file"
-							return false;
-						}
-					}
-
-					// Use this to load anchor information
-					//				// Now let's add all of the extra anchor information
-					//				if ( line != null && line.startsWith( ANCHOR_SEPARATOR ) ) {
-					//					while( (line = reader.readLine()) != null )
-					//					{
-					//						String buffer = line;
-					//	
-					//						// to take into account the possibility of links spanning multiple lines,
-					//						// keep reading until we find a line that starts with an idicator
-					//						// that the link is finished (a line beginning w/ LINK_INDEX_SEPARATOR)
-					//						line = reader.readLine();
-					//						while ( line != null && !line.startsWith( ANCHOR_INDEX_SEPARATOR ) ) {
-					//							buffer = buffer + line;
-					//							line = reader.readLine();
-					//						}
-					//
-					//						// add file and all of its anchors
-					//						if ( buffer != null && line != null)
-					//						{
-					//							anchorsTable.put( buffer, line );
-					//						}
-					//						else
-					//						{
-					//							System.out.println(ResourceHandler.getString("Syntax_Error_in_the_links_UI_"));
-					// //$NON-NLS-1$ = "Syntax Error in the links state file"
-					//							return false;
-					//						}
-					//					}
-					//		
-					//				}
-				} catch (FileNotFoundException fe) {
-					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(fe);
-				} catch (IOException ie) {
-					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ie);
-				} finally {
-					if (reader != null) {
-						try {
-							reader.close();
-						} catch (IOException ie2) {
-							org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ie2);
-						}
-					}
-				}
-
-
-				//
-				// Populate the hash inLinksTable with keys (file paths) and values (in links files
-				// paths)
-				//
-				fileOk = true;
-				for (int i = 0; i < keys.size(); i++) {
-					try {
-						String key = (String) keys.elementAt(i);
-						String compacted_indices = (String) indices.elementAt(i);
-
-						//
-						// Parse the in-links indexes
-						//
-
-						int size = keys.size();
-						Vector in_links = new Vector();
-						if (compacted_indices != LINK_INDEX_SEPARATOR) {
-
-							// Extract indexes and occurences
-
-							StringTokenizer st_idx_occ = new StringTokenizer(new String(compacted_indices), LINK_INDEX_SEPARATOR);
-							while (st_idx_occ.hasMoreTokens()) {
-								String idx_occ = new String(st_idx_occ.nextToken());
-								int pos_occ = idx_occ.indexOf(LINK_OCCURENCE_SEPARATOR);
-								int index;
-								int occurence = 1;
-								if (pos_occ == -1) {
-									index = Integer.valueOf(idx_occ).intValue();
-								} else {
-									index = Integer.valueOf(idx_occ.substring(0, pos_occ)).intValue();
-									occurence = Integer.valueOf(idx_occ.substring(pos_occ + 1)).intValue();
-								}
-								if (index >= 0 && index < size) {
-									Link inlnk = new Link((String) keys.elementAt(index), occurence);
-									in_links.addElement(inlnk);
-								}
-							}
-						}
-						inLinksTable.put(key, in_links);
-					} catch (Exception e) {
-						fileOk = false;
-					}
-				}
-
-				return fileOk;
-			}
-			return false;
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Saves this builder's state to disk so that it can be restarted in the same state later.
-	 */
-	public void save(IProject project) {
-
-		File stateFile = getStateFile(project);
-		if (inLinksTable == null) {
-			stateFile.delete();
-		} else {
-
-			// Prepare the index vector
-
-			Vector index_vector = new Vector(inLinksTable.size());
-			for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-				index_vector.addElement(aenum.nextElement());
-			}
-
-			// write inLinksTable to stateFile
-
-			try {
-				File parentFolder = stateFile.getParentFile();
-				if (!parentFolder.exists()) {
-					parentFolder.mkdirs();
-				}
-				PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(stateFile)));
-				for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-					String key = (String) aenum.nextElement();
-					out.print(key);
-					out.println();
-					out.print(LINK_INDEX_SEPARATOR);
-					Vector in_links = (Vector) inLinksTable.get(key);
-					int nb_of_links = in_links.size();
-
-					// Replace the string by index
-					// Add a '+'separator only for more than one links to save space
-					// Add '/<occurence>' only if occurence > 1 to save space
-					//
-
-					Link lnk = null;
-					int nb_lnks = 0;
-					if (nb_of_links > 0) {
-						lnk = (Link) in_links.elementAt(0);
-						out.print(index_vector.indexOf(lnk.getURL()));
-						nb_lnks = lnk.getOccurrences();
-						if (nb_lnks > 1) {
-							out.print(LINK_OCCURENCE_SEPARATOR);
-							out.print(nb_lnks);
-						}
-						for (int i = 1; i < nb_of_links; i++) {
-							out.print(LINK_INDEX_SEPARATOR);
-							lnk = (Link) in_links.elementAt(i);
-							out.print(index_vector.indexOf(lnk.getURL()));
-							nb_lnks = lnk.getOccurrences();
-							if (nb_lnks > 1) {
-								out.print(LINK_OCCURENCE_SEPARATOR);
-								out.print(nb_lnks);
-							}
-						}
-					}
-					out.println();
-				}
-				/*
-				 * use this to save out anchor information //
-				 * ############################################ if ( !anchorsTable.isEmpty() ) {
-				 * out.println( ANCHOR_SEPARATOR ); } for (Enumeration enum = anchorsTable.keys();
-				 * enum.hasMoreElements();) { String key = (String) enum.nextElement();
-				 * out.print(key); out.println(); //out.print(ANCHOR_INDEX_SEPARATOR); out.println(
-				 * anchorsTable.get(key) ); }
-				 */
-
-				out.flush();
-				out.close();
-			} catch (IOException e) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ProjectSupportResourceHandler.Error_while_saving_links_s_EXC_); //$NON-NLS-1$ = "Error while saving links state file"
-			}
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (3/21/2001 1:45:58 PM)
-	 * 
-	 * @param newFileOk
-	 *            boolean
-	 */
-	void setFileOk(boolean newFileOk) {
-		fileOk = newFileOk;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java
deleted file mode 100644
index 5003dc621..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java
+++ /dev/null
@@ -1,133 +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 Sep 12, 2003
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * A class with some useful methods that support server targetting for Web projects.
- * 
- * @author Pratik Shah
- */
-public class ServerTargetUtil {
-
-	private static final String defaultId = "com.ibm.etools.websphere.serverTarget.base.v51"; //$NON-NLS-1$
-	private static final String defaultExpressId = "com.ibm.etools.websphere.serverTarget.express.v51"; //$NON-NLS-1$
-
-	/**
-	 * @param targets
-	 *            A list of IServerTargets
-	 * @return The index of the target server with the
-	 *         {@link #getDefaultServerTargetId() default Id}; or 0, if it could not be found.
-	 */
-	public static int findDefaultServerTargetIndex(List targets) {
-		int index = 0;
-		for (int i = 0; i < targets.size(); i++) {
-			IRuntime target = (IRuntime) targets.get(i);
-			if (target.getId().equals(getDefaultServerTargetId())) {
-				index = i;
-				break;
-			}
-		}
-		return index;
-	}
-
-	/**
-	 * @param target
-	 *            The IServerTarget that has to be found in the given list; it can be
-	 *            <code>null</code>
-	 * @param list
-	 *            The List from which the IServerTarget has to be found
-	 * 
-	 * @return The index of the given target in the given list; or 0, if the given target could not
-	 *         be found in the given list. Two IServerTargets are considered to be equal if they
-	 *         have the same ID.
-	 */
-	public static int findIndexOf(IRuntime target, List list) {
-		int index = 0;
-		if (target != null) {
-			for (int i = 0; i < list.size(); i++) {
-				IRuntime element = (IRuntime) list.get(i);
-				if (element.equals(target)) {
-					index = i;
-					break;
-				}
-			}
-		}
-		return index;
-	}
-
-	/**
-	 * @return the Id of the target server that should be selected by default
-	 */
-	public static String getDefaultServerTargetId() {
-		String id = defaultExpressId;
-		if (J2EEPlugin.isEJBSupportAvailable()) {
-			id = defaultId;
-		}
-		return id;
-	}
-
-	/**
-	 * @param isJ2EE13
-	 *            <code>true</code> if the constant for J2EE version 1.3 is desired
-	 * @return IServerTargetConstants.J2EE_12 or IServerTargetConstants.J2EE_13
-	 */
-	public static String getJ2EEVersion(boolean isJ2EE13) {
-		return isJ2EE13 ? IServerTargetConstants.J2EE_13 : IServerTargetConstants.J2EE_12;
-	}
-
-	/**
-	 * A convenient method that takes in a list of IServerTargets and returns an array of labels of
-	 * the IServerTargets in the given list.
-	 * 
-	 * @param serverTargets
-	 *            The list of IServerTargets
-	 * @return An array lof labels of the IServerTargets in the given list
-	 */
-	public static String[] getServerNames(List serverTargets) {
-		String[] result = new String[serverTargets.size()];
-		for (int i = 0; i < result.length; i++) {
-			IRuntime runtime = (IRuntime) serverTargets.get(i);
-			result[i] = runtime.getName() + " (" + runtime.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return result;
-	}
-
-	/**
-	 * @param prjName
-	 *            name of the project whose ServerTarget has to be retrieved; it can be
-	 *            <code>null</code>
-	 * 
-	 * @return the ServerTarget of the given project; <code>null</code> if the project does not
-	 *         exist or its ServerTarget is not specified.
-	 */
-	public static IRuntime getServerTarget(String prjName) {
-		if (prjName != null && !prjName.trim().equals("")) { //$NON-NLS-1$
-			IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
-			if (prj != null && prj.exists()) {
-				return ServerCore.getProjectProperties(prj).getRuntimeTarget();
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java
deleted file mode 100644
index 092e80054..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java
+++ /dev/null
@@ -1,94 +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.web.operations;
-
-
-
-public class TemplateData {
-	protected java.lang.String wtFileName = "";//$NON-NLS-1$
-	protected java.lang.String wtCSSName = "";//$NON-NLS-1$
-	protected java.lang.String wtContainerLocatoin = "";//$NON-NLS-1$
-	protected java.lang.String taglibs;
-
-	/**
-	 * TemplateData constructor comment.
-	 */
-	public TemplateData() {
-		super();
-	}
-
-	/**
-	 */
-	public String getContainerLocatoin() {
-		return wtContainerLocatoin;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/4/2001 5:24:30 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getCSSName() {
-		return wtCSSName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/4/2001 5:22:56 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getFileName() {
-		return wtFileName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/15/2001 4:16:10 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getTaglibs() {
-		return taglibs;
-	}
-
-	/**
-	 */
-	public void setContainerLocatoin(String newFileName) {
-		wtContainerLocatoin = newFileName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/4/2001 5:24:30 PM)
-	 * 
-	 * @param newCSSName
-	 *            java.lang.String
-	 */
-	public void setCSSName(java.lang.String newCSSName) {
-		wtCSSName = newCSSName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/4/2001 5:22:56 PM)
-	 * 
-	 * @param newWtFileName
-	 *            java.lang.String
-	 */
-	public void setFileName(String newFileName) {
-		wtFileName = newFileName;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/15/2001 4:16:10 PM)
-	 * 
-	 * @param newTaglibs
-	 *            java.lang.String
-	 */
-	public void setTaglibs(java.lang.String newTaglibs) {
-		taglibs = newTaglibs;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
deleted file mode 100644
index 13fb0001a..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
+++ /dev/null
@@ -1,581 +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.web.operations;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-public class WebPropertiesUtil {
-	// private static final char[] BAD_CHARS = {'/', '\\', ':'};
-	private static final char[] BAD_CHARS = {':'};
-	public static final String DEFAULT_JAVA_SOURCE_NAME = "Java Source"; //$NON-NLS-1$
-	//TODO Port to flexible structure
-	/**
-	 * Update the Web Content folder to a new value if it is different. This applies to both Static
-	 * and J2EE Web Projects. In the case of a J2EE Project, the library classpath entries will be
-	 * modifies to reflect the new location.
-	 * 
-	 * @param project
-	 *            The Web Project to update
-	 * @param webContentName
-	 *            The new name given to the Web Project's Web Content folder
-	 * @param progressMonitor
-	 *            Indicates progress of the update operation
-	 * @return True if the web content rename was actually renamed, false if unneeded.
-	 * @throws CoreException
-	 *             The exception that occured during renaming of the the project's web content
-	 *             folder
-	 */
-	public static boolean updateWebContentNameAndProperties(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
-		boolean success = false;
-		if (project.exists() && project.isOpen()) {
-
-			/*
-			 * IBaseWebNature webNature = J2EEWebNatureRuntimeUtilities.getRuntime(project); if
-			 * (webContentName == null) { if (webNature.isStatic()) { webContentName =
-			 * J2EEWebNatureRuntimeUtilities.getDefaultStaticWebContentName(); } else {
-			 * webContentName = J2EEWebNatureRuntimeUtilities.getDefaultJ2EEWebContentName(); } }
-			 */
-
-			IPath newPath = new Path(webContentName);
-			if (getModuleServerRoot(project).getProjectRelativePath().equals(newPath))
-				return false;
-			if (project.exists(newPath)) {
-				IStatus status = new Status(IStatus.ERROR, "org.eclipse.jst.j2ee", IStatus.OK, ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Could_not_rename_____2, new Object[]{webContentName}), null); //$NON-NLS-1$ //$NON-NLS-2$	
-				throw new CoreException(status);
-			}
-
-			moveWebContentFolder(project, webContentName, progressMonitor);
-			updateWebContentNamePropertiesOnly(project, webContentName, progressMonitor);
-			success = true;
-		}
-		return success;
-	}
-
-	/**
-	 * Update the classpath entries and Server Root Name for this web project only.
-	 * 
-	 * @param project
-	 * @param webContentName
-	 * @return
-	 */
-	public static void updateWebContentNamePropertiesOnly(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
-		IPath newPath = new Path(webContentName);
-		if (getModuleServerRoot(project).equals(newPath))
-			return;
-
-		if (!getModuleServerRoot(project).equals(webContentName)) {
-
-			// if (webModuleArtifact.isJ2EE) {
-			// Update the library references
-			IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-
-			IClasspathEntry[] classpath = javaProject.getRawClasspath();
-			IClasspathEntry[] newClasspath = new IClasspathEntry[classpath.length];
-
-			for (int i = 0; i < classpath.length; i++) {
-				if (classpath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-					IClasspathEntry library = classpath[i];
-					IPath libpath = library.getPath();
-					IPath modServerRootPath = getModuleServerRoot(project).getFullPath();
-					if (modServerRootPath.isPrefixOf(libpath)) {
-						IPath prunedPath = libpath.removeFirstSegments(modServerRootPath.segmentCount());
-						IPath relWebContentPath = new Path(webContentName + "/" + prunedPath.toString()); //$NON-NLS-1$
-						IResource absWebContentPath = project.getFile(relWebContentPath);
-
-						IPath srcAttachmentPath = library.getSourceAttachmentPath();
-						if (null != srcAttachmentPath) {
-							prunedPath = srcAttachmentPath.removeFirstSegments(modServerRootPath.segmentCount());
-						}
-						IResource absWebContentSrcAttachmentPath = project.getFile(relWebContentPath);
-
-						newClasspath[i] = JavaCore.newLibraryEntry(absWebContentPath.getFullPath(), absWebContentSrcAttachmentPath.getFullPath(), library.getSourceAttachmentRootPath(), library.isExported());
-
-					} else {
-						newClasspath[i] = classpath[i];
-					}
-
-				} else {
-					newClasspath[i] = classpath[i];
-				}
-				// }
-
-				// Set the java output folder
-				IFolder outputFolder = project.getFolder(getModuleServerRoot(project).getFullPath());
-				javaProject.setRawClasspath(newClasspath, outputFolder.getFullPath(), new SubProgressMonitor(progressMonitor, 1));
-			}
-			// update websettings
-			// TODO add to WebArtifactEdit
-			// webNature.setModuleServerRootName(webContentName);
-		}
-	}
-
-	/**
-	 * Moves the web content folder to the name indicated only if that path doesn't already exist in
-	 * the project.
-	 * 
-	 * @param project
-	 *            The web project to be updated.
-	 * @param webContentName
-	 *            The new web content name
-	 * @param progressMonitor
-	 *            Indicates progress
-	 * @throws CoreException
-	 *             The exception that occured during move operation
-	 */
-	public static void moveWebContentFolder(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
-		IPath newPath = new Path(webContentName);
-		if (!project.exists(newPath)) {
-			if (newPath.segmentCount() > 1) {
-				for (int i = newPath.segmentCount() - 1; i > 0; i--) {
-					IPath tempPath = newPath.removeLastSegments(i);
-					IFolder tempFolder = project.getFolder(tempPath);
-					if (!tempFolder.exists()) {
-						tempFolder.create(true, true, null);
-					}
-				}
-			}
-			newPath = project.getFullPath().append(newPath);
-			IContainer webContentRoot = getModuleServerRoot(project);
-			IPath oldPath = webContentRoot.getProjectRelativePath();
-			webContentRoot.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
-			for (int i = 0; i < oldPath.segmentCount(); i++) {
-				IPath tempPath = oldPath.removeLastSegments(i);
-				IFolder tempFolder = project.getFolder(tempPath);
-				if (tempFolder.exists() && tempFolder.members().length == 0) {
-					tempFolder.delete(true, true, null);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Synchonizies the class path and the lib directories to catch any changes from the last use
-	 * Creation date: (4/17/01 11:48:12 AM)
-	 */
-	protected static void synch(IProject project, IProgressMonitor monitor) {
-
-		try {
-			if (monitor == null) {
-				monitor = new NullProgressMonitor();
-			}
-			monitor.beginTask(ProjectSupportResourceHandler.Sychronize_Class_Path_UI_, 4); //$NON-NLS-1$
-			//$NON-NLS-1$ = "Sychronize Class Path"
-
-			IContainer lib_folder = getWebLibFolder(project);
-			// Nothing to do if the lib folder does not exist.
-			if (lib_folder == null || !lib_folder.isAccessible())
-				return;
-			IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-			IPath lib_path = lib_folder.getProjectRelativePath();
-			IPath lib_full_path = lib_folder.getFullPath();
-
-			IClasspathEntry[] cp = javaProject.getRawClasspath();
-
-			boolean needsToBeModified = false;
-			// Create a map of the lib projects in the current project
-			Hashtable lib_jars = new Hashtable();
-			IResource[] children = lib_folder.members();
-			monitor.subTask(ProjectSupportResourceHandler.Catalog_Lib_Directory__UI_); //$NON-NLS-1$
-			//$NON-NLS-1$ = "Catalog Lib Directory:"
-			for (int j = 0; j < children.length; j++) {
-				IResource child = children[j];
-				// monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory__UI_") +
-				// child); //$NON-NLS-1$ = "Catalog Lib Directory:"
-				// Make sure it is a zip or a jar file
-				if (child.getType() == IResource.FILE && (child.getFullPath().toString().toLowerCase().endsWith(".jar") //$NON-NLS-1$
-							|| child.getFullPath().toString().toLowerCase().endsWith(".zip"))) { //$NON-NLS-1$
-					lib_jars.put(child.getFullPath(), child);
-				}
-
-			}
-
-			monitor.worked(1);
-			monitor.subTask(ProjectSupportResourceHandler.Update_ClassPath__UI_); //$NON-NLS-1$
-			//$NON-NLS-1$ = "Update ClassPath:"
-			// Loop through all the classpath dirs looking for ones that may have
-			// been deleted
-			Vector newClassPathVector = new Vector();
-			for (int j = 0; j < cp.length; j++) {
-
-				// If it is a lib_path
-				if (cp[j].getPath().toString().startsWith(lib_path.toString()) || cp[j].getPath().toString().startsWith(lib_full_path.toString())) {
-					// It was already in the class path
-					if (lib_jars.get(cp[j].getPath()) != null) {
-						newClassPathVector.add(cp[j]);
-						// Remove it from the hash table of paths to add back
-						// monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory__UI_")
-						// + cp[j].getPath()); //$NON-NLS-1$ = "Catalog Lib Directory:"
-						lib_jars.remove(cp[j].getPath());
-
-					} else {
-						// You have removed something form the class path you
-						// will need to re-build
-						// monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory_Remo_UI_")
-						// + cp[j].getPath()); //$NON-NLS-1$ = "Catalog Lib Directory:Remove "
-						needsToBeModified = true;
-					}
-				} else {
-					monitor.subTask(ProjectSupportResourceHandler.Catalog_Lib_Directory__UI_ + cp[j].getPath()); //$NON-NLS-1$
-					//$NON-NLS-1$ = "Catalog Lib Directory:"
-					newClassPathVector.add(cp[j]);
-				}
-			}
-			monitor.worked(1);
-			monitor.subTask(ProjectSupportResourceHandler.Update_ClassPath__UI_); //$NON-NLS-1$
-			//$NON-NLS-1$ = "Update ClassPath:"
-
-			// Add any entries not already found
-			Enumeration aenum = lib_jars.keys();
-			while (aenum.hasMoreElements()) {
-				IPath path = (IPath) aenum.nextElement();
-				newClassPathVector.add(JavaCore.newLibraryEntry(path, null, null));
-				// You have added something form the class path you
-				// will need to re-build
-				// monitor.setTaskName(ResourceHandler.getString("23concat_UI_", (new Object[] {
-				// path }))); //$NON-NLS-1$ = "Catalog Lib Directory:Add {0}"
-				needsToBeModified = true;
-			}
-
-			monitor.worked(1);
-			monitor.subTask(ProjectSupportResourceHandler.Set_ClassPath__UI_); //$NON-NLS-1$
-			//$NON-NLS-1$ = "Set ClassPath:"
-
-			// Tansfer the vector to an array
-			IClasspathEntry[] newClassPathArray = new IClasspathEntry[newClassPathVector.size()];
-
-			for (int j = 0; j < newClassPathArray.length; j++) {
-				newClassPathArray[j] = (IClasspathEntry) newClassPathVector.get(j);
-			}
-
-			// Only change the class path if there has been a modification
-			if (needsToBeModified) {
-
-				try {
-					javaProject.setRawClasspath(newClassPathArray, monitor);
-				} catch (Exception e) {
-					Logger.getLogger().log(e);
-				}
-			}
-
-		} catch (ClassCastException ex) {
-			Logger.getLogger().log(ex);
-		} catch (CoreException ex) {
-			Logger.getLogger().log(ex);
-		} finally {
-			monitor.done();
-		}
-	}
-
-	public static void updateContextRoot(IProject project, String contextRoot) {
-		if (project.exists() && project.isOpen()) {
-			WebArtifactEdit webEdit = null;
-			try {
-				// TODO migrate to flex projects
-				// webEdit = (WebArtifactEdit) StructureEdit.getFirstArtifactEditForRead(project);
-				if (webEdit != null)
-					webEdit.setServerContextRoot(contextRoot);
-			} finally {
-				if (webEdit != null)
-					webEdit.dispose();
-			}
-
-		}
-	}
-
-
-	/**
-	 * @param project
-	 *            org.eclipse.core.resources.IProject
-	 */
-	/**
-	 * Returns a error message that states whether a context root is valid or not returns null if
-	 * context root is fine
-	 * 
-	 * @return java.lang.String
-	 * @param contextRoot
-	 *            java.lang.String
-	 */
-	public static String validateContextRoot(String contextRoot) {
-
-		if (contextRoot == null)
-			return null;
-
-		String errorMessage = null;
-
-		String name = contextRoot;
-		if (name.equals("") || name == null) { //$NON-NLS-1$
-			// this was added because the error message shouldnt be shown initially. It should be
-			// shown only if context root field is edited to
-			errorMessage = ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2; //$NON-NLS-1$
-			return errorMessage;
-		}
-
-		/*******************************************************************************************
-		 * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
-		 * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
-		 * errorMessage; }
-		 ******************************************************************************************/
-
-		if (name.trim().equals(name)) {
-			StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
-			outer : while (stok.hasMoreTokens()) {
-				String token = stok.nextToken();
-				for (int i = 0; i < token.length(); i++) {
-					if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
-						if (Character.isWhitespace(token.charAt(i))) {
-							// Removed because context roots can contain white space
-							// errorMessage =
-							// ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
-							// = " Context root cannot contain whitespaces."
-						} else {
-							errorMessage = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, new Object[]{(new Character(token.charAt(i))).toString()}); //$NON-NLS-1$
-							break outer;
-						}
-					}
-				}
-			}
-		} // en/ end of if(name.trim
-		else
-			errorMessage = ProjectSupportResourceHandler.Names_cannot_begin_or_end_with_whitespace_5; //$NON-NLS-1$
-
-		return errorMessage;
-	}
-
-
-	/**
-	 * Return true if the string contains any of the characters in the array.
-	 */
-	private static boolean contains(String str, char[] chars) {
-		for (int i = 0; i < chars.length; i++) {
-			if (str.indexOf(chars[i]) != -1)
-				return true;
-		}
-		return false;
-	}
-
-
-	public static String validateFolderName(String folderName) {
-		if (folderName.length() == 0)
-			return ProjectSupportResourceHandler.Folder_name_cannot_be_empty_2; //$NON-NLS-1$
-
-		if (contains(folderName, BAD_CHARS))
-			return ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Folder_name_is_not_valid, new Object[]{folderName}); //$NON-NLS-1$
-
-		return null;
-	}
-
-
-	public static String validateWebContentName(String webContentName, IProject project, String javaSourceName) {
-
-		String msg = validateFolderName(webContentName);
-		if (msg != null)
-			return msg;
-
-		if (javaSourceName != null && webContentName.equals(javaSourceName))
-			return ProjectSupportResourceHandler.Folder_names_cannot_be_equal_4; //$NON-NLS-1$
-
-		// If given a java project, check to make sure current package fragment
-		// root folders do not overlap with new web content name
-		if (project != null) {
-			IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-			if (javaProject != null) {
-				try {
-					IPackageFragmentRoot roots[] = javaProject.getPackageFragmentRoots();
-					for (int i = 0; i < roots.length; i++) {
-						IPackageFragmentRoot root = roots[i];
-						if (!root.isArchive()) {
-							IResource resource = root.getCorrespondingResource();
-							if (resource.getType() == IResource.FOLDER) {
-								IPath path = resource.getFullPath();
-								String rootFolder = path.segment(1);
-								if (webContentName.equals(rootFolder)) {
-									if (root.getKind() == IPackageFragmentRoot.K_SOURCE)
-										return ProjectSupportResourceHandler.Folder_name_cannot_be_the_same_as_Java_source_folder_5; //$NON-NLS-1$
-
-									return ProjectSupportResourceHandler.Folder_name_cannot_be_the_same_as_Java_class_folder_6; //$NON-NLS-1$
-								}
-							}
-						}
-					}
-				} catch (JavaModelException e) {
-					return null;
-				}
-			}
-		}
-
-		return null;
-	}
-
-
-	/**
-	 * Update given web nature to the current version if necessary.
-	 * 
-	 * @param webNature
-	 *            The web Nature that should be examined.
-	 * @return True if successful, false if unnecessary.
-	 * @throws CoreException
-	 *             The exception that occured during the version change operation.
-	 */
-	/*
-	 * static public boolean updateNatureToCurrentVersion(J2EEWebNatureRuntime webNature) throws
-	 * CoreException {
-	 * 
-	 * boolean success = false;
-	 * 
-	 * if (webNature.getVersion() != WEB.CURRENT_VERSION) {
-	 * webNature.setVersion(J2EESettings.CURRENT_VERSION); success = true; }
-	 * ((J2EEModuleWorkbenchURIConverterImpl)
-	 * webNature.getResourceSet().getURIConverter()).recomputeContainersIfNecessary();
-	 * 
-	 * return success; }
-	 */
-
-	/**
-	 * Move the old source folder to the new default folder.
-	 * 
-	 * @param project
-	 *            The Web Project we are working with.
-	 * @param oldSourceFolder
-	 *            The old "Java Source" folder that will be moved.
-	 * @param javaSourceName
-	 *            The new name of the "Java Source" folder, or null for default.
-	 * @return The location of the new folder, or null if no move was necessary.
-	 * @throws CoreException
-	 *             The exception that occured during the move operation.
-	 */
-	static public IContainer updateJavaSourceName(IProject project, IContainer oldSourceFolder, String javaSourceName, IProgressMonitor progressMonitor) throws CoreException {
-		IContainer newSourceFolder = null;
-		if (oldSourceFolder != null) {
-			IPath newPath;
-			if (javaSourceName == null)
-				newPath = new Path(DEFAULT_JAVA_SOURCE_NAME);
-			else
-				newPath = new Path(javaSourceName);
-
-			// Make sure new path is different form old path
-			if (!project.getFolder(newPath).getFullPath().equals(oldSourceFolder.getFullPath())) {
-				oldSourceFolder.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
-				JemProjectUtilities.removeFromJavaClassPath(project, oldSourceFolder);
-				newSourceFolder = project.getFolder(newPath);
-				JemProjectUtilities.appendJavaClassPath(project, JavaCore.newSourceEntry(project.getFolder(newPath).getFullPath()));
-			}
-		}
-		return newSourceFolder;
-	}
-
-
-	/**
-	 * Get the source folder that should be used for migration.
-	 * 
-	 * @param project
-	 *            The Web Project to examine.
-	 * @return The source folder to use in migration, or null if it should be skipped.
-	 */
-	static public IContainer getJavaSourceFolder(IProject project) {
-		List sourceRoots = JemProjectUtilities.getSourceContainers(project);
-		IContainer oldSourceFolder = null;
-
-		if (sourceRoots != null) {
-			if (sourceRoots.size() == 1) {
-				IContainer sourceFolder = (IContainer) sourceRoots.get(0);
-				if (sourceFolder instanceof IFolder) {
-					oldSourceFolder = sourceFolder;
-				}
-			}
-		}
-		return oldSourceFolder;
-	}
-
-	public static IFolder getModuleServerRoot(IProject project) {
-		// TODO need to implement module server root properly
-		return project.getFolder("WebContent");
-	}
-
-	public static IVirtualFolder getWebLibFolder(IVirtualComponent webComponent) {
-		IPath path = new Path(J2EEConstants.WEB_INF + "/" + "lib");
-		IVirtualFolder libFolder = webComponent.getRootFolder().getFolder(path);
-		return libFolder;
-	}
-
-	//TODO delete jsholl
-	/**
-	 * @deprecated use getWebLibFolder(IVirtualComponent webComponent)
-	 * @param project
-	 * @return
-	 */
-	public static IContainer getWebLibFolder(IProject project) {
-		return getWebLibFolder(ComponentCore.createComponent(project)).getUnderlyingFolder();
-	}
-
-	//	
-	// static public boolean isImportedClassesJARFileInLibDir(IResource resource) {
-	// if (resource == null || !resource.exists())
-	// return false;
-	// return resource.getType() == resource.FILE &&
-	// resource.getName().endsWith(IWebNatureConstants.IMPORTED_CLASSES_SUFFIX) && isZip(resource);
-	// }
-	//	
-	// static public boolean isLibDirJARFile(IResource resource) {
-	// if (resource == null || !resource.exists())
-	// return false;
-	// return resource.getType() == resource.FILE && isZip(resource);
-	// }
-	//	
-	// static public boolean isZip(IResource resource) {
-	// String path = resource.getLocation().toOSString();
-	// ZipFile zip = null;
-	//
-	// try {
-	// zip = new ZipFile(path);
-	// } catch (IOException notAZip) {
-	// return false;
-	// } finally {
-	// if (zip != null) {
-	// try {
-	// zip.close();
-	// } catch (IOException ex) {}
-	// }
-	// }
-	// return zip != null;
-	// }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java
deleted file mode 100644
index a6d99c058..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java
+++ /dev/null
@@ -1,99 +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.web.operations;
-
-
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.xml.sax.SAXException;
-
-
-/**
- * The WebToolingException class is the generic class for exceptions generated by the web tooling.
- */
-public class WebToolingException extends Exception {
-	public static final String SAX_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_SA_ERROR_; //$NON-NLS-1$ = "Operation failed due to SAX error: "
-	public static final String IO_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_IO_ERROR_; //$NON-NLS-1$ = "Operation failed due to IO error: "
-	public static final String CORE_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_Co_ERROR_; //$NON-NLS-1$ = "Operation failed due to Core error: "
-	public static final String JAVA_MODEL_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_Ja_ERROR_; //$NON-NLS-1$ = "Operation failed due to Java Model error: "
-
-	/**
-	 * Create a new WebToolingException with no message.
-	 */
-	public WebToolingException() {
-		super();
-	}
-
-	/**
-	 * Create a new instance of the receiver for a supplied IO Exception
-	 * 
-	 * @param message
-	 *            java.lang.String
-	 */
-	public WebToolingException(IOException exception) {
-		this(IO_ERROR_MESSAGE, exception);
-	}
-
-	/**
-	 * Create a new WebToolingException with error message of s.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public WebToolingException(String s) {
-		super(s);
-	}
-
-	/**
-	 * Create a new instance of the receiver with the supplied preamble and the message of the
-	 * example appended to the end.
-	 * 
-	 * @param message
-	 *            java.lang.String
-	 */
-	public WebToolingException(String preamble, Throwable exception) {
-		this(preamble + exception.getMessage());
-	}
-
-	/**
-	 * Create a new instance of the receiver for a supplied CoreException
-	 * 
-	 * @param exception
-	 *            CoreException
-	 */
-	public WebToolingException(CoreException exception) {
-		this(CORE_ERROR_MESSAGE, exception);
-	}
-
-	/**
-	 * Create a new instance of the receiver for a supplied JavaModelException.
-	 * 
-	 * @param exception
-	 *            JavaModelException
-	 */
-	public WebToolingException(JavaModelException exception) {
-		this(JAVA_MODEL_ERROR_MESSAGE, exception);
-	}
-
-	/**
-	 * Create a new instance of the receiver for a supplied SAX Exception
-	 * 
-	 * @param exception
-	 *            SAXException
-	 */
-	public WebToolingException(SAXException exception) {
-		this(SAX_ERROR_MESSAGE, exception);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java
deleted file mode 100644
index 7c9f60725..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java
+++ /dev/null
@@ -1,19 +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.web.operations;
-
-public interface WebToolingTemplate {
-	/**
-	 * Insert the method's description here. Creation date: (12/6/2000 7:35:38 PM)
-	 * 
-	 * @param data
-	 *            TemplateData
-	 */
-	public String generate(TemplateData data);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java
deleted file mode 100644
index be022f87c..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-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.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class WebArtifactEditUtilities {
-	
-	public static IVirtualComponent getWebComponent(Servlet servlet) {
-		IProject project = ProjectUtilities.getProject(servlet);
-		IVirtualComponent component = ComponentCore.createComponent(project);
-			WebArtifactEdit edit = null;
-			try {
-				if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-					edit = WebArtifactEdit.getWebArtifactEditForRead(component);
-					WebApp webapp = edit.getWebApp();
-					if (webapp.getServletNamed(servlet.getServletName()) != null)
-						return component;
-				}
-			} finally {
-				if (edit != null)
-					edit.dispose();
-			}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java
deleted file mode 100644
index d954a9ce8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-
-/**
- * <p>
- * Adapts {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}s to
- * {@see org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit}&nbsp; facades.
- * </p>
- */
-public class WebEditAdapterFactory implements IAdapterFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType == WebArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
-			ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
-			if (J2EEProjectUtilities.isDynamicWebProject(editModel.getProject()))
-				return new WebArtifactEdit((ArtifactEditModel) adaptableObject);
-		}
-		return null;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[]{ArtifactEdit.class, WebArtifactEdit.class};
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
deleted file mode 100644
index fd6b24174..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
+++ /dev/null
@@ -1,656 +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.web.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.componentcore.EnterpriseBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.WebBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-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.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-
-
-/**
- * <p>
- * WebArtifactEdit obtains a Web Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.webapplication.WebAppResource}&nbsp; which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.webapplication.WebAppResource}&nbsp;is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}&nbsp;using a constant {@see
- * J2EEConstants#WEBAPP_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- * 
- */
-public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-
-	/**
-	 * <p>
-	 * Identifier used to link WebArtifactEdit to a WebEditAdapterFactory {@see
-	 * WebEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
-	 * </p>
-	 */
-	public static final Class ADAPTER_TYPE = WebArtifactEdit.class;
-	public static final String WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-	public static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
-	public static final String META_INF = "META-INF"; //$NON-NLS-1$
-
-	public static IPath WEBLIB = new Path("/WEB-INF/lib"); //$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	public WebArtifactEdit() {
-		super();
-	}
-
-	public WebArtifactEdit(IVirtualComponent aModule) {
-		super(aModule);
-	}
-
-	protected BinaryComponentHelper initBinaryComponentHelper(IVirtualComponent binaryModule) {
-		return new WebBinaryComponentHelper(binaryModule);
-	}
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.DYNAMIC_WEB);
-	}
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	protected WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate, String editModelID) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly, forCreate, editModelID);
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 */
-	public static WebArtifactEdit getWebArtifactEditForRead(IProject aProject) {
-		WebArtifactEdit artifactEdit = null;
-		try {
-			if (isValidWebModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new WebArtifactEdit(aProject, true, false);
-		} catch (Exception e) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static WebArtifactEdit getWebArtifactEditForWrite(IProject aProject) {
-		WebArtifactEdit artifactEdit = null;
-		try {
-			if (isValidWebModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new WebArtifactEdit(aProject, false, false);
-		} catch (Exception e) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this
-	 * method must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WebArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * 
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of WebArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static WebArtifactEdit getWebArtifactEditForRead(IVirtualComponent aModule) {
-		if (aModule == null)
-			return null;
-		if (aModule.isBinary()) {
-			return new WebArtifactEdit(aModule);
-		}
-
-		return getWebArtifactEditForRead(aModule.getProject());
-	}
-
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this
-	 * method must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WebArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * 
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of WebArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static WebArtifactEdit getWebArtifactEditForWrite(IVirtualComponent aModule) {
-		if (aModule == null || aModule.isBinary())
-			return null;
-		return getWebArtifactEditForWrite(aModule.getProject());
-	}
-
-	/**
-	 * @param module
-	 *            A {@see WorkbenchComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
-	 *         a JST module
-	 */
-	public static boolean isValidWebModule(IVirtualComponent aModule) throws UnresolveableURIException {
-		if (!isValidEditableModule(aModule))
-			return false;
-		return J2EEProjectUtilities.isDynamicWebProject(aModule.getProject());
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 */
-	public WebArtifactEdit(ArtifactEditModel model) {
-		super(model);
-
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}
-	 * </p>
-	 * 
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}pointing to a module from the given
-	 *            {@see ModuleCoreNature}
-	 */
-	protected WebArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-
-
-
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from WebAppResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 * 
-	 */
-	public int getJ2EEVersion() {
-		return ((WebAppResource) getDeploymentDescriptorResource()).getJ2EEVersionID();
-	}
-
-	/**
-	 * <p>
-	 * Obtains the WebApp (@see WebApp) root object from the WebAppResource. If the root object does
-	 * not exist, then one is created (@link addWebAppIfNecessary(getWebApplicationXmiResource())).
-	 * The root object contains all other resource defined objects.
-	 * </p>
-	 * 
-	 * @return EObject
-	 * 
-	 */
-	public EObject getDeploymentDescriptorRoot() {
-		List contents = getDeploymentDescriptorResource().getContents();
-		if (contents.size() > 0)
-			return (EObject) contents.get(0);
-		if (isBinary()) {
-			return null;
-		}
-		addWebAppIfNecessary((WebAppResource) getDeploymentDescriptorResource());
-		return (EObject) contents.get(0);
-	}
-
-	/**
-	 * <p>
-	 * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
-	 * </p>
-	 * 
-	 * @return Resource
-	 * 
-	 */
-	public Resource getDeploymentDescriptorResource() {
-		if (isBinary()) {
-			return getBinaryComponentHelper().getResource(J2EEConstants.WEBAPP_DD_URI_OBJ);
-		}
-		return getArtifactEditModel().getResource(J2EEConstants.WEBAPP_DD_URI_OBJ);
-	}
-
-	/**
-	 * <p>
-	 * Retrieves Servlet version information derived from the {@see WebAppResource}.
-	 * </p>
-	 * 
-	 * @return an integer representation of a module version
-	 * 
-	 */
-	public int getServletVersion() {
-		return ((WebAppResource) getDeploymentDescriptorResource()).getModuleVersionID();
-	}
-
-	/**
-	 * This method returns the integer representation for the JSP specification level associated
-	 * with the J2EE version for this workbench module. This method will not return null and returns
-	 * 20 as default.
-	 * 
-	 * @see WebArtifactEdit#getServletVersion()
-	 * 
-	 * @return an integer representation of the JSP level
-	 */
-	public int getJSPVersion() {
-		int servletVersion = getServletVersion();
-		if (servletVersion == J2EEVersionConstants.WEB_2_2_ID)
-			return J2EEVersionConstants.JSP_1_1_ID;
-		else if (servletVersion == J2EEVersionConstants.WEB_2_3_ID)
-			return J2EEVersionConstants.JSP_1_2_ID;
-		else
-			return J2EEVersionConstants.JSP_2_0_ID;
-	}
-
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (WebApp) and populates with data. Adds the root
-	 * object to the deployment descriptor resource.
-	 * </p>
-	 * 
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource}
-	 * @param version
-	 *            Version to be set on resource....if null default is taken
-	 * 
-	 * Note: This method is typically used for JUNIT - move?
-	 * </p>
-	 */
-	protected void addWebAppIfNecessary(XMLResource aResource) {
-		if (isBinary()) {
-			throwAttemptedBinaryEditModelAccess();
-		}
-		if (aResource != null) {
-			if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
-				WebApp webAppNew = WebapplicationFactory.eINSTANCE.createWebApp();
-				aResource.getContents().add(webAppNew);
-				aResource.setModified(true);
-			}
-			WebApp webApp = (WebApp) aResource.getContents().get(0);
-			URI moduleURI = getArtifactEditModel().getModuleURI();
-			try {
-				webApp.setDisplayName(StructureEdit.getDeployedName(moduleURI));
-			} catch (UnresolveableURIException e) {
-				// Ignore
-			}
-			aResource.setID(webApp, J2EEConstants.WEBAPP_ID);
-
-			WelcomeFileList wList = WebapplicationFactory.eINSTANCE.createWelcomeFileList();
-			List files = wList.getFile();
-			WelcomeFile file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-			file.setWelcomeFile("index.html"); //$NON-NLS-1$
-			files.add(file);
-			file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-			file.setWelcomeFile("index.htm"); //$NON-NLS-1$
-			files.add(file);
-			file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-			file.setWelcomeFile("index.jsp"); //$NON-NLS-1$
-			files.add(file);
-			file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-			file.setWelcomeFile("default.html"); //$NON-NLS-1$
-			files.add(file);
-			file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-			file.setWelcomeFile("default.htm"); //$NON-NLS-1$
-			files.add(file);
-			file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-			file.setWelcomeFile("default.jsp"); //$NON-NLS-1$
-			files.add(file);
-			
-			webApp.setFileList(wList);
-			
-			try {
-				aResource.saveIfNecessary();
-			} catch (java.net.ConnectException ex) {
-
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-
-	/**
-	 * This method returns the full path to the deployment descriptor resource for the associated
-	 * workbench module. This method may return null.
-	 * 
-	 * @see WebArtifactEdit#getDeploymentDescriptorResource()
-	 * 
-	 * @return the full IPath for the deployment descriptor resource
-	 */
-	public IPath getDeploymentDescriptorPath() {
-		IFile file = WorkbenchResourceHelper.getFile(getDeploymentDescriptorResource());
-		if (file != null)
-			return file.getFullPath();
-		return null;
-	}
-
-	/**
-	 * This method will retrieve the web app resource, create it if necessary, add get the root
-	 * object, the web app out of that web app resource. It will create the web app instance if need
-	 * be, and add it to the web resource. Then, it returns the web app object as the model root.
-	 * This method will not return null.
-	 * 
-	 * @see EnterpriseArtifactEdit#createModelRoot()
-	 * 
-	 * @return the eObject instance of the model root
-	 */
-	public EObject createModelRoot() {
-		if (isBinary()) {
-			throwAttemptedBinaryEditModelAccess();
-		}
-		return createModelRoot(getJ2EEVersion());
-	}
-
-	/**
-	 * This method will retrieve the web app resource, create it if necessary, add get the root
-	 * object, set version the web app out of that web app resource. It will create the web app
-	 * instance if need be, and add it to the web resource. Then, it returns the web app object as
-	 * the model root. This method will not return null.
-	 * 
-	 * @see EnterpriseArtifactEdit#createModelRoot()
-	 * 
-	 * @return the eObject instance of the model root
-	 */
-	public EObject createModelRoot(int version) {
-		if (isBinary()) {
-			throwAttemptedBinaryEditModelAccess();
-		}
-		WebAppResource res = (WebAppResource) getDeploymentDescriptorResource();
-		res.setModuleVersionID(version);
-		addWebAppIfNecessary(res);
-		return res.getRootObject();
-	}
-
-	/**
-	 * This method will return the list of dependent modules which are utility jars in the web lib
-	 * folder of the deployed path of the module. It will not return null.
-	 * 
-	 * @return array of the web library dependent modules
-	 */
-	public IVirtualReference[] getLibModules() {
-		List result = new ArrayList();
-		IVirtualComponent comp = ComponentCore.createComponent(getProject());
-		IVirtualReference[] refComponents = null;
-		if (!comp.isBinary())
-			refComponents = ((J2EEModuleVirtualComponent)comp).getNonManifestReferences();
-		else
-			refComponents = comp.getReferences();
-		// Check the deployed path to make sure it has a lib parent folder and matchs the web.xml
-		// base path
-		for (int i = 0; i < refComponents.length; i++) {
-			if (refComponents[i].getRuntimePath().equals(WEBLIB))
-				result.add(refComponents[i]);
-		}
-
-		return (IVirtualReference[]) result.toArray(new IVirtualReference[result.size()]);
-	}
-
-	/**
-	 * This method will add the dependent modules from the passed in array to the dependentmodules
-	 * list of the associated workbench module. It will ensure a null is not passed and it will
-	 * ensure the dependent modules are not already in the list.
-	 * 
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param libModules
-	 *            array of dependent modules to add as web libraries
-	 */
-	public void addLibModules(ReferencedComponent[] libModules) {
-		// TODO - Need to implement
-		// if (libModules==null)
-		// return;
-		// for (int i=0; i<libModules.length; i++) {
-		// if (!module.getReferencedComponents().contains(libModules[i]))
-		// module.getReferencedComponents().add(libModules[i]);
-		// }
-	}
-
-	/**
-	 * This method will retrieve the context root for this web project's .component file. It is
-	 * meant to handle a standalone web case.
-	 * 
-	 * @return contextRoot String
-	 */
-	public String getServerContextRoot() {
-		return J2EEProjectUtilities.getServerContextRoot(getProject());
-	}
-
-	/**
-	 * This method will retrieve the context root for this web project in the associated parameter's
-	 * application.xml. If the earProject is null, then the contextRoot from the .component of the
-	 * web project is returned.
-	 * 
-	 * @param earProject
-	 * @return contextRoot String
-	 */
-	public String getServerContextRoot(IProject earProject) {
-		if (earProject == null || !J2EEProjectUtilities.isEARProject(earProject))
-			return getServerContextRoot();
-		EARArtifactEdit earEdit = null;
-		String contextRoot = null;
-		try {
-			earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-			if (earEdit != null)
-				contextRoot = earEdit.getWebContextRoot(getProject());
-		} finally {
-			if (earEdit != null)
-				earEdit.dispose();
-		}
-		return contextRoot;
-	}
-
-	/**
-	 * This method will update the context root for this web project on the EAR which is passed in.
-	 * If no EAR is passed the .component file for the web project will be updated.
-	 * 
-	 * @param earProject
-	 * @param aContextRoot
-	 */
-	public void setServerContextRoot(IProject earProject, String aContextRoot) {
-		if (earProject == null || !J2EEProjectUtilities.isEARProject(earProject))
-			setServerContextRoot(aContextRoot);
-		EARArtifactEdit earEdit = null;
-		try {
-			earEdit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
-			if (earEdit != null)
-				earEdit.setWebContextRoot(getProject(), aContextRoot);
-		} finally {
-			if (earEdit != null) {
-				earEdit.saveIfNecessary(new NullProgressMonitor());
-				earEdit.dispose();
-			}
-		}
-	}
-
-	/**
-	 * This method sets the context root property on the web project's .component file for the
-	 * standalone case.
-	 * 
-	 * @param contextRoot
-	 *            string
-	 */
-	public void setServerContextRoot(String contextRoot) {
-		J2EEProjectUtilities.setServerContextRoot(getProject(), contextRoot);
-	}
-
-
-	/**
-	 * @return WebApp
-	 */
-	public WebApp getWebApp() {
-
-		return (WebApp) getDeploymentDescriptorRoot();
-	}
-
-
-	public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-		return getWebArtifactEditForRead(aComponent);
-	}
-
-
-	public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
-		return getWebArtifactEditForWrite(aComponent);
-	}
-
-	public Archive asArchive(boolean includeSource) throws OpenFailureException {
-		if (isBinary()) {
-			return ((EnterpriseBinaryComponentHelper) getBinaryComponentHelper()).accessArchive();
-		} else {
-			WebComponentLoadStrategyImpl loader = new WebComponentLoadStrategyImpl(getComponent());
-			loader.setExportSource(includeSource);
-			String uri = ModuleURIUtil.getHandleString(getComponent());
-			return CommonarchiveFactory.eINSTANCE.openWARFile(loader, uri);
-		}
-	}
-
-	public static void createDeploymentDescriptor(IProject project, int version) {
-		WebArtifactEdit webEdit = new WebArtifactEdit(project, false, true);
-		try {
-			webEdit.createModelRoot(version);
-			webEdit.save(null);
-		} finally {
-			webEdit.dispose();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml
deleted file mode 100644
index 6a17c4ece..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>WebArtifactEdit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the WebArtifactEdit api. This api is used to work with the emf model
-        of a flexible web module. It contains api to read and serialize out the emf model for web applications.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentCreationDataModelProperties.java
deleted file mode 100644
index 732eb1837..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,54 +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.web.datamodel.properties;
-/**
- * <p>
- * IWebComponentCreationDataModelProperties provides properties to the 
- * WebComponentCreationDataModelProvider as well as all extending interfaces extending 
- * IWebComponentCreationDataModelProperties 
- * @see org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IWebFacetInstallDataModelProperties
- */
-public interface IWebComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-     /**
-     * Required, type String, the user defined name of the context root for the web component
-     */
-    public static final String CONTEXT_ROOT = IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT;
-
-    /**
-     * Optional, type String, the user defined name of web contents folder
-     */
-    public static final String WEBCONTENT_FOLDER = "IWebComponentCreationDataModelProperties.WEBCONTENT_FOLDER";    
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java
deleted file mode 100644
index 129150da3..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,37 +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.web.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IWebComponentExportDataModelProperties provides properties to the IDataModel associated with the 
- * WebComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IWebComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-    /**
-     * Required, type Boolean flag which indicates whether or not to export compiled JSP files
-     * (compiled files exist in /WEB-INF/classes as .class and .java[for debug])
-     */
-    public static final String EXCLUDE_COMPILE_JSP = "WebExportDataModel.EXCLUDE_COMPILE_JSP"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
deleted file mode 100644
index 1d51fc1a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,58 +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.web.datamodel.properties;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <p>
- * IWebComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * WebComponentImportDataModelProvider. NOTE: The associated Provider and Operations will be created
- * during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IWebComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-	/**
-	 * <p>
-	 * This optional {@link List} property is used to specify which nested web libraries should be
-	 * expanded into projects during import. The contents of this {@link List} property should be
-	 * {@link Archive}s.
-	 * </p>
-	 */
-	public static final String WEB_LIB_ARCHIVES_SELECTED = "WARImportDataModel.WEB_LIB_ARCHIVES_SELECTED"; //$NON-NLS-1$
-
-	/**
-	 * <p>
-	 * This {@link List} property should not be set by clients. This list contains the
-	 * {@link IDataModel}s for creating the new components to be created for each of the selected
-	 * archives. This list will contain one entry for each web lib archive regardless of whether it
-	 * is selected for import by the {@link #WEB_LIB_ARCHIVES_SELECTED} property.
-	 * </p>
-	 */
-	public static final String WEB_LIB_MODELS = "WARImportDataModel.WEB_LIB_MODELS"; //$NON-NLS-1$
-
-	public static final String CONTEXT_ROOT = "IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml
deleted file mode 100644
index bc7e674b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>web module data model api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the api to create, import and export web modules. The interfaces in this package
-        define the properties that can be set on the web modules data models that are use to run the data model operations and drive the wizard data, validation.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java
deleted file mode 100644
index f779cb839..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,24 +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.web.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-
-
-public interface IWebFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
-
-	public static final String CONTEXT_ROOT = "IWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-	
-	public static final String SOURCE_FOLDER = "IWebFacetInstallDataModelProperties.SOURCE_FOLDER"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
deleted file mode 100644
index 4fe3359d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,123 +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.web.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-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.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IWebFacetInstallDataModelProperties {
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(CONTEXT_ROOT);
-		names.add(SOURCE_FOLDER);
-		return names;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(CONFIG_FOLDER)) {
-			return ProductManager.getProperty(IProductConstants.WEB_CONTENT_FOLDER);
-		} else if (propertyName.equals(SOURCE_FOLDER)) {
-			return "src"; //$NON-NLS-1$
-		} else if (propertyName.equals(CONTEXT_ROOT)) {
-			return getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
-		} else if (propertyName.equals(FACET_ID)) {
-			return J2EEProjectUtilities.DYNAMIC_WEB;
-		} else if (propertyName.equals(MODULE_URI)) {
-			String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
-			return projectName + IJ2EEModuleConstants.WAR_EXT;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (ADD_TO_EAR.equals(propertyName)) {
-			model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.ENABLE_CHG);
-		} else if (FACET_PROJECT_NAME.equals(propertyName)) {
-			model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
-		} else if (propertyName.equals(CONFIG_FOLDER)) {
-			// If using optimized single root structure, update the output folder based on content folder change
-			// The output folder will be "<contentRoot>/WEB-INF/classes"
-			if (ProductManager.shouldUseSingleRootStructure()) {
-				IDataModel masterModel = (IDataModel) model.getProperty(MASTER_PROJECT_DM);
-				if (masterModel != null) {
-					FacetDataModelMap map = (FacetDataModelMap) masterModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-					IDataModel javaModel = map.getFacetDataModel(IModuleConstants.JST_JAVA);
-					if (javaModel != null)
-						javaModel.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME,propertyValue+"/"+J2EEConstants.WEB_INF_CLASSES); //$NON-NLS-1$
-				}
-			}
-			return true;
-		} else if (propertyName.equals(SOURCE_FOLDER)) {
-			IDataModel masterModel = (IDataModel) model.getProperty(MASTER_PROJECT_DM);
-			if (masterModel != null) {
-				FacetDataModelMap map = (FacetDataModelMap) masterModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-				IDataModel javaModel = map.getFacetDataModel(IModuleConstants.JST_JAVA);
-				if (javaModel != null)
-					javaModel.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, propertyValue);
-			}
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		return super.isPropertyEnabled(propertyName);
-	}
-
-	protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
-		return J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(version.getVersionString());
-	}
-
-	public IStatus validate(String name) {
-		if (name.equals(CONTEXT_ROOT)) {
-			return validateContextRoot(getStringProperty(CONTEXT_ROOT));
-		}
-		return super.validate(name);
-	}
-
-	protected IStatus validateContextRoot(String contextRoot) {
-		if (contextRoot == null) {
-			return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2, new Object[]{contextRoot}), null);
-		} else if (contextRoot.trim().equals(contextRoot)) {
-			StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
-			while (stok.hasMoreTokens()) {
-				String token = stok.nextToken();
-				for (int i = 0; i < token.length(); i++) {
-					if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
-						Object[] invalidChar = new Object[]{(new Character(token.charAt(i))).toString()};
-						String errorStatus = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar); //$NON-NLS-1$
-						return J2EEPlugin.newErrorStatus(errorStatus, null);
-					}
-				}
-			}
-		} else
-			return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_begin_or_end_with_whitespace_5, new Object[]{contextRoot}), null); //$NON-NLS-1$
-		return OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
deleted file mode 100644
index 4faaba772..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
+++ /dev/null
@@ -1,217 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.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.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainer;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public final class WebFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-			final IDataModel model = (IDataModel) cfg;
-
-			final IJavaProject jproj = JavaCore.create(project);
-
-			// Add WTP natures.
-
-			WtpUtils.addNatures(project);
-
-			// Create the directory structure.
-
-			final IWorkspace ws = ResourcesPlugin.getWorkspace();
-			final IPath pjpath = project.getFullPath();
-
-			final IPath contentdir = setContentPropertyIfNeeded(model, pjpath, project);
-			mkdirs(ws.getRoot().getFolder(contentdir));
-
-			final IPath webinf = contentdir.append("WEB-INF"); //$NON-NLS-1$
-			IFolder webinfFolder = ws.getRoot().getFolder(webinf);
-			mkdirs(webinfFolder);
-
-			final IPath webinflib = webinf.append("lib"); //$NON-NLS-1$
-			mkdirs(ws.getRoot().getFolder(webinflib));
-
-			// Setup the flexible project structure.
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-
-			c.create(0, null);
-
-			String contextRoot = model.getStringProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT);
-			setContextRootPropertyIfNeeded(c, contextRoot);
-			setJavaOutputPropertyIfNeeded(model,c);
-
-			final IVirtualFolder webroot = c.getRootFolder();
-			if (webroot.getProjectRelativePath().equals(new Path("/"))) //$NON-NLS-1$
-				webroot.createLink(new Path("/" + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)), 0, null); //$NON-NLS-1$
-
-			// Create the deployment descriptor (web.xml) if one doesn't exist
-			if (!webinfFolder.getFile("web.xml").exists()) { //$NON-NLS-1$
-				String ver = fv.getVersionString();
-				int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
-				WebArtifactEdit.createDeploymentDescriptor(project, nVer);
-			}
-			
-			// Set entries for src folders
-			final IVirtualFolder jsrc = c.getRootFolder().getFolder("/WEB-INF/classes"); //$NON-NLS-1$
-			final IClasspathEntry[] cp = jproj.getRawClasspath();
-			for (int i = 0; i < cp.length; i++) {
-				final IClasspathEntry cpe = cp[i];
-				if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 )
-						jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
-				}
-			}
-			
-			IVirtualFile vf = c.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
-			IFile manifestmf = vf.getUnderlyingFile();
-			if (manifestmf == null || !manifestmf.exists()) {
-				try {
-					createManifest(project, c.getRootFolder().getUnderlyingFolder(), monitor);
-				} catch (InvocationTargetException e) {
-					Logger.getLogger().logError(e);
-				} catch (InterruptedException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-
-			// Setup the classpath.
-
-			ClasspathHelper.removeClasspathEntries(project, fv);
-
-			if (!ClasspathHelper.addClasspathEntries(project, fv)) {
-				// TODO: Support the no runtime case.
-				// ClasspathHelper.addClasspathEntries( project, fv, <something> );
-			}
-
-			// Add the web libraries container.
-
-			final IPath webLibContainer = new Path(WebAppLibrariesContainer.CONTAINER_ID);
-			addToClasspath(jproj, JavaCore.newContainerEntry(webLibContainer));
-
-			try {
-				((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	private void setJavaOutputPropertyIfNeeded(IDataModel model, final IVirtualComponent c) {
-		String existing = c.getMetaProperties().getProperty("java-output-path"); //$NON-NLS-1$
-		if (existing == null)
-			setOutputFolder(model, c);
-	}
-	
-	/**
-	 * This overrides the default J2EE set output folder which sets the output folder to the content root
-	 * if the optimized single root structure is used.  For web projects, we need to switch this to
-	 * set the output folder to "<contentRoot>/WEB-INF/classes"
-	 * 
-	 * @param model
-	 * @param component
-	 */
-	protected void setOutputFolder(IDataModel model, IVirtualComponent component) {
-		String outputFolder = null;
-		// If using single root structure, set the output folder to "<contentRoot>/WEB-INF/classes"
-		if (ProductManager.shouldUseSingleRootStructure())
-			outputFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)+"/"+J2EEConstants.WEB_INF_CLASSES;
-		// Otherwise set the output folder to the product setting default
-		else
-			outputFolder = ProductManager.getProperty(IProductConstants.OUTPUT_FOLDER);
-		component.setMetaProperty("java-output-path", outputFolder ); //$NON-NLS-1$
-	}
-
-	private void setContextRootPropertyIfNeeded(final IVirtualComponent c, String contextRoot) {
-		String existing = c.getMetaProperties().getProperty("context-root"); //$NON-NLS-1$
-		if (existing == null)
-			c.setMetaProperty("context-root", contextRoot); //$NON-NLS-1$
-	}
-
-//	private IPath setSourcePropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
-//		IVirtualComponent c = ComponentCore.createComponent(project);
-//		if (c.exists()) {
-//			return J2EEProjectUtilities.getSourcePathOrFirst(project, null).makeAbsolute();
-//		}
-//		return pjpath.append(model.getStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER));
-//	}
-
-	private IPath setContentPropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
-		IVirtualComponent c = ComponentCore.createComponent(project);
-		if (c.exists()) {
-			if( !c.getRootFolder().getProjectRelativePath().isRoot() ){
-				return c.getRootFolder().getUnderlyingResource().getFullPath();
-			}
-		}
-		return pjpath.append(model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
-	}
-
-	private static void mkdirs(final IFolder folder)
-
-	throws CoreException
-
-	{
-		if (!folder.exists()) {
-			if (folder.getParent() instanceof IFolder) {
-				mkdirs((IFolder) folder.getParent());
-			}
-
-			folder.create(true, true, null);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetPostInstallDelegate.java
deleted file mode 100644
index 357a62355..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,70 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public final class WebFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-			final IDataModel model = (IDataModel) cfg;
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-
-			// Associate with an EAR, if necessary.
-			if ( model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR) ) {
-				final String earProjectName = model.getStringProperty(
-							IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-				
-				if ( earProjectName != null && !earProjectName.equals("") ) { //$NON-NLS-1$
-					
-					String ver = fv.getVersionString();
-					
-					String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(ver));
-					final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-					
-					installAndAddModuletoEAR( j2eeVersionText,
-								earProjectName,
-								(IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME),
-								project,
-								moduleURI,
-								monitor );
-					
-				}
-			}
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java
deleted file mode 100644
index 8c67966d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,67 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebFacetRuntimeChangedDelegate 
-
-    implements IDelegate
-    
-{
-    public void execute( final IProject project, 
-                         final IProjectFacetVersion fv,
-                         final Object cfg,
-                         final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", 1 );
-        }
-        
-        try
-        {
-            ClasspathHelper.removeClasspathEntries( project, fv );
-            
-            if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
-            {
-                // TODO: Support the no runtime case.
-                // ClasspathHelper.addClasspathEntries( project, fv, <something> );
-            }
-            
-            if( monitor != null )
-            {
-                monitor.worked( 1 );
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
deleted file mode 100644
index bdc91d3c5..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
+++ /dev/null
@@ -1,25 +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.web.project.facet;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class WebFacetUtils {
-
-    public static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE);
-	public static final IProjectFacetVersion WEB_22 = WEB_FACET.getVersion("2.2"); //$NON-NLS-1$
-	public static final IProjectFacetVersion WEB_23 = WEB_FACET.getVersion("2.3"); //$NON-NLS-1$
-	public static final IProjectFacetVersion WEB_24 = WEB_FACET.getVersion("2.4"); //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
deleted file mode 100644
index aa05f73bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,110 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-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;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebFacetVersionChangeDelegate 
-
-    implements IDelegate
-    
-{
-    public void execute( final IProject project, 
-                         final IProjectFacetVersion fv,
-                         final Object cfg,
-                         final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", 1 );
-        }
-        
-        try
-        {
-            // Find the version that's currently installed.
-            
-            final IFacetedProject fproj
-                = ProjectFacetsManager.create( project );
-
-            final IProjectFacetVersion oldver
-                = fproj.getInstalledVersion( fv.getProjectFacet() );
-            
-            // Reset the classpath. 
-            
-            ClasspathHelper.removeClasspathEntries( project, oldver );
-            
-            if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
-            {
-                // TODO: Support the no runtime case.
-                // ClasspathHelper.addClasspathEntries( project, fv, <something> );
-            }
-            
-            // Update the component version.
-            
-            
-            final IVirtualComponent c = ComponentCore.createComponent(project);
-            
-//            final StructureEdit edit 
-//                = StructureEdit.getStructureEditForWrite( project );
-//            
-//            try
-//            {
-//                final ComponentType oldctype 
-//                    = StructureEdit.getComponentType( c );
-//                
-//                final ComponentType newctype 
-//                    = ComponentcoreFactory.eINSTANCE.createComponentType();
-//                
-//                newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-//                newctype.setVersion( fv.getVersionString() );
-//                newctype.getProperties().addAll( oldctype.getProperties() );
-//                
-//                StructureEdit.setComponentType( c, newctype );
-//                
-//                edit.saveIfNecessary( null );
-//            }
-//            finally
-//            {
-//                edit.dispose();
-//            }
-            
-            if( monitor != null )
-            {
-                monitor.worked( 1 );
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath b/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
deleted file mode 100644
index 5c90c5ca1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="property_files/"/>
-	<classpathentry kind="src" path="webservices_ui/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
deleted file mode 100644
index 6aeb18d15..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
-webserviceui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project b/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
deleted file mode 100644
index 1b17773dd..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.webservice.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.webservice.ui/.settings/org.eclipse.wst.validation.prefs b/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index bd171c47a..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 03 20:41:44 EDT 2006
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e672137ed..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.webservice.ui; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.webservice;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.plugin;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.navigator.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html b/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
deleted file mode 100644
index 4cd924dfd..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = property_files/,\
-                          webservices_ui/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               icons/,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-src.includes = plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadca8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.properties
deleted file mode 100644
index d179e9f11..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-navigator.Content=JSR-109 Web Services Index
-pluginName=WTP Webservice UI Plug-in
-pluginVendor=Eclipse.org
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
deleted file mode 100644
index aab28bdea..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-     <extension
-         point="org.eclipse.ui.navigator.navigatorContent">
-      <navigatorContent
-            name="%navigator.Content"
-            priority="lower"
-            icon="icons/full/ctool16/webservicedesc.gif"
-            contentProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorContentProvider"
-            labelProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorLabelProvider"
-            id="org.eclipse.wst.common.frameworks.internal.navigator.webservice">
-         <triggerPoints>
-            <or>
-               <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/>
-         	   <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup"/>
-               <instanceof value="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription"/>
-               <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"/>
-               <instanceof value="org.eclipse.wst.wsdl.util.WSDLResourceImpl"/>
-               <and>
-                 <instanceof value="org.eclipse.emf.ecore.EObject"/>
-                  <or>
-        	       <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="wsdd.xmi"/>
-	               <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="webservice_client.xmi"/>
-	               <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="wscommon.xmi"/>
-	               <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="http://www.ibm.com/wsdl/2003/WSDL"/>
-	             </or>
-	          </and>
-         	</or>
-         </triggerPoints>
-         <possibleChildren>
-         	<or>
-         	   <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup"/>
-               <instanceof value="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription"/>
-               <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"/>
-               <instanceof value="org.eclipse.wst.wsdl.util.WSDLResourceImpl"/>
-               <and>
-                 <instanceof value="org.eclipse.emf.ecore.EObject"/>
-                  <or>
-        	       <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="wsdd.xmi"/>
-	               <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="webservice_client.xmi"/>
-	               <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="wscommon.xmi"/>
-	               <test 
-	                	forcePluginActivation="true"
-	                	property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-	                  value="http://www.ibm.com/wsdl/2003/WSDL"/>
-	             </or>
-	          </and>
-         	</or>
-         </possibleChildren>
-         <commonSorter
-      		class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
-      		id="org.eclipse.jst.navigator.j2ee.ui.J2EEContent">
-      		<parentExpression>
-           		  <or>         
-		            <instanceof 
-		                  value="org.eclipse.emf.ecore.EObject" />
-		            <instanceof 
-		                  value="org.eclipse.core.resources.IWorkspaceRoot" />  
-		         </or>
-		   </parentExpression>
-      </commonSorter>
-      <!--  Handle open requests -->
-	  <actionProvider
-		  class="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorGroupOpenListener"
-		  id="org.eclipse.jst.j2ee.webservice.ui.J2EEWebServiceActionProvider">
-		  <enablement>
-			 <or>
-				<and>
-				  <instanceof
-					 value="org.eclipse.emf.ecore.EObject" />
-					<or>
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="wsdd.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="webservice_client.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="wscommon.xmi" />
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
-							value="http://www.ibm.com/wsdl/2003/WSDL" />
-					 </or>
-				</and>
-				<instanceof
-					value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" />
-				<instanceof
-					value="org.eclipse.wst.wsdl.util.WSDLResourceImpl" />
-			  </or>
-			</enablement>
-		</actionProvider> 
-      </navigatorContent>
-   </extension>
-
-   
-   <!-- J2EE View Web Services contribution -->
-   
-   <extension
-         point="org.eclipse.ui.navigator.viewer">
-      <viewerContentBinding
-      		viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-      		<includes>
-      		   <contentExtension pattern="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
-      		      isRoot="false"/>
-      		</includes>  
-      </viewerContentBinding>
-   </extension>
-	
-   <extension 
-  		point="org.eclipse.core.runtime.adapters">
-    <factory 
-      class="org.eclipse.jst.j2ee.internal.webservice.WebServiceAdapterFactory" 
-      adaptableType="org.eclipse.wst.wsdl.Service">
-      <adapter type="org.eclipse.core.resources.IResource"/>
-      <adapter type="org.eclipse.core.resources.IFile"/>
-    </factory>
-    <factory 
-      class="org.eclipse.jst.j2ee.internal.webservice.WebServiceAdapterFactory" 
-      adaptableType="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef">
-      <adapter type="org.eclipse.core.resources.IResource"/>
-      <adapter type="org.eclipse.core.resources.IFile"/>
-    </factory>
-     <factory 
-      class="org.eclipse.jst.j2ee.internal.webservice.WsdlResourceAdapterFactory" 
-      adaptableType="org.eclipse.wst.wsdl.util.WSDLResourceImpl">
-      <adapter type="org.eclipse.core.resources.IResource"/>
-      <adapter type="org.eclipse.core.resources.IFile"/>
-    </factory>
-    <factory 
-      class="org.eclipse.jst.j2ee.internal.webservice.WebServiceAdapterFactory" 
-      adaptableType="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean">
-      <adapter type="org.eclipse.core.resources.IResource"/>
-      <adapter type="org.eclipse.core.resources.IFile"/>
-    </factory>
-    
-  </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
deleted file mode 100644
index ee32b6492..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
+++ /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
-###############################################################################
-NEW_BUTTON_LABEL=New...
-NEW_HANDLER_WIZARD_WINDOW_TITLE=New Handler
-NEW_HANDLER_WIZARD_PAGE_TITLE=Web Service Handler
-NEW_HANDLER_WIZARD_PAGE_DESC=Create a new web service handler.
-HANDLER_DISPLAY_NAME_LABEL=Dispaly name:
-HANDLER_DESCRIPTION_LABEL=Description:
-HANDLER_NAME_LABEL=Handler name:
-HANDLER_CLASS_NAME_LABEL=Handler class:
-HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE=Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE=Enter Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_DESC=Creare a new handler initialization parameter.
-HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE=Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE=Enter Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC=Create a new SOAP header.
-HANDLER_NAMESPACE_URL_LABEL=Namespace URL:
-HANDLER_LOCAL_PART_LABEL=Local part:
-PortComponentRefLabelProvider_UI_1=Service Endpoint Interface:
-PortComponentRefLabelProvider_UI_2=Port Component Link:
-WebServiceNavigatorGroupType_UI_0=Services
-WebServiceNavigatorGroupType_UI_1=Clients
-WebServiceNavigatorGroupType_UI_2=Handlers
-WebServiceFilesContribution_UI_0=Files
-WebServiceGroupContentExtension_UI_1=Open with Web Browser
-WebServiceNavigatorGroup_UI_0=JSR-109 Web Services
-Server_Invalid_For_Exisitng_EAR_UI_=Selected target server "{0}" is invalid for the existing EAR project "{1}"
-ServiceReferenceSelectionWizard_UI_6=Service Reference Selection
-ServiceReferenceSelectionWizard_UI_7=Service Reference Snippet
-ServiceReferenceSelectionPage_UI_0=Select a Service Reference
-ServiceReferenceSelectionPage_UI_1=Service Reference owner:
-ServiceReferenceSelectionPage_UI_2=New Service Reference...
-SERVICE_CLASSES_UI_=Service Classes
-PORT_UI_=Port:
-HANDLER_UI_=Handler:
-WSDL_PORT_UI_=WSDL Port:
-SERVICE_IMPL_UI_=ServiceImpl:
-WSDL_UI_=WSDL:
-WS_NAV_JOB0=Indexing JSR-109 Web Services
-WS_NAV_JOB1=Load Web Service Components
-WS_NAV_JOB2=Add JSR-109 Web Services node to viewer
-WS_NAV_JOB3=Update JSR-109 Web Services node in viewer
-WS_NAV_JOB4=Update JSR-109 Web Services node in viewer
-WS_NAV_JOB5=Updating Index of Web Service Components
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java
deleted file mode 100644
index 547b35bbc..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java
+++ /dev/null
@@ -1,86 +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.webservice;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-public class NewProjectsListener implements IResourceChangeListener, IResourceDeltaVisitor  {
-
-	
-	private WebServiceViewerSynchronization synchronization;
-	private boolean listening = false;
-	private boolean synchronizing = false;
-
-	public NewProjectsListener(WebServiceViewerSynchronization sync) {
-		synchronization = sync;
-		if(synchronization.webServiceProjectsExist(new NullProgressMonitor())) {
-			synchronizing = true;
-			synchronization.startIndexJob();
-		}
-		startListening();
-	} 
-	
-	public void dispose() {
-		if(listening)
-			stopListening();
-		if(synchronizing)
-			synchronization.stop();
-	}
-	
-	public void resourceChanged(IResourceChangeEvent event) {
-		try {
-			event.getDelta().accept(this);
-		} catch (CoreException e) {
-			WebServicePlugin.logError(0, e.getMessage(), e);
-		} 
-	} 
-
-	public boolean visit(IResourceDelta delta) throws CoreException { 
-		
-		IResource resource = delta.getResource();
-		switch (resource.getType()) {
-			case IResource.ROOT :
-				return true;
-			case IResource.PROJECT: 
-				if(delta.getKind() == IResourceDelta.ADDED) {
-					if(WebServiceViewerSynchronization.isInteresting((IProject)resource)) {
-						stopListening();
-						synchronizing = true;
-						synchronization.start();
-					}
-				}
-
-			default :
-				break;
-		}
-		
-		return false;
-	}
-
-	private void startListening() {
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-		listening = true;
-	}
-
-	private void stopListening() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		listening = false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
deleted file mode 100644
index 9bdde44bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.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
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.net.URL;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- */
-public class OpenExternalWSDLAction extends AbstractOpenAction {
-
-	String uri = ""; //$NON-NLS-1$
-
-	/**
-	 * @param text
-	 */
-	public OpenExternalWSDLAction(String text) {
-		super(text);
-		this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(J2EEUIPlugin.PLUGIN_ID, "icons/web_type.gif")); //$NON-NLS-1$
-	}
-
-	public void run() {
-		try {
-			IWorkbenchBrowserSupport browserSupport = WebServiceUIPlugin.getDefault().getWorkbench().getBrowserSupport(); 
-			IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,"WSDL","",""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			browser.openURL(new URL(uri));
-		} catch (Exception e) {
-			//Ignore
-		}
-	}
-
-	public boolean updateSelection(IStructuredSelection s) {
-		Object obj = s.getFirstElement();
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (serviceHelper.isWSDLResource(obj))
-			uri = ((Resource) obj).getURI().toString();
-		else if (serviceHelper.isService(obj))
-			uri = WebServicesManager.getInstance().getWSDLResource((EObject)obj).getURI().toString();
-		return super.updateSelection(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
deleted file mode 100644
index 2ee23ed9c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.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
- *******************************************************************************/
-/*
- * Created on Mar 4, 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.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceAdapterFactory extends J2EEEMFAdapterFactory {
-
-	/**
-	 * Default constructor
-	 */
-	public WebServiceAdapterFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		Resource res = null;
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (serviceHelper.isService(adaptableObject))
-			res = WebServicesManager.getInstance().getWsddResource((EObject) adaptableObject);
-		if (res == null)
-			res = WebServicesManager.getInstance().getWSDLResource((EObject) adaptableObject);
-		if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS)
-			return WorkbenchResourceHelper.getFile(res);
-		else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS)
-			return WorkbenchResourceHelper.getFile(res);
-		else
-			return super.getAdapter(adaptableObject, adapterType);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
deleted file mode 100644
index 37f0a6593..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
+++ /dev/null
@@ -1,77 +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 Jan 23, 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.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceFilesContribution {
-
-	protected WebServiceDescription webService;
-	protected List allFiles = null;
-
-	/**
-	 * Constructor
-	 */
-	public WebServiceFilesContribution(WebServiceDescription webService) {
-		super();
-		this.webService = webService;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return WebServiceUIResourceHandler.WebServiceFilesContribution_UI_0; 
-	}
-
-	public String getWSDLFile() {
-		return webService.getWsdlFile();
-	}
-
-	public String getMappingFile() {
-		return webService.getJaxrpcMappingFile();
-	}
-
-	public List getAllFiles() {
-		if (allFiles == null) {
-			allFiles = new ArrayList();
-			allFiles.add(getWSDLFile());
-			allFiles.add(getMappingFile());
-		}
-		return allFiles;
-	}
-
-	/**
-	 * @return Returns the webService.
-	 */
-	public WebServiceDescription getWebService() {
-		return webService;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
deleted file mode 100644
index 665e5151d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.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 Jan 20, 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.webservice;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroup {
-
-	private String label = WebServiceUIResourceHandler.WebServiceNavigatorGroup_UI_0; 
-	private IWorkspaceRoot root;
-
-	/**
-	 * Default constructor
-	 */
-	public WebServiceNavigatorGroup(IWorkspaceRoot wsRoot) {
-		super();
-		root = wsRoot;
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return label;
-	}
-
-	/**
-	 * @return Returns the root.
-	 */
-	public IWorkspaceRoot getRoot() {
-		return root;
-	}
-
-	/**
-	 * @param root
-	 *            The root to set.
-	 */
-	public void setRoot(IWorkspaceRoot root) {
-		this.root = root;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
deleted file mode 100644
index 603e6e202..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
+++ /dev/null
@@ -1,192 +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 Feb 25, 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.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroupType implements IActionFilter { 
-
-	private static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
-
-	private static final Object[] NO_CHILDREN = new Object[0];
-
-	public static final int SERVICES = 0;
-	public static final int CLIENTS = 2;
-	public static final int HANDLERS = 3;
-
-	public static final String SERVICES_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_0;
-	public static final String CLIENTS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_1;
-	public static final String HANDLERS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_2;
-
-	private int TYPE;
-	private EObject wsdlService = null;
-	private ServiceRef serviceRef = null;
-	private final AdapterFactory adapterFactory;
-
-	/**
-	 * Create a specific type of web service navigator grouping
-	 */
-	public WebServiceNavigatorGroupType(int groupType, AdapterFactory factory) {
-		super();
-		TYPE = groupType;
-		adapterFactory = factory;
-	}
-
-	/**
-	 * Create a specific type of web service navigator grouping
-	 */
-	public WebServiceNavigatorGroupType(int groupType, EObject wsdlService, AdapterFactory factory) {
-		super();
-		TYPE = groupType;
-		this.wsdlService = wsdlService;
-		adapterFactory = factory;
-	}
-
-	/**
-	 * Create a specific type of web service navigator grouping
-	 */
-	public WebServiceNavigatorGroupType(int groupType, ServiceRef serviceRef, AdapterFactory factory) {
-		super();
-		TYPE = groupType;
-		this.serviceRef = serviceRef;
-		adapterFactory = factory;
-	}
-
-	/**
-	 * @return Returns the TYPE.
-	 */
-	public int getGroupType() {
-		return TYPE;
-	}
-
-	public boolean isServices() {
-		return getGroupType() == SERVICES;
-	}
-
-	public boolean isClients() {
-		return getGroupType() == CLIENTS;
-	}
-
-	public boolean isHandlers() {
-		return getGroupType() == HANDLERS;
-	}
-
-	public EObject getWsdlService() {
-		return wsdlService;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (isServices())
-			return SERVICES_UI;
-		else if (isClients())
-			return CLIENTS_UI;
-		else if (isHandlers())
-			return HANDLERS_UI;
-		else
-			return super.toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String,
-	 *      java.lang.String)
-	 */
-	public boolean testAttribute(Object target, String name, String value) {
-		if (target != null && target instanceof WebServiceNavigatorGroupType && value != null) {
-			WebServiceNavigatorGroupType group = (WebServiceNavigatorGroupType) target;
-			if (group.isClients() && value.equals(CLIENTS_UI))
-				return true;
-			else if (group.isServices() && value.equals(SERVICES_UI))
-				return true;
-			else if (group.isHandlers() && value.equals(HANDLERS_UI))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @return Returns the serviceRef.
-	 */
-	public ServiceRef getServiceRef() {
-		return serviceRef;
-	}
-
-
-	public Object[] getChildren() {
-
-		switch (getGroupType()) {
-
-			case CLIENTS :
-				return WebServicesManager.getInstance().getAllWorkspaceServiceRefs().toArray();
-			case HANDLERS : {
-				List result = new ArrayList();
-				// handle web service handlers case
-				if (getWsdlService() != null) {
-					PortComponent port = WebServicesManager.getInstance().getPortComponent(getWsdlService());
-					if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty()) {
-						
-						/*
-						 * The rendering in the viewer is the list of handlers from an object
-						 * that is never touched by the AdapterFactoryContentProvider, and
-						 * thus never adapted by the AdapterFactory, and thus never has an
-						 * ItemProvider for the viewer attached to it. The following line 
-						 * ensures that it looks like this element was "rendered" by the 
-						 * content provider, so that updates to the list of handlers will
-						 * be propagated to the viewer.  
-						 */
-						adapterFactory.adapt(port, ITreeItemContentProviderClass);
-						
-						return port.getHandlers().toArray();
-					}
-				}
-				// handle service ref case
-				else if (getServiceRef() != null)
-					return getServiceRef().getHandlers().toArray();
-
-				return NO_CHILDREN;
-			}
-			case SERVICES : {
-				List result = new ArrayList();
-				result.addAll(WebServicesManager.getInstance().getInternalWSDLServices());
-				result.addAll(WebServicesManager.getInstance().getExternalWSDLServices());
-				return result.toArray();
-			}
-		}
-		return NO_CHILDREN;
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
deleted file mode 100644
index 79325c2bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WebServiceUIResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "webserviceui";//$NON-NLS-1$
-
-	private WebServiceUIResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String NEW_BUTTON_LABEL;
-	public static String NEW_HANDLER_WIZARD_WINDOW_TITLE;
-	public static String NEW_HANDLER_WIZARD_PAGE_TITLE;
-	public static String NEW_HANDLER_WIZARD_PAGE_DESC;
-	public static String HANDLER_DISPLAY_NAME_LABEL;
-	public static String HANDLER_DESCRIPTION_LABEL;
-	public static String HANDLER_NAME_LABEL;
-	public static String HANDLER_CLASS_NAME_LABEL;
-	public static String HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE;
-	public static String HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE;
-	public static String HANDLER_INIT_PARAM_WIZARD_PAGE_DESC;
-	public static String HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE;
-	public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE;
-	public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC;
-	public static String HANDLER_NAMESPACE_URL_LABEL;
-	public static String HANDLER_LOCAL_PART_LABEL;
-	public static String PortComponentRefLabelProvider_UI_1;
-	public static String PortComponentRefLabelProvider_UI_2;
-	public static String WebServiceNavigatorGroupType_UI_0;
-	public static String WebServiceNavigatorGroupType_UI_1;
-	public static String WebServiceNavigatorGroupType_UI_2;
-	public static String WebServiceFilesContribution_UI_0;
-	public static String WebServiceGroupContentExtension_UI_1;
-	public static String WebServiceNavigatorGroup_UI_0;
-	public static String Server_Invalid_For_Exisitng_EAR_UI_;
-	public static String ServiceReferenceSelectionWizard_UI_6;
-	public static String ServiceReferenceSelectionWizard_UI_7;
-	public static String ServiceReferenceSelectionPage_UI_0;
-	public static String ServiceReferenceSelectionPage_UI_1;
-	public static String ServiceReferenceSelectionPage_UI_2;
-	public static String SERVICE_CLASSES_UI_;
-	public static String PORT_UI_;
-	public static String HANDLER_UI_;
-	public static String WS_NAV_JOB0;
-	public static String WS_NAV_JOB1;
-	public static String WS_NAV_JOB2;
-	public static String WS_NAV_JOB3;
-	public static String WS_NAV_JOB4;
-	public static String WS_NAV_JOB5;
-	public static String WSDL_PORT_UI_;
-	public static String SERVICE_IMPL_UI_;
-	public static String WSDL_UI_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WebServiceUIResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
deleted file mode 100644
index 6fc26ac53..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
+++ /dev/null
@@ -1,306 +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.webservice;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceEvent;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceManagerListener;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.navigator.internal.NonConflictingRule;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectPropertyTester;
-
-public class WebServiceViewerSynchronization implements WebServiceManagerListener{
-	
-
-	private WebServicesManager webServicesManager = null; 
-	
-    private static final String PROJECT_FACET = "projectFacet"; //$NON-NLS-1$     
-    
-    /* The facets are duplicated here to avoid loading plugins just for constants */
-    /* package */ static final String EAR_FACET = "jst.ear"; //$NON-NLS-1$ 
-    /* package */ static final String APPCLIENT_FACET = "jst.appclient"; //$NON-NLS-1$ 
-    /* package */ static final String WEB_FACET = "jst.web"; //$NON-NLS-1$ 
-    /* package */ static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$ 
-    /* package */ static final String UTILITY_FACET = "jst.utility"; //$NON-NLS-1$ 
-    /* package */ static final String CONNECTOR_FACET = "jst.connector"; //$NON-NLS-1$ 
-    /* package */ static final String STATIC_WEB_FACET = "wst.web"; //$NON-NLS-1$ 
-    
-    private static final FacetedProjectPropertyTester facetPropertyTester = new FacetedProjectPropertyTester();
-
-    
-    private WebServicesNavigatorContentProvider contentProvider;
-
-	private Job indexJob = new WebServiceIndexJob();
-	private Job updateJob = new UpdateWebServicesNodeUIJob(); 
-	private Job removeJob = new RemoveWebServicesNodeUIJob(); 
-
-	private boolean navigatorGroupAdded = false;
-	private boolean indexJobScheduled = false;
-	
-	private boolean initialized = false;
-	
-	public WebServiceViewerSynchronization(WebServicesNavigatorContentProvider provider) {
-		contentProvider = provider; 
-	}
-	
-
-	public void start() {
-
-		try { 
-			
-			getWebServicesManager().addListener(this);
-			
-			// create the default synchronizer for any web service editor to use with view due
-			// to the usage of seperate edit models.
-			WebServicesNavigatorSynchronizer.createInstance(
-							new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID), contentProvider);
-		} finally { 
-			initialized = true;
-		} 
-	}
-	 
-	public void stop() { 
-		if(initialized) {
-			getWebServicesManager().removeListener(this);
-			// dispose current instance of web service editor/explorer synchronizer
-			WebServicesNavigatorSynchronizer.disposeInstance();
-		}
-	}
-	
-	public void webServiceManagerChanged(WebServiceEvent anEvent) {
-		
-		switch (anEvent.getEventType()) {
-			case WebServiceEvent.REFRESH:
-
-				if(!hasNavigatorGroupBeenAdded()) {
-					if(!hasIndexJobBeenScheduled())
-						indexJob.schedule();
-					else {
-						new AddWebServicesNodeUIJob().schedule();
-					}
-				} else {
-					updateJob.schedule();
-				}
-				break;
-			case WebServiceEvent.REMOVE:
-				removeJob.schedule();
-		}
-	}
-
-
-	public void startIndexJob() {
-		indexJob.schedule();
-		
-	} 
-	
-	/**
-	 * Employ a Test-And-Set (TST) primitive to ensure the Job is only scheduled once per load.
-	 * 
-	 * @return True if the the index job has been scheduled. The value of indexJobSchedule will
-	 *         _always_ be true after this method executes, so if false is returned, the job must be
-	 *         scheduled by the caller.
-	 */
-	/* package */ synchronized boolean hasIndexJobBeenScheduled() {
-		if (!indexJobScheduled) {
-			indexJobScheduled = true;
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Multiple threads access this boolean flag, so we synchronize it to ensure that its value is
-	 * consistent across different threads.
-	 * 
-	 * @return True if the WebServicesNavigatorGroup has already been processed and added to the
-	 *         tree.
-	 */
-	/* package */ synchronized boolean hasNavigatorGroupBeenAdded() {
-		return navigatorGroupAdded;
-	} 
-	
-	/* package */ synchronized void setNavigatorGroupAdded(boolean hasBeenAdded) {
-		navigatorGroupAdded = hasBeenAdded;
-	}
-
-	private WebServicesManager getWebServicesManager() {
-		if (webServicesManager == null)
-			webServicesManager = WebServicesManager.getInstance();
-		return webServicesManager;
-	}
-	
-	private boolean indexWebServices(IProgressMonitor monitor) {
-		boolean hasChildren = false;
-		if (!monitor.isCanceled()) {
-			try {
-				hasChildren |= getWebServicesManager().getWorkspace13ServiceRefs().size() > 0;
-			} catch (RuntimeException e) { 
-				WebServiceUIPlugin.logError(0, e.getMessage(), e);
-			}
-		} else {
-			return hasChildren;
-		}
-		monitor.worked(1);
-
-		if (!monitor.isCanceled()) {
-			try {
-				hasChildren |= getWebServicesManager().getWorkspace14ServiceRefs().size() > 0;
-			} catch (RuntimeException e) { 
-				WebServiceUIPlugin.logError(0, e.getMessage(), e);
-			}
-		} else {
-			return hasChildren;
-		}
-		monitor.worked(1);
-
-		if (!monitor.isCanceled()) {
-			try {
-				hasChildren |= getWebServicesManager().getInternalWSDLServices().size() > 0;
-			} catch (RuntimeException e) { 
-				WebServiceUIPlugin.logError(0, e.getMessage(), e);
-			}
-		} else {
-			return hasChildren;
-		}
-		monitor.worked(1);
-
-		if (!monitor.isCanceled()) {
-			try {
-				hasChildren |= getWebServicesManager().getExternalWSDLServices().size() > 0;
-			} catch (RuntimeException e) { 
-				WebServiceUIPlugin.logError(0, e.getMessage(), e);
-			}
-		} else {
-			return hasChildren;
-		}
-		monitor.worked(1);
-		return hasChildren;
-	}
-	
-	/* package */ static boolean hasFacet(Object element, String facet) {
-		return facetPropertyTester.test(element, PROJECT_FACET, new Object[] {}, facet);
-	}
-	
-	/* package */ boolean webServiceProjectsExist(IProgressMonitor monitor) { 	
-		
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		try {
-			monitor.beginTask("Searching for web service capable projects...", projects.length);
-			for (int i = 0; i < projects.length; i++) {
-				 if(isInteresting(projects[i]))
-					 return true;
-				 monitor.worked(1);
-			}
-		} finally {
-			monitor.done();
-		}
-		return false;
-	}
-
-	/* package */ static boolean isInteresting(IProject project) {
-		return hasFacet(project, WEB_FACET) || 
-			hasFacet(project, EJB_FACET) || 
-			hasFacet(project, APPCLIENT_FACET);
-	}
-
-	public class WebServiceIndexJob extends Job {
-	
-		public WebServiceIndexJob() {
-			super(WebServiceUIResourceHandler.WS_NAV_JOB0);
-			setRule(new NonConflictingRule());
-		}
-
-		protected IStatus run(IProgressMonitor monitor) {
-			monitor.beginTask(WebServiceUIResourceHandler.WS_NAV_JOB1, 4);
-  
-			if (webServiceProjectsExist(monitor) && indexWebServices(monitor)) {
-				new AddWebServicesNodeUIJob().schedule();
-			}
-
-			return Status.OK_STATUS;
-		}
-	}
-
-	public class AddWebServicesNodeUIJob extends UIJob {
-
-
-		public AddWebServicesNodeUIJob() {
-			super(WebServiceUIResourceHandler.WS_NAV_JOB2);
-		}
-
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-
-			TreeViewer viewer = contentProvider.getViewer();
-			if(!viewer.getControl().isDisposed()) {
-				viewer.add(viewer.getInput(), contentProvider.getNavigatorGroup());
-			}
-			setNavigatorGroupAdded(true);
-			return Status.OK_STATUS;
-		} 
-	}
-
-	public class UpdateWebServicesNodeUIJob extends UIJob {
- 
-		public UpdateWebServicesNodeUIJob () {
-			super(WebServiceUIResourceHandler.WS_NAV_JOB3);
-		}
-
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			TreeViewer viewer = contentProvider.getViewer();
-
-			if(!viewer.getControl().isDisposed()) {
-				if(hasNavigatorGroupBeenAdded())
-					contentProvider.getViewer().refresh(contentProvider.getNavigatorGroup());
-				else {
-					viewer.add(viewer.getInput(), contentProvider.getNavigatorGroup());
-					setNavigatorGroupAdded(true);
-				}
-			}
-			return Status.OK_STATUS;
-		} 
-	}
-	 
-	public class RemoveWebServicesNodeUIJob extends UIJob { 
-
-		public RemoveWebServicesNodeUIJob() {
-			super(WebServiceUIResourceHandler.WS_NAV_JOB4);
-		}
-
-		public IStatus runInUIThread(IProgressMonitor monitor) { 
-
-			monitor.beginTask(WebServiceUIResourceHandler.WS_NAV_JOB5, 4);
-
-			TreeViewer viewer = contentProvider.getViewer();
-
-			if(!viewer.getControl().isDisposed()) {
-				if (indexWebServices(monitor)) {
-					viewer.refresh(contentProvider.getNavigatorGroup());
-				} else {
-					viewer.remove(contentProvider.getNavigatorGroup());
-					setNavigatorGroupAdded(false);
-				}
-			}
-			return Status.OK_STATUS;
-		} 
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
deleted file mode 100644
index 1e7310045..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
+++ /dev/null
@@ -1,307 +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 Jan 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.webservice;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorContentProvider extends AdapterFactoryContentProvider {
-
-	private static final Object[] NO_CHILDREN = new Object[0]; 
-
-	private WebServicesManager webServicesManager = null; 
-	private WebServiceNavigatorGroup webServiceNavigatorGroup;
-	private WebServiceNavigatorGroupType SERVICES = null;
-	private WebServiceNavigatorGroupType CLIENTS = null;
-	private HashMap HANDLERS = new HashMap();
-	private TreeViewer viewer = null;
-
-	private WebServiceViewerSynchronization viewerSynchronization;
-	private NewProjectsListener projectListener;
-	
-
-	public WebServicesNavigatorContentProvider() {
-		super(createAdapterFactory());
-		viewerSynchronization = new WebServiceViewerSynchronization(this);
-		projectListener = new NewProjectsListener(viewerSynchronization);
-
-	} 
-	
-	public void dispose() { 
-		super.dispose();
-		projectListener.dispose();
-	}
-
-	/**
-	 * Configure and return a composite adapter factory for our contents
-	 */
-	public static AdapterFactory createAdapterFactory() {
-		return new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		
-		if (parentElement instanceof IWorkspaceRoot) {
-			// return new Object[]{ getWebServicesNavigatorGroup(parentElement) };
-			if (!viewerSynchronization.hasNavigatorGroupBeenAdded()) {
-				if (!viewerSynchronization.hasIndexJobBeenScheduled())
-					viewerSynchronization.startIndexJob();
-				return NO_CHILDREN;
-			} else {
-				return new Object[]{getNavigatorGroup()};
-			}
-		} else if (parentElement instanceof WebServiceNavigatorGroup)
-			return new Object[]{getServicesGroup(), getClientsGroup()};
-
-		else if (parentElement instanceof WebServiceNavigatorGroupType) {
-			WebServiceNavigatorGroupType wsGroupType = (WebServiceNavigatorGroupType) parentElement;
-			return wsGroupType.getChildren();
-		} else if (WSDLServiceExtManager.getServiceHelper().isService(parentElement))
-			return getServiceLevelNodes(parentElement).toArray();
-
-		else if (parentElement instanceof ServiceRef)
-			return new Object[]{getHandlersGroup(parentElement)};
-
-		else if (parentElement instanceof Handler || parentElement instanceof org.eclipse.jst.j2ee.webservice.wsclient.Handler || WSDLServiceExtManager.getServiceHelper().isWSDLResource(parentElement))
-			return NO_CHILDREN;
-
-		else
-			return super.getChildren(parentElement);
-	}
-
-
-	private List getServiceLevelNodes(Object parentElement) {
-		List result = new ArrayList();
-		// add service classes
-		if (getWebServicesManager().isServiceInternal((EObject) parentElement) && getWebServicesManager().getServiceImplBean((EObject) parentElement) != null)
-			result.add(getWebServicesManager().getServiceImplBean((EObject) parentElement));
-		// Add handlers
-		if (getWebServicesManager().isServiceInternal((EObject) parentElement))
-			result.add(getHandlersGroup(parentElement));
-		// add wsdl file
-		Resource wsdl = getWebServicesManager().getWSDLResource((EObject) parentElement);
-		if (wsdl != null)
-			result.add(wsdl);
-		return result;
-	}
-
-	private List getHandlerChildren(Object parentElement) {
-		List result = new ArrayList();
-		WebServiceNavigatorGroupType handlersGroup = (WebServiceNavigatorGroupType) parentElement;
-		// handle web service handlers case
-		if (handlersGroup.getWsdlService() != null) {
-			PortComponent port = getWebServicesManager().getPortComponent(handlersGroup.getWsdlService());
-			if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty())
-				result.addAll(port.getHandlers());
-		}
-		// handle service ref case
-		else if (handlersGroup.getServiceRef() != null) {
-			result.addAll(handlersGroup.getServiceRef().getHandlers());
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof IWorkspaceRoot)
-			return null;
-		else if (element instanceof WebServiceNavigatorGroup)
-			return ((WebServiceNavigatorGroup) element).getRoot();
-		else
-			return super.getParent(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
-		// TODO handle change events
-		if (aViewer != null && aViewer instanceof TreeViewer)
-			viewer = (TreeViewer) aViewer;
-		super.inputChanged(aViewer, oldInput, newInput);
-	}
- 
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	/**
-	 * @return Returns the navigatorGroup.
-	 */
-	public WebServiceNavigatorGroup getNavigatorGroup() {
-		if (null == webServiceNavigatorGroup) {
-			webServiceNavigatorGroup = new WebServiceNavigatorGroup(ResourcesPlugin.getWorkspace().getRoot());
-		}
-		return webServiceNavigatorGroup;
-	}
-
-	protected WebServicesManager getWebServicesManager() {
-		if (webServicesManager == null)
-			webServicesManager = WebServicesManager.getInstance();
-		return webServicesManager;
-	}
-	
-	private WebServiceNavigatorGroupType getServicesGroup() {
-		if (SERVICES == null)
-			SERVICES = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.SERVICES, getAdapterFactory());
-		return SERVICES;
-	}
-
-	private WebServiceNavigatorGroupType getClientsGroup() {
-		if (CLIENTS == null)
-			CLIENTS = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.CLIENTS, getAdapterFactory());
-		return CLIENTS;
-	}
-
-	private WebServiceNavigatorGroupType getHandlersGroup(Object key) {
-		if (key == null)
-			return null;
-		WebServiceNavigatorGroupType handler = null;
-		handler = (WebServiceNavigatorGroupType) HANDLERS.get(key);
-		if (handler == null) {
-			if (WSDLServiceExtManager.getServiceHelper().isService(key))
-				handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (EObject) key, getAdapterFactory());
-			else if (key instanceof ServiceRef)
-				handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (ServiceRef) key, getAdapterFactory());
-
-			if (handler != null)
-				HANDLERS.put(key, handler);
-		}
-		return handler;
-	}
-
-	/**
-	 * @return Returns the viewer.
-	 */
-	public TreeViewer getViewer() {
-		return viewer;
-	}
-	
-	public void notifyChanged(Notification notification) {
-	
-		if(notification.getNotifier() instanceof ServiceRef) {
-			switch(notification.getFeatureID(ServiceRef.class)) {
-				case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-					
-					WebServiceNavigatorGroupType handlersGroup = getHandlersGroup(notification.getNotifier());
-
-					if(handlersGroup != null) {
-						switch(notification.getEventType()) {
-							case Notification.ADD: 
-								viewer.add(handlersGroup, notification.getNewValue());						
-								break;
-							case Notification.ADD_MANY: 
-								viewer.add(handlersGroup, ((Collection)notification.getNewValue()).toArray());						
-								break;
-							case Notification.REMOVE: 						
-								viewer.remove(notification.getOldValue());
-								break;
-							case Notification.REMOVE_MANY:
-								viewer.remove(((Collection)notification.getOldValue()).toArray());
-								break;
-						}			
-					}
-					return;				
-				default:			
-			} 
-		} else if(notification.getNotifier() instanceof PortComponent) {
-			switch(notification.getFeatureID(PortComponent.class)) {
-				case WsddPackage.PORT_COMPONENT__HANDLERS:
-					
-					PortComponent pComp = (PortComponent) notification.getNotifier();
-					EObject service = getWebServicesManager().getService(pComp);
-					if(service != null) {
-						WebServiceNavigatorGroupType handlersGroup = getHandlersGroup(service);						
-						if(handlersGroup != null) {
-							switch(notification.getEventType()) {
-								case Notification.ADD: 
-									viewer.add(handlersGroup, notification.getNewValue());						
-									break;
-								case Notification.ADD_MANY: 
-									viewer.add(handlersGroup, ((Collection)notification.getNewValue()).toArray());						
-									break;
-								case Notification.REMOVE: 						
-									viewer.remove(notification.getOldValue());
-									break;
-								case Notification.REMOVE_MANY:
-									viewer.remove(((Collection)notification.getOldValue()).toArray());
-									break;
-							}
-						}
-					}
-					
-					
-					return;				
-				default:			
-			}
-		}  
-		super.notifyChanged(notification);	 
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
deleted file mode 100644
index ba94ebbf0..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
+++ /dev/null
@@ -1,169 +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 10, 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.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServicesNavigatorGroupOpenListener extends CommonActionProvider {
-
-	private OpenExternalWSDLAction openExternalWSDLAction;
-	private OpenJ2EEResourceAction openAction;
-	
-	/**
-	 * @param text
-	 */
-	public WebServicesNavigatorGroupOpenListener() {
-	}
-	
-	public void init(ICommonActionExtensionSite aConfig) { 
-		openExternalWSDLAction = new OpenExternalWSDLAction(WebServiceUIResourceHandler.WebServiceGroupContentExtension_UI_1);
-		openAction = new OpenJ2EEResourceAction();
-	}
-	
-	public void setContext(ActionContext aContext) {
-		if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
-			WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-			if (selection == null || selection.getFirstElement()==null)
-				return;
-			Object selectedObject = selection.getFirstElement();
-			if (serviceHelper==null)
-				return;
-			else if (selectedObject instanceof ServiceImpl) {
-				WsddResource resource = WebServicesManager.getInstance().getWsddResource((ServiceImpl)selectedObject);
-				if (resource == null) {
-					openExternalWSDLAction.selectionChanged(selection);
-					super.setContext(aContext);
-					return;
-				}
-				List wsddSelection = new ArrayList();
-				wsddSelection.add(resource);
-				openAction.selectionChanged(new StructuredSelection(wsddSelection));
-			}
-			else if (serviceHelper.isWSDLResource(selectedObject)) {
-				Resource wsdl = (Resource) selectedObject;
-				IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-				if (wsdlFile == null || !wsdlFile.exists()) {
-					openExternalWSDLAction.selectionChanged(selection);
-					super.setContext(aContext);
-					return;
-				}
-				openAction.selectionChanged(selection);
-			}
-			
-			else {
-				openAction.selectionChanged(selection);
-			}	
-		}
-		super.setContext(aContext);
-	}
-	
-	public void fillActionBars(IActionBars theActionBars) {
-		if (getContext()==null || getContext().getSelection().isEmpty())
-			return;
-		IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
-		
-		if (selection.getFirstElement() instanceof ServiceImpl) {
-			ServiceImpl wsdl = (ServiceImpl) selection.getFirstElement();
-			WsddResource resource = WebServicesManager.getInstance().getWsddResource(wsdl);
-			if (resource == null) {
-				IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-				if (wsdlFile == null || !wsdlFile.exists()) {
-					openExternalWSDLAction.selectionChanged(selection);
-					theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openExternalWSDLAction);
-					return;
-				} 
-				openAction.selectionChanged(selection);
-				theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
-				return;
-			}
-			List wsddSelection = new ArrayList();
-			wsddSelection.add(resource);
-			openAction.selectionChanged(new StructuredSelection(wsddSelection));
-			theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
-			return;
-			
-		} else if (selection.getFirstElement() instanceof WSDLResourceImpl) {
-			WSDLResourceImpl wsdl = (WSDLResourceImpl) selection.getFirstElement();
-			IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-			if (wsdlFile == null || !wsdlFile.exists()) {
-				openExternalWSDLAction.selectionChanged(selection);
-				theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openExternalWSDLAction);
-				return;
-			}
-		}
-		
-		openAction.selectionChanged(selection);
-		if(openAction.isEnabled()) 
-			theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
-		return;
-	}
-	
-	public void fillContextMenu(IMenuManager menu) {
-		if (getContext()==null || getContext().getSelection().isEmpty())
-			return;
-		IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
-		if (selection.getFirstElement() instanceof ServiceImpl) {
-			ServiceImpl wsdl = (ServiceImpl) selection.getFirstElement();
-			IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-			if (wsdlFile == null || !wsdlFile.exists()) {
-				openExternalWSDLAction.selectionChanged(selection);
-				menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openExternalWSDLAction);
-				return;
-			}
-		}
-		else if (selection.getFirstElement() instanceof WSDLResourceImpl) {
-			WSDLResourceImpl wsdl = (WSDLResourceImpl) selection.getFirstElement();
-			IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-			if (wsdlFile == null || !wsdlFile.exists()) {
-				openExternalWSDLAction.selectionChanged(selection);
-				menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openExternalWSDLAction);
-				return;
-			}
-		}
-		openAction.selectionChanged(selection);
-		if (openAction.isEnabled())
-			menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
deleted file mode 100644
index 5f1d285c7..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
+++ /dev/null
@@ -1,189 +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 Jan 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.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorLabelProvider extends AdapterFactoryLabelProvider implements ILabelProvider {
-
-	private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$
-	
-	public WebServicesNavigatorLabelProvider() {
-		super(createAdapterFactory());
-	}
-	
-	/**
-	 * Configure and return a composite adapter factory for our contents
-	 */
-	public static AdapterFactory createAdapterFactory() {
-		return new DynamicAdapterFactory(VIEWER_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (element instanceof WebServiceNavigatorGroup)
-			return J2EEUIPlugin.getDefault().getImage("webServicesFolder_obj"); //$NON-NLS-1$
-		else if (element instanceof String)
-			return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
-		else if (element instanceof WebServiceNavigatorGroupType)
-			return J2EEUIPlugin.getDefault().getImage("folder"); //$NON-NLS-1$
-		else if (serviceHelper.isService(element)) {
-			if (WebServicesManager.getInstance().isServiceInternal((EObject) element))
-				return J2EEUIPlugin.getDefault().getImage("webServiceItemProvider_obj"); //$NON-NLS-1$
-			return J2EEUIPlugin.getDefault().getImage("extwebserviceitemprovider_obj"); //$NON-NLS-1$
-		} else if (serviceHelper.isWSDLResource(element))
-			return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
-		else
-			return super.getImage(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		String space = " "; //$NON-NLS-1$
-		if (element instanceof WebServiceDescription)
-			return getWebServiceDescriptionText((WebServiceDescription) element);
-		else if (element instanceof PortComponent)
-			return WebServiceUIResourceHandler.PORT_UI_ + space + super.getText(element); 
-		else if (element instanceof Handler)
-			return WebServiceUIResourceHandler.HANDLER_UI_ + space + super.getText(element); 
-		else if (element instanceof WSDLPort)
-			return WebServiceUIResourceHandler.WSDL_PORT_UI_ + space + super.getText(element); 
-		else if (element instanceof ServiceImplBean)
-			return WebServiceUIResourceHandler.SERVICE_CLASSES_UI_; 
-		else if (element instanceof EJBLink)
-			return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element); 
-		else if (element instanceof ServletLink)
-			return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element); 
-		else if (serviceHelper.isService(element))
-			return serviceHelper.getServiceLocalPart(element);
-		else if (serviceHelper.isWSDLResource(element)) {
-			String result = ""; //$NON-NLS-1$
-			IFile file = WorkbenchResourceHelper.getFile((Resource) element);
-			if (file != null && file.exists())
-				result = file.getFullPath().toString();
-			else
-				result = ((Resource) element).getURI().toString();
-			return WebServiceUIResourceHandler.WSDL_UI_ + space + result; 
-		} else if (element instanceof ServiceRef) {
-			String beanName14 = ""; //$NON-NLS-1$
-			if (WebServicesManager.getInstance().isJ2EE14((ServiceRef) element)) {
-				if (((ServiceRef) element).eContainer() instanceof Session)
-					beanName14 = ((Session) ((ServiceRef) element).eContainer()).getName() + ": "; //$NON-NLS-1$
-			}
-
-			return ProjectUtilities.getProject((ServiceRef) element).getName() + ": " + beanName14 //$NON-NLS-1$
-						+ ((ServiceRef) element).getServiceRefName();
-		} else
-			return super.getText(element);
-	}
-
-	/**
-	 * get text for web service
-	 */
-	private String getWebServiceDescriptionText(WebServiceDescription description) {
-		Resource res = description.eResource();
-		IProject project = null;
-		String projString = ""; //$NON-NLS-1$
-		if (res != null)
-			project = WorkbenchResourceHelper.getProject(res);
-		if (project != null)
-			projString = project.getName() + ": "; //$NON-NLS-1$
-		return projString + super.getText(description);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// TODO add any listeners?
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		// TODO handle dispose
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
-	 *      java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		// TODO do something smart here?
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		// TODO how do we remove listeners?
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
deleted file mode 100644
index 135f48abb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
+++ /dev/null
@@ -1,134 +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 10, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-/**
- * @author jlanuti
- */
-public class WebServicesNavigatorSynchronizer extends AdapterFactoryContentProvider implements Adapter {
-
-
-	private static WebServicesNavigatorSynchronizer INSTANCE = null;
-	protected Notifier target = null;
-	private WebServicesNavigatorContentProvider contentProvider = null;
-
-	/**
-	 * Constructor
-	 */
-	public WebServicesNavigatorSynchronizer(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
-		super(adapterFactory);
-		contentProvider = provider;
-	}
-
-	public static WebServicesNavigatorSynchronizer getInstance() {
-		return INSTANCE;
-	}
-
-	public static WebServicesNavigatorSynchronizer createInstance(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
-		INSTANCE = new WebServicesNavigatorSynchronizer(adapterFactory, provider);
-		return INSTANCE;
-	}
-
-	public static void disposeInstance() {
-		INSTANCE = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#getTarget()
-	 */
-	public Notifier getTarget() {
-		return target;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier newTarget) {
-		target = newTarget;
-	}
-
-	public void notifyChanged(final Notification notification) {
-		if (notification.isTouch()) {
-			//There is nothing that is required since nothing changed.
-			return;
-		}
-		
-		EObject notifier = (EObject) notification.getNotifier();
-		if (notifier instanceof WebServices) {
-			//Do nothing.
-		} else if (isServiceRefModification(notification)) {
-			// Handle service ref edits
-			contentProvider.getViewer().refresh(notifier);
-		} else if (isServiceRefAddOrRemove(notification)) {
-			//Handle service ref adds or removes
-			contentProvider.getViewer().refresh();
-		} else {
-			// Handle web service changes by getting the WSDD parent
-			while (!(notifier instanceof WebServiceDescription) && notifier != null) {
-				notifier = notifier.eContainer();
-			}
-			// Refresh the associated wsdl service for the WSDD parent
-			if (notifier instanceof WebServiceDescription && notifier !=null) {
-				EObject wsdl = WebServicesManager.getInstance().getWSDLServiceForWebService((WebServiceDescription)notifier);
-				contentProvider.getViewer().refresh(wsdl);
-			}
-			super.notifyChanged(notification);
-		}
-	}
-	
-	private boolean isServiceRefAddOrRemove(Notification notification) {
-		//Note this check is not handling ADD_MANY or REMOVE_MANY.
-		Object value = null;
-		switch (notification.getEventType()) {
-			case Notification.ADD:
-				value = notification.getNewValue();
-				break;
-			case Notification.REMOVE:
-				value = notification.getOldValue();
-				break;
-		}
-		return value != null && (value instanceof ServiceRef || value instanceof ComponentScopedRefs);
-	}
-	
-	private boolean isServiceRefModification(Notification notification) {
-		Object notifier = notification.getNotifier();
-		return notifier instanceof ServiceRef || notifier instanceof Handler;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
deleted file mode 100644
index 066f4d940..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
+++ /dev/null
@@ -1,58 +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 5, 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.webservice;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WsdlResourceAdapterFactory extends J2EEEMFAdapterFactory {
-
-	/**
-	 * Default constructor
-	 */
-	public WsdlResourceAdapterFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		Resource res = null;
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (serviceHelper.isWSDLResource(adaptableObject))
-			res = (Resource) adaptableObject;
-
-		if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS)
-			return WorkbenchResourceHelper.getFile(res) != null ? WorkbenchResourceHelper.getFile(res) : null;
-		else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS)
-			return WorkbenchResourceHelper.getFile(res);
-		else
-			return super.getAdapter(adaptableObject, adapterType);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 8e9c3572d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,126 +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 Nov 15, 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.webservice.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServiceUIPlugin extends AbstractUIPlugin {
-	
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservice.ui"; //$NON-NLS-1$
-	
-	//	The shared instance.
-	private static WebServiceUIPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public WebServiceUIPlugin() {
-		super();
-		plugin = this;
-	}
-	
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WebServiceUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-
-	/**
-	 * Record an error against this plugin's log. 
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param anException
-	 */
-	public static void logError(int aCode, String aMessage,
-			Throwable anException) {
-		getDefault().getLog().log(
-				createErrorStatus(aCode, aMessage, anException));
-	}
-
-	/**
-	 * 
-	 * Record a message against this plugin's log. 
-	 * 
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 */
-	public static void log(int severity, int aCode, String aMessage,
-			Throwable exception) {
-		log(createStatus(severity, aCode, aMessage, exception));
-	}
-
-	/**
-	 * 
-	 * Record a status against this plugin's log. 
-	 * 
-	 * @param aStatus
-	 */
-	public static void log(IStatus aStatus) {
-		getDefault().getLog().log(aStatus);
-	}
-
-	/**
-	 * Create a status associated with this plugin.
-	 *  
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createStatus(int severity, int aCode,
-			String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode,
-				aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createErrorStatus(int aCode, String aMessage,
-			Throwable exception) {
-		return createStatus(IStatus.ERROR, aCode, aMessage, exception);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.classpath b/plugins/org.eclipse.jst.j2ee.webservice/.classpath
deleted file mode 100644
index be3b41021..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="webservice/"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore
deleted file mode 100644
index e54d28649..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-webservice.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.project b/plugins/org.eclipse.jst.j2ee.webservice/.project
deleted file mode 100644
index 5fcfb43ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.webservice</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 14e5a36b1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.webservice; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.webservice.adapter;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.command;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.componentcore.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.constants;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.helper;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.wsdd.provider;x-internal:=true
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/about.html b/plugins/org.eclipse.jst.j2ee.webservice/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/build.properties b/plugins/org.eclipse.jst.j2ee.webservice/build.properties
deleted file mode 100644
index f40d5ee72..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/build.properties
+++ /dev/null
@@ -1,21 +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/,\
-               images/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
-source.. = webservice/,\
-                        property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/component.xml b/plugins/org.eclipse.jst.j2ee.webservice/component.xml
deleted file mode 100644
index 780cb13f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.webservice"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.webservice" fragment="false"/><plugin id="org.eclipse.jst.j2ee.webservice.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif
deleted file mode 100644
index ac0d8b26f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index eb074fbde..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 0c05357d6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index f4df8d42f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 94dd2537a..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index 02c00da2a..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif
deleted file mode 100644
index 3b9e4baeb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif
deleted file mode 100644
index 022f2b659..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif
deleted file mode 100644
index ff93e09dc..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif
deleted file mode 100644
index 80ca95e80..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif
deleted file mode 100644
index 3db9aa744..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif
deleted file mode 100644
index cc5b0b061..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif
deleted file mode 100644
index 11202c5bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif
deleted file mode 100644
index 083d44b35..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif
deleted file mode 100644
index 8aee36721..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif
deleted file mode 100644
index da0b7fff1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif
deleted file mode 100644
index 767ee9316..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif
deleted file mode 100644
index 543f6df52..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif
deleted file mode 100644
index 98bbc526f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif
deleted file mode 100644
index 87e470594..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif
deleted file mode 100644
index 17c6fea10..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif
deleted file mode 100644
index 87e470594..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif
deleted file mode 100644
index 17c6fea10..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif
deleted file mode 100644
index df680cea5..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif
deleted file mode 100644
index 5b3180b96..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif
deleted file mode 100644
index c707b3433..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif
deleted file mode 100644
index 7bf99266f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif
deleted file mode 100644
index afeb42594..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif
deleted file mode 100644
index 2c772458c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif
deleted file mode 100644
index f507a8467..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif
deleted file mode 100644
index b5dd75e42..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif
deleted file mode 100644
index 2dbc34d56..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif
deleted file mode 100644
index b54d7423a..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif
deleted file mode 100644
index c2f688ee0..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif
deleted file mode 100644
index 012ad9cc8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif
deleted file mode 100644
index 2124f3e3a..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif
deleted file mode 100644
index 136e3b272..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif
deleted file mode 100644
index 33854e98c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif
deleted file mode 100644
index 134551bff..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif
deleted file mode 100644
index a26660ec2..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif
deleted file mode 100644
index 48e3cf226..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif
deleted file mode 100644
index 7bf99266f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif
deleted file mode 100644
index ed8747474..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif
deleted file mode 100644
index 7bac4fd38..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif
deleted file mode 100644
index c8d381f0b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif
deleted file mode 100644
index 904159880..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif
deleted file mode 100644
index 1e5345fb3..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif
deleted file mode 100644
index a17dc7d88..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif
deleted file mode 100644
index 89ad5da38..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif
deleted file mode 100644
index 162a57805..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif
deleted file mode 100644
index 507b8a82e..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3fe6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif
deleted file mode 100644
index 120b02086..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif
deleted file mode 100644
index 1c8339c9f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif
deleted file mode 100644
index b930e2d09..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif
deleted file mode 100644
index 670c5c92e..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif
deleted file mode 100644
index 16bc425b0..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif
deleted file mode 100644
index 69ec361fb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif b/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif b/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif
deleted file mode 100644
index fd0c66950..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties b/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties
deleted file mode 100644
index 7f47259d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties
+++ /dev/null
@@ -1,159 +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
-###############################################################################
-# ----------------------------------------------------------------------
-# Properties for com.ibm.etools.webservice.atk.ui
-#
-# Entries are of the form CONSTANT=string
-#
-# File plugins/com.ibm.etools.webservice.atk.ui/plugin.properties, wsa.etools.ws.properties, lunar, 20030922a 26
-# Version 1.26 03/09/09 16:41:49
-# ----------------------------------------------------------------------
-
-#
-# Messages in plugin.xml.
-#
-
-pluginName=Web Service Plug-in
-pluginVendor=Eclipse.org
-
-
-#
-# Edit models
-#
-WSDD_EDIT_MODEL_NAME=Web Services Edit Model
-EDITOR_EDITMODELS_WEB_SERVICES=Web Services Editor Edit Model
-WSCDD_EDIT_MODEL_NAME=Web Services Client Edit Model
-EDITOR_EDITMODELS_WEB_SERVICES_CLIENT=Web Services Client Editor Edit Model
-
-#
-#Common Editor Messages
-#
-TITLE_SAVE_ERROR=Save Error
-MSG_SAVE_ERROR=An error occurred when attempting to save editor contents.
-
-#
-# Messages in WebServicesEditor
-#
-
-#
-# Messages in WebServicesClientEditor
-#
-
-
-
-#
-# Messages in WebServicesPage
-#
-
-
-#
-# Messages in PortComponentPage
-#
-
-
-#
-# Messages in HandlerPage
-#
-
-
-#
-# Messages in WebServicesClientPage
-#
-
-
-#
-# Messages in ServiceRefPage
-#
-
-
-#
-# Labels
-#
-LABEL_UNQUALIFIED_COMPONENT=<unqualified>
-LABEL_SERVLET_LINK=Servlet link
-
-
-
-#
-# Labels for table layout
-#
-LABEL_TABLE_NAME=Name
-LABEL_TABLE_VALUE=Value
-LABEL_TABLE_SOAP_ROLE=SOAP role
-LABEL_TABLE_PORT_NAME=Port name
-LABEL_TABLE_PORT_COMPONENT_LINK=Port component link
-LABEL_TABLE_DESCRIPTION=Description
-
-#
-# Page and Section titles/descriptions
-#
-
-
-
-
-#
-# Dialog labels
-#
-
-
-#
-# Tooltips
-#
-
-
-#
-# Labels for providers
-#
-_UI_WebServiceDescription_type=Web service description
-_UI_PortComponent_type=Port component
-_UI_Handler_type=Handler
-_UI_PortComponentRef_type=Port component reference
-_UI_ServiceRef_type=Service reference
-_UI_WebServicesClient_type=Web services client
-_UI_ComponentScopedRefs_type=Component scoped reference
-_UI_WSDLPort_type=WSDL port
-_UI_WebServices_type=Web services
-_UI_ServletLink_type=Servlet link
-_UI_ServiceImplBean_type=Service implementation bean
-_UI_EJBLink_type=EJB link
-_UI_BeanLink_type=Bean link
-_UI_SOAPRole_type=SOAP role
-_UI_SOAPHeader_type=SOAP header
-_UI_PortName_type=Port name
-_UI_InitParam_type=Initial parameter
-_UI_ServiceRef_jaxrpcMappingFile_feature=Jaxrpc Mapping File
-_UI_ServiceRef_jaxrpcMappingFile_feature_desc=The jaxrpc mapping file.
-_UI_ServiceRef_serviceInterface_feature=Service Interface
-_UI_ServiceRef_serviceInterface_feature_desc=The service interface.
-_UI_ServiceRef_serviceRefName_feature=Name
-_UI_ServiceRef_serviceRefName_feature_desc=The service reference name.
-_UI_ServiceRef_wsdlFile_feature=Wsdl File
-_UI_ServiceRef_wsdlFile_feature_desc=The .wsdl file.
-_UI_PortComponentRef_serviceEndpointInterface_feature=Service Endpoint Interface
-_UI_PortComponentRef_serviceEndpointInterface_feature_desc=The service endpoint interface.
-_UI_PortComponentRef_portComponentLink_feature=Link
-_UI_PortComponentRef_portComponentLink_feature_desc=The port component link.
-_UI_Handler_soapRoles_feature=Soap Roles
-_UI_Handler_soapRoles_feature_desc=The handler soap roles.
-_UI_Handler_portNames_feature=Port Names
-_UI_Handler_portNames_feature_desc=The handler port names.
-_UI_Handler_handlerName_feature=Handler Name
-_UI_Handler_handlerName_feature_desc=The handler name.
-_UI_Handler_handlerClass_feature=Handler Class
-_UI_Handler_handlerClass_feature_desc=The handler class.
-_UI_InitParam_paramName_feature=Name
-_UI_InitParam_paramName_feature_desc=The initial parameter name.
-_UI_InitParam_description_feature=Description
-_UI_InitParam_description_feature_desc=The initial parameter description.
-_UI_InitParam_paramValue_feature=Value
-_UI_InitParam_paramValue_feature_desc=The initial parameter value.
-_UI_JaxRPCMissingModel=Mapping file name unknown.
-
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml
deleted file mode 100644
index 3fcd0b4a6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!--  Dyanmic Content Provider extensions -->
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactory"
-            packageURI="webservice_client.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.WscommonItemProviderAdapterFactory"
-            packageURI="wscommon.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.provider.WscommonItemProviderAdapterFactory">
-      </adapterFactory>
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
-            packageURI="client.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactoryForClient">
-      </adapterFactory>
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
-            packageURI="webservice_client.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForWSClient">
-      </adapterFactory>
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
-            packageURI="ejb.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForEJB">
-      </adapterFactory>
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
-            packageURI="webapplication.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForWEB">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.webservice.provider.WsddItemProviderAdapterFactory"
-            packageURI="wsdd.xmi"
-            id="org.eclipse.jst.j2ee.internal.webservice.provider.WsddItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
-      <editModelExtension
-            editModelID="jst.web"
-            id="webservices.web.editModelextension">
-         <editModelResource
-               URI="WEB-INF/webservicesclient.xml">
-         </editModelResource>
-         <editModelResource
-               URI="WEB-INF/webservices.xml">
-         </editModelResource>
-      </editModelExtension>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
-      <editModelExtension
-            editModelID="jst.ejb"
-            id="webservices.ejb.editModelextension">
-         <editModelResource
-               URI="META-INF/webservicesclient.xml">
-         </editModelResource>
-         <editModelResource
-               URI="META-INF/webservices.xml">
-         </editModelResource>
-      </editModelExtension>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
-      <editModelExtension
-            editModelID="jst.appclient"
-            id="webservices.appclient.editModelextension">
-         <editModelResource
-               URI="META-INF/webservicesclient.xml">
-         </editModelResource>
-         <editModelResource
-               URI="META-INF/webservices.xml">
-         </editModelResource>
-      </editModelExtension>
-   </extension>
-
-   <extension
-         id="WSDLServiceHelper"
-         name="WSDLServiceHelper"
-         point="org.eclipse.jst.j2ee.WSDLServiceHelper">
-      <wsdlHelper
-            helperClass="org.eclipse.jst.j2ee.internal.webservice.helper.WSDLServiceHelperImpl">
-      </wsdlHelper>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.modulecore.resourceFactories">
-      <resourceFactory
-            class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
-            shortSegment="webservices.xml"/>
-      <resourceFactory
-            class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
-            shortSegment="webservices-temp.xml"/>
-      <resourceFactory
-            class="org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory"
-            shortSegment="webservicesclient.xml"/> 
-   </extension>
-      <extension
-         point="org.eclipse.wst.common.modulecore.resourceFactories">
-      <resourceFactory
-            class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
-            shortSegment="webservices.xml"/>
-      <resourceFactory
-            class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
-            shortSegment="webservices-temp.xml"/>
-      <resourceFactory
-            class="org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory"
-            shortSegment="webservicesclient.xml"/> 
-   </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml
deleted file mode 100644
index c58f27329..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.webservice"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties b/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties
deleted file mode 100644
index 8a7b0a3b4..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-ERR_HANDLER_DISPLAY_NAME_EMPTY=The handler name cannot be empty.
-ERR_HANDLER_DISPLAY_NAME_EXIST=The handler name already exists.
-ERR_HANDLER_PARAM_NAME_EMPTY=The handler initialization parameter name cannot be empty.
-ERR_HANDLER_NAMESPACE_URL_EMPTY=The handler name space URL cannot be empty.ServiceRefItemProvider.0=ServiceRef
-ERR_HANDLER_PARAM_NAME_EXISTS=The parameter name already exist.
-ERR_HANDLER_NAMESPACE_URL_EXISTS=The handler name space URL already exisit, please change name.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
deleted file mode 100644
index 5cf43b584..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
+++ /dev/null
@@ -1,133 +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.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-
-public class AdapterCCombo extends AdapterImpl implements SelectionListener {
-	private EObject eObject_;
-	private EStructuralFeature feature_;
-	private EStructuralFeature displayFeature_;
-	private CCombo combo_;
-	private String defaultDisplayString_;
-
-	public AdapterCCombo(EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo, String defaultDisplayString) {
-		super();
-		eObject_ = null;
-		feature_ = feature;
-		displayFeature_ = displayFeature;
-		combo_ = combo;
-		combo_.addSelectionListener(this);
-		defaultDisplayString_ = (defaultDisplayString != null) ? defaultDisplayString : ""; //$NON-NLS-1$
-	}
-
-	public AdapterCCombo(EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo) {
-		this(feature, displayFeature, combo, null);
-	}
-
-	public AdapterCCombo(EObject eObject, EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo) {
-		this(eObject, feature, displayFeature, combo, null);
-	}
-
-	public AdapterCCombo(EObject eObject, EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo, String defaultDisplayString) {
-		this(feature, displayFeature, combo, defaultDisplayString);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		Object notifier = msg.getNotifier();
-		if (notifier == eObject_) {
-			int type = msg.getEventType();
-			if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY)
-				populateCombo();
-		} else if (msg.getFeature() == displayFeature_)
-			populateCombo();
-	}
-
-	private void populateCombo() {
-		if (eObject_ != null) {
-			Object object = eObject_.eGet(feature_);
-			if (object != null) {
-				if (combo_.isDisposed())
-					return;
-				int selectionIndex = combo_.getSelectionIndex();
-				String text = combo_.getText();
-				combo_.removeAll();
-				if (object instanceof EList) {
-					EList eList = (EList) object;
-					for (Iterator it = eList.iterator(); it.hasNext();)
-						combo_.add(toDisplayString(((EObject) it.next()).eGet(displayFeature_)));
-				} else
-					combo_.add(toDisplayString(((EObject) object).eGet(displayFeature_)));
-				int newIndex = combo_.indexOf(text);
-				if (selectionIndex != -1 && newIndex != -1)
-					combo_.select(newIndex);
-				else
-					combo_.select(0);
-			}
-		}
-	}
-
-	private String toDisplayString(Object object) {
-		if (object != null) {
-			String s = object.toString();
-			if (s != null && s.length() > 0)
-				return s;
-		}
-		return defaultDisplayString_;
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-		//Do nothing
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		//Do nothing
-	}
-
-	public void adapt(EObject eObject) {
-		if (eObject_ != null) {
-			eObject_.eAdapters().remove(this);
-			combo_.removeAll();
-		}
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			Object object = eObject_.eGet(feature_);
-			if (object instanceof EList) {
-				for (Iterator it = ((EList) object).iterator(); it.hasNext();) {
-					Object item = it.next();
-					if (item instanceof EObject)
-						((EObject) item).eAdapters().add(this);
-				}
-			} else if (object instanceof EObject)
-				((EObject) object).eAdapters().add(this);
-			populateCombo();
-		}
-	}
-
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		if (combo_ != null && !combo_.isDisposed())
-			combo_.removeSelectionListener(this);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java
deleted file mode 100644
index faf03dad6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java
+++ /dev/null
@@ -1,199 +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.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterElement extends AdapterImpl implements ModifyListener {
-	private ArtifactEdit artifactEdit;
-	private EObject parent_;
-	private EClass childEClass_;
-	private EStructuralFeature childFeature_;
-	private boolean childNillable_;
-	private EStructuralFeature[] features_;
-	private boolean[] featuresNillable_;
-	private Text[] featuresTexts_;
-	private AdapterText[] featuresAdapters_;
-
-	public AdapterElement(ArtifactEdit anArtifactEdit, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, EStructuralFeature[] features, boolean[] featuresNillable, Text[] featuresTexts) {
-		super();
-		artifactEdit = anArtifactEdit;
-		parent_ = null;
-		childEClass_ = childEClass;
-		childFeature_ = childFeature;
-		childNillable_ = childNillable;
-		features_ = features;
-		featuresNillable_ = featuresNillable;
-		featuresTexts_ = featuresTexts;
-		addModifyListener();
-		featuresAdapters_ = new AdapterText[features_.length];
-		newAdapters(null);
-	}
-
-	public AdapterElement(ArtifactEdit anArtifactEdit, EObject parent, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, EStructuralFeature[] features, boolean[] featuresNillable, Text[] featuresTexts) {
-		this(anArtifactEdit, childEClass, childFeature, childNillable, features, featuresNillable, featuresTexts);
-		adapt(parent);
-	}
-
-	private void newAdapters(EObject eObject) {
-		if (eObject == null)
-			for (int i = 0; i < featuresAdapters_.length; i++)
-				featuresAdapters_[i] = new AdapterText(artifactEdit, features_[i], featuresTexts_[i], featuresNillable_[i]);
-		else
-			for (int i = 0; i < featuresAdapters_.length; i++)
-				featuresAdapters_[i] = new AdapterText(artifactEdit, eObject, features_[i], featuresTexts_[i], featuresNillable_[i]);
-	}
-
-	private void addModifyListener() {
-		for (int i = 0; i < featuresTexts_.length; i++)
-			featuresTexts_[i].addModifyListener(this);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && msg.getFeature() == childFeature_) {
-			EObject child = (EObject) parent_.eGet(childFeature_);
-			if (child == null && !childNillable_)
-				child = setChild();
-			for (int i = 0; i < featuresAdapters_.length; i++)
-				featuresAdapters_[i].adapt(child);
-		}
-	}
-
-	public void modifyText(ModifyEvent e) {
-		boolean isTextsNull = isTextsNull();
-		EObject child = (EObject) parent_.eGet(childFeature_);
-		boolean childCanBeRemoved = true;
-		if (child != null) {
-			Iterator allfeatures = childEClass_.getEAllStructuralFeatures().iterator();
-			while (allfeatures.hasNext()) {
-				EStructuralFeature thisFeature = (EStructuralFeature) allfeatures.next();
-				if (!adaptingFeature(thisFeature) && child.eIsSet(thisFeature)) {
-					childCanBeRemoved = false;
-					break;
-				}
-			}
-		}
-		if (isTextsNull && child != null && childNillable_ && childCanBeRemoved) {
-			disposeAdapters();
-			parent_.eAdapters().remove(this);
-			CommandRemoveElement command = new CommandRemoveElement(null, null, parent_, childFeature_);
-			artifactEdit.getContentModelRoot().eResource().setModified(true);
-			artifactEdit.getCommandStack().execute(command);
-			parent_.eAdapters().add(this);
-			newAdapters(null);
-		} else if (!isTextsNull && child == null) {
-			disposeAdapters();
-			parent_.eAdapters().remove(this);
-			child = createChild();
-			for (int i = 0; i < features_.length; i++) {
-				String text = featuresTexts_[i].getText();
-				if (text != null && text.length() > 0)
-					child.eSet(features_[i], text);
-			}
-			CommandAddElement command = new CommandAddElement(null, null, parent_, childFeature_, child);
-			artifactEdit.getContentModelRoot().eResource().setModified(true);
-			artifactEdit.getCommandStack().execute(command);
-			parent_.eAdapters().add(this);
-			newAdapters(child);
-		}
-	}
-
-	private boolean isTextsNull() {
-		for (int i = 0; i < featuresTexts_.length; i++) {
-			String text = featuresTexts_[i].getText();
-			if (text != null && text.length() > 0)
-				return false;
-		}
-		return true;
-	}
-
-	public void adapt(EObject eObject) {
-		if (parent_ != null)
-			parent_.eAdapters().remove(this);
-		parent_ = eObject;
-		EObject child = null;
-		if (parent_ != null) {
-			parent_.eAdapters().add(this);
-			child = (EObject) parent_.eGet(childFeature_);
-			if (child == null && !childNillable_)
-				child = setChild();
-		}
-		removeModifyListener();
-		for (int i = 0; i < featuresAdapters_.length; i++)
-			featuresAdapters_[i].adapt(child);
-		addModifyListener();
-	}
-
-	private EObject setChild() {
-		EObject child = createChild();
-		parent_.eAdapters().remove(this);
-		parent_.eSet(childFeature_, child);
-		parent_.eAdapters().add(this);
-		return child;
-	}
-
-	private EObject createChild() {
-		EFactory childFactory = childEClass_.getEPackage().getEFactoryInstance();
-		EObject child = childFactory.create(childEClass_);
-		for (int i = 0; i < features_.length; i++) {
-			if (!featuresNillable_[i])
-				child.eSet(features_[i], ""); //$NON-NLS-1$
-		}
-		return child;
-	}
-
-	public void dispose() {
-		if (parent_ != null)
-			parent_.eAdapters().remove(this);
-		disposeAdapters();
-		removeModifyListener();
-	}
-
-	private void disposeAdapters() {
-		for (int i = 0; i < featuresAdapters_.length; i++)
-			featuresAdapters_[i].dispose();
-	}
-
-	private void removeModifyListener() {
-		for (int i = 0; i < featuresTexts_.length; i++)
-			if (featuresTexts_[i] != null && !featuresTexts_[i].isDisposed())
-				featuresTexts_[i].removeModifyListener(this);
-	}
-
-	private boolean adaptingFeature(EStructuralFeature feature) {
-		if (features_ == null)
-			return false;
-
-		for (int i = 0; i < features_.length; i++) {
-			if (feature == features_[i]) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java
deleted file mode 100644
index a39e82236..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java
+++ /dev/null
@@ -1,162 +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.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterExpiresCCombo extends AdapterImpl implements ModifyListener {
-	private ArtifactEdit artifactEdit_;
-	private EObject eObject_;
-	private EStructuralFeature feature_;
-	private CCombo year_;
-	private CCombo month_;
-	private CCombo day_;
-	private CCombo hour_;
-	private CCombo minute_;
-	private CCombo second_;
-	private CCombo msecond_;
-	private boolean nillable_;
-
-	public AdapterExpiresCCombo(ArtifactEdit artifactEdit, EStructuralFeature feature, CCombo year, CCombo month, CCombo day, CCombo hour, CCombo minute, CCombo second, CCombo msecond, boolean nillable) {
-		super();
-		artifactEdit_ = artifactEdit;
-		eObject_ = null;
-		feature_ = feature;
-		year_ = year;
-		month_ = month;
-		day_ = day;
-		hour_ = hour;
-		minute_ = minute;
-		second_ = second;
-		msecond_ = msecond;
-		nillable_ = nillable;
-		year_.addModifyListener(this);
-		month_.addModifyListener(this);
-		day_.addModifyListener(this);
-		hour_.addModifyListener(this);
-		minute_.addModifyListener(this);
-		second_.addModifyListener(this);
-		msecond_.addModifyListener(this);
-	}
-
-	public AdapterExpiresCCombo(ArtifactEdit artifactEdit, EObject eObject, EStructuralFeature feature, CCombo year, CCombo month, CCombo day, CCombo hour, CCombo minute, CCombo second, CCombo msecond, boolean nillable) {
-		this(artifactEdit, feature, year, month, day, hour, minute, second, msecond, nillable);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
-			setText(msg.getNewStringValue());
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, expires(), nillable_);
-			artifactEdit_.getContentModelRoot().eResource().setModified(true);
-			artifactEdit_.getCommandStack().execute(command);
-		}
-	}
-
-	public String expires() {
-		return "P" + //$NON-NLS-1$
-					year_.getText() + "Y" + //$NON-NLS-1$
-					month_.getText() + "M" + //$NON-NLS-1$
-					day_.getText() + "DT" + //$NON-NLS-1$
-					hour_.getText() + "H" + //$NON-NLS-1$
-					minute_.getText() + "M" + //$NON-NLS-1$
-					second_.getText() + "." + //$NON-NLS-1$
-					msecond_.getText() + "S"; //$NON-NLS-1$
-	}
-
-	public void adapt(EObject eObject) {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			setText((String) eObject_.eGet(feature_));
-		}
-	}
-
-	public void adapt(EObject eObject, EStructuralFeature feature) {
-		feature_ = feature;
-		adapt(eObject);
-	}
-
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		if (year_ != null && !year_.isDisposed())
-			year_.removeModifyListener(this);
-		if (month_ != null && !month_.isDisposed())
-			month_.removeModifyListener(this);
-		if (day_ != null && !day_.isDisposed())
-			day_.removeModifyListener(this);
-		if (hour_ != null && !hour_.isDisposed())
-			hour_.removeModifyListener(this);
-		if (minute_ != null && !minute_.isDisposed())
-			minute_.removeModifyListener(this);
-		if (second_ != null && !second_.isDisposed())
-			second_.removeModifyListener(this);
-		if (msecond_ != null && !msecond_.isDisposed())
-			msecond_.removeModifyListener(this);
-
-	}
-
-	private boolean syncTextAndModel() {
-		if (eObject_ != null) {
-			String modelValue = (String) eObject_.eGet(feature_);
-			String value = expires();
-			if (modelValue == null || modelValue.length() <= 0)
-				return !(value == null || value.length() <= 0);
-			return !(modelValue.equals(value));
-		}
-		return false;
-	}
-
-	private void setText(String modelValue) {
-		if (modelValue != null) {
-			int y = modelValue.indexOf("Y"); //$NON-NLS-1$
-			int mo = modelValue.indexOf("M"); //$NON-NLS-1$
-			int d = modelValue.indexOf("D"); //$NON-NLS-1$
-			int h = modelValue.indexOf("H"); //$NON-NLS-1$
-			int mi = modelValue.lastIndexOf("M"); //$NON-NLS-1$
-			int s = modelValue.indexOf("."); //$NON-NLS-1$
-			int ms = modelValue.indexOf("S"); //$NON-NLS-1$
-
-			if (!year_.isDisposed() && y > 0)
-				year_.setText(modelValue.substring(1, y));
-			if (!month_.isDisposed() && mo > 0)
-				month_.setText(modelValue.substring(y + 1, mo));
-			if (!day_.isDisposed() && d > 0)
-				day_.setText(modelValue.substring(mo + 1, d));
-			if (!hour_.isDisposed() && h > 0)
-				hour_.setText(modelValue.substring(d + 2, h));
-			if (!minute_.isDisposed() && mi > 0)
-				minute_.setText(modelValue.substring(h + 1, mi));
-			if (!second_.isDisposed() && s > 0)
-				second_.setText(modelValue.substring(mi + 1, s));
-			if (!msecond_.isDisposed() && ms > 0)
-				msecond_.setText(modelValue.substring(s + 1, ms));
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
deleted file mode 100644
index a3ab5bff8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.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.webservice.adapter;
-
-/*
- * import org.eclipse.emf.ecore.EObject;
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyHandlerClassText;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterHandlerClassText extends AdapterImpl implements ModifyListener {
-	protected ArtifactEdit artifactEdit;
-	protected Handler eObject_;
-	protected EStructuralFeature feature_;
-	protected Text text_;
-	protected boolean nillable_;
-
-	public AdapterHandlerClassText(ArtifactEdit anArtifactEdit, Text text) {
-		super();
-		artifactEdit = anArtifactEdit;
-		eObject_ = null;
-		feature_ = Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass();
-		text_ = text;
-		nillable_ = false;
-		text_.addModifyListener(this);
-	}
-
-	public AdapterHandlerClassText(ArtifactEdit anArtifactEdit, Handler eObject, Text text) {
-		this(anArtifactEdit, text);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
-			String newClassName = eObject_.getHandlerClass().getQualifiedNameForReflection();
-			setText(newClassName);
-		}
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			CommandModifyHandlerClassText command = new CommandModifyHandlerClassText(null, null, eObject_, text_.getText());
-			if (artifactEdit != null) {
-				artifactEdit.getContentModelRoot().eResource().setModified(true);
-				artifactEdit.getCommandStack().execute(command);
-			}
-		}
-	}
-
-	public void adapt(Handler eObject) {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			String newClassName = eObject_.getHandlerClass().getQualifiedNameForReflection();
-			setText(newClassName);
-		} else
-			setText(null);
-	}
-
-	/*
-	 * public void adapt(EObject eObject, EStructuralFeature feature) { feature_ = feature;
-	 * adapt(eObject); }
-	 */
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		if (text_ != null && !text_.isDisposed())
-			text_.removeModifyListener(this);
-	}
-
-	protected boolean syncTextAndModel() {
-		if (eObject_ != null) {
-			String modelValue = eObject_.getHandlerClass().getQualifiedNameForReflection();
-			String textValue = text_.getText();
-			if (modelValue == null || modelValue.length() <= 0)
-				return !(textValue == null || textValue.length() <= 0);
-			return !(modelValue.equals(textValue));
-		}
-		return false;
-	}
-
-	private void setText(String text) {
-		if (!text_.isDisposed()) {
-			String currText = text_.getText();
-			if (text == null || text.length() <= 0) {
-				if (currText != null && currText.length() > 0)
-					text_.setText(""); //$NON-NLS-1$
-			} else if (!text.equals(currText))
-				text_.setText(text);
-		}
-	}
-
-	/**
-	 * @return Returns the j2eeEditModel.
-	 */
-	public ArtifactEdit getArtifactEdit() {
-		return artifactEdit;
-	}
-
-	/**
-	 * @param editModel
-	 *            The j2eeEditModel to set.
-	 */
-	public void setArtifactEdit(ArtifactEdit anArtifactEdit) {
-		artifactEdit = anArtifactEdit;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java
deleted file mode 100644
index 729d0d416..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java
+++ /dev/null
@@ -1,89 +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.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class AdapterLayer extends AdapterImpl {
-	private EObject parent_;
-	private EStructuralFeature feature_;
-	private EClass childEClass_;
-	private EObject child_;
-
-	public AdapterLayer(EObject parent, EStructuralFeature feature, EClass childEClass) {
-		super();
-		parent_ = parent;
-		feature_ = feature;
-		childEClass_ = childEClass;
-		adapt(parent_);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY)
-			adaptParent();
-	}
-
-	public void adapt(EObject eObject) {
-		if (child_ != null)
-			child_.eAdapters().remove(this);
-		parent_ = eObject;
-		adaptChild();
-		if (child_ != null)
-			child_.eAdapters().add(this);
-	}
-
-	public void dispose() {
-		if (child_ != null)
-			child_.eAdapters().remove(this);
-	}
-
-	public EObject getChild() {
-		return child_;
-	}
-
-	private void adaptChild() {
-		if (parent_ != null) {
-			Object object = parent_.eGet(feature_);
-			if (object == null)
-				child_ = childEClass_.getEPackage().getEFactoryInstance().create(childEClass_);
-			else
-				child_ = (EObject) object;
-		} else
-			child_ = null;
-	}
-
-	private void adaptParent() {
-		if (parent_ != null && child_ != null) {
-			EList childFeatures = childEClass_.getEAllStructuralFeatures();
-			for (Iterator it = childFeatures.iterator(); it.hasNext();) {
-				EStructuralFeature childFeature = (EStructuralFeature) it.next();
-				boolean isFeatureSet;
-				Object grandchild = child_.eGet(childFeature);
-				if (grandchild != null && grandchild instanceof EList)
-					isFeatureSet = !((EList) grandchild).isEmpty();
-				else
-					isFeatureSet = child_.eIsSet(childFeature);
-				if (isFeatureSet) {
-					parent_.eSet(feature_, child_);
-					return;
-				}
-			}
-			parent_.eUnset(feature_);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java
deleted file mode 100644
index 831d04d98..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java
+++ /dev/null
@@ -1,116 +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 Jan 21, 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.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifySEI;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-/**
- * @author rsinha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AdapterPCRefText extends AdapterText {
-	public AdapterPCRefText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
-		super(anArtifactEdit, feature, text, nillable);
-	}
-
-
-	public AdapterPCRefText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
-		super(anArtifactEdit, eObject, feature, text, nillable);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
-			Object obj = eObject_.eGet(feature_);
-			String objStringValue = ""; //$NON-NLS-1$
-			if (obj instanceof String) {
-				objStringValue = (String) obj;
-			} else if (obj instanceof JavaClass) {
-				JavaClass javaClass = (JavaClass) obj;
-				objStringValue = javaClass.getQualifiedNameForReflection();
-			}
-			setText(objStringValue);
-		}
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			//Handle PortComponentRef_ServiceEndpointInterface feature in a special way.
-			String SEIFeatureName = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface().getName();
-			if ((eObject_ instanceof PortComponentRef) && (feature_.getName().equals(SEIFeatureName))) {
-				CommandModifySEI command = new CommandModifySEI(null, null, (PortComponentRef) eObject_, text_.getText(), nillable_);
-				artifactEdit.getContentModelRoot().eResource().setModified(true);
-				artifactEdit.getCommandStack().execute(command);
-			} else {
-				CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
-				artifactEdit.getContentModelRoot().eResource().setModified(true);
-				artifactEdit.getCommandStack().execute(command);
-			}
-		}
-	}
-
-	public void adapt(EObject eObject) {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			Object obj = eObject_.eGet(feature_);
-			String objStringValue = ""; //$NON-NLS-1$
-			if (obj instanceof String) {
-				objStringValue = (String) obj;
-			} else if (obj instanceof JavaClass) {
-				JavaClass javaClass = (JavaClass) obj;
-				objStringValue = javaClass.getQualifiedNameForReflection();
-			}
-			setText(objStringValue);
-		} else
-			setText(null);
-	}
-
-	protected boolean syncTextAndModel() {
-		if (eObject_ != null) {
-			String modelValue;
-			//Handle PortComponentRef_ServiceEndpointInterface feature in a special way.
-			String SEIFeatureName = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface().getName();
-			if ((eObject_ instanceof PortComponentRef) && (feature_.getName().equals(SEIFeatureName))) {
-				modelValue = ((PortComponentRef) eObject_).getServiceEndpointInterface().getQualifiedNameForReflection();
-			} else {
-				modelValue = (String) eObject_.eGet(feature_);
-			}
-			String textValue = text_.getText();
-			if (modelValue == null || modelValue.length() <= 0)
-				return !(textValue == null || textValue.length() <= 0);
-			return !(modelValue.equals(textValue));
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java
deleted file mode 100644
index 6a030e013..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java
+++ /dev/null
@@ -1,247 +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.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-/**
- * Generic eSet's will not work when setting namespaceURIs on QName's so AdapterElement cannot be
- * used when the child is a QName. This class is very similar AdapterElement but has special
- * behaviour for handling QName's.
- */
-public class AdapterQNameElement extends AdapterImpl implements ModifyListener {
-
-	private ArtifactEdit artifactEdit;
-	private EObject parent_;
-	private EClass childEClass_;
-	private EStructuralFeature childFeature_;
-	private boolean childNillable_;
-	private EStructuralFeature[] features_;
-	private boolean[] featuresNillable_;
-	private Text[] featuresTexts_;
-	private AdapterText[] featuresAdapters_;
-
-	/**
-	 *  
-	 */
-	public AdapterQNameElement(ArtifactEdit anArtifactEdit, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, Text nsURIText, Text localPartText) {
-		super();
-		artifactEdit = anArtifactEdit;
-		parent_ = null;
-		childEClass_ = childEClass;
-		childFeature_ = childFeature;
-		childNillable_ = childNillable;
-		CommonPackage commonPKG = CommonPackage.eINSTANCE;
-		// Set up QName features
-		features_ = new EStructuralFeature[2];
-		features_[0] = commonPKG.getQName_NamespaceURI();
-		features_[1] = commonPKG.getQName_LocalPart();
-		featuresNillable_ = new boolean[2];
-		featuresNillable_[0] = false;
-		featuresNillable_[1] = false;
-		featuresTexts_ = new Text[2];
-		featuresTexts_[0] = nsURIText;
-		featuresTexts_[1] = localPartText;
-		addModifyListener();
-		featuresAdapters_ = new AdapterText[features_.length];
-		newAdapters(null);
-
-	}
-
-	/**
-	 *  
-	 */
-	public AdapterQNameElement(ArtifactEdit anArtifactEdit, EObject parent, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, Text nsURIText, Text localPartText) {
-		this(anArtifactEdit, childEClass, childFeature, childNillable, nsURIText, localPartText);
-		adapt(parent);
-	}
-
-	private void newAdapters(EObject eObject) {
-		if (eObject == null) {
-			featuresAdapters_[0] = new AdapterQNameText(artifactEdit, features_[0], featuresTexts_[0], featuresNillable_[0]);
-			featuresAdapters_[1] = new AdapterText(artifactEdit, features_[1], featuresTexts_[1], featuresNillable_[1]);
-		} else {
-			featuresAdapters_[0] = new AdapterQNameText(artifactEdit, eObject, features_[0], featuresTexts_[0], featuresNillable_[0]);
-			featuresAdapters_[1] = new AdapterText(artifactEdit, eObject, features_[1], featuresTexts_[1], featuresNillable_[1]);
-		}
-	}
-
-	private void addModifyListener() {
-		for (int i = 0; i < featuresTexts_.length; i++)
-			featuresTexts_[i].addModifyListener(this);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && msg.getFeature() == childFeature_) {
-			EObject child = (EObject) parent_.eGet(childFeature_);
-			if (child == null && !childNillable_)
-				child = setChild();
-			for (int i = 0; i < featuresAdapters_.length; i++)
-				featuresAdapters_[i].adapt(child);
-		}
-	}
-
-	public void modifyText(ModifyEvent e) {
-		boolean isTextsNull = isTextsNull();
-		EObject child = (EObject) parent_.eGet(childFeature_);
-		boolean childCanBeRemoved = true;
-		if (child != null) {
-			Iterator allfeatures = childEClass_.getEAllStructuralFeatures().iterator();
-			while (allfeatures.hasNext()) {
-				EStructuralFeature thisFeature = (EStructuralFeature) allfeatures.next();
-				if (!adaptingFeature(thisFeature) && child.eIsSet(thisFeature)) {
-					childCanBeRemoved = false;
-					break;
-				}
-			}
-		}
-		if (isTextsNull && child != null && childNillable_ && childCanBeRemoved) {
-			disposeAdapters();
-			parent_.eAdapters().remove(this);
-			CommandRemoveElement command = new CommandRemoveElement(null, null, parent_, childFeature_);
-			artifactEdit.getContentModelRoot().eResource().setModified(true);
-			artifactEdit.getCommandStack().execute(command);
-			parent_.eAdapters().add(this);
-			newAdapters(null);
-		} else if (!isTextsNull && child == null) {
-			disposeAdapters();
-			parent_.eAdapters().remove(this);
-			child = createChild();
-			setFeaturesOnChild(child);
-			/*
-			 * replaced by setFeaturesOnChild for (int i = 0; i < features_.length; i++) { String
-			 * text = featuresTexts_[i].getText(); if (text != null && text.length() > 0)
-			 * child.eSet(features_[i], text); }
-			 */
-			CommandAddElement command = new CommandAddElement(null, null, parent_, childFeature_, child);
-			artifactEdit.getContentModelRoot().eResource().setModified(true);
-			artifactEdit.getCommandStack().execute(command);
-			parent_.eAdapters().add(this);
-			newAdapters(child);
-		}
-	}
-
-	private boolean isTextsNull() {
-		for (int i = 0; i < featuresTexts_.length; i++) {
-			String text = featuresTexts_[i].getText();
-			if (text != null && text.length() > 0)
-				return false;
-		}
-		return true;
-	}
-
-	public void adapt(EObject eObject) {
-		if (parent_ != null)
-			parent_.eAdapters().remove(this);
-		parent_ = eObject;
-		EObject child = null;
-		if (parent_ != null) {
-			parent_.eAdapters().add(this);
-			child = (EObject) parent_.eGet(childFeature_);
-			if (child == null && !childNillable_)
-				child = setChild();
-		}
-		removeModifyListener();
-		for (int i = 0; i < featuresAdapters_.length; i++)
-			featuresAdapters_[i].adapt(child);
-		addModifyListener();
-	}
-
-	private EObject setChild() {
-		EObject child = createChild();
-		parent_.eAdapters().remove(this);
-		parent_.eSet(childFeature_, child);
-		parent_.eAdapters().add(this);
-		return child;
-	}
-
-	private EObject createChild() {
-		EFactory childFactory = childEClass_.getEPackage().getEFactoryInstance();
-		EObject child = childFactory.create(childEClass_);
-		for (int i = 0; i < features_.length; i++) {
-			if (!featuresNillable_[i])
-				child.eSet(features_[i], ""); //$NON-NLS-1$
-		}
-		return child;
-	}
-
-	public void dispose() {
-		if (parent_ != null)
-			parent_.eAdapters().remove(this);
-		disposeAdapters();
-		removeModifyListener();
-	}
-
-	private void disposeAdapters() {
-		for (int i = 0; i < featuresAdapters_.length; i++)
-			featuresAdapters_[i].dispose();
-	}
-
-	private void removeModifyListener() {
-		for (int i = 0; i < featuresTexts_.length; i++)
-			if (featuresTexts_[i] != null && !featuresTexts_[i].isDisposed())
-				featuresTexts_[i].removeModifyListener(this);
-	}
-
-	private boolean adaptingFeature(EStructuralFeature feature) {
-		if (features_ == null)
-			return false;
-
-		for (int i = 0; i < features_.length; i++) {
-			if (feature == features_[i]) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	protected void setFeaturesOnChild(EObject child) {
-		if (child instanceof QName) //This will always be true.
-		{
-			QName qname = (QName) child;
-			String namespaceURIValue = featuresTexts_[0].getText();
-			String localPartValue = featuresTexts_[1].getText();
-			if (namespaceURIValue == null || namespaceURIValue.length() == 0) {
-				//Just set the local part
-				if (localPartValue != null && localPartValue.length() > 0)
-					qname.setLocalPart(localPartValue);
-
-			} else {
-				if (localPartValue == null)
-					localPartValue = ""; //$NON-NLS-1$
-
-				//Set namespace and local part using QNameHelper
-				QNameHelper.setQNameValue(qname, namespaceURIValue, localPartValue);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java
deleted file mode 100644
index 60968f245..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java
+++ /dev/null
@@ -1,62 +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.webservice.adapter;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyNSURI;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-
-
-/**
- * Since generic eSet's will not work for setting QName namespaceURI's, this subclass's purpose is
- * to override the behaviour when necessary.
- */
-public class AdapterQNameText extends AdapterText {
-
-	public AdapterQNameText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
-		super(anArtifactEdit, feature, text, nillable);
-	}
-
-
-	public AdapterQNameText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
-		super(anArtifactEdit, eObject, feature, text, nillable);
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			//Handle QName_NamespaceURI feature in a special way.
-			String namespaceFeatureName = CommonPackage.eINSTANCE.getQName_NamespaceURI().getName();
-			if ((eObject_ instanceof QName) && (feature_.getName().equals(namespaceFeatureName))) {
-				CommandModifyNSURI command = new CommandModifyNSURI(null, null, (QName) eObject_, text_.getText(), nillable_);
-				if (artifactEdit != null) {
-					artifactEdit.getContentModelRoot().eResource().setModified(true);
-					artifactEdit.getCommandStack().execute(command);
-				} 
-			} else {
-				CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
-				if (artifactEdit != null) {
-					artifactEdit.getContentModelRoot().eResource().setModified(true);
-					artifactEdit.getCommandStack().execute(command);
-				} 
-			}
-
-
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
deleted file mode 100644
index 4c1184cc8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.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.webservice.adapter;
-
-/*
- * import org.eclipse.emf.ecore.EObject;
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyServiceInterfaceText;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterServiceInterfaceText extends AdapterImpl implements ModifyListener {
-	protected ArtifactEdit artifactEdit;
-	protected ServiceRef eObject_;
-	protected EStructuralFeature feature_;
-	protected Text text_;
-	protected boolean nillable_;
-
-	public AdapterServiceInterfaceText(ArtifactEdit anArtifactEdit, Text text) {
-		super();
-		artifactEdit = anArtifactEdit;
-		eObject_ = null;
-		feature_ = Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface();
-		text_ = text;
-		nillable_ = false;
-		text_.addModifyListener(this);
-	}
-
-	public AdapterServiceInterfaceText(ArtifactEdit anArtifactEdit, ServiceRef eObject, Text text) {
-		this(anArtifactEdit, text);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
-			String newClassName = eObject_.getServiceInterface().getQualifiedNameForReflection();
-			setText(newClassName);
-		}
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			CommandModifyServiceInterfaceText command = new CommandModifyServiceInterfaceText(null, null, eObject_, text_.getText());
-			artifactEdit.getContentModelRoot().eResource().setModified(true);
-			artifactEdit.getCommandStack().execute(command);
-		}
-	}
-
-	public void adapt(ServiceRef eObject) {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			if (eObject_.getServiceInterface() != null) {
-				String newClassName = eObject_.getServiceInterface().getQualifiedNameForReflection();
-				setText(newClassName);
-			} else {
-				setText(null);
-			}
-		} else
-			setText(null);
-	}
-
-	/*
-	 * public void adapt(EObject eObject, EStructuralFeature feature) { feature_ = feature;
-	 * adapt(eObject); }
-	 */
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		if (text_ != null && !text_.isDisposed())
-			text_.removeModifyListener(this);
-	}
-
-	protected boolean syncTextAndModel() {
-		if (eObject_ != null) {
-			String modelValue = null;
-			if (eObject_.getServiceInterface() != null)
-				modelValue = eObject_.getServiceInterface().getQualifiedNameForReflection();
-			String textValue = text_.getText();
-			if (modelValue == null || modelValue.length() <= 0)
-				return !(textValue == null || textValue.length() <= 0);
-			return !(modelValue.equals(textValue));
-		}
-		return false;
-	}
-
-	private void setText(String text) {
-		if (!text_.isDisposed()) {
-			String currText = text_.getText();
-			if (text == null || text.length() <= 0) {
-				if (currText != null && currText.length() > 0)
-					text_.setText(""); //$NON-NLS-1$
-			} else if (!text.equals(currText))
-				text_.setText(text);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java
deleted file mode 100644
index 3fdd4ddf7..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java
+++ /dev/null
@@ -1,123 +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.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterText extends AdapterImpl implements ModifyListener {
-	protected EObject eObject_;
-	protected EStructuralFeature feature_;
-	protected Text text_;
-	protected boolean nillable_;
-	protected ArtifactEdit artifactEdit;
-
-	public AdapterText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
-		super();
-		artifactEdit = anArtifactEdit;
-		eObject_ = null;
-		feature_ = feature;
-		text_ = text;
-		nillable_ = nillable;
-		text_.addModifyListener(this);
-	}
-
-	public AdapterText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
-		this(anArtifactEdit, feature, text, nillable);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
-			setText(msg.getNewStringValue());
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
-			if (artifactEdit != null) {
-				artifactEdit.getContentModelRoot().eResource().setModified(true);
-				artifactEdit.getCommandStack().execute(command);
-			}
-		}
-	}
-
-	public void adapt(EObject eObject) {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			setText((String) eObject_.eGet(feature_));
-		} else
-			setText(null);
-	}
-
-	public void adapt(EObject eObject, EStructuralFeature feature) {
-		feature_ = feature;
-		adapt(eObject);
-	}
-
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		if (text_ != null && !text_.isDisposed())
-			text_.removeModifyListener(this);
-	}
-
-	protected boolean syncTextAndModel() {
-		if (eObject_ != null) {
-			String modelValue = (String) eObject_.eGet(feature_);
-			String textValue = text_.getText();
-			if (modelValue == null || modelValue.length() <= 0)
-				return !(textValue == null || textValue.length() <= 0);
-			return !(modelValue.equals(textValue));
-		}
-		return false;
-	}
-
-	protected void setText(String text) {
-		if (!text_.isDisposed()) {
-			String currText = text_.getText();
-			if (text == null || text.length() <= 0) {
-				if (currText != null && currText.length() > 0)
-					text_.setText(""); //$NON-NLS-1$
-			} else if (!text.equals(currText))
-				text_.setText(text);
-		}
-	}
-
-	/**
-	 * @return Returns the j2eeEditModel.
-	 */
-	public ArtifactEdit getArtifactEdit() {
-		return artifactEdit;
-	}
-
-	/**
-	 * @param editModel
-	 *            The j2eeEditModel to set.
-	 */
-	public void setArtifactEdit(ArtifactEdit anArtifactEdit) {
-		artifactEdit = anArtifactEdit;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java
deleted file mode 100644
index 63822fe89..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java
+++ /dev/null
@@ -1,105 +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.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterTextCCombo extends AdapterImpl implements ModifyListener {
-	private ArtifactEdit artifactEdit_;
-	private EObject eObject_;
-	private EStructuralFeature feature_;
-	private CCombo text_;
-	private boolean nillable_;
-
-	public AdapterTextCCombo(ArtifactEdit artifactEdit, EStructuralFeature feature, CCombo text, boolean nillable) {
-		super();
-		artifactEdit_ = artifactEdit;
-		eObject_ = null;
-		feature_ = feature;
-		text_ = text;
-		nillable_ = nillable;
-		text_.addModifyListener(this);
-	}
-
-	public AdapterTextCCombo(ArtifactEdit artifactEdit, EObject eObject, EStructuralFeature feature, CCombo text, boolean nillable) {
-		this(artifactEdit, feature, text, nillable);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
-			setText(msg.getNewStringValue());
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (syncTextAndModel()) {
-			CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
-			artifactEdit_.getContentModelRoot().eResource().setModified(true);
-			artifactEdit_.getCommandStack().execute(command);
-		}
-	}
-
-	public void adapt(EObject eObject) {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			setText((String) eObject_.eGet(feature_));
-		} else
-			setText(null);
-	}
-
-	public void adapt(EObject eObject, EStructuralFeature feature) {
-		feature_ = feature;
-		adapt(eObject);
-	}
-
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		if (text_ != null && !text_.isDisposed())
-			text_.removeModifyListener(this);
-	}
-
-	private boolean syncTextAndModel() {
-		if (eObject_ != null) {
-			String modelValue = (String) eObject_.eGet(feature_);
-			String textValue = text_.getText();
-			if (modelValue == null || modelValue.length() <= 0)
-				return !(textValue == null || textValue.length() <= 0);
-			return !(modelValue.equals(textValue));
-		}
-		return false;
-	}
-
-	private void setText(String text) {
-		if (!text_.isDisposed()) {
-			String currText = text_.getText();
-			if (text == null || text.length() <= 0) {
-				if (currText != null && currText.length() > 0)
-					text_.setText(""); //$NON-NLS-1$
-			} else if (!text.equals(currText))
-				text_.setText(text);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java
deleted file mode 100644
index 20629a0ca..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java
+++ /dev/null
@@ -1,147 +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.webservice.adapter;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.Viewer;
-
-public class AdapterViewer extends AdapterImpl {
-	private EObject eObject_;
-	private Viewer viewer_;
-	private ArrayList features_;
-
-	public AdapterViewer(Viewer viewer) {
-		super();
-		eObject_ = null;
-		viewer_ = viewer;
-		features_ = new ArrayList();
-	}
-
-	public AdapterViewer(EObject eObject, Viewer viewer) {
-		this(viewer);
-		adapt(eObject);
-	}
-
-	public void notifyChanged(Notification msg) {
-		int type = msg.getEventType();
-		if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY) {
-			Object notifier = msg.getNotifier();
-			if (notifier == eObject_) {
-				if (type == Notification.SET || type == Notification.ADD || type == Notification.ADD_MANY)
-					internalAdaptFeature((EStructuralFeature) msg.getFeature());
-				else if (type == Notification.UNSET || type == Notification.REMOVE || type == Notification.REMOVE_MANY) {
-					Object object = msg.getOldValue();
-					if (object instanceof EObject)
-						((EObject) object).eAdapters().remove(this);
-					else if (object instanceof EList) {
-						EList eList = (EList) object;
-						for (int i = 0; i < eList.size(); i++) {
-							Object item = eList.get(i);
-							if (item instanceof EObject)
-								((EObject) item).eAdapters().remove(this);
-						}
-					}
-				}
-			}
-			viewer_.refresh();
-		}
-	}
-
-	public void adapt(EObject eObject) {
-		if (eObject_ != null) {
-			eObject_.eAdapters().remove(this);
-			unadaptAllCachedFeature();
-		}
-		eObject_ = eObject;
-		if (eObject_ != null) {
-			eObject_.eAdapters().add(this);
-			readaptAllCachedFeature();
-		}
-		viewer_.refresh();
-	}
-
-	public void adaptFeature(EStructuralFeature feature) {
-		if (!features_.contains(feature)) {
-			features_.add(feature);
-			internalAdaptFeature(feature);
-		}
-	}
-
-	private void internalAdaptFeature(EStructuralFeature feature) {
-		if (eObject_ != null) {
-			Object featureObject = eObject_.eGet(feature);
-			if (featureObject instanceof EObject) {
-				EList eAdapters = ((EObject) featureObject).eAdapters();
-				if (!eAdapters.contains(this))
-					eAdapters.add(this);
-			} else if (featureObject instanceof EList) {
-				EList eList = (EList) featureObject;
-				for (int i = 0; i < eList.size(); i++) {
-					Object object = eList.get(i);
-					if (object instanceof EObject) {
-						EList eAdapters = ((EObject) object).eAdapters();
-						if (!eAdapters.contains(this))
-							eAdapters.add(this);
-					}
-				}
-			}
-		}
-	}
-
-	private void readaptAllCachedFeature() {
-		EStructuralFeature[] features = new EStructuralFeature[features_.size()];
-		for (int i = 0; i < features.length; i++)
-			features[i] = (EStructuralFeature) features_.get(i);
-		for (int i = 0; i < features.length; i++)
-			internalAdaptFeature(features[i]);
-	}
-
-	public void unadaptFeature(EStructuralFeature feature) {
-		features_.remove(feature);
-		internalUnadaptFeature(feature);
-	}
-
-	private void internalUnadaptFeature(EStructuralFeature feature) {
-		if (eObject_ != null) {
-			Object featureObject = eObject_.eGet(feature);
-			if (featureObject instanceof EObject)
-				((EObject) featureObject).eAdapters().remove(this);
-			else if (featureObject instanceof EList) {
-				EList eList = (EList) featureObject;
-				for (int i = 0; i < eList.size(); i++) {
-					Object object = eList.get(i);
-					if (object instanceof EObject)
-						((EObject) object).eAdapters().remove(this);
-				}
-			}
-		}
-	}
-
-	private void unadaptAllCachedFeature() {
-		EStructuralFeature[] features = new EStructuralFeature[features_.size()];
-		for (int i = 0; i < features.length; i++)
-			features[i] = (EStructuralFeature) features_.get(i);
-		for (int i = 0; i < features.length; i++)
-			internalUnadaptFeature(features[i]);
-	}
-
-	public void dispose() {
-		if (eObject_ != null)
-			eObject_.eAdapters().remove(this);
-		unadaptAllCachedFeature();
-		features_ = null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java
deleted file mode 100644
index cdba3094d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java
+++ /dev/null
@@ -1,39 +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.webservice.adapter;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class AdapterViewerItem {
-	private EList eObjects_;
-	private EStructuralFeature feature_;
-
-	public AdapterViewerItem(EList eObjects, EStructuralFeature feature) {
-		eObjects_ = eObjects;
-		feature_ = feature;
-	}
-
-	public AdapterViewerItem(EObject eObject, EStructuralFeature feature) {
-		eObjects_ = new BasicEList();
-		eObjects_.add(eObject);
-		feature_ = feature;
-	}
-
-	public EList getEObjectList() {
-		return eObjects_;
-	}
-
-	public EStructuralFeature getEStructuralFeature() {
-		return feature_;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
deleted file mode 100644
index 6da963b08..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
+++ /dev/null
@@ -1,193 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddClientHandler extends AbstractCommand {
-	private ServiceRef parent_;
-	private Handler newChild_;
-
-	//private boolean oldChildSet_;
-
-	public CommandAddClientHandler(String label, String description, ServiceRef parent, Handler newChild) {
-		super(label, description);
-		parent_ = parent;
-		newChild_ = newChild;
-	}
-
-	public CommandAddClientHandler(String label, String description, ServiceRef parent, String handlerName, JavaClass handlerClass) {
-		super(label, description);
-		parent_ = parent;
-		newChild_ = createNewHandler(handlerName, handlerClass);
-	}
-
-	public CommandAddClientHandler(String label, String description, ServiceRef parent, String handlerName, String handlerClassName) {
-		super(label, description);
-		parent_ = parent;
-		JavaClass handlerClass = JavaRefFactory.eINSTANCE.createClassRef(handlerClassName);
-		newChild_ = createNewHandler(handlerName, handlerClass);
-	}
-
-	private Handler createNewHandler(String handlerName, JavaClass handlerClass) {
-		Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
-		Handler newChild = factory.createHandler();
-		newChild.setHandlerName(handlerName);
-		newChild.setHandlerClass(handlerClass);
-		return newChild;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		parent_.getHandlers().add(newChild_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		parent_.getHandlers().remove(newChild_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-
-	public Object getAddedObject() {
-		return newChild_;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
deleted file mode 100644
index 34a7ffcb1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
+++ /dev/null
@@ -1,207 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandAddElement extends AbstractCommand {
-	private EObject parent_;
-	private EStructuralFeature childFeature_;
-	private Object newChild_;
-	private Object oldChild_;
-	private boolean oldChildSet_;
-
-	public CommandAddElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild) {
-		super(label, description);
-		parent_ = parent;
-		childFeature_ = childFeature;
-		newChild_ = newChild;
-		oldChild_ = null;
-		oldChildSet_ = true;
-	}
-
-	public CommandAddElement(String label, String description, EObject parent, EClass childEClass, EStructuralFeature childFeature, EStructuralFeature[] childProperties, Object[] propertyValues) {
-		super(label, description);
-		parent_ = parent;
-		childFeature_ = childFeature;
-		newChild_ = createNewChild(childEClass, (childProperties != null) ? childProperties : new EStructuralFeature[0], (propertyValues != null) ? propertyValues : new Object[0]);
-		oldChild_ = null;
-		oldChildSet_ = true;
-	}
-
-	private Object createNewChild(EClass childEClass, EStructuralFeature[] childProperties, Object[] propertyValues) {
-		EFactory eFactory = childEClass.getEPackage().getEFactoryInstance();
-		EObject newChild = eFactory.create(childEClass);
-		if (newChild != null)
-			for (int i = 0; i < childProperties.length; i++)
-				newChild.eSet(childProperties[i], propertyValues[i]);
-		return newChild;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		if (childFeature_.isMany()) {
-			if (newChild_ != null)
-				((EList) parent_.eGet(childFeature_)).add(newChild_);
-		} else {
-			oldChild_ = parent_.eGet(childFeature_);
-			oldChildSet_ = parent_.eIsSet(childFeature_);
-			parent_.eSet(childFeature_, newChild_);
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (childFeature_.isMany()) {
-			if (newChild_ != null)
-				((EList) parent_.eGet(childFeature_)).remove(newChild_);
-		} else {
-			if (oldChildSet_)
-				parent_.eSet(childFeature_, oldChild_);
-			else
-				parent_.eUnset(childFeature_);
-		}
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-
-	public Object getAddedObject() {
-		return newChild_;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
deleted file mode 100644
index b33c0ff60..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
+++ /dev/null
@@ -1,193 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddPortComponentRef extends AbstractCommand {
-	private ServiceRef parent_;
-	private PortComponentRef newChild_;
-
-	//private boolean oldChildSet_;
-
-	public CommandAddPortComponentRef(String label, String description, ServiceRef parent, PortComponentRef newChild) {
-		super(label, description);
-		parent_ = parent;
-		newChild_ = newChild;
-	}
-
-	public CommandAddPortComponentRef(String label, String description, ServiceRef parent, String portComponentLink, JavaClass serviceEndpointInterface) {
-		super(label, description);
-		parent_ = parent;
-		newChild_ = createNewPortComponentRef(portComponentLink, serviceEndpointInterface);
-	}
-
-	public CommandAddPortComponentRef(String label, String description, ServiceRef parent, String portComponentLink, String seiName) {
-		super(label, description);
-		parent_ = parent;
-		JavaClass seiClass = JavaRefFactory.eINSTANCE.createClassRef(seiName);
-		newChild_ = createNewPortComponentRef(portComponentLink, seiClass);
-	}
-
-	private PortComponentRef createNewPortComponentRef(String portComponentLink, JavaClass serviceEndpointInterface) {
-		Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
-		PortComponentRef newChild = factory.createPortComponentRef();
-		newChild.setPortComponentLink(portComponentLink);
-		newChild.setServiceEndpointInterface(serviceEndpointInterface);
-		return newChild;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		parent_.getPortComponentRefs().add(newChild_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		parent_.getPortComponentRefs().remove(newChild_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-
-	public Object getAddedObject() {
-		return newChild_;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
deleted file mode 100644
index 2392005ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
+++ /dev/null
@@ -1,185 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddServiceRef extends AbstractCommand {
-	private WebServicesClient parent_;
-	private ServiceRef newChild_;
-
-	//private boolean oldChildSet_;
-
-	public CommandAddServiceRef(String label, String description, WebServicesClient parent, ServiceRef newChild) {
-		super(label, description);
-		parent_ = parent;
-		newChild_ = newChild;
-	}
-
-	public CommandAddServiceRef(String label, String description, WebServicesClient parent, String serviceRefName, JavaClass serviceInterface) {
-		super(label, description);
-		parent_ = parent;
-		newChild_ = createNewServiceRef(serviceRefName, serviceInterface);
-	}
-
-	private ServiceRef createNewServiceRef(String serviceRefName, JavaClass serviceInterface) {
-		Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
-		ServiceRef newChild = factory.createServiceRef();
-		newChild.setServiceRefName(serviceRefName);
-		newChild.setServiceInterface(serviceInterface);
-		return newChild;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		parent_.getServiceRefs().add(newChild_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		parent_.getServiceRefs().remove(newChild_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-
-	public Object getAddedObject() {
-		return newChild_;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
deleted file mode 100644
index 3f2625484..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
+++ /dev/null
@@ -1,182 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandModifyElement extends AbstractCommand {
-	private EObject parent_;
-	private EStructuralFeature[] properties_;
-	private Object[] propertyValues_;
-	private Object[] oldPropertyValues_;
-
-	public CommandModifyElement(String label, String description, EObject parent, EStructuralFeature[] properties, Object[] propertyValues) {
-		super(label, description);
-		parent_ = parent;
-		properties_ = properties;
-		propertyValues_ = propertyValues;
-
-	}
-
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		oldPropertyValues_ = new Object[properties_.length];
-
-		if (parent_ != null) {
-			for (int i = 0; i < properties_.length; i++) {
-				oldPropertyValues_[i] = parent_.eGet(properties_[i]);
-				parent_.eSet(properties_[i], propertyValues_[i]);
-			}
-		}
-
-
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-
-		if (parent_ != null) {
-			for (int i = 0; i < oldPropertyValues_.length; i++) {
-				parent_.eSet(properties_[i], oldPropertyValues_[i]);
-			}
-		}
-
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
deleted file mode 100644
index a91436fce..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
+++ /dev/null
@@ -1,183 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandModifyHandlerClassText extends AbstractCommand {
-	private Handler eObject_;
-	private EStructuralFeature feature_;
-	private String newValue_;
-	private JavaClass oldValue_;
-	private boolean nillable_;
-	private boolean oldIsSet_;
-
-	public CommandModifyHandlerClassText(String label, String description, Handler eObject, String newValue) {
-		super(label, description);
-		eObject_ = eObject;
-		feature_ = Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass();
-		if (newValue == null)
-			newValue_ = ""; //$NON-NLS-1$
-		else
-			newValue_ = newValue;
-		nillable_ = false;
-		oldValue_ = null;
-		oldIsSet_ = true;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		oldIsSet_ = eObject_.eIsSet(feature_);
-		oldValue_ = eObject_.getHandlerClass();
-		eObject_.setHandlerClass(JavaRefFactory.eINSTANCE.createClassRef(newValue_));
-		if (nillable_ && newValue_ == null)
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (oldIsSet_)
-			eObject_.setHandlerClass(oldValue_);
-		else
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
deleted file mode 100644
index 9ba37eb72..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
+++ /dev/null
@@ -1,183 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-
-public class CommandModifyNSURI extends AbstractCommand {
-	private QName eObject_;
-	private EStructuralFeature feature_;
-	private String newValue_;
-	private Object oldValue_;
-	private boolean nillable_;
-	private boolean oldIsSet_;
-
-	public CommandModifyNSURI(String label, String description, QName eObject, String newValue, boolean nillable) {
-		super(label, description);
-		eObject_ = eObject;
-		feature_ = CommonPackage.eINSTANCE.getQName_NamespaceURI();
-		if (nillable && (newValue == null || newValue.length() <= 0))
-			newValue_ = null;
-		else if (!nillable && newValue == null)
-			newValue_ = ""; //$NON-NLS-1$
-		else
-			newValue_ = newValue;
-		nillable_ = nillable;
-		oldValue_ = null;
-		oldIsSet_ = true;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		oldIsSet_ = eObject_.eIsSet(feature_);
-		oldValue_ = eObject_.getNamespaceURI();
-		QNameHelper.setQNameNamespaceURI(eObject_, newValue_);
-		if (nillable_ && newValue_ == null)
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (oldIsSet_)
-			eObject_.eSet(feature_, oldValue_);
-		else
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
deleted file mode 100644
index c030e0f68..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
+++ /dev/null
@@ -1,196 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- *  
- */
-public class CommandModifySEI extends AbstractCommand {
-	private PortComponentRef eObject_;
-	private EStructuralFeature feature_;
-	private String newValue_;
-	private Object oldValue_;
-	private boolean nillable_;
-	private boolean oldIsSet_;
-
-
-	public CommandModifySEI(String label, String description, PortComponentRef eObject, String newValue, boolean nillable) {
-		super(label, description);
-		eObject_ = eObject;
-		feature_ = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface();
-		if (nillable && (newValue == null || newValue.length() <= 0))
-			newValue_ = null;
-		else if (!nillable && newValue == null)
-			newValue_ = ""; //$NON-NLS-1$
-		else
-			newValue_ = newValue;
-		nillable_ = nillable;
-		oldValue_ = null;
-		oldIsSet_ = true;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		oldIsSet_ = eObject_.eIsSet(feature_);
-		oldValue_ = eObject_.getServiceEndpointInterface();
-		JavaClass newJavaClass_ = JavaRefFactory.eINSTANCE.createClassRef(newValue_);
-		eObject_.setServiceEndpointInterface(newJavaClass_);
-		if (nillable_ && newValue_ == null)
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (oldIsSet_)
-			eObject_.eSet(feature_, oldValue_);
-		else
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.command.Command#execute()
-	 */
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
deleted file mode 100644
index 1688d3235..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
+++ /dev/null
@@ -1,183 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandModifyServiceInterfaceText extends AbstractCommand {
-	private ServiceRef eObject_;
-	private EStructuralFeature feature_;
-	private String newValue_;
-	private JavaClass oldValue_;
-	private boolean nillable_;
-	private boolean oldIsSet_;
-
-	public CommandModifyServiceInterfaceText(String label, String description, ServiceRef eObject, String newValue) {
-		super(label, description);
-		eObject_ = eObject;
-		feature_ = Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface();
-		if (newValue == null)
-			newValue_ = ""; //$NON-NLS-1$
-		else
-			newValue_ = newValue;
-		nillable_ = false;
-		oldValue_ = null;
-		oldIsSet_ = true;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		oldIsSet_ = eObject_.eIsSet(feature_);
-		oldValue_ = eObject_.getServiceInterface();
-		eObject_.setServiceInterface(JavaRefFactory.eINSTANCE.createClassRef(newValue_));
-		if (nillable_ && newValue_ == null)
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (oldIsSet_)
-			eObject_.setServiceInterface(oldValue_);
-		else
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
deleted file mode 100644
index de6eb0023..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
+++ /dev/null
@@ -1,181 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandModifyText extends AbstractCommand {
-	private EObject eObject_;
-	private EStructuralFeature feature_;
-	private String newValue_;
-	private Object oldValue_;
-	private boolean nillable_;
-	private boolean oldIsSet_;
-
-	public CommandModifyText(String label, String description, EObject eObject, EStructuralFeature feature, String newValue, boolean nillable) {
-		super(label, description);
-		eObject_ = eObject;
-		feature_ = feature;
-		if (nillable && (newValue == null || newValue.length() <= 0))
-			newValue_ = null;
-		else if (!nillable && newValue == null)
-			newValue_ = ""; //$NON-NLS-1$
-		else
-			newValue_ = newValue;
-		nillable_ = nillable;
-		oldValue_ = null;
-		oldIsSet_ = true;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		oldIsSet_ = eObject_.eIsSet(feature_);
-		oldValue_ = eObject_.eGet(feature_);
-		eObject_.eSet(feature_, newValue_);
-		if (nillable_ && newValue_ == null)
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (oldIsSet_)
-			eObject_.eSet(feature_, oldValue_);
-		else
-			eObject_.eUnset(feature_);
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
deleted file mode 100644
index 79893fb7e..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
+++ /dev/null
@@ -1,291 +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.webservice.command;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-public class CommandMoveServiceRefs extends AbstractCommand {
-	private EObject source_;
-	private EObject target_;
-	private EStructuralFeature childFeature_;
-	private Object[] children_;
-	private boolean isCopy_;
-	private Object[] clonedChildren_;
-	private EList serviceRefs;
-
-	public CommandMoveServiceRefs(String label, String description, EObject source, EObject target, EStructuralFeature childFeature, Object[] children, boolean isCopy, EList serviceRefs) {
-		super(label, description);
-		source_ = source;
-		target_ = target;
-		childFeature_ = childFeature;
-		children_ = children;
-		isCopy_ = isCopy;
-		clonedChildren_ = null;
-		this.serviceRefs = serviceRefs;
-	}
-
-	private Object cloneObject(Object object) {
-		if (object instanceof EList) {
-			EList clone = new BasicEList();
-			for (Iterator it = ((EList) object).iterator(); it.hasNext();) {
-				clone.add(cloneObject(it.next()));
-			}
-			return clone;
-		}
-		if (object instanceof EObject) {
-			EObject source = (EObject) object;
-			EClass eClass = ((EObject) object).eClass();
-			EPackage ePackage = eClass.getEPackage();
-			EFactory eFactory = ePackage.getEFactoryInstance();
-			EObject clone = eFactory.create(eClass);
-			EList features = eClass.getEAllStructuralFeatures();
-			for (Iterator it = features.iterator(); it.hasNext();) {
-				EStructuralFeature feature = (EStructuralFeature) it.next();
-				if (source.eIsSet(feature)) {
-					Object clonedFeature = cloneObject(source.eGet(feature));
-					if (feature.isMany())
-						((List) clone.eGet(feature)).addAll((List) clonedFeature);
-					else
-						clone.eSet(feature, clonedFeature);
-				} else
-					clone.eUnset(feature);
-			}
-			return clone;
-		}
-		if (object != null)
-			return new String(object.toString());
-		return null;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		if (childFeature_.isMany())
-			executeMany();
-		else
-			executeSingle();
-	}
-
-	private void executeSingle() {
-		Object child = source_.eGet(childFeature_);
-		if (isCopy_)
-			target_.eSet(childFeature_, cloneObject(child));
-		else {
-			source_.eUnset(childFeature_);
-			target_.eSet(childFeature_, child);
-		}
-	}
-
-	private void executeMany() {
-		EList sourceList;
-		if (source_ instanceof WebServicesClient)
-			sourceList = serviceRefs;
-		else
-			sourceList = (EList) source_.eGet(childFeature_);
-		EList targetList;
-		if (target_ instanceof WebServicesClient)
-			targetList = serviceRefs;
-		else
-			targetList = (EList) target_.eGet(childFeature_);
-		if (isCopy_)
-			clonedChildren_ = new Object[children_.length];
-		for (int i = 0; i < children_.length; i++) {
-			int index = sourceList.indexOf(children_[i]);
-			if (index != -1) {
-				if (isCopy_) {
-					clonedChildren_[i] = cloneObject(children_[i]);
-					targetList.add(clonedChildren_[i]);
-				} else {
-					sourceList.remove(index);
-					targetList.add(children_[i]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (childFeature_.isMany())
-			undoSingle();
-		else
-			undoMany();
-	}
-
-	private void undoSingle() {
-		Object child = target_.eGet(childFeature_);
-		target_.eUnset(childFeature_);
-		if (!isCopy_)
-			source_.eSet(childFeature_, child);
-	}
-
-	private void undoMany() {
-		EList sourceList;
-		if (source_ instanceof WebServicesClient)
-			sourceList = serviceRefs;
-		else
-			sourceList = (EList) source_.eGet(childFeature_);
-		EList targetList;
-		if (target_ instanceof WebServicesClient)
-			targetList = serviceRefs;
-		else
-			targetList = (EList) target_.eGet(childFeature_);
-		if (isCopy_) {
-			if (clonedChildren_ != null) {
-				for (int i = 0; i < clonedChildren_.length; i++) {
-					targetList.remove(clonedChildren_[i]);
-				}
-			}
-		} else {
-			for (int i = 0; i < children_.length; i++) {
-				int index = targetList.indexOf(children_[i]);
-				if (index != -1) {
-					targetList.remove(index);
-					sourceList.add(children_[i]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
deleted file mode 100644
index 52061651f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
+++ /dev/null
@@ -1,200 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandRemoveElement extends AbstractCommand {
-	private EObject parent_;
-	private Object child_;
-	private Object oldChild_;
-	private boolean oldChildSet_;
-	private EStructuralFeature childFeature_;
-	private boolean nillable_;
-
-	public CommandRemoveElement(String label, String description, EObject parent, EStructuralFeature childFeature) {
-		this(label, description, parent, childFeature, true);
-	}
-
-	public CommandRemoveElement(String label, String description, EObject parent, EStructuralFeature childFeature, boolean nillable) {
-		this(label, description, parent, null, childFeature, nillable);
-	}
-
-	public CommandRemoveElement(String label, String description, EObject parent, Object child, EStructuralFeature childFeature) {
-		this(label, description, parent, child, childFeature, true);
-	}
-
-	public CommandRemoveElement(String label, String description, EObject parent, Object child, EStructuralFeature childFeature, boolean nillable) {
-		super(label, description);
-		parent_ = parent;
-		child_ = child;
-		oldChild_ = null;
-		oldChildSet_ = true;
-		childFeature_ = childFeature;
-		nillable_ = nillable;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		if (childFeature_.isMany()) {
-			if (child_ != null)
-				((EList) parent_.eGet(childFeature_)).remove(child_);
-		} else {
-			oldChild_ = parent_.eGet(childFeature_);
-			oldChildSet_ = parent_.eIsSet(childFeature_);
-			if (nillable_)
-				parent_.eUnset(childFeature_);
-			else
-				parent_.eSet(childFeature_, null);
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (childFeature_.isMany()) {
-			if (child_ != null)
-				((EList) parent_.eGet(childFeature_)).add(child_);
-		} else {
-			if (oldChildSet_)
-				parent_.eSet(childFeature_, oldChild_);
-			else
-				parent_.eUnset(childFeature_);
-		}
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
deleted file mode 100644
index 46cec0c91..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
+++ /dev/null
@@ -1,198 +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.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandSetElement extends AbstractCommand {
-	private EObject parent_;
-	private EStructuralFeature childFeature_;
-	private Object newChild_;
-	private Object oldChild_;
-	private boolean oldChildSet_;
-
-	public CommandSetElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild) {
-		this(label, description, parent, childFeature, newChild, null);
-	}
-
-	public CommandSetElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild, Object oldChild) {
-		super(label, description);
-		parent_ = parent;
-		childFeature_ = childFeature;
-		newChild_ = newChild;
-		oldChild_ = oldChild;
-		oldChildSet_ = true;
-	}
-
-	/**
-	 * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
-	 * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
-	 * override this method to initialize and to yield a cached value for the all subsequent calls
-	 * to canExecute.
-	 * 
-	 * @return whether the command is executable.
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
-	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
-	 * 
-	 * @return whether the comamad is valid to <code>execute</code>.
-	 */
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-
-	/**
-	 * Performs the command activity required for the effect. The effect of calling
-	 * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
-	 * <code>canExecute</code> hasn't been called, is undefined.
-	 */
-	public void execute() {
-		if (childFeature_.isMany() && !(newChild_ instanceof EList)) {
-			if (oldChild_ != null && newChild_ != null) {
-				EList eList = (EList) parent_.eGet(childFeature_);
-				int index = eList.indexOf(oldChild_);
-				if (index != -1)
-					eList.set(index, newChild_);
-			}
-		} else {
-			oldChild_ = parent_.eGet(childFeature_);
-			oldChildSet_ = parent_.eIsSet(childFeature_);
-			if (newChild_ != null)
-				parent_.eSet(childFeature_, newChild_);
-			else
-				parent_.eUnset(childFeature_);
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> because most command should be undoable.
-	 * 
-	 * @return <code>true</code>.
-	 */
-	public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Performs the command activity required to <code>undo</code> the effects of a preceding
-	 * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
-	 * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
-	 * when canUndo returns <code>false</code>, is undefined.
-	 */
-	public void undo() {
-		if (childFeature_.isMany() && !(newChild_ instanceof EList)) {
-			if (oldChild_ != null && newChild_ != null) {
-				EList eList = (EList) parent_.eGet(childFeature_);
-				int index = eList.indexOf(newChild_);
-				if (index != -1)
-					eList.set(index, oldChild_);
-			}
-		} else {
-			if (oldChildSet_)
-				parent_.eSet(childFeature_, oldChild_);
-			else
-				parent_.eUnset(childFeature_);
-		}
-	}
-
-	/**
-	 * Performs the command activity required to <code>redo</code> the effect after undoing the
-	 * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
-	 * called is undefined. Note that if you implement <code>redo</code> to call
-	 * <code>execute</code> then any derived class will be restricted by that decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	/**
-	 * Returns a collection of things which this command wishes to present as it's result. The
-	 * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
-	 * <code>undo</code>, is undefined.
-	 * 
-	 * @return a collection of things which this command wishes to present as it's result.
-	 */
-	public Collection getResult() {
-		return super.getResult();
-	}
-
-	/**
-	 * Returns the collection of things which this command wishes to present as the objects affected
-	 * by the command. Typically should could be used as the selection that should be highlighted to
-	 * best illustrate the effect of the command. The result of calling this before an
-	 * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
-	 * result may be different after an <code>undo</code> than it is after an <code>execute</code>
-	 * or <code>redo</code>, but the result should be the same (equivalent) after either an
-	 * <code>execute</code> or <code>redo</code>.
-	 * 
-	 * @return the collection of things which this command wishes to present as the objects affected
-	 *         by the command.
-	 */
-	public Collection getAffectedObjects() {
-		return super.getAffectedObjects();
-	}
-
-	/**
-	 * Called to indicate that the command will never be used again. Calling any other method after
-	 * this one has undefined results.
-	 */
-	public void dispose() {
-		//Do nothing
-	}
-
-	/**
-	 * Returns a command that represents the composition of this command with the given command. The
-	 * resulting command may just be this, if this command is capabable of composition. Otherwise,
-	 * it will be a new command created to compose the two.
-	 * <p>
-	 * Instead of the following pattern of usage
-	 * 
-	 * <pre>
-	 * Command result = x;
-	 * if (condition)
-	 * 	result = result.chain(y);
-	 * </pre>
-	 * 
-	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
-	 * 
-	 * <pre>
-	 * CompoundCommand subcommands = new CompoundCommand();
-	 * subcommands.append(x);
-	 * if (condition)
-	 * 	subcommands.append(y);
-	 * Command result = subcommands.unwrap();
-	 * </pre>
-	 * 
-	 * This gives you more control over how the compound command composes it's result and affected
-	 * objects.
-	 * 
-	 * @param command
-	 *            the command to chain.
-	 * @return a command that represents the composition of this command with the given command.
-	 */
-	public Command chain(Command command) {
-		return super.chain(command);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java
deleted file mode 100644
index d9dcbb430..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource}&nbsp; which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource}&nbsp;is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}&nbsp;using a constant {@see
- * J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- * 
- */ 
-public class JaxRPCMapArtifactEdit extends EnterpriseArtifactEdit {
-	
-	/**
-	 * <p>
-	 * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
-	 * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
-	 * </p>
-	 */
-
-	public static final Class ADAPTER_TYPE = JaxRPCMapArtifactEdit.class;
-	
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public JaxRPCMapArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-		// TODO Auto-generated constructor stub
-	}
-	
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 */
-	public JaxRPCMapArtifactEdit(ArtifactEditModel model) {
-		super(model);
-	}
-	
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}
-	 * </p>
-	 * 
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}pointing to a module from the given
-	 *            {@see ModuleCoreNature}
-	 */ 
-	protected JaxRPCMapArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-	
-	/**
-	 * 
-	 * @return WsddResource from (@link getDeploymentDescriptorResource())
-	 *  
-	 */
-
-	public JaxrpcmapResource getJaxRPCMapXmiResource(String mappingFilePathURI) {
-		
-		URI uri = URI.createPlatformResourceURI(mappingFilePathURI);
-		ResourceSet resSet = getArtifactEditModel().getResourceSet();
-		WTPResourceFactoryRegistry registry = (WTPResourceFactoryRegistry) resSet.getResourceFactoryRegistry();
-		registry.registerLastFileSegment(uri.lastSegment(), new JaxrpcmapResourceFactory(RendererFactory.getDefaultRendererFactory()));
-
-		JaxrpcmapResource jaxrpcmapRes = (JaxrpcmapResource) resSet.getResource(uri, true);
-				
-		return jaxrpcmapRes;
-	}
-	
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from EJBResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 *  
-	 */
-
-	public int getJ2EEVersion(String mappingFilePathURI) {
-		return getJaxRPCMapXmiResource(mappingFilePathURI).getJ2EEVersionID();
-	}
-	
-	
-	/**
-	 * <p>
-	 * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
-	 * </p>
-	 * 
-	 * @return Resource
-	 *  
-	 */
-
-	public Resource getDeploymentDescriptorResource(String mappingFilePathURI) {
-		return getJaxRPCMapXmiResource(mappingFilePathURI);
-	}
-	
-	
-	/**
-	 * 
-	 * @return WebServices from (@link getDeploymentDescriptorRoot())
-	 *  
-	 */
-	public JavaWSDLMapping getJavaWSDLMapping() {
-		return (JavaWSDLMapping) getDeploymentDescriptorRoot();
-	}
-	
-	/**
-	 * <p>
-	 * Obtains the WebServices (@see WebServices) root object from the WsddResource. If the root object does
-	 * not exist, then one is created (@link addEJBJarIfNecessary(getEJBJarXmiResource())).
-	 * The root object contains all other resource defined objects.
-	 * </p>
-	 * 
-	 * @return EObject
-	 *  
-	 */
-	public EObject getDeploymentDescriptorRoot(String mappingFilePathURI) {
-		List contents = getDeploymentDescriptorResource(mappingFilePathURI).getContents();
-		if (contents.size() > 0)
-			return (EObject) contents.get(0);
-		addJavaWSDLMappingIfNecessary(getJaxRPCMapXmiResource(mappingFilePathURI));
-		return (EObject) contents.get(0);
-	}
-	
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (WebServices) and populates with data. Adds the root
-	 * object to the deployment descriptor resource.
-	 * </p>
-	 * 
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource}
-	 * Note: This method is typically used for JUNIT - move?
-	 * </p>
-	 */
-	protected void addJavaWSDLMappingIfNecessary(JaxrpcmapResource aResource) {
-		if (aResource != null) {
-		    if(aResource.getContents() == null || aResource.getContents().isEmpty()) {
-				JavaWSDLMapping map = JaxrpcmapFactory.eINSTANCE.createJavaWSDLMapping();
-				aResource.getContents().add(map);
-		    }
-			aResource.getContents().get(0);
-			getArtifactEditModel().getModuleURI();
-			try {
-				aResource.saveIfNecessary();
-			}
-			catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 */
-	public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForRead(IProject aProject) {
-		JaxRPCMapArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new JaxRPCMapArtifactEdit(aProject, true);
-		} catch (IllegalArgumentException iae) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForWrite(IProject aProject) {
-		JaxRPCMapArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new JaxRPCMapArtifactEdit(aProject, false);
-		} catch (IllegalArgumentException iae) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-	
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WSDDArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that will not
-	 * be used for editing. Invocations of any save*() API on an instance returned from this method
-	 * will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * 
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an accessible
-	 *            project in the workspace
-	 * @return An instance of WSDDArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForRead(IVirtualComponent aModule) {
-			IProject project = aModule.getProject();
-			ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
-			return new JaxRPCMapArtifactEdit(nature, aModule, true);
-	}
-	
-	
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WSDDArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * 
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an accessible
-	 *            project in the workspace
-	 * @return An instance of WSDDArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForWrite(IVirtualComponent aModule) {
-		
-				IProject project = aModule.getProject();
-				ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
-				return new JaxRPCMapArtifactEdit(nature, aModule, false);
-		
-	}
-	
-	
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
-	 *         JST module
-	 */
-	public static boolean isValidEJBModule(IVirtualComponent aComponent) {
-		return J2EEProjectUtilities.isEJBProject(aComponent.getProject());
-	}
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
-	 *         JST module
-	 */
-	public static boolean isValidWebModule(IVirtualComponent aComponent) {
-		return J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject());
-	}
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
-	 *         JST module
-	 */
-	public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
-		return J2EEProjectUtilities.isApplicationClientProject(aComponent.getProject());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
-	 */
-	public EObject createModelRoot(String mappingFilePathURI) {
-	    return createModelRoot(getJ2EEVersion(),mappingFilePathURI);
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
-	 */
-	public EObject createModelRoot(int version,String mappingFilePathURI) {
-	    JaxrpcmapResource res = getJaxRPCMapXmiResource(mappingFilePathURI);
-	    res.setModuleVersionID(version);
-	    addJavaWSDLMappingIfNecessary(res);
-		return getJavaWSDLMapping();
-	}
-
-	public EObject createModelRoot() {
-		throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
-	}
-
-	public EObject createModelRoot(int version) {
-		throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
-	}
-
-	public Resource getDeploymentDescriptorResource() {
-		throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
-	}
-
-	public int getJ2EEVersion() {
-		throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java
deleted file mode 100644
index cdd35a867..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-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.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data
- * from a {@see org.eclipse.jst.j2ee.ejb.EJBResource}&nbsp; which stores the
- * metamodel. The {@see org.eclipse.jst.j2ee.ejb.EJBResource}&nbsp;is retrieved
- * from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}&nbsp;using
- * a constant {@see J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods
- * extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-public class WSCDDArtifactEdit extends EnterpriseArtifactEdit {
-
-	/**
-	 * <p>
-	 * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
-	 * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
-	 * </p>
-	 */
-
-	public static final Class ADAPTER_TYPE = WSCDDArtifactEdit.class;
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public WSCDDArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 */
-	public WSCDDArtifactEdit(ArtifactEditModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this
-	 * method.
-	 * </p>
-	 * 
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}pointing to a module from
-	 *            the given {@see ModuleCoreNature}
-	 */
-	public WSCDDArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-
-	/**
-	 * @return WsddResource from (@link getDeploymentDescriptorResource())
-	 */
-
-	public WebServicesResource getWscddXmiResource() {
-		return (WebServicesResource) getDeploymentDescriptorResource();
-	}
-
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from EJBResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 */
-
-	public int getJ2EEVersion() {
-		return getWscddXmiResource().getJ2EEVersionID();
-	}
-
-	/**
-	 * <p>
-	 * Retrieves the underlying resource from the ArtifactEditModel using
-	 * defined URI.
-	 * </p>
-	 * 
-	 * @return Resource
-	 */
-
-	public Resource getDeploymentDescriptorResource() {
-		if (getArtifactEditModel()!=null)
-			return getArtifactEditModel().getResource(getWebServicesClientXmlResourceURI());
-		return null;
-	}
-
-	public URI getWebServicesClientXmlResourceURI() {
-		URI resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_WEB_INF_DD_URI_OBJ;
-		if (isValidAppClientModule(ComponentCore.createComponent(getProject())))
-			resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ;
-		else if (isValidEJBModule(ComponentCore.createComponent(getProject())))
-			resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ;
-		return resourceURI;
-	}
-
-	/**
-	 * @return WebServices from (@link getDeploymentDescriptorRoot())
-	 */
-	public WebServicesClient getWebServicesClient() {
-		return (WebServicesClient) getDeploymentDescriptorRoot();
-	}
-
-	/**
-	 * <p>
-	 * Obtains the WebServices (@see WebServices) root object from the
-	 * WsddResource. If the root object does not exist, then one is created
-	 * (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root object
-	 * contains all other resource defined objects.
-	 * </p>
-	 * 
-	 * @return EObject
-	 */
-	public EObject getDeploymentDescriptorRoot() {
-		List contents = getDeploymentDescriptorResource().getContents();
-		if (contents.size() > 0)
-			return (EObject) contents.get(0);
-		addWebServicesClientIfNecessary(getWscddXmiResource());
-		return (EObject) contents.get(0);
-	}
-
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (WebServices) and populates
-	 * with data. Adds the root object to the deployment descriptor resource.
-	 * </p>
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource} Note: This method
-	 *            is typically used for JUNIT - move?
-	 *            </p>
-	 */
-	protected void addWebServicesClientIfNecessary(WebServicesResource aResource) {
-		if (aResource != null) {
-			if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
-				WebServicesClient ws_client = Webservice_clientFactory.eINSTANCE.createWebServicesClient();
-				aResource.getContents().add(ws_client);
-			}
-			aResource.getContents().get(0);
-			getArtifactEditModel().getModuleURI();
-			try {
-				aResource.saveIfNecessary();
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will not be used for editing.
-	 * Invocations of any save*() API on an instance returned from this method
-	 * will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the
-	 *         underlying content model
-	 */
-	public static WSCDDArtifactEdit getWSCDDArtifactEditForRead(IProject aProject) {
-		WSCDDArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new WSCDDArtifactEdit(aProject, true);
-		} catch (IllegalArgumentException iae) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and
-	 *         persist changes to the underlying content model
-	 */
-	public static WSCDDArtifactEdit getWSCDDArtifactEditForWrite(IProject aProject) {
-		WSCDDArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new WSCDDArtifactEdit(aProject, false);
-		} catch (IllegalArgumentException iae) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WSDDArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will not be used for editing.
-	 * Invocations of any save*() API on an instance returned from this method
-	 * will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this
-	 * method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of WSDDArtifactEdit that may only be used to read the
-	 *         underlying content model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static WSCDDArtifactEdit getWSCDDArtifactEditForRead(IVirtualComponent aModule) {
-
-		IProject project = aModule.getProject();
-		ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
-		if (aModule != null && isValidWSCDDModule(aModule))
-			return new WSCDDArtifactEdit(nature, aModule, true);
-		return null;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WSDDArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this
-	 * method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of WSDDArtifactEdit that may be used to modify and
-	 *         persist changes to the underlying content model
-	 */
-	public static WSCDDArtifactEdit getWSCDDArtifactEditForWrite(IVirtualComponent aModule) {
-		IProject project = aModule.getProject();
-		ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
-		if (aModule != null && isValidWSCDDModule(aModule))
-			return new WSCDDArtifactEdit(nature, aModule, false);
-		return null;
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
-	 *         the moduleTypeId is a JST module
-	 */
-	public static boolean isValidEJBModule(IVirtualComponent aComponent) {
-		return aComponent !=null && J2EEProjectUtilities.isEJBProject(aComponent.getProject());
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidWSDDModule(IVirtualComponent)}and the
-	 *         moduleTypeId is a JST module
-	 */
-	protected static boolean isValidWSCDDModule(IVirtualComponent aComponent) {
-		return (isValidAppClientModule(aComponent) || isValidWebModule(aComponent) || isValidEJBModule(aComponent));
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
-	 *         the moduleTypeId is a JST module
-	 */
-	public static boolean isValidWebModule(IVirtualComponent aComponent) {
-		return aComponent !=null && J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject());
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
-	 *         the moduleTypeId is a JST module
-	 */
-	public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
-		return aComponent !=null && J2EEProjectUtilities.isApplicationClientProject(aComponent.getProject());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
-	 */
-	public EObject createModelRoot() {
-		return createModelRoot(getJ2EEVersion());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
-	 */
-	public EObject createModelRoot(int version) {
-		WebServicesResource res = getWscddXmiResource();
-		res.setModuleVersionID(version);
-		addWebServicesClientIfNecessary(res);
-		return getWebServicesClient();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java
deleted file mode 100644
index c9f96eb76..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-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.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data
- * from a {@see org.eclipse.jst.j2ee.ejb.EJBResource}&nbsp; which stores the
- * metamodel. The {@see org.eclipse.jst.j2ee.ejb.EJBResource}&nbsp;is retrieved
- * from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}&nbsp;using
- * a constant {@see J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods
- * extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-public class WSDDArtifactEdit extends EnterpriseArtifactEdit {
-
-	/**
-	 * <p>
-	 * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
-	 * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
-	 * </p>
-	 */
-
-	public static final Class ADAPTER_TYPE = WSDDArtifactEdit.class;
-
-	public static final String WSIL_FILE_EXT = "wsil"; //$NON-NLS-1$
-
-	public static final String WSDL_FILE_EXT = "wsdl"; //$NON-NLS-1$
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public WSDDArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 */
-	public WSDDArtifactEdit(ArtifactEditModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this
-	 * method.
-	 * </p>
-	 * 
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}pointing to a module from
-	 *            the given {@see ModuleCoreNature}
-	 */
-	public WSDDArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-
-	/**
-	 * @return WsddResource from (@link getDeploymentDescriptorResource())
-	 */
-
-	public WsddResource getWsddXmiResource() {
-		return (WsddResource) getDeploymentDescriptorResource();
-	}
-
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from EJBResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 */
-
-	public int getJ2EEVersion() {
-		return getWsddXmiResource().getJ2EEVersionID();
-	}
-
-	/**
-	 * <p>
-	 * Retrieves the underlying resource from the ArtifactEditModel using
-	 * defined URI.
-	 * </p>
-	 * 
-	 * @return Resource
-	 */
-
-	public Resource getDeploymentDescriptorResource() {
-		return getArtifactEditModel().getResource(getWebServicesXmlResourceURI());
-	}
-
-	public URI getWebServicesXmlResourceURI() {
-
-		URI resourceURI = J2EEConstants.WEB_SERVICES_WEB_INF_DD_URI_OBJ;
-		if (isValidAppClientModule(getComponent()))
-			resourceURI = J2EEConstants.WEB_SERVICES_META_INF_DD_URI_OBJ;
-		else if (isValidEJBModule(getComponent()))
-			resourceURI = J2EEConstants.WEB_SERVICES_META_INF_DD_URI_OBJ;
-		return resourceURI;
-	}
-
-	/**
-	 * @return WebServices from (@link getDeploymentDescriptorRoot())
-	 */
-	public WebServices getWebServices() {
-		if (!getProject().isAccessible())
-			return null;
-		if (getWsddXmiResource().getContents().isEmpty())
-			return null;
-		return (WebServices) getDeploymentDescriptorRoot();
-	}
-
-	/**
-	 * <p>
-	 * Obtains the WebServices (@see WebServices) root object from the
-	 * WsddResource. If the root object does not exist, then one is created
-	 * (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root object
-	 * contains all other resource defined objects.
-	 * </p>
-	 * 
-	 * @return EObject
-	 */
-	public EObject getDeploymentDescriptorRoot() {
-		List contents = getDeploymentDescriptorResource().getContents();
-		if (contents.size() > 0)
-			return (EObject) contents.get(0);
-		addWebServicesIfNecessary(getWsddXmiResource());
-		if (contents.isEmpty())
-			return null;
-		return (EObject) contents.get(0);
-	}
-
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (WebServices) and populates
-	 * with data. Adds the root object to the deployment descriptor resource.
-	 * </p>
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource} Note: This method
-	 *            is typically used for JUNIT - move?
-	 *            </p>
-	 */
-	protected void addWebServicesIfNecessary(WsddResource aResource) {
-		if (aResource != null) {
-			if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
-				WebServices ws = WsddFactory.eINSTANCE.createWebServices();
-				aResource.getContents().add(ws);
-			}
-			aResource.getContents().get(0);
-			getArtifactEditModel().getModuleURI();
-			try {
-				aResource.saveIfNecessary();
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will not be used for editing.
-	 * Invocations of any save*() API on an instance returned from this method
-	 * will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the
-	 *         underlying content model
-	 */
-	public static WSDDArtifactEdit getWSDDArtifactEditForRead(IProject aProject) {
-		WSDDArtifactEdit artifactEdit = null;
-		IVirtualComponent comp = ComponentCore.createComponent(aProject);
-		if (comp != null && isValidWSDDModule(comp)) {
-			try {
-				artifactEdit = new WSDDArtifactEdit(aProject, true);
-			} catch (IllegalArgumentException iae) {
-				artifactEdit = null;
-			}
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and
-	 *         persist changes to the underlying content model
-	 */
-	public static WSDDArtifactEdit getWSDDArtifactEditForWrite(IProject aProject) {
-		WSDDArtifactEdit artifactEdit = null;
-		IVirtualComponent comp = ComponentCore.createComponent(aProject);
-		if (comp != null && isValidWSDDModule(comp)) {
-			try {
-				artifactEdit = new WSDDArtifactEdit(aProject, false);
-			} catch (IllegalArgumentException iae) {
-				artifactEdit = null;
-			}
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WSDDArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will not be used for editing.
-	 * Invocations of any save*() API on an instance returned from this method
-	 * will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this
-	 * method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of WSDDArtifactEdit that may only be used to read the
-	 *         underlying content model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static WSDDArtifactEdit getWSDDArtifactEditForRead(IVirtualComponent aModule) {
-		IProject project = aModule.getProject();
-		ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
-		if (aModule != null && isValidWSDDModule(aModule))
-			return new WSDDArtifactEdit(nature, aModule, true);
-		return null;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the
-	 * given {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are
-	 * returned through this method must be {@see #dispose()}ed of when no
-	 * longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an WSDDArtifactEdit facade for a specific
-	 * {@see WorkbenchComponent}&nbsp;that will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this
-	 * method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that
-	 *            resolves to an accessible project in the workspace
-	 * @return An instance of WSDDArtifactEdit that may be used to modify and
-	 *         persist changes to the underlying content model
-	 */
-	public static WSDDArtifactEdit getWSDDArtifactEditForWrite(IVirtualComponent aModule) {
-		IProject project = aModule.getProject();
-		ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
-		if (aModule != null && isValidWSDDModule(aModule))
-			return new WSDDArtifactEdit(nature, aModule, false);
-		return null;
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
-	 *         the moduleTypeId is a JST module
-	 */
-	public static boolean isValidEJBModule(IVirtualComponent aComponent) {
-		return J2EEProjectUtilities.isEJBProject(aComponent.getProject());
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidWSDDModule(IVirtualComponent)}and the
-	 *         moduleTypeId is a JST module
-	 */
-	protected static boolean isValidWSDDModule(IVirtualComponent aComponent) {
-		return (isValidAppClientModule(aComponent) || isValidWebModule(aComponent) || isValidEJBModule(aComponent));
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
-	 *         the moduleTypeId is a JST module
-	 */
-	public static boolean isValidWebModule(IVirtualComponent aComponent) {
-		return J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject());
-	}
-
-	/**
-	 * @param component
-	 *            A {@see IVirtualComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
-	 *         the moduleTypeId is a JST module
-	 */
-	public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
-		return J2EEProjectUtilities.isApplicationClientProject(aComponent.getProject());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
-	 */
-	public EObject createModelRoot() {
-		return createModelRoot(getJ2EEVersion());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
-	 */
-	public EObject createModelRoot(int version) {
-		WsddResource res = (WsddResource) getDeploymentDescriptorResource();
-		res.setModuleVersionID(version);
-		addWebServicesIfNecessary(res);
-		return getWebServices();
-	}
-
-	public EObject getContentModelRoot() {
-		return getWebServices();
-	}
-
-	public List getWSILResources() {
-		final List result = new ArrayList(); 
-		
-		try {
-			getProject().accept(new IResourceProxyVisitor() {
-				
-				public boolean visit(IResourceProxy proxy) throws CoreException {
-					if(proxy.getName().endsWith(WSIL_FILE_EXT)) {
-						IResource file = proxy.requestResource();
-						IVirtualResource[] vResources = ComponentCore.createResources(file);
-						if (vResources.length > 0 && !result.contains(file))
-							result.add(file);
-					}
-					return true;
-				}
-				
-			}, IResource.NONE);
-		} catch (CoreException e) {
-			WebServicePlugin.logError(0, e.getMessage(), e);
-		} 
-		return result;
-	}
-
-	public List getWSDLResources() {
-		return getResources(WSDL_FILE_EXT);
-	}
-
-	private List getResources(String ext) {
-		List resources = getArtifactEditModel().getResources();
-		List result = new ArrayList();
-		for (int i = 0; i < resources.size(); i++) {
-			Resource res = (Resource) resources.get(i);
-			if (res != null && res.getURI().fileExtension() != null && res.getURI().fileExtension().equals(ext))
-				result.add(res);
-		}
-		return result;
-	}
-
-	/**
-	 * return the WSDLResource if it exists, otherwise return null
-	 */
-	public Resource getWsdlResource(String path) {
-		if (path == null || path.equals(""))return null; //$NON-NLS-1$
-		Resource res = null;
-		try {
-			res = getArtifactEditModel().getResource(URI.createURI(path));
-		} catch (Exception e) {
-			// Ignore
-		}
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (res != null && res.isLoaded() && serviceHelper.isWSDLResource(res))
-			return res;
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java
deleted file mode 100644
index 010157860..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.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.webservice.constants;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-
-public class ATKUIConstants {
-	// init-param
-	public String defaultInitParamName() {
-		return new String(WebServicePlugin.getMessage("%LABEL_TABLE_NAME")); //$NON-NLS-1$
-	}
-
-	public String defaultInitParamValue() {
-		return new String(WebServicePlugin.getMessage("%LABEL_TABLE_VALUE")); //$NON-NLS-1$
-	}
-
-	public String defaultDescription() {
-		return new String(WebServicePlugin.getMessage("%LABEL_TABLE_DESCRIPTION")); //$NON-NLS-1$
-	}
-
-	// QName
-	private String DEFAULT_PREFIX = "pfx"; //$NON-NLS-1$
-	private String DEFAULT_NAMESPACEURI = "NamespaceURI"; //$NON-NLS-1$
-	private String DEFAULT_LOCALPART = "LocalPart"; //$NON-NLS-1$
-
-	public String defaultPrefix() {
-		return new String(DEFAULT_PREFIX);
-	}
-
-	public String defaultNamespaceURI() {
-		return new String(DEFAULT_NAMESPACEURI);
-	}
-
-	public String defaultLocalPart() {
-		return new String(DEFAULT_LOCALPART);
-	}
-
-	// soap role
-	public String defaultSOAPRole() {
-		return new String(WebServicePlugin.getMessage("%LABEL_TABLE_SOAP_ROLE")); //$NON-NLS-1$
-	}
-
-	// port name
-	public String defaultPortName() {
-		return new String(WebServicePlugin.getMessage("%LABEL_TABLE_PORT_NAME")); //$NON-NLS-1$
-	}
-
-	//port component
-	public String defaultServiceEndpointInterface() {
-		return new String("java.rmi.Remote"); //$NON-NLS-1$
-	}
-
-
-	// port component ref
-	public JavaClass defaultClientServiceEndpointInterface() {
-		return JavaRefFactory.eINSTANCE.createClassRef("java.rmi.Remote"); //$NON-NLS-1$
-	}
-
-	public String defaultPortComponentLink() {
-		return new String(WebServicePlugin.getMessage("%LABEL_TABLE_PORT_COMPONENT_LINK")); //$NON-NLS-1$
-	}
-
-	// service-ref
-	public ServiceRef defaultServiceRef() {
-		ServiceRef serviceRef = Webservice_clientFactory.eINSTANCE.createServiceRef();
-		serviceRef.setServiceRefName(defaultServiceRefName());
-		serviceRef.setServiceInterface(defaultServiceInterface());
-		return serviceRef;
-	}
-
-	public String defaultServiceRefName() {
-		StringBuffer sb = new StringBuffer("service/"); //$NON-NLS-1$
-		sb.append(WebServicePlugin.getMessage("%_UI_ServiceRef_type")); //$NON-NLS-1$
-		return sb.toString();
-	}
-
-	public JavaClass defaultServiceInterface() {
-		return JavaRefFactory.eINSTANCE.createClassRef("javax.xml.rpc.Service"); //$NON-NLS-1$
-	}
-
-	// port component name
-	public String defaultPortComponentName() {
-		return new String(WebServicePlugin.getMessage("%_UI_PortComponent_type")); //$NON-NLS-1$
-	}
-
-	// service impl bean
-	public ServiceImplBean defaultServiceImplBean() {
-		ServiceImplBean serviceImplBean = WsddFactory.eINSTANCE.createServiceImplBean();
-		serviceImplBean.setEServletLink(defaultServletLink());
-		return serviceImplBean;
-	}
-
-	// servlet link
-	public ServletLink defaultServletLink() {
-		ServletLink servletLink = WsddFactory.eINSTANCE.createServletLink();
-		servletLink.setServletLink(WebServicePlugin.getMessage("%LABEL_SERVLET_LINK")); //$NON-NLS-1$
-		return servletLink;
-	}
-
-	// WSDL port
-	public WSDLPort defaultWSDLPort(int versionID) {
-		WSDLPort wsdlport = WsddFactory.eINSTANCE.createWSDLPort();
-		QNameHelper.setQNameValue(wsdlport, defaultNamespaceURI(), defaultLocalPart(), defaultPrefix(), versionID);
-		return wsdlport;
-	}
-
-	// port component
-	public PortComponent defaultPortComponent(int versionID) {
-		PortComponent portComponent = WsddFactory.eINSTANCE.createPortComponent();
-		portComponent.setPortComponentName(defaultPortComponentName());
-		portComponent.setWsdlPort(defaultWSDLPort(versionID));
-		portComponent.setServiceEndpointInterface(defaultServiceEndpointInterface());
-		portComponent.setServiceImplBean(defaultServiceImplBean());
-		return portComponent;
-	}
-
-	// JAX RPC mapping
-	public String defaultJaxRpcMappingFile() {
-		return new String("jaxrpcmapping.xml"); //$NON-NLS-1$
-	}
-
-	// component scoped reference
-	public String defaultComponentName() {
-		return new String(WebServicePlugin.getMessage("%_UI_PortComponentRef_type")); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java
deleted file mode 100644
index f5207c3ab..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java
+++ /dev/null
@@ -1,249 +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.webservice.constants;
-
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-public class InfopopConstants {
-
-	/** *************************Infopops for pages************************ */
-	public String getInfopopWebServicesPage() {
-		return WebServicePlugin.PLUGIN_ID + ".EJSRP0001"; //$NON-NLS-1$
-	}
-
-	public String getInfopopPortComponentPage() {
-		return WebServicePlugin.PLUGIN_ID + ".EJSRP0002"; //$NON-NLS-1$
-	}
-
-	public String getInfopopWSHandlerPage() {
-		return WebServicePlugin.PLUGIN_ID + ".EJSRP0003"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceRefPage() {
-		return WebServicePlugin.PLUGIN_ID + ".EJSRP0004"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSRHandlerPage() {
-		return WebServicePlugin.PLUGIN_ID + ".EJSRP0005"; //$NON-NLS-1$
-	}
-
-
-
-	/** *************************Infopops for sections*********************** */
-	public String getInfopopDescription() {
-		/* CONTEXT_ID EJSR0001 for the description text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0001"; //$NON-NLS-1$
-	}
-
-	public String getInfopopDisplayName() {
-		/* CONTEXT_ID EJSR0002 for the display name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0002"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSmallIcon() {
-		/* CONTEXT_ID EJSR0003 for the small icon display */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0003"; //$NON-NLS-1$
-	}
-
-	public String getInfopopLargeIcon() {
-		/* CONTEXT_ID EJSR0004 for the large icon display */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0004"; //$NON-NLS-1$
-	}
-
-	public String getInfopopWebServiceDescriptionName() {
-		/* CONTEXT_ID EJSR0005 for the Web service description name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0005"; //$NON-NLS-1$
-	}
-
-	public String getInfopopWSDLFile() {
-		/* CONTEXT_ID EJSR0006 for the WSDL file location text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0006"; //$NON-NLS-1$
-	}
-
-	public String getInfopopJAXRPCMappingFile() {
-		/* CONTEXT_ID EJSR0007 for the JAX-RPC mapping file location text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0007"; //$NON-NLS-1$
-	}
-
-	public String getInfopopPortComponentName() {
-		/* CONTEXT_ID EJSR0008 for the port component name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0008"; //$NON-NLS-1$
-	}
-
-	public String getInfopopWSDLPortNamespaceURI() {
-		/* CONTEXT_ID EJSR0009 for the WSDL port namespace URI text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0009"; //$NON-NLS-1$
-	}
-
-	public String getInfopopWSDLPortLocalpart() {
-		/* CONTEXT_ID EJSR0010 for the WSDL port local part text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0010"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceEndpointInterface() {
-		/*
-		 * CONTEXT_ID EJSR0011 for the fully qualified service endpoint interface class name text
-		 * field
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0011"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceImplBean() {
-		/*
-		 * CONTEXT_ID EJSR0012 for the fully qualified service implementation bean class name text
-		 * field
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0012"; //$NON-NLS-1$
-	}
-
-	public String getInfopopEJBLink() {
-		/* CONTEXT_ID EJSR0013 for the use EJB link radio button */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0013"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServletLink() {
-		/* CONTEXT_ID EJSR0014 for the use servlet link radio button */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0014"; //$NON-NLS-1$
-	}
-
-	public String getInfopopHandlerName() {
-		/* CONTEXT_ID EJSR0015 for the handler name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0015"; //$NON-NLS-1$
-	}
-
-	public String getInfopopHandlerClass() {
-		/* CONTEXT_ID EJSR0016 for the fully qualified handler class name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0016"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceRefName() {
-		/* CONTEXT_ID EJSR0017 for the service reference name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0017"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceInterfaceName() {
-		/* CONTEXT_ID EJSR0018 for the service interface name text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0018"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceQNameNamespaceURI() {
-		/* CONTEXT_ID EJSR0019 for the service qname namspace URI text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0019"; //$NON-NLS-1$
-	}
-
-	public String getInfopopServiceQNameLocalpart() {
-		/* CONTEXT_ID EJSR0020 for the service qname local part text field */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0020"; //$NON-NLS-1$
-	}
-
-	public String getInfopopComboWebServiceDescription() {
-		/*
-		 * CONTEXT_ID EJSR0021 for the Web service description drop-down (list of Web service
-		 * descriptions)
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0021"; //$NON-NLS-1$
-	}
-
-	public String getInfopopComboPortComponent() {
-		/* CONTEXT_ID EJSR0022 for the port component drop-down (list of port components) */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0022"; //$NON-NLS-1$
-	}
-
-	public String getInfopopComboComponentScopedRef() {
-		/*
-		 * CONTEXT_ID EJSR0023 for the component scoped reference drop-down (list of component
-		 * scoped reference)
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0023"; //$NON-NLS-1$
-	}
-
-	public String getInfopopComboServiceRef() {
-		/* CONTEXT_ID EJSR0024 for the service reference drop-down (list of service references) */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0024"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionWebServiceDescription() {
-		/* CONTEXT_ID EJSR0025 for the Web service description section in the webservices.xml editor */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0025"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionPortComponent() {
-		/* CONTEXT_ID EJSR0026 for the port component section in the webservices.xml editor */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0026"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionHandlerWS() {
-		/* CONTEXT_ID EJSR0027 for the handler section in the webservices.xml editor */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0027"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionComponentScopedRef() {
-		/*
-		 * CONTEXT_ID EJSR0028 for the component scoped reference section in the
-		 * webservicesclient.xml editor
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0028"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionServiceRef() {
-		/* CONTEXT_ID EJSR0029 for the service reference section in the webservicesclient.xml editor */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0029"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionPortComponentRef() {
-		/*
-		 * CONTEXT_ID EJSR0030 for the port component reference section in the webservicesclient.xml
-		 * editor
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0030"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionHandlerWSC() {
-		/* CONTEXT_ID EJSR0031 for the handler section in the webservicesclient.xml editor */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0031"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionInitParams() {
-		/*
-		 * CONTEXT_ID EJSR0032 for the initial parameter section in both webservices.xml and
-		 * webservicesclient.xml editor
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0032"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionSOAPHeaders() {
-		/*
-		 * CONTEXT_ID EJSR0033 for the SOAP header section in both webservices.xml and
-		 * webservicesclient.xml editor
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0033"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionSOAPRoles() {
-		/*
-		 * CONTEXT_ID EJSR0034 for the SOAP role section in both webservices.xml and
-		 * webservicesclient.xml editor
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0034"; //$NON-NLS-1$
-	}
-
-	public String getInfopopSectionPortNames() {
-		/* CONTEXT_ID EJSR0035 for the port name section in the webservicesclient.xml editor */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0035"; //$NON-NLS-1$
-	}
-
-	public String getInfopopResourceTree() {
-		/*
-		 * CONTEXT_ID EJSR0036 for the popup dialog that allows the user to select a resource in the
-		 * workbench
-		 */
-		return WebServicePlugin.PLUGIN_ID + "EJSR0036"; //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java
deleted file mode 100644
index d05b17c1a..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java
+++ /dev/null
@@ -1,358 +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.webservice.helper;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * This class contains methods to help navigate WSDL files provided in various JSR-109 descriptors
- */
-public class WSDLHelper {
-
-	private IProject proj;
-
-	public WSDLHelper(IProject aProject) {
-		this.proj = aProject;
-	}
-
-	/**
-	 * This method returns the list of wsdl:port@name's contained in the WSDL file referred to by
-	 * the specified <service-ref>
-	 * 
-	 * @param serviceRefName
-	 *            The name of the <service-ref>
-	 * @param compScopedRefName
-	 *            The name of the <component-scoped-refs>
-	 * @param wsc
-	 *            The root object of the webservicesclient.xml descriptor
-	 * @param exclude
-	 *            port names to exclude in the returned array
-	 * @return String[] An array of wsdl:port@names's. null is returned if there are any problems
-	 *         with navigating the webservicesclient.xml or the WSDL.
-	 */
-	public String[] getPortNames(String serviceRefName, String compScopedRefName, WebServicesClient wsc, String[] exclude) {
-		ServiceRef sr = getServiceRef(serviceRefName, compScopedRefName, wsc);
-		if (sr == null)
-			return null;
-
-		String wsdlURL = getWSDLFileURL(sr);
-		if (wsdlURL.length() == 0)
-			return null;
-
-		String serviceLocalName = getServiceQname(sr);
-		String[] portNames = getPortNames(wsdlURL, serviceLocalName);
-		portNames = trim(portNames, exclude);
-		return portNames;
-
-	}
-
-	/**
-	 * This method returns the namespace of the wsdl:service in WSDL file referred to by the
-	 * specified <service-ref>
-	 * 
-	 * @param serviceRefName
-	 *            The name of the <service-ref>
-	 * @param compScopedRefName
-	 *            The name of the <component-scoped-refs>
-	 * @param wsc
-	 *            The root object of the webservicesclient.xml descriptor
-	 * @param exclude
-	 *            port names to exclude in the returned array
-	 * @return String The namespace of the wsdl:service. null is returned if there are any problems
-	 *         with navigating the webservicesclient.xml or the WSDL.
-	 */
-	public String getPortNamespace(String serviceRefName, String compScopedRefName, WebServicesClient wsc) {
-		ServiceRef sr = getServiceRef(serviceRefName, compScopedRefName, wsc);
-		if (sr == null)
-			return null;
-
-		String wsdlURL = getWSDLFileURL(sr);
-		if (wsdlURL.length() == 0)
-			return ""; //$NON-NLS-1$
-
-		String serviceLocalName = getServiceQname(sr);
-		String namespace = getPortNamespace(wsdlURL, serviceLocalName);
-		return namespace;
-	}
-
-	/**
-	 * This method returns the list of wsdl:port@name's contained in the specified wsdl:service in
-	 * the specified WSDL file.
-	 * 
-	 * @param wsdlURL
-	 *            The URL of the WSDL file.
-	 * @param serviceLocalName
-	 *            The local name of the wsdl:service to look in.
-	 * @return String[] An array of wsdl:port@name's. Null is returned a wsdl:service with the
-	 *         specified local name could not be found.
-	 */
-	private String[] getPortNames(String wsdlURL, String serviceLocalName) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		Object targetService = getTargetService(wsdlURL, serviceLocalName);
-
-		if (targetService == null) {
-			//System.out.println("getPortNames ... targetService null.");
-			return null;
-		}
-
-		Map ports = serviceHelper.getServicePorts(targetService);
-		int numberOfPorts = ports.size();
-		String[] portNames = new String[numberOfPorts];
-		Iterator k = ports.values().iterator();
-		for (int m = 0; m < numberOfPorts; m++) {
-			Object port = k.next();
-			portNames[m] = serviceHelper.getPortName(port);
-		}
-
-		return portNames;
-	}
-
-	/**
-	 * This method returns the namespace of the specified wsdl:service in the specified WSDL file.
-	 * 
-	 * @param wsdlURL
-	 *            The URL of the WSDL file.
-	 * @param serviceLocalName
-	 *            The local name of the wsdl:service to look in.
-	 * @return String[] An array of wsdl:port@name's. An empty String is returned if a wsdl:service
-	 *         with the specified local name could not be found.
-	 */
-	private String getPortNamespace(String wsdlURL, String serviceLocalName) {
-		Object targetService = getTargetService(wsdlURL, serviceLocalName);
-
-		if (targetService == null) {
-			//System.out.println("getPortNamespace ... targetService null.");
-			return ""; //$NON-NLS-1$
-		}
-
-		return WSDLServiceExtManager.getServiceHelper().getServiceNamespaceURI(targetService);
-	}
-
-	private Object getTargetService(String wsdlURL, String serviceLocalName) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		Object definition = getWSDLDefinition(wsdlURL);
-		if (definition == null) {
-			return null;
-		}
-
-		Object targetService = null;
-		Map services = serviceHelper.getDefinitionServices(definition);
-		if (!services.isEmpty()) {
-			if ((serviceLocalName == null || serviceLocalName.length() == 0) && services.size() > 1) //Multiple
-			// services
-			// without
-			// one
-			// designated
-			// is
-			// an
-			// error
-			{
-				return null;
-			}
-
-			if ((serviceLocalName == null || serviceLocalName.length() == 0) && services.size() == 1) {
-				//Return the port names in the one service
-				Iterator i = services.values().iterator();
-				targetService = i.next();
-			} else //There are multiple services but one is designated
-			{
-				Iterator j = services.values().iterator();
-				while (j.hasNext()) {
-					Object service = j.next();
-					String serviceName = serviceHelper.getServiceLocalPart(service);
-					if (serviceName.equals(serviceLocalName)) {
-						targetService = service;
-						break; //Found a match. Break out of loop. We must be assuming unique names
-						// on services.
-					}
-				}
-			}
-		}
-
-		return targetService;
-
-	}
-
-
-	private Object getWSDLDefinition(String wsdlURL) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		return serviceHelper.getWSDLDefinition(wsdlURL);
-		
-		/*try {
-			WSDLResourceImpl res = (WSDLResourceImpl) WorkbenchResourceHelperBase.getResource(URI.createURI(wsdlURL), true);
-			if (res == null)
-				return null;
-			return res.getDefinition();
-		} catch (Exception wsdle) {
-			return null;
-		}*/
-	}
-
-	/**
-	 * Returns the file URL of the <wsdl-file>specified in the given <service-ref>. Returns a blank
-	 * String if <wsdl-file>is not specified in the provided <service-ref>
-	 */
-	private String getWSDLFileURL(ServiceRef sr) {
-		String wsdlFileRelPath = sr.getWsdlFile();
-		if (wsdlFileRelPath == null || wsdlFileRelPath.length() == 0)
-			return ""; //$NON-NLS-1$
-
-		// Get a handle on the WSDL file.
-		IVirtualComponent component = ComponentCore.createComponent(proj);
-		if (component != null) {
-			IVirtualFolder moduleRoot = component.getRootFolder().getFolder("/"); //$NON-NLS-1$
-			IFile wsdlFile = moduleRoot.getFile(wsdlFileRelPath).getUnderlyingFile();
-			if (!wsdlFile.exists()) {
-				return ""; //$NON-NLS-1$
-			}
-			//Get the fileURL from wsdlFile
-			String wsdlURL;
-			try {
-				wsdlURL = wsdlFile.getLocation().toFile().toURL().toString();
-			} catch (MalformedURLException murle) {
-				return ""; //$NON-NLS-1$
-			}
-
-			if (wsdlURL == null || wsdlURL.length() == 0)
-				return ""; //$NON-NLS-1$
-			return wsdlURL;
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the local part of the <service-qname>specified in the given <service-ref>. Returns a
-	 * blank String if <service-qname>is not specified in the provided <service-ref>
-	 */
-	private String getServiceQname(ServiceRef sr) {
-		QName serviceQname = sr.getServiceQname();
-		if (serviceQname == null)
-			return ""; //$NON-NLS-1$
-
-		String serviceLocalName = serviceQname.getLocalPart();
-		if (serviceLocalName == null)
-			return ""; //$NON-NLS-1$
-
-		return serviceLocalName;
-	}
-
-	/* If compScopedRefName is empty or null, we may have to check all of them. */
-	public ServiceRef getServiceRef(String name, String compScopedRefName, WebServicesClient wsc) {
-		Iterator serviceRefs;
-		if (compScopedRefName != null && compScopedRefName.length() > 0) {
-			ComponentScopedRefs csr = getCompScopedRef(compScopedRefName, wsc);
-			serviceRefs = csr.getServiceRefs().iterator();
-		} else {
-			serviceRefs = wsc.getServiceRefs().iterator();
-			//If there are no service refs ... check all component-scoped-refs for the service-ref
-			if (!serviceRefs.hasNext()) {
-				Iterator csRefs = wsc.getComponentScopedRefs().iterator();
-
-				while (csRefs.hasNext()) {
-					ComponentScopedRefs csr = (ComponentScopedRefs) csRefs.next();
-					Iterator srs = csr.getServiceRefs().iterator();
-					while (srs.hasNext()) {
-						ServiceRef sr = (ServiceRef) srs.next();
-						String thisName = sr.getServiceRefName();
-						if (thisName.equals(name)) {
-							return sr;
-						}
-					}
-				}
-
-				return null; //Could not find it in any of the component-scoped-refs
-			}
-
-		}
-
-		while (serviceRefs.hasNext()) {
-			ServiceRef serviceRef = (ServiceRef) serviceRefs.next();
-			String serviceRefName = serviceRef.getServiceRefName();
-			if (serviceRefName.equals(name))
-				return serviceRef;
-		}
-		return null;
-	}
-
-
-	private ComponentScopedRefs getCompScopedRef(String name, WebServicesClient wsc) {
-		Iterator compScopedRefs = wsc.getComponentScopedRefs().iterator();
-		while (compScopedRefs.hasNext()) {
-			ComponentScopedRefs compScopedRef = (ComponentScopedRefs) compScopedRefs.next();
-			String compScopedRefName = compScopedRef.getComponentName();
-			if (compScopedRefName.equals(name))
-				return compScopedRef;
-		}
-		return null;
-
-	}
-
-
-	private String[] trim(String[] values, String[] exclude) {
-		if (values == null || values.length == 0 || exclude == null || exclude.length == 0) //no
-			// change
-			// required.
-			// return
-			// as
-			// is.
-			return values;
-
-		String[] finalValues;
-		ArrayList finalList = new ArrayList();
-		for (int i = 0; i < values.length; i++) {
-			if (!contains(exclude, values[i])) {
-				finalList.add(values[i]);
-			}
-		}
-
-		int finalSize = finalList.size();
-		finalValues = new String[finalSize];
-		Object[] finalArray = finalList.toArray();
-		for (int j = 0; j < finalSize; j++) {
-			finalValues[j] = (String) (finalArray[j]);
-		}
-
-		return finalValues;
-
-	}
-
-	/**
-	 * Returns true if the array of String's contains the specified String. False otherwise.
-	 */
-	private boolean contains(String[] values, String s) {
-		if (values == null)
-			return false;
-
-		for (int i = 0; i < values.length; i++) {
-			if (values[i].equals(s))
-				return true;
-		}
-
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java
deleted file mode 100644
index df42d7c8b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java
+++ /dev/null
@@ -1,207 +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.webservice.helper;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLServiceHelperImpl implements WSDLServiceHelper {
-
-	/**
-	 * 
-	 */
-	public WSDLServiceHelperImpl() {
-		super();
-	} 
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortName(java.lang.Object)
-	 */
-	public String getPortName(Object port) {
-		Port aPort = (Port)port;
-		return aPort.getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServicePorts(java.lang.Object)
-	 */
-	public Map getServicePorts(Object aService) {
-		Service service =(Service)aService;
-		return service.getPorts();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceNamespaceURI(java.lang.Object)
-	 */
-	public String getServiceNamespaceURI(Object aService) {
-		Service service =(Service)aService;
-		return service.getQName().getNamespaceURI();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceDefinitionLocation(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getServiceDefinitionLocation(EObject aService) {
-		Service service =(Service)aService;
-		return service.getEnclosingDefinition().getLocation();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortBindingNamespaceURI(java.lang.Object)
-	 */
-	public String getPortBindingNamespaceURI(Object aPort) {
-		Port port = (Port)aPort;
-		return port.getBinding().getQName().getNamespaceURI();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceLocalPart(java.lang.Object)
-	 */
-	public String getServiceLocalPart(Object aService) {
-		Service service =(Service)aService;
-		return service.getQName().getLocalPart();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceQName(java.lang.Object)
-	 */
-	public Object getServiceQName(Object aService) {
-		Service service =(Service)aService;
-		return service.getQName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getDefinitionServices(java.lang.Object)
-	 */
-	public Map getDefinitionServices(Object aDefinition) {
-		Definition definition =(Definition)aDefinition;
-		return definition.getServices();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(java.lang.String)
-	 */
-	public Object getWSDLDefinition(String wsdlURL) {
-		try {
-			WSDLResourceImpl res = (WSDLResourceImpl) WorkbenchResourceHelperBase.getResource(URI.createURI(wsdlURL), true);
-			if (res == null)
-				return null;
-			return res.getDefinition();
-		} catch (Exception wsdle) {
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(org.eclipse.emf.ecore.resource.Resource)
-	 */
-	public Object getWSDLDefinition(Resource wsdlResource) {
-		return ((WSDLResourceImpl)wsdlResource).getDefinition();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWsdlServicesFromWsilFile(org.eclipse.core.resources.IFile)
-	 */
-	public List getWsdlServicesFromWsilFile(IFile wsil) {
-		List result = new ArrayList();
-		WebServiceEntity entity = parseWsilFile(wsil);
-		if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSIL) {
-			// get all the WSDL references from the WSIL entity
-			List wsdlList = entity.getChildren();
-			for (Iterator it = wsdlList.iterator(); it.hasNext();) {
-				Object item = it.next();
-				if (item != null && item instanceof WebServiceEntity) {
-					if (((WebServiceEntity) item).getModel() != null && ((WebServiceEntity) item).getModel() instanceof Definition) {
-						Definition def = (Definition) ((WebServiceEntity) item).getModel();
-						if (def != null && !def.getServices().isEmpty())
-							result.addAll(def.getServices().values());
-					}
-				}
-			}
-		}
-		return result;
-	}
-	public WebServiceEntity parseWsilFile(IFile wsil) {
-	WebServicesParser parser = null;
-	String url = null;
-	// verify proper input
-	if (wsil == null || !wsil.getFileExtension().equals(WSIL_EXT))
-		return null;
-	// Parse wsil file to get wsdl services
-	try {
-		url = wsil.getLocation().toFile().toURL().toString();
-		parser = new WebServicesParser(url);
-		parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_WSDL);
-	} catch (Exception e) {
-		//Ignore
-	}
-	if (parser == null)
-		return null;
-	return parser.getWebServiceEntityByURI(url);
-}
-
-	public boolean isService(Object aService) {
-		
-		return aService instanceof Service;
-	}
-	public boolean isWSDLResource(Object aResource) {
-		
-		return aResource instanceof WSDLResourceImpl;
-	}
-	public boolean isDefinition(Object aDefinition) {
-		
-		return aDefinition instanceof Definition;
-	}
-
-
-	public List get13ServiceRefs(EObject j2eeObject) {
-		if (j2eeObject instanceof ApplicationClient)
-			return WebServicesManager.getInstance().get13ServiceRefs((ApplicationClient)j2eeObject);
-		else if (j2eeObject instanceof EnterpriseBean)
-			return WebServicesManager.getInstance().get13ServiceRefs((EnterpriseBean)j2eeObject);
-		else if (j2eeObject instanceof WebApp)
-			return WebServicesManager.getInstance().get13ServiceRefs((WebApp)j2eeObject);
-		else
-			return Collections.EMPTY_LIST;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java
deleted file mode 100644
index 37be5b738..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-public class WebServiceEvent {
-
-	public static final int REFRESH = 1;
-	public static final int REMOVE = 0;
-	
-	private int eventType = 0;
-	
-	public WebServiceEvent(int anEventType) {
-		super();
-		eventType = anEventType;
-	}
-	
-	public int getEventType() {
-		return eventType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java
deleted file mode 100644
index e1dcaee55..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-public interface WebServiceManagerListener {
-
-	public void webServiceManagerChanged(WebServiceEvent anEvent);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java
deleted file mode 100644
index 5a3d751a1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java
+++ /dev/null
@@ -1,975 +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 Feb 9, 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.webservice.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSCDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
-	private HashMap wsArtifactEdits = new HashMap();
-	private HashMap wsClientArtifactEdits = new HashMap();
-	private List wsArtifactEditsList;
-	private List wsClientArtifactEditsList;
-	private static WebServicesManager INSTANCE = null;
-	private List listeners;
-	private List removedListeners = new ArrayList();
-	private boolean isNotifying = false;
-	private boolean wsClientElementsChanged = true;
-	private boolean wsElementsChanged = true;
-
-	public static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
-	public static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
-
-	public synchronized static WebServicesManager getInstance() {
-		if (INSTANCE == null)
-			INSTANCE = new WebServicesManager();
-		return INSTANCE;
-	}
-
-	/**
-	 * Default Constructor
-	 */
-	public WebServicesManager() {
-		super();
-		init();
-	}
-
-	private void init() {
-		collectArtifactEdits();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-	}
-	
-	private void addArtifactEdit(IProject handle) {
-		synchronized(wsArtifactEdits) {
-			if (!wsArtifactEdits.containsKey(handle)) {
-				WSDDArtifactEdit edit = WSDDArtifactEdit.getWSDDArtifactEditForRead(handle);
-				if (edit != null) {
-					WebServices webServices = edit.getWebServices();
-					// If the project has a webservice.xml with internal services or 
-					// it has .wsil files with external services, we cache the artifact edit
-					if ((webServices != null && !webServices.getWebServiceDescriptions().isEmpty()) || !edit.getWSILResources().isEmpty()) {
-						edit.addListener(this);
-						wsArtifactEdits.put(handle, edit);
-						wsElementsChanged = true;
-					// Otherwise, dispose the artifact edit
-					} else {
-						edit.dispose();
-					}
-				}
-			}
-		}
-		synchronized (wsClientArtifactEdits) {
-			if (!wsClientArtifactEdits.containsKey(handle)) {
-				WSCDDArtifactEdit edit = WSCDDArtifactEdit.getWSCDDArtifactEditForRead(handle);
-				if (edit != null) {
-					WebServicesResource res = edit.getWscddXmiResource();
-					boolean isInterested = false;
-					// Does the project have 1.3 web service clients?
-					if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
-						isInterested = true;
-					
-					// Does the project have 1.4 web service clients?
-					List wsClientEdits = new ArrayList();
-					wsClientEdits.add(edit);
-					if (!getWorkspace14ServiceRefs(wsClientEdits).isEmpty())
-						isInterested = true;
-					
-					// If project has 1.3 or 1.4 web service clients, cache the artifact edit
-					if (isInterested) {
-						edit.addListener(this);
-						wsClientArtifactEdits.put(handle, edit);
-						wsClientElementsChanged = true;
-					// Otherwise, dispose the artifact edit	
-					} else {
-						edit.dispose();
-					}
-				}
-			}
-		}
-	}
-	
-	private void removeArtifactEdit(IProject handle) {
-		synchronized(wsArtifactEdits) {
-			if (wsArtifactEdits.containsKey(handle)) {
-				ArtifactEdit edit = (ArtifactEdit) wsArtifactEdits.get(handle);
-				if (edit != null) {
-					wsArtifactEdits.remove(handle);
-					edit.removeListener(this);
-					edit.dispose();
-					wsElementsChanged = true;
-				}
-			}
-		}
-		synchronized (wsClientArtifactEdits) {
-			if (wsClientArtifactEdits.containsKey(handle)) {
-				ArtifactEdit edit = (ArtifactEdit) wsClientArtifactEdits.get(handle);
-				if (edit != null) {
-					wsClientArtifactEdits.remove(handle);
-					edit.removeListener(this);
-					edit.dispose();
-					wsClientElementsChanged = true;
-				}
-			}
-		}
-	}
-
-	private void collectArtifactEdits() {
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			IProject project = projects[i];
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			try {
-				if (!ModuleCoreNature.isFlexibleProject(project) || J2EEProjectUtilities.isEARProject(project) || J2EEProjectUtilities.isStaticWebProject(project))
-					continue;
-			} catch (Exception e) {
-				continue;
-			}
-			addArtifactEdit(component.getProject());
-		}
-	}
-
-	/**
-	 * @return Returns the artifact edit iterator for web service artifact edits
-	 */
-	private List getWSArtifactEdits() {
-		synchronized (wsArtifactEdits) {
-			if (wsElementsChanged) {
-				wsArtifactEditsList = new ArrayList();
-				wsArtifactEditsList.addAll(wsArtifactEdits.values());
-				wsElementsChanged = false;
-			}
-		}
-		return wsArtifactEditsList;
-	}
-	
-	/**
-	 * @return Returns the editModels.
-	 */
-	private List getWSClientArtifactEdits() {
-		synchronized (wsClientArtifactEdits) {
-			if (wsClientElementsChanged) {
-				wsClientArtifactEditsList = new ArrayList();
-				wsClientArtifactEditsList.addAll(wsClientArtifactEdits.values());
-				wsClientElementsChanged = false;
-			}
-		}
-		return wsClientArtifactEditsList;
-	}
-
-	private List getListeners() {
-		if (listeners == null)
-			listeners = new ArrayList();
-		return listeners;
-	}
-
-	/**
-	 * Add aListener to the list of listeners.
-	 */
-	public void addListener(WebServiceManagerListener aListener) {
-		if (aListener != null && !getListeners().contains(aListener))
-			getListeners().add(aListener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-	 */
-	public void editModelChanged(EditModelEvent anEvent) {
-		if (anEvent == null)
-			return;
-		if (anEvent.getEventCode()==EditModelEvent.UNLOADED_RESOURCE) {
-			List resources = anEvent.getChangedResources();
-			for (int i=0; i<resources.size(); i++) {
-				Resource res = (Resource) resources.get(i);
-				if (isInterestedInResource(res))
-					notifyListeners(anEvent.getEventCode());
-			}
-		}
-		else if (anEvent.getEventCode() == EditModelEvent.PRE_DISPOSE) {
-			ArtifactEditModel editModel = (ArtifactEditModel) anEvent.getEditModel();
-			if (editModel == null || editModel.getProject() == null)
-				return;
-			removeArtifactEdit(editModel.getProject());
-			notifyListeners(anEvent.getEventCode());
-		}
-	}
-
-
-	/**
-	 * Notify listeners of
-	 * 
-	 * @anEvent.
-	 */
-	protected void notifyListeners(int anEventType) {
-		if (listeners == null)
-			return;
-		synchronized (this) {
-			isNotifying = true;
-		}
-		try {
-			WebServiceEvent webServiceEvent = null;
-			
-			switch (anEventType) {
-			case EditModelEvent.UNLOADED_RESOURCE:
-			case EditModelEvent.PRE_DISPOSE:
-			case EditModelEvent.REMOVED_RESOURCE:
-				webServiceEvent = new WebServiceEvent(WebServiceEvent.REMOVE);
-				break;
-			default:
-				if (!getAllWorkspaceServiceRefs().isEmpty() || !getAllWSDLServices().isEmpty())
-					webServiceEvent = new WebServiceEvent(WebServiceEvent.REFRESH);
-			}
-			List list = getListeners();
-			if (webServiceEvent!=null) {
-				for (int i = 0; i < list.size(); i++) {
-					((WebServiceManagerListener) list.get(i)).webServiceManagerChanged(webServiceEvent);
-				}
-			}
-		} finally {
-			synchronized (this) {
-				isNotifying = false;
-				if (removedListeners != null && !removedListeners.isEmpty()) {
-					for (int i = 0; i < removedListeners.size(); i++)
-						listeners.remove(removedListeners.get(i));
-					removedListeners.clear();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Remove aListener from the list of listeners.
-	 */
-	public synchronized boolean removeListener(WebServiceManagerListener aListener) {
-		if (aListener != null) {
-			if (isNotifying)
-				return removedListeners.add(aListener);
-			return getListeners().remove(aListener);
-		}
-		return false;
-	}
-
-	private void releaseArtifactEdits() {
-		synchronized (wsArtifactEdits) {
-			Iterator iter = wsArtifactEdits.values().iterator();
-			while (iter.hasNext()) {
-				WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
-				artifactEdit.removeListener(this);
-				artifactEdit.dispose();
-			}
-			wsArtifactEdits.clear();
-		}
-		
-		synchronized (wsClientArtifactEdits) {
-			Iterator iter = wsClientArtifactEdits.values().iterator();
-			while (iter.hasNext()) {
-				WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
-				artifactEdit.removeListener(this);
-				artifactEdit.dispose();
-			}
-			wsClientArtifactEdits.clear();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		acceptDelta(event);
-	}
-
-
-	protected void acceptDelta(IResourceChangeEvent event) {
-		IResourceDelta delta = event.getDelta();
-		// search for changes to any projects using a visitor
-		if (delta != null) {
-			try {
-				delta.accept(this);
-			} catch (Exception e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-	}
-
-	/**
-	 * returns a list of internal web services descriptions in the workspace
-	 */
-	public List getInternalWebServicesDescriptions() {
-		List result = new ArrayList();
-		List webServices = getInternalWebServices();
-		for (int i = 0; i < webServices.size(); i++) {
-			WebServices webService = (WebServices) webServices.get(i);
-			if (webService != null)
-				result.addAll(webService.getWebServiceDescriptions());
-		}
-		return result;
-	}
-
-	/**
-	 * @return all internal web services instances in workspace
-	 */
-	public List getInternalWebServices() {
-		List result = new ArrayList();
-		Iterator iter = getWSArtifactEdits().iterator();
-		while (iter.hasNext()) {
-			WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
-			WebServices webServices = artifactEdit.getWebServices();
-			if (webServices != null)
-				result.add(webServices);
-		}
-		return result;
-	}
-
-	/**
-	 * returns a list of all the internal wsdl services in wsdl's pointed to by wsdd's
-	 */
-	public List getInternalWSDLServices() {
-		return getWSDLServicesFromWSDLResources(getInternalWSDLResources());
-	}
-
-	public List getInternalWSDLResources() {
-		List result = new ArrayList();
-		List wsddWebServices = getInternalWebServicesDescriptions();
-		for (int i = 0; i < wsddWebServices.size(); i++) {
-			WebServiceDescription webServices = (WebServiceDescription) wsddWebServices.get(i);
-			Resource wsdl = getWSDLResource(webServices);
-			if (wsdl != null && !result.contains(wsdl))
-				result.add(wsdl);
-		}
-		return result;
-	}
-
-		public List getExternalWSDLResources() {
-			//TODO fix up for basis off .wsil
-			List result = getWorkspaceWSDLResources();
-			result.removeAll(getInternalWSDLResources());
-			List serviceRefs = getAllWorkspaceServiceRefs();
-			for (int i=0; i<serviceRefs.size(); i++) {
-				ServiceRef ref = (ServiceRef) serviceRefs.get(i);
-				try {
-					Resource res = WorkbenchResourceHelperBase.getResource(URI.createURI(ref.getWsdlFile()), true);
-					if (res !=null && result.contains(res))
-						result.remove(res);
-				} catch (Exception e) {
-					//Ignore
-				}
-			}
-			return result;
-		}
-		
-	public boolean isServiceInternal(EObject service) {
-		return getInternalWSDLResources().contains(getWSDLResource(service));
-	}
-
-	private List getWSDLServicesFromWSDLResources(List wsdlResources) {
-		List result = new ArrayList();
-		for (int i = 0; i < wsdlResources.size(); i++) {
-			Resource wsdl = (Resource) wsdlResources.get(i);
-			List services = getWSDLServices(wsdl);
-			if (wsdl != null && services != null && !services.isEmpty())
-				result.addAll(services);
-		}
-		return result;
-	}
-
-	public List getExternalWSDLServices() {
-		List result = getWsdlServicesFromWorkspaceWSILs();
-		result.removeAll(getInternalWSDLServices());
-		return result;
-	}
-
-	public List getWsdlServicesFromWorkspaceWSILs() {
-		List result = new ArrayList();
-		List wsilFiles = getWorkspaceWSILFiles();
-		for (int i = 0; i < wsilFiles.size(); i++) {
-			IFile wsil = (IFile) wsilFiles.get(i);
-			List services = getWsdlServicesFromWsilFile(wsil);
-			if (!services.isEmpty())
-				result.addAll(services);
-		}
-	return result;
-	}
-
-	public List getWsdlServicesFromWsilFile(IFile wsil) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		return serviceHelper.getWsdlServicesFromWsilFile(wsil);
-	}
-
-	/**
-	 * Returns all WSDL Services, both internal and external
-	 */
-	public List getAllWSDLServices() {
-		List result = new ArrayList();
-		result.addAll(getInternalWSDLServices());
-		result.addAll(getExternalWSDLServices());
-		return result;
-	}
-
-	protected void dispose() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		releaseArtifactEdits();
-		INSTANCE = null;
-	}
-
-	public Resource getWSDLResource(WebServiceDescription webService) {
-		if (webService == null)
-			return null;
-		String wsdlFileName = webService.getWsdlFile();
-		Resource res = null;
-		IVirtualResource[] resources = ComponentCore.createResources(WorkbenchResourceHelper.getFile(webService));
-		if (resources == null || resources.length==0) return res;
-		WSDDArtifactEdit artifactEdit = getExistingWSDDArtifactEdit(resources[0].getComponent().getProject());
-		if (artifactEdit!=null) 
-			res = artifactEdit.getWsdlResource(wsdlFileName);
-		return res;
-	}
-	
-	private WSDDArtifactEdit getExistingWSDDArtifactEdit(IProject project) {
-		List wsEdits = getWSArtifactEdits();
-		for (int i=0; i<wsEdits.size(); i++) {
-			WSDDArtifactEdit edit = (WSDDArtifactEdit) wsEdits.get(i);
-			if (edit !=null && edit.getProject()!= null && edit.getProject().equals(project))
-				return edit;
-		}
-		return null;
-	}
-	
-	private WSCDDArtifactEdit getExistingWSCDDArtifactEdit(IProject project) {
-		List wsClientEdits = getWSClientArtifactEdits();
-		for (int i=0; i<wsClientEdits.size(); i++) {
-			WSCDDArtifactEdit edit = (WSCDDArtifactEdit) wsClientEdits.get(i);
-			if (edit !=null && edit.getProject()!= null && edit.getProject().equals(project))
-				return edit;
-		}
-		return null;
-	}
-
-	public List getWSDLServices(Resource wsdl) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		List result = new ArrayList();
-		Object def = serviceHelper.getWSDLDefinition(wsdl);
-		if (def == null)
-			return result;
-		result = new ArrayList(serviceHelper.getDefinitionServices(def).values());
-		return result;
-	}
-
-	public EObject getWSDLServiceForWebService(WebServiceDescription webService) {
-		EObject service = null;
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		Resource wsdl = getWSDLResource(webService);
-		if (wsdl == null) return service;
-		Object definition = serviceHelper.getWSDLDefinition(wsdl);
-		if (definition == null) return service;
-		Map services = serviceHelper.getDefinitionServices(definition);
-		if (services.isEmpty()) return service;
-		PortComponent portComp = null;
-		if (webService.getPortComponents()!=null && webService.getPortComponents().size()>0) {
-			portComp = (PortComponent) webService.getPortComponents().get(0);
-			return getService(portComp);
-		}
-		return service;
-	}
-
-	public Resource getWSDLResource(EObject wsdlService) {
-		return wsdlService.eResource();
-	}
-
-	public EObject getService(PortComponent port) {
-		List services = getInternalWSDLServices();
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		for (int i = 0; i < services.size(); i++) {
-			EObject service = (EObject)services.get(i);
-			if (serviceHelper.getServicePorts(service).size() == 1) {
-				Object wsdlPort = serviceHelper.getServicePorts(service).values().toArray()[0];
-				String qName = serviceHelper.getPortBindingNamespaceURI(wsdlPort);
-				if (port.getWsdlPort().getNamespaceURI().equals(qName))
-					return service;
-			}
-		}
-		return null;
-	}
-
-	public PortComponent getPortComponent(String qName) {
-		List wsDescs = getInternalWebServicesDescriptions();
-		for (int i = 0; i < wsDescs.size(); i++) {
-			WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
-			List ports = wsDesc.getPortComponents();
-			for (int j = 0; j < ports.size(); j++) {
-				PortComponent portComp = (PortComponent) ports.get(j);
-				if (portComp.getWsdlPort().getNamespaceURI().equals(qName))
-					return portComp;
-			}
-		}
-		return null;
-	}
-
-	public PortComponent getPortComponent(String qName, IProject project) {
-		List wsDescs = getInternalWebServicesDescriptions();
-		for (int i = 0; i < wsDescs.size(); i++) {
-			WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
-			List ports = wsDesc.getPortComponents();
-			for (int j = 0; j < ports.size(); j++) {
-				PortComponent portComp = (PortComponent) ports.get(j);
-				if (project == ProjectUtilities.getProject(portComp))
-					return portComp;
-			}
-		}
-		return null;
-	}
-
-	public PortComponent getPortComponent(EObject wsdlService) {
-		// If there is only one port in the wsdl service, find the matching port component
-		// otherwise if multiple ports return null because we need more information
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (wsdlService == null || serviceHelper.getServicePorts(wsdlService).isEmpty())
-			return null;
-		if (serviceHelper.getServicePorts(wsdlService).size() == 1) {
-			Object port = serviceHelper.getServicePorts(wsdlService).values().toArray()[0];
-			String qName = serviceHelper.getPortBindingNamespaceURI(port);
-			return getPortComponent(qName, ProjectUtilities.getProject(wsdlService));
-		}
-		return null;
-	}
-
-	public ServiceImplBean getServiceImplBean(EObject wsdlService) {
-		PortComponent port = getPortComponent(wsdlService);
-		if (port == null)
-			return null;
-		return port.getServiceImplBean();
-	}
-
-	public WsddResource getWsddResource(EObject wsdlService) {
-		PortComponent port = getPortComponent(wsdlService);
-		if (port == null)
-			return null;
-		return (WsddResource) port.eResource();
-	}
-
-	public String getServiceEndpointInterface(EObject wsdlService) {
-		PortComponent port = getPortComponent(wsdlService);
-		if (port == null)
-			return null;
-		return port.getServiceEndpointInterface();
-	}
-
-	public List getAllWorkspaceServiceRefs() {
-		List result = new ArrayList();
-		result.addAll(getWorkspace13ServiceRefs());
-		result.addAll(getWorkspace14ServiceRefs());
-		return result;
-	}
-
-	public List getWorkspace13ServiceRefs() {
-		List result = new ArrayList();
-		Iterator iter = getWSClientArtifactEdits().iterator();
-		while (iter.hasNext()) {
-			WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
-			WebServicesResource res = artifactEdit.getWscddXmiResource();
-			if (res != null && res.isLoaded() && res.getWebServicesClient() != null) {
-				if (J2EEProjectUtilities.isEJBProject(artifactEdit.getProject())) {
-					List scopedBeans = res.getWebServicesClient().getComponentScopedRefs();
-					for (Iterator iterator = scopedBeans.iterator(); iterator.hasNext();) {
-						ComponentScopedRefs refBean = (ComponentScopedRefs) iterator.next();
-						result.addAll(refBean.getServiceRefs());
-					}
-				} else	result.addAll(res.getWebServicesClient().getServiceRefs());
-			}
-		}
-		return result;
-	}
-
-	public List get13ServiceRefs(IProject handle) {
-		List result = new ArrayList();
-		WSCDDArtifactEdit wsClientArtifactEdit = getExistingWSCDDArtifactEdit(handle);
-		if (wsClientArtifactEdit !=null) {
-			WebServicesResource res = wsClientArtifactEdit.getWscddXmiResource();
-			if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
-				result.addAll(res.getWebServicesClient().getServiceRefs());
-		}
-		return result;
-	}
-
-	public List getWorkspace14ServiceRefs() {
-		return getWorkspace14ServiceRefs(getWSClientArtifactEdits());
-	}
-	
-	private List getWorkspace14ServiceRefs(List wsClientArtifactEdits) {
-		Iterator iter = wsClientArtifactEdits.iterator();
-		List result = new ArrayList();
-		while (iter.hasNext()) {
-			WSCDDArtifactEdit wscArtifactEdit = (WSCDDArtifactEdit) iter.next();
-			ArtifactEdit artifactEdit = ArtifactEdit.getArtifactEditForRead(wscArtifactEdit.getProject());
-			try {
-				EObject rootObject = null;
-				if (artifactEdit!=null)
-					rootObject = artifactEdit.getContentModelRoot();
-				// handle EJB project case
-				if (rootObject instanceof EJBJar) {
-					List cmps = ((EJBJar) rootObject).getEnterpriseBeans();
-					for (int j = 0; j < cmps.size(); j++) {
-						EnterpriseBean bean = (EnterpriseBean) cmps.get(j);
-						if (bean.getServiceRefs() != null && !bean.getServiceRefs().isEmpty())
-							result.addAll(bean.getServiceRefs());
-					}
-				}
-				// handle Web Project
-				else if (rootObject instanceof WebApp) {
-					if (((WebApp) rootObject).getServiceRefs() != null && !((WebApp) rootObject).getServiceRefs().isEmpty())
-						result.addAll(((WebApp) rootObject).getServiceRefs());
-				}
-				// handle App clients
-				else if (rootObject instanceof ApplicationClient) {
-					if (((ApplicationClient) rootObject).getServiceRefs() != null && !((ApplicationClient) rootObject).getServiceRefs().isEmpty())
-						result.addAll(((ApplicationClient) rootObject).getServiceRefs());
-				}
-			} finally {
-				if (artifactEdit != null)
-					artifactEdit.dispose();
-			}
-		}
-		return result;
-	}
-
-	public boolean isJ2EE14(ServiceRef ref) {
-		return !(ref.eContainer() instanceof WebServicesClient);
-	}
-
-	public List getWorkspaceWSILFiles() {
-		List result = new ArrayList();
-		Iterator iter = getWSArtifactEdits().iterator();
-		while (iter.hasNext()) {
-			WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
-			List files = artifactEdit.getWSILResources();
-			for (int j = 0; j < files.size(); j++) {
-				IFile file = (IFile) files.get(j);
-				if (file != null && WSIL_EXT.equals(file.getFileExtension()))
-					result.add(file);
-			}
-		}
-		return result;
-	}
-
-	public List getWorkspaceWSDLResources() {
-		List result = new ArrayList();
-		Iterator iter = getWSArtifactEdits().iterator();
-		while (iter.hasNext()) {
-			WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
-			IProject project = artifactEdit.getProject();
-			if (project != null) {
-				List wsdlResources = artifactEdit.getWSDLResources();
-				if (wsdlResources != null && !wsdlResources.isEmpty()) {
-					for (int j = 0; j < wsdlResources.size(); j++) {
-						Resource wsdl = (Resource) wsdlResources.get(j);
-						if (!result.contains(wsdl))
-							result.add(wsdl);
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	public List getWSDLServices() {
-		List result = new ArrayList();
-		List internalWsdls = getInternalWSDLServices();
-		if (internalWsdls != null && !internalWsdls.isEmpty())
-			result.addAll(internalWsdls);
-		//TODO add externals
-		return result;
-	}
-
-	/**
-	 * @param bean
-	 * @return
-	 */
-	public List get13ServiceRefs(EnterpriseBean bean) {
-		WSCDDArtifactEdit artifactEdit = null;
-		IFile file = WorkbenchResourceHelper.getFile(bean);
-		if (file!=null)
-			artifactEdit = getExistingWSCDDArtifactEdit(file.getProject());
-		if (artifactEdit !=null) {
-			WebServicesResource res = artifactEdit.getWscddXmiResource();
-			if (res != null && res.getWebServicesClient() != null) {
-				String ejbName = bean.getName();
-				List scopes = res.getWebServicesClient().getComponentScopedRefs();
-				for (Iterator iter = scopes.iterator(); iter.hasNext();) {
-					ComponentScopedRefs scope = (ComponentScopedRefs) iter.next();
-					if (scope.getComponentName().equals(ejbName))
-						return scope.getServiceRefs();
-				}
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @param client
-	 * @return
-	 */
-	public List get13ServiceRefs(ApplicationClient client) {
-		IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(client));
-		if (handle == null)
-			return Collections.EMPTY_LIST;
-		WSCDDArtifactEdit artifactEdit = getExistingWSCDDArtifactEdit(handle);
-		if (artifactEdit !=null) {
-			WebServicesResource res = artifactEdit.getWscddXmiResource();
-			if (res != null) {
-				WebServicesClient webClient = res.getWebServicesClient();
-				if (webClient != null)
-					return webClient.getServiceRefs();
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @param webapp
-	 * @return
-	 */
-	public List get13ServiceRefs(WebApp webapp) {
-		IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(webapp));
-		if (handle == null)
-			return Collections.EMPTY_LIST;
-		WSCDDArtifactEdit artifactEdit = getExistingWSCDDArtifactEdit(handle);
-		if (artifactEdit !=null) {
-			WebServicesResource res = artifactEdit.getWscddXmiResource();
-			if (res != null) {
-				WebServicesClient webClient = res.getWebServicesClient();
-				if (webClient != null)
-					return webClient.getServiceRefs();
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-	 */
-	public boolean visit(IResourceDelta delta) throws CoreException {
-		IResource resource = delta.getResource();
-		if (resource.getType() == IResource.PROJECT) {
-			IProject p = (IProject) resource;
-			// Handle project adds and project opens
-			if ((delta.getKind()==IResourceDelta.ADDED || (((delta.getFlags() & IResourceDelta.OPEN) != 0) && p.isAccessible()))) {
-				IVirtualComponent component = ComponentCore.createComponent(p);
-				if (component!=null && !J2EEProjectUtilities.isEARProject(p) && !J2EEProjectUtilities.isStaticWebProject(p)) {
-					addArtifactEdit(p);
-					notifyListeners(EditModelEvent.ADDED_RESOURCE);
-					return false;
-				}
-			}
-			// Handle project close events and removals 
-			else if ((delta.getKind() == IResourceDelta.CHANGED  && ((delta.getFlags() & IResourceDelta.OPEN) != 0))
-					|| (delta.getKind() == IResourceDelta.REMOVED)){
-				removeArtifactEdit(p);
-				return false;
-			}
-		}
-		
-		else if (resource.getType() == IResource.FILE && isInterrestedInFile((IFile) resource)) {
-			// Handle WSIL and WSDL File additions
-			if ((delta.getKind() == IResourceDelta.ADDED) || ((delta.getFlags() & IResourceDelta.MOVED_TO) != 0)) {
-				if (resource.getFileExtension().equals(WSDL_EXT))
-				    addedWsdl((IFile) resource);
-				else if (resource.getFileExtension().equals(WSIL_EXT))
-				    addedWsil((IFile)resource);
-			}
-			// Handle WSIL or WSDL file removals
-			else if ((delta.getKind() == IResourceDelta.REMOVED) || ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0)) {
-				if (resource.getFileExtension().equals(WSDL_EXT) || resource.getFileExtension().equals(WSIL_EXT))
-				notifyListeners(EditModelEvent.UNLOADED_RESOURCE);
-			}
-			return false;
-		}
-		return true;
-	}
-
-	protected void addedWsdl(IFile wsdl) {
-		if (!wsdl.exists())
-			return;
-		IProject handle = getComponentProject(wsdl);
-		if (handle != null) {
-			addArtifactEdit(handle);
-			notifyListeners(EditModelEvent.LOADED_RESOURCE);
-		}
-	}
-
-	protected void addedWsil(IFile wsil) {
-		if (!wsil.exists())
-			return;
-		IProject handle = getComponentProject(wsil);
-		if (handle != null) {
-			addArtifactEdit(handle);
-			notifyListeners(EditModelEvent.LOADED_RESOURCE);
-		}
-	}
-	
-	private IProject getComponentProject(IFile res) {
-		if (res==null)
-			return null;
-		return res.getProject();
-	}
-
-	protected boolean isInterrestedInFile(IFile aFile) {
-		if (aFile != null && aFile.getFileExtension() != null) {
-			String extension = aFile.getFileExtension();
-			return extension.equals(WSDL_EXT) || extension.equals(WSIL_EXT);
-		}
-		return false;
-	}
-	
-	/**
-	 * The only resources webservice manager is concerned about are:
-	 * webservice.xml, webserviceclient.xml, and J2EE 1.4 web.xml, ejb-jar-xml, and application-client.xml
-	 * @param res
-	 * @return boolean isInterested
-	 */
-	private boolean isInterestedInResource(Resource res) {
-		if (res instanceof WsddResource || res instanceof WebServicesResource) {
-			return true;
-		} else if (res instanceof EJBResource || res instanceof WebAppResource || res instanceof ApplicationClientResource) {
-			return ((XMLResource)res).getJ2EEVersionID()>J2EEVersionConstants.J2EE_1_3_ID;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param object
-	 * @return
-	 */
-	public Collection getServiceRefs(EJBJar jar) {
-
-		List list = new ArrayList();
-		List beans = jar.getEnterpriseBeans();
-		try {
-			for (int i = 0; i < beans.size(); i++) {
-				EnterpriseBean bean = (EnterpriseBean) beans.get(i);
-				list.addAll(getServiceRefs(bean));
-			}
-		} catch (Exception e) {
-			//Ignore
-		}
-		return list;
-	}
-
-	public Collection getServiceRefs(EnterpriseBean bean) {
-		List list = new ArrayList();
-		if (bean.getEjbJar().getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
-			list.addAll(bean.getServiceRefs());
-		else
-			list.addAll(get13ServiceRefs(bean));
-		return list;
-	}
-
-	public Collection getServiceRefs(WebApp webapp) {
-
-		List list = new ArrayList();
-		try {
-			if (webapp.getVersionID() >= J2EEVersionConstants.WEB_2_4_ID)
-				list.addAll(webapp.getServiceRefs());
-			else
-				list.addAll(get13ServiceRefs(webapp));
-		} catch (Exception e) {
-			//Ignore
-		}
-		return list;
-	}
-
-	public Collection getServiceRefs(ApplicationClient client) {
-
-		List list = new ArrayList();
-		try {
-			if (client.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
-				list.addAll(client.getServiceRefs());
-			else
-				list.addAll(get13ServiceRefs(client));
-		} catch (Exception e) {
-			//Ignore
-		}
-		return list;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
deleted file mode 100644
index 0f7efaef2..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,295 +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 Jan 28, 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.webservice.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicePlugin extends WTPPlugin implements ResourceLocator {
-
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.internal.internal.webservice"; //$NON-NLS-1$
-
-	/**
-	 * The reference to the singleton instance of this plugin.
-	 */
-	private static WebServicePlugin singleton;
-
-	/**
-	 * @param descriptor
-	 */
-	public WebServicePlugin() {
-		super();
-		if (singleton == null)
-			singleton = this;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
-	 */
-	public String getPluginID() {
-		return PLUGIN_ID;
-	}
-
-	/**
-	 * Returns an image descriptor for the named resource as relative to the plugin install
-	 * location.
-	 * 
-	 * @return An image descriptor, possibly null.
-	 */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = getInstance().getBundle().getEntry("/"); //$NON-NLS-1$
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the singleton instance of this plugin. Equivalent to calling
-	 * (ATKUIPlugin)Platform.getPlugin("com.ibm.etools.webservice.atk.ui");
-	 * 
-	 * @return The ATKUIPlugin singleton.
-	 */
-	static public WebServicePlugin getInstance() {
-		return singleton;
-	}
-
-	/**
-	 * Returns the message string identified by the given key from the plugin.properties file for
-	 * the appropriate locale.
-	 * 
-	 * @param key
-	 *            The message key string prefixed by a "%" symbol. That is, the string passed in
-	 *            must be of the form "%KEY" where the plugin.properties file contains a line of the
-	 *            form: "KEY = value".
-	 * @return The locale-specific message.
-	 */
-	public static String getMessage(String key) {
-		return Platform.getResourceString(getInstance().getBundle(), key);
-	}
-
-	/**
-	 * Returns the message string identified by the given key from the plugin.properties file for
-	 * the appropriate locale. Substitution sequences in the message string are replaced by the
-	 * given array of substitution objects (which are most frequently strings). See
-	 * java.text.MessageFormat for further details on substitution.
-	 * 
-	 * @param key
-	 *            The message key string prefixed by a "%" symbol. That is, the string passed in
-	 *            must be of the form "%KEY" where the plugin.properties file contains a line of the
-	 *            form: "KEY = value".
-	 * @param args
-	 *            The substitution values for the message as required by the message in
-	 *            plugin.properties and by the rules of class java.text.MessageFormat.
-	 * @return The locale-specific message.
-	 */
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
-	}
-
-
-	/**
-	 * Returns the URL from which all resources are based.
-	 * 
-	 * @return the URL from which all resources are based.
-	 */
-	public URL getBaseURL() {
-		String installURL = getPluginInstallLocation();
-		if (installURL != null) {
-			try {
-				StringBuffer sb = new StringBuffer(installURL);
-				sb.append("plugin.properties"); //$NON-NLS-1$
-				return new URL(sb.toString());
-			} catch (MalformedURLException e) {
-				//Ignore
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the description that can be used to create the image resource associated with the
-	 * key. The description will typically be in the form of a URL to the image data. Creation of an
-	 * actual image depends on the GUI environment; within Eclipse,
-	 * org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry can be used.
-	 * 
-	 * @param key
-	 *            the key of the image resource.
-	 * @return the description on the image resource.
-	 */
-	public Object getImage(String key) {
-		ImageDescriptor imageDescriptor = getImageDescriptor(key);
-		if (imageDescriptor != null)
-			return imageDescriptor.createImage();
-		return null;
-	}
-
-	public String getPluginStateLocation() {
-		return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
-	}
-
-	public String getPluginInstallLocation() {
-		try {
-			return Platform.resolve(getInstance().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
-		} catch (Throwable t) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the string resource associated with the key.
-	 * 
-	 * @param key
-	 *            the key of the string resource.
-	 * @return the string resource associated with the key.
-	 */
-	public String getString(String key) {
-		return getMessage(key);
-	}
-
-	/**
-	 * Returns a string resource associated with the key, and peforms substitutions.
-	 * 
-	 * @param key
-	 *            the key of the string.
-	 * @param substitutions
-	 *            the message substitutions.
-	 * @return a string resource associated with the key.
-	 * @see #getString(String)
-	 * @see MessageFormat#format(String, Object[])
-	 */
-	public String getString(String key, Object[] substitutions) {
-		return getMessage(key, substitutions);
-	}
-
-	/**
-	 * Called once by the platform when this plugin is first loaded.
-	 * 
-	 * @throws CoreException
-	 *             If this plugin fails to start.
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * Called once by the platform when this plugin is unloaded.
-	 * 
-	 * @throws CoreException
-	 *             If this plugin fails to shutdown.
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-	public String getString(String key, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key);
-	}
-
-	public String getString(String key, Object[] substitutions, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key,substitutions);
-	}
-	
-
-	/**
-	 * Record an error against this plugin's log. 
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param anException
-	 */
-	public static void logError(int aCode, String aMessage,
-			Throwable anException) {
-		getInstance().getLog().log(
-				createErrorStatus(aCode, aMessage, anException));
-	}
-
-	/**
-	 * 
-	 * Record a message against this plugin's log. 
-	 * 
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 */
-	public static void log(int severity, int aCode, String aMessage,
-			Throwable exception) {
-		log(createStatus(severity, aCode, aMessage, exception));
-	}
-
-	/**
-	 * 
-	 * Record a status against this plugin's log. 
-	 * 
-	 * @param aStatus
-	 */
-	public static void log(IStatus aStatus) {
-		getInstance().getLog().log(aStatus);
-	}
-
-	/**
-	 * Create a status associated with this plugin.
-	 *  
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createStatus(int severity, int aCode,
-			String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode,
-				aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createErrorStatus(int aCode, String aMessage,
-			Throwable exception) {
-		return createStatus(IStatus.ERROR, aCode, aMessage, exception);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java
deleted file mode 100644
index 4d83f901f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java
+++ /dev/null
@@ -1,90 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-
-
-public class ATKUIAdapterFactory extends AdapterFactoryImpl {
-	private AdapterFactory[] adapterFactories_;
-
-	public ATKUIAdapterFactory() {
-		adapterFactories_ = new AdapterFactory[4];
-		adapterFactories_[0] = new WsddItemProviderAdapterFactory();
-		adapterFactories_[1] = new ATKUIWscddAdapterFactory();
-		adapterFactories_[2] = new ATKUIWscommonAdapterFactory();
-		adapterFactories_[3] = new ATKUICommonAdapterFactory();
-
-	}
-
-	public Object adapt(Object target, Object type) {
-
-		if (target instanceof Notifier) {
-			for (int i = 0; i < adapterFactories_.length; i++) {
-				Object object = adapterFactories_[i].adapt(target, type);
-				if (object != null) {
-					return object;
-				}
-			}
-			return null;
-		}
-		return resolve(target, type);
-	}
-
-	public Adapter adapt(Notifier target, Object type) {
-		Object object = adapt((Object) target, type);
-		if (object instanceof Adapter) {
-			return (Adapter) object;
-		}
-		return null;
-	}
-
-	/**
-	 * This is called by {@link #adapt(Object,Object) adapt(Object, Object)}for objects that aren't
-	 * notifiers.
-	 * 
-	 * @param an
-	 *            arbitrary object to adapt.
-	 * @param type
-	 *            the key indicating the type of adapter required.
-	 * @return the object itself.
-	 * @see #adapt(Object,Object)
-	 */
-	protected Object resolve(Object object, Object type) {
-		if (object instanceof EList)
-			return resolveEList((EList) object, type);
-		else if (object instanceof AdapterViewerItem)
-			return resolveAdapterViewerItem((AdapterViewerItem) object, type);
-		else
-			return null;
-	}
-
-	private Object resolveEList(EList eList, Object type) {
-		if (eList.size() > 0)
-			return adapt(eList.get(0), type);
-		return null;
-	}
-
-	private Object resolveAdapterViewerItem(AdapterViewerItem adapterViewerItem, Object type) {
-		return resolveEList(adapterViewerItem.getEObjectList(), type);
-	}
-
-	public void addListener(INotifyChangedListener listener) {
-		((WsddItemProviderAdapterFactory) adapterFactories_[0]).addListener(listener);
-		((ATKUIWscddAdapterFactory) adapterFactories_[1]).addListener(listener);
-		((ATKUIWscommonAdapterFactory) adapterFactories_[2]).addListener(listener);
-		((ATKUICommonAdapterFactory) adapterFactories_[3]).addListener(listener);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java
deleted file mode 100644
index cbad1aece..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java
+++ /dev/null
@@ -1,48 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory;
-
-
-public class ATKUICommonAdapterFactory extends CommonItemProviderAdapterFactory {
-	public ATKUICommonAdapterFactory() {
-		super();
-	}
-
-	public Adapter createParamValueAdapter() {
-		if (paramValueItemProvider == null)
-			paramValueItemProvider = new ATKUIParamValueItemProvider(this);
-
-		return paramValueItemProvider;
-	}
-
-	public Adapter createQNameAdapter() {
-		if (qNameItemProvider == null) {
-			qNameItemProvider = new ATKUIQNameItemProvider(this);
-		}
-
-		return qNameItemProvider;
-	}
-
-
-	/*
-	 * public Adapter createSOAPHeaderAdapter() { if (soapHeaderItemProvider == null)
-	 * soapHeaderItemProvider = new ATKUISOAPHeaderItemProvider(this); return
-	 * soapHeaderItemProvider; }
-	 * 
-	 * public Adapter createSOAPRoleAdapter() { if (soapRoleItemProvider == null)
-	 * soapRoleItemProvider = new ATKUISOAPRoleItemProvider(this); return soapRoleItemProvider; }
-	 * 
-	 * public Adapter createPortNameAdapter() { if (portNameItemProvider == null)
-	 * portNameItemProvider = new ATKUIPortNameItemProvider(this); return portNameItemProvider; }
-	 *  
-	 */
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
deleted file mode 100644
index 213f34820..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
+++ /dev/null
@@ -1,87 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-
-
-public class ATKUIComponentScopedRefsItemProvider extends ComponentScopedRefsItemProvider implements ITableItemLabelProvider {
-	public ATKUIComponentScopedRefsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		return toDisplayString(((ComponentScopedRefs) object).getComponentName());
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
deleted file mode 100644
index 002f32a24..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
+++ /dev/null
@@ -1,98 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-
-
-public class ATKUIHandlerItemProvider extends HandlerItemProvider implements ITableItemLabelProvider {
-	public ATKUIHandlerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		return toDisplayString(((Handler) object).getHandlerName());
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-
-	protected String toDisplayString(JavaClass javaClass) {
-		String className = javaClass.getQualifiedNameForReflection();
-		return (className != null) ? className : ""; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java
deleted file mode 100644
index 0cb0c5da6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java
+++ /dev/null
@@ -1,48 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-
-
-public class ATKUIInitParamItemProvider extends InitParamItemProvider implements ITableItemLabelProvider {
-	public ATKUIInitParamItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		InitParam initParam = (InitParam) object;
-		switch (columnIndex) {
-			case 0 :
-				return toDisplayString(initParam.getParamName());
-			case 1 :
-				return toDisplayString(initParam.getParamValue());
-			case 2 :
-				return toDisplayString(initParam.getDescription());
-			default :
-				StringBuffer sb = new StringBuffer();
-				sb.append(initParam.getParamName());
-				sb.append("="); //$NON-NLS-1$
-				sb.append(initParam.getParamValue());
-				return sb.toString();
-		}
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java
deleted file mode 100644
index 9ec450e6c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java
+++ /dev/null
@@ -1,52 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.internal.provider.ParamValueItemProvider;
-
-public class ATKUIParamValueItemProvider extends ParamValueItemProvider implements ITableItemLabelProvider {
-	public ATKUIParamValueItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		ParamValue initParam = (ParamValue) object;
-		switch (columnIndex) {
-			case 0 :
-				return toDisplayString(initParam.getName());
-			case 1 :
-				return toDisplayString(initParam.getValue());
-			case 2 :
-				return toDisplayString(initParam.getDescription());
-			default :
-				StringBuffer sb = new StringBuffer();
-				sb.append(initParam.getName());
-				sb.append("="); //$NON-NLS-1$
-				sb.append(initParam.getValue());
-				return sb.toString();
-		}
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java
deleted file mode 100644
index 7e1ef1a10..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java
+++ /dev/null
@@ -1,53 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-
-
-public class ATKUIPortComponentRefItemProvider extends PortComponentRefItemProvider implements ITableItemLabelProvider {
-	public ATKUIPortComponentRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		PortComponentRef portCompRef = (PortComponentRef) object;
-		switch (columnIndex) {
-			case 0 :
-				return toDisplayString(portCompRef.getServiceEndpointInterface());
-			case 1 :
-				return toDisplayString(portCompRef.getPortComponentLink());
-			default :
-				return toDisplayString(portCompRef.getServiceEndpointInterface());
-		}
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-
-	protected String toDisplayString(JavaClass javaClass) {
-		String className = javaClass.getQualifiedNameForReflection();
-		return (className != null) ? className : ""; //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java
deleted file mode 100644
index 53eab3296..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java
+++ /dev/null
@@ -1,35 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-
-
-public class ATKUIPortNameItemProvider extends PortNameItemProvider implements ITableItemLabelProvider {
-	public ATKUIPortNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		PortName portName = (PortName) object;
-		return toDisplayString(portName.getPortName());
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java
deleted file mode 100644
index d63839f3b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-
-
-public class ATKUIQNameItemProvider extends QNameItemProvider implements ITableItemLabelProvider {
-	public ATKUIQNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		QName qname = (QName) object;
-		switch (columnIndex) {
-			case 0 :
-				return toDisplayString(qname.getNamespaceURI());
-			case 1 :
-				return toDisplayString(qname.getLocalPart());
-			default :
-				StringBuffer sb = new StringBuffer();
-				sb.append(qname.getNamespaceURI());
-				sb.append("#"); //$NON-NLS-1$
-				sb.append(qname.getLocalPart());
-				return sb.toString();
-		}
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java
deleted file mode 100644
index 4909752d4..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java
+++ /dev/null
@@ -1,48 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-
-
-public class ATKUISOAPHeaderItemProvider extends SOAPHeaderItemProvider implements ITableItemLabelProvider {
-	public ATKUISOAPHeaderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		SOAPHeader soapHeader = (SOAPHeader) object;
-		switch (columnIndex) {
-			case 0 :
-				return toDisplayString(soapHeader.getNamespaceURI());
-			case 1 :
-				return toDisplayString(soapHeader.getLocalPart());
-			default :
-				StringBuffer sb = new StringBuffer();
-				sb.append(soapHeader.getNamespaceURI());
-				sb.append("#"); //$NON-NLS-1$
-				sb.append(soapHeader.getLocalPart());
-				return sb.toString();
-		}
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java
deleted file mode 100644
index e723d25e0..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java
+++ /dev/null
@@ -1,35 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-
-
-public class ATKUISOAPRoleItemProvider extends SOAPRoleItemProvider implements ITableItemLabelProvider {
-	public ATKUISOAPRoleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		SOAPRole soapRole = (SOAPRole) object;
-		return toDisplayString(soapRole.getSoapRole());
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
deleted file mode 100644
index afa4a7ca4..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
+++ /dev/null
@@ -1,98 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-public class ATKUIServiceRefItemProvider extends ServiceRefItemProvider implements ITableItemLabelProvider {
-	public ATKUIServiceRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnText.
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		return toDisplayString(((ServiceRef) object).getServiceRefName());
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This does the same thing as ITableLabelProvider.getColumnImage.
-	 */
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-
-	protected String toDisplayString(JavaClass javaClass) {
-		String className = javaClass.getQualifiedNameForReflection();
-		return (className != null) ? className : ""; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
deleted file mode 100644
index bc1f1aabc..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
+++ /dev/null
@@ -1,91 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-public class ATKUIWebServicesClientItemProvider extends WebServicesClientItemProvider {
-	public ATKUIWebServicesClientItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		feature = Webservice_clientFactory.eINSTANCE.getWebservice_clientPackage().getWebServicesClient_ComponentScopedRefs();
-		if (feature.getName().equals(adapterViewerItem.getEStructuralFeature().getName()))
-			result.add(SectionComponentScopedRefHelper.getWsClient());
-		return result;
-	}
-
-	/**
-	 * This returns WebServicesClient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return null;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		return WebServicePlugin.getMessage("%LABEL_UNQUALIFIED_COMPONENT"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java
deleted file mode 100644
index f87d9fcf3..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.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.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-
-public class ATKUIWscddAdapterFactory extends Webservice_clientItemProviderAdapterFactory {
-	public ATKUIWscddAdapterFactory() {
-		super();
-	}
-
-	public Adapter createWebServicesClientAdapter() {
-		if (webServicesClientItemProvider == null)
-			webServicesClientItemProvider = new ATKUIWebServicesClientItemProvider(this);
-		return webServicesClientItemProvider;
-	}
-
-	public Adapter createComponentScopedRefsAdapter() {
-		if (componentScopedRefsItemProvider == null)
-			componentScopedRefsItemProvider = new ATKUIComponentScopedRefsItemProvider(this);
-		return componentScopedRefsItemProvider;
-	}
-
-	public Adapter createPortComponentRefAdapter() {
-		if (portComponentRefItemProvider == null)
-			portComponentRefItemProvider = new ATKUIPortComponentRefItemProvider(this);
-		return portComponentRefItemProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createServiceRefAdapter()
-	 */
-	public Adapter createServiceRefAdapter() {
-		if (serviceRefItemProvider == null)
-			serviceRefItemProvider = new ATKUIServiceRefItemProvider(this);
-		return serviceRefItemProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createHandlerAdapter()
-	 */
-	public Adapter createHandlerAdapter() {
-		if (handlerItemProvider == null)
-			handlerItemProvider = new ATKUIHandlerItemProvider(this);
-		return handlerItemProvider;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java
deleted file mode 100644
index e46f9400e..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java
+++ /dev/null
@@ -1,41 +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.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-public class ATKUIWscommonAdapterFactory extends WscommonItemProviderAdapterFactory {
-	public ATKUIWscommonAdapterFactory() {
-		super();
-	}
-
-	public Adapter createInitParamAdapter() {
-		if (initParamItemProvider == null)
-			initParamItemProvider = new ATKUIInitParamItemProvider(this);
-		return initParamItemProvider;
-	}
-
-	public Adapter createSOAPHeaderAdapter() {
-		if (soapHeaderItemProvider == null)
-			soapHeaderItemProvider = new ATKUISOAPHeaderItemProvider(this);
-		return soapHeaderItemProvider;
-	}
-
-	public Adapter createSOAPRoleAdapter() {
-		if (soapRoleItemProvider == null)
-			soapRoleItemProvider = new ATKUISOAPRoleItemProvider(this);
-		return soapRoleItemProvider;
-	}
-
-	public Adapter createPortNameAdapter() {
-		if (portNameItemProvider == null)
-			portNameItemProvider = new ATKUIPortNameItemProvider(this);
-		return portNameItemProvider;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
deleted file mode 100644
index f060cf4f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-
-// Non-generated provider code
-
-public abstract class AbstractATKUIItemProvider extends ItemProviderAdapter {
-	public AbstractATKUIItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * Get the resource locator for this adapter's resources.
-	 */
-	protected ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
deleted file mode 100644
index 40c048914..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
+++ /dev/null
@@ -1,163 +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.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class BeanLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public BeanLinkItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns BeanLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/BeanLink"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { return getString("_UI_BeanLink_type"); }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		return getString("%_UI_BeanLink_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
deleted file mode 100644
index a0e21396d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
+++ /dev/null
@@ -1,165 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.ComponentScopedRefs}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ComponentScopedRefsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ComponentScopedRefsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addComponentNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Component Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addComponentNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ComponentScopedRefs_componentName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ComponentScopedRefs_componentName_feature", "_UI_ComponentScopedRefs_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ComponentName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ServiceRefs());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns ComponentScopedRefs.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/full/obj16/ComponentScopedRefs.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label =
-	 * ((ComponentScopedRefs)object).getComponentName(); return label == null || label.length() == 0 ?
-	 * getString("_UI_ComponentScopedRefs_type") : getString("_UI_ComponentScopedRefs_type") + " " +
-	 * label; }
-	 */
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((ComponentScopedRefs) object).getComponentName();
-		return label == null || label.length() == 0 ? getString("%_UI_ComponentScopedRefs_type") : label; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ComponentScopedRefs.class)) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME :
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
deleted file mode 100644
index 6d56f5bfb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
+++ /dev/null
@@ -1,155 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ConstructorParameterOrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ConstructorParameterOrderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConstructorParameterOrder_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ConstructorParameterOrder_id_feature", "_UI_ConstructorParameterOrder_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames());
-		}
-		return childrenFeatures;
-	}
-
-
-	/**
-	 * This returns ConstructorParameterOrder.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ConstructorParameterOrder"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ConstructorParameterOrder) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_ConstructorParameterOrder_type") : //$NON-NLS-1$
-					getString("_UI_ConstructorParameterOrder_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ConstructorParameterOrder.class)) {
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID :
-			case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames(), JaxrpcmapFactory.eINSTANCE.createElementName()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
deleted file mode 100644
index 8f34e6be2..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
+++ /dev/null
@@ -1,113 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.DescriptionItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class DescriptionTypeItemProvider extends DescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DescriptionTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns DescriptionType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/DescriptionType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DescriptionType) object).getLang();
-		return label == null || label.length() == 0 ? getString("_UI_DescriptionType_type") : //$NON-NLS-1$
-					getString("_UI_DescriptionType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
deleted file mode 100644
index d076af9ae..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
+++ /dev/null
@@ -1,113 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.DisplayNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class DisplayNameTypeItemProvider extends DisplayNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DisplayNameTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns DisplayNameType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/DisplayNameType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DisplayNameType) object).getLang();
-		return label == null || label.length() == 0 ? getString("_UI_DisplayNameType_type") : //$NON-NLS-1$
-					getString("_UI_DisplayNameType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java
deleted file mode 100644
index f3fb6f959..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java
+++ /dev/null
@@ -1,158 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class EJBLinkItemProvider extends BeanLinkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EJBLinkItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addEjbLinkPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_EJBLink_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_EJBLink_id_feature", "_UI_EJBLink_type"), WsddPackage.eINSTANCE.getEJBLink_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Ejb Link feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addEjbLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBLink_ejbLink_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EJBLink_ejbLink_feature", "_UI_EJBLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getEJBLink_EjbLink(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns EJBLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/full/obj16/sessionBean_obj.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((EJBLink)object).getId(); return label ==
-	 * null || label.length() == 0 ? getString("_UI_EJBLink_type") : getString("_UI_EJBLink_type") + " " +
-	 * label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((EJBLink) object).getEjbLink();
-		return label == null || label.length() == 0 ? getString("%_UI_EJBLink_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(EJBLink.class)) {
-			case WsddPackage.EJB_LINK__EJB_LINK : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java
deleted file mode 100644
index 5b29e1e83..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java
+++ /dev/null
@@ -1,148 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ElementNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ElementNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addTextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ElementName_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ElementName_id_feature", "_UI_ElementName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getElementName_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Text feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ElementName_text_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ElementName_text_feature", "_UI_ElementName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getElementName_Text(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns ElementName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ElementName"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ElementName) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_ElementName_type") : //$NON-NLS-1$
-					getString("_UI_ElementName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ElementName.class)) {
-			case JaxrpcmapPackage.ELEMENT_NAME__ID :
-			case JaxrpcmapPackage.ELEMENT_NAME__TEXT : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
deleted file mode 100644
index 9fbb3a848..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
+++ /dev/null
@@ -1,200 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class ExceptionMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ExceptionMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addExceptionTypePropertyDescriptor(object);
-			addWsdlMessagePartNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_id_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getExceptionMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Exception Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addExceptionTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_exceptionType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_exceptionType_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ExceptionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_wsdlMessagePartName_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessage());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ConstructorParameterOrder());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns ExceptionMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ExceptionMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ExceptionMapping) object).getWsdlMessagePartName();
-		return label == null || label.length() == 0 ? getString("_UI_ExceptionMapping_type") : //$NON-NLS-1$
-					getString("_UI_ExceptionMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ExceptionMapping.class)) {
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__ID :
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE :
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME :
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE :
-			case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ConstructorParameterOrder(), JaxrpcmapFactory.eINSTANCE.createConstructorParameterOrder()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
deleted file mode 100644
index 775ed8be1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
+++ /dev/null
@@ -1,222 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.Handler}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class HandlerItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public HandlerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addHandlerNamePropertyDescriptor(object);
-			addSoapRolesPropertyDescriptor(object);
-			addPortNamesPropertyDescriptor(object);
-			addHandlerClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Handler Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addHandlerNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_handlerName_feature"), //$NON-NLS-1$
-					getString("%_UI_Handler_handlerName_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getHandler_HandlerName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Soap Roles feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addSoapRolesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_soapRoles_feature"), //$NON-NLS-1$
-					getString("%_UI_Handler_soapRoles_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getHandler_SoapRoles(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Port Names feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addPortNamesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_portNames_feature"), //$NON-NLS-1$
-					getString("%_UI_Handler_portNames_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getHandler_PortNames(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Handler Class feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addHandlerClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_handlerClass_feature"), //$NON-NLS-1$
-					getString("%_UI_Handler_handlerClass_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass(), false));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *  
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_InitParams());
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders());
-//			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_HandlerName());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/obj16/handler.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((Handler)object).getHandlerName();
-	 * return label == null || label.length() == 0 ? getString("_UI_Handler_type") :
-	 * getString("_UI_Handler_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((Handler) object).getHandlerName();
-		return label == null || label.length() == 0 ? getString("%_UI_Handler_type") : getString("%_UI_Handler_type") + ": " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Handler.class)) {
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME :
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES :
-			case Webservice_clientPackage.HANDLER__PORT_NAMES :
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS :
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_InitParams(), CommonFactory.eINSTANCE.createParamValue()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), CommonFactory.eINSTANCE.createQName()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), WsddFactory.eINSTANCE.createWSDLPort()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
deleted file mode 100644
index c80243f5d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
+++ /dev/null
@@ -1,220 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class InitParamItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public InitParamItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			//pgm addIdPropertyDescriptor(object);
-			addParamNamePropertyDescriptor(object);
-			addParamValuePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_InitParam_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_InitParam_id_feature", "_UI_InitParam_type"),
-	 * WscommonPackage.eINSTANCE.getInitParam_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addParamNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_paramName_feature"), //$NON-NLS-1$
-					getString("%_UI_InitParam_paramName_feature_desc"), //$NON-NLS-1$
-					WscommonPackage.eINSTANCE.getInitParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addParamValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_paramValue_feature"), //$NON-NLS-1$
-					getString("%_UI_InitParam_paramValue_feature_desc"), //$NON-NLS-1$
-					WscommonPackage.eINSTANCE.getInitParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_description_feature"), //$NON-NLS-1$
-					getString("%_UI_InitParam_description_feature_desc"), //$NON-NLS-1$ 
-					WscommonPackage.eINSTANCE.getInitParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WscommonPackage.eINSTANCE.getInitParam_DescriptionTypes());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns InitParam.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/full/obj16/initializ_parameter.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((InitParam)object).getParamName();
-	 * return label == null || label.length() == 0 ? getString("_UI_InitParam_type") :
-	 * getString("_UI_InitParam_type") + " " + label; } /*
-	 * 
-	 * /** This returns the label text for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc --> @non-generated
-	 */
-	public String getText(Object object) {
-		InitParam initParam = (InitParam) object;
-		String name = initParam.getParamName();
-		String value = initParam.getParamValue();
-		if (name == null || name.length() == 0 || value == null || value.length() == 0)
-			return getString("%_UI_InitParam_type"); //$NON-NLS-1$
-		StringBuffer label = new StringBuffer();
-		label.append(name);
-		label.append("="); //$NON-NLS-1$
-		label.append(value);
-		return label.toString();
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(InitParam.class)) {
-			//pgm case WscommonPackage.INIT_PARAM__ID:
-			case WscommonPackage.INIT_PARAM__PARAM_NAME :
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE :
-			case WscommonPackage.INIT_PARAM__DESCRIPTION :
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WscommonPackage.eINSTANCE.getInitParam_DescriptionTypes(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
-	 */
-	public Collection getChildren(Object object) {
-		Collection children = super.getChildren(object);
-		InitParam param = (InitParam) object;
-		if (param.getParamName() != null)
-			children.add(param.getParamName());
-		if (param.getParamValue() != null)
-			children.add(param.getParamValue());
-		if (param.getDescription() != null)
-			children.add(param.getDescription());
-		return children;
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
deleted file mode 100644
index fb12cac93..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,109 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class InterfaceMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public InterfaceMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns InterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/InterfaceMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_InterfaceMapping_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
deleted file mode 100644
index d74ac56cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
+++ /dev/null
@@ -1,184 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class JavaWSDLMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JavaWSDLMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaWSDLMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JavaWSDLMapping_id_feature", "_UI_JavaWSDLMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_PackageMappings());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_ExceptionMappings());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns JavaWSDLMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/JavaWSDLMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((JavaWSDLMapping) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_JavaWSDLMapping_type") : //$NON-NLS-1$
-					getString("_UI_JavaWSDLMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(JavaWSDLMapping.class)) {
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID :
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS :
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS :
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS :
-			case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_PackageMappings(), JaxrpcmapFactory.eINSTANCE.createPackageMapping()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings(), JaxrpcmapFactory.eINSTANCE.createJavaXMLTypeMapping()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_ExceptionMappings(), JaxrpcmapFactory.eINSTANCE.createExceptionMapping()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createInterfaceMapping()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createServiceInterfaceMapping()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createServiceEndpointInterfaceMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
deleted file mode 100644
index aebe19118..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
+++ /dev/null
@@ -1,214 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class JavaXMLTypeMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JavaXMLTypeMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addClassTypePropertyDescriptor(object);
-			addQnameScopePropertyDescriptor(object);
-			addAnonymousTypeQnamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_id_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Class Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addClassTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_classType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_classType_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_ClassType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Qname Scope feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addQnameScopePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_qnameScope_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_qnameScope_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_QnameScope(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Anonymous Type Qname feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAnonymousTypeQnamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_anonymousTypeQname_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_anonymousTypeQname_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_AnonymousTypeQname(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_RootTypeQname());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_VariableMappings());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns JavaXMLTypeMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/JavaXMLTypeMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((JavaXMLTypeMapping) object).getAnonymousTypeQname();
-		return label == null || label.length() == 0 ? getString("_UI_JavaXMLTypeMapping_type") : //$NON-NLS-1$
-					getString("_UI_JavaXMLTypeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(JavaXMLTypeMapping.class)) {
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID :
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE :
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE :
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME :
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME :
-			case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_RootTypeQname(), JaxrpcmapFactory.eINSTANCE.createRootTypeQname()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_VariableMappings(), JaxrpcmapFactory.eINSTANCE.createVariableMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
deleted file mode 100644
index cc3d6ef29..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,678 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util.JaxrpcmapAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class JaxrpcmapItemProviderAdapterFactory extends JaxrpcmapAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JaxrpcmapItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected JavaWSDLMappingItemProvider javaWSDLMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createJavaWSDLMappingAdapter() {
-		if (javaWSDLMappingItemProvider == null) {
-			javaWSDLMappingItemProvider = new JavaWSDLMappingItemProvider(this);
-		}
-
-		return javaWSDLMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PackageMappingItemProvider packageMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createPackageMappingAdapter() {
-		if (packageMappingItemProvider == null) {
-			packageMappingItemProvider = new PackageMappingItemProvider(this);
-		}
-
-		return packageMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected JavaXMLTypeMappingItemProvider javaXMLTypeMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createJavaXMLTypeMappingAdapter() {
-		if (javaXMLTypeMappingItemProvider == null) {
-			javaXMLTypeMappingItemProvider = new JavaXMLTypeMappingItemProvider(this);
-		}
-
-		return javaXMLTypeMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ExceptionMappingItemProvider exceptionMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createExceptionMappingAdapter() {
-		if (exceptionMappingItemProvider == null) {
-			exceptionMappingItemProvider = new ExceptionMappingItemProvider(this);
-		}
-
-		return exceptionMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ServiceInterfaceMappingItemProvider serviceInterfaceMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createServiceInterfaceMappingAdapter() {
-		if (serviceInterfaceMappingItemProvider == null) {
-			serviceInterfaceMappingItemProvider = new ServiceInterfaceMappingItemProvider(this);
-		}
-
-		return serviceInterfaceMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ServiceEndpointInterfaceMappingItemProvider serviceEndpointInterfaceMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createServiceEndpointInterfaceMappingAdapter() {
-		if (serviceEndpointInterfaceMappingItemProvider == null) {
-			serviceEndpointInterfaceMappingItemProvider = new ServiceEndpointInterfaceMappingItemProvider(this);
-		}
-
-		return serviceEndpointInterfaceMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected RootTypeQnameItemProvider rootTypeQnameItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createRootTypeQnameAdapter() {
-		if (rootTypeQnameItemProvider == null) {
-			rootTypeQnameItemProvider = new RootTypeQnameItemProvider(this);
-		}
-
-		return rootTypeQnameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected VariableMappingItemProvider variableMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createVariableMappingAdapter() {
-		if (variableMappingItemProvider == null) {
-			variableMappingItemProvider = new VariableMappingItemProvider(this);
-		}
-
-		return variableMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLMessageItemProvider wsdlMessageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLMessageAdapter() {
-		if (wsdlMessageItemProvider == null) {
-			wsdlMessageItemProvider = new WSDLMessageItemProvider(this);
-		}
-
-		return wsdlMessageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ConstructorParameterOrderItemProvider constructorParameterOrderItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createConstructorParameterOrderAdapter() {
-		if (constructorParameterOrderItemProvider == null) {
-			constructorParameterOrderItemProvider = new ConstructorParameterOrderItemProvider(this);
-		}
-
-		return constructorParameterOrderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ElementNameItemProvider elementNameItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createElementNameAdapter() {
-		if (elementNameItemProvider == null) {
-			elementNameItemProvider = new ElementNameItemProvider(this);
-		}
-
-		return elementNameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLServiceNameItemProvider wsdlServiceNameItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLServiceNameAdapter() {
-		if (wsdlServiceNameItemProvider == null) {
-			wsdlServiceNameItemProvider = new WSDLServiceNameItemProvider(this);
-		}
-
-		return wsdlServiceNameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PortMappingItemProvider portMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createPortMappingAdapter() {
-		if (portMappingItemProvider == null) {
-			portMappingItemProvider = new PortMappingItemProvider(this);
-		}
-
-		return portMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLPortTypeItemProvider wsdlPortTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLPortTypeAdapter() {
-		if (wsdlPortTypeItemProvider == null) {
-			wsdlPortTypeItemProvider = new WSDLPortTypeItemProvider(this);
-		}
-
-		return wsdlPortTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLBindingItemProvider wsdlBindingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLBindingAdapter() {
-		if (wsdlBindingItemProvider == null) {
-			wsdlBindingItemProvider = new WSDLBindingItemProvider(this);
-		}
-
-		return wsdlBindingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ServiceEndpointMethodMappingItemProvider serviceEndpointMethodMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createServiceEndpointMethodMappingAdapter() {
-		if (serviceEndpointMethodMappingItemProvider == null) {
-			serviceEndpointMethodMappingItemProvider = new ServiceEndpointMethodMappingItemProvider(this);
-		}
-
-		return serviceEndpointMethodMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLOperationItemProvider wsdlOperationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLOperationAdapter() {
-		if (wsdlOperationItemProvider == null) {
-			wsdlOperationItemProvider = new WSDLOperationItemProvider(this);
-		}
-
-		return wsdlOperationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected MethodParamPartsMappingItemProvider methodParamPartsMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createMethodParamPartsMappingAdapter() {
-		if (methodParamPartsMappingItemProvider == null) {
-			methodParamPartsMappingItemProvider = new MethodParamPartsMappingItemProvider(this);
-		}
-
-		return methodParamPartsMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLReturnValueMappingItemProvider wsdlReturnValueMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLReturnValueMappingAdapter() {
-		if (wsdlReturnValueMappingItemProvider == null) {
-			wsdlReturnValueMappingItemProvider = new WSDLReturnValueMappingItemProvider(this);
-		}
-
-		return wsdlReturnValueMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLMessageMappingItemProvider wsdlMessageMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLMessageMappingAdapter() {
-		if (wsdlMessageMappingItemProvider == null) {
-			wsdlMessageMappingItemProvider = new WSDLMessageMappingItemProvider(this);
-		}
-
-		return wsdlMessageMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLMessagePartNameItemProvider wsdlMessagePartNameItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLMessagePartNameAdapter() {
-		if (wsdlMessagePartNameItemProvider == null) {
-			wsdlMessagePartNameItemProvider = new WSDLMessagePartNameItemProvider(this);
-		}
-
-		return wsdlMessagePartNameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected InterfaceMappingItemProvider interfaceMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createInterfaceMappingAdapter() {
-		if (interfaceMappingItemProvider == null) {
-			interfaceMappingItemProvider = new InterfaceMappingItemProvider(this);
-		}
-
-		return interfaceMappingItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
deleted file mode 100644
index 987258b2b..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
+++ /dev/null
@@ -1,183 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class MethodParamPartsMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public MethodParamPartsMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addParamPositionPropertyDescriptor(object);
-			addParamTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_id_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Position feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParamPositionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_paramPosition_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_paramPosition_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_ParamPosition(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Param Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParamTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_paramType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_paramType_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_ParamType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns MethodParamPartsMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/MethodParamPartsMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodParamPartsMapping) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_MethodParamPartsMapping_type") : //$NON-NLS-1$
-					getString("_UI_MethodParamPartsMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(MethodParamPartsMapping.class)) {
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID :
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION :
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE :
-			case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping(), JaxrpcmapFactory.eINSTANCE.createWSDLMessageMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
deleted file mode 100644
index c634e9e31..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
+++ /dev/null
@@ -1,163 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class PackageMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public PackageMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addPackageTypePropertyDescriptor(object);
-			addNamespaceURIPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_id_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getPackageMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Package Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addPackageTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_packageType_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_packageType_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getPackageMapping_PackageType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Namespace URI feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamespaceURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_namespaceURI_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_namespaceURI_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getPackageMapping_NamespaceURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns PackageMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/PackageMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((PackageMapping) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_PackageMapping_type") : //$NON-NLS-1$
-					getString("_UI_PackageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(PackageMapping.class)) {
-			case JaxrpcmapPackage.PACKAGE_MAPPING__ID :
-			case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE :
-			case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
deleted file mode 100644
index 5441d28ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
+++ /dev/null
@@ -1,336 +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.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class PortComponentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public PortComponentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPortComponentNamePropertyDescriptor(object);
-			addServiceEndpointInterfacePropertyDescriptor(object);
-			addSmallIconPropertyDescriptor(object);
-			addLargeIconPropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_PortComponent_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_PortComponent_id_feature", "_UI_PortComponent_type"),
-	 * WsddPackage.eINSTANCE.getPortComponent_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Port Component Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addPortComponentNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_portComponentName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_portComponentName_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getPortComponent_PortComponentName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Service Endpoint Interface feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_serviceEndpointInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_serviceEndpointInterface_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getPortComponent_ServiceEndpointInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSmallIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_smallIcon_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_smallIcon_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getPortComponent_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLargeIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_largeIcon_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_largeIcon_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getPortComponent_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_description_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getPortComponent_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_displayName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_displayName_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getPortComponent_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_WsdlPort());
-			childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_ServiceImplBean());
-			childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_Handlers());
-			childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_DescriptionType());
-			childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_DisplayNameType());
-			childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_IconType());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns PortComponent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public Object getImage(Object object) { return
-	 * getResourceLocator().getImage("full/obj16/PortComponent"); }
-	 */
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label =
-	 * ((PortComponent)object).getPortComponentName(); return label == null || label.length() == 0 ?
-	 * getString("_UI_PortComponent_type") : getString("_UI_PortComponent_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns PortComponent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @non-generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/obj16/portcomponent.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((PortComponent) object).getPortComponentName();
-		return label == null || label.length() == 0 ? getString("%_UI_PortComponent_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(PortComponent.class)) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME :
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE :
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON :
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON :
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION :
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME :
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT :
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN :
-			case WsddPackage.PORT_COMPONENT__HANDLERS :
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE :
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE :
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_WsdlPort(), WsddFactory.eINSTANCE.createWSDLPort()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_ServiceImplBean(), WsddFactory.eINSTANCE.createServiceImplBean()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_Handlers(), WsddFactory.eINSTANCE.createHandler()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_DescriptionType(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_DisplayNameType(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_IconType(), CommonFactory.eINSTANCE.createIconType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java
deleted file mode 100644
index b203f2f2c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java
+++ /dev/null
@@ -1,154 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.PortComponentRef}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class PortComponentRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public PortComponentRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPortComponentLinkPropertyDescriptor(object);
-			addServiceEndpointInterfacePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Port Component Link feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *  
-	 */
-	protected void addPortComponentLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_PortComponentRef_portComponentLink_feature"), //$NON-NLS-1$
-					getString("%_UI_PortComponentRef_portComponentLink_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getPortComponentRef_PortComponentLink(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Service Endpoint Interface feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *  
-	 */
-	protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_PortComponentRef_serviceEndpointInterface_feature"), //$NON-NLS-1$
-					getString("%_UI_PortComponentRef_serviceEndpointInterface_feature_desc"), //$NON-NLS-1$ 
-					Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface(), false));
-	}
-
-
-	/**
-	 * This returns PortComponentRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/obj16/portcomponent.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label =
-	 * ((PortComponentRef)object).getPortComponentLink(); return label == null || label.length() ==
-	 * 0 ? getString("_UI_PortComponentRef_type") : getString("_UI_PortComponentRef_type") + " " +
-	 * label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((PortComponentRef) object).getPortComponentLink();
-		return label == null || label.length() == 0 ? getString("%_UI_PortComponentRef_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(PortComponentRef.class)) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java
deleted file mode 100644
index 247d8e086..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java
+++ /dev/null
@@ -1,162 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class PortMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public PortMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addPortNamePropertyDescriptor(object);
-			addJavaPortNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_id_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getPortMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Port Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addPortNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_portName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_portName_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getPortMapping_PortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Java Port Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addJavaPortNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_javaPortName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_javaPortName_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getPortMapping_JavaPortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns PortMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/PortMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((PortMapping) object).getPortName();
-		return label == null || label.length() == 0 ? getString("_UI_PortMapping_type") : //$NON-NLS-1$
-					getString("_UI_PortMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(PortMapping.class)) {
-			case JaxrpcmapPackage.PORT_MAPPING__ID :
-			case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME :
-			case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java
deleted file mode 100644
index 200633c80..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java
+++ /dev/null
@@ -1,159 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class PortNameItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public PortNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			//pgm addIdPropertyDescriptor(object);
-			addPortNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_PortName_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_PortName_id_feature", "_UI_PortName_type"), WscommonPackage.eINSTANCE.getPortName_Id(),
-	 * true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Port Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addPortNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortName_portName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_PortName_portName_feature", "_UI_PortName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WscommonPackage.eINSTANCE.getPortName_PortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns PortName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/PortName"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((PortName)object).getPortName();
-	 * return label == null || label.length() == 0 ? getString("_UI_PortName_type") :
-	 * getString("_UI_PortName_type") + " " + label; }
-	 */
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((PortName) object).getPortName();
-		return label == null || label.length() == 0 ? getString("%_UI_PortName_type") : label; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(PortName.class)) {
-			//pgm case WscommonPackage.PORT_NAME__ID:
-			case WscommonPackage.PORT_NAME__PORT_NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java
deleted file mode 100644
index 45a06cb40..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java
+++ /dev/null
@@ -1,112 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class RootTypeQnameItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public RootTypeQnameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns RootTypeQname.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/RootTypeQname"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((RootTypeQname) object).getCombinedQName();
-		return label == null || label.length() == 0 ? getString("_UI_RootTypeQname_type") : //$NON-NLS-1$
-					getString("_UI_RootTypeQname_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java
deleted file mode 100644
index b51303169..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SOAPHeaderItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SOAPHeaderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns SOAPHeader.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/SOAPHeader"); //$NON-NLS-1$
-	}
-
-
-	protected String toDisplayString(String s) {
-		return (s != null) ? s : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label =
-	 * ((SOAPHeader)object).getCombinedQName(); return label == null || label.length() == 0 ?
-	 * getString("_UI_SOAPHeader_type") : getString("_UI_SOAPHeader_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		SOAPHeader soapHeader = (SOAPHeader) object;
-		String nsURI = soapHeader.getNamespaceURI();
-		String localpart = soapHeader.getLocalPart();
-		if (nsURI == null || nsURI.length() == 0 || localpart == null || localpart.length() == 0)
-			return getString("%_UI_SOAPHeader_type"); //$NON-NLS-1$
-		StringBuffer label = new StringBuffer();
-		label.append(nsURI);
-		label.append("#"); //$NON-NLS-1$
-		label.append(localpart);
-		return label.toString();
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java
deleted file mode 100644
index eb1d361aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java
+++ /dev/null
@@ -1,160 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SOAPRoleItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SOAPRoleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			//pgm addIdPropertyDescriptor(object);
-			addSoapRolePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_SOAPRole_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_SOAPRole_id_feature", "_UI_SOAPRole_type"), WscommonPackage.eINSTANCE.getSOAPRole_Id(),
-	 * true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Soap Role feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSoapRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SOAPRole_soapRole_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SOAPRole_soapRole_feature", "_UI_SOAPRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WscommonPackage.eINSTANCE.getSOAPRole_SoapRole(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns SOAPRole.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/SOAPRole"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((SOAPRole)object).getId(); return
-	 * label == null || label.length() == 0 ? getString("_UI_SOAPRole_type") :
-	 * getString("_UI_SOAPRole_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((SOAPRole) object).getSoapRole();
-		return label == null || label.length() == 0 ? getString("%_UI_SOAPRole_type") : label; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SOAPRole.class)) {
-			//pgm case WscommonPackage.SOAP_ROLE__ID:
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java
deleted file mode 100644
index b542c9596..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java
+++ /dev/null
@@ -1,41 +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 Jan 29, 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.webservice.provider;
-
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class SectionComponentScopedRefHelper {
-
-	private static WebServicesClient wsClient;
-
-	public static void setWsClient(WebServicesClient client) {
-		wsClient = client;
-	}
-
-	public static WebServicesClient getWsClient() {
-		return wsClient;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
deleted file mode 100644
index cffbbaf31..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,190 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ServiceEndpointInterfaceMappingItemProvider extends InterfaceMappingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ServiceEndpointInterfaceMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addServiceEndpointInterfacePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointInterfaceMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointInterfaceMapping_id_feature", "_UI_ServiceEndpointInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Service Endpoint Interface feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointInterfaceMapping_serviceEndpointInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointInterfaceMapping_serviceEndpointInterface_feature", "_UI_ServiceEndpointInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns ServiceEndpointInterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ServiceEndpointInterfaceMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ServiceEndpointInterfaceMapping) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_ServiceEndpointInterfaceMapping_type") : //$NON-NLS-1$
-					getString("_UI_ServiceEndpointInterfaceMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServiceEndpointInterfaceMapping.class)) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType(), JaxrpcmapFactory.eINSTANCE.createWSDLPortType()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding(), JaxrpcmapFactory.eINSTANCE.createWSDLBinding()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings(), JaxrpcmapFactory.eINSTANCE.createServiceEndpointMethodMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
deleted file mode 100644
index 2d3251ef8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
+++ /dev/null
@@ -1,214 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ServiceEndpointMethodMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ServiceEndpointMethodMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addJavaMethodNamePropertyDescriptor(object);
-			addWsdlOperationPropertyDescriptor(object);
-			addWrappedElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_id_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Java Method Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addJavaMethodNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_javaMethodName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_javaMethodName_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_JavaMethodName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl Operation feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_wsdlOperation_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_wsdlOperation_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlOperation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wrapped Element feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWrappedElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_wrappedElement_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_wrappedElement_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WrappedElement(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns ServiceEndpointMethodMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ServiceEndpointMethodMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ServiceEndpointMethodMapping) object).getJavaMethodName();
-		return label == null || label.length() == 0 ? getString("_UI_ServiceEndpointMethodMapping_type") : //$NON-NLS-1$
-					getString("_UI_ServiceEndpointMethodMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServiceEndpointMethodMapping.class)) {
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS :
-			case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings(), JaxrpcmapFactory.eINSTANCE.createMethodParamPartsMapping()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping(), JaxrpcmapFactory.eINSTANCE.createWSDLReturnValueMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
deleted file mode 100644
index 1a7a6de3c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
+++ /dev/null
@@ -1,253 +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.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ServiceImplBeanItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ServiceImplBeanItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_ServiceImplBean_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_ServiceImplBean_id_feature", "_UI_ServiceImplBean_type"),
-	 * WsddPackage.eINSTANCE.getServiceImplBean_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink());
-			childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_EServletLink());
-			childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns ServiceImplBean.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/full/obj16/srvce_elem_obj.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((ServiceImplBean)object).getId();
-	 * return label == null || label.length() == 0 ? getString("_UI_ServiceImplBean_type") :
-	 * getString("_UI_ServiceImplBean_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		ServiceImplBean serviceImplBean = (ServiceImplBean) object;
-		String ejbLink = serviceImplBean.getEEJBLink().getEjbLink();
-		if (ejbLink != null && ejbLink.length() > 0)
-			return ejbLink;
-		String beanLink = serviceImplBean.getBeanLink().toString();
-		if (beanLink != null && beanLink.length() > 0)
-			return beanLink;
-		String servletLink = serviceImplBean.getEServletLink().getServletLink();
-		if (servletLink != null && servletLink.length() > 0)
-			return servletLink;
-		return getString("%_UI_ServiceImplBean_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServiceImplBean.class)) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK :
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK :
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink(), WsddFactory.eINSTANCE.createEJBLink()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_EServletLink(), WsddFactory.eINSTANCE.createServletLink()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createBeanLink()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createServletLink()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createEJBLink()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
-		boolean qualify = feature == WsddPackage.eINSTANCE.getServiceImplBean_EServletLink() || feature == WsddPackage.eINSTANCE.getServiceImplBean_BeanLink() || feature == WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink();
-		return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
-					new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
deleted file mode 100644
index 5ee3d042f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,185 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ServiceInterfaceMappingItemProvider extends InterfaceMappingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ServiceInterfaceMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addServiceInterfacePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceInterfaceMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceInterfaceMapping_id_feature", "_UI_ServiceInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Service Interface feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServiceInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceInterfaceMapping_serviceInterface_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServiceInterfaceMapping_serviceInterface_feature", "_UI_ServiceInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName());
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_PortMappings());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns ServiceInterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/ServiceInterfaceMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ServiceInterfaceMapping) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_ServiceInterfaceMapping_type") : //$NON-NLS-1$
-					getString("_UI_ServiceInterfaceMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServiceInterfaceMapping.class)) {
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID :
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE :
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME :
-			case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName(), JaxrpcmapFactory.eINSTANCE.createWSDLServiceName()));
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_PortMappings(), JaxrpcmapFactory.eINSTANCE.createPortMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
deleted file mode 100644
index 0c4add860..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
+++ /dev/null
@@ -1,64 +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 26, 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.webservice.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServiceRefEditorItemProvider extends ServiceRefItemProvider {
-	/**
-	 * @param adapterFactory
-	 */
-	public ServiceRefEditorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers());
-		}
-		return childrenReferences;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object arg0) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
deleted file mode 100644
index 98a15703e..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
+++ /dev/null
@@ -1,228 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.ServiceRef}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ServiceRefItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ServiceRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addServiceInterfacePropertyDescriptor(object);
-			addServiceRefNamePropertyDescriptor(object);
-			addWsdlFilePropertyDescriptor(object);
-			addJaxrpcMappingFilePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Service Ref Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServiceRefNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_serviceRefName_feature"), //$NON-NLS-1$
-					getString("%_UI_ServiceRef_serviceRefName_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceRefName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl File feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addWsdlFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_wsdlFile_feature"), //$NON-NLS-1$
-					getString("%_UI_ServiceRef_wsdlFile_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getServiceRef_WsdlFile(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Jaxrpc Mapping File feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *  
-	 */
-	protected void addJaxrpcMappingFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_jaxrpcMappingFile_feature"), //$NON-NLS-1$
-					getString("%_UI_ServiceRef_jaxrpcMappingFile_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getServiceRef_JaxrpcMappingFile(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Service Interface feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *  
-	 */
-	protected void addServiceInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_serviceInterface_feature"), //$NON-NLS-1$
-					getString("%_UI_ServiceRef_serviceInterface_feature_desc"), //$NON-NLS-1$
-					Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface(), false));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			//childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_PortComponentRefs());
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers());
-			//childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns ServiceRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/obj16/serviceref.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label =
-	 * ((ServiceRef)object).getServiceRefName(); return label == null || label.length() == 0 ?
-	 * getString("_UI_ServiceRef_type") : getString("_UI_ServiceRef_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((ServiceRef) object).getServiceRefName();
-		return "ServiceRef " + label; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServiceRef.class)) {
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME :
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE :
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE :
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS :
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS :
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_PortComponentRefs(), Webservice_clientFactory.eINSTANCE.createPortComponentRef()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers(), Webservice_clientFactory.eINSTANCE.createHandler()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), CommonFactory.eINSTANCE.createQName()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), WsddFactory.eINSTANCE.createWSDLPort()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java
deleted file mode 100644
index 109677509..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java
+++ /dev/null
@@ -1,156 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ServletLinkItemProvider extends BeanLinkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ServletLinkItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addServletLinkPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_ServletLink_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_ServletLink_id_feature", "_UI_ServletLink_type"),
-	 * WsddPackage.eINSTANCE.getServletLink_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Servlet Link feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addServletLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletLink_servletLink_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ServletLink_servletLink_feature", "_UI_ServletLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getServletLink_ServletLink(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns ServletLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/full/obj16/servlet.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((ServletLink)object).getId(); return
-	 * label == null || label.length() == 0 ? getString("_UI_ServletLink_type") :
-	 * getString("_UI_ServletLink_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((ServletLink) object).getServletLink();
-		return label == null || label.length() == 0 ? getString("%_UI_ServletLink_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ServletLink.class)) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
deleted file mode 100644
index c4e815bf8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
+++ /dev/null
@@ -1,205 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class VariableMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public VariableMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addJavaVariableNamePropertyDescriptor(object);
-			addXmlElementNamePropertyDescriptor(object);
-			addDataMemberPropertyDescriptor(object);
-			addXmlAttributeNamePropertyDescriptor(object);
-			addXmlWildcardPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_id_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getVariableMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Java Variable Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addJavaVariableNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_javaVariableName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_javaVariableName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getVariableMapping_JavaVariableName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Xml Element Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addXmlElementNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlElementName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlElementName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlElementName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Data Member feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDataMemberPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_dataMember_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_dataMember_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getVariableMapping_DataMember(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Xml Attribute Name feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addXmlAttributeNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlAttributeName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlAttributeName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlAttributeName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Xml Wildcard feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addXmlWildcardPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlWildcard_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlWildcard_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlWildcard(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns VariableMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/VariableMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((VariableMapping) object).getJavaVariableName();
-		return label == null || label.length() == 0 ? getString("_UI_VariableMapping_type") : //$NON-NLS-1$
-					getString("_UI_VariableMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(VariableMapping.class)) {
-			case JaxrpcmapPackage.VARIABLE_MAPPING__ID :
-			case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME :
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME :
-			case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER :
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME :
-			case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java
deleted file mode 100644
index 229f19948..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java
+++ /dev/null
@@ -1,112 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLBindingItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLBindingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns WSDLBinding.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLBinding"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLBinding) object).getCombinedQName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLBinding_type") : //$NON-NLS-1$
-					getString("_UI_WSDLBinding_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java
deleted file mode 100644
index 8e540b835..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java
+++ /dev/null
@@ -1,112 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLMessageItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLMessageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns WSDLMessage.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLMessage"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLMessage) object).getCombinedQName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLMessage_type") : //$NON-NLS-1$
-					getString("_UI_WSDLMessage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
deleted file mode 100644
index e84f8ddde..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
+++ /dev/null
@@ -1,197 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLMessageMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLMessageMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addWsdlMessagePartNamePropertyDescriptor(object);
-			addParameterModePropertyDescriptor(object);
-			addSoapHeaderPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_id_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_wsdlMessagePartName_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Parameter Mode feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addParameterModePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_parameterMode_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_parameterMode_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_ParameterMode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Soap Header feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSoapHeaderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_soapHeader_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_soapHeader_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_SoapHeader(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessage());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns WSDLMessageMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLMessageMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLMessageMapping) object).getWsdlMessagePartName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLMessageMapping_type") : //$NON-NLS-1$
-					getString("_UI_WSDLMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WSDLMessageMapping.class)) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID :
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME :
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE :
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER :
-			case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
deleted file mode 100644
index af6c536ae..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
+++ /dev/null
@@ -1,149 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLMessagePartNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLMessagePartNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addWsdlMessagePartNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessagePartName_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessagePartName_id_feature", "_UI_WSDLMessagePartName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessagePartName_wsdlMessagePartName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessagePartName_wsdlMessagePartName_feature", "_UI_WSDLMessagePartName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns WSDLMessagePartName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLMessagePartName"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLMessagePartName) object).getWsdlMessagePartName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLMessagePartName_type") : //$NON-NLS-1$
-					getString("_UI_WSDLMessagePartName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WSDLMessagePartName.class)) {
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID :
-			case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java
deleted file mode 100644
index d3880fdc2..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java
+++ /dev/null
@@ -1,148 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLOperationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLOperationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addWsdlOperationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLOperation_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLOperation_id_feature", "_UI_WSDLOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLOperation_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl Operation feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLOperation_wsdlOperation_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLOperation_wsdlOperation_feature", "_UI_WSDLOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLOperation_WsdlOperation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns WSDLOperation.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLOperation"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLOperation) object).getId();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLOperation_type") : //$NON-NLS-1$
-					getString("_UI_WSDLOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WSDLOperation.class)) {
-			case JaxrpcmapPackage.WSDL_OPERATION__ID :
-			case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java
deleted file mode 100644
index 10e94365d..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java
+++ /dev/null
@@ -1,129 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLPortItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLPortItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns WSDLPort.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/full/obj16/wsdl.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((WSDLPort)object).getCombinedQName();
-	 * return label == null || label.length() == 0 ? getString("_UI_WSDLPort_type") :
-	 * getString("_UI_WSDLPort_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		WSDLPort wsdlport = (WSDLPort) object;
-		String nsURI = wsdlport.getNamespaceURI();
-		String localpart = wsdlport.getLocalPart();
-		if (nsURI == null || nsURI.length() == 0 || localpart == null || localpart.length() == 0)
-			return getString("%_UI_WSDLPort_type"); //$NON-NLS-1$
-		StringBuffer label = new StringBuffer();
-		label.append(nsURI);
-		label.append("#"); //$NON-NLS-1$
-		label.append(localpart);
-		return label.toString();
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java
deleted file mode 100644
index 4e717b6f8..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java
+++ /dev/null
@@ -1,112 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLPortTypeItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLPortTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns WSDLPortType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLPortType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLPortType) object).getCombinedQName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLPortType_type") : //$NON-NLS-1$
-					getString("_UI_WSDLPortType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
deleted file mode 100644
index fc626138f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
+++ /dev/null
@@ -1,183 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WSDLReturnValueMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLReturnValueMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addMethodReturnValuePropertyDescriptor(object);
-			addWsdlMessagePartNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_id_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_id_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Method Return Value feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addMethodReturnValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_methodReturnValue_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_methodReturnValue_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_MethodReturnValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_wsdlMessagePartName_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessage());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns WSDLReturnValueMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLReturnValueMapping"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLReturnValueMapping) object).getWsdlMessagePartName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLReturnValueMapping_type") : //$NON-NLS-1$
-					getString("_UI_WSDLReturnValueMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WSDLReturnValueMapping.class)) {
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID :
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE :
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME :
-			case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
deleted file mode 100644
index d2f5003f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
+++ /dev/null
@@ -1,113 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class WSDLServiceNameItemProvider extends QNameItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WSDLServiceNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-
-	/**
-	 * This returns WSDLServiceName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WSDLServiceName"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WSDLServiceName) object).getCombinedQName();
-		return label == null || label.length() == 0 ? getString("_UI_WSDLServiceName_type") : //$NON-NLS-1$
-					getString("_UI_WSDLServiceName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return Webservicej2eeEditPlugin.INSTANCE;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
deleted file mode 100644
index df59e828c..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
+++ /dev/null
@@ -1,344 +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.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class WebServiceDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WebServiceDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addJaxrpcMappingFilePropertyDescriptor(object);
-			addWebServiceDescriptionNamePropertyDescriptor(object);
-			addWsdlFilePropertyDescriptor(object);
-			addSmallIconPropertyDescriptor(object);
-			addLargeIconPropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_WebServiceDescription_id_feature"),
-	 * getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_id_feature",
-	 * "_UI_WebServiceDescription_type"), WsddPackage.eINSTANCE.getWebServiceDescription_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Jaxrpc Mapping File feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addJaxrpcMappingFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_jaxrpcMappingFile_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_jaxrpcMappingFile_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_JaxrpcMappingFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Web Service Description Name feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWebServiceDescriptionNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_webServiceDescriptionName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_webServiceDescriptionName_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_WebServiceDescriptionName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Wsdl File feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addWsdlFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_wsdlFile_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_wsdlFile_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_WsdlFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSmallIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_smallIcon_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_smallIcon_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLargeIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_largeIcon_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_largeIcon_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_description_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_displayName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_displayName_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getWebServiceDescription_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_PortComponents());
-			childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_DescriptionType());
-			childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_DisplayNameType());
-			childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_IconType());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns WebServiceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public Object getImage(Object object) { return
-	 * getResourceLocator().getImage("full/obj16/WebServiceDescription"); }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label =
-	 * ((WebServiceDescription)object).getWebServiceDescriptionName(); return label == null ||
-	 * label.length() == 0 ? getString("_UI_WebServiceDescription_type") :
-	 * getString("_UI_WebServiceDescription_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns WebServiceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *  
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/obj16/webservicedesc.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((WebServiceDescription) object).getWebServiceDescriptionName();
-		return label == null || label.length() == 0 ? getString("%_UI_WebServiceDescription_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WebServiceDescription.class)) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE :
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_PortComponents(), WsddFactory.eINSTANCE.createPortComponent()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_DescriptionType(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_DisplayNameType(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_IconType(), CommonFactory.eINSTANCE.createIconType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
deleted file mode 100644
index 123b61084..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
+++ /dev/null
@@ -1,154 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.WebServicesClient}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WebServicesClientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WebServicesClientItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ComponentScopedRefs());
-			childrenReferences.add(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ServiceRefs());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns WebServicesClient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WebServicesClient"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-
-	public String getText(Object object) {
-		//return getString("_UI_WebServicesClient_type");
-		return getString("%_UI_WebServicesClient_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WebServicesClient.class)) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS :
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ComponentScopedRefs(), Webservice_clientFactory.eINSTANCE.createComponentScopedRefs()));
-
-		newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
deleted file mode 100644
index 4e3323ef3..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
+++ /dev/null
@@ -1,163 +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.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class WebServicesItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WebServicesItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_WebServices_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_WebServices_id_feature", "_UI_WebServices_type"),
-	 * WsddPackage.eINSTANCE.getWebServices_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WsddPackage.eINSTANCE.getWebServices_WebServiceDescriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns WebServices.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/WebServices"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((WebServices)object).getDisplayName();
-	 * return label == null || label.length() == 0 ? getString("_UI_WebServices_type") :
-	 * getString("_UI_WebServices_type") + " " + label; }
-	 */
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((WebServices) object).getDisplayName();
-		return label == null || label.length() == 0 ? getString("%_UI_WebServices_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WebServices.class)) {
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServices_WebServiceDescriptions(), WsddFactory.eINSTANCE.createWebServiceDescription()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java
deleted file mode 100644
index 232671d9e..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java
+++ /dev/null
@@ -1,48 +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 26, 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.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class Webservice_clientEditorItemProviderFactory extends Webservice_clientItemProviderAdapterFactory {
-	/**
-	 *  
-	 */
-	public Webservice_clientEditorItemProviderFactory() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createServiceRefAdapter()
-	 */
-	public Adapter createServiceRefAdapter() {
-		if (serviceRefItemProvider == null) {
-			serviceRefItemProvider = new ServiceRefEditorItemProvider(this);
-		}
-
-		return serviceRefItemProvider;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
deleted file mode 100644
index ffed8064f..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,279 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.util.Webservice_clientAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class Webservice_clientItemProviderAdapterFactory extends Webservice_clientAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Webservice_clientItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.wsclient.ServiceRef}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ServiceRefItemProvider serviceRefItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.wsclient.ServiceRef}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createServiceRefAdapter() {
-		if (serviceRefItemProvider == null) {
-			serviceRefItemProvider = new ServiceRefItemProvider(this);
-		}
-
-		return serviceRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.wsclient.PortComponentRef}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PortComponentRefItemProvider portComponentRefItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.wsclient.PortComponentRef}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createPortComponentRefAdapter() {
-		if (portComponentRefItemProvider == null) {
-			portComponentRefItemProvider = new PortComponentRefItemProvider(this);
-		}
-
-		return portComponentRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.wsclient.Handler}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected HandlerItemProvider handlerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.wsclient.Handler}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createHandlerAdapter() {
-		if (handlerItemProvider == null) {
-			handlerItemProvider = new HandlerItemProvider(this);
-		}
-
-		return handlerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.wsclient.WebServicesClient}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WebServicesClientItemProvider webServicesClientItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.wsclient.WebServicesClient}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWebServicesClientAdapter() {
-		if (webServicesClientItemProvider == null) {
-			webServicesClientItemProvider = new WebServicesClientItemProvider(this);
-		}
-
-		return webServicesClientItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.wsclient.ComponentScopedRefs}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComponentScopedRefsItemProvider componentScopedRefsItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.wsclient.ComponentScopedRefs}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createComponentScopedRefsAdapter() {
-		if (componentScopedRefsItemProvider == null) {
-			componentScopedRefsItemProvider = new ComponentScopedRefsItemProvider(this);
-		}
-
-		return componentScopedRefsItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java
deleted file mode 100644
index d9aab3029..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java
+++ /dev/null
@@ -1,91 +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.webservice.provider;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Webservice-j2ee edit plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public final class Webservicej2eeEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final Webservicej2eeEditPlugin INSTANCE = new Webservicej2eeEditPlugin();
-
-	/**
-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Webservicej2eeEditPlugin() {
-		super(new ResourceLocator[]{});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin </b>. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @param descriptor
-		 *            the description of the plugin.
-		 * @generated
-		 */
-		public Implementation(IPluginDescriptor descriptor) {
-			super(descriptor);
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
deleted file mode 100644
index aa84566dd..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,307 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.util.WscommonAdapterFactory;
-
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class WscommonItemProviderAdapterFactory extends WscommonAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WscommonItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected InitParamItemProvider initParamItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createInitParamAdapter() {
-		if (initParamItemProvider == null) {
-			initParamItemProvider = new InitParamItemProvider(this);
-		}
-
-		return initParamItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SOAPHeaderItemProvider soapHeaderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createSOAPHeaderAdapter() {
-		if (soapHeaderItemProvider == null) {
-			soapHeaderItemProvider = new SOAPHeaderItemProvider(this);
-		}
-
-		return soapHeaderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SOAPRoleItemProvider soapRoleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createSOAPRoleAdapter() {
-		if (soapRoleItemProvider == null) {
-			soapRoleItemProvider = new SOAPRoleItemProvider(this);
-		}
-
-		return soapRoleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PortNameItemProvider portNameItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createPortNameAdapter() {
-		if (portNameItemProvider == null) {
-			portNameItemProvider = new PortNameItemProvider(this);
-		}
-
-		return portNameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DescriptionTypeItemProvider descriptionTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createDescriptionTypeAdapter() {
-		if (descriptionTypeItemProvider == null) {
-			descriptionTypeItemProvider = new DescriptionTypeItemProvider(this);
-		}
-
-		return descriptionTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DisplayNameTypeItemProvider displayNameTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createDisplayNameTypeAdapter() {
-		if (displayNameTypeItemProvider == null) {
-			displayNameTypeItemProvider = new DisplayNameTypeItemProvider(this);
-		}
-
-		return displayNameTypeItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
deleted file mode 100644
index 1a91929e1..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,374 +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.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.wsdd.provider.HandlerItemProvider;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.util.WsddAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class WsddItemProviderAdapterFactory extends WsddAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public WsddItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WebServicesItemProvider webServicesItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWebServicesAdapter() {
-		if (webServicesItemProvider == null) {
-			webServicesItemProvider = new WebServicesItemProvider(this);
-		}
-
-		return webServicesItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WebServiceDescriptionItemProvider webServiceDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWebServiceDescriptionAdapter() {
-		if (webServiceDescriptionItemProvider == null) {
-			webServiceDescriptionItemProvider = new WebServiceDescriptionItemProvider(this);
-		}
-
-		return webServiceDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PortComponentItemProvider portComponentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createPortComponentAdapter() {
-		if (portComponentItemProvider == null) {
-			portComponentItemProvider = new PortComponentItemProvider(this);
-		}
-
-		return portComponentItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected WSDLPortItemProvider wsdlPortItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createWSDLPortAdapter() {
-		if (wsdlPortItemProvider == null) {
-			wsdlPortItemProvider = new WSDLPortItemProvider(this);
-		}
-
-		return wsdlPortItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}instances. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ServiceImplBeanItemProvider serviceImplBeanItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createServiceImplBeanAdapter() {
-		if (serviceImplBeanItemProvider == null) {
-			serviceImplBeanItemProvider = new ServiceImplBeanItemProvider(this);
-		}
-
-		return serviceImplBeanItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ServletLinkItemProvider servletLinkItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createServletLinkAdapter() {
-		if (servletLinkItemProvider == null) {
-			servletLinkItemProvider = new ServletLinkItemProvider(this);
-		}
-
-		return servletLinkItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EJBLinkItemProvider ejbLinkItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createEJBLinkAdapter() {
-		if (ejbLinkItemProvider == null) {
-			ejbLinkItemProvider = new EJBLinkItemProvider(this);
-		}
-
-		return ejbLinkItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected HandlerItemProvider handlerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createHandlerAdapter() {
-		if (handlerItemProvider == null) {
-			handlerItemProvider = new HandlerItemProvider(this);
-		}
-
-		return handlerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected BeanLinkItemProvider beanLinkItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createBeanLinkAdapter() {
-		if (beanLinkItemProvider == null) {
-			beanLinkItemProvider = new BeanLinkItemProvider(this);
-		}
-
-		return beanLinkItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
deleted file mode 100644
index d0fb4e173..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
+++ /dev/null
@@ -1,271 +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.wsdd.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/*
- * This class should be merged with HandlerItemProvider in org.eclipse.jst.j2ee.internal.internal.internal.webservice.provider
- * package and all references to this class need to be replaced with HandlerItemProvider in 
- * org.eclipse.jst.j2ee.internal.internal.internal.webservice.provider package.
- */
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class HandlerItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public HandlerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addHandlerNamePropertyDescriptor(object);
-			addHandlerClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
-	 * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-	 * getString("_UI_Handler_id_feature"), getString("_UI_PropertyDescriptor_description",
-	 * "_UI_Handler_id_feature", "_UI_Handler_type"), WsddPackage.eINSTANCE.getHandler_Id(), true,
-	 * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
-	 */
-
-	/**
-	 * This adds a property descriptor for the Handler Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addHandlerNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Handler_handlerName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Handler_handlerName_feature", "_UI_Handler_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getHandler_HandlerName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Handler Class feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addHandlerClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Handler_handlerClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Handler_handlerClass_feature", "_UI_Handler_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					WsddPackage.eINSTANCE.getHandler_HandlerClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(WsddPackage.eINSTANCE.getHandler_InitParams());
-			childrenReferences.add(WsddPackage.eINSTANCE.getHandler_SoapHeaders());
-			childrenReferences.add(WsddPackage.eINSTANCE.getHandler_SoapRoles());
-			childrenReferences.add(WsddPackage.eINSTANCE.getHandler_HandlerClass());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public Object getImage(Object object) { return
-	 * getResourceLocator().getImage("full/obj16/Handler"); }
-	 */
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	/*
-	 * public String getText(Object object) { String label = ((Handler)object).getDisplayName();
-	 * return label == null || label.length() == 0 ? getString("_UI_Handler_type") :
-	 * getString("_UI_Handler_type") + " " + label; }
-	 */
-	/**
-	 * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @non-generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("icons/obj16/handler.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @non-generated
-	 */
-	public String getText(Object object) {
-		String label = ((Handler) object).getHandlerName();
-		return label == null || label.length() == 0 ? getString("%_UI_Handler_type") : label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Handler.class)) {
-			case WsddPackage.HANDLER__HANDLER_NAME :
-			case WsddPackage.HANDLER__HANDLER_CLASS :
-			case WsddPackage.HANDLER__INIT_PARAMS :
-			case WsddPackage.HANDLER__SOAP_HEADERS :
-			case WsddPackage.HANDLER__SOAP_ROLES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_InitParams(), WscommonFactory.eINSTANCE.createInitParam()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_SoapHeaders(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
-		newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_SoapRoles(), WscommonFactory.eINSTANCE.createSOAPRole()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return WebServicePlugin.getInstance();
-	}
-
-	/**
-	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
-	 */
-	public Collection getChildren(Object object) {
-		if (object instanceof EList)
-			return getChildrenFromEList((EList) object);
-		else if (object instanceof AdapterViewerItem)
-			return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
-		else
-			return super.getChildren(object);
-	}
-
-	protected Collection getChildrenFromEList(EList eList) {
-		Collection result = new ArrayList();
-		for (Iterator it = eList.iterator(); it.hasNext();)
-			result.addAll(super.getChildren(it.next()));
-		return result;
-	}
-
-	protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
-		Collection result = new ArrayList();
-		EList eObjectList = adapterViewerItem.getEObjectList();
-		EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
-		for (Iterator it = eObjectList.iterator(); it.hasNext();) {
-			EObject eObject = (EObject) it.next();
-			Object object = eObject.eGet(feature);
-			if (object != null) {
-				if (object instanceof List)
-					result.addAll((List) object);
-				else
-					result.add(object);
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/.classpath b/plugins/org.eclipse.jst.j2ee/.classpath
deleted file mode 100644
index 3ca08572b..000000000
--- a/plugins/org.eclipse.jst.j2ee/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="j2eeplugin/"/>
-	<classpathentry kind="src" path="common/"/>
-	<classpathentry kind="src" path="commonedit/"/>
-	<classpathentry kind="src" path="earproject/"/>
-	<classpathentry kind="src" path="j2eecreation/"/>
-	<classpathentry kind="src" path="archiveops/"/>
-	<classpathentry kind="src" path="applicationedit/"/>
-	<classpathentry kind="src" path="appclientcreation/"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="src" path="refactor"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee/.cvsignore b/plugins/org.eclipse.jst.j2ee/.cvsignore
deleted file mode 100644
index 590084fe0..000000000
--- a/plugins/org.eclipse.jst.j2ee/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee/.project b/plugins/org.eclipse.jst.j2ee/.project
deleted file mode 100644
index 8f2cf14e0..000000000
--- a/plugins/org.eclipse.jst.j2ee/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
deleted file mode 100644
index e0f1006a8..000000000
--- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,75 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: J2EE Component
-Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.application.internal.operations;x-internal:=true,
- org.eclipse.jst.j2ee.applicationclient.componentcore.util,
- org.eclipse.jst.j2ee.applicationclient.internal.creation;x-internal:=true,
- org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util;x-internal:=true,
- org.eclipse.jst.j2ee.common.internal.provider;x-internal:=true,
- org.eclipse.jst.j2ee.componentcore,
- org.eclipse.jst.j2ee.componentcore.util,
- org.eclipse.jst.j2ee.datamodel.properties,
- org.eclipse.jst.j2ee.internal;x-internal:=true,
- org.eclipse.jst.j2ee.internal.application.common;x-internal:=true,
- org.eclipse.jst.j2ee.internal.application.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.archive.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.common;x-internal:=true,
- org.eclipse.jst.j2ee.internal.common.classpath,
- org.eclipse.jst.j2ee.internal.common.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.componentcore,
- org.eclipse.jst.j2ee.internal.delete;x-internal:=true,
- org.eclipse.jst.j2ee.internal.deploy;x-internal:=true,
- org.eclipse.jst.j2ee.internal.deployables;x-internal:=true,
- org.eclipse.jst.j2ee.internal.earcreation;x-internal:=true,
- org.eclipse.jst.j2ee.internal.earcreation.modulemap;x-internal:=true,
- org.eclipse.jst.j2ee.internal.modulecore.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.moduleextension;x-internal:=true,
- org.eclipse.jst.j2ee.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.project;x-internal:=true,
- org.eclipse.jst.j2ee.internal.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.rename;x-internal:=true,
- org.eclipse.jst.j2ee.internal.servertarget;x-internal:=true,
- org.eclipse.jst.j2ee.internal.validation;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservices;x-internal:=true,
- org.eclipse.jst.j2ee.project.datamodel.properties,
- org.eclipse.jst.j2ee.project.facet,
- org.eclipse.jst.j2ee.refactor,
- org.eclipse.jst.j2ee.refactor.listeners,
- org.eclipse.jst.j2ee.refactor.operations
-Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee/about.html b/plugins/org.eclipse.jst.j2ee/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.j2ee/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
deleted file mode 100644
index 1a22bcbfc..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.applicationclient.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.componentcore.AppClientBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.EnterpriseBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-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.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-	
-	/**
-	 * <p>
-	 * Identifier used to link AppClientArtifactEdit to a AppClientEditAdapterFactory {@see
-	 * AppClientEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
-	 * </p>
-	 */
-
-	public static final Class ADAPTER_TYPE = AppClientArtifactEdit.class;
-
-	/**
-	 * 
-	 */
-	public AppClientArtifactEdit() {
-		super();
-	}
-
-	public AppClientArtifactEdit(IVirtualComponent aModule) {
-		super(aModule);
-	}
-	
-	protected BinaryComponentHelper initBinaryComponentHelper(IVirtualComponent binaryModule) {
-		return new AppClientBinaryComponentHelper(binaryModule);
-	}
-	
-	
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public AppClientArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);		
-	}
-	
-	public AppClientArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.APPLICATION_CLIENT);		
-	}
-
-	public AppClientArtifactEdit(ArtifactEditModel anArtifactEditModel) {
-		super(anArtifactEditModel);		
-	}
-
-	/**
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param aNature
-	 * @param aModule
-	 * @param toAccessAsReadOnly
-	 */
-	protected AppClientArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);		
-	}
-	
-	/**
-	 * <p>
-	 * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
-	 * </p>
-	 * 
-	 * @return Resource
-	 *  
-	 */
-
-	public Resource getDeploymentDescriptorResource() {
-		if(isBinary()){
-			return getBinaryComponentHelper().getResource(J2EEConstants.APP_CLIENT_DD_URI_OBJ);
-		} 
-		return getArtifactEditModel().getResource(J2EEConstants.APP_CLIENT_DD_URI_OBJ);
-	}
-	
-	/**
-	 * <p>
-	 * Obtains the ApplicationClient (@see ApplicationClient) root object from the ApplicationClientResource. If the root object does
-	 * not exist, then one is created (@link addAppClientJarIfNecessary(getAppClientXmiResource())).
-	 * The root object contains all other resource defined objects.
-	 * </p>
-	 * 
-	 * @return EObject
-	 *  
-	 */
-	public EObject getDeploymentDescriptorRoot() {
-		List contents = getDeploymentDescriptorResource().getContents();
-		if (contents.size() > 0)
-			return (EObject) contents.get(0);
-		if(isBinary()){
-			return null;
-		}
-		addAppClientIfNecessary(getApplicationClientXmiResource());
-		return (EObject) contents.get(0);
-	}
-	
-	/**
-	 * 
-	 * @return ApplicationClientResource from (@link getDeploymentDescriptorResource())
-	 *  
-	 */
-
-	public ApplicationClientResource getApplicationClientXmiResource() {
-		return (ApplicationClientResource) getDeploymentDescriptorResource();
-	}
-	
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (ApplicationClient) and populates with data. Adds the root
-	 * object to the deployment descriptor resource.
-	 * </p>
-	 * 
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource}
-	 * 
-	 * Note: This method is typically used for JUNIT - move?
-	 * </p>
-	 */
-	protected void addAppClientIfNecessary(XMLResource aResource) {
-		if(isBinary()){
-			throwAttemptedBinaryEditModelAccess();
-		}
-		if (aResource != null && aResource.getContents().isEmpty()) {
-			ApplicationClient appClient = ClientFactory.eINSTANCE.createApplicationClient();
-			aResource.getContents().add(appClient);
-			URI moduleURI = getArtifactEditModel().getModuleURI();
-			try {
-				appClient.setDisplayName(StructureEdit.getDeployedName(moduleURI));
-			} catch (UnresolveableURIException e) {
-				//Ignore
-			}
-			aResource.setID(appClient, J2EEConstants.APP_CLIENT_ID);
-			//TODO add more mandatory elements
-		}
-	}
-	
-	/**
-	 * <p>
-	 * Method used for adding a j2ee project to an ear project; subclasses must override to create a
-	 * new instance of the correct kind of Module
-	 * </p>
-	 */
-	public Module createNewModule() {
-		if(isBinary()){
-			throwAttemptedBinaryEditModelAccess();
-		}
-		return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createJavaClientModule();
-	}
-	
-	/**
-	 * 
-	 * @return ApplicationClient from (@link getDeploymentDescriptorRoot())
-	 *  
-	 */
-	public ApplicationClient getApplicationClient() {
-		return (ApplicationClient) getDeploymentDescriptorRoot();
-	}
-	
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from ApplicationClientResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 *  
-	 */
-
-	public int getJ2EEVersion() {
-		return getApplicationClientXmiResource().getJ2EEVersionID();
-	}
-	
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 */
-	public static AppClientArtifactEdit getAppClientArtifactEditForRead(IProject aProject) {
-		AppClientArtifactEdit artifactEdit = null;
-		try {
-			if (isValidApplicationClientModule(ComponentCore.createComponent(aProject))) 
-				artifactEdit = new AppClientArtifactEdit(aProject, true, false);
-		} catch (Exception e) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static AppClientArtifactEdit getAppClientArtifactEditForWrite(IProject aProject) {
-		AppClientArtifactEdit artifactEdit = null;
-		try {
-			if (isValidApplicationClientModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new AppClientArtifactEdit(aProject, false, false);
-		} catch (Exception e) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-	
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of AppClientArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an AppClientArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that will not
-	 * be used for editing. Invocations of any save*() API on an instance returned from this method
-	 * will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an accessible
-	 *            project in the workspace
-	 * @return An instance of AppClientArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static AppClientArtifactEdit getAppClientArtifactEditForRead(IVirtualComponent aModule) {
-		if (aModule == null)
-			return null;
-		if(aModule.isBinary()){
-			return new AppClientArtifactEdit(aModule);
-		}
-		return getAppClientArtifactEditForRead(aModule.getProject());
-	}
-	
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of AppClientArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an AppClientArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an accessible
-	 *            project in the workspace
-	 * @return An instance of AppClientArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static AppClientArtifactEdit getAppClientArtifactEditForWrite(IVirtualComponent aModule) {
-		if (aModule == null || aModule.isBinary())
-			return null;
-		return getAppClientArtifactEditForWrite(aModule.getProject());
-	}
-	
-	/**
-	 * <p>Note: This method is for internal use only. Clients should not call this method.</p>
-	 * @param module
-	 *            A {@see WorkbenchComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is a
-	 *         JST module
-	 */
-	public static boolean isValidApplicationClientModule(IVirtualComponent aModule) throws UnresolveableURIException {
-		if (!isValidEditableModule(aModule))
-			return false;
-		return J2EEProjectUtilities.isApplicationClientProject(aModule.getProject());
-	}
-
-	public EObject createModelRoot() {
-		if(isBinary()){
-			throwAttemptedBinaryEditModelAccess();
-		}
-	    return createModelRoot(getJ2EEVersion());
-	}
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
-     */
-    public EObject createModelRoot(int version) {
-    	if(isBinary()){
-			throwAttemptedBinaryEditModelAccess();
-		}
-	    ApplicationClientResource res = (ApplicationClientResource)getDeploymentDescriptorResource();
-		res.setModuleVersionID(version);
-	    addAppClientIfNecessary(res);
-		return ((ApplicationClientResource)getDeploymentDescriptorResource()).getRootObject();
-    }
-
-	public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-		
-		return getAppClientArtifactEditForRead(aComponent);
-	}
-
-	public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
-		
-		return getAppClientArtifactEditForWrite(aComponent);
-	}
-
-	public Archive asArchive(boolean includeSource) throws OpenFailureException{
-		if (isBinary()) {
-			return ((EnterpriseBinaryComponentHelper) getBinaryComponentHelper()).accessArchive();
-		} else {
-			AppClientComponentLoadStrategyImpl loader = new AppClientComponentLoadStrategyImpl(getComponent());
-			loader.setExportSource(includeSource);
-			String uri = ModuleURIUtil.getHandleString(getComponent());
-			return CommonarchiveFactory.eINSTANCE.openApplicationClientFile(loader, uri);
-		}
-	}
-	
-	public static void createDeploymentDescriptor(IProject project, int version) {
-		AppClientArtifactEdit appClientEdit = new AppClientArtifactEdit(project,false,true);
-		try {
-			appClientEdit.createModelRoot(version);
-			appClientEdit.save(null);
-		} finally {
-			appClientEdit.dispose();
-		} 
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/package.xml
deleted file mode 100644
index 49e3e8c7c..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJB Artifact Edit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the AppClientArtifactEdit api. This api is used to work with the emf model
-        of a flexible application client module. It contains api to read and serialize out the emf model for application client modules.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModelProvider.java
deleted file mode 100644
index 56619a869..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,155 +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.applicationclient.internal.creation;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * @deprecated 
- * @see AppClientFacetProjectCreationDataModelProvider
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see AppClientFacetProjectCreationDataModelProvider
- */
-public class AppClientComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IAppClientComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	public AppClientComponentCreationDataModelProvider() {
-		super();
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(CREATE_DEFAULT_MAIN_CLASS);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(CREATE_DEFAULT_MAIN_CLASS)) {
-			return getProperty(CREATE_DEFAULT_FILES);
-		} else if (propertyName.equals(ADD_TO_EAR)) {
-			return Boolean.TRUE;
-		} else if (propertyName.equals(MANIFEST_FOLDER)) {
-			return IPath.SEPARATOR + CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
-		}
-		if (propertyName.equals(DD_FOLDER)) {
-			return  IPath.SEPARATOR + CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER + IPath.SEPARATOR + J2EEConstants.META_INF;
-		}
-		if (propertyName.equals(JAVASOURCE_FOLDER)) {
-			return  CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER;
-		} else if (propertyName.equals(MODULE_URI)) {
-			return getProject().getName()+IJ2EEModuleConstants.JAR_EXT;
-		} 
-		return super.getDefaultProperty(propertyName);
-	}
-
-	protected Integer getDefaultComponentVersion() {
-		int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-		return new Integer(highestJ2EEPref);
-	}
-
-	protected DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
-		int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-		DataModelPropertyDescriptor[] descriptors = null;
-		switch (highestJ2EEPref) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				descriptors = new DataModelPropertyDescriptor[1];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
-				break;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				descriptors = new DataModelPropertyDescriptor[2];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
-				descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
-				break;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-			default :
-				descriptors = new DataModelPropertyDescriptor[3];
-				descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
-				descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
-				descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_4_ID), J2EEVersionConstants.VERSION_1_4_TEXT);
-				break;
-		}
-		return descriptors;
-	}
-
-	protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
-		return moduleVersion;
-	}
-
-	protected EClass getComponentType() {
-		return CommonarchivePackage.eINSTANCE.getApplicationClientFile();
-	}
-
-	protected String getComponentExtension() {
-		return ".jar"; //$NON-NLS-1$
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		//return new AppClientComponentCreationOperation(model);
-		return new AppClientComponentCreationFacetOperation(model);
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean doSet = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(JAVASOURCE_FOLDER)){
-			//unless MANIFEST folder is opened up, it is set as same as Java source folder
-			setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF); //$NON-NLS-1$
-		}		
-		return doSet;
-	}	
-	
-	protected String getJ2EEProjectType() {
-		return J2EEProjectUtilities.APPLICATION_CLIENT;
-	}
-	
-	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
-		if (propertyName.equals(COMPONENT_VERSION)) {
-			Integer propertyValue = (Integer) getProperty(propertyName);
-			String description = null;
-			switch (propertyValue.intValue()) {
-				case J2EEVersionConstants.J2EE_1_2_ID :
-					description = J2EEVersionConstants.VERSION_1_2_TEXT;
-					break;
-				case J2EEVersionConstants.J2EE_1_3_ID :
-					description = J2EEVersionConstants.VERSION_1_3_TEXT;
-					break;
-				case J2EEVersionConstants.J2EE_1_4_ID :
-				default :
-					description = J2EEVersionConstants.VERSION_1_4_TEXT;
-					break;
-			}
-			return new DataModelPropertyDescriptor(propertyValue, description);
-		}
-		return super.getPropertyDescriptor(propertyName);
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationFacetOperation.java
deleted file mode 100644
index 1ae788c1c..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.applicationclient.internal.creation;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEComponentCreationFacetOperation;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see AppClientFacetProjectCreationDataModelProvider
- */
-public class AppClientComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation implements IFacetProjectCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	public AppClientComponentCreationFacetOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-		dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(FACET_DM_MAP);
-		IDataModel javaDM = setupJavaInstallAction();
-		map.add(javaDM);
-		IDataModel newModel = setupAppClientFacetInstallAction();
-		map.add(newModel);
-		setRuntime(newModel, dm); // Setting runtime property
-		setAddToEARFromWizard(newModel);
-		IStatus stat = dm.getDefaultOperation().execute(monitor, info);
-		if (stat.isOK()) {
-			String earProjectName = (String) model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME);
-			IProject earProject = ProjectUtilities.getProject(earProjectName);
-			if (earProject != null && earProject.exists())
-				stat = addtoEar(projectName, earProjectName);
-		}
-
-		return stat;
-	}
-
-	protected IDataModel setupAppClientFacetInstallAction() {
-		String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
-		IDataModel facetInstallDataModel = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
-		facetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-		facetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
-		facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
-		facetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));
-		if (model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR))
-			facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, model.getProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME));
-		facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, model.getProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
-		facetInstallDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(IJ2EEComponentCreationDataModelProperties.RUNTIME_TARGET_ID));
-		return facetInstallDataModel;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentImportDataModelProvider.java
deleted file mode 100644
index 988a06723..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,73 +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.applicationclient.internal.creation;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientComponentImportOperation;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-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.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public final class AppClientComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider implements IAppClientComponentImportDataModelProperties {
-
-	public AppClientComponentImportDataModelProvider() {
-		super();
-	}
-
-	protected int getType() {
-		return XMLResource.APP_CLIENT_TYPE;
-	}
-
-	protected Archive openArchive(String uri) throws OpenFailureException {
-		return CommonarchiveFactory.eINSTANCE.openApplicationClientFile(getArchiveOptions(), uri);
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new AppClientComponentImportOperation(model);
-	}
-
-	protected IDataModel createJ2EEComponentCreationDataModel() {
-		IDataModel appClientDataModel = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
-		FacetDataModelMap map = (FacetDataModelMap)appClientDataModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		//need to ensure no default Main class is created during import
-		map.getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT).setBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS, false);
-		return appClientDataModel;
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean set = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(FILE)) {
-			IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-			if (getModuleFile() != null) {
-				FacetDataModelMap map = (FacetDataModelMap) moduleDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-				IDataModel appClientFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.APPLICATION_CLIENT );
-
-				int version = getModuleSpecVersion();
-				String versionText = J2EEVersionUtil.getJ2EETextVersion( version );
-				appClientFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
-				model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-			}
-		}
-		return set;
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientCreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientCreationResourceHandler.java
deleted file mode 100644
index c35ede999..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientCreationResourceHandler.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.applicationclient.internal.creation;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AppClientCreationResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "appclientcreation";//$NON-NLS-1$
-
-	private AppClientCreationResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String Error_occured_getting_appl_ERROR_;
-	public static String Creating_Application_Clien_UI_;
-	public static String Error_occured_loading_appl_UI_;
-	public static String Not_an_Application_Client_project_ERROR_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AppClientCreationResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index bd1b7fad5..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.applicationclient.internal.creation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class AppClientFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
-	public AppClientFacetProjectCreationDataModelProvider() {
-		super();
-	}
-	
-	public void init() {
-		super.init();
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-		map.add(javaFacet);
-		IDataModel appClientFacet = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
-		map.add(appClientFacet);
-		String appClientRoot = appClientFacet.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-		javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, appClientRoot);
-		// If using optimized single root structure, set the output folder to the content root
-		if (ProductManager.shouldUseSingleRootStructure())
-			javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME, appClientRoot);
-		appClientFacet.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
-					if (isPropertySet(EAR_PROJECT_NAME))
-						setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
-					else
-						model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
-				}else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
-					setProperty(ADD_TO_EAR, event.getProperty());
-				}
-			}
-		});	
-		
-		Collection requiredFacets = new ArrayList();
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(javaFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(appClientFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-	}
-	
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if( propertyName.equals( MODULE_URI )){
-			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-			IDataModel appFacet = map.getFacetDataModel( J2EEProjectUtilities.APPLICATION_CLIENT );	
-			appFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}		
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/IConfigurationConstants.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/IConfigurationConstants.java
deleted file mode 100644
index 8848cf02b..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/IConfigurationConstants.java
+++ /dev/null
@@ -1,21 +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.applicationclient.internal.creation;
-
-
-/**
- * Insert the type's description here. Creation date: (4/4/2001 10:05:24 AM)
- * 
- * @author: Administrator
- */
-public interface IConfigurationConstants {
-	final String PLUG_IN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
deleted file mode 100644
index f3f5095bf..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-public class AppClientEditAdapterFactory implements IAdapterFactory {
-
-	public AppClientEditAdapterFactory() {
-		super();
-	}
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType == AppClientArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
-			ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
-			if (J2EEProjectUtilities.isApplicationClientProject(editModel.getProject()))
-				return new AppClientArtifactEdit((ArtifactEditModel) adaptableObject);
-		}
-		return null;
-	}
-
-	public Class[] getAdapterList() {
-		return new Class[]{ArtifactEdit.class, AppClientArtifactEdit.class};
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
deleted file mode 100644
index 313e188f4..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.internal.common.CreationConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class AppClientFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IAppClientFacetInstallDataModelProperties {
-
-	public AppClientFacetInstallDataModelProvider() {
-		super();
-	}
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(CREATE_DEFAULT_MAIN_CLASS);
-		return names;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(FACET_ID))
-			return J2EEProjectUtilities.APPLICATION_CLIENT;
-		else if (propertyName.equals(CREATE_DEFAULT_MAIN_CLASS))
-			return Boolean.TRUE;
-		else if (propertyName.equals(CONFIG_FOLDER))
-			return CreationConstants.DEFAULT_APPCLIENT_SOURCE_FOLDER;
-		else if (propertyName.equals(MODULE_URI)) {
-			String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ','_');
-			return projectName + IJ2EEModuleConstants.JAR_EXT; 
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
-		return J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(version.getVersionString());
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
deleted file mode 100644
index 50cfd0293..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.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.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class AppClientFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null)
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		try {
-			IDataModel model = (IDataModel) config;
-			final IJavaProject jproj = JavaCore.create(project);
-
-			// Add WTP natures.
-			WtpUtils.addNatures(project);
-
-			// Setup the flexible project structure.
-			final IVirtualComponent c = createFlexibleProject(monitor, project, model, jproj);
-
-			// Setup the classpath.
-			ClasspathHelper.removeClasspathEntries(project, fv);
-			if (!ClasspathHelper.addClasspathEntries(project, fv)) {
-				// TODO: Support the no runtime case.
-				// ClasspathHelper.addClasspathEntries( project, fv, <something> );
-			}
-
-
-//			// Add main class if necessary
-//			if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS))
-//				addMainClass(monitor, model, project);
-
-			try {
-				((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-
-			if (monitor != null)
-				monitor.worked(1);
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (monitor != null)
-				monitor.done();
-		}
-	}
-
-	protected IVirtualComponent createFlexibleProject(IProgressMonitor monitor, IProject project, IDataModel model, IJavaProject jproj) throws Exception {
-		// Create the directory structure.
-		final IWorkspace ws = ResourcesPlugin.getWorkspace();
-		final IPath pjpath = project.getFullPath();
-
-		final IVirtualComponent c = ComponentCore.createComponent(project);
-		c.create(0, null);
-		setOutputFolder(model, c);
-		final IVirtualFolder root = c.getRootFolder();
-		
-		IFolder sourceFolder = null;
-		String configFolder = null;
-		configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-		root.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
-		String configFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-		IPath configFolderpath = pjpath.append(configFolderName);
-		sourceFolder = ws.getRoot().getFolder(configFolderpath);
-
-		if (!sourceFolder.getFile(J2EEConstants.APP_CLIENT_DD_URI).exists()) {
-			String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
-			int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
-			AppClientArtifactEdit.createDeploymentDescriptor(project, nVer);
-		}
-		
-		// add source folder maps
-		final IClasspathEntry[] cp = jproj.getRawClasspath();
-		for (int i = 0; i < cp.length; i++) {
-			final IClasspathEntry cpe = cp[i];
-			if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-				root.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
-			}
-		}
-		return c;
-	}
-
-//	private void addMainClass(IProgressMonitor monitor, IDataModel model, IProject project) {
-//		try {
-//			IDataModel mainClassDataModel = DataModelFactory.createDataModel(NewJavaClassDataModelProvider.class);
-//			mainClassDataModel.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, project.getName());
-//			mainClassDataModel.setProperty(INewJavaClassDataModelProperties.CLASS_NAME, "Main"); //$NON-NLS-1$
-//			mainClassDataModel.setBooleanProperty(INewJavaClassDataModelProperties.MAIN_METHOD, true);
-//			String projRelativeSourcePath = IPath.SEPARATOR + project.getName() + IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-//			mainClassDataModel.setProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER, projRelativeSourcePath);
-//			IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-//			mainClassDataModel.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT, javaProject.getPackageFragmentRoots()[0]);
-//			mainClassDataModel.getDefaultOperation().execute(monitor, null);
-//			createManifestEntryForMainClass(monitor, model, project);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-//	}
-
-//	protected void createManifestEntryForMainClass(IProgressMonitor monitor, IDataModel model, IProject project) throws CoreException, InvocationTargetException, InterruptedException {
-//		IVirtualComponent appClientComponent = ComponentCore.createComponent(project);
-//		IVirtualFile vf = appClientComponent.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
-//		IFile manifestmf = vf.getUnderlyingFile();
-//		if (manifestmf == null || !manifestmf.exists()) {
-//			try {
-//				createManifest(project, appClientComponent.getRootFolder().getUnderlyingFolder(), monitor);
-//			} catch (Exception e) {
-//				Logger.getLogger().logError(e);
-//			}
-//			String manifestFolder = IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER) + IPath.SEPARATOR + J2EEConstants.META_INF;
-//			IContainer container = project.getFolder(manifestFolder);
-//			manifestmf = container.getFile(new Path(J2EEConstants.MANIFEST_SHORT_NAME));
-//		}
-//		if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS)) {
-//			IDataModel dm = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
-//			dm.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, project.getName());
-//			dm.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-//			dm.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
-//			dm.setProperty(UpdateManifestDataModelProperties.MAIN_CLASS, "Main"); //$NON-NLS-1$
-//			try {
-//				dm.getDefaultOperation().execute(monitor, null);
-//			} catch (Exception e) {
-//				// Ignore
-//			}
-//		}
-//	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java
deleted file mode 100644
index 0b49234a8..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class AppClientFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null)
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		try {
-			IDataModel model = (IDataModel) config;
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-			
-			// Add main class if necessary
-			if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS))
-				addMainClass(monitor, model, project);			
-
-			// Associate with an EAR, if necessary.
-			final String earProjectName = (String) model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-			if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
-				if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
-					String ver = fv.getVersionString();
-					
-					String j2eeVersionText = ver;
-					installEARFacet(j2eeVersionText, earProjectName, (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME), monitor);
-					final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-					installAndAddModuletoEAR( j2eeVersionText,
-								earProjectName,
-								(IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME),
-								project,
-								moduleURI,
-								monitor );
-
-				}
-			}
-
-			if (monitor != null)
-				monitor.worked(1);
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (monitor != null)
-				monitor.done();
-		}
-	}
-	
-	private void addMainClass(IProgressMonitor monitor, IDataModel model, IProject project) {
-		try {
-			IDataModel mainClassDataModel = DataModelFactory.createDataModel(NewJavaClassDataModelProvider.class);
-			mainClassDataModel.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, project.getName());
-			mainClassDataModel.setProperty(INewJavaClassDataModelProperties.CLASS_NAME, "Main"); //$NON-NLS-1$
-			mainClassDataModel.setBooleanProperty(INewJavaClassDataModelProperties.MAIN_METHOD, true);
-			String projRelativeSourcePath = IPath.SEPARATOR + project.getName() + IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-			mainClassDataModel.setProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER, projRelativeSourcePath);
-			IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-			mainClassDataModel.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT, javaProject.getPackageFragmentRoots()[0]);
-			mainClassDataModel.getDefaultOperation().execute(monitor, null);
-			createManifestEntryForMainClass(monitor, model, project);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	protected void createManifestEntryForMainClass(IProgressMonitor monitor, IDataModel model, IProject project) throws CoreException, InvocationTargetException, InterruptedException {
-		IVirtualComponent appClientComponent = ComponentCore.createComponent(project);
-		IVirtualFile vf = appClientComponent.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
-		IFile manifestmf = vf.getUnderlyingFile();
-		if (manifestmf == null || !manifestmf.exists()) {
-			try {
-				createManifest(project, appClientComponent.getRootFolder().getUnderlyingFolder(), monitor);
-			} catch (Exception e) {
-				Logger.getLogger().logError(e);
-			}
-			String manifestFolder = IPath.SEPARATOR + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER) + IPath.SEPARATOR + J2EEConstants.META_INF;
-			IContainer container = project.getFolder(manifestFolder);
-			manifestmf = container.getFile(new Path(J2EEConstants.MANIFEST_SHORT_NAME));
-		}
-		if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS)) {
-			IDataModel dm = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
-			dm.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, project.getName());
-			dm.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-			dm.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
-			dm.setProperty(UpdateManifestDataModelProperties.MAIN_CLASS, "Main"); //$NON-NLS-1$
-			try {
-				dm.getDefaultOperation().execute(monitor, null);
-			} catch (Exception e) {
-				// Ignore
-			}
-		}
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/IAppClientFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/IAppClientFacetInstallDataModelProperties.java
deleted file mode 100644
index 3436004d3..000000000
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/IAppClientFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-public interface IAppClientFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
-	 /**
-     * Optional, type Boolean. the default value is <code>Boolean.TRUE</code>.If this is true and CREATE_DEFAULT_FILES is true, then a default main
-     * class will be generated during component creation.
-     */
-    public static final String CREATE_DEFAULT_MAIN_CLASS = "IAppClientComponentCreationDataModelProperties.CREATE_DEFAULT_MAIN_CLASS"; //$NON-NLS-1$
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
deleted file mode 100644
index a1f94fd2b..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
+++ /dev/null
@@ -1,131 +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.application.common;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandActionDelegate;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-
-/**
- * This is used to generate a command that will add a new child of appropriate type to an object.
- * The implementation specifies an owner, a feature, and a helper to which the implementation is
- * delegated,
- */
-public class CreateChildCommand extends CommandWrapper implements CommandActionDelegate {
-
-	/**
-	 * This is the helper interface to which child creation is delegated.
-	 */
-	public static interface Helper {
-		/**
-		 * This implements the default command behavior
-		 */
-		public Object createChild(Object object);
-
-		/**
-		 * This returns the default label
-		 */
-		public String getCreateChildText(Object object);
-
-		/**
-		 * This returns the default help text
-		 */
-		public String getCreateChildToolTipText(Object object);
-
-		/**
-		 * This returns the default image
-		 */
-		public Object getCreateChildImage(Object object);
-	}
-
-	/**
-	 * This is the editing doman in which this command operates.
-	 */
-	protected EditingDomain domain;
-	/**
-	 * This is the owner to which children will be added.
-	 */
-	protected EObject owner;
-	/**
-	 * This is the feature of the owner to which children will be added.
-	 */
-	protected EReference feature;
-	/**
-	 * This is the helper object to which child creation is delegated.
-	 */
-	protected CreateChildCommand.Helper helper;
-
-	/**
-	 * This creates an instances that will add something to the owner's feature based on the
-	 * delegate helper.
-	 */
-	public CreateChildCommand(EditingDomain domain, EObject owner, EReference feature, CreateChildCommand.Helper helper) {
-		super();
-
-		this.domain = domain;
-		this.owner = owner;
-		this.feature = feature;
-		this.helper = helper;
-	}
-
-	/**
-	 * This returns a command that creates a new child of some appropriate type.
-	 */
-	public static Command create(EditingDomain domain, Object object) {
-		return domain.createCommand(CreateChildCommand.class, new CommandParameter(object));
-	}
-
-	/**
-	 * This creates the add command that will implement this action and specifies the collection by
-	 * delegating to {@link CreateChildCommand.Helper#getCreateChildImage}.
-	 */
-	protected Command createCommand() {
-		if (feature == null) {
-			return AddCommand.create(domain, owner, null, helper.createChild(owner));
-		}
-		return new AddCommand(domain, owner, feature, helper.createChild(owner));
-	}
-
-	/**
-	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildToolTipText}.
-	 */
-	public String getDescription() {
-		return helper.getCreateChildToolTipText(owner);
-	}
-
-	/**
-	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildImage}.
-	 */
-	public Object getImage() {
-		return helper.getCreateChildImage(owner);
-	}
-
-	/**
-	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildText}.
-	 */
-	public String getText() {
-		return helper.getCreateChildText(owner);
-	}
-
-	/**
-	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildToolTipText}.
-	 */
-	public String getToolTipText() {
-		return helper.getCreateChildToolTipText(owner);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
deleted file mode 100644
index edff7f533..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
+++ /dev/null
@@ -1,214 +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.application.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}object.
- */
-public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ApplicationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: check that this is what you want.
-		Module child = org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getApplicationFactory().createModule();
-
-		// TODO: initialize child here...
-
-		return child;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		ApplicationPackage pkg = ApplicationPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		result.add(pkg.getApplication_SecurityRoles());
-		result.add(pkg.getApplication_Modules());
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "CreateModule"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return ApplicationProvidersResourceHandler.getString("Create_Module_UI_"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return ApplicationProvidersResourceHandler.getString("Create_a_child_of_type_Module_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This returns Application.gif.
-	 */
-	public Object getImage(Object object) {
-		String key = null;
-		if (((Application) object).eResource() == null)
-			return J2EEPlugin.getPlugin().getImage("earFile_obj"); //$NON-NLS-1$
-		switch (((Application) object).getVersionID()) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				key = "12_ear_obj"; //$NON-NLS-1$
-				break;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				key = "13_ear_obj"; //$NON-NLS-1$
-				break;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-			default :
-				key = "14_ear_obj"; //$NON-NLS-1$
-				break;
-		}
-		return J2EEPlugin.getPlugin().getImage(key);
-	}
-
-	/**
-	 * This returns the parent of the Application.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Application_version_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Application_version_feature", "_UI_Application_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ApplicationPackage.eINSTANCE.getApplication_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	public String getText(Object object) {
-
-		String displayName = ((Application) object).getDisplayName();
-		return displayName == null ? ApplicationProvidersResourceHandler.getString("<<No_display_name>>_ERROR_") : displayName; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Application.class)) {
-			case ApplicationPackage.APPLICATION__VERSION :
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES :
-			case ApplicationPackage.APPLICATION__MODULES : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_SecurityRoles(), CommonFactory.eINSTANCE.createSecurityRole()));
-
-		newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createModule()));
-
-		newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createWebModule()));
-
-		newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createJavaClientModule()));
-
-		newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createEjbModule()));
-
-		newChildDescriptors.add(createChildParameter(ApplicationPackage.eINSTANCE.getApplication_Modules(), ApplicationFactory.eINSTANCE.createConnectorModule()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java
deleted file mode 100644
index 173415d7f..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.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.application.provider;
-
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-
-
-/**
- * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. The
- * commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class ApplicationItemProviderAdapter extends ItemProviderAdapter {
-	/**
-	 * This creates and instance from an adapter factory and a domain notifier.
-	 */
-	protected ApplicationItemProviderAdapter(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This implements the default behavior for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		return null;
-	}
-
-	/**
-	 * This returns the default image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return ApplicationProvidersResourceHandler.getString("Create_a_new_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
deleted file mode 100644
index c1000c63d..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,267 +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.application.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.internal.util.ApplicationAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
-	 */
-	protected Collection supportedTypes = new ArrayList();
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}instances.
-	 */
-	protected ApplicationItemProvider applicationItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}instances.
-	 */
-	protected ModuleItemProvider moduleItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}instances.
-	 */
-	protected WebModuleItemProvider webModuleItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
-	 */
-	protected JavaClientModuleItemProvider javaClientModuleItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
-	 */
-	protected ConnectorModuleItemProvider connectorModuleItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}instances.
-	 */
-	protected EjbModuleItemProvider ejbModuleItemProvider;
-	protected Disposable disposable = new Disposable();
-
-	/**
-	 * This constructs an instance.
-	 */
-	public ApplicationItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	public Adapter adapt(Notifier target, Object adapterKey) {
-		return super.adapt(target, this);
-	}
-
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	public Adapter adaptNew(Notifier target, Object adapterType) {
-		Adapter adapter = super.adaptNew(target, adapterType);
-		disposable.add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}.
-	 */
-	public Adapter createApplicationAdapter() {
-		if (applicationItemProvider == null) {
-			applicationItemProvider = new ApplicationItemProvider(this);
-		}
-
-		return applicationItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}.
-	 */
-	public Adapter createEjbModuleAdapter() {
-		if (ejbModuleItemProvider == null) {
-			ejbModuleItemProvider = new EjbModuleItemProvider(this);
-		}
-
-		return ejbModuleItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}.
-	 */
-	public Adapter createJavaClientModuleAdapter() {
-		if (javaClientModuleItemProvider == null) {
-			javaClientModuleItemProvider = new JavaClientModuleItemProvider(this);
-		}
-
-		return javaClientModuleItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a connector.
-	 * 
-	 * @return Adapter
-	 */
-	public Adapter createConnectorModuleAdapter() {
-		if (connectorModuleItemProvider == null) {
-			connectorModuleItemProvider = new ConnectorModuleItemProvider(this);
-		}// if
-
-		return connectorModuleItemProvider;
-	}// createConnectorModuleAdapter
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}.
-	 */
-	public Adapter createModuleAdapter() {
-		if (moduleItemProvider == null) {
-			moduleItemProvider = new ModuleItemProvider(this);
-		}
-
-		return moduleItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}.
-	 */
-	public Adapter createWebModuleAdapter() {
-		if (webModuleItemProvider == null) {
-			webModuleItemProvider = new WebModuleItemProvider(this);
-		}
-
-		return webModuleItemProvider;
-	}
-
-	public void dispose() {
-		disposable.dispose();
-	}
-
-	/**
-	 * This calls {@link INotifyChangedListener#fireNotifyChanged fireNotifyChanged}for each viewer
-	 * in {@link #notifyChangedListeners}.
-	 */
-	/*
-	 * public void fireNotifyChanged(Object object, int eventType, Object feature, Object oldValue,
-	 * Object newValue, int index) { for (Iterator i = notifyChangedListeners.iterator();
-	 * i.hasNext(); ) { INotifyChangedListener notifyChangedListener =
-	 * (INotifyChangedListener)i.next(); notifyChangedListener.notifyChanged(new
-	 * ENotificationImpl((InternalEObject)object, eventType,(EStructuralFeature) feature, oldValue,
-	 * newValue, index)); }
-	 * 
-	 * if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(object, eventType,
-	 * feature, oldValue, newValue, index); } }
-	 */
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return super.isFactoryForType(type) || supportedTypes.contains(type);
-	}
-
-	/**
-	 * This removes a listener.
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
deleted file mode 100644
index 2bee27955..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
+++ /dev/null
@@ -1,93 +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.application.provider;
-
-
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-public class ApplicationProvidersResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-	public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
-		public URL getBaseURL() {
-			return null;
-		}
-
-		public Object getImage(String arg0) {
-			return J2EEPlugin.getPlugin().getImage(arg0);
-		}
-
-		public String getString(String arg0) {
-			return ApplicationProvidersResourceHandler.getString(arg0);
-		}
-
-		public String getString(String arg0, Object[] arg1) {
-			return ApplicationProvidersResourceHandler.getString(arg0, arg1);
-		}
-		public String getString(String key, boolean translate) {
-			// TODO For now...  translate not supported
-			return getString(key);
-		}
-
-		public String getString(String key, Object[] substitutions, boolean translate) {
-			// TODO For now...  translate not supported
-			return getString(key,substitutions);
-		}
-	};
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("applicationproviders");//$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);
-		}
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ConnectorModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ConnectorModuleItemProvider.java
deleted file mode 100644
index ee08848bc..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ConnectorModuleItemProvider.java
+++ /dev/null
@@ -1,126 +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.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adapter for a Connector modules in ears.
- */
-public class ConnectorModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * 
-	 * @param AdapterFactory
-	 *            adapterFactory - Current adapter
-	 */
-	public ConnectorModuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}// ConnectorModuleItemProvider
-
-	/**
-	 * This returns resource image
-	 * 
-	 * @param Object
-	 *            object - resource
-	 * @return Object
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("full/obj16/connector_module"); //$NON-NLS-1$
-	}// getImage
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ConnectorModule) object).getUri();
-		return label == null || label.length() == 0 ? getString("_UI_ConnectorModule_type") : //$NON-NLS-1$
-					getString("_UI_ConnectorModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-
-	/**
-	 * This returns the parent of the ConnectorModule.
-	 * 
-	 * @param Object
-	 *            object - resource
-	 * @return Object
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}// getParent
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @param Object
-	 *            object - resource
-	 * @return List
-	 */
-	public List getPropertyDescriptors(Object object) {
-
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}// if
-
-		return itemPropertyDescriptors;
-	}// getPropertyDescriptors
-
-}// ConnectorModuleItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
deleted file mode 100644
index 1dcc01e11..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
+++ /dev/null
@@ -1,108 +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.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}object.
- */
-public class EjbModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public EjbModuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns EjbModule.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("module_ejb_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((EjbModule) object).getUri();
-		return label == null || label.length() == 0 ? getString("_UI_EjbModule_type") : //$NON-NLS-1$
-					getString("_UI_EjbModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-
-	/**
-	 * This returns the parent of the EjbModule.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
deleted file mode 100644
index 9e14a7f18..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
+++ /dev/null
@@ -1,108 +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.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}object.
- */
-public class JavaClientModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public JavaClientModuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns JavaClientModule.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("module_clientapp_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((JavaClientModule) object).getUri();
-		return label == null || label.length() == 0 ? getString("_UI_JavaClientModule_type") : //$NON-NLS-1$
-					getString("_UI_JavaClientModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-
-	/**
-	 * This returns the parent of the JavaClientModule.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
deleted file mode 100644
index c00f59193..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
+++ /dev/null
@@ -1,179 +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.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}object.
- */
-public class ModuleItemProvider extends ApplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ModuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns Module.gif.
-	 */
-	public Object getImage(Object object) {
-		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("Module"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the parent of the Module.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			ApplicationPackage pkg = ApplicationPackage.eINSTANCE;
-
-			// This is for the uri feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Uri_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_uri_property_UI_"), //$NON-NLS-1$
-						pkg.getModule_Uri()));
-
-			// This is for the altDD feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("AltDD_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_altDD_property_UI_"), //$NON-NLS-1$
-						pkg.getModule_AltDD(), false));
-
-			// This is for the application feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Application_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_application_property_UI_"), //$NON-NLS-1$
-						pkg.getModule_Application(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Uri feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUriPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Module_uri_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Module_uri_feature", "_UI_Module_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ApplicationPackage.eINSTANCE.getModule_Uri(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Alt DD feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAltDDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Module_altDD_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Module_altDD_feature", "_UI_Module_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ApplicationPackage.eINSTANCE.getModule_AltDD(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	public String getText(Object object) {
-		return getURIIfPossible((Module) object);
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Module.class)) {
-			case ApplicationPackage.MODULE__URI :
-			case ApplicationPackage.MODULE__ALT_DD : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	public static String getURIIfPossible(Module m) {
-		return m.getUri() == null ? ApplicationProvidersResourceHandler.getString("<<URI_not_set>>_ERROR_") : m.getUri(); //$NON-NLS-1$
-	}
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
-	 */
-	/*
-	 * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
-	 * Object newValue, int index) { ApplicationPackage pkg = ApplicationPackage.eINSTANCE;; if
-	 * (feature == pkg.getModule_Uri() || feature == pkg.getModule_AltDD() || feature ==
-	 * pkg.getModule_Application()) { fireNotifyChanged(notifier, eventType, feature, oldValue,
-	 * newValue, index); // ModuleExtension does not update automatically. // The following code is
-	 * to explicitly notify ApplicationExtension if (feature == pkg.getModule_Uri() || feature ==
-	 * pkg.getModule_AltDD() ) { ApplicationExtension applicationExtension =
-	 * ApplicationExtensionsHelper.getApplicationExtension(((Module)notifier).getApplication()); if
-	 * (applicationExtension == null) return; EObject newFeature =
-	 * ApplicationextPackage.eINSTANCE.getApplicationExtension_ModuleExtensions(); Object
-	 * moduleExtension = applicationExtension.getModuleExtension((Module)notifier); Notification
-	 * notification = new NotificationImpl(applicationExtension, Notification.SET, newFeature,
-	 * moduleExtension, moduleExtension); applicationExtension.eNotify(notification); } // code ends
-	 * return; } super.notifyChanged(notifier, eventType, feature, oldValue, newValue, index); }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java
deleted file mode 100644
index 7b185b653..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.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.application.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}object.
- */
-public class WebModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public WebModuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns WebModule.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("module_web_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WebModule) object).getUri();
-		return label == null || label.length() == 0 ? getString("_UI_WebModule_type") : //$NON-NLS-1$
-					getString("_UI_WebModule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(WebModule.class)) {
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-
-	/**
-	 * This returns the parent of the WebModule.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			ApplicationPackage pkg = ApplicationPackage.eINSTANCE;
-
-			// This is for the contextRoot feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("ContextRoot_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_contextRoot_property_UI_"), //$NON-NLS-1$
-						pkg.getWebModule_ContextRoot(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Context Root feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addContextRootPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebModule_contextRoot_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_WebModule_contextRoot_feature", "_UI_WebModule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ApplicationPackage.eINSTANCE.getWebModule_ContextRoot(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
deleted file mode 100644
index 6534a7788..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
+++ /dev/null
@@ -1,275 +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.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object.
- */
-public class ApplicationClientItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ApplicationClientItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates a new child for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		// TODO: create some child object.
-		return null;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		ClientPackage pkg = ClientPackage.eINSTANCE;
-		Collection result = new ArrayList();
-		result.add(pkg.getApplicationClient_EjbReferences());
-		result.add(pkg.getApplicationClient_ResourceRefs());
-		result.add(pkg.getApplicationClient_ResourceEnvRefs());
-		result.add(pkg.getApplicationClient_EnvironmentProps());
-		result.add(pkg.getApplicationClient_MessageDestinationRefs());
-		result.add(pkg.getApplicationClient_ServiceRefs());
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "Create#CHILD_CLASS_NAME#"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return ApplicationProvidersResourceHandler.getString("Create_a_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This returns ApplicationClient.gif.
-	 */
-	public Object getImage(Object object) {
-		String key = null;
-		if (((ApplicationClient) object).eResource() == null)
-			return J2EEPlugin.getPlugin().getImage("applclientJAR_obj"); //$NON-NLS-1$
-		switch (((ApplicationClient) object).getVersionID()) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				key = "appclient_12"; //$NON-NLS-1$
-				break;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				key = "appclient_13"; //$NON-NLS-1$
-				break;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-			default :
-				key = "appclient_14"; //$NON-NLS-1$
-				break;
-		}
-		return J2EEPlugin.getPlugin().getImage(key);
-	}
-
-	/**
-	 * This returns the parent of the ApplicationClient.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ApplicationClient_version_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ApplicationClient_version_feature", "_UI_ApplicationClient_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ClientPackage.eINSTANCE.getApplicationClient_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Callback Handler feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addCallbackHandlerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ApplicationClient_callbackHandler_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ApplicationClient_callbackHandler_feature", "_UI_ApplicationClient_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ClientPackage.eINSTANCE.getApplicationClient_CallbackHandler(), true));
-	}
-
-	public String getText(Object object) {
-
-		/*
-		 * String displayName = ((ApplicationClient) object).getDisplayName(); return displayName ==
-		 * null ? "" ApplicationProvidersResourceHandler.getString(" < <No_display_name>>_ERROR_") :
-		 * displayName; //$NON-NLS-1$
-		 */
-		ApplicationClient appclient = ((ApplicationClient) object);
-		if (appclient.getDisplayName() == null) {
-			try {
-				IProject project = ProjectUtilities.getProject(appclient);
-				return project.getDescription().getName();
-			} catch (Exception e) {
-				//Ignore
-			}
-
-			Resource resource = appclient.eResource();
-			if (resource != null) {
-				return new Path(resource.getURI().toString()).removeFileExtension().lastSegment();
-			}
-			return ""; //$NON-NLS-1$
-		}
-		return appclient.getDisplayName();
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ApplicationClient.class)) {
-			case ClientPackage.APPLICATION_CLIENT__VERSION :
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_REFS :
-			case ClientPackage.APPLICATION_CLIENT__ENVIRONMENT_PROPS :
-			case ClientPackage.APPLICATION_CLIENT__EJB_REFERENCES :
-			case ClientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS :
-			case ClientPackage.APPLICATION_CLIENT__SERVICE_REFS :
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS :
-			case ClientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_ResourceRefs(), CommonFactory.eINSTANCE.createResourceRef()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_EnvironmentProps(), CommonFactory.eINSTANCE.createEnvEntry()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_EjbReferences(), CommonFactory.eINSTANCE.createEjbRef()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_EjbReferences(), CommonFactory.eINSTANCE.createEJBLocalRef()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_ResourceEnvRefs(), CommonFactory.eINSTANCE.createResourceEnvRef()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_MessageDestinationRefs(), CommonFactory.eINSTANCE.createMessageDestinationRef()));
-
-		newChildDescriptors.add(createChildParameter(ClientPackage.eINSTANCE.getApplicationClient_MessageDestinations(), CommonFactory.eINSTANCE.createMessageDestination()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
-	 */
-	public Collection getChildren(Object object) {
-		ApplicationClient client = (ApplicationClient) object;
-		Collection myChildren = super.getChildren(object);
-		myChildren.addAll(client.getMessageDestinations());
-		if (client.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) {
-			WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-			myChildren.addAll(serviceHelper.get13ServiceRefs(client));
-		}	
-		return myChildren;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java
deleted file mode 100644
index 4253a6b5a..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.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.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.application.common.CreateChildCommand;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-
-
-
-/**
- * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. The commands
- * are implemented uniformly on all our item adapters using this common base class.
- */
-public class ClientItemProviderAdapter extends ItemProviderAdapter implements org.eclipse.jst.j2ee.internal.application.common.CreateChildCommand.Helper {
-	/**
-	 * This creates and instance from an adapter factory and a domain notifier.
-	 */
-	protected ClientItemProviderAdapter(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This implements the default behavior for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		return null;
-	}
-
-	/**
-	 * This creates the supported commands.
-	 */
-	public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
-		if (commandClass == CreateChildCommand.class) {
-			return new CreateChildCommand(editingDomain, (EObject) object, null, this);
-		}
-		return super.createCommand(object, editingDomain, commandClass, commandParameter);
-	}
-
-	/**
-	 * This returns the default image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		return ApplicationProvidersResourceHandler.getString("Create_a_new_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
deleted file mode 100644
index 5a5b15955..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,180 +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.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.client.internal.util.ClientAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class ClientItemProviderAdapterFactory extends ClientAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-	/**
-	 * This is used to implement {@link #IChangeNotifier}.
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
-	 */
-	protected Collection supportedTypes = new ArrayList();
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}instances.
-	 */
-	protected ApplicationClientItemProvider applicationClientItemProvider;
-	protected Disposable disposable = new Disposable();
-
-	/**
-	 * This constructs an instance.
-	 */
-	public ClientItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	public Adapter adapt(Notifier target, Object adapterKey) {
-		return super.adapt(target, this);
-	}
-
-	public Object adapt(Object object, Object type) {
-		// This is a kludge to deal with enumerators, which crash the doSwitch.
-		//
-		if (object instanceof EObject && ((EObject) object).eClass() == null) {
-			return null;
-		}
-
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	public Adapter adaptNew(Notifier target, Object adapterType) {
-		Adapter adapter = super.adaptNew(target, adapterType);
-		disposable.add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}.
-	 */
-	public Adapter createApplicationClientAdapter() {
-		if (applicationClientItemProvider == null) {
-			applicationClientItemProvider = new ApplicationClientItemProvider(this);
-		}
-
-		return applicationClientItemProvider;
-	}
-
-	public void dispose() {
-		disposable.dispose();
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}.
-	 */
-	/*
-	 * public void fireNotifyChanged(Object object, int eventType, Object feature, Object oldValue,
-	 * Object newValue, int index) { changeNotifier.fireNotifyChanged(object, eventType, feature,
-	 * oldValue, newValue, index);
-	 * 
-	 * if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(object, eventType,
-	 * feature, oldValue, newValue, index); } }
-	 */
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return super.isFactoryForType(type) || supportedTypes.contains(type);
-	}
-
-	/**
-	 * This removes a listener.
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java
deleted file mode 100644
index 1edbb7d92..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java
+++ /dev/null
@@ -1,166 +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.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}
- * object.
- */
-public class EARProjectMapItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/** Added to generated code */
-	protected boolean includeModules = false;
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public EARProjectMapItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public EARProjectMapItemProvider(AdapterFactory adapterFactory, boolean includeModules) {
-		this(adapterFactory);
-		this.includeModules = includeModules;
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			if (includeModules)
-				childrenReferences.add(ModulemapPackage.eINSTANCE.getEARProjectMap_Mappings());
-			childrenReferences.add(ModulemapPackage.eINSTANCE.getEARProjectMap_UtilityJARMappings());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// TODO: Check the type of the specified child object and return the proper feature to use
-		// for
-		//       adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns the parent of the EARProjectMap.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns EARProjectMap.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("EARProjectMap"); //$NON-NLS-1$
-	}
-
-	public String getText(Object object) {
-		return ApplicationProvidersResourceHandler.getString("EARProjectMap_UI_"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(EARProjectMap.class)) {
-			case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
-			case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
-	 */
-	/*
-	 * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
-	 * Object newValue, int index) { ModulemapPackage pkg = ModulemapPackage.eINSTANCE;; if
-	 * (!includeModules && feature == pkg.getEARProjectMap_Mappings()) return;
-	 * 
-	 * if (feature == pkg.getEARProjectMap_Mappings() || feature ==
-	 * pkg.getEARProjectMap_UtilityJARMappings()) { fireNotifyChanged(notifier, eventType, feature,
-	 * oldValue, newValue, index); return; } super.notifyChanged(notifier, eventType, feature,
-	 * oldValue, newValue, index); }
-	 */
-
-	/**
-	 * This adds to the collection of {@linkcom.ibm.etools.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		if (includeModules)
-			newChildDescriptors.add(createChildParameter(modulemapPackage.getEARProjectMap_Mappings(), modulemapPackage.getModuleMapping()));
-		newChildDescriptors.add(createChildParameter(modulemapPackage.getEARProjectMap_UtilityJARMappings(), modulemapPackage.getUtilityJARMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
deleted file mode 100644
index c343db665..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
+++ /dev/null
@@ -1,252 +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.provider;
-
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-public class J2EEItemProvider extends ItemProvider implements IAdaptable {
-
-	protected static final Class IRESOURCE_CLASS = IResource.class;
-	protected static final Class IFILE_CLASS = IFile.class;
-
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 */
-	public J2EEItemProvider() {
-		super();
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param children
-	 */
-	public J2EEItemProvider(Collection children) {
-		super(children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param text
-	 */
-	public J2EEItemProvider(String text) {
-		super(text);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param text
-	 * @param children
-	 */
-	public J2EEItemProvider(String text, Collection children) {
-		super(text, children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 */
-	public J2EEItemProvider(String text, Object image) {
-		super(text, image);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 * @param children
-	 */
-	public J2EEItemProvider(String text, Object image, Collection children) {
-		super(text, image, children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 * @param parent
-	 */
-	public J2EEItemProvider(String text, Object image, Object parent) {
-		super(text, image, parent);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param text
-	 * @param image
-	 * @param parent
-	 * @param children
-	 */
-	public J2EEItemProvider(String text, Object image, Object parent, Collection children) {
-		super(text, image, parent, children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, String text) {
-		super(adapterFactory, text);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image) {
-		super(adapterFactory, text, image);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 * @param parent
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent) {
-		super(adapterFactory, text, image, parent);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param children
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, Collection children) {
-		super(adapterFactory, children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param children
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, String text, Collection children) {
-		super(adapterFactory, text, children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 * @param children
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image, Collection children) {
-		super(adapterFactory, text, image, children);
-	}
-
-	/**
-	 * Constructor for J2EEItemProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param text
-	 * @param image
-	 * @param parent
-	 * @param children
-	 */
-	public J2EEItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
-		super(adapterFactory, text, image, parent, children);
-	}
-
-	protected boolean notificationOn = true;
-
-	protected void disableNotification() {
-		notificationOn = false;
-	}
-
-	protected void enableNotification() {
-		notificationOn = true;
-	}
-
-
-	public void fireNotifyChanged(Notification notification) {
-		if (notificationOn)
-			super.fireNotifyChanged(notification);
-	}
-
-	public Collection getChildren(Object object) {
-		if (children.isEmpty()) {
-			try {
-				disableNotification();
-				initializeChildren();
-			} finally {
-				enableNotification();
-			}
-		}
-		return children;
-	}
-
-	protected void initializeChildren() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IRESOURCE_CLASS || adapter == IFILE_CLASS)
-			return null; //return getAssociatedFile();
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-	
-	public IFile getAssociatedFile() {
-		return null;		
-	}
-
-	/**
-	 * @return
-	 */
-	private IProject getProjectFromParent() {
-		return ProjectUtilities.getProject(getParent());
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java
deleted file mode 100644
index d7c6f84b0..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java
+++ /dev/null
@@ -1,166 +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.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModuleMapping;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}
- * object.
- */
-public class ModuleMappingItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ModuleMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			ModulemapPackage pkg = ModulemapPackage.eINSTANCE;
-			;
-
-			// This is for the projectName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Project_Name_1"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_project_name_property_of_the_module_mapping_UI_"), //$NON-NLS-1$
-						pkg.getModuleMapping_ProjectName(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
-			// This is for the module feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Module_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_module_of_the_module_mapping_UI_"), //$NON-NLS-1$
-						pkg.getModuleMapping_Module(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Project Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addProjectNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ModuleMapping_projectName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ModuleMapping_projectName_feature", "_UI_ModuleMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ModulemapPackage.eINSTANCE.getModuleMapping_ProjectName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Module feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addModulePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ModuleMapping_module_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ModuleMapping_module_feature", "_UI_ModuleMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ModulemapPackage.eINSTANCE.getModuleMapping_Module(), true));
-	}
-
-
-	/**
-	 * This returns the parent of the ModuleMapping.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns ModuleMapping.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("ModuleMapping"); //$NON-NLS-1$
-	}
-
-	public String getText(Object object) {
-		ModuleMapping moduleMapping = ((ModuleMapping) object);
-		return ApplicationProvidersResourceHandler.getString("ModuleMapping_UI_") + moduleMapping.getProjectName(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ModuleMapping.class)) {
-			case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
-			case ModulemapPackage.MODULE_MAPPING__MODULE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
-	 */
-	/*
-	 * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
-	 * Object newValue, int index) { ModulemapPackage pkg = ModulemapPackage.eINSTANCE;; if (
-	 * feature == pkg.getModuleMapping_ProjectName() || feature == pkg.getModuleMapping_Module() ) {
-	 * fireNotifyChanged(notifier, eventType, feature, oldValue, newValue, index); return; }
-	 * super.notifyChanged(notifier, eventType, feature, oldValue, newValue, index); }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapEditPlugin.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapEditPlugin.java
deleted file mode 100644
index ebf6adf34..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapEditPlugin.java
+++ /dev/null
@@ -1,125 +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.provider;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactory;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-
-
-
-/**
- * @deprecated Leaving this in for now, to minimize breakage to all the providers; should delete
- *             when we regen all providers for mof5
- * 
- * This is the central singleton for the modulemap plugin.
- */
-public class ModulemapEditPlugin extends Plugin {
-	/**
-	 * Keep track of the singleton.
-	 */
-	protected static ModulemapEditPlugin plugin;
-
-	/**
-	 * Keep track of the modulemap package.
-	 */
-	protected ModulemapPackage modulemapPackage;
-
-	/**
-	 * Create the instance.
-	 */
-	public ModulemapEditPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-
-		// Remember the static instance.
-		//
-		plugin = this;
-	}
-
-	/**
-	 * Get the one modulemap package.
-	 */
-	public ModulemapPackage getModulemapPackage() {
-		return modulemapPackage;
-	}
-
-	/**
-	 * Get the one modulemap factory.
-	 */
-	public ModulemapFactory getModulemapFactory() {
-		return (ModulemapFactory) modulemapPackage.getEFactoryInstance();
-	}
-
-	/**
-	 * Do initialization stuff here.
-	 */
-	public void startup() throws CoreException {
-		super.startup();
-		modulemapPackage = org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactoryImpl.getPackage();
-	}
-
-	/**
-	 * Get the singleton instance.
-	 */
-	public static ModulemapEditPlugin getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * Get a .gif from the icons folder.
-	 */
-	public Object getImage(String key) {
-		try {
-			return new URL(getDescriptor().getInstallURL(), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (MalformedURLException exception) {
-			System.out.println(ApplicationProvidersResourceHandler.getString("Failed_to_load_image_for_ERROR_") + key + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-			exception.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get a translated string from the resource bundle.
-	 */
-	public String getString(String key) {
-		return getDescriptor().getResourceBundle().getString(key);
-	}
-
-	/**
-	 * Get a translated string from the resource bundle, with an object substitution.
-	 */
-	public String getString(String key, Object s1) {
-		return MessageFormat.format(getString(key), new Object[]{s1});
-	}
-
-	/**
-	 * Get a translated string from the resource bundle, with two object substitutions.
-	 */
-	public String getString(String key, Object s1, Object s2) {
-		return MessageFormat.format(getString(key), new Object[]{s1, s2});
-	}
-
-	/**
-	 * Get a translated string from the resource bundle, with three object substitutions.
-	 */
-	public String getString(String key, Object s1, Object s2, Object s3) {
-		return MessageFormat.format(getString(key), new Object[]{s1, s2, s3});
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java
deleted file mode 100644
index 49bc8c44b..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java
+++ /dev/null
@@ -1,137 +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.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactory;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This extended item provider supports the following commands:
- * <ul>
- * <li>{@link CreateChildCommand}
- * </ul>
- * <p>
- * The commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class ModulemapItemProviderAdapter extends ItemProviderAdapter {
-	/**
-	 * This is the package for the modulemap model.
-	 */
-	protected static final ModulemapPackage modulemapPackage = (ModulemapPackage) EPackage.Registry.INSTANCE.getEPackage(ModulemapPackage.eNS_URI);
-	/**
-	 * This is the factory for the modulemap model.
-	 */
-	protected static final ModulemapFactory modulemapFactory = modulemapPackage.getModulemapFactory();
-
-	/**
-	 * This creates an instance from an adapter factory and a domain notifier.
-	 */
-	protected ModulemapItemProviderAdapter(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This creates the supported commands.
-	 */
-	public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
-		return super.createCommand(object, editingDomain, commandClass, commandParameter);
-	}
-
-	/**
-	 * This is a convenience method for creating <code>CommandParameter</code> s for a given
-	 * parent feature and child type (MOF meta-object).
-	 */
-	protected CommandParameter createChildParameter(EReference feature, EObject childType) {
-		return new CommandParameter(null, feature, modulemapFactory.create(childType.eClass()));
-	}
-
-	/**
-	 * This returns the default owner object for {@link CreateChildCommand}.
-	 */
-	public Object getCreateChildOwner(Object parent) {
-		return parent;
-	}
-
-	/**
-	 * This returns the default result collection for {@link CreateChildCommand}.
-	 */
-	public Collection getCreateChildResult(Object child) {
-		Collection result = new ArrayList(1);
-		result.add(child);
-		return result;
-	}
-
-	/**
-	 * This returns the default label for {@link CreateChildCommand}.
-	 */
-	public String getCreateChildText(Object parent, Object feature, Object child) {
-		return J2EEPlugin.getPlugin().getString("_UI_CreateChild_text"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default description for {@link CreateChildCommand}.
-	 */
-	public String getCreateChildDescription(Object parent, Object feature, Object child) {
-		return J2EEPlugin.getPlugin().getString("_UI_CreateChild_description"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default help text for {@link CreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object parent, Object feature, Object child) {
-		return J2EEPlugin.getPlugin().getString("_UI_CreateChild_tooltip"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default image for {@link CreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object parent, Object feature, Object child) {
-		Object image = null;
-
-		if (parent instanceof EObject && child instanceof EObject) {
-			String name = ((EObject) parent).eClass().getName() + "Create" + ((EObject) child).eClass().getName(); //$NON-NLS-1$
-			image = J2EEPlugin.getPlugin().getImage(name);
-		}
-		return image;
-	}
-
-	/**
-	 * This looks up the name of the type of the specified object.
-	 */
-	protected String getTypeText(Object object) {
-		String typeKey = object instanceof EObject ? ((EObject) object).eClass().getName() : "Unknown"; //$NON-NLS-1$
-		return J2EEPlugin.getPlugin().getString("_UI_" + typeKey + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This looks up the name of the specified feature.
-	 */
-	protected String getFeatureText(Object feature) {
-		String featureKey = feature instanceof EReference ? ((EReference) feature).getName() : "Unknown"; //$NON-NLS-1$
-		return J2EEPlugin.getPlugin().getString("_UI_" + featureKey + "_feature"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java
deleted file mode 100644
index bc415ac53..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,215 +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.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapAdapterFactory;
-
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class ModulemapItemProviderAdapterFactory extends ModulemapAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link #com.ibm.etools.emf.edit.provider.IChangeNotifier}.
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance.
-	 */
-	public ModulemapItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}
-	 * instances.
-	 */
-	protected ModuleMappingItemProvider moduleMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}.
-	 */
-	public Adapter createModuleMappingAdapter() {
-		if (moduleMappingItemProvider == null) {
-			moduleMappingItemProvider = new ModuleMappingItemProvider(this);
-		}
-
-		return moduleMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}
-	 * instances.
-	 */
-	protected EARProjectMapItemProvider earProjectMapItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}.
-	 */
-	public Adapter createEARProjectMapAdapter() {
-		if (earProjectMapItemProvider == null) {
-			earProjectMapItemProvider = new EARProjectMapItemProvider(this);
-		}
-
-		return earProjectMapItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}
-	 * instances.
-	 */
-	protected UtilityJARMappingItemProvider utilityJARMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}.
-	 */
-	public Adapter createUtilityJARMappingAdapter() {
-		if (utilityJARMappingItemProvider == null) {
-			utilityJARMappingItemProvider = new UtilityJARMappingItemProvider(this);
-		}
-
-		return utilityJARMappingItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return super.isFactoryForType(type) || supportedTypes.contains(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	public Object adapt(Object object, Object type) {
-		// This is a kludge to deal with enumerators, which crash the doSwitch.
-		//
-		if (object instanceof EObject && ((EObject) object).eClass() == null) {
-			return null;
-		}
-
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}.
-	 */
-	/*
-	 * public void fireNotifyChanged(Object object, int eventType, Object feature, Object oldValue,
-	 * Object newValue, int index) { changeNotifier.fireNotifyChanged(object, eventType, feature,
-	 * oldValue, newValue, index);
-	 * 
-	 * if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(object, eventType,
-	 * feature, oldValue, newValue, index); } }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java
deleted file mode 100644
index 6cf3c105f..000000000
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java
+++ /dev/null
@@ -1,191 +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.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage;
-import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}
- * object.
- */
-public class UtilityJARMappingItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public UtilityJARMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			ModulemapPackage pkg = ModulemapPackage.eINSTANCE;
-			;
-
-			// This is for the projectName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Project_Name_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_project_name_property_of_the_utility_jar_mapping_UI_"), //$NON-NLS-1$
-						pkg.getUtilityJARMapping_ProjectName(), false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
-			// This is for the uri feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), ApplicationProvidersResourceHandler.getString("Uri_UI_"), //$NON-NLS-1$
-						ApplicationProvidersResourceHandler.getString("The_uri_property_of_the_utility_jar_mapping_UI_"), //$NON-NLS-1$
-						pkg.getUtilityJARMapping_Uri(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Project Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addProjectNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UtilityJARMapping_projectName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_UtilityJARMapping_projectName_feature", "_UI_UtilityJARMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ModulemapPackage.eINSTANCE.getUtilityJARMapping_ProjectName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Uri feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUriPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UtilityJARMapping_uri_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_UtilityJARMapping_uri_feature", "_UI_UtilityJARMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					ModulemapPackage.eINSTANCE.getUtilityJARMapping_Uri(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns the parent of the UtilityJARMapping.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns UtilityJARMapping.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("icons/full/obj16/prjutiljar_obj"); //$NON-NLS-1$
-	}
-
-	//	/**
-	//	 * @param object
-	//	 * @return
-	//	 */
-	//	private boolean isEJBClientJAR(Object object) {
-	//		UtilityJARMapping map = (UtilityJARMapping) object;
-	//		IProject project = ProjectUtilities.getProject(map);
-	//		if (project == null)
-	//			return false;
-	//
-	//		EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-	//		if (runtime == null)
-	//			return false;
-	//
-	//		EAREditModel model = null;
-	//		try {
-	//			model = runtime.getEarEditModelForRead(this);
-	//			return model.isEjbClientJarMapping(map);
-	//		} finally {
-	//			if (model != null)
-	//				model.releaseAccess(this);
-	//		}
-	//	}
-
-	public String getText(Object object) {
-		UtilityJARMapping map = ((UtilityJARMapping) object);
-		return map == null ? "<??>" : map.getUri(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(UtilityJARMapping.class)) {
-			case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
-			case ModulemapPackage.UTILITY_JAR_MAPPING__URI : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return ApplicationProvidersResourceHandler.RESOURCE_LOCATOR;
-	}
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}.
-	 */
-	/*
-	 * public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue,
-	 * Object newValue, int index) { ModulemapPackage pkg = ModulemapPackage.eINSTANCE;; if (
-	 * feature == pkg.getUtilityJARMapping_ProjectName() || feature ==
-	 * pkg.getUtilityJARMapping_Uri() ) { fireNotifyChanged(notifier, eventType, feature, oldValue,
-	 * newValue, index); return; } super.notifyChanged(notifier, eventType, feature, oldValue,
-	 * newValue, index); }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAddWebComponentToEnterpriseApplicationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAddWebComponentToEnterpriseApplicationDataModelProperties.java
deleted file mode 100644
index 45d5e29ea..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAddWebComponentToEnterpriseApplicationDataModelProperties.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-
-public interface IAddWebComponentToEnterpriseApplicationDataModelProperties extends ICreateReferenceComponentsDataModelProperties{
-
-	public static final String CONTEXT_ROOT = "IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentCreationDataModelProperties.java
deleted file mode 100644
index b8b5d0859..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,49 +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.datamodel.properties;
-
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IAppClientComponentCreationDataModelProperties provides properties to the 
- * AppClientComponentCreationDataModelProvider as well as all extending interfaces extending 
- * IEjbComponentCreationDataModelProperties 
- * @see org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IAppClientFacetInstallDataModelProperties
- */
-public interface IAppClientComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-    /**
-     * Optional, type Boolean. the default value is <code>Boolean.TRUE</code>.If this is true and CREATE_DEFAULT_FILES is true, then a default main
-     * class will be generated during component creation.
-     */
-    public static final String CREATE_DEFAULT_MAIN_CLASS = "IAppClientComponentCreationDataModelProperties.CREATE_DEFAULT_MAIN_CLASS"; //$NON-NLS-1$
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentExportDataModelProperties.java
deleted file mode 100644
index 00fa5d0ba..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,30 +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.datamodel.properties;
-/**
- * <p>
- * IAppClientComponentExportDataModelProperties provides properties to the IDataModel associated with the 
- * AppClientComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IAppClientComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentImportDataModelProperties.java
deleted file mode 100644
index f2895dc90..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IAppClientComponentImportDataModelProperties.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.datamodel.properties;
-
-/**
- * <p>
- * IAppClientComponentImportDataModelProperties provides properties to the IDataModel associated with the 
- * AppClientComponentImportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IAppClientComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentExportDataModelProperties.java
deleted file mode 100644
index d6e8b1a81..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,30 +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.datamodel.properties;
-/**
- * <p>
- * IEARComponentExportDataModelProperties provides properties to the DataModel associated with the 
- * EARComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IEARComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentImportDataModelProperties.java
deleted file mode 100644
index c30fa4a1b..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEARComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,79 +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.datamodel.properties;
-
-/**
- * <p>
- * IEARComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * EARComponentImportDataModelProvider. NOTE: The associated Provider and Operations will be created
- * during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IEARComponentImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
-
-	/**
-	 * Optional, type IPath default is ear location
-	 */
-	public static final String NESTED_MODULE_ROOT = "IEnterpriseApplicationImportDataModelProperties.NESTED_MODULE_ROOT"; //$NON-NLS-1$
-
-	/**
-	 * Optional, A List containing utililty jars. This list should consist of the CommonArchive
-	 * Archives of all the Utility Jars that should be extracted into projects.
-	 */
-	public static final String UTILITY_LIST = "IEnterpriseApplicationImportDataModelProperties.UTILITY_LIST"; //$NON-NLS-1$
-	/**
-	 * Optional, A List containing modules to be imported list;
-	 */
-	public static final String SELECTED_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.SELECTED_MODELS_LIST"; //$NON-NLS-1$
-	/**
-	 * Optional, A List containing ejb client jars associated with any ejb components which are to
-	 * be imported.
-	 */
-	public static final String EJB_CLIENT_LIST = "IEnterpriseApplicationImportDataModelProperties.EJB_CLIENT_LIST"; //$NON-NLS-1$
-
-	/**
-	 * Optional. This is a list of data models. This list must contain all non-utilty projects in
-	 * the ear to be imported
-	 */
-	public static final String MODULE_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.MODULE_MODELS_LIST"; //$NON-NLS-1$
-
-	/**
-	 * Optional. This is a list of data models. This list must contain all utility jars selected to
-	 * be imported
-	 */
-	public static final String UTILITY_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.UTILITY_MODELS_LIST"; //$NON-NLS-1$
-
-	/**
-	 * This is an unsettable property which will return all the project DataModels.
-	 */
-	public static final String ALL_PROJECT_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.ALL_PROJECT_MODELS_LIST"; //$NON-NLS-1$
-
-	/**
-	 * This is an unsettable property which will return .
-	 */
-	public static final String UNHANDLED_PROJECT_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.UNHANDLED_PROJECT_MODELS_LIST"; //$NON-NLS-1$
-
-	/**
-	 * This is an unsettable property which will return .
-	 */
-	public static final String HANDLED_PROJECT_MODELS_LIST = "IEnterpriseApplicationImportDataModelProperties.HANDLED_PROJECT_MODELS_LIST"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEarComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEarComponentCreationDataModelProperties.java
deleted file mode 100644
index bb412c282..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IEarComponentCreationDataModelProperties.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
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IEarComponentCreationDataModelProperties provides properties to the
- * EarComponentCreationDataModelProvider as well as all extending interfaces extending
- * IEarComponentCreationDataModelProperties
- * 
- * @see org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider
- *      </p>
- *      <p>
- *      This interface is not intended to be implemented by clients.
- *      </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IEarFacetInstallDataModelProperties
- */
-public interface IEarComponentCreationDataModelProperties extends IJ2EEComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-	/**
-	 * A java.util.List of IProject J2EEModules which are to be added to the EAR.
-	 */
-	public static final String J2EE_PROJECTS_LIST = "IEarComponentCreationDataModel.J2EE_PROJECTS_LIST"; //$NON-NLS-1$
-	public static final String JAVA_PROJECT_LIST = "IEarComponentCreationDataModel.JAVA_PROJECT_LIST"; //$NON-NLS-1$	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java
deleted file mode 100644
index 421ebe2f8..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
-
-/**
- * <p>
- * IJ2EEComponentCreationDataModelProperties provides properties to the 
- * J2EEComponentCreationDataModelProvider as well as all extending interfaces extending 
- * IJ2EEComponentCreationDataModelProperties 
- * @see org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IJ2EEFacetProjectCreationDataModelProperties
- */
-public interface IJ2EEComponentCreationDataModelProperties extends IJavaComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	/**
-	 * Required, type Boolean, the default value is <code>Boolean.FALSE</code>.
-	 */
-	public static final String ADD_TO_EAR = "IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-	
-	public static final String MODULE_URI = "IJ2EEComponentCreationDataModelProperties.MODULE_URI"; //$NON-NLS-1$
-	/**
-	 * type String, this property needs to be set if the value of the property ADD_TO_EAR  is set to <code>Boolean.TRUE</code>
-	 */
-	public static final String EAR_COMPONENT_NAME = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME"; //$NON-NLS-1$
-    /**
-     * type String, this property needs to be set if the value of the property ADD_TO_EAR  is set to <code>Boolean.TRUE</code>
-     */
-    public static final String EAR_COMPONENT_DEPLOY_NAME = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_DEPLOY_NAME"; //$NON-NLS-1$
-    /**
-     * type ComponentHandle, this property needs to be set if the value of the property ADD_TO_EAR  is set to <code>Boolean.TRUE</code>.  Represents
-     * a handle to the EAR
-     */
-    public static final String EAR_COMPONENT_PROJECT = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT"; //$NON-NLS-1$
-    
-	/**
-	 * type Boolean; the default value is <code>Boolean.TRUE</code>, this is UI only property
-	 */
-	public static final String UI_SHOW_EAR_SECTION = "IJ2EEComponentCreationDataModelProperties.UI_SHOW_EAR_SECTION"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, type String
-     * String indicates the name of the the folder where the deployment descriptor exists.
-     * Each J2EE componenr provider will default the Deployment descriptor folder.
-     * 
-	 */
-	
-	public static final String DD_FOLDER = "IJ2EEComponentCreationDataModelProperties.DD_FOLDER"; //$NON-NLS-1$
-
-    /**
-     * Required, type Integer. The user defined version of the component.
-     */
-    public static final String COMPONENT_VERSION = "IComponentCreationDataModelProperties.COMPONENT_VERSION"; //$NON-NLS-1$
-
-    /**
-     * type Integer
-     */
-    public static final String VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME = "IComponentCreationDataModelProperties.VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME"; //$NON-NLS-1$
-    /**
-     * type AddComponentToEnterpriseApplicationDataModel
-     */
-    public static final String NESTED_ADD_COMPONENT_TO_EAR_DM = "IComponentCreationDataModelProperties.NESTED_ADD_COMPONENT_TO_EAR_DM"; //$NON-NLS-1$
-    /**
-     * type EARComponentCreationDataModel
-     */
-    public static final String NESTED_EAR_COMPONENT_CREATION_DM = "IComponentCreationDataModelProperties.NESTED_EAR_COMPONENT_CREATION_DM"; //$NON-NLS-1$
-    /**
-     * type UpdateManifestDataModel
-     */
-    public static final String NESTED_UPDATE_MANIFEST_DM = "IComponentCreationDataModelProperties.NESTED_UPDATE_MANIFEST_DM"; //$NON-NLS-1$
-    /**
-     * type ClassPathSelection
-     */
-    public static final String CLASSPATH_SELECTION = "IComponentCreationDataModelProperties.CLASSPATH_SELECTION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentExportDataModelProperties.java
deleted file mode 100644
index e04c278d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,66 +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.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-/**
- * <p>
- * IJ2EEComponentExportDataModelProperties provides properties to the IDataModel associated with the 
- * J2EEComponentExportDataModelProvider as well as all extending interfaces extending 
- * IJ2EEComponentExportDataModelProperties specifically all J2EE component specific exports.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IJ2EEComponentExportDataModelProperties extends IDataModelProperties {
-
-	/**
-     * Required, type String. The user defined name of the project to be exported.
-     */
-    public static final String PROJECT_NAME = "IJ2EEComponentExportDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-    /**
-     * @deprecated use {@link #PROJECT_NAME}
-     * @see DoNotUseMeThisWillBeDeletedPost15 
-     */
-    public static final String COMPONENT_NAME = PROJECT_NAME;
-    /**
-     * Required, type IPath.  The user defined export location including fully qualified Path and archive file
-     * to be created name. 
-     */
-    public static final String ARCHIVE_DESTINATION = "IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION"; //$NON-NLS-1$
-    /**
-     * Optional, type Boolean.  If <code>Boolean.TRUE</code> source and class fields will both be archived and exported.
-     * Otherwise if <code>Boolean.FALSE</code> only output files are exported.
-     */
-    public static final String EXPORT_SOURCE_FILES = "IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES"; //$NON-NLS-1$
-    /**
-     * Optional, type Boolean.  If <code>Boolean.TRUE</code> and an archive with the same name exists in the 
-     * ARCHIVE_DESTINATION, the existing will be overwritten by the archive to be created.  Otherwise,
-     * if <code>Boolean.FALSE</code> a error message will be show indicating name collisions.
-     */
-    public static final String OVERWRITE_EXISTING = "IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING"; //$NON-NLS-1$
-    /**
-     * Optional, type boolean, Default <code>Boolean.TRUE</code> indicating a Build runs before exporting thus output files are created
-     * and archived.  However, if <code>Boolean.FALSE</code> the component is archived as is.
-     */
-    public static final String RUN_BUILD = "IJ2EEComponentExportDataModelProperties.RUN_BUILD"; //$NON-NLS-1$}
-    
-    public static final String COMPONENT = "IJ2EEComponentExportDataModelProperties.COMPONENT"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentImportDataModelProperties.java
deleted file mode 100644
index bf5ea1732..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,89 +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.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IJ2EEComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * J2EEComponentImportDataModelProvider as well as all extending interfaces extending
- * IJ2EEComponentImportDataModelProperties specifically all J2EE component specific imports.
- * 
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-
-public interface IJ2EEComponentImportDataModelProperties extends IDataModelProperties {
-
-	/**
-	 * Required, type String, name of the file to be imported.
-	 */
-	public static final String FILE_NAME = "IJ2EEArtifactImportDataModelProperties.FILE_NAME"; //$NON-NLS-1$
-
-	/**
-	 * Optional, type Archive, used when a file is available as an object rather than a url (i.e.
-	 * using the FILE_NAME property will not work).
-	 */
-	public static final String FILE = "IJ2EEArtifactImportDataModelProperties.FILE"; //$NON-NLS-1$
-	/**
-	 * Required, type String, name of the Project which the Archive will be imported.
-	 */
-	public static final String PROJECT_NAME = "IJ2EEComponentImportDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-	
-	/**
-	 * @deprecated used {@link #PROJECT_NAME}
-	 * 
-	 * @see DoNotUseMeThisWillBeDeletedPost15
-	 */
-	public static final String COMPONENT_NAME = PROJECT_NAME;
-
-	/**
-	 * Unsettable property used to retreive the component after the operation has executed.
-	 */
-	public static final String COMPONENT = "IJ2EEComponentImportDataModelProperties.COMPONENT"; //$NON-NLS-1$
-	/**
-	 * Optional, type IOverwriteHandler. Defines a IOverwriteHandler for the component in the
-	 * workspace if an existing component should be overwritten (OVERWRITE_COMPONENT).
-	 */
-	public static final String OVERWRITE_HANDLER = "IJ2EEArtifactImportDataModelProperties.OVERWRITE_HANDLER"; //$NON-NLS-1$
-
-	/**
-	 * Optional, type SaveFilter, default is null
-	 */
-	public static final String SAVE_FILTER = "IJ2EEArtifactImportDataModelProperties.SAVE_FILTER"; //$NON-NLS-1$
-
-	/**
-	 * Optional, type Boolean - Should the archive be closed on dispose?
-	 */
-	public static final String CLOSE_ARCHIVE_ON_DISPOSE = "IJ2EEArtifactImportDataModelProperties.closeArchiveOnDispose"; //$NON-NLS-1$
-	/**
-	 * Optional - type List, populated list of files previously selected. This can be used for GUIs
-	 * which wish to show preivous selections.
-	 */
-	public static final String FILE_SELECTION_HISTORY = "IJ2EEArtifactImportDataModelProperties.FILE_SELECTION_HISTORY"; //$NON-NLS-1$
-	/**
-	 * Optional, type IDataModel. This IDataModel will have a J2EE specific component creation
-	 * provider associated with it.
-	 */
-	public static final String NESTED_MODEL_J2EE_COMPONENT_CREATION = "IJ2EEArtifactImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java
deleted file mode 100644
index b02980a63..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
-/**
- * <p>
- * IJ2EEModuleImportDataModelProperties provides properties to the IDataModel associated with the 
- * J2EEModuleImportDataModelProvider as well as all extending interfaces extending 
- * IJ2EEModuleImportDataModelProperties specifically all J2EE component specific imports.
- * 
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IJ2EEModuleImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
-    
-	/**
-	 * @deprecated use the {@link IJ2EEFacetProjectCreationDataModelProperties#EAR_PROJECT_NAME} on the nested project creation model
-	 * 
-	 * @see DoNotUseMeThisWillBeDeletedPost15
-	 */
-	public static final String EAR_COMPONENT_NAME = "IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME"; //$NON-NLS-1$
-    /**
-     * @deprecated use the {@link IJ2EEFacetProjectCreationDataModelProperties#ADD_TO_EAR} on the nested project creation model
-     * 
-     * @see DoNotUseMeThisWillBeDeletedPost15
-     */
-    public static final String ADD_TO_EAR = "IJ2EEModuleImportDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-	
-	public static final String EXTENDED_IMPORT_FACTORY = "IJ2EEModuleImportDataModelProperties.EXTENDED_IMPORT_FACTORY"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEUtilityJarListImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEUtilityJarListImportDataModelProperties.java
deleted file mode 100644
index 38aa727e0..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEUtilityJarListImportDataModelProperties.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.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface IJ2EEUtilityJarListImportDataModelProperties extends IDataModelProperties{
-
-	/**
-	 * Required. The EAR Project to which Utility Jars should be added.
-	 */
-	public static final String EAR_PROJECT_NAME = IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME;
-
-	/**
-	 * Optional. Boolean Property. True indicates to create a Project Can be used with
-	 * LINK_IMPORT="true|"false" or BINARY_IMPORT="true|false" The default value is true.
-	 */
-	public static final String CREATE_PROJECT = "J2EEUtilityJarListImportDataModel.CREATE_PROJECT"; //$NON-NLS-1$
-
-	/**
-	 * Optional. Boolean property. True indicates to import the jar as a linked project Can be
-	 * specified with BINARY_IMPORT="true|false" and/or CREATE_PROJECT="true|false" The default
-	 * value is false.
-	 */
-	public static final String LINK_IMPORT = "J2EEUtilityJarListImportDataModel.LINK_IMPORT"; //$NON-NLS-1$
-
-	/**
-	 * Optional. Boolean Property. True indicates to create a Project Can be used with
-	 * LINK_IMPORT="true|"false" or BINARY_IMPORT="true|false" The default value is true.
-	 */
-	public static final String CREATE_LINKED_PROJECT = "J2EEUtilityJarListImportDataModel.CREATE_LINKED_PROJECT"; //$NON-NLS-1$
-
-	/**
-	 * Optional. Boolean property. True indicates to import the jar as a linked project Can be
-	 * specified with BINARY_IMPORT="true|false" and/or CREATE_PROJECT="true|false" The default
-	 * value is false.
-	 */
-	public static final String COPY = "J2EEUtilityJarListImportDataModel.COPY"; //$NON-NLS-1$
-
-	/**
-	 * Optional. Boolean property. True indicates to import the jar as a binary project Can be
-	 * specified with LINK_IMPORT="true|false" and/or CREATE_PROJECT="true|false" The default value
-	 * is false.
-	 */
-	public static final String BINARY_IMPORT = "J2EEUtilityJarListImportDataModel.BINARY_IMPORT"; //$NON-NLS-1$
-
-	/**
-	 * Required. A java.util.List of fully qualified file names for each Utility Jar that should be
-	 * imported.
-	 */
-	public static final String UTILITY_JAR_LIST = "J2EEUtilityJarListImportDataModel.UTILITY_JAR_LIST"; //$NON-NLS-1$
-
-	public static final String AVAILABLE_JARS_DIRECTORY = "J2EEUtilityJarListImportDataModel.AVAILABLE_JARS_DIRECTORY"; //$NON-NLS-1$
-
-	public static final String PROJECT_ROOT = "J2EEUtilityJarListImportDataModel.PROJECT_ROOT"; //$NON-NLS-1$
-
-	public static final String OVERRIDE_PROJECT_ROOT = "J2EEUtilityJarListImportDataModel.OVERRIDE_PROJECT_ROOT"; //$NON-NLS-1$
-
-	public static final String OVERWRITE_IF_NECESSARY = "J2EEUtilityJarListImportDataModel.OVERWRITE_IF_NECESSARY"; //$NON-NLS-1$
-
-	public static final String CREATE_LINKED_PATH_VARIABLE = "J2EEUtilityJarListImportDataModel.CREATE_LINKED_PATH"; //$NON-NLS-1$
-
-	public static final String LINKED_PATH_VARIABLE = "J2EEUtilityJarListImportDataModel.LINKED_PATH_VARIABLE"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java
deleted file mode 100644
index f2cb47ba9..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,64 +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.datamodel.properties;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IJavaComponentCreationDataModelProperties provides properties to the 
- * JavaComponentCreationDataModelProvider as well as all extending interfaces extending 
- * IJavaComponentCreationDataModelProperties specifically, but not limited to all J2EE component related
- * creation.
- * @see org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IJavaFacetInstallDataModelProperties
- */
-public interface IJavaComponentCreationDataModelProperties extends IComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-	/**
-	 * Optional, type String
-     * String indicating the name of the the root Java Source Folder in the component being created.
-     * The DataModelProvider will default the Java Source Folder to the Component folder.
-     * 
-	 */
-	public static final String JAVASOURCE_FOLDER = "IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER";
-    /**
-     * Optional, type String
-     * String indicating the name of the the root folder containing the Manifest.MF in the component being created.
-     * The DataModelProvider will default the Manifest folder to the Component folder/META-INF.
-     */
-	public static final String MANIFEST_FOLDER = "IJavaComponentCreationDataModelProperties.MANIFEST_FOLDER";
-	
-    /**
-     * Required, type String. This is used to specify the server target.
-     * 
-     */
-    public static final String RUNTIME_TARGET_ID = IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID;	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaUtilityJarImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaUtilityJarImportDataModelProperties.java
deleted file mode 100644
index ebcff0f6c..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaUtilityJarImportDataModelProperties.java
+++ /dev/null
@@ -1,45 +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.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IJavaUtilityJarImportDataModelProperties provides properties to the IDataModel associated with the 
- * JavaUtilityJarImportDataModelProvider.
- * 
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-public interface IJavaUtilityJarImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
-    /**
-     * Required, type String.  Represents the name of the Project containing the EAR component, which the utility 
-     * jar will be added.
-     */
-    public static final String EAR_PROJECT_NAME = "J2EEUtilityJarImportDataModel.EAR_PROJECT_NAME"; //$NON-NLS-1$
-    /**
-     * @deprecated use {@link #EAR_PROJECT_NAME}
-     * 
-     * @see DoNotUseMeThisWillBeDeletedPost15
-     */
-    public static final String EAR_COMPONENT_NAME = EAR_PROJECT_NAME;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IUtilityJavaComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IUtilityJavaComponentCreationDataModelProperties.java
deleted file mode 100644
index 8c1ed6ab7..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IUtilityJavaComponentCreationDataModelProperties.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
-/**
- * <p>
- * IJavaComponentCreationDataModelProperties provides properties to the 
- * JavaComponentCreationDataModelProvider as well as all extending interfaces extending 
- * IJavaComponentCreationDataModelProperties specifically, but not limited to all J2EE component related
- * creation.
- * @see org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IJavaFacetInstallDataModelProperties
- */
-public interface IUtilityJavaComponentCreationDataModelProperties extends IJavaComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-	/**
-	 * Optional, type String
-     * String indicating the name of the the root Java Source Folder in the component being created.
-     * The DataModelProvider will default the Java Source Folder to the Component folder.
-     * 
-	 */
-	public static final String EAR_PROJECT_NAME = "IUtilityJavaComponentCreationDataModelProperties.EAR_PROJECT_NAME";
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/package.xml b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/package.xml
deleted file mode 100644
index 3bf43aad3..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>j2ee module common data model api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the api the common create, import and export j2ee modules. It also includes the enterprise application and applciation client creation, import and export api. The interfaces in this package
-        define the properties that can be set on the j2ee modules data models that are used to run the data model operations and drive the wizard data, validation.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientArchiveOpsResourceHandler.java
deleted file mode 100644
index 8111e913d..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AppClientArchiveOpsResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "appclientarchiveops";//$NON-NLS-1$
-
-	private AppClientArchiveOpsResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String ARCHIVE_OPERATION_SaveFile;
-	public static String ARCHIVE_OPERATION_ProjectNature;
-	public static String ARCHIVE_OPERATION_SaveManifest;
-	public static String ARCHIVE_OPERATION_FileNotFound;
-	public static String ARCHIVE_OPERATION_OpeningArchive;
-	public static String ARCHIVE_OPERATION_ImportOperation;
-	public static String IMPORT_MOFRESOURCE_STRING;
-	public static String APPCLIENT_IMPORT_OPERATION_STRING;
-	public static String APPCLIENT_IMPORT_FILE_STRING;
-	public static String APPCLIENT_IMPORT_ERROR;
-	public static String ARCHIVE_OPERATION_ErrorOccured;
-	public static String Application_Client_File_UI_;
-	public static String _c__Copyright_IBM_Corporation_2001_1;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AppClientArchiveOpsResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentExportOperation.java
deleted file mode 100644
index 706eeec44..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentExportOperation.java
+++ /dev/null
@@ -1,46 +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.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentExportOperation extends J2EEArtifactExportOperation {
-
-	public AppClientComponentExportOperation(IDataModel model) {
-		super(model);
-	}
-
-	public void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
-		try {
-			CommonarchiveFactory caf = ((CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI)).getCommonarchiveFactory();
-			AppClientComponentLoadStrategyImpl ls = new AppClientComponentLoadStrategyImpl(getComponent());
-			ls.setExportSource(isExportSource());
-			setModuleFile(caf.openApplicationClientFile(ls, getDestinationPath().toOSString()));
-			getModuleFile().saveAsNoReopen(getDestinationPath().toOSString());
-		} catch (SaveFailureException ex) {
-			throw ex;
-		} catch (Exception e) {
-			throw new SaveFailureException(AppClientArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
-		}
-	}
-
-	protected String archiveString() {
-		return AppClientArchiveOpsResourceHandler.Application_Client_File_UI_; 
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentImportOperation.java
deleted file mode 100644
index 5f88a9581..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentImportOperation.java
+++ /dev/null
@@ -1,28 +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.archive.operations;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentImportOperation extends J2EEArtifactImportOperation {
-
-	public AppClientComponentImportOperation(IDataModel model) {
-		super(model);
-	}
-
-	protected SaveStrategy createSaveStrategy(IVirtualComponent virtualComponent) {
-		AppClientComponentSaveStrategyImpl saveStrat = new AppClientComponentSaveStrategyImpl(virtualComponent);
-		return saveStrat;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentLoadStrategyImpl.java
deleted file mode 100644
index 953444498..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
-	public AppClientComponentLoadStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentSaveStrategyImpl.java
deleted file mode 100644
index 7c769bd1e..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
-	public AppClientComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
deleted file mode 100644
index c374ed8b6..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,508 +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.archive.operations;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public abstract class ComponentLoadStrategyImpl extends LoadStrategyImpl {
-
-	protected static final String DOT_PROJECT = ".project"; //$NON-NLS-1$
-	protected static final String DOT_CLASSPATH = ".classpath"; //$NON-NLS-1$
-	protected static final String DOT_SETTINGS = ".settings"; //$NON-NLS-1$
-	protected static final String DOT_CVS_IGORE = ".cvsignore"; //$NON-NLS-1$
-
-	protected IVirtualComponent vComponent;
-	protected boolean exportSource;
-	private ArtifactEdit artifactEdit;
-	private List zipFiles = new ArrayList();
-
-	protected class FilesHolder {
-
-		private Map urisToFiles = new HashMap();
-		private Map urisToResources = new HashMap();
-		private Map resourcesToURI = new HashMap();
-		private Map urisToDiskFiles;
-		private Map urisToZipEntry = new HashMap();
-
-		public void removeIFile(IFile file) {
-			String uri = (String) resourcesToURI.get(file);
-			remove(uri);
-		}
-
-		public void remove(String uri) {
-			urisToFiles.remove(uri);
-			Object resource = urisToResources.remove(uri);
-			if (resource != null) {
-				resourcesToURI.remove(resource);
-			}
-			if (urisToDiskFiles != null) {
-				urisToDiskFiles.remove(uri);
-			}
-		}
-
-		public void addDirectory(File directory) {
-			String uri = directory.getURI();
-			urisToFiles.put(uri, directory);
-		}
-
-		public void addFile(File file) {
-			String uri = file.getURI();
-			urisToFiles.put(uri, file);
-		}
-
-		public void addFile(File file, java.io.File externalDiskFile) {
-			String uri = file.getURI();
-			urisToFiles.put(uri, file);
-			if (null == urisToDiskFiles) {
-				urisToDiskFiles = new HashMap();
-			}
-			urisToDiskFiles.put(uri, externalDiskFile);
-		}
-
-		public void addFile(File file, IResource resource) {
-			String uri = file.getURI();
-			urisToFiles.put(uri, file);
-			urisToResources.put(uri, resource);
-		}
-
-		public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
-			java.io.File diskFile = null;
-
-			if (urisToDiskFiles != null && urisToDiskFiles.containsKey(uri)) {
-				diskFile = (java.io.File) urisToDiskFiles.get(uri);
-			} else if (urisToResources != null && urisToResources.containsKey(uri)) {
-				IResource resource = (IResource) urisToResources.get(uri);
-				diskFile = new java.io.File(resource.getLocation().toOSString());
-			} else {
-				Map fileURIMap = (Map) urisToZipEntry.get(uri);
-				Iterator it = fileURIMap.keySet().iterator();
-
-				String sourceFileUri = ""; //$NON-NLS-1$
-				ZipFile zipFile = null;
-
-				// there is only one key, pair
-				while (it.hasNext()) {
-					sourceFileUri = (String) it.next();
-					zipFile = (ZipFile) fileURIMap.get(sourceFileUri);
-				}
-				ZipEntry entry = zipFile.getEntry(sourceFileUri);
-				InputStream in = zipFile.getInputStream(entry);
-				return in;
-			}
-			return new FileInputStream(diskFile);
-		}
-
-		public List getFiles() {
-			return new ArrayList(urisToFiles.values());
-		}
-
-		public boolean contains(String uri) {
-			return urisToFiles.containsKey(uri);
-		}
-
-		public void addEntry(ZipEntry entry, ZipFile zipFile, IPath runtimePath) {
-			String uri = runtimePath == null ? null : runtimePath.toString();
-			String fileURI = ""; //$NON-NLS-1$
-			if (uri != null) {
-				if (!uri.equals("/")) //$NON-NLS-1$
-					fileURI = uri + entry.getName();
-				else
-					fileURI = entry.getName();
-			} else {
-				fileURI = entry.getName();
-			}
-
-			File file = createFile(fileURI);
-
-			Map fileURIMap = new HashMap();
-			fileURIMap.put(entry.getName(), zipFile);
-
-			urisToZipEntry.put(file.getURI(), fileURIMap);
-			urisToFiles.put(file.getURI(), file);
-		}
-	}
-
-	protected FilesHolder filesHolder;
-
-	private Exception exception; //TEMP TODO REMOVE
-	
-	public ComponentLoadStrategyImpl(IVirtualComponent vComponent) {
-		this.vComponent = vComponent;
-		filesHolder = new FilesHolder();
-		exception = new Exception();
-	}
-
-	public boolean contains(String uri) {
-		IVirtualFolder rootFolder = vComponent.getRootFolder();
-		return rootFolder.getFile(new Path(uri)).exists();
-	}
-
-	protected void initializeResourceSet() {
-		resourceSet = WorkbenchResourceHelperBase.getResourceSet(vComponent.getProject());
-	}
-
-	protected boolean primContains(String uri) {
-		return false;
-	}
-
-	public List getFiles() {
-		aggregateSourceFiles();
-		aggregateClassFiles();
-		addUtilities();
-		return filesHolder.getFiles();
-	}
-
-	protected void addUtilities() {
-		IVirtualReference[] components = vComponent.getReferences();
-		for (int i = 0; i < components.length; i++) {
-			IVirtualReference reference = components[i];
-			IVirtualComponent referencedComponent = reference.getReferencedComponent();
-
-			if (referencedComponent.isBinary() && reference.getDependencyType() == DependencyType.CONSUMES) {
-				java.io.File diskFile = ((VirtualArchiveComponent) referencedComponent).getUnderlyingDiskFile();
-				ZipFile zipFile;
-				IPath path = reference.getRuntimePath();
-				try {
-					zipFile = new ZipFile(diskFile);
-					zipFiles.add(zipFile);
-					Enumeration enumeration = zipFile.entries();
-					while (enumeration.hasMoreElements()) {
-						ZipEntry entry = (ZipEntry) enumeration.nextElement();
-						filesHolder.addEntry(entry, zipFile, path);
-					}
-				} catch (ZipException e) {
-					Logger.getLogger().logError(e);
-				} catch (IOException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-		}
-	}
-
-	protected void aggregateSourceFiles() {
-		try {
-			IVirtualFolder rootFolder = vComponent.getRootFolder();
-			IVirtualResource[] members = rootFolder.members();
-			aggregateFiles(members);
-		} catch (CoreException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	protected void aggregateClassFiles() {
-		StructureEdit se = null;
-		try {
-			IPackageFragmentRoot[] sourceRoots = J2EEProjectUtilities.getSourceContainers(vComponent.getProject());
-			se = StructureEdit.getStructureEditForRead(vComponent.getProject());
-			for (int i = 0; i < sourceRoots.length; i++) {
-				IPath outputPath = sourceRoots[i].getRawClasspathEntry().getOutputLocation();
-				if (outputPath == null) {
-					IProject project = vComponent.getProject();
-					if (project.hasNature(JavaCore.NATURE_ID)) {
-						IJavaProject javaProject = JavaCore.create(project);
-						outputPath = javaProject.getOutputLocation();
-					}
-				}
-
-				if (outputPath != null) {
-					IContainer javaOutputContainer = outputPath.segmentCount() > 1 ? (IContainer) ResourcesPlugin.getWorkspace().getRoot().getFolder(outputPath) : (IContainer) ResourcesPlugin.getWorkspace().getRoot().getProject(outputPath.lastSegment());
-					IPath runtimePath = null;
-					try {
-						ComponentResource[] componentResources = se.findResourcesBySourcePath(sourceRoots[i].getResource().getProjectRelativePath());
-						if (componentResources.length > 0) {
-							IPath tmpRuntimePath = componentResources[0].getRuntimePath();
-							IPath tmpSourcePath = componentResources[0].getSourcePath();
-							if (!tmpRuntimePath.equals(tmpSourcePath)) {
-								while (tmpSourcePath.segmentCount() > 0 && tmpRuntimePath.segmentCount() > 0 && tmpRuntimePath.lastSegment().equals(tmpSourcePath.lastSegment())) {
-									tmpRuntimePath = tmpRuntimePath.removeLastSegments(1);
-									tmpSourcePath = tmpSourcePath.removeLastSegments(1);
-								}
-								if (tmpRuntimePath.segmentCount() != 0) {
-									runtimePath = tmpRuntimePath.makeRelative();
-								}
-							}
-						}
-					} catch (UnresolveableURIException e) {
-						Logger.getLogger().logError(e);
-					}
-					if (null == runtimePath) {
-						runtimePath = new Path(""); //$NON-NLS-1$
-					}
-
-					aggregateOutputFiles(new IResource[]{javaOutputContainer}, runtimePath, javaOutputContainer.getProjectRelativePath().segmentCount());
-				}
-			}
-		} catch (CoreException e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (se != null) {
-				se.dispose();
-			}
-		}
-	}
-
-	protected boolean aggregateOutputFiles(IResource[] resources, final IPath runtimePathPrefix, int outputFolderSegmentCount) throws CoreException {
-		boolean fileAdded = false;
-		for (int i = 0; i < resources.length; i++) {
-			File cFile = null;
-			if (!resources[i].exists()) {
-				continue;
-			}
-			// We have to avoid duplicates between the source and output folders (non-java
-			// resources)
-			IPath runtimePath = runtimePathPrefix.append(resources[i].getProjectRelativePath().removeFirstSegments(outputFolderSegmentCount));
-			String uri = runtimePath == null ? null : runtimePath.toString();
-			if (uri == null)
-				continue;
-			if (resources[i].getType() == IResource.FILE) {
-				if (!shouldInclude(uri))
-					continue;
-				cFile = createFile(uri);
-				cFile.setLastModified(getLastModified(resources[i]));
-				filesHolder.addFile(cFile, resources[i]);
-				fileAdded = true;
-			} else if (shouldInclude((IContainer) resources[i])) {
-				IResource[] nestedResources = ((IContainer) resources[i]).members();
-				aggregateOutputFiles(nestedResources, runtimePathPrefix, outputFolderSegmentCount);
-				if(!filesHolder.contains(uri)){
-					if (!shouldInclude(uri))
-						continue;
-					cFile = createDirectory(uri);
-					cFile.setLastModified(getLastModified(resources[i]));
-					filesHolder.addDirectory(cFile);
-					fileAdded = true;
-				}
-			}
-		}
-		return fileAdded;
-	}
-
-	protected boolean aggregateFiles(IVirtualResource[] virtualResources) throws CoreException {
-		boolean fileAdded = false;
-		for (int i = 0; i < virtualResources.length; i++) {
-			File cFile = null;
-			if (!virtualResources[i].exists()) {
-				continue;
-			}
-			// We have to avoid duplicates between the source and output folders (non-java
-			// resources)
-			IPath runtimePath = virtualResources[i].getRuntimePath();
-			String uri = runtimePath == null ? null : runtimePath.toString();
-			if (uri == null)
-				continue;
-			if (uri.charAt(0) == IPath.SEPARATOR) {
-				uri = uri.substring(1);
-			}
-			if (filesHolder.contains(uri))
-				continue;
-
-			if (virtualResources[i].getType() == IVirtualResource.FILE) {
-				if (!shouldInclude(uri))
-					continue;
-				IResource resource = virtualResources[i].getUnderlyingResource();
-				if (resource.isDerived()) {
-					continue;
-				}
-				cFile = createFile(uri);
-				cFile.setLastModified(getLastModified(resource));
-				filesHolder.addFile(cFile, resource);
-				fileAdded = true;
-			} else if (shouldInclude((IVirtualContainer) virtualResources[i])) {
-				IVirtualResource[] nestedVirtualResources = ((IVirtualContainer) virtualResources[i]).members();
-				aggregateFiles(nestedVirtualResources);
-				if(!filesHolder.contains(uri)){
-					if (!shouldInclude(uri))
-						continue;
-					IResource resource = virtualResources[i].getUnderlyingResource();
-					if (resource.isDerived()) {
-						continue;
-					}
-					cFile = createDirectory(uri);
-					cFile.setLastModified(getLastModified(resource));
-					filesHolder.addDirectory(cFile);
-					fileAdded = true;
-				}
-			}
-		}
-		return fileAdded;
-	}
-
-	protected long getLastModified(IResource aResource) {
-		return aResource.getLocation().toFile().lastModified();
-	}
-
-	public void setExportSource(boolean newExportSource) {
-		exportSource = newExportSource;
-	}
-
-	public boolean isExportSource() {
-		return exportSource;
-	}
-
-	protected boolean shouldInclude(IContainer aContainer) {
-		return true;
-	}
-
-	protected boolean shouldInclude(IVirtualContainer vContainer) {
-		IContainer iContainer = (IContainer) vContainer.getUnderlyingResource();
-		return shouldInclude(iContainer);
-	}
-
-	protected boolean shouldInclude(String uri) {
-		if (DOT_PROJECT.equals(uri) || DOT_CLASSPATH.equals(uri) || uri.endsWith(DOT_CVS_IGORE) || uri.startsWith(DOT_SETTINGS)) {
-			return false;
-		}
-		return isExportSource() || !isSource(uri);
-	}
-
-	protected boolean isSource(String uri) {
-		if (uri == null)
-			return false;
-		return uri.endsWith(ArchiveUtil.DOT_JAVA) || uri.endsWith(ArchiveUtil.DOT_SQLJ);
-	}
-
-	protected void addExternalFile(String uri, java.io.File externalDiskFile) {
-		File aFile = createFile(uri);
-		filesHolder.addFile(aFile, externalDiskFile);
-	}
-
-	public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
-		if (filesHolder.contains(uri)) {
-			return filesHolder.getInputStream(uri);
-		}
-		IVirtualFolder rootFolder = vComponent.getRootFolder();
-		IVirtualResource vResource = rootFolder.findMember(uri);
-		String filePath = null;
-		if (null != vResource && vResource.exists()) {
-			filePath = vResource.getUnderlyingResource().getLocation().toOSString();
-			java.io.File file = new java.io.File(filePath);
-			return new FileInputStream(file);
-		}
-		String eString = EARArchiveOpsResourceHandler.ARCHIVE_OPERATION_FileNotFound;
-		throw new FileNotFoundException(eString);
-	}
-
-	public Collection getLoadedMofResources() {
-		Collection resources = super.getLoadedMofResources();
-		Collection resourcesToRemove = new ArrayList();
-		Iterator iterator = resources.iterator();
-		while (iterator.hasNext()) {
-			Resource res = (Resource) iterator.next();
-			if (res.getURI().toString().endsWith(IModuleConstants.COMPONENT_FILE_NAME))
-				resourcesToRemove.add(res);
-		}
-		if (null != resourcesToRemove) {
-			resources.removeAll(resourcesToRemove);
-		}
-
-		return resources;
-	}
-
-	protected synchronized ArtifactEdit getArtifactEditForRead() {
-		if(artifactEdit == null){
-			artifactEdit = ArtifactEdit.getArtifactEditForRead(vComponent);
-		}
-		return artifactEdit;
-	}
-	
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
-		return getArtifactEditForRead().getResource(URI.createURI(uri));
-	}
-
-	public boolean isClassLoaderNeeded() {
-		return false;
-	}
-
-	public IVirtualComponent getComponent() {
-		return vComponent;
-	}
-
-	public void close() {
-		if(Thread.currentThread().toString().toLowerCase().indexOf("finalizer") != -1){
-			System.err.println("Opener of Archive didn't close! "+this);
-			exception.printStackTrace(System.err);
-		}
-		
-		try{
-			Iterator it = zipFiles.iterator();
-			while (it.hasNext()) {
-				ZipFile file = (ZipFile) it.next();
-				try {
-					file.close();
-				} catch (IOException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-		} finally{
-			try{
-				synchronized(this) {
-					if(artifactEdit != null){
-						ArtifactEditModel editModel = (ArtifactEditModel)artifactEdit.getAdapter(ArtifactEditModel.class);
-						if(editModel != null && !editModel.isDisposed()){
-							artifactEdit.dispose();
-						}
-						artifactEdit = null;
-					}
-				}
-			} finally {
-				super.close();
-			}
-		}
-		
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
deleted file mode 100644
index 16756d704..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,278 +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.archive.operations;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategyImpl;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-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.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-public abstract class ComponentSaveStrategyImpl extends SaveStrategyImpl {
-
-	protected IDataModel dataModel;
-	protected IVirtualComponent vComponent;
-	protected IOverwriteHandler overwriteHandler;
-	protected IProgressMonitor progressMonitor;
-
-	private String archiveComponentsDeployPath;
-	private List archiveComponents;
-	private Map archiveComponentURIMap;
-
-	public ComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super();
-		if (null == vComponent) {
-			throw new NullPointerException();
-		}
-		this.vComponent = vComponent;
-	}
-
-	public void setDataModel(IDataModel dataModel) {
-		this.dataModel = dataModel;
-	}
-
-	public void setOverwriteHandler(IOverwriteHandler newOverwriteHandler) {
-		overwriteHandler = newOverwriteHandler;
-	}
-
-	public void setProgressMonitor(IProgressMonitor newProgressMonitor) {
-		progressMonitor = newProgressMonitor;
-	}
-
-	protected void validateEdit(IFile aFile) {
-		if (overwriteHandler == null)
-			return;
-		if (!(aFile.exists() && aFile.isReadOnly()))
-			return;
-
-		overwriteHandler.validateEdit(aFile);
-	}
-
-	protected boolean shouldOverwrite(String uri) {
-		if (overwriteHandler.isOverwriteNone())
-			return false;
-		return (overwriteHandler.isOverwriteResources() || overwriteHandler.isOverwriteAll() || overwriteHandler.shouldOverwrite(uri));
-	}
-
-	protected SaveStrategy createNestedSaveStrategy(Archive anArchive) throws IOException {
-		return null;
-	}
-
-	protected OutputStream getOutputStreamForResource(Resource aResource) throws IOException {
-		// this method has no references in the hirarchy
-		return null;
-	}
-
-	protected void saveFiles() throws SaveFailureException {
-		super.saveFiles();
-		linkArchiveComponents();
-	}
-
-	public void save(File aFile, InputStream in) throws SaveFailureException {
-		try {
-			String displayString = EJBArchiveOpsResourceHandler.IMPORT_OPERATION_STRING;
-			progressMonitor.subTask(displayString + aFile.getURI());
-			
-			IPath projectRelativePath = getOutputPathForFile(aFile);
-			if (aFile.isArchive()) {
-				saveAsArchiveComponent((Archive) aFile, projectRelativePath, in);
-			} else if (!aFile.isDirectoryEntry()) {
-				saveToOutputPath(projectRelativePath, in);
-			} else {
-				createDirectory(projectRelativePath);
-			}
-		} catch (OverwriteHandlerException ohe) {
-			throw ohe;
-		} catch (Exception e) {
-			String errorString = EJBArchiveOpsResourceHandler.ARCHIVE_OPERATION_SaveFile + aFile.getName();
-			throw new SaveFailureException(errorString, e);
-		}
-	}
-
-	//TODO this should be renamed to getProjectRelativePath
-	/**
-	 * Returns the project relative path for where the specified file should be
-	 * saved.
-	 * 
-	 * @param aFile
-	 * @return
-	 */
-	protected IPath getOutputPathForFile(File aFile) {
-		String uri = aFile.getURI();
-		IFile iFile = null;
-		if(uri.startsWith(IModuleConstants.DOT_SETTINGS)){
-			iFile = vComponent.getProject().getFile(new Path(uri));
-		}else {
-			IVirtualFolder rootFolder = vComponent.getRootFolder();
-			IVirtualFile vFile = rootFolder.getFile(aFile.getURI());
-			iFile = vFile.getUnderlyingFile();
-		}
-		return iFile.getProjectRelativePath();
-	}
-
-	//TODO This isn't referenced in WTP it should be deleted.
-	/**
-	 * @deprecated
-	 */
-	protected void saveToWorkbenchPath(IPath workbenchPath, InputStream in) throws Exception {
-		IFile iFile = ResourcesPlugin.getWorkspace().getRoot().getFile(workbenchPath);
-		saveToIFile(iFile, in);
-	}
-
-	/**
-	 * Creates the IFolder specified by the project relative path.
-	 * 
-	 * @param projectRelativePath
-	 * @throws CoreException
-	 */
-	protected void createDirectory(IPath projectRelativePath) throws CoreException {
-		IFolder iFolder = vComponent.getProject().getFolder(projectRelativePath);
-		if (!iFolder.exists()) {
-			mkdirs(iFolder);
-		}
-	}
-
-	/**
-	 * Creates the specified IFolder
-	 * 
-	 * @param folder
-	 * @throws CoreException
-	 */
-	protected void mkdirs(IFolder folder) throws CoreException {
-		IContainer container = folder.getParent();
-		if (!container.exists()) {
-			mkdirs((IFolder) container);
-		}
-		folder.create(true, true, null);
-	}
-
-	/**
-	 * Save the specified Archive to the specified project relative path
-	 * using the passed input stream.
-	 * 
-	 * @param archive
-	 * @param projectRelativePath
-	 * @param in
-	 * @throws Exception
-	 */
-	protected void saveAsArchiveComponent(Archive archive, IPath projectRelativePath, InputStream in) throws Exception {
-		IFile iFile = saveToOutputPathIFile(projectRelativePath, in);
-		//TODO investigate removing this block and related variables and linkArchiveComponents(); see bugzilla 159160
-		if (shouldLinkAsComponentRef(archive)) {
-			IVirtualComponent archiveComponent = ComponentCore.createArchiveComponent(vComponent.getProject(), VirtualArchiveComponent.LIBARCHIVETYPE + iFile.getFullPath().toString());
-			if (archiveComponents == null) {
-				archiveComponents = new ArrayList();
-				archiveComponentURIMap = new HashMap();
-				archiveComponentsDeployPath = IPath.SEPARATOR + projectRelativePath.removeLastSegments(1).toString();
-			}
-			archiveComponents.add(archiveComponent);
-			archiveComponentURIMap.put(archiveComponent, iFile.getName());
-		}
-	}
-
-	protected boolean shouldLinkAsComponentRef(Archive archive) {
-		return false;
-	}
-
-	protected void linkArchiveComponents() {
-		if (archiveComponents != null && archiveComponents.size() > 0) {
-			IDataModel createReferencesDataModel = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
-			createReferencesDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, vComponent);
-			createReferencesDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, archiveComponentsDeployPath);
-			createReferencesDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, archiveComponents);
-			createReferencesDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, archiveComponentURIMap);
-			try {
-				createReferencesDataModel.getDefaultOperation().execute(null, null);
-			} catch (ExecutionException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Saves to the specified project relative output path. Warning this method
-	 * will be changed post 1.5 to return an IFile
-	 * 
-	 * @param projectRelativePath
-	 * @param in
-	 * @throws Exception
-	 */
-	protected void saveToOutputPath(IPath projectRelativePath, InputStream in) throws Exception {
-		saveToOutputPathIFile(projectRelativePath, in);
-	}
-
-	/**
-	 * TODO refactor change the method above to return IFile
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 */
-	protected IFile saveToOutputPathIFile(IPath projectRelativePath, InputStream in) throws Exception {
-		IFile iFile = vComponent.getProject().getFile(projectRelativePath);
-		saveToIFile(iFile, in);
-		return iFile;
-	}
-
-
-	protected void saveToIFile(IFile iFile, InputStream in) throws Exception {
-		validateEdit(iFile);
-		if (iFile.exists())
-			iFile.setContents(in, true, true, null);
-		else {
-			mkdirs(iFile.getFullPath().removeLastSegments(1), ResourcesPlugin.getWorkspace().getRoot());
-			iFile.create(in, true, null);
-		}
-	}
-
-
-	protected void mkdirs(IPath path, IWorkspaceRoot root) throws CoreException {
-		if (path.segmentCount() <= 1)
-			return;
-		IFolder folder = root.getFolder(path);
-		if (!folder.exists()) {
-			mkdirs(path.removeLastSegments(1), root);
-			folder.create(true, true, null);
-		}
-	}
-
-	public void save(ArchiveManifest aManifest) throws SaveFailureException {
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ConnectorComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ConnectorComponentSaveStrategyImpl.java
deleted file mode 100644
index f0c4e7ae0..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ConnectorComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ConnectorComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
-	public ConnectorComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/DependentJarExportMerger.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/DependentJarExportMerger.java
deleted file mode 100644
index 6c5e888eb..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/DependentJarExportMerger.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.archive.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Attributes;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-
-public class DependentJarExportMerger {
-	protected Archive outgoingArchive;
-	protected IProject project;
-	protected List dependentArchives;
-	protected boolean includeSource;
-
-	/**
-	 * DependentJarExportMerger constructor comment.
-	 */
-	public DependentJarExportMerger(Archive archive, IProject aProject, boolean includeSourceFiles) {
-		super();
-		outgoingArchive = archive;
-		project = aProject;
-		includeSource = includeSourceFiles;
-	}
-
-	protected void finalize() throws Throwable {
-		release();
-	}
-
-	public CommonarchiveFactory getArchiveFactory() {
-		return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
-	}
-
-	public void merge() {
-		String[] cp = outgoingArchive.getManifest().getClassPathTokenized();
-		dependentArchives = new ArrayList(cp.length);
-		List keepClassPaths = new ArrayList();
-		for (int i = 0; i < cp.length; i++) {
-			Archive dependentJar = null;
-			IFile file = null;
-			try {
-				file = project.getFile(cp[i]);
-			} catch (IllegalArgumentException e) {
-				continue;
-			}
-			if (file.exists() && cp[i].endsWith(J2EEImportConstants.IMPORTED_JAR_SUFFIX)) {
-				try {
-					dependentJar = getArchiveFactory().primOpenArchive(file.getLocation().toOSString());
-				} catch (OpenFailureException ex) {
-					// Need to write this to the log file
-					org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-					continue;
-				}
-				dependentArchives.add(dependentJar);
-				mergeFiles(dependentJar);
-			} else
-				keepClassPaths.add(cp[i]);
-		}
-		resetClassPath(keepClassPaths);
-	}
-
-	protected void mergeFiles(Archive dependentJar) {
-		List files = dependentJar.getFiles();
-		List filesToAdd = new java.util.ArrayList();
-		for (int i = 0; i < files.size(); i++) {
-			File aFile = (File) files.get(i);
-			if (shouldMerge(aFile))
-				filesToAdd.add(aFile);
-		}
-		try {
-			outgoingArchive.addCopyFiles(filesToAdd);
-		} catch (DuplicateObjectException ignore) {
-			// Shouldn't happen because we just checked for dups
-		}
-	}
-
-	/**
-	 * Clients must call this when done to close the archives
-	 */
-	public void release() {
-		if (dependentArchives == null)
-			return;
-		for (int i = 0; i < dependentArchives.size(); i++) {
-			Archive anArchive = (Archive) dependentArchives.get(i);
-			if (anArchive.isOpen())
-				anArchive.close();
-		}
-	}
-
-	protected void resetClassPath(List cp) {
-		ArchiveManifest mf = outgoingArchive.getManifest();
-		if (cp.isEmpty())
-			mf.getMainAttributes().remove(Attributes.Name.CLASS_PATH);
-		else {
-			mf.setClassPath("");//$NON-NLS-1$
-			for (int i = 0; i < cp.size(); i++) {
-				mf.appendClassPath((String) cp.get(i));
-			}
-		}
-	}
-
-	protected boolean shouldMerge(File aFile) {
-
-		String uri = aFile.getURI();
-		if (!(uri.endsWith(".java") || uri.endsWith(".class")))//$NON-NLS-2$//$NON-NLS-1$
-			return false;
-		if (!includeSource && uri.endsWith(".java"))//$NON-NLS-1$
-			return false;
-		return !outgoingArchive.containsFile(uri) && !ArchiveConstants.MANIFEST_URI.equals(uri);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARArchiveOpsResourceHandler.java
deleted file mode 100644
index 8dc663bc1..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EARArchiveOpsResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "eararchiveops";//$NON-NLS-1$
-
-	private EARArchiveOpsResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String ARCHIVE_OPERATION_SaveMofResources;
-	public static String ARCHIVE_OPERATION_SaveFile;
-	public static String ARCHIVE_OPERATION_ProjectNature;
-	public static String ARCHIVE_OPERATION_SaveManifest;
-	public static String ARCHIVE_OPERATION_FileNotFound;
-	public static String ARCHIVE_OPERATION_FileContents;
-	public static String ARCHIVE_OPERATION_ErroOccured;
-	public static String ARCHIVE_OPERATION_FilesFromProject;
-	public static String ARCHIVE_OPERATION_OpeningArchive;
-	public static String ARCHIVE_OPERATION_ImportOperation;
-	public static String IMPORT_MOFRESOURCE_STRING;
-	public static String EAR_IMPORT_FILE_STRING;
-	public static String ERROR_IMPORTING_EAR_FILE;
-	public static String ERROR_EXPORTING_EAR_FILE;
-	public static String IMPORTING_EAR_FILE_UI_;
-	public static String Updating_project_classpath_UI_;
-	public static String UNABLE_TO_LOAD_MODULE_ERROR_;
-	public static String _jar_UI_;
-	public static String Updating_manifest_Class_Path__attributes_UI_;
-	public static String _preDeploy_ERROR_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EARArchiveOpsResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentExportOperation.java
deleted file mode 100644
index 9ea71bb7f..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentExportOperation.java
+++ /dev/null
@@ -1,67 +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.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARComponentExportOperation extends J2EEArtifactExportOperation {
-
-	public EARComponentExportOperation(IDataModel model) {
-		super(model);
-	}
-
-	protected void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException {
-		EARArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = (EARArtifactEdit) ComponentUtilities.getArtifactEditForRead(getComponent());
-			EARFile archive = (EARFile) artifactEdit.asArchive(isExportSource());
-			String destination = getDestinationPath().toOSString();
-			archive.setURI(destination);
-			setModuleFile(archive);
-			archive.saveAsNoReopen(destination);
-		} catch (SaveFailureException ex) {
-			throw ex;
-		} catch (Exception e) {
-			throw new SaveFailureException(AppClientArchiveOpsResourceHandler.ARCHIVE_OPERATION_OpeningArchive, e);
-		} finally {
-			if (null != artifactEdit) {
-				artifactEdit.dispose();
-			}
-		}
-	}
-
-	protected void runNecessaryBuilders(IVirtualComponent component, IProgressMonitor monitor) throws CoreException {
-		super.runNecessaryBuilders(component, monitor);
-		IVirtualReference[] refs = component.getReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IVirtualComponent refComp = refs[i].getReferencedComponent();
-			super.runNecessaryBuilders(refComp, monitor);
-		}
-	}
-
-
-	protected String archiveString() {
-		return "EAR";
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
deleted file mode 100644
index dc90f5eb4..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
+++ /dev/null
@@ -1,153 +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.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EARComponentImportOperation extends J2EEArtifactImportOperation {
-
-	protected EARArtifactEdit artifactEdit = null;
-
-	public EARComponentImportOperation(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * Subclasses must override to performs the workbench modification steps that are to be
-	 * contained within a single logical workbench change.
-	 * 
-	 * @param monitor
-	 *            the progress monitor to use to display progress
-	 */
-	protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
-		super.doExecute(monitor);
-		List modelsToImport = (List) model.getProperty(IEARComponentImportDataModelProperties.HANDLED_PROJECT_MODELS_LIST);
-		try {
-			IDataModel importModel = null;
-			// make sure the wars handle importing their own web libs
-			for (int i = modelsToImport.size() - 1; i > 0; i--) {
-				importModel = (IDataModel) modelsToImport.get(i);
-				Archive nestedArchive = (Archive) importModel.getProperty(IEARComponentImportDataModelProperties.FILE);
-				if (nestedArchive.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) {
-					WARFile owningWar = (WARFile) nestedArchive.eContainer();
-					modelsToImport.remove(importModel);
-					for (int j = 0; j < modelsToImport.size(); j++) {
-						IDataModel warModel = (IDataModel) modelsToImport.get(j);
-						if (warModel.getProperty(IEARComponentImportDataModelProperties.FILE) == owningWar) {
-							// TODO this is bad, but don't have access to the plugin where these
-							// constants are defined.
-							String archivesSelected = "WARImportDataModel.WEB_LIB_ARCHIVES_SELECTED"; //$NON-NLS-1$
-							String libModels = "WARImportDataModel.WEB_LIB_MODELS"; //$NON-NLS-1$
-							List warHandledArchives = (List) warModel.getProperty(archivesSelected);
-							if (warHandledArchives == Collections.EMPTY_LIST) {
-								warHandledArchives = new ArrayList();
-								warModel.setProperty(archivesSelected, warHandledArchives);
-							}
-							warHandledArchives.add(nestedArchive);
-							List warLibModels = (List) warModel.getProperty(libModels);
-							for (int k = 0; k < warLibModels.size(); k++) {
-								IDataModel libModel = (IDataModel) warLibModels.get(k);
-								if (libModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE) == nestedArchive) {
-									libModel.setProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME, importModel.getProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME));
-									libModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, importModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-								}
-							}
-						}
-					}
-				}
-			}
-
-			List componentToAdd = new ArrayList();
-			Map componentToURIMap = new HashMap();
-			for (int i = 0; i < modelsToImport.size(); i++) {
-				importModel = (IDataModel) modelsToImport.get(i);
-				Archive nestedArchive = (Archive) importModel.getProperty(IEARComponentImportDataModelProperties.FILE);
-				importModel.setProperty(IJ2EEComponentImportDataModelProperties.CLOSE_ARCHIVE_ON_DISPOSE, Boolean.FALSE);
-				IDataModel compCreationModel = importModel.getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION);
-				if (compCreationModel.isProperty(IJ2EEFacetProjectCreationDataModelProperties.MODULE_URI))
-					compCreationModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.MODULE_URI, nestedArchive.getURI());
-				try {
-					importModel.getDefaultOperation().execute(monitor, info);
-				} catch (ExecutionException e) {
-					Logger.getLogger().logError(e);
-				}
-				IVirtualComponent component = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
-				componentToAdd.add(component);
-				componentToURIMap.put(component, nestedArchive.getURI());
-			}
-			if (componentToAdd.size() > 0) {
-				IDataModel addComponentsDM = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-				addComponentsDM.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, virtualComponent);
-				addComponentsDM.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, componentToAdd);
-				addComponentsDM.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
-				addComponentsDM.getDefaultOperation().execute(monitor, info);
-			}
-		} finally {
-			if (null != artifactEdit) {
-				artifactEdit.dispose();
-				artifactEdit = null;
-			}
-			resetDisposeImportModels();
-		}
-	}
-
-	/**
-	 * @param modelsToImport
-	 */
-	private void resetDisposeImportModels() {
-		resetDisposeImportModels((List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST));
-	}
-
-	private void resetDisposeImportModels(List models) {
-		IDataModel model;
-		for (int i = 0; i < models.size(); i++) {
-			model = (IDataModel) models.get(i);
-			model.setProperty(IJ2EEComponentImportDataModelProperties.CLOSE_ARCHIVE_ON_DISPOSE, Boolean.TRUE);
-		}
-	}
-
-	protected SaveStrategy createSaveStrategy(IProject project) { // NOOP
-		return null;
-	}
-
-	protected SaveStrategy createSaveStrategy(IVirtualComponent virtualComponent) {
-		return new EARComponentSaveStrategyImpl(virtualComponent);
-	}
-
-	protected EARFile getEarFile() {
-		return (EARFile) model.getProperty(IEARComponentImportDataModelProperties.FILE);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
deleted file mode 100644
index fafa44d38..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,161 +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.archive.operations;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.ArtifactEditRegistryReader;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class EARComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
-	private List artifactEditsToDispose = new ArrayList();
-	private Map binaryComponentURIsToDiskFileMap = new HashMap();
-
-	public EARComponentLoadStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-	public List getFiles() {
-		aggregateSourceFiles();
-		addModulesAndUtilities();
-		return filesHolder.getFiles();
-	}
-
-	public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
-		if (binaryComponentURIsToDiskFileMap.containsKey(uri)) {
-			java.io.File diskFile = (java.io.File) binaryComponentURIsToDiskFileMap.get(uri);
-			return new FileInputStream(diskFile);
-		}
-		return super.getInputStream(uri);
-	}
-
-	public void addModulesAndUtilities() {
-		EARArtifactEdit earArtifactEdit = null;
-		try {
-			earArtifactEdit = EARArtifactEdit.getEARArtifactEditForRead(vComponent);
-			IVirtualReference[] components = earArtifactEdit.getComponentReferences();
-			for (int i = 0; i < components.length; i++) {
-				IVirtualReference reference = components[i];
-				IVirtualComponent referencedComponent = reference.getReferencedComponent();
-
-				java.io.File diskFile = null;
-				if (referencedComponent.isBinary()) {
-					diskFile = ((VirtualArchiveComponent) referencedComponent).getUnderlyingDiskFile();
-					if (!diskFile.exists()) {
-						IFile wbFile = ((VirtualArchiveComponent) referencedComponent).getUnderlyingWorkbenchFile();
-						diskFile = new File(wbFile.getLocation().toOSString());
-					}
-				}
-
-				boolean isModule = false;
-				ArtifactEdit componentArtifactEdit = null;
-				try {
-					if (J2EEProjectUtilities.isApplicationClientComponent(referencedComponent)) {
-						componentArtifactEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(referencedComponent);
-					} else if (J2EEProjectUtilities.isEJBComponent(referencedComponent)) {
-						componentArtifactEdit = ArtifactEditRegistryReader.instance().getArtifactEdit(J2EEProjectUtilities.EJB).createArtifactEditForRead(referencedComponent);
-					} else if (J2EEProjectUtilities.isDynamicWebComponent(referencedComponent)) {
-						componentArtifactEdit = ArtifactEditRegistryReader.instance().getArtifactEdit(J2EEProjectUtilities.DYNAMIC_WEB).createArtifactEditForRead(referencedComponent);
-					} else if (J2EEProjectUtilities.isJCAComponent(referencedComponent)) {
-						componentArtifactEdit = ArtifactEditRegistryReader.instance().getArtifactEdit(J2EEProjectUtilities.JCA).createArtifactEditForRead(referencedComponent);
-					}
-					if (null != componentArtifactEdit) {
-						Archive archive = ((EnterpriseArtifactEdit) componentArtifactEdit).asArchive(exportSource);
-						if (referencedComponent.isBinary()) {
-							artifactEditsToDispose.add(componentArtifactEdit);
-							archive.setLoadingContainer(getContainer());
-							binaryComponentURIsToDiskFileMap.put(archive.getOriginalURI(), diskFile);
-						}
-						archive.setURI(earArtifactEdit.getModuleURI(referencedComponent));
-						filesHolder.addFile(archive);
-						isModule = true;
-					}
-				} catch (OpenFailureException oe) {
-					Logger.getLogger().logError(oe);
-				} finally {
-					if (!referencedComponent.isBinary() && componentArtifactEdit != null) {
-						componentArtifactEdit.dispose();
-					}
-				}
-				if (!isModule) {
-					if (referencedComponent.isBinary()) {
-						String uri = reference.getArchiveName();
-						addExternalFile(uri, diskFile);
-					} else if (J2EEProjectUtilities.isUtilityProject(referencedComponent.getProject())) {
-						try {
-							if (!referencedComponent.isBinary()) {
-								String uri = earArtifactEdit.getModuleURI(referencedComponent);
-								Archive archive = J2EEProjectUtilities.asArchive(uri, referencedComponent.getProject(), exportSource);
-								archive.setURI(uri);
-								filesHolder.addFile(archive);
-							} else {
-
-
-							}
-						} catch (OpenFailureException e) {
-							Logger.getLogger().logError(e);
-						}
-					}
-				}
-			}
-
-		} finally {
-			if (null != earArtifactEdit) {
-				earArtifactEdit.dispose();
-			}
-		}
-	}
-
-	public void close() {
-		super.close();
-		Iterator it = artifactEditsToDispose.iterator();
-		while (it.hasNext()) {
-			ArtifactEdit edit = (ArtifactEdit) it.next();
-			edit.dispose();
-		}
-		artifactEditsToDispose.clear();
-	}
-
-	public ZipFileLoadStrategyImpl createLoadStrategy(String uri) throws FileNotFoundException, IOException {
-		String filename = uri.replace('/', java.io.File.separatorChar);
-		java.io.File file = new java.io.File(filename);
-		if (!file.exists()) {
-			throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // =
-		}
-		if (file.isDirectory()) {
-			throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // =
-		}
-		return new org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl(file);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentSaveStrategyImpl.java
deleted file mode 100644
index c0cb18e39..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,247 +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.archive.operations;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-public class EARComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
-	protected Map createdComponentsMap;
-
-	public EARComponentSaveStrategyImpl(IVirtualComponent component) {
-		super(component);
-	}
-
-	public void setDataModel(IDataModel dataModel) {
-		super.setDataModel(dataModel);
-
-		setArchive((Archive) dataModel.getProperty(IEARComponentImportDataModelProperties.FILE));
-		overwriteHandler = (IOverwriteHandler) dataModel.getProperty(IEARComponentImportDataModelProperties.OVERWRITE_HANDLER);
-		if (null != overwriteHandler) {
-			overwriteHandler.setEarSaveStrategy(this);
-		}
-		buildProjectsMap();
-	}
-
-
-
-	/**
-	 * Creates a Map mapping archive uris to projects for all archives in the ear that imported as
-	 * projects.
-	 */
-	private void buildProjectsMap() {
-		createdComponentsMap = new HashMap();
-		List createdProjectsList = (List) dataModel.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
-		IDataModel importDM = null;
-		Archive anArchive = null;
-		for (int i = 0; i < createdProjectsList.size(); i++) {
-			importDM = (IDataModel) createdProjectsList.get(i);
-			anArchive = (Archive) importDM.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-			createdComponentsMap.put(anArchive.getURI(), importDM.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT));
-		}
-	}
-
-	protected void addFileToClasspath(IProject p, IFile file, List cp) {
-		if (!file.exists())
-			return;
-
-		// Assume the file also contains the source
-		IPath path = file.getFullPath();
-		IClasspathEntry entry = JavaCore.newLibraryEntry(path, path, null, true);
-		if (!cp.contains(entry))
-			cp.add(entry);
-	}
-
-	protected void addProjectToClasspath(IProject dependent, IProject prereq, List cp) {
-		IClasspathEntry entry = JavaCore.newProjectEntry(prereq.getFullPath(), true);
-		if (!cp.contains(entry))
-			cp.add(entry);
-	}
-
-	protected EARFile getEARFile() {
-		return (EARFile) getArchive();
-	}
-
-
-	protected java.io.OutputStream getOutputStreamForResource(org.eclipse.emf.ecore.resource.Resource aResource) throws java.io.IOException {
-		return null;
-	}
-
-	public void save() throws SaveFailureException {
-
-		saveFiles();
-		saveManifest();
-		saveMofResources();
-		progressMonitor.subTask(EARArchiveOpsResourceHandler.Updating_project_classpath_UI_);
-		updateComponentClasspaths();
-
-	}
-
-	public void save(Archive anArchive) throws SaveFailureException {
-		progressMonitor.subTask(anArchive.getURI());
-		saveArchiveAsJARInEAR(anArchive);
-	}
-
-	protected void saveArchiveAsJARInEAR(Archive anArchive) throws SaveFailureException {
-		try {
-			anArchive.save(createNestedSaveStrategy(anArchive));
-			progressMonitor.worked(1);
-		} catch (IOException e) {
-			throw new SaveFailureException(anArchive.getURI(), e);
-		}
-	}
-
-	protected SubProgressMonitor subMonitor() {
-		return new SubProgressMonitor(progressMonitor, 10);
-	}
-
-	public void setMonitor(org.eclipse.core.runtime.IProgressMonitor newMonitor) {
-		progressMonitor = newMonitor;
-	}
-
-	protected boolean shouldSave(File aFile) {
-		if (aFile.isArchive()) {
-			return getFilter().shouldSave(aFile.getURI(), getArchive());
-		}
-		return super.shouldSave(aFile);
-	}
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 * @deprecated
-	 * @param archive
-	 * @return
-	 */
-	protected boolean operationHandlesNested(Archive archive) {
-		return !shouldLinkAsComponentRef(archive);
-	}
-
-	protected boolean shouldLinkAsComponentRef(Archive archive) {
-		if (null != dataModel) {
-			List list = (List) dataModel.getProperty(IEARComponentImportDataModelProperties.HANDLED_PROJECT_MODELS_LIST);
-			for (int i = 0; i < list.size(); i++) {
-				if (archive == ((IDataModel) list.get(i)).getProperty(IEARComponentImportDataModelProperties.FILE)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	protected boolean shouldSave(String uri) {
-		if (overwriteHandler != null) {
-			if (overwriteHandler.isOverwriteNone())
-				return false;
-			return ((super.shouldSave(uri)) && (overwriteHandler.isOverwriteAll() || overwriteHandler.isOverwriteResources() || overwriteHandler.shouldOverwrite(uri)));
-		}
-		return true;
-	}
-
-
-	/*
-	 * Parse the manifest of the module file; for each cp entry 1) cananonicalize to a uri that
-	 * looks like the entry in the ear 2) If the ear contains a file with that uri (the entry is
-	 * valid) a) If the file is another was blown out to a project, add a cp entry for a referenced
-	 * project b) otherwise, add a cp entry that points to the file in the ear project, and cp
-	 * entries for all prereqs
-	 */
-	protected void updateProjectClasspath(Archive anArchive, IVirtualComponent component) {
-
-		String message = EARArchiveOpsResourceHandler.Updating_project_classpath_UI_ + component.getName();
-		progressMonitor.subTask(message);
-		List projectCpEntries = new ArrayList();
-		Set visited = new HashSet();
-		traverseClasspaths(component.getProject(), anArchive, projectCpEntries, visited);
-
-		try {
-			if (!projectCpEntries.isEmpty())
-				JemProjectUtilities.appendJavaClassPath(component.getProject(), projectCpEntries);
-			JemProjectUtilities.forceClasspathReload(component.getProject());
-		} catch (JavaModelException ex) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-		}
-
-	}
-
-	/*
-	 * If you have a dependency to a JAR in the EAR project, and the JAR depends on another JAR in
-	 * the EAR; you want to compile cleanly after import, so you need both those JARs on your build
-	 * path
-	 */
-	protected void traverseClasspaths(IProject p, Archive anArchive, List projectCpEntries, Set visitedArchives) {
-		visitedArchives.add(anArchive);
-		String[] manifestCpEntries = anArchive.getManifest().getClassPathTokenized();
-		EARFile earFile = (EARFile) dataModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-		for (int i = 0; i < manifestCpEntries.length; i++) {
-			String uri = ArchiveUtil.deriveEARRelativeURI(manifestCpEntries[i], anArchive);
-			// ensure the entry is valid or skip to the next
-			if (uri == null)
-				continue;
-			File aFile = null;
-			try {
-				aFile = earFile.getFile(uri);
-			} catch (FileNotFoundException notThere) {
-			}
-			if (aFile == null || !aFile.isArchive() || visitedArchives.contains(aFile))
-				continue;
-			Archive depArchive = (Archive) aFile;
-			IProject prereq = null;
-			IVirtualComponent depComponent = (IVirtualComponent) createdComponentsMap.get(uri);
-			if (depComponent != null)
-				prereq = depComponent.getProject();
-
-			if (prereq != null) {
-				addProjectToClasspath(p, prereq, projectCpEntries);
-			} else {
-				addFileToClasspath(p, vComponent.getRootFolder().getFile(uri).getUnderlyingFile(), projectCpEntries);
-				traverseClasspaths(p, depArchive, projectCpEntries, visitedArchives);
-			}
-		}
-	}
-
-	protected void updateComponentClasspaths() {
-		List jarFiles = getEARFile().getArchiveFiles();
-		for (int i = 0; i < jarFiles.size(); i++) {
-			Archive anArchive = (Archive) jarFiles.get(i);
-			IVirtualComponent component = (IVirtualComponent) createdComponentsMap.get(anArchive.getURI());
-			if (component != null)
-				updateProjectClasspath(anArchive, component);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBArchiveOpsResourceHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBArchiveOpsResourceHandler.java
deleted file mode 100644
index 8f0f800a0..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBArchiveOpsResourceHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.archive.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EJBArchiveOpsResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "ejbarchiveops";//$NON-NLS-1$
-
-	private EJBArchiveOpsResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String ARCHIVE_OPERATION_SaveMofResources;
-	public static String ARCHIVE_OPERATION_SaveFile;
-	public static String ARCHIVE_OPERATION_ProjectNature;
-	public static String ARCHIVE_OPERATION_SaveManifest;
-	public static String ARCHIVE_OPERATION_FileNotFound;
-	public static String ARCHIVE_OPERATION_FileContents;
-	public static String ARCHIVE_OPERATION_ErroOccured;
-	public static String ARCHIVE_OPERATION_FilesFromProject;
-	public static String ARCHIVE_OPERATION_OpeningArchive;
-	public static String ARCHIVE_OPERATION_InvalidEJBJar;
-	public static String ARCHIVE_OPERATION_InvalidImportEJBJar;
-	public static String ARCHIVE_OPERATION_ImportOperation;
-	public static String EJB_IMPORT_OPERATION_STRING;
-	public static String EJB_IMPORT_FILE_STRING;
-	public static String IMPORT_MOFRESOURCE_STRING;
-	public static String IMPORT_OPERATION_STRING;
-	public static String ERROR_COPYING_FILES_FROM_ORIGINAL_JAR;
-	public static String ERROR_IMPORTING_MODULE_FILE;
-	public static String Yes_UI;
-	public static String No_UI;
-	public static String Yes_To_All_UI;
-	public static String Cancel_UI_;
-	public static String Error_exporting__UI_;
-	public static String EJB_Jar_File_UI_;
-	public static String Copy_Dep_JARS_UI;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EJBArchiveOpsResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBComponentSaveStrategyImpl.java
deleted file mode 100644
index 0b1b3a1fa..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EJBComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
-	public EJBComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IOverwriteHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IOverwriteHandler.java
deleted file mode 100644
index b47b26e16..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IOverwriteHandler.java
+++ /dev/null
@@ -1,142 +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.archive.operations;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-
-
-/**
- * Insert the type's description here. Creation date: (4/16/2001 3:12:41 PM)
- * 
- * @author: Administrator
- */
-public interface IOverwriteHandler {
-	public static final String NO = EJBArchiveOpsResourceHandler.No_UI; 
-	public static final String YES = EJBArchiveOpsResourceHandler.Yes_UI; 
-	public static final String ALL = EJBArchiveOpsResourceHandler.Yes_To_All_UI; 
-	public static final String NONE = EJBArchiveOpsResourceHandler.Cancel_UI_; 
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	org.eclipse.core.resources.IProject getProject();
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	boolean isOverwriteAll();
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	boolean isOverwriteNone();
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	boolean isOverwriteResources();
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	String queryOverwrite(String resourcePath);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	void setEarSaveStrategy(EARComponentSaveStrategyImpl newEarSaveStrategy);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	void setEjbSaveStrategy(J2EEComponentSaveStrategyImpl newEjbSaveStrategy);
-
-	/**
-	 * Sets the RAR SaveStrategy.
-	 * 
-	 * @param RARProjectSaveStrategyImpl
-	 *            rarSaveStrategy - The rar save strategy to set.
-	 */
-	void setRARSaveStrategy(J2EEComponentSaveStrategyImpl newRARSaveStrategy);
-
-	void setOverwriteAll(boolean newAllTrue);
-
-	void setOverwriteNone(boolean newNoneTrue);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	void setOverwriteResources(boolean newOverwriteResources);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	void setProject(org.eclipse.core.resources.IProject newProject);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	void setWarSaveStrategy(J2EEComponentSaveStrategyImpl newWarSaveStrategy);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	boolean shouldOverwrite(String uri);
-
-	/**
-	 * Check to see if the file can be checked out.
-	 * 
-	 * @throws OverwriteHandlerException
-	 *             if the validate fails
-	 */
-	void validateEdit(IFile aFile) throws OverwriteHandlerException;
-
-	/**
-	 * Check to see if the files can be checked out.
-	 * 
-	 * @throws OverwriteHandlerException
-	 *             if the validate fails
-	 */
-	void validateState(ResourceStateValidator resourceStateValidator);
-
-	/**
-	 * Insert the method's description here. Creation date: (4/16/2001 3:13:38 PM)
-	 * 
-	 * @return boolean
-	 */
-	boolean shouldOverwriteWLProject(IProject fProject, java.lang.String uri);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java
deleted file mode 100644
index dcc5728ba..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java
+++ /dev/null
@@ -1,90 +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.archive.operations;
-
-
-import org.eclipse.jst.j2ee.internal.project.IJ2EEProjectTypes;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * This class defines the rules for importing an individual nested JAR in an EAR project
- */
-public class ImportOption implements IJ2EEProjectTypes {
-	/**
-	 * Project info for the individual module/JAR, or null if the file should be placed in the
-	 * application
-	 */
-	protected IDataModel model;
-
-	/**
-	 * Valid only if the project info is not null
-	 * 
-	 * @see IJ2EEProjectTypes
-	 */
-	protected int projectType = IJ2EEProjectTypes.DEFAULT;
-
-	/**
-	 * @see IJ2EEProjectTypes#MODULE
-	 * @see IJ2EEProjectTypes#UTIL
-	 */
-	protected int archiveType = IJ2EEProjectTypes.MODULE;
-
-	/**
-	 * Constructor for ImportOption.
-	 */
-	public ImportOption(IDataModel model) {
-		super();
-		this.model = model;
-	}
-
-	public ImportOption(IDataModel model, int type) {
-		this(model);
-		projectType = type;
-	}
-
-	public IDataModel getModel() {
-		return model;
-	}
-
-	public int getProjectType() {
-		return projectType;
-	}
-
-	public String getProjectName() {
-		return model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
-	}
-
-	/**
-	 * @return Returns the archiveType.
-	 */
-	public int getArchiveType() {
-		return archiveType;
-	}
-
-	/**
-	 * @param archiveType
-	 *            The archiveType to set.
-	 */
-	public void setArchiveType(int archiveType) {
-		this.archiveType = archiveType;
-	}
-
-	/**
-	 * @param projectType
-	 *            The projectType to set.
-	 */
-	public void setProjectType(int projectType) {
-		this.projectType = projectType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java
deleted file mode 100644
index af30a3443..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java
+++ /dev/null
@@ -1,202 +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.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceRuleFactory;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class J2EEArtifactExportOperation extends AbstractDataModelOperation {
-
-	protected IProgressMonitor progressMonitor;
-	private IVirtualComponent component;
-	private IPath destinationPath;
-	private ModuleFile moduleFile;
-	private boolean exportSource = false;
-
-	public J2EEArtifactExportOperation() {
-		super();
-	}
-
-	public J2EEArtifactExportOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		setComponent((IVirtualComponent) model.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT));
-		setDestinationPath(new Path(model.getStringProperty(IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION)));
-		setExportSource(model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES));
-		try {
-			setProgressMonitor(monitor);
-			// defect 240999
-			component.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-			if (model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.RUN_BUILD)) {
-				runNecessaryBuilders(component, monitor);
-			}
-			export();
-		} catch (Exception e) {
-			if(moduleFile != null){
-				//The module fil will be closed if the export succeeds
-				//Need to be careful not to close the archive twice because of ReferenceCounted Archives
-				moduleFile.close(); 
-			}
-			throw new ExecutionException(EJBArchiveOpsResourceHandler.Error_exporting__UI_ + archiveString(), e);
-		}
-		return OK_STATUS;
-	}
-
-	protected abstract void export() throws SaveFailureException, CoreException, InvocationTargetException, InterruptedException;
-
-	protected abstract String archiveString();
-
-	protected void setProgressMonitor(IProgressMonitor newProgressMonitor) {
-		progressMonitor = newProgressMonitor;
-	}
-
-	protected IProgressMonitor getProgressMonitor() {
-		return progressMonitor;
-	}
-
-	private void setComponent(IVirtualComponent newComponent) {
-		component = newComponent;
-	}
-
-	protected IVirtualComponent getComponent() {
-		if (component == null)
-			component = (IVirtualComponent) model.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT);
-		return component;
-	}
-
-	protected IPath getDestinationPath() {
-		return destinationPath;
-	}
-
-	protected void setDestinationPath(IPath newDestinationPath) {
-		destinationPath = newDestinationPath;
-	}
-
-	protected boolean isExportSource() {
-		return exportSource;
-	}
-
-	protected void setExportSource(boolean newExportSource) {
-		exportSource = newExportSource;
-	}
-
-	protected ModuleFile getModuleFile() {
-		return moduleFile;
-	}
-
-	protected void setModuleFile(ModuleFile newModuleFile) {
-		moduleFile = newModuleFile;
-	}
-
-	protected void runNecessaryBuilders(IVirtualComponent component, IProgressMonitor monitor) throws CoreException {
-		if(!component.isBinary()){
-			IProject project = component.getProject();
-			IProjectDescription description = project.getDescription();
-			ICommand javaBuilder = getJavaCommand(description);
-			if (javaBuilder != null) {
-				project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, JavaCore.BUILDER_ID, javaBuilder.getArguments(), monitor);
-			}
-			ICommand libCopyBuilder = getLibCopyBuilder(description);
-			if (null != libCopyBuilder) {
-				project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, LibCopyBuilder.BUILDER_ID, libCopyBuilder.getArguments(), monitor);
-			}
-		}
-	}
-
-	/**
-	 * Find the specific Java command amongst the build spec of a given description
-	 */
-	protected ICommand getJavaCommand(IProjectDescription description) throws CoreException {
-		if (description == null) {
-			return null;
-		}
-
-		ICommand[] commands = description.getBuildSpec();
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals(JavaCore.BUILDER_ID)) {
-				return commands[i];
-			}
-		}
-		return null;
-	}
-
-	protected ICommand getLibCopyBuilder(IProjectDescription description) throws CoreException {
-		if (description == null) {
-			return null;
-		}
-
-		ICommand[] commands = description.getBuildSpec();
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals(LibCopyBuilder.BUILDER_ID)) {
-				return commands[i];
-			}
-		}
-		return null;
-
-	}
-
-	public ISchedulingRule getSchedulingRule() {
-		Set projs = gatherDependentProjects(getComponent(), new HashSet());
-		ISchedulingRule combinedRule = null;
-		IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
-		for (Iterator iter = projs.iterator(); iter.hasNext();) {
-			IProject proj = (IProject) iter.next();
-			ISchedulingRule rule = ruleFactory.createRule(proj);
-			combinedRule = MultiRule.combine(rule, combinedRule);
-		}
-		combinedRule = MultiRule.combine(ruleFactory.buildRule(), combinedRule);
-
-		return combinedRule;
-	}
-
-	private Set gatherDependentProjects(IVirtualComponent comp, Set projs) {
-		if (!projs.contains(comp.getProject())) {
-			projs.add(comp.getProject());
-			IVirtualReference[] refs = comp.getReferences();
-			for (int i = 0; i < refs.length; i++) {
-				IVirtualReference refComp = refs[i];
-				projs.addAll(gatherDependentProjects(refComp.getReferencedComponent(), projs));
-			}
-		}
-		return projs;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java
deleted file mode 100644
index fec00e7d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java
+++ /dev/null
@@ -1,208 +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.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsOp;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-public abstract class J2EEArtifactImportOperation extends AbstractDataModelOperation {
-
-	protected Archive moduleFile;
-	protected IVirtualComponent virtualComponent;
-	protected IAdaptable info;
-
-	public J2EEArtifactImportOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable anInfo) throws ExecutionException {
-		try {
-			J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
-			this.info = anInfo;
-			doExecute(monitor);
-			return OK_STATUS;
-		} finally {
-			try {
-				if (virtualComponent != null) {
-					J2EEComponentClasspathUpdater.getInstance().queueUpdate(virtualComponent.getProject());
-				}
-			} finally {
-				J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
-				model.dispose();
-
-			}
-		}
-	}
-
-	protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
-		moduleFile = (Archive) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-		monitor.beginTask(null, moduleFile.getFiles().size());
-
-		virtualComponent = createVirtualComponent(model.getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION), monitor);
-
-		try {
-			importModuleFile(monitor);
-		} catch (InvocationTargetException e) {
-			throw new ExecutionException(e.getMessage(), e);
-		} catch (InterruptedException e) {
-			throw new ExecutionException(e.getMessage(), e);
-		}
-	}
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 */
-	protected void fixupManifestRefs() {
-	}
-
-	protected IVirtualComponent createVirtualComponent(IDataModel aModel, IProgressMonitor monitor) throws ExecutionException {
-		aModel.getDefaultOperation().execute(monitor, info);
-		String projectName = aModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		IProject project = ProjectUtilities.getProject(projectName);
-		return ComponentCore.createComponent(project);
-	}
-
-	/**
-	 * Creates the appropriate save strategy. Subclases should overwrite this method to create the
-	 * appropriate save startegy for the kind of J2EE module project to import the archive
-	 */
-	protected abstract SaveStrategy createSaveStrategy(IVirtualComponent vc);
-
-	protected void modifyStrategy(SaveStrategy saveStrat) {
-	}
-
-	/**
-	 * perform the archive import operation
-	 * 
-	 * @throws java.lang.reflect.InvocationTargetException
-	 * @throws java.lang.InterruptedException
-	 */
-	protected void importModuleFile(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		try {
-			monitor.worked(1);
-			J2EEComponentSaveStrategyImpl aStrategy = (J2EEComponentSaveStrategyImpl) createSaveStrategy(virtualComponent);
-			aStrategy.setProgressMonitor(monitor);
-			aStrategy.setOverwriteHandler((IOverwriteHandler) model.getProperty(IJ2EEComponentImportDataModelProperties.OVERWRITE_HANDLER));
-			aStrategy.setDataModel(model);
-			modifyStrategy(aStrategy);
-			moduleFile.save(aStrategy);
-		} catch (OverwriteHandlerException oe) {
-			throw new InterruptedException();
-		} catch (Exception ex) {
-			throw new WFTWrappedException(ex, EJBArchiveOpsResourceHandler.ERROR_IMPORTING_MODULE_FILE);
-		}
-	}
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 * @deprecated this will be deleted do not use this method
-	 */
-	protected static void addToClasspath(IDataModel importModel, List extraEntries) throws JavaModelException {
-		if (extraEntries.size() > 0) {
-			IJavaProject javaProject = JavaCore.create(((IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT)).getProject());
-			IClasspathEntry[] javaClasspath = javaProject.getRawClasspath();
-			List nonDuplicateList = new ArrayList();
-			for (int i = 0; i < extraEntries.size(); i++) {
-				IClasspathEntry extraEntry = (IClasspathEntry) extraEntries.get(i);
-				boolean include = true;
-				for (int j = 0; include && j < javaClasspath.length; j++) {
-					if (extraEntry.equals(javaClasspath[j])) {
-						include = false;
-					}
-				}
-				if (include) {
-					nonDuplicateList.add(extraEntry);
-				}
-			}
-			if (nonDuplicateList.size() > 0) {
-				IClasspathEntry[] newJavaClasspath = new IClasspathEntry[javaClasspath.length + nonDuplicateList.size()];
-				System.arraycopy(javaClasspath, 0, newJavaClasspath, 0, javaClasspath.length);
-				for (int j = 0; j < nonDuplicateList.size(); j++) {
-					newJavaClasspath[javaClasspath.length + j] = (IClasspathEntry) nonDuplicateList.get(j);
-				}
-				javaProject.setRawClasspath(newJavaClasspath, new NullProgressMonitor());
-			}
-		}
-	}
-
-	// Assumes that the project exists with the same name as the
-	// entry in the manifest.
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * 
-	 * @deprecated this will be deleted do not use this method
-	 */
-	protected void fixModuleReference(IDataModel importModel, String[] manifestEntries) {
-		IVirtualComponent comp = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
-
-		if (J2EEProjectUtilities.isEJBProject(comp.getProject()) && manifestEntries.length > 0) {
-			for (int j = 0; j < manifestEntries.length; j++) {
-				String name = manifestEntries[j];
-				int endIndex = name.length() - 4; // lop off .jar
-				if (endIndex < 1) {
-					continue;
-				}
-				name = name.substring(0, endIndex);
-				IProject project = null;
-				try {
-					project = ProjectUtilities.getProject(name);
-				} catch (IllegalArgumentException e) {
-					continue;
-				}
-				if (project != null && project.isAccessible() && project.exists()) {
-					IVirtualComponent refcomp = ComponentCore.createComponent(project);
-					if (refcomp.exists()) {
-						ArrayList list = new ArrayList();
-						list.add(refcomp);
-						CreateReferenceComponentsOp op = ComponentUtilities.createReferenceComponentOperation(comp, list);
-						try {
-							op.execute(null, null);
-						} catch (ExecutionException e) {
-							Logger.getLogger().logError(e);
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentLoadStrategyImpl.java
deleted file mode 100644
index 085563c49..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class J2EEComponentLoadStrategyImpl extends ComponentLoadStrategyImpl{
-
-	public J2EEComponentLoadStrategyImpl(IVirtualComponent component) {
-		super(component);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentSaveStrategyImpl.java
deleted file mode 100644
index 02a31596d..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,153 +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.archive.operations;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-public abstract class J2EEComponentSaveStrategyImpl extends ComponentSaveStrategyImpl {
-
-	protected final String DOT_CLASS = ".class"; //$NON-NLS-1$
-	protected final String IMPORTED_CLASSES = "ImportedClasses";  //$NON-NLS-1$
-	
-	public J2EEComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-	protected void saveFiles() throws SaveFailureException {
-		super.saveFiles();
-		linkImportedClassesFolderIfNecessary();
-		try {
-			vComponent.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-		} catch (CoreException ex) {
-			Logger.getLogger().logError(ex);
-		}
-	}
-
-	public boolean endsWithClassType(String aFileName) {
-		if (aFileName.endsWith(DOT_CLASS))
-			return true;
-		return false;
-	}
-
-	protected boolean shouldSave(File aFile) {
-		if (endsWithClassType(aFile.getURI())){
-			boolean shouldSave = isClassWithoutSource(aFile);
-			if(shouldSave && !importedClassesFolderCreated){
-				createImportedClassesFolder();
-			}
-			return shouldSave;
-		}
-		return super.shouldSave(aFile);
-	}
-
-	public void save(ArchiveManifest aManifest) throws SaveFailureException {
-		IVirtualFolder rootFolder = vComponent.getRootFolder();
-		IVirtualFile vFile = rootFolder.getFile(new Path(J2EEConstants.MANIFEST_URI));
-		IFile iFile = vFile.getUnderlyingFile();
-		validateEdit(iFile);
-		OutputStream out = new WorkbenchByteArrayOutputStream(iFile);
-		try {
-			aManifest.write(out);
-		} catch (IOException e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			try {
-				out.close();
-			} catch (IOException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-	}
-
-	protected boolean importedClassesFolderCreated = false;
-	protected IFolder importedClassesFolder;
-
-	protected void createImportedClassesFolder() {
-		importedClassesFolderCreated = true;
-		IContainer jarParent = vComponent.getRootFolder().getUnderlyingFolder().getParent();
-		importedClassesFolder = jarParent.getFolder(new Path(IMPORTED_CLASSES));
-		try {
-			importedClassesFolder.create(true, true, null);
-		} catch (CoreException e1) {
-			Logger.getLogger().logError(e1);
-		}
-	}
-	
-	protected void linkImportedClassesFolderIfNecessary() {
-		if (importedClassesFolder != null) {
-			try {
-				vComponent.getRootFolder().getFolder(getImportedClassesRuntimePath()).createLink(importedClassesFolder.getProjectRelativePath(), 0, null);
-				if (shouldAddImportedClassesToClasspath()) {
-					if (JemProjectUtilities.getJavaProject(vComponent.getProject()) != null) {
-						IJavaProject javaProject = JavaCore.create(vComponent.getProject());
-						IClasspathEntry[] javaClasspath = javaProject.getRawClasspath();
-						IClasspathEntry[] newJavaClasspath = new IClasspathEntry[javaClasspath.length + 1];
-						System.arraycopy(javaClasspath, 0, newJavaClasspath, 0, javaClasspath.length);
-						newJavaClasspath[newJavaClasspath.length - 1] = JavaCore.newLibraryEntry(importedClassesFolder.getFullPath(), null, null, true);
-						javaProject.setRawClasspath(newJavaClasspath, new NullProgressMonitor());
-					}
-				}
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-	}
-
-	protected boolean shouldAddImportedClassesToClasspath() {
-		return true;
-	}
-
-	protected IPath getImportedClassesRuntimePath() {
-		return new Path("/");
-	}
-
-	protected IPath getOutputPathForFile(File aFile) {
-		if(endsWithClassType(aFile.getURI())){
-			return importedClassesFolder.getFile(getImportedClassesURI(aFile)).getProjectRelativePath();
-		}
-		return super.getOutputPathForFile(aFile);
-	}
-	
-	protected String getImportedClassesURI(File aFile) {
-		return aFile.getURI();
-	}
-
-	protected boolean isClassWithoutSource(File aFile) {
-		String javaUri = ArchiveUtil.classUriToJavaUri(aFile.getURI());
-		if (javaUri == null)
-			return false;
-		return !archive.containsFile(javaUri);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEImportConstants.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEImportConstants.java
deleted file mode 100644
index 9bf8af510..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEImportConstants.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
- *******************************************************************************/
-/*
- * Created on Dec 18, 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.archive.operations;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEImportConstants {
-	public static final String IMPORTED_JAR_SUFFIX = ".imported_classes.jar"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEJavaComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEJavaComponentSaveStrategyImpl.java
deleted file mode 100644
index 0e2b74b52..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEJavaComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,20 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class J2EEJavaComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
-	public J2EEJavaComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentCreationDataModelProvider.java
deleted file mode 100644
index 4fbe599c5..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,156 +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.archive.operations;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.ComponentCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see JavaProjectFacetCreationDataModelProvider
- */
-public class JavaComponentCreationDataModelProvider extends ComponentCreationDataModelProvider implements IJavaComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(JAVASOURCE_FOLDER);
-		propertyNames.add(MANIFEST_FOLDER);
-		propertyNames.add(RUNTIME_TARGET_ID);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(JAVASOURCE_FOLDER)) {
-			return getComponentName();
-		} else if (propertyName.equals(MANIFEST_FOLDER)) {
-			return "/" + J2EEConstants.META_INF; //$NON-NLS-1$
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public void init() {
-		super.init();
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean status = super.propertySet(propertyName, propertyValue);
-		if (PROJECT_NAME.equals(propertyName)) {
-			// model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALUE_CHG);
-			// IDataModel dm = (IDataModel)model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-			// dm.setProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME,
-			// propertyValue);
-		} else if (LOCATION.equals(propertyName)) {
-			IDataModel dm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-			dm.setProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_LOCATION, propertyValue);
-		} else if (RUNTIME_TARGET_ID.equals(propertyName)) {
-			IDataModel dm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-			dm.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID, propertyValue);
-		}
-//		else if (propertyName.equals(JAVASOURCE_FOLDER)){
-//			//unless MANIFEST folder is opened up, it is set as same as Java source folder
-//			setProperty(MANIFEST_FOLDER, getProperty(JAVASOURCE_FOLDER)+ "/" + J2EEConstants.META_INF);
-//		}
-		return status;
-	}
-
-	public IStatus validate(String propertyName) {
-		if (propertyName.equals(JAVASOURCE_FOLDER)) {
-			IStatus status = OK_STATUS;
-			String srcFolderName = model.getStringProperty(JAVASOURCE_FOLDER);
-			if (srcFolderName == null || srcFolderName.length() == 0) {
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SOURCEFOLDER_EMPTY);
-				status = WTPCommonPlugin.createErrorStatus(errorMessage);
-			}
-			return status;
-
-		} else if (propertyName.equals(MANIFEST_FOLDER)) {
-			IStatus status = OK_STATUS;
-			String srcFolderName = model.getStringProperty(MANIFEST_FOLDER);
-			if (srcFolderName == null || srcFolderName.length() == 0) {
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_NAME_EMPTY);
-				status = WTPCommonPlugin.createErrorStatus(errorMessage);
-			}
-			return status;
-		} else if (propertyName.equals(RUNTIME_TARGET_ID)) {
-			
-			IDataModel dm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-			IStatus nestedValiation = dm.validate();
-			if (!nestedValiation.isOK())
-				return nestedValiation;			
-		}
-		// else if(propertyName.equals(PROJECT_NAME)){
-		// IDataModel projectdm = (IDataModel)model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-		// return
-		// projectdm.validateProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME);
-		// }
-
-		return super.validate(propertyName);
-	}
-
-	public JavaComponentCreationDataModelProvider() {
-		super();
-	}
-
-	protected EClass getComponentType() {
-		return CommonarchivePackage.eINSTANCE.getModuleFile();
-	}
-
-	protected Integer getDefaultComponentVersion() {
-		Integer version = new Integer("10");
-		return version;
-	}
-
-	protected String getComponentExtension() {
-		return ".jar"; //$NON-NLS-1$
-	}
-
-	protected List getProperties() {
-		return null;
-	}
-	
-	protected void initProjectCreationModel() {
-		IDataModel dm = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
-		model.addNestedModel(NESTED_PROJECT_CREATION_DM, dm);
-		model.setProperty(LOCATION, dm.getProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_LOCATION));
-
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (propertyName.equals(RUNTIME_TARGET_ID)) {
-			// IDataModel projectdm = (IDataModel)model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-			// return
-			// projectdm.getValidPropertyDescriptors(IFlexibleJavaProjectCreationDataModelProperties.SERVER_TARGET_ID);
-		}
-		return null;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentLoadStrategyImpl.java
deleted file mode 100644
index 3ffab1e65..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
-	public JavaComponentLoadStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentSaveStrategyImpl.java
deleted file mode 100644
index 2269718c4..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/JavaComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,21 +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.archive.operations;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaComponentSaveStrategyImpl extends ComponentSaveStrategyImpl {
-
-	public JavaComponentSaveStrategyImpl(IVirtualComponent vComponent) {
-		super(vComponent);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/OverwriteHandlerException.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/OverwriteHandlerException.java
deleted file mode 100644
index 9ab5d9210..000000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/OverwriteHandlerException.java
+++ /dev/null
@@ -1,42 +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.archive.operations;
-
-
-
-/**
- * Insert the type's description here. Creation date: (8/16/2001 6:07:35 PM)
- * 
- * @author: Administrator
- */
-public class OverwriteHandlerException extends RuntimeException {
-    /**
-     * Warning clean-up 12/05/2005
-     */   
-	private static final long serialVersionUID = 1651836694391641930L;
-
-	/**
-	 * OverwriteHandlerException constructor comment.
-	 */
-	public OverwriteHandlerException() {
-		super();
-	}
-
-	/**
-	 * OverwriteHandlerException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public OverwriteHandlerException(String s) {
-		super(s);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/build.properties b/plugins/org.eclipse.jst.j2ee/build.properties
deleted file mode 100644
index 577adeb53..000000000
--- a/plugins/org.eclipse.jst.j2ee/build.properties
+++ /dev/null
@@ -1,34 +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 = schema/,\
-               icons/,\
-               plugin.properties,\
-               prepareAllPII.xml,\
-               plugin.xml,\
-               .,\
-               META-INF/,\
-               about.html,\
-               license/
-source.. = j2eeplugin/,\
-           common/,\
-           commonedit/,\
-           earproject/,\
-           j2eecreation/,\
-           archiveops/,\
-           applicationedit/,\
-           appclientcreation/,\
-           property_files/,\
-           refactor/
-jars.compile.order = .
-src.includes = rose/,\
-               schema/,\
-               component.xml
-output.. = bin/
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java
deleted file mode 100644
index 6a7be1515..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java
+++ /dev/null
@@ -1,378 +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.common;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.util.NotificationUtil;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-/**
- * This adapter is used to listen for changes to the ejb class or the primary key class in order to
- * reflect the proper CMP field types and the proper key attributes.
- */
-public class CMPJavaChangeSynchronizationAdapter extends AdapterImpl {
-
-	private static final String J2EE_PROJ_MIGRATION_ADAPTER = "J2EEProjectMigration"; //$NON-NLS-1$
-
-	protected static EjbPackage EJB_PACK = EjbFactoryImpl.getPackage();
-
-	private static HashMap enablementMap = new HashMap();
-
-	public static void disable(ContainerManagedEntity cmp) {
-		enablementMap.put(cmp, Boolean.FALSE);
-	}
-
-	public static void enable(ContainerManagedEntity cmp) {
-		enablementMap.put(cmp, Boolean.TRUE);
-	}
-
-	public static boolean isEnabled(ContainerManagedEntity cmp) {
-		if (!enablementMap.containsKey(cmp))
-			return true;
-		return ((Boolean) enablementMap.get(cmp)).booleanValue();
-	}
-
-	protected Resource cmpResource;
-
-	private List foundKeys = new ArrayList();
-	
-	/*
-	 * This Set is used to avoid reacting to notifications for a notifier while
-	 * updating that notifier.
-	 */
-	private Set updatingSet = new HashSet();
-
-	public CMPJavaChangeSynchronizationAdapter() {
-		super();
-	} // EJBKeyShapeMaintenanceAdapter
-
-	/**
-	 * Notifies if there is change in the key shape.
-	 * 
-	 * @param Notification
-	 *            msg - Message indicates what has changed.
-	 */
-	public void notifyChanged(Notification msg) {
-		if (!isEnabled(getCMP())) {
-			enable(getCMP());
-			return;
-		}
-		Object notifier = msg.getNotifier();
-		if (!updatingSet.contains(notifier)) {
-			try {
-				updatingSet.add(notifier);
-				switch (msg.getEventType()) {
-					case Notification.SET :
-						setNotification(msg);
-						break;
-					case Notification.UNSET :
-						unsetNotification(msg);
-						break;
-					case Notification.REMOVING_ADAPTER :
-						removeAdapterNotification(msg);
-						break;
-					case ReflectionAdaptor.EVENT :
-						jemFlushNotification(msg);
-						break;
-				}
-			} finally {
-				updatingSet.remove(notifier);
-			}
-		}
-	}
-
-	/**
-	 * Use if the there was an set notification.
-	 * 
-	 * @param Notification
-	 *            msg - Message indicates what has changed.
-	 */
-	protected void setNotification(Notification msg) {
-		EStructuralFeature sf = (EStructuralFeature) msg.getFeature();
-		if (sf == EJB_PACK.getEnterpriseBean_EjbClass() || sf == EJB_PACK.getEntity_PrimaryKey()) {
-			if (!isMigrating()) {
-				removeAttributeMaintenanceAdapter((Notifier) msg.getOldValue());
-				addAttributeMaintenanceAdapter((Notifier) msg.getNewValue());
-				touchKeyShapeAdapter(msg);
-			}
-		} else if (sf == EJB_PACK.getEntity_PrimaryKey()) {
-			removeAttributeMaintenanceAdapter((Notifier) msg.getOldValue());
-			if (shouldAddToPrimaryKeyClass((ContainerManagedEntity) getTarget()))
-				addAttributeMaintenanceAdapter((Notifier) msg.getNewValue());
-		} else {
-			jemFlushNotification(msg); //In EMF a TOUCH is a SET.
-		}
-	} // setNotification
-
-	/**
-	 * @return
-	 */
-	private boolean isMigrating() {
-		EJBJar jar = ((ContainerManagedEntity) getTarget()).getEjbJar();
-		if (jar != null)
-			return EcoreUtil.getExistingAdapter(jar, J2EE_PROJ_MIGRATION_ADAPTER) != null;
-		return false;
-	}
-
-	// setNotification
-	/**
-	 * Use if the there was an unset notification.
-	 * 
-	 * @param Notification
-	 *            msg - Message indicates what has changed.
-	 */
-	protected void unsetNotification(Notification msg) {
-		EStructuralFeature sf = (EStructuralFeature) msg.getFeature();
-		if ((sf == EJB_PACK.getEnterpriseBean_EjbClass() || sf == EJB_PACK.getEntity_PrimaryKey()) && !isMigrating()) {
-			removeAttributeMaintenanceAdapter((Notifier) msg.getOldValue());
-		}
-	} // unsetNotification
-
-	/**
-	 * Use if the there was an touch notification.
-	 * 
-	 * @param Notification
-	 *            msg - Message indicates what has changed.
-	 */
-	protected void jemFlushNotification(Notification msg) {
-		if ((NotificationUtil.isFlushNewEvent(msg) || NotificationUtil.isFlushEvent(msg)) && !isMigrating()) {
-			if (msg.getNotifier() == ((ContainerManagedEntity) getTarget()).getEjbClass()) {
-				touchBeanAdapter(msg);
-			} else if (msg.getNotifier() == ((ContainerManagedEntity) getTarget()).getPrimaryKey()) {
-				touchKeyShapeAdapter(msg);
-			} // if
-			//if the notifier is eq the primary key
-			//else ejb bean class flush
-		} // if
-	} // touchNotification
-
-	protected void removeAdapterNotification(Notification msg) {
-		if (msg.getOldValue() == this && msg.getNotifier() instanceof ContainerManagedEntity) {
-			ContainerManagedEntity cmp = (ContainerManagedEntity) msg.getNotifier();
-			if (cmp.getEjbClass() != null)
-				cmp.getEjbClass().eAdapters().remove(this);
-			if (cmp.getPrimaryKey() != null)
-				cmp.getPrimaryKey().eAdapters().remove(this);
-		}
-	}
-
-	/**
-	 * Adds the key shape adapter
-	 * 
-	 * @param Notifier
-	 *            notifier - The current notifier.
-	 */
-	protected void addAttributeMaintenanceAdapter(Notifier notifier) {
-		if (notifier != null && !notifier.eAdapters().contains(this))
-			notifier.eAdapters().add(this);
-	}
-
-	/**
-	 * Remove the key shape adapter
-	 */
-	protected void removeAttributeMaintenanceAdapter(Notifier notifier) {
-		if (notifier != null)
-			notifier.eAdapters().remove(this);
-	}
-
-	/**
-	 * The key has been touched.
-	 * 
-	 * @param Notification
-	 *            msg - The notification message.
-	 */
-	protected void touchKeyShapeAdapter(Notification msg) {
-		if (msg == null)
-			return;
-		ContainerManagedEntity cmp = (ContainerManagedEntity) getTarget();
-		JavaClass primaryKeyClass = cmp.getPrimaryKey();
-		//Synch the two lists.
-		synchCMPandKeyAttributes(cmp, primaryKeyClass);
-	} // touchKeyShapeAdapter
-
-	/**
-	 * The ejb class has been flushed.
-	 * 
-	 * @param Notification
-	 *            msg - The notification message.
-	 */
-	protected void touchBeanAdapter(Notification msg) {
-		if (msg == null)
-			return;
-		ContainerManagedEntity cmp = (ContainerManagedEntity) getTarget();
-		List cmpAttributes = cmp.getPersistentAttributes();
-		if (cmpAttributes != null || !cmpAttributes.isEmpty()) {
-			boolean modFlag = getCurrentModificationFlag();
-			try {
-				for (int i = 0; i < cmpAttributes.size(); i++) {
-					CMPAttribute cmpAttr = (CMPAttribute) cmpAttributes.get(i);
-					if (cmpAttr != null && !cmpAttr.isDerived()) {
-						cmpAttr.setEType(null);
-					}
-				}
-			} finally {
-				setModificationFlag(modFlag);
-			}
-		}
-		synchCMPandKeyAttributes(cmp, cmp.getPrimaryKey());
-	}
-
-	/**
-	 * Synchronzies the cmp and primary key class attributes.
-	 * 
-	 * @param ContainerManagedEntity
-	 *            cmp - The cmp.
-	 * @param JavaClass
-	 *            primaryKeyClass
-	 */
-	protected void synchCMPandKeyAttributes(ContainerManagedEntity cmp, JavaClass primaryKeyClass) {
-		if (cmp == null || primaryKeyClass == null || cmp.getPrimKeyField() != null || primaryKeyClass.getQualifiedName().startsWith("java.lang")) //$NON-NLS-1$
-			return;
-
-		// make sure we flush the primary key to get latest updates if no save
-		// took place
-		flushPrimaryKeyClass(primaryKeyClass);
-
-		List cmpAttributes = cmp.getPersistentAttributes();
-		if (cmpAttributes != null || !cmpAttributes.isEmpty()) {
-			foundKeys.clear();
-			List keyAttributesList = cmp.getKeyAttributes();
-			foundKeys.addAll(keyAttributesList);
-			boolean modFlag = getCurrentModificationFlag();
-			try {
-				List keyFields = primaryKeyClass.getFieldsExtended();
-				for (int i = 0; i < keyFields.size(); i++) {
-					Field field = (Field) keyFields.get(i);
-					if (field.getJavaVisibility() != JavaVisibilityKind.PUBLIC_LITERAL)
-						continue;
-					String fieldName = field.getName();
-					if (fieldName != null) {
-						CMPAttribute keyAttr = cmp.getKeyAttribute(fieldName);
-						if (keyAttr == null)
-							cmp.addKeyAttributeName(fieldName);
-						else
-							foundKeys.remove(keyAttr);
-					}
-				}
-				if (!foundKeys.isEmpty())
-					keyAttributesList.removeAll(foundKeys);
-			} finally {
-				setModificationFlag(modFlag);
-			}
-		}
-	}
-
-	public void setTarget(Notifier newTarget) {
-		boolean isChanged = getTarget() != newTarget;
-		if (newTarget == null) {
-			super.setTarget(newTarget);
-			cmpResource = null;
-		} else if (newTarget instanceof ContainerManagedEntity) {
-			//TODO - uncomment when compile errors are gone
-			if (false)/* (EJBCommandCopier.isCodegenCopy(newTarget)) */
-				newTarget.eAdapters().remove(this);
-			else {
-				Resource res = ((ContainerManagedEntity) newTarget).eResource();
-				if (res != null && res.getResourceSet() != null) {
-					super.setTarget(newTarget);
-					if (isChanged)
-						initializeTarget();
-				}
-			}
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void initializeTarget() {
-		ContainerManagedEntity cmp = (ContainerManagedEntity) getTarget();
-		addAttributeMaintenanceAdapter(cmp.getEjbClass());
-		if (shouldAddToPrimaryKeyClass(cmp))
-			addAttributeMaintenanceAdapter(cmp.getPrimaryKey());
-	}
-
-	private boolean shouldAddToPrimaryKeyClass(ContainerManagedEntity cmp) {
-		return cmp.getPrimKeyField() == null && cmp.getPrimaryKey() != null && !cmp.getPrimaryKey().getQualifiedName().startsWith("java.lang"); //$NON-NLS-1$
-	}
-
-	protected Resource getCMPResource() {
-		if (cmpResource == null && getTarget() != null)
-			cmpResource = ((EObject) getTarget()).eResource();
-		return cmpResource;
-	}
-
-	protected boolean getCurrentModificationFlag() {
-		return getCMPResource() != null && cmpResource.getContents() != null ? cmpResource.isModified() : false;
-	}
-
-	protected void setModificationFlag(boolean aBoolean) {
-		if (getCMPResource() != null)
-			getCMPResource().setModified(aBoolean);
-	}
-
-	public ContainerManagedEntity getCMP() {
-		if (getTarget() instanceof ContainerManagedEntity)
-			return (ContainerManagedEntity) getTarget();
-		return null;
-	}
-
-	protected boolean flushPrimaryKeyClass(JavaClass primaryKeyClass) {
-		// ensure the primary key class is flushed and reloaded to get latest
-		// content
-		IProject p = ProjectUtilities.getProject(primaryKeyClass);
-		try {
-			List natures = EMFNature.getRegisteredRuntimes(p);
-			EMFNature nature = null;
-			for (int i = 0; i < natures.size(); i++) {
-				if (natures.get(i) instanceof EMFNature)
-					nature = (EMFNature) natures.get(i);
-			}
-			List adapterFactories = nature.getResourceSet().getAdapterFactories();
-			AdapterFactory factory = EcoreUtil.getAdapterFactory(adapterFactories, ReadAdaptor.TYPE_KEY);
-			if (factory instanceof JavaJDOMAdapterFactory) {
-				JavaJDOMAdapterFactory javaFactory = (JavaJDOMAdapterFactory) factory;
-				javaFactory.flushReflectionNoNotification(primaryKeyClass.getQualifiedName());
-				return true;
-			}
-		} catch (Exception e) {
-			// We don't really care what the exception was, we'll just bail out
-			// and return false;
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
deleted file mode 100644
index e58c8bba9..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
+++ /dev/null
@@ -1,783 +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.common;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathContainer;
-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.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-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.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateInputProvider;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorImpl;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-public class ClasspathModel implements ResourceStateInputProvider, ResourceStateValidator {
-
-	protected IProject project;
-	protected IVirtualComponent selectedEARComponent;
-	protected EARFile earFile;
-	protected IVirtualComponent component;
-	protected Archive archive;
-	public EARArtifactEdit earArtifactEdit;
-	/** The EAR nature runtimes for all the open EAR projects in the workspace */
-	protected IVirtualComponent[] availableEARComponents = null;
-	protected ClassPathSelection classPathSelection;
-	protected List listeners;
-	protected List nonResourceFiles;
-	protected ResourceStateValidator stateValidator;
-	protected ArchiveManifest manifest;
-	public static String NO_EAR_MESSAGE = CommonEditResourceHandler.getString("NO_EAR_JARDEP_FOR_MOD_UI_"); //$NON-NLS-1$
-	protected List targetWLPRefComponentList;
-	protected boolean isWLPModel = false;
-	protected ClassPathSelection classPathWLPSelection;
-
-	protected Comparator comparator = new Comparator() {
-		public int compare(Object o1, Object o2) {
-			IVirtualComponent e1 = (IVirtualComponent) o1;
-			IVirtualComponent e2 = (IVirtualComponent) o2;
-			return e1.getProject().getName().compareTo(e2.getProject().getName());
-		}
-	};
-
-
-	public ClasspathModel(ArchiveManifest initialManifest) {
-		super();
-		manifest = initialManifest;
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-		initializeComponent();
-		getAvailableEARComponents();
-	}
-
-	private void initializeComponent() {
-		setComponent(ComponentCore.createComponent(getProject()));
-	}
-
-	protected IVirtualComponent[] refreshAvailableEARs() {
-		if (component != null) {
-			IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects(getComponent().getProject());
-			availableEARComponents = ComponentUtilities.getComponents(earProjects);
-			if (availableEARComponents != null && availableEARComponents.length > 0) {
-				Arrays.sort(availableEARComponents, comparator);
-				if (selectedEARComponent == null || !Arrays.asList(availableEARComponents).contains(selectedEARComponent)) {
-					if (availableEARComponents.length > 0)
-						selectedEARComponent = availableEARComponents[0];
-					else
-						selectedEARComponent = null;
-				}
-			}
-		}
-		return availableEARComponents;
-	}
-
-	public IVirtualComponent[] getAvailableEARComponents() {
-		if (availableEARComponents == null)
-			refreshAvailableEARs();
-		return availableEARComponents;
-	}
-
-	/**
-	 * Gets the selectedEARComponent.
-	 * 
-	 * @return Returns a EARNatureRuntime
-	 */
-	public IVirtualComponent getSelectedEARComponent() {
-		return selectedEARComponent;
-	}
-
-	public void setSelectedEARComponent(IVirtualComponent component) {
-		selectedEARComponent = component;
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.EAR_PROJECT_CHANGED));
-	}
-
-	public String getArchiveURI() {
-		if (selectedEARComponent != null) {
-			return getEARArtifactEdit().getModuleURI(getComponent());
-		}
-		return null;
-	}
-
-	public EARArtifactEdit getEARArtifactEdit() {
-		if (earArtifactEdit == null || selectedEARComponentChanged())
-			earArtifactEdit = EARArtifactEdit.getEARArtifactEditForRead(selectedEARComponent);
-		return earArtifactEdit;
-	}
-
-	private boolean selectedEARComponentChanged() {
-		if (earArtifactEdit != null && !earArtifactEdit.getComponent().getName().equals(selectedEARComponent.getName())) {
-			earArtifactEdit.dispose();
-			earArtifactEdit = null;
-			return true;
-		}
-		return false;
-	}
-
-	protected void initializeEARFile() {
-		if (selectedEARComponent == null || !isDDInEAR(selectedEARComponent)) {
-			earFile = null;
-			return;
-		}
-		try {
-			earFile = (EARFile) getEARArtifactEdit().asArchive(false);
-		} catch (OpenFailureException ex) {
-			handleOpenFailureException(ex);
-		}
-	}
-
-	/**
-	 * initializeSelection method comment.
-	 */
-	protected void initializeSelection(ArchiveManifest existing) {
-		try {
-			initializeEARFile();
-			initializeArchive();
-			if (!J2EEProjectUtilities.isEARProject(getProject())) {
-				if (archive != null) {
-					if (existing == null) {
-						if (manifest != null)
-							archive.setManifest(manifest);
-						else
-							// Load it now because we're going to close the EAR;
-							// this might be a binary project
-							archive.getManifest();
-					} else
-						archive.setManifest(existing);
-					List archiveFiles = earFile.getArchiveFiles();
-					for (int i = 0; i < archiveFiles.size(); i++) {
-						Archive anArchive = (Archive) archiveFiles.get(i);
-						try {
-							if (anArchive.isEJBJarFile())
-								((EJBJarFile) anArchive).getDeploymentDescriptor();
-							anArchive.getManifest();
-						} catch (ManifestException mfEx) {
-							Logger.getLogger().logError(mfEx);
-							anArchive.setManifest((ArchiveManifest) new ArchiveManifestImpl());
-						} catch (DeploymentDescriptorLoadException ddException) {
-							Logger.getLogger().logError(ddException);
-						}
-					}
-				}
-				createClassPathSelection();
-			}
-		} finally {
-			if (earFile != null)
-				earFile.close();
-		}
-	}
-
-	protected void initializeArchive() {
-		if (!J2EEProjectUtilities.isEARProject(getProject())) {
-			if (earFile == null) {
-				archive = null;
-				return;
-			}
-			String uri = getArchiveURI();
-			if (uri != null) {
-				try {
-					archive = (Archive) earFile.getFile(uri);
-				} catch (java.io.FileNotFoundException ex) {
-					archive = null;
-				}
-			}
-		} else {
-			EARArtifactEdit edit = null;
-			try {
-				edit = EARArtifactEdit.getEARArtifactEditForRead(getProject());
-				archive = edit.asArchive(true);
-			} catch (OpenFailureException oe) {
-				Logger.getLogger().log(oe);
-			} finally {
-				if (edit != null)
-					edit.dispose();
-			}
-		}
-	}
-
-	protected void createClassPathSelection() {
-		if (archive != null)
-			classPathSelection = new ClassPathSelection(archive, earFile);
-		else
-			classPathSelection = null;
-	}
-
-	protected boolean isDDInEAR(IVirtualComponent aComponent) {
-		IContainer mofRoot = aComponent.getProject();
-		if (mofRoot == null || !mofRoot.exists())
-			return false;
-
-		return mofRoot.exists(new Path(aComponent.getRootFolder().getProjectRelativePath().toString() + "//" + J2EEConstants.APPLICATION_DD_URI)); //$NON-NLS-1$
-	}
-
-	protected void handleOpenFailureException(OpenFailureException ex) {
-		org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-	}
-
-	public void dispose() {
-		if (earArtifactEdit != null) {
-			earArtifactEdit.dispose();
-			earArtifactEdit = null;
-		}
-	}
-
-	public ClassPathSelection getClassPathSelection() {
-		if (classPathSelection == null)
-			initializeSelection(null);
-		return classPathSelection;
-	}
-
-	public void resetClassPathSelection(ArchiveManifest mf) {
-		initializeSelection(mf);
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_RESET));
-	}
-
-	public void resetClassPathSelection() {
-		resetClassPathSelection(null);
-	}
-
-	public void addListener(ClasspathModelListener listener) {
-		if (listeners == null)
-			listeners = new ArrayList();
-
-		listeners.add(listener);
-	}
-
-	public void removeListener(ClasspathModelListener listener) {
-		if (listeners != null)
-			listeners.remove(listener);
-	}
-
-	public void fireNotification(ClasspathModelEvent evt) {
-		if (listeners == null)
-			return;
-
-		for (int i = 0; i < listeners.size(); i++) {
-			ClasspathModelListener listener = (ClasspathModelListener) listeners.get(i);
-			listener.modelChanged(evt);
-		}
-	}
-
-	/**
-	 * Sets the isSelected for the classpath element and sends out a notification of type
-	 * {@link ClasspathModelEvent#CLASS_PATH_CHANGED}
-	 */
-	public void setSelection(ClasspathElement element, boolean selected) {
-		element.setSelected(selected);
-		if (!isWLPModel()) {
-			updateManifestClasspath();
-		} else {
-			// at least fire the change event
-			fireNotification(new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED));
-		}
-	}
-
-	/**
-	 * Select or deselect all and notify
-	 */
-	public void setAllClasspathElementsSelected(boolean selected) {
-		ClassPathSelection s = getClassPathSelection();
-		if (s != null) {
-			s.setAllSelected(selected);
-			updateManifestClasspath();
-		}
-	}
-
-	/**
-	 * Select or deselect all and notify
-	 */
-	public void setAllClasspathElementsSelected(List elements, boolean selected) {
-		ClassPathSelection s = getClassPathSelection();
-		if (s != null) {
-			s.setAllSelected(elements, selected);
-			updateManifestClasspath();
-		}
-	}
-
-	/**
-	 * Gets the archive.
-	 * 
-	 * @return Returns a Archive
-	 */
-	public Archive getArchive() {
-		return archive;
-	}
-
-	/**
-	 * Updates the manifest Class-Path:, and sends out a notification of type
-	 * {@link ClasspathModelEvent#CLASS_PATH_CHANGED}
-	 */
-	public void updateManifestClasspath() {
-		if (classPathSelection != null && classPathSelection.isModified()) {
-			archive.getManifest().setClassPath(classPathSelection.toString());
-			fireNotification(new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED));
-		}
-	}
-
-	/**
-	 * Updates the manifest Main-Class:, and sends out a notification of type
-	 * {@link ClasspathModelEvent#MAIN_CLASS_CHANGED}
-	 */
-	public void updateMainClass(String mainClass) {
-		archive.getManifest().setMainClass(mainClass);
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.MAIN_CLASS_CHANGED));
-	}
-
-	/**
-	 * Updates the manifest Main-Class:, and sends out a notification of type
-	 * {@link ClasspathModelEvent#MAIN_CLASS_CHANGED}
-	 */
-	public void updateImplVersion(String implVersion) {
-		archive.getManifest().setImplemenationVersion(implVersion);
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.IMPL_VERSION_CHANGED));
-	}
-
-	public void fireSavedEvent() {
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.MODEL_SAVED));
-	}
-
-	/**
-	 * Sets the manifest without touching the archive, or notifying
-	 */
-	public void primSetManifest(ArchiveManifest mf) {
-		manifest = mf;
-	}
-
-	/**
-	 * Sets the manfest on the archive, updates the classpath selection, and notifies
-	 */
-	public void setManifest(ArchiveManifest manifest) {
-		archive.setManifest(manifest);
-		getClassPathSelection(); // Ensure the selection is initialized.
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.MANIFEST_CHANGED));
-	}
-
-	public void selectEAR(int index) {
-		ArchiveManifest mf = new ArchiveManifestImpl((ArchiveManifestImpl) getArchive().getManifest());
-		earFile.close();
-		selectedEARComponent = availableEARComponents[index];
-		initializeSelection(mf);
-		fireNotification(new ClasspathModelEvent(ClasspathModelEvent.EAR_PROJECT_CHANGED));
-	}
-
-	public void moveUp(List toMoveUp) {
-		getClassPathSelection().moveUp(toMoveUp);
-		updateManifestClasspath();
-	}
-
-	public void moveDown(List toMoveDown) {
-		getClassPathSelection().moveDown(toMoveDown);
-		updateManifestClasspath();
-	}
-
-	public void refresh() {
-		ArchiveManifest mf = null;
-		if (archive != null)
-			mf = new ArchiveManifestImpl((ArchiveManifestImpl) getArchive().getManifest());
-		refreshAvailableEARs();
-		resetClassPathSelection(mf);
-	}
-
-
-	/**
-	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#cacheNonResourceValidateState(List)
-	 */
-	public void cacheNonResourceValidateState(List roNonResourceFiles) {
-	}
-
-
-	/**
-	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getNonResourceFiles()
-	 */
-	public List getNonResourceFiles() {
-		if (nonResourceFiles == null)
-			initNonResourceFiles();
-		return nonResourceFiles;
-	}
-
-	protected void initNonResourceFiles() {
-		// Might be opened from a JAR
-		if (getComponent() == null)
-			return;
-		nonResourceFiles = new ArrayList(3);
-		nonResourceFiles.add(getComponent().getProject().getFile(ProjectUtilities.DOT_PROJECT));
-		nonResourceFiles.add(getComponent().getProject().getFile(ProjectUtilities.DOT_CLASSPATH));
-		IFile mf = J2EEProjectUtilities.getManifestFile(getComponent().getProject());
-		if (mf != null)
-			nonResourceFiles.add(mf);
-	}
-
-
-	/**
-	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getNonResourceInconsistentFiles()
-	 */
-	public List getNonResourceInconsistentFiles() {
-		return null;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#isDirty()
-	 */
-	public boolean isDirty() {
-		ClassPathSelection selection = getClassPathSelection();
-		if (selection == null)
-			return false;
-		return selection.isModified();
-	}
-
-
-	/**
-	 * Return a list of all the files that will get modified as a result of running this operation;
-	 * used for validateEdit
-	 */
-	public Set getAffectedFiles() {
-		Set result = new HashSet();
-		IFile aFile = J2EEProjectUtilities.getManifestFile(getComponent().getProject());
-		if (aFile != null && aFile.exists())
-			result.add(aFile);
-		result.addAll(ProjectUtilities.getFilesAffectedByClasspathChange(getComponent().getProject()));
-		return result;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getResources()
-	 */
-	public List getResources() {
-		return Collections.EMPTY_LIST;
-	}
-
-	public boolean selectDependencyIfNecessary(IProject referencedProject) {
-		getClassPathSelection();
-		if (classPathSelection == null || classPathSelection.hasDirectOrIndirectDependencyTo(referencedProject))
-			return false;
-
-		ClasspathElement element = classPathSelection.getClasspathElement(referencedProject);
-		if (element != null) {
-			setSelection(element, true);
-			return true;
-		}
-		return false;
-	}
-
-	public boolean selectDependencyIfNecessary(String jarName) {
-		getClassPathSelection();
-		if (classPathSelection == null || classPathSelection.hasDirectOrIndirectDependencyTo(jarName))
-			return false;
-
-		ClasspathElement element = classPathSelection.getClasspathElement(jarName);
-		if (element != null) {
-			setSelection(element, true);
-			return true;
-		}
-		return false;
-	}
-
-	public void removeDependency(String jarName) {
-		getClassPathSelection();
-		if (classPathSelection == null)
-			return;
-
-		ClasspathElement element = classPathSelection.getClasspathElement(jarName);
-		if (element != null && element.isValid())
-			setSelection(element, false);
-	}
-
-	public void removeDependency(IProject referencedProject) {
-		getClassPathSelection();
-		if (classPathSelection == null)
-			return;
-
-		ClasspathElement element = classPathSelection.getClasspathElement(referencedProject);
-		if (element != null && element.isValid())
-			setSelection(element, false);
-	}
-
-	public void selectFilterLevel(int filterLevel) {
-		getClassPathSelection();
-		if (classPathSelection != null)
-			classPathSelection.selectFilterLevel(filterLevel);
-		updateManifestClasspath();
-	}
-
-	/**
-	 * Gets the stateValidator.
-	 * 
-	 * @return Returns a ResourceStateValidator
-	 */
-	public ResourceStateValidator getStateValidator() {
-		if (stateValidator == null)
-			stateValidator = createStateValidator();
-		return stateValidator;
-	}
-
-	/**
-	 * Method createStateValidator.
-	 * 
-	 * @return ResourceStateValidator
-	 */
-	private ResourceStateValidator createStateValidator() {
-		return new ResourceStateValidatorImpl(this);
-	}
-
-	/**
-	 * @see ResourceStateValidator#checkActivation(ResourceStateValidatorPresenter)
-	 */
-	public void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
-		getStateValidator().checkActivation(presenter);
-	}
-
-	/**
-	 * @see ResourceStateValidator#lostActivation(ResourceStateValidatorPresenter)
-	 */
-	public void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
-		getStateValidator().lostActivation(presenter);
-	}
-
-	/**
-	 * @see ResourceStateValidator#validateState(ResourceStateValidatorPresenter)
-	 */
-	public IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException {
-		return getStateValidator().validateState(presenter);
-	}
-
-	/**
-	 * @see ResourceStateValidator#checkSave(ResourceStateValidatorPresenter)
-	 */
-	public boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException {
-		return getStateValidator().checkSave(presenter);
-	}
-
-	/**
-	 * @see ResourceStateValidator#checkReadOnly()
-	 */
-	public boolean checkReadOnly() {
-		return getStateValidator().checkReadOnly();
-	}
-
-	public IVirtualComponent getComponent() {
-		return component;
-	}
-
-	public void setComponent(IVirtualComponent component) {
-		this.component = component;
-	}
-
-	public ClassPathSelection getClassPathSelectionForWLPs() {
-		if (classPathWLPSelection == null)
-			initializeSelectionForWLPs();
-		return classPathWLPSelection;
-	}
-
-	private void initializeSelectionForWLPs() {
-		classPathWLPSelection = new ClassPathSelection();
-		try {
-			IClasspathContainer container = J2EEComponentClasspathUpdater.getInstance().getWebAppLibrariesContainer(component.getProject(), true);
-			IClasspathEntry[] containerEntries = null != container ? container.getClasspathEntries() : null;
-			IPath libPath = new Path("/WEB-INF/lib"); //$NON-NLS-1$
-
-			HashSet hs = new HashSet();
-			hs.addAll(J2EEProjectUtilities.getAllJavaNonFlexProjects());
-			IProject[] utilityProjects = J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.UTILITY);
-			hs.addAll(Arrays.asList(utilityProjects));
-			
-			IProject[] ejbProjects = J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.EJB);
-			hs.addAll(Arrays.asList(ejbProjects));
-			
-			for (Iterator it = hs.iterator(); it.hasNext();) {
-				Object item = it.next();
-				IProject utilProject = null;
-				if (item instanceof IProject) {
-					utilProject = (IProject) item;
-					if (utilProject.getName().startsWith(".")) { //$NON-NLS-1$
-						continue;
-					}
-				} else if (item instanceof IVirtualComponent)
-					utilProject = ((IVirtualComponent) item).getProject();
-				boolean existingEntry = false;
-				if (containerEntries != null) {
-					for (int j = 0; j < containerEntries.length; j++) {
-						IClasspathEntry eachEntry = containerEntries[j];
-						if (eachEntry.getEntryKind() == IClasspathEntry.CPE_PROJECT && eachEntry.getPath().toString().equals("/" + utilProject.getName())) { //$NON-NLS-1$
-							IVirtualReference ref = component.getReference(utilProject.getName());
-							if (ref != null && ref.getRuntimePath().equals(libPath)) {
-								existingEntry = true;
-							}
-							break;
-						}
-					}
-				}
-				if( !existingEntry ){
-					IJavaProject javaProject = JavaCore.create( component.getProject() );
-					if( javaProject!= null ){
-						IClasspathEntry[] entry = javaProject.getRawClasspath();
-						for (int j = 0; j < entry.length; j++) {
-							IClasspathEntry eachEntry = entry[j];
-							if (eachEntry.getEntryKind() == IClasspathEntry.CPE_PROJECT && 
-									eachEntry.getPath().toString().equals("/" + utilProject.getName())) { //$NON-NLS-1$
-								IVirtualReference ref = component.getReference(utilProject.getName());
-								if( ref != null && ref.getRuntimePath().equals( libPath )){
-									existingEntry = true;
-								}						
-								break;
-							}
-						}
-					}
-				}
-				classPathWLPSelection.createProjectElement(utilProject, existingEntry);
-				classPathWLPSelection.setFilterLevel(ClassPathSelection.FILTER_NONE);
-			}
-
-			if (component != null && J2EEProjectUtilities.isDynamicWebProject( component.getProject() )) {
-				IVirtualReference[] newrefs = component.getReferences();
-				for (int i = 0; i < newrefs.length; i++) {
-					IVirtualReference ref = newrefs[i];
-					IVirtualComponent referencedComponent = ref.getReferencedComponent();
-					if (referencedComponent == null)
-						continue;
-					boolean isBinary = referencedComponent.isBinary();
-					if (isBinary) {
-						String unresolvedURI = ""; //$NON-NLS-1$
-						try {
-							unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)));
-						} catch (UnresolveableURIException e) {
-							e.printStackTrace();
-						}
-						
-						URI archiveURI = URI.createURI(unresolvedURI);
-
-						boolean alreadyInList = false;
-						Iterator iter = classPathWLPSelection.getClasspathElements().iterator();
-						while (iter.hasNext()) {
-							ClasspathElement tmpelement = (ClasspathElement) iter.next();
-							if (tmpelement.getText().equals(archiveURI.lastSegment())) {
-								alreadyInList = true;
-								break;
-							}
-						}
-						ClasspathElement element = null;
-						if (!alreadyInList) {
-							boolean inContainer = false;
-							if (containerEntries != null) {
-								String lastSegment = archiveURI.lastSegment();
-								for (int j = 0; !inContainer && j < containerEntries.length; j++) {
-									if (containerEntries[j].getPath().lastSegment().equals(lastSegment)) {
-										inContainer = true;
-									}
-								}
-							}
-							
-							if( !inContainer ){
-								IJavaProject javaProject = JavaCore.create( component.getProject() );
-									if( javaProject != null ){
-									VirtualArchiveComponent vComp = (VirtualArchiveComponent) referencedComponent;
-					                java.io.File diskFile = vComp.getUnderlyingDiskFile();
-					                IPath path = null;
-					                if ( diskFile.exists() ) {
-					                	path = new Path( diskFile.getAbsolutePath() );
-					                } else {
-					                    IFile iFile = vComp.getUnderlyingWorkbenchFile();
-					                    path = iFile.getFullPath();
-					                }								
-									inContainer =  inClassPath(javaProject, path );
-								}
-							}
-							if (inContainer) {
-								element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), referencedComponent.getName(), archiveURI.lastSegment());
-								classPathWLPSelection.addClasspathElement(element, unresolvedURI);
-							} else {
-								element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), null);
-								classPathWLPSelection.addClasspathElement(element, unresolvedURI);
-							}
-						}
-					}
-				} // for
-			}
-		} catch (CoreException e) {
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	public boolean isWLPModel() {
-		return isWLPModel;
-	}
-
-	public void setWLPModel(boolean isWLPModel) {
-		this.isWLPModel = isWLPModel;
-	}
-
-	private boolean inClassPath(IJavaProject javaProject, IPath path ){
-		boolean existingEntry = false;
-		IClasspathEntry[] entry = null;
-		try {
-			entry = javaProject.getRawClasspath();
-		} catch (JavaModelException e) {
-			Logger.getLogger().logError(e);
-		}
-		for (int j = 0; j < entry.length; j++) {
-			IClasspathEntry eachEntry = entry[j];
-			if (eachEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY || eachEntry.getEntryKind() == IClasspathEntry.CPE_VARIABLE ) {
-				IClasspathEntry classPathEntry = JavaCore.getResolvedClasspathEntry( eachEntry );
-				if( classPathEntry != null && classPathEntry.getPath().equals(path) ){
-					existingEntry = true;
-					break;
-				}
-			}
-		}
-		return existingEntry;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelEvent.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelEvent.java
deleted file mode 100644
index 388409f28..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelEvent.java
+++ /dev/null
@@ -1,42 +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.common;
-
-
-public class ClasspathModelEvent extends Object {
-	protected int eventType;
-	public static final int CLASS_PATH_CHANGED = 1;
-	public static final int EAR_PROJECT_CHANGED = 2;
-	public static final int MANIFEST_CHANGED = 3;
-	public static final int CLASS_PATH_RESET = 4;
-	public static final int MAIN_CLASS_CHANGED = 5;
-	public static final int MODEL_SAVED = 6;
-	public static final int IMPL_VERSION_CHANGED = 7;
-
-	/**
-	 * Constructor for ClasspathModelEvent.
-	 */
-	public ClasspathModelEvent(int eventType) {
-		super();
-		this.eventType = eventType;
-	}
-
-	/**
-	 * Gets the eventType.
-	 * 
-	 * @return Returns a int
-	 */
-	public int getEventType() {
-		return eventType;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelListener.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelListener.java
deleted file mode 100644
index c3333f392..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModelListener.java
+++ /dev/null
@@ -1,14 +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.common;
-
-
-public interface ClasspathModelListener {
-	void modelChanged(ClasspathModelEvent evt);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CreationConstants.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CreationConstants.java
deleted file mode 100644
index ef9ecf17f..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CreationConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public interface CreationConstants {
-
-	String DEFAULT_WEB_SOURCE_FOLDER =	"src"; //$NON-NLS-1$ 
-	String DEFAULT_EJB_SOURCE_FOLDER = ProductManager.getProperty(IProductConstants.EJB_CONTENT_FOLDER);
-	String DEFAULT_CONNECTOR_SOURCE_FOLDER = ProductManager.getProperty(IProductConstants.JCA_CONTENT_FOLDER);
-	String DEFAULT_APPCLIENT_SOURCE_FOLDER = ProductManager.getProperty(IProductConstants.APP_CLIENT_CONTENT_FOLDER); 
-	String EJB_CLIENT_NAME ="ClientProject";//$NON-NLS-1$ 
-	String CLIENT_JAR_URI="ClientJARURI";//$NON-NLS-1$ 
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EECommonMessages.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EECommonMessages.java
deleted file mode 100644
index afeeca861..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EECommonMessages.java
+++ /dev/null
@@ -1,74 +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 Dec 3, 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.common;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * @author DABERG
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EECommonMessages extends NLS {
-	private static final String BUNDLE_NAME = "j2ee_common";//$NON-NLS-1$
-
-	private J2EECommonMessages() {
-		// Do not instantiate
-	}
-
-	public static String ERR_SECURITY_ROLE_EMPTY;
-	public static String ERR_SECURITY_ROLE_EXIST;
-	public static String ERR_JAVA_CLASS_NAME_EMPTY;
-	public static String ERR_JAVA_CLASS_NAME_EXIST;
-	public static String ERR_JAVA_CLASS_FILE_NAME_EXIST;
-	public static String ERR_JAVA_CLASS_FOLDER_NAME_EMPTY;
-	public static String ERR_JAVA_CLASS_FOLDER_PROJECT_NOT_OPEN;
-	public static String ERR_JAVA_CLASS_NOT_JAVA_PROJECT;
-	public static String ERR_JAVA_CLASS_FOLDER_STATIC_PROJECT;
-	public static String ERR_JAVA_CLASS_FOLDER_NOT_SOURCE;
-	public static String ERR_JAVA_CLASS_NAME_QUALIFIED;
-	public static String ERR_JAVA_CLASS_NAME_INVALID;
-	public static String ERR_JAVA_CLASS_NAME_WARNING;
-	public static String ERR_JAVA_CLASS_SUPERCLASS_NOT_EXIST;
-	public static String ERR_JAVA_CLASS_SUPERCLASS_FINAL;
-	public static String ERR_JAVA_PACAKGE_NAME_INVALID;
-	public static String ERR_JAVA_PACKAGE_NAME_WARNING;
-	public static String ERR_BOTH_FINAL_AND_ABSTRACT;
-	public static String WebServiceClientGenerator_UI_0;
-	public static String ERR_SECURITY_ROLE_LIST_EMPTY;
-
-	public static String ERR_JAVA_CLASS_FOLDER_NOT_EXIST;
-
-	public static String ERR_EMPTY_MODULE_NAME;
-	public static String ERR_EMPTY_PROJECT_NAME;
-	public static String ERR_PROJECT_NAME_EXISTS;
-	public static String ERR_VERSION_NOT_SUPPORTED;
-	public static String ERR_NOT_SUPPORTED;
-	public static String ERR_JAVA_CLASS_FOLDER_NOT_ABSOLUTE;
-
-	public static String J2EE_MODULE_CLASSPATH_CONTAINER_NAME;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, J2EECommonMessages.class);
-	}
-
-	public static String getResourceString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
deleted file mode 100644
index f51d2e51f..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
+++ /dev/null
@@ -1,271 +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 Mar 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.common;
-
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author nagrawal
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEVersionUtil {
-
-	public static String getServletTextVersion(int aVersion) {
-		switch (aVersion) {
-		case J2EEVersionConstants.SERVLET_2_2:
-			return J2EEVersionConstants.VERSION_2_2_TEXT;
-
-		case J2EEVersionConstants.SERVLET_2_3:
-			return J2EEVersionConstants.VERSION_2_3_TEXT;
-
-		case J2EEVersionConstants.SERVLET_2_4:
-			return J2EEVersionConstants.VERSION_2_4_TEXT;
-		}
-		return ""; //$NON-NLS-1$
-
-	}
-
-	public static String getEJBTextVersion(int aVersion) {
-
-		switch (aVersion) {
-		case J2EEVersionConstants.EJB_1_0_ID:
-			return J2EEVersionConstants.VERSION_1_0_TEXT;
-
-		case J2EEVersionConstants.EJB_1_1_ID:
-			return J2EEVersionConstants.VERSION_1_1_TEXT;
-
-		case J2EEVersionConstants.EJB_2_0_ID:
-			return J2EEVersionConstants.VERSION_2_0_TEXT;
-
-		case J2EEVersionConstants.EJB_2_1_ID:
-			return J2EEVersionConstants.VERSION_2_1_TEXT;
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String getJCATextVersion(int aVersion) {
-		switch (aVersion) {
-		case J2EEVersionConstants.JCA_1_0_ID:
-			return J2EEVersionConstants.VERSION_1_0_TEXT;
-
-		case J2EEVersionConstants.JCA_1_5_ID:
-			return J2EEVersionConstants.VERSION_1_5_TEXT;
-
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String getJ2EETextVersion(int aVersion) {
-		switch (aVersion) {
-		case J2EEVersionConstants.J2EE_1_2_ID:
-			return J2EEVersionConstants.VERSION_1_2_TEXT;
-
-		case J2EEVersionConstants.J2EE_1_3_ID:
-			return J2EEVersionConstants.VERSION_1_3_TEXT;
-
-		case J2EEVersionConstants.J2EE_1_4_ID:
-			return J2EEVersionConstants.VERSION_1_4_TEXT;
-
-		}
-		return "";//$NON-NLS-1$
-	}
-
-	public static int convertAppClientVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertEJBVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_1_1_TEXT))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_0_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_1_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertWebVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_2_2_TEXT))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_3_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_4_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertConnectorVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_1_0_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_1_5_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertJ2EEVersionIDToEJBVersionID(int j2eeVersionId) {
-		switch (j2eeVersionId) {
-			case J2EEVersionConstants.J2EE_1_2_ID:
-				return J2EEVersionConstants.EJB_1_1_ID;
-			case J2EEVersionConstants.J2EE_1_3_ID:
-				return J2EEVersionConstants.EJB_2_0_ID;
-			case J2EEVersionConstants.J2EE_1_4_ID:
-				return J2EEVersionConstants.EJB_2_1_ID;
-		}
-		// default
-		return J2EEVersionConstants.EJB_2_1_ID;
-	}
-
-	public static int convertJ2EEVersionIDToWebVersionID(int j2eeVersionId) {
-		switch (j2eeVersionId) {
-			case J2EEVersionConstants.J2EE_1_2_ID:
-				return J2EEVersionConstants.WEB_2_2_ID;
-			case J2EEVersionConstants.J2EE_1_3_ID:
-				return J2EEVersionConstants.WEB_2_3_ID;
-			case J2EEVersionConstants.J2EE_1_4_ID:
-				return J2EEVersionConstants.WEB_2_4_ID;
-		}
-		// default
-		return J2EEVersionConstants.WEB_2_4_ID;
-	}
-
-	public static int convertJ2EEVersionIDToConnectorVersionID(int j2eeVersionId) {
-		switch (j2eeVersionId) {
-			case J2EEVersionConstants.J2EE_1_3_ID:
-				return J2EEVersionConstants.JCA_1_0_ID;
-			case J2EEVersionConstants.J2EE_1_4_ID:
-				return J2EEVersionConstants.JCA_1_5_ID;
-		}
-		// default
-		return J2EEVersionConstants.JCA_1_5_ID;
-	}
-	
-	public static int convertVersionStringToInt(IVirtualComponent comp) {
-		String version = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
-		if (J2EEProjectUtilities.isDynamicWebProject(comp.getProject()))
-			return convertWebVersionStringToJ2EEVersionID(version);
-		if (J2EEProjectUtilities.isEJBProject(comp.getProject()))
-			return convertEJBVersionStringToJ2EEVersionID(version);
-		if (J2EEProjectUtilities.isEARProject(comp.getProject()))
-			return convertVersionStringToInt(version);
-		if (J2EEProjectUtilities.isJCAProject(comp.getProject()))
-			return convertConnectorVersionStringToJ2EEVersionID(version);
-		if (J2EEProjectUtilities.isApplicationClientProject(comp.getProject()))
-			return convertAppClientVersionStringToJ2EEVersionID(version);
-		return 0;
-	}
-	
-	public static int convertVersionStringToInt(String version) {
-		int nVersion = 0;
-		
-		if( version.endsWith("")){ //$NON-NLS-1$
-			nVersion = 0;
-		}
-		if (version.equals(J2EEVersionConstants.VERSION_1_0_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_1_0;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_1_1_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_1_1;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_1_2;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_1_3;	
-		
-		if (version.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_1_4;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_1_5_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_1_5;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_2_0_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_2_0;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_2_1_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_2_1;	
-		
-		if (version.equals(J2EEVersionConstants.VERSION_2_2_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_2_2;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_2_3_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_2_3;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_2_4_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_2_4;
-		
-		if (version.equals(J2EEVersionConstants.VERSION_2_5_TEXT))
-			nVersion = J2EEVersionConstants.VERSION_2_5;		
-	
-		return nVersion;
-	}
-	public static String convertVersionIntToString(int version) {
-		String nVersion = null;
-		
-		if (version == J2EEVersionConstants.VERSION_1_0)
-			nVersion = J2EEVersionConstants.VERSION_1_0_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_1_1)
-			nVersion = J2EEVersionConstants.VERSION_1_1_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_1_2)
-			nVersion = J2EEVersionConstants.VERSION_1_2_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_1_3)
-			nVersion = J2EEVersionConstants.VERSION_1_3_TEXT;	
-		
-		if (version == J2EEVersionConstants.VERSION_1_4)
-			nVersion = J2EEVersionConstants.VERSION_1_4_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_1_5)
-			nVersion = J2EEVersionConstants.VERSION_1_5_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_2_0)
-			nVersion = J2EEVersionConstants.VERSION_2_0_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_2_1)
-			nVersion = J2EEVersionConstants.VERSION_2_1_TEXT;	
-		
-		if (version == J2EEVersionConstants.VERSION_2_2)
-			nVersion = J2EEVersionConstants.VERSION_2_2_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_2_3)
-			nVersion = J2EEVersionConstants.VERSION_2_3_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_2_4)
-			nVersion = J2EEVersionConstants.VERSION_2_4_TEXT;
-		
-		if (version == J2EEVersionConstants.VERSION_2_5)
-			nVersion = J2EEVersionConstants.VERSION_2_5_TEXT;		
-	
-		return nVersion;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java
deleted file mode 100644
index ccb94f067..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java
+++ /dev/null
@@ -1,162 +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.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-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.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
-/**
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class UpdateProjectClasspath {
-	
- 
-	public UpdateProjectClasspath(String sourceFolder, String componentName, IProject jProject){
-		addSrcFolderToProject(sourceFolder, componentName, jProject);
-	}
-	
-	private IClasspathEntry[] getClasspathEntries(String sourceFolder, String componentName,
-			IProject jProject) {
-	
-		ArrayList list = new ArrayList();
-		list.add(JavaCore.newSourceEntry(jProject.getFullPath().append(sourceFolder)));
-		
-		IClasspathEntry[] classpath = new IClasspathEntry[list.size()];
-
-
-        IPath newOutputPath = null;
-        for (int i = 0; i < classpath.length; i++) {
-			classpath[i] = (IClasspathEntry) list.get(i);
-            newOutputPath = Path.fromOSString(Path.SEPARATOR +jProject.getName() + "/bin/");
-            ((ClasspathEntry)classpath[i]).specificOutputLocation = newOutputPath;
-		}
-		return classpath;		
-	}	
-	
-	private void addSrcFolderToProject(String sourceFolder,String componentName,
-			IProject jProject) {
-			
-		IJavaProject javaProject = JavaCore.create( jProject );
-		try {
-	
-			IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-            List oldEntriesList,classpathList;
-			IClasspathEntry[] newEntries = getClasspathEntries(sourceFolder, componentName, 
-					jProject);
-	         /**
-	          * Warning clean-up 12/05/2005
-	          */   
-			//int oldSize = oldEntries.length;
-			//int newSize = newEntries.length;
-			
-			classpathList = new ArrayList();
-			oldEntriesList = Arrays.asList(oldEntries);
-			classpathList.addAll(oldEntriesList);
-			for( int j=0; j< newEntries.length; j++){
-                if(!oldEntriesList.contains(newEntries[j])) {
-                	classpathList.add(newEntries[j]);
-                }
-			}
-			IClasspathEntry[] classpathEntries = (IClasspathEntry[]) classpathList.toArray(new IClasspathEntry[classpathList.size()]);
-			javaProject.setRawClasspath(classpathEntries, null);
-		}
-		catch (JavaModelException e) {
-			Logger.getLogger().logError(e);
-		}
-	}	
-
-	private static IClasspathEntry[] getProjectDependency(IProject clientProj){
-		IClasspathEntry projectEntry = JavaCore.newProjectEntry(clientProj.getFullPath(), true);
-			return new IClasspathEntry[]{projectEntry};	
-	}
-	
-	private static boolean entryToChange(final IClasspathEntry entry, final IClasspathEntry[] entriesToChange) {
-		for (int i = 0; i < entriesToChange.length; i++) {
-			if (entriesToChange[i].equals(entry)) {
-				return true;
-			}
-		}
-		return false;
-	}	
-
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * TODO this probably can be deleted
-	 * @param projectName
-	 * @param referencedProjectName
-	 * @param add
-	 */
-	public static  void updateProjectDependency(final String projectName, final String referencedProjectName, final boolean add) {
-
-		IProject proj = ProjectUtilities.getProject( projectName );
-		IProject refproj = ProjectUtilities.getProject( referencedProjectName );
-		updateProjectDependency( proj, refproj, add );
-		
-	}
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * TODO this probably can be deleted
-	 * @param ejbProj
-	 * @param clientProj
-	 * @param add
-	 */
-	public static  void updateProjectDependency(final IProject ejbProj, final IProject clientProj, final boolean add) {
-		final IJavaProject javaProject = JavaCore.create(ejbProj);
-		try {
-			final IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-			final IClasspathEntry[] entriesToChange = getProjectDependency(clientProj);
-			final List classpathEntries = new ArrayList();
-			for (int i = 0; i < oldEntries.length; i++) {
-				if (!entryToChange(oldEntries[i], entriesToChange)) {
-					classpathEntries.add(oldEntries[i]);
-				}
-			}
-			if (add) {
-				for (int j = 0; j < entriesToChange.length; j++) {
-					boolean containsEntry = false;
-					if (entriesToChange[j].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-						for (int k = 0; k < classpathEntries.size(); k++) {
-							String existingEntry = ((IClasspathEntry) classpathEntries.get(k)).getPath().segment(0);
-							String newEntry = entriesToChange[j].getPath().segment(0);
-							if (existingEntry.equals(newEntry)) {
-								containsEntry = true;
-								break;
-							}
-						}
-					}
-					if (!containsEntry)
-						classpathEntries.add(entriesToChange[j]);
-				}
-			}
-			javaProject.setRawClasspath((IClasspathEntry[]) classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]), null);
-		} catch (JavaModelException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/VirtualArchiveComponentAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/VirtualArchiveComponentAdapterFactory.java
deleted file mode 100644
index a7b6a331e..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/VirtualArchiveComponentAdapterFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-
-public class VirtualArchiveComponentAdapterFactory implements IAdapterFactory {
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType == VirtualArchiveComponent.ADAPTER_TYPE ) {
-			VirtualArchiveComponent component = (VirtualArchiveComponent) adaptableObject;
-			IPath path = J2EEProjectUtilities.getResolvedPathForArchiveComponent(component.getName());
-			return path;
-		}
-		return null;
-	}
-
-	
-	public Class[] getAdapterList() {
-		return new Class[]{VirtualArchiveComponent.class};
-	}	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
deleted file mode 100644
index 28a5d3f20..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
+++ /dev/null
@@ -1,343 +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.common.classpath;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-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.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-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.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jdt.internal.core.JavaProject;
-import org.eclipse.jdt.internal.core.util.Util;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.jdt.internal.classpath.ClasspathDecorations;
-import org.eclipse.jst.common.jdt.internal.classpath.ClasspathDecorationsManager;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
-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;
-
-/**
- * This classpath container is based on the Component references; not the manifest entries. Other
- * mechanisms are in place to ensure that the component references are updated when the manifest is
- * updated, and also to make sure the manifest is updated when the component references are updated.
- * 
- */
-public class J2EEComponentClasspathContainer implements IClasspathContainer {
-
-	public static final String CONTAINER_ID = "org.eclipse.jst.j2ee.internal.module.container"; //$NON-NLS-1$
-	public static final IPath CONTAINER_PATH = new Path(CONTAINER_ID);
-
-	private static IPath WEBLIB = new Path("/WEB-INF/lib"); //$NON-NLS-1$
-	
-	private static ClasspathDecorationsManager decorationsManager = new ClasspathDecorationsManager(J2EEPlugin.PLUGIN_ID);
-
-	public static ClasspathDecorationsManager getDecorationsManager() {
-        return decorationsManager;
-    }
-	
-	private IPath containerPath;
-	private IJavaProject javaProject;
-	private IClasspathEntry[] entries = new IClasspathEntry[0];
-	private static Map keys = new Hashtable();
-	private static Map previousSelves = new Hashtable();
-	
-	private class LastUpdate {
-		private long dotClasspathTimeStamp = -1;
-		private int refCount = 0;
-		private boolean[] isBinary = new boolean[refCount];
-		private IPath[] paths = new IPath[refCount];
-	}
-
-	private LastUpdate lastUpdate = new LastUpdate();
-
-	public J2EEComponentClasspathContainer(IPath path, IJavaProject javaProject) {
-		this.containerPath = path;
-		this.javaProject = javaProject;
-	}
-
-	private boolean requiresUpdate() {
-		IVirtualComponent component = ComponentCore.createComponent(javaProject.getProject());
-		if (component == null) {
-			return false;
-		}
-		
-		IFile dotClasspath = javaProject.getProject().getFile(ProjectUtilities.DOT_CLASSPATH);
-		long dotClasspathTimeStamp = dotClasspath.exists() ? dotClasspath.getLocalTimeStamp() : 0;
-		if(dotClasspathTimeStamp != lastUpdate.dotClasspathTimeStamp){
-			return true;
-		}
-		
-		IVirtualReference[] refs = component.getReferences();
-		IVirtualComponent comp = null;
-
-		// avoid updating the container if references haven't changed
-		if (refs.length == lastUpdate.refCount) {
-			for (int i = 0; i < lastUpdate.refCount; i++) {
-				comp = refs[i].getReferencedComponent();
-				if (comp.isBinary() != lastUpdate.isBinary[i]) {
-					return true;
-				} else {
-					IPath path = null;
-					if (comp.isBinary()) {
-						VirtualArchiveComponent archiveComp = (VirtualArchiveComponent) comp;
-						java.io.File diskFile = archiveComp.getUnderlyingDiskFile();
-						if (diskFile.exists())
-							path = new Path(diskFile.getAbsolutePath());
-						else {
-							IFile iFile = archiveComp.getUnderlyingWorkbenchFile();
-							path = iFile.getFullPath();
-						}
-					} else {
-						path = comp.getProject().getFullPath();
-					}
-					if (!path.equals(lastUpdate.paths[i])) {
-						return true;
-					}
-				}
-			}
-			return false;
-		}
-		return true;
-	}
-	
-	private void update() {
-		if(!javaProject.isOpen()){
-			try {
-				if(javaProject.getProject().exists() && javaProject.getProject().hasNature(JavaCore.NATURE_ID)){
-					javaProject.open(null);
-				} else {
-					return;
-				}
-			} catch (JavaModelException e) {
-				Logger.getLogger().logError(e);
-			} catch (CoreException e) {
-				//ignore 
-				return;
-			}
-		}
-		
-		IVirtualComponent component = ComponentCore.createComponent(javaProject.getProject());
-		Object key = keys.get(new Integer(javaProject.getProject().hashCode()));
-		J2EEComponentClasspathContainer firstPreviousSelf = (J2EEComponentClasspathContainer)previousSelves.get(key);
-		if (component == null) {
-			return;
-		}
-		
-		IFile dotClasspath = javaProject.getProject().getFile(ProjectUtilities.DOT_CLASSPATH);
-		lastUpdate.dotClasspathTimeStamp = dotClasspath.exists() ? dotClasspath.getLocalTimeStamp() : 0;
-		
-		IVirtualComponent comp = null;
-		IVirtualReference ref = null;
-		
-		IVirtualReference[] refs = component.getReferences();
-		List refsList = new ArrayList();
-		Set refedComps = new HashSet();
-		refedComps.add(component);
-		for(int i = 0; i<refs.length;i++){
-			refsList.add(refs[i]);
-			refedComps.add(refs[i].getReferencedComponent());
-		}
-		for(int i=0; i< refsList.size(); i++){
-			comp = ((IVirtualReference)refsList.get(i)).getReferencedComponent();
-			if(comp.isBinary()){
-				IVirtualReference [] binaryRefs = comp.getReferences();
-				for(int j = 0; j<binaryRefs.length; j++){
-					if(!refedComps.contains(binaryRefs[j].getReferencedComponent())){
-						refsList.add(binaryRefs[j]);
-						refedComps.add(binaryRefs[j].getReferencedComponent());
-					}
-				}
-			}
-		}
-		
-		lastUpdate.refCount = refsList.size();
-		lastUpdate.isBinary = new boolean[lastUpdate.refCount];
-		lastUpdate.paths = new IPath[lastUpdate.refCount];
-
-		boolean isWeb = J2EEProjectUtilities.isDynamicWebProject(component.getProject());
-		boolean shouldAdd = true;
-
-		List entriesList = new ArrayList();
-
-		try {
-			IJavaProject javaProject = JavaCore.create(component.getProject());
-			Set existingEntries = new HashSet();
-			try {
-				IClasspathContainer container = JavaCore.getClasspathContainer(CONTAINER_PATH, javaProject);
-				List previousEntries = null;
-				if(null != container){
-					final IClasspathEntry[] containerEntries = container.getClasspathEntries();
-					previousEntries = Arrays.asList(containerEntries);
-				}
-				existingEntries.addAll(Arrays.asList(javaProject.getResolvedClasspath(true)));
-				if(null != previousEntries){
-					existingEntries.removeAll(previousEntries);
-				}
-				if(firstPreviousSelf != null){
-					existingEntries.removeAll(Arrays.asList(firstPreviousSelf.entries));
-				}
-				J2EEComponentClasspathContainer secondPreviousSelf = (J2EEComponentClasspathContainer)previousSelves.get(key);
-				if(firstPreviousSelf != secondPreviousSelf && secondPreviousSelf != null){
-					existingEntries.removeAll(Arrays.asList(secondPreviousSelf.entries));
-				}
-				
-				existingEntries.removeAll(Arrays.asList(entries));
-			
-			} catch (JavaModelException e) {
-				Logger.getLogger().logError(e);
-			}
-			for (int i = 0; i < refsList.size(); i++) {
-				ref = (IVirtualReference)refsList.get(i);
-				comp = ref.getReferencedComponent();
-				lastUpdate.isBinary[i] = comp.isBinary();
-				shouldAdd = !(isWeb && ref.getRuntimePath().equals(WEBLIB));
-				if (!shouldAdd) {
-					continue;
-				}
-				if (comp.isBinary()) {
-					VirtualArchiveComponent archiveComp = (VirtualArchiveComponent) comp;
-					java.io.File diskFile = archiveComp.getUnderlyingDiskFile();
-					if (diskFile.exists()) {
-						lastUpdate.paths[i] = new Path(diskFile.getAbsolutePath());
-					} else {
-						IFile iFile = archiveComp.getUnderlyingWorkbenchFile();
-						lastUpdate.paths[i] = iFile.getFullPath();
-					}
-					if (!isAlreadyOnClasspath(existingEntries, lastUpdate.paths[i])) {
-						ClasspathDecorations dec = decorationsManager.getDecorations( getPath().toString(), lastUpdate.paths[i].toString() );
-						
-						IPath srcpath = null;
-				        IPath srcrootpath = null;
-				        IClasspathAttribute[] attrs = {};
-				        IAccessRule[] access = {};
-						
-				        if( dec != null ) {
-				            srcpath = dec.getSourceAttachmentPath();
-				            srcrootpath = dec.getSourceAttachmentRootPath();
-				            attrs = dec.getExtraAttributes();
-				        }
-			        
-				        entriesList.add(JavaCore.newLibraryEntry( lastUpdate.paths[i], srcpath, srcrootpath, access, attrs, true ));
-					}
-				} else {
-					IProject project = comp.getProject();
-					lastUpdate.paths[i] = project.getFullPath();
-					if (!isAlreadyOnClasspath(existingEntries, lastUpdate.paths[i])) {
-						entriesList.add(JavaCore.newProjectEntry(lastUpdate.paths[i], true));
-					}
-				}
-			}
-		} finally {
-			entries = new IClasspathEntry[entriesList.size()];
-			for (int i = 0; i < entries.length; i++) {
-				entries[i] = (IClasspathEntry) entriesList.get(i);
-			}
-		}
-		previousSelves.put(key, this);
-	}
-
-	public static void install(IPath containerPath, IJavaProject javaProject) {
-		try{
-			J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
-			Integer hashCode = new Integer(javaProject.getProject().hashCode());
-			Object key = keys.get(hashCode);
-			if(key == null){
-				keys.put(hashCode, hashCode);
-				key = hashCode;
-			}
-			final IJavaProject[] projects = new IJavaProject[]{javaProject};
-			final J2EEComponentClasspathContainer container = new J2EEComponentClasspathContainer(containerPath, javaProject);
-			container.update();
-			final IClasspathContainer[] conts = new IClasspathContainer[]{container};
-			try {
-				JavaCore.setClasspathContainer(containerPath, projects, conts, null);
-				previousSelves.put(key, container);
-			} catch (JavaModelException e) {
-				Logger.getLogger().log(e);
-			}
-		} finally {
-			J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
-		}
-	}
-
-	public void refresh(boolean force){
-		if(force || requiresUpdate()){
-			install(containerPath, javaProject);
-			// Update dependency graph
-			DependencyGraphManager.getInstance().forceRefresh();
-		}
-	}
-	
-	public void refresh() {
-		refresh(false);
-	}
-
-	public IClasspathEntry[] getClasspathEntries() {
-		return entries;
-	}
-
-	public String getDescription() {
-		return J2EECommonMessages.J2EE_MODULE_CLASSPATH_CONTAINER_NAME;
-	}
-
-	public int getKind() {
-		return K_APPLICATION;
-	}
-
-	public IPath getPath() {
-		return containerPath;
-	}
-
-	/**
-	 * Taken from {@link JavaProject#isOnClasspath(org.eclipse.core.resources.IResource)}
-	 * 
-	 * @param classpath
-	 * @param newPath
-	 * @return
-	 */
-	private static boolean isAlreadyOnClasspath(Set classpath, IPath newPath) {
-		for (Iterator itr = classpath.iterator(); itr.hasNext();) {
-			IClasspathEntry entry = (IClasspathEntry) itr.next();
-			IPath entryPath = entry.getPath();
-			if (entryPath.equals(newPath)) { // package fragment roots must match exactly entry
-				// pathes (no exclusion there)
-				return true;
-			}
-			if (entryPath.isPrefixOf(newPath) && !Util.isExcluded(newPath, ((ClasspathEntry) entry).fullInclusionPatternChars(), ((ClasspathEntry) entry).fullExclusionPatternChars(), false)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathInitializer.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathInitializer.java
deleted file mode 100644
index d18b09489..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathInitializer.java
+++ /dev/null
@@ -1,101 +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.common.classpath;
-
-import java.lang.reflect.Field;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.common.jdt.internal.classpath.ClasspathDecorations;
-import org.eclipse.jst.common.jdt.internal.classpath.ClasspathDecorationsManager;
-
-public class J2EEComponentClasspathInitializer extends ClasspathContainerInitializer {
-
-	private static final ClasspathDecorationsManager decorations = J2EEComponentClasspathContainer.getDecorationsManager();
-	
-	public void initialize(IPath containerPath, IJavaProject javaProject) throws CoreException {
-		J2EEComponentClasspathContainer.install(containerPath, javaProject);
-	}
-
-	public boolean canUpdateClasspathContainer(final IPath containerPath, final IJavaProject project) {
-		return true;
-	}
-
-	public void requestClasspathContainerUpdate(final IPath containerPath, final IJavaProject javaProject, final IClasspathContainer sg) throws CoreException {
-		final String key = containerPath.toString();
-		final IClasspathEntry[] entries = sg.getClasspathEntries();
-		
-		for (int i = 0; i < entries.length; i++) {
-			final IClasspathEntry entry = entries[i];
-
-			final IPath srcpath = entry.getSourceAttachmentPath();
-			final IPath srcrootpath = entry.getSourceAttachmentRootPath();
-			final IClasspathAttribute[] attrs = entry.getExtraAttributes();
-
-			if (srcpath != null || attrs.length > 0) {
-				final String eid = entry.getPath().toString();
-				final ClasspathDecorations dec = new ClasspathDecorations();
-
-				dec.setSourceAttachmentPath(srcpath);
-				dec.setSourceAttachmentRootPath(srcrootpath);
-				dec.setExtraAttributes(attrs);
-
-				decorations.setDecorations(key, eid, dec);
-			}
-		}
-
-		decorations.save();
-
-		final IClasspathContainer container = JavaCore.getClasspathContainer(containerPath, javaProject);
-
-		// ( (FlexibleProjectContainer) container ).refresh();
-
-		refresh(container);
-	}
-	
-	// Workaround for bug 145784.
-    // this same hack is also being used in FlexibleProjectContainerInitializer
-    private static void refresh( final IClasspathContainer container )
-    {
-        if( container instanceof J2EEComponentClasspathContainer )
-        {
-            ( (J2EEComponentClasspathContainer) container ).refresh(true);
-        }
-        else
-        {
-            try
-            {
-                final Field field 
-                    = container.getClass().getDeclaredField( "fOriginal" ); //$NON-NLS-1$
-                
-                field.setAccessible( true );
-                
-                refresh( (IClasspathContainer) field.get( container ) );
-            }
-            catch( NoSuchFieldException e )
-            {
-                // Should not happen.
-                throw new RuntimeException( e );
-            }
-            catch( IllegalAccessException e )
-            {
-                // Should not happen.
-                throw new RuntimeException( e );
-            }
-        }
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
deleted file mode 100644
index 55faa8bfa..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
+++ /dev/null
@@ -1,543 +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.common.classpath;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathContainer;
-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.ProjectUtilities;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainer;
-import org.eclipse.jst.j2ee.application.internal.operations.IModuleExtensions;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.componentcore.EnterpriseBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPModulesResourceFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-public class J2EEComponentClasspathUpdater implements IResourceChangeListener, IResourceDeltaVisitor {
-
-	private static J2EEComponentClasspathUpdater instance = null;
-
-	private int pauseCount = 0;
-	
-	private IPath WEB_APP_LIBS_PATH = new Path("org.eclipse.jst.j2ee.internal.web.container");
-
-	public static J2EEComponentClasspathUpdater getInstance() {
-		if (instance == null) {
-			init();
-		}
-		return instance;
-	}
-
-	private static void init() {
-		if (instance == null) {
-			instance = new J2EEComponentClasspathUpdater();
-		}
-	}
-
-	/**
-	 * Pauses updates; any caller of this method must ensure through a
-	 * try/finally block that resumeUpdates is subsequently called.
-	 */
-	public void pauseUpdates() {
-		synchronized (this) {
-			pauseCount++;
-		}
-	}
-
-	public void resumeUpdates() {
-		resumeUpdates(true);
-	}
-	
-	private void resumeUpdates(boolean scheduleJob){
-		synchronized (this) {
-			if (pauseCount > 0) {
-				pauseCount--;
-			}
-			if (pauseCount > 0) {
-				return;
-			}
-		}
-		if(scheduleJob){
-			moduleUpdateJob.schedule(MODULE_UPDATE_DELAY);
-		}
-	}
-	
-	public void forceUpdate(Collection projects){
-		forceUpdate(projects, true);
-	}
-	
-	/**
-	 * Collection of type IProject
-	 * @param projects
-	 */
-	public void forceUpdate(Collection projects, boolean runAsJob) {
-		try {
-			pauseUpdates();
-			Iterator iterator = projects.iterator();
-			while(iterator.hasNext()){
-				queueUpdate((IProject)iterator.next());
-			}
-		} finally {
-			forceUpdateOnNextRun = true;
-			// the following code is in place of the normal call to
-			// resume updates.  This restores the pauseCount and forces 
-			// the job to be scheduled immediately 
-			synchronized (this) {
-				if (pauseCount > 0) {
-					pauseCount--;
-				}
-			}
-			if(runAsJob){
-				moduleUpdateJob.schedule(0);
-			} else {
-				moduleUpdateJob.run(new NullProgressMonitor());
-			}
-		}
-	}
-	
-	private boolean forceUpdateOnNextRun = false;
-	
-	public void queueUpdate(IProject project) {
-		if (J2EEProjectUtilities.isEARProject(project)) {
-			queueUpdateEAR(project);
-		} else if (J2EEProjectUtilities.isApplicationClientProject(project) || J2EEProjectUtilities.isEJBProject(project) || J2EEProjectUtilities.isDynamicWebProject(project)
-				|| J2EEProjectUtilities.isJCAProject(project) || J2EEProjectUtilities.isUtilityProject(project)) {
-			queueUpdateModule(project);
-		}
-	}
-
-	public void queueUpdateModule(IProject project) {
-		moduleUpdateJob.queueModule(project);
-		if(!isKnown(project)){
-			IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects(project);
-			for (int i = 0; i < earProjects.length; i++) {
-				moduleUpdateJob.queueEAR(earProjects[i]);
-			}
-		} 
-		synchronized (this) {
-			if (pauseCount > 0) {
-				return;
-			}
-		}
-		moduleUpdateJob.schedule(MODULE_UPDATE_DELAY);
-	}
-
-	public void queueUpdateEAR(IProject earProject) {
-		moduleUpdateJob.queueEAR(earProject);
-		synchronized (this) {
-			if (pauseCount > 0) {
-				return;
-			}
-		}
-		moduleUpdateJob.schedule(MODULE_UPDATE_DELAY);
-	}
-	
-	public boolean projectsQueued() {
-		return moduleUpdateJob.projectsQueued() || moduleUpdateJob.getState() != Job.NONE;
-	}
-	
-	private static final int MODULE_UPDATE_DELAY = 30;
-	public static final String MODULE_UPDATE_JOB_NAME = "EAR Libraries Update Job"; 
-
-	private final ModuleUpdateJob moduleUpdateJob = new ModuleUpdateJob();
-
-	public class ModuleUpdateJob extends Job {
-
-		public boolean belongsTo(Object family) {
-			if(family == MODULE_UPDATE_JOB_NAME){
-				return true;
-			}
-			return super.belongsTo(family);
-		}
-		
-		// We use the listener list as a thread safe queue.
-		private class Queue extends ListenerList  {
-			public synchronized Object[] getListeners() {
-				Object[] data = super.getListeners();
-				clear();
-				return data;
-			}
-		};
-
-		private Queue moduleQueue = new Queue();
-
-		private Queue earQueue = new Queue();
-
-		public ModuleUpdateJob() {
-			super(MODULE_UPDATE_JOB_NAME); 
-			setRule(ResourcesPlugin.getWorkspace().getRoot());
-			setSystem(true);
-		}
-
-		public void queueEAR(IProject ear) {
-			earQueue.add(ear);
-		}
-
-		public void queueModule(IProject project) {
-			moduleQueue.add(project);
-		}
-		
-		public boolean projectsQueued() {
-			return !earQueue.isEmpty() || !moduleQueue.isEmpty();
-		}
-
-		private void processEars() {
-			Object[] earProjects = earQueue.getListeners();
-			for (int i = 0; i < earProjects.length; i++) {
-				IProject earProject = (IProject) earProjects[i];
-				EARArtifactEdit edit = null;
-				try {
-					edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-					if(edit != null){
-						IVirtualReference[] refs = edit.getComponentReferences();
-						IVirtualComponent comp = null;
-						for (int j = 0; j < refs.length; j++) {
-							comp = refs[j].getReferencedComponent();
-							if (!comp.isBinary()) {
-								queueModule(comp.getProject());
-							}
-						}
-					}
-				} finally {
-					if (edit != null) {
-						edit.dispose();
-					}
-				}
-				IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
-				if(null != earComponent){
-					EnterpriseBinaryComponentHelper.ArchiveCache.getInstance().clearDisconnectedArchivesInEAR(earComponent);	
-				}
-			}
-		}
-		
-		private void processModules(){
-			Object[] projects = moduleQueue.getListeners();
-			for (int i = 0; i < projects.length; i++) {
-				IProject project = (IProject) projects[i];
-				IClasspathContainer container = getWebAppLibrariesContainer(project, false);
-				if (container != null && container instanceof FlexibleProjectContainer) {
-					((FlexibleProjectContainer) container).refresh();
-				}
-				IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects(project);
-				if (earProjects.length == 0) {
-					removeContainerFromModuleIfNecessary(project);
-					return;
-				} 
-				
-				container = addContainerToModuleIfNecessary(project);
-				if (container != null && container instanceof J2EEComponentClasspathContainer) {
-					((J2EEComponentClasspathContainer) container).refresh(forceUpdateOnNextRun);
-				}
-			}
-		}
-		
-
-		protected IStatus run(IProgressMonitor monitor) {
-
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					J2EEPlugin.getDefault().getLogger().logError(e);
-				}
-
-				public void run() throws Exception {
-					try {
-						processEars();
-						processModules();
-					} finally {
-						forceUpdateOnNextRun = false;
-					}
-					
-				}
-			});
-
-			return Status.OK_STATUS;
-		}
-	};
-
-	public IClasspathContainer getWebAppLibrariesContainer(IProject webProject, boolean create) {
-		IJavaProject jproj = JavaCore.create(webProject);
-		IClasspathContainer container = null;
-		IClasspathEntry entry = create ? null : getExistingContainer(jproj, WEB_APP_LIBS_PATH);
-		if (entry != null || create) {
-		try {
-				container = JavaCore.getClasspathContainer(WEB_APP_LIBS_PATH, jproj);
-		} catch (JavaModelException e) {
-				J2EEPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-		return container;
-	}
-	
-	private IClasspathContainer addContainerToModuleIfNecessary(IProject moduleProject) {
-		IJavaProject jproj = JavaCore.create(moduleProject);
-		IClasspathEntry entry = getExistingContainer(jproj, J2EEComponentClasspathContainer.CONTAINER_PATH);
-		if (entry == null) {
-			try {
-				entry = JavaCore.newContainerEntry(J2EEComponentClasspathContainer.CONTAINER_PATH, true);
-				addToClasspath(jproj, entry);
-			} catch (CoreException e) {
-				J2EEPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-		IClasspathContainer container = null;
-		try {
-			container = JavaCore.getClasspathContainer(J2EEComponentClasspathContainer.CONTAINER_PATH, jproj);
-		} catch (JavaModelException e) {
-			J2EEPlugin.getDefault().getLogger().logError(e);
-		}
-		return container;
-	}
-
-	private void removeContainerFromModuleIfNecessary(IProject moduleProject) {
-		IJavaProject jproj = JavaCore.create(moduleProject);
-		IClasspathEntry entry = getExistingContainer(jproj, J2EEComponentClasspathContainer.CONTAINER_PATH);
-		if (entry != null) {
-			try {
-				removeFromClasspath(jproj, entry);
-			} catch (CoreException e) {
-				J2EEPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-	}
-
-	private void addToClasspath(final IJavaProject jproj, final IClasspathEntry entry) throws CoreException {
-		final IClasspathEntry[] current = jproj.getRawClasspath();
-		final IClasspathEntry[] updated = new IClasspathEntry[current.length + 1];
-		System.arraycopy(current, 0, updated, 0, current.length);
-		updated[current.length] = entry;
-		jproj.setRawClasspath(updated, null);
-	}
-
-	private void removeFromClasspath(final IJavaProject jproj, final IClasspathEntry entry) throws CoreException {
-		final IClasspathEntry[] current = jproj.getRawClasspath();
-		final IClasspathEntry[] updated = new IClasspathEntry[current.length - 1];
-		boolean removed = false;
-		for (int i = 0; i < current.length; i++) {
-			if (!removed) {
-				if (current[i] == entry) {
-					removed = true;
-				} else {
-					updated[i] = current[i];
-				}
-			} else {
-				updated[i - 1] = current[i];
-			}
-		}
-		jproj.setRawClasspath(updated, null);
-	}
-
-	/**
-	 * Returns the existing classpath container if it is already on the
-	 * classpath. This will not create a new container.
-	 * 
-	 * @param jproj
-	 * @param classpathContainerID
-	 * @return
-	 */
-	public IClasspathEntry getExistingContainer(IJavaProject jproj, IPath classpathContainerPath) {
-		try {
-			IClasspathEntry[] cpes;
-			cpes = jproj.getRawClasspath();
-			for (int j = 0; j < cpes.length; j++) {
-				final IClasspathEntry cpe = cpes[j];
-				if (cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
-					if (cpe.getPath().equals(classpathContainerPath)) {
-						return cpe; // entry found
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-			J2EEPlugin.getDefault().getLogger().logError(e);
-		}
-		// entry not found
-		return null;
-	}
-
-	private Set knownProjects = new HashSet();
-	
-	private boolean isKnown(IProject project){
-		return !knownProjects.add(project.getName());
-	}
-	
-	private void forgetProject(IProject project){
-		knownProjects.remove(project.getName());
-	}
-	
-	public void resourceChanged(IResourceChangeEvent event) {
-		boolean scheduleJob = false;
-		try {
-			pauseUpdates();
-			switch (event.getType()){
-				case IResourceChangeEvent.PRE_CLOSE:
-				case IResourceChangeEvent.PRE_DELETE:
-					IResource resource = event.getResource();
-					if(resource.getType() == IResource.PROJECT){
-						if(ModuleCoreNature.isFlexibleProject((IProject) resource)){
-							if(J2EEProjectUtilities.isEARProject((IProject)resource)){
-								IProject earProject = (IProject) resource;
-								EARArtifactEdit edit = null;
-								try {
-									edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-									if(edit != null){
-										IVirtualReference[] refs = edit.getComponentReferences();
-										IVirtualComponent comp = null;
-										for (int j = 0; j < refs.length; j++) {
-											comp = refs[j].getReferencedComponent();
-											if (!comp.isBinary()) {
-												queueUpdateModule(comp.getProject());
-											}
-										}
-									}
-								} finally {
-									if (edit != null) {
-										edit.dispose();
-									}
-								}
-							} else {
-								IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects((IProject)resource);
-								for(int i=0; i<earProjects.length; i++){
-									queueUpdateEAR(earProjects[i]);
-								}
-							}
-							forgetProject((IProject)resource);
-						}
-						EnterpriseBinaryComponentHelper.ArchiveCache.getInstance().clearAllArchivesInProject((IProject)resource);
-					}
-					break;
-				case IResourceChangeEvent.POST_CHANGE:
-					scheduleJob = true;
-					event.getDelta().accept(this);
-					break;
-			}
-		} catch (CoreException e) {
-			J2EEPlugin.getDefault().getLogger().logError(e);
-		} finally {
-			resumeUpdates(scheduleJob);
-		}
-	}
-
-	/*
-	 * Needs to notice changes to MANIFEST.MF in any J2EE projects, changes to
-	 * .component in any J2EE Projects, and any archive changes in EAR projects
-	 */
-	public boolean visit(IResourceDelta delta) {
-		IResource resource = delta.getResource();
-		switch (resource.getType()) {
-		case IResource.ROOT:
-			return true;
-		case IResource.PROJECT:
-			return ModuleCoreNature.isFlexibleProject((IProject) resource);
-		case IResource.FOLDER: {
-			if (resource.getName().equals(IJ2EEModuleConstants.DOT_SETTINGS)) {
-				return true;
-			}
-			IVirtualComponent comp = ComponentCore.createComponent(resource.getProject());
-
-			if (comp instanceof J2EEModuleVirtualComponent || comp instanceof EARVirtualComponent) {
-				IVirtualFolder rootFolder = comp.getRootFolder();
-				if (comp instanceof EARVirtualComponent) {
-					return isRootAncester(resource, rootFolder);
-				} else { // J2EEModuleVirtualComponent
-					return isRootAncester(resource, rootFolder) || isFolder(resource, rootFolder.getFolder(J2EEConstants.META_INF));
-				}
-			}
-			return false;
-		}
-		case IResource.FILE: {
-			String name = resource.getName();
-			if (name.equals(WTPModulesResourceFactory.WTP_MODULES_SHORT_NAME) || name.equals(ProjectUtilities.DOT_CLASSPATH)) {
-				queueUpdate(resource.getProject());
-			} else if (name.equals(J2EEConstants.MANIFEST_SHORT_NAME)) { // MANIFEST.MF must be all caps per spec
-				IFile manifestFile = J2EEProjectUtilities.getManifestFile(resource.getProject(), false);
-				if (null == manifestFile || resource.equals(manifestFile)) {
-					queueUpdateModule(resource.getProject());
-				}
-			} else if (endsWithIgnoreCase(name, IModuleExtensions.DOT_JAR)) {
-				try {
-					if (FacetedProjectFramework.hasProjectFacet(resource.getProject(), J2EEProjectUtilities.ENTERPRISE_APPLICATION)) {
-						IVirtualComponent comp = ComponentCore.createComponent(resource.getProject());
-						if(isFolder(resource.getParent(), comp.getRootFolder())){
-							queueUpdateEAR(resource.getProject());
-						}
-					}
-				} catch (CoreException e) {
-					J2EEPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		}
-		default:
-			return false;
-		}
-	}
-	
-	public static boolean endsWithIgnoreCase(String str, String sfx) {
-		return str.regionMatches(true, str.length() - sfx.length(), sfx, 0, sfx.length());
-	}
-
-	public static boolean isFolder(IResource resource, IVirtualFolder folder) {
-		IContainer[] realFolders = folder.getUnderlyingFolders();
-		for (int i = 0; i < realFolders.length; i++) {
-			if (realFolders[i].equals(resource)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean isRootAncester(IResource resource, IVirtualFolder rootFolder) {
-		IContainer[] realRoots = rootFolder.getUnderlyingFolders();
-		IPath currentResourcePath = resource.getFullPath();
-		for (int i = 0; i < realRoots.length; i++) {
-			if (currentResourcePath.isPrefixOf(realRoots[i].getFullPath()))
-				return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/INewJavaClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/INewJavaClassDataModelProperties.java
deleted file mode 100644
index 1d23d6cd7..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/INewJavaClassDataModelProperties.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-
-public interface INewJavaClassDataModelProperties extends IArtifactEditOperationDataModelProperties {
-
-	/**
-	 * Required, String property used to set the unqualified java class name for the new java class.
-	 */
-	public static final String CLASS_NAME = "NewJavaClassDataModel.CLASS_NAME"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, String property used to set the source folder location for the new java class.  The first
-	 * source folder found in the project will be used if one is not specified.
-	 */
-	public static final String SOURCE_FOLDER = "NewJavaClassDataModel.SOURCE_FOLDER"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, String property used to to set the java package for the new java class.  The default
-	 * package is used if one is not specified.
-	 */
-	public static final String JAVA_PACKAGE = "NewJavaClassDataModel.JAVA_PACKAGE"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, String property used to set the qualified java class name of the superclass of the
-	 * new java class.
-	 */
-	public static final String SUPERCLASS = "NewJavaClassDataModel.SUPERCLASS"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to set the visibility of the new java class. This is true
-	 * by default.
-	 */
-	public static final String MODIFIER_PUBLIC = "NewJavaClassDataModel.MODIFIER_PUBLIC"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to set whether the new java class is abstract.  This is false
-	 * by default.
-	 */
-	public static final String MODIFIER_ABSTRACT = "NewJavaClassDataModel.MODIFIER_ABSTRACT"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to set whether the new java class is declared final.  This is false
-	 * by default.
-	 */
-	public static final String MODIFIER_FINAL = "NewJavaClassDataModel.MODIFIER_FINAL"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, List property of all the qualified names of interfaces the new java class should implement.
-	 */
-	public static final String INTERFACES = "NewJavaClassDataModel.INTERFACES"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to set whether the new java class should generate a main method.  This
-	 * is false by default.
-	 */
-	public static final String MAIN_METHOD = "NewJavaClassDataModel.MAIN_METHOD"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to set whether or not the constructor from the superclass should be
-	 * generated in the new java class.  The default value is true.
-	 */
-	public static final String CONSTRUCTOR = "NewJavaClassDataModel.CONSTRUCTOR"; //$NON-NLS-1$
-	
-	/**
-	 * Optional, boolean property used to set whether the new java class should add method stubs for unimplemented
-	 * methods defined in the interfaces of the interface list.  This is true by default.
-	 */
-	public static final String ABSTRACT_METHODS = "NewJavaClassDataModel.ABSTRACT_METHODS"; //$NON-NLS-1$
-	
-	/**
-	 * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
-	 */
-	public static final String JAVA_PACKAGE_FRAGMENT_ROOT = "NewJavaClassDataModel.JAVA_PACKAGE_FRAGMENT_ROOT"; //$NON-NLS-1$
-	
-	/**
-	 * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
-	 */
-	public static final String JAVA_SOURCE_FOLDER = "NewJavaClassDataModel.JAVA_SOURCE_FOLDER"; //$NON-NLS-1$
-	
-	/**
-	 * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
-	 */
-	public static final String PROJECT = "NewJavaClassDataModel.PROJECT"; //$NON-NLS-1$
-	
-	/**
-	 * THIS PROPERTY SHOULD NOT BE SET, it's value is meant to be determined as a helper method
-	 */
-	public static final String QUALIFIED_CLASS_NAME = "NewJavaClassDataModel.QUALIFIED_CLASS_NAME"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java
deleted file mode 100644
index 16fa74fb1..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java
+++ /dev/null
@@ -1,195 +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.common.operations;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-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.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper;
-
-
-/**
- * Insert the type's description here. Creation date: (4/8/2001 10:13:52 PM)
- * 
- * @author: Administrator
- */
-public class J2EEModifierHelperCreator {
-
-	public static ModifierHelper createAssemblyDescriptorHelper(EJBJar anEJBJar) {
-		if (anEJBJar == null || anEJBJar.getAssemblyDescriptor() != null)
-			return null;
-		EjbPackage pack = EjbFactoryImpl.getPackage();
-		EStructuralFeature sf = pack.getEJBJar_AssemblyDescriptor();
-		return new ModifierHelper(anEJBJar, sf, null);
-	}
-
-	/**
-	 * return modifier helper that will create a method element with method type and param
-	 * associated with the methodSig and the methodpermission will be derived from the security
-	 * role.
-	 */
-
-	public static ModifierHelper createMethodElementAsCopyHelper(MethodElement element, SecurityRole role) {
-		if (role == null)
-			return null;
-		ModifierHelper tempHelper = new ModifierHelper();
-		setMethodPermissionOwnerHelper(tempHelper, role);
-		tempHelper.setFeature(getEjbPackage().getMethodPermission_MethodElements());
-		tempHelper.setValue(EtoolsCopyUtility.createCopy(element));
-		return tempHelper;
-	}
-
-	/**
-	 * return modifier helper that will create a method element with method type and param
-	 * associated with the methodSig and the methodpermission will be derived from the security
-	 * role.
-	 */
-
-	public static ModifierHelper createMethodElementHelper(EnterpriseBean bean, SecurityRole role, String methodType, String methodSig) {
-		if (role == null)
-			return null;
-		ModifierHelper tempHelper = new ModifierHelper();
-		setMethodPermissionOwnerHelper(tempHelper, role);
-		tempHelper.setFeature(getEjbPackage().getMethodPermission_MethodElements());
-		tempHelper.addAttribute(getEjbPackage().getMethodElement_Type(), methodType);
-		int index = methodSig.indexOf("(");//$NON-NLS-1$
-		String methodName = methodSig;
-		String methodParms = null;
-		if (index > -1) {
-			methodName = methodSig.substring(0, index);
-			methodParms = methodSig.substring(index + 1, methodSig.length() - 1);
-		}
-		if (methodParms != null)
-			methodParms = methodParms.replace(',', ' ');
-		tempHelper.addAttribute(getEjbPackage().getMethodElement_Name(), methodName);
-		if (methodParms != null)
-			tempHelper.addAttribute(getEjbPackage().getMethodElement_Parms(), methodParms);
-		tempHelper.addAttribute(getEjbPackage().getMethodElement_EnterpriseBean(), bean);
-		return tempHelper;
-	}
-
-	/**
-	 * return modifier helper that will create a method element with method type and param
-	 * associated with the methodSig and a new methodtransacton for a transtype.
-	 */
-
-	public static ModifierHelper createMethodElementHelper(EnterpriseBean bean, String methodType, String methodSig, String transType) {
-		if (bean == null)
-			return null;
-		ModifierHelper ownerHelper = createMethodTransactionHelper((EJBJar) bean.eContainer(), transType);
-		ModifierHelper tempHelper = new ModifierHelper();
-		tempHelper.setOwnerHelper(ownerHelper);
-		tempHelper.setFeature(getEjbPackage().getMethodTransaction_MethodElements());
-		tempHelper.addAttribute(getEjbPackage().getMethodElement_Type(), methodType);
-		int index = methodSig.indexOf("(");//$NON-NLS-1$
-		String methodName = methodSig;
-		String methodParms = null;
-		if (index > -1) {
-			methodName = methodSig.substring(0, index);
-			methodParms = methodSig.substring(index + 1, methodSig.length() - 1);
-		}
-		if (methodParms != null)
-			methodParms = methodParms.replace(',', ' ');
-		tempHelper.addAttribute(getEjbPackage().getMethodElement_Name(), methodName);
-		if (methodParms != null)
-			tempHelper.addAttribute(getEjbPackage().getMethodElement_Parms(), methodParms);
-		tempHelper.addAttribute(getEjbPackage().getMethodElement_EnterpriseBean(), bean);
-		return tempHelper;
-	}
-
-	public static ModifierHelper createMethodPermissionHelper(SecurityRole role) {
-
-		if (role == null)
-			return null;
-
-		AssemblyDescriptor assembly = (AssemblyDescriptor) role.eContainer();
-		EStructuralFeature sf = EjbPackage.eINSTANCE.getAssemblyDescriptor_MethodPermissions();
-		ModifierHelper tempHelper = new ModifierHelper(assembly, sf, null);
-		tempHelper.addAttribute(getEjbPackage().getMethodPermission_Roles(), role);
-		return tempHelper;
-	}
-
-	/**
-	 * Create a helper that will create a new MethodTransaction with
-	 * 
-	 * @aTransType.
-	 */
-	public static ModifierHelper createMethodTransactionHelper(EJBJar anEJBJar, String aTransType) {
-		if (anEJBJar == null)
-			return null;
-		ModifierHelper helper = new ModifierHelper();
-		setAssemblyDescriptorOwnerHelper(helper, anEJBJar);
-		helper.setFeature(getEjbPackage().getAssemblyDescriptor_MethodTransactions());
-		helper.addAttribute(getEjbPackage().getMethodTransaction_TransactionAttribute(), aTransType);
-		return helper;
-	}
-
-
-
-	protected static CommonPackage getCommonPackage() {
-		return CommonPackage.eINSTANCE;
-	}
-
-	protected static EjbPackage getEjbPackage() {
-		return EjbFactoryImpl.getPackage();
-	}
-
-	/**
-	 * Set the owner of
-	 * 
-	 * @helper to be the existing AssemblyDescriptor from
-	 * @anEJBJar or set the ownerHelper of
-	 * @helper for the creation of a new AssemblyDescriptor when one does not exist.
-	 */
-	public static void setAssemblyDescriptorOwnerHelper(ModifierHelper helper, EJBJar anEJBJar) {
-		ModifierHelper ownerHelper = J2EEModifierHelperCreator.createAssemblyDescriptorHelper(anEJBJar);
-		if (ownerHelper == null)
-			helper.setOwner(anEJBJar.getAssemblyDescriptor());
-		else
-			helper.setOwnerHelper(ownerHelper);
-	}
-
-	/**
-	 * Set the owner of
-	 * 
-	 * @helper to be the existing AssemblyDescriptor from
-	 * @anEJBJar or set the ownerHelper of
-	 * @helper for the creation of a new AssemblyDescriptor when one does not exist.
-	 */
-	public static void setMethodPermissionOwnerHelper(ModifierHelper helper, SecurityRole role) {
-		List roleList = new ArrayList(1);
-		roleList.add(role);
-		MethodPermission permission = ((AssemblyDescriptor) role.eContainer()).getMethodPermission(roleList);
-		ModifierHelper ownerHelper = null;
-		if (permission == null)
-			ownerHelper = J2EEModifierHelperCreator.createMethodPermissionHelper(role);
-
-		if (ownerHelper == null)
-			helper.setOwner(permission);
-		else
-			helper.setOwnerHelper(ownerHelper);
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
deleted file mode 100644
index a940e1f8c..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
- * 
- * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
- *             containers
- */
-public interface JARDependencyDataModelProperties {
-
-	/**
-	 * String, the ear project name, required
-	 */
-	public static final String EAR_PROJECT_NAME = "AbstractJARDependencyDataModel.EAR_PROJECT_NAME"; //$NON-NLS-1$
-
-	public static final String REFERENCED_PROJECT_NAME = "AbstractJARDependencyDataModel.REFERENCED_PROJECT_NAME"; //$NON-NLS-1$
-
-	/**
-	 * nested, required
-	 */
-	public static final String PROJECT_NAME = UpdateManifestDataModelProperties.PROJECT_NAME;
-
-
-	/**
-	 * Used for client JAR dependency inversion
-	 */
-	public static final String OPPOSITE_PROJECT_NAME = "AbstractJARDependencyDataModel.OPPOSITE_PROJECT_NAME"; //$NON-NLS-1$
-
-	/**
-	 * nested
-	 */
-	public static final String JAR_LIST = UpdateManifestDataModelProperties.JAR_LIST;
-
-	/**
-	 * type Integer, default JAR_MANIPULATION_ADD, other possible values are JAR_MANIPULATION_REMOVE
-	 * and JAR_MANIPULATION_INVERT
-	 */
-	public static final String JAR_MANIPULATION_TYPE = "AbstractJARDependencyDataModel.JAR_MANIPULATION_TYPE"; //$NON-NLS-1$
-	
-	public static final String NESTED_MODEL_UPDATE_MAINFEST = "AbstractJARDependencyDataModel.NESTED_MODEL_UPDATE_MAINFEST"; //$NON-NLS-1$
-
-	public static final int JAR_MANIPULATION_ADD = 0;
-	public static final int JAR_MANIPULATION_REMOVE = 1;
-	public static final int JAR_MANIPULATION_INVERT = 2;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
deleted file mode 100644
index 7423a5a50..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
+++ /dev/null
@@ -1,82 +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 Dec 2, 2003
- * 
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-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.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
- * 
- * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
- *             containers
- */
-public class JARDependencyDataModelProvider extends AbstractDataModelProvider implements JARDependencyDataModelProperties {
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EAR_PROJECT_NAME);
-		propertyNames.add(REFERENCED_PROJECT_NAME);
-		propertyNames.add(JAR_MANIPULATION_TYPE);
-		propertyNames.add(OPPOSITE_PROJECT_NAME);
-		return propertyNames;
-	}
-
-	public void init() {
-		super.init();
-		IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
-		model.addNestedModel(NESTED_MODEL_UPDATE_MAINFEST, updateManifestDataModel);
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(JAR_MANIPULATION_TYPE)) {
-			return new Integer(JAR_MANIPULATION_ADD);
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public IProject getEARProject() {
-		return ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
-	}
-
-	/**
-	 * @return
-	 */
-	public IDataModel getUpdateManifestDataModel() {
-		return model.getNestedModel(NESTED_MODEL_UPDATE_MAINFEST);
-	}
-
-	public IProject getReferencedProject() {
-		return ProjectUtilities.getProject(getStringProperty(REFERENCED_PROJECT_NAME));
-	}
-
-	public IProject getOppositeProject() {
-		return ProjectUtilities.getProject(getStringProperty(OPPOSITE_PROJECT_NAME));
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new JARDependencyOperation(model);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
deleted file mode 100644
index fce366868..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
+++ /dev/null
@@ -1,179 +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 2, 2003
- *  
- */
-package org.eclipse.jst.j2ee.internal.common.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestOperation;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-/**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
- * 
- * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
- *             containers
- */
-public class JARDependencyOperation extends AbstractDataModelOperation implements JARDependencyDataModelProperties{
-	public JARDependencyOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	private void saveModel(ClasspathModel model, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, CoreException {
-		if (!model.isDirty())
-			return;
-		validateEdit(model);
-		monitor.beginTask("", 2); //$NON-NLS-1$
-		org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestOperation mfOperation = createManifestOperation(model);
-		IHeadlessRunnableWithProgress buildPathOperation = createBuildPathOperation(model);
-		try {
-			mfOperation.execute(new SubProgressMonitor(monitor, 1), null);
-			// No longer manipulating build path... containers will calculate
-			//buildPathOperation.run(new SubProgressMonitor(monitor, 1));
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * @param model
-	 */
-	protected void validateEdit(ClasspathModel aModel) throws CoreException {
-		Set affectedFiles = aModel.getAffectedFiles();
-		IFile[] files = (IFile[]) affectedFiles.toArray(new IFile[affectedFiles.size()]);
-		IStatus result = J2EEPlugin.getWorkspace().validateEdit(files, null);
-		if (!result.isOK())
-			throw new CoreException(result);
-	}
-
-	protected UpdateJavaBuildPathOperation createBuildPathOperation(ClasspathModel aModel) {
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(aModel.getProject());
-		return new UpdateJavaBuildPathOperation(javaProject, aModel.getClassPathSelection());
-	}
-
-	private UpdateManifestOperation createManifestOperation(ClasspathModel aModel) {
-		IDataModel updateManifestDataModel = DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class);
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, aModel.getProject().getName());
-		updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, UpdateManifestDataModelProvider.convertClasspathStringToList(aModel.getClassPathSelection().toString()));
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, J2EEProjectUtilities.getManifestFile( aModel.getProject()));
-		return new UpdateManifestOperation(updateManifestDataModel);
-	}
-
-	
-	public final IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) throws ExecutionException {
-		
-		IProject proj = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.PROJECT_NAME));
-		IProject earProject = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.EAR_PROJECT_NAME)); 
-		
-		ClasspathModel clpModel = new ClasspathModel(null);
-		IVirtualComponent earComponent = ComponentCore.createComponent( earProject );
-		if( !earComponent.exists() )
-			return OK_STATUS;
-		
-		clpModel.setSelectedEARComponent( earComponent );
-		clpModel.setProject( proj );
-		
-		try {
-			int jarManipulationType = model.getIntProperty(JARDependencyDataModelProperties.JAR_MANIPULATION_TYPE);
-			switch (jarManipulationType) {
-				case JARDependencyDataModelProperties.JAR_MANIPULATION_ADD :
-					{
-						List jarList = (List) model.getNestedModel(NESTED_MODEL_UPDATE_MAINFEST).getProperty(UpdateManifestDataModelProperties.JAR_LIST);
-						if (!jarList.isEmpty()) {
-							for (int i = 0; i < jarList.size(); i++) {
-								String jarName = (String) jarList.get(i);
-								clpModel.selectDependencyIfNecessary(jarName);
-							}
-						} else {
-							IProject refproj = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME));							
-							clpModel.selectDependencyIfNecessary( refproj );
-						}
-					}
-					break;
-					
-				case JARDependencyDataModelProperties.JAR_MANIPULATION_REMOVE : 
-					{
-						List jarList = (List) model.getNestedModel(NESTED_MODEL_UPDATE_MAINFEST).getProperty(UpdateManifestDataModelProperties.JAR_LIST);
-						for (int i = 0; i < jarList.size(); i++) {
-							String jarName = (String) jarList.get(i);
-							clpModel.removeDependency(jarName);
-						}
-					}
-					break;
-					
-				case JARDependencyDataModelProperties.JAR_MANIPULATION_INVERT :
-					{
-						IProject refproj = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.REFERENCED_PROJECT_NAME));
-						IProject oppositeProject = ProjectUtilities.getProject(model.getStringProperty(JARDependencyDataModelProperties.OPPOSITE_PROJECT_NAME));
-						clpModel.getClassPathSelection().invertClientJARSelection( refproj, oppositeProject );
-					}
-					break;
-
-			}
-			if (clpModel.isDirty())
-				try {
-					saveModel(clpModel, monitor);
-				} catch (InvocationTargetException e) {
-					Logger.getLogger().logError(e);
-				} catch (InterruptedException e) {
-					Logger.getLogger().logError(e);
-				} catch (CoreException e) {
-					Logger.getLogger().logError(e);
-				}			
-		} finally {
-			if (clpModel != null)
-				clpModel.dispose();			
-			if (monitor != null)
-				monitor.done();
-		}
-		return OK_STATUS;
-	}	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
deleted file mode 100644
index ec80d61da..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
+++ /dev/null
@@ -1,773 +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 Apr 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.common.operations;
-
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportContainer;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.compiler.CharOperation;
-
-//TODO this is a copy of the class in org.eclipse.jdt.ui and should be deleted once bugzilla 60567
-// is addressed
-/**
- * 
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class JavaModelUtil {
-	/**
-	 * Finds a type by its qualified type name (dot separated).
-	 * 
-	 * @param jproject
-	 *            The java project to search in
-	 * @param fullyQualifiedName
-	 *            The fully qualified name (type name with enclosing type names and package (all
-	 *            separated by dots))
-	 * @return The type found, or null if not existing
-	 */
-	public static IType findType(IJavaProject jproject, String fullyQualifiedName) throws JavaModelException {
-		//workaround for bug 22883
-		IType type = jproject.findType(fullyQualifiedName);
-		if (type != null)
-			return type;
-		IPackageFragmentRoot[] roots = jproject.getPackageFragmentRoots();
-		for (int i = 0; i < roots.length; i++) {
-			IPackageFragmentRoot root = roots[i];
-			type = findType(root, fullyQualifiedName);
-			if (type != null && type.exists())
-				return type;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns <code>true</code> if the given package fragment root is referenced. This means it
-	 * is own by a different project but is referenced by the root's parent. Returns
-	 * <code>false</code> if the given root doesn't have an underlying resource.
-	 */
-	public static boolean isReferenced(IPackageFragmentRoot root) {
-		IResource resource = root.getResource();
-		if (resource != null) {
-			IProject jarProject = resource.getProject();
-			IProject container = root.getJavaProject().getProject();
-			return !container.equals(jarProject);
-		}
-		return false;
-	}
-
-	private static IType findType(IPackageFragmentRoot root, String fullyQualifiedName) throws JavaModelException {
-		IJavaElement[] children = root.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IJavaElement element = children[i];
-			if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
-				IPackageFragment pack = (IPackageFragment) element;
-				if (!fullyQualifiedName.startsWith(pack.getElementName()))
-					continue;
-				IType type = findType(pack, fullyQualifiedName);
-				if (type != null && type.exists())
-					return type;
-			}
-		}
-		return null;
-	}
-
-	private static IType findType(IPackageFragment pack, String fullyQualifiedName) throws JavaModelException {
-		ICompilationUnit[] cus = pack.getCompilationUnits();
-		for (int i = 0; i < cus.length; i++) {
-			ICompilationUnit unit = cus[i];
-			IType type = findType(unit, fullyQualifiedName);
-			if (type != null && type.exists())
-				return type;
-		}
-		return null;
-	}
-
-	private static IType findType(ICompilationUnit cu, String fullyQualifiedName) throws JavaModelException {
-		IType[] types = cu.getAllTypes();
-		for (int i = 0; i < types.length; i++) {
-			IType type = types[i];
-			if (getFullyQualifiedName(type).equals(fullyQualifiedName))
-				return type;
-		}
-		return null;
-	}
-
-	/**
-	 * Finds a type by package and type name.
-	 * 
-	 * @param jproject
-	 *            the java project to search in
-	 * @param pack
-	 *            The package name
-	 * @param typeQualifiedName
-	 *            the type qualified name (type name with enclosing type names (separated by dots))
-	 * @return the type found, or null if not existing
-	 * @deprecated Use IJavaProject.findType(String, String) instead
-	 */
-	public static IType findType(IJavaProject jproject, String pack, String typeQualifiedName) throws JavaModelException {
-		return jproject.findType(pack, typeQualifiedName);
-	}
-
-	/**
-	 * Finds a type container by container name. The returned element will be of type
-	 * <code>IType</code> or a <code>IPackageFragment</code>.<code>null</code> is returned
-	 * if the type container could not be found.
-	 * 
-	 * @param jproject
-	 *            The Java project defining the context to search
-	 * @param typeContainerName
-	 *            A dot separarted name of the type container
-	 * @see #getTypeContainerName(IType)
-	 */
-	public static IJavaElement findTypeContainer(IJavaProject jproject, String typeContainerName) throws JavaModelException {
-		// try to find it as type
-		IJavaElement result = jproject.findType(typeContainerName);
-		if (result == null) {
-			// find it as package
-			IPath path = new Path(typeContainerName.replace('.', '/'));
-			result = jproject.findElement(path);
-			if (!(result instanceof IPackageFragment)) {
-				result = null;
-			}
-
-		}
-		return result;
-	}
-
-	/**
-	 * Finds a type in a compilation unit. Typical usage is to find the corresponding type in a
-	 * working copy.
-	 * 
-	 * @param cu
-	 *            the compilation unit to search in
-	 * @param typeQualifiedName
-	 *            the type qualified name (type name with enclosing type names (separated by dots))
-	 * @return the type found, or null if not existing
-	 */
-	public static IType findTypeInCompilationUnit(ICompilationUnit cu, String typeQualifiedName) throws JavaModelException {
-		IType[] types = cu.getAllTypes();
-		for (int i = 0; i < types.length; i++) {
-			String currName = getTypeQualifiedName(types[i]);
-			if (typeQualifiedName.equals(currName)) {
-				return types[i];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Finds a a member in a compilation unit. Typical usage is to find the corresponding member in
-	 * a working copy.
-	 * 
-	 * @param cu
-	 *            the compilation unit (eg. working copy) to search in
-	 * @param member
-	 *            the member (eg. from the original)
-	 * @return the member found, or null if not existing
-	 */
-	public static IMember findMemberInCompilationUnit(ICompilationUnit cu, IMember member) {
-		IJavaElement[] elements = cu.findElements(member);
-		if (elements != null && elements.length > 0) {
-			return (IMember) elements[0];
-		}
-		return null;
-	}
-
-
-	/**
-	 * Returns the element of the given compilation unit which is "equal" to the given element. Note
-	 * that the given element usually has a parent different from the given compilation unit.
-	 * 
-	 * @param cu
-	 *            the cu to search in
-	 * @param element
-	 *            the element to look for
-	 * @return an element of the given cu "equal" to the given element
-	 */
-	public static IJavaElement findInCompilationUnit(ICompilationUnit cu, IJavaElement element) {
-		IJavaElement[] elements = cu.findElements(element);
-		if (elements != null && elements.length > 0) {
-			return elements[0];
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the qualified type name of the given type using '.' as separators. This is a replace
-	 * for IType.getTypeQualifiedName() which uses '$' as separators. As '$' is also a valid
-	 * character in an id this is ambiguous. JavaCore PR: 1GCFUNT
-	 */
-	public static String getTypeQualifiedName(IType type) {
-		return type.getTypeQualifiedName('.');
-	}
-
-	/**
-	 * Returns the fully qualified name of the given type using '.' as separators. This is a replace
-	 * for IType.getFullyQualifiedTypeName which uses '$' as separators. As '$' is also a valid
-	 * character in an id this is ambiguous. JavaCore PR: 1GCFUNT
-	 */
-	public static String getFullyQualifiedName(IType type) {
-		return type.getFullyQualifiedName('.');
-	}
-
-	/**
-	 * Returns the fully qualified name of a type's container. (package name or enclosing type name)
-	 */
-	public static String getTypeContainerName(IType type) {
-		IType outerType = type.getDeclaringType();
-		if (outerType != null) {
-			return outerType.getFullyQualifiedName('.');
-		}
-		return type.getPackageFragment().getElementName();
-	}
-
-
-	/**
-	 * Concatenates two names. Uses a dot for separation. Both strings can be empty or
-	 * <code>null</code>.
-	 */
-	public static String concatenateName(String name1, String name2) {
-		StringBuffer buf = new StringBuffer();
-		if (name1 != null && name1.length() > 0) {
-			buf.append(name1);
-		}
-		if (name2 != null && name2.length() > 0) {
-			if (buf.length() > 0) {
-				buf.append('.');
-			}
-			buf.append(name2);
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Concatenates two names. Uses a dot for separation. Both strings can be empty or
-	 * <code>null</code>.
-	 */
-	public static String concatenateName(char[] name1, char[] name2) {
-		StringBuffer buf = new StringBuffer();
-		if (name1 != null && name1.length > 0) {
-			buf.append(name1);
-		}
-		if (name2 != null && name2.length > 0) {
-			if (buf.length() > 0) {
-				buf.append('.');
-			}
-			buf.append(name2);
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Evaluates if a member (possible from another package) is visible from elements in a package.
-	 * 
-	 * @param member
-	 *            The member to test the visibility for
-	 * @param pack
-	 *            The package in focus
-	 */
-	public static boolean isVisible(IMember member, IPackageFragment pack) throws JavaModelException {
-
-		int type = member.getElementType();
-		if (type == IJavaElement.INITIALIZER || (type == IJavaElement.METHOD && member.getElementName().startsWith("<"))) { //$NON-NLS-1$
-			return false;
-		}
-
-		int otherflags = member.getFlags();
-		IType declaringType = member.getDeclaringType();
-		if (Flags.isPublic(otherflags) || (declaringType != null && declaringType.isInterface())) {
-			return true;
-		} else if (Flags.isPrivate(otherflags)) {
-			return false;
-		}
-
-		IPackageFragment otherpack = (IPackageFragment) findParentOfKind(member, IJavaElement.PACKAGE_FRAGMENT);
-		return (pack != null && otherpack != null && isSamePackage(pack, otherpack));
-	}
-
-	/**
-	 * Evaluates if a member in the focus' element hierarchy is visible from elements in a package.
-	 * 
-	 * @param member
-	 *            The member to test the visibility for
-	 * @param pack
-	 *            The package of the focus element focus
-	 */
-	public static boolean isVisibleInHierarchy(IMember member, IPackageFragment pack) throws JavaModelException {
-		int type = member.getElementType();
-		if (type == IJavaElement.INITIALIZER || (type == IJavaElement.METHOD && member.getElementName().startsWith("<"))) { //$NON-NLS-1$
-			return false;
-		}
-
-		int otherflags = member.getFlags();
-
-		IType declaringType = member.getDeclaringType();
-		if (Flags.isPublic(otherflags) || Flags.isProtected(otherflags) || (declaringType != null && declaringType.isInterface())) {
-			return true;
-		} else if (Flags.isPrivate(otherflags)) {
-			return false;
-		}
-
-		IPackageFragment otherpack = (IPackageFragment) findParentOfKind(member, IJavaElement.PACKAGE_FRAGMENT);
-		return (pack != null && pack.equals(otherpack));
-	}
-
-
-	/**
-	 * Returns the package fragment root of <code>IJavaElement</code>. If the given element is
-	 * already a package fragment root, the element itself is returned.
-	 */
-	public static IPackageFragmentRoot getPackageFragmentRoot(IJavaElement element) {
-		return (IPackageFragmentRoot) element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-	}
-
-	/**
-	 * Returns the parent of the supplied java element that conforms to the given parent type or
-	 * <code>null</code>, if such a parent doesn't exit.
-	 * 
-	 * @deprecated Use element.getParent().getAncestor(kind);
-	 */
-	public static IJavaElement findParentOfKind(IJavaElement element, int kind) {
-		if (element != null && element.getParent() != null) {
-			return element.getParent().getAncestor(kind);
-		}
-		return null;
-	}
-
-	/**
-	 * Finds a method in a type. This searches for a method with the same name and signature.
-	 * Parameter types are only compared by the simple name, no resolving for the fully qualified
-	 * type name is done. Constructors are only compared by parameters, not the name.
-	 * 
-	 * @param name
-	 *            The name of the method to find
-	 * @param paramTypes
-	 *            The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
-	 * @param isConstructor
-	 *            If the method is a constructor
-	 * @return The first found method or <code>null</code>, if nothing found
-	 */
-	public static IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IType type) throws JavaModelException {
-		return findMethod(name, paramTypes, isConstructor, type.getMethods());
-	}
-
-	/**
-	 * Finds a method by name. This searches for a method with a name and signature. Parameter types
-	 * are only compared by the simple name, no resolving for the fully qualified type name is done.
-	 * Constructors are only compared by parameters, not the name.
-	 * 
-	 * @param name
-	 *            The name of the method to find
-	 * @param paramTypes
-	 *            The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
-	 * @param isConstructor
-	 *            If the method is a constructor
-	 * @param methods
-	 *            The methods to search in
-	 * @return The found method or <code>null</code>, if nothing found
-	 */
-	public static IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IMethod[] methods) throws JavaModelException {
-		for (int i = methods.length - 1; i >= 0; i--) {
-			if (isSameMethodSignature(name, paramTypes, isConstructor, methods[i])) {
-				return methods[i];
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * Finds a method declararion in a type's hierarchy. The search is top down, so this returns the
-	 * first declaration of the method in the hierarchy. This searches for a method with a name and
-	 * signature. Parameter types are only compared by the simple name, no resolving for the fully
-	 * qualified type name is done. Constructors are only compared by parameters, not the name.
-	 * 
-	 * @param type
-	 *            Searches in this type's supertypes.
-	 * @param name
-	 *            The name of the method to find
-	 * @param paramTypes
-	 *            The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
-	 * @param isConstructor
-	 *            If the method is a constructor
-	 * @return The first method found or null, if nothing found
-	 */
-	public static IMethod findMethodDeclarationInHierarchy(ITypeHierarchy hierarchy, IType type, String name, String[] paramTypes, boolean isConstructor) throws JavaModelException {
-		IType[] superTypes = hierarchy.getAllSupertypes(type);
-		for (int i = superTypes.length - 1; i >= 0; i--) {
-			IMethod first = findMethod(name, paramTypes, isConstructor, superTypes[i]);
-			if (first != null && !Flags.isPrivate(first.getFlags())) {
-				// the order getAllSupertypes does make assumptions of the order of inner elements
-				// -> search recursivly
-				IMethod res = findMethodDeclarationInHierarchy(hierarchy, first.getDeclaringType(), name, paramTypes, isConstructor);
-				if (res != null) {
-					return res;
-				}
-				return first;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Finds a method implementation in a type's classhierarchy. The search is bottom-up, so this
-	 * returns the nearest overridden method. Does not find methods in interfaces or abstract
-	 * methods. This searches for a method with a name and signature. Parameter types are only
-	 * compared by the simple name, no resolving for the fully qualified type name is done.
-	 * Constructors are only compared by parameters, not the name.
-	 * 
-	 * @param type
-	 *            Type to search the superclasses
-	 * @param name
-	 *            The name of the method to find
-	 * @param paramTypes
-	 *            The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
-	 * @param isConstructor
-	 *            If the method is a constructor
-	 * @return The first method found or null, if nothing found
-	 */
-	public static IMethod findMethodImplementationInHierarchy(ITypeHierarchy hierarchy, IType type, String name, String[] paramTypes, boolean isConstructor) throws JavaModelException {
-		IType[] superTypes = hierarchy.getAllSuperclasses(type);
-		for (int i = 0; i < superTypes.length; i++) {
-			IMethod found = findMethod(name, paramTypes, isConstructor, superTypes[i]);
-			if (found != null) {
-				if (Flags.isAbstract(found.getFlags())) {
-					return null;
-				}
-				return found;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Tests if a method equals to the given signature. Parameter types are only compared by the
-	 * simple name, no resolving for the fully qualified type name is done. Constructors are only
-	 * compared by parameters, not the name.
-	 * 
-	 * @param name
-	 *            Name of the method
-	 * @param paramTypes
-	 *            The type signatures of the parameters e.g. <code>{"QString;","I"}</code>
-	 * @param isConstructor
-	 *            Specifies if the method is a constructor
-	 * @return Returns <code>true</code> if the method has the given name and parameter types and
-	 *         constructor state.
-	 */
-	public static boolean isSameMethodSignature(String name, String[] paramTypes, boolean isConstructor, IMethod curr) throws JavaModelException {
-		if (isConstructor || name.equals(curr.getElementName())) {
-			if (isConstructor == curr.isConstructor()) {
-				String[] currParamTypes = curr.getParameterTypes();
-				if (paramTypes.length == currParamTypes.length) {
-					for (int i = 0; i < paramTypes.length; i++) {
-						String t1 = Signature.getSimpleName(Signature.toString(paramTypes[i]));
-						String t2 = Signature.getSimpleName(Signature.toString(currParamTypes[i]));
-						if (!t1.equals(t2)) {
-							return false;
-						}
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Tests if two <code>IPackageFragment</code> s represent the same logical java package.
-	 * 
-	 * @return <code>true</code> if the package fragments' names are equal.
-	 */
-	public static boolean isSamePackage(IPackageFragment pack1, IPackageFragment pack2) {
-		return pack1.getElementName().equals(pack2.getElementName());
-	}
-
-	/**
-	 * Checks whether the given type has a valid main method or not.
-	 */
-	public static boolean hasMainMethod(IType type) throws JavaModelException {
-		IMethod[] methods = type.getMethods();
-		for (int i = 0; i < methods.length; i++) {
-			if (methods[i].isMainMethod()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if the field is boolean.
-	 */
-	public static boolean isBoolean(IField field) throws JavaModelException {
-		return field.getTypeSignature().equals(Signature.SIG_BOOLEAN);
-	}
-
-	/**
-	 * Returns true if the element is on the build path of the given project
-	 * 
-	 * @deprecated Use jproject.isOnClasspath(element);
-	 */
-	public static boolean isOnBuildPath(IJavaProject jproject, IJavaElement element) {
-		return jproject.isOnClasspath(element);
-	}
-
-	/**
-	 * Tests if the given element is on the class path of its containing project. Handles the case
-	 * that the containing project isn't a Java project.
-	 */
-	public static boolean isOnClasspath(IJavaElement element) {
-		IJavaProject project = element.getJavaProject();
-		if (!project.exists())
-			return false;
-		return project.isOnClasspath(element);
-	}
-
-	/**
-	 * Resolves a type name in the context of the declaring type.
-	 * 
-	 * @param refTypeSig
-	 *            the type name in signature notation (for example 'QVector') this can also be an
-	 *            array type, but dimensions will be ignored.
-	 * @param declaringType
-	 *            the context for resolving (type where the reference was made in)
-	 * @return returns the fully qualified type name or build-in-type name. if a unresoved type
-	 *         couldn't be resolved null is returned
-	 */
-	public static String getResolvedTypeName(String refTypeSig, IType declaringType) throws JavaModelException {
-		int arrayCount = Signature.getArrayCount(refTypeSig);
-		char type = refTypeSig.charAt(arrayCount);
-		if (type == Signature.C_UNRESOLVED) {
-			int semi = refTypeSig.indexOf(Signature.C_SEMICOLON, arrayCount + 1);
-			if (semi == -1) {
-				throw new IllegalArgumentException();
-			}
-			String name = refTypeSig.substring(arrayCount + 1, semi);
-
-			String[][] resolvedNames = declaringType.resolveType(name);
-			if (resolvedNames != null && resolvedNames.length > 0) {
-				return concatenateName(resolvedNames[0][0], resolvedNames[0][1]);
-			}
-			return null;
-		}
-		return Signature.toString(refTypeSig.substring(arrayCount));
-	}
-
-	/**
-	 * Returns if a CU can be edited.
-	 */
-	public static boolean isEditable(ICompilationUnit cu) {
-		IResource resource = toOriginal(cu).getResource();
-		return (resource.exists() && !resource.getResourceAttributes().isReadOnly());
-	}
-
-	/**
-	 * Finds a qualified import for a type name.
-	 */
-	public static IImportDeclaration findImport(ICompilationUnit cu, String simpleName) throws JavaModelException {
-		IImportDeclaration[] existing = cu.getImports();
-		for (int i = 0; i < existing.length; i++) {
-			String curr = existing[i].getElementName();
-			if (curr.endsWith(simpleName)) {
-				int dotPos = curr.length() - simpleName.length() - 1;
-				if ((dotPos == -1) || (dotPos > 0 && curr.charAt(dotPos) == '.')) {
-					return existing[i];
-				}
-			}
-		}
-		return null;
-	}
-
-	//private static boolean PRIMARY_ONLY = false;
-
-
-
-	/**
-	 * Returns the original element if the given element is a working copy. If the cu is already an
-	 * original the input element is returned. The returned element might not exist
-	 */
-	public static IJavaElement toOriginal(IJavaElement element) {
-		return element.getPrimaryElement();
-	}
-
-	/**
-	 * @deprecated Inline this method.
-	 */
-	public static IMember toWorkingCopy(IMember member) {
-		return member;
-	}
-
-	/**
-	 * @deprecated Inline this method.
-	 */
-	public static IPackageDeclaration toWorkingCopy(IPackageDeclaration declaration) {
-		return declaration;
-	}
-
-	/**
-	 * @deprecated Inline this method.
-	 */
-	public static IJavaElement toWorkingCopy(IJavaElement elem) {
-		return elem;
-	}
-
-	/**
-	 * @deprecated Inline this method.
-	 */
-	public static IImportContainer toWorkingCopy(IImportContainer container) {
-		return container;
-
-	}
-
-	/**
-	 * @deprecated Inline this method.
-	 */
-	public static IImportDeclaration toWorkingCopy(IImportDeclaration importDeclaration) {
-		return importDeclaration;
-	}
-
-
-	/**
-	 * @deprecated Inline this method.
-	 */
-	public static ICompilationUnit toWorkingCopy(ICompilationUnit cu) {
-		return cu;
-	}
-
-	/**
-	 * Returns true if a cu is a primary cu (original or shared working copy)
-	 */
-	public static boolean isPrimary(ICompilationUnit cu) {
-		return cu.getOwner() == null;
-	}
-
-
-	/*
-	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
-	 * 
-	 * Reconciling happens in a separate thread. This can cause a situation where the Java element
-	 * gets disposed after an exists test has been done. So we should not log not present exceptions
-	 * when they happen in working copies.
-	 */
-	public static boolean filterNotPresentException(CoreException exception) {
-		if (!(exception instanceof JavaModelException))
-			return true;
-		JavaModelException je = (JavaModelException) exception;
-		if (!je.isDoesNotExist())
-			return true;
-		IJavaElement[] elements = je.getJavaModelStatus().getElements();
-		for (int i = 0; i < elements.length; i++) {
-			IJavaElement element = elements[i];
-			ICompilationUnit unit = (ICompilationUnit) element.getAncestor(IJavaElement.COMPILATION_UNIT);
-			if (unit == null)
-				return true;
-			if (!unit.isWorkingCopy())
-				return true;
-		}
-		return false;
-	}
-
-	public static IType[] getAllSuperTypes(IType type, IProgressMonitor pm) throws JavaModelException {
-		//workaround for 23656
-		Set types = new HashSet(Arrays.asList(type.newSupertypeHierarchy(pm).getAllSupertypes(type)));
-		IType objekt = type.getJavaProject().findType("java.lang.Object");//$NON-NLS-1$
-		if (objekt != null)
-			types.add(objekt);
-		return (IType[]) types.toArray(new IType[types.size()]);
-	}
-
-	public static boolean isExcludedPath(IPath resourcePath, IPath[] exclusionPatterns) {
-		char[] path = resourcePath.toString().toCharArray();
-		for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
-			char[] pattern = exclusionPatterns[i].toString().toCharArray();
-			if (CharOperation.pathMatch(pattern, path, true, '/')) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/*
-	 * Returns whether the given resource path matches one of the exclusion patterns.
-	 * 
-	 * @see IClasspathEntry#getExclusionPatterns
-	 */
-	public final static boolean isExcluded(IPath resourcePath, char[][] exclusionPatterns) {
-		if (exclusionPatterns == null)
-			return false;
-		char[] path = resourcePath.toString().toCharArray();
-		for (int i = 0, length = exclusionPatterns.length; i < length; i++)
-			if (CharOperation.pathMatch(exclusionPatterns[i], path, true, '/'))
-				return true;
-		return false;
-	}
-
-
-	/**
-	 * Force a reconcile of a compilation unit.
-	 * 
-	 * @param unit
-	 */
-	public static void reconcile(ICompilationUnit unit) throws JavaModelException {
-		synchronized (unit) {
-			unit.reconcile();
-		}
-	}
-
-	private static Boolean fgIsJDTCore_1_5 = null;
-
-	/**
-	 * Return true if JRE 1.5 in enabled.
-	 */
-	public static boolean isJDTCore_1_5() {
-		if (fgIsJDTCore_1_5 == null) {
-			fgIsJDTCore_1_5 = new Boolean(JavaCore.getDefaultOptions().containsKey("org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation")); //$NON-NLS-1$
-		}
-		return fgIsJDTCore_1_5.booleanValue();
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java
deleted file mode 100644
index b1277f768..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java
+++ /dev/null
@@ -1,523 +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.common.operations;
-
-import java.lang.reflect.Modifier;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditOperationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * This data model provider is a subclass of AbstractDataModelProvider and follows the
- * IDataModelOperation and Data Model Wizard frameworks.
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider
- * 
- * This data model provider extends the ArtifactEditOperationDataModelProvider to get project name
- * and artifact edit information that during the operation, the artifact edit model can be used to
- * save changes.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditOperationDataModelProvider
- * 
- * The NewJavaClassDataModelProvider is used to store all the base properties which would be needed
- * to generate a new instance of a java class. Validations for these properties such as class name,
- * package name, superclass, and modifiers are also provided.
- * 
- * The INewJavaClassDataModelProperties is implemented to store all of the property names.
- * @see org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties
- * 
- * Clients must subclass this data model provider and the properties interface to use it and to
- * cache and provide their own specific attributes. They should also provide their own validation
- * methods and default values for the properties they add.
- * 
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewJavaClassDataModelProvider extends ArtifactEditOperationDataModelProvider implements INewJavaClassDataModelProperties {
-
-	/**
-	 * Subclasses may extend this method to perform their own validation. This method should not
-	 * return null. It does not accept null as a parameter.
-	 * 
-	 * @see NewJavaClassDataModelProvider#validate(String)
-	 * 
-	 * @param folderFullPath
-	 * @return IStatus
-	 */
-	protected IStatus validateJavaSourceFolder(String folderFullPath) {
-		// Ensure that the source folder path is not empty
-		if (folderFullPath == null || folderFullPath.length() == 0) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NAME_EMPTY;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// Ensure that the source folder path is absolute
-		else if (!new Path(folderFullPath).isAbsolute()) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_ABSOLUTE;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		IProject project = getTargetProject();
-		// Ensure project is not closed
-		if (project == null) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_EXIST;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// Ensure project is accessible.
-		if (!project.isAccessible()) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_EXIST;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// Ensure the project is a java project.
-		try {
-			if (!project.hasNature(JavaCore.NATURE_ID)) {
-				String msg = J2EECommonMessages.ERR_JAVA_CLASS_NOT_JAVA_PROJECT;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-		} catch (CoreException e) {
-			Logger.getLogger().log(e);
-		}
-		// Ensure the selected folder is a valid java source folder for the component
-		IFolder sourcefolder = getJavaSourceFolder();
-		if (sourcefolder == null || (sourcefolder != null && !sourcefolder.getFullPath().equals(new Path(folderFullPath)))) {
-			String msg = J2EECommonMessages.getResourceString(J2EECommonMessages.ERR_JAVA_CLASS_FOLDER_NOT_SOURCE, new String[]{folderFullPath});
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// Valid source is selected
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * Subclasses may extend this method to perform their own retrieval of a default java source
-	 * folder. This implementation returns the first source folder in the project for the component.
-	 * This method may return null.
-	 * 
-	 * @return IFolder instance of default java source folder
-	 */
-	protected IFolder getDefaultJavaSourceFolder() {
-		IProject project = getTargetProject();
-		if (project == null)
-			return null;
-		IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
-		// Try and return the first source folder
-		if (sources.length > 0) {
-			try {
-				return (IFolder) sources[0].getCorrespondingResource();
-			} catch (Exception e) {
-				return null;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Subclasses may extend this method to create their own specialized default WTP operation. This
-	 * implementation creates an instance of the NewJavaClassOperation to create a new java class.
-	 * This method will not return null.
-	 * 
-	 * @see WTPOperationDataModel#getDefaultOperation()
-	 * @see NewJavaClassOperation
-	 * 
-	 * @return WTPOperation
-	 */
-	public IDataModelOperation getDefaultOperation() {
-		return new NewJavaClassOperation(getDataModel());
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own data model's properties as valid base
-	 * properties.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
-	 */
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(SOURCE_FOLDER);
-		propertyNames.add(JAVA_PACKAGE);
-		propertyNames.add(CLASS_NAME);
-		propertyNames.add(SUPERCLASS);
-		propertyNames.add(MODIFIER_PUBLIC);
-		propertyNames.add(MODIFIER_ABSTRACT);
-		propertyNames.add(MODIFIER_FINAL);
-		propertyNames.add(INTERFACES);
-		propertyNames.add(MAIN_METHOD);
-		propertyNames.add(CONSTRUCTOR);
-		propertyNames.add(ABSTRACT_METHODS);
-		propertyNames.add(JAVA_PACKAGE_FRAGMENT_ROOT);
-		propertyNames.add(JAVA_SOURCE_FOLDER);
-		propertyNames.add(PROJECT);
-		propertyNames.add(QUALIFIED_CLASS_NAME);
-		return propertyNames;
-	}
-
-	/**
-	 * Subclasses may extend this method to add the default values for their own specific data model
-	 * properties. This declares the default values for the new java class. This method does not
-	 * accept null. It may return null.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultProperty(String)
-	 * 
-	 * @param propertyName
-	 * @return default object value of the property
-	 */
-	public Object getDefaultProperty(String propertyName) {
-		// Get the default source folder for the project
-		if (propertyName.equals(SOURCE_FOLDER)) {
-			IFolder sourceFolder = getDefaultJavaSourceFolder();
-			if (sourceFolder != null && sourceFolder.exists())
-				return sourceFolder.getFullPath().toOSString();
-		}
-		// Use Object as the default superclass if one is not specified
-		else if (propertyName.equals(SUPERCLASS))
-			return new String("java.lang.Object"); //$NON-NLS-1$
-		// Use public as default visibility
-		else if (propertyName.equals(MODIFIER_PUBLIC))
-			return new Boolean(true);
-		// Generate constructors from the superclass by default
-		else if (propertyName.equals(CONSTRUCTOR))
-			return new Boolean(true);
-		// Generate unimplemented methods from declared interfaces by default
-		else if (propertyName.equals(ABSTRACT_METHODS))
-			return new Boolean(true);
-		else if (propertyName.equals(PROJECT))
-			return getTargetProject();
-		else if (propertyName.equals(JAVA_SOURCE_FOLDER))
-			return getJavaSourceFolder();
-		else if (propertyName.equals(JAVA_PACKAGE_FRAGMENT_ROOT))
-			return getJavaPackageFragmentRoot();
-		else if (propertyName.equals(QUALIFIED_CLASS_NAME))
-			return getQualifiedClassName();
-		return super.getDefaultProperty(propertyName);
-	}
-
-	/**
-	 * This method will return the qualified java class name as specified by the class name and
-	 * package name properties in the data model. This method should not return null.
-	 * 
-	 * @see INewJavaClassDataModelProperties#CLASS_NAME
-	 * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
-	 * 
-	 * @return String qualified java classname
-	 */
-	private String getQualifiedClassName() {
-		// Use the java package name and unqualified class name to create a qualified java class
-		// name
-		String packageName = getStringProperty(JAVA_PACKAGE);
-		String className = getStringProperty(CLASS_NAME);
-		// Ensure the class is not in the default package before adding package name to qualified
-		// name
-		if (packageName != null && packageName.trim().length() > 0)
-			return packageName + "." + className; //$NON-NLS-1$
-		return className;
-	}
-
-	/**
-	 * Subclasses may override this method to provide their own validation of any of the data
-	 * model's properties. This implementation ensures that a java class can be properly generated
-	 * from the values as specified. This method will not return null. This method will not accept
-	 * null as a parameter.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#validate(java.lang.String)
-	 * 
-	 * @param propertyName
-	 * @return IStatus of the validity of the specifiec property
-	 */
-	public IStatus validate(String propertyName) {
-		IStatus result = super.validate(propertyName);
-		if (result != null && !result.isOK())
-			return result;
-		if (propertyName.equals(SOURCE_FOLDER))
-			return validateJavaSourceFolder(getStringProperty(propertyName));
-		if (propertyName.equals(JAVA_PACKAGE))
-			return validateJavaPackage(getStringProperty(propertyName));
-		if (propertyName.equals(CLASS_NAME)) {
-			result = validateJavaClassName(getStringProperty(propertyName));
-			if (result.isOK())
-				result = canCreateTypeInClasspath(getStringProperty(CLASS_NAME));
-		}
-		if (propertyName.equals(SUPERCLASS))
-			return validateSuperclass(getStringProperty(propertyName));
-		if (propertyName.equals(MODIFIER_ABSTRACT) || propertyName.equals(MODIFIER_FINAL))
-			return validateModifier(propertyName, getBooleanProperty(propertyName));
-		return result;
-	}
-
-	/**
-	 * This method will validate whether the specified package name is a valid java package name. It
-	 * will be called during the doValidateProperty(String). This method will accept null. It will
-	 * not return null.
-	 * 
-	 * @see NewJavaClassDataModelProvider#validate(String)
-	 * 
-	 * @param packName --
-	 *            the package name
-	 * @return IStatus of if the package name is valid
-	 */
-	private IStatus validateJavaPackage(String packName) {
-		if (packName != null && packName.trim().length() > 0) {
-			// Use standard java conventions to validate the package name
-			IStatus javaStatus = JavaConventions.validatePackageName(packName);
-			if (javaStatus.getSeverity() == IStatus.ERROR) {
-				String msg = J2EECommonMessages.ERR_JAVA_PACAKGE_NAME_INVALID + javaStatus.getMessage();
-				return WTPCommonPlugin.createErrorStatus(msg);
-			} else if (javaStatus.getSeverity() == IStatus.WARNING) {
-				String msg = J2EECommonMessages.ERR_JAVA_PACKAGE_NAME_WARNING + javaStatus.getMessage();
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-		}
-		// java package name is valid
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * Subclasses may override this method to provide their own validation of the class name. This
-	 * implementation will verify if the specified class name is a valid UNQUALIFIED java class
-	 * name. This method will not accept null. It will not return null.
-	 * 
-	 * @see NewJavaClassDataModelProvider#validate(String)
-	 * 
-	 * @param className
-	 * @return IStatus of if java class name is valid
-	 */
-	protected IStatus validateJavaClassName(String className) {
-		// Do not allow qualified name
-		if (className.lastIndexOf('.') != -1) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_QUALIFIED;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// Check Java class name by standard java conventions
-		IStatus javaStatus = JavaConventions.validateJavaTypeName(className);
-		if (javaStatus.getSeverity() == IStatus.ERROR) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_INVALID + javaStatus.getMessage();
-			return WTPCommonPlugin.createErrorStatus(msg);
-		} else if (javaStatus.getSeverity() == IStatus.WARNING) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_WARNING + javaStatus.getMessage();
-			return WTPCommonPlugin.createWarningStatus(msg);
-		}
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * This method will verify the specified superclass can be subclassed. It ensures the superclass
-	 * is a valid java class, that it exists, and that it is not final. This method will accept
-	 * null. It will not return null.
-	 * 
-	 * @see NewJavaClassDataModelProvider#validate(String)
-	 * 
-	 * @param superclassName
-	 * @return IStatus of if the superclass can be subclassed
-	 */
-	private IStatus validateSuperclass(String superclassName) {
-		// Ensure the superclass name is not empty
-		if (superclassName == null || superclassName.trim().length() == 0) {
-			String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_EMPTY;
-			return WTPCommonPlugin.createErrorStatus(msg);
-		}
-		// In default case of Object, return OK right away
-		if (superclassName.equals("java.lang.Object")) //$NON-NLS-1$
-			return WTPCommonPlugin.OK_STATUS;
-		// Ensure the unqualified java class name of the superclass is valid
-		String className = superclassName;
-		int index = superclassName.lastIndexOf("."); //$NON-NLS-1$
-		if (index != -1) {
-			className = superclassName.substring(index + 1);
-		}
-		IStatus status = validateJavaClassName(className);
-		// If unqualified super class name is valid, ensure validity of superclass itself
-		if (status.isOK()) {
-			// If the superclass does not exist, throw an error
-			IJavaProject javaProject = JemProjectUtilities.getJavaProject(getTargetProject());
-			IType supertype = null;
-			try {
-				supertype = javaProject.findType(superclassName);
-			} catch (Exception e) {
-				// Just throw error below
-			}
-			if (supertype == null) {
-				String msg = J2EECommonMessages.ERR_JAVA_CLASS_SUPERCLASS_NOT_EXIST;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-			// Ensure the superclass is not final
-			int flags = -1;
-			try {
-				flags = supertype.getFlags();
-				if (Modifier.isFinal(flags)) {
-					String msg = J2EECommonMessages.ERR_JAVA_CLASS_SUPERCLASS_FINAL;
-					return WTPCommonPlugin.createErrorStatus(msg);
-				}
-			} catch (Exception e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		// Return status of specified superclass
-		return status;
-	}
-
-	/**
-	 * This method will ensure that if the abstract modifier is set, that final is not set, and
-	 * vice-versa, as this is not supported either way. This method will not accept null. It will
-	 * not return null.
-	 * 
-	 * @see NewJavaClassDataModelProvider#validate(String)
-	 * 
-	 * @param prop
-	 * @return IStatus of whether abstract value is valid
-	 */
-	private IStatus validateModifier(String propertyName, boolean prop) {
-		// Throw an error if both Abstract and Final are checked
-		if (prop) {
-			// Ensure final is not also checked
-			if (propertyName.equals(MODIFIER_ABSTRACT) && getBooleanProperty(MODIFIER_FINAL)) {
-				String msg = J2EECommonMessages.ERR_BOTH_FINAL_AND_ABSTRACT;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-			// Ensure abstract is not also checked
-			if (propertyName.equals(MODIFIER_FINAL) && getBooleanProperty(MODIFIER_ABSTRACT)) {
-				String msg = J2EECommonMessages.ERR_BOTH_FINAL_AND_ABSTRACT;
-				return WTPCommonPlugin.createErrorStatus(msg);
-			}
-		}
-		// Abstract and final settings are valid
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * This method is intended for internal use only. This will check the java model for the
-	 * specified javaproject in the data model for the existence of the passed in qualified
-	 * classname. This method does not accept null. It may return null.
-	 * 
-	 * @see NewJavaClassDataModelProvider#getTargetProject()
-	 * @see JavaModelUtil#findType(IJavaProject, String)
-	 * 
-	 * @param fullClassName
-	 * @return IType for the specified classname
-	 */
-	protected IStatus canCreateTypeInClasspath(String className) {
-		// Retrieve the java project for the cached project
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(getTargetProject());
-		try {
-			String folderPath = getStringProperty(SOURCE_FOLDER);
-			String packagePath = getStringProperty(JAVA_PACKAGE);
-			// Replace all "." with "//" in the package path to denote folders
-			if (packagePath.indexOf('.')>-1) {
-				StringBuffer buffer = new StringBuffer(packagePath);
-				for (int i = 0; i < buffer.length(); i++) {
-					if (buffer.charAt(i)=='.') {
-						buffer.deleteCharAt(i);
-						buffer.insert(i, "//"); //$NON-NLS-1$
-					}
-				}
-				packagePath = buffer.toString();
-			}
-			IPath path = new Path(folderPath + "//" + packagePath); //$NON-NLS-1$
-			IPackageFragment pack = javaProject.findPackageFragment(path);
-			if (pack != null) {
-				ICompilationUnit cu = pack.getCompilationUnit(className + ".java"); //$NON-NLS-1$
-				IResource resource = cu.getResource();
-				if (resource.exists()) {
-					String msg = J2EECommonMessages.ERR_JAVA_CLASS_NAME_EXIST;
-					return WTPCommonPlugin.createErrorStatus(msg);
-				}
-			}
-			return WTPCommonPlugin.OK_STATUS;
-		} catch (Exception e) {
-			Logger.getLogger().log(e);
-		}
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	/**
-	 * This will return the IFolder instance for the specified folder name in the data model. This
-	 * method may return null.
-	 * 
-	 * @see INewJavaClassDataModelProperties#SOURCE_FOLDER
-	 * @see NewJavaClassDataModelProvider#getAllSourceFolders()
-	 * 
-	 * @return IFolder java source folder
-	 */
-	protected final IFolder getJavaSourceFolder() {
-		IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(getTargetProject());
-		// Ensure there is valid source folder(s)
-		if (sources == null || sources.length == 0)
-			return null;
-		String folderFullPath = getStringProperty(SOURCE_FOLDER);
-		// Get the source folder whose path matches the source folder name value in the data model
-		for (int i = 0; i < sources.length; i++) {
-			if (sources[i].getPath().equals(new Path(folderFullPath))) {
-				try {
-					return (IFolder) sources[i].getCorrespondingResource();
-				} catch (Exception e) {
-					break;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Subclasses may extend this method to perform their own retrieval mechanism. This
-	 * implementation simply returns the JDT package fragment root for the selected source folder.
-	 * This method may return null.
-	 * 
-	 * @see IJavaProject#getPackageFragmentRoot(org.eclipse.core.resources.IResource)
-	 * 
-	 * @return IPackageFragmentRoot
-	 */
-	protected IPackageFragmentRoot getJavaPackageFragmentRoot() {
-		IProject project = getTargetProject();
-		if (project != null) {
-			IJavaProject aJavaProject = JemProjectUtilities.getJavaProject(project);
-			// Return the source folder for the java project of the selected project
-			if (aJavaProject != null) {
-				IFolder sourcefolder = (IFolder) getProperty(JAVA_SOURCE_FOLDER);
-				if (sourcefolder != null)
-					return aJavaProject.getPackageFragmentRoot(sourcefolder);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This method ensures the source folder is updated if the component is changed.
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
-	 *      Object)
-	 * 
-	 * @return boolean if property set successfully
-	 */
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean result = super.propertySet(propertyName, propertyValue);
-		if (result) {
-			if (COMPONENT_NAME.equals(propertyName)){
-				if( getDefaultJavaSourceFolder() != null ){
-					setProperty(SOURCE_FOLDER, getDefaultJavaSourceFolder().getFullPath().toOSString());
-				}
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java
deleted file mode 100644
index d89671487..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java
+++ /dev/null
@@ -1,821 +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.common.operations;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-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.Flags;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * NewJavaClassOperation is a data model operation that is used to create a default instance of a new java class
- * based on the input and properties set in the NewJavaClassDataModelProvider.  
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider
- * 
- * It is a subclass of ArtifactEditProviderOperation and clients can invoke this operation as is or it may be subclassed to
- * add additional or modify behaviour.  The execute() method can be extended to drive this behaviour.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- * 
- * The new java class is generated through the use of adding a series of static tokens defined within to
- * an ongoing string buffer.
- * 
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- * 
- * This needs to be removed as it is legacy inherited from another team
- */
-public class NewJavaClassOperation extends ArtifactEditProviderOperation {
-
-	// Tokens for string buffer creation of default java class
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	protected static final String TAB = "\t"; //$NON-NLS-1$
-	protected static final String SPACE = " "; //$NON-NLS-1$
-	protected static final String DOT = "."; //$NON-NLS-1$
-	protected static final String COMMA = ","; //$NON-NLS-1$
-	protected static final String SEMICOLON = ";"; //$NON-NLS-1$
-	protected static final String POUND = "#"; //$NON-NLS-1$
-	protected static final String OPEN_PAR = "("; //$NON-NLS-1$
-	protected static final String CLOSE_PAR = ")"; //$NON-NLS-1$
-	protected static final String OPEN_BRA = "{"; //$NON-NLS-1$
-	protected static final String CLOSE_BRA = "}"; //$NON-NLS-1$
-	protected static final String lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$
-
-	protected static final String JAVA_LANG_OBJECT = "java.lang.Object"; //$NON-NLS-1$
-	protected static final String PACKAGE = "package "; //$NON-NLS-1$
-	protected static final String CLASS = "class "; //$NON-NLS-1$
-	protected static final String IMPORT = "import "; //$NON-NLS-1$
-	protected static final String EXTENDS = "extends "; //$NON-NLS-1$
-	protected static final String IMPLEMENTS = "implements "; //$NON-NLS-1$
-	protected static final String THROWS = "throws "; //$NON-NLS-1$
-	protected static final String SUPER = "super"; //$NON-NLS-1$
-	protected static final String PUBLIC = "public "; //$NON-NLS-1$
-	protected static final String PROTECTED = "protected "; //$NON-NLS-1$
-	protected static final String PRIVATE = "private "; //$NON-NLS-1$
-	protected static final String STATIC = "static "; //$NON-NLS-1$
-	protected static final String ABSTRACT = "abstract "; //$NON-NLS-1$
-	protected static final String FINAL = "final "; //$NON-NLS-1$
-	protected static final String VOID = "void"; //$NON-NLS-1$
-	protected static final String INT = "int"; //$NON-NLS-1$
-	protected static final String BOOLEAN = "boolean"; //$NON-NLS-1$
-	protected static final String MAIN_METHOD = "\tpublic static void main(String[] args) {"; //$NON-NLS-1$
-	protected static final String TODO_COMMENT = "\t\t// TODO Auto-generated method stub"; //$NON-NLS-1$
-	protected static final String RETURN_NULL = "\t\treturn null;"; //$NON-NLS-1$
-	protected static final String RETURN_0 = "\t\treturn 0;"; //$NON-NLS-1$
-	protected static final String RETURN_FALSE = "\t\treturn false;"; //$NON-NLS-1$
-
-	/**
-	 * This is a list of all the calculated import statements that will need to be added
-	 */
-	private List importStatements;
-
-	/**
-	 * This is a NewJavaClassOperation constructor.  Data models passed in should be instances
-	 * of NewJavaClassDataModel.  This method does not accept null.  It will not return null.
-	 * @see NewJavaClassDataModelProvider
-	 * 
-	 * @param dataModel
-	 * @return NewJavaClassOperation
-	 */
-	public NewJavaClassOperation(IDataModel dataModel) {
-		super(dataModel);
-		importStatements = new ArrayList();
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own actions during execution.
-	 * The implementation of the execute method drives the running of the operation.  This
-	 * method will create the source folder, the java package, and then create the java file.
-	 * This method will accept null.
-	 * @see AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 * 
-	 * @param monitor ProgressMonitor
-	 * @throws CoreException
-	 * @throws InterruptedException
-	 * @throws InvocationTargetException
-	 */
-	public IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// Ensure source folder exists
-		IFolder sourceFolder = createJavaSourceFolder();
-		// Ensure java package exists
-		IPackageFragment pack = createJavaPackage();
-		// Create java class
-		createJavaFile(sourceFolder, pack);
-		return OK_STATUS;
-	}
-
-	/**
-	 * This method will return the java source folder as specified in the java class data model. 
-	 * It will create the java source folder if it does not exist.  This method may return null.
-	 * @see INewJavaClassDataModelProperties#SOURCE_FOLDER
-	 * @see IFolder#create(boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 * 
-	 * @return IFolder the java source folder
-	 */
-	protected final IFolder createJavaSourceFolder() {
-		// Get the source folder name from the data model
-		String folderFullPath = model.getStringProperty(INewJavaClassDataModelProperties.SOURCE_FOLDER);
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IFolder folder = root.getFolder(new Path(folderFullPath));
-		// If folder does not exist, create the folder with the specified path
-		if (!folder.exists()) {
-			try {
-				folder.create(true, true, null);
-			} catch (CoreException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		// Return the source folder
-		return folder;
-	}
-
-	/**
-	 * This method will return the java package as specified by the new java class data model.
-	 * If the package does not exist, it will create the package.  This method should not return
-	 * null.
-	 * @see INewJavaClassDataModelProperties#JAVA_PACKAGE
-	 * @see IPackageFragmentRoot#createPackageFragment(java.lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 * 
-	 * @return IPackageFragment the java package
-	 */
-	protected final IPackageFragment createJavaPackage() {
-		// Retrieve the package name from the java class data model
-		String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
-		IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
-		IPackageFragment pack =	packRoot.getPackageFragment(packageName);
-		// Handle default package
-		if (pack == null) {
-			pack = packRoot.getPackageFragment(""); //$NON-NLS-1$
-		}
-		// Create the package fragment if it does not exist
-		if (!pack.exists()) {
-			String packName = pack.getElementName();
-			try {
-				pack = packRoot.createPackageFragment(packName, true, null);
-			} catch (JavaModelException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		// Return the package
-		return pack;
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own java file creation path.
-	 * This implementation will use the properties specified in the data model to create
-	 * a default java class.  The class will be built using pre-defined tokens and will be
-	 * built up using a string buffer.  The method getJavaFileContent will handle the building
-	 * of the string buffer while this method will write those contents to the file.
-	 * This method does not accept null parameters.
-	 * @see INewJavaClassDataModelProperties#CLASS_NAME
-	 * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
-	 * 
-	 * @param sourceFolder
-	 * @param pack
-	 */
-	protected void createJavaFile(IFolder sourceFolder, IPackageFragment pack) {
-		// Retrieve properties from the java class data model
-		String packageName = model.getStringProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE);
-		String className = model.getStringProperty(INewJavaClassDataModelProperties.CLASS_NAME);
-		String fileName = className + ".java"; //$NON-NLS-1$
-		//ICompilationUnit cu = null;
-		try {
-			// Get the java file content from the string buffer
-			String content = getJavaFileContent(pack, className);
-			// Create the compilation unit
-			pack.createCompilationUnit(fileName, content, true, null);
-			byte[] contentBytes = content.getBytes();
-			IPath packageFullPath = new Path(packageName.replace('.', IPath.SEPARATOR));
-			IPath javaFileFullPath = packageFullPath.append(fileName);
-			IFile file = sourceFolder.getFile(javaFileFullPath);
-			// Set the contents in the file if it already exists
-			if (file != null && file.exists()) {
-				file.setContents(new ByteArrayInputStream(contentBytes), false, true, null);
-			} // If the file does not exist, create it with the contents
-			else if (file != null) {
-				file.create(new ByteArrayInputStream(contentBytes), false, null);
-			}
-			// editModel.getWorkingCopy(cu, true); //Track CU.
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	/**
-	 * This is intended for internal use only.  This is where the string buffer for the contents
-	 * of the java file is built up using the properties in the data model and the predefined tokens.
-	 * This method will not accept null parameters. It will not return null.
-	 * @see NewJavaClassDataModelProvider
-	 * @see NewJavaClassOperation#createJavaFile(IFolder, IPackageFragment)
-	 * 
-	 * @param pack
-	 * @param className
-	 * @return String java file contents
-	 */
-	private String getJavaFileContent(IPackageFragment pack, String className) {
-		// Create the superclass name
-		String superclassName = model.getStringProperty(INewJavaClassDataModelProperties.SUPERCLASS);
-		List interfaces = (List) model.getProperty(INewJavaClassDataModelProperties.INTERFACES);
-		String packageStatement = getPackageStatement(pack);
-		// Create the import statements
-		setupImportStatements(pack, superclassName, interfaces);
-		// Create the class declaration
-		String classDeclaration = getClassDeclaration(superclassName, className, interfaces);
-		// Create the fields
-		String fields = getFields();
-		// Create the methods
-		String methods = getMethodStubs(superclassName, className);
-
-		StringBuffer contents = new StringBuffer();
-		// Add the package statement to the buffer
-		contents.append(packageStatement);
-		// Add all the import statements to the buffer
-		for (int i = 0; i < importStatements.size(); i++) {
-			contents.append(IMPORT + importStatements.get(i) + SEMICOLON);
-			contents.append(lineSeparator);
-		}
-		contents.append(lineSeparator);
-		// Add the class declaration to the buffer
-		contents.append(classDeclaration);
-		// Add the fields to the buffer
-		contents.append(fields);
-		// Add the method bodies to the buffer
-		contents.append(methods);
-		contents.append(CLOSE_BRA);
-		// Return the contents of the buffer
-		return contents.toString();
-	}
-
-	/**
-	 * This is intended for internal use only.  This method will return a package string for
-	 * the class.  It will not accept a null parameter.  It will not return null.
-	 * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
-	 * 
-	 * @param pack
-	 * @return String package statement
-	 */
-	private String getPackageStatement(IPackageFragment pack) {
-		StringBuffer sb = new StringBuffer();
-		// If it is not default package, add package statement
-		if (!pack.isDefaultPackage()) {
-			sb.append(PACKAGE + pack.getElementName() + SEMICOLON);
-			sb.append(lineSeparator);
-			sb.append(lineSeparator);
-		}
-		// Return contents of buffer
-		return sb.toString();
-	}
-
-	/**
-	 * This method is intended for internal use.  It checks to see if the qualified class name
-	 * belongs to the specified package. This method will not accept nulls.  It will not return null.
-	 * @see NewJavaClassOperation#setupImportStatements(IPackageFragment, String, List)
-	 *
-	 * @param packageFragment
-	 * @param className
-	 * @return boolean is class in this package?
-	 */
-	private boolean isSamePackage(IPackageFragment packageFragment, String className) {
-		if (className != null && className.length() > 0) {
-			String sPackageName = packageFragment.getElementName();
-			String classPackageName = Signature.getQualifier(className);
-			// Does the qualified class's package name match the passed in package's name?
-			if (classPackageName.equals(sPackageName))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * This method is intended for internal use only.  This method will set up the required import
-	 * statements and cache to the importStatements list.
-	 * This method does not accept null parameters.
-	 * @see NewJavaClassOperation#importStatements
-	 * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
-	 * 
-	 * @param pack
-	 * @param superclassName
-	 * @param interfaces
-	 */
-	private void setupImportStatements(IPackageFragment pack, String superclassName, List interfaces) {
-		// If there is a superclass and it is not in the same package, add an import for it
-		if (superclassName != null && superclassName.length() > 0) {
-			if (!superclassName.equals(JAVA_LANG_OBJECT) && !isSamePackage(pack, superclassName)) {
-				importStatements.add(superclassName);
-			}
-		}
-		// Add an import the list of implemented interfaces
-		if (interfaces != null && interfaces.size() > 0) {
-			int size = interfaces.size();
-			for (int i = 0; i < size; i++) {
-				String interfaceName = (String) interfaces.get(i);
-				importStatements.add(interfaceName);
-			}
-		}
-	}
-
-	/**
-	 * This class is intended for internal use only.  This will build up the class declartion
-	 * statement based off the properties set in the java class data model.
-	 * This method does not accept null parameters.  It will not return null.
-	 * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
-	 * 
-	 * @param superclassName
-	 * @param className
-	 * @param interfaces
-	 * @return String class declaration string
-	 */
-	private String getClassDeclaration(String superclassName, String className, List interfaces) {
-		StringBuffer sb = new StringBuffer();
-		// Append appropriate modifiers
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_PUBLIC))
-			sb.append(PUBLIC);
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT))
-			sb.append(ABSTRACT);
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_FINAL))
-			sb.append(FINAL);
-		// Add the class token 
-		sb.append(CLASS);
-		// Add the class name
-		sb.append(className + SPACE);
-		// If there is a superclass, add the extends and super class name
-		if (superclassName != null && superclassName.length() > 0 && !superclassName.equals(JAVA_LANG_OBJECT)) {
-			int index = superclassName.lastIndexOf(DOT);
-			if (index != -1)
-				superclassName = superclassName.substring(index + 1);
-			sb.append(EXTENDS + superclassName + SPACE);
-		}
-		// If there are interfaces, add the implements and then interate over the interface list
-		if (interfaces != null && interfaces.size() > 0) {
-			sb.append(IMPLEMENTS);
-			int size = interfaces.size();
-			for (int i = 0; i < size; i++) {
-				String interfaceName = (String) interfaces.get(i);
-				int index = interfaceName.lastIndexOf(DOT);
-				if (index != -1)
-					interfaceName = interfaceName.substring(index + 1);
-				sb.append(interfaceName);
-				if (i < size - 1)
-					sb.append(COMMA);
-				sb.append(SPACE);
-			}
-		}
-		sb.append(OPEN_BRA);
-		sb.append(lineSeparator);
-		// Return the finished class declaration string
-		return sb.toString();
-	}
-
-	/**
-	 * Subclasses may extend this method to add their own fields.  The default implementation
-	 * is not to have any fields.  This method will not return null.
-	 * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
-	 * 
-	 * @return String fields string
-	 */
-	protected String getFields() {
-		return EMPTY_STRING;
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will build up a string with the
-	 * contents of all the method stubs for the unimplemented methods defined in the interfaces.
-	 * It will also add inherited constructors from the superclass as appropriate.
-	 * This method does not accept null parameters.  It will not return null.
-	 * @see NewJavaClassOperation#getJavaFileContent(IPackageFragment, String)
-	 * 
-	 * @param superclassName
-	 * @param className
-	 * @return String method stubs string
-	 */
-	private String getMethodStubs(String superclassName, String className) {
-		StringBuffer sb = new StringBuffer();
-		IJavaProject javaProj = JemProjectUtilities.getJavaProject(getTargetProject());
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.MAIN_METHOD)) {
-			// Add main method
-			sb.append(MAIN_METHOD);
-			sb.append(lineSeparator);
-			sb.append(TODO_COMMENT);
-			sb.append(lineSeparator);
-			sb.append(TAB + CLOSE_BRA);
-			sb.append(lineSeparator);
-			sb.append(lineSeparator);
-		}
-
-		IType superClassType = null;
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR) || model.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS)) {
-			// Find super class type
-			try {
-				superClassType = javaProj.findType(superclassName);
-			} catch (JavaModelException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.CONSTRUCTOR)) {
-			// Implement constructors from superclass
-			try {
-				if (superClassType != null) {
-					IMethod[] methods = superClassType.getMethods();
-					for (int j = 0; j < methods.length; j++) {
-						if (methods[j].isConstructor() && !Flags.isPrivate(methods[j].getFlags())) {
-							String methodStub = getMethodStub(methods[j], superclassName, className);
-							sb.append(methodStub);
-						}
-					}
-				}
-			} catch (JavaModelException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		// Add unimplemented methods defined in the interfaces list
-		if (model.getBooleanProperty(INewJavaClassDataModelProperties.ABSTRACT_METHODS) && superClassType != null) {
-			String methodStub = getUnimplementedMethodsFromSuperclass(superClassType, className);
-			if (methodStub != null && methodStub.trim().length() > 0)
-				sb.append(methodStub);
-			methodStub = getUnimplementedMethodsFromInterfaces(superClassType, className, javaProj);
-			if (methodStub != null && methodStub.trim().length() > 0)
-				sb.append(methodStub);
-		}
-		// Add any user defined method stubs
-		if (superClassType != null) {
-			String userDefined = getUserDefinedMethodStubs(superClassType);
-			if (userDefined != null && userDefined.trim().length() > 0)
-				sb.append(userDefined);
-		}
-		// Return the methods string
-		return sb.toString();
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will retrieve method stubs for
-	 * unimplemented methods in the superclass that will need to be created in the new class.
-	 * This method does not accept null parameters. It will not return null.
-	 * @see NewJavaClassOperation#getMethodStubs(String, String)
-	 * 
-	 * @param superClassType
-	 * @param className
-	 * @return String unimplemented methods defined in superclass
-	 */
-	private String getUnimplementedMethodsFromSuperclass(IType superClassType, String className) {
-		StringBuffer sb = new StringBuffer();
-		try {
-			// Implement abstract methods from superclass
-			IMethod[] methods = superClassType.getMethods();
-			for (int j = 0; j < methods.length; j++) {
-				IMethod method = methods[j];
-				int flags = method.getFlags();
-				// Add if the method is abstract, not private or static, and the option is selected in data model
-				if ((Flags.isAbstract(flags) && !Flags.isStatic(flags) && !Flags.isPrivate(flags)) || implementImplementedMethod(methods[j])) {
-					String methodStub = getMethodStub(methods[j], superClassType.getFullyQualifiedName(), className);
-					sb.append(methodStub);
-				}
-			}
-		} catch (JavaModelException e) {
-			Logger.getLogger().log(e);
-		}
-		// Return method stubs string
-		return sb.toString();
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will retrieve method stubs for
-	 * unimplemented methods defined in the interfaces that will need to be created in the new class.
-	 * This method does not accept null parameters. It will not return null.
-	 * @see NewJavaClassOperation#getMethodStubs(String, String)
-	 * 
-	 * @param superClassType
-	 * @param className
-	 * @param javaProj
-	 * @return String unimplemented methods defined in interfaces
-	 */
-	private String getUnimplementedMethodsFromInterfaces(IType superClassType, String className, IJavaProject javaProj) {
-		StringBuffer sb = new StringBuffer();
-		try {
-			// Implement defined methods from interfaces
-			List interfaces = (List) model.getProperty(INewJavaClassDataModelProperties.INTERFACES);
-			if (interfaces != null) {
-				for (int i = 0; i < interfaces.size(); i++) {
-					String qualifiedClassName = (String) interfaces.get(i);
-					IType interfaceType = javaProj.findType(qualifiedClassName);
-					IMethod[] methodArray = interfaceType.getMethods();
-					// Make sure the method isn't already defined in the heirarchy
-					for (int j = 0; j < methodArray.length; j++) {
-						if (isMethodImplementedInHierarchy(methodArray[j], superClassType))
-							continue;
-						String methodStub = getMethodStub(methodArray[j], qualifiedClassName, className);
-						sb.append(methodStub);
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-			Logger.getLogger().log(e);
-		}
-		// Return method stubs string
-		return sb.toString();
-	}
-
-	/**
-	 * This method is intended for internal use only.  Checks to see if the passed type name
-	 * is of a primitive type.  This method does not accept null.  It will not return null.
-	 * @see Signature#getElementType(java.lang.String)
-	 * 
-	 * @param typeName
-	 * @return boolean is type Primitive?
-	 */
-	private boolean isPrimitiveType(String typeName) {
-		char first = Signature.getElementType(typeName).charAt(0);
-		return (first != Signature.C_RESOLVED && first != Signature.C_UNRESOLVED);
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will add import statements for the specified
-	 * type if it is determined to be necessary. This does accept null parameters.  It will not return null.
-	 * @see NewJavaClassOperation#getMethodStub(IMethod, String, String)
-	 * 
-	 * @param refTypeSig
-	 * @param declaringType
-	 * @return String type signature
-	 * @throws JavaModelException
-	 */
-	private String resolveAndAdd(String refTypeSig, IType declaringType) throws JavaModelException {
-		String resolvedTypeName = JavaModelUtil.getResolvedTypeName(refTypeSig, declaringType);
-		// Could type not be resolved and is import statement missing?
-		if (resolvedTypeName != null && !importStatements.contains(resolvedTypeName) && !resolvedTypeName.startsWith("java.lang")) { //$NON-NLS-1$
-			importStatements.add(resolvedTypeName);
-		}
-		return Signature.toString(refTypeSig);
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will use the predefined tokens to generate the
-	 * actual method stubs.  This method does not accept null parameters.  It will not return null.
-	 * 
-	 * @param method
-	 * @param superClassName
-	 * @param className
-	 * @return String method stub
-	 */
-	private String getMethodStub(IMethod method, String superClassName, String className) {
-		StringBuffer sb = new StringBuffer();
-		try {
-			IType parentType = method.getDeclaringType();
-			String name = method.getElementName();
-			String[] paramTypes = method.getParameterTypes();
-			String[] paramNames = method.getParameterNames();
-			String[] exceptionTypes = method.getExceptionTypes();
-
-			// Parameters String
-			String paramString = EMPTY_STRING;
-			int nP = paramTypes.length;
-			for (int i = 0; i < nP; i++) {
-				String type = paramTypes[i];
-				// update import statements
-				if (!isPrimitiveType(type)) {
-					type = resolveAndAdd(type, parentType);
-				} else {
-					type = Signature.toString(type);
-				}
-
-				int index = type.lastIndexOf(DOT);
-				if (index != -1)
-					type = type.substring(index + 1);
-				paramString += type + SPACE + paramNames[i];
-				if (i < nP - 1)
-					paramString += COMMA + SPACE;
-			}
-			// Java doc
-			sb.append("\t/* (non-Java-doc)"); //$NON-NLS-1$
-			sb.append(lineSeparator);
-			sb.append("\t * @see "); //$NON-NLS-1$
-			sb.append(superClassName + POUND + name + OPEN_PAR);
-			sb.append(paramString);
-			sb.append(CLOSE_PAR);
-			sb.append(lineSeparator);
-			sb.append("\t */"); //$NON-NLS-1$
-			sb.append(lineSeparator);
-			// access
-			sb.append(TAB);
-			if (Flags.isPublic(method.getFlags()))
-				sb.append(PUBLIC);
-			else if (Flags.isProtected(method.getFlags()))
-				sb.append(PROTECTED);
-			else if (Flags.isPrivate(method.getFlags()))
-				sb.append(PRIVATE);
-			String returnType = null;
-			if (method.isConstructor()) {
-				sb.append(className);
-			} else {
-				// return type
-				returnType = method.getReturnType();
-				if (!isPrimitiveType(returnType)) {
-					returnType = resolveAndAdd(returnType, parentType);
-				} else {
-					returnType = Signature.toString(returnType);
-				}
-				int idx = returnType.lastIndexOf(DOT);
-				if (idx == -1)
-					sb.append(returnType);
-				else
-					sb.append(returnType.substring(idx + 1));
-				sb.append(SPACE);
-				// name
-				sb.append(name);
-			}
-			// Parameters
-			sb.append(OPEN_PAR + paramString + CLOSE_PAR);
-			// exceptions
-			int nE = exceptionTypes.length;
-			if (nE > 0) {
-				sb.append(SPACE + THROWS);
-				for (int i = 0; i < nE; i++) {
-					String type = exceptionTypes[i];
-					if (!isPrimitiveType(type)) {
-						type = resolveAndAdd(type, parentType);
-					} else {
-						type = Signature.toString(type);
-					}
-					int index = type.lastIndexOf(DOT);
-					if (index != -1)
-						type = type.substring(index + 1);
-					sb.append(type);
-					if (i < nE - 1)
-						sb.append(COMMA + SPACE);
-				}
-			}
-			sb.append(SPACE + OPEN_BRA);
-			sb.append(lineSeparator);
-			if (method.isConstructor()) {
-				sb.append(TAB + TAB + SUPER + OPEN_PAR);
-				for (int i = 0; i < nP; i++) {
-					sb.append(paramNames[i]);
-					if (i < nP - 1)
-						sb.append(COMMA + SPACE);
-				}
-				sb.append(CLOSE_PAR + SEMICOLON);
-				sb.append(lineSeparator);
-			} else {
-				String methodBody = getMethodBody(method, returnType);
-				sb.append(methodBody);
-			}
-			sb.append(TAB + CLOSE_BRA);
-			sb.append(lineSeparator);
-			sb.append(lineSeparator);
-		} catch (JavaModelException e) {
-			Logger.getLogger().log(e);
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * This method is intended for internal use only.  It checks to see whether or not the
-	 * method is already implemented in the class heirarchy.
-	 * It does not accept null parameters.  It will not return null.
-	 * @see NewJavaClassOperation#getUnimplementedMethodsFromInterfaces(IType, String, IJavaProject)
-	 * 
-	 * @param method
-	 * @param superClass
-	 * @return boolean is method already in heirarchy?
-	 */
-	private boolean isMethodImplementedInHierarchy(IMethod method, IType superClass) {
-		boolean ret = false;
-		IMethod foundMethod = findMethodImplementationInHierarchy(method, superClass);
-		// if the method exists and the property is set on the data model, then return true
-		if (foundMethod != null && foundMethod.exists() && !implementImplementedMethod(method))
-			ret = true;
-		return ret;
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will recursively check the supertype heirarchy for
-	 * the passed in method.  This will not accept null parameters.  It will return null if the method does
-	 * not already exist in the heirarchy.
-	 * @see NewJavaClassOperation#isMethodImplementedInHierarchy(IMethod, IType)
-	 * 
-	 * @param method
-	 * @param superClass
-	 * @return IMethod the method from the heirarchy
-	 */
-	private IMethod findMethodImplementationInHierarchy(IMethod method, IType superClass) {
-		IMethod implementedMethod = null;
-		try {
-			if (superClass != null && superClass.exists()) {
-				ITypeHierarchy tH = superClass.newSupertypeHierarchy(new NullProgressMonitor());
-				implementedMethod = findMethodImplementationInHierarchy(tH, superClass, method.getElementName(), method.getParameterTypes(), method.isConstructor());
-			}
-		} catch (JavaModelException e) {
-			//Ignore
-		}
-		return implementedMethod;
-	}
-
-	/**
-	 * This method is intended for internal use only.  This will recursively check the supertype heirarchy for
-	 * the passed in method.  This will not accept null parameters.  It will return null if the method does
-	 * not already exist in the heirarchy.
-	 * @see NewJavaClassOperation#findMethodImplementationInHierarchy(IMethod, IType)
-	 * @see JavaModelUtil#findMethodImplementationInHierarchy(ITypeHierarchy, IType, String, String[], boolean)
-	 * 
-	 * @param tH
-	 * @param thisType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @param isConstructor
-	 * @return IMethod
-	 * @throws JavaModelException
-	 */
-	private IMethod findMethodImplementationInHierarchy(ITypeHierarchy tH, IType thisType, String methodName, String parameterTypes[], boolean isConstructor) throws JavaModelException {
-		IMethod found = JavaModelUtil.findMethod(methodName, parameterTypes, isConstructor, thisType);
-		// If method exists make sure it is not abstract
-		if (found != null && !Flags.isAbstract(found.getFlags())) {
-			return found;
-		}
-		// Check recursively
-		return JavaModelUtil.findMethodImplementationInHierarchy(tH, thisType, methodName, parameterTypes, isConstructor);
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own specific method body definitions.
-	 * The default implementation is to add a todo, and to return the appropriate type.
-	 * This method does not accept null parameters.  It will not return null.
-	 * @see NewJavaClassOperation#getMethodStub(IMethod, String, String)
-	 * 
-	 * @param method
-	 * @param returnType
-	 * @return String method body
-	 */
-	protected String getMethodBody(IMethod method, String returnType) {
-		// Add a todo comment
-		String body = TODO_COMMENT;
-		body += lineSeparator;
-		// Add the appropriate default return type
-		if (returnType == null || returnType.equals(VOID))
-			return body;
-		if (returnType.equals(INT))
-			body += RETURN_0;
-		else if (returnType.equals(BOOLEAN))
-			body += RETURN_FALSE;
-		else
-			body += RETURN_NULL;
-		body += lineSeparator;
-		// Return the method body
-		return body;
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own user defined method stubs.  The
-	 * default implementation to just return an empty string.  This method will not accept
-	 * null parameter.  It will not return null.
-	 * @see NewJavaClassOperation#getMethodStubs(String, String)
-	 * 
-	 * @param superClassType
-	 * @return String user defined methods
-	 */
-	protected String getUserDefinedMethodStubs(IType superClassType) {
-		return EMPTY_STRING;
-	}
-
-	/**
-	 * Subclasses may extend this method to provide their own specialized return on which nonimplemented
-	 * methods to implement.  This does not accept a null parameter.  This will not return null.
-	 * The default implementation is to always return false.
-	 * 
-	 * @param method
-	 * @return boolean should implement method?
-	 */
-	protected boolean implementImplementedMethod(IMethod method) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
deleted file mode 100644
index f80182b27..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
+++ /dev/null
@@ -1,273 +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.common.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-/**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
- * 
- * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
- *             containers
- */
-public class UpdateJavaBuildPathOperation implements IHeadlessRunnableWithProgress {
-	protected IJavaProject javaProject;
-	protected ClassPathSelection classPathSelection;
-	// All the Java build path entries created by the classpath selection
-	protected Set allClasspathEntries;
-	protected List allUnselectedClasspathEntries;
-
-	/**
-	 * UpdateJavaBuildPathOperation constructor comment.
-	 */
-	public UpdateJavaBuildPathOperation(IJavaProject aJavaProject, ClassPathSelection aClassPathSelection) {
-		super();
-		javaProject = aJavaProject;
-		classPathSelection = aClassPathSelection;
-		allClasspathEntries = new HashSet();
-		IClasspathEntry[] classpathEntry = aClassPathSelection.getClasspathEntriesForSelected();
-		if (classpathEntry != null)
-			allClasspathEntries.addAll(Arrays.asList(classpathEntry));
-	}
-
-	/**
-	 * UpdateJavaBuildPathOperation constructor comment.
-	 */
-	public UpdateJavaBuildPathOperation(IJavaProject aJavaProject, ClassPathSelection selected, ClassPathSelection unselected) {
-		super();
-		javaProject = aJavaProject;
-		classPathSelection = selected;
-		allClasspathEntries = new HashSet();
-		if (selected != null && !selected.getClasspathElements().isEmpty())
-			allClasspathEntries.addAll(Arrays.asList(selected.getClasspathEntriesForSelected()));
-
-		allUnselectedClasspathEntries = new ArrayList();
-		if (unselected != null && !unselected.getClasspathElements().isEmpty())
-			allUnselectedClasspathEntries.addAll(unselected.getClasspathElements());
-	}
-
-	public UpdateJavaBuildPathOperation(IJavaProject aJavaProject, ClassPathSelection selected, List unselected) {
-		super();
-		javaProject = aJavaProject;
-		classPathSelection = selected;
-		allClasspathEntries = new HashSet();
-		if (selected != null && !selected.getClasspathElements().isEmpty())
-			allClasspathEntries.addAll(Arrays.asList(selected.getClasspathEntriesForSelected()));
-
-		allUnselectedClasspathEntries = new ArrayList();
-		if (unselected != null && !unselected.isEmpty())
-			allUnselectedClasspathEntries.addAll(unselected);
-	}
-
-	protected void ensureClasspathEntryIsExported(List cp, IClasspathEntry entry) {
-		if (entry.isExported())
-			return;
-		int index = getIndex(cp, entry);
-		IClasspathEntry newEntry = null;
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_PROJECT :
-				newEntry = JavaCore.newProjectEntry(entry.getPath(), true);
-				break;
-			case IClasspathEntry.CPE_LIBRARY :
-				newEntry = JavaCore.newLibraryEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath(), true);
-				break;
-			case IClasspathEntry.CPE_VARIABLE :
-				newEntry = JavaCore.newVariableEntry(entry.getPath(), entry.getSourceAttachmentPath(), entry.getSourceAttachmentRootPath());
-			default :
-				break;
-		}
-		if (entry != null)
-			cp.set(index, newEntry);
-	}
-
-	protected IClasspathEntry ensureElementInList(List cp, ClasspathElement element, IClasspathEntry predecessor) {
-		IClasspathEntry addedEntry = null;
-		// The element might have multiple entries in the case of
-		// the imported_classes.jar file
-		IClasspathEntry[] cpEntries = element.newClasspathEntries();
-		if (cpEntries == null || cpEntries.length == 0)
-			// indicates an invalid entry
-			return null;
-
-		int predecessorPos = predecessor == null ? -1 : getIndex(cp, predecessor);
-		addedEntry = cpEntries[0];
-		// Ensure that the first item is in the list, and follows
-		// the predecessor if specified; preserve existing items in
-		// the case of source attachments
-		int pos = getIndex(cp, addedEntry);
-		if (pos == -1) {
-			if (predecessorPos == -1)
-				cp.add(addedEntry);
-			else
-				cp.add(predecessorPos + 1, addedEntry);
-		} else {
-			addedEntry = (IClasspathEntry) cp.get(pos);
-			if (pos < predecessorPos) {
-				cp.remove(addedEntry);
-				cp.add(predecessorPos, addedEntry);
-			}
-		}
-		ensureClasspathEntryIsExported(cp, addedEntry);
-
-		// Remove and add so we can ensure the proper order; this
-		// is the case of the imported_classes.jar; we always want it
-		// directly after the project
-		for (int i = 1; i < cpEntries.length; i++) {
-			int index = getIndex(cp, cpEntries[i]);
-			if (index != -1) {
-				addedEntry = (IClasspathEntry) cp.get(index);
-				cp.remove(index);
-			} else
-				addedEntry = cpEntries[i];
-			pos = getIndex(cp, cpEntries[0]);
-			cp.add(pos + 1, addedEntry);
-		}
-		return addedEntry;
-	}
-
-	protected int getIndex(List cp, IClasspathEntry entry) {
-		for (int i = 0; i < cp.size(); i++) {
-			IClasspathEntry elmt = (IClasspathEntry) cp.get(i);
-			if (elmt.getPath().equals(entry.getPath()))
-				return i;
-		}
-		return -1;
-	}
-
-	protected void ensureElementNotInList(List cp, ClasspathElement element) {
-		IClasspathEntry[] cpEntries = element.newClasspathEntries();
-		if (cpEntries == null || cpEntries.length == 0)
-			return;
-		for (int i = 0; i < cpEntries.length; i++) {
-			if (allClasspathEntries.contains(cpEntries[i]))
-				// This may be included indirectly by a transitive dependency
-				continue;
-			int index = getIndex(cp, cpEntries[i]);
-			if (index != -1)
-				cp.remove(index);
-		}
-	}
-
-	protected void ensureRemoveElementInList(List cp, ClasspathElement element) {
-		IClasspathEntry[] cpEntries = element.newClasspathEntries();
-		if (cpEntries == null || cpEntries.length == 0)
-			return;
-		for (int i = 0; i < cpEntries.length; i++) {
-			if (cp.contains(cpEntries[i])) {
-				int index = getIndex(cp, cpEntries[i]);
-				if (index != -1)
-					cp.remove(index);
-			}
-		}
-	}
-
-	/**
-	 * 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 {
-		try {
-			String[] prevRequiredProjects = javaProject.getRequiredProjectNames();
-			List cp = new ArrayList(Arrays.asList(javaProject.getRawClasspath()));
-			List classpathElements = classPathSelection.getClasspathElements();
-			IClasspathEntry predecessor = null;
-			IClasspathEntry result = null;
-			for (int i = 0; i < classpathElements.size(); i++) {
-				ClasspathElement element = (ClasspathElement) classpathElements.get(i);
-				if (element.isSelected()) {
-					result = ensureElementInList(cp, element, predecessor);
-					if (result != null)
-						predecessor = result;
-				} else
-					ensureElementNotInList(cp, element);
-			}
-			filterUnselectedEntries(cp);
-			IClasspathEntry[] newCp = ((IClasspathEntry[]) cp.toArray(new IClasspathEntry[cp.size()]));
-			javaProject.setRawClasspath(newCp, monitor);
-			updateRequiredProjects(javaProject, prevRequiredProjects, new SubProgressMonitor(monitor, 1));
-		} catch (Exception ex) {
-			throw new WFTWrappedException(ex);
-		}
-	}
-
-	private void filterUnselectedEntries(List cp) {
-		if (allUnselectedClasspathEntries != null) {
-			for (int i = 0; i < allUnselectedClasspathEntries.size(); i++) {
-				ClasspathElement element = (ClasspathElement) allUnselectedClasspathEntries.get(i);
-				ensureRemoveElementInList(cp, element);
-			}
-		}
-	}
-
-	protected void updateRequiredProjects(IJavaProject jproject, String[] prevRequiredProjects, IProgressMonitor monitor) throws CoreException {
-		String[] newRequiredProjects = jproject.getRequiredProjectNames();
-
-		ArrayList prevEntries = new ArrayList(Arrays.asList(prevRequiredProjects));
-		ArrayList newEntries = new ArrayList(Arrays.asList(newRequiredProjects));
-
-		IProject proj = jproject.getProject();
-		IProjectDescription projDesc = proj.getDescription();
-
-		ArrayList newRefs = new ArrayList();
-		IProject[] referencedProjects = projDesc.getReferencedProjects();
-		for (int i = 0; i < referencedProjects.length; i++) {
-			String curr = referencedProjects[i].getName();
-			if (newEntries.remove(curr) || !prevEntries.contains(curr)) {
-				newRefs.add(referencedProjects[i]);
-			}
-		}
-		IWorkspaceRoot root = proj.getWorkspace().getRoot();
-		for (int i = 0; i < newEntries.size(); i++) {
-			String curr = (String) newEntries.get(i);
-			newRefs.add(root.getProject(curr));
-		}
-		projDesc.setReferencedProjects((IProject[]) newRefs.toArray(new IProject[newRefs.size()]));
-		proj.setDescription(projDesc, monitor);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
deleted file mode 100644
index 6e449ca54..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
+++ /dev/null
@@ -1,147 +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.webservices;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class DefaultWSDLServiceHelper implements WSDLServiceHelper {
-
-	/**
-	 * 
-	 */
-	public DefaultWSDLServiceHelper() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortName(java.lang.Object)
-	 */
-	public String getPortName(Object port) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServicePorts(java.lang.Object)
-	 */
-	public Map getServicePorts(Object aService) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceNamespaceURI(java.lang.Object)
-	 */
-	public String getServiceNamespaceURI(Object aService) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceDefinitionLocation(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getServiceDefinitionLocation(EObject aService) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortBindingNamespaceURI(java.lang.Object)
-	 */
-	public String getPortBindingNamespaceURI(Object aPort) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceLocalPart(java.lang.Object)
-	 */
-	public String getServiceLocalPart(Object aService) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceQName(java.lang.Object)
-	 */
-	public Object getServiceQName(Object aService) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getDefinitionServices(java.lang.Object)
-	 */
-	public Map getDefinitionServices(Object aDefinition) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(java.lang.String)
-	 */
-	public Object getWSDLDefinition(String wsdlURL) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(org.eclipse.emf.ecore.resource.Resource)
-	 */
-	public Object getWSDLDefinition(Resource wsdlResource) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWsdlServicesFromWsilFile(org.eclipse.core.resources.IFile)
-	 */
-	public List getWsdlServicesFromWsilFile(IFile wsil) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isService(Object aService) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	public boolean isWSDLResource(Object aResource) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	public boolean isDefinition(Object aDefinition) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public List get13ServiceRefs(EObject j2eeObject) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtManager.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtManager.java
deleted file mode 100644
index b2406a01b..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtManager.java
+++ /dev/null
@@ -1,36 +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.webservices;
-
-public class WSDLServiceExtManager {
-	public static WSDLServiceHelper extension;
-
-	public static WSDLServiceHelper getServiceHelper() {
-		if (extension == null) {
-			// Initialize the WSDL Service Registry to register extensions into this manager
-			WSDLServiceExtensionRegistry.getInstance();
-		}
-		return extension;
-	}
-
-	public static void registerWSDLServiceHelper(WSDLServiceHelper ext) {
-		extension = ext;
-	}
-
-	public static void removeWSDLServiceHelper() {
-		extension = null;
-	}
-
-	public WSDLServiceExtManager() {
-		super();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java
deleted file mode 100644
index c006c96e5..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java
+++ /dev/null
@@ -1,71 +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 Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WSDLServiceExtensionRegistry extends RegistryReader {
-
-	static final String EXTENSION_NAME = "WSDLServiceHelper"; //$NON-NLS-1$
-	static final String ELEMENT_WSDL_HELPER = "wsdlHelper"; //$NON-NLS-1$
-	static final String WSDL_HELPER_CLASS = "helperClass"; //$NON-NLS-1$
-	private static WSDLServiceExtensionRegistry INSTANCE = null;
-
-	public WSDLServiceExtensionRegistry() {
-		super(J2EEPlugin.PLUGIN_ID, EXTENSION_NAME);
-	}
-
-	public static WSDLServiceExtensionRegistry getInstance() {
-		if (INSTANCE == null) {
-			INSTANCE = new WSDLServiceExtensionRegistry();
-			INSTANCE.readRegistry();
-		}
-		return INSTANCE;
-	}
-
-	/**
-	 * readElement() - parse and deal w/ an extension like: <earModuleExtension extensionClass =
-	 * "com.ibm.etools.web.plugin.WebModuleExtensionImpl"/>
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(ELEMENT_WSDL_HELPER))
-			return false;
-		WSDLServiceHelper extension = null;
-		try {
-			extension = (WSDLServiceHelper) element.createExecutableExtension(WSDL_HELPER_CLASS);
-		} catch (Throwable e) {
-			//Ignore
-		} 
-		if (extension != null)
-			addModuleExtension(extension);
-		else // Register default do nothing helper......
-			addModuleExtension(new DefaultWSDLServiceHelper());
-		return true;
-	}
-
-
-	private static void addModuleExtension(WSDLServiceHelper ext) {
-		WSDLServiceExtManager.registerWSDLServiceHelper(ext);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java
deleted file mode 100644
index be9521778..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java
+++ /dev/null
@@ -1,51 +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.webservices;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author cbridgha
- *
- * This interface is intended to expand the visibility of wsdl api, without a direct dependency
- */
-public interface WSDLServiceHelper {
-	
-	public static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
-	
-	public String getPortName(Object port);
-	public Map getServicePorts(Object aService);
-	public String getServiceNamespaceURI(Object aService);
-	public Object getServiceDefinitionLocation(EObject aService);
-	public String getPortBindingNamespaceURI(Object aPort);
-	public String getServiceLocalPart(Object aService);
-	public Object getServiceQName(Object aService);
-	public Map getDefinitionServices(Object aDefinition);
-	public Object getWSDLDefinition(String wsdlURL);
-	public Object getWSDLDefinition(Resource wsdlResource);
-	public List getWsdlServicesFromWsilFile(IFile wsil);
-	public boolean isService(Object aService);
-	public boolean isWSDLResource(Object aResource);
-	public boolean isDefinition(Object aDefinition);
-	public List get13ServiceRefs(EObject j2eeObject);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceClientGenerator.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceClientGenerator.java
deleted file mode 100644
index 5797b899e..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceClientGenerator.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 Apr 28, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
-
-
-/**
- * Extension for generating web service clients
- */
-public abstract class WebServiceClientGenerator {
-
-	public static final String GENERIC_J2EE_CONTAINER = J2EECommonMessages.WebServiceClientGenerator_UI_0;
-
-	private List runtime = null;
-
-	/**
-	 * Generates Web service client artifacts based on information obatined from the dataModel
-	 * (wsdlURL, serviceQName, outputWSDLFilePathName, projectName, shouldDeploy) After generating
-	 * the Web service client artifacts, sets the following on the dataModel: serviceInterfaceName,
-	 * serviceEndpointInterfaceName, didGenDescriptors
-	 * 
-	 * @return Status for results
-	 */
-	public abstract IStatus genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel);
-
-	public void setRuntime(List serverTargets) {
-		runtime = serverTargets;
-	}
-
-	public List getServerTargets() {
-		if (runtime == null)
-			runtime = new ArrayList();
-		return runtime;
-	}
-
-	public boolean isRuntimeSupported(String serverTargetID) {
-		return getServerTargets().contains(serverTargetID);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataHelper.java
deleted file mode 100644
index 909295edb..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataHelper.java
+++ /dev/null
@@ -1,78 +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 Apr 26, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-
-/**
- * WebServicesClientDataHelper Interface Extension - For use in generating Web Service Clients by
- * sharing data between J2EE operations and web services operations
- */
-public interface WebServicesClientDataHelper {
-
-	/**
-	 * @return the URL for the associated original WSDL file referenced by the client
-	 */
-	public String getWSDLUrl();
-
-	/**
-	 * @return the QName of form http://someNamespace:someLocalPart for the associated web service
-	 *         for the client
-	 */
-	public String getServiceQName();
-
-	/**
-	 * @return the name of the target project for the web service client
-	 */
-	public String getProjectName();
-
-	/**
-	 * @return the URI for the fileName path for the copied WSDL file into the client project
-	 */
-	public String getOutputWSDLFileName();
-
-	/**
-	 * @return the qualified classname of the generated Service Interface
-	 */
-	public String getServiceInterfaceName();
-
-	/**
-	 * @return the qualified classname of the generated Service Endpoint Interface
-	 */
-	public String[] getServiceEndpointInterfaceNames();
-
-	/**
-	 * @return should generate code for deployment?
-	 */
-	public boolean shouldDeploy();
-
-	/**
-	 * @return whether the extension generated the descriptors or not
-	 */
-	public boolean shouldGenDescriptors();
-
-	/**
-	 * Set the SEI classname for the web service client
-	 */
-	public void setServiceInterfaceName(String name);
-
-	/**
-	 * Set the SI classname for the web service client
-	 */
-	public void setServiceEndpointInterfaceNames(String[] names);
-
-	/**
-	 * Set whether descriptors were generated
-	 */
-	public void setDidGenDescriptors(boolean b);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataRegistry.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataRegistry.java
deleted file mode 100644
index 67160f679..000000000
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServicesClientDataRegistry.java
+++ /dev/null
@@ -1,86 +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 Apr 26, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservices;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * Read the WebServicesClientDataExtensions
- */
-public class WebServicesClientDataRegistry extends RegistryReader {
-
-	private static WebServicesClientDataRegistry INSTANCE = null;
-	public static final String WS_CLIENT_EXTENSION_POINT = "WebServiceClientGenerator"; //$NON-NLS-1$
-	public static final String GENERATOR = "generator"; //$NON-NLS-1$
-	public static final String CLASS_NAME = "className"; //$NON-NLS-1$
-	public static final String SERVER_TARGET = "serverTarget"; //$NON-NLS-1$
-	public static final String RUNTIME = "runtime"; //$NON-NLS-1$
-	private List wsClientDataExtensions = null;
-
-	/**
-	 * Default constructor
-	 */
-	public WebServicesClientDataRegistry() {
-		super(J2EEPlugin.PLUGIN_ID, WS_CLIENT_EXTENSION_POINT);
-	}
-
-	public static WebServicesClientDataRegistry getInstance() {
-		if (INSTANCE == null) {
-			INSTANCE = new WebServicesClientDataRegistry();
-			INSTANCE.readRegistry();
-		}
-		return INSTANCE;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(GENERATOR))
-			return false;
-		// Get the class specified in the extension point
-		WebServiceClientGenerator helper = null;
-		try {
-			helper = (WebServiceClientGenerator) element.createExecutableExtension(CLASS_NAME);
-			// get server target runtimes
-			IConfigurationElement[] runtimes = element.getChildren(RUNTIME);
-			List runtimeList = new ArrayList();
-			for (int i = 0; i < runtimes.length; i++) {
-				IConfigurationElement runtime = runtimes[i];
-				String serverTarget = runtime.getAttribute(SERVER_TARGET);
-				runtimeList.add(serverTarget);
-			}
-			helper.setRuntime(runtimeList);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		// Add data helper class to registry extensions list
-		if (helper != null) {
-			getWSClientGeneratorExtensions().add(helper);
-			return true;
-		}
-		return false;
-	}
-
-	public List getWSClientGeneratorExtensions() {
-		if (wsClientDataExtensions == null)
-			wsClientDataExtensions = new ArrayList();
-		return wsClientDataExtensions;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
deleted file mode 100644
index 1b321b06d..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
+++ /dev/null
@@ -1,116 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-
-/**
- * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
- * adapters using this common base class.
- */
-public class CommonItemProviderAdapter extends ItemProviderAdapter {
-
-	/**
-	 * This creates and instance from an adapter factory and a domain notifier.
-	 */
-	protected CommonItemProviderAdapter(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This implements the default behavior for {@link CreateChildCommand}.
-	 */
-	public Object createChild(Object object) {
-		return null;
-	}
-
-	/**
-	 * This creates the default new children for {@link CreateChildrenCommand}.
-	 */
-	public Collection createChildren(Object object) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * This returns the default image for {@link com.ibm.etools.common.command.CreateChildCommand}.
-	 */
-	public Object getCreateChildImage(Object object) {
-		EObject refObject = (EObject) object;
-		Collection localChildrenReferences = getChildrenReferences(object);
-		if (localChildrenReferences.size() != 1) {
-			return J2EEPlugin.getPlugin().getImage("create_child");//$NON-NLS-1$
-		}
-		return J2EEPlugin.getPlugin().getImage(refObject.eClass().getName() + "Create" + //$NON-NLS-1$
-					((EReference) localChildrenReferences.iterator().next()).getEType().getName());
-	}
-
-	/**
-	 * This returns the default create children label.
-	 */
-	public String getCreateChildrenText(Object object) {
-		//EObject refObject = (EObject)object;
-		Collection localChildrenReferences = getChildrenReferences(object);
-		if (localChildrenReferences.size() != 1) {
-			return CommonEditResourceHandler.getString("Create_Two_Children_UI_"); //$NON-NLS-1$
-		}
-		return CommonEditResourceHandler.getString("21concat", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the default create children help text.
-	 */
-	public String getCreateChildrenToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		Collection localChildrenReferences = getChildrenReferences(object);
-		if (localChildrenReferences.size() != 1) {
-			return CommonEditResourceHandler.getString("19concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$
-		}
-		return CommonEditResourceHandler.getString("20concat_UI_", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$ = "Create two new children of type {0} for the selected {1}."
-	}
-
-	/**
-	 * This returns the default label for {@link com.ibm.etools.common.command.CreateChildCommand}.
-	 */
-	public String getCreateChildText(Object object) {
-		//EObject refObject = (EObject)object;
-		Collection localChildrenReferences = getChildrenReferences(object);
-		if (localChildrenReferences.size() != 1) {
-			return CommonEditResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
-		}
-		return CommonEditResourceHandler.getString("18concat_UI_", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create {0}"
-	}
-
-	/**
-	 * This returns the default help text for
-	 * {@link com.ibm.etools.common.command.CreateChildCommand}.
-	 */
-	public String getCreateChildToolTipText(Object object) {
-		EObject refObject = (EObject) object;
-		Collection localChildrenReferences = getChildrenReferences(object);
-		if (localChildrenReferences.size() != 1) {
-			return CommonEditResourceHandler.getString("29concat", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a new child for the selected {0}."
-		}
-		return CommonEditResourceHandler.getString("16concat_UI_", (new Object[]{((EReference) localChildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type {0} for the selected {1}."
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
deleted file mode 100644
index 27a6a5e67..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,562 +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.common.internal.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.util.CommonAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
- * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
- * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class CommonItemProviderAdapterFactory extends CommonAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
-	 */
-	protected Collection supportedTypes = new ArrayList();
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.common.SecurityRole}
-	 * instances.
-	 */
-	protected SecurityRoleItemProvider securityRoleItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.common.EjbRef}
-	 * instances.
-	 */
-	protected EjbRefItemProvider ejbRefItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.common.ResourceRef}
-	 * instances.
-	 */
-	protected ResourceRefItemProvider resourceRefItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.common.ResourceEnvRef}
-	 * instances.
-	 */
-	protected ResourceEnvRefItemProvider resourceEnvRefItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all {@link com.ibm.etools.common.EnvEntry}
-	 * instances.
-	 */
-	//ItemProviders
-	protected EnvEntryItemProvider envEntryItemProvider;
-
-	protected SecurityIdentityItemProvider securityIdentityItemProvider;
-
-	protected RunAsSpecifiedIdentityItemProvider runAsSpecifiedIdentityItemProvider;
-
-	protected IdentityItemProvider identityItemProvider;
-
-	protected UseCallerIdentityItemProvider useCallerIdentityItemProvider;
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.common.SecurityRoleRef}instances.
-	 */
-	protected SecurityRoleRefItemProvider securityRoleRefItemProvider;
-	protected Disposable disposable = new Disposable();
-
-	/**
-	 * This constructs an instance.
-	 */
-	public CommonItemProviderAdapterFactory() {
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	public Adapter adapt(Notifier target, Object adapterKey) {
-		return super.adapt(target, this);
-	}
-
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	public Adapter adaptNew(Notifier target, Object adapterType) {
-		Adapter adapter = super.adaptNew(target, adapterType);
-		disposable.add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.EjbRef}.
-	 */
-	public Adapter createEjbRefAdapter() {
-		if (ejbRefItemProvider == null) {
-			ejbRefItemProvider = new EjbRefItemProvider(this);
-		}
-
-		return ejbRefItemProvider;
-	}
-
-
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.UseCallerIdentity}.
-	 */
-	public Adapter createUseCallerIdentityAdapter() {
-		if (useCallerIdentityItemProvider == null) {
-			useCallerIdentityItemProvider = new UseCallerIdentityItemProvider(this);
-		}
-
-		return useCallerIdentityItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DescriptionItemProvider descriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createDescriptionAdapter() {
-		if (descriptionItemProvider == null) {
-			descriptionItemProvider = new DescriptionItemProvider(this);
-		}
-
-		return descriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected QNameItemProvider qNameItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.QName}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createQNameAdapter() {
-		if (qNameItemProvider == null) {
-			qNameItemProvider = new QNameItemProvider(this);
-		}
-
-		return qNameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ListenerItemProvider listenerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createListenerAdapter() {
-		if (listenerItemProvider == null) {
-			listenerItemProvider = new ListenerItemProvider(this);
-		}
-
-		return listenerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected CompatibilityDescriptionGroupItemProvider compatibilityDescriptionGroupItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		if (compatibilityDescriptionGroupItemProvider == null) {
-			compatibilityDescriptionGroupItemProvider = new CompatibilityDescriptionGroupItemProvider(this);
-		}
-
-		return compatibilityDescriptionGroupItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.EnvEntry}.
-	 */
-	public Adapter createEnvEntryAdapter() {
-		if (envEntryItemProvider == null) {
-			envEntryItemProvider = new EnvEntryItemProvider(this);
-		}
-
-		return envEntryItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.ResourceRef}.
-	 */
-	public Adapter createResourceRefAdapter() {
-		if (resourceRefItemProvider == null) {
-			resourceRefItemProvider = new ResourceRefItemProvider(this);
-		}
-
-		return resourceRefItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.ResourceEnvRef}.
-	 */
-	public Adapter createResourceEnvRefAdapter() {
-		if (resourceEnvRefItemProvider == null) {
-			resourceEnvRefItemProvider = new ResourceEnvRefItemProvider(this);
-		}
-
-		return resourceEnvRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EJBLocalRefItemProvider ejbLocalRefItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createEJBLocalRefAdapter() {
-		if (ejbLocalRefItemProvider == null) {
-			ejbLocalRefItemProvider = new EJBLocalRefItemProvider(this);
-		}
-
-		return ejbLocalRefItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.SecurityRole}.
-	 */
-	public Adapter createSecurityRoleAdapter() {
-		if (securityRoleItemProvider == null) {
-			securityRoleItemProvider = new SecurityRoleItemProvider(this);
-		}
-
-		return securityRoleItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.Identity}.
-	 */
-	public Adapter createIdentityAdapter() {
-		if (identityItemProvider == null) {
-			identityItemProvider = new IdentityItemProvider(this);
-		}
-
-		return identityItemProvider;
-	}
-
-
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}instances. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IconTypeItemProvider iconTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createIconTypeAdapter() {
-		if (iconTypeItemProvider == null) {
-			iconTypeItemProvider = new IconTypeItemProvider(this);
-		}
-
-		return iconTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DisplayNameItemProvider displayNameItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createDisplayNameAdapter() {
-		if (displayNameItemProvider == null) {
-			displayNameItemProvider = new DisplayNameItemProvider(this);
-		}
-
-		return displayNameItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected MessageDestinationRefItemProvider messageDestinationRefItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createMessageDestinationRefAdapter() {
-		if (messageDestinationRefItemProvider == null) {
-			messageDestinationRefItemProvider = new MessageDestinationRefItemProvider(this);
-		}
-
-		return messageDestinationRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected MessageDestinationItemProvider messageDestinationItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createMessageDestinationAdapter() {
-		if (messageDestinationItemProvider == null) {
-			messageDestinationItemProvider = new MessageDestinationItemProvider(this);
-		}
-
-		return messageDestinationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ParamValueItemProvider paramValueItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createParamValueAdapter() {
-		if (paramValueItemProvider == null) {
-			paramValueItemProvider = new ParamValueItemProvider(this);
-		}
-
-		return paramValueItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected DescriptionGroupItemProvider descriptionGroupItemProvider;
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		if (descriptionGroupItemProvider == null) {
-			descriptionGroupItemProvider = new DescriptionGroupItemProvider(this);
-		}
-
-		return descriptionGroupItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.RunAsSpecifiedIdentity}.
-	 */
-	public Adapter createRunAsSpecifiedIdentityAdapter() {
-		if (runAsSpecifiedIdentityItemProvider == null) {
-			runAsSpecifiedIdentityItemProvider = new RunAsSpecifiedIdentityItemProvider(this);
-		}
-
-		return runAsSpecifiedIdentityItemProvider;
-	}
-
-	public Adapter createSecurityIdentityAdapter() {
-		if (securityIdentityItemProvider == null) {
-			securityIdentityItemProvider = new SecurityIdentityItemProvider(this);
-		}
-
-		return securityIdentityItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link com.ibm.etools.common.SecurityRoleRef}.
-	 */
-	public Adapter createSecurityRoleRefAdapter() {
-		if (securityRoleRefItemProvider == null) {
-			securityRoleRefItemProvider = new SecurityRoleRefItemProvider(this);
-		}
-
-		return securityRoleRefItemProvider;
-	}
-
-	public void dispose() {
-		disposable.dispose();
-	}
-
-	/**
-	 * This returns the root adapter factory that contains the factory.
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return (parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory());
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return super.isFactoryForType(type) || supportedTypes.contains(type);
-	}
-
-	/**
-	 * This removes a listener.
-	 * 
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains the factory.
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
deleted file mode 100644
index 9158a3a1f..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
+++ /dev/null
@@ -1,173 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class CompatibilityDescriptionGroupItemProvider extends DescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public CompatibilityDescriptionGroupItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSmallIconPropertyDescriptor(object);
-			addLargeIconPropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addDisplayNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addSmallIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_smallIcon_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_smallIcon_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_SmallIcon(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addLargeIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_largeIcon_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_largeIcon_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_LargeIcon(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_description_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_description_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addDisplayNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_displayName_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_CompatibilityDescriptionGroup_displayName_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns CompatibilityDescriptionGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CompatibilityDescriptionGroup"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((CompatibilityDescriptionGroup) object).getDisplayName();
-		return label == null || label.length() == 0 ? getString("_UI_CompatibilityDescriptionGroup_type") : //$NON-NLS-1$
-					getString("_UI_CompatibilityDescriptionGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(CompatibilityDescriptionGroup.class)) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON :
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON :
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION :
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
deleted file mode 100644
index b4d292f19..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
+++ /dev/null
@@ -1,159 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class DescriptionGroupItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DescriptionGroupItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			//childrenReferences.add(CommonPackage.eINSTANCE.getDescriptionGroup_Icons());
-			//childrenReferences.add(CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames());
-			//childrenReferences.add(CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns DescriptionGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/DescriptionGroup"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_Icons(), CommonFactory.eINSTANCE.createIconType()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames(), CommonFactory.eINSTANCE.createDisplayName()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_DescriptionGroup_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(DescriptionGroup.class)) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS :
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES :
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java
deleted file mode 100644
index cc12dcc62..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class DescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLangPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Description_lang_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Description_lang_feature", "_UI_Description_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getDescription_Lang(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Description_value_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Description_value_feature", "_UI_Description_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getDescription_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns Description.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/CompatibilityDescriptionGroup"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *  
-	 */
-	public String getText(Object object) {
-		String label = ((Description) object).getValue();
-		return label == null || label.length() == 0 ? CommonEditResourceHandler.getString("Description_UI_") : //$NON-NLS-1$
-					CommonEditResourceHandler.getString("Description_UI_") + ": " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Description.class)) {
-			case CommonPackage.DESCRIPTION__LANG :
-			case CommonPackage.DESCRIPTION__VALUE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java
deleted file mode 100644
index c1bd1e647..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.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.common.internal.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class DisplayNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public DisplayNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLangPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_DisplayName_lang_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_DisplayName_lang_feature", "_UI_DisplayName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getDisplayName_Lang(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_DisplayName_value_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_DisplayName_value_feature", "_UI_DisplayName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getDisplayName_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns DisplayName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/DisplayName"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DisplayName) object).getLang();
-		return label == null || label.length() == 0 ? getString("_UI_DisplayName_type") : //$NON-NLS-1$
-					getString("_UI_DisplayName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(DisplayName.class)) {
-			case CommonPackage.DISPLAY_NAME__LANG :
-			case CommonPackage.DISPLAY_NAME__VALUE : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
deleted file mode 100644
index 620d8243c..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
+++ /dev/null
@@ -1,143 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class EJBLocalRefItemProvider extends EjbRefItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EJBLocalRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLocalHomePropertyDescriptor(object);
-			addLocalPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This adds a property descriptor for the Local Home feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	protected void addLocalHomePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_EJBLocalRef_localHome_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_EJBLocalRef_localHome_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getEJBLocalRef_LocalHome(), false));
-	}
-
-	/**
-	 * This adds a property descriptor for the Local feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 */
-	protected void addLocalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_EJBLocalRef_local_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_EJBLocalRef_local_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getEJBLocalRef_Local(), false));
-	}
-
-
-	/**
-	 * This returns EJBLocalRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getDefault().getImage("ejb_local_ref_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 */
-	public String getText(Object object) {
-		String label = ((EJBLocalRef) object).getName();
-		return label == null || label.length() == 0 ? CommonEditResourceHandler.getString("_UI_EJBLocalRef_type") : label; //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(EJBLocalRef.class)) {
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME :
-			case CommonPackage.EJB_LOCAL_REF__LOCAL : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
deleted file mode 100644
index 05365e781..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
+++ /dev/null
@@ -1,296 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.EjbRef}object.
- */
-public class EjbRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public EjbRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns ejb_reference.gif.
-	 */
-	public Object getImage(Object object) {
-		String key = ((EjbRef) object).isLocal() ? "ejb_local_ref_obj" : "ejb_reference"; //$NON-NLS-1$ //$NON-NLS-2$
-		return J2EEPlugin.getPlugin().getImage(key); 
-	}
-
-	/**
-	 * This returns the parent of the EjbRef.
-	 */
-	public Object getParent(Object object) {
-		return object == null ? null : ((EjbRef) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-
-			// This is for the name feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
-						pkg.getEjbRef_Name(), true));
-
-			// This is for the type feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
-						pkg.getEjbRef_Type(), false));
-
-			// This is for the home feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Home_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_home_property_UI_"), //$NON-NLS-1$
-						pkg.getEjbRef_Home(), false));
-
-			// This is for the remote feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Remote_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_remote_property_UI_"), //$NON-NLS-1$
-						pkg.getEjbRef_Remote(), false));
-
-			// This is for the link feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
-						pkg.getEjbRef_Link(), false));
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
-						pkg.getEjbRef_Description(), true));
-
-			// This is for the client feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("Client_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_client_property_UI_"), //$NON-NLS-1$
-			 * pkg.getEjbRef_Client()));
-			 */
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
-			 * pkg.getEjbRef_WebApp()));
-			 */
-
-			// This is for the ejb feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), // next four
-			 * lines for 175333 //ResourceHandler.getString("Ejb_UI_"), //$NON-NLS-1$
-			 * "EJB",//$NON-NLS-1$ //ResourceHandler.getString("The_ejb_property_UI_"),
-			 * //$NON-NLS-1$ ResourceHandler.getString("The_EJB_property_UI_"), //$NON-NLS-1$ = "The
-			 * EJB property" pkg.getEjbRef_Ejb()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEjbRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEjbRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_name_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEjbRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_type_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_type_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEjbRef_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Home feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addHomePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_home_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_home_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEjbRef_Home(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Remote feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRemotePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_remote_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_remote_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEjbRef_Remote(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_link_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_link_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEjbRef_Link(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EjbRef_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EjbRef_description_feature", "_UI_EjbRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEjbRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getEjbRef_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		if (object instanceof EJBLocalRef)
-			return "EjbLocalRef " + ((EJBLocalRef) object).getName(); //$NON-NLS-1$
-		return "EjbRef " + ((EjbRef) object).getName(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(EjbRef.class)) {
-			case CommonPackage.EJB_REF__NAME :
-			case CommonPackage.EJB_REF__TYPE :
-			case CommonPackage.EJB_REF__HOME :
-			case CommonPackage.EJB_REF__REMOTE :
-			case CommonPackage.EJB_REF__LINK :
-			case CommonPackage.EJB_REF__DESCRIPTION :
-			case CommonPackage.EJB_REF__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
-	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
-	 * this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
deleted file mode 100644
index 4331c4361..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
+++ /dev/null
@@ -1,244 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.EnvEntry}object.
- */
-public class EnvEntryItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public EnvEntryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns environment_entity.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("environment_entity");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the parent of the EnvEntry.
-	 */
-	public Object getParent(Object object) {
-
-		return object == null ? null : ((EnvEntry) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
-						pkg.getEnvEntry_Description()));
-
-			// This is for the name feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
-						pkg.getEnvEntry_Name()));
-
-			// This is for the value feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Value_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_value_property_UI_"), //$NON-NLS-1$
-						pkg.getEnvEntry_Value()));
-
-			// This is for the type feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
-						pkg.getEnvEntry_Type()));
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
-			 * pkg.getEnvEntry_WebApp()));
-			 */
-
-			// This is for the client feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("Client_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_client_property_UI_"), //$NON-NLS-1$
-			 * pkg.getEnvEntry_Client()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_description_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEnvEntry_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_name_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEnvEntry_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_value_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_value_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEnvEntry_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EnvEntry_type_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_EnvEntry_type_feature", "_UI_EnvEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getEnvEntry_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getEnvEntry_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		return "EnvEntry " + ((EnvEntry) object).getName();//$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(EnvEntry.class)) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION :
-			case CommonPackage.ENV_ENTRY__NAME :
-			case CommonPackage.ENV_ENTRY__VALUE :
-			case CommonPackage.ENV_ENTRY__TYPE :
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEnvEntry_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getEnvEntry_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
-	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
-	 * this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
deleted file mode 100644
index 18a8cd246..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
+++ /dev/null
@@ -1,163 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class IconTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public IconTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSmallIconPropertyDescriptor(object);
-			addLargeIconPropertyDescriptor(object);
-			addLangPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSmallIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_IconType_smallIcon_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_IconType_smallIcon_feature", "_UI_IconType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getIconType_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLargeIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_IconType_largeIcon_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_IconType_largeIcon_feature", "_UI_IconType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getIconType_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Lang feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLangPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_IconType_lang_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_IconType_lang_feature", "_UI_IconType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getIconType_Lang(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns IconType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/IconType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((IconType) object).getSmallIcon();
-		return label == null || label.length() == 0 ? getString("_UI_IconType_type") : //$NON-NLS-1$
-					getString("_UI_IconType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(IconType.class)) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON :
-			case CommonPackage.ICON_TYPE__LARGE_ICON :
-			case CommonPackage.ICON_TYPE__LANG : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
deleted file mode 100644
index a9e139b81..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
+++ /dev/null
@@ -1,176 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.Identity}object.
- */
-public class IdentityItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public IdentityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-			;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Description", //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_of_the_identity_2"), //$NON-NLS-1$
-						pkg.getIdentity_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
-			// This is for the roleName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Role Name", //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_role_name_property_of_the_identity_4"), //$NON-NLS-1$
-						pkg.getIdentity_RoleName(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Identity_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Identity_description_feature", "_UI_Identity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getIdentity_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRoleNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Identity_roleName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Identity_roleName_feature", "_UI_Identity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getIdentity_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getIdentity_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns the parent of the Identity.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns Identity.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("security_identity_obj");//$NON-NLS-1$
-	}
-
-	public String getText(Object object) {
-		Identity identity = ((Identity) object);
-		return "Identity " + identity.getRoleName(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(Identity.class)) {
-			case CommonPackage.IDENTITY__DESCRIPTION :
-			case CommonPackage.IDENTITY__ROLE_NAME :
-			case CommonPackage.IDENTITY__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getIdentity_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getIdentity_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
deleted file mode 100644
index 9ac243d48..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
+++ /dev/null
@@ -1,190 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.JNDIEnvRefsGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class JNDIEnvRefsGroupItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public JNDIEnvRefsGroupItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EnvironmentProperties());
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceRefs());
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs());
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceEnvRefs());
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs());
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_MessageDestinationRefs());
-			childrenReferences.add(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ServiceRefs());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EReference getChildReference(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildReference(object, child);
-	}
-
-
-	/**
-	 * This returns JNDIEnvRefsGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/JNDIEnvRefsGroup"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((JNDIEnvRefsGroup) object).getDisplayName();
-		return label == null || label.length() == 0 ? getString("_UI_JNDIEnvRefsGroup_type") : //$NON-NLS-1$
-					getString("_UI_JNDIEnvRefsGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(JNDIEnvRefsGroup.class)) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES :
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS :
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS :
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS :
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS :
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS :
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EnvironmentProperties(), CommonFactory.eINSTANCE.createEnvEntry()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceRefs(), CommonFactory.eINSTANCE.createResourceRef()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs(), CommonFactory.eINSTANCE.createEjbRef()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs(), CommonFactory.eINSTANCE.createEJBLocalRef()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ResourceEnvRefs(), CommonFactory.eINSTANCE.createResourceEnvRef()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs(), CommonFactory.eINSTANCE.createEJBLocalRef()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_MessageDestinationRefs(), CommonFactory.eINSTANCE.createMessageDestinationRef()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
-		boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
-		return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
-					new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java
deleted file mode 100644
index 86c3d02a7..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common.internal.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-public class ListenerItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ListenerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns Listener.gif
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("listener");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the webApp of the Listener.
-	 */
-	public Object getParent(Object object) {
-		return WebapplicationPackage.eINSTANCE.getWebApp();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			CommonPackage wap = CommonPackage.eINSTANCE;
-
-			// This is for the listenerClass feature.
-
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "ListenerClass", CommonEditResourceHandler.getString("The_ListenerClass_property_2"), wap.getListener_ListenerClass(), false)); //$NON-NLS-1$ //$NON-NLS-2$
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Listener Class feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addListenerClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Listener_listenerClass_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_Listener_listenerClass_feature", "_UI_Listener_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getListener_ListenerClass(), true));
-	}
-
-
-	public String getText(Object object) {
-		Listener listener = (Listener) object;
-		String name = listener.getListenerClassName();
-		if (name == null)
-			name = "<listener>"; //$NON-NLS-1$
-		return name;
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
deleted file mode 100644
index c253268f5..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
+++ /dev/null
@@ -1,133 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class MessageDestinationItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public MessageDestinationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageDestination_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_MessageDestination_name_feature", "_UI_MessageDestination_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getMessageDestination_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns MessageDestination.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/msgdrivendestination_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 */
-	public String getText(Object object) {
-		String md = CommonEditResourceHandler.getString("MessageDestination_UI_"); //$NON-NLS-1$
-		String label = ((MessageDestination) object).getName();
-		return label == null || label.length() == 0 ? md : md + " " + label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(MessageDestination.class)) {
-			case CommonPackage.MESSAGE_DESTINATION__NAME : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
deleted file mode 100644
index 76513c5f0..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
+++ /dev/null
@@ -1,197 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class MessageDestinationRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public MessageDestinationRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-			addUsagePropertyDescriptor(object);
-			addLinkPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getMessageDestinationRef_Name(), true));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature.
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getMessageDestinationRef_Type(), true));
-	}
-
-	/**
-	 * This adds a property descriptor for the Usage feature.
-	 */
-	protected void addUsagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Usage_UI_"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("The_usage_property_UI_"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getMessageDestinationRef_Usage(), true));
-	}
-
-	/**
-	 * This adds a property descriptor for the Link feature.
-	 */
-	protected void addLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getMessageDestinationRef_Link(), true));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getMessageDestinationRef_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns MessageDestinationRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("message_bean_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MessageDestinationRef) object).getName();
-		return CommonEditResourceHandler.getString("MessageDestinationRefItemProvider_UI_0") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$, $NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(MessageDestinationRef.class)) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME :
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE :
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE :
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK :
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getMessageDestinationRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getMessageDestinationRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object arg0) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
deleted file mode 100644
index 646cd3887..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
+++ /dev/null
@@ -1,187 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ParamValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ParamValueItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_ParamValue_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ParamValue_name_feature", "_UI_ParamValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getParamValue_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_ParamValue_value_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ParamValue_value_feature", "_UI_ParamValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getParamValue_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_ParamValue_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ParamValue_description_feature", "_UI_ParamValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getParamValue_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getParamValue_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns ParamValue.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("initializ_parameter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ParamValue) object).getName();
-		return label == null || label.length() == 0 ? CommonEditResourceHandler.getString("_UI_ParamValue_type") : //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_ParamValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ParamValue.class)) {
-			case CommonPackage.PARAM_VALUE__NAME :
-			case CommonPackage.PARAM_VALUE__VALUE :
-			case CommonPackage.PARAM_VALUE__DESCRIPTION :
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getParamValue_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getParamValue_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
deleted file mode 100644
index 8c7ec4964..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
+++ /dev/null
@@ -1,176 +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.common.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
- * @generated
- */
-public class QNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public QNameItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamespaceURIPropertyDescriptor(object);
-			addLocalPartPropertyDescriptor(object);
-			//addCombinedQNamePropertyDescriptor(object);
-			//addInternalPrefixOrNsURIPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Namespace URI feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addNamespaceURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_QName_namespaceURI_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_QName_namespaceURI_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getQName_NamespaceURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Local Part feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	protected void addLocalPartPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("_UI_QName_localPart_feature"), //$NON-NLS-1$
-					CommonEditResourceHandler.getString("_UI_QName_localPart_feature_desc"), //$NON-NLS-1$
-					CommonPackage.eINSTANCE.getQName_LocalPart(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Combined QName feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addCombinedQNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_QName_combinedQName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_QName_combinedQName_feature", "_UI_QName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getQName_CombinedQName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Internal Prefix Or Ns URI feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addInternalPrefixOrNsURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_QName_internalPrefixOrNsURI_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_QName_internalPrefixOrNsURI_feature", "_UI_QName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getQName_InternalPrefixOrNsURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-
-	/**
-	 * This returns QName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("qname"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 */
-	public String getText(Object object) {
-		String label = CommonEditResourceHandler.getString("_UI_QName_type"); //$NON-NLS-1$
-		if (((QName) object).getNamespaceURI() != null && (((QName) object).getLocalPart() != null)) {
-			label = CommonEditResourceHandler.getString("_UI_QName_type") + " " + //$NON-NLS-1$ //$NON-NLS-2$
-						((QName) object).getNamespaceURI() + "#" + ((QName) object).getLocalPart(); //$NON-NLS-1$
-		}
-		return label;
-
-
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(QName.class)) {
-			case CommonPackage.QNAME__NAMESPACE_URI :
-			case CommonPackage.QNAME__LOCAL_PART :
-			case CommonPackage.QNAME__COMBINED_QNAME :
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
deleted file mode 100644
index b7680b513..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
+++ /dev/null
@@ -1,202 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.ResourceRef}object.
- */
-public class ResourceEnvRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ResourceEnvRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns resource_reference.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("res_env_ref_obj"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the parent of the ResourceRef.
-	 */
-	public Object getParent(Object object) {
-		return object == null ? null : ((ResourceEnvRef) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceEnvRef_Description(), true));
-
-			// This is for the name feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceEnvRef_Name(), true));
-
-			// This is for the type feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceEnvRef_Type(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceEnvRef_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceEnvRef_description_feature", "_UI_ResourceEnvRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceEnvRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceEnvRef_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceEnvRef_name_feature", "_UI_ResourceEnvRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceEnvRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceEnvRef_type_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceEnvRef_type_feature", "_UI_ResourceEnvRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceEnvRef_Type(), true));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getResourceEnvRef_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		return "ResourceEnvRef " + ((ResourceEnvRef) object).getName(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ResourceEnvRef.class)) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION :
-			case CommonPackage.RESOURCE_ENV_REF__NAME :
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceEnvRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceEnvRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
-	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
-	 * this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
deleted file mode 100644
index 9d564185a..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
+++ /dev/null
@@ -1,281 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.ResourceRef}object.
- */
-public class ResourceRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public ResourceRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns resource_reference.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("resource_reference"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the parent of the ResourceRef.
-	 */
-	public Object getParent(Object object) {
-		return object == null ? null : ((ResourceRef) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-			;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceRef_Description()));
-
-			// This is for the name feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceRef_Name()));
-
-			// This is for the type feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Type_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_type_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceRef_Type(), false));
-
-			// This is for the auth feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Auth_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_auth_property_UI_"), //$NON-NLS-1$
-						pkg.getResourceRef_Auth()));
-
-			// This is for the link feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
-			 * pkg.getResourceRef_Link()));
-			 */
-
-			// This is for the client feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("Client_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_client_property_UI_"), //$NON-NLS-1$
-			 * pkg.getResourceRef_Client()));
-			 */
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
-			 * pkg.getResourceRef_WebApp()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_description_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_name_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_type_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_type_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceRef_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Auth feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addAuthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_auth_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_auth_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceRef_Auth(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_link_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_link_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceRef_Link(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Res Sharing Scope feature. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addResSharingScopePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceRef_resSharingScope_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_ResourceRef_resSharingScope_feature", "_UI_ResourceRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getResourceRef_ResSharingScope(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getResourceRef_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		return "ResourceRef " + ((ResourceRef) object).getName(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(ResourceRef.class)) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION :
-			case CommonPackage.RESOURCE_REF__NAME :
-			case CommonPackage.RESOURCE_REF__TYPE :
-			case CommonPackage.RESOURCE_REF__AUTH :
-			case CommonPackage.RESOURCE_REF__LINK :
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE :
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getResourceRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
-	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
-	 * this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
deleted file mode 100644
index aac1e6f2d..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
+++ /dev/null
@@ -1,136 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.RunAsSpecifiedIdentity}
- * object.
- */
-public class RunAsSpecifiedIdentityItemProvider extends SecurityIdentityItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public RunAsSpecifiedIdentityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-
-			// This is for the identity feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Identity", //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_identity_of_the_run_as_specified_identity_2"), //$NON-NLS-1$
-						pkg.getRunAsSpecifiedIdentity_Identity(), false));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getRunAsSpecifiedIdentity_Identity());
-		}
-		return childrenReferences;
-	}
-
-	/**
-	 * This returns the parent of the RunAsSpecifiedIdentity.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns RunAsSpecifiedIdentity.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("security_identity_obj");//$NON-NLS-1$
-	}
-
-	public String getText(Object object) {
-		RunAsSpecifiedIdentity runAsSpecifiedIdentity = ((RunAsSpecifiedIdentity) object);
-		return "RunAsSpecifiedIdentity " + runAsSpecifiedIdentity.getDescription(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(RunAsSpecifiedIdentity.class)) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getRunAsSpecifiedIdentity_Identity(), CommonFactory.eINSTANCE.createIdentity()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
deleted file mode 100644
index 05363da3f..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
+++ /dev/null
@@ -1,160 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-;
-
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.SecurityIdentity}object.
- */
-public class SecurityIdentityItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public SecurityIdentityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-			;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Description", //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_of_the_security_identity_2"), //$NON-NLS-1$
-						pkg.getSecurityIdentity_Description(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityIdentity_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityIdentity_description_feature", "_UI_SecurityIdentity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getSecurityIdentity_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getSecurityIdentity_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	/**
-	 * This returns the parent of the SecurityIdentity.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns SecurityIdentity.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("environment_entity");//$NON-NLS-1$
-	}
-
-	public String getText(Object object) {
-		SecurityIdentity securityIdentity = ((SecurityIdentity) object);
-		return "SecurityIdentity " + securityIdentity.getDescription(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SecurityIdentity.class)) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION :
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityIdentity_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityIdentity_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
deleted file mode 100644
index c510a5e5b..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
+++ /dev/null
@@ -1,203 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.SecurityRole}object.
- */
-public class SecurityRoleItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public SecurityRoleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns security_role.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("security_role");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the parent of the SecurityRole.
-	 */
-	public Object getParent(Object object) {
-		return object == null ? null : ((SecurityRole) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
-						pkg.getSecurityRole_Description()));
-
-			// This is for the roleName feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("RoleName_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_roleName_property_UI_"), //$NON-NLS-1$
-						pkg.getSecurityRole_RoleName()));
-
-			// This is for the application feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("Application_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_application_property_UI_"), //$NON-NLS-1$
-			 * pkg.getSecurityRole_Application()));
-			 */
-
-			// This is for the webApp feature.
-			//
-			/*
-			 * itemPropertyDescriptors.add (new ItemPropertyDescriptor
-			 * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-			 * ResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$
-			 * ResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$
-			 * pkg.getSecurityRole_WebApp()));
-			 */
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRole_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityRole_description_feature", "_UI_SecurityRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getSecurityRole_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addRoleNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRole_roleName_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityRole_roleName_feature", "_UI_SecurityRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getSecurityRole_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getSecurityRole_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		return " " + ((SecurityRole) object).getRoleName();//$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SecurityRole.class)) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION :
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME :
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRole_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRole_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
-	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
-	 * this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
deleted file mode 100644
index 0d63afaef..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
+++ /dev/null
@@ -1,201 +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.common.internal.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.SecurityRoleRef}object.
- */
-public class SecurityRoleRefItemProvider extends CommonItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public SecurityRoleRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns security_role_reference.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("security_role_reference");//$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the servlet of the SecurityRoleRef.
-	 */
-	public Object getParent(Object object) {
-		return object == null ? null : ((SecurityRoleRef) object).eContainer();
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			CommonPackage pkg = CommonPackage.eINSTANCE;
-
-			// This is for the name feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Name_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_name_property_UI_"), //$NON-NLS-1$
-						pkg.getSecurityRoleRef_Name()));
-
-			// This is for the description feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Description_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$
-						pkg.getSecurityRoleRef_Description()));
-
-			// This is for the link feature.
-			//
-			itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), CommonEditResourceHandler.getString("Link_UI_"), //$NON-NLS-1$
-						CommonEditResourceHandler.getString("The_link_property_UI_"), //$NON-NLS-1$
-						pkg.getSecurityRoleRef_Link(), false));
-
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRoleRef_name_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityRoleRef_name_feature", "_UI_SecurityRoleRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getSecurityRoleRef_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRoleRef_description_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityRoleRef_description_feature", "_UI_SecurityRoleRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getSecurityRoleRef_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This adds a property descriptor for the Link feature. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityRoleRef_link_feature"), //$NON-NLS-1$
-					getString("_UI_PropertyDescriptor_description", "_UI_SecurityRoleRef_link_feature", "_UI_SecurityRoleRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					CommonPackage.eINSTANCE.getSecurityRoleRef_Link(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenReferences(Object object) {
-		if (childrenReferences == null) {
-			super.getChildrenReferences(object);
-			childrenReferences.add(CommonPackage.eINSTANCE.getSecurityRoleRef_Descriptions());
-		}
-		return childrenReferences;
-	}
-
-
-	public String getText(Object object) {
-		return "SecurityRoleRef " + ((SecurityRoleRef) object).getName();//$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(SecurityRoleRef.class)) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME :
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION :
-			case CommonPackage.SECURITY_ROLE_REF__LINK :
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS : {
-				fireNotifyChanged(notification);
-				return;
-			}
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRoleRef_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
-		newChildDescriptors.add(createChildParameter(CommonPackage.eINSTANCE.getSecurityRoleRef_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-
-	/**
-	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
-	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
-	 * this is faster.
-	 */
-	public boolean hasChildren(Object object) {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/UseCallerIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/UseCallerIdentityItemProvider.java
deleted file mode 100644
index 28ab991a0..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/UseCallerIdentityItemProvider.java
+++ /dev/null
@@ -1,100 +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.common.internal.provider;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.common.UseCallerIdentity}object.
- */
-public class UseCallerIdentityItemProvider extends SecurityIdentityItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 */
-	public UseCallerIdentityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the parent of the UseCallerIdentity.
-	 */
-	public Object getParent(Object object) {
-		return ((EObject) object).eContainer();
-	}
-
-	/**
-	 * This returns UseCallerIdentity.gif.
-	 */
-	public Object getImage(Object object) {
-		return J2EEPlugin.getPlugin().getImage("security_identity_obj");//$NON-NLS-1$
-	}
-
-	public String getText(Object object) {
-		UseCallerIdentity useCallerIdentity = ((UseCallerIdentity) object);
-		return "UseCallerIdentity " + useCallerIdentity.getDescription(); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *  
-	 */
-	public ResourceLocator getResourceLocator() {
-		return J2EEPlugin.getDefault();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/CommonEditResourceHandler.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/CommonEditResourceHandler.java
deleted file mode 100644
index b2e308bc8..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/CommonEditResourceHandler.java
+++ /dev/null
@@ -1,63 +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.common;
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CommonEditResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("commonedit");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(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);
-		}
-
-	}
-
-	public static String getString(String key, Object[] args, int x) {
-
-		return getString(key);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IJ2EECommonConstants.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IJ2EECommonConstants.java
deleted file mode 100644
index d6e6f4bfd..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IJ2EECommonConstants.java
+++ /dev/null
@@ -1,35 +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.common;
-
-
-/**
- * @author jialin
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- */
-public interface IJ2EECommonConstants {
-
-	//J2EE Preferences
-	// J2EE_NAVIGATOR_LINKING_PREFERENCE specifies whether the J2EE Navigator
-	// selection should be linked to the active editor.
-	// It is a boolean value, and the default is true.
-	final static String J2EE_NAVIGATOR_LINKING_PREFERENCE = "org.eclipse.jst.j2ee.internal.internal.ui.preference.j2eeNavigatorLinking"; //$NON-NLS-1$
-	final static String J2EE_VERSION_PREFERENCE = "org.eclipse.jst.j2ee.internal.internal.ui.preference.j2eeVersion";//$NON-NLS-1$
-	final static String J2EE_VERSION_1_2 = "J2EE_1_2"; //$NON-NLS-1$
-	final static String J2EE_VERSION_1_3 = "J2EE_1_3"; //$NON-NLS-1$
-
-	final static String J2EE_VERSION_PREF_LABEL = CommonEditResourceHandler.getString("Select_the_highest_J2EE_version_that_is_to_be_used__UI_"); //$NON-NLS-1$
-
-	final static String SAVE_ON_BINARY_PROJECT_TITLE = CommonEditResourceHandler.getString("SAVE_ON_BINARY_PROJECT_TITLE_UI_"); //$NON-NLS-1$
-	final static String SAVE_ON_BINARY_PROJECT_MESSAGE = CommonEditResourceHandler.getString("SAVE_ON_BINARY_PROJECT_MESSAGE_UI_"); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IStructuredTextEditingDomain.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IStructuredTextEditingDomain.java
deleted file mode 100644
index b2f988240..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/IStructuredTextEditingDomain.java
+++ /dev/null
@@ -1,43 +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.common;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.wst.sse.core.internal.undo.IStructuredTextUndoManager;
-
-/**
- * This is a specialized editing domain that can be used by editors that have one or more design
- * pages that view a MOF model and a source page that contains an XML Model.
- */
-public interface IStructuredTextEditingDomain extends EditingDomain {
-	/**
-	 * Execute a command within the editing domain.
-	 */
-	public void execute(Command command);
-
-	/**
-	 * Execute a command within the editing domain
-	 */
-	public void execute(String label, Command command);
-
-	/**
-	 * This returns the adapter factory used by this domain.
-	 */
-	public AdapterFactory getAdapterFactory();
-
-	public IStructuredTextUndoManager getUndoManager();
-
-	public void setUndoManager(IStructuredTextUndoManager newUndoManager);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
deleted file mode 100644
index ff54dbe1b..000000000
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
+++ /dev/null
@@ -1,88 +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.common;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.wst.sse.core.internal.undo.IStructuredTextUndoManager;
-
-/**
- * This is a specialized editing domain that can be used by editors that have one or more design
- * pages that view a MOF model and a source page that contains an XML Model.
- */
-public class StructuredTextEditingDomain extends AdapterFactoryEditingDomain implements IStructuredTextEditingDomain {
-	protected IStructuredTextUndoManager undoManager;
-
-	/**
-	 * StructuredTextEditingDomain constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 * @param commandStack
-	 *            CommandStack
-	 */
-	public StructuredTextEditingDomain(AdapterFactory adapterFactory, CommandStack commandStack) {
-		super(adapterFactory, commandStack);
-	}
-
-	public StructuredTextEditingDomain(AdapterFactory adapterFactory, CommandStack commandStack, ResourceSet resourceSet) {
-		super(adapterFactory, commandStack, resourceSet);
-	}
-
-	/**
-	 * Execute a command within the editing domain.
-	 */
-	public void execute(Command command) {
-		execute(command.getLabel(), command);
-	}
-
-	/**
-	 * Execute a command within the editing domain.
-	 */
-	public void execute(String label, Command command) {
-		executeViaUndoManager(label, command);
-	}
-
-	/**
-	 * Execute a command directly on the command stack
-	 */
-	public void executeViaStack(Command command) {
-		getCommandStack().execute(command);
-	}
-
-	/**
-	 * Execute a command within the editing domain.
-	 */
-	public void executeViaUndoManager(String label, Command command) {
-		if (command.canExecute()) {
-			if (undoManager != null) {
-				undoManager.beginRecording(this, label);
-				command.execute();
-				undoManager.endRecording(this);
-			} else
-				executeViaStack(command);
-		}
-	}
-
-	public IStructuredTextUndoManager getUndoManager() {
-		return undoManager;
-	}
-
-	public void setUndoManager(IStructuredTextUndoManager newUndoManager) {
-		undoManager = newUndoManager;
-		undoManager.setCommandStack(commandStack);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/component.xml b/plugins/org.eclipse.jst.j2ee/component.xml
deleted file mode 100644
index 39d5499b1..000000000
--- a/plugins/org.eclipse.jst.j2ee/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee" fragment="false"/><plugin id="org.eclipse.jst.j2ee.navigator.ui" fragment="false"/><plugin id="org.eclipse.jst.j2ee.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
deleted file mode 100644
index f21a0e9e6..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class AddComponentToEnterpriseApplicationDataModelProvider extends CreateReferenceComponentsDataModelProvider implements IAddComponentToEnterpriseApplicationDataModelProperties {
-
-	public AddComponentToEnterpriseApplicationDataModelProvider() {
-		super();
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
-			Map map = new HashMap();
-			List components = (List) getProperty(TARGET_COMPONENT_LIST);
-			for (int i = 0; i < components.size(); i++) {
-				IVirtualComponent component = (IVirtualComponent) components.get(i);
-				IProject project = component.getProject();
-				String name = component.getName();
-				if(name != null)
-					name = name.replace(' ','_');
-				
-				if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-					name += IModuleExtensions.DOT_WAR;
-				} else if (J2EEProjectUtilities.isJCAProject(project)) {
-					name += IModuleExtensions.DOT_RAR;
-				} else {
-					name += IModuleExtensions.DOT_JAR;
-				}
-				map.put(component, name);
-			}
-			setProperty(propertyName, map);
-			return map;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-
-	public IDataModelOperation getDefaultOperation() {
-		return new AddComponentToEnterpriseApplicationOp(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
deleted file mode 100644
index 9c8a89290..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsOp;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class AddComponentToEnterpriseApplicationOp extends CreateReferenceComponentsOp {
-	public static final String metaInfFolderDeployPath = "/"; //$NON-NLS-1$
-
-	public AddComponentToEnterpriseApplicationOp(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (monitor != null) {
-			monitor.beginTask("", 3);
-		}
-
-		try {
-			J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
-			IStatus status = super.execute(submon(monitor, 1), info);
-			if (!status.isOK())
-				return Status.CANCEL_STATUS;
-			updateEARDD(submon(monitor, 1));
-			updateModuleRuntimes(submon(monitor, 1));
-			return OK_STATUS;
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-			J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
-		}
-	}
-
-	protected String getArchiveName(IVirtualComponent comp) {
-		boolean useArchiveURI = true;
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(comp.getProject());
-		} catch (CoreException e) {
-			useArchiveURI = false;
-		}
-
-		if (useArchiveURI && facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(IModuleConstants.JST_UTILITY_MODULE)) {
-			IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE);
-			useArchiveURI = projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
-		}
-		if (useArchiveURI) {
-			return super.getArchiveName(comp);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	
-	/**
-	 * {@link DoNotUseMeThisWillBeDeletedPost15}
-	 * For each module component added to the ear, references are created for every manifest entry.
-	 * 
-	 * @param monitor
-	 */
-	protected void updateManifestReferences(IProgressMonitor monitor) {
-	}
-
-	protected void updateEARDD(IProgressMonitor monitor) {
-
-		EARArtifactEdit earEdit = null;
-		StructureEdit se = null;
-		try {
-			IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
-			earEdit = EARArtifactEdit.getEARArtifactEditForWrite(sourceComp.getProject());
-			se = StructureEdit.getStructureEditForWrite(sourceComp.getProject());
-			if (earEdit != null) {
-				Application application = earEdit.getApplication();
-				List list = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-				Map map = (Map) model.getProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP);
-				if (list != null && list.size() > 0) {
-					for (int i = 0; i < list.size(); i++) {
-						StructureEdit compse = null;
-						IVirtualComponent wc = (IVirtualComponent) list.get(i);
-						WorkbenchComponent earwc = se.getComponent();
-						try {
-							compse = StructureEdit.getStructureEditForWrite(wc.getProject());
-							WorkbenchComponent refwc = compse.getComponent();
-							ReferencedComponent ref = se.findReferencedComponent(earwc, refwc);
-							Module mod = addModule(application, wc, (String) map.get(wc));
-							if (ref!=null)
-								ref.setDependentObject(mod);
-						} finally {
-							if (compse != null) {
-								compse.saveIfNecessary(monitor);
-								compse.dispose();
-							}
-						}
-					}
-				}
-			}
-			se.saveIfNecessary(monitor);
-			earEdit.saveIfNecessary(monitor);
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (earEdit != null)
-				earEdit.dispose();
-			if (se != null)
-				se.dispose();
-		}
-	}
-
-	protected Module createNewModule(IVirtualComponent wc) {
-		if (J2EEProjectUtilities.isDynamicWebProject(wc.getProject())) {
-			return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createWebModule();
-		} else if (J2EEProjectUtilities.isEJBProject(wc.getProject())) {
-			return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createEjbModule();
-		} else if (J2EEProjectUtilities.isApplicationClientProject(wc.getProject())) {
-			return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createJavaClientModule();
-		} else if (J2EEProjectUtilities.isJCAProject(wc.getProject())) {
-			return ((ApplicationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI)).getApplicationFactory().createConnectorModule();
-		}
-		return null;
-	}
-
-	protected Module addModule(Application application, IVirtualComponent wc, String name) {
-		Application dd = application;
-		Module existingModule = dd.getFirstModule(name);
-
-		if (existingModule == null) {
-			existingModule = createNewModule(wc);
-			if (existingModule != null) {
-				existingModule.setUri(name);
-				if (existingModule instanceof WebModule) {
-					Properties props = wc.getMetaProperties();
-					String contextroot = ""; //$NON-NLS-1$
-					if ((props != null) && (props.containsKey(J2EEConstants.CONTEXTROOT)))
-						contextroot = props.getProperty(J2EEConstants.CONTEXTROOT);
-					((WebModule) existingModule).setContextRoot(contextroot);
-				}
-				dd.getModules().add(existingModule);
-			}
-		}
-		return existingModule;
-	}
-
-	private void updateModuleRuntimes(final IProgressMonitor monitor) {
-		if (monitor != null) {
-			monitor.beginTask("", 10);
-		}
-
-		try {
-			final IVirtualComponent ear = (IVirtualComponent) this.model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
-
-			final IProject earpj = ear.getProject();
-
-			final List moduleComponents = (List) this.model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
-			final Set moduleProjects = new HashSet();
-
-			for (Iterator itr = moduleComponents.iterator(); itr.hasNext();) {
-				moduleProjects.add(((IVirtualComponent) itr.next()).getProject());
-			}
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-
-			EarFacetRuntimeHandler.updateModuleProjectRuntime(earpj, moduleProjects, submon(monitor, 9));
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	private static IProgressMonitor submon(final IProgressMonitor parent, final int ticks) {
-		return (parent == null ? null : new SubProgressMonitor(parent, ticks));
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebComponentToEARDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebComponentToEARDataModelProvider.java
deleted file mode 100644
index 867ba9f8f..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebComponentToEARDataModelProvider.java
+++ /dev/null
@@ -1,103 +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.application.internal.operations;
-
-import java.util.Set;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * 
- */
-public class AddWebComponentToEARDataModelProvider extends AddComponentToEnterpriseApplicationDataModelProvider implements IAddWebComponentToEnterpriseApplicationDataModelProperties {
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(CONTEXT_ROOT);
-		return propertyNames;
-	}
-
-	/**
-	 * 
-	 */
-	protected String getDefaultURIExtension() {
-		return "war"; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isWebModuleArchive() {
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean notify = super.propertySet(propertyName, propertyValue);
-		if (notify && propertyName.equals(CONTEXT_ROOT))
-			model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.DEFAULT_CHG);
-		return notify;
-	}
-
-	/**
-	 * 
-	 */
-	public Object getDefaultProperty(String propertyName) {
-		// if (propertyName.equals(CONTEXT_ROOT))
-		// return getDefaultContextRoot();
-		return super.getDefaultProperty(propertyName);
-	}
-
-
-	/**
-	 * 
-	 */
-	public IStatus validate(String propertyName) {
-		if (CONTEXT_ROOT.equals(propertyName)) {
-			return validateContextRoot(getStringProperty(CONTEXT_ROOT));
-		}
-		return super.validate(propertyName);
-	}
-
-	/**
-	 * 
-	 * @param contextRoot
-	 * @return
-	 */
-	public IStatus validateContextRoot(String contextRoot) {
-		if (contextRoot.equals("") || contextRoot == null) { //$NON-NLS-1$
-			return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2, new Object[]{contextRoot}), null); 
-		} else if (contextRoot.trim().equals(contextRoot)) {
-			StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
-			while (stok.hasMoreTokens()) {
-				String token = stok.nextToken();
-				for (int i = 0; i < token.length(); i++) {
-					if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
-						Object[] invalidChar = new Object[]{(new Character(token.charAt(i))).toString()};
-						String errorStatus = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar); 
-						return J2EEPlugin.newErrorStatus(errorStatus, null);
-					}
-				}
-			}
-		} else
-			return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_begin_or_end_with_whitespace_5, new Object[]{contextRoot}), null); 
-		return OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientComponentExportDataModelProvider.java
deleted file mode 100644
index 8b23858d4..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,71 +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.application.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.AppClientComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class AppClientComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider {
-
-    public AppClientComponentExportDataModelProvider() {
-        super();
-    }
-
-    public IDataModelOperation getDefaultOperation() {
-        return new AppClientComponentExportOperation(model);
-    }
-
-    protected String getModuleExtension() {
-        return ".jar"; //$NON-NLS-1$
-    }
-
-    protected String getWrongComponentTypeString(String projectName) {
-        return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_AN_APP_CLIENT, new Object[]{projectName});
-    }
-
-    protected String getProjectType() {
-        return J2EEProjectUtilities.APPLICATION_CLIENT;
-    }
-    /**
-     * Exports the specified Application Client Module project to the specified Application Client
-     * Jar file.
-     * 
-     * @param appClientProjectName
-     *            The name of the Application Client Module project to export.
-     * @param appClientJarFileName
-     *            The fully qualified Application Client Jar file location to export the specified
-     *            Application Client Module project.
-     * @param overwriteExisting
-     *            If this is <code>true</code> then an existing file at the location specified by
-     *            <code>earFileName</code> will be overwritten.
-     * @param exportSource
-     *            If this is <code>true</code> then all source files in the specified Application
-     *            Client Module will be included in the resulting Application Client Jar file.
-     * @plannedfor WTP 1.0
-     */
-//    public static void exportProject(String appClientProjectName, String appClientJarFileName, boolean overwriteExisting, boolean exportSource) {
-//        AppClientModuleExportDataModel dataModel = new AppClientModuleExportDataModel();
-//        dataModel.setProperty(PROJECT_NAME, appClientProjectName);
-//        dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-//        dataModel.setProperty(ARCHIVE_DESTINATION, appClientJarFileName);
-//        dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-//        try {
-//            dataModel.getDefaultOperation().run(null);
-//        } catch (InvocationTargetException e) {
-//            Logger.getLogger().logError(e);
-//        } catch (InterruptedException e) {
-//            Logger.getLogger().logError(e);
-//        }
-//    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/BinaryProjectHelper.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/BinaryProjectHelper.java
deleted file mode 100644
index 3e7245d54..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/BinaryProjectHelper.java
+++ /dev/null
@@ -1,135 +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.application.internal.operations;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-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.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-public class BinaryProjectHelper {
-
-	public void importArchiveAsBinary(Archive archive, IProject project, IProgressMonitor monitor) {
-		try {
-					
-			IJavaProject javaProject = JavaCore.create(project);
-			
-			IFile savedModuleFile = saveFile(archive, project);
-			saveEnclosedFile(archive, project, ProjectUtilities.DOT_CLASSPATH);
-			saveEnclosedFile(archive, project, ProjectUtilities.DOT_PROJECT);
-			removeImportedClassesFromClasspathIfNecessary(project);
-			
-			ensureBinary(javaProject, monitor);
-			IPath path = savedModuleFile.getFullPath();
-			
-			IClasspathEntry newEntry = JavaCore.newLibraryEntry(path, path, null, true);
-						
-			IClasspathEntry[] entries = javaProject.getRawClasspath();
-			IClasspathEntry[] newEntries = new IClasspathEntry[entries.length + 1];
-			System.arraycopy(entries, 0, newEntries, 1, entries.length);
-			newEntries[0] = newEntry;			
-			javaProject.setRawClasspath(newEntries, monitor);
-								 
-		} catch (FileNotFoundException e) {
-			Logger.getLogger().log(e);
-		} catch (IOException e) {
-			Logger.getLogger().log(e);
-		} catch (JavaModelException e) {
-			Logger.getLogger().log(e);
-		} 
-	} 
-
-	/**
-	 * 
-	 */
-	public static void removeImportedClassesFromClasspathIfNecessary(IProject project) {
-		IJavaProject javaProj = JavaCore.create(project);
-		if (javaProj != null) {
-			IClasspathEntry[] entries = javaProj.readRawClasspath();
-			if (entries != null) {
-				IClasspathEntry entryToRemove = null;
-				for (int i = 0; i < entries.length; i++) {
-					if (entries[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY && entries[i].getPath().toString().endsWith("imported_classes") && !project.getFolder("imported_classes").exists()) {
-						entryToRemove = entries[i];
-						break;
-					}
-				}
-				if (null != entryToRemove) {
-					IClasspathEntry[] newEntries = new IClasspathEntry[entries.length - 1];
-					for (int i = 0, j = 0; i < newEntries.length && j < entries.length; j++) {
-						if (entryToRemove != entries[j]) {
-							newEntries[i] = entries[j];
-							i++;
-						}
-					}
-					entries = newEntries;
-					IPath output = javaProj.readOutputLocation();
-					if (output != null)
-						try {
-							javaProj.setRawClasspath(entries, output, null);
-						} catch (JavaModelException e) {
-						}
-				}
-
-			}
-		}
-	}
-
-	protected IFile saveFile(File aFile, IProject p) throws IOException {
-		IFile iFile = p.getFile(aFile.getURI());
-		WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(iFile);
-		ArchiveUtil.copy(aFile.getInputStream(), out);
-		return iFile;
-	}
-
-	protected void saveEnclosedFile(Archive anArchive, IProject p, String uri) throws IOException {
-		try {
-			File aFile = anArchive.getFile(uri);
-			saveFile(aFile, p);
-		} catch (FileNotFoundException ignore) {
-		}
-	}
-
-	protected void ensureBinary(IJavaProject javaProject, IProgressMonitor monitor) {
-		
-		if (javaProject == null)
-			return;
-		List newCp = new ArrayList();
-		try {
-			IClasspathEntry[] entries = javaProject.getRawClasspath();
-			for (int i = 0; i < entries.length; i++) { 
-				if (entries[i].getEntryKind() != IClasspathEntry.CPE_SOURCE)
-					newCp.add(entries[i]);
-			}
-			entries = (IClasspathEntry[]) newCp.toArray(new IClasspathEntry[newCp.size()]);
-			javaProject.setRawClasspath(entries, monitor);
-		} catch (JavaModelException ex) {
-			Logger.getLogger().log(ex);
-		}
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
deleted file mode 100644
index 6ecbc23ba..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
+++ /dev/null
@@ -1,882 +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.application.internal.operations;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-
-
-public class ClassPathSelection {
-	protected Archive archive;
-	protected IProject earProject;
-	protected IVirtualComponent earComponent;
-	protected List classpathElements;
-	protected Map urisToElements;
-	protected boolean modified;
-	private String targetProjectName;
-	protected Map ejbToClientJARs = null;
-	protected Map clientToEJBJARs = null;
-	public static final int FILTER_EJB_SERVER_JARS = 0;
-	public static final int FILTER_EJB_CLIENT_JARS = 1;
-	public static final int FILTER_NONE = 2;
-
-	protected int filterLevel = 2;
-
-	protected static Comparator comparator = new Comparator() {
-		/**
-		 * @see Comparator#compare(Object, Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			Archive a1 = (Archive) o1;
-			Archive a2 = (Archive) o2;
-			return a1.getURI().compareTo(a2.getURI());
-		}
-	};
-
-	public ClassPathSelection(Archive anArchive, String targetProjectName, EARFile earFile) {
-		super();
-		archive = anArchive;
-		this.targetProjectName = targetProjectName;
-		initializeEARProject(earFile);
-		initializeElements();
-	}
-
-	/**
-	 * ClassPathSelection constructor comment.
-	 */
-	public ClassPathSelection(Archive anArchive, EARFile earFile) {
-		super();
-		archive = anArchive;
-		initializeEARProject(earFile);
-		initializeElements();
-	}
-	
-	/**
-	 * ClassPathSelection constructor comment.
-	 */
-	public ClassPathSelection() {
-		super();
-	}
-
-	protected ClasspathElement createElement(Archive referencingArchive, Archive referencedArchive, String cpEntry) {
-		ClasspathElement element = new ClasspathElement(referencingArchive);
-		element.setValid(true);
-				
-		String uriString = referencedArchive.getURI();
-		URI uri = URI.createURI(uriString);
-
-		boolean hasAbsolutePath = uri.hasAbsolutePath();
-		if( hasAbsolutePath ){
-			uriString = uri.lastSegment();
-		}
-		
-		//element.setText(referencedArchive.getURI());
-		element.setText(uriString);
-		element.setTargetArchive(referencedArchive);
-		element.setEarProject(earProject);
-		if( earComponent != null ){
-			IContainer earConentFolder = earComponent.getRootFolder().getUnderlyingFolder();
-			if( earConentFolder.getType() == IResource.FOLDER ){
-				element.setEarContentFolder( earConentFolder.getName());
-			}else {
-				element.setEarContentFolder( "" );
-			}
-		}
-	
-		setProjectValues(element, referencedArchive);
-		if (cpEntry != null)
-			element.setValuesSelected(cpEntry);
-		setType(element, referencedArchive);
-		return element;
-	}
-
-	protected ClasspathElement createInvalidElement(String cpEntry) {
-		ClasspathElement element = new ClasspathElement(archive);
-		element.setValid(false);
-		element.setSelected(true);
-		element.setRelativeText(cpEntry);
-		element.setText(cpEntry);
-		element.setEarProject(earProject);
-		setInvalidProject(element);
-		return element;
-	}
-	
-	public ClasspathElement createProjectElement(IProject project) {
-		ClasspathElement element = new ClasspathElement(project);
-		element.setValid(true);
-		element.setSelected(true);
-		element.setText(project.getName());
-		element.setProject(project);
-		addClasspathElement(element,element.getProjectName());
-		return element;
-	}
-	
-	public ClasspathElement createProjectElement(IProject project, boolean existingEntry ) {
-		ClasspathElement element = new ClasspathElement(project);
-		element.setValid(true);
-		element.setSelected(existingEntry);
-		element.setText(project.getName());
-		element.setProject(project);
-		addClasspathElement(element,element.getProjectName());
-		return element;
-	}
-	
-	
-	public ClasspathElement createArchiveElement(URI uri, String name, String cpEntry) {
-		ClasspathElement element = new ClasspathElement(uri);
-		element.setValid(false);
-		element.setRelativeText(name);
-		if (cpEntry != null)
-			element.setValuesSelected(cpEntry);		
-		element.setText(name);
-		element.setEarProject(earProject);
-		return element;
-	}	
-
-	/**
-	 * @param element
-	 */
-	private void setInvalidProject(ClasspathElement element) {
-		IProject earProj = element.getEarProject();
-		//IVirtualComponent[] component = ComponentUtilities.getComponent(earProj.getName());
-		IVirtualComponent component = ComponentUtilities.getComponent(earProj.getName());
-		EARArtifactEdit edit = null;
-		try {
-			edit = EARArtifactEdit.getEARArtifactEditForRead(component);
-		if (edit != null) {
-			String moduleName = element.getRelativeText();
-			if(moduleName != null) {
-				IVirtualComponent modComponent = edit.getModule(moduleName);
-				if(modComponent != null) {
-				IProject mappedProject = modComponent.getProject();
-				element.setProject(mappedProject);
-				}
-			}
-		}
-	  } finally {
-		  if(edit != null) {
-			  edit.dispose();
-		    edit = null;
-		  }
-	  }
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 1:17:21 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getClasspathElements() {
-		if(classpathElements == null)
-			classpathElements = new ArrayList();
-		return classpathElements;
-	}
-	
-	public java.util.List getSelectedClasspathElements() {
-		ArrayList list = new ArrayList();
-		Iterator it = getClasspathElements().iterator();
-		while(it.hasNext()) {
-			ClasspathElement element = (ClasspathElement)it.next();
-			if( element.isSelected() ){
-				list.add(element);
-			}
-		}
-		return list;
-	}	
-
-	/**
-	 * Adapter method to convert the manifest class path entries which map to a project to a list of
-	 * classpath entries for a java build path
-	 */
-	protected IClasspathEntry[] getClasspathEntries(boolean filterSelected) {
-		List result = new ArrayList();
-		IClasspathEntry[] array = null;
-		ClasspathElement element = null;
-		if(classpathElements != null) {
-		for (int i = 0; i < classpathElements.size(); i++) {
-			element = (ClasspathElement) classpathElements.get(i);
-			if (filterSelected && !element.isSelected())
-				continue;
-			array = ((ClasspathElement) classpathElements.get(i)).newClasspathEntries();
-			if (array == null)
-				continue;
-			for (int j = 0; j < array.length; j++) {
-				if (!result.contains(array[j]))
-					result.add(array[j]);
-			}
-		}
-		return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
-		}
-		return null;
-	}
-
-	/**
-	 * Adapter method to convert the manifest class path entries which map to a project to a list of
-	 * classpath entries for a java build path
-	 */
-	public IClasspathEntry[] getClasspathEntriesForAll() {
-		return getClasspathEntries(false);
-	}
-
-	/**
-	 * Adapter method to convert the manifest class path entries which map to a project to a list of
-	 * classpath entries for a java build path
-	 */
-	public IClasspathEntry[] getClasspathEntriesForSelected() {
-		return getClasspathEntries(true);
-	}
-
-	protected EARFile getEARFile() {
-		if (archive == null)
-			return null;
-
-		Container parent = archive.getContainer();
-		if (parent != null && parent.isEARFile())
-			return (EARFile) parent;
-		return null;
-	}
-
-	protected static IProject getEARProject(Archive anArchive) {
-		Container c = anArchive.getContainer();
-		if (!c.isEARFile())
-			return null;
-		EARFile ear = (EARFile) c;
-		LoadStrategy loader = ear.getLoadStrategy();
-		if (!(loader instanceof EARComponentLoadStrategyImpl))
-			return null;
-
-		return ((EARComponentLoadStrategyImpl) loader).getComponent().getProject();
-	}
-
-	public Archive getArchive() {
-		return archive;
-	}
-
-	protected IProject getProject(Archive anArchive) {
-		LoadStrategy loader = anArchive.getLoadStrategy();
-		if (loader instanceof ComponentLoadStrategyImpl)
-			return ((ComponentLoadStrategyImpl) loader).getComponent().getProject();
-		return null;
-	}
-
-	public String getText() {
-		return archive.getURI();
-	}
-
-	protected Archive getArchive(String uri, List archives) {
-		for (int i = 0; i < archives.size(); i++) {
-			Archive anArchive = (Archive) archives.get(i);
-			
-			String archiveURIString = anArchive.getURI();
-			URI archiveURI = URI.createURI(archiveURIString);
-			boolean hasAbsolutePath = archiveURI.hasAbsolutePath();
-			if( hasAbsolutePath ){
-				archiveURIString = archiveURI.lastSegment();
-			}
-			if (archiveURIString.equals(uri))
-				return anArchive;
-		}
-		return null;
-	}
-
-	protected void initializeElements() {
-		ejbToClientJARs = J2EEProjectUtilities.collectEJBClientJARs(getEARFile());
-		clientToEJBJARs = reverse(ejbToClientJARs);
-		classpathElements = new ArrayList();
-		urisToElements = new HashMap();
-		String[] cp = new String[0];
-		try {
-			cp = archive.getManifest().getClassPathTokenized();
-		} catch (ManifestException ex) {
-			Logger.getLogger().logError(ex);
-		}
-		List archives = getEARFile().getArchiveFiles();
-		Archive other = null;
-		ClasspathElement element = null;
-		for (int i = 0; i < cp.length; i++) {
-			String cpEntry = cp[i];
-			String uri = ArchiveUtil.deriveEARRelativeURI(cpEntry, archive);
-			other = getArchive(uri, archives);
-			if (other != null && ArchiveUtil.isValidDependency(other, archive)) {
-				element = createElement(archive, other, cpEntry);
-				archives.remove(other);
-			} else {
-				element = createInvalidElement(cpEntry);
-				if (element.representsImportedJar()) {
-					element.setValid(true);
-					element.setProject(getProject(archive));
-				}
-				if (other != null)
-					element.setProject(getProject(other));
-				
-				if( other == null ){
-					//making a best guess for the project name
-					if( element.getProject() == null ){
-						int  index = cpEntry.indexOf(".jar"); //$NON-NLS-1$
-						if( index > 0 ){
-							String projectName = cpEntry.substring(0, index);
-							IProject project = ProjectUtilities.getProject( projectName );
-							if( project != null && project.exists() )
-								element.setProject( project );
-						}
-					}
-				}
-			}
-			addClasspathElement(element, uri);
-		}
-		Collections.sort(archives, comparator);
-		//Anything that remains in the list of available archives that is valid should be
-		//available for selection
-		for (int i = 0; i < archives.size(); i++) {
-			other = (Archive) archives.get(i);
-			if (other != archive && ArchiveUtil.isValidDependency(other, archive)) {
-				IProject project = getProject(other);
-				if (null == targetProjectName || null == project || !project.getName().equals(targetProjectName)) {
-					element = createElement(archive, other, null);
-					element.setProject(getProject(other));
-					addClasspathElement(element, other.getURI());
-				}
-			}
-		}
-		
-		if( earComponent!= null){
-			IVirtualReference[] newrefs = earComponent.getReferences();
-			for( int i=0; i < newrefs.length; i++){
-				IVirtualReference ref = newrefs[i];
-				IVirtualComponent referencedComponent = ref.getReferencedComponent();
-				boolean isBinary = referencedComponent.isBinary();
-				if( isBinary ){
-					
-					
-			         /**
-			          * Warning clean-up 12/05/2005
-			          */   
-					//String uri = J2EEProjectUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
-					String unresolvedURI = ref.getArchiveName();
-					if(unresolvedURI == null){
-						try {
-							unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)));
-						} catch (UnresolveableURIException e) {
-							e.printStackTrace();
-						}
-					}
-					
-					if(unresolvedURI != null){
-						URI archiveURI = URI.createURI(unresolvedURI);	
-						
-						boolean  alreadyInList = false;
-						Iterator iter = getClasspathElements().iterator();
-						while(iter.hasNext()){
-							ClasspathElement tmpelement = (ClasspathElement)iter.next();
-							if(unresolvedURI.endsWith(tmpelement.getText())){
-								alreadyInList = true;
-								break;
-							}
-						}
-						
-						if( !alreadyInList ){
-							if( inManifest(cp, archiveURI.lastSegment())){
-								element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), archiveURI.lastSegment());
-								addClasspathElement(element, unresolvedURI);
-							}else{
-								element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), null);
-								addClasspathElement(element, unresolvedURI);							
-							}
-						}
-					}
-				}
-			}
-		}	
-	}
-
-	boolean inManifest(String[] cp, String archiveName ){
-		boolean result = false;
-		String cpEntry = "";
-		for (int i = 0; i < cp.length; i++) {
-			cpEntry = cp[i];
-			if( archiveName.equals(cpEntry)){
-				result = true;
-			}
-		}
-		return result;
-	}
-		
-	protected List loadClassPathArchives(){
-        /**
-         * Warning clean-up 12/05/2005
-         */   
-		//LoadStrategy loadStrat = archive.getLoadStrategy();
-		
-		List archives = new ArrayList();
-		
-		if( earComponent!= null){
-			IVirtualReference[] newrefs = earComponent.getReferences();
-			for( int i=0; i < newrefs.length; i++){
-				IVirtualReference ref = newrefs[i];
-				IVirtualComponent referencedComponent = ref.getReferencedComponent();
-				boolean isBinary = referencedComponent.isBinary();
-			
-				if( isBinary ){
-					String uri = J2EEProjectUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
-		
-					try {
-						ZipFileLoadStrategyImpl strat = createLoadStrategy(uri);
-						Archive archive = null;
-						try {
-							archive = CommonarchiveFactoryImpl.getActiveFactory().primOpenArchive(strat, uri);
-						} catch (OpenFailureException e) {
-							// TODO Auto-generated catch block
-							Logger.getLogger().logError(e);
-						}
-
-						archives.add(archive);
-						
-					} catch (FileNotFoundException e) {
-						Logger.getLogger().logError(e);
-					} catch (IOException e) {
-						Logger.getLogger().logError(e);
-					}
-				}
-				
-			}
-		}
-		return archives;
-	}
-	
-	Archive getClassPathArchive(String uri, List archives){
-		for (int i = 0; i < archives.size(); i++) {
-			Archive anArchive = (Archive) archives.get(i);
-			
-			String archiveURIString = anArchive.getURI();
-			URI archiveURI = URI.createURI(archiveURIString);
-			boolean hasAbsolutePath = archiveURI.hasAbsolutePath();
-			if( hasAbsolutePath ){
-				archiveURIString = archiveURI.lastSegment();
-			}
-			if (archiveURIString.equals(uri))
-				return anArchive;
-		}
-		return null;
-	}
-	
-	boolean  isClassPathArchive(String uri, List archives){
-		for (int i = 0; i < archives.size(); i++) {
-			Archive anArchive = (Archive) archives.get(i);
-			
-			String archiveURIString = anArchive.getURI();
-			URI archiveURI = URI.createURI(archiveURIString);
-	         /**
-	          * Warning clean-up 12/05/2005
-	          */   
-			//boolean hasAbsolutePath = archiveURI.hasAbsolutePath();
-			if( archiveURI.lastSegment().equals(uri) ){
-				return true;
-			}
-		}
-		return false;
-	}	
-	
-	public ZipFileLoadStrategyImpl createLoadStrategy(String uri) throws FileNotFoundException, IOException {
-		String filename = uri.replace('/', java.io.File.separatorChar);
-		java.io.File file = new java.io.File(filename);
-		if (!file.exists()) {
-			throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
-		}
-		if (file.isDirectory()) {
-			throw new FileNotFoundException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[]{uri, file.getAbsolutePath()}))); // = "URI Name: {0}; File name: {1}"
-		}
-		return new org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl(file);
-	}
-	
-	
-	private void initializeEARProject(EARFile earFile) {
-		LoadStrategy loadStrat = earFile.getLoadStrategy();
-		if (loadStrat instanceof EARComponentLoadStrategyImpl){
-			earComponent = ((EARComponentLoadStrategyImpl) loadStrat).getComponent();
-			earProject = ((EARComponentLoadStrategyImpl) loadStrat).getComponent().getProject();
-		}	
-	}
-
-	private void setType(ClasspathElement element, Archive other) {
-		if (other == null)
-			return;
-		else if (clientToEJBJARs.containsKey(other))
-			element.setJarType(ClasspathElement.EJB_CLIENT_JAR);
-		else if (other.isEJBJarFile())
-			element.setJarType(ClasspathElement.EJB_JAR);
-	}
-
-	/**
-	 * @param localejbToClientJARs
-	 * @return
-	 */
-	private Map reverse(Map localejbToClientJARs) {
-		if (localejbToClientJARs == null || localejbToClientJARs.isEmpty())
-			return Collections.EMPTY_MAP;
-		Map result = new HashMap();
-		Iterator iter = localejbToClientJARs.entrySet().iterator();
-		while (iter.hasNext()) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			result.put(entry.getValue(), entry.getKey());
-		}
-		return result;
-	}
-
-	public void addClasspathElement(ClasspathElement element, String uri) {
-		getClasspathElements().add(element);
-		getUrisToElements().put(uri, element);
-		element.setParentSelection(this);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 6:05:11 PM)
-	 * 
-	 * @return boolean
-	 */
-	public boolean isModified() {
-		return modified;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 6:05:11 PM)
-	 * 
-	 * @param newModified
-	 *            boolean
-	 */
-	public void setModified(boolean newModified) {
-		modified = newModified;
-	}
-
-	protected void setProjectValues(ClasspathElement element, Archive referencedArchive) {
-		IProject p = getProject(referencedArchive);
-		if (p == null)
-			return;
-
-		element.setProject(p);
-		//Handle the imported jars in the project
-		String[] cp = null;
-		try {
-			cp = referencedArchive.getManifest().getClassPathTokenized();
-		} catch (ManifestException mfEx) {
-			Logger.getLogger().logError(mfEx);
-			cp = new String[]{};
-		}
-		List paths = new ArrayList(cp.length);
-		for (int i = 0; i < cp.length; i++) {
-
-			IFile file = null;
-			try {
-				file = p.getFile(cp[i]);
-			} catch (IllegalArgumentException invalidPath) {
-				continue;
-			}
-			if (file.exists())
-				paths.add(file.getFullPath());
-		}
-		if (!paths.isEmpty())
-			element.setImportedJarPaths(paths);
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < classpathElements.size(); i++) {
-			ClasspathElement element = (ClasspathElement) classpathElements.get(i);
-			if (element.isSelected()) {
-				sb.append(element.getRelativeText());
-				sb.append(" "); //$NON-NLS-1$
-			}
-		}
-		//Remove the trailing space
-		if (sb.length() > 0)
-			sb.deleteCharAt(sb.length() - 1);
-		return sb.toString();
-	}
-
-	public void setAllSelected(boolean selected) {
-		setAllSelected(classpathElements, selected);
-	}
-
-	public void setAllSelected(List elements, boolean selected) {
-		for (int i = 0; i < elements.size(); i++) {
-			ClasspathElement elmt = (ClasspathElement) elements.get(i);
-			elmt.setSelected(selected);
-		}
-	}
-
-	/* borrowed code from jdt */
-	protected List moveUp(List elements, List move) {
-		int nElements = elements.size();
-		List res = new ArrayList(nElements);
-		Object floating = null;
-		for (int i = 0; i < nElements; i++) {
-			Object curr = elements.get(i);
-			if (move.contains(curr)) {
-				res.add(curr);
-			} else {
-				if (floating != null) {
-					res.add(floating);
-				}
-				floating = curr;
-			}
-		}
-		if (floating != null) {
-			res.add(floating);
-		}
-		return res;
-	}
-
-	/* borrowed code from jdt */
-	public void moveUp(List toMoveUp) {
-		setModifiedIfAnySelected(toMoveUp);
-		if (toMoveUp.size() > 0)
-			classpathElements = moveUp(classpathElements, toMoveUp);
-	}
-
-	/* borrowed code from jdt */
-	public void moveDown(List toMoveDown) {
-		setModifiedIfAnySelected(toMoveDown);
-		if (toMoveDown.size() > 0)
-			classpathElements = reverse(moveUp(reverse(classpathElements), toMoveDown));
-
-	}
-
-	/* borrowed code from jdt */
-	protected List reverse(List p) {
-		List reverse = new ArrayList(p.size());
-		for (int i = p.size() - 1; i >= 0; i--) {
-			reverse.add(p.get(i));
-		}
-		return reverse;
-	}
-
-	public ClasspathElement getClasspathElement(String uri) {
-		if (urisToElements == null)
-			return null;
-		return (ClasspathElement) urisToElements.get(uri);
-	}
-
-	public ClasspathElement getClasspathElement(IProject archiveProject) {
-		if (archiveProject != null) {
-			for (int i = 0; i < classpathElements.size(); i++) {
-				ClasspathElement elmnt = (ClasspathElement) classpathElements.get(i);
-				if (archiveProject.equals(elmnt.getProject()))
-					return elmnt;
-			}
-		}
-		return null;
-	}
-
-	public boolean hasDirectOrIndirectDependencyTo(IProject archiveProject) {
-		ClasspathElement element = getClasspathElement(archiveProject);
-		if (element == null)
-			return false;
-		Archive anArchive = null;
-		if (element.isValid()) {
-			try {
-				anArchive = (Archive) getEARFile().getFile(element.getText());
-			} catch (FileNotFoundException e) {
-			}
-		}
-		return anArchive != null && archive.hasClasspathVisibilityTo(anArchive);
-	}
-
-	public boolean hasDirectOrIndirectDependencyTo(String jarName) {
-		ClasspathElement element = getClasspathElement(jarName);
-		if (element == null)
-			return false;
-		Archive anArchive = null;
-		if (element.isValid()) {
-			try {
-				anArchive = (Archive) getEARFile().getFile(element.getText());
-			} catch (FileNotFoundException e) {
-			}
-		}
-		return anArchive != null && archive.hasClasspathVisibilityTo(anArchive);
-	}
-
-
-	public boolean isAnyJarSelected(int type) {
-		if (classpathElements != null) {
-			for (int i = 0; i < classpathElements.size(); i++) {
-				ClasspathElement element = (ClasspathElement) classpathElements.get(i);
-				if (element.getJarType() == type && element.isSelected())
-					return true;
-			}
-		}
-		return false;
-	}
-
-
-	public boolean isAnyEJBJarSelected() {
-		return isAnyJarSelected(ClasspathElement.EJB_JAR);
-	}
-
-
-
-	public boolean isAnyEJBClientJARSelected() {
-		return isAnyJarSelected(ClasspathElement.EJB_CLIENT_JAR);
-
-	}
-
-	/**
-	 * @return
-	 */
-	public int getFilterLevel() {
-		return filterLevel;
-	}
-
-	/**
-	 * @param i
-	 */
-	public void setFilterLevel(int i) {
-		filterLevel = i;
-	}
-
-	/**
-	 * This method selects or deselects indivual elements based on the filter level, and
-	 * additionally sets the filter level.
-	 * 
-	 * @param i
-	 */
-	public void selectFilterLevel(int level) {
-		setFilterLevel(level);
-		switch (level) {
-			case FILTER_EJB_CLIENT_JARS :
-				invertClientJARSelections(ClasspathElement.EJB_CLIENT_JAR);
-				break;
-			case FILTER_EJB_SERVER_JARS :
-				invertClientJARSelections(ClasspathElement.EJB_JAR);
-				break;
-			default :
-				break;
-		}
-	}
-
-	public void invertClientJARSelection(IProject aProject, IProject opposite) {
-		ClasspathElement element = getClasspathElement(aProject);
-		ClasspathElement oppositeElement = (opposite == null ? null : getClasspathElement(opposite));
-		if (element.isSelected())
-			invertSelectionIfPossible(element, oppositeElement);
-	}
-
-	private void invertClientJARSelections(int elementType) {
-		if (classpathElements == null)
-			return;
-
-		for (int i = 0; i < classpathElements.size(); i++) {
-			ClasspathElement element = (ClasspathElement) classpathElements.get(i);
-			if (element.getJarType() == elementType && element.isSelected()) {
-				invertSelectionIfPossible(element, null);
-			}
-		}
-	}
-
-	/**
-	 * @param element
-	 * @param elementType
-	 */
-	private void invertSelectionIfPossible(ClasspathElement element, ClasspathElement opposite) {
-		if (element == null)
-			return;
-		if (opposite == null)
-			opposite = getOppositeElement(element);
-		if (opposite != null) {
-			opposite.setSelected(true);
-			element.setSelected(false);
-		}
-	}
-
-	/**
-	 * If the element represents an EJB client JAR, returns the corresponding server JAR. If the
-	 * element represents an EJB server JAR, returns the corresponding client JAR.
-	 */
-	public ClasspathElement getOppositeElement(ClasspathElement element) {
-		String uri = element.getText();
-		Archive target = element.getTargetArchive();
-		if (uri == null || target == null)
-			return null;
-		Archive oppositeJAR = null;
-		switch (element.getJarType()) {
-			case (ClasspathElement.EJB_CLIENT_JAR) :
-				oppositeJAR = (Archive) clientToEJBJARs.get(target);
-				break;
-			case (ClasspathElement.EJB_JAR) :
-				oppositeJAR = (Archive) ejbToClientJARs.get(target);
-				break;
-			default :
-				break;
-		}
-		if (oppositeJAR != null)
-			return getClasspathElement(oppositeJAR.getURI());
-
-		return null;
-	}
-
-	private void setModifiedIfAnySelected(List elements) {
-		for (int i = 0; i < elements.size(); i++) {
-			ClasspathElement element = (ClasspathElement) elements.get(i);
-			if (element.isSelected())
-				setModified(true);
-		}
-	}
-
-	public boolean isMyClientJAR(ClasspathElement element) {
-		if (element == null || ejbToClientJARs == null)
-			return false;
-		Archive myClientJar = (Archive) ejbToClientJARs.get(archive);
-		return myClientJar != null && myClientJar == element.getTargetArchive();
-	}
-
-	public Map getUrisToElements() {
-		if(urisToElements == null)
-			urisToElements = new HashMap();
-		return urisToElements;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java
deleted file mode 100644
index 5d4bd4a15..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEImportConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-
-public class ClasspathElement {
-	public final static int UTIL_JAR = 0;
-	public final static int EJB_JAR = 1;
-	public final static int EJB_CLIENT_JAR = 2;
-	protected int jarType = UTIL_JAR;
-	/** The owner archive of this entry */
-	protected Archive archive;
-
-	/** The archive this entry references, if it exists */
-	protected Archive targetArchive;
-
-	/** The display text for this item */
-	protected String text;
-	/** Indicates if this is selected in the view */
-	protected boolean selected;
-	protected boolean valid;
-	/**
-	 * The text that is an actual Class-Path entry in the Manifest; in the case of multi-segment
-	 * uris, might look like ../xxx
-	 */
-	protected String relativeText;
-	/** The project that corresponds to the dependent module, when it exists */
-	protected IProject project;
-	/**
-	 * If the project is not null, there may be imported jars in the project List of IPath
-	 */
-	protected List importedJarPaths;
-	protected IProject earProject;
-	protected ClassPathSelection parentSelection;
-	protected URI archiveURI;
-	protected String earContentFolder;
-
-	public ClasspathElement(Archive anArchive) {
-		super();
-		archive = anArchive;
-	}
-	
-	public ClasspathElement(IProject project) {
-		super();
-		this.project = project;
-	}
-	
-	public ClasspathElement(URI  aArchiveURI) {
-		super();
-		archiveURI = aArchiveURI;
-	}	
-
-	protected void computeRelativeText() {
-		if (archive != null) {
-			relativeText = J2EEProjectUtilities.computeRelativeText(archive.getURI(), getText());
-			if (relativeText == null)
-				relativeText = getText();
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/28/2001 5:07:26 PM)
-	 * 
-	 * @return org.eclipse.core.resources.IProject
-	 */
-	public org.eclipse.core.resources.IProject getEarProject() {
-		return earProject;
-	}
-
-	protected IFile getImportedJarAsIFile() {
-		if (getProject() != null) {
-			if (getText() != null && getText().endsWith(J2EEImportConstants.IMPORTED_JAR_SUFFIX)) {
-				IFile file = getProject().getFile(getText());
-				if (file != null && file.exists())
-					return file;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/28/2001 4:33:35 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getImportedJarPaths() {
-		return importedJarPaths;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/27/2001 1:14:04 PM)
-	 * 
-	 * @return int
-	 */
-	public int getJarType() {
-		return jarType;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/25/2001 6:21:01 PM)
-	 * 
-	 * @return org.eclipse.core.resources.IProject
-	 */
-	public org.eclipse.core.resources.IProject getProject() {
-		return project;
-	}
-
-	public IVirtualComponent getComponent() {
-		if(project != null){
-			return ComponentCore.createComponent(project);
-		} else if(relativeText != null){
-			IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
-			IVirtualReference[] refs = earComponent.getReferences();
-			for (int i = 0; i < refs.length; i++) {
-				IVirtualReference reference = refs[i];
-				if( reference.getReferencedComponent() != null ){
-					String name = reference.getReferencedComponent().getName();
-					if(name.lastIndexOf('/') != -1){
-						name = name.substring(name.lastIndexOf('/')+1);
-					}
-					if (name.equals(relativeText)){
-						return reference.getReferencedComponent();
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	
-	public String getProjectName() {
-		return project == null ? null : project.getName();
-	}
-
-	public java.lang.String getRelativeText() {
-		if (relativeText == null)
-			computeRelativeText();
-		return relativeText;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 11:00:36 AM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getText() {
-		return text;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 11:01:46 AM)
-	 * 
-	 * @return boolean
-	 */
-	public boolean isSelected() {
-		return selected;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/27/2001 1:04:35 PM)
-	 * 
-	 * @return boolean
-	 */
-	public boolean isValid() {
-		return valid;
-	}
-
-	public IResource getResource() {
-		if (project != null)
-			return project;
-		return earProject.getFile(getText());
-	}
-
-	public IClasspathEntry[] newClasspathEntriesForArchive() {
-		if( !archiveURI.equals("")){
-			String resourcePath = "";
-			try {
-				resourcePath = ModuleURIUtil.getArchiveName(archiveURI);
-			} catch (UnresolveableURIException e) {
-				Logger.getLogger().logError(e);
-			}
-			IPath resPath = new Path(resourcePath);
-			if (!resPath.isAbsolute())
-				resPath = resPath.makeAbsolute();
-			java.io.File file = new java.io.File(resourcePath);
-			if( file.exists() || J2EEPlugin.getWorkspace().getRoot().exists(new Path(resourcePath))){
-				return new IClasspathEntry[]{JavaCore.newLibraryEntry( resPath, null, null, true)};
-			}else{
-				return new IClasspathEntry[]{JavaCore.newVariableEntry( resPath, null, null)};
-			}
-		}	
-		return new IClasspathEntry[0];
-	}
-	
-	
-	/**
-	 * Adapter method to convert this manifest class path element to zero or more classpath entries
-	 * for a java build path
-	 */
-	public IClasspathEntry[] newClasspathEntries(Set visited) {
-		if (visited.contains(this))
-			return new IClasspathEntry[0];
-		visited.add(this);
-		if (representsImportedJar())
-			return new IClasspathEntry[]{JavaCore.newLibraryEntry(getImportedJarAsIFile().getFullPath(), null, null)};
-		
-		if( archiveURI != null && !archiveURI.equals("") ){
-			return newClasspathEntriesForArchive();
-		}
-		if (!valid && isSelected())
-			return new IClasspathEntry[0];
-
-		if (project == null)
-			return newClasspathEntriesFromEARProject(visited);
-
-		IClasspathEntry projectEntry = JavaCore.newProjectEntry(getProject().getFullPath(), true);
-		if (importedJarPaths == null || importedJarPaths.isEmpty())
-			return new IClasspathEntry[]{projectEntry};
-
-		List result = new ArrayList(2);
-		result.add(projectEntry);
-		for (int i = 0; i < importedJarPaths.size(); i++) {
-			IPath path = (IPath) importedJarPaths.get(i);
-			result.add(JavaCore.newLibraryEntry(path, null, null));
-		}
-		return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
-	}
-
-	public IClasspathEntry[] newClasspathEntries() {
-		return newClasspathEntries(new HashSet());
-	}
-
-	protected IClasspathEntry newClasspathEntryFromEARProj() {
-		IPath path = earProject.getFullPath().append( getEarContentFolder() + IPath.SEPARATOR + earProject.getFile(getText()).getProjectRelativePath());
-		return JavaCore.newLibraryEntry(path, path, null, true);
-	}
-
-	/**
-	 * The archive is in the EAR and not in a project.
-	 */
-	protected IClasspathEntry[] newClasspathEntriesFromEARProject(Set visited) {
-		List cpEntries = new ArrayList();
-		cpEntries.add(newClasspathEntryFromEARProj());
-		traverseClasspaths(cpEntries, visited);
-		return (IClasspathEntry[]) cpEntries.toArray(new IClasspathEntry[cpEntries.size()]);
-	}
-
-	/*
-	 * If you have a dependency to a JAR in the EAR project, and the JAR depends on another JAR in
-	 * the EAR; you want to compile cleanly after import, so you need both those JARs on your build
-	 * path
-	 */
-	protected void traverseClasspaths(List projectCpEntries, Set visited) {
-
-		File aFile = null;
-		try {
-			aFile = getEARFile().getFile(getText());
-		} catch (FileNotFoundException notThere) {
-		}
-		if (aFile == null || !aFile.isArchive())
-			return;
-
-		Archive depArchive = (Archive) aFile;
-		String[] manifestCpEntries = depArchive.getManifest().getClassPathTokenized();
-		for (int i = 0; i < manifestCpEntries.length; i++) {
-			String uri = ArchiveUtil.deriveEARRelativeURI(manifestCpEntries[i], depArchive);
-			if (uri == null)
-				continue;
-			ClasspathElement other = parentSelection.getClasspathElement(uri);
-			//If the other element is already selected, then
-			// we don't need to add it again
-			if (other == null || other.isSelected())
-				continue;
-			IClasspathEntry[] cpEntries = other.newClasspathEntries(visited);
-			for (int j = 0; j < cpEntries.length; j++) {
-				if (!projectCpEntries.contains(cpEntries[j]))
-					projectCpEntries.add(cpEntries[j]);
-			}
-		}
-	}
-
-
-	public boolean representsImportedJar() {
-		return getImportedJarAsIFile() != null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/28/2001 5:07:26 PM)
-	 * 
-	 * @param newEarProject
-	 *            org.eclipse.core.resources.IProject
-	 */
-	public void setEarProject(org.eclipse.core.resources.IProject newEarProject) {
-		earProject = newEarProject;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/28/2001 4:33:35 PM)
-	 * 
-	 * @param newImportedJarPaths
-	 *            java.util.List
-	 */
-	public void setImportedJarPaths(java.util.List newImportedJarPaths) {
-		importedJarPaths = newImportedJarPaths;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/27/2001 1:14:04 PM)
-	 * 
-	 * @param newJarType
-	 *            int
-	 */
-	public void setJarType(int newJarType) {
-		jarType = newJarType;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/25/2001 6:21:01 PM)
-	 * 
-	 * @param newProject
-	 *            org.eclipse.core.resources.IProject
-	 */
-	public void setProject(org.eclipse.core.resources.IProject newProject) {
-		project = newProject;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 4:20:55 PM)
-	 * 
-	 * @param newRelativeText
-	 *            java.lang.String
-	 */
-	public void setRelativeText(java.lang.String newRelativeText) {
-		relativeText = newRelativeText;
-	}
-
-	public void setSelected(Archive referencingJar, Archive referencedJar, List classPath) {
-		for (int i = 0; i < classPath.size(); i++) {
-			String cpEntry = (String) classPath.get(i);
-			String uri = ArchiveUtil.deriveEARRelativeURI(cpEntry, referencingJar);
-			if (uri != null && uri.equals(referencedJar.getURI())) {
-				setSelected(true);
-				return;
-			}
-		}
-		setSelected(false);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 11:01:46 AM)
-	 * 
-	 * @param newSelected
-	 *            boolean
-	 */
-	public void setSelected(boolean newSelected) {
-		boolean oldSelected = selected;
-		selected = newSelected;
-		if (oldSelected != newSelected && parentSelection != null)
-			parentSelection.setModified(true);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/22/2001 11:00:36 AM)
-	 * 
-	 * @param newText
-	 *            java.lang.String
-	 */
-	public void setText(java.lang.String newText) {
-		text = newText;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (8/27/2001 1:04:35 PM)
-	 * 
-	 * @param newValid
-	 *            boolean
-	 */
-	public void setValid(boolean newValid) {
-		valid = newValid;
-	}
-
-	public void setValuesSelected(String cpEntry) {
-		setSelected(true);
-		setRelativeText(cpEntry);
-	}
-
-	public String toString() {
-		return "ClasspatheElement(" + getText() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected EARFile getEARFile() {
-		return (EARFile) archive.getContainer();
-	}
-
-	void setParentSelection(ClassPathSelection selection) {
-		parentSelection = selection;
-	}
-
-	/**
-	 * Returns the archive.
-	 * 
-	 * @return Archive
-	 */
-	public Archive getArchive() {
-		return archive;
-	}
-
-	public boolean isEJBJar() {
-		return jarType == EJB_JAR;
-	}
-
-	public boolean isEJBClientJar() {
-		return jarType == EJB_CLIENT_JAR;
-	}
-
-	/**
-	 * @return
-	 */
-	public Archive getTargetArchive() {
-		return targetArchive;
-	}
-
-	/**
-	 * @param archive
-	 */
-	public void setTargetArchive(Archive archive) {
-		targetArchive = archive;
-	}
-
-	public URI getArchiveURI() {
-		return archiveURI;
-	}
-
-	public String getEarContentFolder() {
-		return earContentFolder;
-	}
-
-	public void setEarContentFolder(String earContentFolder) {
-		this.earContentFolder = earContentFolder;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateDataModelProvider.java
deleted file mode 100644
index f3313f82c..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateDataModelProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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 impl
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-/**
- * <code>AbstractDataModelProvider</code> subclass that supports the <code>ComputeEARsForContextRootUpdateOp</code>.
- */
-public class ComputeEARsForContextRootUpdateDataModelProvider extends AbstractDataModelProvider implements IUpdateModuleContextRootProperties {
-
-	public Set getPropertyNames() {
-		final Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EARS_TO_UPDATE);
-		return propertyNames;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateOp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateOp.java
deleted file mode 100644
index 57baa525d..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ComputeEARsForContextRootUpdateOp.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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 impl
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <code>AbstractDataModelOperation</code> subclass that computes the set of referencing EARs
- * in which the context-root for a given module will be updated in the application.xml file.
- */
-public class ComputeEARsForContextRootUpdateOp extends AbstractDataModelOperation implements IUpdateModuleContextRootProperties { 
-	
-	public ComputeEARsForContextRootUpdateOp() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
-        if (monitor != null) {
-            monitor.beginTask("", 1);
-        }
-        
-        final IProject project = (IProject)model.getProperty(PROJECT);
-        final List earsToUpdate = new ArrayList();
-        try {
-        	// get the set of all referencing EARs
-        	final IProject[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-        	
-        	// for each EAR, check if the current context-root value is equal to the old context-root setting
-        	// if it is, update it to reflect the new value
-        	for (int i = 0; i < ears.length; i++) {
-        		// check if the current value of the context-root for the module
-        		// is equal to the value stored in the associated EAR's
-        		// application.xml
-        		if (currentRootEqualsEARRoot(ears[i], project)) {
-        			earsToUpdate.add(ears[i]);
-        		}
-        	}
-        	// Save the list of EARs to update in a nested IDataModel
-        	IDataModel nestedModel = DataModelFactory.createDataModel(new ComputeEARsForContextRootUpdateDataModelProvider());
-        	nestedModel.setProperty(EARS_TO_UPDATE, earsToUpdate);
-        	model.addNestedModel(NESTED_MODEL_ID, nestedModel);
-
-        } catch (Exception e) {
-			Logger.getLogger().logError(e);
-        } finally {
-            if (monitor != null) {
-                monitor.done();
-            }
-        }
-		return OK_STATUS;
-	}
-	
-	/*
-	 * Determines if the current module context-root is equal to the value in the application.xml.
-	 */
-	private boolean currentRootEqualsEARRoot(final IProject earProject, final IProject moduleProject) {
-		EARArtifactEdit earEdit = null;
-		try {
-			earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-			if (earEdit == null) {
-				return false;
-			}
-			final Application app = earEdit.getApplication();
-			final IVirtualComponent comp = ComponentCore.createComponent(moduleProject);
-			if (app == null || comp == null) {
-				return false;
-			}
-			final String moduleURI = earEdit.getModuleURI(comp);
-			final Module module = app.getFirstModule(moduleURI);
-			if (module != null && module instanceof WebModule) {
-				final Properties props = comp.getMetaProperties();
-				if ((props != null) && (props.containsKey(J2EEConstants.CONTEXTROOT))) {
-					return ((WebModule) module).getContextRoot().equals(props.getProperty(J2EEConstants.CONTEXTROOT));
-				}
-			}
-		} finally {
-			if (earEdit != null) {
-				earEdit.dispose();
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// no-op
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// no-op
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.java
deleted file mode 100644
index df1bbaadf..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.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.application.internal.operations;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class CopyArchiveIntoProjectOperation extends J2EEUtilityJarImportAssistantOperation {
-
-	public CopyArchiveIntoProjectOperation(File utilityJar) {
-		super(NLS.bind(EARCreationResourceHandler.CopyArchiveIntoProjectOperation_Copying_archive_into_selected_proje_, utilityJar.getName()), utilityJar);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		MultiStatus status = new MultiStatus(J2EEPlugin.PLUGIN_ID, 0, NLS.bind(EARCreationResourceHandler.CopyArchiveIntoProjectOperation_Copying_archive_into_selected_proje_, getUtilityJar().getName()), null);
-		 
-		try {
-
-			IFile copiedJarFile = null;
-			
-			IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName()); 
-			IVirtualComponent earComponent = ComponentCore.createComponent(associatedEARProject);
-			
-			IContainer underlyingFolder = earComponent.getRootFolder().getUnderlyingFolder();
-			if(underlyingFolder.isAccessible()) {
-				 copiedJarFile = underlyingFolder.getFile(new Path(getUtilityJar().getName()));
-			} else {
-				 copiedJarFile = associatedEARProject.getFile(getUtilityJar().getName());
-			}		
- 			if (copiedJarFile.exists()) {
-				if (isOverwriteIfNecessary())
-					copiedJarFile.delete(true, true, new SubProgressMonitor(monitor, 1));
-				else {
-					status.add(J2EEPlugin.createErrorStatus(0, NLS.bind(EARCreationResourceHandler.CopyArchiveIntoProjectOperation_Found_existing_file_0_, copiedJarFile), null));
-					return status;
-				}
-			} 
-			
-			FileInputStream fileInputStream = null;
-			ByteArrayOutputStream bos = null;
-			ByteArrayInputStream jarFileInputStream = null;
-			try {
-				fileInputStream = new FileInputStream(getUtilityJar());
-				bos = new ByteArrayOutputStream();
-				byte[] data = new byte[4096];
-				try {
-					int bytesRead = 0;
-					while ((bytesRead = fileInputStream.read(data)) > 0)
-						bos.write(data, 0, bytesRead);
-					// clear space for GC
-					data = null;
-				} finally {
-					if(fileInputStream != null) 
-						fileInputStream.close();
-				}
-
-				jarFileInputStream = new ByteArrayInputStream(bos.toByteArray());
-				copiedJarFile.create(jarFileInputStream, 0, new SubProgressMonitor(monitor, 1));
-
-				addLibraryToClasspath(associatedEARProject, copiedJarFile, monitor);
-				
-				createVirtualArchiveComponent(associatedEARProject, getUtilityJar().getName(), copiedJarFile, monitor);
-				
-				
-			} catch (FileNotFoundException e) {
-				status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-				J2EEPlugin.logError(0, e.getMessage(), e);
-			} catch (InvocationTargetException e) {
-				status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-				J2EEPlugin.logError(0, e.getMessage(), e);
-			} catch (InterruptedException e) {
-				status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-				J2EEPlugin.logError(0, e.getMessage(), e);
-			} finally {
-				if (bos != null)
-					bos.close();
-				if (jarFileInputStream != null)
-					jarFileInputStream.close();
-			} 
-		} catch (IOException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-			J2EEPlugin.logError(0, e.getMessage(), e);  
-		} catch (CoreException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-			J2EEPlugin.logError(0, e.getMessage(), e);
-		}  
-		return status;
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithExtractedJarOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithExtractedJarOperation.java
deleted file mode 100644
index 930fdfd98..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithExtractedJarOperation.java
+++ /dev/null
@@ -1,115 +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.application.internal.operations;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaUtilityJarImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-
-
-public class CreateProjectWithExtractedJarOperation extends J2EEUtilityJarImportAssistantOperation {
-//	private boolean createBinaryProject = false; 
-	private String newProjectName;
-	private String projectRoot;
-	private boolean createAsBinary;
-
-
-	public CreateProjectWithExtractedJarOperation(File utilityJar, String overridingProjectRoot) {
-		super(NLS.bind(EARCreationResourceHandler.CreateProjectWithExtractedJarOperation_Create_project_with_extracted_conte_, utilityJar.getName()), utilityJar);
-		newProjectName = getUtilityJarProjectName(utilityJar);
-		projectRoot = findUniqueLocation(overridingProjectRoot, newProjectName); 
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		MultiStatus status = new MultiStatus(J2EEPlugin.PLUGIN_ID, 0, NLS.bind(EARCreationResourceHandler.CreateProjectWithExtractedJarOperation_Create_project_with_extracted_conte_, getUtilityJar().getName()), null);
-		Archive archive = null;
-		try {
-			archive = CommonarchiveFactory.eINSTANCE.primOpenArchive(getUtilityJar().getAbsolutePath());
-
-			IDataModel importModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider()); 
-
-			importModel.setProperty(IJavaUtilityJarImportDataModelProperties.FILE, archive);
-//			importModel.setProperty(IJavaUtilityJarImportDataModelProperties.FILE_NAME, getUtilityJar().getAbsolutePath());
-
-			if (projectRoot != null && projectRoot.length() > 0) {				
-				importModel.setBooleanProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION, false);
-				importModel.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectRoot);
-			}
-
-			// importModel.getJ2eeProjectCreationDataModel().setBooleanProperty(J2EEProjectCreationDataModel.ADD_SERVER_TARGET, true);
-			if (isOverwriteIfNecessary()) {
-				// importModel.setBooleanProperty(IJavaUtilityJarImportDataModelProperties.OVERWRITE_HANDLER);
-				IProject existingProject = getWorkspaceRoot().getProject(newProjectName);
-				if (existingProject.exists()) {
-					existingProject.delete(true, true, monitor);
-				}
-			}
-			
-			importModel.setProperty(IJavaUtilityJarImportDataModelProperties.PROJECT_NAME, newProjectName);
-			importModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());
-
-			status.add(importModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, 1), info)); 
-			
-			IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName());
- 			IProject utilityJarProject = getWorkspaceRoot().getProject(newProjectName);
-			linkArchiveToEAR(associatedEARProject, getUtilityJar().getName(), utilityJarProject, new SubProgressMonitor(monitor, 1));
-			
-		} catch (OpenFailureException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-			J2EEPlugin.logError(0, e.getMessage(), e);
-		} catch (InvocationTargetException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-			J2EEPlugin.logError(0, e.getMessage(), e);
-		} catch (InterruptedException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-			J2EEPlugin.logError(0, e.getMessage(), e);
-		} catch (CoreException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-			J2EEPlugin.logError(0, e.getMessage(), e);
-		} finally {
-			if(archive != null)
-				archive.close();
-		}
-		return status;
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-	public void setNewProjectName(String newProjectName) {
-		this.newProjectName = newProjectName;
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithLinkedJarOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithLinkedJarOperation.java
deleted file mode 100644
index 9b3cbb3aa..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithLinkedJarOperation.java
+++ /dev/null
@@ -1,103 +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.application.internal.operations;
-
-import java.io.File;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-
-public class CreateProjectWithLinkedJarOperation extends J2EEUtilityJarImportAssistantOperation {
-
-	private String linkedPathVariable;
-	private String projectRoot;
-	private boolean createAsBinary;
-
-	public CreateProjectWithLinkedJarOperation(File utilityJar, String overridingProjectRoot, String linkedPathVariable) {
-		super(NLS.bind(EARCreationResourceHandler.CreateProjectWithLinkedJarOperation_Creating_project_with_linked_archiv_, utilityJar.getName()), utilityJar);
-		this.linkedPathVariable= linkedPathVariable; 
-		projectRoot = findUniqueLocation(overridingProjectRoot, getUtilityJarProjectName(utilityJar)); 
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		MultiStatus status = new MultiStatus(J2EEPlugin.PLUGIN_ID, 0, NLS.bind(EARCreationResourceHandler.CreateProjectWithLinkedJarOperation_Creating_project_with_linked_archiv_, getUtilityJar().getName()), null);
- 
-		try {
-			IProject project = getWorkspaceRoot().getProject(getUtilityJarProjectName(getUtilityJar()));
-			
-			IDataModel createUtilityProject = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-			createUtilityProject.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, getUtilityJarProjectName(getUtilityJar()));
-			
-			if (projectRoot != null && projectRoot.length() > 0) {				
-				createUtilityProject.setBooleanProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION, false);
-				createUtilityProject.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectRoot);
-			}
- 			
-			createUtilityProject.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());
-			
-			status.add(createUtilityProject.getDefaultOperation().execute(monitor, info));
-			
-			IProject utilityJarProject = getWorkspaceRoot().getProject(getUtilityJarProjectName(getUtilityJar()));
-			
-			/* Remove the default src folder */
-			IJavaProject utilityJarJavaProject = JavaCore.create(utilityJarProject);
-			IPackageFragmentRoot srcFolder = utilityJarJavaProject.getPackageFragmentRoot(utilityJarProject.getFolder("src"));
-			if(srcFolder.exists()) {
-				srcFolder.delete(IResource.FORCE, IPackageFragmentRoot.ORIGINATING_PROJECT_CLASSPATH, monitor);
-			}			
-			status.add(createLinkedArchive(project, getUtilityJar().getName(), getUtilityJar(), linkedPathVariable, monitor));
-			
-			/* Remove the /src mapping */
-			IVirtualComponent utilComponent = ComponentCore.createComponent(project);
-			status.add(removeRootMapping(utilComponent, "/src", monitor));
-			
-			/* Create the /<archive> mapping */
-			status.add(createVirtualArchiveComponent(project, getUtilityJar().getName(), project.getFile(getUtilityJar().getName()), monitor));
-			 
-			/* Make this project a utility jar project for the EAR */
-			IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName());			
-			status.add(linkArchiveToEAR(associatedEARProject, getUtilityJar().getName(), utilityJarProject, new SubProgressMonitor(monitor, 1)));
-
-		} catch (Exception e) {
-			status.add(J2EEPlugin.createErrorStatus(0, EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_2, e));
-		}		 
-		return status; 
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultJ2EEComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultJ2EEComponentCreationOperation.java
deleted file mode 100644
index 5bfb1a189..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultJ2EEComponentCreationOperation.java
+++ /dev/null
@@ -1,134 +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.application.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.activities.WTPActivityBridge;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class DefaultJ2EEComponentCreationOperation extends AbstractDataModelOperation implements IDefaultJ2EEComponentCreationDataModelProperties {
-
-    public static final String JCA_DEV_ACTIVITY_ID = "com.ibm.wtp.jca.development"; //$NON-NLS-1$
-
-    public static final String WEB_DEV_ACTIVITY_ID = "com.ibm.wtp.web.development"; //$NON-NLS-1$
-
-    public static final String ENTERPRISE_JAVA = "com.ibm.wtp.ejb.development"; //$NON-NLS-1$
-
-    public DefaultJ2EEComponentCreationOperation(IDataModel model) {
-        super(model);
-    }
-
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        try {
-            if (model.getBooleanProperty(CREATE_EJB)) {
-                IDataModel projectModel = model.getNestedModel(NESTED_MODEL_EJB);
-                createEJBComponent(projectModel, monitor);
-            }
-            if (model.getBooleanProperty(CREATE_WEB)) {
-                IDataModel projectModel = model.getNestedModel(NESTED_MODEL_WEB);
-                createWebJ2EEComponent(projectModel, monitor);
-            }
-            if (model.getBooleanProperty(CREATE_CONNECTOR)) {
-                IDataModel projectModel = model.getNestedModel(NESTED_MODEL_JCA);
-                createRarJ2EEComponent(projectModel, monitor);
-            }
-            if (model.getBooleanProperty(CREATE_APPCLIENT)) {
-                IDataModel projectModel = model.getNestedModel(NESTED_MODEL_CLIENT);
-                createAppClientComponent(projectModel, monitor);
-            }
-        } catch (Exception e) {
-            Logger.getLogger().log(e.getMessage());
-        }
-        return OK_STATUS;
-    }
-
-    /**
-     * @param model
-     */
-    private void createEJBComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
-        model.getDefaultOperation().execute(monitor, null);
-        addDefaultFacets(model);
-        WTPActivityBridge.getInstance().enableActivity(ENTERPRISE_JAVA, true);
-    }
-
-    /**
-     * @param model
-     */
-    private void createWebJ2EEComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
-        model.getDefaultOperation().execute(monitor, null);
-        addDefaultFacets(model);
-        WTPActivityBridge.getInstance().enableActivity(WEB_DEV_ACTIVITY_ID, true);
-    }
-
-    /**
-     * @param model
-     */
-    private void createRarJ2EEComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
-        model.getDefaultOperation().execute(monitor, null);
-        addDefaultFacets(model);
-        WTPActivityBridge.getInstance().enableActivity(ENTERPRISE_JAVA, true);
-    }
-
-    /**
-     * @param model
-     */
-    private void createAppClientComponent(IDataModel model, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException, ExecutionException {
-        model.getDefaultOperation().execute(monitor, null);
-        addDefaultFacets(model);
-        WTPActivityBridge.getInstance().enableActivity(ENTERPRISE_JAVA, true);
-
-    }
-
-    private void addDefaultFacets(IDataModel model) throws CoreException{
-        IRuntime runtime = (IRuntime) model.getProperty(FacetProjectCreationDataModelProvider.FACET_RUNTIME);        
-        String projectName = model.getStringProperty(FacetProjectCreationDataModelProvider.FACET_PROJECT_NAME);
-        IProject project = ProjectUtilities.getProject( projectName );
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(project);
-		} catch (CoreException e) {
-
-		}
-		
-		if( facetedProject != null && runtime != null ){
-			try {
-				FacetProjectCreationOperation.addDefaultFactets( facetedProject, runtime );
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-		}    	
-    }
-    
-    public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        return null;
-    }
-
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        return null;
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentExportDataModelProvider.java
deleted file mode 100644
index 52037bf23..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,71 +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.application.internal.operations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EARComponentExportDataModelProvider extends J2EEArtifactExportDataModelProvider {
-
-    public EARComponentExportDataModelProvider() {
-        super();
-    }
-    
-    public IDataModelOperation getDefaultOperation() {
-        return new EARComponentExportOperation(model);
-    }
-
-    protected String getModuleExtension() {
-        return ".ear"; //$NON-NLS-1$
-    }
-
-    protected String getWrongComponentTypeString(String projectName) {
-        return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_AN_EAR, new Object[]{projectName});
-    }
-
-    protected String getProjectType() {
-        return J2EEProjectUtilities.ENTERPRISE_APPLICATION;
-    }
-    /**
-     * Exports the specified Enterprise Appliction project to the specified EAR file.
-     * 
-     * @param earProjectName
-     *            The name of the Enterprise Application project to export.
-     * @param earFileName
-     *            The fully qualified EAR file location to export the specified Enterprise
-     *            Application project.
-     * @param overwriteExisting
-     *            If this is <code>true</code> then an existing file at the location specified by
-     *            <code>earFileName</code> will be overwritten.
-     * @param exportSource
-     *            If this is <code>true</code> then all source files in the specified Enterprise
-     *            Application Project and all its modules will be included in the resulting EAR
-     *            file.
-     * @plannedfor WTP 1.0
-     */
-//TODO: can this be done in the new datamodel framework?
-//    public static void exportProject(String earProjectName, String earFileName, boolean overwriteExisting, boolean exportSource) {
-//        EnterpriseApplicationExportDataModel dataModel = new EnterpriseApplicationExportDataModel();
-//        dataModel.setProperty(PROJECT_NAME, earProjectName);
-//        dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-//        dataModel.setProperty(ARCHIVE_DESTINATION, earFileName);
-//        dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-//        try {
-//            dataModel.getDefaultOperation().run(null);
-//        } catch (InvocationTargetException e) {
-//            Logger.getLogger().logError(e);
-//        } catch (InterruptedException e) {
-//            Logger.getLogger().logError(e);
-//        }
-//    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
deleted file mode 100644
index e946caa44..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,725 +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.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-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.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IAddWebComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaUtilityJarImportDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentImportOperation;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-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.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * This dataModel is used for to import Enterprise Applications(from EAR files) into the workspace.
- * 
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- * 
- * @plannedfor WTP 1.0
- */
-public final class EARComponentImportDataModelProvider extends J2EEArtifactImportDataModelProvider implements IAnnotationsDataModel, IEARComponentImportDataModelProperties {
-
-	/**
-	 * This is only to force validation for the nested projects; do not set.
-	 */
-	public static final String NESTED_PROJECTS_VALIDATION = "EARImportDataModel.NESTED_PROJECTS_VALIDATION"; //$NON-NLS-1$
-
-	/**
-	 * This is only to force validation for the EAR name against the nested projects; do not set.
-	 */
-	public static final String EAR_NAME_VALIDATION = "EARImportDataModel.EAR_NAME_VALIDATION";//$NON-NLS-1$
-
-
-	private IDataModelListener nestedListener = new IDataModelListener() {
-		public void propertyChanged(DataModelEvent event) {
-			if (event.getPropertyName().equals(PROJECT_NAME)) {
-				model.notifyPropertyChange(NESTED_PROJECTS_VALIDATION, IDataModel.DEFAULT_CHG);
-			}
-		}
-	};
-
-	private Hashtable ejbJarToClientJarModels = new Hashtable();
-
-	private Hashtable clientJarToEjbJarModels = new Hashtable();
-
-	private ModuleFile cachedLoadError = null;
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(NESTED_MODULE_ROOT);
-		propertyNames.add(UTILITY_LIST);
-		propertyNames.add(MODULE_MODELS_LIST);
-		propertyNames.add(EJB_CLIENT_LIST);
-		propertyNames.add(UTILITY_MODELS_LIST);
-		propertyNames.add(NESTED_PROJECTS_VALIDATION);
-		propertyNames.add(EAR_NAME_VALIDATION);
-		propertyNames.add(SELECTED_MODELS_LIST);
-		propertyNames.add(USE_ANNOTATIONS);
-		propertyNames.add(ALL_PROJECT_MODELS_LIST);
-		propertyNames.add(UNHANDLED_PROJECT_MODELS_LIST);
-		propertyNames.add(HANDLED_PROJECT_MODELS_LIST);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (NESTED_MODULE_ROOT.equals(propertyName)) {
-			return getLocation().toOSString();
-		} else if (MODULE_MODELS_LIST.equals(propertyName) || UTILITY_LIST.equals(propertyName) || UTILITY_MODELS_LIST.equals(propertyName) || SELECTED_MODELS_LIST.equals(propertyName) || EJB_CLIENT_LIST.equals(propertyName)) {
-			return Collections.EMPTY_LIST;
-		} else if (USE_ANNOTATIONS.equals(propertyName)) {
-			return Boolean.FALSE;
-		} else if (ALL_PROJECT_MODELS_LIST.equals(propertyName)) {
-			return getProjectModels();
-		} else if (UNHANDLED_PROJECT_MODELS_LIST.equals(propertyName)) {
-			return getUnhandledProjectModels();
-		} else if (HANDLED_PROJECT_MODELS_LIST.equals(propertyName)) {
-			return getHandledSelectedModels();
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public void propertyChanged(DataModelEvent event) {
-		super.propertyChanged(event);
-		if (event.getPropertyName().equals(PROJECT_NAME)) {
-			changeModuleCreationLocationForNameChange(getProjectModels());
-		} else if (event.getPropertyName().equals(IFacetProjectCreationDataModelProperties.FACET_RUNTIME) && event.getDataModel() == model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION)) {
-			Object propertyValue = event.getProperty();
-			IDataModel nestedModel = null;
-			List projectModels = (List) getProperty(ALL_PROJECT_MODELS_LIST);
-			for (int i = 0; i < projectModels.size(); i++) {
-				nestedModel = (IDataModel) projectModels.get(i);
-				nestedModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
-			}
-		}
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (ALL_PROJECT_MODELS_LIST.equals(propertyName) || UNHANDLED_PROJECT_MODELS_LIST.equals(propertyName) || HANDLED_PROJECT_MODELS_LIST.equals(propertyName) || EAR_NAME_VALIDATION.equals(propertyName)) {
-			throw new RuntimeException(propertyName + " is an unsettable property"); //$NON-NLS-1$
-		}
-		boolean doSet = super.propertySet(propertyName, propertyValue);
-		if (NESTED_MODULE_ROOT.equals(propertyName)) {
-			updateModuleRoot();
-		} else if (FILE_NAME.equals(propertyName)) {
-			setProperty(MODULE_MODELS_LIST, getModuleModels());
-			updateModuleRoot();
-			setProperty(UTILITY_LIST, null);
-
-			IDataModel earProjectModel = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-			if (getArchiveFile() != null) {
-				FacetDataModelMap map = (FacetDataModelMap) earProjectModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-				IDataModel earFacetDataModel = map.getFacetDataModel(J2EEProjectUtilities.ENTERPRISE_APPLICATION);
-
-				int version = ArchiveUtil.getFastSpecVersion((ModuleFile) getArchiveFile());
-				String versionText = J2EEVersionUtil.getJ2EETextVersion(version);
-				earFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
-			}
-
-			model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-			if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
-				setBooleanProperty(USE_ANNOTATIONS, false);
-			model.notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
-		} else if (UTILITY_LIST.equals(propertyName)) {
-			updateUtilityModels((List) propertyValue);
-		} else if (USE_ANNOTATIONS.equals(propertyName)) {
-			List projectModels = (List) getProperty(MODULE_MODELS_LIST);
-			IDataModel nestedModel = null;
-			for (int i = 0; i < projectModels.size(); i++) {
-				nestedModel = (IDataModel) projectModels.get(i);
-				if (nestedModel.isProperty(USE_ANNOTATIONS)) {
-					nestedModel.setProperty(USE_ANNOTATIONS, propertyValue);
-				}
-			}
-		} else if (MODULE_MODELS_LIST.equals(propertyName)) {
-			List newList = new ArrayList();
-			newList.addAll(getProjectModels());
-			setProperty(SELECTED_MODELS_LIST, newList);
-		} else if (PROJECT_NAME.equals(propertyName)) {
-			List nestedModels = (List) getProperty(MODULE_MODELS_LIST);
-			IDataModel nestedModel = null;
-			for (int i = 0; i < nestedModels.size(); i++) {
-				nestedModel = (IDataModel) nestedModels.get(i);
-				nestedModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, propertyValue);
-			}
-			nestedModels = (List) getProperty(UTILITY_MODELS_LIST);
-			for (int i = 0; i < nestedModels.size(); i++) {
-				nestedModel = (IDataModel) nestedModels.get(i);
-				nestedModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, propertyValue);
-			}
-
-			if (ProjectCreationDataModelProviderNew.validateProjectName(getStringProperty(PROJECT_NAME)).isOK()) {
-				IProject project = ProjectUtilities.getProject(getStringProperty(PROJECT_NAME));
-				if (null != project && project.exists()) {
-
-					IFacetedProject facetedProject = null;
-					boolean canContinue = true;
-					try {
-						facetedProject = ProjectFacetsManager.create(project);
-					} catch (CoreException e) {
-						Logger.getLogger().logError(e);
-						canContinue = false;
-					}
-
-					if (canContinue) {
-						IRuntime runtime = facetedProject.getRuntime();
-						if (null != runtime) {
-							setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, runtime);
-						}
-					}
-				}
-			}
-		}
-		return doSet;
-	}
-
-	public List getAllUtilitiesExceptEJBClients(EARFile earFile) {
-		List clientList = (List) getProperty(EJB_CLIENT_LIST);
-		List list = getAllUtilities(earFile);
-		for (int i = list.size() - 1; i > -1; i--) {
-			FileImpl file = (FileImpl) list.get(i);
-			boolean shouldRemove = false;
-			for (int j = 0; j < clientList.size() && !shouldRemove; j++) {
-				IDataModel localModel = (IDataModel) clientList.get(j);
-				if (localModel.getProperty(IJ2EEComponentImportDataModelProperties.FILE) == file) {
-					shouldRemove = true;
-				}
-			}
-
-			if (shouldRemove) {
-				list.remove(i);
-			}
-		}
-		return list;
-	}
-
-	public static List getAllUtilities(EARFile earFile) {
-		List files = earFile.getFiles();
-		List utilJars = new ArrayList();
-		for (int i = 0; i < files.size(); i++) {
-			FileImpl file = (FileImpl) files.get(i);
-			if (file.isArchive() && !file.isModuleFile() && file.getURI().endsWith(".jar")) { //$NON-NLS-1$
-				utilJars.add(file);
-			}
-			if (file.isWARFile()) {
-				utilJars.addAll(getWebLibs((WARFile) file));
-			}
-		}
-		return utilJars;
-	}
-
-	public static List getWebLibs(WARFile warFile) {
-		return ((WARFileImpl) warFile).getLibArchives();
-	}
-
-
-	protected boolean forceResetOnPreserveMetaData() {
-		return false;
-	}
-
-	public IStatus validate(String propertyName) {
-		if (propertyName.equals(NESTED_PROJECTS_VALIDATION) || propertyName.equals(EAR_NAME_VALIDATION)) {
-			boolean checkAgainstEARNameOnly = propertyName.equals(EAR_NAME_VALIDATION);
-
-			String earProjectName = getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-			List subProjects = getSelectedModels();
-			IDataModel subDataModel = null;
-			String tempProjectName = null;
-			Archive tempArchive = null;
-			IStatus tempStatus = null;
-			Hashtable projects = new Hashtable(4);
-			for (int i = 0; i < subProjects.size(); i++) {
-				subDataModel = (IDataModel) subProjects.get(i);
-				tempProjectName = subDataModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-				// TODO: add manual validation
-				// IStatus status =
-				// ProjectCreationDataModel.validateProjectName(tempProjectName);
-				// if (!status.isOK()) {
-				// return status;
-				// }
-				tempArchive = (Archive) subDataModel.getProperty(FILE);
-
-				if (checkAgainstEARNameOnly) {
-					if (tempProjectName.equals(earProjectName)) {
-						return WTPCommonPlugin.createWarningStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_1, new Object[]{tempProjectName, tempArchive.getURI()}));
-					} else if (!WTPPlugin.isPlatformCaseSensitive()) {
-						if (tempProjectName.toLowerCase().equals(earProjectName.toLowerCase())) {
-							return WTPCommonPlugin.createWarningStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_1a, new Object[]{earProjectName, tempProjectName, tempArchive.getURI()}));
-						}
-					}
-				} else {
-					// if (!overwrite && subDataModel.getProject().exists()) {
-					// return
-					// WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.getString("EARImportDataModel_UI_0",
-					// new Object[]{tempProjectName, tempArchive.getURI()})); //$NON-NLS-1$
-					// }
-					tempStatus = subDataModel.validateProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
-					if (!tempStatus.isOK()) {
-						return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_0, new Object[]{tempProjectName, tempArchive.getURI()}));
-					}
-					tempStatus = subDataModel.validate();
-					if (!tempStatus.isOK()) {
-						return tempStatus;
-					}
-					if (tempProjectName.equals(earProjectName)) {
-						return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_1, new Object[]{tempProjectName, tempArchive.getURI()}));
-					} else if (!WTPPlugin.isPlatformCaseSensitive()) {
-						if (tempProjectName.toLowerCase().equals(earProjectName.toLowerCase())) {
-							return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_1a, new Object[]{earProjectName, tempProjectName, tempArchive.getURI()}));
-						}
-					}
-					if (projects.containsKey(tempProjectName)) {
-						return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_2, new Object[]{tempProjectName, tempArchive.getURI(), ((Archive) projects.get(tempProjectName)).getURI()}));
-					} else if (!WTPPlugin.isPlatformCaseSensitive()) {
-						String lowerCaseProjectName = tempProjectName.toLowerCase();
-						String currentKey = null;
-						Enumeration keys = projects.keys();
-						while (keys.hasMoreElements()) {
-							currentKey = (String) keys.nextElement();
-							if (currentKey.toLowerCase().equals(lowerCaseProjectName)) {
-								return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_2a, new Object[]{tempProjectName, currentKey, tempArchive.getURI(), ((Archive) projects.get(currentKey)).getURI()}));
-							}
-						}
-					}
-					projects.put(tempProjectName, tempArchive);
-				}
-			}
-		} else if (propertyName.equals(FILE_NAME)) {
-			IStatus status = super.validate(propertyName);
-			if (!status.isOK()) {
-				return status;
-			} else if (cachedLoadError != null) {
-				return WTPCommonPlugin.createWarningStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_4, new Object[]{cachedLoadError.getURI()}));
-			}
-			return status;
-		}
-		// TODO: check context root is not inside current working
-		// directory...this is invalid
-		return super.validate(propertyName);
-	}
-
-	private void updateModuleRoot() {
-		List projects = getProjectModels();
-		String basePath = isPropertySet(NESTED_MODULE_ROOT) ? getStringProperty(NESTED_MODULE_ROOT) : null;
-		boolean useDefault = basePath == null;
-		IDataModel localModel = null;
-		for (int i = 0; null != projects && i < projects.size(); i++) {
-			localModel = (IDataModel) projects.get(i);
-			localModel.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_BASE_LOCATION, basePath);
-			localModel.setBooleanProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION, useDefault);
-		}
-	}
-
-	private void changeModuleCreationLocationForNameChange(List projects) {
-		IDataModel localModel = null;
-		for (int i = 0; null != projects && i < projects.size(); i++) {
-			localModel = (IDataModel) projects.get(i);
-			if (isPropertySet(NESTED_MODULE_ROOT)) {
-				IPath newPath = new Path((String) getProperty(NESTED_MODULE_ROOT));
-				newPath = newPath.append((String) localModel.getProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME));
-				// model.setProperty(J2EEComponentCreationDataModel.PROJECT_LOCATION,
-				// newPath.toOSString());
-			} else {
-				// model.setProperty(J2EEComponentCreationDataModel.PROJECT_LOCATION, null);
-			}
-		}
-	}
-
-	private IPath getLocation() {
-		return ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	}
-
-	private void trimSelection() {
-		boolean modified = false;
-		List selectedList = getSelectedModels();
-		List allList = getProjectModels();
-		for (int i = selectedList.size() - 1; i > -1; i--) {
-			if (!allList.contains(selectedList.get(i))) {
-				modified = true;
-				selectedList.remove(i);
-			}
-		}
-		if (modified) {
-			List newList = new ArrayList();
-			newList.addAll(selectedList);
-			setProperty(SELECTED_MODELS_LIST, newList);
-		}
-	}
-
-	private void updateUtilityModels(List utilityJars) {
-		updateUtilityModels(utilityJars, SELECTED_MODELS_LIST, UTILITY_MODELS_LIST);
-	}
-
-	private void updateUtilityModels(List utilityJars, String selectedProperty, String listTypeProperty) {
-		boolean allSelected = true;
-		List selectedList = (List) getProperty(selectedProperty);
-		List allList = getProjectModels();
-		if (selectedList.size() == allList.size()) {
-			for (int i = 0; i < selectedList.size() && allSelected; i++) {
-				if (!selectedList.contains(allList.get(i)) || !allList.contains(selectedList.get(i))) {
-					allSelected = false;
-				}
-			}
-		} else {
-			allSelected = false;
-		}
-		List utilityModels = (List) getProperty(listTypeProperty);
-		Archive currentArchive = null;
-		IDataModel currentUtilityModel = null;
-		boolean utilityJarsModified = false;
-		// Add missing
-		for (int i = 0; null != utilityJars && i < utilityJars.size(); i++) {
-			currentArchive = (Archive) utilityJars.get(i);
-			boolean added = false;
-			for (int j = 0; utilityModels != null && j < utilityModels.size() && !added; j++) {
-				currentUtilityModel = (IDataModel) utilityModels.get(j);
-				if (currentUtilityModel.getProperty(IJavaUtilityJarImportDataModelProperties.FILE) == currentArchive) {
-					added = true;
-				}
-			}
-			if (!added) {
-				if (!isPropertySet(listTypeProperty)) {
-					utilityModels = new ArrayList();
-					setProperty(listTypeProperty, utilityModels);
-				}
-				IDataModel localModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider());
-				localModel.setProperty(IJavaUtilityJarImportDataModelProperties.FILE, currentArchive);
-				localModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, getStringProperty(PROJECT_NAME));
-				localModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-				utilityModels.add(localModel);
-				localModel.addListener(nestedListener);
-				utilityJarsModified = true;
-			}
-		} // Remove extras
-		for (int i = utilityModels.size() - 1; i >= 0; i--) {
-			currentUtilityModel = (IDataModel) utilityModels.get(i);
-			currentArchive = (Archive) currentUtilityModel.getProperty(IJavaUtilityJarImportDataModelProperties.FILE);
-			if (null == utilityJars || !utilityJars.contains(currentArchive)) {
-				currentUtilityModel.removeListener(nestedListener);
-				currentUtilityModel.dispose();
-				utilityModels.remove(currentUtilityModel);
-				utilityJarsModified = true;
-			}
-		}
-		allList = getProjectModels();
-		if (allSelected) {
-			List newList = new ArrayList();
-			newList.addAll(allList);
-			setProperty(SELECTED_MODELS_LIST, newList);
-		} else {
-			trimSelection();
-		}
-		if (utilityJarsModified) {
-			model.notifyPropertyChange(NESTED_PROJECTS_VALIDATION, IDataModel.VALUE_CHG);
-		}
-	}
-
-	private List getModuleModels() {
-		if (getArchiveFile() == null)
-			return Collections.EMPTY_LIST;
-		cachedLoadError = null;
-		List moduleFiles = getEARFile().getModuleFiles();
-		List moduleModels = new ArrayList();
-		List clientJarArchives = new ArrayList();
-		IDataModel localModel;
-		String earProjectName = getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-
-		List defaultModuleNames = new ArrayList();
-		defaultModuleNames.add(earProjectName);
-		List collidingModuleNames = null;
-		Hashtable ejbJarsWithClients = new Hashtable();
-		for (int i = 0; i < moduleFiles.size(); i++) {
-			localModel = null;
-			ModuleFile temp = (ModuleFile) moduleFiles.get(i);
-			try {
-				if (temp.isApplicationClientFile()) {
-					localModel = DataModelFactory.createDataModel(new AppClientComponentImportDataModelProvider());
-				} else if (temp.isWARFile()) {
-					WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
-					if (webExt != null) {
-						localModel = webExt.createImportDataModel();
-						WebModule webModule = (WebModule) getEARFile().getModule(temp.getURI(), null);
-						if (null != webModule && null != webModule.getContextRoot()) {
-							localModel.setProperty(IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT, webModule.getContextRoot());
-						}
-					}
-				} else if (temp.isEJBJarFile()) {
-					EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
-					if (ejbExt != null) {
-						localModel = ejbExt.createImportDataModel();
-					}
-					EJBJar jar = ((EJBJarFile) temp).getDeploymentDescriptor();
-					if (jar != null) {
-						if (jar.getEjbClientJar() != null) {
-							String clientName = jar.getEjbClientJar();
-							try {
-								Archive clientArchive = (Archive) getEARFile().getFile(clientName);
-								clientJarArchives.add(clientArchive);
-								ejbJarsWithClients.put(localModel, clientArchive);
-							} catch (Exception e) {
-								// TODO: handle exception
-							}
-						}
-					}
-				} else if (temp.isRARFile()) {
-					JcaModuleExtension rarExt = EarModuleManager.getJCAModuleExtension();
-					if (rarExt != null) {
-						localModel = rarExt.createImportDataModel();
-					}
-				}
-				if (localModel != null) {
-					localModel.setProperty(FILE, temp);
-					localModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, earProjectName);
-					localModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
-					localModel.addListener(this);
-					localModel.addListener(nestedListener);
-					moduleModels.add(localModel);
-					String moduleName = localModel.getStringProperty(IJ2EEFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-					if (defaultModuleNames.contains(moduleName)) {
-						if (collidingModuleNames == null) {
-							collidingModuleNames = new ArrayList();
-						}
-						collidingModuleNames.add(moduleName);
-					} else {
-						defaultModuleNames.add(moduleName);
-					}
-				}
-			} catch (Exception e) {
-				Logger.getLogger().logError("Error loading nested archive: " + temp.getURI()); //$NON-NLS-1$
-				Logger.getLogger().logError(e);
-				cachedLoadError = temp;
-			}
-		}
-		updateUtilityModels(clientJarArchives, EJB_CLIENT_LIST, EJB_CLIENT_LIST);
-		List clientModelList = (List) getProperty(EJB_CLIENT_LIST);
-		Enumeration ejbModels = ejbJarsWithClients.keys();
-		ejbJarToClientJarModels.clear();
-		clientJarToEjbJarModels.clear();
-		while (ejbModels.hasMoreElements()) {
-			Object ejbModel = ejbModels.nextElement();
-			Object archive = ejbJarsWithClients.get(ejbModel);
-			Object clientModel = null;
-			for (int i = 0; clientModel == null && i < clientModelList.size(); i++) {
-				if (((IDataModel) clientModelList.get(i)).getProperty(FILE) == archive) {
-					clientModel = clientModelList.get(i);
-				}
-			}
-			ejbJarToClientJarModels.put(ejbModel, clientModel);
-			clientJarToEjbJarModels.put(clientModel, ejbModel);
-		}
-
-		for (int i = 0; collidingModuleNames != null && i < moduleModels.size(); i++) {
-			localModel = (IDataModel) moduleModels.get(i);
-			String moduleName = localModel.getStringProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME);
-			if (collidingModuleNames.contains(moduleName)) {
-				ModuleFile module = (ModuleFile) localModel.getProperty(IJ2EEModuleImportDataModelProperties.FILE);
-				String suffix = null;
-				if (module.isApplicationClientFile()) {
-					suffix = "_AppClient"; //$NON-NLS-1$
-				} else if (module.isWARFile()) {
-					suffix = "_WEB"; //$NON-NLS-1$
-				} else if (module.isEJBJarFile()) {
-					suffix = "_EJB"; //$NON-NLS-1$
-				} else if (module.isRARFile()) {
-					suffix = "_JCA"; //$NON-NLS-1$
-				}
-				if (defaultModuleNames.contains(moduleName + suffix)) {
-					int count = 1;
-					for (; defaultModuleNames.contains(moduleName + suffix + count) && count < 10; count++);
-					suffix += count;
-				}
-				localModel.setProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME, moduleName + suffix);
-			}
-		}
-		return moduleModels;
-	}
-
-	protected int getType() {
-		return XMLResource.APPLICATION_TYPE;
-	}
-
-	protected Archive openArchive(String uri) throws OpenFailureException {
-		return CommonarchiveFactory.eINSTANCE.openEARFile(getArchiveOptions(), uri);
-	}
-
-	private EARFile getEARFile() {
-		return (EARFile) getArchiveFile();
-	}
-
-	public boolean handlesArchive(Archive anArchive) {
-		List temp = new ArrayList();
-		List tempList = (List) getProperty(MODULE_MODELS_LIST);
-		if (null != tempList) {
-			temp.addAll(tempList);
-		}
-		tempList = (List) getProperty(EJB_CLIENT_LIST);
-		if (null != tempList) {
-			temp.addAll(tempList);
-		}
-		tempList = getSelectedModels();
-		for (int i = 0; i < tempList.size(); i++) {
-			if (!temp.contains(tempList.get(i))) {
-				temp.add(tempList.get(i));
-			}
-		}
-		IDataModel importDM = null;
-		for (int i = 0; i < temp.size(); i++) {
-			importDM = (IDataModel) temp.get(i);
-			if (importDM.getProperty(FILE) == anArchive) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private List getProjectModels() {
-		List temp = new ArrayList();
-		List tempList = (List) getProperty(MODULE_MODELS_LIST);
-		if (null != tempList) {
-			temp.addAll(tempList);
-		}
-		tempList = (List) getProperty(UTILITY_MODELS_LIST);
-		if (null != tempList) {
-			temp.addAll(tempList);
-		}
-		tempList = (List) getProperty(EJB_CLIENT_LIST);
-		if (null != tempList) {
-			temp.addAll(tempList);
-		}
-		return temp;
-	}
-
-	private List getUnhandledProjectModels() {
-		List handled = removeHandledModels(getProjectModels(), getProjectModels(), false);
-		List all = getProjectModels();
-		all.removeAll(handled);
-		return all;
-	}
-
-	public List getSelectedModels() {
-		return (List) getProperty(SELECTED_MODELS_LIST);
-	}
-
-	private List removeHandledModels(List listToPrune, List modelsToCheck, boolean addModels) {
-		List newList = new ArrayList();
-		newList.addAll(listToPrune);
-		IDataModel localModel = null;
-		for (int i = 0; i < modelsToCheck.size(); i++) {
-			localModel = (IDataModel) modelsToCheck.get(i);
-			// model.extractHandled(newList, addModels);
-		}
-		return newList;
-	}
-
-	private List getHandledSelectedModels() {
-		List selectedModels = getSelectedModels();
-		return removeHandledModels(selectedModels, selectedModels, true);
-	}
-
-	public int getJ2EEVersion() {
-		EARFile ef = getEARFile();
-		return null == ef ? J2EEVersionConstants.J2EE_1_2_ID : ArchiveUtil.getFastSpecVersion(ef);
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		if (!super.isPropertyEnabled(propertyName)) {
-			return false;
-		}
-		if (propertyName.equals(USE_ANNOTATIONS)) {
-			if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
-				return false;
-			return true;
-		}
-		return true;
-	}
-
-	public void dispose() {
-		super.dispose();
-		List list = getProjectModels();
-		for (int i = 0; i < list.size(); i++) {
-			((IDataModel) list.get(i)).dispose();
-		}
-		EARFile earFile = getEARFile();
-		if (earFile != null)
-			earFile.close();
-	}
-
-	// TODO: Implement with J2EEArtifactImportDataModelProvider
-	/*
-	 * public J2EEArtifactImportDataModel getMatchingEJBJarOrClient(J2EEArtifactImportDataModel
-	 * model) { if (clientJarToEjbJarModels.containsKey(model)) { return
-	 * (J2EEArtifactImportDataModel) clientJarToEjbJarModels.get(model); } else if
-	 * (ejbJarToClientJarModels.containsKey(model)) { return (J2EEArtifactImportDataModel)
-	 * ejbJarToClientJarModels.get(model); } else { return null; } }
-	 */
-
-	protected IDataModel createJ2EEComponentCreationDataModel() {
-		return DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new EARComponentImportOperation(model);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportFactory.java
deleted file mode 100644
index 282d15a8a..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportFactory.java
+++ /dev/null
@@ -1,36 +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 21, 2004 
- * @author jsholl
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jsholl
- */
-public interface ExtendedImportFactory {
-
-	public Archive openArchive(ArchiveOptions archiveOptions, String uri) throws OpenFailureException;
-
-	public void importModuleFile(IDataModel model, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
-
-	public int getSpecVersion(Archive archive);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportRegistry.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportRegistry.java
deleted file mode 100644
index fdfc974c6..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ExtendedImportRegistry.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 Jun 21, 2004 
- * @author jsholl
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * @author jsholl
- */
-public class ExtendedImportRegistry extends RegistryReader {
-
-	private static final String PLUGIN_ID = J2EEPlugin.PLUGIN_ID;
-
-	private static final String EXTENSION_ID = "ExtendedModuleImport"; //$NON-NLS-1$
-
-	private static final String FACTORY_CLASS = "factoryClass"; //$NON-NLS-1$
-
-	private static final String MODULE_TYPE = "moduleType"; //$NON-NLS-1$
-
-	public static final String EJB_TYPE = "EJB"; //$NON-NLS-1$
-
-	private List ejbConfigurationElements = null;
-
-	private List ejbFactories = null;
-
-	private static ExtendedImportRegistry instance = null;
-
-	public static ExtendedImportRegistry getInstance() {
-		//if (null == instance) {
-		instance = new ExtendedImportRegistry();
-		//}
-		return instance;
-	}
-
-	private ExtendedImportRegistry() {
-		super(PLUGIN_ID, EXTENSION_ID);
-		readRegistry();
-	}
-
-	/**
-	 * returns a List of ExtendedFactories;
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public List getFactories(String type) {
-		if (type.equals(EJB_TYPE)) {
-			if (ejbFactories == null) {
-				ejbFactories = new ArrayList();
-				for (int i = 0; null != ejbConfigurationElements && i < ejbConfigurationElements.size(); i++) {
-					try {
-						ejbFactories.add(((IConfigurationElement) ejbConfigurationElements.get(i)).createExecutableExtension(FACTORY_CLASS));
-					} catch (CoreException e) {
-						Logger.getLogger().logError(e);
-					}
-				}
-			}
-			return ejbFactories;
-		}
-		return null;
-	}
-
-	public boolean readElement(IConfigurationElement element) {
-		String moduleType = element.getAttribute(MODULE_TYPE);
-		if (null != moduleType) {
-			if (moduleType.equals(EJB_TYPE)) {
-				if (ejbConfigurationElements == null) {
-					ejbConfigurationElements = new ArrayList();
-				}
-				ejbConfigurationElements.add(element);
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModelProvider.java
deleted file mode 100644
index 04c36f30a..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,102 +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.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModelProvider;
-import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModelProvider;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.FlexibleProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see JavaProjectFacetCreationDataModelProvider
- */
-public class FlexibleJavaProjectCreationDataModelProvider extends FlexibleProjectCreationDataModelProvider implements IFlexibleJavaProjectCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	public FlexibleJavaProjectCreationDataModelProvider() {
-		super();
-	}
-
-	public void init() {
-		super.init();
-		IDataModel serverTargetModel = DataModelFactory.createDataModel(new J2EEProjectServerTargetDataModelProvider());
-		model.addNestedModel(NESTED_MODEL_SERVER_TARGET, serverTargetModel);
-	}
-
-	protected void initNestedProjectModel() {
-		IDataModel javaProjModel = DataModelFactory.createDataModel(new JavaProjectCreationDataModelProvider());
-		model.addNestedModel(NESTED_MODEL_PROJECT_CREATION, javaProjModel);
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(NESTED_MODEL_SERVER_TARGET);
-		propertyNames.add(ADD_SERVER_TARGET);
-		propertyNames.add(RUNTIME_TARGET_ID);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(ADD_SERVER_TARGET)) {
-			return Boolean.TRUE;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean status = super.propertySet(propertyName, propertyValue);
-		if (PROJECT_NAME.equals(propertyName)) {
-			IDataModel projModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
-			projModel.setProperty(IJ2EEProjectServerTargetDataModelProperties.PROJECT_NAME, propertyValue);
-		} else if (RUNTIME_TARGET_ID.equals(propertyName)) {
-			IDataModel projModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
-			projModel.setProperty(IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID, propertyValue);
-		}
-		return status;
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new FlexibleJavaProjectCreationOperation(model);
-	}
-
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (propertyName.equals(RUNTIME_TARGET_ID)) {
-			IDataModel serverTargetModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
-			return serverTargetModel.getValidPropertyDescriptors(IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID);
-		}
-		return null;
-	}
-
-	public IStatus validate(String propertyName) {
-		IStatus status = super.validate(propertyName);
-		if (!status.isOK()) {
-			return status;
-		} else if (propertyName.equals(NESTED_MODEL_SERVER_TARGET)) {
-			IDataModel stModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
-			return stModel.validate();
-		}
-		return OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationOperation.java
deleted file mode 100644
index 438c7c91b..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationOperation.java
+++ /dev/null
@@ -1,67 +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.application.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.FlexibleProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see JavaProjectFacetCreationDataModelProvider
- */
-public class FlexibleJavaProjectCreationOperation extends FlexibleProjectCreationOperation implements IFlexibleJavaProjectCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-    public FlexibleJavaProjectCreationOperation(IDataModel model) {
-        super(model);
-    }
-    private void addServerTarget(IProgressMonitor monitor)  throws CoreException, InvocationTargetException, InterruptedException, ExecutionException{
-        IDataModel serverModel = model.getNestedModel(NESTED_MODEL_SERVER_TARGET);
-        IDataModelOperation op = serverModel.getDefaultOperation();
-        op.execute(monitor, null);
-    }
-    
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = super.execute(monitor, info);
-        try {
-        	createJavaEMFNature();
-            addServerTarget(monitor);
-        } catch (ExecutionException e) {
-        	Logger.getLogger().log(e);
-        } catch (CoreException e) {
-        	Logger.getLogger().log(e);
-        } catch (InvocationTargetException e) {
-        	Logger.getLogger().log(e);
-        } catch (InterruptedException e) {
-        	Logger.getLogger().log(e);
-        }
-        return status;
-    }
-	protected void createJavaEMFNature() throws CoreException {
-		JavaEMFNature nature = JavaEMFNature.createRuntime(getProject());
-		nature.getResourceSet();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAddComponentToEnterpriseApplicationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAddComponentToEnterpriseApplicationDataModelProperties.java
deleted file mode 100644
index 66121d392..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAddComponentToEnterpriseApplicationDataModelProperties.java
+++ /dev/null
@@ -1,19 +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.application.internal.operations;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-
-public interface IAddComponentToEnterpriseApplicationDataModelProperties extends ICreateReferenceComponentsDataModelProperties {
-
-	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java
deleted file mode 100644
index 8b8a47720..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java
+++ /dev/null
@@ -1,35 +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.application.internal.operations;
-
-/**
- * The IAnnotationsDataModel is data model interface used by other data models in
- * the WTP wizard and operation framework.
- * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel
- * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation
- * 
- * This provides the USE_ANNOTATIONS property which is used to determine whether or
- * not artifacts should be created using annotations or not.
- * 
- * Subclasses may extend this interface to add their own properties.
- * 
- * The use of this interface is EXPERIMENTAL and subject to substantial changes.
- * 
- */
-public interface IAnnotationsDataModel {
-
-	/**
-	 * Optional, type Boolean to determine whether an artifact should be created with annotated tags.
-	 * The default is set on the particular data model who implements this interface.
-	 */
-	public static final String USE_ANNOTATIONS = "IAnnotationsDataModel.useAnnotations"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IModuleExtensions.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IModuleExtensions.java
deleted file mode 100644
index a9b8de25a..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IModuleExtensions.java
+++ /dev/null
@@ -1,21 +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.application.internal.operations;
-
-public interface IModuleExtensions {
-
-	public String DOT_WAR = ".war"; //$NON-NLS-1$
-	public String DOT_JAR = ".jar"; //$NON-NLS-1$ 
-	public String DOT_RAR = ".rar"; //$NON-NLS-1$
-	public String DOT_EAR = ".ear"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IUpdateModuleContextRootProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IUpdateModuleContextRootProperties.java
deleted file mode 100644
index 9df847f4b..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IUpdateModuleContextRootProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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 impl
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import org.eclipse.wst.web.internal.operation.IWebProjectPropertiesUpdateDataModelProperties;
-
-/**
- * Holds DataModelOperation properties for updating the context-root of modules in associated EAR application.xml files.
- */
-public interface IUpdateModuleContextRootProperties extends IWebProjectPropertiesUpdateDataModelProperties {
-	/**
-	 * ID for nexted IDataModel
-	 */
-	public static final String NESTED_MODEL_ID = "UpdateModuleContextRootModel"; //$NON-NLS-1$
-	/**
-	 * Name of property (in nested model) that holds a List of EAR IProjects.
-	 */
-	public static final String EARS_TO_UPDATE = "IUpdateModuleContextRootProperties.EARS_TO_UPDATE"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java
deleted file mode 100644
index b4852ed15..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.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.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public abstract class J2EEArtifactExportDataModelProvider extends AbstractDataModelProvider implements IJ2EEComponentExportDataModelProperties {
-
-	public HashMap componentMap;
-
-	public J2EEArtifactExportDataModelProvider() {
-		super();
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		propertyNames.add(ARCHIVE_DESTINATION);
-		propertyNames.add(EXPORT_SOURCE_FILES);
-		propertyNames.add(OVERWRITE_EXISTING);
-		propertyNames.add(RUN_BUILD);
-		propertyNames.add(COMPONENT);
-		return propertyNames;
-	}
-
-	protected abstract String getProjectType();
-
-	protected abstract String getWrongComponentTypeString(String projectName);
-
-	protected abstract String getModuleExtension();
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(ARCHIVE_DESTINATION)) {
-			return ""; //$NON-NLS-1$
-		} else if (propertyName.equals(EXPORT_SOURCE_FILES)) {
-			return Boolean.FALSE;
-		} else if (propertyName.equals(OVERWRITE_EXISTING)) {
-			return Boolean.FALSE;
-		} else if (propertyName.equals(RUN_BUILD)) {
-			return Boolean.TRUE;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean set = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(PROJECT_NAME)) {
-			if (getComponentMap().isEmpty())
-				intializeComponentMap();
-			IVirtualComponent component = (IVirtualComponent) getComponentMap().get(propertyValue);
-			if (null != component && component.getName().equals(propertyValue)) {
-				setProperty(COMPONENT, component);
-			} else {
-				setProperty(COMPONENT, null);
-		}
-		}
-		return set;
-	}
-
-	public HashMap getComponentMap() {
-		if (componentMap == null)
-			componentMap = new HashMap();
-		return componentMap;
-	}
-
-	public void intializeComponentMap() {
-		IVirtualComponent[] comps = ComponentUtilities.getAllWorkbenchComponents();
-		for (int i = 0; i < comps.length; i++) {
-			getComponentMap().put(comps[i].getName(), comps[i]);
-		}
-	}
-
-	/**
-	 * Populate the resource name combo with projects that are not encrypted.
-	 */
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		// TODO: populate valid components
-		if (propertyName.equals(PROJECT_NAME)) {
-			List componentNames = new ArrayList();
-			IVirtualComponent[] wbComps = ComponentUtilities.getAllWorkbenchComponents();
-
-			List relevantComponents = new ArrayList();
-			for (int i = 0; i < wbComps.length; i++) {
-				if (J2EEProjectUtilities.getJ2EEProjectType(wbComps[i].getProject()).equals(getProjectType())) {
-					relevantComponents.add(wbComps[i]);
-					getComponentMap().put(wbComps[i].getName(), wbComps[i]);
-				}
-			}
-
-			if (relevantComponents == null || relevantComponents.size() == 0)
-				return null;
-
-			for (int j = 0; j < relevantComponents.size(); j++) {
-				componentNames.add(((IVirtualComponent) relevantComponents.get(j)).getName());
-			}
-			String[] names = (String[]) componentNames.toArray(new String[componentNames.size()]);
-
-			return DataModelPropertyDescriptor.createDescriptors(names);
-		}
-		return super.getValidPropertyDescriptors(propertyName);
-		// (ProjectUtilities.getProjectNamesWithoutForwardSlash((String[])
-		// projectsWithNature.toArray(new String[projectsWithNature.size()])));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
-	 */
-	public IStatus validate(String propertyName) {
-		if (PROJECT_NAME.equals(propertyName)) {
-			String projectName = (String) model.getProperty(PROJECT_NAME);
-			if (projectName == null || projectName.equals("")) //$NON-NLS-1$
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_EXISTS_ERROR));
-			IVirtualComponent component = (IVirtualComponent) componentMap.get(projectName);
-			if (component == null) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_EXISTS_ERROR));
-			}
-			if (!J2EEProjectUtilities.getJ2EEProjectType(component.getProject()).equals(getProjectType())) {
-				return WTPCommonPlugin.createErrorStatus(getWrongComponentTypeString(projectName));
-			}
-		}
-		if (ARCHIVE_DESTINATION.equals(propertyName)) {
-			String archiveLocation = (String) model.getProperty(ARCHIVE_DESTINATION);
-			if (!model.isPropertySet(ARCHIVE_DESTINATION) || archiveLocation.equals("")) { //$NON-NLS-1$
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID)); //);
-			} else if (model.isPropertySet(ARCHIVE_DESTINATION) && !validateModuleType(archiveLocation)) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_ARCHIVE_SHOULD_END_WITH, new Object[]{getModuleExtension()})); //);
-			} else if (model.isPropertySet(ARCHIVE_DESTINATION)) {
-				IStatus tempStatus = validateLocation(archiveLocation);
-				if (tempStatus != OK_STATUS)
-					return tempStatus;
-			}
-		}
-		if (ARCHIVE_DESTINATION.equals(propertyName) || OVERWRITE_EXISTING.equals(propertyName)) {
-			String location = (String) getProperty(ARCHIVE_DESTINATION);
-			if (checkForExistingFileResource(location)) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.RESOURCE_EXISTS_ERROR, new Object[]{location}));
-			}
-		}
-		return OK_STATUS;
-	}
-
-	private IStatus validateLocation(String archiveLocation) {
-		IPath path = null;
-		try {
-			path = new Path(archiveLocation);
-		} catch (IllegalArgumentException ex) {
-			return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID));
-		}
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IStatus status = workspace.validateName(path.lastSegment(), IResource.FILE);
-		if (!status.isOK()) {
-			return status;
-		}
-		String device = path.getDevice();
-		if (device == null)
-			return OK_STATUS;
-		if (path == null || device.length() == 1 && device.charAt(0) == IPath.DEVICE_SEPARATOR)
-			return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID));
-
-		if (!path.toFile().canWrite()) {
-			if (path.toFile().exists()) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.IS_READ_ONLY));
-			}
-			boolean OK = false;
-			path = path.removeLastSegments(1);
-			for (int i = 1; !OK && i < 20 && path.segmentCount() > 0; i++) {
-				if (path.toFile().exists()) {
-					OK = true;
-				}
-				status = workspace.validateName(path.lastSegment(), IResource.FOLDER);
-				if (!status.isOK()) {
-					return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.DESTINATION_INVALID));
-				}
-				path = path.removeLastSegments(1);
-			}
-		}
-
-		return OK_STATUS;
-	}
-
-	private boolean checkForExistingFileResource(String fileName) {
-		if (!model.getBooleanProperty(OVERWRITE_EXISTING)) {
-			java.io.File externalFile = new java.io.File(fileName);
-			if (externalFile != null && externalFile.exists())
-				return true;
-		}
-		return false;
-	}
-
-	private boolean validateModuleType(String archive) {
-		if ((archive.length() < 4) || (!(archive.substring(archive.length() - 4, archive.length()).equalsIgnoreCase(getModuleExtension())))) {
-			return false;
-		}
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
deleted file mode 100644
index c2ebeafc5..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
+++ /dev/null
@@ -1,303 +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.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-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.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public abstract class J2EEArtifactImportDataModelProvider extends AbstractDataModelProvider implements IJ2EEComponentImportDataModelProperties, IDataModelListener {
-
-	private static final String USE_DEFAULT_PROJECT_NAME = "J2EEArtifactImportDataModelProvider.USE_DEFAULT_PROJECT_NAME"; //$NON-NLS-1$
-	
-	public static final String FACET_RUNTIME = "IJ2EEArtifactImportDataModelProperties.FACET_RUNTIME"; //$NON-NLS-1$	
-
-	private IDataModel componentCreationDM;
-	private OpenFailureException cachedOpenFailureException = null;
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(FILE_NAME);
-		propertyNames.add(FILE);
-		propertyNames.add(SAVE_FILTER);
-		propertyNames.add(OVERWRITE_HANDLER);
-		propertyNames.add(CLOSE_ARCHIVE_ON_DISPOSE);
-		propertyNames.add(USE_DEFAULT_PROJECT_NAME);
-		propertyNames.add(PROJECT_NAME);
-		propertyNames.add(COMPONENT);
-		propertyNames.add( FACET_RUNTIME );
-		return propertyNames;
-	}
-
-	public void init() {
-		super.init();
-		componentCreationDM = createJ2EEComponentCreationDataModel();
-		componentCreationDM.setBooleanProperty(FacetProjectCreationDataModelProvider.FORCE_VERSION_COMPLIANCE, false);
-		componentCreationDM.addListener(this);
-		model.addNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION, componentCreationDM);
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(CLOSE_ARCHIVE_ON_DISPOSE)) {
-			return Boolean.TRUE;
-		} else if (propertyName.equals(USE_DEFAULT_PROJECT_NAME)) {
-			return Boolean.TRUE;
-		}else if( propertyName.equals(COMPONENT)){
-			String projectName = getStringProperty(PROJECT_NAME);
-			IProject project = ProjectUtilities.getProject(projectName);
-			return ComponentCore.createComponent(project);			
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	private boolean settingFileName = false;
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (propertyName.equals(FILE)) {
-			if (!settingFileName) {
-				setProperty(FILE_NAME, null);
-			}
-			updateDefaultComponentName();
-			return true;
-		} else if (propertyName.equals(SAVE_FILTER) && getArchiveFile() != null) {
-			getArchiveFile().setSaveFilter(getSaveFilter());
-		} else if (FILE_NAME.equals(propertyName)) {
-			try {
-				cachedOpenFailureException = null;
-				handleArchiveSetup((String) propertyValue);
-			} catch (OpenFailureException oe) {
-				cachedOpenFailureException = oe;
-			}
-		} else if( COMPONENT.equals(propertyName)){
-			throw new RuntimeException(propertyName + " should not be set."); //$NON-NLS-1$
-		}else if (PROJECT_NAME.equals(propertyName)) {
-			List nestedModels = new ArrayList(model.getNestedModels());
-			IDataModel nestedModel = null;
-			for (int i = 0; i < nestedModels.size(); i++) {
-				nestedModel = (IDataModel) nestedModels.get(i);
-				try {
-					nestedModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
-				} catch (Exception e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-		} else if( FACET_RUNTIME.equals( propertyName )){
-			throw new RuntimeException(propertyName + " should not be set."); //$NON-NLS-1$
-		}
-		return true;
-	}
-
-	private boolean doingComponentUpdate;
-
-	private void updateDefaultComponentName() {
-		Archive archive = getArchiveFile();
-		if (null != archive && getBooleanProperty(USE_DEFAULT_PROJECT_NAME)) {
-			try {
-				doingComponentUpdate = true;
-				Path path = new Path(archive.getURI());
-				String defaultProjectName = path.segment(path.segmentCount() - 1);
-				if (defaultProjectName.indexOf('.') > 0) {
-					defaultProjectName = defaultProjectName.substring(0, defaultProjectName.lastIndexOf('.'));
-				}
-				setProperty(PROJECT_NAME, defaultProjectName);
-			} finally {
-				doingComponentUpdate = false;
-			}
-
-		}
-	}
-
-	private boolean handleArchiveSetup(String fileName) throws OpenFailureException {
-		try {
-			settingFileName = true;
-			Archive archive = getArchiveFile();
-			if (archive != null) {
-				archive.close();
-				setProperty(FILE, null);
-			}
-			String uri = getStringProperty(FILE_NAME);
-			if (!archiveExistsOnFile())
-				return false;
-			archive = openArchive(uri);
-			if (null != archive) {
-				archive.setSaveFilter(getSaveFilter());
-			}
-			setProperty(FILE, archive);
-			return archive != null;
-		} finally {
-			settingFileName = false;
-		}
-
-	}
-
-	protected abstract Archive openArchive(String uri) throws OpenFailureException;
-
-	private boolean closeModuleFile() {
-		if (null != getArchiveFile()) {
-			getArchiveFile().close();
-		}
-		return true;
-	}
-
-	public IStatus validate(String propertyName) {
-		if (FILE_NAME.equals(propertyName) && !isPropertySet(FILE)) {
-			String fileName = getStringProperty(propertyName);
-			if (fileName == null || fileName.length() == 0) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.ARCHIVE_FILE_NAME_EMPTY_ERROR, new Object[]{ArchiveUtil.getModuleFileTypeName(getType())}));
-			} else if (cachedOpenFailureException != null) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(cachedOpenFailureException.getMessage()));
-			} else if (fileName != null && !archiveExistsOnFile()) {
-				return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.FILE_DOES_NOT_EXIST_ERROR, new Object[]{ArchiveUtil.getModuleFileTypeName(getType())}));
-			}
-		} else if (NESTED_MODEL_J2EE_COMPONENT_CREATION.equals(propertyName) ) {
-			return getDataModel().getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION).validate(true);
-		} else if(FACET_RUNTIME.equals(propertyName)){
-			return validateVersionSupportedByServer();
-		}
-		return OK_STATUS;
-	}
-
-	protected int getJ2EEVersion() {
-		return 0;
-	}
-
-	protected abstract IDataModel createJ2EEComponentCreationDataModel();
-
-	/*
-	 * @see XMLResource#APP_CLIENT_TYPE
-	 * @see XMLResource#APPLICATION_TYPE
-	 * @see XMLResource#EJB_TYPE
-	 * @see XMLResource#WEB_APP_TYPE
-	 * @see XMLResource#RAR_TYPE
-	 */
-	protected abstract int getType();
-
-	private boolean archiveExistsOnFile() {
-		String jarName = (String) getProperty(FILE_NAME);
-		if (jarName != null && jarName.length() > 0) {
-			java.io.File file = new java.io.File(jarName);
-			return file.exists() && !file.isDirectory();
-		}
-		return false;
-	}
-
-	public void dispose() {
-		if (getBooleanProperty(CLOSE_ARCHIVE_ON_DISPOSE))
-			closeModuleFile();
-		super.dispose();
-	}
-
-	protected final void setArchiveFile(Archive archiveFile) {
-		setProperty(FILE, archiveFile);
-	}
-
-	protected final Archive getArchiveFile() {
-		return (Archive) getProperty(FILE);
-	}
-
-	protected final ArchiveOptions getArchiveOptions() {
-		ArchiveOptions opts = new ArchiveOptions();
-		opts.setIsReadOnly(true);
-		return opts;
-	}
-
-	private SaveFilter getSaveFilter() {
-		return (SaveFilter) getProperty(SAVE_FILTER);
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	public void propertyChanged(DataModelEvent event) {
-		if (!doingComponentUpdate && event.getDataModel() == componentCreationDM && event.getPropertyName().equals(PROJECT_NAME) && getBooleanProperty(USE_DEFAULT_PROJECT_NAME)) {
-			setBooleanProperty(USE_DEFAULT_PROJECT_NAME, false);
-		}
-		if( event.getDataModel() == componentCreationDM && event.getPropertyName().equals(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)){
-			model.notifyPropertyChange(FACET_RUNTIME, IDataModel.DEFAULT_CHG);
-		}
-	}
-	
-	protected IStatus validateVersionSupportedByServer(){
-		if( model.isPropertySet(FILE)){
-			IDataModel projectModel = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-			FacetDataModelMap map = (FacetDataModelMap) projectModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			Collection projectFacets = (Collection)getProperty(FacetProjectCreationDataModelProvider.REQUIRED_FACETS_COLLECTION);
-					
-			IRuntime runtime = (IRuntime) getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME); 
-			for(Iterator iterator = projectFacets.iterator(); iterator.hasNext();){
-				IDataModel facetDataModel = map.getFacetDataModel(((IProjectFacet)iterator.next()).getId());
-				IProjectFacetVersion facetVersion = (IProjectFacetVersion)facetDataModel.getProperty(IFacetDataModelProperties.FACET_VERSION);
-				if(facetVersion.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA)){
-					Set set = Collections.singleton(facetVersion.getProjectFacet());
-					try {
-						if( runtime != null ){
-							Set correctSet = runtime.getDefaultFacets(set);
-							IProjectFacetVersion correctVersion = null;
-							Iterator correctVersions = correctSet.iterator();
-							while(correctVersions.hasNext() && correctVersion == null){
-								IProjectFacetVersion version = (IProjectFacetVersion)correctVersions.next();
-								if(version.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA)){
-									correctVersion = version;
-								}
-							}
-							
-							if(correctVersion != null){
-								facetDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION, correctVersion);
-								facetVersion = correctVersion;
-							}
-						}
-					} catch (CoreException e) {
-						Logger.getLogger().logError(e);
-					}
-				}
-			
-				if(runtime != null && !runtime.supports(facetVersion)){
-					return WTPCommonPlugin.createErrorStatus( J2EECreationResourceHandler.VERSION_NOT_SUPPORTED ); //$NON-NLS-1$
-				}
-			}
-		}
-		return OK_STATUS;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModelProvider.java
deleted file mode 100644
index d4e870b7b..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,731 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see J2EEFacetInstallDataModelProvider
- */
-public abstract class J2EEComponentCreationDataModelProvider extends JavaComponentCreationDataModelProvider implements IJ2EEComponentCreationDataModelProperties, IAnnotationsDataModel, DoNotUseMeThisWillBeDeletedPost15 {
-
-	private IDataModel earCreationDM = null;
-	private static String MODULE_NOT_SUPPORTED = "MODULE_NOT_SUPPORTED"; //$NON-NLS-1$
-	private static String MODULEVERSION_NOT_SUPPORTED = "VERSION_NOT_SUPPORTED"; //$NON-NLS-1$
-	private static String OK = "OK"; //$NON-NLS-1$
-
-	public void init() {
-		super.init();
-		model.setProperty(COMPONENT_VERSION, getDefaultProperty(COMPONENT_VERSION));
-
-		IDataModel dm = DataModelFactory.createDataModel(createAddComponentToEAR());
-		model.setProperty(NESTED_ADD_COMPONENT_TO_EAR_DM, dm);
-		propertySet(CLASSPATH_SELECTION, null);
-		model.setProperty(NESTED_UPDATE_MANIFEST_DM, DataModelFactory.createDataModel(UpdateManifestDataModelProvider.class));
-		model.setProperty(USE_ANNOTATIONS, Boolean.FALSE);
-	}
-
-	public AddComponentToEnterpriseApplicationDataModelProvider createAddComponentToEAR() {
-		return new AddComponentToEnterpriseApplicationDataModelProvider();
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EAR_COMPONENT_NAME);
-		propertyNames.add(EAR_COMPONENT_DEPLOY_NAME);
-		propertyNames.add(ADD_TO_EAR);
-		propertyNames.add(UI_SHOW_EAR_SECTION);
-		propertyNames.add(DD_FOLDER);
-		propertyNames.add(COMPONENT_VERSION);
-		propertyNames.add(VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME);
-		propertyNames.add(NESTED_ADD_COMPONENT_TO_EAR_DM);
-		propertyNames.add(CLASSPATH_SELECTION);
-		propertyNames.add(NESTED_EAR_COMPONENT_CREATION_DM);
-		propertyNames.add(NESTED_UPDATE_MANIFEST_DM);
-		propertyNames.add(EAR_COMPONENT_PROJECT);
-		propertyNames.add(USE_ANNOTATIONS);
-		propertyNames.add(MODULE_URI);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(ADD_TO_EAR)) {
-			return Boolean.FALSE;
-		} else if (propertyName.equals(UI_SHOW_EAR_SECTION)) {
-			return Boolean.TRUE;
-		} else if (propertyName.equals(EAR_COMPONENT_NAME)) {
-			return getDataModel().getStringProperty(COMPONENT_NAME) + "EAR"; //$NON-NLS-1$
-		} else if (propertyName.equals(COMPONENT_VERSION)) {
-			return getDefaultComponentVersion();
-		} else if (propertyName.equals(NESTED_EAR_COMPONENT_CREATION_DM))
-			return getDefaultEarCreationDM();
-		return super.getDefaultProperty(propertyName);
-	}
-
-	private Object getDefaultEarCreationDM() {
-		if (earCreationDM == null) {
-			earCreationDM = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
-			setProperty(NESTED_EAR_COMPONENT_CREATION_DM, earCreationDM);
-		}
-		return earCreationDM;
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		if (EAR_COMPONENT_NAME.equals(propertyName)) {
-			return getBooleanProperty(ADD_TO_EAR);
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean status = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(EAR_COMPONENT_NAME)) {
-			model.setProperty(EAR_COMPONENT_DEPLOY_NAME, propertyValue);
-			IProject earProj = getEARProject();
-			IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-			earDM.setProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT, earProj);
-			model.setProperty(EAR_COMPONENT_PROJECT, earProj);
-
-		} else if (propertyName.equals(COMPONENT_NAME)) {
-
-			if (getBooleanProperty(ADD_TO_EAR)) {
-				if (!model.isPropertySet(EAR_COMPONENT_NAME)) {
-					model.notifyPropertyChange(EAR_COMPONENT_NAME, IDataModel.VALID_VALUES_CHG);
-					model.setProperty(EAR_COMPONENT_DEPLOY_NAME, getProperty(EAR_COMPONENT_NAME));
-					IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-					IProject earProject = getEARProject();
-					model.setProperty(EAR_COMPONENT_PROJECT, earProject);
-					if (earDM != null && earProject != null)
-						earDM.setProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT, earProject);
-				}
-			}
-		} else if (propertyName.equals(ADD_TO_EAR)) {
-			model.notifyPropertyChange(EAR_COMPONENT_NAME, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(NESTED_EAR_COMPONENT_CREATION_DM, IDataModel.DEFAULT_CHG);
-			IProject earProj = getEARProject();
-			model.setProperty(EAR_COMPONENT_PROJECT, earProj);
-			IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-			if (earDM != null && earProj != null) {
-				earDM.setProperty(IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT, earProj);
-				earDM.setProperty(COMPONENT_VERSION, new Integer(getJ2EEVersion()));
-			}
-
-		} else if (propertyName.equals(COMPONENT_VERSION)) {
-			if (getJ2EEVersion() < J2EEVersionConstants.VERSION_1_3)
-				setProperty(USE_ANNOTATIONS, Boolean.FALSE);
-			model.notifyPropertyChange(USE_ANNOTATIONS, DataModelEvent.ENABLE_CHG);
-			model.notifyPropertyChange(EAR_COMPONENT_NAME, DataModelEvent.VALID_VALUES_CHG);
-			if (getBooleanProperty(ADD_TO_EAR)) {
-				IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-				earDM.setProperty(COMPONENT_VERSION, new Integer(getJ2EEVersion()));
-			}
-			// this will force to reload all the server types which are valid for this component
-			// version
-			model.notifyPropertyChange(RUNTIME_TARGET_ID, DataModelEvent.VALID_VALUES_CHG);			
-		} else if (RUNTIME_TARGET_ID.equals(propertyName)) {
-			setProperty(ADD_TO_EAR, new Boolean(isEARSupported()));
-
-			IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-			earDM.setProperty(RUNTIME_TARGET_ID, propertyValue);
-		} 
-		return status;
-	}
-
-	protected IProject getEARProject() {
-		String earProjname = (String) model.getProperty(EAR_COMPONENT_NAME);
-		IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-		earDM.setProperty(IComponentCreationDataModelProperties.PROJECT_NAME, earProjname);
-
-		if (earProjname != null && !earProjname.equals("") && validate(EAR_COMPONENT_NAME).isOK()) //$NON-NLS-1$
-			return ProjectUtilities.getProject(earProjname);
-		return null;
-	}
-
-
-	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName){
-		if (propertyName.equals(RUNTIME_TARGET_ID)) {
-			String propertyValue =  (String)getProperty(propertyName);
-			if( propertyValue != null ){
-				IRuntime runtime = getServerTargetByID(propertyValue);
-				if( runtime != null )
-					return new DataModelPropertyDescriptor(propertyValue, runtime.getName());
-			}
-		}
-		return super.getPropertyDescriptor(propertyName);
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (propertyName.equals(COMPONENT_VERSION)) {
-			return getValidComponentVersionDescriptors();
-		}
-		if (propertyName.equals(EAR_COMPONENT_NAME)) {
-			int j2eeVersion = getJ2EEVersion();
-			return getEARPropertyDescriptor(j2eeVersion);
-		} else if (propertyName.equals(RUNTIME_TARGET_ID)) {
-			return validJ2EEServerPropertyDescriptors();
-		}
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	protected String isvalidJComponentVersionsSupportedByServer() {
-		String serverID = model.getStringProperty(RUNTIME_TARGET_ID);
-		IRuntime runtime = getServerTargetByID(serverID);
-
-		if (serverID.equals("") || runtime == null) { //$NON-NLS-1$
-			return MODULEVERSION_NOT_SUPPORTED;
-		}
-		Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
-		String j2eeVer = J2EEVersionUtil.convertVersionIntToString(version.intValue());
-		return isTypeSupported(runtime.getRuntimeType(), getJ2EEProjectType(), j2eeVer);
-	}
-	
-	protected abstract String getJ2EEProjectType();
-
-	protected DataModelPropertyDescriptor[] validJ2EEServerPropertyDescriptors() {
-
-		Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
-		//int j2eeversion = convertModuleVersionToJ2EEVersion(version.intValue());
-		String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString(version.intValue());
-
-		ArrayList validServers = new ArrayList();
-
-		IDataModel projectdm = model.getNestedModel(NESTED_PROJECT_CREATION_DM);
-		DataModelPropertyDescriptor[] desc = projectdm.getValidPropertyDescriptors(RUNTIME_TARGET_ID);
-		for (int i = 0; i < desc.length; i++) {
-			DataModelPropertyDescriptor descriptor = desc[i];
-			String runtimeid = (String) descriptor.getPropertyValue();
-			IRuntime runtime = getServerTargetByID(runtimeid);
-			String ok = isTypeSupported(runtime.getRuntimeType(), getJ2EEProjectType(), j2eeVersionText);
-			if (ok.equals(OK))
-				validServers.add(descriptor);
-		}
-
-		if (!validServers.isEmpty()) {
-			int serverTargetListSize = validServers.size();
-			DataModelPropertyDescriptor[] result = new DataModelPropertyDescriptor[serverTargetListSize];
-			for (int i = 0; i < validServers.size(); i++) {
-				result[i] = (DataModelPropertyDescriptor) validServers.get(i);
-			}
-			return result;
-		}
-		return new DataModelPropertyDescriptor[0];
-	}
-
-	protected IRuntime getServerTargetByID(String id) {
-		IRuntime[] targets = ServerUtil.getRuntimes("", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		for (int i = 0; i < targets.length; i++) {
-			IRuntime target = targets[i];
-			if (id.equals(target.getId()))
-				return target;
-		}
-		return null;
-	}
-
-//	private List getValidServerTargets() {
-//		List validServerTargets = null;
-//		validServerTargets = ServerTargetHelper.getServerTargets("", ""); //$NON-NLS-1$  //$NON-NLS-2$
-//		if (validServerTargets != null && validServerTargets.isEmpty())
-//			validServerTargets = null;
-//		if (validServerTargets == null)
-//			return Collections.EMPTY_LIST;
-//		return validServerTargets;
-//	}
-
-
-	protected String isTypeSupported(IRuntimeType type, String moduleID, String j2eeVersion) {
-		IModuleType[] moduleTypes = type.getModuleTypes();
-
-		boolean moduleFound = false;
-		boolean moduleVersionFound = false;
-
-		if (moduleTypes != null) {
-			int size = moduleTypes.length;
-
-			for (int i = 0; i < size; i++) {
-				IModuleType moduleType = moduleTypes[i];
-
-				if (matches(moduleType.getId(), moduleID)) {
-					moduleFound = true;
-					String version = moduleType.getVersion();
-					if (version.equals(j2eeVersion) || version.equals("*")) { //$NON-NLS-1$
-						moduleVersionFound = true;
-						return OK;
-					} 
-					if (i < size)
-						continue;
-				}
-			}
-		}
-		if (!moduleFound)
-			return MODULE_NOT_SUPPORTED;
-		if (!moduleVersionFound)
-			return MODULEVERSION_NOT_SUPPORTED;
-		return ""; //$NON-NLS-1$
-	}
-
-
-	protected static String[] getServerVersions(IRuntimeType type, String moduleID) {
-		List list = new ArrayList();
-		if (type == null)
-			return null;
-		IModuleType[] moduleTypes = type.getModuleTypes();
-		if (moduleTypes != null) {
-			int size = moduleTypes.length;
-			for (int i = 0; i < size; i++) {
-				IModuleType moduleType = moduleTypes[i];
-				if (matches(moduleType.getId(), moduleID)) {
-					list.add(moduleType.getVersion());
-				}
-
-			}
-		}
-		String[] versions = null;
-		if (!list.isEmpty()) {
-			versions = new String[list.size()];
-			list.toArray(versions);
-		}
-		return versions;
-	}
-
-	protected static boolean matches(String serverTypeID, String j2eeModuleID) {
-
-		if (serverTypeID.equals("jst") || serverTypeID.equals("jst.*")) //$NON-NLS-1$ //$NON-NLS-2$
-			return j2eeModuleID.equals(J2EEProjectUtilities.DYNAMIC_WEB) || j2eeModuleID.equals(J2EEProjectUtilities.EJB) || j2eeModuleID.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION) || j2eeModuleID.equals(J2EEProjectUtilities.APPLICATION_CLIENT) || j2eeModuleID.equals(J2EEProjectUtilities.JCA);
-		
-		else if (serverTypeID.equals(J2EEProjectUtilities.DYNAMIC_WEB))
-			return j2eeModuleID.equals(J2EEProjectUtilities.DYNAMIC_WEB);
-		
-		else if (serverTypeID.equals(J2EEProjectUtilities.EJB))
-			return j2eeModuleID.equals(J2EEProjectUtilities.EJB);
-		
-		else if (serverTypeID.equals(J2EEProjectUtilities.JCA))
-			return j2eeModuleID.equals(J2EEProjectUtilities.JCA);
-		
-		else if (serverTypeID.equals(J2EEProjectUtilities.APPLICATION_CLIENT))
-			return j2eeModuleID.equals(J2EEProjectUtilities.APPLICATION_CLIENT);
-		
-		else if (serverTypeID.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION)) 
-			return j2eeModuleID.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION) || j2eeModuleID.equals(J2EEProjectUtilities.APPLICATION_CLIENT) || j2eeModuleID.equals(J2EEProjectUtilities.JCA);
-			
-		return false;
-	}
-
-
-
-	private DataModelPropertyDescriptor[] getEARPropertyDescriptor(int j2eeVersion) {
-		StructureEdit mc = null;
-		ArrayList earDescriptorList = new ArrayList();
-
-		IProject[] projs = ProjectUtilities.getAllProjects();
-
-		for (int index = 0; index < projs.length; index++) {
-			IProject flexProject = projs[index];
-			try {
-				if (flexProject != null) {
-					if (ModuleCoreNature.isFlexibleProject(flexProject)) {
-						IVirtualComponent comp = ComponentCore.createComponent(flexProject);
-						if (J2EEProjectUtilities.isEARProject(comp.getProject())) {
-							String sVer = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
-							int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
-							if (j2eeVersion <= ver) {
-								DataModelPropertyDescriptor desc = new DataModelPropertyDescriptor(comp.getProject().getName());
-								earDescriptorList.add(desc);
-							}
-						}
-					}
-				}
-			} finally {
-				if (mc != null)
-					mc.dispose();
-			}
-		}
-		DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[earDescriptorList.size()];
-		for (int i = 0; i < descriptors.length; i++) {
-			DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor) earDescriptorList.get(i);
-			descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(), desc.getPropertyDescription());
-		}
-		return descriptors;
-	}
-
-
-
-	public IProject getProject() {
-		String projName = getDataModel().getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-		if (projName != null && projName.length() > 0)
-			return ProjectUtilities.getProject(projName);
-		return null;
-	}
-
-	public WorkbenchComponent getTargetWorkbenchComponent() {
-		StructureEdit core = null;
-		try {
-			IProject flexProject = getProject();
-			if (flexProject != null) {
-				core = StructureEdit.getStructureEditForRead(getProject());
-				if (core != null) {
-					String componentName = getProperty(COMPONENT_NAME) != null ? getProperty(COMPONENT_NAME).toString() : null;
-					if (componentName != null)
-						return core.getComponent();
-				}
-			}
-		} finally {
-			if (core != null)
-				core.dispose();
-		}
-		return null;
-	}
-
-	protected boolean isEARSupported() {
-		if (this instanceof EarComponentCreationDataModelProvider)
-			return false;
-		String serverID = model.getStringProperty(RUNTIME_TARGET_ID);
-		IRuntime runtime = getServerTargetByID(serverID);
-		Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
-		int nj2eeVer = convertModuleVersionToJ2EEVersion(version.intValue());
-		String j2eeVer = J2EEVersionUtil.getJ2EETextVersion(nj2eeVer);
-
-		if (runtime != null) {
-			String msg = isTypeSupported(runtime.getRuntimeType(), J2EEProjectUtilities.ENTERPRISE_APPLICATION, j2eeVer);
-			if (msg.equals(OK)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected boolean validateComponentAlreadyInEar() {
-		//IVirtualComponent component = ComponentCore.createComponent(getProject(), getModuleName());
-
-		IProject earProj = (IProject) model.getProperty(EAR_COMPONENT_PROJECT);
-		if (earProj != null && earProj.exists()) {
-			IVirtualComponent earComp = ComponentCore.createComponent(earProj);
-			if (earComp != null && earComp.exists()) {
-				IVirtualReference[] refs = earComp.getReferences();
-				for (int i = 0; i < refs.length; i++) {
-					IVirtualReference ref = refs[i];
-					IVirtualComponent referencedComp = ref.getReferencedComponent();
-					if (referencedComp.getName().equalsIgnoreCase(getModuleName()))
-						return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public IStatus validate(String propertyName) {
-		if (EAR_COMPONENT_NAME.equals(propertyName) && getBooleanProperty(ADD_TO_EAR)) {
-			return validateEARModuleNameProperty();
-		} else if (COMPONENT_VERSION.equals(propertyName)) {
-			return validateComponentVersionProperty();
-		} else if (propertyName.equals(VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME)) {
-			return OK_STATUS;
-		} else if (propertyName.equals(ADD_TO_EAR)) {
-			boolean val = getBooleanProperty(ADD_TO_EAR);
-			if (val) {
-				String serverID = model.getStringProperty(RUNTIME_TARGET_ID);
-				IRuntime runtime = getServerTargetByID(serverID);
-				if (serverID.equals("") || runtime == null) { //$NON-NLS-1$
-					String msg = EARCreationResourceHandler.SERVER_TARGET_NOT_SUPPORT_EAR;
-					return WTPCommonPlugin.createErrorStatus(msg);
-				}
-				Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
-				int nj2eeVer = convertModuleVersionToJ2EEVersion(version.intValue());
-				String j2eeVer = J2EEVersionUtil.getJ2EETextVersion(nj2eeVer);
-				String msg = isTypeSupported(runtime.getRuntimeType(), J2EEProjectUtilities.ENTERPRISE_APPLICATION, j2eeVer);
-				if (!msg.equals(OK)) {
-					msg = EARCreationResourceHandler.SERVER_TARGET_NOT_SUPPORT_EAR;
-					return WTPCommonPlugin.createErrorStatus(msg);
-				} 
-				if (validateComponentAlreadyInEar()) {
-						msg = J2EECreationResourceHandler.COMPONENT_ALREADYINEAR; 
-						return WTPCommonPlugin.createErrorStatus(msg);
-				}
-			}
-		} else if (propertyName.equals(PROJECT_NAME)) {
-			if (!isCreatingEarComponent()) {
-				String projName = getDataModel().getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-				IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);
-				IProject earProj = (IProject) earDM.getProperty(EAR_COMPONENT_PROJECT);
-				if (earProj != null) {
-					String earProjName = earProj.getName();
-					if (earProjName.equalsIgnoreCase(projName)) {
-						String msg = EARCreationResourceHandler.EAR_PROJECTNAME_SAMEAS_MODULE;
-						return WTPCommonPlugin.createErrorStatus(msg);
-					}
-				}
-			}
-		}
-		return super.validate(propertyName);
-	}
-
-	protected boolean isCreatingEarComponent() {
-		return false;
-	}
-
-	private IStatus validateComponentVersionProperty() {
-		int componentVersion = model.getIntProperty(COMPONENT_VERSION);
-		String result = isvalidJComponentVersionsSupportedByServer();
-		if (result.equals(MODULEVERSION_NOT_SUPPORTED)) {
-			return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SPEC_LEVEL_NOT_FOUND));
-		} else if (result.equals(MODULE_NOT_SUPPORTED)) {
-			return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_NOT_SUPPORTED));
-		}
-		if (componentVersion == -1)
-			return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SPEC_LEVEL_NOT_FOUND));
-		return OK_STATUS;
-	}
-
-	private IStatus validateEARModuleNameProperty() {
-		IStatus status = OK_STATUS;
-		String earName = getStringProperty(EAR_COMPONENT_NAME);
-		if (status.isOK()) {
-			if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS); 
-				return WTPCommonPlugin.createErrorStatus(errorMessage);
-			} else if (earName == null || earName.equals("")) { //$NON-NLS-1$
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
-				return WTPCommonPlugin.createErrorStatus(errorMessage);
-			}
-		} else
-			return status;
-		// IProject earProject =
-		// applicationCreationDataModel.getTargetProject();
-		// if (null != earProject && earProject.exists()) {
-		// if (earProject.isOpen()) {
-		// try {
-		// EARNatureRuntime earNature = (EARNatureRuntime)
-		// earProject.getNature(IEARNatureConstants.NATURE_ID);
-		// if (earNature == null) {
-		// return
-		// WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_NOT_EAR,
-		// new Object[]{earProject.getName()}));
-		// } else if (earNature.getJ2EEVersion() < getJ2EEVersion()) {
-		// String earVersion =
-		// EnterpriseApplicationCreationDataModel.getVersionString(earNature.getJ2EEVersion());
-		// return
-		// WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.INCOMPATABLE_J2EE_VERSIONS,
-		// new Object[]{earProject.getName(), earVersion}));
-		// }
-		// return OK_STATUS;
-		// } catch (CoreException e) {
-		// return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, -1, null, e);
-		// }
-		// }
-		// return
-		// WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_ClOSED,
-		// new Object[]{earProject.getName()}));
-		// } else if (null != earProject && null != getTargetProject()) {
-		// if (earProject.getName().equals(getTargetProject().getName())) {
-		// return
-		// WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME,
-		// new Object[]{earProject.getName()}));
-		// } else if (!CoreFileSystemLibrary.isCaseSensitive()) {
-		// if
-		// (earProject.getName().toLowerCase().equals(getTargetProject().getName().toLowerCase()))
-		// {
-		// return
-		// WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME,
-		// new Object[]{earProject.getName()}));
-		// }
-		// }
-		// }
-		// IStatus status =
-		// applicationCreationDataModel.validateProperty(EnterpriseApplicationCreationDataModel.PROJECT_NAME);
-		// if (status.isOK()) {
-		// status =
-		// applicationCreationDataModel.validateProperty(EnterpriseApplicationCreationDataModel.PROJECT_LOCATION);
-		// }
-		// return status;
-
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	public final ClassPathSelection getClassPathSelection() {
-		// boolean createNew = false;
-		// if (null == cachedSelection ||
-		// !getApplicationCreationDataModel().getTargetProject().getName().equals(cachedSelection.getEARFile().getURI()))
-		// {
-		// createNew = true;
-		// }
-		// // close an existing cachedSelection
-		// if (createNew && cachedSelection != null) {
-		// EARFile earFile = cachedSelection.getEARFile();
-		// if (earFile != null)
-		// earFile.close();
-		// }
-		//
-		// if (createNew && getTargetProject() != null) {
-		// cachedSelection =
-		// ClasspathSelectionHelper.createClasspathSelection(getTargetProject(),
-		// getModuleExtension(),
-		// getApplicationCreationDataModel().getTargetProject(),
-		// getModuleType());
-		// }
-		// return cachedSelection;
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	// public void propertyChanged(WTPOperationDataModelEvent event) {
-	// super.propertyChanged(event);
-	// if (event.getDataModel() == addComponentToEARDataModel && event.getFlag()
-	// == WTPOperationDataModelEvent.PROPERTY_CHG &&
-	// event.getPropertyName().equals(ArtifactEditOperationDataModel.PROJECT_NAME))
-	// {
-	// earComponentCreationDataModel.setProperty(EARComponentCreationDataModel.COMPONENT_NAME,
-	// event.getProperty());
-	// }
-	// }
-	protected final IDataModel getAddComponentToEARDataModel() {
-		// return (AddComponentToEnterpriseApplicationDataModel)
-		// model.getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
-		return (IDataModel) model.getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
-	}
-
-	protected final IDataModel getUpdateManifestDataModel() {
-		return (IDataModel) model.getProperty(NESTED_UPDATE_MANIFEST_DM);
-	}
-
-	public String getModuleName() {
-		return getDataModel().getStringProperty(COMPONENT_NAME);
-	}
-
-	public final int getJ2EEVersion() {
-		return convertModuleVersionToJ2EEVersion(getIntProperty(COMPONENT_VERSION));
-	}
-
-	/**
-	 * Subclasses should override to convert the j2eeVersion to a module version id. By default we
-	 * return the j2eeVersion which is fine if no conversion is necessary.
-	 * 
-	 * @param integer
-	 * @return
-	 */
-	protected Integer convertJ2EEVersionToModuleVersion(Integer j2eeVersion) {
-		return j2eeVersion;
-	}
-
-	protected abstract int convertModuleVersionToJ2EEVersion(int moduleVersion);
-
-	protected abstract DataModelPropertyDescriptor[] getValidComponentVersionDescriptors();
-
-
-//	private DataModelPropertyDescriptor[] validExistingProjectsDescriptors() {
-//
-//		IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
-//		List items = new ArrayList();
-//		for (int i = 0; i < workspaceProjects.length; i++) {
-//			IProject project = workspaceProjects[i];
-//			try {
-//				if (project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-//					items.add(project.getName());
-//				}
-//			} catch (CoreException ce) {
-//				// Ignore
-//			}
-//		}
-//
-//		DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[items.size()];
-//		for (int i = 0; i < descriptors.length; i++) {
-//			descriptors[i] = new DataModelPropertyDescriptor(items.get(i));
-//		}
-//		return descriptors;
-//
-//
-//		// StructureEdit mc = null;
-//		// ArrayList earDescriptorList = new ArrayList();
-//		//
-//		// IProject[] projs = ProjectUtilities.getAllProjects();
-//		//
-//		// for (int index = 0; index < projs.length; index++) {
-//		// IProject flexProject = projs[index];
-//		// try {
-//		// if (flexProject != null) {
-//		// IFlexibleProject fProject = ComponentCore.createFlexibleProject(flexProject);
-//		// if ( fProject.isFlexible()){
-//		// IVirtualComponent[] comps = fProject.getComponents();
-//		// int earVersion = 0;
-//		// for( int i=0; i< comps.length; i++ ){
-//		// if( comps[i].getComponentTypeId().equals(IModuleConstants.JST_EAR_MODULE)){
-//		// String sVer = comps[i].getVersion();
-//		// int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
-//		// if (j2eeVersion <= ver) {
-//		// DataModelPropertyDescriptor desc = new
-//		// DataModelPropertyDescriptor(comps[i].getComponentHandle(), comps[i].getName());
-//		// earDescriptorList.add(desc);
-//		// }
-//		// }
-//		// }
-//		// }
-//		// }
-//		// } finally {
-//		// if (mc != null)
-//		// mc.dispose();
-//		// }
-//		// }
-//		// DataModelPropertyDescriptor[] descriptors = new
-//		// DataModelPropertyDescriptor[earDescriptorList.size()];
-//		// for (int i = 0; i < descriptors.length; i++) {
-//		// DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor)earDescriptorList.get(i);
-//		// descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(),
-//		// desc.getPropertyDescription());
-//		// }
-//		// return descriptors;
-//
-//
-//	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentExportDataModelProvider.java
deleted file mode 100644
index b302081cc..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,18 +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.application.internal.operations;
-
-public abstract class J2EEComponentExportDataModelProvider extends J2EEArtifactExportDataModelProvider {
-
-    public J2EEComponentExportDataModelProvider() {
-        super();
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentImportDataModelProvider.java
deleted file mode 100644
index 2a96de9d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,59 +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.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-
-/**
- * This dataModel is a common super class used to import J2EE Modules.
- * 
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- * 
- * @plannedfor WTP 1.0
- */
-public abstract class J2EEComponentImportDataModelProvider extends J2EEArtifactImportDataModelProvider implements IJ2EEModuleImportDataModelProperties {
-
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EXTENDED_IMPORT_FACTORY);
-		return propertyNames;
-	}
-
-	protected int getModuleSpecVersion() {
-		if (!isPropertySet(EXTENDED_IMPORT_FACTORY)) {
-			return ArchiveUtil.getFastSpecVersion(getModuleFile());
-		}
-		ExtendedImportFactory factory = (ExtendedImportFactory) getProperty(EXTENDED_IMPORT_FACTORY);
-		return factory.getSpecVersion(getModuleFile());
-	}
-
-//	public boolean propertySet(String propertyName, Object propertyValue) {
-//		boolean set = super.propertySet(propertyName, propertyValue);
-//		if (propertyName.equals(FILE)) {
-//			IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
-//			if (getModuleFile() != null) {
-//				moduleDM.setIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION, getModuleSpecVersion());
-//				model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-//			}
-//		}
-//		return set;
-//	}
-
-	protected ModuleFile getModuleFile() {
-		return (ModuleFile) getArchiveFile();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportAssistantOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportAssistantOperation.java
deleted file mode 100644
index 6b8889cf8..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportAssistantOperation.java
+++ /dev/null
@@ -1,195 +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.application.internal.operations;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IPathVariableManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-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.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class J2EEUtilityJarImportAssistantOperation extends AbstractOperation {
-
-	private File utilityJar;
-
-	private boolean overwriteIfNecessary = false;
-	private String associatedEARProjectName;
-
-	public J2EEUtilityJarImportAssistantOperation(String label, File utilityJar) {
-		super(label);
-		this.utilityJar = utilityJar;
-	}
-
-	public void setAssociatedEARProjectName(String associatedEARProjectName) {
-		this.associatedEARProjectName = associatedEARProjectName;
-	}
-
-
-	public void setOverwriteIfNecessary(boolean overwriteProject) {
-		this.overwriteIfNecessary = overwriteProject;
-	}
-
-	protected final void createLinkedPathVariable(String linkedPathVariable, File archiveFile) throws CoreException {
-		IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-		IPath linkedPath = new Path(archiveFile.getAbsolutePath());
-		manager.setValue(linkedPathVariable, linkedPath);
-
-	}
-
-	protected final String getUtilityJarProjectName(File utilityJar) {
-		String name = null;
-		if (utilityJar != null) {
-			int len = utilityJar.getName().lastIndexOf('.');
-			name = utilityJar.getName().substring(0, len);
-		}
-		return name;
-	} 
-
-	protected final IStatus linkArchiveToEAR(IProject earProject, String uriMapping, IProject utilityProject, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, ExecutionException {
-		IDataModel addArchiveProjectToEARDataModel = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
-
-		IVirtualComponent earcomponent = ComponentCore.createComponent(earProject);
-		IVirtualComponent utilcomponent = ComponentCore.createComponent(utilityProject);
-
-		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earcomponent);
-		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Collections.singletonList(utilcomponent));
-		Map uriMap = new HashMap();
-		uriMap.put(utilcomponent, uriMapping);
-		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
-		return addArchiveProjectToEARDataModel.getDefaultOperation().execute(monitor, null);
-	}
-
-	protected final IStatus createVirtualArchiveComponent(IProject targetProject, String uriMapping, IFile utilityJarIFile, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, ExecutionException {
-		IDataModel addArchiveProjectToEARDataModel = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
-
-		IVirtualComponent earcomponent = ComponentCore.createComponent(targetProject);
-
-		IVirtualComponent utilcomponent = ComponentCore.createArchiveComponent(targetProject, VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR + utilityJarIFile.getProjectRelativePath().toString());
-
-		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earcomponent);
-		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Collections.singletonList(utilcomponent));
-		Map uriMap = new HashMap();
-		uriMap.put(utilcomponent, uriMapping);
-		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
-		return  addArchiveProjectToEARDataModel.getDefaultOperation().execute(monitor, null);
-	}
-	
-
-	protected final IStatus removeRootMapping(IVirtualComponent sourceComponent, String uriMapping, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, ExecutionException {
-
-		try {
-			sourceComponent.getRootFolder().removeLink(new Path(uriMapping), 0, monitor);
-		} catch (CoreException e) { 
-			return J2EEPlugin.createErrorStatus(0, e.getMessage(), e);
-		}
-		return Status.OK_STATUS;
-	}	
-
-	protected File getUtilityJar() {
-		return utilityJar;
-	}
-
-	protected final IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-
-
-	protected final String getAssociatedEARProjectName() {
-		return associatedEARProjectName;
-	}
-
-	protected final boolean isOverwriteIfNecessary() {
-		return overwriteIfNecessary;
-	}
- 
-	protected final void addLibraryToClasspath(IProject associatedEARProject, IFile copiedJarFile, IProgressMonitor monitor) throws CoreException, JavaModelException {
-		if (associatedEARProject.hasNature(JavaCore.NATURE_ID)) {
-
-			IClasspathEntry entry = JavaCore.newLibraryEntry(copiedJarFile.getFullPath().makeAbsolute(), null, // source
-																												// attachment
-						null, // source attachment root
-						new IAccessRule[0], // accessRules
-						new IClasspathAttribute[0], // extraAttributes
-						false); // isExported
-
-			IJavaProject earJavaProject = JavaCore.create(associatedEARProject);
-			IClasspathEntry[] rawClasspath = earJavaProject.getRawClasspath();
-			IClasspathEntry[] newClasspath = new IClasspathEntry[rawClasspath.length + 1];
-			System.arraycopy(rawClasspath, 0, newClasspath, 0, rawClasspath.length);
-			newClasspath[rawClasspath.length] = entry;
-			earJavaProject.setRawClasspath(newClasspath, monitor);
-
-		}
-	}
-	
-    protected final IStatus createLinkedArchive(IProject project, String linkedFileName, File archiveFile, String linkedPathVariable, IProgressMonitor monitor) throws CoreException {
-        IFile linkedJarFile = null; 
-        IPath pathToArchive = getLinkedPath(archiveFile, linkedPathVariable);
-
-        linkedJarFile = project.getFile(linkedFileName);
-        if (linkedJarFile.exists()) {
-            if (isOverwriteIfNecessary())
-                linkedJarFile.delete(true, true, new SubProgressMonitor(monitor, 1));
-            else
-                return J2EEPlugin.createErrorStatus(0, NLS.bind(EARCreationResourceHandler.CreateProjectWithLinkedJarOperation_File_already_exists_0_, linkedJarFile.getFullPath()), null);
-        }
-        linkedJarFile.createLink(pathToArchive, IResource.ALLOW_MISSING_LOCAL, new SubProgressMonitor(monitor, 1));
-
-        addLibraryToClasspath(project, linkedJarFile, monitor);
-        return Status.OK_STATUS;
-    } 
-
-    protected final IPath getLinkedPath(File archiveFile, String linkedPathVariable) throws CoreException {        
-
-        if (linkedPathVariable == null || linkedPathVariable.length() == 0)
-            return new Path(archiveFile.getAbsolutePath());
-        else {
-            createLinkedPathVariable(linkedPathVariable, archiveFile.getParentFile());
-            return new Path(linkedPathVariable).append(archiveFile.getName());
-        }
-    } 
-    
-    protected final String findUniqueLocation(String baseLocation, String proposedProjectName) { 
-    	
-    	return baseLocation != null ? (baseLocation + File.separator + proposedProjectName) : null;
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java
deleted file mode 100644
index 3061c2ec2..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java
+++ /dev/null
@@ -1,59 +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 Dec 15, 2003
- * 
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaUtilityJarImportDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public final class J2EEUtilityJarImportDataModelProvider extends J2EEArtifactImportDataModelProvider implements IJavaUtilityJarImportDataModelProperties {
-
-	public static String J2EE_UTILITY_JAR_IMPORT_DMP_ID = "j2eeUtilityJarImportDataModelProvider";
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EAR_PROJECT_NAME);
-		return propertyNames;
-	}
-
-	protected Archive openArchive(String uri) throws OpenFailureException {
-		return null;
-	}
-
-	protected int getType() {
-		return 0;
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new J2EEUtilityJarImportOperationNew(model);
-	}
-
-	protected IDataModel createJ2EEComponentCreationDataModel() {
-		return DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-	}
-
-	public String getID() {
-
-		return J2EE_UTILITY_JAR_IMPORT_DMP_ID;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperationNew.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperationNew.java
deleted file mode 100644
index b384b3c2f..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperationNew.java
+++ /dev/null
@@ -1,36 +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.application.internal.operations;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEJavaComponentSaveStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEUtilityJarImportOperationNew extends J2EEArtifactImportOperation {
-
-	public J2EEUtilityJarImportOperationNew(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	protected SaveStrategy createSaveStrategy(IVirtualComponent virtualComponent) {
-		J2EEJavaComponentSaveStrategyImpl saveStrat = new J2EEJavaComponentSaveStrategyImpl(virtualComponent);
-		return saveStrat;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModelProvider.java
deleted file mode 100644
index b151a5cd1..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModelProvider.java
+++ /dev/null
@@ -1,348 +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.application.internal.operations;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IPathVariableManager;
-import org.eclipse.core.resources.IProject;
-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.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.project.facet.EARFacetUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author mdelder
- *  
- */
-public class J2EEUtilityJarListImportDataModelProvider extends AbstractDataModelProvider implements IJ2EEUtilityJarListImportDataModelProperties {
-
-
-
-	private static final Object[] EMPTY_ARRAY = new Object[0];
-
-	public J2EEUtilityJarListImportDataModelProvider() {
-		super();
-	}
-
-	public Set getPropertyNames(){
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(EAR_PROJECT_NAME);
-		propertyNames.add(CREATE_PROJECT);
-		propertyNames.add(LINK_IMPORT);
-		propertyNames.add(CREATE_LINKED_PROJECT);
-		propertyNames.add(COPY);
-		propertyNames.add(BINARY_IMPORT);
-		propertyNames.add(UTILITY_JAR_LIST);
-		propertyNames.add(AVAILABLE_JARS_DIRECTORY);
-		propertyNames.add(PROJECT_ROOT);
-		propertyNames.add(OVERRIDE_PROJECT_ROOT);
-		propertyNames.add(OVERWRITE_IF_NECESSARY);
-		propertyNames.add(CREATE_LINKED_PATH_VARIABLE);
-		propertyNames.add(LINKED_PATH_VARIABLE);
-		return propertyNames;
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-
-		boolean notify = super.propertySet(propertyName, propertyValue);
-
-		if (AVAILABLE_JARS_DIRECTORY.equals(propertyName)) {
-			setProperty(UTILITY_JAR_LIST, EMPTY_ARRAY);
-		} else if (UTILITY_JAR_LIST.equals(propertyName)) {
-			if (propertyValue == null)
-				setProperty(UTILITY_JAR_LIST, EMPTY_ARRAY);
-			else
-				model.setProperty(UTILITY_JAR_LIST, propertyValue);
-
-		} else if (PROJECT_ROOT.equals(propertyName)) {
-			if (propertyValue == null || ((String) propertyValue).length() == 0)
-				setBooleanProperty(OVERRIDE_PROJECT_ROOT, false);
-			else
-				setBooleanProperty(OVERRIDE_PROJECT_ROOT, true);
-
-		} else if (J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT)) {
-
-			setBooleanProperty(LINK_IMPORT, false);
-			setBooleanProperty(CREATE_LINKED_PROJECT, false);
-			setBooleanProperty(COPY, false);
-
-			model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
-		} else if (J2EEUtilityJarListImportDataModelProvider.LINK_IMPORT.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.LINK_IMPORT)) {
-
-			setBooleanProperty(CREATE_PROJECT, false);
-			setBooleanProperty(CREATE_LINKED_PROJECT, false);
-			setBooleanProperty(COPY, false);
-
-			model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
-		} else if (J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT)) {
-
-			setBooleanProperty(LINK_IMPORT, false);
-			setBooleanProperty(CREATE_PROJECT, false);
-			setBooleanProperty(COPY, false);
-
-			model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
-		} else if (J2EEUtilityJarListImportDataModelProvider.COPY.equals(propertyName) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.COPY)) {
-
-			setBooleanProperty(CREATE_PROJECT, false);
-			setBooleanProperty(LINK_IMPORT, false);
-			setBooleanProperty(CREATE_LINKED_PROJECT, false);
-
-			model.notifyPropertyChange(BINARY_IMPORT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(OVERRIDE_PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(CREATE_LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-
-
-		} else if (J2EEUtilityJarListImportDataModelProvider.OVERRIDE_PROJECT_ROOT.equals(propertyName)) {
-			model.notifyPropertyChange(PROJECT_ROOT, IDataModel.ENABLE_CHG);
-		} else if (J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE.equals(propertyName)) {
-
-			if (isLinkedPathVariableInvalid())
-				setProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE, "TEAM_SHARED_DIRECTORY"); //$NON-NLS-1$
-
-			model.notifyPropertyChange(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE, IDataModel.ENABLE_CHG);
-			model.notifyPropertyChange(AVAILABLE_JARS_DIRECTORY, IDataModel.ENABLE_CHG);
-
-		} else if (J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE.equals(propertyName)) {
-			// will only set if necessary
-			setProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE, Boolean.TRUE);
-
-			if (linkedPathExists()) {
-				String linkedPathVariable = getStringProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE);
-				IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-				IPath availableJarsPath = manager.getValue(linkedPathVariable);
-				setProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE, Boolean.valueOf(availableJarsPath != null));
-
-				String availableJarsPathString = availableJarsPath.toOSString();
-				if (availableJarsPathString != null && availableJarsPathString.length() > 0)
-					setProperty(J2EEUtilityJarListImportDataModelProvider.AVAILABLE_JARS_DIRECTORY, availableJarsPathString);
-			}
-
-			model.notifyPropertyChange(AVAILABLE_JARS_DIRECTORY, IDataModel.ENABLE_CHG);
-		}
-		return notify;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#basicIsEnabled(java.lang.String)
-	 */
-	public boolean isPropertyEnabled(String propertyName) {
-		if (J2EEUtilityJarListImportDataModelProvider.BINARY_IMPORT.equals(propertyName)) {
-			return getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT);
-		} else if (J2EEUtilityJarListImportDataModelProvider.OVERRIDE_PROJECT_ROOT.equals(propertyName)) {
-			return getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT);
-		} else if (J2EEUtilityJarListImportDataModelProvider.PROJECT_ROOT.equals(propertyName)) {
-			return (getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_PROJECT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT)) && getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.OVERRIDE_PROJECT_ROOT);
-		} else if (J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE.equals(propertyName)) {
-			return (getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.LINK_IMPORT) || getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PROJECT));
-		} else if (J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE.equals(propertyName)) {
-			return getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE);
-		} else if (J2EEUtilityJarListImportDataModelProvider.AVAILABLE_JARS_DIRECTORY.equals(propertyName)) {
-			boolean createPath = getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE);
-			return !createPath || !linkedPathExists();
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-
-	private boolean linkedPathExists() {
-		String linkedPathVariable = getStringProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE);
-		if (linkedPathVariable == null || linkedPathVariable.trim().length() == 0)
-			return false;
-
-		IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-		IPath availableJarsPath = manager.getValue(linkedPathVariable);
-		return availableJarsPath != null;
-	}
-
-	private boolean isLinkedPathVariableInvalid() {
-		boolean createPath = getBooleanProperty(J2EEUtilityJarListImportDataModelProvider.CREATE_LINKED_PATH_VARIABLE);
-		String linkedPathVariable = getStringProperty(J2EEUtilityJarListImportDataModelProvider.LINKED_PATH_VARIABLE);
-		return (createPath && (linkedPathVariable == null || linkedPathVariable.trim().length() == 0));
-	}
-	
-	public IDataModelOperation getDefaultOperation() { 
-		return new J2EEUtilityJarListImportOperation(model);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEImportDataModel#getDefaultProperty(java.lang.String)
-	 */
-	public Object getDefaultProperty(String propertyName) {
-		if (CREATE_PROJECT.equals(propertyName))
-			return Boolean.TRUE;
-		else if (LINK_IMPORT.equals(propertyName))
-			return Boolean.FALSE;
-		else if (COPY.equals(propertyName))
-			return Boolean.FALSE;
-		else if (CREATE_LINKED_PROJECT.equals(propertyName))
-			return Boolean.FALSE;
-		else if (CREATE_LINKED_PATH_VARIABLE.equals(propertyName))
-			return Boolean.FALSE;
-		else if (OVERRIDE_PROJECT_ROOT.equals(propertyName))
-			return Boolean.FALSE;
-		else if (BINARY_IMPORT.equals(propertyName))
-			return Boolean.FALSE;
-		else if (PROJECT_ROOT.equals(propertyName))
-			return ResourcesPlugin.getWorkspace().getRoot().getRawLocation().toOSString();
-		else if (EAR_PROJECT_NAME.equals(propertyName))
-			return ""; //$NON-NLS-1$
-		else if (AVAILABLE_JARS_DIRECTORY.equals(propertyName))
-			return ""; //$NON-NLS-1$
-		else if (LINKED_PATH_VARIABLE.equals(propertyName))
-			return ""; //$NON-NLS-1$
-		else if (UTILITY_JAR_LIST.equals(propertyName))
-			return EMPTY_ARRAY;
-		else
-			return super.getDefaultProperty(propertyName);
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (EAR_PROJECT_NAME.equals(propertyName)) {
-			return DataModelPropertyDescriptor.createDescriptors(getValidProjectNames());
-		} else if (LINKED_PATH_VARIABLE.equals(propertyName)) {
-			IPathVariableManager manager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-			return DataModelPropertyDescriptor.createDescriptors(manager.getPathVariableNames());
-		} else
-			return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	/**
-	 * Populate the resource name combo with connector projects that are not encrypted.
-	 */
-	protected Object[] getValidProjectNames() {
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		List projectsWithNature = new ArrayList();
- 
-		IFacetedProject facetedProject = null;
-		for (int i = 0; i < projects.length; i++) { 
-			if(projects[i].isAccessible()) {
-				try {
-					facetedProject = ProjectFacetsManager.create(projects[i]);
-				if (facetedProject!=null && facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET)) {
-					projectsWithNature.add(projects[i].getFullPath().toString());
-				}
-				} catch (CoreException e) {
-					J2EEPlugin.logError(0, e.getMessage(), e);
-				} 
-			}
-		}
-
-		return ProjectUtilities.getProjectNamesWithoutForwardSlash((String[]) projectsWithNature.toArray(new String[projectsWithNature.size()]));
-	}
-
-	public IStatus validate(String propertyName) {
-		if (EAR_PROJECT_NAME.equals(propertyName) /* && isSet(EAR_PROJECT_NAME) */) {
-			String earProjectName = getStringProperty(EAR_PROJECT_NAME);
-			if (earProjectName != null && earProjectName.length() > 0) {
-				IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName);
-				try {
-					if (!earProject.isAccessible())
-						return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Valid_Project, null); 
-					return Status.OK_STATUS;
-				} catch (Exception e) {
-					return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Valid_Project, e); 
-				}
-			}
-			return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Valid_Project, null); 
-
-		} else if (UTILITY_JAR_LIST.equals(propertyName) || J2EEUtilityJarListImportDataModelProvider.OVERWRITE_IF_NECESSARY.equals(propertyName)) {
-
-			Object[] list = (Object[]) getProperty(UTILITY_JAR_LIST);
-			if (list == null || list.length == 0)
-				return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Select_Jar, null); 
-
-			/* return validateExistingProjects(); */
-
-			return Status.OK_STATUS;
-		} else if (LINKED_PATH_VARIABLE.equals(propertyName)) {
-			if (isLinkedPathVariableInvalid())
-				return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Specify_Linked_Path, null);
-			else if (linkedPathExists()) 
-				return new Status(IStatus.INFO, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_Linked_Path_Exists, null);
-		} else if (PROJECT_ROOT.equals(propertyName)) {
-			return validateProjectRoot();
-		} 
-		return super.validate(propertyName);
-	}
-
-	private IStatus validateProjectRoot() {
-		if (isPropertySet(PROJECT_ROOT) && getBooleanProperty(OVERRIDE_PROJECT_ROOT)) {
-			String loc = (String) getProperty(PROJECT_ROOT);
-			File file = new File(loc);
-			if (!file.canWrite() || !file.isDirectory())
-				return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportDataModel_0, null); 
-		}
-		return OK_STATUS;
-	}
-
-	// private IStatus validateExistingProjects() {
-	// boolean createProject = (getBooleanProperty(J2EEUtilityJarListImportDataModel.CREATE_PROJECT)
-	// || getBooleanProperty(J2EEUtilityJarListImportDataModel.CREATE_LINKED_PROJECT));
-	// boolean overwrite =
-	// getBooleanProperty(J2EEUtilityJarListImportDataModel.OVERWRITE_IF_NECESSARY);
-	// if (createProject && !overwrite) {
-	// File jarFile = null;
-	// String nameWithoutJar = null;
-	// Object[] selectedJars = (Object[]) getProperty(UTILITY_JAR_LIST);
-	// for (int i = 0; i < selectedJars.length; i++) {
-	// jarFile = (File) selectedJars[i];
-	// int start = jarFile.getName().indexOf(".jar");
-	// nameWithoutJar = jarFile.getName().substring(0, start);
-	// if (ProjectUtilities.getProject(nameWithoutJar).exists())
-	// return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, 0, "Existing projects with the derived
-	// names already exist (\"{0}\").", null); // {0}
-	// // nameWithoutJar
-	//
-	// }
-	// }
-	// return Status.OK_STATUS;
-	// }
-	
-	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportOperation.java
deleted file mode 100644
index df8e061ee..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportOperation.java
+++ /dev/null
@@ -1,145 +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.application.internal.operations;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class J2EEUtilityJarListImportOperation extends AbstractDataModelOperation implements IUndoableOperation {
-
-	private static final int ASSISTANT_TICKS = 5;
-
-	public J2EEUtilityJarListImportOperation(IDataModel model) { 
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-		MultiStatus status = new MultiStatus(J2EEPlugin.PLUGIN_ID, 0, EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_Import_Utility_Jars, null);  
-			
-		Object[] utilityJars = (Object[]) model.getProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST);
-		if (utilityJars == null || utilityJars.length == 0)
-			return J2EEPlugin.createErrorStatus(0, EARCreationResourceHandler.J2EEUtilityJarListImportOperation_There_were_no_utility_jars_selected, null);
-
-		monitor.beginTask(EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_Import_Utility_Jars, utilityJars.length * (1 + ASSISTANT_TICKS)); //$NON-NLS-1$
-
-//		String earProjectName = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME);
-//		boolean isBinary = model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.BINARY_IMPORT);
-		
-		// if model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.COPY) then
-		// isLinked = createProject = false;
-		boolean toLinkImportedJars = shouldLinkImportedJars();
-		boolean toCreateProject = shouldCreateProject();
-		boolean toOverrideProjectRoot = shouldOverrideProjectRoot();  
-		boolean toOverwriteIfNecessary = shouldOverwriteIfNecessary();
-		
-		
-		String projectRoot = null;		
-		if(toOverrideProjectRoot)
-			projectRoot = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT);
-		
-		monitor.subTask(EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_Preparing_to_import); //$NON-NLS-1$
-
-		String associatedEARProjectName = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME);		
-		
-		J2EEUtilityJarImportAssistantOperation assistantOperation = null;
-		List utilityJarOperations = new ArrayList();
-		File utilityJar = null;
-		String linkedPathVariable = null; 
-		if(model.isPropertySet(IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE))
-			linkedPathVariable = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE);
-		for (int i = 0; i < utilityJars.length && !monitor.isCanceled(); i++) {
-			utilityJar = (File) utilityJars[i];
-			if (toCreateProject) { 
-				if (!toLinkImportedJars) {
-					assistantOperation = new CreateProjectWithExtractedJarOperation(utilityJar, projectRoot); 
-				 
-				} else {
-					assistantOperation = new CreateProjectWithLinkedJarOperation(utilityJar, projectRoot, linkedPathVariable);
-					
-				} 
-			} else { 
-				if (!toLinkImportedJars) {
-					assistantOperation = new CopyArchiveIntoProjectOperation(utilityJar);
-				} else
-					assistantOperation = new LinkArchiveIntoProjectOperation(utilityJar, linkedPathVariable);
-			} 
-			assistantOperation.setAssociatedEARProjectName(associatedEARProjectName); 
-			assistantOperation.setOverwriteIfNecessary(toOverwriteIfNecessary);
-			utilityJarOperations.add(assistantOperation);
-
-			monitor.worked(1);
-		}
-		
-		for (Iterator iter = utilityJarOperations.iterator(); iter.hasNext() && !monitor.isCanceled();) {
-			try {
-				assistantOperation = (J2EEUtilityJarImportAssistantOperation) iter.next();
-				IProgressMonitor submonitor = new SubProgressMonitor(monitor, ASSISTANT_TICKS);
-				assistantOperation.execute(submonitor, null);
-				submonitor.done();
-			} catch (Exception e) {
-				status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-				J2EEPlugin.logError(0, e.getMessage(), e);
-			} 
-		} 
-		
-		monitor.done();
-		
-		return status;
-	}
- 
-	private boolean shouldOverwriteIfNecessary() {
-		return model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY);
-	}
-
-	protected final boolean shouldImportAsBinary() {
-		return model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.BINARY_IMPORT);
-	}
-
-	protected final boolean shouldOverrideProjectRoot() {
-		return model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.OVERRIDE_PROJECT_ROOT);
-	}
- 
-	protected final  boolean shouldCreateProject() {
-		return (model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.CREATE_PROJECT) || model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PROJECT));
-	}
- 
-	protected final  boolean shouldLinkImportedJars() {
-		return (model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.LINK_IMPORT) || model.getBooleanProperty(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PROJECT));
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-
- 
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/LinkArchiveIntoProjectOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/LinkArchiveIntoProjectOperation.java
deleted file mode 100644
index 1ae71e6ef..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/LinkArchiveIntoProjectOperation.java
+++ /dev/null
@@ -1,78 +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.application.internal.operations;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-
-public class LinkArchiveIntoProjectOperation extends J2EEUtilityJarImportAssistantOperation {
-
-
-	private String linkedPathVariable;
-
-	public LinkArchiveIntoProjectOperation(File utilityJar, String linkedPathVariable) {
-		super(NLS.bind(EARCreationResourceHandler.LinkArchiveIntoProjectOperation_Linking_archive_into_selected_proje_, utilityJar.getName()), utilityJar);
-		this.linkedPathVariable = linkedPathVariable;
-
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		MultiStatus status = new MultiStatus(J2EEPlugin.PLUGIN_ID, 0, NLS.bind(EARCreationResourceHandler.LinkArchiveIntoProjectOperation_Linking_archive_into_selected_proje_, getUtilityJar().getName()), null);
-
-		IProject project = getWorkspaceRoot().getProject(getAssociatedEARProjectName());
-
-		try {
-			IFile linkedJarFile = project.getFile(getUtilityJar().getName());
-			if (linkedJarFile.exists()) {
-				if (isOverwriteIfNecessary())
-					linkedJarFile.delete(true, true, new SubProgressMonitor(monitor, 1));
-				else {
-					status.add(J2EEPlugin.createErrorStatus(0, NLS.bind(EARCreationResourceHandler.CreateProjectWithLinkedJarOperation_File_already_exists_0_, linkedJarFile.getFullPath()), null));
-					return status;
-				}
-			}
-			status.add(createLinkedArchive(project, getUtilityJar().getName(), getUtilityJar(), linkedPathVariable, monitor));
-
-			addLibraryToClasspath(project, linkedJarFile, monitor);
-			
-			createVirtualArchiveComponent(project, getUtilityJar().getName(), linkedJarFile, monitor);
-
-		} catch (CoreException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-		} catch (InvocationTargetException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-		} catch (InterruptedException e) {
-			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
-		}
-		return status;
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		return Status.CANCEL_STATUS;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationDataModelProvider.java
deleted file mode 100644
index 137156296..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationDataModelProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class RemoveComponentFromEnterpriseApplicationDataModelProvider extends RemoveReferenceComponentsDataModelProvider implements IAddComponentToEnterpriseApplicationDataModelProperties {
-
-	public RemoveComponentFromEnterpriseApplicationDataModelProvider() {
-		super();
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new RemoveComponentFromEnterpriseApplicationOperation(model);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
deleted file mode 100644
index c90763a5a..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class RemoveComponentFromEnterpriseApplicationOperation extends RemoveReferenceComponentOperation {
-
-
-	public RemoveComponentFromEnterpriseApplicationOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		try {
-			J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
-			updateEARDD(monitor);
-			super.execute(monitor, info);
-			return OK_STATUS;
-		} finally {
-			J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
-		}
-	}
-
-	protected void updateEARDD(IProgressMonitor monitor) {
-		EARArtifactEdit earEdit = null;
-		try {
-			IVirtualComponent comp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
-			if (!comp.getProject().isAccessible())
-				return;
-			J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(comp.getProject());
-			earEdit = EARArtifactEdit.getEARArtifactEditForWrite(comp.getProject());
-			if (earEdit != null) {
-				Application application = earEdit.getApplication();
-				List list = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-				if (list != null && list.size() > 0) {
-					for (int i = 0; i < list.size(); i++) {
-						IVirtualComponent wc = (IVirtualComponent) list.get(i);
-						String moduleURI = getModuleURI(earEdit, wc);
-						removeModule(application, moduleURI); 
-						IVirtualFile vFile = comp.getRootFolder().getFile(moduleURI);
-						IFile iFile = vFile.getUnderlyingFile();
-						if(iFile.exists()){
-							iFile.delete(true, monitor);
-						}
-					}
-				}
-			}
-			earEdit.saveIfNecessary(monitor);
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (earEdit != null)
-				earEdit.dispose();
-		}
-	}
-	
-	protected String getModuleURI(final EARArtifactEdit earEdit, final IVirtualComponent targetComponent) {
-		return earEdit.getModuleURI(targetComponent);
-	}
-
-	protected void removeModule(final Application application, final String moduleURI) {
-		Module module = application.getFirstModule(moduleURI);
-		application.getModules().remove(module);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProperties.java
deleted file mode 100644
index 36573c508..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProperties.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-public interface UpdateManifestDataModelProperties {
-	/**
-	 * Project name with manifest to update, type String required.
-	 */
-	public static final String PROJECT_NAME = "UpdateManifestDataModel.PROJECT_NAME"; //$NON-NLS-1$
-
-	/**
-	 * java.util.List of Strings
-	 */
-	public static final String JAR_LIST = "UpdateManifestDataModel.CLASSPATH_LIST"; //$NON-NLS-1$
-
-	/**
-	 * String. This is build from the JAR_LIST property. Never set this property.
-	 */
-	public static final String JAR_LIST_TEXT_UI = "UpdateManifestDataModel.CLASSPATH_LIST_TEXT_UI"; //$NON-NLS-1$
-
-	/**
-	 * Boolean, true merges, false replaces, default is true
-	 */
-	public static final String MERGE = "UpdateManifestDataModel.MERGE"; //$NON-NLS-1$
-
-	/**
-	 * String, no default.
-	 */
-	public static final String MAIN_CLASS = "UpdateManifestDataModel.MAIN_CLASS"; //$NON-NLS-1$
-	
-		
-	/**
-	 * String, no default.
-	 */
-	public static final String MANIFEST_FILE = "UpdateManifestDataModel.MANIFEST_FILE"; //$NON-NLS-1$	
-	
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProvider.java
deleted file mode 100644
index 5a7c6116b..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModelProvider.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
- *******************************************************************************/
-/*
- * Created on Nov 13, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class UpdateManifestDataModelProvider extends AbstractDataModelProvider implements UpdateManifestDataModelProperties {
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		propertyNames.add(JAR_LIST);
-		propertyNames.add(JAR_LIST_TEXT_UI);
-		propertyNames.add(MERGE);
-		propertyNames.add(MAIN_CLASS);
-		propertyNames.add(MANIFEST_FILE);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(MERGE)) {
-			return Boolean.TRUE;
-		} else if (propertyName.equals(JAR_LIST)) {
-			return new ArrayList();
-		} else if (propertyName.equals(JAR_LIST_TEXT_UI)) {
-			return getClasspathAsString();
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean set = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(JAR_LIST) && isPropertySet(JAR_LIST_TEXT_UI))
-			setProperty(JAR_LIST_TEXT_UI, getClasspathAsString());
-		return set;
-	}
-
-	public IProject getProject() {
-		String projectName = (String) getProperty(PROJECT_NAME);
-		return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-	}
-
-	public String getClasspathAsString() {
-		List classpathList = (List) getProperty(JAR_LIST);
-		return convertClasspathListToString(classpathList);
-	}
-
-	public static String convertClasspathListToString(List list) {
-		String classpathString = ""; //$NON-NLS-1$
-		for (int i = 0; i < list.size(); i++) {
-			classpathString += ((String) list.get(i)) + " "; //$NON-NLS-1$
-		}
-		return classpathString.trim();
-	}
-
-	public static List convertClasspathStringToList(String string) {
-		List list = new ArrayList();
-		StringTokenizer tokenizer = new StringTokenizer(string, " "); //$NON-NLS-1$
-		while (tokenizer.hasMoreTokens()) {
-			list.add(tokenizer.nextToken());
-		}
-		return list;
-	}
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new UpdateManifestOperation(model);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java
deleted file mode 100644
index 7c1ff049e..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java
+++ /dev/null
@@ -1,79 +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 Nov 13, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-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.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class UpdateManifestOperation extends AbstractDataModelOperation {
-
-	public UpdateManifestOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) throws ExecutionException {
-		IFile file = (IFile)model.getProperty(UpdateManifestDataModelProperties.MANIFEST_FILE);
-		
-		String classPathValue = model.getStringProperty(UpdateManifestDataModelProperties.JAR_LIST_TEXT_UI);
-		try {
-			ArchiveManifest mf = J2EEProjectUtilities.readManifest(file);
-			
-			if (mf == null)
-				mf = new ArchiveManifestImpl();
-			mf.addVersionIfNecessary();
-			if (model.getBooleanProperty(UpdateManifestDataModelProperties.MERGE)) {
-				mf.mergeClassPath(ArchiveUtil.getTokens(classPathValue));
-			} else {
-				mf.setClassPath(classPathValue);
-			}
-			if (model.isPropertySet(UpdateManifestDataModelProperties.MAIN_CLASS)) {
-				mf.setMainClass(model.getStringProperty(UpdateManifestDataModelProperties.MAIN_CLASS));
-			}
-
-			J2EEProjectUtilities.writeManifest(file, mf);
-		} catch (java.io.IOException ex) {
-			throw new ExecutionException(ex.getMessage(),ex);
-		}
-		return OK_STATUS;
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateModuleContextRootInEAROp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateModuleContextRootInEAROp.java
deleted file mode 100644
index cf16b571d..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateModuleContextRootInEAROp.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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 impl
- *******************************************************************************/
-package org.eclipse.jst.j2ee.application.internal.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <code>AbstractDataModelOperation</code> subclass that updates the context-root for a given
- * module within the application.xml files of all containing EARs.
- */
-public class UpdateModuleContextRootInEAROp extends AbstractDataModelOperation implements IUpdateModuleContextRootProperties {
-	
-	public UpdateModuleContextRootInEAROp() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
-        if(monitor != null) {
-            monitor.beginTask("", 1);
-        }
-        
-        try {
-        	final String newContextRoot = model.getStringProperty(CONTEXT_ROOT);
-        	final IProject project = (IProject) model.getProperty(PROJECT);
-        	final IDataModel nestedModel = model.getNestedModel(NESTED_MODEL_ID);
-        	if (nestedModel != null) {
-            	List earsToUpdate= (List) nestedModel.getProperty(EARS_TO_UPDATE);
-            	if (newContextRoot != null && earsToUpdate != null && project != null) {
-            		// update each specified EAR
-            		for (int i = 0; i < earsToUpdate.size(); i++) {
-            			updateEARContextRoot((IProject) earsToUpdate.get(i), project, newContextRoot, monitor);
-            		}
-            	}
-        	}
-        } catch (Exception e) {
-			Logger.getLogger().logError(e);
-        } finally {
-            if (monitor != null) {
-                monitor.done();
-            }
-        }
-		return OK_STATUS;
-	}
-	
-	/*
-	 * Updates the context-root element int the application.xml of the specified EAR for the specified
-	 * module project to the new value. 
-	 */
-	private void updateEARContextRoot(final IProject ear, final IProject project, final String newContextRoot,
-			final IProgressMonitor monitor) {
-		EARArtifactEdit earEdit = null;
-		try {
-			earEdit = EARArtifactEdit.getEARArtifactEditForWrite(ear);
-			if (earEdit != null) {
-				final Application application = earEdit.getApplication();
-				final IVirtualComponent comp = ComponentCore.createComponent(project);
-				if (comp == null) {
-					return;
-				}
-				final String moduleURI = earEdit.getModuleURI(comp);
-				final Module module = application.getFirstModule(moduleURI);
-				if (module != null && module instanceof WebModule) {
-					((WebModule) module).setContextRoot(newContextRoot);
-				}
-				earEdit.saveIfNecessary(monitor);
-			}
-		} finally {
-			if (earEdit != null) {
-				earEdit.dispose();
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// no-op
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// no-op
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
deleted file mode 100644
index ad7eab8e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ /dev/null
@@ -1,630 +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.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.EARComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-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.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * <p>
- * EARArtifactEdit obtains an {@see org.eclipse.jst.j2ee.application.Application}&nbsp;metamodel.
- * The {@see org.eclipse.jst.j2ee.application.ApplicationResource}&nbsp; which stores the metamodel
- * is retrieved from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}&nbsp;using a
- * cached constant (@see
- * org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants#APPLICATION_DD_URI). The
- * defined methods extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-
-public class EARArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-
-	public static final Class ADAPTER_TYPE = EARArtifactEdit.class;
-	
-	private static final IVirtualReference[] NO_REFERENCES = new IVirtualReference[0];
-
-	/**
-	 * 
-	 */
-	public EARArtifactEdit() {
-		super();
-	}
-
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public EARArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-
-	// This should be revereted to protected when 115924 is fixed
-	public EARArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.ENTERPRISE_APPLICATION);
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 */
-	public static EARArtifactEdit getEARArtifactEditForRead(IProject aProject) {
-		EARArtifactEdit artifactEdit = null;
-		try {
-			if (isValidEARModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new EARArtifactEdit(aProject, true, false);
-		} catch (Exception iae) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
-	 * must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>The following method may return null. </b>
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static EARArtifactEdit getEARArtifactEditForWrite(IProject aProject) {
-		EARArtifactEdit artifactEdit = null;
-		try {
-			if (isValidEARModule(ComponentCore.createComponent(aProject)))
-				artifactEdit = new EARArtifactEdit(aProject, false, false);
-		} catch (Exception iae) {
-			artifactEdit = null;
-		}
-		return artifactEdit;
-	}
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of EARArtifactEdit that are returned through this
-	 * method must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an EARArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will not be used for editing. Invocations of any save*() API on an instance returned from
-	 * this method will throw exceptions.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of EARArtifactEdit that may only be used to read the underlying content
-	 *         model
-	 * @throws UnresolveableURIException
-	 *             could not resolve uri.
-	 */
-	public static EARArtifactEdit getEARArtifactEditForRead(IVirtualComponent aModule) {
-		if (aModule == null)
-			return null;
-		return getEARArtifactEditForRead(aModule.getProject());
-	}
-
-
-	/**
-	 * <p>
-	 * Returns an instance facade to manage the underlying edit model for the given
-	 * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this
-	 * method must be {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Use to acquire an EARArtifactEdit facade for a specific {@see WorkbenchComponent}&nbsp;that
-	 * will be used for editing.
-	 * </p>
-	 * <p>
-	 * <b>This method may return null. </b>
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aModule
-	 *            A valid {@see WorkbenchComponent}&nbsp;with a handle that resolves to an
-	 *            accessible project in the workspace
-	 * @return An instance of EARArtifactEdit that may be used to modify and persist changes to the
-	 *         underlying content model
-	 */
-	public static EARArtifactEdit getEARArtifactEditForWrite(IVirtualComponent aModule) {
-		if (aModule == null)
-			return null;
-		return getEARArtifactEditForWrite(aModule.getProject());
-	}
-
-	/**
-	 * @param module
-	 *            A {@see WorkbenchComponent}
-	 * @return True if the supplied module
-	 *         {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
-	 *         a JST module
-	 */
-	public static boolean isValidEARModule(IVirtualComponent aModule) throws UnresolveableURIException {
-		if (!isValidEditableModule(aModule))
-			return false;
-		return J2EEProjectUtilities.isEARProject(aModule.getProject());
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 */
-	public EARArtifactEdit(ArtifactEditModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}pointing to a module from the given
-	 *            {@see ModuleCoreNature}
-	 */
-
-
-	protected EARArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from ApplicationResource.
-	 * </p>
-	 * 
-	 * @return an integer representation of a J2EE Spec version
-	 * 
-	 */
-	public int getJ2EEVersion() {
-		return getApplicationXmiResource().getJ2EEVersionID();
-	}
-
-	/**
-	 * 
-	 * @return ApplicationResource from (@link getDeploymentDescriptorResource())
-	 * 
-	 */
-
-	public ApplicationResource getApplicationXmiResource() {
-		return (ApplicationResource) getDeploymentDescriptorResource();
-	}
-
-	/**
-	 * <p>
-	 * Obtains the Application {@see Application}root object from the {@see ApplicationResource},
-	 * the root object contains all other resource defined objects.
-	 * </p>
-	 * 
-	 * @return Application
-	 * 
-	 */
-
-	public Application getApplication() {
-		return (Application) getDeploymentDescriptorRoot();
-	}
-
-	/**
-	 * <p>
-	 * Retrieves the resource from the {@see ArtifactEditModel}
-	 * </p>
-	 * 
-	 * @return Resource
-	 * 
-	 */
-
-	public Resource getDeploymentDescriptorResource() {
-		return getArtifactEditModel().getResource(J2EEConstants.APPLICATION_DD_URI_OBJ);
-	}
-
-
-	/**
-	 * <p>
-	 * Creates a deployment descriptor root object (Application) and populates with data. Adds the
-	 * root object to the deployment descriptor resource.
-	 * </p>
-	 * 
-	 * <p>
-	 * 
-	 * @param aModule
-	 *            A non-null pointing to a {@see XMLResource}
-	 * @param version
-	 *            Version to be set on resource....if null default is taken
-	 * 
-	 * Note: This method is typically used for JUNIT - move?
-	 * </p>
-	 */
-	protected void addApplicationIfNecessary(XMLResource aResource) {
-		if (aResource != null) {
-			if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
-				Application newApp = ApplicationFactory.eINSTANCE.createApplication();
-				aResource.getContents().add(newApp);
-			}
-			Application application = (Application) aResource.getContents().get(0);
-			URI moduleURI = getArtifactEditModel().getModuleURI();
-			try {
-				application.setDisplayName(StructureEdit.getDeployedName(moduleURI));
-			} catch (UnresolveableURIException e) {
-				// Ignore
-			}
-			aResource.setID(application, J2EEConstants.APPL_ID);
-			// TODO add more mandatory elements
-		}
-	}
-
-	/**
-	 * Checks if the uri mapping already exists.
-	 * 
-	 * @param String
-	 *            currentURI - The current uri of the module.
-	 * @return boolean
-	 */
-	public boolean uriExists(String currentURI) {
-		StructureEdit edit = null;
-		try {
-			edit = StructureEdit.getStructureEditForRead(getProject());
-			if (edit!=null && edit.getComponent()!=null) {
-				List referencedComps = edit.getComponent().getReferencedComponents();
-				for (int i=0; i<referencedComps.size(); i++) {
-					ReferencedComponent ref = (ReferencedComponent) referencedComps.get(i);
-					Object module = ref.getDependentObject();
-					if (module!=null && module instanceof Module) {
-						String existingURI = ((Module)module).getUri();
-						if (existingURI!=null && existingURI.equals(currentURI))
-							return true;
-					}
-				}
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
-	 */
-	public EObject createModelRoot() {
-		return createModelRoot(getJ2EEVersion());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
-	 */
-	public EObject createModelRoot(int version) {
-		ApplicationResource res = (ApplicationResource) getDeploymentDescriptorResource();
-		res.setModuleVersionID(version);
-		addApplicationIfNecessary(res);
-		return ((ApplicationResource) getDeploymentDescriptorResource()).getRootObject();
-	}
-
-	/**
-	 * This method will return the list of IVirtualReferences for all of the utility modules
-	 * contained in the EAR application
-	 * 
-	 * @return - an array of IVirtualReferences for utility modules in the EAR
-	 */
-	public IVirtualReference[] getUtilityModuleReferences() {  
-		
-		List explicitUtilityReferences = 
-			getComponentReferencesAsList(Collections.singletonList(J2EEProjectUtilities.UTILITY));
-		
-		// fetch other Utility Jars attached to the EAR project 
-		List implicitUtilityReferenceTypes =
-			Arrays.asList(new String[] {  IModuleConstants.JST_APPCLIENT_MODULE, 
-										   IModuleConstants.JST_WEB_MODULE,  
-										   IModuleConstants.JST_EJB_MODULE }); 
-
-		List implicitUtilityReferences = 
-			getComponentReferencesAsList(implicitUtilityReferenceTypes);
-		
-		
-		Application application = getApplication();
-		Module module = null;
-		IVirtualReference reference = null;
-		for (Iterator referenceItr = implicitUtilityReferences.iterator(); referenceItr.hasNext(); ) {
-			reference = (IVirtualReference) referenceItr.next();
-			module = application.getFirstModule(reference.getArchiveName());
-			if(module != null) 
-				referenceItr.remove(); 
-		}
-		
-		List allUtilityModuleReferences = new ArrayList();
-		allUtilityModuleReferences.addAll(explicitUtilityReferences);
-		allUtilityModuleReferences.addAll(implicitUtilityReferences);
-		
-		if(allUtilityModuleReferences.size() > 0)
-			return (IVirtualReference[]) allUtilityModuleReferences.toArray(new IVirtualReference[allUtilityModuleReferences.size()]);
-		return NO_REFERENCES;
-		
-	}
-
-	public String getModuleURI(IVirtualComponent moduleComp) {
-		IVirtualReference [] refs = getComponent().getReferences();
-		for(int i=0; i<refs.length; i++){
-			if(refs[i].getReferencedComponent().equals(moduleComp)){
-				return refs[i].getArchiveName();
-			}
-		}
-		return null;		
-	}
-
-	private String getJarURI(final ReferencedComponent ref, final IVirtualComponent moduleComp) {
-		String uri =  ref.getArchiveName();
-		if( uri == null || uri.length() < 0 ){
-			uri = moduleComp.getName()+IJ2EEModuleConstants.JAR_EXT;
-		}else{
-			String prefix = ref.getRuntimePath().makeRelative().toString();
-			if(prefix.length() > 0){
-				uri = prefix + "/" + uri; //$NON-NLS-1$
-			}
-		}
-		return uri;
-	}
-	
-	public IVirtualComponent getModuleByManifestURI(final String uri) {
-		IVirtualComponent earComponent = ComponentCore.createComponent(getProject());
-		IVirtualReference [] refs = earComponent.getReferences();
-
-		for(int i=0;i<refs.length; i++){
-			if(refs[i].getArchiveName().equals(uri)){
-				return refs[i].getReferencedComponent();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This method will return the an IVirtualComponent for the given module name. The method take
-	 * either moduleName or moduleName + ".module_extension" (module_extension = ".jar" || ".war" ||
-	 * ".rar") which allows users to get a IVirtualComponent for a given entry in an application.xml
-	 * 
-	 * @return - a IVirtualComponent for module name
-	 */
-	public IVirtualComponent getModule(String moduleName) {
-		if (moduleName == null)
-			return null;
-		if (moduleName.endsWith(IJ2EEModuleConstants.JAR_EXT) || moduleName.endsWith(IJ2EEModuleConstants.WAR_EXT) || moduleName.endsWith(IJ2EEModuleConstants.RAR_EXT))
-			moduleName = moduleName.substring(0, (moduleName.length() - IJ2EEModuleConstants.JAR_EXT.length()));
-		IVirtualReference[] references = getComponentReferences();
-		for (int i = 0; i < references.length; i++) {
-			IVirtualComponent component = references[i].getReferencedComponent();
-			if (component.getName().equals(moduleName)) {
-				return component;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This method will return the list of IVirtualReferences for the J2EE module components
-	 * contained in this EAR application.
-	 * 
-	 * @return - an array of IVirtualReferences for J2EE modules in the EAR
-	 */
-	public IVirtualReference[] getJ2EEModuleReferences() {
-		List j2eeTypes = new ArrayList();
-		j2eeTypes.add(J2EEProjectUtilities.APPLICATION_CLIENT);
-		j2eeTypes.add(J2EEProjectUtilities.JCA);
-		j2eeTypes.add(J2EEProjectUtilities.EJB);
-		j2eeTypes.add(J2EEProjectUtilities.DYNAMIC_WEB);
-		return getComponentReferences(j2eeTypes);
-	}
-
-	/**
-	 * This method will return the list of IVirtualReferences for all of the components contained in
-	 * this EAR application.
-	 * 
-	 * @return - an array of IVirtualReferences for components in the EAR
-	 */
-	public IVirtualReference[] getComponentReferences() {
-		return getComponentReferences(Collections.EMPTY_LIST);
-	}
-
-	/**
-	 * This method will return the IVirtualReference to the component of the given name
-	 * 
-	 * @return - IVirtualReference or null if not found
-	 */
-	public IVirtualReference getComponentReference(String componentName) {
-		IVirtualReference[] refs = getComponentReferences(Collections.EMPTY_LIST);
-		for (int i = 0; i < refs.length; i++) {
-			IVirtualReference reference = refs[i];
-			if (reference.getReferencedComponent().getName().equals(componentName))
-				return reference;
-
-		}
-		return null;
-	}
-
-	private IVirtualReference[] getComponentReferences(List componentTypes) {
-		List components = getComponentReferencesAsList(componentTypes);
-		if(components.size() > 0)
-			return (IVirtualReference[]) components.toArray(new IVirtualReference[components.size()]);
-		return NO_REFERENCES;
-	} 
-	
-	/**
-	 * 
-	 * @param componentTypes
-	 * @return A List of {@link IVirtualReference}s.
-	 */
-	private List getComponentReferencesAsList(List componentTypes) {
-		List components = new ArrayList();
-		IVirtualComponent earComponent = getComponent();
-		if (earComponent != null && J2EEProjectUtilities.isEARProject(earComponent.getProject())) {
-			IVirtualReference[] refComponents = earComponent.getReferences();
-			for (int i = 0; i < refComponents.length; i++) {
-				IVirtualComponent module = refComponents[i].getReferencedComponent();
-				if (module == null)
-					continue;
-				// if component types passed in is null then return all components
-				if (componentTypes == null || componentTypes.size() == 0)
-					components.add(refComponents[i]);
-				else {
-					if (componentTypes.contains(J2EEProjectUtilities.getJ2EEComponentType(module))) {
-						components.add(refComponents[i]);
-					}
-				}
-			}
-		}
-		return components;
-	}
-
-	public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
-
-		return getEARArtifactEditForRead(aComponent);
-	}
-
-	public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
-
-		return getEARArtifactEditForWrite(aComponent);
-	}
-
-	public Archive asArchive(boolean includeSource) throws OpenFailureException {
-		EARComponentLoadStrategyImpl loader = new EARComponentLoadStrategyImpl(getComponent());
-		loader.setExportSource(includeSource);
-		String uri = ModuleURIUtil.getHandleString(getComponent());
-		return CommonarchiveFactory.eINSTANCE.openEARFile(loader, uri);
-	}
-
-	public static void createDeploymentDescriptor(IProject project, int version) {
-		EARArtifactEdit earEdit = new EARArtifactEdit(project, false, true);
-		try {
-			earEdit.createModelRoot(version);
-			earEdit.save(null);
-		} finally {
-			earEdit.dispose();
-		}
-	}
-
-	/**
-	 * This method will return the context root in this application for the passed in web project.
-	 * 
-	 * @param webProject
-	 * @return contextRoot String
-	 */
-	public String getWebContextRoot(IProject webProject) {
-		if (webProject == null || !J2EEProjectUtilities.isDynamicWebProject(webProject))
-			return null;
-		IVirtualComponent webComp = ComponentCore.createComponent(webProject);
-		String webModuleURI = getModuleURI(webComp);
-		if (webModuleURI != null) {
-			WebModule webModule = (WebModule) getApplication().getModule(webModuleURI, null);
-			if (webModule != null)
-				return webModule.getContextRoot();
-		}
-		return null;
-	}
-
-	/**
-	 * This method will set the context root on the application for the passed in contextRoot. This
-	 * must be called in a write artifact edit and be saved for changes to be saved.
-	 * 
-	 * @param webProject
-	 * @param aContextRoot
-	 */
-	public void setWebContextRoot(IProject webProject, String aContextRoot) {
-		if (webProject == null || !J2EEProjectUtilities.isDynamicWebProject(webProject))
-			return;
-		IVirtualComponent webComp = ComponentCore.createComponent(webProject);
-		String webModuleURI = getModuleURI(webComp);
-		if (webModuleURI != null) {
-			WebModule webModule = (WebModule) getApplication().getModule(webModuleURI, null);
-			if (webModule != null)
-				webModule.setContextRoot(aContextRoot);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
deleted file mode 100644
index 1bac55444..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
+++ /dev/null
@@ -1,208 +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.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
-import org.eclipse.wst.common.componentcore.internal.util.IComponentImplFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-public class EARVirtualComponent extends VirtualComponent implements IComponentImplFactory {
-	
-	/**
-	 * @deprecated
-	 * @return
-	 * @see DoNotUseMeThisWillBeDeletedPost15
-	 */
-	protected IVirtualFolder defaultRootFolder;
-	
-	public EARVirtualComponent() {
-		super();
-	}
-
-	public EARVirtualComponent(IProject aProject, IPath aRuntimePath) {
-		super(aProject, aRuntimePath);
-		defaultRootFolder = new VirtualFolder(aProject, new Path("/")); //$NON-NLS-1$
-	}
-
-	public IVirtualComponent createArchiveComponent(IProject aProject, String archiveLocation, IPath aRuntimePath) {
-		return new J2EEModuleVirtualArchiveComponent(aProject, archiveLocation, aRuntimePath);
-	}
-	
-	public IVirtualComponent createComponent(IProject aProject) {
-		return new EARVirtualComponent(aProject, new Path("/")); //$NON-NLS-1$
-	}
-	
-	public IVirtualFolder createFolder(IProject aProject, IPath aRuntimePath) {
-		return new EARVirtualRootFolder(aProject, aRuntimePath);
-	}
-
-	private static String getJarURI(final ReferencedComponent ref, final IVirtualComponent moduleComp) {
-		String uri = ref.getArchiveName();
-		if (uri == null || uri.length() < 0) {
-			if(moduleComp.isBinary()){
-				uri = new Path(moduleComp.getName()).lastSegment();
-			} else {
-				uri = moduleComp.getName() + IJ2EEModuleConstants.JAR_EXT;
-			}
-		} else {
-			String prefix = ref.getRuntimePath().makeRelative().toString();
-			if (prefix.length() > 0) {
-				uri = prefix + "/" + uri; //$NON-NLS-1$
-			}
-		}
-		return uri;
-	}
-
-	private static List getHardReferences(IVirtualComponent earComponent) {
-		StructureEdit core = null;
-		List hardReferences = new ArrayList();
-		try {
-			core = StructureEdit.getStructureEditForRead(earComponent.getProject());
-			if (core != null && core.getComponent() != null) {
-				WorkbenchComponent component = core.getComponent();
-				if (component != null) {
-					List referencedComponents = component.getReferencedComponents();
-					for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) {
-						ReferencedComponent referencedComponent = (ReferencedComponent) iter.next();
-						if (referencedComponent == null)
-							continue;
-						IVirtualReference vReference = StructureEdit.createVirtualReference(earComponent, referencedComponent);
-						if (vReference != null) {
-							IVirtualComponent referencedIVirtualComponent = vReference.getReferencedComponent();
-							if (referencedIVirtualComponent != null && referencedIVirtualComponent.exists()) {
-								String archiveName = null;
-								if (referencedComponent.getDependentObject() != null) {
-									archiveName = ((Module) referencedComponent.getDependentObject()).getUri();
-								} else {
-									if (referencedIVirtualComponent.isBinary()) {
-										archiveName = getJarURI(referencedComponent, referencedIVirtualComponent);
-									} else {
-										IProject referencedProject = referencedIVirtualComponent.getProject();
-										// If dependent object is not set, assume
-										// compname is module name + proper
-										// extension
-										if (J2EEProjectUtilities.isDynamicWebProject(referencedProject) || J2EEProjectUtilities.isStaticWebProject(referencedProject)) {
-											archiveName = referencedIVirtualComponent.getName() + IJ2EEModuleConstants.WAR_EXT;
-										} else if (J2EEProjectUtilities.isJCAProject(referencedProject)) {
-											archiveName = referencedIVirtualComponent.getName() + IJ2EEModuleConstants.RAR_EXT;
-										} else if (J2EEProjectUtilities.isUtilityProject(referencedProject)) {
-											archiveName = getJarURI(referencedComponent, referencedIVirtualComponent);
-										} else {
-											archiveName = referencedIVirtualComponent.getName() + IJ2EEModuleConstants.JAR_EXT;
-										}
-									}
-								}
-								vReference.setArchiveName(archiveName);
-								hardReferences.add(vReference);
-							}
-						}
-					}
-				}
-			}
-		} finally {
-			if (core != null)
-				core.dispose();
-		}
-		return hardReferences;
-	}
-
-	/**
-	 * Returns the resulting list of referenced components based off the hard references and archives mapping to the root folder.
-	 * 
-	 * @param earComponent
-	 * @param hardReferences
-	 * @param membersToIgnore
-	 * @return
-	 */
-	private static List getLooseArchiveReferences(EARVirtualComponent earComponent, List hardReferences) {
-		return  getLooseArchiveReferences(earComponent, hardReferences, null, (EARVirtualRootFolder)earComponent.getRootFolder());
-	}
-	
-	private static List getLooseArchiveReferences(EARVirtualComponent earComponent, List hardReferences, List dynamicReferences, EARVirtualRootFolder folder) {
-		try {
-			IVirtualResource[] members = folder.superMembers();
-			for (int i = 0; i < members.length; i++) {
-				if (IVirtualResource.FILE == members[i].getType()) {
-					if(folder.isDynamicComponent((IVirtualFile)members[i])){
-						String archiveName = members[i].getRuntimePath().toString().substring(1);
-						boolean shouldInclude = true;
-						for (int j = 0; j < hardReferences.size() && shouldInclude; j++) {
-							String tempArchiveName = ((IVirtualReference) hardReferences.get(j)).getArchiveName();
-							if (null != tempArchiveName && tempArchiveName.equals(archiveName)) {
-								shouldInclude = false;
-							}
-						}
-						if (shouldInclude) {
-							IResource iResource = members[i].getUnderlyingResource();
-							IVirtualComponent dynamicComponent = ComponentCore.createArchiveComponent(earComponent.getProject(), VirtualArchiveComponent.LIBARCHIVETYPE + iResource.getFullPath().toString());
-							IVirtualReference dynamicRef = ComponentCore.createReference(earComponent, dynamicComponent);
-							dynamicRef.setArchiveName(archiveName);
-							if (null == dynamicReferences) {
-								dynamicReferences = new ArrayList();
-							}
-							dynamicReferences.add(dynamicRef);
-						}
-					}
-				} else if(IVirtualResource.FOLDER == members[i].getType()){
-					dynamicReferences = getLooseArchiveReferences(earComponent, hardReferences, dynamicReferences, (EARVirtualRootFolder)members[i]);
-				}
-			}
-		} catch (CoreException e) {
-			Logger.getLogger().logError(e);
-		}
-		return dynamicReferences;
-	}
-
-	public IVirtualReference[] getReferences() {
-		List hardReferences = getHardReferences(this);
-		List dynamicReferences = getLooseArchiveReferences(this, hardReferences);
-
-		if (dynamicReferences != null) {
-			hardReferences.addAll(dynamicReferences);
-		}
-
-		return (IVirtualReference[]) hardReferences.toArray(new IVirtualReference[hardReferences.size()]);
-	}
-
-	/**
-	 * @deprecated
-	 * @return
-	 * @see DoNotUseMeThisWillBeDeletedPost15
-	 */
-	public IVirtualFolder getDefaultRootFolder() {
-		return defaultRootFolder;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualRootFolder.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualRootFolder.java
deleted file mode 100644
index 56a7e3a2b..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualRootFolder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.jst.j2ee.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-//TODO this should be renamed to EARVirtualFolder because it is not used only for the root.
-public class EARVirtualRootFolder extends VirtualFolder {
-
-	public EARVirtualRootFolder(IProject aComponentProject, IPath aRuntimePath) {
-		super(aComponentProject, aRuntimePath);
-	}
-
-	public static String [] EXTENSIONS_TO_IGNORE = new String [] {".jar", ".zip", ".rar", ".war" };
-	
-	public IVirtualResource[] superMembers() throws CoreException {
-		return superMembers(IResource.NONE);
-	}
-	
-	public IVirtualResource[] superMembers(int memberFlags) throws CoreException {
-		return super.members(memberFlags);
-	}
-	
-	public boolean isDynamicComponent(IVirtualFile vFile){
-		String archiveName = vFile.getName();
-		for(int j = 0; j<EXTENSIONS_TO_IGNORE.length; j++){
-			if(J2EEComponentClasspathUpdater.endsWithIgnoreCase(archiveName, EXTENSIONS_TO_IGNORE[j])){
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * For now, just rip out files with .jar, .rar, or .war file extensions, because these are
-	 * the only files automatically added dyamically
-	 */
-	public IVirtualResource[] members(int memberFlags) throws CoreException {
-		IVirtualResource[] members = superMembers(memberFlags);
-		List virtualResources = new ArrayList();
-		boolean shouldAdd = true;
-		for (int i = 0; i < members.length; i++) {
-			shouldAdd = true;
-			if (IVirtualResource.FILE == members[i].getType()) {
-				if(isDynamicComponent((IVirtualFile)members[i])){
-					shouldAdd = false;
-				}
-			}
-			if (shouldAdd) {
-				virtualResources.add(members[i]);
-			}
-		}
-		return (IVirtualResource[]) virtualResources
-				.toArray(new IVirtualResource[virtualResources.size()]);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/package.xml
deleted file mode 100644
index aec496d4e..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-    <head>
-        <meta
-            name="root"
-            content="../../../../../../../" />
-        <title>EJBArtifactEdit api overview</title>
-    </head>
-
-    <body>  
-		<abstract>
-        This package includes the EARArtifactEdit api. This api is used to work with the emf model
-        of a flexible EAR module. It contains api to read and serialize out the emf model for enterprise applications.
-		</abstract>
-
-	<a href="#top">top</a>
-    </body>
-</html>    
-    
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java
deleted file mode 100644
index f9ef5e227..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,423 +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.earcreation;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.DefaultJ2EEComponentCreationOperation;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-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.frameworks.datamodel.AbstractDataModelProvider;
-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.internal.WTPPlugin;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class DefaultJ2EEComponentCreationDataModelProvider extends AbstractDataModelProvider implements IDefaultJ2EEComponentCreationDataModelProperties {
-	private static String CREATE_BASE = "DefaultJ2EEComponentCreationDataModel.CREATE_"; //$NON-NLS-1$
-
-	private static final int EJB = 0;
-	private static final int WEB = 1;
-	private static final int RAR = 2;
-	private static final int CLIENT = 3;
-
-	private static final String WEB_SUFFIX = "Web"; //$NON-NLS-1$
-	private static final String EJB_SUFFIX = "EJB"; //$NON-NLS-1$
-	private static final String CLIENT_SUFFIX = "Client"; //$NON-NLS-1$
-	private static final String CONNECTOR_SUFFIX = "Connector"; //$NON-NLS-1$
-
-	private IDataModel ejbModel;
-	private IDataModel ejbFacetModel;
-	private IDataModel webModel;
-	private IDataModel webFacetModel;
-	private IDataModel jcaModel;
-	private IDataModel jcaFacetModel;
-	private IDataModel clientModel;
-	private IDataModel clientFacetModel;
-
-	public DefaultJ2EEComponentCreationDataModelProvider() {
-		super();
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		propertyNames.add(EAR_COMPONENT_NAME);
-		propertyNames.add(APPCLIENT_COMPONENT_NAME);
-		propertyNames.add(WEB_COMPONENT_NAME);
-		propertyNames.add(EJB_COMPONENT_NAME);
-		propertyNames.add(CONNECTOR_COMPONENT_NAME);
-		propertyNames.add(J2EE_VERSION);
-		propertyNames.add(CREATE_EJB);
-		propertyNames.add(CREATE_WEB);
-		propertyNames.add(CREATE_APPCLIENT);
-		propertyNames.add(CREATE_CONNECTOR);
-		propertyNames.add(MODULE_NAME_COLLISIONS_VALIDATION);
-		propertyNames.add(ENABLED);
-		propertyNames.add(NESTED_MODEL_CLIENT);
-		propertyNames.add(NESTED_MODEL_EJB);
-		propertyNames.add(NESTED_MODEL_JCA);
-		propertyNames.add(NESTED_MODEL_WEB);
-		propertyNames.add(FACET_RUNTIME);
-		return propertyNames;
-	}
-
-
-	public IDataModelOperation getDefaultOperation() {
-		return new DefaultJ2EEComponentCreationOperation(model);
-	}
-
-	public void init() {
-		initNestedCreationModels();
-		super.init();
-	}
-
-	protected void initNestedCreationModels() {
-		clientModel = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
-		model.addNestedModel(NESTED_MODEL_CLIENT, clientModel);
-		clientFacetModel = ((FacetDataModelMap)clientModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT);
-		clientFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
-		
-		EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
-		if (ejbExt != null) {
-			ejbModel = ejbExt.createProjectDataModel();
-			if (ejbModel != null){
-				model.addNestedModel(NESTED_MODEL_EJB, ejbModel);
-				ejbFacetModel = ((FacetDataModelMap)ejbModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.EJB);
-				ejbFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			}
-		}
-		WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
-		if (webExt != null) {
-			webModel = webExt.createProjectDataModel();
-			if (webModel != null){
-				model.addNestedModel(NESTED_MODEL_WEB, webModel);
-				webFacetModel = ((FacetDataModelMap)webModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
-				webFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			}
-		}
-		JcaModuleExtension rarExt = EarModuleManager.getJCAModuleExtension();
-		if (rarExt != null) {
-			jcaModel = rarExt.createProjectDataModel();
-			if (jcaModel != null){
-				model.addNestedModel(NESTED_MODEL_JCA, jcaModel);
-				jcaFacetModel = ((FacetDataModelMap)jcaModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP)).getFacetDataModel(J2EEProjectUtilities.JCA);
-				jcaFacetModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			}
-		}
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.startsWith(CREATE_BASE))
-			return getDefaultCreateValue(propertyName);
-		if (propertyName.equals(ENABLED))
-			return Boolean.TRUE;
-		return super.getDefaultProperty(propertyName);
-	}
-
-
-	private Object getDefaultCreateValue(String propertyName) {
-		if (propertyName.equals(CREATE_CONNECTOR)) {
-			int version = getIntProperty(J2EE_VERSION);
-			if (version < J2EEVersionConstants.J2EE_1_3_ID)
-				return Boolean.FALSE;
-		}
-		return Boolean.TRUE;
-	}
-
-	private int convertPropertyNameToInt(String propertyName) {
-		if (propertyName.equals(CREATE_WEB)) {
-			return WEB;
-		} else if (propertyName.equals(CREATE_EJB)) {
-			return EJB;
-		} else if (propertyName.equals(CREATE_CONNECTOR)) {
-			return RAR;
-		} else if (propertyName.equals(CREATE_APPCLIENT)) {
-			return CLIENT;
-		}
-		return -1;
-	}
-
-	private String ensureUniqueProjectName(String projectName) {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		String newName = projectName;
-		int index = 0;
-		IProject proj = root.getProject(newName);
-		while (proj.exists()) {
-			index++;
-			newName = projectName + index;
-			proj = root.getProject(newName);
-		}
-		return newName;
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean notify = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(J2EE_VERSION)) {
-			updatedJ2EEVersion((Integer) propertyValue);
-			return true;
-		}else if (propertyName.startsWith(CREATE_BASE)){
-			notifyEnablement(convertPropertyNameToInt(propertyName));
-		}else if (propertyName.equals(EAR_COMPONENT_NAME)) {
-			setDefaultComponentNames((String) propertyValue);
-		}else if(webModel != null && propertyName.equals(WEB_COMPONENT_NAME)){
-			webModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
-		}else if(clientModel != null && propertyName.equals(APPCLIENT_COMPONENT_NAME)){
-			clientModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
-		}else if(ejbModel != null && propertyName.equals(EJB_COMPONENT_NAME)){
-			ejbModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
-		}else if(jcaModel != null && propertyName.equals(CONNECTOR_COMPONENT_NAME)){
-			jcaModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, propertyValue);
-		} 
-		else if(FACET_RUNTIME.equals(propertyName)){
-			if(webModel != null){
-				webModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
-			}
-			if(clientModel != null){
-				clientModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
-			}
-			if(ejbModel != null){
-				ejbModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
-			}
-			if(jcaModel != null){
-				jcaModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
-			}
-		}
-		return notify;
-	}
-
-	private void notifyEnablement(int flag) {
-		String propertyName = null;
-		switch (flag) {
-			case EJB :
-				propertyName = EJB_COMPONENT_NAME;
-				break;
-			case WEB :
-				propertyName = WEB_COMPONENT_NAME;
-				break;
-			case CLIENT :
-				propertyName = APPCLIENT_COMPONENT_NAME;
-				break;
-			case RAR :
-				propertyName = CONNECTOR_COMPONENT_NAME;
-		}
-		if (propertyName != null)
-			model.notifyPropertyChange(propertyName, IDataModel.ENABLE_CHG);
-	}
-
-	private void updatedJ2EEVersion(Integer version) {
-		setNestedJ2EEVersion(version);
-		if (version.intValue() < J2EEVersionConstants.J2EE_1_3_ID && model.isPropertySet(CREATE_CONNECTOR)) {
-			model.setProperty(CREATE_CONNECTOR, Boolean.FALSE);
-		}
-	}
-
-	public IStatus validateModuleNameCollisions() {
-		if (getBooleanProperty(ENABLED)) {
-			ArrayList list = new ArrayList();
-			String projectName = null;
-			String actualProjectName = null;
-			boolean errorCollision = false;
-			boolean errorNoSelection = true;
-			if (getBooleanProperty(CREATE_APPCLIENT)) {
-				actualProjectName = clientModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-				projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
-				list.add(projectName);
-				errorNoSelection = false;
-			}
-			if (getBooleanProperty(CREATE_EJB)) {
-				actualProjectName = ejbModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-				projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
-				if (!list.contains(projectName)) {
-					list.add(projectName);
-				} else {
-					errorCollision = true;
-				}
-				errorNoSelection = false;
-			}
-			if (!errorCollision && getBooleanProperty(CREATE_WEB)) {
-				actualProjectName = webModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-				projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
-				if (!list.contains(projectName)) {
-					list.add(projectName);
-				} else {
-					errorCollision = true;
-				}
-				errorNoSelection = false;
-			}
-			if (!errorCollision && getBooleanProperty(CREATE_CONNECTOR)) {
-				actualProjectName = jcaModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-				projectName = WTPPlugin.isPlatformCaseSensitive() ? actualProjectName : actualProjectName.toLowerCase();
-				if (!list.contains(projectName)) {
-					list.add(projectName);
-				} else {
-					errorCollision = true;
-				}
-				errorNoSelection = false;
-			}
-			if (errorCollision) {
-				return J2EEPlugin.newErrorStatus(EARCreationResourceHandler.getString("DuplicateModuleNames", new Object[]{actualProjectName}), null); //$NON-NLS-1$
-			} else if (errorNoSelection) {
-				return J2EEPlugin.newErrorStatus(EARCreationResourceHandler.NoModulesSelected, null); 
-			}
-		}
-
-		return OK_STATUS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
-	 */
-	public IStatus validate(String propertyName) {
-
-		if (getBooleanProperty(CREATE_APPCLIENT) && propertyName.equals(APPCLIENT_COMPONENT_NAME)) {
-			return clientModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		}
-
-		if (getBooleanProperty(CREATE_WEB) && propertyName.equals(WEB_COMPONENT_NAME)) {
-			return webModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		}
-
-		if (getBooleanProperty(CREATE_EJB) && propertyName.equals(EJB_COMPONENT_NAME)) {
-			return ejbModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		}
-
-		if (getBooleanProperty(CREATE_CONNECTOR) && propertyName.equals(CONNECTOR_COMPONENT_NAME)) {
-			return jcaModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		}
-		return super.validate(propertyName);
-	}
-
-//	private IStatus validateComponentName(String componentName) {
-//		IStatus status = OK_STATUS;
-//		if (status.isOK()) {
-//			if (componentName.indexOf("#") != -1) { //$NON-NLS-1$
-//				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS); 
-//				return WTPCommonPlugin.createErrorStatus(errorMessage);
-//			} else if (componentName == null || componentName.equals("")) { //$NON-NLS-1$
-//				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
-//				return WTPCommonPlugin.createErrorStatus(errorMessage);
-//			}
-//		}
-//		return status;
-//	}
-
-	private void setDefaultNestedComponentName(String name, int flag) {
-		IDataModel modModule = getNestedModel(flag);
-		if (modModule != null) {
-			String compName = ensureUniqueProjectName(name);
-			modModule.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, compName);
-		}
-	}
-
-	private void setDefaultComponentNames(String base) {
-		String componentName;
-		if (base.endsWith(EJB_SUFFIX))
-			componentName = base;
-		else
-			componentName = base + EJB_SUFFIX;
-		setDefaultNestedComponentName(componentName, EJB);
-		setProperty(EJB_COMPONENT_NAME, componentName);
-		if (base.endsWith(WEB_SUFFIX))
-			componentName = base;
-		else
-			componentName = base + WEB_SUFFIX;
-		setDefaultNestedComponentName(componentName, WEB);
-		setProperty(WEB_COMPONENT_NAME, componentName);
-		if (base.endsWith(CLIENT_SUFFIX))
-			componentName = base;
-		else
-			componentName = base + CLIENT_SUFFIX;
-		setDefaultNestedComponentName(componentName, CLIENT);
-		setProperty(APPCLIENT_COMPONENT_NAME, componentName);
-		if (base.endsWith(CONNECTOR_SUFFIX))
-			componentName = base;
-		else
-			componentName = base + CONNECTOR_SUFFIX;
-		setDefaultNestedComponentName(componentName, RAR);
-		setProperty(CONNECTOR_COMPONENT_NAME, componentName);
-	}
-
-	private void setNestedJ2EEVersion(Object j2eeVersion) {
-		int j2eeVer = ((Integer) j2eeVersion).intValue();
-		if (ejbFacetModel != null) {
-			String facetVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertJ2EEVersionIDToEJBVersionID(j2eeVer));
-			IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(ejbFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
-			ejbFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
-		}
-		if (webFacetModel != null) {
-			String facetVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertJ2EEVersionIDToWebVersionID(j2eeVer));
-			IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(webFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
-			webFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
-		}
-		if (jcaFacetModel != null) {
-			String facetVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertJ2EEVersionIDToConnectorVersionID(j2eeVer));
-			IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(jcaFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
-			jcaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
-		}
-		if (clientFacetModel != null){
-			String facetVersionString = J2EEVersionUtil.convertVersionIntToString(j2eeVer);
-			IProjectFacetVersion facetVersion = ProjectFacetsManager.getProjectFacet(clientFacetModel.getStringProperty(IFacetDataModelProperties.FACET_ID)).getVersion(facetVersionString);
-			clientFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, facetVersion);
-		}
-	}
-
-	private IDataModel getNestedModel(int flag) {
-		switch (flag) {
-			case EJB :
-				return ejbModel;
-			case WEB :
-				return webModel;
-			case RAR :
-				return jcaModel;
-			case CLIENT :
-				return clientModel;
-		}
-		return null;
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		if (propertyName.equals(CREATE_CONNECTOR)) {
-			int version = getIntProperty(J2EE_VERSION);
-			return version > J2EEVersionConstants.J2EE_1_2_ID;
-		}
-		if( propertyName.equals(CONNECTOR_COMPONENT_NAME)){
-			return getBooleanProperty(CREATE_CONNECTOR);
-		}
-		if (propertyName.equals(APPCLIENT_COMPONENT_NAME))
-			return getBooleanProperty(CREATE_APPCLIENT);
-		if (propertyName.equals(EJB_COMPONENT_NAME))
-			return getBooleanProperty(CREATE_EJB);
-		if (propertyName.equals(WEB_COMPONENT_NAME))
-			return getBooleanProperty(CREATE_WEB);
-		return super.isPropertyEnabled(propertyName);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARCreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARCreationResourceHandler.java
deleted file mode 100644
index 79e50f08f..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARCreationResourceHandler.java
+++ /dev/null
@@ -1,121 +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.earcreation;
-
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class EARCreationResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "earcreation";//$NON-NLS-1$
-
-	private EARCreationResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String Error_occured_getting_appl_ERROR_;
-	public static String Error_occured_getting_appl1_ERROR_;
-	public static String Creating__UI_;
-	public static String Creating_EAR_Project_UI_;
-	public static String The_project_already_exist_ERROR_;
-	public static String EARProjectCreationOperatio_ERROR_;
-	public static String ABS_PATH_CHANGED_UI_;
-	public static String UNSAVED_CHANGES_WARN_;
-	public static String PROJECT_MAP_PROBLEMS_ERROR_;
-	public static String MODULE_PROJECTS_CLOSED_WARN_;
-	public static String Add_Module_Command_Label_UI_;
-	public static String Remove_Module_Command_Label_UI_;
-
-	public static String Set_project_UI_;
-	public static String Add_Utility_JAR_UI;
-	public static String REM_UTIL_JAR_UI;
-	public static String PROJ_DESC_UPDATE_ERROR_UI_;
-	public static String Not_an_ear_project_UI_;
-	public static String EAR_PROJECT_MUST_BE_OPEN_UI_;
-	public static String Updating_absolute_paths_UI_;
-	public static String DuplicateModuleNames;
-	public static String NoModulesSelected;
-
-	public static String KEY_1;
-	public static String KEY_2;
-	public static String KEY_3;
-	public static String KEY_4;
-	public static String KEY_5;
-	public static String KEY_6;
-	public static String KEY_7;
-	public static String KEY_8;
-	public static String KEY_9;
-	public static String KEY_10;
-	public static String KEY_11;
-	public static String KEY_12;
-	public static String KEY_13;
-	public static String KEY_14;
-	public static String KEY_15;
-	public static String KEY_16;
-	
-	public static String J2EEUtilityJarListImportOperation_UI_Import_Utility_Jars;
-	public static String J2EEUtilityJarListImportOperation_UI_Preparing_to_import;
-	public static String J2EEUtilityJarListImportOperation_UI_2;
-	public static String J2EEUtilityJarListImportDataModel_0;
-	public static String J2EEUtilityJarListImportDataModel_Specify_Valid_Project;
-	public static String J2EEUtilityJarListImportDataModel_Select_Jar;
-	public static String J2EEUtilityJarListImportDataModel_Specify_Linked_Path;
-	public static String J2EEUtilityJarListImportOperation_There_were_no_utility_jars_selected;
-	public static String J2EEUtilityJarListImportDataModel_Linked_Path_Exists;
-	
-	
-	public static String CreateProjectWithExtractedJarOperation_Create_project_with_extracted_conte_;
-	public static String CopyArchiveIntoProjectOperation_Copying_archive_into_selected_proje_;
-	public static String CopyArchiveIntoProjectOperation_Found_existing_file_0_;
-	public static String CreateProjectWithLinkedJarOperation_Creating_project_with_linked_archiv_;
-	public static String CreateProjectWithLinkedJarOperation_Cannot_link_utility_jar_into_a_clos_;
-	public static String CreateProjectWithLinkedJarOperation_File_already_exists_0_;
-	public static String LinkArchiveIntoProjectOperation_Linking_archive_into_selected_proje_;
-	
-	public static String EARImportDataModel_UI_0;
-	public static String EARImportDataModel_UI_1;
-	public static String EARImportDataModel_UI_1a;
-	public static String EARImportDataModel_UI_2;
-	public static String EARImportDataModel_UI_2a;
-	public static String EARImportDataModel_UI_3;
-	public static String EARImportDataModel_UI_4;
-	public static String ModuleMappingImpl_UI_0;
-	public static String UtilityJARMappingImpl_UI_0;
-	public static String importWrongType;
-	public static String importWrongVersion;
-	public static String EAR_PROJECTNAME_SAMEAS_MODULE;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EARCreationResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-
-	public static final String ADD_MODULE_MODULE_TYPE = KEY_1;
-	public static final String ADD_MODULE_MODULE_EXISTS = KEY_2;
-	public static final String ADD_MODULE_MODULE_CLOSED = KEY_3;
-	public static final String ADD_MODULE_MODULE_NULL = KEY_4;
-	public static final String ADD_PROJECT_URI_EXISTS = KEY_5;
-	public static final String ADD_PROJECT_NOT_JAVA = KEY_6;
-	public static final String ADD_PROJECT_UTIL_URI = KEY_7;
-	public static final String ADD_PROJECT_UTIL_MAPPED = KEY_8;
-	public static final String ADD_PROJECT_NOT_EAR = KEY_9;
-	public static final String ADD_PROJECT_URI_EMPTY = KEY_10;
-	public static final String NOT_AN_APP_CLIENT = KEY_11;
-	public static final String NOT_AN_EAR = KEY_12;
-	public static final String NOT_AN_EJB = KEY_13;
-	public static final String NOT_A_RAR = KEY_14;
-	public static final String NOT_A_WAR = KEY_15;
-	public static final String SERVER_TARGET_NOT_SUPPORT_EAR = KEY_16;
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationDataModelProvider.java
deleted file mode 100644
index 04fd5dcab..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.earcreation;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see EARFacetProjectCreationDataModelProvider
- */
-public class EarComponentCreationDataModelProvider extends J2EEComponentCreationDataModelProvider implements IEarComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-    public IDataModelOperation getDefaultOperation() {
-        //return new EARComponentCreationOperation(model);
-    	return new EarComponentCreationFacetOperation(model);
-    }
-
-    /**
-     * @return Returns the default J2EE spec level based on the Global J2EE
-     *         Preference
-     */
-    protected Integer getDefaultComponentVersion() {
-        int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-        switch (highestJ2EEPref) {
-        case (J2EEVersionConstants.J2EE_1_4_ID):
-            return new Integer(J2EEVersionConstants.J2EE_1_4_ID);
-        case (J2EEVersionConstants.J2EE_1_3_ID):
-            return new Integer(J2EEVersionConstants.J2EE_1_3_ID);
-        case (J2EEVersionConstants.J2EE_1_2_ID):
-            return new Integer(J2EEVersionConstants.J2EE_1_2_ID);
-        default:
-            return new Integer(J2EEVersionConstants.J2EE_1_4_ID);
-        }
-    }
-
-    public Set getPropertyNames(){
-    	Set propertyNames = super.getPropertyNames();
-		propertyNames.add(J2EE_PROJECTS_LIST);
-		propertyNames.add(JAVA_PROJECT_LIST);
-		return propertyNames;
-    }
-    
-    public Object getDefaultProperty(String propertyName) {
-        if (propertyName.equals(DD_FOLDER)) {
-        	return IPath.SEPARATOR + "META_INF"; //$NON-NLS-1$
-        } else if (propertyName.equals(UI_SHOW_EAR_SECTION)) {
-            return Boolean.FALSE;
-        } else if (propertyName.equals(J2EE_PROJECTS_LIST)) {
-            return Collections.EMPTY_LIST;
-        }else if (propertyName.equals(JAVA_PROJECT_LIST)){
-			return Collections.EMPTY_LIST;
-        } else if(propertyName.equals(NESTED_EAR_COMPONENT_CREATION_DM)){
-        	return model;
-        }
-        return super.getDefaultProperty(propertyName);
-    }
-
-    public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
-        if (propertyName.equals(COMPONENT_VERSION)) {
-            Integer propertyValue = (Integer) getProperty(propertyName);
-            String description = null;
-            switch (propertyValue.intValue()) {
-            case J2EEVersionConstants.VERSION_1_2:
-                description = J2EEVersionConstants.VERSION_1_2_TEXT;
-                break;
-            case J2EEVersionConstants.VERSION_1_3:
-                description = J2EEVersionConstants.VERSION_1_3_TEXT;
-                break;
-            case J2EEVersionConstants.VERSION_1_4:
-            default:
-                description = J2EEVersionConstants.VERSION_1_4_TEXT;
-                break;
-            }
-            return new DataModelPropertyDescriptor(propertyValue, description);
-        }
-        return super.getPropertyDescriptor(propertyName);
-    }
-
-    public DataModelPropertyDescriptor[] getValidComponentVersionDescriptors() {
-        int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID();
-        DataModelPropertyDescriptor[] descriptors = null;
-        switch (highestJ2EEPref) {
-        case J2EEVersionConstants.J2EE_1_2_ID:
-            descriptors = new DataModelPropertyDescriptor[1];
-            descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
-            break;
-        case J2EEVersionConstants.J2EE_1_3_ID:
-            descriptors = new DataModelPropertyDescriptor[2];
-            descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
-            descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
-            break;
-        case J2EEVersionConstants.J2EE_1_4_ID:
-        default:
-            descriptors = new DataModelPropertyDescriptor[3];
-            descriptors[0] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT);
-            descriptors[1] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT);
-            descriptors[2] = new DataModelPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_4_ID), J2EEVersionConstants.VERSION_1_4_TEXT);
-            break;
-        }
-        return descriptors;
-    }
-
-    protected int convertModuleVersionToJ2EEVersion(int moduleVersion) {
-        return moduleVersion;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEModuleCreationDataModel#getModuleType()
-     */
-    protected EClass getComponentType() {
-        return CommonarchiveFactoryImpl.getPackage().getEARFile();
-    }
-
-    protected String getComponentExtension() {
-        return ".ear"; //$NON-NLS-1$
-    }
-
-    public IStatus validate(String propertyName) {
-        if (propertyName.equals(PROJECT_NAME)) {
-            // validate server target
-			IStatus stat = super.validate(propertyName);
-			if( stat.isOK()){
-	            String projectName = getDataModel().getStringProperty(PROJECT_NAME);
-	            if (projectName != null && projectName.length() != 0) {
-	                IProject project = ProjectUtilities.getProject(projectName);
-	                if (project != null) {
-	                    IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-	                    if (runtime != null) {
-	                        IRuntimeType type = runtime.getRuntimeType();
-	                        String typeId = type.getId();
-	                        if (typeId.startsWith("org.eclipse.jst.server.tomcat")) { //$NON-NLS-1$
-	                            String msg = EARCreationResourceHandler.SERVER_TARGET_NOT_SUPPORT_EAR;
-	                            return WTPCommonPlugin.createErrorStatus(msg);
-	                        }
-	                    }
-	                }
-	            }
-			}
-        }else if(propertyName.equals(J2EE_PROJECTS_LIST)){
-			return validateTargetComponentVersion((List)model.getProperty(J2EE_PROJECTS_LIST));
-        }
-        return super.validate(propertyName);
-    }
-
-	private IStatus validateTargetComponentVersion(List list) {
-
-		Integer version = (Integer) model.getProperty(COMPONENT_VERSION);
-		int earVersion = version.intValue();
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			IProject handle = (IProject)iter.next();
-			//IVirtualComponent comp = (IVirtualComponent) iter.next();
-			IVirtualComponent comp = ComponentCore.createComponent(handle.getProject());
-			int compVersion = J2EEVersionUtil.convertVersionStringToInt(comp);
-			if (earVersion < compVersion) {
-				String errorStatus = "The Module specification level of "+handle.getName()+", is incompatible with the containing EAR version"; //$NON-NLS-1$
-				return J2EEPlugin.newErrorStatus(errorStatus, null);
-			}
-			
-		}
-		return OK_STATUS;
-	}
-	
-	
-    public boolean propertySet(String propertyName, Object propertyValue) {
-        boolean returnValue = super.propertySet(propertyName, propertyValue);
-        if (propertyName.equals(COMPONENT_NAME)) {
-            setProperty(COMPONENT_DEPLOY_NAME, getDataModel().getStringProperty(COMPONENT_NAME));
-        } else if(propertyName.equals(NESTED_EAR_COMPONENT_CREATION_DM)){
-        	throw new RuntimeException();
-        }
-        return returnValue;
-    }
-	
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName){
-		return super.getValidPropertyDescriptors(propertyName);
-	}	
-	
-	protected boolean isCreatingEarComponent() {
-		return true;
-	}
-
-	protected IProject getEARProject(){
-		String earProjname = (String) model.getProperty(COMPONENT_NAME);
-		
-		IDataModel earDM = (IDataModel) model.getProperty(NESTED_EAR_COMPONENT_CREATION_DM);	
-		earDM.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, earProjname);
-		
-		if( earProjname != null && !earProjname.equals("") && validate(COMPONENT_NAME).isOK())
-			return ProjectUtilities.getProject(earProjname);
-		else
-			return null;
-		
-	}
-	
-	protected String getJ2EEProjectType() {
-		return J2EEProjectUtilities.ENTERPRISE_APPLICATION;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationFacetOperation.java
deleted file mode 100644
index c2990d517..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,131 +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.earcreation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see EARFacetProjectCreationDataModelProvider
- */
-public class EarComponentCreationFacetOperation extends AbstractDataModelOperation implements IFacetProjectCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-
-	public EarComponentCreationFacetOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-
-		IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		String runtime = model.getStringProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID);
-		IRuntime facetRuntime = null;
-		try {
-			runtime = ServerCore.findRuntime(runtime).getName();
-			facetRuntime = RuntimeManager.getRuntime(runtime);
-		} catch (Exception e) {
-			// proceed with facetRuntime = null
-		}
-		dm.setProperty(FACET_RUNTIME, facetRuntime);
-		String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-		dm.setProperty(FACET_PROJECT_NAME, projectName);
-
-		IDataModel newDM = setupEarInstallAction();
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(FACET_DM_MAP);
-		map.add(newDM);
-
-		IStatus stat = dm.getDefaultOperation().execute(monitor, info);
-		if (stat.isOK())
-			addModulesToEAR(monitor);
-
-		return stat;
-	}
-
-	protected IDataModel setupEarInstallAction() {
-		String versionStr = model.getPropertyDescriptor(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION).getPropertyDescription();
-		IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
-		earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-		earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
-		return earFacetInstallDataModel;
-	}
-
-	protected void setRuntime(IFacetedProject facetProj) throws CoreException {
-		String runtimeID = model.getStringProperty(IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID);
-		String runtimeName = ServerCore.findRuntime(runtimeID).getName();
-		try {
-			IRuntime runtime = RuntimeManager.getRuntime(runtimeName);
-			facetProj.setRuntime(runtime, null);
-		} catch (IllegalArgumentException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	private IStatus addModulesToEAR(IProgressMonitor monitor) {
-		IStatus stat = OK_STATUS;
-		try {
-			IDataModel dm = (IDataModel) model.getProperty(IJ2EEComponentCreationDataModelProperties.NESTED_ADD_COMPONENT_TO_EAR_DM);
-			String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-			IProject project = ProjectUtilities.getProject(projectName);
-			IVirtualComponent component = ComponentCore.createComponent(project);
-
-
-			dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, component);
-
-			List moduleProjectsList = (List) model.getProperty(IEarComponentCreationDataModelProperties.J2EE_PROJECTS_LIST);
-			if (moduleProjectsList != null && !moduleProjectsList.isEmpty()) {
-				List moduleComponentsList = new ArrayList(moduleProjectsList.size());
-				for (int i = 0; i < moduleProjectsList.size(); i++) {
-					moduleComponentsList.add(ComponentCore.createComponent((IProject) moduleProjectsList.get(i)));
-				}
-				dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, moduleComponentsList);
-				stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-				if (stat != OK_STATUS)
-					return stat;
-				dm.getDefaultOperation().execute(monitor, null);
-			}
-		} catch (Exception e) {
-			Logger.getLogger().log(e);
-		}
-		return stat;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
deleted file mode 100644
index 7114446e7..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.earcreation;
-
-import java.util.Collections;
-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.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class EarFacetInstallDataModelProvider extends J2EEFacetInstallDataModelProvider implements IEarFacetInstallDataModelProperties {
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(CONTENT_DIR);
-		names.add(J2EE_PROJECTS_LIST);
-		names.add(JAVA_PROJECT_LIST);
-		return names;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(FACET_ID)) {
-			return J2EEProjectUtilities.ENTERPRISE_APPLICATION;
-		} else if (propertyName.equals(CONTENT_DIR)) {
-			return ProductManager.getProperty(IProductConstants.APPLICATION_CONTENT_FOLDER);
-		} else if (propertyName.equals(J2EE_PROJECTS_LIST) || propertyName.equals(JAVA_PROJECT_LIST)) {
-			return Collections.EMPTY_LIST;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public IStatus validate(String name) {
-		if (name.equals(J2EE_PROJECTS_LIST)) {
-			return validateTargetComponentVersion((List) model.getProperty(J2EE_PROJECTS_LIST));
-		}
-		return super.validate(name);
-	}
-
-	private IStatus validateTargetComponentVersion(List list) {
-		int earVersion = getJ2EEVersion();
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			IProject handle = (IProject) iter.next();
-			IVirtualComponent comp = ComponentCore.createComponent(handle.getProject());
-			if (comp == null) return OK_STATUS; //Not a faceted project, so version not relevant
-			int compVersion = J2EEVersionUtil.convertVersionStringToInt(comp);
-			if (earVersion < compVersion) {
-				String errorStatus = "The Module specification level of " + handle.getName() + ", is incompatible with the containing EAR version"; //$NON-NLS-1$
-				return J2EEPlugin.newErrorStatus(errorStatus, null);
-			}
-		}
-		return OK_STATUS;
-	}
-
-	protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
-		return J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IDefaultJ2EEComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IDefaultJ2EEComponentCreationDataModelProperties.java
deleted file mode 100644
index 5fc021a25..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IDefaultJ2EEComponentCreationDataModelProperties.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.earcreation;
-
-public interface IDefaultJ2EEComponentCreationDataModelProperties {
-    /**
-     * Required - This is the name of the project. type String
-     */
-    public static final String PROJECT_NAME = "DefaultJ2EEComponentCreationDataModel.PROJECT_NAME"; //$NON-NLS-1$
-    /**
-     * Required - This is the name of the ear. type String
-     */
-    public static final String EAR_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.EAR_NAME"; //$NON-NLS-1$
-    /**
-     * Required - This is the name of the app client. type String
-     */
-    public static final String APPCLIENT_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.APPCLIENT_NAME"; //$NON-NLS-1$
-    /**
-     * Required - This is the name of the WEB. type String
-     */
-    public static final String WEB_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.WEB_COMPONENT_NAME"; //$NON-NLS-1$
-    /**
-     * Required - This is the name of the EJB. type String
-     */
-    public static final String EJB_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.EJB_COMPONENT_NAME"; //$NON-NLS-1$
-    /**
-     * Required - This is the name of the connector. type String
-     */
-    public static final String CONNECTOR_COMPONENT_NAME = "DefaultJ2EEComponentCreationDataModel.CONNECTOR_COMPONENT_NAME"; //$NON-NLS-1$
-
-    public static final String J2EE_VERSION = "DefaultJ2EEComponentCreationDataModel.J2EE_VERSION"; //$NON-NLS-1$
-   /**
-     * Default is true. type Boolean
-     */
-    public static final String CREATE_EJB = "DefaultJ2EEComponentCreationDataModel.CREATE_EJB";
-    /**
-     * Default is true. type Boolean
-     */
-    public static final String CREATE_WEB = "DefaultJ2EEComponentCreationDataModel.CREATE_WEB";
-    /**
-     * Default is true. type Boolean
-     */
-    public static final String CREATE_APPCLIENT = "DefaultJ2EEComponentCreationDataModel.CREATE_CLIENT";
-    /**
-     * Default is true. type Boolean
-     */
-    public static final String CREATE_CONNECTOR = "DefaultJ2EEComponentCreationDataModel.CREATE_CONNECTOR";
-
-    /**
-     * Used for validation only; validates no collsions between various module names. Do not set
-     * this value.
-     */
-    public static final String MODULE_NAME_COLLISIONS_VALIDATION = "DefaultJ2EEComponentCreationDataModel.MODULE_NAME_COLLISIONS_VALIDATION"; //$NON-NLS-1$
-
-    /**
-     * Default is true. type Boolean
-     */
-    public static final String ENABLED = "DefaultJ2EEComponentCreationDataModel.ENABLED"; //$NON-NLS-1$
-
-    public static final String NESTED_MODEL_EJB = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_EJB"; //$NON-NLS-1$
-    public static final String NESTED_MODEL_WEB = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_WEB"; //$NON-NLS-1$
-    public static final String NESTED_MODEL_JCA = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_JCA"; //$NON-NLS-1$
-    public static final String NESTED_MODEL_CLIENT = "DefaultJ2EEComponentCreationDataModel.NESTED_MODEL_CLIENT"; //$NON-NLS-1$
-    
-    public static final String FACET_RUNTIME = "DefaultJ2EEComponentCreationDataModel.FACET_RUNTIME";//$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEarFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEarFacetInstallDataModelProperties.java
deleted file mode 100644
index 9ffe4bdf5..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEarFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.earcreation;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-
-
-public interface IEarFacetInstallDataModelProperties extends IJ2EEFacetInstallDataModelProperties {
-
-	//TODO what is this???
-	public static final String CONTENT_DIR = "IEarFacetInstallDataModelProperties.CONTENT_DIR";//$NON-NLS-1$
-
-	public static final String J2EE_PROJECTS_LIST = "IEarFacetInstallDataModelProperties.J2EE_PROJECTS_LIST"; //$NON-NLS-1$
-	public static final String JAVA_PROJECT_LIST = "IEarFacetInstallDataModelProperties.JAVA_PROJECT_LIST"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
deleted file mode 100644
index fd059de77..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
+++ /dev/null
@@ -1,29 +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.earcreation;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-
-public interface ILooseConfigConstants {
-	/**
-	 * The short name of the loose configuration file; will most often need to use
-	 * {@link #CONFIG_PATH}
-	 */
-	String CONFIG_FILE_NAME = "looseconfig.xmi"; //$NON-NLS-1$
-	/** The absolute path to the loose configuration file */
-	String CONFIG_PATH = J2EEPlugin.getDefault().getStateLocation().append(CONFIG_FILE_NAME).toOSString();
-	/** The property name used by WebSphere to lookup the loose configuration location to load */
-	String WAS_PROPERTY = LooseConfigRegister.LOOSE_CONFIG_PROPERTY;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMap.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMap.java
deleted file mode 100644
index 49d57deec..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMap.java
+++ /dev/null
@@ -1,40 +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.earcreation.modulemap;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * @lastgen interface EARProjectMap extends EObject {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface EARProjectMap extends EObject {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of Mappings references
-	 */
-	EList getMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The list of UtilityJARMappings references
-	 */
-	EList getUtilityJARMappings();
-
-} //EARProjectMap
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMapImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMapImpl.java
deleted file mode 100644
index ed53a879c..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/EARProjectMapImpl.java
+++ /dev/null
@@ -1,171 +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.earcreation.modulemap;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-
-
-/**
- * @lastgen class EARProjectMapImpl extends EObjectImpl implements EARProjectMap, EObject {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class EARProjectMapImpl extends EObjectImpl implements EARProjectMap {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList mappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList utilityJARMappings = null;
-
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EARProjectMapImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModulemapPackage.eINSTANCE.getEARProjectMap();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getMappings() {
-		if (mappings == null) {
-			mappings = new EObjectContainmentEList(ModuleMapping.class, this, ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS);
-		}
-		return mappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EList getUtilityJARMappings() {
-		if (utilityJARMappings == null) {
-			utilityJARMappings = new EObjectContainmentEList(UtilityJARMapping.class, this, ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS);
-		}
-		return utilityJARMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (baseClass == null ? featureID : eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
-					return ((InternalEList) getMappings()).basicRemove(otherEnd, msgs);
-				case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
-					return ((InternalEList) getUtilityJARMappings()).basicRemove(otherEnd, msgs);
-				default :
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
-				return getMappings();
-			case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
-				return getUtilityJARMappings();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
-				getMappings().clear();
-				getMappings().addAll((Collection) newValue);
-				return;
-			case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
-				getUtilityJARMappings().clear();
-				getUtilityJARMappings().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
-				getMappings().clear();
-				return;
-			case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
-				getUtilityJARMappings().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.EAR_PROJECT_MAP__MAPPINGS :
-				return mappings != null && !mappings.isEmpty();
-			case ModulemapPackage.EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS :
-				return utilityJARMappings != null && !utilityJARMappings.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //EARProjectMapImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMapping.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMapping.java
deleted file mode 100644
index cee99ee07..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMapping.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.Module;
-
-
-
-/**
- * @lastgen interface ModuleMapping extends EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- * </p>
- */
-public interface ModuleMapping extends EObject {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the ProjectName attribute
-	 */
-	String getProjectName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the ProjectName attribute
-	 */
-	void setProjectName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The Module reference
-	 */
-	Module getModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the Module reference
-	 */
-	void setModule(Module value);
-
-} //ModuleMapping
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMappingImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMappingImpl.java
deleted file mode 100644
index 333f8d9b7..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModuleMappingImpl.java
+++ /dev/null
@@ -1,194 +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.earcreation.modulemap;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-
-
-/**
- * @lastgen class ModuleMappingImpl extends EObjectImpl implements ModuleMapping, EObject {}
- * * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModuleMappingImpl extends EObjectImpl implements ModuleMapping {
-	/**
-	 * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getProjectName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROJECT_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String projectName = PROJECT_NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Module module = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ModuleMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModulemapPackage.eINSTANCE.getModuleMapping();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getProjectName() {
-		return projectName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setProjectName(String newProjectName) {
-		String oldProjectName = projectName;
-		projectName = newProjectName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.MODULE_MAPPING__PROJECT_NAME, oldProjectName, projectName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public Module getModule() {
-		if (module != null && module.eIsProxy()) {
-			Module oldModule = module;
-			module = (Module) EcoreUtil.resolve(module, this);
-			if (module != oldModule) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModulemapPackage.MODULE_MAPPING__MODULE, oldModule, module));
-			}
-		}
-		return module;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Module basicGetModule() {
-		return module;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setModule(Module newModule) {
-		Module oldModule = module;
-		module = newModule;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.MODULE_MAPPING__MODULE, oldModule, module));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
-				return getProjectName();
-			case ModulemapPackage.MODULE_MAPPING__MODULE :
-				if (resolve)
-					return getModule();
-				return basicGetModule();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
-				return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
-			case ModulemapPackage.MODULE_MAPPING__MODULE :
-				return module != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
-				setProjectName((String) newValue);
-				return;
-			case ModulemapPackage.MODULE_MAPPING__MODULE :
-				setModule((Module) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.MODULE_MAPPING__PROJECT_NAME :
-				setProjectName(PROJECT_NAME_EDEFAULT);
-				return;
-			case ModulemapPackage.MODULE_MAPPING__MODULE :
-				setModule((Module) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(EARCreationResourceHandler.getString("ModuleMappingImpl_UI_0", new Object[]{projectName})); //$NON-NLS-1$
-		return result.toString();
-	}
-
-} //ModuleMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapAdapterFactory.java
deleted file mode 100644
index ae34dbb68..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapAdapterFactory.java
+++ /dev/null
@@ -1,130 +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.earcreation.modulemap;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-
-
-/**
- * @lastgen class ModulemapAdapterFactory extends AdapterFactoryImpl {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected static ModulemapPackage modelPackage;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ModulemapAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ModulemapPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ModulemapSwitch modelSwitch = new ModulemapSwitch() {
-		public Object caseModuleMapping(ModuleMapping object) {
-			return createModuleMappingAdapter();
-		}
-
-		public Object caseEARProjectMap(EARProjectMap object) {
-			return createEARProjectMapAdapter();
-		}
-
-		public Object caseUtilityJARMapping(UtilityJARMapping object) {
-			return createUtilityJARMappingAdapter();
-		}
-
-		public Object defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter) modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases. It's useful to
-	 * ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEARProjectMapAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createModuleMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createUtilityJARMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default
-	 * implementation returns null. <!-- end-user-doc -->
-	 * 
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ModulemapAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactory.java
deleted file mode 100644
index 33a1f779e..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactory.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EFactory;
-
-
-/**
- * @lastgen interface ModulemapFactory extends EFactory {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface ModulemapFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	ModulemapFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapFactoryImpl();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EARProjectMap value
-	 */
-	EARProjectMap createEARProjectMap();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ModuleMapping value
-	 */
-	ModuleMapping createModuleMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return UtilityJARMapping value
-	 */
-	UtilityJARMapping createUtilityJARMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	ModulemapPackage getModulemapPackage();
-
-} //ModulemapFactory
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactoryImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactoryImpl.java
deleted file mode 100644
index 1f132f364..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapFactoryImpl.java
+++ /dev/null
@@ -1,92 +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.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-
-
-/**
- * @lastgen class ModulemapFactoryImpl extends EFactoryImpl implements ModulemapFactory, EFactory {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapFactoryImpl extends EFactoryImpl implements ModulemapFactory {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ModulemapFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ModulemapPackage.MODULE_MAPPING :
-				return createModuleMapping();
-			case ModulemapPackage.EAR_PROJECT_MAP :
-				return createEARProjectMap();
-			case ModulemapPackage.UTILITY_JAR_MAPPING :
-				return createUtilityJARMapping();
-		}
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EARProjectMap createEARProjectMap() {
-		EARProjectMapImpl earProjectMap = new EARProjectMapImpl();
-		return earProjectMap;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ModuleMapping createModuleMapping() {
-		ModuleMappingImpl moduleMapping = new ModuleMappingImpl();
-		return moduleMapping;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public UtilityJARMapping createUtilityJARMapping() {
-		UtilityJARMappingImpl utilityJARMapping = new UtilityJARMappingImpl();
-		return utilityJARMapping;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ModulemapPackage getModulemapPackage() {
-		return (ModulemapPackage) getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static ModulemapPackage getPackage() {
-		return ModulemapPackage.eINSTANCE;
-	}
-
-} //ModulemapFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapInit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapInit.java
deleted file mode 100644
index 31f97e7f4..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapInit.java
+++ /dev/null
@@ -1,57 +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.earcreation.modulemap;
-
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-//import com.ibm.etools.j2ee.internal.project.EAREditModel;
-/**
-* @deprecated
-* Use
-* <p>
-* 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
-* as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
-* all the info that was captured in .modulemaps file will is now captured in the .component file
-*/
-
-public class ModulemapInit {
-	protected static boolean initialized = false;
-
-	public static void init() {
-		init(true);
-	}
-
-	public static void init(boolean shouldPreRegisterPackages) {
-		if (!initialized) {
-			initialized = true;
-			invokePrereqInits(shouldPreRegisterPackages);
-			if (shouldPreRegisterPackages) {
-				ExtendedEcoreUtil.preRegisterPackage("modulemap.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-								public EPackage getEPackage() {
-									return ModulemapPackage.eINSTANCE;
-								}
-								public EFactory getEFactory() {
-									return ModulemapFactory.eINSTANCE;
-								}
-							});
-			}
-			//ResourceDependencyRegister.registerDependency(J2EEConstants.APPLICATION_DD_URI_OBJ, EAREditModel.MODULE_MAP_URI_OBJ);
-		}
-	}
-
-	public static void invokePrereqInits(boolean shouldPreRegisterPackages) {
-		//TODO Should remove....
-		//com.ibm.ejs.models.base.extensions.init.ExtensionsInit.init(shouldPreRegisterPackages);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackage.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackage.java
deleted file mode 100644
index 638f73a11..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackage.java
+++ /dev/null
@@ -1,181 +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.earcreation.modulemap;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-
-/**
- * @lastgen interface ModulemapPackage extends EPackage {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface ModulemapPackage extends EPackage {
-	/**
-	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	String eNAME = "modulemap"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_PROJECT_MAP = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_MAPPING = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_MAPPING__PROJECT_NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_MAPPING__MODULE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Module Mapping</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_MAPPING_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_PROJECT_MAP__MAPPINGS = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>EAR Project Map</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int EAR_PROJECT_MAP_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int UTILITY_JAR_MAPPING = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int UTILITY_JAR_MAPPING__PROJECT_NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int UTILITY_JAR_MAPPING__URI = 1;
-
-
-	/**
-	 * The number of structural features of the the '<em>Utility JAR Mapping</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int UTILITY_JAR_MAPPING_FEATURE_COUNT = 2;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "modulemap.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	String eNS_PREFIX = "modulemap"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	ModulemapPackage eINSTANCE = org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return EARProjectMap object
-	 */
-	EClass getEARProjectMap();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEARProjectMap_Mappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEARProjectMap_UtilityJARMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return ModuleMapping object
-	 */
-	EClass getModuleMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getModuleMapping_ProjectName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getModuleMapping_Module();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return UtilityJARMapping object
-	 */
-	EClass getUtilityJARMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getUtilityJARMapping_ProjectName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getUtilityJARMapping_Uri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	ModulemapFactory getModulemapFactory();
-
-} //ModulemapPackage
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java
deleted file mode 100644
index c593480ce..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java
+++ /dev/null
@@ -1,238 +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.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.internal.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl;
-
-
-
-/**
- * @lastgen class ModulemapPackageImpl extends EPackageImpl implements ModulemapPackage, EPackage {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapPackageImpl extends EPackageImpl implements ModulemapPackage {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass moduleMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass earProjectMapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private EClass utilityJARMappingEClass = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	private ModulemapPackageImpl() {
-		super(eNS_URI, ModulemapFactory.eINSTANCE);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static ModulemapPackage init() {
-		// Initialize simple dependencies
-		CommonPackageImpl.init();
-		JavaRefPackageImpl.init();
-		ApplicationPackageImpl.init();
-		EcorePackageImpl.init();
-
-		// Obtain or create and register package and interdependencies
-		ModulemapPackageImpl theModulemapPackage = (ModulemapPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ModulemapPackageImpl());
-
-		// Step 1: create meta-model objects
-		theModulemapPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theModulemapPackage.initializePackageContents();
-
-		return theModulemapPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEARProjectMap() {
-		return earProjectMapEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEARProjectMap_Mappings() {
-		return (EReference) earProjectMapEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEARProjectMap_UtilityJARMappings() {
-		return (EReference) earProjectMapEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getModuleMapping() {
-		return moduleMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getModuleMapping_ProjectName() {
-		return (EAttribute) moduleMappingEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getModuleMapping_Module() {
-		return (EReference) moduleMappingEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getUtilityJARMapping() {
-		return utilityJARMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getUtilityJARMapping_ProjectName() {
-		return (EAttribute) utilityJARMappingEClass.getEAttributes().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getUtilityJARMapping_Uri() {
-		return (EAttribute) utilityJARMappingEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ModulemapFactory getModulemapFactory() {
-		return (ModulemapFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is guarded to have no affect on
-	 * any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated)
-			return;
-		isCreated = true;
-
-		// Create classes and their features
-		moduleMappingEClass = createEClass(MODULE_MAPPING);
-		createEAttribute(moduleMappingEClass, MODULE_MAPPING__PROJECT_NAME);
-		createEReference(moduleMappingEClass, MODULE_MAPPING__MODULE);
-
-		earProjectMapEClass = createEClass(EAR_PROJECT_MAP);
-		createEReference(earProjectMapEClass, EAR_PROJECT_MAP__MAPPINGS);
-		createEReference(earProjectMapEClass, EAR_PROJECT_MAP__UTILITY_JAR_MAPPINGS);
-
-		utilityJARMappingEClass = createEClass(UTILITY_JAR_MAPPING);
-		createEAttribute(utilityJARMappingEClass, UTILITY_JAR_MAPPING__PROJECT_NAME);
-		createEAttribute(utilityJARMappingEClass, UTILITY_JAR_MAPPING__URI);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This method is guarded to have
-	 * no affect on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized)
-			return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		//		CommonPackageImpl theCommonPackage =
-		// (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		//		JavaRefPackageImpl theJavaRefPackage =
-		// (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-		//		EcorePackageImpl theEcorePackage =
-		// (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(moduleMappingEClass, ModuleMapping.class, "ModuleMapping", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getModuleMapping_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, true, false); //$NON-NLS-1$
-		initEReference(getModuleMapping_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, true, false); //$NON-NLS-1$
-
-		initEClass(earProjectMapEClass, EARProjectMap.class, "EARProjectMap", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getEARProjectMap_Mappings(), this.getModuleMapping(), null, "mappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, true, false); //$NON-NLS-1$
-		initEReference(getEARProjectMap_UtilityJARMappings(), this.getUtilityJARMapping(), null, "utilityJARMappings", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, true, false); //$NON-NLS-1$
-
-		initEClass(utilityJARMappingEClass, UtilityJARMapping.class, "UtilityJARMapping", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getUtilityJARMapping_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, true, false); //$NON-NLS-1$
-		initEAttribute(getUtilityJARMapping_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, true, false); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //ModulemapPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapSwitch.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapSwitch.java
deleted file mode 100644
index ff5df4d72..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapSwitch.java
+++ /dev/null
@@ -1,107 +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.earcreation.modulemap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-
-
-/**
- * @lastgen class ModulemapSwitch {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class ModulemapSwitch {
-	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected static ModulemapPackage modelPackage;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ModulemapSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ModulemapPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case ModulemapPackage.MODULE_MAPPING : {
-					ModuleMapping moduleMapping = (ModuleMapping) theEObject;
-					Object result = caseModuleMapping(moduleMapping);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case ModulemapPackage.EAR_PROJECT_MAP : {
-					EARProjectMap earProjectMap = (EARProjectMap) theEObject;
-					Object result = caseEARProjectMap(earProjectMap);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				case ModulemapPackage.UTILITY_JAR_MAPPING : {
-					UtilityJARMapping utilityJARMapping = (UtilityJARMapping) theEObject;
-					Object result = caseUtilityJARMapping(utilityJARMapping);
-					if (result == null)
-						result = defaultCase(theEObject);
-					return result;
-				}
-				default :
-					return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseEARProjectMap(EARProjectMap object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseModuleMapping(ModuleMapping object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseUtilityJARMapping(UtilityJARMapping object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ModulemapSwitch
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMapping.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMapping.java
deleted file mode 100644
index e52356154..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMapping.java
+++ /dev/null
@@ -1,53 +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.earcreation.modulemap;
-
-
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * @lastgen interface UtilityJARMapping extends EObject {}
- * @deprecated
- * Use
- * <p>
- * 		Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public interface UtilityJARMapping extends EObject {
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the ProjectName attribute
-	 */
-	String getProjectName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the ProjectName attribute
-	 */
-	void setProjectName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the Uri attribute
-	 */
-	String getUri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value
-	 *            The new value of the Uri attribute
-	 */
-	void setUri(String value);
-
-} //UtilityJARMapping
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMappingImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMappingImpl.java
deleted file mode 100644
index d935451e0..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/UtilityJARMappingImpl.java
+++ /dev/null
@@ -1,183 +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.earcreation.modulemap;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-
-
-/**
- * @lastgen class UtilityJARMappingImpl extends EObjectImpl implements UtilityJARMapping, EObject {}
- * @deprecated
- * Use
- * <p>
- * Need to use the ModuleCore and WorkbenchComponent Api to get to the referenced modules
- * as with the Flexible project changes a .modulemaps file will not exist in an EAR module and
- * all the info that was captured in .modulemaps file will is now captured in the .component file
- */
-public class UtilityJARMappingImpl extends EObjectImpl implements UtilityJARMapping {
-	/**
-	 * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getProjectName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROJECT_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String projectName = PROJECT_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String uri = URI_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected UtilityJARMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModulemapPackage.eINSTANCE.getUtilityJARMapping();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getProjectName() {
-		return projectName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setProjectName(String newProjectName) {
-		String oldProjectName = projectName;
-		projectName = newProjectName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME, oldProjectName, projectName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModulemapPackage.UTILITY_JAR_MAPPING__URI, oldUri, uri));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
-				return getProjectName();
-			case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
-				return getUri();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
-				return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
-			case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
-				setProjectName((String) newValue);
-				return;
-			case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
-				setUri((String) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature.getFeatureID(), eFeature.getContainerClass())) {
-			case ModulemapPackage.UTILITY_JAR_MAPPING__PROJECT_NAME :
-				setProjectName(PROJECT_NAME_EDEFAULT);
-				return;
-			case ModulemapPackage.UTILITY_JAR_MAPPING__URI :
-				setUri(URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(EARCreationResourceHandler.getString("UtilityJARMappingImpl_UI_0", new Object[]{projectName, uri})); //$NON-NLS-1$
-		return result.toString();
-	}
-
-} //UtilityJARMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
deleted file mode 100644
index 889db8005..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
+++ /dev/null
@@ -1,54 +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.modulecore.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-
-/**
- * <p>
- * Adapts {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}s to
- * {@see org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEdit}&nbsp; facades.
- * </p>
- */
-public class EarEditAdapterFactory implements IAdapterFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-
-		if (adapterType == EARArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
-			ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
-			if (J2EEProjectUtilities.isEARProject(editModel.getProject()))
-				return new EARArtifactEdit((ArtifactEditModel) adaptableObject);
-		}
-		return null;
-
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-
-		return new Class[]{ArtifactEdit.class, EARArtifactEdit.class};
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java
deleted file mode 100644
index 71c0defc1..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java
+++ /dev/null
@@ -1,45 +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 19, 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.moduleextension;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface EarModuleExtension {
-
-	/**
-	 * Return a default instance of the J2EEModuleCreationDataModel.
-	 * 
-	 * @return
-	 */
-	IDataModel createProjectDataModel();
-
-	IDataModel createImportDataModel();
-
-	IDataModelOperation createProjectCreationOperation(IDataModel dataModel);
-
-	IDataModelOperation createProjectCreationOperation(ImportOption option);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java
deleted file mode 100644
index d67120d17..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.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
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- * 
- * To change the template for this generated file go to Window&gt;Preferences&gt;Java&gt;Code
- * Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public abstract class EarModuleExtensionImpl implements EarModuleExtension {
-	/**
-	 *  
-	 */
-	public EarModuleExtensionImpl() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectCreationOperation(com.ibm.etools.archive.ear.operations.ImportOption)
-	 */
-	public IDataModelOperation createProjectCreationOperation(ImportOption option) {
-		if (option.getArchiveType() == ImportOption.MODULE)
-			return option.getModel().getDefaultOperation();
-		return null;
-	}
-
-	public IDataModelOperation createProjectCreationOperation(IDataModel dataModel) {
-		return dataModel.getDefaultOperation();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java
deleted file mode 100644
index 3a9ed1419..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.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
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.moduleextension;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class EarModuleExtensionRegistry extends RegistryReader {
-
-	static final String EXTENSION_NAME = "EARModuleExtension"; //$NON-NLS-1$
-	static final String ELEMENT_EARMODULE_EXTENSION = "earModuleExtension"; //$NON-NLS-1$
-	static final String MODULE_EXTENSION_CLASS = "extensionClass"; //$NON-NLS-1$
-	private static EarModuleExtensionRegistry INSTANCE = null;
-
-	public EarModuleExtensionRegistry() {
-		super(J2EEPlugin.PLUGIN_ID, EXTENSION_NAME);
-	}
-
-	public static EarModuleExtensionRegistry getInstance() {
-		if (INSTANCE == null) {
-			INSTANCE = new EarModuleExtensionRegistry();
-			INSTANCE.readRegistry();
-		}
-		return INSTANCE;
-	}
-
-	/**
-	 * readElement() - parse and deal w/ an extension like: <earModuleExtension extensionClass =
-	 * "com.ibm.etools.web.plugin.WebModuleExtensionImpl"/>
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(ELEMENT_EARMODULE_EXTENSION))
-			return false;
-
-		EarModuleExtension extension = null;
-		try {
-			extension = (EarModuleExtension) element.createExecutableExtension(MODULE_EXTENSION_CLASS);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		if (extension != null)
-			addModuleExtension(extension);
-		return true;
-	}
-
-
-	private static void addModuleExtension(EarModuleExtension ext) {
-		EarModuleManager.registerModuleExtension(ext);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleManager.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleManager.java
deleted file mode 100644
index 14d2cfb6f..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleManager.java
+++ /dev/null
@@ -1,94 +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 19, 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.moduleextension;
-
-import java.util.HashMap;
-
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EarModuleManager {
-	static HashMap moduleExtensions = new HashMap();
-
-
-	/**
-	 * @return
-	 */
-	public static HashMap getModuleExtensions() {
-		return moduleExtensions;
-	}
-
-	public static EarModuleExtension getModuleExtension(String key) {
-		//Make sure the registry is loaded
-		EarModuleExtensionRegistry.getInstance();
-		return (EarModuleExtension) moduleExtensions.get(key);
-	}
-
-	/**
-	 * @return
-	 */
-	public static EjbModuleExtension getEJBModuleExtension() {
-		return (EjbModuleExtension) getModuleExtension(J2EEProjectUtilities.EJB);
-	}
-
-	/**
-	 * @return
-	 */
-	public static JcaModuleExtension getJCAModuleExtension() {
-		return (JcaModuleExtension) getModuleExtension(J2EEProjectUtilities.JCA);
-	}
-
-	/**
-	 * @return
-	 */
-	public static WebModuleExtension getWebModuleExtension() {
-		return (WebModuleExtension) getModuleExtension(J2EEProjectUtilities.DYNAMIC_WEB);
-	}
-
-	public static boolean hasEJBModuleExtension() {
-		return (EjbModuleExtension) getModuleExtension(J2EEProjectUtilities.EJB) != null;
-	}
-
-	public static boolean hasJCAModuleExtension() {
-		return (JcaModuleExtension) getModuleExtension(J2EEProjectUtilities.JCA) != null;
-	}
-
-	public static boolean hasWebModuleExtension() {
-		return getModuleExtension(J2EEProjectUtilities.DYNAMIC_WEB) != null;
-	}
-
-	public static void registerModuleExtension(EarModuleExtension ext) {
-		if (ext instanceof WebModuleExtension)
-			moduleExtensions.put(J2EEProjectUtilities.DYNAMIC_WEB, ext);
-		else if (ext instanceof EjbModuleExtension)
-			moduleExtensions.put(J2EEProjectUtilities.EJB, ext);
-		else if (ext instanceof JcaModuleExtension)
-			moduleExtensions.put(J2EEProjectUtilities.JCA, ext);
-		else
-			moduleExtensions.put(J2EEProjectUtilities.ENTERPRISE_APPLICATION, ext);
-	}
-
-	public static void removeModuleExtension(String key) {
-		moduleExtensions.remove(key);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java
deleted file mode 100644
index 2ff3645dd..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.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 Sep 19, 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.moduleextension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface EjbModuleExtension extends EarModuleExtension {
-
-	//void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand cmd);
-
-	//J2EEJavaProjectInfo createProjectInfo();
-
-	//J2EEImportOperationOLD createImportOperation(IProject proj, EJBJarFile ejbJarFile);
-
-	EJBJar getEJBJar(IProject aProject);
-
-	IProject getDefinedEJBClientJARProject(IProject anEJBProject);
-
-	IDataModelOperation createEJBClientJARProject(
-			final String clientProjectName,
-			final String srcFolderName,
-			final String ejbProjectName,
-			final String earProjectName,
-			final org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime);
-	
-	IDataModelOperation createEJBClientJARProject(IProject ejbProject);	
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/JcaModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/JcaModuleExtension.java
deleted file mode 100644
index 92ca9ca7f..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/JcaModuleExtension.java
+++ /dev/null
@@ -1,36 +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 19, 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.moduleextension;
-
-//import org.eclipse.jst.j2ee.internal.earcreation.UpdateModuleReferencesInEARProjectCommand;
-//import org.eclipse.jst.j2ee.internal.project.J2EENature;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface JcaModuleExtension extends EarModuleExtension {
-
-	//void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand cmd);
-
-	//J2EEJavaProjectInfo createProjectInfo();
-
-	//J2EEImportOperation createImportOperation(IProject proj, RARFile rarFile);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/WebModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/WebModuleExtension.java
deleted file mode 100644
index cf9a5d031..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/WebModuleExtension.java
+++ /dev/null
@@ -1,58 +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 19, 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.moduleextension;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.project.J2EEJavaProjectInfo;
-//import org.eclipse.jst.j2ee.internal.project.J2EENature;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface WebModuleExtension extends EarModuleExtension {
-
-	static final String WEBSETTINGS_FILE_URI = ".j2ee"; //$NON-NLS-1$
-
-//	void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand command);
-
-	void addWLPProjects(IProject aProject, Set projectsToBuild);
-
-
-	void setContextRootForModuleMapping(WebModule m, IProject nestedProject) throws CoreException;
-
-	//J2EEImportOperationOLD createImportOperation(IProject nestedProject, WARFile warFile,
-	// EARImportConfiguration importConfig);
-
-	String getContentFolder(IProject project, IFile webSettingsFile);
-
-	J2EEJavaProjectInfo createProjectInfo();
-
-	boolean compareWebContextRoot(Module module, IProject project) throws CoreException;
-
-	boolean hasRuntime(IProject project);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index d0c396e6f..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,39 +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.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class EARFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
-	public EARFacetProjectCreationDataModelProvider() {
-		super();
-	}
-
-	public void init() {
-		super.init();
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		IDataModel earFacet = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
-		map.add(earFacet);
-		
-		Collection requiredFacets = new ArrayList();
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(earFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetUtils.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetUtils.java
deleted file mode 100644
index 45d7c67e2..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EARFacetUtils.java
+++ /dev/null
@@ -1,26 +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.project.facet;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class EARFacetUtils {
-
-    public static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
-	public static final IProjectFacetVersion EAR_12 = EAR_FACET.getVersion("1.2"); //$NON-NLS-1$
-	public static final IProjectFacetVersion EAR_13 = EAR_FACET.getVersion("1.3"); //$NON-NLS-1$
-	public static final IProjectFacetVersion EAR_14 = EAR_FACET.getVersion("1.4"); //$NON-NLS-1$
-
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
deleted file mode 100644
index 46c617a03..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
+++ /dev/null
@@ -1,77 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class EarFacetInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-			IDataModel model = (IDataModel) cfg;
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-			// Add WTP natures.
-
-			WtpUtils.addNaturestoEAR(project);
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-			c.create(0, null);
-
-			final IVirtualFolder earroot = c.getRootFolder();
-			earroot.createLink(new Path("/" + model.getStringProperty(IEarFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
-
-			if (!project.getFile(J2EEConstants.APPLICATION_DD_URI).exists()) {
-				String ver = fv.getVersionString();
-				int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
-				EARArtifactEdit.createDeploymentDescriptor(project, nVer);
-			}
-
-			try {
-				((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java
deleted file mode 100644
index fee5cac65..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,90 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class EarFacetPostInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-			IDataModel model = (IDataModel) cfg;
-
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-
-			Set dependentProjects = new HashSet();
-			dependentProjects.addAll((List) model.getProperty(IEarFacetInstallDataModelProperties.J2EE_PROJECTS_LIST));
-			dependentProjects.addAll((List) model.getProperty(IEarFacetInstallDataModelProperties.JAVA_PROJECT_LIST));
-			if (!dependentProjects.isEmpty()) {
-				List dependentComponents = new ArrayList(dependentProjects.size());
-				for (Iterator iterator = dependentProjects.iterator(); iterator.hasNext();) {
-					IProject depProject = (IProject) iterator.next();
-					IVirtualComponent depComp = ComponentCore.createComponent(depProject);
-					if (depComp == null) {
-						JavaProjectMigrationOperation utilOp = J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(depProject);
-						utilOp.execute(null, null);
-						depComp = ComponentCore.createComponent(depProject);
-					}
-
-					dependentComponents.add(depComp);
-				}
-
-				final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-				dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, c);
-				List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-				modList.addAll(dependentComponents);
-				dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-				try {
-					dataModel.getDefaultOperation().execute(null, null);
-				} catch (ExecutionException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-
-		}
-
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
deleted file mode 100644
index 4dd10c7b8..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-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.wst.common.project.facet.core.IDelegate;
-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;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/** 
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetRuntimeHandler 
-{
-    /**
-     * Private constructor. This class is not meant to be instantiated.
-     */
-    
-    private EarFacetRuntimeHandler() {}
-    
-    public static void updateModuleProjectRuntime( final IProject earProject,
-                                                   final IProject moduleProject,
-                                                   final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", 1 );
-        }
-        
-        try
-        {
-            final IFacetedProject earFacetedProject
-                = ProjectFacetsManager.create( earProject );
-        
-            final IRuntime earRuntime = earFacetedProject.getRuntime();
-    
-            final IFacetedProject moduleFacetedProject 
-                = ProjectFacetsManager.create( moduleProject );
-            
-            if( moduleFacetedProject != null && 
-                ! equals( earRuntime, moduleFacetedProject.getRuntime() ) )
-            {
-                boolean supports = true;
-                
-                if( earRuntime != null )
-                {
-                    for( Iterator itr = moduleFacetedProject.getProjectFacets().iterator(); 
-                         itr.hasNext(); )
-                    {
-                        final IProjectFacetVersion fver 
-                            = (IProjectFacetVersion) itr.next();
-                        
-                        if( ! earRuntime.supports( fver ) )
-                        {
-                            supports = false;
-                            break;
-                        }
-                    }
-                }
-                
-                if( supports )
-                {
-                    moduleFacetedProject.setRuntime( earRuntime, submon( monitor, 1 ) );
-                }
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-
-    public static void updateModuleProjectRuntime( final IProject earProject,
-                                                   final Set moduleProjects,
-                                                   final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", moduleProjects.size() );
-        }
-        
-        try
-        {
-            for( Iterator itr = moduleProjects.iterator(); itr.hasNext(); )
-            {
-                final IProject moduleProject = (IProject) itr.next();
-                
-                updateModuleProjectRuntime( earProject, moduleProject, 
-                                            submon( monitor, 1 ) );
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-    
-    public static final class RuntimeChangedDelegate
-    
-        implements IDelegate
-        
-    {
-        public void execute( final IProject project, 
-                             final IProjectFacetVersion fv, 
-                             final Object cfg, 
-                             final IProgressMonitor monitor ) 
-        
-            throws CoreException 
-            
-        {
-            if( monitor != null ) 
-            {
-                monitor.beginTask( "", 10 ); //$NON-NLS-1$
-            }
-    
-            try 
-            {
-                // Compile the list of projects referenced by this ear project.
-                
-                final Set moduleProjects = new HashSet();
-                
-                final IVirtualComponent earvc 
-                    = ComponentCore.createComponent( project );
-                
-                final IVirtualReference[] vrefs = earvc.getReferences();
-                
-                for( int i = 0; i < vrefs.length; i++ )
-                {
-                    final IVirtualReference vref = vrefs[ i ];
-                    final IVirtualComponent vc = vref.getReferencedComponent();
-                    
-                    moduleProjects.add( vc.getProject() );
-                }
-                
-                if( monitor != null )
-                {
-                    monitor.worked( 1 );
-                }
-                
-                // Attempt to change the runtime for each of the referenced projects.
-                
-                updateModuleProjectRuntime( project, moduleProjects, 
-                                            submon( monitor, 9 ) );
-            }
-            finally 
-            {
-                if( monitor != null ) 
-                {
-                    monitor.done();
-                }
-            }
-        }
-    }
-
-    private static IProgressMonitor submon( final IProgressMonitor parent,
-                                            final int ticks )
-    {
-        return ( parent == null ? null : new SubProgressMonitor( parent, ticks ) );
-    }
-    
-    private static boolean equals( final Object obj1,
-                                   final Object obj2 )
-    {
-        if( obj1 == obj2 )
-        {
-            return true;
-        }
-        else if( obj1 == null || obj2 == null )
-        {
-            return false;
-        }
-        else
-        {
-            return obj1.equals( obj2 );
-        }
-    }
-
-    
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
deleted file mode 100644
index 386297246..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
+++ /dev/null
@@ -1,138 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IMarker;
-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.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-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.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectValidator;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetValidator
-
-    implements IFacetedProjectValidator
-    
-{
-    private static final String MARKER_ID 
-        = J2EEPlugin.PLUGIN_ID + ".differentRuntimesDetected";
-    
-    public void validate( final IFacetedProject fproj ) 
-    
-        throws CoreException
-        
-    {
-        final IVirtualComponent vc 
-            = ComponentCore.createComponent( fproj.getProject() );
-        
-        if( vc == null )
-        {
-            return;
-        }
-    
-        if( fproj.hasProjectFacet( EARFacetUtils.EAR_FACET ) )
-        {
-            fproj.getProject().deleteMarkers( MARKER_ID, false, 
-                                              IResource.DEPTH_ZERO );
-            
-            final IVirtualReference[] refs = vc.getReferences();
-            
-            for( int i = 0; i < refs.length; i++ )
-            {
-                final IVirtualReference ref = refs[ i ];
-                final IVirtualComponent refvc = ref.getReferencedComponent();
-                
-                if( refvc != null && !refvc.isBinary())
-                {
-                    final IProject refpj = refvc.getProject();
-                    validate( fproj, ProjectFacetsManager.create( refpj ) );
-                }
-            }
-        }
-        else
-        {
-            final IVirtualComponent[] referencing 
-                = vc.getReferencingComponents();
-            
-            for( int i = 0; i < referencing.length; i++ )
-            {
-                final IVirtualComponent refvc = referencing[ i ];
-                
-                final IFacetedProject reffpj
-                    = ProjectFacetsManager.create( refvc.getProject() );
-                
-                if( reffpj.hasProjectFacet( EARFacetUtils.EAR_FACET ) )
-                {
-                    validate( reffpj );
-                }
-            }
-        }
-    }
-    
-    private void validate( final IFacetedProject ear,
-                           final IFacetedProject module )
-    
-        throws CoreException
-        
-    {
-        final IRuntime earRuntime = ear.getRuntime();
-        final IRuntime moduleRuntime = module.getRuntime();
-        
-        if( earRuntime == null && moduleRuntime != null )
-        {
-            // Should this also be a warning?
-        }
-        else if( earRuntime != null && moduleRuntime == null )
-        {
-            // Should this also be a warning?
-        }
-        else if( earRuntime != null && moduleRuntime != null &&
-                 ! earRuntime.equals( moduleRuntime ) )
-        {
-            final String msg
-                = NLS.bind( Resources.targettingDifferentRuntimes,
-                            module.getProject().getName() );
-            
-            final IMarker m = ear.createWarningMarker( MARKER_ID, msg );
-            
-            m.setAttribute( "moduleProject", module.getProject().getName() );
-            m.setAttribute( "runtime1", ear.getRuntime().getName() );
-            m.setAttribute( "runtime2", module.getRuntime().getName() );
-        }
-    }
-    
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-        public static String targettingDifferentRuntimes;
-        
-        static
-        {
-            initializeMessages( EarFacetValidator.class.getName(), 
-                                Resources.class );
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.properties b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.properties
deleted file mode 100644
index 17d4bab76..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.properties
+++ /dev/null
@@ -1 +0,0 @@
-targettingDifferentRuntimes = Referenced module project {0} is targetting a different runtime.
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
deleted file mode 100644
index e121e6b05..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,92 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-/**
- * Warning clean-up 12/05/2005
- */   
-//import org.eclipse.wst.common.componentcore.ComponentCore;
-//import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarFacetVersionChangeDelegate 
-
-    implements IDelegate
-    
-{
-    public void execute( final IProject project, 
-                         final IProjectFacetVersion fv,
-                         final Object cfg,
-                         final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", 1 );
-        }
-        
-        try
-        {
-         /**
-          * Warning clean-up 12/05/2005
-          */   
-            //final IVirtualComponent c = ComponentCore.createComponent(project);
-            
-//            final StructureEdit edit 
-//                = StructureEdit.getStructureEditForWrite( project );
-//            
-//            try
-//            {
-//                final ComponentType oldctype 
-//                    = StructureEdit.getComponentType( c );
-//                
-//                final ComponentType newctype 
-//                    = ComponentcoreFactory.eINSTANCE.createComponentType();
-//                
-//                newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-//                newctype.setVersion( fv.getVersionString() );
-//                newctype.getProperties().addAll( oldctype.getProperties() );
-//                
-//                StructureEdit.setComponentType( c, newctype );
-//                
-//                edit.saveIfNecessary( null );
-//            }
-//            finally
-//            {
-//                edit.dispose();
-//            }
-            
-            if( monitor != null )
-            {
-                monitor.worked( 1 );
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaProjectMigrationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaProjectMigrationDataModelProperties.java
deleted file mode 100644
index 0eab85c35..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaProjectMigrationDataModelProperties.java
+++ /dev/null
@@ -1,21 +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.project.facet;
-
-
-public interface IJavaProjectMigrationDataModelProperties {
-
-	/**
-	 * Required
-	 */
-	public static final String PROJECT_NAME = "IJavaProjectMigrationDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaUtilityProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaUtilityProjectCreationDataModelProperties.java
deleted file mode 100644
index 9f9093527..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IJavaUtilityProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-public interface IJavaUtilityProjectCreationDataModelProperties {
-
-	public static final String PROJECT_NAME = "IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-	
-//	public static final String PROJECT_LOCATION = "IJavaUtilityProjectCreationDataModelProperties.PROJECT_LOCATION"; //$NON-NLS-1$	
-	
-	public static final String EAR_PROJECT_NAME = "IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
-
-	public static final String RUNTIME = "IJavaUtilityProjectCreationDataModelProperties.RUNTIME";	//$NON-NLS-1$
-	
-	public static final String SOURCE_FOLDER = "IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER";	//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IUtilityFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IUtilityFacetInstallDataModelProperties.java
deleted file mode 100644
index ce202cc17..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/IUtilityFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,18 +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.project.facet;
-
-
-
-
-public interface IUtilityFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationDataModelProvider.java
deleted file mode 100644
index 54b310108..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationDataModelProvider.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * This dataModel is a common super class used for creation of WTP Components.
- * 
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- * 
- * @plannedfor WTP 1.0
- */
-public class JavaProjectMigrationDataModelProvider extends AbstractDataModelProvider implements IJavaProjectMigrationDataModelProperties {
-
-	public void init() {
-		super.init();
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		return propertyNames;
-	}
-
-	public void propertyChanged(DataModelEvent event) {
-		if (event.getFlag() == DataModelEvent.VALUE_CHG) {
-			event.getDataModel();
-		}
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		return true;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public IStatus validate(String propertyName) {
-
-		return OK_STATUS;
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new JavaProjectMigrationOperation(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationOperation.java
deleted file mode 100644
index 4faa77ae0..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaProjectMigrationOperation.java
+++ /dev/null
@@ -1,92 +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.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-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.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-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.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-
-public class JavaProjectMigrationOperation extends AbstractDataModelOperation implements IJavaProjectMigrationDataModelProperties {
-
-
-
-	public JavaProjectMigrationOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
-
-
-		IDataModel jdm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-		
-		jdm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(PROJECT_NAME));
-
-		jdm.setProperty(IFacetDataModelProperties.FACET_VERSION, getJavaFacetVersion() ); 	
-
-		IDataModel udm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
-		try {
-			udm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(PROJECT_NAME));
-			udm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0"); //$NON-NLS-1$
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		}
-
-		IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(PROJECT_NAME));
-
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		map.add(jdm);
-		map.add(udm);
-
-		try {
-			dm.getDefaultOperation().execute(monitor, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().logError(e);
-		}
-		return OK_STATUS;
-	}
-
-	private IProjectFacetVersion getJavaFacetVersion(){
-		
-		IProject project = J2EEProjectUtilities.getProject( model.getStringProperty(PROJECT_NAME) );
-		IJavaProject jProj = JemProjectUtilities.getJavaProject( project );
-		String jdtVersion = jProj.getOption(JavaCore.COMPILER_COMPLIANCE, true );
-		
-		if (jdtVersion.startsWith("1.3")) { //$NON-NLS-1$
-			return JavaFacetUtils.JAVA_13;
-		} else if (jdtVersion.startsWith("1.4")) { //$NON-NLS-1$
-			return JavaFacetUtils.JAVA_14;
-		}else if (jdtVersion.startsWith("1.5")) { //$NON-NLS-1$
-			return JavaFacetUtils.JAVA_50;
-		}
-		return JavaFacetUtils.JAVA_60;	
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationDataModelProvider.java
deleted file mode 100644
index ae7079ec4..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationDataModelProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IUtilityJavaComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see UtilityProjectCreationDataModelProvider
- */
-public class JavaUtilityComponentCreationDataModelProvider
-	extends JavaComponentCreationDataModelProvider implements IUtilityJavaComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-			propertyNames.add(EAR_PROJECT_NAME);
-		return propertyNames;
-	}
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new JavaUtilityComponentCreationFacetOperation(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationFacetOperation.java
deleted file mode 100644
index d00d6f746..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see UtilityProjectCreationDataModelProvider
- */
-public class JavaUtilityComponentCreationFacetOperation extends J2EEComponentCreationFacetOperation implements DoNotUseMeThisWillBeDeletedPost15{
-
-	public JavaUtilityComponentCreationFacetOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-		IStatus result = OK_STATUS;
-		try {
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, (String) model.getProperty(JavaUtilityComponentCreationDataModelProvider.PROJECT_NAME));
-
-			FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			map.add(setupJavaInstallAction());
-			
-			IDataModel newModel = setupUtilityInstallAction(model);
-			map.add( newModel );
-
-			setRuntime(newModel, dm); // Setting runtime property
-			setAddToEARFromWizard(newModel);
-			result = dm.getDefaultOperation().execute(monitor, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().logError(e);
-		}
-		return result;
-	}
-
-	protected IDataModel setupUtilityInstallAction(IDataModel aDM) {
-		IDataModel dm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
-		try {
-			dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(JavaUtilityComponentCreationDataModelProvider.PROJECT_NAME));
-			dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0"); //$NON-NLS-1$
-			dm.setProperty(IUtilityFacetInstallDataModelProperties.RUNTIME_TARGET_ID, model.getProperty(JavaUtilityComponentCreationDataModelProvider.RUNTIME_TARGET_ID));
-			dm.setProperty(IUtilityFacetInstallDataModelProperties.CONFIG_FOLDER, 
-					model.getProperty(JavaUtilityComponentCreationDataModelProvider.JAVASOURCE_FOLDER));
-			dm.setStringProperty(IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME,model.getStringProperty(JavaUtilityComponentCreationDataModelProvider.EAR_PROJECT_NAME));
-			
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		}
-
-		return dm;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationDataModelProvider.java
deleted file mode 100644
index ba73143ba..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationDataModelProvider.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-
-public class JavaUtilityProjectCreationDataModelProvider
-	extends AbstractDataModelProvider implements IJavaUtilityProjectCreationDataModelProperties{
-
-	public JavaUtilityProjectCreationDataModelProvider() {
-		super();
-	}
-	
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		//propertyNames.add(PROJECT_LOCATION);
-		propertyNames.add(EAR_PROJECT_NAME);
-		propertyNames.add(RUNTIME);
-		propertyNames.add(SOURCE_FOLDER);
-		return propertyNames;
-	}
-	
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new JavaUtilityProjectCreationOperation(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationOperation.java
deleted file mode 100644
index a7baf7597..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/JavaUtilityProjectCreationOperation.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class JavaUtilityProjectCreationOperation extends AbstractDataModelOperation implements IJavaUtilityProjectCreationDataModelProperties{
-
-
-	
-	public JavaUtilityProjectCreationOperation(IDataModel model) {
-		super(model);
-	}
-	
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		
-		IStatus stat = OK_STATUS;
-		
-		String projectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME );
-		String earProjectName = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME );;
-		String javaSourceFolder = model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER );
-		
-		org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = (IRuntime) model.getProperty(IJavaUtilityProjectCreationDataModelProperties.RUNTIME);
-		
-		IDataModel dm = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
-		
-		
-		//IDataModel pdm = dm.getNestedModel( IFacetProjectCreationDataModelProperties.NESTED_PROJECT_DM );
-		//pdm.setStringProperty( IProjectCreationPropertiesNew.PROJECT_LOCATION, model.getStringProperty( IJavaUtilityProjectCreationDataModelProperties.PROJECT_LOCATION ) );
-		
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(UtilityProjectCreationDataModelProvider.FACET_DM_MAP);
-		
-		IDataModel javadm = map.getFacetDataModel( IModuleConstants.JST_JAVA );
-		IDataModel utildm = map.getFacetDataModel( J2EEProjectUtilities.UTILITY );
-		
-		
-		javadm.setProperty( JavaFacetInstallDataModelProvider.FACET_PROJECT_NAME,
-				projectName);
-		
-		
-		javadm.setProperty( JavaFacetInstallDataModelProvider.SOURCE_FOLDER_NAME,
-				javaSourceFolder);
-		
-
-		utildm.setProperty( IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME, earProjectName);
-		
-		utildm.setProperty( IUtilityFacetInstallDataModelProperties.FACET_RUNTIME, runtime );
-		dm.setProperty(UtilityProjectCreationDataModelProvider.FACET_RUNTIME, runtime);
-
-		FacetProjectCreationOperation op = new FacetProjectCreationOperation(dm);
-		try {
-			stat = op.execute( monitor, null );
-		} catch (ExecutionException e) {
-			Logger.getLogger().logError(e);
-		}
-		return stat;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDataModelProvider.java
deleted file mode 100644
index e13df8267..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class UtilityFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IUtilityFacetInstallDataModelProperties {
-	
-	public Object getDefaultProperty(String propertyName) {
-		if (FACET_ID.equals(propertyName)) {
-			return J2EEProjectUtilities.UTILITY;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
-		return 0;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
deleted file mode 100644
index 00a68edc3..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
+++ /dev/null
@@ -1,123 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.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.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class UtilityFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-
-			final IDataModel model = (IDataModel) cfg;
-
-			// Add WTP natures.
-
-			WtpUtils.addNatures(project);
-
-			// Setup the flexible project structure.
-
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-
-			c.create(0, null);
-
-			final IVirtualFolder jsrc = c.getRootFolder();
-			final IJavaProject jproj = JavaCore.create(project);
-
-			final IClasspathEntry[] cp = jproj.getRawClasspath();
-
-			for (int i = 0; i < cp.length; i++) {
-				final IClasspathEntry cpe = cp[i];
-
-				if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					IPath path = cpe.getPath().removeFirstSegments(1);
-					if (path.isEmpty()) {
-						path = new Path("/"); //$NON-NLS-1$
-					}
-					jsrc.createLink(path, 0, null);
-				}
-			}
-
-			final IWorkspace ws = ResourcesPlugin.getWorkspace();
-
-			final IVirtualFolder root = c.getRootFolder();
-
-			IContainer container = null;
-
-			if (root.getProjectRelativePath().segmentCount() == 0) {
-				container = project;
-			} else {
-				container = project.getFolder(root.getProjectRelativePath());
-			}
-
-			try {
-				if (container != null)
-					createManifest(project, container, monitor);
-			} catch (InvocationTargetException e) {
-				Logger.getLogger().logError(e);
-			} catch (InterruptedException e) {
-				Logger.getLogger().logError(e);
-			}
-
-
-			ClasspathHelper.removeClasspathEntries(project, fv);
-
-			if (!ClasspathHelper.addClasspathEntries(project, fv)) {
-				// TODO: Support the no runtime case.
-				// ClasspathHelper.addClasspathEntries( project, fv, <something> );
-			}
-
-			try {
-				((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java
deleted file mode 100644
index aec49dde7..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,79 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public final class UtilityFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try {
-
-			final IDataModel model = (IDataModel) cfg;
-
-
-			// Associate with an EAR, if necessary.
-			if (model.getBooleanProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR)) {
-				final String earProjectName = model.getStringProperty(IUtilityFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-				if (earProjectName != null && earProjectName != "") { //$NON-NLS-1$
-//					IProject earProject = ProjectUtilities.getProject(earProjectName);
-//					if (earProject.exists()) {
-//						IVirtualComponent earComp = ComponentCore.createComponent(earProject);
-//
-//						IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-//						dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-//						List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-//						modList.add(c);
-//						dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-//						try {
-//							dataModel.getDefaultOperation().execute(null, null);
-//						} catch (ExecutionException e) {
-//							Logger.getLogger().logError(e);
-//						}
-//					}
-					
-
-					final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-					
-					//final String moduleURI = project.getName() + ".jar";
-						
-					installAndAddModuletoEAR( J2EEVersionConstants.VERSION_1_4_TEXT,
-								earProjectName,
-								(IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME),
-								project,
-								moduleURI,
-								monitor );					
-				}
-			}
-
-
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
deleted file mode 100644
index a5f3eadca..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
+++ /dev/null
@@ -1,72 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class UtilityFacetUnInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
-	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
-		if (monitor != null) {
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		}
-
-		try{
-			//remove .component  file
-			IFile file = project.getFile( StructureEdit.MODULE_META_FILE_NAME );
-			file.delete( true, monitor );
-			
-			//remove manifest file
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-			final IVirtualFolder root = c.getRootFolder();
-			IContainer container = null;
-
-			if (root.getProjectRelativePath().segmentCount() == 0) {
-				container = project;
-			} else {
-				container = project.getFolder(root.getProjectRelativePath());
-			}
-			
-			IFile manifestFile = container.getFile(new Path(J2EEConstants.MANIFEST_URI));
-			manifestFile.delete( true, monitor );
-			
-			IFolder manifestFolder = container.getFolder( new Path(J2EEConstants.META_INF) );
-			manifestFolder.delete( true, monitor );
-		     
-			//remove  module core nature
-			WtpUtils.removeNatures( project );
-			
-			//remove server class path container
-			ClasspathHelper.removeClasspathEntries( project, fv );
-			
-		}finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
deleted file mode 100644
index 7750bb9dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,70 +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.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class UtilityProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
-	public UtilityProjectCreationDataModelProvider() {
-		super();
-	}
-
-	public void init() {
-		super.init();
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		IDataModel javaFacet = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-		// If applicable, keep project structure optimized by making output directory the same as the content root
-		if (ProductManager.shouldUseSingleRootStructure())
-			javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME, javaFacet.getStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME));
-		map.add(javaFacet);
-		IDataModel utilFacet = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
-		map.add(utilFacet);
-		utilFacet.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
-					if (isPropertySet(EAR_PROJECT_NAME))
-						setProperty(EAR_PROJECT_NAME, (String)event.getProperty());
-					else
-						model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
-				}else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
-					setProperty(ADD_TO_EAR, event.getProperty());
-				}
-			}
-		});	
-		
-		Collection requiredFacets = new ArrayList();
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(javaFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(utilFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if( propertyName.equals( MODULE_URI )){
-			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-			IDataModel utilFacet = map.getFacetDataModel( J2EEProjectUtilities.UTILITY );	
-			utilFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/icons/11_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/11_cmpbean_obj.gif
deleted file mode 100644
index 5db4e72ed..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/11_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/11_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/11_ejb_obj.gif
deleted file mode 100644
index 445aa374e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/11_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/11_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/11_ejbjar_obj.gif
deleted file mode 100644
index f34adc945..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/11_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/12_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/12_ear_obj.gif
deleted file mode 100644
index f66e7a922..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/12_ear_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/13_ear_obj.gif
deleted file mode 100644
index 07cd6ab2e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/13_ear_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d4d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/20_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/20_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/20_ejb_obj.gif
deleted file mode 100644
index 7dbebc448..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/20_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/20_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/20_ejbjar_obj.gif
deleted file mode 100644
index 6b594c96e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/20_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AccessIntent.gif b/plugins/org.eclipse.jst.j2ee/icons/AccessIntent.gif
deleted file mode 100644
index baf46780b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AccessIntent.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ApplClientJar.gif b/plugins/org.eclipse.jst.j2ee/icons/ApplClientJar.gif
deleted file mode 100644
index 4423578f1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ApplClientJar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptor.gif
deleted file mode 100644
index f0ff233b4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptorCreateMethodPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptorCreateMethodPermission.gif
deleted file mode 100644
index f37ae2b11..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AssemblyDescriptorCreateMethodPermission.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee/icons/AuthenticationMechanism.gif
deleted file mode 100644
index 13da128ce..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/AuthenticationMechanism.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanCache.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanCache.gif
deleted file mode 100644
index 34a760d87..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanCache.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanInstall.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanInstall.gif
deleted file mode 100644
index dd5d5d56c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanInstall.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanInternationalization.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanInternationalization.gif
deleted file mode 100644
index 8fdc9a0bc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanInternationalization.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/BeanStructure.gif b/plugins/org.eclipse.jst.j2ee/icons/BeanStructure.gif
deleted file mode 100644
index 4e4b93058..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/BeanStructure.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPAttribute.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPAttribute.gif
deleted file mode 100644
index 8f2b1d589..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPAttribute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeCreateContainerManagedEntity.gif
deleted file mode 100644
index 5a441709a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeCreateContainerManagedEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeold.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeold.gif
deleted file mode 100644
index f143c43bb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPAttributeold.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CMPKeyAttribute.gif b/plugins/org.eclipse.jst.j2ee/icons/CMPKeyAttribute.gif
deleted file mode 100644
index f438dc852..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CMPKeyAttribute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee/icons/ConfigProperty.gif
deleted file mode 100644
index 586eb816b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ConfigProperty.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Connector.gif b/plugins/org.eclipse.jst.j2ee/icons/Connector.gif
deleted file mode 100644
index c0eea5ba8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Connector.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateLicense.gif b/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateLicense.gif
deleted file mode 100644
index 11aef620b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateLicense.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateResourceAdapter.gif
deleted file mode 100644
index f37ae2b11..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ConnectorCreateResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerActivitySession.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerActivitySession.gif
deleted file mode 100644
index 29aedbcb1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerActivitySession.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntity.gif
deleted file mode 100644
index 20ed1f9a4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityCreateEntity.gif
deleted file mode 100644
index 37517a090..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityCreateEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtension.gif
deleted file mode 100644
index b8c44509a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtensionCreateEjbRelationshipRole.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtensionCreateEjbRelationshipRole.gif
deleted file mode 100644
index 93036317b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityExtensionCreateEjbRelationshipRole.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityno.gif b/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityno.gif
deleted file mode 100644
index e93cc1db2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ContainerManagedEntityno.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Copy of CreateChild.gif b/plugins/org.eclipse.jst.j2ee/icons/Copy of CreateChild.gif
deleted file mode 100644
index 81aa4a2f8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Copy of CreateChild.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/CreateChild.gif b/plugins/org.eclipse.jst.j2ee/icons/CreateChild.gif
deleted file mode 100644
index 81aa4a2f8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/CreateChild.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EAR.gif b/plugins/org.eclipse.jst.j2ee/icons/EAR.gif
deleted file mode 100644
index b5630b311..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EAR.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJar.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJar.gif
deleted file mode 100644
index f8b5c0a09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateContainerManagedEntity.gif
deleted file mode 100644
index 1e1969059..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateContainerManagedEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateEntity.gif
deleted file mode 100644
index 5a441709a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarCreateEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtension.gif
deleted file mode 100644
index 7438a9df0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtensionCreateEjbGeneralization.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtensionCreateEjbGeneralization.gif
deleted file mode 100644
index 00295179d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBJarExtensionCreateEjbGeneralization.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EJBMethodCategory.gif b/plugins/org.eclipse.jst.j2ee/icons/EJBMethodCategory.gif
deleted file mode 100644
index 7438a9df0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EJBMethodCategory.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbGeneralization.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbGeneralization.gif
deleted file mode 100644
index aa490b6e3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbGeneralization.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbKeyRelationshipRole.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbKeyRelationshipRole.gif
deleted file mode 100644
index 1b12ecf4f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbKeyRelationshipRole.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbModelFile.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbModelFile.gif
deleted file mode 100644
index dfbc52986..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbModelFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbModule.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbModule.gif
deleted file mode 100644
index f8b5c0a09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbModule.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbModuleExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbModuleExtension.gif
deleted file mode 100644
index e34cdad16..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbModuleExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationship.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbRelationship.gif
deleted file mode 100644
index bd63583f1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationship.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationshipRole.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbRelationshipRole.gif
deleted file mode 100644
index 14902a0be..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbRelationshipRole.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbextModelFile.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbextModelFile.gif
deleted file mode 100644
index dfbc52986..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbextModelFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EjbqlFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/EjbqlFinderDescriptor.gif
deleted file mode 100644
index 586eb816b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EjbqlFinderDescriptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBean.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBean.gif
deleted file mode 100644
index 586eb816b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBean.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateContainerManagedEntity.gif
deleted file mode 100644
index 99722d527..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateContainerManagedEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateEntity.gif
deleted file mode 100644
index 99722d527..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanCreateEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtension.gif
deleted file mode 100644
index c0eea5ba8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtensionCreateReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtensionCreateReadOnlyAttributes.gif
deleted file mode 100644
index 11aef620b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EnterpriseBeanExtensionCreateReadOnlyAttributes.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Entity.gif b/plugins/org.eclipse.jst.j2ee/icons/Entity.gif
deleted file mode 100644
index 2969141b8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Entity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityCreateContainerManagedEntity.gif
deleted file mode 100644
index 00295179d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityCreateContainerManagedEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityEJB.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityEJB.gif
deleted file mode 100644
index 80468117d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityEJB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityExtension.gif
deleted file mode 100644
index f0ff233b4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/EntityExtensionCreateReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/EntityExtensionCreateReadOnlyAttributes.gif
deleted file mode 100644
index f37ae2b11..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/EntityExtensionCreateReadOnlyAttributes.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/FinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/FinderDescriptor.gif
deleted file mode 100644
index 2969141b8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/FinderDescriptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/FullSelectFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/FullSelectFinderDescriptor.gif
deleted file mode 100644
index 13da128ce..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/FullSelectFinderDescriptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Identity.gif b/plugins/org.eclipse.jst.j2ee/icons/Identity.gif
deleted file mode 100644
index 51cf89f26..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Identity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModule.gif b/plugins/org.eclipse.jst.j2ee/icons/JavaClientModule.gif
deleted file mode 100644
index 12a9ed73b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModule.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModuleExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/JavaClientModuleExtension.gif
deleted file mode 100644
index 12a9ed73b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/JavaClientModuleExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/License.gif b/plugins/org.eclipse.jst.j2ee/icons/License.gif
deleted file mode 100644
index f0ff233b4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/License.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/LocalTran.gif b/plugins/org.eclipse.jst.j2ee/icons/LocalTran.gif
deleted file mode 100644
index e652041d3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/LocalTran.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodElement.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodElement.gif
deleted file mode 100644
index c3e27cdec..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodElement.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodPermission.gif
deleted file mode 100644
index db55cc72d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodPermission.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodPermissionCreateMethodElement.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodPermissionCreateMethodElement.gif
deleted file mode 100644
index 11aef620b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodPermissionCreateMethodElement.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodSessionAttribute.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodSessionAttribute.gif
deleted file mode 100644
index 6836424f3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodSessionAttribute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodTransaction.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodTransaction.gif
deleted file mode 100644
index c33f3b2c0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodTransaction.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/MethodTransactionCreateMethodElement.gif b/plugins/org.eclipse.jst.j2ee/icons/MethodTransactionCreateMethodElement.gif
deleted file mode 100644
index 93036317b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/MethodTransactionCreateMethodElement.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/PersistenceSecurityIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/PersistenceSecurityIdentity.gif
deleted file mode 100644
index adedfe31d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/PersistenceSecurityIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/ReadOnlyAttributes.gif
deleted file mode 100644
index 9f50c468b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ReadOnlyAttributes.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapter.gif
deleted file mode 100644
index b8c44509a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateAuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateAuthenticationMechanism.gif
deleted file mode 100644
index 00295179d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateAuthenticationMechanism.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateConfigProperty.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateConfigProperty.gif
deleted file mode 100644
index 37517a090..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateConfigProperty.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateSecurityPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateSecurityPermission.gif
deleted file mode 100644
index 93036317b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ResourceAdapterCreateSecurityPermission.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/RunAsMode.gif b/plugins/org.eclipse.jst.j2ee/icons/RunAsMode.gif
deleted file mode 100644
index 8ed70a4be..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/RunAsMode.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/RunAsSpecifiedIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/RunAsSpecifiedIdentity.gif
deleted file mode 100644
index 585ac7a25..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/RunAsSpecifiedIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SecurityIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/SecurityIdentity.gif
deleted file mode 100644
index 56587d89c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SecurityIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee/icons/SecurityPermission.gif
deleted file mode 100644
index 2969141b8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SecurityPermission.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/Session.gif b/plugins/org.eclipse.jst.j2ee/icons/Session.gif
deleted file mode 100644
index 507b8a82e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/Session.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateContainerManagedEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionCreateContainerManagedEntity.gif
deleted file mode 100644
index 8ac779306..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateContainerManagedEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateEntity.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionCreateEntity.gif
deleted file mode 100644
index 8ac779306..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionCreateEntity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionExtension.gif
deleted file mode 100644
index 7c28109f6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/SessionExtensionCreateReadOnlyAttributes.gif b/plugins/org.eclipse.jst.j2ee/icons/SessionExtensionCreateReadOnlyAttributes.gif
deleted file mode 100644
index 37517a090..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/SessionExtensionCreateReadOnlyAttributes.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/UseCallerIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/UseCallerIdentity.gif
deleted file mode 100644
index 8e385e997..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/UseCallerIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/UseSystemIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/UseSystemIdentity.gif
deleted file mode 100644
index cf76ebc6c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/UseSystemIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/UserFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/UserFinderDescriptor.gif
deleted file mode 100644
index 29d1aab8b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/UserFinderDescriptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WAR.gif b/plugins/org.eclipse.jst.j2ee/icons/WAR.gif
deleted file mode 100644
index 31ecb7aee..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WAR.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WebModule.gif b/plugins/org.eclipse.jst.j2ee/icons/WebModule.gif
deleted file mode 100644
index bf20f7017..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WebModule.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WebModuleExtension.gif b/plugins/org.eclipse.jst.j2ee/icons/WebModuleExtension.gif
deleted file mode 100644
index bf20f7017..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WebModuleExtension.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/WhereClauseFinderDescriptor.gif b/plugins/org.eclipse.jst.j2ee/icons/WhereClauseFinderDescriptor.gif
deleted file mode 100644
index d85a9d0b3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/WhereClauseFinderDescriptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/access_intent_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/access_intent_obj.gif
deleted file mode 100644
index caf09eaac..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/access_intent_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/access_intent_read_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/access_intent_read_obj.gif
deleted file mode 100644
index b5dd219d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/access_intent_read_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/access_intent_update_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/access_intent_update_obj.gif
deleted file mode 100644
index b3307fee3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/access_intent_update_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/appClientExt_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/appClientExt_obj.gif
deleted file mode 100644
index 910df4963..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/appClientExt_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/assemblyDescriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/assemblyDescriptor_obj.gif
deleted file mode 100644
index 405cae616..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/assemblyDescriptor_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/attributeKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/attributeKey_obj.gif
deleted file mode 100644
index 534b37a72..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/attributeKey_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/attribute_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/attribute_obj.gif
deleted file mode 100644
index cfb58e431..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/attribute_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/bmp.gif b/plugins/org.eclipse.jst.j2ee/icons/bmp.gif
deleted file mode 100644
index ebc18b587..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/bmp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/bmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/bmpEntity_obj.gif
deleted file mode 100644
index 797df138c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/bmpEntity_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/cmp.gif b/plugins/org.eclipse.jst.j2ee/icons/cmp.gif
deleted file mode 100644
index 20ed1f9a4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/cmp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/cmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/cmpEntity_obj.gif
deleted file mode 100644
index 20ed1f9a4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/cmpEntity_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/cmpField_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/cmpField_obj.gif
deleted file mode 100644
index 6c66a3d9e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/cmpField_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/deaccsintent_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/deaccsintent_ovr.gif
deleted file mode 100644
index 327c3f3f4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/deaccsintent_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/earBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/earBinding_obj.gif
deleted file mode 100644
index 2c1bc4114..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/earBinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/earExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/earExtension_obj.gif
deleted file mode 100644
index 07c56bc83..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/earExtension_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/earFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/earFile_obj.gif
deleted file mode 100644
index 4468d66ab..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/earFile_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejb16.gif b/plugins/org.eclipse.jst.j2ee/icons/ejb16.gif
deleted file mode 100644
index f8b5c0a09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejb16.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejb16old.GIF b/plugins/org.eclipse.jst.j2ee/icons/ejb16old.GIF
deleted file mode 100644
index 1e4a57cb2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejb16old.GIF
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbBinding_obj.gif
deleted file mode 100644
index c97e6eee1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbBinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbExtension_obj.gif
deleted file mode 100644
index 12184cfad..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbExtension_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbJar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbJar_obj.gif
deleted file mode 100644
index f8b5c0a09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbJar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/ejbRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/ejbRef_obj.gif
deleted file mode 100644
index 515506901..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/ejbRef_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/entitybean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/entitybean_obj.gif
deleted file mode 100644
index 20ed1f9a4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/entitybean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/entitybean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/entitybean_wiz.gif
deleted file mode 100644
index 5fb89294f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/entitybean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/error_co.gif b/plugins/org.eclipse.jst.j2ee/icons/error_co.gif
deleted file mode 100644
index 119dcccd5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/error_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/field.gif b/plugins/org.eclipse.jst.j2ee/icons/field.gif
deleted file mode 100644
index 06d38f5c8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/field.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/finder_descriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/finder_descriptor_obj.gif
deleted file mode 100644
index 5533c0bae..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/finder_descriptor_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/foreignKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/foreignKey_obj.gif
deleted file mode 100644
index d261a1de3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/foreignKey_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/frnkeyrelnshp_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/frnkeyrelnshp_ovr.gif
deleted file mode 100644
index cee9ff63e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/frnkeyrelnshp_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Field_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Field_ejb.gif
deleted file mode 100644
index 06d38f5c8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Field_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowBaseTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowBaseTypes_ejb.gif
deleted file mode 100644
index 9d8c615a8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowBaseTypes_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowGenTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowGenTypes_ejb.gif
deleted file mode 100644
index ba4b1c362..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/ShowGenTypes_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Types_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Types_ejb.gif
deleted file mode 100644
index e0ecb6a57..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/clcl16/Types_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateResourceRefBinding_defaultAuth_BasicAuthData.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateResourceRefBinding_defaultAuth_BasicAuthData.gif
deleted file mode 100644
index 453145c7d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateResourceRefBinding_defaultAuth_BasicAuthData.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateRunAsSpecifiedIdentity_identity_Identity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateRunAsSpecifiedIdentity_identity_Identity.gif
deleted file mode 100644
index 82bd4bdf3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/CreateRunAsSpecifiedIdentity_identity_Identity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_export_wiz.gif
deleted file mode 100644
index 6f83300c8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_export_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4ef..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createEJB_RDB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createEJB_RDB.gif
deleted file mode 100644
index a6627bdfa..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createEJB_RDB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createRDB_EJB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createRDB_EJB.gif
deleted file mode 100644
index c323270b8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/createRDB_EJB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejb_rdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejb_rdbmapping_wiz.gif
deleted file mode 100644
index 31748bd7f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejb_rdbmapping_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d54..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbclientjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbcomposer_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbcomposer_wiz.gif
deleted file mode 100644
index 847be21b7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/ejbcomposer_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ear_wiz.gif
deleted file mode 100644
index 2270b1717..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417c4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_rar_wiz.gif
deleted file mode 100644
index befb3d4e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_war_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/export_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_ddl.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_ddl.gif
deleted file mode 100644
index fabe5588e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_ddl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_rmic.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_rmic.gif
deleted file mode 100644
index b0fefa221..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/generate_rmic.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ear_wiz.gif
deleted file mode 100644
index 099201bb5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ejbjar_wiz.gif
deleted file mode 100644
index 5644b48df..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_rar_wiz.gif
deleted file mode 100644
index 50f25a2f7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_war_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/import_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/new_appclientproject_wiz.gif
deleted file mode 100644
index cd94cc493..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/new_appclientproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newaccessbean_wiz.gif
deleted file mode 100644
index 1e0ca041e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newaccessbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a13a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba83..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b507..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejb_wiz.gif
deleted file mode 100644
index 73561c7ab..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbex_wiz.gif
deleted file mode 100644
index 6fbde809c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbjar_wiz.gif
deleted file mode 100644
index 219e4c3df..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22bf9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadca8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/re_execute.gif
deleted file mode 100644
index 8f943a8c3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/re_execute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/table_mapping_strategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/table_mapping_strategy_wiz.gif
deleted file mode 100644
index 88d2c1307..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ctool16/table_mapping_strategy_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/data_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/data_view.gif
deleted file mode 100644
index 8f2b1d589..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/data_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ear_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ear_ed_view.gif
deleted file mode 100644
index 2800367fd..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ear_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/earext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/earext_ed_view.gif
deleted file mode 100644
index e9b34130d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/earext_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_ed_view.gif
deleted file mode 100644
index ac0972f65..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_rdbmapping_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_rdbmapping_view.gif
deleted file mode 100644
index 650671f9b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_rdbmapping_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_view.gif
deleted file mode 100644
index ac0972f65..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejb_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejbext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejbext_ed_view.gif
deleted file mode 100644
index e9b34130d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/ejbext_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_perspective.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/j2ee_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/table_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/cview16/table_view.gif
deleted file mode 100644
index b99b45cac..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/cview16/table_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Field_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Field_ejb.gif
deleted file mode 100644
index bc24f1a0a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Field_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowBaseTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowBaseTypes_ejb.gif
deleted file mode 100644
index d723a5f4d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowBaseTypes_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowGenTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowGenTypes_ejb.gif
deleted file mode 100644
index 956e8b240..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/ShowGenTypes_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Types_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Types_ejb.gif
deleted file mode 100644
index 645b1beaf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dlcl16/Types_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_export_wiz.gif
deleted file mode 100644
index f4c1946bc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_export_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_import_wiz.gif
deleted file mode 100644
index 8311eb322..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/appclient_import_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createEJB_RDB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createEJB_RDB.gif
deleted file mode 100644
index 07c8fda7a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createEJB_RDB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createRDB_EJB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createRDB_EJB.gif
deleted file mode 100644
index 4c3edb1c2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/createRDB_EJB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejb_rdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejb_rdbmapping_wiz.gif
deleted file mode 100644
index e321a4993..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejb_rdbmapping_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 849fea4f1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbclientjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbcomposer_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbcomposer_wiz.gif
deleted file mode 100644
index f3ad6c157..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/ejbcomposer_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ear_wiz.gif
deleted file mode 100644
index 0df2346e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 86f296b15..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_rar_wiz.gif
deleted file mode 100644
index 2f32b119a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_war_wiz.gif
deleted file mode 100644
index 211d4e513..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/export_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_ddl.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_ddl.gif
deleted file mode 100644
index 4cf6b348f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_ddl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_rmic.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_rmic.gif
deleted file mode 100644
index e579151f8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/generate_rmic.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ear_wiz.gif
deleted file mode 100644
index 69b92b9cb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ejbjar_wiz.gif
deleted file mode 100644
index e55397626..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_rar_wiz.gif
deleted file mode 100644
index d4d230832..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_war_wiz.gif
deleted file mode 100644
index 1cd2eb0c9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/import_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/new_appclientproject_wiz.gif
deleted file mode 100644
index bf1b02029..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/new_appclientproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newaccessbean_wiz.gif
deleted file mode 100644
index 73bdda6ac..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newaccessbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newappclient_wiz.gif
deleted file mode 100644
index 17a003614..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newappclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 36ea3b14f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newear_wiz.gif
deleted file mode 100644
index fcee4ff22..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejb_wiz.gif
deleted file mode 100644
index 96ce90f11..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbex_wiz.gif
deleted file mode 100644
index 56c4b3dc8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbjar_wiz.gif
deleted file mode 100644
index ae1d521d2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbprj_wiz.gif
deleted file mode 100644
index e92896bf6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newejbprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newservlet_wiz.gif
deleted file mode 100644
index 76b0a8f04..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newwar_wiz.gif
deleted file mode 100644
index be1414a2f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/re_execute.gif
deleted file mode 100644
index 7f056da88..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/re_execute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/table_mapping_strategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/table_mapping_strategy_wiz.gif
deleted file mode 100644
index 48314a171..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/dtool16/table_mapping_strategy_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Field_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Field_ejb.gif
deleted file mode 100644
index 06d38f5c8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Field_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowBaseTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowBaseTypes_ejb.gif
deleted file mode 100644
index 9d8c615a8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowBaseTypes_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowGenTypes_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowGenTypes_ejb.gif
deleted file mode 100644
index ba4b1c362..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/ShowGenTypes_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Types_ejb.gif b/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Types_ejb.gif
deleted file mode 100644
index e0ecb6a57..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/elcl16/Types_ejb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_export_wiz.gif
deleted file mode 100644
index 6f83300c8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_export_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4ef..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/appclient_import_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createEJB_RDB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createEJB_RDB.gif
deleted file mode 100644
index a6627bdfa..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createEJB_RDB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createRDB_EJB.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createRDB_EJB.gif
deleted file mode 100644
index c323270b8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/createRDB_EJB.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejb_rdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejb_rdbmapping_wiz.gif
deleted file mode 100644
index 31748bd7f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejb_rdbmapping_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d54..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbclientjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbcomposer_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbcomposer_wiz.gif
deleted file mode 100644
index 847be21b7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/ejbcomposer_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ear_wiz.gif
deleted file mode 100644
index 2270b1717..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417c4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_rar_wiz.gif
deleted file mode 100644
index befb3d4e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_war_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/export_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_ddl.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_ddl.gif
deleted file mode 100644
index fabe5588e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_ddl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_rmic.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_rmic.gif
deleted file mode 100644
index b0fefa221..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/generate_rmic.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ear_wiz.gif
deleted file mode 100644
index 099201bb5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ejbjar_wiz.gif
deleted file mode 100644
index 5644b48df..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_rar_wiz.gif
deleted file mode 100644
index 50f25a2f7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_war_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/import_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/new_appclientproject_wiz.gif
deleted file mode 100644
index cd94cc493..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/new_appclientproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newaccessbean_wiz.gif
deleted file mode 100644
index 1e0ca041e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newaccessbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a13a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newappclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba83..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newear_wiz.gif
deleted file mode 100644
index 8b409b507..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejb_wiz.gif
deleted file mode 100644
index 73561c7ab..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbex_wiz.gif
deleted file mode 100644
index 6fbde809c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbjar_wiz.gif
deleted file mode 100644
index 219e4c3df..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22bf9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newejbprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadca8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/re_execute.gif
deleted file mode 100644
index 8f943a8c3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/re_execute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/table_mapping_strategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/etool16/table_mapping_strategy_wiz.gif
deleted file mode 100644
index 88d2c1307..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/etool16/table_mapping_strategy_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/data_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/data_view.gif
deleted file mode 100644
index 8f2b1d589..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/data_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ear_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ear_ed_view.gif
deleted file mode 100644
index 2800367fd..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ear_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/earext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/earext_ed_view.gif
deleted file mode 100644
index e9b34130d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/earext_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_ed_view.gif
deleted file mode 100644
index ac0972f65..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_rdbmapping_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_rdbmapping_view.gif
deleted file mode 100644
index 650671f9b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_rdbmapping_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_view.gif
deleted file mode 100644
index ac0972f65..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejb_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejbext_ed_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejbext_ed_view.gif
deleted file mode 100644
index e9b34130d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/ejbext_ed_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_perspective.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/j2ee_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/table_view.gif b/plugins/org.eclipse.jst.j2ee/icons/full/eview16/table_view.gif
deleted file mode 100644
index b99b45cac..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/eview16/table_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/EJBDataTransformer.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/EJBDataTransformer.gif
deleted file mode 100644
index dbfb4e66c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/EJBDataTransformer.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/ForwardFlattenedFKComposer.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/ForwardFlattenedFKComposer.gif
deleted file mode 100644
index 40ca08bdf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/ForwardFlattenedFKComposer.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/InheritedPrimaryTableStrategy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/InheritedPrimaryTableStrategy.gif
deleted file mode 100644
index 7ca8515c5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/InheritedPrimaryTableStrategy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/PrimaryTableStrategy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/PrimaryTableStrategy.gif
deleted file mode 100644
index 64ec28652..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/PrimaryTableStrategy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/RDBMemberType.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/RDBMemberType.gif
deleted file mode 100644
index 94fddb73d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/RDBMemberType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/arraytype_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/arraytype_obj.gif
deleted file mode 100644
index 9c27c10ae..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/arraytype_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/class.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/class.gif
deleted file mode 100644
index 6279478c5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/class.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/datatype_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/datatype_obj.gif
deleted file mode 100644
index 805379da4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/datatype_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/error_co.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/error_co.gif
deleted file mode 100644
index 119dcccd5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/error_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/folder.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/folder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/form_banner.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/form_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/form_banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/home_nav.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/home_nav.gif
deleted file mode 100644
index fd0c66950..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/home_nav.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/interface.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/interface.gif
deleted file mode 100644
index 21325ca77..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/interface.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/jcu_obj.gif
deleted file mode 100644
index 36a73ace2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/jcu_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/showerr_tsk.gif
deleted file mode 100644
index c2bfdd606..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showerr_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/showwarn_tsk.gif
deleted file mode 100644
index 14009e997..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/showwarn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/warn_tsk.gif
deleted file mode 100644
index e2b751dff..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warning_co.gif b/plugins/org.eclipse.jst.j2ee/icons/full/extra/warning_co.gif
deleted file mode 100644
index ee2dac4a9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/extra/warning_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_cmpbean_obj.gif
deleted file mode 100644
index 5db4e72ed..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejb_obj.gif
deleted file mode 100644
index 445aa374e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejbjar_obj.gif
deleted file mode 100644
index f34adc945..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/11_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_deploy.gif
deleted file mode 100644
index f4e43f0d2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_obj.gif
deleted file mode 100644
index f66e7a922..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/12_ear_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_deploy.gif
deleted file mode 100644
index d8a225441..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_obj.gif
deleted file mode 100644
index 07cd6ab2e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/13_ear_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/14_ear_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/14_ear_obj.gif
deleted file mode 100644
index 54b9b1745..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/14_ear_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d4d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejb_obj.gif
deleted file mode 100644
index 7dbebc448..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejbjar_obj.gif
deleted file mode 100644
index 6b594c96e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/20_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_cmpbean_obj.gif
deleted file mode 100644
index 35835bc25..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejb_obj.gif
deleted file mode 100644
index 673ba6aa6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejbjar_wiz.gif
deleted file mode 100644
index 9dae05280..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/21_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/AbstractAuthData.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/AbstractAuthData.gif
deleted file mode 100644
index 9840795fb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/AbstractAuthData.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/BasicAuthData.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/BasicAuthData.gif
deleted file mode 100644
index 474fe9757..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/BasicAuthData.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/CompatibilityDescriptionGroup.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/CompatibilityDescriptionGroup.gif
deleted file mode 100644
index e4b530eca..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/CompatibilityDescriptionGroup.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EJBLocalRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EJBLocalRef.gif
deleted file mode 100644
index 49f813f09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EJBLocalRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRef.gif
deleted file mode 100644
index 5ca132d82..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRefBinding.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRefBinding.gif
deleted file mode 100644
index 5dac05712..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EjbRefBinding.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EnvEntry.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EnvEntry.gif
deleted file mode 100644
index 734bfbd68..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/EnvEntry.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/Identity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/Identity.gif
deleted file mode 100644
index 75a9caab7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/Identity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRef.gif
deleted file mode 100644
index 11b1dbb00..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRefBinding.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRefBinding.gif
deleted file mode 100644
index 2ceb35ee7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceEnvRefBinding.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRef.gif
deleted file mode 100644
index f7e1f5b52..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRefBinding.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRefBinding.gif
deleted file mode 100644
index 1d8d3e873..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ResourceRefBinding.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/RunAsSpecifiedIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/RunAsSpecifiedIdentity.gif
deleted file mode 100644
index 483f3c2cf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/RunAsSpecifiedIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SOAPHeader.gif
deleted file mode 100644
index 7bf99266f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SOAPHeader.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityIdentity.gif
deleted file mode 100644
index b05d25b94..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRole.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRole.gif
deleted file mode 100644
index 16472b83f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRole.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRoleRef.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRoleRef.gif
deleted file mode 100644
index 37f38ea19..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/SecurityRoleRef.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/UseCallerIdentity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/UseCallerIdentity.gif
deleted file mode 100644
index ffe70317c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/UseCallerIdentity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_obj.gif
deleted file mode 100644
index caf09eaac..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_read_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_read_obj.gif
deleted file mode 100644
index b5dd219d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_read_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_update_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_update_obj.gif
deleted file mode 100644
index b3307fee3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/access_intent_update_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/accessbean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/accessbean_obj.gif
deleted file mode 100644
index 96411b8ce..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/accessbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d54..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/annotation_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appClientExt_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appClientExt_obj.gif
deleted file mode 100644
index 910df4963..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appClientExt_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12.gif
deleted file mode 100644
index 6c304dbef..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12_deploy.gif
deleted file mode 100644
index da01785a2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_12_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13.gif
deleted file mode 100644
index 556473c02..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13_deploy.gif
deleted file mode 100644
index e1d605b6e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_13_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14.gif
deleted file mode 100644
index b2483803b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14_deploy.gif
deleted file mode 100644
index b0d08af9e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclient_14_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_deploy.gif
deleted file mode 100644
index bb973cd42..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_obj.gif
deleted file mode 100644
index 276842824..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/appclientgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/applclientJAR_obj.GIF b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/applclientJAR_obj.GIF
deleted file mode 100644
index 4423578f1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/applclientJAR_obj.GIF
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/assemblyDescriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/assemblyDescriptor_obj.gif
deleted file mode 100644
index 405cae616..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/assemblyDescriptor_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attributeKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attributeKey_obj.gif
deleted file mode 100644
index 534b37a72..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attributeKey_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attribute_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attribute_obj.gif
deleted file mode 100644
index cfb58e431..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/attribute_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_data_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_data_obj.gif
deleted file mode 100644
index 757f6d9a9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_data_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_mechanism_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_mechanism_obj.gif
deleted file mode 100644
index 30fdf97b2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_mechanism_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_table_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_table_obj.gif
deleted file mode 100644
index 6600367bf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/auth_table_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/bmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/bmpEntity_obj.gif
deleted file mode 100644
index 797df138c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/bmpEntity_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpEntity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpEntity_obj.gif
deleted file mode 100644
index 20ed1f9a4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpEntity_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_dec.gif
deleted file mode 100644
index 6c66a3d9e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_dec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_obj.gif
deleted file mode 100644
index 6c66a3d9e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/cmpField_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collaccess_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collaccess_obj.gif
deleted file mode 100644
index 8ac7ca754..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collaccess_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collincrement_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collincrement_obj.gif
deleted file mode 100644
index 2aec8796e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/collincrement_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/config_prop_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/config_prop_obj.gif
deleted file mode 100644
index bc4723920..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/config_prop_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connection_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connection_obj.gif
deleted file mode 100644
index e8efe69dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connection_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connector_module.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connector_module.gif
deleted file mode 100644
index 522c511d6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connector_module.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c65..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/connectorgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/copyhelper_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/copyhelper_ovr.gif
deleted file mode 100644
index 4b850e428..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/copyhelper_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/create_child.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/create_child.gif
deleted file mode 100644
index eb68f6376..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/create_child.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dataclass_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dataclass_ovr.gif
deleted file mode 100644
index cac40a880..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dataclass_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/db_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/db_obj.gif
deleted file mode 100644
index 8f2b1d589..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/db_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dbgroup_obj.gif
deleted file mode 100644
index 40d011d0b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/dbgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earBinding_obj.gif
deleted file mode 100644
index 2c1bc4114..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earBinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earExtension_obj.gif
deleted file mode 100644
index 07c56bc83..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earExtension_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earFile_obj.gif
deleted file mode 100644
index 4468d66ab..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/earFile_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_deploy.gif
deleted file mode 100644
index cb0af0116..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef01..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/eargroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbBinding_obj.gif
deleted file mode 100644
index c97e6eee1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbBinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbExtension_obj.gif
deleted file mode 100644
index 12184cfad..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbExtension_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbJar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbJar_obj.gif
deleted file mode 100644
index f8b5c0a09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbJar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbRef_obj.gif
deleted file mode 100644
index 515506901..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbRef_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_container_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_container_obj.gif
deleted file mode 100644
index b0adb3e59..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_container_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_local_ref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_local_ref_obj.gif
deleted file mode 100644
index be8a6c1ce..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_local_ref_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_rdbmapping_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_rdbmapping_obj.gif
deleted file mode 100644
index ed3b87bc0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_rdbmapping_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_reference.gif
deleted file mode 100644
index 515506901..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejb_reference.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientjar_obj.gif
deleted file mode 100644
index f1c715ef9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientutil_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientutil_obj.gif
deleted file mode 100644
index 51db289d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbclientutil_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_deploy.gif
deleted file mode 100644
index d85581251..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e59..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbql_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbql_obj.gif
deleted file mode 100644
index 6e9243894..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/ejbql_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f959..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/environment_entity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/envvar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/envvar_obj.gif
deleted file mode 100644
index bf043f959..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/envvar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/extwebserviceitemprovider_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/extwebserviceitemprovider_obj.gif
deleted file mode 100644
index f4cc6e3aa..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/extwebserviceitemprovider_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/finder_descriptor_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/finder_descriptor_obj.gif
deleted file mode 100644
index 5533c0bae..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/finder_descriptor_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/foreignKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/foreignKey_obj.gif
deleted file mode 100644
index d261a1de3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/foreignKey_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/form_banner.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/form_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/form_banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/group_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/group_obj.gif
deleted file mode 100644
index 2de7edd64..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/group_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/homeInt_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/homeInt_dec.gif
deleted file mode 100644
index 41f6a7af4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/homeInt_dec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a3d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/home_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/inhrelejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/inhrelejb_obj.gif
deleted file mode 100644
index ed38f2378..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/inhrelejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_obj.gif
deleted file mode 100644
index 293a4fa4d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readcom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readcom_obj.gif
deleted file mode 100644
index 71bfe6321..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readcom_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readuncom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readuncom_obj.gif
deleted file mode 100644
index acfe4db46..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_readuncom_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_repread_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_repread_obj.gif
deleted file mode 100644
index 9d489cf5a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_repread_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_serializ_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_serializ_obj.gif
deleted file mode 100644
index d7db3f2de..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/isolation_level_serializ_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/jarproject_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/jarproject_deploy.gif
deleted file mode 100644
index 4c54bf16c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/jarproject_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/javabean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/javabean_obj.gif
deleted file mode 100644
index c5b260c2a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/javabean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/keyInt_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/keyInt_dec.gif
deleted file mode 100644
index 03af38b6b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/keyInt_dec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/license_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/license_obj.gif
deleted file mode 100644
index 50e8dbd30..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/license_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/listener.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/listener.gif
deleted file mode 100644
index 232047872..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/listener.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090fe..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_home_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febec2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/local_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/manyRight_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/manyRight_dec.gif
deleted file mode 100644
index 6edba7b3e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/manyRight_dec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/message_bean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/message_bean_obj.gif
deleted file mode 100644
index 03e422acb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/message_bean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methElement_obj.gif
deleted file mode 100644
index c3e27cdec..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methElement_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methPermission_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methPermission_obj.gif
deleted file mode 100644
index db55cc72d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methPermission_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methTransaction_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methTransaction_obj.gif
deleted file mode 100644
index c33f3b2c0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methTransaction_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methods_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methods_obj.gif
deleted file mode 100644
index 4054a0ec6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/methods_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_clientapp_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_clientapp_obj.gif
deleted file mode 100644
index 0921a8e61..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_clientapp_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_ejb_obj.gif
deleted file mode 100644
index 1a7cf0ee6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_group.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_group.gif
deleted file mode 100644
index bb4d9d16b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_group.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_web_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_web_obj.gif
deleted file mode 100644
index 7a7b7a3c6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/module_web_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/msgdrivendestination_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/msgdrivendestination_obj.gif
deleted file mode 100644
index f5fdccd6f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/msgdrivendestination_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_read.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_read.gif
deleted file mode 100644
index 2c4d6cdba..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_read.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_update.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_update.gif
deleted file mode 100644
index ab1d06ff4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/opt_update.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/parameter_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/parameter_obj.gif
deleted file mode 100644
index b3e0727e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/parameter_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_read.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_read.gif
deleted file mode 100644
index 061aab07d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_read.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_update.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_update.gif
deleted file mode 100644
index 996f6ac98..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/pess_update.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_active_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_active_obj.gif
deleted file mode 100644
index 7bb71d2ba..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_active_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_inactive_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_inactive_obj.gif
deleted file mode 100644
index ebac134d2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/primaryKey_inactive_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_missing_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_missing_obj.gif
deleted file mode 100644
index ff856e195..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_missing_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_obj.gif
deleted file mode 100644
index 240d96a46..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/prjutiljar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/qname.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/qname.gif
deleted file mode 100644
index 904159880..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/qname.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/query_method_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/query_method_obj.gif
deleted file mode 100644
index 0d044049d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/query_method_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/readaheadhint_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/readaheadhint_obj.gif
deleted file mode 100644
index 3ec246234..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/readaheadhint_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/relationship_role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/relationship_role_obj.gif
deleted file mode 100644
index e42284385..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/relationship_role_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remInt_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remInt_dec.gif
deleted file mode 100644
index 44c071efb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remInt_dec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398f4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/remote_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/res_env_ref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/res_env_ref_obj.gif
deleted file mode 100644
index aed2adb9e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/res_env_ref_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resourceRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resourceRef_obj.gif
deleted file mode 100644
index f84a67a35..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resourceRef_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_adapter_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_adapter_obj.gif
deleted file mode 100644
index 959c660d7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_adapter_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_reference.gif
deleted file mode 100644
index f84a67a35..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/resource_reference.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/roleKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/roleKey_obj.gif
deleted file mode 100644
index 274a850e4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/roleKey_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/role_obj.gif
deleted file mode 100644
index b8c76f74a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/role_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_binding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_binding_obj.gif
deleted file mode 100644
index 4680b4bb3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_binding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_map_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_map_obj.gif
deleted file mode 100644
index 4b5374bb5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/run_map_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/secur_role_ref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/secur_role_ref_obj.gif
deleted file mode 100644
index 36ae1d9dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/secur_role_ref_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_identity_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_identity_obj.gif
deleted file mode 100644
index e91320f56..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_identity_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_permission_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_permission_obj.gif
deleted file mode 100644
index 873fe1a25..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_permission_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role.gif
deleted file mode 100644
index ad7903727..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_obj.gif
deleted file mode 100644
index ad7903727..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_reference.gif
deleted file mode 100644
index 0ce458a18..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/security_role_reference.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrole_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrole_obj.gif
deleted file mode 100644
index a6b251fc8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrole_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrolebinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrolebinding_obj.gif
deleted file mode 100644
index 227c74932..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/securityrolebinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/serverPaused_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/serverPaused_obj.gif
deleted file mode 100644
index dbfcf55dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/serverPaused_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 614666731..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/service_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sessionBean_obj.gif
deleted file mode 100644
index 507b8a82e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sessionBean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/session_scope.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/session_scope.gif
deleted file mode 100644
index 9d7b01234..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/session_scope.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/showwarn_tsk.gif
deleted file mode 100644
index 14009e997..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/showwarn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sql_query_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sql_query_obj.gif
deleted file mode 100644
index 72132b2d4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/sql_query_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/timout_scope.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/timout_scope.gif
deleted file mode 100644
index f1c3b1685..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/timout_scope.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/transaction_scope.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/transaction_scope.gif
deleted file mode 100644
index 4465a80db..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/transaction_scope.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/undefinedRight_dec.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/undefinedRight_dec.gif
deleted file mode 100644
index a28c716e7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/undefinedRight_dec.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/user_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/user_obj.gif
deleted file mode 100644
index 90a00147b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/user_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/utiljar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/utiljar_obj.gif
deleted file mode 100644
index ec315d5ff..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/utiljar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warBinding_obj.gif
deleted file mode 100644
index cb71fc651..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warBinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warExtension_obj.gif
deleted file mode 100644
index 9fe7971be..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warExtension_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warFile_obj.gif
deleted file mode 100644
index 067477a3b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/warFile_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServiceItemProvider_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServiceItemProvider_obj.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServiceItemProvider_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServicesFolder_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServicesFolder_obj.gif
deleted file mode 100644
index ab3039ca2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webServicesFolder_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/web_library_project_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/web_library_project_obj.gif
deleted file mode 100644
index b268385d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/web_library_project_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e39b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_deploy.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_deploy.gif
deleted file mode 100644
index fb242a513..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_obj.gif
deleted file mode 100644
index 274d361ca..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/obj16/webgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_0_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_0_ovr.gif
deleted file mode 100644
index 3bb995aac..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_0_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_1_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_1_ovr.gif
deleted file mode 100644
index 4ac772850..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_1_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_2_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_2_ovr.gif
deleted file mode 100644
index f350ae458..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_2_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_3_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_3_ovr.gif
deleted file mode 100644
index 0888d5636..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_3_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_4_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_4_ovr.gif
deleted file mode 100644
index 02affb1fd..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_4_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_5_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_5_ovr.gif
deleted file mode 100644
index f3f364be3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/1_5_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_0_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_0_ovr.gif
deleted file mode 100644
index 80b105fbe..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_0_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_1_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_1_ovr.gif
deleted file mode 100644
index 687276584..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_1_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_2_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_2_ovr.gif
deleted file mode 100644
index 77a2bd007..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_2_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_3_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_3_ovr.gif
deleted file mode 100644
index 7c714881d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_3_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_4_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_4_ovr.gif
deleted file mode 100644
index 39e6f80c1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/2_4_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/caller_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/caller_ovr.gif
deleted file mode 100644
index 552337a76..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/caller_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca57e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc69..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/database_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/database_ovr.gif
deleted file mode 100644
index 2ab322dc7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/database_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d66..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejbql_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejbql_ovr.gif
deleted file mode 100644
index 4081d4c37..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/ejbql_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c473c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/fullselect_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/fullselect_ovr.gif
deleted file mode 100644
index d1bb3ee64..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/fullselect_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/home_interf_ov.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/home_interf_ov.gif
deleted file mode 100644
index 3cbfe780f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/home_interf_ov.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/key_interf_ov.gif
deleted file mode 100644
index 307044047..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/key_interf_ov.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_home_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_home_ovr.gif
deleted file mode 100644
index d7827341f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_home_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_ovr.gif
deleted file mode 100644
index 43e165576..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/local_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/optimistic_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/optimistic_ovr.gif
deleted file mode 100644
index f7c71fb2f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/optimistic_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/remote_interf_ov.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/remote_interf_ov.gif
deleted file mode 100644
index 19c9cae05..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/remote_interf_ov.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/securityrole_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/securityrole_ovr.gif
deleted file mode 100644
index 2b61ab3a1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/securityrole_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_config_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_config_ovr.gif
deleted file mode 100644
index d041bd028..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_config_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_inst_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_inst_ovr.gif
deleted file mode 100644
index e8c91ac81..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_inst_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_ovr.gif
deleted file mode 100644
index b5e8b3f9b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/server_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/user_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/user_ovr.gif
deleted file mode 100644
index b8797f34f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/user_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e96177a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/whereclause_ovr.GIF b/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/whereclause_ovr.GIF
deleted file mode 100644
index 987b661fb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/ovr16/whereclause_ovr.GIF
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/1x_cmpbean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/1x_cmpbean_palette_obj.gif
deleted file mode 100644
index 99e75dd40..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/1x_cmpbean_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/2x_cmpbean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/2x_cmpbean_palette_obj.gif
deleted file mode 100644
index b81d5ef9f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/2x_cmpbean_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/bmpEntity_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/bmpEntity_palette_obj.gif
deleted file mode 100644
index 595d7e8da..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/bmpEntity_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_rdbmapping_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_rdbmapping_palette_obj.gif
deleted file mode 100644
index d4f0b47bd..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_rdbmapping_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_reference_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_reference_palette_obj.gif
deleted file mode 100644
index 6052360ee..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/ejb_reference_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/inherelejb_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/inherelejb_palette_obj.gif
deleted file mode 100644
index 8c2ca928f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/inherelejb_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/message_bean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/message_bean_palette_obj.gif
deleted file mode 100644
index 804fabd04..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/message_bean_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/relationship_role_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/relationship_role_palette_obj.gif
deleted file mode 100644
index ef7a20c72..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/relationship_role_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/sessionBean_palette_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/pal24/sessionBean_palette_obj.gif
deleted file mode 100644
index 1400d5e7c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/pal24/sessionBean_palette_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_cmpbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_cmpbean_wiz.gif
deleted file mode 100644
index 5999ae8b2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_cmpbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejb_wiz.gif
deleted file mode 100644
index a92a7a938..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejbjar_wiz.gif
deleted file mode 100644
index 561a70bfc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/11_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/12_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/12_ear_wiz.gif
deleted file mode 100644
index 1cb420fe9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/12_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/13_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/13_ear_wiz.gif
deleted file mode 100644
index 78fe9f19e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/13_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_cmpbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_cmpbean_wiz.gif
deleted file mode 100644
index f2396419a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_cmpbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejb_wiz.gif
deleted file mode 100644
index 973509301..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejbjar_wiz.gif
deleted file mode 100644
index f7b2b9dc1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/20_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/Serviceref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/Serviceref_wiz.gif
deleted file mode 100644
index 3d8bca824..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/Serviceref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/access_intent_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/access_intent_wiz.gif
deleted file mode 100644
index 56ed87065..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/access_intent_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/accessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/accessbean_wiz.gif
deleted file mode 100644
index c2cfbc707..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/accessbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/add_mess_dest_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/add_mess_dest_wiz_ban.gif
deleted file mode 100644
index f9941cec6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/add_mess_dest_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_export_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_export_wiz.gif
deleted file mode 100644
index f0ef22af2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_export_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_import_wiz.gif
deleted file mode 100644
index e5900ab9d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_import_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 860fcec4c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/attribute_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/attribute_wiz.gif
deleted file mode 100644
index 8a70e59bc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/attribute_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/beanselection_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/beanselection_wiz.gif
deleted file mode 100644
index a7e02b9f2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/beanselection_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/bmp_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/bmp_bean_wiz.gif
deleted file mode 100644
index a07867dcb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/bmp_bean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/cmp_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/cmp_bean_wiz.gif
deleted file mode 100644
index d709d1cf8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/cmp_bean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/del_clientview_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/del_clientview_wiz.gif
deleted file mode 100644
index 5a282f746..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/del_clientview_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 1a8b12752..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earimport_wiz.gif
deleted file mode 100644
index 2b9447f3f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earpub_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earpub_wiz.gif
deleted file mode 100644
index d93b329b2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/earpub_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_module_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_module_wiz.gif
deleted file mode 100644
index aab29948f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_module_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_ref_wiz.gif
deleted file mode 100644
index dc55d2af0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_ref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_utility_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_utility_wiz.gif
deleted file mode 100644
index 58f927b8c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_utility_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_wiz.gif
deleted file mode 100644
index fe5e26820..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbbinding_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbbinding_wiz.gif
deleted file mode 100644
index 8dee6c065..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbbinding_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbclientjar_wizban.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbclientjar_wizban.gif
deleted file mode 100644
index 231da6174..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbclientjar_wizban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbcomposerbanner_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbcomposerbanner_wiz.gif
deleted file mode 100644
index 34324ffa3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbcomposerbanner_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexample_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexample_wiz.gif
deleted file mode 100644
index 53bcb2e9b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexample_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexport_wiz.gif
deleted file mode 100644
index 4ca8448ad..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbexport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbimport_wiz.gif
deleted file mode 100644
index d123519da..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbjar_wiz.gif
deleted file mode 100644
index 13941e3bf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e05..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbql_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbql_wiz.gif
deleted file mode 100644
index 0ea27cae5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbql_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbrdbmapping_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbrdbmapping_wiz.gif
deleted file mode 100644
index d8dbc32c5..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/ejbrdbmapping_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_ref_wiz.gif
deleted file mode 100644
index e50f828be..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_ref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_variable_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_variable_wiz.gif
deleted file mode 100644
index 2918928d1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/env_variable_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 532a40efb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index f56f9e0fa..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index da3116862..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1adc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index 649eacd5f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 34418d941..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_class_file_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_class_file_wiz_ban.gif
deleted file mode 100644
index 81b1e3f61..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_class_file_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 9da81ce37..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index 786c86435..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4f6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d38..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/inheritance_hierarchy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/inheritance_hierarchy_wiz.gif
deleted file mode 100644
index 305d22e0a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/inheritance_hierarchy_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/isolationlevel_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/isolationlevel_wiz.gif
deleted file mode 100644
index 64c541619..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/isolationlevel_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javaprj_to_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javaprj_to_ear_wiz.gif
deleted file mode 100644
index 01e38ccbd..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javaprj_to_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javavisualeditor_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javavisualeditor_wiz.gif
deleted file mode 100644
index 2d51013d9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/javavisualeditor_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/local_ejb_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/local_ejb_ref_wiz.gif
deleted file mode 100644
index 34f12faba..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/local_ejb_ref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/message_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/message_bean_wiz.gif
deleted file mode 100644
index ad25134a1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/message_bean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/messdestref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/messdestref_wiz.gif
deleted file mode 100644
index b7067480a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/messdestref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_permission_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_permission_wiz.gif
deleted file mode 100644
index caa95c9be..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_permission_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_transaction_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_transaction_wiz.gif
deleted file mode 100644
index f692e8334..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/method_transaction_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_appclientproject_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_appclientproject_wiz.gif
deleted file mode 100644
index c4d2fdeb6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_appclientproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_clientview_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_clientview_wiz.gif
deleted file mode 100644
index e9dc4573e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/new_clientview_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newaccessbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newaccessbean_wiz.gif
deleted file mode 100644
index b32f60402..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newaccessbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newappclientprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newappclientprj_wiz.gif
deleted file mode 100644
index cf4f00751..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newappclientprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newconnectionprj_wiz.gif
deleted file mode 100644
index 231f8d3e7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newear_wiz.gif
deleted file mode 100644
index 465f7afea..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejb_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejb_wiz.gif
deleted file mode 100644
index 8a69ebec0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejb_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbex_wiz.gif
deleted file mode 100644
index 16447fba1..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbjar_wiz.gif
deleted file mode 100644
index 79829c2b3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbprj_wiz.gif
deleted file mode 100644
index b4b8b14af..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newejbprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newfilter_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newfilter_wiz.gif
deleted file mode 100644
index f4b4d0839..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newfilter_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newlistener_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newlistener_wiz.gif
deleted file mode 100644
index 1be71d591..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newlistener_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a52..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwar_wiz.gif
deleted file mode 100644
index d964e2e56..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242bf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwebex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e924..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/preload_relationship_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/preload_relationship_wiz.gif
deleted file mode 100644
index f757600d0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/preload_relationship_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/regenabn_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/regenabn_wiz.gif
deleted file mode 100644
index b80914e02..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/regenabn_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/relationship_role_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/relationship_role_wiz.gif
deleted file mode 100644
index 0f483808c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/relationship_role_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/replace_role_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/replace_role_wiz.gif
deleted file mode 100644
index 2dc52d4eb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/replace_role_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/resource_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/resource_ref_wiz.gif
deleted file mode 100644
index 0d6323e77..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/resource_ref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_ref_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_ref_wiz.gif
deleted file mode 100644
index 42294884c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_ref_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_wiz.gif
deleted file mode 100644
index e05db64d3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/secur_role_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/security_identity_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/security_identity_wiz.gif
deleted file mode 100644
index ee031726c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/security_identity_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/selectbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/selectbean_wiz.gif
deleted file mode 100644
index 013845164..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/selectbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/session_bean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/session_bean_wiz.gif
deleted file mode 100644
index dfa3648f3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/session_bean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/sql_query_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/sql_query_wiz.gif
deleted file mode 100644
index 0a3ee60dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/sql_query_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/tablemappingstrategy_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/tablemappingstrategy_wiz.gif
deleted file mode 100644
index fad2d5976..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/tablemappingstrategy_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/user_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/user_wiz.gif
deleted file mode 100644
index 7d771ef18..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/user_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/usergroup_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/usergroup_wiz.gif
deleted file mode 100644
index 7e3c9291c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/usergroup_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index 2d8c0479c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d25124251..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warexport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe947..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/full/wizban/warimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/getstart_a.GIF b/plugins/org.eclipse.jst.j2ee/icons/getstart_a.GIF
deleted file mode 100644
index 6331e65e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/getstart_a.GIF
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee/icons/initializ_parameter.gif
deleted file mode 100644
index b902ea3ea..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/initializ_parameter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readcom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readcom_obj.gif
deleted file mode 100644
index 71bfe6321..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readcom_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readuncom_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readuncom_obj.gif
deleted file mode 100644
index acfe4db46..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_readuncom_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_repread_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_repread_obj.gif
deleted file mode 100644
index 9d489cf5a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_repread_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_serializ_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/isolation_level_serializ_obj.gif
deleted file mode 100644
index d7db3f2de..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/isolation_level_serializ_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/jar_nonexist_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/jar_nonexist_obj.gif
deleted file mode 100644
index 0c2ab2195..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/jar_nonexist_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/jar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/jar_obj.gif
deleted file mode 100644
index ec315d5ff..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/jar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/java_prop.gif b/plugins/org.eclipse.jst.j2ee/icons/java_prop.gif
deleted file mode 100644
index 49873f49e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/java_prop.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/key.gif b/plugins/org.eclipse.jst.j2ee/icons/key.gif
deleted file mode 100644
index 03af38b6b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/key.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/message_bean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/message_bean_obj.gif
deleted file mode 100644
index 03e422acb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/message_bean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/methElement_obj.gif
deleted file mode 100644
index c3e27cdec..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/methElement_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/methPermission_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/methPermission_obj.gif
deleted file mode 100644
index db55cc72d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/methPermission_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/methTransaction_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/methTransaction_obj.gif
deleted file mode 100644
index c33f3b2c0..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/methTransaction_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/msgdrivenbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/msgdrivenbean_wiz.gif
deleted file mode 100644
index 30eae5053..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/msgdrivenbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/newjprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/newjprj_wiz.gif
deleted file mode 100644
index 6d137cd38..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/newjprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/componentscopedref.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/componentscopedref.gif
deleted file mode 100644
index 120b02086..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/componentscopedref.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/handler.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/handler.gif
deleted file mode 100644
index 1c8339c9f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/handler.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/localencodingmapping_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/localencodingmapping_obj.gif
deleted file mode 100644
index 82555b91e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/localencodingmapping_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/messdestref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/messdestref_obj.gif
deleted file mode 100644
index c6830d00f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/messdestref_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/portcomponent.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/portcomponent.gif
deleted file mode 100644
index b930e2d09..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/portcomponent.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/qname.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/qname.gif
deleted file mode 100644
index 904159880..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/qname.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref.gif
deleted file mode 100644
index 670c5c92e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref_obj.gif
deleted file mode 100644
index 2efd1a59f..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/serviceref_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/obj16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee/icons/obj16/webservicedesc.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/obj16/webservicedesc.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_active_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/primaryKey_active_obj.gif
deleted file mode 100644
index 7bb71d2ba..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_active_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_inactive_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/primaryKey_inactive_obj.gif
deleted file mode 100644
index ebac134d2..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/primaryKey_inactive_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/rdaheadhint_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/rdaheadhint_obj.gif
deleted file mode 100644
index 3ec246234..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/rdaheadhint_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/resourceRef_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/resourceRef_obj.gif
deleted file mode 100644
index f84a67a35..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/resourceRef_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/role.gif b/plugins/org.eclipse.jst.j2ee/icons/role.gif
deleted file mode 100644
index 6edba7b3e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/role.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/roleKey_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/roleKey_obj.gif
deleted file mode 100644
index 274a850e4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/roleKey_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/role_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/role_obj.gif
deleted file mode 100644
index b8c76f74a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/role_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/roleid_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/roleid_obj.gif
deleted file mode 100644
index b68316272..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/roleid_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/serverPaused_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/serverPaused_obj.gif
deleted file mode 100644
index dbfcf55dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/serverPaused_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a82e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/sessionBean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/sessionbean_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/sessionbean_wiz.gif
deleted file mode 100644
index b9a8d7124..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/sessionbean_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warBinding_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/warBinding_obj.gif
deleted file mode 100644
index cb71fc651..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warBinding_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warExtension_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/warExtension_obj.gif
deleted file mode 100644
index 9fe7971be..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warExtension_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/warFile_obj.gif
deleted file mode 100644
index 31ecb7aee..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warFile_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee/icons/warn_tsk.gif
deleted file mode 100644
index e2b751dff..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/warning_co.gif b/plugins/org.eclipse.jst.j2ee/icons/warning_co.gif
deleted file mode 100644
index ee2dac4a9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/warning_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/web_application.gif b/plugins/org.eclipse.jst.j2ee/icons/web_application.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/web_application.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowDown.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowDown.gif
deleted file mode 100644
index 91e708f7c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowDown.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowUp.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowUp.gif
deleted file mode 100644
index 906051150..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/ArrowUp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/add_column.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/add_column.gif
deleted file mode 100644
index 256e5a0a3..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/add_column.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/connection.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/connection.gif
deleted file mode 100644
index e8efe69dc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/connection.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/convertlinks_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/convertlinks_wiz.gif
deleted file mode 100644
index 3d75cb53a..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/convertlinks_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/default.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/default.gif
deleted file mode 100644
index 52bac3646..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/default.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportftp_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportftp_wiz.gif
deleted file mode 100644
index fc66e9ea7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportftp_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importftp_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importftp_wiz.gif
deleted file mode 100644
index 400e049ed..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importftp_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importhttp_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importhttp_wiz.gif
deleted file mode 100644
index 41768717c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importhttp_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/importwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/method.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/method.gif
deleted file mode 100644
index e33651358..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/method.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/methodreturn.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/methodreturn.gif
deleted file mode 100644
index 268ae7afc..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/methodreturn.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebex_wiz.gif
deleted file mode 100644
index 43e86dbfd..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d1c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/warFile_obj.gif
deleted file mode 100644
index 31ecb7aee..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/warFile_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_application.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_application.gif
deleted file mode 100644
index d2a041b39..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_application.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_ovr.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_ovr.gif
deleted file mode 100644
index e0dd2d85c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/ctool16/web_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/linksview16/mailto_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/linksview16/mailto_view.gif
deleted file mode 100644
index 23f12fa33..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/linksview16/mailto_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/ascii.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/ascii.gif
deleted file mode 100644
index ef3028807..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/ascii.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/binary.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/binary.gif
deleted file mode 100644
index 17633ae45..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/binary.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f959..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/environment_entity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/java_properties.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/java_properties.gif
deleted file mode 100644
index 49873f49e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/java_properties.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/method_return.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/method_return.gif
deleted file mode 100644
index d528595b4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/method_return.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/projlib_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/projlib_obj.gif
deleted file mode 100644
index 6912defa4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/projlib_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/obj16/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/sample16/folder.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/sample16/folder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/sample16/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFile.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFile.gif
deleted file mode 100644
index ef3028807..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFolder.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFolder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/thumbnail16/defaultFolder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/colourpal_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/colourpal_view.gif
deleted file mode 100644
index 5a04dae01..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/colourpal_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/gallery_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/gallery_view.gif
deleted file mode 100644
index 9f779e421..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/gallery_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/links_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/links_view.gif
deleted file mode 100644
index 5fd9c9494..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/links_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/sample.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/sample.gif
deleted file mode 100644
index bda81f7da..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/sample.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/thumbnail_view.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/thumbnail_view.gif
deleted file mode 100644
index ababbcafe..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/view16/thumbnail_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftpimport_wiz.gif
deleted file mode 100644
index 56c8c3bb9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftpimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftppub_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftppub_wiz.gif
deleted file mode 100644
index efb2bd4ec..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/ftppub_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/httpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/httpimport_wiz.gif
deleted file mode 100644
index 71c8182d7..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/httpimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242bf..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwebex_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e924..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/newwprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d25124251..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warexport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe947..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webtoolsicons/full/wizban/warimport_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejb_obj.gif
deleted file mode 100644
index 445aa374e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejbjar_obj.gif
deleted file mode 100644
index f34adc945..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/11_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejb_obj.gif
deleted file mode 100644
index 7dbebc448..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejbjar_obj.gif
deleted file mode 100644
index 6b594c96e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/20_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/ServletCreateInitParam.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/ServletCreateInitParam.gif
deleted file mode 100644
index e12289b3c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/ServletCreateInitParam.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebAppCreateContextParam.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebAppCreateContextParam.gif
deleted file mode 100644
index 8450a6f0e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebAppCreateContextParam.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebResourceCollectionCreateURLPatternType.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebResourceCollectionCreateURLPatternType.gif
deleted file mode 100644
index 9f75eb094..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/WebResourceCollectionCreateURLPatternType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/authority_constraint.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/authority_constraint.gif
deleted file mode 100644
index 5b64c4d75..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/authority_constraint.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/create_child.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/create_child.gif
deleted file mode 100644
index eb68f6376..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/create_child.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/error_page.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/error_page.gif
deleted file mode 100644
index 811b21bbb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/error_page.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/errorcode_errorpage.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/errorcode_errorpage.gif
deleted file mode 100644
index 811b21bbb..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/errorcode_errorpage.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/exception_type_errorpage.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/exception_type_errorpage.gif
deleted file mode 100644
index 184556359..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/exception_type_errorpage.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter.gif
deleted file mode 100644
index 0712d1ed9..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter_mapping.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter_mapping.gif
deleted file mode 100644
index 8f2e36ba6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/filter_mapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/form_login_config.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/form_login_config.gif
deleted file mode 100644
index e3fcbb1e6..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/form_login_config.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a52..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/full/wizban/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/http_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/http_type.gif
deleted file mode 100644
index b26c71d2e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/http_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter.gif
deleted file mode 100644
index 162a57805..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter_context.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter_context.gif
deleted file mode 100644
index 162a57805..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/initializ_parameter_context.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_library_reference.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_library_reference.gif
deleted file mode 100644
index 997b50c69..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_library_reference.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_type.gif
deleted file mode 100644
index 8a6367542..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/jsp_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/listener.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/listener.gif
deleted file mode 100644
index 232047872..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/listener.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/mime_mapping.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/mime_mapping.gif
deleted file mode 100644
index b64775883..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/mime_mapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/newservlet_wiz.gif
deleted file mode 100644
index f45eadca8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_constraint.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_constraint.gif
deleted file mode 100644
index d155408e8..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_constraint.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_role_nametype.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_role_nametype.gif
deleted file mode 100644
index e91320f56..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/security_role_nametype.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_mapping.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_mapping.gif
deleted file mode 100644
index c495ac8c4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_mapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_type.gif
deleted file mode 100644
index c4a9d210b..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/servlet_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/session_config.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/session_config.gif
deleted file mode 100644
index 7b2c1f750..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/session_config.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/url_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/url_type.gif
deleted file mode 100644
index b26c71d2e..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/url_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/user_data_constraint.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/user_data_constraint.gif
deleted file mode 100644
index 25dc9c892..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/user_data_constraint.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_application.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_application.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_application.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_resource_collection.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_resource_collection.gif
deleted file mode 100644
index acba7cb36..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_resource_collection.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_type.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_type.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/web_type.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_12.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_12.gif
deleted file mode 100644
index 7646c44a4..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_12.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_13.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_13.gif
deleted file mode 100644
index fec24d632..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/webapp_13.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_file.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_file.gif
deleted file mode 100644
index d7dab830d..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_file.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_list.gif b/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_list.gif
deleted file mode 100644
index f4c713273..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/webuiIcons/welcome_list.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/icons/xml_image.gif b/plugins/org.eclipse.jst.j2ee/icons/xml_image.gif
deleted file mode 100644
index 1496cba65..000000000
--- a/plugins/org.eclipse.jst.j2ee/icons/xml_image.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
deleted file mode 100644
index 5a6a6c2f7..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
+++ /dev/null
@@ -1,241 +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.componentcore;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModel;
-import org.eclipse.jst.common.jdt.internal.integration.WorkingCopyManager;
-import org.eclipse.jst.common.jdt.internal.integration.WorkingCopyProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * <p>
- * EnterpriseArtifactEdit obtains a type-specific J2EE metamodel from the managed
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}. The underlying EditModel maintains
- * {@see org.eclipse.emf.ecore.resource.Resource}s, such as the J2EE deployment descriptor
- * resource. The defined methods extract data or manipulate the contents of the underlying resource.
- * </p>
- * 
- * <p>
- * This class is an abstract class, and clients are intended to subclass and own their
- * implementation.
- * </p>
- */
-public abstract class EnterpriseArtifactEdit extends ArtifactEdit implements WorkingCopyProvider {
-
-	/**
-	 * 
-	 */
-	protected EnterpriseArtifactEdit() {
-		super();
-	}
-
-	public EnterpriseArtifactEdit(IVirtualComponent aModule){
-		super(aModule);
-	}
-	
-	
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	public EnterpriseArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-	
-	/**
-	 * @param aHandle
-	 * @param toAccessAsReadOnly
-	 * @throws IllegalArgumentException
-	 */
-	protected EnterpriseArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate, String projectType) throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly, forCreate, projectType);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see ArtifactEditModel}.
-	 * </p>
-	 * <p>
-	 * Clients that use this constructor are required to release their access of the EditModel when
-	 * finished. Calling {@see ArtifactEdit#dispose()}will not touch the supplied EditModel.
-	 * </p>
-	 * 
-	 * @param anArtifactEditModel
-	 *            A valid, properly-accessed EditModel
-	 */
-	public EnterpriseArtifactEdit(ArtifactEditModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Creates an instance facade for the given {@see WorkbenchComponent}.
-	 * </p>
-	 * <p>
-	 * Instances of EnterpriseArtifactEdit that are returned through this method must be
-	 * {@see #dispose()}ed of when no longer in use.
-	 * </p>
-	 * <p>
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * </p>
-	 * 
-	 * @param aNature
-	 *            A non-null {@see ModuleCoreNature}&nbsp;for an accessible project
-	 * @param aModule
-	 *            A non-null {@see WorkbenchComponent}&nbsp;pointing to a module from the given
-	 *            {@see ModuleCoreNature}
-	 */
-
-	protected EnterpriseArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
-		super(aNature, aModule, toAccessAsReadOnly);
-	}
-
-	/**
-	 * <p>
-	 * Retrieves J2EE version information from deployment descriptor resource.
-	 * </p>
-	 * 
-	 * @return An the J2EE Specification version of the underlying {@see WorkbenchComponent}
-	 * 
-	 */
-	public abstract int getJ2EEVersion();
-
-	/**
-	 * <p>
-	 * Retrieves a deployment descriptor resource from {@see ArtifactEditModel}using a defined URI.
-	 * </p>
-	 * 
-	 * @return The correct deployment descriptor resource for the underlying
-	 *         {@see WorkbenchComponent}
-	 * 
-	 */
-	public abstract Resource getDeploymentDescriptorResource();
-
-	/**
-	 * <p>
-	 * Obtains the root object from a deployment descriptor resource, the root object contains all
-	 * other resource defined objects. Examples of a deployment descriptor root include:
-	 * {@see org.eclipse.jst.j2ee.webapplication.WebApp},
-	 * {@see org.eclipse.jst.j2ee.application.Application}, and
-	 * {@see org.eclipse.jst.j2ee.ejb.EJBJar}
-	 * </p>
-	 * <p>
-	 * Subclasses may extend this method to perform their own deployment descriptor creataion/
-	 * retrieval.
-	 * </p>
-	 * 
-	 * @return An EMF metamodel object representing the J2EE deployment descriptor
-	 * 
-	 */
-
-	public EObject getDeploymentDescriptorRoot() {
-		Resource res = getDeploymentDescriptorResource();
-		return (EObject) res.getContents().get(0);
-	}
-
-	/**
-	 * Returns a working copy managet
-	 * 
-	 * @return
-	 */
-
-	public WorkingCopyManager getWorkingCopyManager() {
-		if(isBinary()){
-			throwAttemptedBinaryEditModelAccess();
-		}
-		return ((JavaArtifactEditModel)getArtifactEditModel()).getWorkingCopyManager();
-	}
-	
-	/**
-	 * 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 ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
-		if (isReadOnly())
-			return null;
-		return getWorkingCopyManager().getWorkingCopy(cu, forNewCU);
-	}
-
-	/**
-	 * 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 ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws org.eclipse.core.runtime.CoreException {
-		return getWorkingCopyManager().getExistingWorkingCopy(cu);
-	}
-
-	public URI getModuleLocation(String moduleName) {
-		if (getProject()!=null)
-			return ModuleURIUtil.fullyQualifyURI(getProject());
-		return null;
-	}
-
-	/**
-	 * This will delete
-	 * 
-	 * @cu from the workbench and fix the internal references for this working copy manager.
-	 */
-	public void delete(org.eclipse.jdt.core.ICompilationUnit cu, org.eclipse.core.runtime.IProgressMonitor monitor) {
-		getWorkingCopyManager().delete(cu, monitor);
-	}
-
-	/**
-	 * <p>
-	 * Create an deployment descriptor resource if one does not get and return it. Subclasses should
-	 * overwrite this method to create their own type of deployment descriptor
-	 * </p>
-	 * 
-	 * @return an EObject
-	 */
-
-	public abstract EObject createModelRoot();
-
-	/**
-	 * <p>
-	 * Create an deployment descriptor resource if one does not get and return it. Subclasses should
-	 * overwrite this method to create their own type of deployment descriptor
-	 * </p>
-	 * 
-	 * @param int
-	 *            version of the component
-	 * @return an EObject
-	 */
-
-	public abstract EObject createModelRoot(int version);
-	
-	
-	public Archive asArchive(boolean includeSource) throws OpenFailureException{
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualArchiveComponent.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualArchiveComponent.java
deleted file mode 100644
index 84d9daf95..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualArchiveComponent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.j2ee.componentcore;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.componentcore.EnterpriseBinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class J2EEModuleVirtualArchiveComponent extends VirtualArchiveComponent {
-
-	private static final IVirtualReference[] NO_REFERENCES = new VirtualReference[0];
-
-	protected String[] manifestClasspath;
-
-	public J2EEModuleVirtualArchiveComponent(IProject aComponentProject, String archiveLocation, IPath aRuntimePath) {
-		super(aComponentProject, archiveLocation, aRuntimePath);
-	}
-
-	public IVirtualReference[] getReferences() {
-		List dynamicReferences = J2EEModuleVirtualComponent.getManifestReferences(this, null);
-		if (null == dynamicReferences) {
-			return NO_REFERENCES;
-		}
-		return (IVirtualReference[]) dynamicReferences.toArray(new IVirtualReference[dynamicReferences.size()]);
-	}
-
-	public String[] getManifestClasspath() {
-		if (null == manifestClasspath) {
-			Archive archive = EnterpriseBinaryComponentHelper.ArchiveCache.getInstance().getArchive(this);
-			if (null == archive) {
-				EnterpriseBinaryComponentHelper helper = EnterpriseBinaryComponentHelper.getHelper(this);
-				try {
-					archive = helper.accessArchive();
-					ArchiveManifest manifest = archive.getManifest();
-					manifestClasspath = manifest.getClassPathTokenized();
-				} catch (Exception e) {
-				} finally {
-					if (null != archive) {
-						archive.close();
-					}
-					if (null != helper) {
-						helper.dispose();
-					}
-				}
-			} else {
-				ArchiveManifest manifest = archive.getManifest();
-				manifestClasspath = manifest.getClassPathTokenized();
-			}
-
-			if (manifestClasspath == null) {
-				manifestClasspath = new String[0];
-			}
-		}
-		return manifestClasspath;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
deleted file mode 100644
index e6f13665a..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
+++ /dev/null
@@ -1,185 +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.componentcore;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-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.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
-import org.eclipse.wst.common.componentcore.internal.util.IComponentImplFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class J2EEModuleVirtualComponent extends VirtualComponent implements IComponentImplFactory {
-
-	public J2EEModuleVirtualComponent() {
-		super();
-	}
-
-	public J2EEModuleVirtualComponent(IProject aProject, IPath aRuntimePath) {
-		super(aProject, aRuntimePath);
-	}
-
-	public IVirtualComponent createComponent(IProject aProject) {
-		return new J2EEModuleVirtualComponent(aProject, new Path("/")); //$NON-NLS-1$
-	}
-
-	public IVirtualComponent createArchiveComponent(IProject aProject, String archiveLocation, IPath aRuntimePath) {
-		return new J2EEModuleVirtualArchiveComponent(aProject, archiveLocation, aRuntimePath);
-	}
-	
-	public IVirtualFolder createFolder(IProject aProject, IPath aRuntimePath) {
-		return new VirtualFolder(aProject, aRuntimePath);
-	}
-	
-	public IVirtualReference[] getReferences() {
-		IVirtualReference[] hardReferences = getNonManifestReferences();
-		List dynamicReferences = J2EEModuleVirtualComponent.getManifestReferences(this, hardReferences);
-
-		IVirtualReference[] references = null;
-		if (dynamicReferences == null) {
-			references = hardReferences;
-		} else {
-			references = new IVirtualReference[hardReferences.length + dynamicReferences.size()];
-			System.arraycopy(hardReferences, 0, references, 0, hardReferences.length);
-			for (int i = 0; i < dynamicReferences.size(); i++) {
-				references[hardReferences.length + i] = (IVirtualReference) dynamicReferences.get(i);
-			}
-		}
-		return references;
-	}
-	
-	public IVirtualReference[] getNonManifestReferences() {
-		return super.getReferences();
-	}
-
-	public static String [] getManifestClasspath(IVirtualComponent moduleComponent) {
-		String[] manifestClasspath = null;
-		if(!moduleComponent.isBinary()){
-			IVirtualFile vManifest = moduleComponent.getRootFolder().getFile(J2EEConstants.MANIFEST_URI);
-			if (vManifest.exists()) {
-				IFile manifestFile = vManifest.getUnderlyingFile();
-				InputStream in = null;
-				try {
-					in = manifestFile.getContents();
-					ArchiveManifest manifest = new ArchiveManifestImpl(in);
-					manifestClasspath = manifest.getClassPathTokenized();
-				} catch (IOException e) {
-					Logger.getLogger().logError(e);
-				} catch (CoreException e) {
-					Logger.getLogger().logError(e);
-				} finally {
-					if (in != null) {
-						try {
-							in.close();
-							in = null;
-						} catch (IOException e) {
-							Logger.getLogger().logError(e);
-						}
-					}
-				}
-			}
-		} else {
-			manifestClasspath = ((J2EEModuleVirtualArchiveComponent)moduleComponent).getManifestClasspath();
-		}
-		
-		return manifestClasspath;
-			
-	}
-	
-
-	public static List getManifestReferences(IVirtualComponent moduleComponent, IVirtualReference[] hardReferences) {
-		List dynamicReferences = null;
-		String [] manifestClasspath = getManifestClasspath(moduleComponent); 
-
-		IVirtualReference foundRef = null;
-		String earArchiveURI = null; //The URI for this archive in the EAR
-		boolean simplePath = false;
-		
-		if (manifestClasspath != null && manifestClasspath.length > 0) {
-			IProject[] earProjects = J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.ENTERPRISE_APPLICATION);
-			IVirtualReference[] earRefs = null;
-			for (int i = 0; i < earProjects.length && null == earRefs; i++) {
-				IVirtualComponent tempEARComponent = ComponentCore.createComponent(earProjects[i]);
-				IVirtualReference[] tempEarRefs = tempEARComponent.getReferences();
-				for (int j = 0; j < tempEarRefs.length && earRefs == null; j++) {
-					if (tempEarRefs[j].getReferencedComponent().equals(moduleComponent)) {
-						earRefs = tempEarRefs;
-						foundRef = tempEarRefs[j];
-						earArchiveURI = foundRef.getArchiveName(); 
-						simplePath = earArchiveURI.lastIndexOf("/") == -1; //$NON-NLS-1$
-					}
-				}
-			}
-
-			if (null != earRefs) {
-				for (int i = 0; i < manifestClasspath.length; i++) {
-					boolean found = false;
-					for (int j = 0; j < earRefs.length && !found; j++) {
-						if(foundRef != earRefs[j]){
-							String archiveName = earRefs[j].getArchiveName();
-							if (null != archiveName){
-								boolean shouldAdd = false;
-								if(simplePath && manifestClasspath[i].lastIndexOf("/") == -1){ //$NON-NLS-1$
-									shouldAdd = archiveName.equals(manifestClasspath[i]);	
-								} else {
-									String earRelativeURI = ArchiveUtil.deriveEARRelativeURI(manifestClasspath[i], earArchiveURI);
-									if(null != earRelativeURI){
-										shouldAdd = earRelativeURI.equals(archiveName);	
-									}
-								}
-								
-								if(shouldAdd){
-									found = true;
-									boolean shouldInclude = true;
-									IVirtualComponent dynamicComponent = earRefs[j].getReferencedComponent();
-									if(null != hardReferences){
-										for (int k = 0; k < hardReferences.length && shouldInclude; k++) {
-											if (hardReferences[k].getReferencedComponent().equals(dynamicComponent)) {
-												shouldInclude = false;
-											}
-										}
-									}
-									if (shouldInclude) {
-										IVirtualReference dynamicReference = ComponentCore.createReference(moduleComponent, dynamicComponent);
-										if (null == dynamicReferences) {
-											dynamicReferences = new ArrayList();
-										}
-										dynamicReferences.add(dynamicReference);
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return dynamicReferences;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java
deleted file mode 100644
index 0503d0b18..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java
+++ /dev/null
@@ -1,90 +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.componentcore;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ApplicationClientFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.AppClient12ImportStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClientBinaryComponentHelper extends EnterpriseBinaryComponentHelper {
-
-	public static boolean handlesComponent(IVirtualComponent component) {
-		AppClientBinaryComponentHelper helper = null;
-		try {
-			helper = new AppClientBinaryComponentHelper(component);
-			return helper.isArchiveValid();
-		} catch (Exception e) {
-			return false;
-		} finally {
-			helper.dispose();
-		}
-	}
-
-	protected static class Discriminator extends AppClient12ImportStrategyImpl.Discriminator {
-
-		private static Discriminator instance;
-
-		public static Discriminator getInstance() {
-			if (instance == null) {
-				instance = new Discriminator();
-			}
-			return instance;
-		}
-
-		public Archive createConvertedArchive() {
-			ReferenceCountedApplicationClientFileImpl archive = new ReferenceCountedApplicationClientFileImpl();
-			return archive;
-		}
-	}
-
-	protected static class ReferenceCountedApplicationClientFileImpl extends ApplicationClientFileImpl implements IReferenceCountedArchive {
-
-		private int count = 0;
-
-		public void access() {
-			synchronized (this) {
-				count++;
-			}
-		}
-
-		public void close() {
-			synchronized (this) {
-				count--;
-				if (count > 0) {
-					return;
-				}
-			}
-			physicallyClose(this);
-		}
-		
-		public void forceClose(){
-			count = 0;
-			super.close();
-		}
-	}
-
-	protected ArchiveTypeDiscriminator getDiscriminator() {
-		return Discriminator.getInstance();
-	}
-
-	public AppClientBinaryComponentHelper(IVirtualComponent component) {
-		super(component);
-	}
-
-	public EObject getPrimaryRootObject() {
-		return ((ApplicationClientFile) getArchive()).getDeploymentDescriptor();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/ComponentArchiveOptions.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/ComponentArchiveOptions.java
deleted file mode 100644
index 48d176645..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/ComponentArchiveOptions.java
+++ /dev/null
@@ -1,28 +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.componentcore;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ComponentArchiveOptions extends ArchiveOptions {
-
-	private IVirtualComponent component;
-	
-	public ComponentArchiveOptions(IVirtualComponent component){
-		this.component = component;
-	}
-
-	public IVirtualComponent getComponent() {
-		return component;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java
deleted file mode 100644
index e582af514..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java
+++ /dev/null
@@ -1,90 +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.componentcore;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EJBJarFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.EjbJar11ImportStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBBinaryComponentHelper extends EnterpriseBinaryComponentHelper {
-
-	public static boolean handlesComponent(IVirtualComponent component) {
-		EJBBinaryComponentHelper helper = null;
-		try {
-			helper = new EJBBinaryComponentHelper(component);
-			return helper.isArchiveValid();
-		} catch (Exception e) {
-			return false;
-		} finally {
-			helper.dispose();
-		}
-	}
-
-	protected static class Discriminator extends EjbJar11ImportStrategyImpl.Discriminator {
-
-		private static Discriminator instance;
-
-		public static Discriminator getInstance() {
-			if (instance == null) {
-				instance = new Discriminator();
-			}
-			return instance;
-		}
-
-		public Archive createConvertedArchive() {
-			ReferenceCountedEJBJarFileImpl archive = new ReferenceCountedEJBJarFileImpl();
-			return archive;
-		}
-	}
-
-	protected static class ReferenceCountedEJBJarFileImpl extends EJBJarFileImpl implements IReferenceCountedArchive {
-
-		private int count = 0;
-
-		public void access() {
-			synchronized (this) {
-				count++;
-			}
-		}
-
-		public void close() {
-			synchronized (this) {
-				count--;
-				if (count > 0) {
-					return;
-				}
-			}
-			physicallyClose(this);
-		}
-		
-		public void forceClose(){
-			count = 0;
-			super.close();
-		}
-	}
-
-	protected ArchiveTypeDiscriminator getDiscriminator() {
-		return Discriminator.getInstance();
-	}
-
-	public EJBBinaryComponentHelper(IVirtualComponent component) {
-		super(component);
-	}
-
-	public EObject getPrimaryRootObject() {
-		return ((EJBJarFile) getArchive()).getDeploymentDescriptor();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java
deleted file mode 100644
index 09827110a..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java
+++ /dev/null
@@ -1,371 +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.componentcore;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-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 abstract class EnterpriseBinaryComponentHelper extends BinaryComponentHelper {
-
-	public static EnterpriseBinaryComponentHelper getHelper(IVirtualComponent aComponent){
-		EnterpriseBinaryComponentHelper helper = null;
-		if (J2EEProjectUtilities.isEJBComponent(aComponent)) {
-			helper = new EJBBinaryComponentHelper(aComponent);
-		} else if (J2EEProjectUtilities.isApplicationClientComponent(aComponent)) {
-			helper = new AppClientBinaryComponentHelper(aComponent);
-		} else if (J2EEProjectUtilities.isJCAComponent(aComponent)) {
-			helper = new JCABinaryComponentHelper(aComponent);
-		} else if (J2EEProjectUtilities.isDynamicWebComponent(aComponent)) {
-			helper = new WebBinaryComponentHelper(aComponent);
-		} else {
-			helper = new UtilityBinaryComponentHelper(aComponent);
-		}
-		return helper;
-	}
-	
-	private IReferenceCountedArchive archive = null;
-
-	protected EnterpriseBinaryComponentHelper(IVirtualComponent component) {
-		super(component);
-	}
-
-	protected ComponentArchiveOptions getArchiveOptions() {
-		ComponentArchiveOptions options = new ComponentArchiveOptions(getComponent());
-		options.setIsReadOnly(true);
-		options.setRendererType(ArchiveOptions.SAX);
-		options.setUseJavaReflection(false);
-		return options;
-	}
-
-	protected IReferenceCountedArchive getUniqueArchive() {
-		try {
-			return openArchive();
-		} catch (OpenFailureException e) {
-			Logger.getLogger().logError(e);
-		}
-		return null;
-	}
-
-	public Archive accessArchive() {
-		IReferenceCountedArchive archive = getArchive();
-		archive.access();
-		if(!isPhysicallyOpen(archive)){
-			physicallyOpen(archive);
-		}
-		return archive;
-	}
-
-	protected IReferenceCountedArchive getArchive() {
-		if (archive == null) {
-			archive = getUniqueArchive();
-		}
-		return archive;
-	}
-
-	protected boolean isArchiveValid() {
-		if (archive != null) {
-			return true;
-		}
-		Archive anArchive = null;
-		try {
-			anArchive = CommonarchiveFactory.eINSTANCE.primOpenArchive(getArchiveOptions(), getArchiveURI());
-			ArchiveTypeDiscriminator disc = getDiscriminator();
-			return null == disc || disc.canImport(anArchive);
-		} catch (Exception e) {
-			return false;
-		} finally {
-			if (anArchive != null) {
-				anArchive.close();
-			}
-		}
-	}
-
-	protected String getArchiveURI() {
-		String archiveURI = null;
-		VirtualArchiveComponent archiveComp = (VirtualArchiveComponent) getComponent();
-		java.io.File diskFile = archiveComp.getUnderlyingDiskFile();
-		if (diskFile.exists())
-			archiveURI = diskFile.getAbsolutePath();
-		else {
-			IFile iFile = archiveComp.getUnderlyingWorkbenchFile();
-			archiveURI = iFile.getRawLocation().toOSString();
-		}
-		return archiveURI;
-	}
-
-	public void dispose() {
-		if (archive != null) {
-			archive.close();
-			archive = null;
-		}
-	}
-
-	protected abstract ArchiveTypeDiscriminator getDiscriminator();
-
-	protected IReferenceCountedArchive openArchive() throws OpenFailureException {
-		ArchiveCache cache = ArchiveCache.getInstance();
-		IReferenceCountedArchive archive = cache.getArchive(getComponent());
-		if (archive != null) {
-			archive.access();
-			return archive;
-		}
-		return cache.openArchive(this);
-	}
-
-	boolean gotResource = false;
-	
-	public Resource getResource(URI uri) {
-		Resource resource = null;
-		if(!isPhysicallyOpen(getArchive())){
-			resource = getArchive().getResourceSet().getResource(uri, false);
-			if(resource == null){
-				physicallyOpen(getArchive());
-			}
-		}
-		if(resource == null){
-			resource = getArchive().getResourceSet().getResource(uri, true); 
-		}
-		
-		return resource;
-	}
-
-	public void releaseAccess(ArtifactEdit edit) {
-		dispose();
-	}
-
-	private static void unloadArchive(IReferenceCountedArchive archive) {
-		WorkbenchResourceHelperBase.removeAndUnloadAll(archive.getResourceSet().getResources(), archive.getResourceSet());
-		archive.getLoadStrategy().setResourceSet(null);
-		archive.setLoadStrategy(null);
-	}
-	
-	private static boolean isPhysicallyOpen(IReferenceCountedArchive archive) {
-		return ((BinaryZipFileLoadStrategy)archive.getLoadStrategy()).isPhysicallyOpen();
-	}
-	
-	private static void physicallyOpen(IReferenceCountedArchive archive) {
-		try {
-			((BinaryZipFileLoadStrategy)archive.getLoadStrategy()).physicallyOpen();
-		} catch (ZipException e) {
-			Logger.getLogger().logError(e);
-		} catch (IOException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-	
-	protected static void physicallyClose(IReferenceCountedArchive archive) {
-		((BinaryZipFileLoadStrategy)archive.getLoadStrategy()).physicallyClose();
-	}
-
-	private static class BinaryZipFileLoadStrategy extends ZipFileLoadStrategyImpl {
-		
-		private boolean physicallyOpen = true;
-		
-		public BinaryZipFileLoadStrategy() {
-			super();
-		}
-
-		public BinaryZipFileLoadStrategy(java.io.File file) throws IOException {
-			super(file);
-		}
-
-		public boolean isPhysicallyOpen(){
-			return physicallyOpen;
-		}
-		
-		public void physicallyOpen() throws ZipException, IOException{
-			if(!isPhysicallyOpen()){
-				physicallyOpen = true;
-				setZipFile(new ZipFile(file));
-			}
-		}
-		
-		public void physicallyClose(){
-			if(isPhysicallyOpen()){
-				physicallyOpen = false;
-				try{
-					zipFile.close();
-				}
-				catch (Throwable t) {
-					//Ignore
-				}
-			} 
-		}
-		
-		public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
-			final boolean isPhysciallyOpen = isPhysicallyOpen();
-			Exception caughtException = null;
-			try {
-				if (!isPhysciallyOpen) {
-					physicallyOpen();
-				}
-				ZipEntry entry = getZipFile().getEntry(uri);
-				if (entry == null)
-					throw new FileNotFoundException(uri);
-
-				return new java.io.BufferedInputStream(getZipFile().getInputStream(entry)) {
-					public void close() throws IOException {
-						super.close();
-						if (!isPhysciallyOpen ) {
-							physicallyClose();
-						}
-					}
-				};
-			} catch (FileNotFoundException e) {
-				caughtException = e;
-				throw e;
-			} catch (IllegalStateException zipClosed) {
-				caughtException = zipClosed;
-				throw new IOException(zipClosed.toString());
-			} catch (Exception e) {
-				caughtException = e;
-				throw new IOException(e.toString());
-			} finally {
-				if (caughtException != null) {
-					if (!isPhysciallyOpen) {
-						physicallyClose();
-					}
-				}
-			}
-		}
-	};
-	
-	public static class ArchiveCache {
-
-		private static ArchiveCache instance = null;
-
-		public static ArchiveCache getInstance() {
-			if (instance == null) {
-				instance = new ArchiveCache();
-			}
-			return instance;
-		}
-
-		protected Map componentsToArchives = new Hashtable();
-
-		public synchronized IReferenceCountedArchive getArchive(IVirtualComponent component) {
-			IReferenceCountedArchive archive = (IReferenceCountedArchive) componentsToArchives.get(component);
-			return archive;
-		}
-
-		public synchronized void clearDisconnectedArchivesInEAR(IVirtualComponent earComponent) {
-			if (componentsToArchives.isEmpty()) {
-				return;
-			}
-			Set liveBinaryComponnts = new HashSet();
-			IVirtualReference[] refs = earComponent.getReferences();
-			IVirtualComponent component = null;
-			for (int i = 0; i < refs.length; i++) {
-				component = refs[i].getReferencedComponent();
-				if (component.isBinary()) {
-					liveBinaryComponnts.add(component);
-				}
-			}
-			clearArchivesInProject(earComponent.getProject(), liveBinaryComponnts);
-		}
-
-		public synchronized void clearAllArchivesInProject(IProject earProject) {
-			if (componentsToArchives.isEmpty()) {
-				return;
-			}
-			clearArchivesInProject(earProject, null);
-		}
-
-		private void clearArchivesInProject(IProject earProject, Set excludeSet) {
-			Iterator iterator = componentsToArchives.entrySet().iterator();
-			IVirtualComponent component = null;
-			IReferenceCountedArchive archive = null;
-			while (iterator.hasNext()) {
-				Map.Entry entry = (Map.Entry)iterator.next();
-				component = (IVirtualComponent) entry.getKey();
-				if (component.getProject().equals(earProject) && (excludeSet == null || !excludeSet.contains(component))) {
-					archive = (IReferenceCountedArchive) entry.getValue();
-					archive.forceClose();
-					unloadArchive(archive);
-					iterator.remove();
-				}
-			}
-		}
-
-		public synchronized IReferenceCountedArchive openArchive(EnterpriseBinaryComponentHelper helper) throws OpenFailureException {
-			ArchiveOptions options = helper.getArchiveOptions();
-			String archiveURI = helper.getArchiveURI();
-			String filename = archiveURI.replace('/', java.io.File.separatorChar);
-			java.io.File file = new java.io.File(filename);
-			if (!file.exists()) {
-				throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.file_not_found_EXC_, (new Object[] { archiveURI, file.getAbsolutePath() }))); 
-			}
-			try {
-				BinaryZipFileLoadStrategy strategy = new BinaryZipFileLoadStrategy(file);
-				options.setLoadStrategy(strategy);
-			} catch (IOException ex) {
-				throw new OpenFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.could_not_open_EXC_, (new Object[] { archiveURI })), ex); 
-			}
-
-			Archive anArchive = CommonarchiveFactory.eINSTANCE.primOpenArchive(options, archiveURI);
-
-			ArchiveTypeDiscriminator discriminator = helper.getDiscriminator();
-
-			if (!discriminator.canImport(anArchive)) {
-				anArchive.close();
-				throw new OpenFailureException(discriminator.getUnableToOpenMessage());
-			}
-			IReferenceCountedArchive specificArchive = (IReferenceCountedArchive) discriminator.openArchive(anArchive);
-			specificArchive.initializeAfterOpen();
-			specificArchive.access();
-			componentsToArchives.put(helper.getComponent(), specificArchive);
-			return specificArchive;
-		}
-	}
-
-	protected interface IReferenceCountedArchive extends Archive {
-
-		/**
-		 * Increases the reference count by one. A call to close will decriment
-		 * the count by one. If after decrimenting the count the count is 0
-		 * 
-		 */
-		public void access();
-
-		public void forceClose();
-		
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java
deleted file mode 100644
index 8cffb3ebb..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java
+++ /dev/null
@@ -1,90 +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.componentcore;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.RARFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.RarImportStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JCABinaryComponentHelper extends EnterpriseBinaryComponentHelper {
-
-	public static boolean handlesComponent(IVirtualComponent component) {
-		JCABinaryComponentHelper helper = null;
-		try {
-			helper = new JCABinaryComponentHelper(component);
-			return helper.isArchiveValid();
-		} catch (Exception e) {
-			return false;
-		} finally {
-			helper.dispose();
-		}
-	}
-
-	protected static class Discriminator extends RarImportStrategyImpl.Discriminator {
-
-		private static Discriminator instance;
-
-		public static Discriminator getInstance() {
-			if (instance == null) {
-				instance = new Discriminator();
-			}
-			return instance;
-		}
-
-		public Archive createConvertedArchive() {
-			ReferenceCountedRARFileImpl archive = new ReferenceCountedRARFileImpl();
-			return archive;
-		}
-	}
-
-	protected static class ReferenceCountedRARFileImpl extends RARFileImpl implements IReferenceCountedArchive {
-
-		private int count = 0;
-
-		public void access() {
-			synchronized (this) {
-				count++;
-			}
-		}
-
-		public void close() {
-			synchronized (this) {
-				count--;
-				if (count > 0) {
-					return;
-				}
-			}
-			physicallyClose(this);
-		}
-		
-		public void forceClose(){
-			count = 0;
-			super.close();
-		}
-	}
-
-	protected ArchiveTypeDiscriminator getDiscriminator() {
-		return Discriminator.getInstance();
-	}
-
-	public JCABinaryComponentHelper(IVirtualComponent component) {
-		super(component);
-	}
-
-	public EObject getPrimaryRootObject() {
-		return ((RARFile) getArchive()).getDeploymentDescriptor();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java
deleted file mode 100644
index 6d1cf3042..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.jst.j2ee.internal.componentcore;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminatorImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ArchiveImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ImportStrategy;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class UtilityBinaryComponentHelper extends EnterpriseBinaryComponentHelper {
-
-	public UtilityBinaryComponentHelper(IVirtualComponent component) {
-		super(component);
-	}
-
-	protected static class Discriminator extends ArchiveTypeDiscriminatorImpl {
-
-		private static Discriminator instance;
-
-		public static Discriminator getInstance() {
-			if (instance == null) {
-				instance = new Discriminator();
-			}
-			return instance;
-		}
-
-		public Archive createConvertedArchive() {
-			ReferenceCountedArchiveImpl archive = new ReferenceCountedArchiveImpl();
-			return archive;
-		}
-
-		public boolean canImport(Archive anArchive) {
-			return true;
-		}
-
-		public ImportStrategy createImportStrategy(Archive old, Archive newArchive) {
-			return null;
-		}
-
-		public String getUnableToOpenMessage() {
-			return "";//$NON-NLS-1$
-		}
-	}
-
-	protected static class ReferenceCountedArchiveImpl extends ArchiveImpl implements IReferenceCountedArchive {
-
-		private int count = 0;
-
-		public void access() {
-			synchronized (this) {
-				count++;
-			}
-		}
-
-		public void close() {
-			synchronized (this) {
-				count--;
-				if (count > 0) {
-					return;
-				}
-			}
-			physicallyClose(this);
-		}
-		
-		public void forceClose(){
-			count = 0;
-			super.close();
-		}
-	}
-
-	protected ArchiveTypeDiscriminator getDiscriminator() {
-		return Discriminator.getInstance();
-	}
-	
-	protected IReferenceCountedArchive getUniqueArchive() {
-		try {
-			return openArchive();
-		} catch (OpenFailureException e) {
-		}
-		return null;
-	}
-	
-	public EObject getPrimaryRootObject() {
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java
deleted file mode 100644
index 438121cdc..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java
+++ /dev/null
@@ -1,90 +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.componentcore;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.War22ImportStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class WebBinaryComponentHelper extends EnterpriseBinaryComponentHelper {
-
-	public static boolean handlesComponent(IVirtualComponent component) {
-		WebBinaryComponentHelper helper = null;
-		try {
-			helper = new WebBinaryComponentHelper(component);
-			return helper.isArchiveValid();
-		} catch (Exception e) {
-			return false;
-		} finally {
-			helper.dispose();
-		}
-	}
-
-	protected static class Discriminator extends War22ImportStrategyImpl.Discriminator {
-
-		private static Discriminator instance;
-
-		public static Discriminator getInstance() {
-			if (instance == null) {
-				instance = new Discriminator();
-			}
-			return instance;
-		}
-
-		public Archive createConvertedArchive() {
-			ReferenceCountedWARFileImpl archive = new ReferenceCountedWARFileImpl();
-			return archive;
-		}
-	}
-
-	protected static class ReferenceCountedWARFileImpl extends WARFileImpl implements IReferenceCountedArchive {
-
-		private int count = 0;
-
-		public void access() {
-			synchronized (this) {
-				count++;
-			}
-		}
-
-		public void close() {
-			synchronized (this) {
-				count--;
-				if (count > 0) {
-					return;
-				}
-			}
-			physicallyClose(this);
-		}
-		
-		public void forceClose(){
-			count = 0;
-			super.close();
-		}
-	}
-
-	protected ArchiveTypeDiscriminator getDiscriminator() {
-		return Discriminator.getInstance();
-	}
-
-	public WebBinaryComponentHelper(IVirtualComponent component) {
-		super(component);
-	}
-
-	public EObject getPrimaryRootObject() {
-		return ((WARFile) getArchive()).getDeploymentDescriptor();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/ClasspathDeleteInfo.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/ClasspathDeleteInfo.java
deleted file mode 100644
index fbb8341f7..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/ClasspathDeleteInfo.java
+++ /dev/null
@@ -1,76 +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.delete;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A simple structure that remembers for a given project, the manifest entries to be deleted and the
- * build path entries to be deleted
- */
-public class ClasspathDeleteInfo {
-	/**
-	 * The project from which the dependencies will be removed
-	 */
-	protected IProject targetProject;
-	/**
-	 * The literal manifest entries to be removed; String
-	 */
-	protected List manifestEntries;
-	/**
-	 * The project references to be removed from the build path; IProject
-	 */
-	protected List referencedProjects;
-
-	public ClasspathDeleteInfo(IProject project) {
-		super();
-		targetProject = project;
-	}
-
-	/**
-	 * Gets the manifestEntries.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getManifestEntries() {
-		if (manifestEntries == null)
-			manifestEntries = new ArrayList();
-		return manifestEntries;
-	}
-
-
-	/**
-	 * Gets the referencedProjects.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getReferencedProjects() {
-		if (referencedProjects == null)
-			referencedProjects = new ArrayList();
-		return referencedProjects;
-	}
-
-
-	/**
-	 * Gets the targetProject.
-	 * 
-	 * @return Returns a IProject
-	 */
-	public IProject getTargetProject() {
-		return targetProject;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java
deleted file mode 100644
index 2a448a5f1..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java
+++ /dev/null
@@ -1,253 +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.delete;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-public class DeleteModuleOperation { //extends WTPOperation {
-
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-		// TODO Auto-generated method stub
-		
-	}
-
-//	protected DeleteOptions options;
-//	/*
-//	 * key is an EAREditModel and the value is a list of delete commands. We cache the commands and
-//	 * execute later because the modules still need to exist when we go to remove module dependency
-//	 * references.
-//	 */
-//	protected Map deferredCommands;
-//	protected IProgressMonitor monitor;
-//	protected DeleteModuleDependencyOperation deleteModuleDependencyOperation;
-//	protected LooseComposedEditModel deleteEditModel;
-//	protected List dirtyEarModels;
-//
-//	protected static String EDIT_MODEL_KEY = "DELETE_MODULES"; //$NON-NLS-1$
-//
-//	public DeleteModuleOperation(DeleteOptions options) {
-//		this.options = options;
-//	}
-//
-//	/**
-//	 * @see HeadlessJ2EEOperation#execute(IProgressMonitor)
-//	 */
-//	protected void execute(IProgressMonitor aMonitor) throws CoreException, InvocationTargetException, InterruptedException {
-//		this.monitor = aMonitor;
-//		try {
-//			buildDeleteCommandsIfNecessary();
-//			if (options.shouldDeleteModuleDependencies()) {
-//				deleteModuleDependencies();
-//			}
-//			checkIfEarsAreDirty();
-//			executeDeferredCommands();
-//			saveModelsIfNecessary();
-//		} finally {
-//			releaseModels();
-//		}
-//
-//	}
-//
-//	protected void checkIfEarsAreDirty() {
-//		dirtyEarModels = new ArrayList();
-//		if (deferredCommands == null)
-//			return;
-//		Iterator models = deferredCommands.keySet().iterator();
-//		while (models.hasNext()) {
-//			EAREditModel model = (EAREditModel) models.next();
-//			if (model.isDirty() && !dirtyEarModels.contains(model)) {
-//				dirtyEarModels.add(model);
-//			}
-//		}
-//	}
-//
-//	protected void buildDeleteCommandsIfNecessary() {
-//		if (deferredCommands != null && !deferredCommands.isEmpty())
-//			return;
-//		deferredCommands = new HashMap();
-//		List earProjects = EARNatureRuntime.getAllEARProjectsInWorkbench();
-//		for (int i = 0; i < earProjects.size(); i++) {
-//			IProject p = (IProject) earProjects.get(i);
-//			if (options.getSelectedProjects().contains(p))
-//				return;
-//			EARNatureRuntime runtime = EARNatureRuntime.getRuntime(p);
-//			if (runtime != null)
-//				buildDeleteCommands(runtime);
-//		}
-//	}
-//
-//	protected void buildDeleteCommands(EARNatureRuntime runtime) {
-//		List commands = new ArrayList();
-//		EAREditModel model = runtime.getEarEditModelForWrite(this);
-//		List projects = options.getModuleAndUtilityProjects();
-//		try {
-//			if (options.shouldDeleteModules()) {
-//				for (int i = 0; i < projects.size(); i++) {
-//					IProject project = (IProject) projects.get(i);
-//					Module m = runtime.getModule(project);
-//					if (m != null)
-//						commands.add(new RemoveModuleFromEARProjectCommand(m, runtime.getProject()));
-//					else {
-//						String uri = runtime.getJARUri(project);
-//						if (uri != null)
-//							commands.add(new RemoveUtilityJARMapCommand(runtime.getProject(), uri, project));
-//					}
-//				}
-//			}
-//			if (!commands.isEmpty())
-//				deferredCommands.put(model, commands);
-//			else
-//				model.releaseAccess(this);
-//		} catch (RuntimeException e) {
-//			model.releaseAccess(this);
-//			throw e;
-//		} catch (Error err) {
-//			model.releaseAccess(this);
-//			throw err;
-//		}
-//	}
-//
-//	/**
-//	 * Do this for unhandled exceptions
-//	 */
-//	protected void releaseModels() {
-//		if (deleteEditModel != null) {
-//			//TODO - RLS, 2/19/2004 we need to revisit the whole notion of the loose composed edit
-//			//model beccause this does not release the nested models as expected, also it looks
-//			// like
-//			// the delete edit model is never created which means validate edit is not happening
-//			//TODO - JAS when you look at this class to clean up the above, also look at
-//			// RenameModuleOperation
-//			//because it has the same kind of mess
-//			deleteEditModel.releaseAccess(this);
-//			deleteEditModel = null;
-//		}
-//		if (deferredCommands != null) {
-//			Iterator iter = deferredCommands.keySet().iterator();
-//			while (iter.hasNext()) {
-//				EditModel editModel = (EditModel) iter.next();
-//				editModel.releaseAccess(this);
-//				iter.remove();
-//			}
-//		}
-//	}
-//
-//	public void release() {
-//		releaseModels();
-//	}
-//
-//	/**
-//	 * After a normal execution flow, save the models if necessary
-//	 */
-//	protected void saveModelsIfNecessary() {
-//		if (deferredCommands == null)
-//			return;
-//		Iterator models = deferredCommands.keySet().iterator();
-//		while (models.hasNext()) {
-//			EAREditModel model = (EAREditModel) models.next();
-//			if (model.isDirty()) {
-//				if (dirtyEarModels.contains(model)) {
-//					model.saveIfNecessary(this);
-//				} else {
-//					model.save(this);
-//				}
-//			}
-//		}
-//	}
-//
-//	protected void deleteModuleDependencies() throws InvocationTargetException, InterruptedException {
-//		getDeleteModuleDependencyOperation().run(monitor);
-//	}
-//
-//	protected DeleteModuleDependencyOperation getDeleteModuleDependencyOperation() {
-//		if (deleteModuleDependencyOperation == null) {
-//			List earEditModels = new ArrayList();
-//			Iterator iter = deferredCommands.keySet().iterator();
-//			while (iter.hasNext())
-//				earEditModels.add(((EAREditModel) iter.next()).getEARNature());
-//			deleteModuleDependencyOperation = new DeleteModuleDependencyOperation(earEditModels, new HashSet(options.getModuleAndUtilityProjects()));
-//		}
-//		return deleteModuleDependencyOperation;
-//	}
-//
-//	protected void executeDeferredCommands() {
-//		Iterator it = deferredCommands.entrySet().iterator();
-//		while (it.hasNext()) {
-//			Map.Entry entry = (Map.Entry) it.next();
-//			List commands = (List) entry.getValue();
-//			executeCommands(commands);
-//
-//		}
-//	}
-//
-//	protected void executeCommands(List commands) {
-//		for (int i = 0; i < commands.size(); i++) {
-//			Command cmd = (Command) commands.get(i);
-//			cmd.execute();
-//		}
-//	}
-//
-//	/**
-//	 * Return a list of all the non-resource files that will get modified as a result of running
-//	 * this operation; used for validate edit.
-//	 */
-//	protected List getAffectedNonResourceFiles() {
-//		if (options.shouldDeleteModuleDependencies())
-//			return getDeleteModuleDependencyOperation().getAffectedFiles();
-//		return Collections.EMPTY_LIST;
-//	}
-//
-//	/**
-//	 * Use this only for validate edits
-//	 */
-//	public ComposedEditModel getDeleteEditModel() {
-//		if (deleteEditModel == null)
-//			initializeDeleteEditModel();
-//		return deleteEditModel;
-//	}
-//
-//	protected void initializeDeleteEditModel() {
-//		if (options.getAllProjectsToDelete().size() == 0) {
-//			throw new RuntimeException(J2EECreationResourceHandler.getString("DeleteModuleOperation_UI_0")); //$NON-NLS-1$
-//		}
-//
-//		buildDeleteCommandsIfNecessary();
-//		IProject project = null;
-//		project = (IProject) options.getAllProjectsToDelete().get(0);
-//
-//		deleteEditModel = new LooseComposedEditModel(EDIT_MODEL_KEY, (EMFWorkbenchContext) WorkbenchResourceHelper.getEMFContext(project)) {
-//
-//			/**
-//			 * @see org.eclipse.jst.j2ee.internal.internal.workbench.EditModel#getNonResourceFiles()
-//			 */
-//			public List getNonResourceFiles() {
-//				List result = super.getNonResourceFiles();
-//				result.addAll(getAffectedNonResourceFiles());
-//				return result;
-//			}
-//		};
-//
-//		Iterator it = deferredCommands.keySet().iterator();
-//		while (it.hasNext()) {
-//			deleteEditModel.addChild((J2EEEditModel) it.next());
-//		}
-//	}
-//
-//	public IStatus getStatus() {
-//		return deleteModuleDependencyOperation.getStatus();
-//	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteOptions.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteOptions.java
deleted file mode 100644
index a921577e5..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteOptions.java
+++ /dev/null
@@ -1,126 +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.delete;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class DeleteOptions {
-
-	protected boolean isEARDelete;
-	protected boolean deleteProjects;
-	protected boolean deleteModules;
-	protected boolean deleteModuleDependencies;
-	protected List selectedProjects;
-	/** Applicable for EAR delete */
-	protected List selectedReferencedProjects;
-
-	/**
-	 * Constructor for DeleteOptions.
-	 */
-	public DeleteOptions() {
-		super();
-	}
-
-
-	public boolean shouldDeleteModules() {
-		return deleteModules;
-	}
-
-
-	public void setDeleteModules(boolean deleteModulesFromAllEARs) {
-		this.deleteModules = deleteModulesFromAllEARs;
-	}
-
-
-	public boolean shouldDeleteProjects() {
-		return deleteProjects;
-	}
-
-
-	public void setDeleteProjects(boolean deleteProjects) {
-		this.deleteProjects = deleteProjects;
-	}
-
-
-	public boolean shouldDeleteModuleDependencies() {
-		return deleteModuleDependencies;
-	}
-
-
-	public void setDeleteModuleDependencies(boolean deleteReferencesFromModuleDependencies) {
-		this.deleteModuleDependencies = deleteReferencesFromModuleDependencies;
-	}
-
-	public List getModuleAndUtilityProjects() {
-		if (isEARDelete)
-			return getSelectedReferencedProjects();
-		return getSelectedProjects();
-	}
-
-	public List getAllProjectsToDelete() {
-		List result = new ArrayList();
-		result.addAll(getSelectedProjects());
-		result.addAll(getSelectedReferencedProjects());
-		return result;
-	}
-
-	/**
-	 * Gets the selectedProjects.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getSelectedProjects() {
-		if (selectedProjects == null)
-			return Collections.EMPTY_LIST;
-		return selectedProjects;
-	}
-
-	/**
-	 * Sets the selectedProjects.
-	 * 
-	 * @param selectedProjects
-	 *            The selectedProjects to set
-	 */
-	public void setSelectedProjects(List selectedProjects) {
-		this.selectedProjects = selectedProjects;
-	}
-
-	/**
-	 * Gets the selectedReferencedProjects.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getSelectedReferencedProjects() {
-		if (selectedReferencedProjects == null)
-			return Collections.EMPTY_LIST;
-		return selectedReferencedProjects;
-	}
-
-	/**
-	 * Sets the selectedReferencedProjects.
-	 * 
-	 * @param selectedReferencedProjects
-	 *            The selectedReferencedProjects to set
-	 */
-	public void setSelectedReferencedProjects(List selectedReferencedProjects) {
-		this.selectedReferencedProjects = selectedReferencedProjects;
-	}
-
-	public boolean isEARDelete() {
-		return isEARDelete;
-	}
-
-	public void setIsEARDelete(boolean isEARDelete) {
-		this.isEARDelete = isEARDelete;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/Assert.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/Assert.java
deleted file mode 100644
index 265ae9ab1..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/Assert.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.project;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code.
- * The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p>
- */
-public final class Assert {
-	/* This class is not intended to be instantiated. */
-	private Assert() {
-		// not allowed
-	}
-
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression) {
-		return isLegal(expression, ""); //$NON-NLS-1$
-	}
-
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression, String message) {
-		if (!expression)
-			throw new IllegalArgumentException(message);
-		return expression;
-	}
-
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * 
-	 * @param object the value to test
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object) {
-		isNotNull(object, ""); //$NON-NLS-1$
-	}
-
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param object the value to test
-	 * @param message the message to include in the exception
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object, String message) {
-		if (object == null)
-			throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
-	}
-
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression) {
-		return isTrue(expression, ""); //$NON-NLS-1$
-	}
-
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression, String message) {
-		if (!expression)
-			throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
-		return expression;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/AssertionFailedException.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/AssertionFailedException.java
deleted file mode 100644
index 91c64d906..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/AssertionFailedException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.project;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch 
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
-/* package */
-class AssertionFailedException extends RuntimeException {
-	/**
-	 * All serializable objects should have a stable serialVersionUID
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/** Constructs a new exception with the given message.
-	 */
-	public AssertionFailedException(String detail) {
-		super(detail);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IJ2EEProjectTypes.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IJ2EEProjectTypes.java
deleted file mode 100644
index 684f12120..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IJ2EEProjectTypes.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.project;
-
-
-public interface IJ2EEProjectTypes {
-	int SOURCE = 1;
-	int BINARY = 2;
-	int DEFAULT = 3;
-	int UTIL = 4;
-	int EJB_CLIENT = 5;
-	int MODULE = 6;
-	int EJB_MODULE = 7;
-	int WEB_MODULE = 8;
-	int JCA_MODULE = 9;
-	int APPCLIENT_MODULE = 10;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EECreationResourceHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EECreationResourceHandler.java
deleted file mode 100644
index 8974bd53a..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EECreationResourceHandler.java
+++ /dev/null
@@ -1,162 +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.project;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class J2EECreationResourceHandler extends NLS {
-	private static final String BUNDLE_NAME = "j2eecreation";//$NON-NLS-1$
-
-	private J2EECreationResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String EJBReferenceDataModel_UI_12;
-	public static String MIGRATE_J2EE_SPEC_UI_;
-	public static String EJBReferenceDataModel_UI_11;
-	public static String EJBReferenceDataModel_UI_10;
-	public static String REQUIRED_CLIENT_VIEW_TITLE;
-	public static String MIGRATION_COMPLETE;
-	public static String NOT_NEEDED_DEPLOYMENT_DESC_MIG;
-	public static String MIGRATION_WARNINGS_REPORT_UI_;
-	public static String BACKEND_MIGRATION_FAILED;
-	public static String REUSE_DELETED_CLIENT_VIEW_NAME_UI_;
-	public static String EJB_PROJECTS_UI_;
-	public static String NOT_NEEDED_BACKEND_MIG;
-	public static String MIGRATION_NOT_POSSIBLE_REPORT;
-	public static String PROJECT_MUST_BE_SELECTED_UI_;
-	public static String JAR_11_IMPORT_20_UI_;
-	public static String WEBCONTENT_FOLDER_RENAME_SKIPPED;
-	public static String CONFIRM_MIGRATE_PROJECT_STRUCTURE;
-	public static String WEBPROJECT_VERSION_MIGRATE_FAILED;
-	public static String JdkJarFileDoesNotExist_UI;
-	public static String Local_cannot_be_empty_UI_;
-	public static String LOCAL_CLIENT_NOT_NEEDED;
-	public static String REMOTE_CLIENT_VIEWS_NOT_EXIST_UI_;
-	public static String MIGRATING_PROJECT_STRUCTURES_UI_;
-	public static String ResourceEnvironmentReferenceDataModel_2;
-	public static String J2EE_1_2_ONLY_HAVE_REMOTE;
-	public static String OPEN_EDITORS_TITLE;
-	public static String EJB_MUST_BE_SELECTED_UI_;
-	public static String FAILED_MIGRATING_IMPORTED_CLASSES;
-	public static String OPEN_J2EE_MIGRATION_WIZARD_UI_;
-	public static String LOCAL_CLIENT_VIEWS_EXIST_UI_;
-	public static String DELETING_REMOTE_CLIENT_VIEWS_UI_;
-	public static String EJB_UI_;
-	public static String CONFIRM_CLIENT_VIEW_REQUIRED;
-	public static String MIGRATION_NOT_NEEDED;
-	public static String ADDING_LOCAL_CLIENT_VIEWS_UI_;
-	public static String WEB_UI_;
-	public static String DeleteModuleOperation_UI_0;
-	public static String Home_cannot_be_empty_UI_;
-	public static String WEBCONTENT_LIBPATH_UPDATE_FAILED;
-	public static String REMOTE_CLIENT_DELETE_SUCCESS_UI_;
-	public static String ServerTargetDataModel_UI_9;
-	public static String LOCAL_CLIENT_ADD_FAILED_UI_;
-	public static String ServerTargetDataModel_UI_8;
-	public static String OLD_PROJECT_STRUCTURE_UI_;
-	public static String ServerTargetDataModel_UI_7;
-	public static String INFORM_PROPER_SELECTION;
-	public static String MIGRATE_MODULE_PROJECTS_UI_;
-	public static String COMPLETED_LOCAL_CLIENT_CREATE;
-	public static String IMPORTED_CLASSES_FILE_DELETED;
-	public static String ADD_LOCAL_CLIENT_VIEWS_BAN_UI_;
-	public static String USE_REMOTE_FOR_DIFFERENT_EAR;
-	public static String APP_PROJECT_ERROR_EXC_;
-	public static String InvalidCharsError;
-	public static String ENTERPRISE_APPLICATIONS_UI_;
-	public static String ResourceReferenceDataModel_UI_1;
-	public static String ResourceReferenceDataModel_UI_0;
-	public static String DELETE_REM_CLIENT_VIEWS_UI_;
-	public static String Errors_occurred_renaming_module_dependencies_UI_;
-	public static String MIGRATION_ERRORS_REPORT_UI_;
-	public static String J2EE_VERSION_FAILED_UI_;
-	public static String COMPLETED_DEPLOY_DELETE;
-	public static String PROJECT_REFERENCES_UPDATED;
-	public static String TARGET_ALSO_EXIST_IN_SAME_EAR;
-	public static String WEBCONTENT_FOLDER_RENAME_FAILED;
-	public static String MIGRATE_UI_;
-	public static String Creating__UI_;
-	public static String Error_creating_an_EAR_proj_UI_;
-	public static String ReferenceDataModel_UI_6;
-	public static String ReferenceDataModel_UI_5;
-	public static String ReferenceDataModel_UI_3;
-	public static String ENTERPRISE_BEANS_BAN_UI_;
-	public static String ADD_LOCAL_CLIENT_VIEWS_CHECK_UI_;
-	public static String Can_not_rename_module_dependency_from_project_UI_;
-	public static String PROJECT_STRUCTURE_SUCCESS_UI_;
-	public static String SOURCE_FOLDER_RENAME_SKIPPED;
-	public static String UNKNOWN_UI_;
-	public static String WIZ_BAN_DESC_UI_;
-	public static String COMPLETED_CMP20_CODEGEN;
-	public static String PROJECT_NOT_NEED_MIGRATION_UI_;
-	public static String SELECT_EJB_CLIENT_VIEWS_UI_;
-	public static String Creating_Java_Project_UI_;
-	public static String REMOTE_CLIENT_DELETE_FAILED_UI_;
-	public static String FILES_OUT_OF_SYNC;
-	public static String MIGRATE_CMP_BEANS_UI_;
-	public static String Remote_cannot_be_empty_UI_;
-	public static String Errors_occurred_deleting_module_dependencies_UI_;
-	public static String Can_not_remove_module_dependency_from_project_UI_;
-	public static String INVALID_SELECTION_TITLE;
-	public static String ABS_PATHS_APP_EXT_REMOVED;
-	public static String Local_home_cannot_be_empty_UI_;
-	public static String USE_LOCAL_FOR_DIFFERENT_EAR;
-	public static String ENTERPRISE_APP_PROJECTS_UI_;
-	public static String MIGRATE_J2EE_PROJECTS_UI_;
-	public static String MIGRATION_SUCCESS_REPORT_UI_;
-	public static String FAILED_DEPLOY_DELETE;
-	public static String J2EE_VERSION_NOT_NEED_MIGRATION_UI_;
-	public static String MIGRATING_J2EE_VERSION_UI_;
-	public static String APPLICATION_CLIENTS_UI_;
-	public static String ServiceReferenceDataModel_ERROR_8;
-	public static String PROJECT_STRUCTURE_FAILED_UI_;
-	public static String LOCAL_CLIENT_ADD_SUCCESS_UI_;
-	public static String COMPONENT_ALREADYINEAR;
-	public static String COMPLETED_BACKEND_MIG;
-	public static String MIGRATE_EJB_SPEC_UI_;
-	public static String RenameModuleOperation_UI_0;
-	public static String CMP_11_IMPORT_20_UI_;
-	public static String J2EE_PROJECT_MIGRATION_TITLE_UI_;
-	public static String APP_CLIENT_ONLY_HAVE_REMOTE;
-	public static String MIGRATION_NOT_NEEDED_REPORT;
-	public static String LOCAL_CLIENT_VIEW_SCHEME_UI_;
-	public static String BINARY_MIGRATION_FAILED;
-	public static String ENTERPRISE_APPLICATION_UI_;
-	public static String INFORM_OPEN_EDITORS;
-	public static String EXTRACTED_IMPORTED_CLASSES;
-	public static String J2EE_VERSION_SUCCESS_UI_;
-	public static String SUFFIX_EXAMPLE_UI_;
-	public static String CONFIRMATION_TITLE;
-	public static String MIGRATION_ERRORS;
-	public static String APPLICATION_CLIENT_UI_;
-	public static String SPECIFY_SUFFIX_UI_;
-	public static String CONFIRM_MIGRATE_J2EE_13;
-	public static String PortComponentReferenceDataModel_ERROR_4;
-	public static String FAILED_LOCAL_CLIENT_CREATE;
-	public static String MessageDestReferenceDataModel_9;
-	public static String APPLICATION_CLIENT_PROJECTS_UI_;
-	public static String MessageDestReferenceDataModel_8;
-	public static String SOURCE_FOLDER_RENAME_FAILED;
-	public static String MessageDestReferenceDataModel_7;
-	public static String ENTERPRISE_BEANS_LIST_UI_;
-	public static String PROJECT_CLASSPATH_UPDATED;
-	public static String VERSION_NOT_SUPPORTED;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, J2EECreationResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEJavaProjectInfo.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEJavaProjectInfo.java
deleted file mode 100644
index bdbacddfe..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEJavaProjectInfo.java
+++ /dev/null
@@ -1,481 +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.project;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-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.internal.plugin.JavaProjectInfo;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * This class stores the info required for creating a new J2EE project; not all info will apply to
- * all kinds of projects
- */
-public class J2EEJavaProjectInfo extends JavaProjectInfo {
-	protected static final String SRCROOT_VAR = "JRE_SRCROOT"; //$NON-NLS-1$
-	protected IProject project;
-	protected String jdkRTJarPath;
-	protected String projectName;
-	protected IPath projectLocation;
-	protected String javaOutputPath;
-	protected IClasspathEntry[] classpathEntries;
-	protected boolean shouldInitializeDefaultClasspath = true;
-	protected String natureId;
-	protected IRuntime serverTarget;
-	protected int moduleVersion;
-
-	/**
-	 * EJBProjectInfo constructor comment.
-	 */
-	public J2EEJavaProjectInfo() {
-		super();
-	}
-
-	/**
-	 * EJBProjectInfo constructor comment.
-	 */
-	public J2EEJavaProjectInfo(IProject project) {
-		super();
-		setProject(project);
-	}
-
-	public IClasspathEntry[] calculateServerClasspathEntries() throws JavaModelException {
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject == null)
-			return null;
-		if (getProject().exists()) {
-			//We don't need to remove a server target anyomre as it need to be there
-			//ServerTargetManager.removeServerTarget(getProject(),null);
-			IClasspathEntry[] ces = javaProject.getRawClasspath();
-			if (ces.length > 0)
-				addToClasspathEntries(ces);
-		}
-		addServerJdkRuntimeToClasspathEntries();
-		addServerJarsToClasspathEntries();
-		return classpathEntries;
-	}
-
-	/**
-	 * Sets up the default classpath for this project
-	 */
-	protected void addDefaultToClasspathEntries() {
-		addToClasspathEntries(computeDefaultJavaClasspath());
-	}
-
-	/**
-	 * Set the corresponding jsp and servlet levels. Creation date: (11/09/00 10:05:24 AM)
-	 */
-	public void setJ2EEVersion(int newVersion) {
-	}
-
-
-	/**
-	 * add the source folder to classpath dir (IClasspathEntry.CPE_SOURCE)
-	 */
-	public void addJavaSourceToClasspathEntries() {
-		IPath sourceClassPath = new Path(getFullSourcePath());
-		addToClasspathEntries(new IClasspathEntry[]{JavaCore.newSourceEntry(sourceClassPath)});
-	}
-
-	public boolean addJdkJarToClasspathEntries(String jdkJarFullPathName) {
-
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject == null)
-			return false;
-
-		IClasspathEntry[] entry = new IClasspathEntry[1];
-		Path path = new Path(jdkJarFullPathName);
-		if (!path.toFile().exists()) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(J2EECreationResourceHandler.getString(J2EECreationResourceHandler.JdkJarFileDoesNotExist_UI, new Object[]{jdkJarFullPathName})); 
-			return false;
-		}
-
-		entry[0] = JavaCore.newLibraryEntry(path, null, null);
-		addToClasspathEntries(entry);
-
-		return true;
-	}
-
-	/**
-	 * add rt.jar form the server.jdk plugin
-	 */
-	public void addServerJdkRuntimeToClasspathEntries() {
-		addToClasspathEntries(getServerJDKClasspathEntries());
-	}
-
-	public IClasspathEntry[] getServerJDKClasspathEntries() {
-		List list = new ArrayList(4);
-		//TODO This class should be deleted.
-		//		if (isJ2EE13()
-		//			|| !org.eclipse.jst.j2ee.internal.internal.plugin.J2EEPlugin.hasDevelopmentRole()) {
-		//			list.add(JavaCore.newVariableEntry(new
-		// Path(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE + "/jre/lib/rt.jar"),
-		// //$NON-NLS-1$
-		//			new Path(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE + "/src.jar"), //$NON-NLS-1$
-		//			new Path(IEJBNatureConstants.SERVERJDK_SRCROOT_VARIABLE))); //$NON-NLS-1$
-		//		} else {
-		//			list.add(JavaCore.newVariableEntry(new
-		// Path(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE + "/jre/lib/rt.jar"), //$NON-NLS-1$
-		//			new Path(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE + "/src.jar"), //$NON-NLS-1$
-		//			new Path(IEJBNatureConstants.SERVERJDK_SRCROOT_VARIABLE))); //$NON-NLS-1$
-		//		}
-		return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
-	}
-
-	/**
-	 * Adds entries to the class path for this project
-	 */
-	public void addToClasspathEntries(IClasspathEntry[] entries) {
-
-		java.util.List list = new ArrayList(10);
-		// add the existing ones if any
-		if (classpathEntries != null)
-			list.addAll(Arrays.asList(classpathEntries));
-
-		// add the new ones
-		list.addAll(Arrays.asList(entries));
-
-		// convert
-		classpathEntries = new IClasspathEntry[list.size()];
-		classpathEntries = (IClasspathEntry[]) list.toArray(classpathEntries);
-
-	}
-
-	public boolean addVariableJarToClasspathEntries(String fullPath) {
-
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject == null)
-			return false;
-
-		IClasspathEntry[] entry = new IClasspathEntry[1];
-		entry[0] = JavaCore.newVariableEntry(new Path(fullPath), null, null);
-		addToClasspathEntries(entry);
-		return true;
-	}
-
-	public boolean addVariableJarToClasspathEntriesWithAttachments(String fullPath, String srcPath, String srcRoot) {
-
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject == null)
-			return false;
-
-		IClasspathEntry[] entry = new IClasspathEntry[1];
-		entry[0] = JavaCore.newVariableEntry(new Path(fullPath), new Path(srcPath), new Path(srcRoot));
-		addToClasspathEntries(entry);
-		return true;
-	}
-
-	/**
-	 * Return the default classpath for projects of this kind; subclasses should override for
-	 * setting up new projects
-	 */
-	protected IClasspathEntry[] computeDefaultJavaClasspath() {
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject == null)
-			return null;
-		addJavaSourceToClasspathEntries();
-		if (serverTarget == null) {
-			addServerJdkRuntimeToClasspathEntries();
-			addServerJarsToClasspathEntries();
-		}
-		return classpathEntries;
-	}
-
-	/**
-	 * Sublcasses have to overide this method to set the server jars
-	 */
-	public void addServerJarsToClasspathEntries() {
-
-	}
-
-	/**
-	 * Creates a project handle with a specified path. The project resource should <b>not </b> be
-	 * created concretely here;
-	 */
-	public IProject createProjectHandle(IPath projectPath) {
-		return getWorkspace().getRoot().getProject(projectPath.segment(0));
-	}
-
-	public IClasspathEntry[] getClasspathEntries() {
-		if (classpathEntries == null)
-			initializeClasspathEntries();
-		return classpathEntries;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getDefaultContextRoot() {
-		return null;
-	}
-
-	/**
-	 * Subclasses should override as necessary
-	 */
-	protected String getDefaultJavaOutputPath() {
-		return DEFAULT_JAVA_OUTPUT_PATH;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getDefaultUri() {
-		return projectName.replace(' ', '_') + ".jar"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the java output folder for the receiver, in the form of /project/ <output folder>
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getFullJavaOutputPath() {
-		return Path.ROOT.append(getProjectPath()).append(getJavaOutputPath()).toString();
-	}
-
-	/**
-	 * Get the module path folder for the receiver in the form of /project/modulepath
-	 * 
-	 * @return java.lang.String
-	 */
-	protected String getFullSourcePath() {
-		return Path.ROOT.append(getProjectPath()).append(getSourcePath()).toString();
-	}
-
-	/**
-	 * Returns the project relative path of the java build destination
-	 */
-	public java.lang.String getJavaOutputPath() {
-		if (javaOutputPath == null)
-			javaOutputPath = getDefaultJavaOutputPath();
-		return javaOutputPath;
-	}
-
-	/**
-	 * @param i
-	 */
-	public void setModuleVersion(int version) {
-		moduleVersion = version;
-	}
-
-	public IJavaProject getJavaProject() {
-		// needed to get an IJavaProject to create classpaths from.
-		IProject aProject = getProject();
-		if (aProject == null)
-			aProject = getWorkspace().getRoot().getProject(getProjectName());
-
-		return JavaCore.create(aProject);
-	}
-
-	/**
-	 * Return the absolute path of the default jdk rt.jar to use for this project
-	 */
-	public java.lang.String getJdkRTJarPath() {
-		return jdkRTJarPath;
-	}
-
-	/**
-	 * Return the project being created; checks the workspace for an existing project
-	 */
-	public IProject getProject() {
-		if (project == null) {
-			IProject aProject = getWorkspace().getRoot().getProject(getProjectName());
-			if (aProject.exists())
-				project = aProject;
-		}
-		return project;
-	}
-
-	/**
-	 * Return the location of the project in the file system.
-	 * 
-	 * @return org.eclipse.core.runtime.IPath
-	 */
-	public IPath getProjectLocation() {
-		return projectLocation;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getProjectName() {
-		if (projectName == null && project != null)
-			projectName = project.getName();
-		return projectName;
-	}
-
-	public IPath getProjectPath() {
-		return new Path(getProjectName());
-	}
-
-	public IWorkspace getWorkspace() {
-		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getWorkspace();
-	}
-
-	/**
-	 * Lazy initialization - useGetClasspathEntries
-	 */
-	protected void initializeClasspathEntries() {
-		if (shouldInitializeDefaultClasspath())
-			computeDefaultJavaClasspath();
-		else
-			classpathEntries = new IClasspathEntry[0];
-	}
-
-	/**
-	 * Answer false by default
-	 * 
-	 * @deprecated - Use getModuleVersion() with J2EEVersionConstants
-	 */
-	protected boolean isJ2EE13() {
-		return false;
-	}
-
-	public IProject primGetProject() {
-		return project;
-	}
-
-	public void removeClasspathEntry(IClasspathEntry entry) {
-		if (entry == null)
-			return;
-
-		List list = new ArrayList(Arrays.asList(getClasspathEntries()));
-		list.remove(entry);
-		classpathEntries = (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/10/00 10:09:58 AM)
-	 * 
-	 * @param newClassPathEntries
-	 *            org.eclipse.jdt.core.api.IClasspathEntry
-	 */
-	public void setClasspathEntries(IClasspathEntry[] newClasspathEntries) {
-		classpathEntries = newClasspathEntries;
-	}
-
-	public void setJavaOutputPath(String path) {
-		javaOutputPath = path;
-	}
-
-	public void setJdkRTJarPath(String path) {
-		jdkRTJarPath = path;
-	}
-
-	public void setProject(IProject aProject) {
-		project = aProject;
-	}
-
-	/**
-	 * Set the location in the file system that the project is to be created.
-	 * 
-	 * @param newProjectLocation
-	 *            IPath
-	 */
-	public void setProjectLocation(IPath newProjectLocation) {
-		projectLocation = newProjectLocation;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/09/00 10:05:24 AM)
-	 * 
-	 * @param newProjectName
-	 *            java.lang.String
-	 */
-	public void setProjectName(java.lang.String newProjectName) {
-		if (projectName != newProjectName)
-			setClasspathEntries(null);
-		projectName = newProjectName;
-	}
-
-	public void setShouldInitializeDefaultClasspath(boolean value) {
-		shouldInitializeDefaultClasspath = value;
-	}
-
-	public boolean shouldInitializeDefaultClasspath() {
-		return shouldInitializeDefaultClasspath;
-	}
-
-	/**
-	 * Gets the natureId.
-	 * 
-	 * @return Returns a String
-	 */
-	public String getNatureId() {
-		if (natureId == null)
-			return getDefaultNatureId();
-		return natureId;
-	}
-
-	/**
-	 * returns the correct nature id string based on the J2EE spec level being used
-	 */
-	public String getDefaultNatureId() {
-		return null;
-	}
-
-	/**
-	 * Sets the natureId.
-	 * 
-	 * @param natureId
-	 *            The natureId to set
-	 */
-	public void setNatureId(String natureId) {
-		this.natureId = natureId;
-	}
-
-	/**
-	 * Get the correct WAS classpath variable based on the J2EE version.
-	 */
-	protected String getWASPluginVariable() {
-		//TODO This class needs to be deleted.
-		//	if (isJ2EE13()
-		//		|| !org.eclipse.jst.j2ee.internal.internal.plugin.J2EEPlugin.hasDevelopmentRole())
-		//		return IEJBNatureConstants.WAS_50_PLUGINDIR_VARIABLE;
-		//	else
-		//		return IEJBNatureConstants.WAS_PLUGINDIR_VARIABLE;
-		return ""; //$NON-NLS-1$
-	}
-
-	public int getModuleVersion() {
-		return moduleVersion;
-	}
-
-	/**
-	 * @return
-	 */
-	public IRuntime getServerTarget() {
-		return serverTarget;
-	}
-
-	/**
-	 * @param target
-	 */
-	public void setServerTarget(IRuntime target) {
-		serverTarget = target;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
deleted file mode 100644
index bdf87db3f..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
+++ /dev/null
@@ -1,904 +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.project;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-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.impl.CommonarchiveFactoryImpl;
-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.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.componentcore.AppClientBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.EJBBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.JCABinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.WebBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationOperation;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-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.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class J2EEProjectUtilities extends ProjectUtilities {
-
-	public static final String ENTERPRISE_APPLICATION = IModuleConstants.JST_EAR_MODULE;
-
-	public static final String APPLICATION_CLIENT = IModuleConstants.JST_APPCLIENT_MODULE;
-
-	public static final String EJB = IModuleConstants.JST_EJB_MODULE;
-
-	public static final String DYNAMIC_WEB = IModuleConstants.JST_WEB_MODULE;
-
-	public static final String UTILITY = IModuleConstants.JST_UTILITY_MODULE;
-
-	public static final String JCA = IModuleConstants.JST_CONNECTOR_MODULE;
-
-	public static final String STATIC_WEB = IModuleConstants.WST_WEB_MODULE;
-
-	/**
-	 * Return the absolute path of a loose archive in a J2EE application or WAR file
-	 */
-	public static IPath getRuntimeLocation(IProject aProject) {
-		if (JemProjectUtilities.isBinaryProject(aProject))
-			return getBinaryProjectJARLocation(aProject);
-		return JemProjectUtilities.getJavaProjectOutputAbsoluteLocation(aProject);
-	}
-
-	public static IPath getBinaryProjectJARLocation(IProject aProject) {
-		List sources = JemProjectUtilities.getLocalJARPathsFromClasspath(aProject);
-		if (!sources.isEmpty()) {
-			IPath path = (IPath) sources.get(0);
-			return aProject.getFile(path).getLocation();
-		}
-		return null;
-	}
-
-	public static Archive getClientJAR(EJBJarFile file, EARFile earFile) {
-		EJBJar jar = null;
-		try {
-			jar = file.getDeploymentDescriptor();
-		} catch (DeploymentDescriptorLoadException exc) {
-			return null;
-		}
-		if (jar == null)
-			return null;
-		String clientJAR = jar.getEjbClientJar();
-		if (clientJAR == null || clientJAR.length() == 0)
-			return null;
-		String normalized = ArchiveUtil.deriveEARRelativeURI(clientJAR, file.getURI());
-		if (normalized != null) {
-			try {
-				File aFile = earFile.getFile(normalized);
-				if (aFile.isArchive() && !aFile.isModuleFile())
-					return (Archive) aFile;
-			} catch (FileNotFoundException nothingThere) {
-			}
-		}
-		return null;
-		// TODO - release the DD here to free up space
-	}
-
-	/**
-	 * Append one IClasspathEntry to the build path of the passed project. If a classpath entry
-	 * having the same path as the parameter already exists, then does nothing.
-	 */
-	public static void appendJavaClassPath(IProject p, IClasspathEntry newEntry) throws JavaModelException {
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(p);
-		if (javaProject == null)
-			return;
-		IClasspathEntry[] classpath = javaProject.getRawClasspath();
-		List newPathList = new ArrayList(classpath.length);
-		for (int i = 0; i < classpath.length; i++) {
-			IClasspathEntry entry = classpath[i];
-			// fix dup class path entry for .JETEmitter project
-			// Skip the entry to be added if it already exists
-			if (Platform.getOS().equals(Platform.OS_WIN32)) {
-				if (!entry.getPath().toString().equalsIgnoreCase(newEntry.getPath().toString()))
-					newPathList.add(entry);
-				else
-					return;
-			} else {
-				if (!entry.getPath().equals(newEntry.getPath()))
-					newPathList.add(entry);
-				else
-					return;
-			}
-		}
-		newPathList.add(newEntry);
-		IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
-		javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
-	}
-
-	public static Archive asArchiveFromBinary(String jarUri, IProject aProject) throws OpenFailureException {
-		IPath path = getBinaryProjectJARLocation(aProject);
-		if (path != null) {
-			String location = path.toOSString();
-			Archive anArchive = CommonarchiveFactoryImpl.getActiveFactory().primOpenArchive(location);
-			anArchive.setURI(jarUri);
-			return anArchive;
-		}
-		return null;
-	}
-
-	public static ArchiveManifest readManifest(IFile aFile) {
-		InputStream in = null;
-		try {
-			if (aFile == null || !aFile.exists())
-				return null;
-			in = aFile.getContents();
-			return new ArchiveManifestImpl(in);
-		} catch (Exception ex) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-			return null;
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException weTried) {
-				}
-			}
-		}
-	}
-
-	public static ArchiveManifest readManifest(IProject p) {
-		InputStream in = null;
-		try {
-			IFile aFile = getManifestFile(p);
-			if (aFile == null || !aFile.exists())
-				return null;
-			in = aFile.getContents();
-			return new ArchiveManifestImpl(in);
-		} catch (Exception ex) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-			return null;
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException weTried) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * Equavalent to calling getManifestFile(project, true)
-	 * 
-	 * @param p
-	 * @return
-	 */
-	public static IFile getManifestFile(IProject project) {
-		return getManifestFile(project, true);
-	}
-
-	/**
-	 * Returns the IFile handle to the J2EE manifest file for the specified
-	 * project. If createIfNecessary is true, the MANIFEST.MF file will be
-	 * created if it does not already exist.
-	 * 
-	 * @param p
-	 * @param createIfNecessary
-	 * @return
-	 */
-	public static IFile getManifestFile(IProject p, boolean createIfNecessary) {
-		IVirtualComponent component = ComponentCore.createComponent(p);
-		try {
-			IFile file = ComponentUtilities.findFile(component, new Path(J2EEConstants.MANIFEST_URI));
-			if (createIfNecessary && file == null) {
-				IVirtualFolder virtualFolder = component.getRootFolder();
-				file = virtualFolder.getUnderlyingFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
-
-				try {
-					ManifestFileCreationAction.createManifestFile(file, p);
-				} catch (CoreException e) {
-					Logger.getLogger().log(e);
-				} catch (IOException e) {
-					Logger.getLogger().log(e);
-				}
-			}
-			return file;
-		} catch (CoreException ce) {
-			Logger.getLogger().log(ce);
-		}
-		return null;
-	}
-
-	public static void writeManifest(IProject aProject, ArchiveManifest manifest) throws java.io.IOException {
-		writeManifest(aProject, getManifestFile(aProject), manifest);
-	}
-
-	public static void writeManifest(IFile aFile, ArchiveManifest manifest) throws java.io.IOException {
-		writeManifest(aFile.getProject(), aFile, manifest);
-	}
-
-	private static void writeManifest(IProject aProject, IFile aFile, ArchiveManifest manifest) throws java.io.IOException {
-		if (aFile != null) {
-			OutputStream out = new WorkbenchByteArrayOutputStream(aFile);
-			manifest.writeSplittingClasspath(out);
-			out.close();
-			J2EEComponentClasspathUpdater.getInstance().queueUpdateModule(aProject);
-		}
-	}
-
-	/**
-	 * Keys are the EJB JAR files and the values are the respective client JARs; includes only key
-	 * value pairs for which EJB Client JARs are defined and exist.
-	 * 
-	 * @author schacher
-	 */
-	public static Map collectEJBClientJARs(EARFile earFile) {
-		if (earFile == null)
-			return Collections.EMPTY_MAP;
-		Map ejbClientJARs = null;
-		List ejbJARFiles = earFile.getEJBJarFiles();
-		Archive clientJAR = null;
-		for (int i = 0; i < ejbJARFiles.size(); i++) {
-			EJBJarFile ejbJarFile = (EJBJarFile) ejbJARFiles.get(i);
-			clientJAR = getClientJAR(ejbJarFile, earFile);
-			if (clientJAR != null) {
-				if (ejbClientJARs == null)
-					ejbClientJARs = new HashMap();
-				ejbClientJARs.put(ejbJarFile, clientJAR);
-			}
-		}
-		return ejbClientJARs == null ? Collections.EMPTY_MAP : ejbClientJARs;
-	}
-
-	public static String computeRelativeText(String referencingURI, String referencedURI, EnterpriseBean bean) {
-		if (bean == null)
-			return null;
-
-		String beanName = bean.getName();
-		if (beanName == null)
-			return null;
-
-		String relativeUri = computeRelativeText(referencingURI, referencedURI);
-		if (relativeUri == null)
-			return beanName;
-		return relativeUri + "#" + beanName; //$NON-NLS-1$
-	}
-
-	public static String computeRelativeText(String referencingURI, String referencedURI) {
-		if (referencingURI == null || referencedURI == null)
-			return null;
-		IPath pPre = new Path(referencingURI);
-		IPath pDep = new Path(referencedURI);
-		if (pPre.getDevice() != null || pDep.getDevice() != null)
-			return null;
-		pPre = pPre.makeRelative();
-		pDep = pDep.makeRelative(); // referenced Archive path URI
-
-		while (pPre.segmentCount() > 1 && pDep.segmentCount() > 1 && pPre.segment(0).equals(pDep.segment(0))) {
-			pPre = pPre.removeFirstSegments(1);
-			pDep = pDep.removeFirstSegments(1);
-		}
-
-		IPath result = null;
-		StringBuffer buf = new StringBuffer();
-		String segment = null;
-		do {
-			segment = pDep.lastSegment();
-			pPre = pPre.removeLastSegments(1);
-			pDep = pDep.removeLastSegments(1);
-			if (segment != null) {
-				if (result == null)
-					result = new Path(segment);
-				else
-					result = new Path(segment).append(result);
-			}
-			if (!pPre.equals(pDep) && !pPre.isEmpty())
-				buf.append("../"); //$NON-NLS-1$
-		} while (!pPre.equals(pDep));
-
-		if (result != null)
-			buf.append(result.makeRelative().toString());
-
-		return buf.toString();
-	}
-
-	public static IProject getEJBProjectFromEJBClientProject(IProject ejbClientProject) {
-		try {
-			if (null != ejbClientProject && ejbClientProject.hasNature(JavaCore.NATURE_ID)) {
-				IProject[] allProjects = getAllProjects();
-				for (int i = 0; i < allProjects.length; i++) {
-					if (null != EarModuleManager.getEJBModuleExtension().getEJBJar(allProjects[i])) {
-						if (ejbClientProject == EarModuleManager.getEJBModuleExtension().getDefinedEJBClientJARProject(allProjects[i])) {
-							return allProjects[i];
-						}
-					}
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-
-	public static EnterpriseBean getEnterpriseBean(ICompilationUnit cu) {
-		IProject proj = cu.getJavaProject().getProject();
-		EJBJar jar = EarModuleManager.getEJBModuleExtension().getEJBJar(proj);
-		if (null == jar) {
-			jar = EarModuleManager.getEJBModuleExtension().getEJBJar(getEJBProjectFromEJBClientProject(proj));
-		}
-		if (jar != null) {
-			int index = cu.getElementName().indexOf('.');
-			String className = cu.getElementName();
-			if (index > 0)
-				className = className.substring(0, index);
-			JavaClass javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(cu.getParent().getElementName(), className, jar.eResource().getResourceSet());
-			return jar.getEnterpriseBeanWithReference(javaClass);
-		}
-		return null;
-	}
-
-	public static IContainer getSourceFolderOrFirst(IProject p, String defaultSourceName) {
-		try {
-			IPath sourcePath = getSourcePathOrFirst(p, defaultSourceName);
-			if (sourcePath == null)
-				return null;
-			else if (sourcePath.isEmpty())
-				return p;
-			else
-				return p.getFolder(sourcePath);
-		} catch (IllegalArgumentException ex) {
-			return null;
-		}
-	}
-
-	public static void removeBuilders(IProject project, List builderids) throws CoreException {
-		IProjectDescription desc = project.getDescription();
-		ICommand[] oldSpec = desc.getBuildSpec();
-		int oldLength = oldSpec.length;
-		if (oldLength == 0)
-			return;
-		int remaining = 0;
-		// null out all commands that match the builder to remove
-		for (int i = 0; i < oldSpec.length; i++) {
-			if (builderids.contains(oldSpec[i].getBuilderName()))
-				oldSpec[i] = null;
-			else
-				remaining++;
-		}
-		// check if any were actually removed
-		if (remaining == oldSpec.length)
-			return;
-		ICommand[] newSpec = new ICommand[remaining];
-		for (int i = 0, newIndex = 0; i < oldLength; i++) {
-			if (oldSpec[i] != null)
-				newSpec[newIndex++] = oldSpec[i];
-		}
-		desc.setBuildSpec(newSpec);
-		project.setDescription(desc, IResource.NONE, null);
-	}
-
-	public static IPath getSourcePathOrFirst(IProject p, String defaultSourceName) {
-		IJavaProject javaProj = JemProjectUtilities.getJavaProject(p);
-		if (javaProj == null)
-			return null;
-		IClasspathEntry[] cp = null;
-		try {
-			cp = javaProj.getRawClasspath();
-		} catch (JavaModelException ex) {
-			JEMUtilPlugin.getLogger().logError(ex);
-			return null;
-		}
-		IClasspathEntry firstSource = null;
-		IPath defaultSourcePath = null;
-		if (defaultSourceName != null)
-			defaultSourcePath = createPath(p, defaultSourceName);
-		boolean found = false;
-		for (int i = 0; i < cp.length; i++) {
-			if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-				// check if it contains /META-INF/MANIFEST.MF
-				IPath sourceFolderPath = cp[i].getPath().removeFirstSegments(1);
-				IFolder sourceFolder = p.getFolder(sourceFolderPath);
-				if (isSourceFolderAnInputContainer(sourceFolder)) {
-					found = true;
-					if (firstSource == null) {
-						firstSource = cp[i];
-						if (defaultSourcePath == null)
-							break;
-					}
-					if (cp[i].getPath().equals(defaultSourcePath))
-						return defaultSourcePath.removeFirstSegments(1);
-				}
-			}
-		}
-		if (!found) {
-			for (int i = 0; i < cp.length; i++) {
-				if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					if (firstSource == null) {
-						firstSource = cp[i];
-						if (defaultSourcePath == null)
-							break;
-					}
-					if (cp[i].getPath().equals(defaultSourcePath))
-						return defaultSourcePath.removeFirstSegments(1);
-				}
-			}
-		}
-		if (firstSource == null)
-			return null;
-		if (firstSource.getPath().segment(0).equals(p.getName()))
-			return firstSource.getPath().removeFirstSegments(1);
-		return null;
-	}
-
-	public static boolean isSourceFolderAnInputContainer(IFolder sourceFolder) {
-		IContainer parent = sourceFolder;
-		while (true) {
-			parent = parent.getParent();
-			if (parent == null)
-				return false;
-			if (parent instanceof IProject)
-				break;
-		}
-		IProject project = (IProject) parent;
-		try {
-			if (!project.isAccessible())
-				return false;
-			if (isEJBProject(project)) {
-				return sourceFolder.findMember(J2EEConstants.EJBJAR_DD_URI) != null;
-			} else if (isApplicationClientProject(project)) {
-				return sourceFolder.findMember(J2EEConstants.APP_CLIENT_DD_URI) != null;
-			} else if (isDynamicWebProject(project)) {
-				return sourceFolder.findMember(J2EEConstants.WEBAPP_DD_URI) != null;
-			} else if (isJCAProject(project)) {
-				return sourceFolder.findMember(J2EEConstants.RAR_DD_URI) != null;
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static Archive asArchive(String jarUri, IProject project, boolean exportSource) throws OpenFailureException {
-		JavaComponentLoadStrategyImpl strat = new JavaComponentLoadStrategyImpl(ComponentCore.createComponent(project));
-		strat.setExportSource(exportSource);
-		return CommonarchiveFactoryImpl.getActiveFactory().primOpenArchive(strat, jarUri);
-	}
-
-	public static boolean isProjectOfType(IProject project, String typeID) {
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(project);
-		} catch (CoreException e) {
-			return false;
-		}
-
-		if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
-			IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
-			return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
-		}
-		return false;
-	}
-
-	private static boolean isProjectOfType(IFacetedProject facetedProject, String typeID) {
-
-		if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
-			IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
-			return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
-		}
-		return false;
-	}
-
-	private static boolean isEARProject(IFacetedProject project) {
-		return isProjectOfType(project, ENTERPRISE_APPLICATION);
-	}
-
-	private static boolean isDynamicWebProject(IFacetedProject project) {
-		return isProjectOfType(project, DYNAMIC_WEB);
-	}
-
-	private static boolean isStaticWebProject(IFacetedProject project) {
-		return isProjectOfType(project, STATIC_WEB);
-	}
-
-	private static boolean isEJBProject(IFacetedProject project) {
-		return isProjectOfType(project, EJB);
-	}
-
-	private static boolean isJCAProject(IFacetedProject project) {
-		return isProjectOfType(project, JCA);
-	}
-
-	private static boolean isApplicationClientProject(IFacetedProject project) {
-		return isProjectOfType(project, APPLICATION_CLIENT);
-	}
-
-	private static boolean isUtilityProject(IFacetedProject project) {
-		return isProjectOfType(project, UTILITY);
-	}
-
-	public static boolean isEARProject(IProject project) {
-		return isProjectOfType(project, ENTERPRISE_APPLICATION);
-	}
-
-	public static boolean isDynamicWebComponent(IVirtualComponent component) {
-		if (component.isBinary()) {
-			return WebBinaryComponentHelper.handlesComponent(component);
-		}
-		return isProjectOfType(component.getProject(), DYNAMIC_WEB);
-	}
-
-	public static boolean isDynamicWebProject(IProject project) {
-		return isProjectOfType(project, DYNAMIC_WEB);
-	}
-
-	public static boolean isStaticWebProject(IProject project) {
-		return isProjectOfType(project, STATIC_WEB);
-	}
-
-	public static boolean isEJBComponent(IVirtualComponent component) {
-		if (component.isBinary()) {
-			return EJBBinaryComponentHelper.handlesComponent(component);
-		}
-		return isProjectOfType(component.getProject(), EJB);
-	}
-
-	public static boolean isEJBProject(IProject project) {
-		return isProjectOfType(project, EJB);
-	}
-
-	public static boolean isJCAComponent(IVirtualComponent component) {
-		if (component.isBinary()) {
-			return JCABinaryComponentHelper.handlesComponent(component);
-		}
-		return isProjectOfType(component.getProject(), JCA);
-	}
-
-	public static boolean isJCAProject(IProject project) {
-		return isProjectOfType(project, JCA);
-	}
-
-	public static boolean isApplicationClientComponent(IVirtualComponent component) {
-		if (component.isBinary()) {
-			return AppClientBinaryComponentHelper.handlesComponent(component);
-		}
-		return isProjectOfType(component.getProject(), APPLICATION_CLIENT);
-	}
-
-	public static boolean isApplicationClientProject(IProject project) {
-		return isProjectOfType(project, APPLICATION_CLIENT);
-	}
-
-	public static boolean isUtilityProject(IProject project) {
-		return isProjectOfType(project, UTILITY);
-	}
-
-	public static boolean isStandaloneProject(IProject project) {
-		return getReferencingEARProjects(project).length == 0;
-	}
-
-	
-	
-	public static IProject[] getReferencingEARProjects(IProject project) {
-		if(project != null && isEARProject(project)){
-			return new IProject[] {project};
-		}
-		
-		List result = new ArrayList();
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		if (component != null) {
-			IVirtualComponent[] refComponents = component.getReferencingComponents();
-			for (int i = 0; i < refComponents.length; i++) {
-				if (isEARProject(refComponents[i].getProject()))
-					result.add(refComponents[i].getProject());
-			}
-		}
-		return (IProject[]) result.toArray(new IProject[result.size()]);
-	}
-
-	/**
-	 * Return all projects in workspace of the specified type
-	 * 
-	 * @param type -
-	 *            use one of the static strings on this class as a type
-	 * @return IProject[]
-	 */
-	public static IProject[] getAllProjectsInWorkspaceOfType(String type) {
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		List result = new ArrayList();
-		for (int i = 0; i < projects.length; i++) {
-			if (isProjectOfType(projects[i], type))
-				result.add(projects[i]);
-		}
-		return (IProject[]) result.toArray(new IProject[result.size()]);
-	}
-
-	public static String getJ2EEComponentType(IVirtualComponent component) {
-		if (null != component) {
-			if (component.isBinary()) {
-				if (isApplicationClientComponent(component))
-					return APPLICATION_CLIENT;
-				else if (isDynamicWebComponent(component))
-					return DYNAMIC_WEB;
-				else if (isEJBComponent(component))
-					return EJB;
-				else if (isJCAComponent(component))
-					return JCA;
-				else
-					return UTILITY;
-			}
-			return getJ2EEProjectType(component.getProject());
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String getJ2EEProjectType(IProject project) {
-		if (null != project && project.isAccessible()) {
-			IFacetedProject facetedProject = null;
-			try {
-				facetedProject = ProjectFacetsManager.create(project);
-			} catch (CoreException e) {
-				return ""; //$NON-NLS-1$
-			}
-			if (isApplicationClientProject(facetedProject))
-				return APPLICATION_CLIENT;
-			else if (isDynamicWebProject(facetedProject))
-				return DYNAMIC_WEB;
-			else if (isEJBProject(facetedProject))
-				return EJB;
-			else if (isEARProject(facetedProject))
-				return ENTERPRISE_APPLICATION;
-			else if (isJCAProject(facetedProject))
-				return JCA;
-			else if (isStaticWebProject(facetedProject))
-				return STATIC_WEB;
-			else if (isUtilityProject(facetedProject))
-				return UTILITY;
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static IRuntime getServerRuntime(IProject project) throws CoreException {
-		if (project == null)
-			return null;
-		IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-		if (facetedProject == null)
-			return null;
-		org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = facetedProject.getRuntime();
-		if (runtime == null)
-			return null;
-		return FacetUtil.getRuntime(runtime);
-	}
-
-	public static String getJ2EEProjectVersion(IProject project) {
-		String type = getJ2EEProjectType(project);
-		IFacetedProject facetedProject = null;
-		IProjectFacet facet = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(project);
-			facet = ProjectFacetsManager.getProjectFacet(type);
-		} catch (Exception e) {
-			// Not Faceted project or not J2EE Project
-		}
-		if (facet != null && facetedProject.hasProjectFacet(facet))
-			return facetedProject.getInstalledVersion(facet).getVersionString();
-		return null;
-	}
-
-	public static JavaProjectMigrationOperation createFlexJavaProjectForProjectOperation(IProject project) {
-		IDataModel model = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
-		model.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, project.getName());
-		return new JavaProjectMigrationOperation(model);
-	}
-
-	/**
-	 * Retrieve all the source containers for a given virtual workbench component
-	 * 
-	 * @param vc
-	 * @return the array of IPackageFragmentRoots
-	 */
-	public static IPackageFragmentRoot[] getSourceContainers(IProject project) {
-		IJavaProject jProject = JemProjectUtilities.getJavaProject(project);
-		if (jProject == null)
-			return new IPackageFragmentRoot[0];
-		List list = new ArrayList();
-		IVirtualComponent vc = ComponentCore.createComponent(project);
-		IPackageFragmentRoot[] roots;
-		try {
-			roots = jProject.getPackageFragmentRoots();
-			for (int i = 0; i < roots.length; i++) {
-				if (roots[i].getKind() != IPackageFragmentRoot.K_SOURCE)
-					continue;
-				IResource resource = roots[i].getResource();
-				if (null != resource) {
-					IVirtualResource[] vResources = ComponentCore.createResources(resource);
-					boolean found = false;
-					for (int j = 0; !found && j < vResources.length; j++) {
-						if (vResources[j].getComponent().equals(vc)) {
-							if (!list.contains(roots[i]))
-								list.add(roots[i]);
-							found = true;
-						}
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-			Logger.getLogger().logError(e);
-		}
-		return (IPackageFragmentRoot[]) list.toArray(new IPackageFragmentRoot[list.size()]);
-	}
-
-	/**
-	 * Retrieve all the output containers for a given virtual component.
-	 * 
-	 * @param vc
-	 * @return array of IContainers for the output folders
-	 */
-	public static IContainer[] getOutputContainers(IProject project) {
-		List result = new ArrayList();
-		try {
-			if (!project.hasNature(JavaCore.NATURE_ID))
-				return new IContainer[] {};
-		} catch (Exception e) {
-		}
-		IPackageFragmentRoot[] sourceContainers = getSourceContainers(project);
-		for (int i = 0; i < sourceContainers.length; i++) {
-			IContainer outputFolder = getOutputContainer(project, sourceContainers[i]);
-			if (outputFolder != null && !result.contains(outputFolder))
-				result.add(outputFolder);
-		}
-		return (IContainer[]) result.toArray(new IContainer[result.size()]);
-	}
-
-	public static IContainer getOutputContainer(IProject project, IPackageFragmentRoot sourceContainer) {
-		try {
-			IJavaProject jProject = JavaCore.create(project);
-			IPath outputPath = sourceContainer.getRawClasspathEntry().getOutputLocation();
-			if (outputPath == null) {
-				if (jProject.getOutputLocation().segmentCount() == 1)
-					return project;
-				return project.getFolder(jProject.getOutputLocation().removeFirstSegments(1));
-			}
-			return project.getFolder(outputPath.removeFirstSegments(1));
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param name
-	 * @return
-	 * @description the passed name should have either lib or var as its first segment e.g.
-	 *              lib/D:/foo/foo.jar or var/<CLASSPATHVAR>/foo.jar
-	 */
-	public static IPath getResolvedPathForArchiveComponent(String name) {
-
-		URI uri = URI.createURI(name);
-
-		String resourceType = uri.segment(0);
-		URI contenturi = ModuleURIUtil.trimToRelativePath(uri, 1);
-		String contentName = contenturi.toString();
-
-		if (resourceType.equals("lib")) { //$NON-NLS-1$
-			// module:/classpath/lib/D:/foo/foo.jar
-			return Path.fromOSString(contentName);
-
-		} else if (resourceType.equals("var")) { //$NON-NLS-1$
-
-			// module:/classpath/var/<CLASSPATHVAR>/foo.jar
-			String classpathVar = contenturi.segment(0);
-			URI remainingPathuri = ModuleURIUtil.trimToRelativePath(contenturi, 1);
-			String remainingPath = remainingPathuri.toString();
-
-			String[] classpathvars = JavaCore.getClasspathVariableNames();
-			boolean found = false;
-			for (int i = 0; i < classpathvars.length; i++) {
-				if (classpathVar.equals(classpathvars[i])) {
-					found = true;
-					break;
-				}
-			}
-			if (found) {
-				IPath path = JavaCore.getClasspathVariable(classpathVar);
-				URI finaluri = URI.createURI(path.toOSString() + IPath.SEPARATOR + remainingPath);
-				return Path.fromOSString(finaluri.toString());
-			}
-		}
-		return null;
-	}
-
-	public static List getAllJavaNonFlexProjects() throws CoreException {
-		List nonFlexJavaProjects = new ArrayList();
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			if (projects[i].isAccessible() && projects[i].hasNature(JavaCore.NATURE_ID) && !projects[i].hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-				nonFlexJavaProjects.add(projects[i]);
-			}
-		}
-		return nonFlexJavaProjects;
-	}
-
-	/**
-	 * This method will retrieve the context root for the associated workbench module which is used
-	 * by the server at runtime. This method is not yet completed as the context root has to be
-	 * abstracted and added to the workbenchModule model. This API will not change though. Returns
-	 * null for now.
-	 * 
-	 * @return String value of the context root for runtime of the associated module
-	 */
-	public static String getServerContextRoot(IProject project) {
-		return ComponentUtilities.getServerContextRoot(project);
-	}
-
-	/**
-	 * This method will set the context root on the associated workbench module with the given
-	 * string value passed in. This context root is used by the server at runtime. This method is
-	 * not yet completed as the context root still needs to be abstracted and added to the workbench
-	 * module model. This API will not change though. Does nothing as of now.
-	 * 
-	 * @param contextRoot
-	 *            string
-	 */
-	public static void setServerContextRoot(IProject project, String contextRoot) {
-		ComponentUtilities.setServerContextRoot(project, contextRoot);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ManifestFileCreationAction.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ManifestFileCreationAction.java
deleted file mode 100644
index 78e2cddfa..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ManifestFileCreationAction.java
+++ /dev/null
@@ -1,41 +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.project;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-
-public class ManifestFileCreationAction {
-
-	public static final String MANIFEST_HEADER = "Manifest-Version: 1.0\r\nClass-Path: \r\n\r\n"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for ManifestFileCreationAction.
-	 */
-	public ManifestFileCreationAction() {
-		super();
-	}
-
-	public static void createManifestFile(IFile file, IProject aJ2EEProject) throws CoreException, IOException {
-		try {
-			WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);
-			out.write(MANIFEST_HEADER.getBytes());
-			out.close();
-
-		} catch (IOException ioe) {
-			throw ioe;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ProjectSupportResourceHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ProjectSupportResourceHandler.java
deleted file mode 100644
index 66416f0c2..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/ProjectSupportResourceHandler.java
+++ /dev/null
@@ -1,66 +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.project;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ProjectSupportResourceHandler extends NLS {
-	private static final String BUNDLE_NAME = "projectsupport";//$NON-NLS-1$
-
-	private ProjectSupportResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String Folder_name_cannot_be_the_same_as_Java_source_folder_5;
-	public static String Target_Update_Op;
-	public static String Operation_failed_due_to_SA_ERROR_;
-	public static String Creating_Web_Project____UI_;
-	public static String Could_not_rename_____2;
-	public static String A_web_project_must_be_open_and_must_exist_for_properties_to_be_edited_30;
-	public static String Operation_failed_due_to_IO_ERROR_;
-	public static String Cannot_clone_TaglibInfo_1_EXC_;
-	public static String Syntax_Error_in_the_links_UI_;
-	public static String Sync_WLP_Op;
-	public static String Generated_by_Web_Tooling_23;
-	public static String _1concat_EXC_;
-	public static String File_Serving_Enabler_7;
-	public static String Auto_Generated___File_Enabler_9;
-	public static String Not_a_web_project_29;
-	public static String Names_cannot_begin_or_end_with_whitespace_5;
-	public static String The_character_is_invalid_in_a_context_root;
-	public static String Folder_name_cannot_be_the_same_as_Java_class_folder_6;
-	public static String The_path_for_the_links_sta_EXC_;
-	public static String Operation_failed_due_to_Ja_ERROR_;
-	public static String Folder_name_cannot_be_empty_2;
-	public static String Error_importing_Module_Fil_EXC_;
-	public static String Operation_failed_due_to_Co_ERROR_;
-	public static String Folder_names_cannot_be_equal_4;
-	public static String Could_not_read_TLD_15;
-	public static String Folder_name_is_not_valid;
-	public static String Invalid_Servlet_Level_set_on_WebNature_3_EXC_;
-	public static String Context_Root_cannot_be_empty_2;
-	public static String Error_while_saving_links_s_EXC_;
-	public static String Sychronize_Class_Path_UI_;	
-	public static String UNABLE_TO_LOAD_MODULE_ERROR_;
-	public static String Catalog_Lib_Directory__UI_;
-	public static String Update_ClassPath__UI_;	
-	public static String Set_ClassPath__UI_; 	
-	public static String Names_cannot_contain_whitespace_;
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ProjectSupportResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java
deleted file mode 100644
index 87bec50ac..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java
+++ /dev/null
@@ -1,594 +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 17, 2004
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.project;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-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.IncrementalProjectBuilder;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.codegen.CodeGenPlugin;
-import org.eclipse.emf.codegen.jet.JETCompiler;
-import org.eclipse.emf.codegen.jet.JETEmitter;
-import org.eclipse.emf.codegen.jet.JETException;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-
-/**
- * @author schacher, mdelder
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WTPJETEmitter extends JETEmitter {
-
-	public static final String PROJECT_NAME = ".JETEmitters"; //$NON-NLS-1$
-	private Map variables;
-
-	private boolean intelligentLinkingEnabled = false;
-
-	private JETCompiler jetCompiler;
-
-	/**
-	 * @param templateURI
-	 */
-	public WTPJETEmitter(String templateURI) {
-		super(templateURI);
-	}
-
-	/**
-	 * @param templateURIPath
-	 * @param relativeTemplateURI
-	 */
-	public WTPJETEmitter(String[] templateURIPath, String relativeTemplateURI) {
-		super(templateURIPath, relativeTemplateURI);
-	}
-
-	/**
-	 * @param templateURI
-	 * @param classLoader
-	 */
-	public WTPJETEmitter(String templateURI, ClassLoader classLoader) {
-		super(templateURI, classLoader);
-		try {
-			initialize(new NullProgressMonitor());
-		} catch (JETException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @param templateURIPath
-	 * @param relativeTemplateURI
-	 * @param classLoader
-	 */
-	public WTPJETEmitter(String[] templateURIPath, String relativeTemplateURI, ClassLoader classLoader) {
-		super(templateURIPath, relativeTemplateURI, classLoader);
-	}
-
-	/**
-	 * @param templateURIPath
-	 * @param relativeTemplateURI
-	 * @param classLoader
-	 * @param encoding
-	 */
-	public WTPJETEmitter(String[] templateURIPath, String relativeTemplateURI, ClassLoader classLoader, String encoding) {
-		super(templateURIPath, relativeTemplateURI, classLoader, encoding);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.codegen.jet.JETEmitter#initialize(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initialize(IProgressMonitor progressMonitor) throws JETException {
-
-		progressMonitor.beginTask("", 10); //$NON-NLS-1$
-		progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_GeneratingJETEmitterFor_message", new Object[]{templateURI})); //$NON-NLS-1$
-
-		try {
-			// This ensures that the JRE variables are initialized.
-			try {
-				JavaRuntime.getDefaultVMInstall();
-			} catch (Throwable throwable) {
-				// This is kind of nasty to come here.
-				URL jreURL = Platform.find(Platform.getBundle("org.eclipse.emf.codegen"),new Path("plugin.xml")); //$NON-NLS-1$ //$NON-NLS-2$
-				IPath jrePath = new Path(Platform.asLocalURL(jreURL).getFile());
-				jrePath = jrePath.removeLastSegments(1).append(new Path("../../jre/lib/rt.jar")); //$NON-NLS-1$
-				if (!jrePath.equals(JavaCore.getClasspathVariable(JavaRuntime.JRELIB_VARIABLE))) {
-					JavaCore.setClasspathVariable(JavaRuntime.JRELIB_VARIABLE, jrePath, null);
-				}
-			}
-
-			/*
-			 * final JETCompiler jetCompiler = templateURIPath == null ? new
-			 * MyJETCompiler(templateURI, encoding) :
-			 */
-
-			getJetCompiler();
-
-			progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETParsing_message", new Object[]{jetCompiler.getResolvedTemplateURI()})); //$NON-NLS-1$
-			jetCompiler.parse();
-			progressMonitor.worked(1);
-
-			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-			jetCompiler.generate(outputStream);
-			final InputStream contents = new ByteArrayInputStream(outputStream.toByteArray());
-
-			final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			IJavaModel javaModel = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-			if (!javaModel.isOpen()) {
-				javaModel.open(new SubProgressMonitor(progressMonitor, 1));
-			} else {
-				progressMonitor.worked(1);
-			}
-
-			final IProject project = workspace.getRoot().getProject(getProjectName());
-			progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETPreparingProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
-
-			IJavaProject javaProject;
-			if (!project.exists()) {
-				javaProject = createJavaProject(progressMonitor, workspace, project);
-
-				initializeJavaProject(progressMonitor, project, javaProject);
-
-				javaProject.close();
-			} else {
-				project.open(new SubProgressMonitor(progressMonitor, 5));
-				javaProject = JavaCore.create(project);
-				List rawClassPath = Arrays.asList(javaProject.getRawClasspath());
-				for (int i=0; i<rawClassPath.size(); i++) {
-					IClasspathEntry entry = (IClasspathEntry) rawClassPath.get(i);
-					if (entry.getEntryKind()==IClasspathEntry.CPE_LIBRARY)
-						classpathEntries.add(entry);
-				}
-			}
-
-			IPackageFragmentRoot sourcePackageFragmentRoot = openJavaProjectIfNecessary(progressMonitor, project, javaProject);
-
-			String packageName = jetCompiler.getSkeleton().getPackageName();
-			StringTokenizer stringTokenizer = new StringTokenizer(packageName, "."); //$NON-NLS-1$
-			IProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor, 1);
-			subProgressMonitor.beginTask("", stringTokenizer.countTokens() + 4); //$NON-NLS-1$
-			subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_CreateTargetFile_message")); //$NON-NLS-1$
-			IContainer sourceContainer = (IContainer) sourcePackageFragmentRoot.getCorrespondingResource();
-			while (stringTokenizer.hasMoreElements()) {
-				String folderName = stringTokenizer.nextToken();
-				sourceContainer = sourceContainer.getFolder(new Path(folderName));
-				if (!sourceContainer.exists()) {
-					((IFolder) sourceContainer).create(false, true, new SubProgressMonitor(subProgressMonitor, 1));
-				}
-			}
-			IFile targetFile = sourceContainer.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java")); //$NON-NLS-1$
-			if (!targetFile.exists()) {
-				subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreating_message", new Object[]{targetFile.getFullPath()})); //$NON-NLS-1$
-				targetFile.create(contents, true, new SubProgressMonitor(subProgressMonitor, 1));
-			} else {
-				subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", new Object[]{targetFile.getFullPath()})); //$NON-NLS-1$
-				targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
-			}
-
-			boolean errors = performBuild(project, subProgressMonitor, targetFile);
-
-			if (!errors) {
-				loadClass(workspace, project, javaProject, packageName, subProgressMonitor);
-			}
-
-			subProgressMonitor.done();
-		} catch (CoreException exception) {
-			throw new JETException(exception);
-		} catch (Exception exception) {
-			throw new JETException(exception);
-		} finally {
-			progressMonitor.done();
-		}
-
-	}
-
-	/**
-	 * @param progressMonitor
-	 * @param project
-	 * @param javaProject
-	 * @return
-	 * @throws JavaModelException
-	 */
-	protected IPackageFragmentRoot openJavaProjectIfNecessary(IProgressMonitor progressMonitor, final IProject project, IJavaProject javaProject) throws JavaModelException {
-		progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETOpeningJavaProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
-		javaProject.open(new SubProgressMonitor(progressMonitor, 1));
-
-		IPackageFragmentRoot[] packageFragmentRoots = javaProject.getPackageFragmentRoots();
-		IPackageFragmentRoot sourcePackageFragmentRoot = null;
-		for (int j = 0; j < packageFragmentRoots.length; ++j) {
-			IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[j];
-			if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
-				sourcePackageFragmentRoot = packageFragmentRoot;
-				break;
-			}
-		}
-		return sourcePackageFragmentRoot;
-	}
-
-	/**
-	 * @param progressMonitor
-	 * @param project
-	 * @param javaProject
-	 * @throws CoreException
-	 * @throws JavaModelException
-	 */
-	protected void initializeJavaProject(IProgressMonitor progressMonitor, final IProject project, IJavaProject javaProject) throws CoreException, JavaModelException {
-		progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETInitializingProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
-		IClasspathEntry classpathEntry = JavaCore.newSourceEntry(new Path("/" + project.getName() + "/src")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		//IClasspathEntry jreClasspathEntry = JavaCore.newVariableEntry(new Path(JavaRuntime.JRELIB_VARIABLE), new Path(JavaRuntime.JRESRC_VARIABLE), new Path(JavaRuntime.JRESRCROOT_VARIABLE));
-		IClasspathEntry jreClasspathEntry = JavaRuntime.getDefaultJREContainerEntry();
-
-		List classpath = new ArrayList();
-		classpath.add(classpathEntry);
-		classpath.add(jreClasspathEntry);
-		classpath.addAll(classpathEntries);
-
-		IFolder sourceFolder = project.getFolder(new Path("src")); //$NON-NLS-1$
-		if (!sourceFolder.exists()) {
-			sourceFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
-		}
-		IFolder runtimeFolder = project.getFolder(new Path("runtime")); //$NON-NLS-1$
-		if (!runtimeFolder.exists()) {
-			runtimeFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
-		}
-
-		IClasspathEntry[] classpathEntryArray = (IClasspathEntry[]) classpath.toArray(new IClasspathEntry[classpath.size()]);
-
-		javaProject.setRawClasspath(classpathEntryArray, new SubProgressMonitor(progressMonitor, 1));
-
-		javaProject.setOutputLocation(new Path("/" + project.getName() + "/runtime"), new SubProgressMonitor(progressMonitor, 1)); //$NON-NLS-1$ //$NON-NLS-2$
-
-		// appended from previous implementation
-		createClasspathEntries(project);
-	}
-
-	/**
-	 * @param progressMonitor
-	 * @param workspace
-	 * @param project
-	 * @return
-	 * @throws CoreException
-	 */
-	private IJavaProject createJavaProject(IProgressMonitor progressMonitor, final IWorkspace workspace, final IProject project) throws CoreException {
-		IJavaProject javaProject;
-		progressMonitor.subTask("JET creating project " + project.getName()); //$NON-NLS-1$
-		project.create(new SubProgressMonitor(progressMonitor, 1));
-		progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreatingProject_message", new Object[]{project.getName()})); //$NON-NLS-1$
-		IProjectDescription description = workspace.newProjectDescription(project.getName());
-		description.setNatureIds(new String[]{JavaCore.NATURE_ID});
-		description.setLocation(null);
-		project.open(new SubProgressMonitor(progressMonitor, 1));
-		project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
-
-		javaProject = JavaCore.create(project);
-		return javaProject;
-	}
-
-	/**
-	 * @param workspace
-	 * @param project
-	 * @param javaProject
-	 * @param packageName
-	 * @param subProgressMonitor
-	 * @throws JavaModelException
-	 * @throws MalformedURLException
-	 * @throws ClassNotFoundException
-	 * @throws SecurityException
-	 */
-	protected void loadClass(final IWorkspace workspace, final IProject project, IJavaProject javaProject, String packageName, IProgressMonitor subProgressMonitor) throws JavaModelException, MalformedURLException, ClassNotFoundException, SecurityException {
-		//IContainer targetContainer =
-		// workspace.getRoot().getFolder(javaProject.getOutputLocation());
-
-		subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETLoadingClass_message", new Object[]{jetCompiler.getSkeleton().getClassName() + ".class"})); //$NON-NLS-1$ //$NON-NLS-2$
-
-		// Construct a proper URL for relative lookup.
-		//
-		URL url = new File(project.getLocation() + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/").toURL(); //$NON-NLS-1$ //$NON-NLS-2$
-		URLClassLoader theClassLoader = new URLClassLoader(new URL[]{url}, classLoader);
-		Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") + jetCompiler.getSkeleton().getClassName()); //$NON-NLS-1$ //$NON-NLS-2$
-		String methodName = jetCompiler.getSkeleton().getMethodName();
-		Method[] methods = theClass.getDeclaredMethods();
-		for (int i = 0; i < methods.length; ++i) {
-			if (methods[i].getName().equals(methodName)) {
-				setMethod(methods[i]);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * @param project
-	 * @param subProgressMonitor
-	 * @param targetFile
-	 * @return
-	 * @throws CoreException
-	 */
-	protected boolean performBuild(final IProject project, IProgressMonitor subProgressMonitor, IFile targetFile) throws CoreException {
-		subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", new Object[]{project.getName()})); //$NON-NLS-1$
-		project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
-
-		IMarker[] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
-		boolean errors = false;
-		for (int i = 0; i < markers.length; ++i) {
-			IMarker marker = markers[i];
-			if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
-				errors = true;
-				subProgressMonitor.subTask(marker.getAttribute(IMarker.MESSAGE) + " : " + (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[]{targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER)}))); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		return errors;
-	}
-
-	/**
-	 * Create the correct classpath entries for the given project
-	 * 
-	 * @param project
-	 */
-	protected void createClasspathEntries(IProject project) {
-		Assert.isNotNull(project, "A valid project is required in order to append to a classpath"); //$NON-NLS-1$
-		String variableName = null;
-		String pluginId = null;
-		for (Iterator variablesKeyIterator = getVariables().keySet().iterator(); variablesKeyIterator.hasNext();) {
-			variableName = (String) variablesKeyIterator.next();
-			pluginId = (String) getVariables().get(variableName);
-			if (hasOutputDirectory(pluginId))
-				addLinkedFolderAsLibrary(project, variableName, pluginId);
-			else
-				addRuntimeJarsAsLibrary(project, pluginId);
-		}
-	}
-
-	/**
-	 * @param pluginId
-	 * @return
-	 */
-	protected boolean hasOutputDirectory(String pluginId) {
-		Bundle bundle = Platform.getBundle(pluginId);
-		URL outputDirectory = Platform.find(bundle,new Path("bin")); //$NON-NLS-1$
-		if (outputDirectory == null)
-			return false;
-		URL installLocation = null;
-		try {
-			installLocation = Platform.asLocalURL(outputDirectory);
-		} catch (IOException e) {
-			Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{installLocation}) + e); //$NON-NLS-1$
-		}
-		File outputDirectoryFile = new File(installLocation.getPath());// new File(location);
-		return outputDirectoryFile.canRead() && outputDirectoryFile.isDirectory() && outputDirectoryFile.listFiles().length > 0;
-	}
-
-	/**
-	 * @param project
-	 * @param variableName
-	 * @param pluginId
-	 */
-	protected void addRuntimeJarsAsLibrary(IProject project, String pluginId) {
-		ManifestElement[] elements = null;
-		Bundle bundle = Platform.getBundle(pluginId);
-		try {
-			String requires = (String) bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
-			elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, requires);
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-			elements = new ManifestElement[0];
-		}
-		IPath runtimeLibFullPath = null;
-		URL fullurl = null;
-		if (elements == null) {
-			if (bundle.getLocation().endsWith(".jar")) //$NON-NLS-1$
-				runtimeLibFullPath = getJarredPluginPath(bundle);
-			appendToClassPath(runtimeLibFullPath,project);
-			return;
-		}
-		for (int i = 0; i < elements.length; i++) {
-			String value = elements[i].getValue();
-			if (".".equals(value)) //$NON-NLS-1$
-	            value = "/"; //$NON-NLS-1$
-			fullurl = Platform.getBundle(pluginId).getEntry(value);
-			// fix the problem with leading slash that caused dup classpath entries
-			if (fullurl==null) continue;
-			try {
-				runtimeLibFullPath = new Path(Platform.asLocalURL(fullurl).getPath());
-			} catch (Exception e) {
-				Logger.getLogger().logError(e);
-			}
-			//TODO handle jar'ed plugins, this is a hack for now, need to find proper bundle API
-			if (bundle.getLocation().endsWith(".jar")) //$NON-NLS-1$
-				runtimeLibFullPath = getJarredPluginPath(bundle);
-			if (!"jar".equals(runtimeLibFullPath.getFileExtension()) && !"zip".equals(runtimeLibFullPath.getFileExtension())) //$NON-NLS-1$ //$NON-NLS-2$
-				continue;
-			appendToClassPath(runtimeLibFullPath,project);
-		}
-	}
-	
-	private void appendToClassPath(IPath runtimeLibFullPath, IProject project) {
-		IClasspathEntry entry = null;
-		entry = JavaCore.newLibraryEntry(runtimeLibFullPath, null,null,null,new IClasspathAttribute[]{},false);
-		try {
-			if (!classpathEntries.contains(entry))
-				classpathEntries.add(entry);
-			//J2EEProjectUtilities.appendJavaClassPath(project, entry);
-		} catch (Exception e) {
-			Logger.getLogger().logError("Problem appending \"" + entry.getPath() + "\" to classpath of Project \"" + project.getName() + "\"."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			Logger.getLogger().logError(e);
-		}
-	}
-	
-	private IPath getJarredPluginPath(Bundle bundle) {
-		Path runtimeLibFullPath = null;
-		String jarPluginLocation = bundle.getLocation().substring(7);
-		Path jarPluginPath = new Path(jarPluginLocation);
-		// handle case where jars are installed outside of eclipse installation
-		if (jarPluginPath.isAbsolute())
-			runtimeLibFullPath = jarPluginPath;
-		// handle normal case where all plugins under eclipse install
-		else {
-			String installPath = Platform.getInstallLocation().getURL().getPath();
-			runtimeLibFullPath = new Path(installPath+"/"+jarPluginLocation); //$NON-NLS-1$
-		}
-		return runtimeLibFullPath;
-	}
-
-	/**
-	 * @param progressMonitor
-	 */
-	protected void updateProgress(IProgressMonitor progressMonitor, String key) {
-		progressMonitor.subTask(getMessage(key));
-	}
-
-	/**
-	 * @param progressMonitor
-	 */
-	protected void updateProgress(IProgressMonitor progressMonitor, String key, Object[] args) {
-		progressMonitor.subTask(getMessage(key, args));
-	}
-
-	protected String getMessage(String key) {
-		return CodeGenPlugin.getPlugin().getString(key);
-	}
-
-	protected String getMessage(String key, Object[] args) {
-		return CodeGenPlugin.getPlugin().getString(key, args);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.codegen.jet.JETEmitter#addVariable(java.lang.String, java.lang.String)
-	 */
-	public void addVariable(String variableName, String pluginID) throws JETException {
-		if (!isIntelligentLinkingEnabled())
-			super.addVariable(variableName, pluginID);
-		else {
-			getVariables().put(variableName, pluginID);
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			IProject project = workspace.getRoot().getProject(getProjectName());
-			if (project != null && project.exists())
-				createClasspathEntries(project);
-		}
-
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean isIntelligentLinkingEnabled() {
-		return intelligentLinkingEnabled;
-	}
-
-	/**
-	 * @return
-	 */
-	private Map getVariables() {
-		if (variables == null)
-			variables = new HashMap();
-		return variables;
-	}
-
-	protected void addLinkedFolderAsLibrary(IProject project, String variableName, String pluginID) {
-		try {
-			URL outputDirectory = Platform.find(Platform.getBundle(pluginID),new Path("bin")); //$NON-NLS-1$
-//			IPluginDescriptor pluginDescriptor = Platform.getPlugin(pluginID).getDescriptor();
-//			URL outputDirectory = pluginDescriptor.find(new Path("bin")); //$NON-NLS-1$
-			String pathString = Platform.asLocalURL(outputDirectory).getPath();
-			if (pathString.endsWith("/")) //$NON-NLS-1$
-				pathString = pathString.substring(0, pathString.length() - 1);
-			if (pathString.startsWith("/")) //$NON-NLS-1$
-				pathString = pathString.substring(1, pathString.length());
-			IPath path = new Path(pathString).makeAbsolute();
-
-			String binDirectoryVariable = variableName + "_BIN"; //$NON-NLS-1$
-			IFolder linkedDirectory = project.getFolder(binDirectoryVariable);
-			if (!linkedDirectory.exists()) {
-				linkedDirectory.createLink(path, IResource.ALLOW_MISSING_LOCAL, null);
-				linkedDirectory.setDerived(true);
-				project.refreshLocal(IResource.DEPTH_INFINITE, null);
-			}
-			IClasspathEntry entry = JavaCore.newLibraryEntry(linkedDirectory.getFullPath(), null,null,null,new IClasspathAttribute[]{},false);
-
-			if (!classpathEntries.contains(entry))
-			classpathEntries.add(entry);
-			//J2EEProjectUtilities.appendJavaClassPath(project, entry);
-
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * @param intelligentLinkingEnabled
-	 *            The intelligentLinkingEnabled to set.
-	 */
-	public void setIntelligentLinkingEnabled(boolean intelligentLinkingEnabled) {
-		this.intelligentLinkingEnabled = intelligentLinkingEnabled;
-	}
-
-	protected JETCompiler getJetCompiler() {
-		try {
-			if (jetCompiler == null) {
-				jetCompiler = templateURIPath == null ? new MyJETCompiler(templateURI, encoding) : new MyJETCompiler(templateURIPath, templateURI, encoding);
-			}
-		} catch (JETException e) {
-			Logger.getLogger().logError(e);
-		}
-		return jetCompiler;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/test.jpage b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/test.jpage
deleted file mode 100644
index e69de29bb..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/test.jpage
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/ClasspathRenameInfo.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/ClasspathRenameInfo.java
deleted file mode 100644
index ba2780c43..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/ClasspathRenameInfo.java
+++ /dev/null
@@ -1,76 +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.rename;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A simple structure that remembers for a given project, the manifest entries to be deleted and the
- * build path entries to be deleted
- */
-public class ClasspathRenameInfo {
-	/**
-	 * The project from which the dependencies will be removed
-	 */
-	protected IProject targetProject;
-	/**
-	 * The literal manifest entries to be removed; String
-	 */
-	protected List manifestEntries;
-	/**
-	 * The project references to be removed from the build path; IProject
-	 */
-	protected List referencedProjects;
-
-	public ClasspathRenameInfo(IProject project) {
-		super();
-		targetProject = project;
-	}
-
-	/**
-	 * Gets the manifestEntries.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getManifestEntries() {
-		if (manifestEntries == null)
-			manifestEntries = new ArrayList();
-		return manifestEntries;
-	}
-
-
-	/**
-	 * Gets the referencedProjects.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getReferencedProjects() {
-		if (referencedProjects == null)
-			referencedProjects = new ArrayList();
-		return referencedProjects;
-	}
-
-
-	/**
-	 * Gets the targetProject.
-	 * 
-	 * @return Returns a IProject
-	 */
-	public IProject getTargetProject() {
-		return targetProject;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameOptions.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameOptions.java
deleted file mode 100644
index 3041a2415..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameOptions.java
+++ /dev/null
@@ -1,165 +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.rename;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class RenameOptions {
-	protected boolean isEARRename;
-	protected boolean renameProjects;
-	protected boolean renameModules;
-	protected boolean renameModuleDependencies;
-	protected List selectedProjects;
-	/** Applicable for EAR rename */
-	protected List selectedReferencedProjects;
-	protected String newName = null;
-	protected String newContextRoot = null;
-	protected boolean bogus;
-
-	/**
-	 * Constructor for RenameOptions.
-	 */
-	public RenameOptions() {
-		super();
-	}
-
-
-	public boolean shouldRenameModules() {
-		return renameModules;
-	}
-
-
-	public void setRenameModules(boolean renameModulesFromAllEARs) {
-		this.renameModules = renameModulesFromAllEARs;
-	}
-
-
-	public boolean shouldRenameProjects() {
-		return renameProjects;
-	}
-
-
-	public void setRenameProjects(boolean renameProjects) {
-		this.renameProjects = renameProjects;
-	}
-
-
-	public boolean shouldRenameModuleDependencies() {
-		return renameModuleDependencies;
-	}
-
-
-	public void setRenameModuleDependencies(boolean renameReferencesFromModuleDependencies) {
-		this.renameModuleDependencies = renameReferencesFromModuleDependencies;
-	}
-
-	public List getModuleAndUtilityProjects() {
-		if (isEARRename)
-			return getSelectedReferencedProjects();
-		return getSelectedProjects();
-	}
-
-	public List getAllProjectsToRename() {
-		List result = new ArrayList();
-		result.addAll(getSelectedProjects());
-		result.addAll(getSelectedReferencedProjects());
-		return result;
-	}
-
-	/**
-	 * Gets the selectedProjects.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getSelectedProjects() {
-		if (selectedProjects == null)
-			return Collections.EMPTY_LIST;
-		return selectedProjects;
-	}
-
-	/**
-	 * Sets the selectedProjects.
-	 * 
-	 * @param selectedProjects
-	 *            The selectedProjects to set
-	 */
-	public void setSelectedProjects(List selectedProjects) {
-		this.selectedProjects = selectedProjects;
-	}
-
-	/**
-	 * Gets the selectedReferencedProjects.
-	 * 
-	 * @return Returns a List
-	 */
-	public List getSelectedReferencedProjects() {
-		if (selectedReferencedProjects == null)
-			return Collections.EMPTY_LIST;
-		return selectedReferencedProjects;
-	}
-
-	/**
-	 * Sets the selectedReferencedProjects.
-	 * 
-	 * @param selectedReferencedProjects
-	 *            The selectedReferencedProjects to set
-	 */
-	public void setSelectedReferencedProjects(List selectedReferencedProjects) {
-		this.selectedReferencedProjects = selectedReferencedProjects;
-	}
-
-	public boolean isEARRename() {
-		return isEARRename;
-	}
-
-	public void setIsEARRename(boolean isEARRename) {
-		this.isEARRename = isEARRename;
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Gets the newContextRoot.
-	 * 
-	 * @return Returns a String
-	 */
-	public String getNewContextRoot() {
-		return newContextRoot;
-	}
-
-	/**
-	 * Sets the newContextRoot.
-	 * 
-	 * @param newContextRoot
-	 *            The newContextRoot to set
-	 */
-	public void setNewContextRoot(String newContextRoot) {
-		this.newContextRoot = newContextRoot;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/IServerTargetConstants.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/IServerTargetConstants.java
deleted file mode 100644
index d54ae2061..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/IServerTargetConstants.java
+++ /dev/null
@@ -1,41 +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 Aug 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.servertarget;
-
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface IServerTargetConstants {
-	String EAR_TYPE = "j2ee.ear"; //$NON-NLS-1$
-	String WEB_TYPE = "j2ee.web"; //$NON-NLS-1$
-	String WEB_PORTAL_TYPE = "j2ee.web.portal"; //$NON-NLS-1$
-	String EJB_TYPE = "j2ee.ejb"; //$NON-NLS-1$
-	String APP_CLIENT_TYPE = "j2ee.appclient"; //$NON-NLS-1$
-	String CONNECTOR_TYPE = "j2ee.connector"; //$NON-NLS-1$
-	String J2EE_12 = "1.2"; //$NON-NLS-1$
-	String J2EE_13 = "1.3"; //$NON-NLS-1$
-	String J2EE_14 = "1.4"; //$NON-NLS-1$
-	String SERVER_FILE_NAME = ".server"; //$NON-NLS-1$
-	String aesV4ServerTargetId = "com.ibm.etools.websphere.aes.v4";//$NON-NLS-1$
-	String v5ServerTargetId = "com.ibm.etools.websphere.serverTarget.base.v5";//$NON-NLS-1$
-	String v51ServerTargetId = "com.ibm.etools.websphere.serverTarget.base.v51";//$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ITargetRuntimeExtensionHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ITargetRuntimeExtensionHandler.java
deleted file mode 100644
index 5b7882d8c..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ITargetRuntimeExtensionHandler.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
- *******************************************************************************/
-/*
- * Created on Feb 5, 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.servertarget;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface ITargetRuntimeExtensionHandler {
-	public boolean removeTargetRuntimeClasspath(IProject project);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModelProvider.java
deleted file mode 100644
index 1a5802930..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModelProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-public class J2EEProjectServerTargetDataModelProvider extends AbstractDataModelProvider implements IJ2EEProjectServerTargetDataModelProperties {
-
-	private static final String DEFAULT_TARGET_ID = "org.eclipse.jst.server.core.runtimeType"; //$NON-NLS-1$
-
-	public void init() {
-		model.setProperty(RUNTIME_TARGET_ID, getDefaultServerTargetID());
-		super.init();
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new J2EEProjectServerTargetOp(model);
-	}
-
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		propertyNames.add(RUNTIME_TARGET_ID);
-		propertyNames.add(J2EE_VERSION_ID);
-		propertyNames.add(DEPLOYMENT_TYPE_ID);
-		propertyNames.add(UPDATE_MODULES);
-		return propertyNames;
-	}
-
-	public IProject getProject() {
-		String name = (String) getProperty(PROJECT_NAME);
-		if (name != null && name.length() > 0)
-			return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		return null;
-	}
-
-	public IRuntime getRuntimeTarget() {
-		String serverTargetId = (String) getProperty(RUNTIME_TARGET_ID);
-		return ResourceManager.getInstance().getRuntime(serverTargetId);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultProperty(java.lang.String)
-	 */
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(RUNTIME_TARGET_ID))
-			return getDefaultServerTargetID();
-		else if (propertyName.equals(J2EE_VERSION_ID))
-			return getDefaultVersionID();
-		else if (propertyName.equals(UPDATE_MODULES)) {
-			return Boolean.TRUE;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	private Integer getDefaultVersionID() {
-		return new Integer(J2EEVersionConstants.J2EE_1_4_ID);
-	}
-
-	/**
-	 * @return
-	 */
-	private Object getDefaultServerTargetID() {
-		List targets = getValidServerTargets();
-		if (!targets.isEmpty()) {
-			IRuntime target = null;
-			for (int i = targets.size() - 1; i < targets.size() && i >= 0; i--) {
-				target = (IRuntime) targets.get(i);
-				if (DEFAULT_TARGET_ID.equals(target.getId()))
-					return target.getId();
-			}
-			if (target != null)
-				return target.getId();
-		}
-		return null;
-	}
-
-	/**
-	 * This should only be used by clients that need to interact with the Server tooling directly.
-	 * The return value corresponds to the type id associated with a runtime target.
-	 * 
-	 * @return
-	 */
-	public String computeTypeId() {
-		int type = -1;
-		if (getDataModel().isPropertySet(DEPLOYMENT_TYPE_ID))
-			type = getIntProperty(DEPLOYMENT_TYPE_ID);
-		// else {
-		// J2EENature nature = J2EENature.getRegisteredRuntime(getProject());
-		// if (nature != null)
-		// type = nature.getDeploymentDescriptorType();
-		// else
-		// type = getIntProperty(DEPLOYMENT_TYPE_ID);
-		// }
-		return computeTypeId(type);
-	}
-
-	/**
-	 * @param deploymentDescriptorType2
-	 * @return
-	 */
-	private String computeTypeId(int deploymentDescriptorType) {
-		switch (deploymentDescriptorType) {
-			case XMLResource.APPLICATION_TYPE :
-				return IServerTargetConstants.EAR_TYPE;
-			case XMLResource.APP_CLIENT_TYPE :
-				return IServerTargetConstants.APP_CLIENT_TYPE;
-			case XMLResource.EJB_TYPE :
-				return IServerTargetConstants.EJB_TYPE;
-			case XMLResource.WEB_APP_TYPE :
-				return IServerTargetConstants.WEB_TYPE;
-			case XMLResource.RAR_TYPE :
-				return IServerTargetConstants.CONNECTOR_TYPE;
-		}
-		return null;
-	}
-
-	/**
-	 * This is only to be used by clients that need to interact with the Server tooling directly.
-	 * The return value corresponds to the version id associated with a runtime target.
-	 */
-	public String computeVersionId() {
-		int version = -1;
-		if (getDataModel().isPropertySet(J2EE_VERSION_ID))
-			version = getIntProperty(J2EE_VERSION_ID);
-		// else {
-		// J2EENature nature = J2EENature.getRegisteredRuntime(getProject());
-		// if (nature != null)
-		// version = nature.getJ2EEVersion();
-		// else
-		// version = getIntProperty(J2EE_VERSION_ID);
-		// }
-		return computeVersionId(version);
-	}
-
-	/**
-	 * @param version
-	 * @return
-	 */
-	private String computeVersionId(int version) {
-		switch (version) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				return IServerTargetConstants.J2EE_12;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return IServerTargetConstants.J2EE_13;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-				return IServerTargetConstants.J2EE_14;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doGetValidPropertyValues(java.lang.String)
-	 */
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (propertyName.equals(RUNTIME_TARGET_ID))
-			return getValidServerTargetDescriptors();
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	private DataModelPropertyDescriptor[] getValidServerTargetDescriptors() {
-		List targets = getValidServerTargets();
-		DataModelPropertyDescriptor[] descriptors = null;
-		if (!targets.isEmpty()) {
-			int serverTargetListSize = targets.size();
-			descriptors = new DataModelPropertyDescriptor[serverTargetListSize];
-			for (int i = 0; i < targets.size(); i++) {
-				IRuntime runtime = (IRuntime) targets.get(i);
-				descriptors[i] = new DataModelPropertyDescriptor(runtime.getId(), runtime.getName());
-			}
-		} else {
-			descriptors = new DataModelPropertyDescriptor[0];
-		}
-		return descriptors;
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (propertyName.equals(J2EE_VERSION_ID)) {
-			IRuntime target = getServerTargetByID(getStringProperty(RUNTIME_TARGET_ID));
-			if (target == null)
-				setProperty(RUNTIME_TARGET_ID, null);
-			model.notifyPropertyChange(RUNTIME_TARGET_ID, IDataModel.VALID_VALUES_CHG);
-		} else if (RUNTIME_TARGET_ID.equals(propertyName)) {
-			setProperty(RUNTIME_TARGET_ID, propertyValue);
-		}
-		return true;
-	}
-
-
-	private IRuntime getServerTargetByID(String id) {
-		List targets = getValidServerTargets();
-		IRuntime target;
-		for (int i = 0; i < targets.size(); i++) {
-			target = (IRuntime) targets.get(i);
-			if (id.equals(target.getId()))
-				return target;
-		}
-		return null;
-	}
-
-	/**
-	 * @return
-	 */
-	private List getValidServerTargets() {
-		List validServerTargets = null;
-		// TODO: api is needed from the server target helper to get all server targets
-		// validServerTargets = ServerTargetHelper.getServerTargets(IServerTargetConstants.EAR_TYPE,
-		// IServerTargetConstants.J2EE_14);
-		validServerTargets = getServerTargets("", ""); //$NON-NLS-1$  //$NON-NLS-2$
-		if (validServerTargets != null && validServerTargets.isEmpty())
-			validServerTargets = null;
-		if (validServerTargets == null)
-			return Collections.EMPTY_LIST;
-		return validServerTargets;
-	}
-
-	public static List getServerTargets(String type, String version) {
-		List targets = Arrays.asList(ServerUtil.getRuntimes(type, version));
-		return targets;
-	}
-
-	/**
-	 * @return
-	 */
-	// private List getValidServerTargets() {
-	// List validServerTargets = null;
-	// String type = computeTypeId();
-	// if (type != null) {
-	// String version = computeVersionId();
-	// if (version != null) {
-	// validServerTargets = ServerTargetHelper.getServerTargets(type, version);
-	// if (validServerTargets != null && validServerTargets.isEmpty())
-	// validServerTargets = null;
-	// }
-	// }
-	// if (validServerTargets == null)
-	// return Collections.EMPTY_LIST;
-	// return validServerTargets;
-	// }
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String)
-	 */
-	public IStatus validate(String propertyName) {
-		if (propertyName.equals(RUNTIME_TARGET_ID))
-			return validateServerTarget();
-		return super.validate(propertyName);
-	}
-
-	/**
-	 * @return
-	 */
-	private IStatus validateServerTarget() {
-		List targets = getValidServerTargets();
-		if (targets.isEmpty()) {
-			return J2EEPlugin.newErrorStatus(J2EECreationResourceHandler.ServerTargetDataModel_UI_7, null); 
-		}
-		IRuntime target = getRuntimeTarget();
-		if (target == null) {
-			return J2EEPlugin.newErrorStatus(J2EECreationResourceHandler.ServerTargetDataModel_UI_8, null); 
-		} else if (!targets.contains(target)) {
-			return J2EEPlugin.newErrorStatus(J2EECreationResourceHandler.ServerTargetDataModel_UI_9, null); 
-		}
-		return OK_STATUS;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOp.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOp.java
deleted file mode 100644
index 215063985..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOp.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.servertarget;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-public class J2EEProjectServerTargetOp extends AbstractDataModelOperation {
-
-    /**
-     * @param operationDataModel
-     */
-    public J2EEProjectServerTargetOp(IDataModel model) {
-        super(model);
-        // TODO Auto-generated constructor stub
-    }
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        String serverTargetId = model.getStringProperty(IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID);
-		IRuntime runtime = ResourceManager.getInstance().getRuntime(serverTargetId);
-		IProject project = null;
-        String name = model.getStringProperty(IJ2EEProjectServerTargetDataModelProperties.PROJECT_NAME);
-        if (name != null && name.length() > 0)
-			project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (runtime != null && project != null) {
-			try {
-				//ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
-				if (model.getBooleanProperty(IJ2EEProjectServerTargetDataModelProperties.UPDATE_MODULES) 
-						&& project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-					//ServerTargetHelper.setNewServerTargetForEARModules(runtime, project);
-					//ServerTargetHelper.setNewServerTargetForEARUtilityJars(runtime, project);
-				}
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return OK_STATUS;
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java
deleted file mode 100644
index 879a73588..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java
+++ /dev/null
@@ -1,476 +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 Aug 15, 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.servertarget;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-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.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-//import com.ibm.etools.j2ee.internal.project.EAREditModel;
-//import com.ibm.etools.j2ee.internal.project.EARNatureRuntime;
-
-/**
- * @author vijayb
- * @deprecated - Use server core api to set Runtime Targets. Use artifact edit api to
- * get to any j2ee related methods in the class.
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ServerTargetHelper {
-	public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
-
-	public static final String SERVER_CONTAINER = "org.eclipse.jst.server.core.container"; //$NON-NLS-1$
-
-	/**
-	 *  
-	 */
-	public ServerTargetHelper() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public static void cleanUpNonServerTargetClasspath(IProject project) {
-		List existingClasspathEntries = ServerTargetHelper.getExistingNonServerTargetClasspath(project);
-		if (!existingClasspathEntries.isEmpty())
-			ServerTargetHelper.removeNonSeverTargetClasspathEntries(project, existingClasspathEntries);
-	}
-
-	/**
-	 * @param existingClasspathEntries
-	 */
-	public static void removeNonSeverTargetClasspathEntries(IProject project, List existingClasspathEntries) {
-		try {
-			JemProjectUtilities.removeFromJavaClassPath(project, existingClasspathEntries);
-		} catch (JavaModelException jme) {
-			Logger.getLogger().logError(jme);
-		}
-	}
-
-	/**
-	 * @param project
-	 */
-	// public static void syncNoServerTargetForEARModules(IProject project) {
-	// removeServerTargetForEARModuleProjects(project);
-	// removeServerTargetForEARUtilsProject(project);
-	// }
-	/**
-	 * @param project
-	 */
-	// public static void removeServerTargetForEAR(IProject project, boolean
-	// updateModules) {
-	// //We don't need to remove a server target anyomre as it need to be
-	// // there
-	// //ServerTargetManager.removeServerTarget(project, null);
-	// if (updateModules) {
-	// removeServerTargetForEARModuleProjects(project);
-	// removeServerTargetForEARUtilsProject(project);
-	// }
-	// }
-	/**
-	 * @param project
-	 */
-	// private static void removeServerTargetForEARModuleProjects(IProject
-	// project) {
-	// List moduleProjects =
-	// ServerTargetHelper.getAllEarModuleProjects(project);
-	// if (!moduleProjects.isEmpty()) {
-	// for (int i = 0; i < moduleProjects.size(); i++) {
-	// IProject moduleProject = (IProject) moduleProjects.get(i);
-	// ServerTargetType tt =
-	// ServerTargetManager.getServerTargetType(moduleProject);
-	// if (tt != null) {
-	// J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(moduleProject);
-	// if (info != null) {
-	// info.setProject(moduleProject);
-	// try {
-	// info.calculateServerClasspathEntries();
-	// info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null);
-	// } catch (JavaModelException jme) {
-	// Logger.getLogger().logTrace(jme);
-	// }
-	// }
-	// }
-	// }
-	// }
-	// }
-	/**
-	 * @param project
-	 */
-	// private static void removeServerTargetForEARUtilsProject(IProject
-	// project) {
-	// EARNatureRuntime nature = EARNatureRuntime.getRuntime(project);
-	// EAREditModel editModel = null;
-	// Object key = new ServerTargetHelper();
-	// try {
-	// editModel = nature.getEarEditModelForRead(key);
-	// List utilProjects =
-	// ServerTargetHelper.getAllEarUtilityProjects(editModel, project);
-	// if (!utilProjects.isEmpty()) {
-	// for (int i = 0; i < utilProjects.size(); i++) {
-	// IProject moduleProject = (IProject) utilProjects.get(i);
-	// //We don't need to remove a server target anyomre as it need to be there
-	// //ServerTargetType existingTargetType =
-	// // ServerTargetManager.getServerTargetType(moduleProject);
-	// //if (existingTargetType != null) {
-	// //if (!editModel.isEjbClientJarProject(moduleProject))
-	// //We don't need to remove a server target anyomre as it
-	// // need to be there
-	// //ServerTargetManager.removeServerTarget(moduleProject,null);
-	// //else
-	// // removeServerTargetForEJBClientJar(moduleProject);
-	// }
-	// }
-	// } finally {
-	// editModel.releaseAccess(key);
-	// }
-	// }
-	/**
-	 * @param moduleProject
-	 */
-	// public static void removeServerTargetForEJBClientJar(IProject
-	// ejbClientJarProject) {
-	// EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
-	// J2EEJavaProjectInfo info = ejbExt.createProjectInfo();
-	// if (info != null) {
-	// info.setProject(ejbClientJarProject);
-	// try {
-	// info.calculateServerClasspathEntries();
-	// info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null);
-	// } catch (JavaModelException jme) {
-	// Logger.getLogger().logTrace(jme);
-	// }
-	// }
-	// }
-	// public static void removeServerTargetOnProject(IProject project, String
-	// projectType) {
-	// setServerClassPathForJ2EEProject(project, projectType);
-	// }
-	/**
-	 * @param project
-	 */
-	// public static void setServerClassPathForJ2EEProject(IProject project,
-	// String projectType) {
-	// try {
-	// J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(project, projectType);
-	// if (info != null) {
-	// info.setProject(project);
-	// info.calculateServerClasspathEntries();
-	// info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null);
-	// }
-	// } catch (JavaModelException jme) {
-	// Logger.getLogger().logError(jme);
-	// }
-	// }
-	// public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project,
-	// String projectType)
-	// {
-	// if (projectType.equals(IServerTargetConstants.APP_CLIENT_TYPE))
-	// return new ApplicationClientProjectInfo();
-	// else if (projectType.equals(IServerTargetConstants.WEB_TYPE)) {
-	// WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
-	// J2EEJavaProjectInfo info = webExt.createProjectInfo();
-	// String webNature = J2EENature.getRegisteredRuntimeID(project);
-	// info.setJ2EEVersion(webNature.equals(J2EEVersionConstants.VERSION_1_3_TEXT)
-	// ?
-	// J2EEVersionConstants.J2EE_1_3_ID : J2EEVersionConstants.J2EE_1_2_ID);
-	// return info;
-	// } else if (projectType.equals(IServerTargetConstants.EJB_TYPE)) {
-	// EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
-	// return ejbExt.createProjectInfo();
-	// } else if (projectType.equals(IServerTargetConstants.CONNECTOR_TYPE)) {
-	// JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension();
-	// return jcaExt.createProjectInfo();
-	// }
-	// return null;
-	// }
-	// public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project)
-	// {
-	// if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) {
-	// EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension();
-	// return ejbExt.createProjectInfo();
-	// } else if (J2EENature.hasRuntime(project,
-	// IWebNatureConstants.J2EE_NATURE_ID)) {
-	// WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
-	// return webExt.createProjectInfo();
-	// } else if (ApplicationClientNatureRuntime.hasRuntime(project))
-	// return new ApplicationClientProjectInfo();
-	// else if (J2EENature.hasRuntime(project,
-	// IConnectorNatureConstants.CONNECTOR_NATURE_ID)) {
-	// JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension();
-	// return jcaExt.createProjectInfo();
-	// }
-	// return null;
-	// }
-//	public static void setNewServerTargetForEARModules(IRuntime newServerTarget, IProject project) {
-//		List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(project);
-//		if (!moduleProjects.isEmpty()) {
-//			for (int i = 0; i < moduleProjects.size(); i++) {
-//				IProject moduleProject = (IProject) moduleProjects.get(i);
-//				String[] projectAttr = ServerTargetHelper.getProjectTypeAndJ2EELevel(moduleProject);
-//				if (projectAttr[0] != null && projectAttr[1] != null) {
-//					IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget();
-//					if (existingTargetType != null) {
-//						if (!existingTargetType.getId().equals(newServerTarget.getId()))
-//							setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr);
-//						// TODO Move the WLP sync to this method
-//					} else
-//						setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr);
-//				}
-//			}
-//		}
-//	}
-
-//	public static void setServerTargetForModuleProject(IRuntime newServerTarget, IProject moduleProject, String[] projectAttr) {
-//		ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject);
-//		setServerTarget(moduleProject, newServerTarget, null);
-//	}
-
-//	public static List getWebProjectsInEAR(IProject earProject) {
-//		List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(earProject);
-//		if (!moduleProjects.isEmpty()) {
-//			List webProjects = new ArrayList();
-//			for (int i = 0; i < moduleProjects.size(); i++) {
-//				IProject project = (IProject) moduleProjects.get(i);
-//				WebModuleExtension webExt = EarModuleManager.getWebModuleExtension();
-//				if (webExt.hasRuntime(project))
-//					webProjects.add(project);
-//			}
-//			return webProjects;
-//		}
-//		return Collections.EMPTY_LIST;
-//	}
-
-	/**
-	 * @param newServerTarget
-	 * @param tt
-	 * @param project
-	 */
-//	public static void setNewServerTargetForEARUtilityJars(IRuntime newServerTarget, IProject project) {
-//		EARNatureRuntime nature = EARNatureRuntime.getRuntime(project);
-//		EAREditModel editModel = null;
-//		Object key = new ServerTargetHelper();
-//		try {
-//			editModel = nature.getEarEditModelForRead(key);
-//			List utilProjects = ServerTargetHelper.getAllEarUtilityProjects(editModel, project);
-//			if (!utilProjects.isEmpty()) {
-//				for (int i = 0; i < utilProjects.size(); i++) {
-//					IProject moduleProject = (IProject) utilProjects.get(i);
-//					IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget();
-//					if (existingTargetType != null) {
-//						if (!existingTargetType.getId().equals(newServerTarget.getId())) {
-//							setServerTargetForUtilProject(newServerTarget, moduleProject);
-//						}
-//					} else {
-//						setServerTargetForUtilProject(newServerTarget, moduleProject);
-//					}
-//				}
-//			}
-//		} finally {
-//			editModel.releaseAccess(key);
-//		}
-//	}
-
-//	public static void setServerTargetForUtilProject(IRuntime newServerTarget, IProject moduleProject) {
-//		ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject);
-//		setServerTarget(moduleProject, newServerTarget, null);
-//	}
-
-//	public static void setServerTarget(IProject project, IRuntime runtime, IProgressMonitor monitor) {
-//		try {
-//			ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
-//		} catch (CoreException ce) {
-//			Logger.getLogger().logError(ce);
-//		}
-//	}
-
-	/**
-	 * @param earProject
-	 */
-//	public static List getAllEarModuleProjects(IProject earProject) {
-//		EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject);
-//		EAREditModel editModel = null;
-//		List moduleProjects = new ArrayList();
-//		Object key = new ServerTargetHelper();
-//		try {
-//			editModel = nature.getEarEditModelForRead(key);
-//			Set allModuleProjects = editModel.getModuleMappedModuleProjects();
-//			if (!allModuleProjects.isEmpty())
-//				moduleProjects.addAll(allModuleProjects);
-//			return moduleProjects;
-//		} finally {
-//			if (editModel != null)
-//				editModel.releaseAccess(key);
-//		}
-//	}
-//
-	public static String[] getProjectTypeAndJ2EELevel(IProject project) {
-		String[] projectAttr = new String[2];
-//		boolean isJ2EE13 = true;
-//		if (EARNatureRuntime.hasRuntime(project)) {
-//			projectAttr[0] = IServerTargetConstants.EAR_TYPE;
-//			isJ2EE13 = EARNatureRuntime.getRuntime(project).isJ2EE1_3();
-//		} else if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) {
-//			projectAttr[0] = IServerTargetConstants.EJB_TYPE;
-//			isJ2EE13 = J2EENature.getRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS).isJ2EE1_3();
-//		} else if (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) {
-//			projectAttr[0] = IServerTargetConstants.WEB_TYPE;
-//			isJ2EE13 = J2EENature.getRuntime(project, IWebNatureConstants.J2EE_NATURE_ID).isJ2EE1_3();
-//		} else if (J2EENature.hasRuntime(project,IApplicationClientNatureConstants.NATURE_ID)) {
-//			projectAttr[0] = IServerTargetConstants.APP_CLIENT_TYPE;
-//			isJ2EE13 = J2EENature.getRuntime(project,IApplicationClientNatureConstants.NATURE_ID).isJ2EE1_3();
-//		} else if (J2EENature.hasRuntime(project, IConnectorNatureConstants.NATURE_ID)) {
-//			projectAttr[0] = IServerTargetConstants.CONNECTOR_TYPE;
-//			isJ2EE13 = J2EENature.getRuntime(project, IConnectorNatureConstants.NATURE_ID).isJ2EE1_3();
-//		} else if (hasJavaNature(project))
-//			projectAttr[0] = null;
-//		if (projectAttr[0] != null && projectAttr[0].length() > 0) {
-//			if (isJ2EE13)
-//				projectAttr[1] = IServerTargetConstants.J2EE_13;
-//			else
-//				projectAttr[1] = IServerTargetConstants.J2EE_12;
-//		}
-		return projectAttr;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 */
-	public static boolean hasJavaNature(IProject project) {
-		try {
-			return project.hasNature(JAVA_NATURE_ID);
-		} catch (CoreException ce) {
-			Logger.getLogger().logTrace(ce);
-		}
-		return false;
-	}
-
-	/**
-	 * @param earProject
-	 */
-//	public static List getAllEarUtilityProjects(EAREditModel earEditModel, IProject earProject) {
-//		List utilityProjects = new ArrayList();
-//		Set utilProjects = earEditModel.getModuleMappedUtilityJarProjects();
-//		if (!utilProjects.isEmpty())
-//			utilityProjects.addAll(utilProjects);
-//		return utilityProjects;
-//	}
-
-	public static int getExistingServerTargetIndex(List validServerTargets, IProject project) {
-		if (validServerTargets != null) {
-			IRuntime st = ServerCore.getProjectProperties(project).getRuntimeTarget();
-			if (st != null) {
-				for (int i = 0; i < validServerTargets.size(); i++) {
-					if (((IRuntime) validServerTargets.get(i)).getId() == st.getId())
-						return i;
-				}
-			}
-		}
-		return -1;
-	}
-
-	public static List getExistingNonServerTargetClasspath(IProject project) {
-		IJavaProject javaProject = null;
-		List list = new ArrayList();
-		try {
-			javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
-		} catch (Exception e) {
-		}
-		if (javaProject != null) {
-			try {
-				IClasspathEntry[] cp = javaProject.getRawClasspath();
-				int size = cp.length;
-				for (int i = 0; i < size; i++) {
-					int entryKind = cp[i].getEntryKind();
-					if (entryKind != IClasspathEntry.CPE_SOURCE && entryKind != IClasspathEntry.CPE_LIBRARY && entryKind != IClasspathEntry.CPE_PROJECT && (entryKind == IClasspathEntry.CPE_VARIABLE && isWASVariable(cp[i])) && (entryKind != IClasspathEntry.CPE_CONTAINER || !cp[i].getPath().segment(0).equals(SERVER_CONTAINER))) {
-						list.add(cp[i]);
-					}
-				}
-			} catch (Exception e) {
-			}
-			return list;
-		}
-		return list;
-	}
-
-	/**
-	 * @param entry
-	 * @return
-	 */
-	private static boolean isWASVariable(IClasspathEntry entry) {
-		// TODO This is no longer valid in the base.
-		// IPath path = entry.getPath();
-		// if (path != null && path.segmentCount() != 0) {
-		// String classpathVariable = path.segment(0);
-		// return
-		// classpathVariable.equals(IEJBNatureConstants.WAS_PLUGINDIR_VARIABLE)
-		// ||
-		// classpathVariable.equals(IEJBNatureConstants.WAS_50_PLUGINDIR_VARIABLE)
-		// ||
-		// classpathVariable.equals(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE)
-		// ||
-		// classpathVariable.equals(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE)
-		// || classpathVariable.equals(J2EEPlugin.SOAP_PLUGINDIR_VARIABLE)
-		// || classpathVariable.equals(J2EEPlugin.SOAPSEC_PLUGINDIR_VARIABLE);
-		// //|| classpathVariable.equals(J2EEPlugin.XERCES_IMPL_VARIABLE)
-		// //|| classpathVariable.equals(J2EEPlugin.XERCES_PLUGINDIR_VARIABLE)
-		// //|| classpathVariable.equals(J2EEPlugin.WORF_PLUGINDIR_VARIABLE)
-		// //|| classpathVariable.equals(J2EEPlugin.MAIL_CLASSPATH_VARIABLE)
-		// //||
-		// classpathVariable.equals(J2EEPlugin.ACTIVATION_CLASSPATH_VARIABLE);
-		// }
-		return false;
-	}
-
-	/**
-	 * @param earProject
-	 * @param st
-	 * @return
-	 */
-//	public static boolean serverTargetValidForEAR(IProject earProject, IRuntime st) {
-//		return !(J2EENature.hasRuntime(earProject, IEARNatureConstants.NATURE_ID) && st.getId().equals(IServerTargetConstants.aesV4ServerTargetId));
-//	}
-
-	public static List getServerTargets(String type, String version) {
-		List targets = Arrays.asList(ServerUtil.getRuntimes(type, version));
-		return targets;
-	}
-	/*
-	 * public static ITargetType getV50TargetType(IProject project, IServerTarget v50ServerTarget) {
-	 * if (J2EENature.hasRuntime(project, IEARNatureConstants.NATURE_ID)) return
-	 * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EAR_TYPE); if
-	 * (J2EENature.hasRuntime(project, IApplicationClientNatureConstants.NATURE_ID)) return
-	 * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EAR_TYPE); else if
-	 * (J2EENature.hasRuntime(project, IEJBNatureConstants.NATURE_ID)) return
-	 * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EJB_TYPE); else if
-	 * (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) return
-	 * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.WEB_TYPE); return
-	 * null; }
-	 */
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtension.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtension.java
deleted file mode 100644
index 26334b1d3..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtension.java
+++ /dev/null
@@ -1,62 +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 Feb 5, 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.servertarget;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * @author vijayb
- * @deprecated
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TargetRuntimeExtension {
-	String groupID;
-	String className;
-	IConfigurationElement configElement;
-	Plugin plugin;
-
-	/**
-	 *  
-	 */
-	public TargetRuntimeExtension() {
-		super();
-	}
-
-	public TargetRuntimeExtension(Plugin aPlugin, IConfigurationElement element, String groupId, String handlerClass) {
-		super();
-		plugin = aPlugin;
-		configElement = element;
-		groupID = groupId;
-		className = handlerClass;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getGroupId() {
-		return groupID;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setGroupId(String string) {
-		groupID = string;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IFlexibleJavaProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IFlexibleJavaProjectCreationDataModelProperties.java
deleted file mode 100644
index 34fa9a06f..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IFlexibleJavaProjectCreationDataModelProperties.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.project.datamodel.properties;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFlexibleProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-/**
- * <p>
- * IFlexibleJavaProjectCreationDataModelProperties provides properties to the DataModel associated with the 
- * FlexibleJavaProjectCreationDataModelProvider
- * @see org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * 
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see IFacetProjectCreationDataModelProperties
- */
-public interface IFlexibleJavaProjectCreationDataModelProperties extends IFlexibleProjectCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-    /**
-     * Required, type IDataModel. The user set IDataModel used to handle the creation of a server target for the project to be
-     * created.  Providers which currently exist for this IDataModel include J2EEProjectServerTargetDataModelProvider.
-     */
-    public static final String NESTED_MODEL_SERVER_TARGET = "IFlexibleProjectCreationDataModelProperties.NESTED_MODEL_SERVER_TARGET"; //$NON-NLS-1$
-    
-    /**
-     * Optional, type Boolean The default value is <code>Boolean.TRUE</code>. If this property is set 
-     * to <code>Boolean.TRUE</code> then the server target specified by dataModel property <code>SERVER_TARGET_ID</code> 
-     * will be set on the generated artifact.
-     * 
-     * @see SERVER_TARGET_ID
-     */
-    public static final String ADD_SERVER_TARGET = "IFlexibleProjectCreationDataModelProperties.ADD_SERVER_TARGET"; //$NON-NLS-1$
-    /**
-     * Optional, type String. This is used to specify the server target and is required if 
-     * the <code>ADD_SERVER_TARGET</code> property is set to <code>Boolean.TRUE</code>.
-     */
-    public static final String RUNTIME_TARGET_ID = IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IJ2EEProjectServerTargetDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IJ2EEProjectServerTargetDataModelProperties.java
deleted file mode 100644
index 735a26fa9..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/datamodel/properties/IJ2EEProjectServerTargetDataModelProperties.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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.datamodel.properties;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface IJ2EEProjectServerTargetDataModelProperties extends IDataModelProperties{
-
-	/**
-	 * required, type String
-	 */
-	public static final String PROJECT_NAME = "IJ2EEProjectServerTargetDataModelProperties.PROJECT_NAME"; //$NON-NLS-1$
-	/**
-	 * required, not defaulted. If null, will not run.
-	 */
-	public static final String RUNTIME_TARGET_ID = "IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID"; //$NON-NLS-1$
-	/**
-	 * Optional - This needs to be set if the PROJECT_NAME does not exist.
-	 * 
-	 * @link J2EEVersionConstants
-	 */
-	public static final String J2EE_VERSION_ID = "IJ2EEProjectServerTargetDataModelProperties.J2EE_VERSION_ID"; //$NON-NLS-1$
-
-	/**
-	 * optional, default true, type Boolean. Set this to true if the operation is supposed to update
-	 * all dependent modules and projects in an ear if the passed project name is an ear project
-	 */
-	public static final String UPDATE_MODULES = "IJ2EEProjectServerTargetDataModelProperties.UPDATE_MODULES"; //$NON-NLS-1$
-
-	/**
-	 * Optional - This needs to be set if the PROJECT_NAME does not exist.
-	 * 
-	 * @link XMLResource#APP_CLIENT_TYPE
-	 * @link XMLResource#APPLICATION_TYPE
-	 * @link XMLResource#EJB_TYPE
-	 * @link XMLResource#RAR_TYPE
-	 * @link XMLResource#WEB_APP_TYPE
-	 */
-	public static final String DEPLOYMENT_TYPE_ID = "IJ2EEProjectServerTargetDataModelProperties.DD_TYPE_ID"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetInstallDataModelProperties.java
deleted file mode 100644
index 968ed5d24..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,23 +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.project.facet;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-
-public interface IJ2EEFacetInstallDataModelProperties extends IFacetInstallDataModelProperties {
-
-	//TODO this property should probably be deleted
-	public static final String RUNTIME_TARGET_ID = "IJ2EEFacetInstallDataModelProperties.RUNTIME_TARGET_ID"; //$NON-NLS-1$
-	
-	public static final String FACET_RUNTIME = IFacetProjectCreationDataModelProperties.FACET_RUNTIME; 
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetProjectCreationDataModelProperties.java
deleted file mode 100644
index 228a4b472..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.j2ee.project.facet;
-
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-
-public interface IJ2EEFacetProjectCreationDataModelProperties  
-   extends IFacetProjectCreationDataModelProperties{
-
-	public static final String ADD_TO_EAR = "IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-	public static final String EAR_PROJECT_NAME = "IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
-	public static final String MODULE_URI = "IJ2EEFacetProjectCreationDataModelProperties.MODULE_URI"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEModuleFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEModuleFacetInstallDataModelProperties.java
deleted file mode 100644
index 97a67092f..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEModuleFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-public interface IJ2EEModuleFacetInstallDataModelProperties extends IJ2EEFacetInstallDataModelProperties{
-
-	public static final String ADD_TO_EAR = "IJ2EEFacetInstallDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-	public static final String EAR_PROJECT_NAME = "IJ2EEFacetInstallDataModelProperties.EAR_PROJECT_NAME"; //$NON-NLS-1$
-	public static final String CONFIG_FOLDER = "IJ2EEFacetInstallDataModelProperties.CONFIG_FOLDER"; //$NON-NLS-1$
-	public static final String LAST_EAR_NAME = "IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME";	//$NON-NLS-1$
-	public static final String MODULE_URI = "IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEComponentCreationFacetOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEComponentCreationFacetOperation.java
deleted file mode 100644
index 767a7b529..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEComponentCreationFacetOperation.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- * @see J2EEFacetInstallDataModelProvider
- */
-public class J2EEComponentCreationFacetOperation extends AbstractDataModelOperation implements DoNotUseMeThisWillBeDeletedPost15{
-
-	
-	public J2EEComponentCreationFacetOperation(IDataModel model) {
-		super(model);
-	}
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	protected void setRuntime(IDataModel newModel, IDataModel facetModel) {
-		String runtime = newModel.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID);
-		try {
-			if (runtime != null && runtime.trim().length() > 0) {
-				org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = RuntimeManager.getRuntime(runtime);
-				if (facetRuntime != null) {
-					facetModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetRuntime);
-				}
-			}
-		} catch (IllegalArgumentException e) {
-			Logger.getLogger().logError(e);
-		}
-	}
-
-	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 setupJavaInstallAction() {
-		IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-		dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-		//dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.4"); //$NON-NLS-1$
-		dm.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, model.getStringProperty(IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER));
-		return dm;
-	}
-	
-	protected IStatus addtoEar(String projectName, String earProjectName){
-		
-		IStatus stat = OK_STATUS;
-		IProject moduleProject = ProjectUtilities.getProject( projectName );
-		IProject earProject = ProjectUtilities.getProject( earProjectName );
-
-		IVirtualComponent comp = ComponentCore.createComponent( moduleProject );
-		IVirtualComponent earComp = ComponentCore.createComponent( earProject );
-		if( comp != null && comp.exists() && earComp != null && earComp.exists()){
-			
-			IDataModel dataModel = DataModelFactory.createDataModel( new AddComponentToEnterpriseApplicationDataModelProvider());
-			dataModel.setProperty( ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp );
-	        List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-	        modList.add(comp);
-	        dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-	        Map map = new HashMap();
-			map.put(comp, model.getStringProperty(IJ2EEComponentCreationDataModelProperties.MODULE_URI));
-	        dataModel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, map);
-	        try {
-				stat = dataModel.getDefaultOperation().execute(null, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-		}	
-		return stat;
-	}
-	
-	protected void setAddToEARFromWizard(IDataModel newModel) {
-		newModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,model.getBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR));	
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDataModelProvider.java
deleted file mode 100644
index 140da4814..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,33 +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.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public abstract class J2EEFacetInstallDataModelProvider extends FacetInstallDataModelProvider  implements IJ2EEFacetInstallDataModelProperties{
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(RUNTIME_TARGET_ID);
-		names.add(FACET_RUNTIME);
-		return names;
-	}
-
-	protected final int getJ2EEVersion() {
-		return convertFacetVersionToJ2EEVersion((IProjectFacetVersion) getProperty(FACET_VERSION));
-	}
-
-	protected abstract int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version);
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDelegate.java
deleted file mode 100644
index ef2ac95d6..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetInstallDelegate.java
+++ /dev/null
@@ -1,165 +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.project.facet;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-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;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public abstract class J2EEFacetInstallDelegate {
-
-	protected static void addToClasspath(final IJavaProject jproj, final IClasspathEntry entry) throws CoreException {
-		final IClasspathEntry[] current = jproj.getRawClasspath();
-		final IClasspathEntry[] updated = new IClasspathEntry[current.length + 1];
-		System.arraycopy(current, 0, updated, 0, current.length);
-		updated[current.length] = entry;
-		jproj.setRawClasspath(updated, null);
-	}
-
-	protected void installEARFacet(String j2eeVersionText, String earProjectName, IRuntime runtime, IProgressMonitor monitor){
-
-		IProject project = ProjectUtilities.getProject(earProjectName); 
-		if( project.exists())
-			return;
-		
-		IFacetedProject facetProj;
-		try {
-			facetProj = ProjectFacetsManager.create(earProjectName,
-					null, monitor);
-			if(null != runtime){
-				facetProj.setRuntime(runtime, monitor);
-			}
-			
-			IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
-			earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, earProjectName);
-			earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, j2eeVersionText);
-			
-			Set actions = new HashSet();
-			actions.add(new IFacetedProject.Action((Type) earFacetInstallDataModel.getProperty(IFacetDataModelProperties.FACET_TYPE),
-				(IProjectFacetVersion) earFacetInstallDataModel.getProperty(IFacetDataModelProperties.FACET_VERSION),
-				earFacetInstallDataModel));
-
-
-			facetProj.modify(actions, null);
-			
-			try {
-				FacetProjectCreationOperation.addDefaultFactets(facetProj, runtime);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}			
-		} catch (CoreException e) {
-			Logger.getLogger().logError(e);
-		}		
-	}
-	
-    protected void createManifest(IProject project, IContainer aFolder, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-    	
-        IFile file = aFolder.getFile(new Path(J2EEConstants.MANIFEST_URI));
-        if (file.exists()) return;
-        try {
-            ManifestFileCreationAction.createManifestFile(file, project);
-        } catch (CoreException e) {
-            Logger.getLogger().log(e);
-        } catch (IOException e) {
-            Logger.getLogger().log(e);
-        }
-    }
-
-    protected void addToEar(IVirtualComponent earComp, IVirtualComponent j2eeComp, String moduleURI ){
-		final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-		Map map = (Map)dataModel.getProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP);
-		map.put(j2eeComp, moduleURI);
-		
-		dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-			
-		List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-		modList.add(j2eeComp);
-		dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-		try {
-			dataModel.getDefaultOperation().execute(null, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().logError(e);
-		}
-    }
-    
-    protected void installAndAddModuletoEAR( String j2eeVersionText,
-    			String				earProjectName,
-    			IRuntime			runtime,
-    			IProject			moduleProject,
-    			String				moduleURI,
-    			IProgressMonitor	monitor ){
-    	
-		installEARFacet(j2eeVersionText,
-					earProjectName,
-					runtime,
-					monitor);
-		
-		final IVirtualComponent c = ComponentCore.createComponent( moduleProject );
-		final IProject earProject = ProjectUtilities.getProject( earProjectName );
-		final IVirtualComponent earComp = ComponentCore.createComponent( earProject );
-		addToEar( earComp, c, moduleURI );
-    }
-    
-    /**
-     * This method will set the output property on the model element for the given component.
-     * If the single root structure is set for optimized use, the output folder will be the
-     * content root.  Otherwise the default will be used.  This may be overrided by specific
-     * J2EE modules to do more appropriate behaviour.
-     * 
-     * @param model
-     * @param component
-     */
-    protected void setOutputFolder(IDataModel model, IVirtualComponent component) {
-		String outputFolder = null;
-		// If using single root structure, set output folder to be the content folder
-		if (ProductManager.shouldUseSingleRootStructure())
-			outputFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
-		// Otherwise just use the product default for java output path
-		else
-			outputFolder = ProductManager.getProperty(IProductConstants.OUTPUT_FOLDER);
-		component.setMetaProperty("java-output-path", outputFolder ); //$NON-NLS-1$
-	}
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index aa604c387..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.eclipse.jst.j2ee.project.facet;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class J2EEFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider implements IJ2EEFacetProjectCreationDataModelProperties {
-
-	public J2EEFacetProjectCreationDataModelProvider() {
-		super();
-	}
-
-	public void init() {
-		super.init();
-	}
-	
-	public Object getDefaultProperty(String propertyName) {
-		if (EAR_PROJECT_NAME.equals(propertyName)) {
-			IDataModel nestedJ2EEFacetDataModel = getJ2EEFacetModel();
-			if (nestedJ2EEFacetDataModel!=null)
-				return nestedJ2EEFacetDataModel.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(EAR_PROJECT_NAME);
-		names.add(ADD_TO_EAR);
-		names.add(MODULE_URI);
-		return names;
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (FACET_RUNTIME.equals(propertyName) && getBooleanProperty(ADD_TO_EAR)) {
-			DataModelPropertyDescriptor[] descriptors = super.getValidPropertyDescriptors(propertyName);
-			List list = new ArrayList();
-			for (int i = 0; i < descriptors.length; i++) {
-				IRuntime rt = (IRuntime) descriptors[i].getPropertyValue();
-				if (rt == null || rt.supports(EARFacetUtils.EAR_FACET)) {
-					list.add(descriptors[i]);
-				}
-			}
-			descriptors = new DataModelPropertyDescriptor[list.size()];
-			for (int i = 0; i < descriptors.length; i++) {
-				descriptors[i] = (DataModelPropertyDescriptor) list.get(i);
-			}
-			return descriptors;
-		}
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (EAR_PROJECT_NAME.equals(propertyName) || ADD_TO_EAR.equals(propertyName)) {
-			IDataModel nestedJ2EEFacetDataModel = getJ2EEFacetModel();
-			if(null != nestedJ2EEFacetDataModel){
-				if(EAR_PROJECT_NAME.equals(propertyName)){
-					nestedJ2EEFacetDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, propertyValue);
-				} else {
-					nestedJ2EEFacetDataModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, propertyValue);	
-				}
-				
-			}
-			if (getBooleanProperty(ADD_TO_EAR)) {
-				IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
-				if (status.isOK()) {
-					IProject earProject = ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
-					if (earProject != null) {
-						IFacetedProject facetdEarProject;
-						try {
-							facetdEarProject = ProjectFacetsManager.create(earProject);
-							if (facetdEarProject != null) {
-								setProperty(FACET_RUNTIME, facetdEarProject.getRuntime());
-							}
-						} catch (CoreException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-			if (ADD_TO_EAR.equals(propertyName)) {
-				model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
-			}
-			model.notifyPropertyChange(FACET_RUNTIME, IDataModel.ENABLE_CHG);
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}
-
-	protected IDataModel getJ2EEFacetModel() {
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		String [] j2eeFacets = new String [] { J2EEProjectUtilities.APPLICATION_CLIENT, J2EEProjectUtilities.EJB, J2EEProjectUtilities.JCA, J2EEProjectUtilities.DYNAMIC_WEB, J2EEProjectUtilities.UTILITY};
-		IDataModel j2eeFacetDataModel = null;
-		for(int i=0;i<j2eeFacets.length; i++){
-			j2eeFacetDataModel = map.getFacetDataModel(j2eeFacets[i]);
-			if(null != j2eeFacetDataModel){
-				return j2eeFacetDataModel;
-			}
-		}
-		return null;
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		if (FACET_RUNTIME.equals(propertyName)) {
-			if (getBooleanProperty(ADD_TO_EAR)) {
-				IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
-				if (status.isOK()) {
-					IProject earProject = ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
-					if (earProject != null) {
-						IFacetedProject facetdEarProject;
-						try {
-							facetdEarProject = ProjectFacetsManager.create(earProject);
-							if (facetdEarProject != null) {
-								return false;
-							}
-						} catch (CoreException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-			return true;
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-
-	public IStatus validate(String propertyName) {
-		if (ADD_TO_EAR.equals(propertyName) || EAR_PROJECT_NAME.equals(propertyName) || FACET_PROJECT_NAME.equals(propertyName)) {
-			if (model.getBooleanProperty(ADD_TO_EAR)) {
-				IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
-				if (!status.isOK())
-					return status;
-				if (getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME).equals(getStringProperty(EAR_PROJECT_NAME))) {
-					String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME, new Object[]{getStringProperty(EAR_PROJECT_NAME)});
-					return WTPCommonPlugin.createErrorStatus(errorMessage);
-				}
-			}
-		}
-		return super.validate(propertyName);
-	}
-
-	protected IStatus validateEAR(String earName) {
-		if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
-			String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
-			return WTPCommonPlugin.createErrorStatus(errorMessage);
-		} else if (earName == null || earName.equals("")) { //$NON-NLS-1$
-			String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
-			return WTPCommonPlugin.createErrorStatus(errorMessage);
-		}
-		return (ProjectCreationDataModelProviderNew.validateProjectName(earName));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
deleted file mode 100644
index a58fbe941..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,67 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class J2EEFacetRuntimeChangedDelegate 
-
-    implements IDelegate
-    
-{
-    public void execute( final IProject project, 
-                         final IProjectFacetVersion fv,
-                         final Object cfg,
-                         final IProgressMonitor monitor )
-    
-        throws CoreException
-        
-    {
-        if( monitor != null )
-        {
-            monitor.beginTask( "", 1 );
-        }
-        
-        try
-        {
-            ClasspathHelper.removeClasspathEntries( project, fv );
-            
-            if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
-            {
-                // TODO: Support the no runtime case.
-                // ClasspathHelper.addClasspathEntries( project, fv, <something> );
-            }
-            
-            if( monitor != null )
-            {
-                monitor.worked( 1 );
-            }
-        }
-        finally
-        {
-            if( monitor != null )
-            {
-                monitor.done();
-            }
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
deleted file mode 100644
index e138ea455..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,240 +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.project.facet;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-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.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public abstract class J2EEModuleFacetInstallDataModelProvider extends J2EEFacetInstallDataModelProvider implements IJ2EEModuleFacetInstallDataModelProperties {
-
-	/**
-	 * An internal Boolean property used to prohibit adding this module to an EAR. This is set on
-	 * the nested models when used during EAR creation since EAR creation handles adding to the EAR
-	 */
-	public static final String PROHIBIT_ADD_TO_EAR = "J2EEModuleFacetInstallDataModelProvider.PROHIBIT_ADD_TO_EAR"; //$NON-NLS-1$
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(ADD_TO_EAR);
-		names.add(PROHIBIT_ADD_TO_EAR);
-		names.add(CONFIG_FOLDER);
-		names.add(EAR_PROJECT_NAME);
-		names.add(LAST_EAR_NAME);
-		names.add(MODULE_URI);
-		return names;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(PROHIBIT_ADD_TO_EAR)) {
-			return Boolean.FALSE;
-		} else if (propertyName.equals(ADD_TO_EAR)) {
-			return new Boolean( ProductManager.shouldAddToEARByDefault() && isEARSupportedByRuntime());
-		} else if (propertyName.equals(EAR_PROJECT_NAME)) {
-			if (model.isPropertySet(LAST_EAR_NAME)) {
-				IProject project = ProjectUtilities.getProject(getStringProperty(LAST_EAR_NAME));
-				if (project.exists() && project.isAccessible())
-					return project.getName();
-			}
-			DataModelPropertyDescriptor[] descs = getValidPropertyDescriptors(EAR_PROJECT_NAME);
-			if (descs.length > 0) {
-				DataModelPropertyDescriptor desc = descs[0];
-				String eARName = desc.getPropertyDescription();
-				if (eARName != null && !eARName.equals("")) { //$NON-NLS-1$
-					return eARName;
-				} else {
-					return getDataModel().getStringProperty(FACET_PROJECT_NAME) + "EAR"; //$NON-NLS-1$
-				}
-			} else {
-				return getDataModel().getStringProperty(FACET_PROJECT_NAME) + "EAR"; //$NON-NLS-1$
-			}
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (propertyName.equals(PROHIBIT_ADD_TO_EAR)) {
-			setBooleanProperty(ADD_TO_EAR, false);
-		}
-		if (FACET_PROJECT_NAME.equals(propertyName)) {
-			if (getBooleanProperty(ADD_TO_EAR)) {
-				if (!model.isPropertySet(EAR_PROJECT_NAME)) {
-					model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
-				}
-			}
-		} else if (FACET_VERSION.equals(propertyName)) {
-			model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-		} else if (propertyName.equals(CONFIG_FOLDER)) {
-			IDataModel masterModel = (IDataModel) model.getProperty(MASTER_PROJECT_DM);
-			if (masterModel != null) {
-				FacetDataModelMap map = (FacetDataModelMap) masterModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-				IDataModel javaModel = map.getFacetDataModel(IModuleConstants.JST_JAVA);
-				if (javaModel != null) {
-					javaModel.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, propertyValue);
-					// If applicable, react to the change in content folder to update the output folder for single root structures
-					if (ProductManager.shouldUseSingleRootStructure())
-						javaModel.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME,propertyValue);
-				}
-			}
-		} else if ((EAR_PROJECT_NAME.equals(propertyName) || ADD_TO_EAR.equals(propertyName)) && getBooleanProperty(ADD_TO_EAR)) {
-			IStatus status = validateEAR(model.getStringProperty(EAR_PROJECT_NAME));
-			if (status.isOK()) {
-				IProject project = ProjectUtilities.getProject(getStringProperty(EAR_PROJECT_NAME));
-				if (project.exists() && project.isAccessible() && J2EEProjectUtilities.isEARProject(project)) {
-					try {
-						IFacetedProject facetProj = ProjectFacetsManager.create(project, false, new NullProgressMonitor());
-						setProperty(FACET_RUNTIME, facetProj.getRuntime());
-					} catch (CoreException e) {
-						Logger.getLogger().logError(e);
-					}
-				}
-			}
-			model.notifyPropertyChange(FACET_RUNTIME, IDataModel.ENABLE_CHG);
-		} else if (LAST_EAR_NAME.equals(propertyName)) {
-			model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
-		} else if (propertyName.equals(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)) {
-			model.notifyPropertyChange(ADD_TO_EAR, IDataModel.VALID_VALUES_CHG);
-			model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-		}
-
-		if (ADD_TO_EAR.equals(propertyName)) {
-			IStatus stat = model.validateProperty(propertyName);
-			if (stat != OK_STATUS) {
-				return true;
-			}
-			model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
-		}
-
-		return super.propertySet(propertyName, propertyValue);
-	}
-
-	public boolean isPropertyEnabled(String propertyName) {
-		if (ADD_TO_EAR.equals(propertyName)) {
-			return !getBooleanProperty(PROHIBIT_ADD_TO_EAR) && isEARSupportedByRuntime();
-		}
-		if (EAR_PROJECT_NAME.equals(propertyName)) {
-			return !getBooleanProperty(PROHIBIT_ADD_TO_EAR) && isEARSupportedByRuntime() && getBooleanProperty(ADD_TO_EAR);
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (EAR_PROJECT_NAME.equals(propertyName)) {
-			int j2eeVersion = getJ2EEVersion();
-			return getEARPropertyDescriptors(j2eeVersion);
-		}
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-
-	protected DataModelPropertyDescriptor[] getEARPropertyDescriptors(int j2eeVersion) {
-		StructureEdit mc = null;
-		ArrayList earDescriptorList = new ArrayList();
-
-		IProject[] projs = ProjectUtilities.getAllProjects();
-
-		for (int index = 0; index < projs.length; index++) {
-			IProject flexProject = projs[index];
-			try {
-				if (flexProject != null) {
-					if (ModuleCoreNature.isFlexibleProject(flexProject)) {
-						IVirtualComponent comp = ComponentCore.createComponent(flexProject);
-						if (J2EEProjectUtilities.isEARProject(comp.getProject())) {
-							String sVer = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
-							int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
-							if (j2eeVersion <= ver) {
-								DataModelPropertyDescriptor desc = new DataModelPropertyDescriptor(comp.getProject().getName());
-								earDescriptorList.add(desc);
-							}
-						}
-					}
-				}
-			} finally {
-				if (mc != null)
-					mc.dispose();
-			}
-		}
-		DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[earDescriptorList.size()];
-		for (int i = 0; i < descriptors.length; i++) {
-			DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor) earDescriptorList.get(i);
-			descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(), desc.getPropertyDescription());
-		}
-		return descriptors;
-	}
-
-	public IStatus validate(String name) {
-		if (name.equals(EAR_PROJECT_NAME) && getBooleanProperty(ADD_TO_EAR)) {
-			IStatus status = validateEAR(getStringProperty(EAR_PROJECT_NAME));
-			if (!status.isOK())
-				return status;
-			IDataModel masterDM = (IDataModel)getProperty(MASTER_PROJECT_DM);
-			if(masterDM.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME).equals(getStringProperty(EAR_PROJECT_NAME))){
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME, new Object [] {getStringProperty(EAR_PROJECT_NAME) });
-				return WTPCommonPlugin.createErrorStatus(errorMessage);
-			}
-		} else if (name.equals(CONFIG_FOLDER)) {
-			String folderName = model.getStringProperty(CONFIG_FOLDER);
-			if (folderName == null || folderName.length() == 0) {
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SOURCEFOLDER_EMPTY);
-				return WTPCommonPlugin.createErrorStatus(errorMessage);
-			}
-		} else if (name.equals(ADD_TO_EAR)) {
-			if (!isEARSupportedByRuntime()) {
-				String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.MODULE_NOT_SUPPORTED);
-				return WTPCommonPlugin.createErrorStatus(errorMessage);
-			}
-		}
-		return super.validate(name);
-	}
-
-	protected IStatus validateEAR(String earName) {
-		if (earName == null || earName.equals("")) { //$NON-NLS-1$
-			String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
-			return WTPCommonPlugin.createErrorStatus(errorMessage);
-		} else if (earName.indexOf("#") != -1 || earName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
-			String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
-			return WTPCommonPlugin.createErrorStatus(errorMessage);
-		}
-		return (ProjectCreationDataModelProviderNew.validateProjectName(earName));
-	}
-
-	private boolean isEARSupportedByRuntime() {
-		boolean ret = true;
-		IRuntime rt = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
-		if (rt != null)
-			ret = rt.supports(EARFacetUtils.EAR_FACET);
-		return ret;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHandler.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHandler.java
deleted file mode 100644
index d99420ee2..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHandler.java
+++ /dev/null
@@ -1,31 +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 Jun 9, 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;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface J2EEModulePostImportHandler {
-
-	public void moduleImported(IProject moduleProject);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHelper.java
deleted file mode 100644
index 1f8398793..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEModulePostImportHelper.java
+++ /dev/null
@@ -1,158 +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 9, 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;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EEModulePostImportHelper {
-
-	private static final String WEB = J2EEPluginResourceHandler.J2EEModulePostImportHelper_0;
-	private static final String EJB = J2EEPluginResourceHandler.J2EEModulePostImportHelper_1;
-	private static final String APP_CLIENT = J2EEPluginResourceHandler.J2EEModulePostImportHelper_2;
-	private static final String CONNECTOR = J2EEPluginResourceHandler.J2EEModulePostImportHelper_3;
-
-	private static IConfigurationElement[] webExtensions = null;
-	private static IConfigurationElement[] ejbExtensions = null;
-	private static IConfigurationElement[] appClientExtensions = null;
-	private static IConfigurationElement[] connectorExtensions = null;
-
-	private static boolean firstTimeLoading = true;
-
-	public static void notifyWebExtensions(IProject project) {
-		if (webExtensions == null) {
-			loadConfiguration(WEB);
-		}
-		notifyExtensions(webExtensions, project);
-	}
-
-	public static void notifyEjbExtensions(IProject project) {
-		if (ejbExtensions == null) {
-			loadConfiguration(EJB);
-		}
-		notifyExtensions(ejbExtensions, project);
-	}
-
-	public static void notifyAppClientExtensions(IProject project) {
-		if (appClientExtensions == null) {
-			loadConfiguration(APP_CLIENT);
-		}
-		notifyExtensions(appClientExtensions, project);
-	}
-
-	public static void notifyConnectorExtensions(IProject project) {
-		if (connectorExtensions == null) {
-			loadConfiguration(CONNECTOR);
-		}
-		notifyExtensions(connectorExtensions, project);
-	}
-
-	private static void notifyExtensions(IConfigurationElement[] postImportElement, IProject project) {
-		for (int i = 0; i < postImportElement.length; i++) {
-			try {
-				J2EEModulePostImportHandler postCreate = (J2EEModulePostImportHandler) postImportElement[i].createExecutableExtension("className"); //$NON-NLS-1$
-				postCreate.moduleImported(project);
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	private static void loadConfiguration(final String loadingModuleType) {
-		boolean shouldLogErrors = firstTimeLoading;
-		firstTimeLoading = false;
-
-		IExtension[] importExtensions =Platform.getExtensionRegistry().getExtensionPoint("J2EEModulePostImport").getExtensions(); //$NON-NLS-1$
-
-		ArrayList interestedExtensions = new ArrayList();
-		for (int i = 0; i < importExtensions.length; i++) {
-			IExtension extension = importExtensions[i];
-			IConfigurationElement[] configElements = extension.getConfigurationElements();
-			boolean isExtensionInterested = false;
-			IConfigurationElement postImportElement = null;
-			int moduleCount = 0;
-			for (int j = 0; j < configElements.length; j++) {
-				try {
-					IConfigurationElement element = configElements[j];
-					if (element.getName().equalsIgnoreCase("postImport")) { //$NON-NLS-1$
-						postImportElement = element;
-					} else if (element.getName().equalsIgnoreCase(("module"))) { //$NON-NLS-1$
-						moduleCount++;
-						if (!isExtensionInterested) {
-							String moduleType = element.getAttribute("type"); //$NON-NLS-1$
-							if (WEB == loadingModuleType && WEB.equalsIgnoreCase(moduleType)) {
-								isExtensionInterested = true;
-							} else if (EJB == loadingModuleType && EJB.equalsIgnoreCase(moduleType)) {
-								isExtensionInterested = true;
-							} else if (APP_CLIENT == loadingModuleType && APP_CLIENT.equalsIgnoreCase(moduleType)) {
-								isExtensionInterested = true;
-							} else if (CONNECTOR == loadingModuleType && CONNECTOR.equalsIgnoreCase(moduleType)) {
-								isExtensionInterested = true;
-							}
-						}
-					}
-				} catch (Exception e) {
-					if (shouldLogErrors) {
-						e.printStackTrace();
-					}
-				}
-			}
-
-			//if no module types are defined the default is to listen to all of them.
-			if (!isExtensionInterested && 0 == moduleCount) {
-				isExtensionInterested = true;
-			}
-
-			if (isExtensionInterested) {
-				try {
-					//try instantiating the class before adding it to the list.
-					postImportElement.createExecutableExtension("className"); //$NON-NLS-1$
-					interestedExtensions.add(postImportElement);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-
-		IConfigurationElement[] configElements = new IConfigurationElement[interestedExtensions.size()];
-		for (int i = 0; i < configElements.length; i++) {
-			configElements[i] = (IConfigurationElement) interestedExtensions.get(i);
-		}
-		if (WEB == loadingModuleType) {
-			webExtensions = configElements;
-		} else if (EJB == loadingModuleType) {
-			ejbExtensions = configElements;
-		} else if (APP_CLIENT == loadingModuleType) {
-			appClientExtensions = configElements;
-		} else if (CONNECTOR == loadingModuleType) {
-			connectorExtensions = configElements;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/ResourceTypeReaderHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/ResourceTypeReaderHelper.java
deleted file mode 100644
index f28504082..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/ResourceTypeReaderHelper.java
+++ /dev/null
@@ -1,174 +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 10-Oct-03
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author sapnam
- * 
- * This helper class was created for ResourceRefTypeReader and ResourceEnvRefTypeReader to read all
- * valid types from extensions of each and to return a array of String to populate the Ref 'Type'
- * fields.
- */
-public class ResourceTypeReaderHelper {
-	private static String extensionPoint;
-	private static String typeAttributeName;
-	private static final String USAGE_TYPE = "type"; //$NON-NLS-1$
-	private static final String USAGE_ATTRIBUTE_NAME = "usage"; //$NON-NLS-1$
-	private static final String USAGE_COMMON = "Common"; //$NON-NLS-1$
-	private static final String USAGE_EJB = "EJB Jar"; //$NON-NLS-1$
-	private static final String SERVER_TARGET_IDS_ATTRIBUTE_NAME = "target-server-ids"; //$NON-NLS-1$
-	private static final String SERVER_TARGET_IDS_SEPARATOR = ","; //$NON-NLS-1$
-	private boolean isEJBJar;
-
-	public static final int RESOURCE_REF = 0;
-	public static final int RESOURCE_ENV_REF = 1;
-
-	private static final String[] EXTENSION_POINTS = {"org.eclipse.jst.j2ee.resourceRefType", "org.eclipse.jst.j2ee.resourceEnvRefType"};//$NON-NLS-1$ //$NON-NLS-2$
-
-	public static String[] getAllReferences(int refType, String serverTargetID, boolean isEJBJar, String[] baseItems) {
-		String extensionPointLocal = EXTENSION_POINTS[refType];
-		ResourceTypeReaderHelper reader = new ResourceTypeReaderHelper(extensionPointLocal, USAGE_TYPE, isEJBJar);
-		String[] extendedItems = null == serverTargetID ? reader.getResTypes() : reader.getResTypes(serverTargetID);
-		String[] allItems = null;
-		if (null == extendedItems || 0 == extendedItems.length) {
-			allItems = baseItems;
-		} else {
-			allItems = new String[baseItems.length + extendedItems.length];
-			System.arraycopy(baseItems, 0, allItems, 0, baseItems.length);
-			System.arraycopy(extendedItems, 0, allItems, baseItems.length, extendedItems.length);
-		}
-		Arrays.sort(allItems);
-		return allItems;
-	}
-
-
-	private ResourceTypeReaderHelper(String extPoint, String typeAttName, boolean ejbJar) {
-		extensionPoint = extPoint;
-		typeAttributeName = typeAttName;
-		isEJBJar = ejbJar;
-	}
-
-	private IExtensionPoint getExtensionPoint() {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint exPoint = registry.getExtensionPoint(extensionPoint); 
-		return exPoint;
-	}
-
-	private ArrayList processExtensions() {
-		IExtension[] allExtensions = getExtensionPoint().getExtensions();
-		ArrayList tempTypes = new ArrayList();
-		for (int x = 0; x < allExtensions.length; ++x) {
-			IExtension config = allExtensions[x];
-			IConfigurationElement[] cElems = config.getConfigurationElements();
-			for (int i = 0; i < cElems.length; i++) {
-				if (getValidTypes(cElems[i]) != null) {
-					tempTypes.add(getValidTypes(cElems[i]));
-				}
-			}
-		}
-		return tempTypes;
-	}
-
-
-	/**
-	 * @return an array of string containing valid Resource Ref or Resource Env Ref types.
-	 */
-	public String[] getResTypes() {
-		ArrayList types = processExtensions();
-		String[] allTypes = new String[types.size()];
-		for (int z = 0; z < types.size(); z++) {
-			allTypes[z] = (String) types.get(z);
-		}
-		return allTypes;
-	}
-
-	private ArrayList processExtensions(String targetServer) {
-		IExtension[] allExtensions = getExtensionPoint().getExtensions();
-		ArrayList tempTypes = new ArrayList();
-		for (int x = 0; x < allExtensions.length; ++x) {
-			IExtension config = allExtensions[x];
-			IConfigurationElement[] cElems = config.getConfigurationElements();
-			for (int i = 0; i < cElems.length; i++) {
-				if (getValidTypes(cElems[i], targetServer) != null) {
-					tempTypes.add(getValidTypes(cElems[i], targetServer));
-				}
-			}
-		}
-		return tempTypes;
-	}
-
-	/**
-	 * @param element
-	 *            A configuration element.
-	 * @return A valid Type
-	 */
-	private Object getValidTypes(IConfigurationElement element, String targetServer) {
-		String elementServerIDs = element.getAttribute(SERVER_TARGET_IDS_ATTRIBUTE_NAME);
-		if (null == elementServerIDs || isValidTargeted(elementServerIDs, targetServer)) {
-			String usage = element.getAttribute(USAGE_ATTRIBUTE_NAME);
-			if (usage.equals(USAGE_COMMON)) {
-				return element.getAttribute(typeAttributeName);
-			} else if (isEJBJar && usage.equals(USAGE_EJB)) {
-				return element.getAttribute(typeAttributeName);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param element
-	 *            A configuration element.
-	 * @return A valid Type
-	 */
-	private Object getValidTypes(IConfigurationElement element) {
-		return getValidTypes(element, null);
-	}
-
-	/**
-	 * @return an array of string containing valid Resource Ref or Resource Env Ref types.
-	 */
-	public String[] getResTypes(String targetServer) {
-		ArrayList types = processExtensions(targetServer);
-		String[] allTypes = new String[types.size()];
-		for (int z = 0; z < types.size(); z++) {
-			allTypes[z] = (String) types.get(z);
-		}
-		return allTypes;
-	}
-
-	private boolean isValidTargeted(String attribute, String targetServerId) {
-		if (attribute == null || targetServerId == null)
-			return false;
-		if (attribute.trim().equalsIgnoreCase(targetServerId.trim()))
-			return true;
-		if (attribute.indexOf(targetServerId.trim() + SERVER_TARGET_IDS_SEPARATOR) >= 0)
-			return true;
-		if (attribute.trim().length() > (targetServerId.trim().length() + 1) && attribute.substring(attribute.trim().length() - targetServerId.length()).equalsIgnoreCase(targetServerId.trim()))
-			return true;
-		return false;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistry.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistry.java
deleted file mode 100644
index f42f48724..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistry.java
+++ /dev/null
@@ -1,184 +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 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.deploy;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-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 DeployerRegistry {
-	/**
-	 *  
-	 */
-	private static DeployerRegistry INSTANCE;
-	private HashMap deployModuleExtensions = new HashMap();
-
-	public DeployerRegistry() {
-		super();
-	}
-
-	/**
-	 * @param deployer
-	 * @param serverTarget
-	 * @param natureID
-	 */
-	public void register(IConfigurationElement deployer, List serverTargets, List natures) {
-		HashMap targetDeployers;
-		for (Iterator iter = natures.iterator(); iter.hasNext();) {
-			String natureID = (String) iter.next();
-			for (Iterator iterator = serverTargets.iterator(); iterator.hasNext();) {
-				String runtimeID = (String) iterator.next();
-				targetDeployers = getDeployModuleExtensions(natureID);
-				getTargetDeployers(targetDeployers, runtimeID).add(deployer);
-			}
-		}
-	}
-
-	private List getDeployers(String natureID, String serverTarget) {
-		HashMap targetDeployers = getDeployModuleExtensions(natureID);
-		return getTargetDeployers(targetDeployers, serverTarget);
-	}
-
-	public static DeployerRegistry instance() {
-		if (INSTANCE == null) {
-			INSTANCE = new DeployerRegistry();
-			readRegistry();
-		}
-		return INSTANCE;
-	}
-
-	/**
-	 *  
-	 */
-	private static void readRegistry() {
-		DeployerRegistryReader reader = new DeployerRegistryReader();
-		reader.readRegistry();
-	}
-
-	/**
-	 * @return
-	 */
-	public static List getSelectedModules(Object[] mySelections) {
-		List modules = new ArrayList();
-		for (int i = 0; i < mySelections.length; i++) {
-			Object object = mySelections[i];
-			if (object instanceof EObject) {
-				object = ProjectUtilities.getProject(object);
-			}
-			if (object instanceof IProject) {
-				IVirtualComponent component = ComponentCore.createComponent((IProject)object);
-				EnterpriseArtifactEdit edit = null;
-				try {
-					edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(component);
-					if (edit == null)
-						continue;
-					EObject root = edit.getDeploymentDescriptorRoot();
-					if (root == null || modules.contains(root))
-						continue;
-					// Order Ears first...
-					if (J2EEProjectUtilities.isEARProject(component.getProject()))
-						modules.add(0, root);
-					else
-						modules.add(root);
-				} finally {
-					if (edit != null)
-						edit.dispose();
-				}
-			}
-		}
-		return modules;
-	}
-
-	/**
-	 * @param targetDeployers
-	 * @param serverTarget
-	 */
-	private List getTargetDeployers(HashMap targetDeployers, String serverTarget) {
-		if (targetDeployers.get(serverTarget) == null)
-			targetDeployers.put(serverTarget, new ArrayList());
-		return (List) targetDeployers.get(serverTarget);
-	}
-
-	/**
-	 * @param natureID
-	 * @return
-	 */
-	private HashMap getDeployModuleExtensions(String natureID) {
-		if (getDeployModuleExtensions().get(natureID) == null)
-			getDeployModuleExtensions().put(natureID, new HashMap());
-		return (HashMap) getDeployModuleExtensions().get(natureID);
-	}
-
-	/**
-	 * @return Returns the deployExtensions.
-	 */
-	public HashMap getDeployModuleExtensions() {
-		return deployModuleExtensions;
-	}
-
-	/**
-	 * @param deployExtensions
-	 *            The deployExtensions to set.
-	 */
-	public void setDeployModuleExtensions(HashMap deployExtensions) {
-		this.deployModuleExtensions = deployExtensions;
-	}
-
-	/**
-	 * @param module
-	 * @param runtime
-	 * @return
-	 */
-	public List getDeployModuleExtensions(EObject module, IRuntime runtime) {
-		IVirtualComponent comp = ComponentUtilities.findComponent(module);
-		String typeID = ""; //$NON-NLS-1$
-		if (J2EEProjectUtilities.isEARProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.ENTERPRISE_APPLICATION;
-		else if (J2EEProjectUtilities.isApplicationClientProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.APPLICATION_CLIENT;
-		else if (J2EEProjectUtilities.isDynamicWebProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.DYNAMIC_WEB;
-		else if (J2EEProjectUtilities.isStaticWebProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.STATIC_WEB;
-		else if (J2EEProjectUtilities.isEJBProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.EJB;
-		else if (J2EEProjectUtilities.isJCAProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.JCA;
-		else if (J2EEProjectUtilities.isUtilityProject(comp.getProject()))
-			typeID = J2EEProjectUtilities.UTILITY;
-		String runtimeID = runtime.getRuntimeType().getId();
-		return getDeployers(typeID, runtimeID);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java
deleted file mode 100644
index d91f732ea..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java
+++ /dev/null
@@ -1,89 +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 29, 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.deploy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class DeployerRegistryReader extends RegistryReader {
-	/**
-	 * @param registry
-	 * @param plugin
-	 * @param extensionPoint
-	 */
-	static final String J2EE_DEPLOYER_EXTENSION_POINT = "DeployerExtension"; //$NON-NLS-1$
-	static final String TARGET_SERVER_RUNTIME_ID = "runtime_server_id"; //$NON-NLS-1$
-	static final String RUNTIME = "runtime"; //$NON-NLS-1$
-	static final String DEPLOYER = "deployer"; //$NON-NLS-1$
-	public static final String DEPLOYER_CLASS = "deployer_class"; //$NON-NLS-1$
-	static final String MODULE_TYPE_NATURE_ID = "module_nature_id"; //$NON-NLS-1$
-	static final String NATURE = "nature"; //$NON-NLS-1$
-	static final String COMPONENT_TYPE_ID = "component_type"; //$NON-NLS-1$
-	static final String COMPONENT = "component"; //$NON-NLS-1$
-
-	public DeployerRegistryReader() {
-		super(J2EEPlugin.PLUGIN_ID, J2EE_DEPLOYER_EXTENSION_POINT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(DEPLOYER))
-			return false;
-		List runtimeList = new ArrayList();
-		List natureandcomponents = new ArrayList();
-		IConfigurationElement[] runtimes = element.getChildren(RUNTIME);
-		for (int i = 0; i < runtimes.length; i++) {
-			IConfigurationElement runtime = runtimes[i];
-			String serverTarget = runtime.getAttribute(TARGET_SERVER_RUNTIME_ID);
-			runtimeList.add(serverTarget);
-		}
-		IConfigurationElement[] natures = element.getChildren(NATURE);
-		for (int i = 0; i < natures.length; i++) {
-			IConfigurationElement nature = natures[i];
-			String natureID = nature.getAttribute(MODULE_TYPE_NATURE_ID);
-			natureandcomponents.add(natureID);
-		}
-		IConfigurationElement[] components = element.getChildren(COMPONENT);
-		for (int i = 0; i < components.length; i++) {
-			IConfigurationElement component = components[i];
-			String compType = component.getAttribute(COMPONENT_TYPE_ID);
-			natureandcomponents.add(compType);
-		}
-
-		String deployer = element.getAttribute(DEPLOYER_CLASS);
-		if (deployer != null) {
-			DeployerRegistry.instance().register(element, runtimeList, natureandcomponents);
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/FatalDeployerException.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/FatalDeployerException.java
deleted file mode 100644
index 8d410b392..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/FatalDeployerException.java
+++ /dev/null
@@ -1,63 +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 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.deploy;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class FatalDeployerException extends Exception {
-    /**
-     * Warning clean-up 12/05/2005
-     */   
-	private static final long serialVersionUID = -7991505439979201757L;
-
-	/**
-	 *  
-	 */
-	public FatalDeployerException() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param message
-	 */
-	public FatalDeployerException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public FatalDeployerException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param cause
-	 */
-	public FatalDeployerException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployHelper.java
deleted file mode 100644
index 2168ead88..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployHelper.java
+++ /dev/null
@@ -1,145 +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 Aug 4, 2004
- */
-package org.eclipse.jst.j2ee.internal.deploy;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emf.utilities.ICommandContext;
-
-/**
- * @author cbridgha
- * 
- */
-public class J2EEDeployHelper {
-
-	/**
-	 * @param resource
-	 * @param context
-	 * @returns first EJBJar found in the project
-	 */
-	public static EJBJar getEJBJar(IResource resource, ICommandContext context) {
-		EnterpriseArtifactEdit edit = null;
-		try {
-			if (resource instanceof IProject) {
-				IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
-				if (J2EEProjectUtilities.isEJBProject(comp.getProject())) {
-					edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
-					return (EJBJar)edit.getDeploymentDescriptorRoot();
-				}
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return null;
-	}
-
-	/**
-	 * @param resource
-	 * @param context
-	 * @return
-	 */
-	public static Application getApplication(IResource resource, ICommandContext context) {
-		EnterpriseArtifactEdit edit = null;
-		try {
-			if (resource instanceof IProject) {
-				IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
-					if (J2EEProjectUtilities.isEARProject(comp.getProject())) {
-						edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
-						return (Application)edit.getDeploymentDescriptorRoot();
-					}
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return null;
-	}
-
-	/**
-	 * @param resource
-	 * @param context
-	 * @return
-	 */
-	public static ApplicationClient getAppClient(IResource resource, ICommandContext context) {
-		EnterpriseArtifactEdit edit = null;
-		try {
-			if (resource instanceof IProject) {
-				IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
-					if (J2EEProjectUtilities.isApplicationClientProject(comp.getProject())) {
-						edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
-						return (ApplicationClient)edit.getDeploymentDescriptorRoot();
-					}
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return null;
-	}
-
-	/**
-	 * @param resource
-	 * @param context
-	 * @return
-	 */
-	public static WebApp getWebApp(IResource resource, ICommandContext context) {
-		EnterpriseArtifactEdit edit = null;
-		try {
-			if (resource instanceof IProject) {
-				IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
-					if (J2EEProjectUtilities.isDynamicWebProject(comp.getProject())) {
-						edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
-						return (WebApp)edit.getDeploymentDescriptorRoot();
-					}
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return null;
-	}
-
-	/**
-	 * @param resource
-	 * @param context
-	 * @return
-	 */
-	public static Connector getConnector(IResource resource, ICommandContext context) {
-		EnterpriseArtifactEdit edit = null;
-		try {
-			if (resource instanceof IProject) {
-				IVirtualComponent comp = ComponentCore.createComponent((IProject)resource);
-					if (J2EEProjectUtilities.isJCAProject(comp.getProject())) {
-						edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(comp);
-						return (Connector)edit.getDeploymentDescriptorRoot();
-					}
-			}
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java
deleted file mode 100644
index 82d90ba8e..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java
+++ /dev/null
@@ -1,240 +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 Apr 1, 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.deploy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.CommandContext;
-import org.eclipse.wst.common.internal.emf.utilities.ICommand;
-import org.eclipse.wst.common.internal.emf.utilities.ICommandContext;
-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 J2EEDeployOperation extends AbstractDataModelOperation {
-
-	private Object[] selection;
-	private IStatus multiStatus;
-	private IProject currentProject;
-
-	/**
-	 *  
-	 */
-	public J2EEDeployOperation(Object[] deployableObjects) {
-		super();
-		selection = deployableObjects;
-		// TODO Auto-generated constructor stub
-	}
-
-	public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DeployerRegistry reg = DeployerRegistry.instance();
-		List modules = getSelectedModules(selection);
-		monitor.beginTask(J2EEPluginResourceHandler.J2EEDeployOperation_UI_0, modules.size()); 
-		for (int i = 0; i < modules.size(); i++) {
-			EnterpriseArtifactEdit edit = null;
-			try {
-				edit = (EnterpriseArtifactEdit) modules.get(i);
-				EObject module = edit.getDeploymentDescriptorRoot();
-				IProject proj = ProjectUtilities.getProject(module);
-				IRuntime runtime = null;
-				try {
-					runtime = J2EEProjectUtilities.getServerRuntime(proj);
-				}
-				catch (CoreException e) {
-					J2EEPlugin.getDefault().getLog().log(e.getStatus());
-				}
-				if (runtime == null)
-					continue;
-				List visitors = reg.getDeployModuleExtensions(module, runtime);
-				deploy(visitors, module, monitor);
-				monitor.worked(1);
-			} finally {
-				if (edit != null)
-					edit.dispose();
-			}
-		}
-		return getMultiStatus();
-	}
-
-	/**
-	 * @param visitors
-	 * @param module
-	 */
-	private void deploy(List visitors, EObject module, IProgressMonitor monitor) {
-		IProject proj = ProjectUtilities.getProject(module);
-		for (int i = 0; i < visitors.size(); i++) {
-			if (!(visitors.get(i) instanceof IConfigurationElement))
-				continue;
-			ICommand dep = null;
-			try {
-				dep = (ICommand) ((IConfigurationElement) visitors.get(i)).createExecutableExtension(DeployerRegistryReader.DEPLOYER_CLASS);
-			} catch (Exception e) {
-				e.printStackTrace();
-				continue;
-			}
-			ICommandContext ctx = new CommandContext(monitor, null, module.eResource().getResourceSet());
-			if (dep == null) continue;
-			dep.init(selection);
-
-			monitor.setTaskName(J2EEPluginResourceHandler.getString(J2EEPluginResourceHandler.J2EEDeployOperation_1_UI_, new Object[]{proj.getName(), dep.getClass().getName()})); 
-			try {
-				dep.execute(proj, null, ctx);
-				addOKStatus(dep.getClass().getName());
-			} catch (CoreException ex) {
-				Logger.getLogger().logError(ex);
-				monitor.setCanceled(true);
-				Throwable statusException = (ex.getStatus().getException() != null) ? ex.getStatus().getException() : ex;
-				addErrorStatus(ex.getStatus(), dep.getClass().getName(), statusException);
-				continue;
-			}
-		}
-	}
-
-	/**
-	 * @param proj
-	 * @param name
-	 */
-	private void addOKStatus(String DeployerName) {
-
-		IStatus statusLocal = new Status(IStatus.OK, " ", IStatus.OK, (J2EEPluginResourceHandler.getString("J2EEDeployOperation_2_UI_", new Object[]{DeployerName})), null); //$NON-NLS-1$ //$NON-NLS-2$		
-		//TODO
-		getMultiStatus().add(statusLocal);
-
-	}
-
-	/**
-	 * @param exceptionStatus
-	 * @param proj
-	 * @param name
-	 */
-	private void addErrorStatus(IStatus exceptionStatus, String DeployerName, Throwable ex) {
-
-		Throwable mainCause = null;
-		if (exceptionStatus instanceof MultiStatus) {
-			IStatus[] stati = ((MultiStatus) exceptionStatus).getChildren();
-			for (int i = 0; 1 < stati.length; i++) {
-				addErrorStatus(stati[i], DeployerName, stati[i].getException());
-			}
-		}
-		mainCause = (ex.getCause() != null) ? ex.getCause() : ex;
-			
-		//String errorNotes = (mainCause != null && mainCause.getMessage() != null) ? mainCause.getMessage() : "";
-
-		String message = J2EEPluginResourceHandler.bind(J2EEPluginResourceHandler.J2EEDeployOperation_3_UI_,DeployerName, ""); //$NON-NLS-1$
-		IStatus statusLocal = new Status(IStatus.ERROR, J2EEPlugin.getPlugin().getPluginID(), IStatus.ERROR, message, mainCause); //$NON-NLS-1$
-		getMultiStatus().add(statusLocal);
-
-
-
-	}
-
-	private IStatus getMainStatus(IProject proj) {
-
-		IStatus aStatus = new MultiStatus(J2EEPlugin.getPlugin().getPluginID(), IStatus.OK, J2EEPluginResourceHandler.getString(J2EEPluginResourceHandler.J2EEDeployOperation_4_UI_, new Object[]{proj.getName()}), null); 
-
-		return aStatus;
-	}
-
-	/**
-	 * @return Returns the multiStatus.
-	 */
-	public MultiStatus getMultiStatus() {
-		if (multiStatus == null)
-			multiStatus = getMainStatus(currentProject);
-		return (MultiStatus)multiStatus;
-	}
-
-	/**
-	 * @param multiStatus
-	 *            The multiStatus to set.
-	 */
-	public void setMultiStatus(IStatus newStatus) {
-		this.multiStatus = newStatus;
-	}
-	
-	protected List getSelectedModules(Object[] mySelections) {
-		List modules = new ArrayList();
-		List components = new ArrayList();
-		for (int i = 0; i < mySelections.length; i++) {
-			Object object = mySelections[i];
-			if (object instanceof EObject) {
-				object = ProjectUtilities.getProject(object);
-				currentProject = (IProject)object;
-			}
-			if (object instanceof IProject) {
-				currentProject = (IProject)object;
-				IVirtualComponent component = ComponentCore.createComponent((IProject)object);
-				EnterpriseArtifactEdit edit = null;
-				edit = (EnterpriseArtifactEdit)ComponentUtilities.getArtifactEditForRead(component);
-				if (components.contains(edit)) {
-					if (edit != null)
-						edit.dispose();
-					continue;
-				}
-				// Order Ears first...
-				if (J2EEProjectUtilities.isEARProject(component.getProject())) {
-					modules.add(0, edit);
-					components.add(0,component);
-				}
-				else {
-					modules.add(edit);
-					components.add(component);
-				}
-			}
-		}
-		return modules;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployer.java
deleted file mode 100644
index b6ad428d8..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployer.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.deploy;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/*
- * Deployer interface for the J2EEDeploymentFramework
- */
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- * @deprecated - Change to use the org.eclipse.wst.common.emf.utilities.ICommand interface
- */
-public interface J2EEDeployer {
-	/*
-	 * This will contain the multi-selection of objects to deploy. This selection could be used to
-	 * filter elements within a Module. Any other setup code should be done here...
-	 */
-	void init(Object[] selection);
-
-	/*
-	 * This will visit each extension's deploy operation on the deployable object. A Multi-Status
-	 * should be returned
-	 */
-	IStatus visit(EJBJar deployable) throws FatalDeployerException;
-
-	IStatus visit(ApplicationClient deployable) throws FatalDeployerException;
-
-	IStatus visit(Application deployable) throws FatalDeployerException;
-
-	IStatus visit(WebApp deployable) throws FatalDeployerException;
-
-	IStatus visit(Connector deployable) throws FatalDeployerException;
-
-	/*
-	 * Any cleanup should be done here...
-	 */
-	void finish();
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
deleted file mode 100644
index f1467a2e6..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
+++ /dev/null
@@ -1,208 +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.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-
-/**
- * Creates the Object adapter for ear projects.
- */
-public class EnterpriseApplicationDeployableAdapterUtil {
-
-	/**
-	 * Constructor for EnterpriseApplicationDeployableObjectAdapter.
-	 */
-	public EnterpriseApplicationDeployableAdapterUtil() {
-		super();
-	}// EnterpriseApplicationDeployableObjectAdapter
-
-	/**
-	 * Gets the object for a type of object.
-	 * 
-	 * @param Object
-	 *            obj - Object to adapt.
-	 */
-	public static IModuleArtifact getModuleObject(Object obj) {
-		if (obj instanceof Application)
-			return getModuleObject((Application) obj);
-		if (obj instanceof IProject)
-			return getModuleObject((IProject) obj);
-		if (obj instanceof IFile)
-			return getModuleObject((IFile) obj);
-		return null;
-	}// getDeployableObject
-
-	/**
-	 * Gets the deployable object for ear instance.
-	 * 
-	 * @param Application
-	 *            application - EAR instance.
-	 */
-	protected static IModuleArtifact getModuleObject(Application application) {
-		IModule dep = getModule(application);
-		return createModuleObject(dep);
-	}// getDeployableObject
-
-	/**
-	 * Gets the deployable object for project instances.
-	 * 
-	 * @param IProject
-	 *            project - Project instance.
-	 * @return IModuleObject
-	 */
-	protected static IModuleArtifact getModuleObject(IProject project) {
-		IModule dep = getModule(project,null);
-		return createModuleObject(dep);
-	}// getModuleObject
-
-	/**
-	 * Gets the deployable object for file instances.
-	 * 
-	 * @param IFile
-	 *            file - File instance.
-	 * @return IModuleObject
-	 */
-	protected static IModuleArtifact getModuleObject(IFile file) {
-		if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.APPLICATION_DD_URI)) {
-			{
-				IVirtualResource[] resources = ComponentCore.createResources(file);
-				IVirtualComponent component = null;
-				if (resources[0] != null || resources.length <= 0)
-					component = resources[0].getComponent();
-				return createModuleObject(getModule(file.getProject(), component));
-			}
-		}// if
-		return null;
-	}// getModuleObject
-
-	/**
-	 * Gets the deployable object.
-	 * 
-	 * @param EObject
-	 *            refObject - The current refObject.
-	 * @return IModule
-	 */
-	protected static IModule getModule(EObject refObject) {
-		IProject proj = ProjectUtilities.getProject(refObject);
-		Resource servResource = refObject.eResource();
-		IVirtualResource[] resources = null;
-		try {
-			IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
-			resources = ComponentCore.createResources(eclipeServResoruce);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		IVirtualComponent component = null;
-		if (resources[0] != null)
-			component = resources[0].getComponent();
-		return getModule(proj,component);
-	}// getModule
-
-
-
-	protected static IModule getModuleProject(IProject project, Iterator iterator) {
-		IModule deployable = null;
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			if (next instanceof IModule) {
-				deployable = (IModule) next;
-				if (deployable.getProject().equals(project))
-					return deployable;
-			}
-		}
-		return null;
-	}
-
-	protected static IModule getModule(IProject project, IVirtualComponent component) {
-		IModule deployable = null;
-		Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.ENTERPRISE_APPLICATION)).iterator(); 
-		String componentName = null;
-		if (component != null)
-			componentName = component.getName();
-		else
-			return getModuleProject(project, iterator);
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			if (next instanceof IModule) {
-				deployable = (IModule) next;
-				if (deployable.getName().equals(componentName)) {
-					return deployable;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Creates the deployable object.
-	 * 
-	 * @param IModuleObject
-	 *            deployable - The current module object.
-	 */
-	protected static IModuleArtifact createModuleObject(IModule module) {
-
-		if (module != null) {
-			return new NullModuleArtifact(module);
-		}
-
-		return null;
-	}// createDeployableObject
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getId()
-	 */
-	public String getId() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getObjectClassName()
-	 */
-	public String getObjectClassName() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#isPluginActivated()
-	 */
-	public boolean isPluginActivated() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}// EnterpriseApplicationDeployableObjectAdapter
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/FlexibleProjectServerUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/FlexibleProjectServerUtil.java
deleted file mode 100644
index 8330be32e..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/FlexibleProjectServerUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class FlexibleProjectServerUtil {
-	
-	public static IJ2EEModule getModuleDelegate(WorkbenchComponent component) {
-		IModule module = getModule(component);
-		return getModuleDelegate(module);
-	}
-	
-	public static IModule getModule(IProject project) {
-		return ServerUtil.getModule(project);
-	}
-
-	public static IJ2EEModule getModuleDelegate(IModule module) {
-		return (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
-	}
-
-	public static IModule getModule(WorkbenchComponent component) {
-		return getModule(StructureEdit.getContainingProject(component));
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
deleted file mode 100644
index fe5d69795..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
+++ /dev/null
@@ -1,195 +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.deployables;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-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.IVirtualReference;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-
-/**
- * J2EE module factory.
- */
-public class J2EEDeployableFactory extends ProjectModuleFactoryDelegate {
-	protected Map moduleDelegates = new HashMap(5);
-	
-	public static final String ID = "org.eclipse.jst.j2ee.server"; //$NON-NLS-1$
-
-	public J2EEDeployableFactory() {
-		super();
-	}
-
-	protected IModule[] createModules(IProject project) {
-		try {
-			ModuleCoreNature nature = (ModuleCoreNature) project.getNature(IModuleConstants.MODULE_NATURE_ID);
-			if (nature != null)
-				return createModules(nature);
-		} catch (CoreException e) {
-			Logger.getLogger().write(e);
-		}
-		return null;
-	}
-
-	protected IModule[] createModules(ModuleCoreNature nature) {
-		IProject project = nature.getProject();
-		try {
-			IVirtualComponent comp = ComponentCore.createComponent(project);
-			return createModuleDelegates(comp);
-		} catch (Exception e) {
-			Logger.getLogger().write(e);
-		}
-		return null;
-	}
-
-	public ModuleDelegate getModuleDelegate(IModule module) {
-		return (ModuleDelegate) moduleDelegates.get(module);
-	}
-
-	protected IModule[] createModuleDelegates(IVirtualComponent component) {
-		List projectModules = new ArrayList();
-		try {
-			IModule module = null;
-			String type = J2EEProjectUtilities.getJ2EEProjectType(component.getProject());
-			if (type != null && !type.equals("")) {
-				String version = J2EEProjectUtilities.getJ2EEProjectVersion(component.getProject());
-				module = createModule(component.getDeployedName(), component.getDeployedName(), type, version, component.getProject());
-				J2EEFlexProjDeployable moduleDelegate = new J2EEFlexProjDeployable(component.getProject(), component);
-				moduleDelegates.put(module, moduleDelegate);
-				projectModules.add(module);
-			}
-			// Check to add any binary modules
-			if (J2EEProjectUtilities.ENTERPRISE_APPLICATION.equals(type))
-				projectModules.addAll(Arrays.asList(createBinaryModules(component)));
-		} catch (Exception e) {
-			Logger.getLogger().write(e);
-		}
-		return (IModule[]) projectModules.toArray(new IModule[projectModules.size()]);
-	}
-	
-	protected IModule[] createBinaryModules(IVirtualComponent component) {
-		List projectModules = new ArrayList();
-		EARArtifactEdit earEdit = null;
-		try {
-			earEdit = EARArtifactEdit.getEARArtifactEditForRead(component.getProject());
-			Application app = earEdit.getApplication();
-			IVirtualReference[] references = component.getReferences();
-			for (int i=0; i<references.length; i++) {
-				IVirtualComponent moduleComponent = references[i].getReferencedComponent();
-				// Is referenced component a J2EE binary module archive or binary utility project?
-				if (moduleComponent.isBinary()) {
-					// Check if module URI exists on EAR DD for binary j2ee archive
-					Module j2eeModule = app.getFirstModule(references[i].getArchiveName());
-					// If it is not a j2ee module and the component project is the ear, it is just an archive
-					// and we can ignore as it will be processed by the EAR deployable.members() method
-					if (j2eeModule == null && (moduleComponent.getProject() == component.getProject()))
-						continue;
-					
-					String moduleVersion = null;
-					String moduleType = null;
-					// Handle the binary J2EE module case
-					if(j2eeModule != null){
-						ArtifactEdit moduleEdit = null;
-						try {
-							if (j2eeModule.isEjbModule()) {
-								moduleEdit = ComponentUtilities.getArtifactEditForRead(moduleComponent, J2EEProjectUtilities.EJB);
-								EJBJar ejbJar = (EJBJar) moduleEdit.getContentModelRoot();
-								moduleType = J2EEProjectUtilities.EJB;
-								moduleVersion = ejbJar.getVersion();
-							}
-							else if (j2eeModule.isWebModule()) {
-								moduleEdit = ComponentUtilities.getArtifactEditForRead(moduleComponent, J2EEProjectUtilities.DYNAMIC_WEB);
-								WebApp webApp = (WebApp) moduleEdit.getContentModelRoot();
-								moduleType = J2EEProjectUtilities.DYNAMIC_WEB;
-								moduleVersion = webApp.getVersion();
-							}
-							else if (j2eeModule.isConnectorModule()) {
-								moduleEdit = ComponentUtilities.getArtifactEditForRead(moduleComponent, J2EEProjectUtilities.JCA);
-								Connector connector = (Connector) moduleEdit.getContentModelRoot();
-								moduleType = J2EEProjectUtilities.JCA;
-								moduleVersion = connector.getVersion();
-							}
-							else if (j2eeModule.isJavaModule()) {
-								moduleEdit = ComponentUtilities.getArtifactEditForRead(moduleComponent, J2EEProjectUtilities.APPLICATION_CLIENT);
-								ApplicationClient appClient = (ApplicationClient) moduleEdit.getContentModelRoot();
-								moduleType = J2EEProjectUtilities.APPLICATION_CLIENT;
-								moduleVersion = appClient.getVersion();
-							}
-						} finally {
-							if (moduleEdit!=null)
-								moduleEdit.dispose();
-						}
-					} else { // Handle the binary utility component outside the EAR case.
-						moduleVersion = J2EEProjectUtilities.UTILITY;
-						moduleType = J2EEVersionConstants.VERSION_1_0_TEXT;
-					}
-					
-					IModule nestedModule = createModule(moduleComponent.getDeployedName(), moduleComponent.getDeployedName(), moduleType, moduleVersion, moduleComponent.getProject());
-					if (nestedModule!=null) {
-						J2EEFlexProjDeployable moduleDelegate = new J2EEFlexProjDeployable(moduleComponent.getProject(), moduleComponent);
-						moduleDelegates.put(nestedModule, moduleDelegate);
-						projectModules.add(nestedModule);
-						moduleDelegate.getURI(nestedModule);
-					}
-				}
-			}
-		} finally {
-			if (earEdit!=null)
-				earEdit.dispose();
-		}
-		return (IModule[]) projectModules.toArray(new IModule[projectModules.size()]);
-	}
-
-	/**
-	 * Returns the list of resources that the module should listen to
-	 * for state changes. The paths should be project relative paths.
-	 * Subclasses can override this method to provide the paths.
-	 *
-	 * @return a possibly empty array of paths
-	 */
-	protected IPath[] getListenerPaths() {
-		return new IPath[] {
-			new Path(".project"), // nature
-			new Path(StructureEdit.MODULE_META_FILE_NAME), // component
-			new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets
-		};
-	}
-
-	protected void clearCache() {
-		moduleDelegates = new HashMap(5);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
deleted file mode 100644
index 7382e96dd..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
+++ /dev/null
@@ -1,822 +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.deployables;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.server.core.IApplicationClientModule;
-import org.eclipse.jst.server.core.IConnectorModule;
-import org.eclipse.jst.server.core.IEJBModule;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-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.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ModuleFile;
-import org.eclipse.wst.server.core.internal.ModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.web.internal.deployables.ComponentDeployable;
-/**
- * J2EE module superclass.
- */
-public class J2EEFlexProjDeployable extends ComponentDeployable implements IJ2EEModule, IEnterpriseApplication, IApplicationClientModule, IConnectorModule, IEJBModule, IWebModule {
-	private static final IPath WEB_CLASSES_PATH = new Path(J2EEConstants.WEB_INF_CLASSES);
-	private static IPath WEBLIB = new Path(J2EEConstants.WEB_INF_LIB).makeAbsolute();
-	private IPackageFragmentRoot[] cachedSourceContainers;
-	private IContainer[] cachedOutputContainers;
-	private HashMap cachedOutputMappings;
-	private HashMap cachedSourceOutputPairs;
-
-	/**
-	 * Constructor for J2EEFlexProjDeployable.
-	 * 
-	 * @param project
-	 * @param aComponent
-	 */
-	public J2EEFlexProjDeployable(IProject project, IVirtualComponent aComponent) {
-		super(project, aComponent);
-	}
-	
-
-	/**
-	 * Constructor for J2EEFlexProjDeployable.
-	 * 
-	 * @param project
-	 */
-	public J2EEFlexProjDeployable(IProject project) {
-		super(project);
-	}
-
-	/**
-	 * Returns the root folders for the resources in this module.
-	 * 
-	 * @return a possibly-empty array of resource folders
-	 */
-	public IContainer[] getResourceFolders() {
-		List result = new ArrayList();
-		IVirtualComponent vc = ComponentCore.createComponent(getProject());
-		if (vc != null) {
-			IVirtualFolder vFolder = vc.getRootFolder();
-			if (vFolder != null) {
-				IContainer[] underlyingFolders = vFolder.getUnderlyingFolders();
-				result.addAll(Arrays.asList(underlyingFolders));
-			}
-		}
-		return (IContainer[]) result.toArray(new IContainer[result.size()]);
-	}
-
-	/**
-	 * Returns the root folders containing Java output in this module.
-	 * 
-	 * @return a possibly-empty array of Java output folders
-	 */
-	public IContainer[] getJavaOutputFolders() {
-		if (cachedOutputContainers == null)
-			cachedOutputContainers = getJavaOutputFolders(getProject());
-		return cachedOutputContainers;
-	}
-	
-	public IContainer[] getJavaOutputFolders(IProject project) {
-		if (project == null)
-			return new IContainer[0];
-		return J2EEProjectUtilities.getOutputContainers(project);
-	}
-
-	protected boolean shouldIncludeUtilityComponent(IVirtualComponent virtualComp,IVirtualReference[] references, ArtifactEdit edit) {
-		// If the component module is an EAR we know all archives are filtered out of virtual component members
-		// and we will return only those archives which are not binary J2EE modules in the EAR DD.  These J2EE modules will
-		// be returned by getChildModules()
-		if (J2EEProjectUtilities.isEARProject(component.getProject()))
-			return virtualComp != null && virtualComp.isBinary() && !isNestedJ2EEModule(virtualComp, references, (EARArtifactEdit)edit);
-		else 
-			return super.shouldIncludeUtilityComponent(virtualComp, references, edit);
-	}
-	
-	protected IModuleResource[] getBinaryModuleMembers() {
-		IPath archivePath = ((J2EEModuleVirtualArchiveComponent)component).getWorkspaceRelativePath();
-		ModuleFile mf = null;
-		if (archivePath != null) { //In Workspace
-			IFile utilFile = ResourcesPlugin.getWorkspace().getRoot().getFile(archivePath);
-			mf = new ModuleFile(utilFile, utilFile.getName(), ((J2EEModuleVirtualArchiveComponent)component).getRuntimePath().makeRelative());
-		} else {
-			File extFile = ((J2EEModuleVirtualArchiveComponent)component).getUnderlyingDiskFile();
-			mf = new ModuleFile(extFile, extFile.getName(), ((J2EEModuleVirtualArchiveComponent)component).getRuntimePath().makeRelative());
-		}
-		return new IModuleResource[] {mf};
-	}
-	
-	public IModuleResource[] members() throws CoreException {
-		members.clear();
-		
-		// Handle binary components
-		if (component instanceof J2EEModuleVirtualArchiveComponent)
-			return getBinaryModuleMembers();
-		
-		// If j2ee project structure is a single root structure, just return optimized members
-		if (isSingleRootStructure())
-			return getOptimizedMembers();
-		
-		cachedSourceContainers = J2EEProjectUtilities.getSourceContainers(getProject());
-		try {
-			IPath javaPath = Path.EMPTY;
-			if (J2EEProjectUtilities.isDynamicWebProject(component.getProject()))
-				javaPath = WEB_CLASSES_PATH;
-			
-			if (component != null) {
-				IVirtualFolder vFolder = component.getRootFolder();
-				IModuleResource[] mr = getMembers(vFolder, Path.EMPTY);
-				int size = mr.length;
-				for (int j = 0; j < size; j++) {
-					members.add(mr[j]);
-				}
-			}
-			
-			IContainer[] javaCont = getJavaOutputFolders();		
-			int size = javaCont.length;
-			for (int i = 0; i < size; i++) {
-				//If the java output is in the scope of the virtual component, ignore to avoid duplicates
-				if (ComponentCore.createResources(javaCont[i]).length > 0) 
-					continue;
-				IModuleResource[] mr = getMembers(javaCont[i], javaPath, javaPath, javaCont);
-				int size2 = mr.length;
-				for (int j = 0; j < size2; j++) {
-					members.add(mr[j]);
-				}
-			}
-			
-			if (component != null) {
-				addUtilMembers(component);
-				List consumableMembers = getConsumableReferencedMembers(component);
-				if (!consumableMembers.isEmpty())
-					members.addAll(consumableMembers);
-			}
-			
-			IModuleResource[] mr = new IModuleResource[members.size()];
-			members.toArray(mr);
-			return mr;
-		} finally {
-			cachedSourceContainers = null;
-			cachedOutputContainers = null;
-			cachedOutputMappings = null;
-			cachedSourceOutputPairs = null;
-		}
-	}
-	
-	protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
-		if (curPath.equals(javaPath)) {
-			int size = javaCont.length;
-			for (int i = 0; i < size; i++) {
-				IModuleResource[] mr2 = getMembers(javaCont[i], path.append(cc.getName()), null, null);
-				IModuleResource[] mr3 = new IModuleResource[mr.length + mr2.length];
-				System.arraycopy(mr, 0, mr3, 0, mr.length);
-				System.arraycopy(mr2, 0, mr3, mr.length, mr2.length);
-				mr = mr3;
-			}
-		} else {
-			boolean containsFolder = false;
-			String name = javaPath.segment(curPath.segmentCount());
-			int size = mr.length;
-			for (int i = 0; i < size && !containsFolder; i++) {
-				if (mr[i] instanceof IModuleFolder) {
-					IModuleFolder mf2 = (IModuleFolder) mr[i];
-					if (name.equals(mf2.getName())) {
-						containsFolder = true;
-					}
-				}
-			}
-			
-			if (!containsFolder && javaCont.length > 0) {
-				ModuleFolder mf2 = new ModuleFolder(javaCont[0], name, curPath);
-				IModuleResource[] mrf = new IModuleResource[0];
-				size = javaCont.length;
-				for (int i = 0; i < size; i++) {
-					IModuleResource[] mrf2 = getMembers(javaCont[i], javaPath, null, null);
-					IModuleResource[] mrf3 = new IModuleResource[mrf.length + mrf2.length];
-					System.arraycopy(mrf, 0, mrf3, 0, mrf.length);
-					System.arraycopy(mrf2, 0, mrf3, mrf.length, mrf2.length);
-					mrf = mrf3;
-				}
-				
-				mf2.setMembers(mrf);
-				
-				IModuleResource[] mr3 = new IModuleResource[mr.length + 1];
-				System.arraycopy(mr, 0, mr3, 0, mr.length);
-				mr3[mr.length] = mf2;
-				mr = mr3;
-			}
-		}
-		return mr;
-	}
-
-    /**
-     * Returns the classpath as a list of absolute IPaths.
-     * 
-     * @return an array of paths
-     */
-    public IPath[] getClasspath() {
-		List paths = new ArrayList();
-        IJavaProject proj = JemProjectUtilities.getJavaProject(getProject());
-        URL[] urls = JemProjectUtilities.getClasspathAsURLArray(proj);
-		for (int i = 0; i < urls.length; i++) {
-			URL url = urls[i];
-			paths.add(Path.fromOSString(url.getPath()));
-		}
-        return  (IPath[]) paths.toArray(new IPath[paths.size()]);
-    }
-    
-    public String getJNDIName(String ejbName) {
-    	if (!J2EEProjectUtilities.isEJBProject(component.getProject()))
-    		return null;
-		EjbModuleExtensionHelper modHelper = null;
-		EJBJar jar = null;
-		ArtifactEdit ejbEdit = null;
-		try {
-			ejbEdit = ComponentUtilities.getArtifactEditForRead(component);
-			if (ejbEdit != null) {
-				jar = (EJBJar) ejbEdit.getContentModelRoot();
-				modHelper = IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
-				return modHelper == null ? null : modHelper.getJNDIName(jar, jar.getEnterpriseBeanNamed(ejbName));
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (ejbEdit != null)
-				ejbEdit.dispose();
-		}
-		return null;
-	}
-
-    /**
-     * This method will handle a number of J2EE related scenarios.  If this is an ear and a child module is passed in,
-     * the URI for that child module will be returned.  If no child module was passed, the URI of the EAR is returned.
-     * If this is a child component and the module passed in is the EAR, we grab the module uri for this compared to that
-     * EAR.  If no ear module is passed in we look for one and use it and return URI relative to found EAR.  If no EAR's 
-     * are found the URI is returned in a default manner.
-     * 
-     * @return URI string
-     */
-    public String getURI(IModule module) {
-    	// If the component is an ear and the module passed in is a child module
-    	if (component!=null && module!=null && J2EEProjectUtilities.isEARProject(component.getProject()))
- 			return getContainedURI(module);
-
-    	IVirtualComponent ear = null;
-    	String aURI = null;
-    	// If the component is a child module and the module passed in is the ear
-    	if (module != null && J2EEProjectUtilities.isEARProject(module.getProject()))
-    		ear = ComponentCore.createComponent(module.getProject());
-    	// else if the component is a child module and the module passed in is null, search for first ear
-    	else if (module==null && component != null) {
-    		IProject[] earProjects = J2EEProjectUtilities.getReferencingEARProjects(component.getProject());
-	        if (earProjects.length>0)
-	        	ear = ComponentCore.createComponent(earProjects[0]);
-    	}
-    	// We have a valid ear and the component is a valid child
-    	if (ear != null && component != null) {
-    		EARArtifactEdit earEdit = null;
-			try {
-				earEdit = EARArtifactEdit.getEARArtifactEditForRead(ear);
-				if (earEdit != null)
-					aURI = earEdit.getModuleURI(component);
-			} catch (Exception e) {
-				e.printStackTrace();
-			} finally {
-				if (earEdit != null)
-					earEdit.dispose();
-			}
-    	} 
-    	// We have an ear component and no child module
-    	else if (component!=null && J2EEProjectUtilities.isEARProject(component.getProject())) {
-			aURI = component.getDeployedName()+IJ2EEModuleConstants.EAR_EXT;
-    	} 
-    	// We have child components but could not find valid ears
-    	else if (component!=null && J2EEProjectUtilities.isDynamicWebProject(component.getProject())) {
-    		if (module != null && J2EEProjectUtilities.isUtilityProject(module.getProject())) {
-    			IVirtualComponent webComp = ComponentCore.createComponent(component.getProject());
-    			IVirtualReference reference = webComp.getReference(module.getProject().getName());
-    			aURI = ComponentUtilities.getDeployUriOfUtilComponent(reference);
-    		}else{
-    			aURI = component.getDeployedName()+IJ2EEModuleConstants.WAR_EXT;
-    		}
-    	} 
-    	else if (component!=null && (J2EEProjectUtilities.isEJBProject(component.getProject()) || J2EEProjectUtilities.isApplicationClientProject(component.getProject()))) {
-    		aURI = component.getDeployedName()+IJ2EEModuleConstants.JAR_EXT;
-    	} 
-    	else if (component!=null && J2EEProjectUtilities.isJCAProject(component.getProject())) {
-    		aURI = component.getDeployedName()+IJ2EEModuleConstants.RAR_EXT;
-    	}
-    	
-    	if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
-    		aURI = aURI.substring(1);
-    	return aURI;
-	}
-    
-    private boolean isBinaryModuleArchive(IModule module) {
-    	if (module!=null && module.getName().endsWith(IJ2EEModuleConstants.JAR_EXT) || module.getName().endsWith(IJ2EEModuleConstants.WAR_EXT) ||
-    			module.getName().endsWith(IJ2EEModuleConstants.RAR_EXT)) {
-    		if (component!=null && J2EEProjectUtilities.isEARProject(component.getProject()))
-    			return true;
-    	}
-    	return false;
-    }
-    
-    private String getContainedURI(IModule module) {
-    	if (component instanceof J2EEModuleVirtualArchiveComponent || isBinaryModuleArchive(module))
-    		return new Path(module.getName()).lastSegment();
-    	
-    	IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
-    	String aURI = null;
-    	if (comp!=null && component!=null && J2EEProjectUtilities.isEARProject(component.getProject())) {
-			EARArtifactEdit earEdit = null;
-			try {
-				earEdit = EARArtifactEdit.getEARArtifactEditForRead(component);
-				if (earEdit != null)
-					aURI = earEdit.getModuleURI(comp);
-			} catch (Exception e) {
-				e.printStackTrace();
-			} finally {
-				if (earEdit != null)
-					earEdit.dispose();
-			}
-    	}
-    	if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
-    		aURI = aURI.substring(1);
-    	return aURI;
-	}
-    
-    /**
-     * This method returns the context root property from the deployable project's .component file
-     */
-    public String getContextRoot() {
-		Properties props = component.getMetaProperties();
-		if(props.containsKey(J2EEConstants.CONTEXTROOT))
-			return props.getProperty(J2EEConstants.CONTEXTROOT);
-	    return component.getName();
-    }
-    
-    /**
-     * This method is applicable for a web deployable.  The module passed in should either be null or
-     * the EAR module the web deployable is contained in.  It will return the context root from the EAR
-     * if it has one or return the .component value in the web project if it is standalone.
-     *  
-     * @param module
-     * @return contextRoot String
-     */
-    public String getContextRoot(IModule earModule) {
-    	IProject deployProject = component.getProject();
-    	String contextRoot = null;
-    	if (earModule == null)
-    		return getContextRoot();
-    	else if (J2EEProjectUtilities.isEARProject(earModule.getProject()) && J2EEProjectUtilities.isDynamicWebProject(deployProject)) {
-    		EARArtifactEdit edit = null;
-    		try {
-    			edit = EARArtifactEdit.getEARArtifactEditForRead(earModule.getProject());
-    			contextRoot = edit.getWebContextRoot(deployProject);
-    		} finally {
-    			if (edit!=null)
-    				edit.dispose();
-    		}
-    	}
-    	return contextRoot;
-    }
-    
-    /**
-     * Find the source container, if any, for the given file.
-     * 
-     * @param file
-     * @return IPackageFragmentRoot sourceContainer for IFile
-     */
-    protected IPackageFragmentRoot getSourceContainer(IFile file) {
-    	if (file == null)
-    		return null;
-    	IPackageFragmentRoot[] srcContainers = getSourceContainers();
-    	for (int i=0; i<srcContainers.length; i++) {
-    		IPath srcPath = srcContainers[i].getPath();
-    		if (srcPath.isPrefixOf(file.getFullPath()))
-    			return srcContainers[i];
-    	}
-    	return null;
-    }
-    
-    /**
-     * Either returns value from cache or stores result as value in cache for the corresponding
-     * output container for the given source container.
-     * 
-     * @param sourceContainer
-     * @return IContainer output container for given source container
-     */
-    protected IContainer getOutputContainer(IPackageFragmentRoot sourceContainer) {
-    	if (sourceContainer == null)
-    		return null;
-    	
-    	HashMap pairs = getCachedSourceOutputPairs();
-    	IContainer output = (IContainer) pairs.get(sourceContainer);
-    	if (output == null) {
-    		output = J2EEProjectUtilities.getOutputContainer(getProject(), sourceContainer);
-    		pairs.put(sourceContainer,output);
-    	}
-    	return output;
-    }
-    
-	private IPackageFragmentRoot[] getSourceContainers() {
-		if (cachedSourceContainers != null)
-			return cachedSourceContainers;
-		return J2EEProjectUtilities.getSourceContainers(getProject());
-	}
-    
-    protected List getConsumableReferencedMembers(IVirtualComponent vc) throws CoreException {
-		List consumableMembers = new ArrayList();
-		IVirtualReference[] refComponents = vc.getReferences();
-    	for (int i = 0; i < refComponents.length; i++) {
-    		IVirtualReference reference = refComponents[i];
-    		if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_CONSUMES) {
-    			IVirtualComponent consumedComponent = reference.getReferencedComponent();
-    			if (consumedComponent!=null && isProjectOfType(consumedComponent.getProject(),IModuleConstants.JST_UTILITY_MODULE)) {
-    				if (consumedComponent != null && consumedComponent.getRootFolder()!=null) {
-    					IVirtualFolder vFolder = consumedComponent.getRootFolder();
-    					IModuleResource[] mr = getMembers(vFolder, reference.getRuntimePath().makeRelative());
-    					int size = mr.length;
-    					for (int j = 0; j < size; j++) {
-    						if (!members.contains(mr[j]))
-    							members.add(mr[j]);
-    					}
-    					addUtilMembers(consumedComponent);
-    					List childConsumableMembers = getConsumableReferencedMembers(consumedComponent);
-    					if (!childConsumableMembers.isEmpty())
-    						members.addAll(childConsumableMembers);
-    				}
-    				
-    				IContainer[] javaCont = getJavaOutputFolders(consumedComponent.getProject());		
-    				int size = javaCont.length;
-    				for (int j = 0; j < size; j++) {
-    					IModuleResource[] mr = getMembers(javaCont[j], reference.getRuntimePath(), reference.getRuntimePath(), javaCont);
-    					int size2 = mr.length;
-    					for (int k = 0; k < size2; k++) {
-    						if (!members.contains(mr[k]))
-    							members.add(mr[k]);
-    					}
-    				}
-    			}
-    		}
-    	}
-		return consumableMembers;
-	}
-    
-    protected IModule gatherModuleReference(IVirtualComponent component, IVirtualComponent targetComponent ) {
-    	IModule module = super.gatherModuleReference(component, targetComponent);
-    	// Handle binary module components
-    	if (targetComponent instanceof J2EEModuleVirtualArchiveComponent) {
-    		if (J2EEProjectUtilities.isEARProject(component.getProject()) || targetComponent.getProject()!=component.getProject())
-    			module = ServerUtil.getModule(J2EEDeployableFactory.ID+":"+targetComponent.getName()); //$NON-NLS-1$
-    	}
-		return module;
-    }
-    
-    /**
-     * Determine if the component is nested J2EE module on the application.xml of this EAR
-     * @param aComponent
-     * @return boolean is passed in component a nested J2EE module on this EAR
-     */
-    private boolean isNestedJ2EEModule(IVirtualComponent aComponent, IVirtualReference[] references, EARArtifactEdit edit) {
-    	if (edit==null) 
-			return false;
-		Application app = edit.getApplication();
-		IVirtualReference reference = getReferenceNamed(references,aComponent.getName());
-		// Ensure module URI exists on EAR DD for binary archive
-		return app.getFirstModule(reference.getArchiveName()) != null;
-    }
-    
-    private IVirtualReference getReferenceNamed(IVirtualReference[] references, String name) {
-    	for (int i=0; i<references.length; i++) {
-    		if (references[i].getReferencedComponent().getName().equals(name))
-    			return references[i];
-    	}
-    	return null;
-    }
-    
-    protected ArtifactEdit getComponentArtifactEditForRead() {
-		return EARArtifactEdit.getEARArtifactEditForRead(component.getProject());
-	}
-    
-    /**
-     * The references for J2EE module deployment are only those child modules of EARs or web modules
-     */
-    protected IVirtualReference[] getReferences(IVirtualComponent aComponent) {
-    	if (aComponent == null || aComponent.isBinary()) {
-    		return new IVirtualReference[] {};
-    	} else if (J2EEProjectUtilities.isDynamicWebProject(aComponent.getProject())) {
-    		return getWebLibModules((J2EEModuleVirtualComponent)aComponent);
-    	} else if (J2EEProjectUtilities.isEARProject(aComponent.getProject())) {
-    		return super.getReferences(aComponent);
-    	} else {
-    		return new IVirtualReference[] {};
-    	}
-    }
-    
-    /**
-	 * This method will return the list of dependent modules which are utility jars in the web lib
-	 * folder of the deployed path of the module. It will not return null.
-	 * 
-	 * @return array of the web library dependent modules
-	 */
-	private IVirtualReference[] getWebLibModules(J2EEModuleVirtualComponent comp) {
-		List result = new ArrayList();
-		IVirtualReference[] refComponents = comp.getNonManifestReferences();
-		// Check the deployed path to make sure it has a lib parent folder and matchs the web.xml
-		// base path
-		for (int i = 0; i < refComponents.length; i++) {
-			if (refComponents[i].getRuntimePath().equals(WEBLIB))
-				result.add(refComponents[i]);
-		}
-		return (IVirtualReference[]) result.toArray(new IVirtualReference[result.size()]);
-	}
-	
-	/**
-	 * Returns <code>true</code> if this module has a simple structure based on a
-	 * single root folder, and <code>false</code> otherwise.
-	 * <p>
-	 * In a single root structure, all files that are contained within the root folder
-	 * are part of the module, and are already in the correct module structure. No
-	 * module resources exist outside of this single folder.
-	 * 
-	 * For J2EE, this method will check if the project is already in J2EE spec standard output form.  
-	 * The project must follow certain rules, but in general, the project's content roots must be source folders
-	 * and the output folder must also be the the content root folder.
-	 * </p>
-	 * 
-	 * @return <code>true</code> if this module has a single root structure, and
-	 *    <code>false</code> otherwise
-	 */
-	public boolean isSingleRootStructure() {
-		StructureEdit edit = null;
-		try {
-			edit = StructureEdit.getStructureEditForRead(getProject());
-			if (edit == null || edit.getComponent() == null)
-				return false;
-			WorkbenchComponent wbComp = edit.getComponent();
-			List resourceMaps = wbComp.getResources();
-			
-			if (J2EEProjectUtilities.isEARProject(getProject())) {
-				// Always return false for EARs so that members for EAR are always calculated and j2ee modules
-				// are filtered out
-				return false;
-			} else if (J2EEProjectUtilities.isDynamicWebProject(getProject())) {
-				// If there are any web lib jar references, this is not a standard project
-				IVirtualReference[] references = ((J2EEModuleVirtualComponent)component).getNonManifestReferences();
-				for (int i=0; i<references.length; i++) {
-					if (references[i].getReferencedComponent().isBinary())
-						return false;
-				}
-				// Ensure there are only basic component resource mappings -- one for the content folder 
-				// and any for src folders mapped to WEB-INF/classes
-				if (hasDefaultWebResourceMappings(resourceMaps)) {
-					// Verify only one java output folder
-					if (getJavaOutputFolders().length==1) {
-						// Verify the java output folder is to <content root>/WEB-INF/classes
-						IPath javaOutputPath = getJavaOutputFolders()[0].getProjectRelativePath();
-						IPath compRootPath = component.getRootFolder().getUnderlyingFolder().getProjectRelativePath();
-						if (compRootPath.append(J2EEConstants.WEB_INF_CLASSES).equals(javaOutputPath)) 
-							return true;
-					}
-				}
-				return false;
-			} else if (J2EEProjectUtilities.isEJBProject(getProject()) || J2EEProjectUtilities.isJCAProject(getProject())
-					|| J2EEProjectUtilities.isApplicationClientProject(getProject()) || J2EEProjectUtilities.isUtilityProject(getProject())) {
-				// Ensure there are only source folder component resource mappings to the root content folder
-				if (isRootResourceMapping(resourceMaps,false)) {
-					// Verify only one java outputfolder
-					if (getJavaOutputFolders().length==1) {
-						// At this point for utility projects, this project is optimized, we can just use the output folder
-						if (J2EEProjectUtilities.isUtilityProject(getProject()))
-							return true;
-						// Verify the java output folder is the same as one of the content roots
-						IPath javaOutputPath = getJavaOutputFolders()[0].getProjectRelativePath();
-						IContainer[] rootFolders = component.getRootFolder().getUnderlyingFolders();
-						for (int i=0; i<rootFolders.length; i++) {
-							IPath compRootPath = rootFolders[i].getProjectRelativePath();
-							if (javaOutputPath.equals(compRootPath))
-								return true;
-						}
-					}
-				}
-				return false;
-			}
-			return true;
-		} finally {
-			if (edit !=null)
-				edit.dispose();
-		}
-	}
-	
-	/**
-	 * Ensure that any component resource mappings are for source folders and 
-	 * that they map to the root content folder
-	 * 
-	 * @param resourceMaps
-	 * @return boolean
-	 */
-	private boolean isRootResourceMapping(List resourceMaps, boolean isForEAR) {
-		// If the list is empty, return false
-		if (resourceMaps.size()<1)
-			return false;
-		
-		for (int i=0; i<resourceMaps.size(); i++) {
-			ComponentResource resourceMap = (ComponentResource) resourceMaps.get(i);
-			// Verify it maps to "/" for the content root
-			if (!resourceMap.getRuntimePath().equals(Path.ROOT))
-				return false;
-			// If this is not for an EAR, verify it is also a src container
-			if (!isForEAR) {
-				IPath sourcePath = getProject().getFullPath().append(resourceMap.getSourcePath());
-				if (!isSourceContainer(sourcePath))
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Checks if the path argument is to a source container for the project.
-	 * 
-	 * @param a workspace relative full path
-	 * @return is path a source container?
-	 */
-	private boolean isSourceContainer(IPath path) {
-		IPackageFragmentRoot[] srcContainers = getSourceContainers();
-		for (int i=0; i<srcContainers.length; i++) {
-			if (srcContainers[i].getPath().equals(path))
-				return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Ensure the default web setup is correct with one resource map and any number of java 
-	 * resource maps to WEB-INF/classes
-	 * 
-	 * @param resourceMaps
-	 * @return boolean
-	 */
-	private boolean hasDefaultWebResourceMappings(List resourceMaps) {
-		int rootValidMaps = 0;
-		int javaValidRoots = 0;
-		
-		// If there aren't at least 2 maps, return false
-		if (resourceMaps.size()<2)
-			return false;
-		
-		IPath webInfClasses = new Path(J2EEConstants.WEB_INF_CLASSES).makeAbsolute();
-		for (int i=0; i<resourceMaps.size(); i++) {
-			ComponentResource resourceMap = (ComponentResource) resourceMaps.get(i);
-			IPath sourcePath = getProject().getFullPath().append(resourceMap.getSourcePath());
-			
-			// Verify if the map is for the content root
-			if (resourceMap.getRuntimePath().equals(Path.ROOT)) {
-				rootValidMaps++;
-			// Verify if the map is for a java src folder and is mapped to "WEB-INF/classes"
-			} else if (resourceMap.getRuntimePath().equals(webInfClasses) && isSourceContainer(sourcePath)) {
-				javaValidRoots++;
-			// Otherwise we bail because we have a non optimized map
-			} else {
-				return false;
-			}
-		}
-		// Make sure only one of the maps is the content root, and that at least one is for the java folder
-		return rootValidMaps==1 && javaValidRoots>0;
-	}
-	
-	/**
-	 * This method is added for performance reasons.
-	 * It assumes the virtual component is not using any flexible features and is in a standard J2EE format
-	 * with one component root folder and an output folder the same as its content folder.  This will bypass 
-	 * the virtual component API and just return the module resources as they are on disk.
-	 * 
-	 * @return array of ModuleResources
-	 * @throws CoreException
-	 */
-	private IModuleResource[] getOptimizedMembers() throws CoreException {
-		if (component != null) {
-			// For java utility modules, we can just use the output container, at this point we know there is only one
-			if (J2EEProjectUtilities.isUtilityProject(getProject())) {
-				return getModuleResources(Path.EMPTY, getJavaOutputFolders()[0]);
-			}
-			// For J2EE modules, we use the contents of the content root
-			else {
-				IVirtualFolder vFolder = component.getRootFolder();
-				return getModuleResources(Path.EMPTY, vFolder.getUnderlyingFolder());
-			}
-		}
-		return new IModuleResource[] {};
-	}
-	
-	/**
-	 * This method will return from cache or add to cache whether or not an output container
-	 * is mapped in the virtual component.
-	 * 
-	 * @param outputContainer
-	 * @return if output container is mapped
-	 */
-	private boolean isOutputContainerMapped(IContainer outputContainer) {
-		if (outputContainer == null)
-			return false;
-		
-		HashMap outputMaps = getCachedOutputMappings();
-		Boolean result = (Boolean) outputMaps.get(outputContainer);
-		if (result == null) {
-			// If there are any component resources for the container, we know it is mapped
-			if (ComponentCore.createResources(outputContainer).length > 0)
-				result = Boolean.TRUE;	
-			// Otherwise it is not mapped
-			else
-				result = Boolean.FALSE;
-			// Cache the result in the map for this output container
-			outputMaps.put(outputContainer, result);
-		}
-		return result.booleanValue();
-	}
-	
-	/**
-	 * Lazy initialize the cached output mappings
-	 * @return HashMap
-	 */
-	private HashMap getCachedOutputMappings() {
-		if (cachedOutputMappings==null)
-			cachedOutputMappings = new HashMap();
-		return cachedOutputMappings;
-	}
-	
-	/**
-	 * Lazy initialize the cached source - output pairings
-	 * @return HashMap
-	 */
-	private HashMap getCachedSourceOutputPairs() {
-		if (cachedSourceOutputPairs==null)
-			cachedSourceOutputPairs = new HashMap();
-		return cachedSourceOutputPairs;
-	}
-	
-	/**
-	 * This file should be added to the members list from the virtual component maps only if:
-	 * a) it is not in a source folder
-	 * b) it is in a source folder, and the corresponding output folder is a mapped component resource
-	 * 
-	 * @return boolean should file be added to members
-	 */
-	protected boolean shouldAddComponentFile(IFile file) {
-		IPackageFragmentRoot sourceContainer = getSourceContainer(file);
-		// If the file is not in a source container, return true
-		if (sourceContainer==null) {
-			return true;
-		// Else if it is a source container and the output container is mapped in the component, return true
-		// Otherwise, return false.
-		} else {
-			IContainer outputContainer = getOutputContainer(sourceContainer);
-			return outputContainer!=null && isOutputContainerMapped(outputContainer);		
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/CatalogJ2EEXmlDtDEntityResolver.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/CatalogJ2EEXmlDtDEntityResolver.java
deleted file mode 100644
index 8f41b483b..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/CatalogJ2EEXmlDtDEntityResolver.java
+++ /dev/null
@@ -1,42 +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.plugin;
-
-import java.io.IOException;
-
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.xml.sax.InputSource;
-
-public class CatalogJ2EEXmlDtDEntityResolver extends J2EEXmlDtDEntityResolver {
-
-	private URIResolver uriResolver;
-
-	public CatalogJ2EEXmlDtDEntityResolver() {
-	}
-
-	public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) throws IOException, org.xml.sax.SAXException {
-		if (uriResolver == null) {
-			uriResolver = URIResolverPlugin.createResolver();
-		}
-		String uri = uriResolver.resolve(null, publicId, systemId);
-		if (null != uri) {
-			InputSource result = new InputSource(uri);
-			result.setPublicId(publicId);
-			// force the encoding to be UTF8
-			result.setEncoding("UTF-8"); //$NON-NLS-1$
-			return result;
-		}
-		return super.resolveEntity(publicId, systemId);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEModuleConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEModuleConstants.java
deleted file mode 100644
index 5174b5d67..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEModuleConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-public interface IJ2EEModuleConstants extends IModuleConstants {
-	
-	public static final String J2EE_PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$
-	
-	public static final String EAR_EXT = ".ear"; //$NON-NLS-1$
-	public static final String JAR_EXT = ".jar"; //$NON-NLS-1$
-	public static final String WAR_EXT = ".war"; //$NON-NLS-1$
-	public static final String RAR_EXT = ".rar"; //$NON-NLS-1$
-
-	public static final String JST_EAR_TEMPLATE = "template.jst.ear"; //$NON-NLS-1$
-	public static final String JST_UTILITY_TEMPLATE = "template.jst.utility"; //$NON-NLS-1$
-	public static final String JST_APPCLIENT_TEMPLATE = "template.jst.appclient"; //$NON-NLS-1$
-	public static final String JST_EJB_TEMPLATE = "template.jst.ejb"; //$NON-NLS-1$
-	public static final String JST_JCA_TEMPLATE = "template.jst.connector"; //$NON-NLS-1$
-	public static final String JST_WEB_TEMPLATE = "template.jst.web"; //$NON-NLS-1$
-	public static final String WST_WEB_TEMPLATE = "template.wst.web"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEPreferences.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEPreferences.java
deleted file mode 100644
index a0c2f8a3e..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/IJ2EEPreferences.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.plugin;
-
-
-public interface IJ2EEPreferences {
-
-	String PREF_J2EEWEBCONTENT = "org.eclipse.jst.j2ee.internal.preference.j2eeWebContentName"; //$NON-NLS-1$
-	String PREF_STATICWEBCONTENT = "org.eclipse.jst.j2ee.internal.preference.staticWebContentName"; //$NON-NLS-1$
-	String PREF_JAVASOURCE = "org.eclipse.jst.j2ee.internal.preference.javaSourceName"; //$NON-NLS-1$
-	String DEFAULT_J2EEWEBCONTENT = "WebContent"; //$NON-NLS-1$
-	String DEFAULT_STATICWEBCONTENT = "WebContent"; //$NON-NLS-1$
-	String DEFAULT_JAVASOURCE = "JavaSource"; //$NON-NLS-1$
-	String SERVER_TARGET_SUPPORT = "org.eclipse.jst.j2ee.internal.preference.servertargetsupport"; //$NON-NLS-1$
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java
deleted file mode 100644
index 69cb751b5..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.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 Dec 4, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.frameworks.internal.enablement.IGroupInitializer;
-
-
-/**
- * @author schacher
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class J2EEGroupInitializer implements IGroupInitializer {
-
-	/**
-	 *  
-	 */
-	public J2EEGroupInitializer() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.group.IGroupInitializer#isGroupEnabled(org.eclipse.core.resources.IProject)
-	 */
-	public boolean isGroupEnabled(IProject project) {
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
deleted file mode 100644
index 38920bd05..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
+++ /dev/null
@@ -1,647 +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.plugin;
-
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.UIContextDetermination;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util.AppClientEditAdapterFactory;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit;
-import org.eclipse.jst.j2ee.internal.common.VirtualArchiveComponentAdapterFactory;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.modulecore.util.EarEditAdapterFactory;
-import org.eclipse.jst.j2ee.internal.validation.ResourceUtil;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.refactor.listeners.J2EEElementChangedListener;
-import org.eclipse.jst.j2ee.refactor.listeners.ProjectRefactoringListener;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentXMIResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedXMIFactoryImpl;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * This is a top-level class of the j2ee plugin.
- * 
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class J2EEPlugin extends WTPPlugin implements ResourceLocator {
-
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$
-	public static final String UI_PLUGIN_ID = "org.eclipse.jst.j2ee.ui"; //$NON-NLS-1$
-	protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
-	// LibDir Change Listener
-	public static final String LIBDIRCHANGE_BUILDER_ID = "org.eclipse.jst.j2ee.web.LibDirBuilder"; //$NON-NLS-1$
-	// LibCopy builder ID
-	public static final String LIBCOPY_BUILDER_ID = PLUGIN_ID + ".LibCopyBuilder"; //$NON-NLS-1$
-	// Validation part of the plugin
-	public static final String VALIDATION_BUILDER_ID = ValidationPlugin.VALIDATION_BUILDER_ID; // plugin
-//	private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
-//	private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$	
-	// id
-	// of
-	// the
-	// validation
-	// builder//$NON-NLS-1$
-	//Global ResourceSet (somewhat global)
-	private static boolean defaultIsWorkspaceRelativeSchema = false;
-
-	private List fextendedEditModels;
-	private static IPath location;
-
-	public static IStatus OK_STATUS = new Status(IStatus.OK, PLUGIN_ID, 0, "OK", null); //$NON-NLS-1$
-
-	public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
-				"icons/full/cview16", //$NON-NLS-1$
-				"icons/full/ctool16", //$NON-NLS-1$
-				"icons/full/clcl16", //$NON-NLS-1$
-				"icons/full/ovr16", //$NON-NLS-1$
-				"icons/full/extra", //$NON-NLS-1$
-				"icons/full/wizban", //$NON-NLS-1$
-				"icons", //$NON-NLS-1$
-				""}; //$NON-NLS-1$
-
-	protected static Boolean EJB_AVAILABLE = null;
-	private static Boolean HAS_DEV_ROLE;
-
-	private J2EEPreferences preferences = null;
-	public static J2EEPlugin INSTANCE;
-
-	/**
-	 * Create the J2EE plugin and cache its default instance
-	 */
-	public J2EEPlugin() {
-		super();
-		if (INSTANCE == null)
-			INSTANCE = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-			
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/16/2001 7:38:56 PM)
-	 * 
-	 * @return boolean
-	 */
-	public static boolean defaultIsWorkspaceRelativeSchema() {
-		return defaultIsWorkspaceRelativeSchema;
-	}
-
-	/**
-	 * Get the one application factory.
-	 */
-	public ApplicationFactory getApplicationFactory() {
-		return (ApplicationFactory) getApplicationPackage().getEFactoryInstance();
-	}
-
-	/**
-	 * Get the one ejb package.
-	 */
-	public ApplicationPackage getApplicationPackage() {
-		return ApplicationFactoryImpl.getPackage();
-	}
-
-	/**
-	 * Get the plugin singleton.
-	 */
-	static public J2EEPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public URL getBaseURL() {
-		return getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-
-	public Object[] getJ2EEWebProjectMigrationExtensions() {
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint pct = registry.getExtensionPoint("J2EEWebProjectMigrationExtension"); //$NON-NLS-1$
-		List ret = new Vector();
-		if (pct != null) {
-			IExtension[] extension = pct.getExtensions();
-			for (int l = 0; l < extension.length; ++l) {
-				IExtension config = extension[l];
-
-				IConfigurationElement[] cElems = config.getConfigurationElements();
-				for (int i = 0; i < cElems.length; i++) {
-					IConfigurationElement d = cElems[i];
-					if (d.getName().equals("migration")) { //$NON-NLS-1$ 
-						try {
-							Object me = d.createExecutableExtension("run"); //$NON-NLS-1$
-
-							ret.add(me);
-						} catch (Exception ex) {
-							// ignore this extension, keep going
-						}
-					}
-				}
-			}
-		}
-		return ret.toArray();
-	}
-
-	public EditModel getExtendedEditModel(String editModelKey) {
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint pct = registry.getExtensionPoint("EditModelExtension"); //$NON-NLS-1$
-
-		IExtension[] extension = pct.getExtensions();
-		for (int l = 0; l < extension.length; ++l) {
-			IExtension config = extension[l];
-
-			IConfigurationElement[] cElems = config.getConfigurationElements();
-			for (int i = 0; i < cElems.length; i++) {
-				IConfigurationElement d = cElems[i];
-				if (d.getName().equals("editmodel") && editModelKey.equals(d.getAttribute("key"))) //$NON-NLS-1$ //$NON-NLS-2$
-				{ // editmodel class
-					try {
-						return (EditModel) d.createExecutableExtension("run"); //$NON-NLS-1$
-
-					} catch (Exception ex) {
-						return null;
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public List getExtendedEditModels() {
-
-		if (fextendedEditModels != null)
-			return fextendedEditModels;
-		List editModels = new ArrayList();
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint pct = registry.getExtensionPoint("EditModelExtension"); //$NON-NLS-1$
-
-		IExtension[] extension = pct.getExtensions();
-		for (int l = 0; l < extension.length; ++l) {
-			IExtension config = extension[l];
-
-			IConfigurationElement[] cElems = config.getConfigurationElements();
-			for (int i = 0; i < cElems.length; i++) {
-				IConfigurationElement d = cElems[i];
-				if (d.getName().equals("editmodel")) //$NON-NLS-1$
-				{
-					// editmodel class
-					try {
-						editModels.add(d.createExecutableExtension("run")); //$NON-NLS-1$
-
-					} catch (Exception ex) {
-						return null;
-					}
-				}
-			}
-		}
-		fextendedEditModels = editModels;
-		return fextendedEditModels;
-	}
-
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public static URL getImageURL(String key, Bundle bundle) {
-		String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
-		IPath path = null;
-		for (int i = 0; i < ICON_DIRS.length; i++) {
-			path = new Path(ICON_DIRS[i]).append(gif);
-			if (Platform.find(bundle,path) == null)
-				continue;
-			try {
-				return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$ 
-			} catch (MalformedURLException exception) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Load_Image_Error_", new Object[]{key})); //$NON-NLS-1$
-				exception.printStackTrace();
-				continue;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public Object getImage(String key) {
-		return getImageURL(key,this.getBundle());
-	}
-
-	public static IPath getInstallLocation() {
-		if (location == null) {
-			URL url = getInstallURL();
-			try {
-				String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
-				location = new Path(installLocation);
-			} catch (IOException e) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
-			}
-		}
-		return location;
-	}
-
-	public static URL getInstallURL() {
-		return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$ 
-	}
-
-	protected static IJavaModel getJavaModel() {
-		return JemProjectUtilities.getJavaModel();
-	}
-
-	protected static IJavaModel getJavaModel(IProject aProject) {
-		if (aProject != null)
-			return JemProjectUtilities.getJavaModel();
-		return null;
-	}
-
-	public static IJavaProject getJavaProject(IProject project) {
-		IJavaModel model = getJavaModel(project);
-		if (model != null)
-			return model.getJavaProject(project.getName());
-		return null;
-	}
-
-	/**
-	 * Retrieves a hashtable of a logger's preferences initially from the
-	 * com.ibm.etools.logging.util.loggingDefaults extension point if specified in the
-	 * com.ibm.etools.logging.util plugin.xml file. If specified, the
-	 * com.ibm.etools.logging.util.loggingOptions extension point preferences in the parameter
-	 * plugin's plugin.xml file are returned.
-	 * 
-	 * The logger's preferences are stored in the return hashtable using the static instance
-	 * variables in LoggerStateHashKeys as keys.
-	 * 
-	 * @param plugin
-	 *            the Plugin polled for their logger's preferences in the plugin.xml file
-	 * @return hashtable of a logger's preferences
-	 */
-	/*
-	 * public java.util.Hashtable getMsgLoggerConfig(org.eclipse.core.runtime.Plugin plugin) {
-	 * return (new PluginHelperImpl().getMsgLoggerConfig(plugin)); }
-	 */
-	/**
-	 * Get the singleton instance.
-	 */
-	public static J2EEPlugin getPlugin() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Return the plugin directory location- the directory that all the plugins are located in (i.e.
-	 * d:\installdir\plugin)
-	 */
-	public static IPath getPluginLocation(String pluginId) {
-		//IExtensionRegistry registry = Platform.getExtensionRegistry();
-		Bundle bundle = Platform.getBundle(pluginId);
-		if (bundle != null) {
-			try {
-				IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator(); //$NON-NLS-1$ 
-				String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-				return new Path(installStr);
-			} catch (IOException e) {
-			};
-		}
-		return null;
-	}
-
-	protected void initializeDefaultPluginPreferences() {
-		getJ2EEPreferences().initializeDefaultPreferences();
-	}
-
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * If this is called from an operation, in response to some other exception that was caught,
-	 * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
-	 * otherwise this can still be used to signal some other error condition within the operation,
-	 * or to throw a core exception in a context other than executing an operation
-	 * 
-	 * Create a new IStatus of type ERROR using the J2EEPlugin ID. aCode is just an internal code.
-	 */
-	public static IStatus newErrorStatus(int aCode, String aMessage, Throwable exception) {
-		return newStatus(IStatus.ERROR, aCode, aMessage, exception);
-	}
-
-	/**
-	 * If this is called from an operation, in response to some other exception that was caught,
-	 * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
-	 * otherwise this can still be used to signal some other error condition within the operation,
-	 * or to throw a core exception in a context other than executing an operation
-	 * 
-	 * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
-	 */
-	public static IStatus newErrorStatus(String aMessage, Throwable exception) {
-		return newErrorStatus(0, aMessage, exception);
-	}
-
-	/**
-	 * If this is called from an operation, in response to some other exception that was caught,
-	 * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
-	 * otherwise this can still be used to signal some other error condition within the operation.
-	 * 
-	 * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
-	 */
-	public static IStatus newOperationFailedStatus(String aMessage, Throwable exception) {
-		return newStatus(IStatus.ERROR, IResourceStatus.OPERATION_FAILED, aMessage, exception);
-	}
-
-	/**
-	 * Create a new IStatus with a severity using the J2EEPlugin ID. aCode is just an internal code.
-	 */
-	public static IStatus newStatus(int severity, int aCode, String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode, aMessage, exception);
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public String getString(String key) {
-		try {
-			return Platform.getResourceString(getBundle(), key);
-		} catch (MissingResourceException ex) {
-			//TODO Don't throw error - just show unresolved key
-			//Logger.getLogger().logError(ex);
-			return '!' + key + '!';
-		}
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public String getString(String key, Object[] substitutions) {
-		return MessageFormat.format(getString(key), substitutions);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/16/2001 7:38:56 PM)
-	 * 
-	 * @param newDefaultIsWorkspaceRelativeSchema
-	 *            boolean
-	 */
-	public static void setDefaultIsWorkspaceRelativeSchema(boolean newDefaultIsWorkspaceRelativeSchema) {
-		defaultIsWorkspaceRelativeSchema = newDefaultIsWorkspaceRelativeSchema;
-	}
-
-	/**
-	 * This method should be used to determine if the EJB UI support is currently packaged in the
-	 * image.
-	 */
-	public static boolean isEJBSupportAvailable() {
-		if (EJB_AVAILABLE == null) {
-			//TODO We need a better mechanism for the detection of the EJB support.
-			//IPluginDescriptor desc =
-			// Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.internal.internal.ejb.ui");
-			// //$NON-NLS-1$
-			// EJB_AVAILABLE = new Boolean(desc != null);
-			EJB_AVAILABLE = Boolean.TRUE;
-		}
-		return EJB_AVAILABLE.booleanValue();
-	}
-
-	/**
-	 * This method should be used to determine if the workbench is running in UI or Headless
-	 * 
-	 * @deprecated use {@link org.eclipse.wst.common.frameworks.internal.UIContextDetermination}
-	 */
-	public static boolean isHeadless() {
-		return UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
-	}
-
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-				
-		J2EEXmlDtDEntityResolver.INSTANCE = new CatalogJ2EEXmlDtDEntityResolver();
-		DOMUtilities.setDefaultEntityResolver(J2EEXmlDtDEntityResolver.INSTANCE); 
-		//Have to do the next line immediately to fix timing problems with factory registration
-		ArchiveInit.init(false);
-			
-		//ModuleMaps are the maps from modules in an ear project to the j2ee projects for the
-		// modules
-		org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapInit.init(false);
-		ensureFactoryRegistration();
-		ValidatorManager.setResourceUtilClass(ResourceUtil.class);
-		IAdapterManager manager = Platform.getAdapterManager();
-		manager.registerAdapters(new EarEditAdapterFactory(), ArtifactEditModel.class);
-		manager.registerAdapters(new AppClientEditAdapterFactory(), ArtifactEditModel.class);
-		manager.registerAdapters(new VirtualArchiveComponentAdapterFactory(), VirtualArchiveComponent.class );
-		
-		final ProjectRefactoringListener listener = new ProjectRefactoringListener();//ProjectDependencyCache.getCache());
-		// register the project rename/delete refactoring listener
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(listener,
-				IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE);
-		
-		// register the IElementChangedLister that updates the .component file in 
-		// response to .classpath changes
-		JavaCore.addElementChangedListener(new J2EEElementChangedListener(), ElementChangedEvent.POST_CHANGE);
-		
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(J2EEComponentClasspathUpdater.getInstance(), IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE);
-	}
-	
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(J2EEComponentClasspathUpdater.getInstance());
-	}
-
-	/*
-	 * need to make sure the correct factories get loaded when we are in the UI
-	 */
-	private void ensureFactoryRegistration() {
-		//Inside the workbench we do not want the global override defined here.
-		ensureDefaultReferencedXMIResourceFactoryRegistration();
-	}
-
-	/**
-	 *  
-	 */
-	private void ensureDefaultReferencedXMIResourceFactoryRegistration() {
-		J2EEResourceFactoryRegistry reg1 = J2EEResourceFactoryRegistry.INSTANCE;
-		WTPResourceFactoryRegistry reg2 = WTPResourceFactoryRegistry.INSTANCE;
-		ReferencedXMIFactoryImpl factory = new ReferencedComponentXMIResourceFactory();
-		reg1.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, factory);
-		reg2.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, factory);
-		// add xmi because other plugins are registering it globally
-		reg1.getExtensionToFactoryMap().put("xmi", factory); //$NON-NLS-1$
-		reg2.getExtensionToFactoryMap().put("xmi", factory); //$NON-NLS-1$
-	}
-
-	/**
-	 * This is currently just a convenience api for the AAW to turn off unwanted actions. It will
-	 * currently be initialized based on the existence of the AAW plugin.
-	 */
-	public static boolean hasDevelopmentRole() {
-		if (HAS_DEV_ROLE == null) {
-			Bundle desc = Platform.getBundle("org.eclipse.jst.j2ee.assembly"); //$NON-NLS-1$
-			HAS_DEV_ROLE = desc != null ? Boolean.FALSE : Boolean.TRUE;
-		}
-		return HAS_DEV_ROLE.booleanValue();
-	}
-
-	public static IWorkspaceRunnable getWorkspaceRunnable(final IHeadlessRunnableWithProgress op) {
-		return new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				try {
-					op.run(monitor);
-				} catch (InvocationTargetException e) {
-					throw new CoreException(newErrorStatus(0, e.getMessage(), e));
-				} catch (InterruptedException e) {
-					throw new CoreException(newErrorStatus(0, e.getMessage(), e));
-				}
-			}
-		};
-	}
-
-	public String getPluginID() {
-		return PLUGIN_ID;
-	}
-
-	/**
-	 * @return Returns the preferences.
-	 */
-	public J2EEPreferences getJ2EEPreferences() {
-		if (this.preferences == null)
-			this.preferences = new J2EEPreferences(this);
-		return this.preferences;
-	}
-	public String getString(String key, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key);
-	}
-
-	public String getString(String key, Object[] substitutions, boolean translate) {
-		// TODO For now...  translate not supported
-		return getString(key,substitutions);
-	}
-	
-
-	/**
-	 * Record an error against this plugin's log. 
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param anException
-	 */
-	public static void logError(int aCode, String aMessage,
-			Throwable anException) {
-		getDefault().getLog().log(
-				createErrorStatus(aCode, aMessage, anException));
-	}
-
-	/**
-	 * 
-	 * Record a message against this plugin's log. 
-	 * 
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 */
-	public static void log(int severity, int aCode, String aMessage,
-			Throwable exception) {
-		log(createStatus(severity, aCode, aMessage, exception));
-	}
-
-	/**
-	 * 
-	 * Record a status against this plugin's log. 
-	 * 
-	 * @param aStatus
-	 */
-	public static void log(IStatus aStatus) {
-		getDefault().getLog().log(aStatus);
-	}
-
-	/**
-	 * Create a status associated with this plugin.
-	 *  
-	 * @param severity
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createStatus(int severity, int aCode,
-			String aMessage, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, aCode,
-				aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param aCode
-	 * @param aMessage
-	 * @param exception
-	 * @return A status configured with this plugin's id and the given parameters.
-	 */
-	public static IStatus createErrorStatus(int aCode, String aMessage,				
-			Throwable exception) { 
-		return createStatus(IStatus.ERROR, aCode, aMessage != null ? aMessage : exception.toString(), exception);
-	} 
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPluginResourceHandler.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPluginResourceHandler.java
deleted file mode 100644
index f83263995..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPluginResourceHandler.java
+++ /dev/null
@@ -1,76 +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.plugin;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class J2EEPluginResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "j2eewtpplugin";//$NON-NLS-1$
-
-	private J2EEPluginResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String __Considering_delta_INFO_;
-	public static String WARNING_METAFOLDER_MISSING_UI_;
-	public static String Not_a_J2EE_project_UI_;
-	public static String CoreException_could_not_initialize_Web_Service_class_path_variables_ERROR_;
-	public static String Error_opening_archive_for_export_2;
-	public static String J2EEDeployOperation_2_UI_;
-	public static String No_library_folder_UI_;
-	public static String J2EEDeployOperation_UI_Null_Status;
-	public static String RAR_File;
-	public static String NESTED_JAVA_OUTPUT_ERROR;
-	public static String J2EEModulePostImportHelper_3;
-	public static String J2EEModulePostImportHelper_2;
-	public static String J2EEModulePostImportHelper_1;
-	public static String J2EEModulePostImportHelper_0;
-	public static String Some_source_types_have______in_their_name_ERROR_;
-	public static String J2EEDeployOperation_UI_1;
-	public static String J2EEDeployOperation_UI_0;
-	public static String _UI_ParamValue_type;
-	public static String J2EEDeployOperation_1_UI_;
-	public static String An_error_occurred_while_sa_ERROR_;
-	public static String WARNING_FILE_MISSING_UI_;
-	public static String Cannot_load_EJBJar_because_model_is_null_UI_;
-	public static String __Bad_builder_order_for_project_INFO_;
-	public static String No_source_types_UI_;
-	public static String EJBProjectResources_getEJBJar_EJBEditModel__UI_;
-	public static String __No_imported_classes_folder__quitting_INFO_;
-	public static String The_following_resources_ne_UI_;
-	public static String J2EEDeployOperation_4_UI_;
-	public static String __Full_first_build_INFO_;
-	public static String Error_occurred_saving_the_manifest_7;
-	public static String Cannot_load_EJBFile_because_ejbNature_asEJBJarFile___returns_null_UI_;
-	public static String __Delta_build_INFO_;
-	public static String __Start_build_project_INFO_;
-	public static String Cannot_load_EJBFile_because_EJBNatureRuntime_is_null_UI_;
-	public static String Minimizing_project_UI_;
-	public static String Error_getting_project_nature_runtime_6;
-	public static String Creating_Connector_Project_5;
-	public static String Error_getting_project_nature_runtime_3;
-	public static String J2EEDeployOperation_3_UI_;
-	public static String Unable_to_save_read_only_f_ERROR_;
-	public static String Could_not_find_root_object_ERROR_;
-	public static String Cannot_run_J2EEUIWorkingCo_ERROR_;
-	public static String Cannot_load_EJBFile_because_EJBEditModel_is_null_UI_;
-	public static String Error_occurred_loading_ra_xml__4;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, J2EEPluginResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
deleted file mode 100644
index d381d03a6..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
+++ /dev/null
@@ -1,189 +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 Jan 26, 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.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * @author mdelder
- */
-public class J2EEPreferences {
-
-	public interface Keys {
-		final static String J2EE_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.j2eeWebContentName"; //$NON-NLS-1$
-		final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-		final static String JAVA_SOURCE = "org.eclipse.jst.j2ee.preference.javaSourceName"; //$NON-NLS-1$
-		final static String SERVER_TARGET_SUPPORT = "org.eclipse.jst.j2ee.preference.servertargetsupport"; //$NON-NLS-1$
-		final static String CREATE_EJB_CLIENT_JAR = "org.eclipse.jst.j2ee.preference.createClientJar"; //$NON-NLS-1$
-		final static String J2EE_VERSION = "org.eclipse.jst.j2ee.ui.preference.j2eeVersion"; //$NON-NLS-1$
-		final static String EJB_CLIENT_JAR_CP_COMPATIBILITY = "org.eclipse.jst.j2ee.preference.clientjar.cp.compatibility"; //$NON-NLS-1$
-		final static String INCREMENTAL_DEPLOYMENT_SUPPORT = "org.eclipse.jst.j2ee.ui.preference.incrementalDeployment"; //$NON-NLS-1$
-
-
-	}
-
-	public interface Values {
-		final static String J2EE_VERSION_1_2 = "J2EE_1_2"; //$NON-NLS-1$
-		final static String J2EE_VERSION_1_3 = "J2EE_1_3"; //$NON-NLS-1$
-		final static String J2EE_VERSION_1_4 = "J2EE_1_4"; //$NON-NLS-1$
-
-		final static String J2EE_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-		final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-		final static String JAVA_SOURCE = "JavaSource"; //$NON-NLS-1$
-	}
-
-	public interface Defaults {
-
-		final static String J2EE_WEB_CONTENT = Values.J2EE_WEB_CONTENT;
-		final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
-		final static String JAVA_SOURCE = Values.JAVA_SOURCE;
-		final static String J2EE_VERSION = Values.J2EE_VERSION_1_4;
-		final static int J2EE_VERSION_ID = J2EEVersionConstants.J2EE_1_4_ID;
-		final static boolean CREATE_EJB_CLIENT_JAR = false;
-		final static boolean EJB_CLIENT_JAR_CP_COMPATIBILITY = true;
-		final static boolean INCREMENTAL_DEPLOYMENT_SUPPORT = true;
-	}
-
-	private Plugin owner = null;
-	private Preferences preferences = null;
-	private boolean persistOnChange = false;
-
-	public J2EEPreferences(Plugin owner) {
-		this.owner = owner;
-	}
-
-	protected void initializeDefaultPreferences() {
-		getPreferences().setDefault(Keys.J2EE_WEB_CONTENT, Defaults.J2EE_WEB_CONTENT);
-		getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
-		getPreferences().setDefault(Keys.JAVA_SOURCE, Defaults.JAVA_SOURCE);
-
-		getPreferences().setDefault(Keys.J2EE_VERSION, Defaults.J2EE_VERSION);
-		getPreferences().setDefault(Keys.CREATE_EJB_CLIENT_JAR, Defaults.CREATE_EJB_CLIENT_JAR);
-		getPreferences().setDefault(Keys.EJB_CLIENT_JAR_CP_COMPATIBILITY, Defaults.EJB_CLIENT_JAR_CP_COMPATIBILITY);
-		getPreferences().setDefault(Keys.INCREMENTAL_DEPLOYMENT_SUPPORT, Defaults.INCREMENTAL_DEPLOYMENT_SUPPORT);
-
-	}
-
-	public String getJ2EEWebContentFolderName() {
-		return getPreferences().getString(Keys.J2EE_WEB_CONTENT);
-	}
-
-	public String getStaticWebContentFolderName() {
-		return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
-	}
-
-	public String getJavaSourceFolderName() {
-		return getPreferences().getString(Keys.JAVA_SOURCE);
-	}
-
-	public String getHighestJ2EEVersionSetting() {
-		return getPreferences().getString(Keys.J2EE_VERSION);
-	}
-
-	public boolean isServerTargetingEnabled() {
-		return getPreferences().getBoolean(Keys.SERVER_TARGET_SUPPORT);
-	}
-
-	///
-	public void setJ2EEWebContentFolderName(String value) {
-		getPreferences().setValue(Keys.J2EE_WEB_CONTENT, value);
-		firePreferenceChanged();
-	}
-
-	public void setStaticWebContentFolderName(String value) {
-		getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
-		firePreferenceChanged();
-	}
-
-	public void setJavaSourceFolderName(String value) {
-		getPreferences().setValue(Keys.JAVA_SOURCE, value);
-		firePreferenceChanged();
-	}
-
-	public void setHighestJ2EEVersionSetting(String value) {
-		getPreferences().setValue(Keys.J2EE_VERSION, value);
-		firePreferenceChanged();
-	}
-
-	public void setServerTargetingEnabled(boolean value) {
-		getPreferences().setValue(Keys.SERVER_TARGET_SUPPORT, value);
-		firePreferenceChanged();
-	}
-
-	public void setIncrementalDeploymentEnabled(boolean value) {
-		getPreferences().setValue(Keys.INCREMENTAL_DEPLOYMENT_SUPPORT, value);
-		firePreferenceChanged();
-	}
-
-	public boolean isIncrementalDeploymentEnabled() {
-		return getPreferences().getBoolean(Keys.INCREMENTAL_DEPLOYMENT_SUPPORT);
-	}
-
-	/**
-	 * @return one of J2EEVersionConstants.J2EE_VERSION_X_X (@see J2EEVersionConstants)
-	 */
-	public int getHighestJ2EEVersionID() {
-		String versionPreference = getHighestJ2EEVersionSetting();
-		if (Values.J2EE_VERSION_1_2.equals(versionPreference))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		else if (Values.J2EE_VERSION_1_3.equals(versionPreference))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		else
-			return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public void firePreferenceChanged() {
-		if (isPersistOnChange())
-			persist();
-	}
-
-	public void persist() {
-		getOwner().savePluginPreferences();
-	}
-
-	/**
-	 * @return Returns the persistOnChange.
-	 */
-	public boolean isPersistOnChange() {
-		return this.persistOnChange;
-	}
-
-	/**
-	 * @param persistOnChange
-	 *            The persistOnChange to set.
-	 */
-	public void setPersistOnChange(boolean persistOnChange) {
-		this.persistOnChange = persistOnChange;
-	}
-
-	private Preferences getPreferences() {
-		if (this.preferences == null)
-			this.preferences = getOwner().getPluginPreferences();
-		return this.preferences;
-	}
-
-	/**
-	 * @return Returns the owner.
-	 */
-	private Plugin getOwner() {
-		return this.owner;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
deleted file mode 100644
index 707a96dba..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
+++ /dev/null
@@ -1,511 +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.plugin;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-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.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.workbench.utility.JemProjectUtilities;
-
-/**
- * An example incremental project builder that copies additional class files from a library package
- * fragment root folder into a Java project's output directory.
- * 
- * General parameters:
- * <ul>
- * <li>The project should be a Java project.</li>
- * <li>The class files are in the "imported_classes" folder of the project.</li>
- * <li>This builder should run <b>after </b> the Java builder.</li>
- * <li>Full build should copy class files from a secondary library folder into the output folder
- * maintaining package hierarchy; existing class files must never be overwritten.</li>
- * <li>Only *.class files should be copied (not other resource files).</li>
- * <li>Incremental build and auto-build should will perform the copy when there is an add/change in
- * the "imported_classes" folder.</li>
- * <li>Changing the project's output folder should be handled.</li>
- * </ul>
- * Note: the builder is not currently invoking the Minimize helper, it is relying on the copy to not
- * replace existing class files, and the build path order to ensure that compiled classes override
- * imported ones.
- * 
- * @deprecated This class is only used for backwards compatibility
- */
-public class LibCopyBuilder extends IncrementalProjectBuilder {
-	/**
-	 * Internal debug tracing.
-	 */
-	static boolean DEBUG = false;
-
-	/**
-	 * Builder id of this incremental project builder.
-	 */
-	public static final String BUILDER_ID = J2EEPlugin.LIBCOPY_BUILDER_ID;
-
-	/**
-	 * The path where we expect to find the .class files to be copied.
-	 */
-	public static final String IMPORTED_CLASSES_PATH = "imported_classes"; //$NON-NLS-1$
-
-	/**
-	 * The path of the output folder that we last copied class files into, or <code>null</code> if
-	 * this builder has not built this project before.
-	 */
-	private IPath lastOutputPath = null;
-
-	private List sourceContainers;
-
-	private boolean needOutputRefresh;
-
-	/**
-	 * Creates a new instance of the library copying builder.
-	 * <p>
-	 * All incremental project builders are required to have a public 0-argument constructor.
-	 * </p>
-	 */
-	public LibCopyBuilder() {
-		super();
-	}
-
-
-	/**
-	 * 
-	 * The <code>LibCopyBuilder</code> implementation of this
-	 * <code>IncrementalProjectBuilder</code> method copies additional class files into the output
-	 * folder.
-	 * <p>
-	 * [Issue: the implementation should report progress.]
-	 * </p>
-	 * <p>
-	 * [Issue: the implementation should probably use a workspace runnable.]
-	 * </p>
-	 */
-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
-		// this builder is unnecessary in WTP 1.5
-		return null;
-//		sourceContainers = null;
-//		needOutputRefresh = false;
-//		if (DEBUG) {
-//			System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Start_build_project_INFO_ + getProject().getName()); 
-//		}
-//
-//		boolean builderOrderOK = checkBuilderOrdering();
-//
-//		if (DEBUG && !builderOrderOK) {
-//			System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Bad_builder_order_for_project_INFO_ + getProject().getName()); 
-//		}
-//
-//		IFolder[] classFolders = getClassesFolders();
-//		if (classFolders.length == 0) {
-//			// no files to copy
-//			if (DEBUG)
-//				System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__No_imported_classes_folder__quitting_INFO_); 
-//			return null;
-//		}
-//
-//		IJavaProject jproject = JavaCore.create(getProject());
-//		if (jproject == null) {
-//			// not a java project (anymore?)
-//			return null;
-//		}
-//
-//		IPath outputPath = jproject.getOutputLocation();
-//		IFolder outputFolder = getProject().getParent().getFolder(outputPath);
-//		if (outputPath.equals(lastOutputPath)) {
-//			if (kind == INCREMENTAL_BUILD || kind == AUTO_BUILD) {
-//				processDelta(getDelta(getProject()), outputFolder, monitor, classFolders);
-//				refreshOutputIfNecessary(outputFolder);
-//				return null;
-//			}
-//		}
-//
-//		if (DEBUG) {
-//			System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Full_first_build_INFO_);
-//		}
-//		copyAllClassFolders(monitor, classFolders, outputFolder);
-//		lastOutputPath = outputPath;
-//		refreshOutputIfNecessary(outputFolder);
-//		return null;
-	}
-
-	/**
-	 *  
-	 */
-	private void refreshOutputIfNecessary(IFolder outputFolder) throws CoreException {
-		if (needOutputRefresh && outputFolder != null && outputFolder.exists())
-			outputFolder.refreshLocal(IResource.DEPTH_INFINITE, null);
-	}
-
-	private void copyAllClassFolders(IProgressMonitor monitor, IFolder[] classFolders, IFolder outputFolder) throws CoreException {
-		for (int i = 0; i < classFolders.length; i++) {
-			if (!classFolders[i].equals(outputFolder))
-				copyClassFiles(classFolders[i], outputFolder, monitor);
-		}
-
-	}
-
-
-	/**
-	 * Process an incremental build delta.
-	 * 
-	 * @return <code>true</code> if the delta requires a copy
-	 * @param dest
-	 *            the destination folder; may or may not exist
-	 * @param monitor
-	 *            the progress monitor, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if something goes wrong
-	 */
-	protected void processDelta(IResourceDelta delta, final IFolder outputFolder, final IProgressMonitor monitor, final IFolder[] classesFolders) {
-		if (DEBUG) {
-			System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Considering_delta_INFO_ + delta); 
-		}
-		IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
-			private List copiedClassFolders = new ArrayList(classesFolders.length);
-
-			public boolean visit(IResourceDelta subdelta) throws CoreException {
-				IResource resource = subdelta.getResource();
-				if (resource.getType() == IResource.FILE) {
-					IFolder classesFolder = retrieveClassesFolder(resource, classesFolders);
-					if (classesFolder != null && !copiedClassFolders.contains(classesFolder)) {
-						int kind = subdelta.getKind();
-						switch (kind) {
-							case IResourceDelta.ADDED :
-							case IResourceDelta.CHANGED :
-								if (DEBUG) {
-									System.out.println(BUILDER_ID + J2EEPluginResourceHandler.__Delta_build_INFO_ + subdelta); 
-								}
-								copyClassFiles(classesFolder, outputFolder, monitor);
-								break;
-							case IResourceDelta.REMOVED :
-								deleteCorrespondingFile((IFile) resource, classesFolder, outputFolder, monitor);
-								break;
-							case IResourceDelta.ADDED_PHANTOM :
-								break;
-							case IResourceDelta.REMOVED_PHANTOM :
-								break;
-						}
-
-					}
-				} else if (resource.getType() == IResource.FOLDER && resource.equals(outputFolder)) {
-					copyAllClassFolders(null, classesFolders, outputFolder);
-					return false;
-				}
-				return true;
-			}
-		};
-		if (delta != null) {
-			try {
-				delta.accept(visitor);
-			} catch (CoreException e) {
-				// should not happen
-			}
-		}
-	}
-
-	/**
-	 * @param file
-	 * @param classesFolder
-	 * @param outputFolder
-	 * @param monitor
-	 */
-	protected void deleteCorrespondingFile(IFile file, IFolder classesFolder, IFolder outputFolder, IProgressMonitor monitor) throws CoreException {
-		IPath path = file.getFullPath();
-		int segCount = classesFolder.getFullPath().segmentCount();
-		path = path.removeFirstSegments(segCount);
-		IFile javaFile = findCorrespondingJavaFile(path);
-		if (javaFile != null && javaFile.exists())
-			return; //There is nothing to do because the file in the output location is from the
-		// java compilation not the copy.
-		IFile outFile = outputFolder.getFile(path);
-		if (outFile.exists())
-			outFile.delete(true, false, monitor);
-	}
-
-
-	/**
-	 * Method retrieveClassesFolder.
-	 * 
-	 * @param resource
-	 * @return IFolder
-	 */
-	protected IFolder retrieveClassesFolder(IResource resource, IFolder[] classesFolders) {
-		for (int i = 0; i < classesFolders.length; i++) {
-			if (classesFolders[i].getName().equals(resource.getProjectRelativePath().segment(0)))
-				return classesFolders[i];
-		}
-		return null;
-	}
-
-
-	/**
-	 * Checks whether this builder is configured to run <b>after </b> the Java builder.
-	 * 
-	 * @return <code>true</code> if the builder order is correct, and <code>false</code>
-	 *         otherwise
-	 * @exception CoreException
-	 *                if something goes wrong
-	 */
-	private boolean checkBuilderOrdering() throws CoreException {
-		// determine relative builder position from project's buildspec
-		ICommand[] cs = getProject().getDescription().getBuildSpec();
-		int myIndex = -1;
-		int javaBuilderIndex = -1;
-		for (int i = 0; i < cs.length; i++) {
-			if (cs[i].getBuilderName().equals(JavaCore.BUILDER_ID)) {
-				javaBuilderIndex = i;
-			} else if (cs[i].getBuilderName().equals(BUILDER_ID)) {
-				myIndex = i;
-			}
-		}
-		return myIndex > javaBuilderIndex;
-	}
-
-	/**
-	 * Copies class files from the given source folder to the given destination folder. The
-	 * destination folder will be created if required, but only if at least one class file is
-	 * copied.
-	 * 
-	 * @param source
-	 *            the source folder; must exist
-	 * @param dest
-	 *            the destination folder; may or may not exist
-	 * @param monitor
-	 *            the progress monitor, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if something goes wrong
-	 */
-	private void copyClassFiles(IFolder source, final IFolder dest, final IProgressMonitor monitor) throws CoreException {
-		if (DEBUG) {
-			System.out.println(BUILDER_ID + ": Begin copying class files from " + source.getFullPath() + " to " + dest.getFullPath()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		final int sourcePathLength = source.getFullPath().segmentCount();
-
-		class Visitor implements IResourceVisitor {
-			public boolean visit(IResource res) throws CoreException {
-				if (res.getType() == IResource.FILE) {
-					IFile file = (IFile) res;
-
-					// compute relative path from source folder to this file
-					IPath filePath = file.getFullPath();
-					IPath dpath = filePath.removeFirstSegments(sourcePathLength);
-					IFile targetFile = dest.getFile(dpath);
-					copyFile(file, targetFile, dpath, monitor);
-				}
-				return true;
-			}
-		}
-
-		try {
-			source.accept(new Visitor());
-		} catch (CoreException e) {
-			// should not happen
-		}
-
-	}
-
-	/**
-	 * Copies the given file to the given destination file. Does nothing if the destination file
-	 * already exists.
-	 * 
-	 * @param source
-	 *            the source file; must exist
-	 * @param dest
-	 *            the destination file; may or may not exist; never overwritten
-	 * @param monitor
-	 *            the progress monitor, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if something goes wrong
-	 */
-	private void copyFile(IFile source, IFile dest, IPath fileRelativePath, IProgressMonitor monitor) throws CoreException {
-		if (pruneForJavaSource(source, fileRelativePath, monitor))
-			return; //no copy necessary.
-		File sourceFile = null, destFile = null;
-		if (source.exists())
-			sourceFile = source.getLocation().toFile();
-		if (dest.exists())
-			destFile = dest.getLocation().toFile();
-
-		if (destFile != null && sourceFile != null) {
-			if (DEBUG)
-				System.out.println(BUILDER_ID + ": " + dest.getFullPath() + " already exists."); //$NON-NLS-1$ //$NON-NLS-2$
-			if (destFile.lastModified() == sourceFile.lastModified())
-				return;
-			dest.setContents(source.getContents(false), true, false, monitor); //we have to force
-			// b/c set the mod
-			// stamp makes it
-			// think it is out of
-			// synch.
-			synchronizeModificationStamps(sourceFile, destFile);
-			return;
-		}
-		if (DEBUG) {
-			System.out.println(BUILDER_ID + ": Creating " + dest.getFullPath()); //$NON-NLS-1$
-		}
-
-		IContainer parent = dest.getParent();
-		if (parent.getType() == IResource.FOLDER) {
-			mkdirs((IFolder) parent, monitor);
-		}
-		dest.create(source.getContents(false), false, monitor);
-		destFile = dest.getLocation().toFile();
-		synchronizeModificationStamps(sourceFile, destFile);
-		dest.setDerived(true);
-	}
-
-	/**
-	 * Return true if a corresponding .java file is found. Remove the .class file from the
-	 * imported_classes folder (i.e., delete the source file).
-	 * 
-	 * @param source
-	 * @param monitor
-	 * @return
-	 */
-	private boolean pruneForJavaSource(IFile classFile, IPath fileRelativePath, IProgressMonitor monitor) throws CoreException {
-		if (classFile.exists()) {
-			IFile javaFile = findCorrespondingJavaFile(fileRelativePath);
-			if (javaFile != null && javaFile.exists()) {
-				ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{javaFile}, null);
-				classFile.delete(true, false, monitor);
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * @param classFilePath
-	 * @return
-	 */
-	private IFile findCorrespondingJavaFile(IPath classFilePath) {
-		IPath javaPath = convertToJavaPath(classFilePath);
-		List sourceFolders = getSourceContainers();
-		IContainer cont;
-		IFile javaFile;
-		for (int i = 0; i < sourceFolders.size(); i++) {
-			cont = (IContainer) sourceFolders.get(i);
-			javaFile = cont.getFile(javaPath);
-			if (javaFile.exists())
-				return javaFile;
-		}
-		return null;
-	}
-
-
-	private List getSourceContainers() {
-		if (sourceContainers == null)
-			sourceContainers = JemProjectUtilities.getSourceContainers(getProject());
-		return sourceContainers;
-	}
-
-
-	/**
-	 * @param classFile
-	 * @return
-	 */
-	private IPath convertToJavaPath(IPath classFilePath) {
-		IPath javaPath = classFilePath.removeFileExtension();
-		//handle inner classes...look for outermost java file
-		String fileName = classFilePath.lastSegment();
-		int innerIndex = fileName.indexOf('$');
-		if (innerIndex > -1) {
-			javaPath = javaPath.removeLastSegments(1);
-			javaPath = javaPath.append(fileName.substring(0, innerIndex));
-		}
-		javaPath = javaPath.addFileExtension("java"); //$NON-NLS-1$
-		return javaPath;
-	}
-
-
-	/**
-	 * @param source
-	 * @param dest
-	 */
-	private void synchronizeModificationStamps(File sourceFile, File destFile) {
-		if (destFile != null && sourceFile != null) {
-			destFile.setLastModified(sourceFile.lastModified());
-			needOutputRefresh = true;
-		}
-	}
-
-
-	/**
-	 * Creates the given folder, and its containing folders, if required. Does nothing if the given
-	 * folder already exists.
-	 * 
-	 * @param folder
-	 *            the folder to create
-	 * @param monitor
-	 *            the progress monitor, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if something goes wrong
-	 */
-	private void mkdirs(IFolder folder, IProgressMonitor monitor) throws CoreException {
-		if (folder.exists()) {
-			return;
-		}
-		IContainer parent = folder.getParent();
-		if (!parent.exists() && parent.getType() == IResource.FOLDER) {
-			mkdirs((IFolder) parent, monitor);
-		}
-		folder.create(false, true, monitor);
-	}
-
-	private IFolder[] getClassesFolders() {
-		IProject project = getProject();
-		IJavaProject javaProj = JemProjectUtilities.getJavaProject(project);
-		if (javaProj == null)
-			return new IFolder[0];
-		List result = null;
-		IClasspathEntry[] entries;
-		try {
-			entries = javaProj.getResolvedClasspath(true);
-		} catch (JavaModelException e) {
-			return new IFolder[0];
-		}
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-				IPath path = entry.getPath();
-				IResource res = project.getWorkspace().getRoot().findMember(path);
-				if (res != null && res.isAccessible() && res.getType() == IResource.FOLDER && res.getProject().equals(project)) {
-					if (result == null)
-						result = new ArrayList(1);
-					result.add(res);
-				}
-			}
-		}
-		if (result == null)
-			return new IFolder[0];
-		return (IFolder[]) result.toArray(new IFolder[result.size()]);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java
deleted file mode 100644
index 6e373f1f7..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.validation;
-
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-
-/**
- * Abstract base class for registration of symbolic model names, and also provides the mechanism for
- * registering the load model method which loads a specific type of MOF model, as identified by the
- * symbolic model name.
- */
-public abstract class AWorkbenchMOFHelper extends WorkbenchContext {
-	public IResource getResource(Object obj) {
-		IResource res = null;
-		if ((obj != null) && (obj instanceof EObject)) {
-			JavaEMFNature nature = getMOFNature(getProject());
-			if (nature != null) {
-				EObject ro = (EObject) obj;
-				res = WorkbenchResourceHelper.getFile(ro.eResource());
-			}
-		}
-
-		if ((res == null) || (!res.exists())) {
-			return super.getResource(obj);
-		}
-
-		return res;
-	}
-
-	public JavaEMFNature getMOFNature(IProject project) {
-		if (project == null) {
-			return null;
-		}
-
-		IProjectDescription desc = null;
-		try {
-			desc = project.getDescription();
-		} catch (CoreException exc) {
-			Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-			if (logger.isLoggingLevel(Level.FINE)) {
-				LogEntry entry = ValidationPlugin.getLogEntry();
-				entry.setSourceID("WorkbenchContext.getMOFNature(IProject)"); //$NON-NLS-1$
-				entry.setTargetException(exc);
-				logger.write(Level.FINE, entry);
-			}
-			return null;
-		}
-
-		String[] natureIds = desc.getNatureIds();
-		for (int i = 0; i < natureIds.length; i++) {
-			try {
-				IProjectNature nature = project.getNature(natureIds[i]);
-				if (nature instanceof JavaEMFNature) {
-					return (JavaEMFNature) nature;
-				}
-			} catch (CoreException exc) {
-				// log and attempt next nature
-				Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-				if (logger.isLoggingLevel(Level.FINE)) {
-					LogEntry entry = ValidationPlugin.getLogEntry();
-					entry.setSourceID("WorkbenchContext.getMOFNature(IProject)"); //$NON-NLS-1$
-					entry.setTargetException(exc);
-					logger.write(Level.FINE, entry);
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ApplicationClientHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ApplicationClientHelper.java
deleted file mode 100644
index bd059c3a6..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ApplicationClientHelper.java
+++ /dev/null
@@ -1,90 +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.validation;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientMessageConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-/**
- * Insert the type's description here. Creation date: (4/9/2001 11:22:53 AM)
- * 
- * @author: Administrator
- */
-public class ApplicationClientHelper extends J2EEValidationHelper {
-
-	protected ApplicationClientFile appClientFile;
-
-	/**
-	 * ApplicationClientHelper constructor comment.
-	 */
-	public ApplicationClientHelper() {
-		super();
-		registerModel(ApplicationClientMessageConstants.APPCLIENT_MODEL_NAME, "loadApplicationClientFile"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Given a resource, return its non-eclipse-specific location. If this resource, or type of
-	 * resource, isn't handled by this helper, return null.
-	 */
-	public String getPortableName(IResource resource) {
-		if (!(resource instanceof IFile)) {
-			return null;
-		}
-
-		return "application-client.xml"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the AppClient file for validation
-	 */
-
-	public EObject loadApplicationClientFile() {
-
-		IVirtualComponent comp = ComponentCore.createComponent(getProject());
-		ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-		
-		try {
-			appClientFile = (ApplicationClientFile)((AppClientArtifactEdit) edit).asArchive(false);
-			return appClientFile;
-		} catch (OpenFailureException e1) {
-			Logger.getLogger().log(e1);
-		}finally {
-			if (edit != null) {
-				edit.dispose();
-			}
-		}
-		return null;
-	}	
-	
-	public void cleanup(WorkbenchReporter reporter) {
-		closeApplicationClientFile();
-		super.cleanup(reporter);
-	}
-	
-	public void closeApplicationClientFile() {
-		if (appClientFile != null)
-			appClientFile.close();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java
deleted file mode 100644
index 809f5c748..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * This singleton keeps an internal record of project dependencies. That is, every IProject can
- * depend on, and be depended on by, other IProjects. Ditto IJavaProject. This class is updated when
- * a project(s) classpath changes.
- */
-public final class DependencyUtil {
-	private static final IProject[] EMPTY_PROJECTS = new IProject[0];
-	private static final IJavaProject[] EMPTY_JAVAPROJECTS = new IJavaProject[0];
-
-	private static Set _tempSet = null;
-
-	/**
-	 * This is a set for temporary calculations.
-	 */
-	private static Set getTempSet() {
-		if (_tempSet == null) {
-			_tempSet = new HashSet();
-		} else {
-			_tempSet.clear();
-		}
-		return _tempSet;
-	}
-
-	/**
-	 * Return an array of open IProjects which depend on the given IProject parameter.
-	 */
-	public static IProject[] getDependentProjects(IProject project) {
-		if (project == null) {
-			return EMPTY_PROJECTS;
-		}
-
-		IProject[] allProjects = project.getWorkspace().getRoot().getProjects();
-		Set tempSet = getTempSet();
-		for (int i = 0; i < allProjects.length; i++) {
-			IProject p = allProjects[i];
-			IProject[] requires = getRequiredProjects(p);
-			for (int j = 0; j < requires.length; j++) {
-				IProject r = requires[j];
-				if (project.equals(r)) {
-					tempSet.add(p);
-					break;
-				}
-			}
-		}
-		IProject[] dependency = new IProject[tempSet.size()];
-		tempSet.toArray(dependency);
-		return dependency;
-	}
-
-	/**
-	 * Return an array of open IProjects which the given IProject parameter depends on.
-	 */
-	public static IProject[] getRequiredProjects(IProject project) {
-		if (project == null) {
-			return EMPTY_PROJECTS;
-		}
-
-		// Check that each project in this list exists and is open
-		try {
-			IProject[] refProjects = project.getReferencedProjects();
-			if ((refProjects == null) || (refProjects.length == 0)) {
-				return EMPTY_PROJECTS;
-			}
-
-			IProject[] temp = new IProject[refProjects.length];
-			int count = 0;
-			for (int i = 0; i < refProjects.length; i++) {
-				IProject rProject = refProjects[i];
-				if (rProject.exists() && rProject.isOpen()) {
-					temp[count++] = rProject;
-				}
-			}
-
-			if (count == 0) {
-				return EMPTY_PROJECTS;
-			}
-
-			if (count == temp.length) {
-				return temp;
-			}
-
-			IProject[] result = new IProject[count];
-			System.arraycopy(temp, 0, result, 0, count);
-			return result;
-		} catch (CoreException exc) {
-			Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-			if (logger.isLoggingLevel(Level.SEVERE)) {
-				LogEntry entry = ValidationPlugin.getLogEntry();
-				entry.setSourceID("DependencyCache::getRequiredProjects(" + project.getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
-				entry.setTargetException(exc);
-				logger.write(Level.SEVERE, exc);
-			}
-
-			return EMPTY_PROJECTS;
-		}
-	}
-
-	/**
-	 * Return an array of open IJavaProjects which depend on the given IJavaProject parameter.
-	 */
-	public static IJavaProject[] getDependentJavaProjects(IJavaProject javaproject) {
-		if (javaproject == null) {
-			return EMPTY_JAVAPROJECTS;
-		}
-
-		// calculate the dependencies now.
-		try {
-			IJavaProject[] allProjects = javaproject.getJavaModel().getJavaProjects();
-			Set tempSet = getTempSet();
-			for (int i = 0; i < allProjects.length; i++) {
-				IJavaProject p = allProjects[i];
-				IJavaProject[] requires = getRequiredJavaProjects(p);
-				for (int j = 0; j < requires.length; j++) {
-					IJavaProject r = requires[j];
-					if (javaproject.equals(r)) {
-						tempSet.add(p);
-						break;
-					}
-				}
-			}
-			IJavaProject[] dependency = new IJavaProject[tempSet.size()];
-			tempSet.toArray(dependency);
-			return dependency;
-		} catch (JavaModelException exc) {
-			Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-			if (logger.isLoggingLevel(Level.SEVERE)) {
-				LogEntry entry = ValidationPlugin.getLogEntry();
-				entry.setSourceID("DependencyCache::getDependentJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
-				entry.setTargetException(exc);
-				logger.write(Level.SEVERE, exc);
-			}
-
-			return EMPTY_JAVAPROJECTS;
-		}
-	}
-
-	/**
-	 * Return an array of open IJavaProjects which the given IJavaProject parameter depends on.
-	 */
-	public static IJavaProject[] getRequiredJavaProjects(IJavaProject javaproject) {
-		if (javaproject == null) {
-			return EMPTY_JAVAPROJECTS;
-		}
-
-		try {
-			IJavaModel jm = javaproject.getJavaModel();
-			if (jm == null) {
-				Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-				if (logger.isLoggingLevel(Level.SEVERE)) {
-					LogEntry entry = ValidationPlugin.getLogEntry();
-					entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
-					//entry.setText("IJavaModel == null"); //$NON-NLS-1$
-					logger.write(Level.SEVERE, "IJavaModel == null"); //$NON-NLS-1$
-				}
-				return EMPTY_JAVAPROJECTS;
-			}
-
-			String[] requiredProjects = javaproject.getRequiredProjectNames();
-			if ((requiredProjects == null) || (requiredProjects.length == 0)) {
-				return EMPTY_JAVAPROJECTS;
-			}
-
-			IJavaProject[] temp = new IJavaProject[requiredProjects.length];
-			int count = 0;
-			for (int i = 0; i < requiredProjects.length; i++) {
-				String projectName = requiredProjects[i];
-				IJavaProject jp = jm.getJavaProject(projectName);
-				try {
-					if ((jp == null) || (!jp.getProject().exists())) {
-						continue;
-					}
-					if (!jp.getProject().isAccessible()) {
-						continue;
-					}
-
-					if (!jp.getProject().hasNature(JavaCore.NATURE_ID)) {
-						continue;
-					}
-
-					temp[count++] = jp;
-				} catch (CoreException exc) {
-					Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-					if (logger.isLoggingLevel(Level.SEVERE)) {
-						LogEntry entry = ValidationPlugin.getLogEntry();
-						entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
-						entry.setTargetException(exc);
-						logger.write(Level.SEVERE, exc);
-					}
-					continue;
-				}
-			}
-
-			if (count == 0) {
-				return EMPTY_JAVAPROJECTS;
-			}
-
-			if (count == temp.length) {
-				return temp;
-			}
-
-			IJavaProject[] result = new IJavaProject[count];
-			System.arraycopy(temp, 0, result, 0, count);
-			return result;
-		} catch (JavaModelException exc) {
-			Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
-			if (logger.isLoggingLevel(Level.SEVERE)) {
-				LogEntry entry = ValidationPlugin.getLogEntry();
-				entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
-				entry.setTargetException(exc);
-				logger.write(Level.SEVERE, exc);
-			}
-
-			return EMPTY_JAVAPROJECTS;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java
deleted file mode 100644
index 6083da121..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java
+++ /dev/null
@@ -1,112 +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.validation;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-public class EarHelper extends J2EEValidationHelper {
-
-	protected EARFile earFile;
-	protected ArtifactEdit edit = null;
-	
-
-	/**
-	 * WarHelper constructor comment.
-	 */
-	public EarHelper() {
-		super();
-
-		registerModel(J2EEConstants.EAR_MODEL_NAME, "loadEarFile"); //$NON-NLS-1$
-	}
-
-	public String getApplicationXMLFile() {
-
-		return J2EEConstants.APPL_ID;
-	}
-
-	/**
-	 * Given a resource, return its non-eclipse-specific location. If this resource, or type of
-	 * resource, isn't handled by this helper, return null.
-	 */
-	public String getPortableName(IResource resource) {
-		if (!(resource instanceof IFile)) {
-			return null;
-		}
-
-		return "application.xml"; //$NON-NLS-1$
-	}
-
-	public String getTargetObjectName(Object obj) {
-		super.getTargetObjectName(obj);
-
-		if (obj != null && obj instanceof EARFile) {
-			return getApplicationXMLFile();
-		}
-		if (obj != null && obj instanceof ApplicationImpl) {
-			return "application.xml"; //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * Get the WAR file for validation
-	 */
-	
-	public EObject loadEarFile() {
-
-		IVirtualComponent comp = ComponentCore.createComponent(getProject());
-		edit = ComponentUtilities.getArtifactEditForRead(comp);
-		
-		try {
-			Archive archive = ((EARArtifactEdit) edit).asArchive(false);
-			earFile = (EARFile)archive;
-			return archive;
-		} catch (OpenFailureException e1) {
-			Logger.getLogger().log(e1);
-		}
-		return null;
-	}
-	
-	public void closeEARFile() {
-		if (earFile != null) {
-			earFile.close();
-			earFile = null;
-		}
-	}
-	
-	public void cleanup(WorkbenchReporter reporter) {
-		if (edit != null) {
-			edit.dispose();
-			edit = null;
-		}
-		if (earFile != null) {
-			earFile.close();
-			earFile = null;
-		}		
-	}	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/J2EEValidationHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/J2EEValidationHelper.java
deleted file mode 100644
index d36156898..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/J2EEValidationHelper.java
+++ /dev/null
@@ -1,108 +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.validation;
-
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-
-
-public abstract class J2EEValidationHelper extends WorkbenchContext {
-		
-	/**
-	 * Constructor for J2EEValidationHelper.
-	 */
-	public J2EEValidationHelper() {
-		super();
-	}
-
-	/*
-	 * @see IWorkbenchContext#getFile(Object)
-	 */
-	public IResource getResource(Object object) {
-		Resource resource = null;
-		if (object != null && object instanceof EObject)
-			resource = ((EObject) object).eResource();
-		if (resource != null)
-			return WorkbenchResourceHelper.getFile(resource);
-		return null;
-	}
-
-	/**
-	 * Given a resource, return its non-eclipse-specific location. If this resource, or type of
-	 * resource, isn't handled by this helper, return null.
-	 */
-	protected String getFileName(IFile file, IContainer[] containers) {
-		if ((file == null) || (containers == null)) {
-			return null;
-		}
-
-		for (int c = 0; c < containers.length; c++) {
-			IPath resourcePath = getContainerRelativePath(file, containers[c]);
-			if (resourcePath != null) {
-				// file has been found
-				return resourcePath.toString();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Given a file name, return its corresponding IFile, if one exists. This method checks if the
-	 * IContainer passed in contains a file with the given file name. If the container does not have
-	 * the IFile, null is returned.
-	 */
-	protected IFile getFile(String fileName, IContainer[] containers) {
-		IFile clazzFile = null;
-		if ((fileName == null) || (containers == null)) {
-			return null;
-		}
-
-		for (int c = 0; c < containers.length; c++) {
-			IContainer container = containers[c];
-			IPath filePath = container.getProjectRelativePath();
-			clazzFile = getProject().getFile(filePath.append(fileName));
-
-			if (clazzFile.exists()) {
-				return clazzFile;
-			}
-		}
-
-		return null;
-	}
-
-//	protected IFile getXmlFile(String xmlFileName, J2EENature nature) {
-//		if (nature == null) {
-//			return null;
-//		}
-//		return nature.getMetaFolder().getFile(xmlFileName);
-//	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.validation.internal.operations.IWorkbenchContext#getTargetObjectName(java.lang.Object)
-	 */
-	public String getTargetObjectName(Object object) {
-		if (object != null)
-			return object.toString();
-		return null;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java
deleted file mode 100644
index d8ac09f89..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java
+++ /dev/null
@@ -1,105 +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.validation;
-
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ManifestLineValidator extends Object {
-	public static final int MAX_LINE_LENGTH = 72;
-	protected int lineNumber;
-	protected int currentByte;
-	protected int byteCount;
-	protected InputStream inputStream;
-	protected List lineNumbers;
-	protected boolean endsWithLineBreak = true;
-
-	/**
-	 * Constructor for LineValidator.
-	 */
-	public ManifestLineValidator(InputStream in) {
-		super();
-		inputStream = new BufferedInputStream(in);
-		lineNumber = 0;
-	}
-
-	protected List getLineNumbers() {
-		if (lineNumbers == null)
-			lineNumbers = new ArrayList();
-		return lineNumbers;
-	}
-
-	public int[] getLineNumbersExceedingLimit() {
-		if (lineNumbers == null)
-			return new int[0];
-
-		int[] result = new int[lineNumbers.size()];
-		for (int i = 0; i < lineNumbers.size(); i++) {
-			Integer list_element = (Integer) lineNumbers.get(i);
-			result[i] = list_element.intValue();
-		}
-		return result;
-	}
-
-	public void validate() throws IOException {
-		readNext();
-		while (currentByte != -1) {
-			validateNextLine();
-		}
-	}
-
-	public int getLineCount() {
-		return lineNumber;
-	}
-
-	protected void readNext() throws IOException {
-		currentByte = inputStream.read();
-	}
-
-	protected void validateNextLine() throws IOException {
-		lineNumber++;
-		byteCount = 0;
-		boolean eolReached = false;
-		while (currentByte != -1) {
-			if (currentByte == '\r') {
-				eolReached = true;
-				readNext();
-				if (currentByte == '\n') {
-					readNext();
-				}
-				break;
-			} else if (currentByte == '\n') {
-				eolReached = true;
-				readNext();
-				break;
-			} else {
-				byteCount++;
-				readNext();
-			}
-		}
-		if (currentByte == -1 && !eolReached && byteCount > 0)
-			endsWithLineBreak = false;
-		if (byteCount > 72)
-			getLineNumbers().add(new Integer(lineNumber));
-	}
-
-	public boolean endsWithLineBreak() {
-		return endsWithLineBreak;
-	}
-
-	public boolean hasErrors() {
-		return !endsWithLineBreak || (lineNumbers != null && !lineNumbers.isEmpty());
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
deleted file mode 100644
index 4e5090fb2..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
+++ /dev/null
@@ -1,86 +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.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.IProjectValidationHelper;
-
-public class ProjectValidationHelper implements IProjectValidationHelper {
-
-	private static IContainer[] EMPTY_RESULT = new IContainer[] {};
-	private static ProjectValidationHelper INSTANCE;
-	private IContainer[] outputs;
-	private IContainer[] sources;
-	
-	public static ProjectValidationHelper getInstance(){
-		if (INSTANCE == null)
-			INSTANCE = new ProjectValidationHelper();
-		return INSTANCE;
-	}
-	public void disposeInstance(){
-		INSTANCE = null;
-	}
-	private IContainer[] getCachedOutputContainers(IProject project) {
-		if (outputs != null)
-			return outputs;
-		if (project == null || JemProjectUtilities.getJavaProject(project)==null) {
-			outputs = EMPTY_RESULT;
-			return EMPTY_RESULT;
-		}
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		if (comp == null || !comp.exists()) {
-			outputs = EMPTY_RESULT;
-			return EMPTY_RESULT;
-		}
-		outputs = J2EEProjectUtilities.getOutputContainers(project);
-		return outputs;
-	
-	}
-	public IContainer[] getOutputContainers(IProject project) {
-		return getInstance().getCachedOutputContainers(project);
-	}
-	
-	private IContainer[] getCachedSourceContainers(IProject project) {
-		if (sources != null)
-			return sources;
-		if (project == null || JemProjectUtilities.getJavaProject(project)==null) {
-			sources = EMPTY_RESULT;
-			return EMPTY_RESULT;
-		}
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		if (comp == null || !comp.exists()) {
-			sources = EMPTY_RESULT;
-			return EMPTY_RESULT;
-		}
-		IPackageFragmentRoot[] roots = J2EEProjectUtilities.getSourceContainers(project);
-		List result = new ArrayList();
-		for (int i=0; i<roots.length; i++) {
-			if (roots[i].getResource() != null && roots[i].getResource() instanceof IContainer)
-				result.add(roots[i].getResource());
-		}
-		sources = (IContainer[]) result.toArray(new IContainer[result.size()]);
-		return sources;
-		
-	}
-	public IContainer[] getSourceContainers(IProject project) {
-		return getInstance().getCachedSourceContainers(project);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
deleted file mode 100644
index acb8baed8..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.validation;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.internal.adapters.jdom.JDOMAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.wst.validation.internal.operations.IResourceUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class ResourceUtil implements IResourceUtil {
-	public ResourceUtil() {
-		super();
-	}
-
-	public int getLineNo(Object object) {
-		if (object == null) {
-			return IMessage.LINENO_UNSET;
-		}
-
-		if (object instanceof EObject) { // Error discovered using MOF objects
-
-			EObject ro = (EObject) object;
-			JDOMAdaptor jdomAdapter = null;
-
-			Collection c = ro.eAdapters();
-			if (c != null) {
-				Iterator iterator = c.iterator();
-				while (iterator.hasNext()) {
-					Adapter a = (Adapter) iterator.next();
-					if ((a != null) && a.isAdapterForType(ReadAdaptor.TYPE_KEY) && (a instanceof JDOMAdaptor)) {
-						jdomAdapter = (JDOMAdaptor) a;
-					}
-				}
-			}
-
-			if (jdomAdapter != null) {
-				int lineNo = jdomAdapter.getLineNo();
-				if (lineNo != JDOMAdaptor.INVALID_LINENO)
-					return lineNo + 1;
-			}
-
-		}
-
-		return IMessage.LINENO_UNSET;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientHelper.java
deleted file mode 100644
index cb352c1fe..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientHelper.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.validation;
-
-
-
-/**
- * Creates the helper for the WSAD application client validator.
- */
-public class UIApplicationClientHelper extends ApplicationClientHelper {
-
-	/**
-	 * UIApplicationClientHelper
-	 */
-	public UIApplicationClientHelper() {
-		super();
-	}// UIApplicationClientHelper
-
-}// UIApplicationClientHelper
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java
deleted file mode 100644
index 29bb967af..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java
+++ /dev/null
@@ -1,25 +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.validation;
-
-import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientMessageConstants;
-
-
-
-/**
- * Messages for the WSAD application client validator
- */
-public interface UIApplicationClientMessageConstants extends ApplicationClientMessageConstants {
-
-	public static final String DOCTYPE_1_2 = "1.2"; //$NON-NLS-1$
-	public static final String DOCTYPE_1_3 = "1.3"; //$NON-NLS-1$
-	public static final String APPCLIENT_INVALID_DOC_TYPE_ERROR_ = "APPCLIENT_INVALID_DOC_TYPE_ERROR_"; //$NON-NLS-1$
-}// UIApplicationClientMessageConstants
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientValidator.java
deleted file mode 100644
index acae2a5e3..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientValidator.java
+++ /dev/null
@@ -1,82 +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.validation;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientValidator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * Creates the application client validator for WSAD
- */
-public class UIApplicationClientValidator extends ApplicationClientValidator implements UIApplicationClientMessageConstants {
-
-
-	/**
-	 * Default constructor.
-	 */
-	public UIApplicationClientValidator() {
-		super();
-	}// UIApplicationClientValidator
-
-
-	/**
-	 * Does the validation.
-	 */
-
-	public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter)
-	 throws ValidationException {
-		UIApplicationClientHelper helper = (UIApplicationClientHelper) inHelper;
-		IProject proj = ((IWorkbenchContext) inHelper).getProject();
-		IVirtualComponent virComp = ComponentCore.createComponent(proj);
-            if(J2EEProjectUtilities.isApplicationClientProject(proj)) {
-				IVirtualFile ddFile = virComp.getRootFolder().getFile(J2EEConstants.APP_CLIENT_DD_URI);
-				if( ddFile.exists()) {						
-					status = super.validateInJob(helper, inReporter);
-				}
-            }
-			//validateDocType(helper, editModel);
-            return status;
-	}
-	
-
-	/**
-	 * Checks if the nature is consistent with doc type.
-	 */
-//	protected void validateDocType(UIApplicationClientHelper helper, AppClientEditModel editModel) {
-//		if (editModel.getJ2EENature().getJ2EEVersion() >= J2EEVersionConstants.J2EE_1_3_ID && getAppClientDD().getVersionID() < J2EEVersionConstants.J2EE_1_3_ID) {
-//			String[] params = new String[3];
-//			params[0] = DOCTYPE_1_2;
-//			params[1] = helper.getProject().getName();
-//			params[2] = DOCTYPE_1_3;
-//			addError(getBaseName(), APPCLIENT_INVALID_DOC_TYPE_ERROR_, params);
-//		} else if (editModel.getJ2EENature().getJ2EEVersion() < J2EEVersionConstants.J2EE_1_3_ID && getAppClientDD().getVersionID() >= J2EEVersionConstants.J2EE_1_3_ID) {
-//			String[] params = new String[3];
-//			params[0] = DOCTYPE_1_3;
-//			params[1] = helper.getProject().getName();
-//			params[2] = DOCTYPE_1_2;
-//			addError(getBaseName(), APPCLIENT_INVALID_DOC_TYPE_ERROR_, params);
-//		}// if
-//	}// validateDocTypeVsNature
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java
deleted file mode 100644
index 623c8cb40..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java
+++ /dev/null
@@ -1,27 +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.validation;
-
-
-
-/**
- * Insert the type's description here. Creation date: (9/10/2001 2:12:47 PM)
- * 
- * @author: Administrator
- */
-public class UIEarHelper extends EarHelper {
-	/**
-	 * UIEarHelper constructor comment.
-	 */
-	public UIEarHelper() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
deleted file mode 100644
index 1b51d73a2..000000000
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
+++ /dev/null
@@ -1,674 +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.validation;
-
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ValidateXmlCommand;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ManifestException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EARValidationMessageResourceHandler;
-import org.eclipse.jst.j2ee.model.internal.validation.EarValidator;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-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.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-
-/**
- * Insert the type's description here. Creation date: (9/10/2001 2:11:02 PM)
- * 
- * @author: Administrator
- */
-public class UIEarValidator extends EarValidator {
-	public static final String VALIDATOR_ID = "org.eclipse.jst.j2ee.internal.validation.UIEarValidator"; //$NON-NLS-1$
-	public static final String MANIFEST_GROUP_NAME = "WSAD.EAR.MANIFEST"; //$NON-NLS-1$
-	public static final String DOCTYPE_1_2 = "1.2"; //$NON-NLS-1$
-	public static final String DOCTYPE_1_3 = "1.3"; //$NON-NLS-1$
-	
-	protected UIEarHelper earHelper;
-//	private EARArtifactEdit earEdit = null;
-	private IProject project = null;
-
-	/**
-	 * UIEarValidator constructor comment.
-	 */
-	public UIEarValidator() {
-		super();
-	}
-
-	public Command createValidateXMLCommand() {
-
-		ValidateXmlCommand cmd = (ValidateXmlCommand) super.createValidateXMLCommand();
-		cmd.setValidateNested(false);
-		return cmd;
-	}
-
-	protected String getResourceName() {
-		return ((EarHelper) _helper).getProject().getName();
-	}
-
-	protected void duplicateProjectMapError(String earProjectName, String moduleUri, String projectName) {
-
-		String[] params = new String[3];
-		params[0] = projectName;
-		params[1] = earProjectName;
-		params[2] = moduleUri;
-		String msg = NLS.bind(EARValidationMessageResourceHandler.DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_, params);
-	
-		addLocalizedError(msg, appDD);
-	}
-
-	/**
-	 *  
-	 */
-	protected void cleanUpSubTaskMessages(EObject ref) {
-		String groupName = EJB_REF_GROUP_NAME;
-		if (ref instanceof EjbRef)
-			ref = (EjbRef) ref;
-		else if (ref instanceof ResourceRef) {
-			ref = (ResourceRef) ref;
-			groupName = RES_REF_GROUP_NAME;
-		} else if (ref instanceof ServiceRef) {
-			ref = (ServiceRef) ref;
-			groupName = SERVICE_REF_GROUP_NAME;
-		} else if (ref instanceof ResourceEnvRef) {
-			ref = (ResourceEnvRef) ref;
-			groupName = RES_ENV_REF_GROUP_NAME;
-		} else if (ref instanceof SecurityRoleRef) {
-			ref = (SecurityRoleRef) ref;
-			groupName = SEC_ROLE_REF_GROUP_NAME;
-		} else if (ref instanceof MessageDestinationRef) {
-			ref = (MessageDestinationRef) ref;
-			groupName = MESSAGE_REF_GROUP_NAME;
-		}
-		Resource res = ref.eResource();
-		if (res != null) {
-			IFile file = WorkbenchResourceHelper.getFile(res);
-			if (file != null)
-				_reporter.removeMessageSubset(this, file, groupName);
-		}
-	}
-
-	protected void cleanUpAllRefSubTaskMessages(Resource res) {
-		if (res != null) {
-			IFile file = WorkbenchResourceHelper.getFile(res);
-			if (file != null)
-				_reporter.removeMessageSubset(this, file, EJB_REF_GROUP_NAME);
-			_reporter.removeMessageSubset(this, file, RES_REF_GROUP_NAME);
-			_reporter.removeMessageSubset(this, file, SERVICE_REF_GROUP_NAME);
-			_reporter.removeMessageSubset(this, file, SEC_ROLE_REF_GROUP_NAME);
-			_reporter.removeMessageSubset(this, file, MESSAGE_REF_GROUP_NAME);
-			_reporter.removeMessageSubset(this, file, RES_ENV_REF_GROUP_NAME);
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (9/10/2001 2:56:32 PM)
-	 * 
-	 * @return org.eclipse.wst.validation.internal.core.core.ear.workbenchimpl.UIEarHelper
-	 */
-	public org.eclipse.jst.j2ee.internal.validation.UIEarHelper getEarHelper() {
-		return earHelper;
-	}
-
-	protected void invalidClassPathEntryWarning(String entry, Archive anArchive) {
-		String[] params = new String[2];
-		params[0] = anArchive.getURI();
-		params[1] = entry;
-		String msg = NLS.bind(EARValidationMessageResourceHandler.INVALID_MANIFEST_CLASSPATH_ONE_WARN_, params);
-		addLocalizedWarning(msg, getManifestFile(anArchive), MANIFEST_GROUP_NAME);
-	}
-
-	protected void invalidClassPathEntryWarning(String entry, String resolvedEntry, Archive anArchive) {
-		String[] params = new String[3];
-		params[0] = anArchive.getURI();
-		params[1] = entry;
-		params[2] = resolvedEntry;
-		String msg = NLS.bind(EARValidationMessageResourceHandler.INVALID_MANIFEST_CLASSPATH_TWO_WARN_, params);		
-		addLocalizedWarning(msg, getManifestFile(anArchive), MANIFEST_GROUP_NAME);
-	}
-
-	protected void invalidDepedencyWarning(String entry, Archive anArchive, ModuleFile m) {
-		String[] params = new String[3];
-		params[0] = m.getURI();
-		params[1] = entry;
-		params[2] = anArchive.getURI();
-		String msg = NLS.bind(EARValidationMessageResourceHandler.INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_, params);
-		
-		addLocalizedWarning(msg, getManifestFile(anArchive), MANIFEST_GROUP_NAME);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (9/10/2001 2:56:32 PM)
-	 * 
-	 * @param newEarHelper
-	 *            org.eclipse.wst.validation.internal.core.core.ear.workbenchimpl.UIEarHelper
-	 */
-	public void setEarHelper(org.eclipse.jst.j2ee.internal.validation.UIEarHelper newEarHelper) {
-		earHelper = newEarHelper;
-	}
-
-	public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter) throws org.eclipse.wst.validation.internal.core.ValidationException {
-
-		IProject proj = ((IWorkbenchContext) inHelper).getProject();
-		IVirtualComponent earModule = ComponentCore.createComponent(proj);
-            if(J2EEProjectUtilities.isEARProject(proj)){
-				IVirtualFile ddFile = earModule.getRootFolder().getFile(J2EEConstants.APPLICATION_DD_URI);
-				if( ddFile.exists()) {	
-					IStatus status = IValidatorJob.OK_STATUS;
-					status = super.validateInJob(inHelper, inReporter);
-					validateModuleMaps(earModule);
-					validateManifests();
-	//				validateUtilJarMaps(earEdit,earModule);
-	//				validateUriAlreadyExistsInEar(earEdit,earModule);
-	//				validateDocType(earEdit,earModule);					
-				}
-            }
-		return IValidatorJob.OK_STATUS;
-	}	
-
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		IProject project = ((IWorkbenchContext) helper).getProject();
-		IVirtualComponent comp = ComponentCore.createComponent( project );
-		IFile appDeploymentDescriptor = null;
-		if( comp != null ){
-			IVirtualFile vf = comp.getRootFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
-			if( vf!= null ){
-				appDeploymentDescriptor = vf.getUnderlyingFile();
-			}
-		}
-		return appDeploymentDescriptor;
-	}
-
-	public void validateManifests() throws ValidationException {
-		if (earFile == null)
-			return;
-		List archives = earFile.getArchiveFiles();
-		for (int i = 0; i < archives.size(); i++) {
-
-			Archive anArchive = (Archive) archives.get(i);
-
-			IFile target = getManifestFile(anArchive);
-			if (target != null)
-				_reporter.removeMessageSubset(this, target, MANIFEST_GROUP_NAME);
-			validateManifestCase(anArchive);
-			validateManifestLines(anArchive);
-			validateManifestClasspath(anArchive);
-		}
-	}
-
-	public void validateManifestCase(Archive anArchive) {
-		String mfuri = J2EEConstants.MANIFEST_URI;
-
-		//Indicates a manifest file with the valid name exists,
-		//nothing left to do
-		if (anArchive.containsFile(mfuri))
-			return;
-
-		//Otherwise iterate the list of files
-		//Ensure the archive is read-only first
-		anArchive.getOptions().setIsReadOnly(true);
-		List files = anArchive.getFiles();
-		String uri = null;
-		for (int i = 0; i < files.size(); i++) {
-			File aFile = (File) files.get(i);
-			uri = aFile.getURI();
-			if (mfuri.equalsIgnoreCase(uri) && !mfuri.equals(uri)) {
-				String[] params = {uri, anArchive.getURI()};
-				IResource target = earHelper.getProject().getFile(J2EEConstants.MANIFEST_URI);
-				String msg = NLS.bind(EARValidationMessageResourceHandler.INVALID_CASE_FOR_MANIFEST_ERROR_, params);
-				addLocalizedError(msg, target);				
-			}
-		}
-
-	}
-
-
-	public void validateManifestClasspath(Archive anArchive) throws ValidationException {
-		ArchiveManifest manifest = null;
-		try{
-			manifest = anArchive.getManifest();
-		}catch( ManifestException mf){
-			//mf.printStackTrace();
-			mf.getMessage();
-			String[] args = new String[]{anArchive.getURI()};
-			String tmp = NLS.bind(EARValidationMessageResourceHandler.ERROR_READING_MANIFEST_ERROR_, args);
-			
-			addLocalizedError(tmp, args);
-		}
-		
-		if(manifest == null)
-			return;
-
-		String[] cp = manifest.getClassPathTokenized();
-		
-		for (int i = 0; i < cp.length; i++) {
-			String uri = ArchiveUtil.deriveEARRelativeURI(cp[i], anArchive);
-			if (uri == null) {
-				invalidClassPathEntryWarning(cp[i], anArchive);
-				continue;
-			}
-			File f = null;
-			//IFile rf = null;
-			try {
-//					if (uri.endsWith(J2EEImportConstants.IMPORTED_JAR_SUFFIX)) {
-						//TODO Needs work here to initialize rf as rf is an IFile and there is no way to get an IFile currently
-//					IVirtualResource resource = component.getRootFolder().findMember(new Path(uri));
-//						if (resource == null || !resource.exists()) {
-//							invalidClassPathEntryWarning(cp[i], uri, anArchive);
-//						}
-//					}
-//				 else
-					f = earFile.getFile(uri);
-			} catch (java.io.FileNotFoundException ex) {
-				invalidClassPathEntryWarning(cp[i], earFile.getURI(), anArchive);
-				continue;
-			}
-			if (f != null && f.isArchive() && anArchive.isModuleFile()) {
-				Archive archive = (Archive) f;
-				ModuleFile m = (ModuleFile) anArchive;
-				if (!ArchiveUtil.isValidDependency(archive, m))
-					invalidDepedencyWarning(cp[i], archive, m);
-			}
-		}
-	}
-
-
-	protected void validateManifestLines(Archive anArchive) throws ValidationException {
-		if (anArchive == null)
-			return;
-		InputStream is = null;
-		try {
-			is = anArchive.getInputStream(J2EEConstants.MANIFEST_URI);
-			ManifestLineValidator lineVal = new ManifestLineValidator(is);
-			lineVal.validate();
-			addErrorsIfNecessary(anArchive, lineVal);
-		} catch (FileNotFoundException ex) {
-			return;
-		} catch (IOException ex) {
-			handleManifestException(ex, anArchive);
-		} finally {
-			if (is != null)
-				try {
-					is.close();
-				} catch (IOException ex) {
-					handleManifestException(ex, anArchive);
-				}
-		}
-	}
-
-	protected void addErrorsIfNecessary(Archive anArchive, ManifestLineValidator mfVal) {
-		if (!mfVal.hasErrors())
-			return;
-		IFile target = getManifestFile(anArchive);
-		if (!mfVal.endsWithLineBreak())
-			addFileEndError(anArchive, mfVal, target);
-		int[] lines = mfVal.getLineNumbersExceedingLimit();
-		for (int i = 0; i < lines.length; i++) {
-			addLineLengthError(anArchive, target, lines[i]);
-		}
-	}
-
-	protected void addLineLengthError(Archive anArchive, IFile target, int lineNo) {
-		String[] args = new String[2];
-		args[0] = Integer.toString(lineNo);
-		args[1] = anArchive.getURI();
-		
-		String tmp = NLS.bind(EARValidationMessageResourceHandler.MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_, args);
-		
-		if( lineNo >= 0 ){
-			addLocalizedError(tmp, target, MANIFEST_GROUP_NAME, lineNo );
-		}else{
-			addLocalizedError(tmp, target, MANIFEST_GROUP_NAME );
-		}
-
-	}
-
-	protected void addFileEndError(Archive anArchive, ManifestLineValidator mfVal, IFile target) {
-		String[] args = new String[]{anArchive.getURI()};
-		
-		String tmp = NLS.bind(EARValidationMessageResourceHandler.MANIFEST_LINE_END_ERROR_, args);
-		
-		if (target != null)
-			addLocalizedError(tmp, getManifestFile(anArchive), MANIFEST_GROUP_NAME, mfVal.getLineCount());
-		else
-			addLocalizedError(tmp, null, MANIFEST_GROUP_NAME);
-	}
-
-	protected void handleManifestException(IOException ex, Archive anArchive) throws ValidationException {
-		Logger.getLogger().logError(ex);
-		String tmp = NLS.bind(EARValidationMessageResourceHandler.ERROR_READING_MANIFEST_ERROR_, new String[]{anArchive.getURI()});		
-		IMessage message = new LocalizedMessage(IMessage.HIGH_SEVERITY, tmp);
-		throw new ValidationException(message, ex);
-	}
-
-	/**
-	 * Validates utiljar maps
-	 */
-//	public void validateUtilJarMaps(EARArtifactEdit edit, IVirtualComponent workbenchModule) {
-//		List utilJarModules = edit.getUtilityModuleReferences();
-//		if (!utilJarModules.isEmpty() || !utilJarModules.isEmpty()) {
-//			for (int i = 0; i < utilJarModules.size(); i++) {
-//				IVirtualComponent aUtilJar = ((IVirtualReference) utilJarModules.get(i)).getReferencedComponent();
-//				if (aUtilJar != null) {
-//					IProject project = J2EEPlugin.getWorkspace().getRoot().getProject(aUtilJar.getProject().getName());
-//					if (project != null) {
-//						if (!project.exists()) {
-//							String[] params = new String[]{project.getName(), aUtilJar.getRuntimePath().toString(), earHelper.getProject().getName()};
-//							addWarning(getBaseName(), PROJECT_DOES_NOT_EXIST_WARN_, params);
-//						} else {
-//							//validateModuleProjectForValidServerTarget(project);
-//							if (!project.isOpen()) {
-//								String[] params = new String[]{project.getName()};
-//								addWarning(getBaseName(), PROJECT_IS_CLOSED_WARN_, params);
-//							}
-//						}
-//					}
-//				}
-//			}
-//		} 
-//		validateDuplicateUtilJars(edit,workbenchModule);
-//		validateUtilJarNameCollision(edit,workbenchModule);
-//		validateUtilJarContainsNoSpaces(edit,workbenchModule);
-//		
-//	}// validateUtilJarMaps
-
-	/**
-	 * Checks if the util jar contains spaces or not.
-	 * 
-	 * @param EAREditModel
-	 *            earEditModel - The ear editmodel.
-	 */
-	protected void validateUtilJarContainsNoSpaces(EARArtifactEdit edit, IVirtualComponent module) {
-		IVirtualReference[] utilJars = edit.getUtilityModuleReferences();
-
-		if (utilJars == null)
-			return;
-
-		for (int i = 0; i < utilJars.length; i++) {
-			IVirtualReference utilModule = utilJars[i];
-			if (utilModule != null) {
-				String uri = ModuleURIUtil.fullyQualifyURI(project).toString();
-				if (uri != null && uri.indexOf(" ") != -1) { //$NON-NLS-1$
-					String[] params = new String[1];
-					params[0] = uri;
-					String tmp = NLS.bind(EARValidationMessageResourceHandler.URI_CONTAINS_SPACES_ERROR_, params);
-					addLocalizedError(tmp, appDD);
-				}// if
-			}// if
-		}// for
-
-	}// validateUtilJarContainsNoSpaces
-
-	/**
-	 * Validates if the a util jar has the same name as another module.
-	 * 
-	 * @param EAREditModel
-	 *            earEditModel - The ear editmodel.
-	 */
-//	protected void validateUtilJarNameCollision(EARArtifactEdit edit, IVirtualComponent module) {
-//		List utilJars = edit.getUtilityModuleReferences();
-//		if (utilJars == null)
-//			return;
-//		for (int i = 0; i < utilJars.size(); i++) {
-//			UtilityJARMapping utilModule = (UtilityJARMapping) utilJars.get(i);
-//
-//			if (utilModule != null) {
-//				if (edit.uriExists(utilModule.getUri())) {
-//
-//					String[] params = new String[]{utilModule.getUri(), module.getName()};
-//					addError(getBaseName(), MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_, params);
-//
-//				} else if (utilModule.getProjectName() != null || utilModule.getProjectName().length() != 0) {
-//					if (edit.uriExists(utilModule.getUri())) {
-//						String[] params = new String[]{utilModule.getUri(), utilModule.getProjectName()};
-//						addError(getBaseName(), MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_, params);
-//					}
-//				}
-//			}
-//		}
-//	} 
-		
-
-
-	/**
-	 * validate is there are duplicate util jars.
-	 * 
-	 * @param EAREditModel
-	 *            earEditModel - The ear editmodel
-	 */
-	protected void validateDuplicateUtilJars(EARArtifactEdit edit, IVirtualComponent module) {
-		IVirtualReference[] utilJars = edit.getUtilityModuleReferences();
-		Set visitedUtilUri = new HashSet();
-		if (utilJars == null)
-			return;
-		for (int i = 0; i < utilJars.length; i++) {
-			IVirtualReference utilModule = utilJars[i];
-			if (utilModule != null) {
-				String uri = ModuleURIUtil.fullyQualifyURI(project).toString();
-				if (visitedUtilUri.contains(uri)) {
-					String compName = module.getName();
-					duplicateUtilError(module.getName(),uri, compName);
-				} else
-					visitedUtilUri.add(uri);
-			} // if
-		} // for
-	} // validateModuleMapsDuplicateUtil
-
-	/**
-	 * Creates an error for duplicate util jars.
-	 * 
-	 * @param String
-	 *            earProjectName - The ears project name.
-	 * @param String
-	 *            moduleUri - The modules uri.
-	 * @param String
-	 *            projectName - The project name.
-	 */
-	protected void duplicateUtilError(String earProjectName, String moduleUri, String projectName) {
-		String[] params = new String[3];
-		params[0] = projectName;
-		params[1] = earProjectName;
-		params[2] = moduleUri;
-		String tmp = NLS.bind(EARValidationMessageResourceHandler.DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_, params);
-		
-		addLocalizedError(tmp, null);
-	}// duplicateUtilError
-
-	public void validateModuleMaps(IVirtualComponent component) {
-		IVirtualFile ddFile = component.getRootFolder().getFile(J2EEConstants.APPLICATION_DD_URI);
-		if( ddFile.exists()){
-			EList modules = appDD.getModules();
-			if (!modules.isEmpty()) {
-				EARArtifactEdit edit = null;
-				try{
-					edit = EARArtifactEdit.getEARArtifactEditForRead( component.getProject() );
-					
-					for (int i = 0; i < modules.size(); i++) {
-						Module module = (Module) modules.get(i);
-						String uri = module.getUri();
-						IVirtualComponent referencedComp = edit.getModuleByManifestURI( uri );
-						if( referencedComp == null ){
-							String[] params = new String[]{uri, component.getProject().getName()};
-							String tmp = NLS.bind(EARValidationMessageResourceHandler.MISSING_PROJECT_FORMODULE_WARN_, params);
-							
-							addLocalizedWarning(tmp, null);							
-						}
-						validateModuleURIExtension(module);
-					}
-				}finally{
-					if( edit != null )
-						edit.dispose();					
-				}
-			}
-		}
-	}
-
-
-	protected void validateModuleURIExtension(Module module) {
-		String newUri = module.getUri();
-		if (newUri != null && newUri.length() > 0) {
-			if (module instanceof EjbModule && !newUri.endsWith(".jar")) { //$NON-NLS-1$
-				String[] params = new String[1];
-				params[0] = module.getUri();
-				IResource target = earHelper.getProject().getFile(ArchiveConstants.APPLICATION_DD_URI);
-				String tmp = NLS.bind(EARValidationMessageResourceHandler.INVALID_URI_FOR_MODULE_ERROR_, params);
-				addLocalizedWarning(tmp, target);
-			} else if (module instanceof WebModule && !newUri.endsWith(".war")) { //$NON-NLS-1$
-				String[] params = new String[1];
-				params[0] = module.getUri();
-				IResource target = earHelper.getProject().getFile(ArchiveConstants.APPLICATION_DD_URI);
-				String tmp = NLS.bind(EARValidationMessageResourceHandler.INVALID_URI_FOR_MODULE_ERROR_, params);				
-				addLocalizedWarning(tmp, target);
-			}
-		}
-	}
-	
-
-	public void cleanup(IReporter reporter) {
-		if (earHelper != null)
-			earHelper.closeEARFile();
-		super.cleanup(reporter);
-	}
-
-	public void cleanup() {
-
-	}
-	
-	protected IFile getManifestFile(Archive anArchive) {
-		URIConverter conv = anArchive.getResourceSet().getURIConverter();
-		if (conv instanceof WorkbenchURIConverter) {
-			WorkbenchURIConverter wbConv = (WorkbenchURIConverter) conv;
-			IContainer input = wbConv.getInputContainer();
-			if (input == null)
-				return null;
-			IProject p = input.getProject();
-			if (p == null || JemProjectUtilities.isBinaryProject(p))
-				return null;
-			IFile result = J2EEProjectUtilities.getManifestFile(p, false);
-			if (result != null && result.exists())
-				return result;
-		}
-		return null;
-	}
-
-	/**
-	 * Checks if the nature is consistent with doc type.
-	 */
-	protected void validateDocType(EARArtifactEdit edit,IVirtualComponent module) {
-		if (edit == null)
-			return;
-		if (edit.getJ2EEVersion() >= J2EEVersionConstants.J2EE_1_3_ID && appDD.getVersionID() < J2EEVersionConstants.J2EE_1_3_ID) {
-			String[] params = new String[3];
-			params[0] = DOCTYPE_1_2;
-			params[1] = getResourceName();
-			params[2] = DOCTYPE_1_3;
-			String tmp = NLS.bind(EARValidationMessageResourceHandler.EAR_INVALID_DOC_TYPE_ERROR_, params);			
-			addLocalizedError(tmp, appDD);
-		} else if (edit.getJ2EEVersion() < J2EEVersionConstants.J2EE_1_3_ID && appDD.getVersionID() >= J2EEVersionConstants.J2EE_1_3_ID) {
-			String[] params = new String[3];
-			params[0] = DOCTYPE_1_3;
-			params[1] = getResourceName();
-			params[2] = DOCTYPE_1_2;
-			String tmp = NLS.bind(EARValidationMessageResourceHandler.EAR_INVALID_DOC_TYPE_ERROR_, params);			
-			addLocalizedError(tmp, appDD);
-		}
-	}
-
-	/**
-	 * Validates that conflicting jar does not exist in the ear project.
-	 */
-	public void validateUriAlreadyExistsInEar(EARArtifactEdit edit,IVirtualComponent component) {
-		IVirtualReference[] modules = edit.getJ2EEModuleReferences();
-		if (modules == null)
-			return;
-		for (int i = 0; i < modules.length; i++) {
-			IVirtualReference reference = modules[i];
-			IVirtualComponent module = reference.getReferencedComponent();
-			if (module != null && module.getRootFolder().getRuntimePath() != null) {
-				IProject currentEARProject = earHelper.getProject();
-				try {
-					IFile exFile = currentEARProject.getFile(module.getRootFolder().getRuntimePath());
-					if (exFile != null && exFile.exists()) {
-						String[] params = new String[2];
-						params[0] = module.getRootFolder().getRuntimePath().toString();
-						params[1] = currentEARProject.getName();
-						String tmp = NLS.bind(EARValidationMessageResourceHandler.URI_ALREADY_EXISTS_IN_EAR_WARN_, params);						
-						addLocalizedWarning(tmp, appDD);
-					}
-				} catch (IllegalArgumentException iae) {
-					Logger.getLogger().logError(iae);
-				}
-			}
-		}
-	}
-
-	protected void removeAllMessages(EObject eObject, String groupName) {
-		Resource res = eObject.eResource();
-		if(res != null) {
-			IFile file = WorkbenchResourceHelper.getFile(res);
-			if(file != null)
-				_reporter.removeMessageSubset(this,file,groupName);
-		}
-	}
-	
-}// UIEarValidator
diff --git a/plugins/org.eclipse.jst.j2ee/license/berkeley_license.html b/plugins/org.eclipse.jst.j2ee/license/berkeley_license.html
deleted file mode 100644
index 5f2e66fc1..000000000
--- a/plugins/org.eclipse.jst.j2ee/license/berkeley_license.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>                        
-<title>License</title>
-</head>
-
-<body>
-<p>
-<b>Copyright 1994-2006 Sun Microsystems, Inc. All  Rights Reserved.</b>
-</p>      
-<p>Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-</p>
-<ul>
-<li>Redistribution of source code must retain the above copyright notice, this  
-list of conditions and the following disclaimer.<br><br></li>
-<li>Redistribution in binary form must reproduce the above copyright notice, 
-this list of conditions and the following disclaimer in the documentation and/or 
-other materials provided with the distribution.</li>
-</ul>
-<p>Neither the name of Sun Microsystems, Inc. or the names of contributors may 
-be used to endorse or promote products derived from this software without 
-specific prior written permission.
-</p>
-<p>This software is provided &quot;AS IS,&quot; without a warranty of any kind. 
-ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING 
-ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR 
-NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. (&quot;SUN&quot;) 
-AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE 
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS 
-DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY 
-LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, 
-CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND 
-REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR 
-INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGES.
-</p>
-<p>You acknowledge that this software is not designed, licensed or intended 
-for use in the design, construction, operation or maintenance of any nuclear facility.
-</p>
-</body>
-</html>
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.properties b/plugins/org.eclipse.jst.j2ee/plugin.properties
deleted file mode 100644
index bf09cd99b..000000000
--- a/plugins/org.eclipse.jst.j2ee/plugin.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-ear_validator_UI_=EAR Validator
-war_validator_UI_=WAR Validator
-application_client_validator_UI_=Application Client Validator
-validation_UI_=Migration Of Validation
-_UI_ParamValue_type=Param:
-EAR_VALIDATION_PROBLEMMARKER_NAME=EAR Validator Message
-EAR_FACET_LABEL=EAR
-EAR_FACET_DESCRIPTION=Enables the project to be deployed as an EAR module.
-EAR_FACET_TEMPLATE=EAR Project
-UTILITY_FACET_LABEL=Utility Module
-UTILITY_FACET_DESCRIPTION=Enables the project to be referenced by J2EE modules.
-UTILITY_FACET_TEMPLATE=Java Utility Project
-APPCLIENT_FACET_LABEL=Application Client module
-APPCLIENT_FACET_DESCRIPTION=Enables the project to be deployed as a J2EE Application Client module.
-APPCLIENT_FACET_TEMPLATE=Application Client Project
-differentRuntimesDetectedMarkerName = Faceted Project Problem (Mismatched Runtimes)
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
deleted file mode 100644
index 9310b5f63..000000000
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ /dev/null
@@ -1,768 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-<!-- Extension point to register specialized edit models with the EJBNature -->
-<!-- Extension point to register specialized EJB commands -->
-   <extension-point id="EJBCommandExtension" name="EJBCommandExtension" schema="schema/EJBCommandExtension.exsd"/>
-<!--============================-->
-<!-- Codegen Contributions                   -->
-<!--============================-->
-   
-   <extension-point id="J2EEModulePostImport" name="J2EEModulePostImport" schema="schema/J2EEModulePostImport.exsd"/>
-
-   <extension-point id="EARModuleExtension" name="EARModuleExtension" schema="schema/EARModuleExtension.exsd"/>
-   <extension-point id="DeployerExtension" name="J2EE Deployer Extension" schema="schema/DeployerExtension.exsd"/>
-   <extension-point id="resourceEnvRefType" name="Resource Environment Reference Type" schema="schema/resourceEnvRefType.exsd"/>
-   <extension-point id="resourceRefType" name="Resource Reference Type" schema="schema/resourceRefType.exsd"/>
-   <extension-point id="WebServiceClientGenerator" name="WebServiceClientGenerator" schema="schema/WebServiceClientGenerator.exsd"/>
-   <extension-point id="ExtendedModuleImport" name="ExtendedModuleImport" schema="schema/ExtendedModuleImport.exsd"/>
-   <extension-point id="WSDLServiceHelper" name="WSDLServiceHelper" schema="schema/WSDLServiceHelper.exsd"/>
-   <extension-point id="optionalRefactorHandler" name="optionalRefactorHandler" schema="schema/optionalRefactorHandler.exsd"/>
-
-<!--============================-->
-<!-- Module Core Nature         -->
-<!--============================-->
-
-  <extension
-         id="ModuleCoreNature"
-         name="Module Core Properties"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.wst.common.componentcore.ComponentCore">
-         </run>
-      </runtime>
-   </extension> -->
-
- 
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModel">
-      <editModel
-            editModelID="jst.ear"
-            factoryClass="org.eclipse.wst.common.componentcore.internal.impl.ArtifactEditModelFactory">
-         <editModelResource
-               autoload="false"
-               URI="META-INF/application.xml"/>
-      </editModel>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.modulecore.artifactedit">
-      <artifactedit
-            typeID="jst.ear"
-            class="org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit">
-      </artifactedit>
-   </extension> 
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.editModel">
-      <editModel
-            editModelID="jst.appclient"
-            factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
-         <editModelResource
-               autoload="false"
-               URI="META-INF/application-client.xml"/>
-      </editModel>
-   </extension>
-      <extension
-         point="org.eclipse.wst.common.modulecore.artifactedit">
-      <artifactedit
-            typeID="jst.appclient"
-            class="org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit">
-      </artifactedit>
-   </extension> 
-
-<!--===================================================-->
-<!-- Register known J2EE DTDs and XSDs for XML editor  -->
-<!-- DTD and XSD Contributions                         -->
-<!--===================================================-->
-<extension
-         point="org.eclipse.wst.internet.cache.cacheresource">
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/dtd/web-app_2_3.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/j2ee/dtds/application-client_1_2.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/dtd/application-client_1_3.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/j2ee/dtds/application_1_2.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/dtd/application_1_3.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/dtd/ejb-jar_2_0.dtd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd"/>
-       <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"/>
-       <cacheresource
-            license="license/berkeley_license.html"
-            url="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/application_5.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/application-client_5.xsd"/>   
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"/>    
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/javaee_5.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd"/>  
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"/>
-      <cacheresource
-            license="license/berkeley_license.html"
-            url="http://java.sun.com/xml/ns/javaee/"/>
-   </extension>
-
-
-<!--   <extension
-         point="org.eclipse.wst.xml.uriresolver.catalogContributor">
-      <catalogContributor
-            catalogId="default">
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-               uri="dtds/web-app_2_2.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-               uri="dtds/web-app_2_3.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN"
-               uri="dtds/application-client_1_2.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"
-               uri="dtds/application-client_1_3.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN"
-               uri="dtds/application_1_2.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-               uri="dtds/application_1_3.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
-               uri="dtds/ejb-jar_1_1.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
-               uri="dtds/ejb-jar_2_0.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
-               uri="dtds/connector_1_0.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-               uri="dtds/web-jsptaglibrary_1_1.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-               uri="dtds/web-jsptaglibrary_1_2.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
-               uri="xsds/application-client_1_4.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
-               uri="xsds/application_1_4.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-               uri="xsds/connector_1_5.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
-               uri="xsds/ejb-jar_2_1.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/"
-               uri="xsds/j2ee_1_4.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"
-               uri="xsds/jsp_2_0.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               uri="xsds/web-app_2_4.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-               uri="xsds/web-jsptaglibrary_2_0.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
-               uri="xsds/j2ee_jaxrpc_mapping_1_1.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-               uri="xsds/j2ee_web_services_1_1.xsd">
-         </mappingInfo>
-         <mappingInfo
-               key="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
-               uri="xsds/j2ee_web_services_client_1_1.xsd">
-         </mappingInfo>
-                  <mappingInfo
-               key="-//W3C//DTD XMLSCHEMA 200102//EN"
-               uri="dtds/XMLSchema.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="datatypes"
-               uri="dtds/datatypes.dtd">
-         </mappingInfo>
-         <mappingInfo
-               key="-//IBM Corporation, Inc.//DTD J2EE JAX-RPC mapping 1.0//EN"
-               uri="dtds/j2ee_jaxrpc_mapping_1_0.dtd ">
-         </mappingInfo> 
-         <mappingInfo
-               key="-//IBM Corporation, Inc.//DTD J2EE Web services 1.0//EN"
-               uri="dtds/j2ee_web_services_1_0.dtd">
-         </mappingInfo> 
-         <mappingInfo
-               key="-//IBM Corporation, Inc.//DTD J2EE Web services client 1.0//EN"
-               uri="dtds/j2ee_web_services_client_1_0.dtd">
-         </mappingInfo> 
-      </catalogContributor>
-   </extension> -->
-<!--=================================-->
-<!-- LibCopy Builder Contributions   -->
-<!--=================================-->
-   <extension
-         id="LibCopyBuilder"
-         name="Library Copying Builder"
-         point="org.eclipse.core.resources.builders">
-      <builder>
-         <run
-               class="org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder">
-         </run>
-      </builder>
-   </extension>
-   <extension
-         id="EarValidator"
-         name="%ear_validator_UI_"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <facet
-               facetId="jst.ear">
-         </facet>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="*.xml">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="*.xmi">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="*.jar">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter=".modulemaps">
-         </filter>
-         <dependentValidator
-               depValValue="true">
-         </dependentValidator>
-         <markerId
-               markerIdValue="EARValidatorMarker">
-         </markerId>
-         <run
-               class="org.eclipse.jst.j2ee.internal.validation.UIEarValidator">
-         </run>
-         <helper
-               class="org.eclipse.jst.j2ee.internal.validation.UIEarHelper">
-         </helper>
-      </validator>
-   </extension>
-    <extension
-         id="EARValidatorMarker"
-         name="%EAR_VALIDATION_PROBLEMMARKER_NAME"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.wst.validation.problemmarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-      <attribute
-            name="owner">
-      </attribute>
-      <attribute
-            name="validationSeverity">
-      </attribute>
-      <attribute
-            name="targetObject">
-      </attribute>
-      <attribute
-            name="groupName">
-      </attribute>
-      <attribute
-            name="messageId">
-      </attribute>
-   </extension>
-   <extension
-         id="ApplicationClientValidator"
-         name="%application_client_validator_UI_"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <facet
-               facetId="jst.appclient">
-         </facet>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="MANIFEST.MF">
-         </filter>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               nameFilter="application-client.xml">
-         </filter>
-         <dependentValidator
-               depValValue="true">
-         </dependentValidator>
-         <helper
-               class="org.eclipse.jst.j2ee.internal.validation.UIApplicationClientHelper">
-         </helper>
-         <run
-               class="org.eclipse.jst.j2ee.internal.validation.UIApplicationClientValidator">
-         </run>
-      </validator>
-   </extension>
-<!--ModuleMapInit-->
-<!--============================-->
-<!-- J2EE Extension Point Registry-->
-<!--============================-->
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="modulemap.xmi"
-            class="org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModulemapPackage">
-      </package>
-   </extension>
-<!-- ====================================================== -->
-<!-- Register package mappings                              -->
-<!-- Several that have not changed are still registered as  -->
-<!-- a place holder for the future.                         -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.wst.common.emf.packageURIMap">
-      <map
-            uri="modulemap.xmi"
-            prefix="modulemap">
-      </map>
-   </extension>
-<!-- ====================================================== -->
-<!-- Extendable Operations                                  -->
-<!-- These operation are extendable in other plugins        -->
-<!-- ====================================================== -->
-
-   <extension
-         name="J2EE tools function group"
-         point="org.eclipse.wst.common.frameworks.functionGroup">
-      <functionGroup
-            initializerClassName="org.eclipse.jst.j2ee.internal.plugin.J2EEGroupInitializer"
-            name="J2EE Core tools"
-            functionGroupID="org.eclipse.jst.j2ee"
-            priority="0"
-            description="J2EE Core tools">
-      </functionGroup>
-      <functionGroupPatternBinding
-            functionGroupID="org.eclipse.jst.j2ee"
-            pattern="org.eclipse.jst.j2ee.*">
-      </functionGroupPatternBinding>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory"
-            packageURI="common.xmi"
-            id="org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProviderAdapterFactory"
-            packageURI="application.xmi"
-            id="org.eclipse.jst.j2ee.application.provider.ApplicationItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.provider.ClientItemProviderAdapterFactory"
-            packageURI="client.xmi"
-            id="org.eclipse.jst.j2ee.client.provider.ClientItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory
-            functionGroupID="org.eclipse.jst.j2ee"
-            className="org.eclipse.jst.j2ee.internal.provider.ModulemapItemProviderAdapterFactory"
-            packageURI="modulemap.xmi"
-            id="org.eclipse.jst.j2ee.ear.modulemap.provider.ModulemapItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   <extension
-         point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
-      <adapterFactory 
-            className="org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory"
-            packageURI="org.eclipse.emf.ecore.resource"
-            id="org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory">
-      </adapterFactory>
-   </extension>
-   
-   
-   
-   
-<!-- =============================================================== -->
-<!-- Purpose: Define the default deployable project factory          -->
-<!-- Extension point: com.ibm.etools.server.core.deployableFactories -->
-<!-- =============================================================== -->
-   <extension
-         point="org.eclipse.wst.server.core.moduleFactories">
-      <moduleFactory
-            projects="true"
-            class="org.eclipse.jst.j2ee.internal.deployables.J2EEDeployableFactory"
-            id="org.eclipse.jst.j2ee.server">
-         <moduleType
-               versions="*"
-               types="jst.ear, jst.appclient, jst.web, jst.ejb, jst.connector, jst.utility">
-         </moduleType>
-      </moduleFactory>
-   </extension>
-
-<!-- =============================================================== -->
-<!-- WTP Operation extendable operations						        -->
-<!-- 																	 -->
-<!-- =============================================================== -->
-
-
-   <!--============================-->
-   <!-- Builder Provider registrations-->
-   <!--============================-->
-   <extension
-         point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
-        <DataModelProvider
-            class="org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider"
-            id="org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModelProvider"/>         
-        <DataModelProvider
-            class="org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider"
-            id="org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider"/>
-        <DataModelProvider
-            class="org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider"
-            id="org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider"/>
-	</extension>
-	
-	<!-- Project Facets -->
-  <extension point="org.eclipse.wst.common.project.facet.core.facets">
-  
-    <project-facet id="jst.ear">
-      <label>%EAR_FACET_LABEL</label>
-      <description>%EAR_FACET_DESCRIPTION</description>
-      <icon>icons/EAR.gif</icon>
-    </project-facet>
-
-    <project-facet-version facet="jst.ear" version="1.2">
-      <constraint>
-        <and>
-          <conflicts group="modules"/>
-          <conflicts facet="jst.java"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-
-    <project-facet-version facet="jst.ear" version="1.3">
-      <constraint>
-        <and>
-          <conflicts group="modules"/>
-          <conflicts facet="jst.java"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-    
-    <project-facet-version facet="jst.ear" version="1.4">
-      <constraint>
-        <and>
-          <conflicts group="modules"/>
-          <conflicts facet="jst.java"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-        
-    <action facet="jst.ear" version="[1.2-1.4]" type="INSTALL" id="jst.ear.install">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>
-      <config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>
-    </action>
-      
-    <event-handler facet="jst.ear" version="[1.2-1.4]" type="POST_INSTALL">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetPostInstallDelegate"/>
-    </event-handler>  
-
-    <event-handler facet="jst.ear" version="[1.2-1.4]" type="RUNTIME_CHANGED">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>
-	</event-handler>
-
-    <project-facet id="jst.utility">
-      <label>%UTILITY_FACET_LABEL</label>
-      <description>%UTILITY_FACET_DESCRIPTION</description>
-    </project-facet>
-
-    <project-facet-version facet="jst.utility" version="1.0">
-      <action type="install">
-        <delegate class="org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDelegate"/>
-        <config-factory class="org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider"/>
-      </action>
-      <action type="uninstall">
-        <delegate class="org.eclipse.jst.j2ee.project.facet.UtilityFacetUnInstallDelegate"/>
-        <config-factory class="org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider"/>
-      </action>
-      <event-handler type="RUNTIME_CHANGED">
-        <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
-      </event-handler>
-	<event-handler type="POST_INSTALL" facet="jst.ear" version="[1.2-1.4]">
-	  <delegate class="org.eclipse.jst.j2ee.project.facet.UtilityFacetPostInstallDelegate"/>
-	</event-handler>  
-	      
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-    
-    
-    <project-facet id="jst.appclient">
-      <label>%APPCLIENT_FACET_LABEL</label>
-      <description>%APPCLIENT_FACET_DESCRIPTION</description>
-      <icon>icons/ear.gif</icon>
-    </project-facet>
-
-    <project-facet-version facet="jst.appclient" version="1.2">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-    
-    <project-facet-version facet="jst.appclient" version="1.3">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-    
-    <project-facet-version facet="jst.appclient" version="1.4">
-      <constraint>
-        <and>
-          <requires facet="jst.java" version="[1.3"/>
-          <conflicts group="modules"/>
-        </and>
-      </constraint>
-      <group-member id="modules"/>      
-    </project-facet-version>
-            
-    <action type="install" facet="jst.appclient" version="[1.2-1.4]" id="jst.appclient.install">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>
-      <config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>
-    </action>
-	  
-    <event-handler type="POST_INSTALL" facet="jst.appclient" version="[1.2-1.4]">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetPostInstallDelegate"/>
-    </event-handler>
-        
-    <event-handler type="RUNTIME_CHANGED" facet="jst.appclient" version="[1.2-1.4]">
-      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
-    </event-handler>
-	
-    <template id="template.jst.ear">
-      <label>%EAR_FACET_TEMPLATE</label>
-      <fixed facet="jst.ear"/>
-    </template>
-    
-    <template id="template.jst.utility">
-      <label>%UTILITY_FACET_TEMPLATE</label>
-      <fixed facet="jst.java"/>
-      <fixed facet="jst.utility"/>
-    </template>
-
-    <template id="template.jst.appclient">
-      <label>%APPCLIENT_FACET_TEMPLATE</label>
-      <fixed facet="jst.java"/>
-      <fixed facet="jst.appclient"/>
-    </template>    
-
-  </extension>
-  
-  <extension point="org.eclipse.wst.common.project.facet.core.validators">
-    <validator class="org.eclipse.jst.j2ee.project.facet.EarFacetValidator"/>
-  </extension>    
-
-  <extension 
-    point="org.eclipse.core.resources.markers"
-    id="differentRuntimesDetected"
-    name="%differentRuntimesDetectedMarkerName">
-    <super type="org.eclipse.wst.common.project.facet.core.validation.marker"/>
-    <attribute name="moduleProject"/>
-    <attribute name="runtime1"/>
-    <attribute name="runtime2"/>
-    <persistent value="true"/>
-  </extension>
-  
-  <extension
-       point="org.eclipse.wst.validation.validationHelper">
-    <validationHelper
-    	id="org.eclipse.jst.common.componentcore.util.ProjectValidationHelper"
-    	helperClass="org.eclipse.jst.j2ee.internal.validation.ProjectValidationHelper">
-    </validationHelper>	   
- </extension>
-  
-  <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-    <classpathContainerInitializer
-      class="org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathInitializer"
-      id="org.eclipse.jst.j2ee.internal.module.container"/>
-  </extension>
-  
-   <!--
-	  Operation extension that updates the context-root entries in application.xml
-  -->
-  <extension
-     point="org.eclipse.wst.common.frameworks.OperationExtension"
-     id="org.eclipse.jst.j2ee.application.internal.operations.UpdateContextRoot">
-   <operationExtension
-      id="org.eclipse.wst.web.internal.operation.WebProjectPropertiesUpdateOperation"
-      preOperationClass="org.eclipse.jst.j2ee.application.internal.operations.ComputeEARsForContextRootUpdateOp"/>
-   <operationExtension
-      id="org.eclipse.wst.web.internal.operation.WebProjectPropertiesUpdateOperation"
-      postOperationClass="org.eclipse.jst.j2ee.application.internal.operations.UpdateModuleContextRootInEAROp"/>
-  </extension>
-
-
-   <extension
-         point="org.eclipse.wst.common.modulecore.componentimpl">
-      <componentimpl
-            typeID="jst.ear"
-            class="org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent">
-      </componentimpl>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.common.modulecore.componentimpl">
-      <componentimpl
-            typeID="jst.utility"
-            class="org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent">
-      </componentimpl>
-   </extension>
-  
-   <extension
-         point="org.eclipse.wst.common.modulecore.componentimpl">
-      <componentimpl
-            typeID="jst.web"
-            class="org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent">
-      </componentimpl>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.common.modulecore.componentimpl">
-      <componentimpl
-            typeID="jst.connector"
-            class="org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent">
-      </componentimpl>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.common.modulecore.componentimpl">
-      <componentimpl
-            typeID="jst.ejb"
-            class="org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent">
-      </componentimpl>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.common.modulecore.componentimpl">
-      <componentimpl
-            typeID="jst.appclient"
-            class="org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent">
-      </componentimpl>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee/prepareAllPII.xml b/plugins/org.eclipse.jst.j2ee/prepareAllPII.xml
deleted file mode 100644
index 8b0550b2e..000000000
--- a/plugins/org.eclipse.jst.j2ee/prepareAllPII.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<project name="Build" default="All" basedir=".">
-
-<target name="com.ibm.etools.ejb.ui">
-				<echo message="com.ibm.etools.ejb.ui..."/>
-				<ant antfile="../com.ibm.etools.ejb.ui/prepareforpii.xml" target="main"/>	
-</target>
-
-<target name="com.ibm.wtp.ejb.ui">
-				<echo message="com.ibm.wtp.ejb.ui..."/>
-				<ant antfile="../com.ibm.wtp.ejb.ui/prepareforpii.xml" target="main"/>	
-</target>
-
-<target name="com.ibm.etools.emf.workbench.ui">
-				<echo message="com.ibm.etools.emf.workbench.ui..."/>
-				<ant antfile="../com.ibm.etools.emf.workbench.ui/prepareforpii.xml" target="main"/>	
-</target>
-
-<target name="com.ibm.etools.j2ee.core">
-				<echo message="com.ibm.etools.j2ee.core..."/>
-				<ant antfile="../com.ibm.etools.j2ee.core/prepareforpii.xml" target="main"/>	
-</target>
-
-<target name="com.ibm.etools.j2ee.reference.snippets">
-				<echo message="com.ibm.etools.j2ee.reference.snippets..."/>
-				<ant antfile="../com.ibm.etools.j2ee.reference.snippets/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.j2ee.ui">
-				<echo message="com.ibm.etools.j2ee.ui..."/>
-				<ant antfile="../com.ibm.etools.j2ee.ui/prepareforpii.xml" target="main"/>		
-</target>
-
-
-<target name="com.ibm.etools.validation">
-				<echo message="com.ibm.etools.validation..."/>
-				<ant antfile="../com.ibm.etools.validation/prepareforpii.xml" target="main"/>
-				
-</target>
-
-<target name="com.ibm.etools.validation.core">
-				<echo message="com.ibm.etools.validation.core..."/>
-				<ant antfile="../com.ibm.etools.validation.core/prepareforpii.xml" target="main"/>
-				
-</target>
-
-<target name="com.ibm.etools.validation.ui">
-				<echo message="com.ibm.etools.validation.ui..."/>
-				<ant antfile="../com.ibm.etools.validation.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.annotations.controller">
-				<echo message="com.ibm.wtp.annotations.controller..."/>
-				<ant antfile="../com.ibm.wtp.annotations.controller/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.annotations.core">
-				<echo message="com.ibm.wtp.annotations.core..."/>
-				<ant antfile="../com.ibm.wtp.annotations.core/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.annotations.ui">
-				<echo message="com.ibm.wtp.annotations.ui..."/>
-				<ant antfile="../com.ibm.wtp.annotations.ui/prepareforpii.xml" target="main"/>
-					
-</target>
-
-<target name="com.ibm.wtp.common">
-				<echo message="com.ibm.wtp.common..."/>
-				<ant antfile="../com.ibm.wtp.common/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.common.navigator">
-				<echo message="com.ibm.wtp.common.navigator..."/>
-				<ant antfile="../com.ibm.wtp.common.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.common.ui">
-				<echo message="com.ibm.wtp.common.ui..."/>
-				<ant antfile="../com.ibm.wtp.common.ui/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.ejb">
-				<echo message="com.ibm.wtp.ejb.."/>
-				<ant antfile="../com.ibm.wtp.ejb/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.emf">
-				<echo message="com.ibm.wtp.emf.."/>
-				<ant antfile="../com.ibm.wtp.emf/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.emf.workbench">
-				<echo message="com.ibm.wtp.emf.workbench.."/>
-				<ant antfile="../com.ibm.wtp.emf.workbench/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.emf.workbench.edit">
-				<echo message="com.ibm.wtp.emf.workbench.edit.."/>
-				<ant antfile="../com.ibm.wtp.emf.workbench.edit/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.j2ee">
-				<echo message="com.ibm.wtp.j2ee.."/>
-				<ant antfile="../com.ibm.wtp.j2ee/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.j2ee.ui">
-				<echo message="com.ibm.wtp.j2ee.ui.."/>
-				<ant antfile="../com.ibm.wtp.j2ee.ui/prepareforpii.xml" target="main"/>
-</target>
-
-
-<target name="com.ibm.wtp.jca">
-				<echo message="com.ibm.wtp.jca.."/>
-				<ant antfile="../com.ibm.wtp.jca/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.web">
-				<echo message="com.ibm.wtp.web.."/>
-				<ant antfile="../com.ibm.wtp.web/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.webservice">
-				<echo message="com.ibm.wtp.webservice.."/>
-				<ant antfile="../com.ibm.wtp.webservice/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.project.interchange">
-				<echo message="com.ibm.etools.project.interchange.."/>
-				<ant antfile="../com.ibm.etools.project.interchange/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.etools.ejb.samples">
-				<echo message="com.ibm.etools.ejb.samples.."/>
-				<ant antfile="../com.ibm.etools.ejb.samples/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.activities">
-				<echo message="com.ibm.wtp.activities.."/>
-				<ant antfile="../com.ibm.wtp.activities/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="com.ibm.wtp.j2ee.ui.navigator">
-				<echo message="com.ibm.wtp.j2ee.ui.navigator.."/>
-				<ant antfile="../com.ibm.wtp.j2ee.ui.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="org.eclipse.ui.views.navigator">
-				<echo message="org.eclipse.ui.views.navigator.."/>
-				<ant antfile="../org.eclipse.ui.views.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="org.eclipse.ui.workbench.navigator">
-				<echo message="org.eclipse.ui.workbench.navigator.."/>
-				<ant antfile="../org.eclipse.ui.workbench.navigator/prepareforpii.xml" target="main"/>
-</target>
-
-<target name="All">
-				<antcall target="com.ibm.etools.ejb.ui"/>
-				<antcall target="com.ibm.wtp.ejb.ui"/>
-	 			<antcall target="com.ibm.etools.emf.workbench.ui"/>
-	 			<antcall target="com.ibm.etools.j2ee.core"/>
-	 			<antcall target="com.ibm.etools.j2ee.reference.snippets"/>
-				<antcall target="com.ibm.etools.j2ee.ui"/>
-				<antcall target="com.ibm.etools.validation"/>
-				<antcall target="com.ibm.etools.validation.ui"/>
-				<antcall target="com.ibm.wtp.annotations.controller"/>
-				<antcall target="com.ibm.wtp.annotations.core"/>
-				<antcall target="com.ibm.wtp.annotations.ui"/>
-				<antcall target="com.ibm.wtp.common"/>
-				<antcall target="com.ibm.wtp.ejb"/>
-				<antcall target="com.ibm.wtp.emf"/>
-				<antcall target="com.ibm.wtp.emf.workbench"/>
-				<antcall target="com.ibm.wtp.emf.workbench.edit"/>
-				<antcall target="com.ibm.wtp.j2ee"/>
-				<antcall target="com.ibm.wtp.j2ee.ui"/>
-				<antcall target="com.ibm.wtp.jca"/>
-				<antcall target="com.ibm.wtp.web"/>
-				<antcall target="com.ibm.wtp.webservice"/>
-				<antcall target="com.ibm.wtp.common.ui"/>
-				<antcall target="com.ibm.wtp.common.navigator"/>
-				<antcall target="com.ibm.etools.project.interchange"/>
-				<antcall target="com.ibm.etools.ejb.samples"/>	
-				<antcall target="com.ibm.wtp.activities"/>	
-				<antcall target="com.ibm.etools.validation.core"/>	
-				<antcall target="com.ibm.wtp.j2ee.ui.navigator"/>
-				<antcall target="org.eclipse.ui.views.navigator"/>
-				<antcall target="org.eclipse.ui.workbench.navigator"/>									
-</target>
-
-</project>
-
diff --git a/plugins/org.eclipse.jst.j2ee/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee/prepareforpii.xml
deleted file mode 100644
index 281f3d008..000000000
--- a/plugins/org.eclipse.jst.j2ee/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.j2ee"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/appclientarchiveops.properties b/plugins/org.eclipse.jst.j2ee/property_files/appclientarchiveops.properties
deleted file mode 100644
index bac140630..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/appclientarchiveops.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-#This properties file contains string for Archive operations of Application Clients.
-
-ARCHIVE_OPERATION_SaveFile=Error occurred saving the file..
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime..
-ARCHIVE_OPERATION_SaveManifest=Error occurred saving the manifest..
-ARCHIVE_OPERATION_FileNotFound=Error: File not found..
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export..
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-IMPORT_MOFRESOURCE_STRING=Importing meta-data..
-APPCLIENT_IMPORT_OPERATION_STRING=Importing application client JAR..
-APPCLIENT_IMPORT_FILE_STRING=Importing file..
-APPCLIENT_IMPORT_ERROR=Error importing application client file..
-ARCHIVE_OPERATION_ErrorOccured=Error occurred getting module folder name..
-Application_Client_File_UI_=Application Client File
-_c__Copyright_IBM_Corporation_2001_1=(c) Copyright IBM Corporation 2001
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/appclientcreation.properties b/plugins/org.eclipse.jst.j2ee/property_files/appclientcreation.properties
deleted file mode 100644
index f42d2b8a6..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/appclientcreation.properties
+++ /dev/null
@@ -1,14 +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
-###############################################################################
-Error_occured_getting_appl_ERROR_=IWAE0001E Error occurred getting application.xml:
-Creating_Application_Clien_UI_=Creating Application Client Project...
-Error_occured_loading_appl_UI_=Error occured loading application-client.xml:
-Not_an_Application_Client_project_ERROR_=IWAE0002E Not an Application Client project.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/applicationclientvalidation.properties b/plugins/org.eclipse.jst.j2ee/property_files/applicationclientvalidation.properties
deleted file mode 100644
index 7f5c89ecb..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/applicationclientvalidation.properties
+++ /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
-###############################################################################
-# This properties file holds all the externalized strings for the Application Client project
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/applicationclientvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-
-
-ERROR_APPLICATIONCLIENT_INVALID_APPCLIENT_FILE=CHKJ1000E: Validation failed because the application client file is not valid. Ensure that the deployment descriptor is valid.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: Validation failed:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: Unresolvable EJB references in {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: The application client project has an invalid deployment descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: The URI, {0}, does not match anything in the application client file.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: The deployment descriptor could not be loaded due to an unknown syntax error. The bad section starts at line {0}, column {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: The deployment descriptor could not be loaded due to an unknown syntax error. The bad section starts at line {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: The deployment descriptor could not be loaded due to an unknown syntax error. There is no information available to help identify the bad section.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: Validation cannot complete because the deployment descriptor cannot be opened.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E Duplicate resource environment reference "{0}" in application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E Document type version "{0}" for application-client.xml in project "{1}" needs to be version "{2}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E Duplicate enterprise bean reference "{0}" in application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E The Main-Class attribute must be defined in the application client module.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/applicationproviders.properties b/plugins/org.eclipse.jst.j2ee/property_files/applicationproviders.properties
deleted file mode 100644
index d426afdc6..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/applicationproviders.properties
+++ /dev/null
@@ -1,98 +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
-###############################################################################
-AllAuthenticatedUsers_UI_=AllAuthenticatedUsers
-AppName_UI_=AppName
-The_appName_property_UI_=The appName property
-Application_UI_=Application
-The_application_property_UI_=The application property
-AuthorizationTable_UI_=AuthorizationTable
-The_authorizationTable_property_UI_=The authorizationTable property
-RunAsMap_UI_=RunAsMap
-The_runAsMap_property_UI_=The runAsMap property
-ApplicationBinding_UI_=ApplicationBinding
-Failed_to_load_image_for_ERROR_=IWAE0001E Failed to load image for
-Create_Child_UI_=Create Child
-Create_a_new_child_for_the_selected_UI_=Create a new child for the selected
-Create_RoleAssignment_UI_=Create RoleAssignment
-Create_a_child_of_type_RoleAssignment_for_the_selected_UI_=Create a child of type RoleAssignment for the selected
-Everyone_UI_=Everyone
-Create_User_UI_=Create User
-Create_a_child_of_type_User_for_the_selected_UI_=Create a child of type User for the selected
-Role_UI_=Role
-The_role_property_UI_=The role property
-RoleAssignment_UI_=RoleAssignment
-Create_a_new_child_of_type_for_the_selected_UI_=Create a child for the selected
-AuthData_UI_=AuthData
-The_authData_property_UI_=The authData property
-SecurityRole_UI_=SecurityRole
-The_securityRole_property_UI_=The securityRole property
-RunAsBinding_UI_=RunAsBinding
-Create_RunAsBinding_UI_=Create RunAsBinding
-Create_a_child_of_type_RunAsBinding_for_the_selected_UI_=Create a child of type RunAsBinding for the selected
-SpecialSubject_UI_=SpecialSubject
-Name_UI_=Name
-The_name_property_UI_=The name property
-AccessId_UI_=AccessId
-The_accessId_property_UI_=The accessId property
-Subject_UI_=Subject
-Create_WebModuleExtension_UI_=Create WebModuleExtension
-Create_a_child_of_type_WebModuleExtension_for_the_selected_UI_=Create a child of type WebModuleExtension for the selected
-ReloadInterval_UI_=ReloadInterval
-The_reloadInterval_property_UI_=The reloadInterval property
-ApplicationExtension_UI_=ApplicationExtension
-EJB_Module_Extension_UI_=EJB Module Extension
-Client_Module_Extension_UI_=Client Module Extension
-AltBindings_UI_=AltBindings
-The_altBindings_property_UI_=The altBindings property
-AltExtensions_UI_=AltExtensions
-The_altExtensions_property_UI_=The altExtensions property
-DependentClasspath_UI_=DependentClasspath
-The_dependentClasspath_property_UI_=The dependentClasspath property
-AbsolutePath_UI_=AbsolutePath
-The_absolutePath_property_UI_=The absolutePath property
-ApplicationExtension_1_UI_=ApplicationExtension
-The_applicationExtension_property_UI_=The applicationExtension property
-Module_UI_=Module
-The_module_property_UI_=The module property
-<<Unresolvable_ERROR_=IWAE0002E <<Unresolvable
-Create_Module_UI_=Create Module
-Create_a_child_of_type_Module_for_the_selected_UI_=Create a child of type Module for the selected
-SmallIcon_UI_=SmallIcon
-The_smallIcon_property_UI_=The smallIcon property
-LargeIcon_UI_=LargeIcon
-The_largeIcon_property_UI_=The largeIcon property
-Description_UI_=Description
-The_description_property_UI_=The description property
-DisplayName_UI_=DisplayName
-The_displayName_property_UI_=The displayName property
-<<No_display_name>>_ERROR_=IWAE0003E <<No display name>>
-Uri_UI_=Uri
-The_uri_property_UI_=The URI property
-AltDD_UI_=AltDD
-The_altDD_property_UI_=The altDD property
-<<URI_not_set>>_ERROR_=IWAE0004E <<URI not set>>
-ContextRoot_UI_=ContextRoot
-The_contextRoot_property_UI_=The contextRoot property
-Create_a_child_for_the_selected_UI_=Create a child for the selected
-Module_Extension_UI_=Module Extension
-Web_Module_Extension_UI_=Web Module Extension
-EARProjectMap_UI_=EARProjectMap
-Project_Name_UI_=Project Name
-The_project_name_property_of_the_module_mapping_UI_=The project name property of the module mapping
-The_module_of_the_module_mapping_UI_=The module of the module mapping
-ModuleMapping_UI_=ModuleMapping
-Project_Name_1=Project Name
-The_project_name_property_of_the_utility_jar_mapping_UI_=The project name property of the utility JAR mapping
-The_uri_property_of_the_utility_jar_mapping_UI_=The uri property of the utility JAR mapping
-_UI_JavaClientModule_type=JavaClient
-_UI_EjbModule_type=EJB
-_UI_WebModule_type=Web
-_UI_ConnectorModule_type=Connector
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/basecodegen.properties b/plugins/org.eclipse.jst.j2ee/property_files/basecodegen.properties
deleted file mode 100644
index 80a24551b..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/basecodegen.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-No_analysis_reason_provide_INFO_=IWAE0001I No analysis reason is provided for the result, from \"{0}\" to \"{1}\".
-_missing_=<missing>
-Analysis_status_out_of_ran_EXC_=IWAE0002E Analysis status out of range.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/commonedit.properties b/plugins/org.eclipse.jst.j2ee/property_files/commonedit.properties
deleted file mode 100644
index 8eee1370d..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/commonedit.properties
+++ /dev/null
@@ -1,402 +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
-###############################################################################
-Create_Two_Children_UI_=Create Two Children
-Create_Child_UI_=Create Child
-Name_UI_=Name
-The_name_property_UI_=The name property
-Type_UI_=Type
-The_type_property_UI_=The type property
-Home_UI_=Home
-The_home_property_UI_=The home property
-Remote_UI_=Remote
-The_remote_property_UI_=The remote property
-_UI_EJBLocalRef_localHome_feature_desc=The local home property
-_UI_EJBLocalRef_local_feature_desc=The local property
-Link_UI_=Link
-The_link_property_UI_=The link property
-Description_UI_=Description
-The_description_property_UI_=The description property
-Client_UI_=Client
-The_client_property_UI_=The client property
-WebApp_UI_=WebApp
-The_webApp_property_UI_=The webApp property
-Ejb_UI_=Ejb
-The_ejb_property_UI_=The EJB property
-Value_UI_=Value
-The_value_property_UI_=The value property
-Auth_UI_=Auth
-The_auth_property_UI_=The auth property
-RoleName_UI_=RoleName
-The_roleName_property_UI_=The roleName property
-Application_UI_=Application
-The_application_property_UI_=The application property
-Servlet_UI_=Servlet
-The_servlet_property_UI_=The servlet property
-EJB_Reference_UI_=EJB Reference
-_UI_EJBLocalRef_type=EJB Local Reference
-New_UI_=Add
-Delete_UI_=Remove
-Delete_EJB_references_UI_=Delete EJB references
-Variable_UI_=Variable
-Delete_environment_entries_UI_=Delete environment entries
-(New_Variable)_UI_=(New Variable)
-New_environment_entry_UI_=New environment entry
-Delete_resource_references_UI_=Delete resource references
-Reference_Name_UI_=Reference Name
-Authentication_UI_=Authentication
-(New_ResourceRef)_UI_=(New ResourceRef)
-New_resource_reference_UI_=New resource reference
-Security_Roles_UI_=Security Roles
-(New_Security_Role)_UI_=(New Security Role)
-New_security_role_UI_=New security role
-Delete_security_roles_UI_=Delete security roles
-Bad_parent_ERROR_=IWAE0001E Bad parent
-Choose_Icons_UI_=Choose Icons
-Preview_UI_=Preview
-Browse..._UI_=Browse...
-Resource_must_exist._ERROR_=IWAE0002E Resource must exist.
-Resource_must_be_accessibl_ERROR_=IWAE0003E Resource must be accessible.
-What_resources_do_you_want_UI_=What resources do you want to export?
-Where_do_you_want_to_expor_UI_=Where do you want to export resources to?
-Options__UI_=Options:
-Export_source_files_UI_=Export source files
-Create_directory_structure_UI_=Create directory structure
-Create_directories_for_sel_UI_=Create directories for selected folders
-Import_into_new_or_existin_UI_=Import into new or existing Enterprise Application project
-Create_complete_container__UI_=Create complete folder structure
-File_Selection_UI_=File Selection
-Select_a_file__UI_=Select a file:
-Label_Ear_Project_Name_UI=Enterprise application project name:
-Label_Where_To_Import_UI_=Where do you want the imported resources to go?
-Overwrite_existing_resources_UI_=Overwrite existing resources without warning
-Overwrite_existing_resources_export_UI_=Overwrite existing files without warning
-(New_EJB_Ref)_UI_=(New EJB Ref)
-Small_(16x16)__UI_=Small (16x16):
-Large_(32x32)__UI_=Large (32x32):
-Choose_Small_Icon_UI_=Choose Small Icon
-Select_the_Small_Icon_UI_=Select the Small Icon
-Choose_Large_Icon_UI_=Choose Large Icon
-Select_the_Large_Icon_UI_=Select the Large
-Icon29concat=Create a new child for the selected {0}.
-1concat_UI_=Create a new child for the selected {0}.
-3concat_UI_=BasicAuthData {0}
-4concat_UI_=EjbRefBinding {0}
-## on the following line, do not translate:   CHILD_CLASS_NAME  ##
-5concat_UI_=Create a child of type #CHILD_CLASS_NAME# for the selected {0}.
-6concat_UI_=ResourceRefBinding {0}
-9concat_EXC_=IWAE0004E Failed to load image for ''{0}''
-11concat_ERROR_=IWAE0005E Cannot find the image for the file: {0}
-12concat_ERROR_=IWAE0006E Problems with URL format of the image file: {0}
-28concat_UI_={0} is an invalid character in a resource name.
-29concat_UI_=Enterprise Application project contains invalid character {0}.
-30concat_UI_=Enterprise Application must be absolute. Use /{0}.
-13concat_UI_={0} is an invalid character in a resource name.
-14concat_UI_=Enterprise Application project contains invalid character {0}.
-15concat_UI_=Enterprise Application must be absolute. Use /{0}.
-16concat_UI_=Create a child of type {0} for the selected {1}.
-18concat_UI_=Create {0}
-19concat_UI_=Create two new children for the selected {0}.
-20concat_UI_=Create two new children of type {0} for the selected {1}.
-21concat=Create Two {0}s
-Undo@Ctrl+Z_UI_=Undo@Ctrl+Z
-{0}_change_UI_={0} change
-Project_and_EAR_names_can__UI_=Destination Project and Enterprise Application names cannot be the same
-You_must_specify_an_EAR_pr_UI_=You must specify an Enterprise Application project that exists or should be created
-Invalid_EAR_project_name_UI_=Invalid Enterprise Application project name
-Project_exist,_but_it_is_n_UI_=Project exist, but it is not an Enterprise Application project
-EAR_Project_Name__UI_=Enterprise application project name:
-Create_Child_UI__UI_=Create Child
-UserId_UI_=UserId
-The_userId_property_UI_=The userId property
-Password_UI_=Password
-The_password_property_UI_=The password property
-JndiName_UI_=JndiName
-The_jndiName_property_UI_=The jndiName property
-## on the following line, do not translate:  bindingEjbRef  ##
-The_bindingEjbRef_property_UI_=The bindingEjbRef property
-## on the following line, do not translate: bindingResourceRef  ##
-The_bindingResourceRef_pro_UI_=The bindingResourceRef property
-## do not translate the following line ##
-DefaultAuth_UI_=DefaultAuth
-## on the following line, do not translate:  defaultAuth ##
-The_defaultAuth_property_UI_=The defaultAuth property
-## on the following line, do not translate:   CHILD_CLASS_NAME  ##
-Create_#CHILD_CLASS_NAME#_UI_=Create #CHILD_CLASS_NAME#
-Question_UI_=Question
-Resource__UI_=Resource {0} already exists.  Would you like to overwrite it?
-New_EJB_reference_UI_=New EJB reference
-The_EJB_property_UI_=The EJB property
-An_error_occurred_reading__ERROR_=IWAE0007E An error occurred reading the meta-data in Enterprise Application project {0}:
-Error_in_EAR_project_UI_=Error in Enterprise Application project
-Manifest_Class-Path__UI_=Manifest Class-Path:
-Module_Dependencies_UI_=Module Dependencies
-Select_dependent_JARs_for__UI_=Select dependent JARs for the module within the Enterprise Application project.
-Project_name__UI_=Project name:
-NO_EAR_JARDEP_FOR_MOD_UI_=Selected module not associated with an Enterprise Application module.
-EAR_Project_Name__UI__UI_=Enterprise application project name:
-Project_UI_=Project
-Available_dependent_JARs__UI_=Available dependent JARs:
-Project_{0}_is_not_referen_ERROR_=IWAE0008E Project {0} is not referenced by any Enterprise Application project.
-Unable_to_edit_module_depe_UI_=Unable to edit module dependencies
-Define_Java_Build_Settings_UI_=Define Java Build Settings
-Specify_the_source_and_out_UI_=Specify the source and output folders, as well as the Java classpath in the appropriate order.
-Enter_a_valid_project_name_UI_=Enter a valid project name
-Project_name_has_invalid_c_UI_=Project name has invalid characters
-Project_does_not_exist_or__UI_=Project does not exist or Invalid project nature. Enter a valid project name
-EAR_Project_Name_UI_=Enterprise application project name:
-Invalid_destination_projec_UI_=Invalid destination project
-Cannot_import_into_a_close_UI_=Cannot import into a closed project
-Project_name_must_be_speci_UI_=Project name must be specified
-Select_an_EAR_Project_UI_=Select an Enterprise Application project
-The_project_is_referenced__ERROR_=IWAE0009E The project is referenced by more than one Enterprise Application project.  Please select the primary Enterprise Application project.
-An_internal_error_occurred_ERROR_=IWAE0010E An internal error occurred:
-2concat_INFO_=IWAE0011I The file {0} is read-only and cannot be saved.  Would you like to make it editable and save anyway?
-Information_UI_=Information
-The_chosen_operation_is_no_INFO_=IWAE0012I The chosen operation is not currently available.
-Save_problems_UI_=Save problems
-Save_could_not_be_complete_INFO_=IWAE0013I Save could not be completed.  Some related files may have already been saved.\n\nReason
-Yes_UI_=Yes
-Yes_To_All_UI_=Yes To All
-No_UI_=No
-Saving_Read-Only_File_UI_=Saving Read-Only File
-A_source_folder_must_be_sp_UI_=A source folder must be specified
-EAR_project_is_not_open_UI_=Enterprise Application project is not open
-1concat_EXC_=IWAE0014E Invalid initial delay: {0}
-2concat_EXC_=IWAE0015E Invalid delay: {0}
-Information_UI__UI_=Information
-Error_UI_=Error
-Confirm_UI_=Confirm
-Can't_start_a_TimerQueue_t_EXC_=IWAE0016E Can't start a TimerQueue that is already running
-Module_Dependency_Dialog_Title_UI_=Module Dependencies Dialog
-JAR/Module_UI_=JAR/Module
-Must_be_an_Connector_Cli1_UI_=Must be a Connector project.
-Must_be_an_Application_Cli_UI_=Must be an Application Client, EJB, or Web project.
-Must_be_an_EJB_project._UI_=Must be an EJB project.
-Selection_must_be_a_Web_pr_UI_=Selection must be a Web project.
-Must_be_an_Enterprise_Appl_UI_=Must be an Enterprise Application project.
-Must_be_an_Application_Cli1_j2ee13_UI_=Must be an J2EE 1.3 Application Client project.
-Must_be_an_Application_Cli1_UI_=Must be an Application Client project.
-Select_the_highest_J2EE_version_that_is_to_be_used__UI_=&Highest J2EE version used for development:
-Unexpected_IO_exception_occurred_creating_xml_document_1_EXC_=IWAE0017E Unexpected IO exception occurred creating xml document
-Delete_1=Delete...
-Delete_selected_project(s)_2=Delete selected project(s)
-Remove_module(s)_from_all_Enterprise_Applications_3=Remove module(s) from all Enterprise Applications
-Remove_module(s)_from_all_other_Enterprise_Applications_4=Remove module(s) from all other Enterprise Applications
-Remove_module_dependencies_referencing_selected_project(s)_5=Remove module dependencies referencing selected project(s)
-Delete_Module_Options_6=Delete Module Options
-Delete_Enterprise_Application_Options_7=Delete Enterprise Application Options
-Delete_could_not_be_completed_8=Delete could not be completed
-Delete_error_9=Delete error
-What_would_you_like_to_delete__10=What would you like to delete?
-Delete_selected_Enterprise_Application_project(s)_only_11=Delete selected Enterprise Application project(s) only
-Also_delete_module_and_utility_Java_projects_12=Also delete module and utility Java projects
-Delete_selected_project(s)_only_13=Delete selected project(s) only
-Also_delete_references_to_selected_project(s)_14=Also delete references to selected project(s)
-Rename_1=Rename...
-Rename_selected_project_2=Rename selected project
-Rename_module_in_all_Enterprise_Applications_3=Rename module in all Enterprise Applications
-Rename_module_in_all_other_Enterprise_Applications_4=Rename module in all other Enterprise Applications
-Rename_module_dependencies_referencing_selected_project_5=Rename module dependencies referencing selected project
-Rename_Module_Options_6=Rename Module Options
-Rename_Enterprise_Application_Options_7=Rename Enterprise Application Options
-Rename_could_not_be_completed_8=Rename could not be completed
-Rename_error_9=Rename error
-What_would_you_like_to_rename_this_to__10=What would you like to rename this to?
-Context_Root__11=Context Root:
-Rename_selected_Enterprise_Application_project_only_12=Rename selected Enterprise Application project only
-Also_rename_module_and_utility_Java_projects_13=Also rename module and utility Java projects
-Source_1=Source
-Error_creating_nested_text_editor_2=Error creating nested text editor
-Redirecting_Editor_1=Redirecting Editor
-Problems_Opening_Editor_2_ERROR_=IWAE0018E Problems Opening Editor
-The_selected_input_is_not_valid_for_this_type_of_editor.__Redirecting_to_the_XML_editor_3_ERROR_=IWAE0019E The selected input is not valid for this type of editor.  Redirecting to the XML editor.
-REDIRECT_TEXT_EDITOR_UI_=The selected input is not valid for this type of editor.  Redirecting to the text editor.
-REDIRECT_TEXT_EDITOR_BINARY_PROJECT_UI_=The selected input is not valid for this type of editor.  For binary projects, you can open the editor read-only from the deployment descriptor node in the Project Navigator or J2EE Hierarchy view.  Redirecting to the text editor.
-Error_checking_out_files_10=Error checking out files
-Inconsistent_files_detected_11=Inconsistent files detected
-The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_=IWAE0020W The following files are inconsistent with the file system.\nDo you want to save and overwrite these files on the file system?
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_EXC_=IWAE0022E Non-project in selection
-Project_should_not_be_null_1_ERROR_=IWAE0023E Project should not be null
-Non-project_in_selection_2_ERROR_=IWAE0024E Non-project in selection
-Up_1=&Up
-Down_2=&Down
-Select_All_3=Select &All
-Deselect_All_4=D&eselect All
-Project_3=Project
-Enterprise_Application_Project_4=Enterprise application project:
-New_ejb_project_and__ear_project_cannot_have_the_same_non_default_location_5_UI_=New EJB project and  EAR project cannot have the same non default location
-New_ejb_project_and__ear_project_cannot_have_the_same_non_default_location_6_UI_=New EJB project and  EAR project cannot have the same non default location
-Project_already_exists,_enter_a_new_project_name_to_create_a_new_EJB_project_7_UI_=Project already exists, enter a new project name to create a new EJB project
-Project_already_exists,_enter_a_new_project_name_to_create_a_new_EAR_project_8_UI_=Project already exists, enter a new project name to create a new EAR project
-Jar_file_name_must_be_entered_9_UI_=JAR file name must be entered
-New_project_name__1=New project name:
-New_project_location__2=New project location:
-New_4=New
-Existing_5=Existing
-Existing_project_name__6=Existing project name:
-Select_Project_7=Select Project
-Project_does_not_exist_8=Project does not exist
-Not_a_project_9=Not a project
-Select_a_project_10=Select a project
-DefaultEAR_1=DefaultEAR
-Default13EAR_2=Default13EAR
-Enterprise_Application_Project_3=Enterprise application project:
-New_ejb_project_and_the_new_ear_project_cannot_have_the_same_non_default_location_4_ERROR_=IWAE0025E New EJB project and the new EAR project cannot have the same non default location
-New_project_location__1=New project location:
-MapInfoPath.applyPath()_-_Could_not_successfully_apply_path_1_EXC_=IWAE0026E MapInfoPath.applyPath() - Could not successfully apply path
-Enter_a_valid_name=Enter a valid {0} name
-The_non_default_location___1=The non default location: {0} for module {1} is in use.
-The_project_location_in_use_UI=The non default location: {0} for {1} is in use.
-Inconsistent_File_1=Inconsistent File
-Inconsistent_Files_3=Inconsistent Files
-The_following_workspace_files_are_inconsistent_with_the_editor_4=The following workspace files are inconsistent with the editor: \n
-Update_the_editor_with_the_workspace_contents__5=Update the editor with the workspace contents?
-The_following_workspace_file_is_inconsistent_with_the_editor_1=The following workspace file is inconsistent with the editor: {0} \n
-EAR_project_1=EAR project:
-EJB_project_2=EJB project
-EXPORT_SOURCE_ZIP_UI_=Also export a source ZIP file
-EAR_project_UI_=EAR project:
-Project_and_EAR_project_non_default_location_UI_=Project and EAR project cannot have the same non default location
-Invalid_non_default_location_UI_=Invalid non default location
-Project_Main_UI_=Project
-There_are_no_projects_available_that_match_the_selection_criteria._1=There are no projects available that match the selection criteria.
-Incompatible_EAR_and_Web_Project_Level_1=Incompatible EAR and Web Project Level
-You_have_selected_a_1.2_level_EAR.__Your_Web_Project_J2EE_level_will_be_changed_to_1.2.__Would_you_like_to_proceed_ERROR_2=IWAE0027E You have selected a 1.2 level EAR.  Your Web Project's J2EE level will be changed to 1.2.  Would you like to proceed?
-J2EE_Level_4=J2EE Level
-Project_1=Project
-J2EE_Level_2=J2EE Level
-Please_choose_a_J2EE_1.2_level_project_3=Please choose a J2EE 1.2 level project
-Please_choose_a_J2EE_1.3_level_project_4=Please choose a J2EE 1.3 level project
-Problems_Opening_Editor_2=Problems Opening Editor
-The_selected_input_is_not_valid_for_this_type_of_editor.__Redirecting_to_the_XML_editor._ERROR_=IWAE0028E The selected input is not valid for this type of editor.  Redirecting to the XML editor.
-Enterprise_Application_Project__2=Enterprise application Project:
-Context_root__3=Context root:
-CANT_IMPORT_TO_BINARY_PROJECT_UI_=Cannot import into the existing project "{0}" because the project is binary.
-One_or_more_referenced_Web_Library_Projects_do_not_exist=One or more Web Library Projects referenced by {0} do not exist or are closed.\n\nDo you want to continue without exporting these Web Library Projects?
-Warning_1=Warning
-Project_Doc_Root=Context root:
-NO_EAR_JARDEP_UI_=Project is not associated with an Enterprise Application project.
-The_description_property_of_the_identity_2=The description property of the identity
-The_role_name_property_of_the_identity_4=The role name property of the identity
-The_identity_of_the_run_as_specified_identity_2=The identity of the run as specified identity
-The_description_property_of_the_security_identity_2=The description property of the security identity
-Binary_Project_1=Binary Project
-Include_project_build_paths_and_meta-data_files_1=Include project build paths and meta-data files
-new_EAR_project_1=new EAR project
-_ERROR_The_jar_file_does_not_exist_2=IWAE0029E The JAR file does not exist
-_ERROR_The_J2EE_level_of_the_Jar_file_does_not_match_the_Project_level_3=IWAE0030E The J2EE level of the JAR file does not match the Project level
-_ERROR_The_J2EE_level_of_the_jar_file_does_not_match_the_Enterprise_Application_level_4=IWAE0031E The J2EE level of the JAR file does not match the Enterprise Application level
-The_action_cannot_be_performed_on_the_selection,_which_is_part_of_a_binary_project_UI_=The action cannot be performed on the selection, which is part of a binary project.
-destination_project_1=destination project
-CUSTOM_DELETE_MIX_MATCH_UI_=The custom J2EE delete options are not available for the selected J2EE projects.  The standard delete options will be used.
-PROJECT_NOT_ACCESSIBLE=The project {0} is not accessible.
-IMPORT_FAILED_UI_=Import Failed
-ERROR_READING_MANIFEST_DIALOG_TITLE=Error Reading Manifest
-SAVE_MANIFEST_WITH_ERROR=The manifest file contains errors and can not be parsed.  The file will be saved but the Java build path will not be updated.  Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR=The manifest file contains errors and can not be parsed.  Other pages cannot be used until these errors are corrected.  Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE=The manifest file contains errors and can not be parsed.  Following are common limitations which can cause problems:
-MANIFEST_PROBLEM_1=* Lines in the file must be no greater than 72 bytes. Continuation of long lines is indicated by a new line and a space.
-MANIFEST_PROBLEM_2=* The last line in the file must end with a new line or it will not be parsed.
-MANIFEST_PROBLEM_3=* Blank lines with extra white space may cause parse to fail.
-MANIFEST_PROBLEM_4=* The attributes must be formatted correctly.  Refer to the manifest and JAR file specification for more information.
-ERROR_OCCURRED_TITLE=Error
-ERROR_OCCURRED_MESSAGE=An internal error occurred performing the selected action.
-SAVE_ON_BINARY_PROJECT_TITLE_UI_=Binary Projects
-SAVE_ON_BINARY_PROJECT_MESSAGE_UI_=Cannot edit binary projects. All changes will be lost when you click OK. Are you sure you want to continue?
-The_JAR_file_does_not_exist=The JAR file does not exist.
-The_J2EE_level_of_the_Jar_file_does_not_match_the_Project_level._7=The J2EE level of the JAR file does not match the project level.
-Project_already_exists.=Project {0} already exists.
-Enterprise_Application_Project_does_not_exist.=Enterprise Application project {0} does not exist.
-Enterprise_Application_Project_name_must_be_specified.=Enterprise Application project name must be specified.
-An_Enterprise_Application_Project_with_the_name_already_exists_in_the_workspace.=Enterprise Application project {0} already exists.
-Context_Root_cannot_be_emp_UI_=Context Root cannot be empty
-Project_With_Same_Name_Exists_UI_=The project named \"{0}\" already exists.
-Use_default_label_1=Use default
-Must_be_an_J2EE13_EAR_Project_UI_=Must be an J2EE 1.3 level EAR Project
-Assembly_Application_Project_Suffix=EAR
-Assembly_EJBJAR_Project_Suffix=EJB
-Assembly_Web_Project_Suffix=Web
-Assembly_ClientJAR_Project_Suffix=Client
-Assembly_Connector_Project_Suffix=Connector
-Advanced..._UI=Advanced...
-Project_Location_UI_=Project location:
-DD_GENERAL_NAME=Deployment Descriptor
-Destination__1=Destination:
-Resource__2=Resource:
-The_file_does_not_exist._1=The file does not exist.
-Resource__2=Resource:
-Must_be_an_J2EE12_Module_Only_UI_=Must be a J2EE 1.2 Level module file only.
-Project_location__1=Project location:
-Project__1=Project:
-Browse..._2=Browse...
-New..._3=New...
-Invalid_EAR_For_Selected_Module=The J2EE level of the Enterprise Application project is not valid for the selected module file
-Invalid_Project_For_Selected_Module=The J2EE level of the destination project is not valid for the selected module file
-Invalid_EAR_Name_For_Project_Creation=The J2EE level of the exisiting EAR project: {0} does not match the J2EE level of the project being creation
-J2EEImportWizardPage1.EAR_project=EAR project:
-J2EEImportWizardPage1.The_file_does_not_exist=The file does not exist.
-NewJ2EEProjectCreationPage.Project_name=Project name:
-NewJ2EEProjectCreationPage.Project_location=Project location:
-NewJ2EEProjectCreationPage.EAR_project=EAR project:
-Proj_EAR_Proj_Name_Cannot_Be_Same_UI_=Project and EAR project names cannot be same
-Enable_Label_UI_=Enable server targeting support
-Disable_Label_UI_=Disable server targeting support
-Change_Module_Server_Target_Dialog_Message_UI_=EAR target server: "{0}" \nModule target server: "{1}"\n\nChange module target server to EAR target server?
-Change_EAR_Server_Target_Dialog_Message_UI_=Selected module target server: "{0}"\nExisting EAR target server: "{1}" \n\nChange EAR target server to selected module target server?
-CREATE_EJB_CLIENT_JAR_UI_=Create EJB client JAR projects for new EJB projects
-Change_Server_Target_Dialog_Title_UI_=Change Target Server
-Modify_Server_Target_Title_UI_=Modify Target Server
-Server_Target_UI_=Target server:
-Server_Target_Desc_UI_=Select a target server for the \"{0}\" project.
-Server_Target_Checkbox_Label_UI_=Update EAR modules and utility projects to the selected target server
-Server_Target_Change_Desc_UI_=The target server "{0}" of the existing EAR project "{1}" is incompatible \nwith the module project being created. \n\nDo you want to change the target server of the EAR project to the module target server:\n\n{2} ?
-EJB_CLIENT_RADIO_UI_=References to EJB JARs with EJB Client JARs
-USE_EJB_SERVER_JARs_UI_=Use EJB JARs
-USE_EJB_CLIENT_JARs_UI_=Use EJB client JARs
-USE_BOTH_UI_=Allow both
-EJB_CLIENT_JARS_UI_=EJB Client JARs
-JAR_DEPS_CLIENT_UI_=Java JAR Dependencies for references to EJB JARs:
-USE_EJB_JAR_UI=Use EJB JAR
-USE_EJB_JAR_DESC_UI=All referencing modules and JARs depend on the EJB JAR.  This is compatible with WebSphere 4.x, 5.x, and most application servers.
-USE_EJB_CLIENT_JAR_UI_=Use EJB Client JAR, if it exists
-USE_EJB_CLIENT_JAR_DESC_UI=All referencing modules and JARs depend on the EJB client JAR.  This is best practice, but is only compatibile with WebSphere 5.1 and any application servers that support EJB client JAR deployment.
-NONE_SERVER_TARGET_STRING_UI_=No target server specified
-Server_Invalid_For_Exisitng_EAR_UI_=Selected target server "{0}" is invalid for the existing EAR project "{1}"
-Cannot_Set_Server_Target_UI_=Could not set server target\n\n
-_UI_EJBLocalRef_localHome_feature=Local Home
-_UI_EJBLocalRef_local_feature=Local
-_UI_EJBLocalRef_type=Local Ref
-_UI_QName_type=QName:
-_UI_CompatibilityDescriptionGroup_description_feature=Description
-_UI_CompatibilityDescriptionGroup_description_feature_desc=
-_UI_CompatibilityDescriptionGroup_displayName_feature=Display name
-_UI_CompatibilityDescriptionGroup_displayName_feature_desc=
-_UI_CompatibilityDescriptionGroup_smallIcon_feature=Small icon
-_UI_CompatibilityDescriptionGroup_smallIcon_feature_desc=
-_UI_CompatibilityDescriptionGroup_largeIcon_feature=Large icon
-_UI_CompatibilityDescriptionGroup_largeIcon_feature_desc=
-MessageDestination_UI_=Message Destination
-MessageDestinationRefItemProvider_UI_0=MessageDestRef
-INCREMENTAL_DEPLOYMENT_LABEL=Perform Incremental Deployment
-GROUP_DEPLOYMENT_LABEL=Deployment
-
-_UI_QName_localPart_feature=Local Part
-_UI_QName_localPart_feature_desc=The QName local part.
-_UI_QName_namespaceURI_feature=Namespace URI
-_UI_QName_namespaceURI_feature_desc=The QName namespace URI
-Usage_UI_=Usage
-The_usage_property_UI_=The usage property
-_UI_ParamValue_description_feature=Description
-_UI_ParamValue_name_feature=Name
-_UI_ParamValue_value_feature=Value
-_UI_ParamValue_type=Param
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/eararchiveops.properties b/plugins/org.eclipse.jst.j2ee/property_files/eararchiveops.properties
deleted file mode 100644
index 975e16086..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/eararchiveops.properties
+++ /dev/null
@@ -1,35 +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
-###############################################################################
-#This properties file contains string for Archive operations of EARs
-
-
-ARCHIVE_OPERATION_SaveMofResources=Error occurred saving the metadata file.
-ARCHIVE_OPERATION_SaveFile=Error occurred saving the file.
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime.
-ARCHIVE_OPERATION_SaveManifest=Error occurred saving the manifest.
-ARCHIVE_OPERATION_FileNotFound=Error: File not found.
-ARCHIVE_OPERATION_FileContents=Core exception caught in getting file contents.
-ARCHIVE_OPERATION_ErroOccured=Error occurred.
-ARCHIVE_OPERATION_FilesFromProject=Unable to get files, modules, or utility JARs in the EAR.  Check log files.
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export.
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-IMPORT_MOFRESOURCE_STRING=Importing metadata..
-EAR_IMPORT_FILE_STRING=Importing file..
-ERROR_IMPORTING_EAR_FILE=Error importing EAR file.
-ERROR_EXPORTING_EAR_FILE=Error exporting EAR file.
-IMPORTING_EAR_FILE_UI_=Importing EAR file...
-
-Updating_project_classpath_UI_=Updating project classpaths...
-
-UNABLE_TO_LOAD_MODULE_ERROR_=IWAE0001E The module \" {0} \" in Enterprise Application project \" {1} \" could not be loaded.\n {2};
-_jar_UI_=.jar
-Updating_manifest_Class_Path__attributes_UI_=Updating manifest Class-Path: attributes
-_preDeploy_ERROR_=IWAE0002E {0}.preDeploy
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/earcreation.properties b/plugins/org.eclipse.jst.j2ee/property_files/earcreation.properties
deleted file mode 100644
index 4b8c07713..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/earcreation.properties
+++ /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
-###############################################################################
-Error_occured_getting_appl_ERROR_=IWAE0001E Error occurred getting appliction.xml:
-Error_occured_getting_appl1_ERROR_=IWAE0002E Error occurred getting application.xml:
-Creating__UI_=Creating:
-Creating_EAR_Project_UI_=Creating Enterprise Application project...
-The_project_already_exist_ERROR_=IWAE0003E The project already exist.
-EARProjectCreationOperatio_ERROR_=IWAE0004E EARProjectCreationOperation.getNewProject :
-ABS_PATH_CHANGED_UI_=The IBM extensions file contains deprecated absolute paths.  This can be auto-corrected and should be saved.  This will remove the paths from the file, and only needs to be done once.  Would you like to auto-correct?
-UNSAVED_CHANGES_WARN_=IWAE0005W Unsaved changes exist in Application.  Project: {0}
-PROJECT_MAP_PROBLEMS_ERROR_=IWAE0006E Problems exist in project mappings for one or more modules in Application.  Use Application editor to correct.  Project: {0}
-MODULE_PROJECTS_CLOSED_WARN_=IWAE0007W One or more module projects is closed. Enterprise Application project: {0}.
-Add_Module_Command_Label_UI_=Add Module
-Remove_Module_Command_Label_UI_=Remove Module
-
-Set_project_UI_=Set project
-Add_Utility_JAR_UI=Add Utility JAR
-REM_UTIL_JAR_UI=Remove Utility JAR
-PROJ_DESC_UPDATE_ERROR_UI_=IWAE0008E The project description could not be updated.
-Not_an_ear_project_UI_=Not an EAR project.
-EAR_PROJECT_MUST_BE_OPEN_UI_=An EAR project must be open and must exist for properties to be edited.
-Updating_absolute_paths_UI_=Updating absolute paths for the server runtime.
-DuplicateModuleNames=Duplicate module names : {0}
-NoModulesSelected=No module types selected.
-
-
-KEY_1=Project must be of type Web, EJB, Application client or Connector
-KEY_2=Module already exists.
-KEY_3=Selected project is closed.
-KEY_4=Select a project from the list.
-KEY_5=URI exists.
-KEY_6=Selected project is not a Java project.
-KEY_7=The uri must end with '.jar'.
-KEY_8=Utility JAR already exists.
-KEY_9=An open EAR project is required.
-KEY_10=URI cannot be empty.
-KEY_11=The module "{0}" is not an Application Client module.
-KEY_12=The module "{0}" is not an EAR module.
-KEY_13=The module "{0}" is not an EJB module.
-KEY_14=The module "{0}" is not a RAR module.
-KEY_15=The module "{0}" is not a WAR module.
-KEY_16=The selected server target is not valid for the specified EAR component. The selected server may not support EAR component.
-EARImportDataModel_UI_0=The specified project name \" {0} \" for archive \" {1} \" already exists. Choose a different name.
-EARImportDataModel_UI_1=Colliding project name \" {0} \" between EAR project name and \" {1} \" archive.
-EARImportDataModel_UI_1a=Colliding case insensitive project names \" {0} \", \" {1} \" between EAR project name and \" {2} \" archive.
-EARImportDataModel_UI_2=Colliding project name \" {0} \" between archives \" {1} \" and \" {2} \".
-EARImportDataModel_UI_2a=Colliding case insensitive project names \" {0} \", \" {1} \" between archives \" {2} \" and \" {3} \".
-EARImportDataModel_UI_3=The specified project name \" {0} \" already exists. Choose a different name.
-EARImportDataModel_UI_4=The nested archive \" {0} \" could not be loaded because it has errors and can not be imported as a project.  Check the error log for details.
-ModuleMappingImpl_UI_0=projectName: {0}
-UtilityJARMappingImpl_UI_0=projectName: {0}, uri: {1}
-importWrongType=The specified project \" {0} \" is not the correct J2EE type.
-importWrongVersion=The specified project \" {0} \" is not J2EE version compatible with the specified archive.
-EAR_PROJECTNAME_SAMEAS_MODULE=The EAR Project name cannot be same as the Project Name.
-
-
-#J2EE Utility Import strings
-J2EEUtilityJarListImportOperation_UI_Import_Utility_Jars=Import Utility Jars
-J2EEUtilityJarListImportOperation_UI_Preparing_to_import=Preparing to import utility jars...
-J2EEUtilityJarListImportOperation_UI_2=Problem importing Utility Jar
-J2EEUtilityJarListImportDataModel_0=Invalid path location.
-J2EEUtilityJarListImportDataModel_Specify_Valid_Project=Please specify a valid Enterprise Application Project.
-J2EEUtilityJarListImportDataModel_Select_Jar=Please select one or more Utility Jars.
-J2EEUtilityJarListImportDataModel_Specify_Linked_Path=Please specify a non-empty value for the Linked Path Variable name.
-J2EEUtilityJarListImportDataModel_Linked_Path_Exists=A Linked Path Variable with the given name already exists. \nThe path has been updated accordingly.
-J2EEUtilityJarListImportOperation_There_were_no_utility_jars_selected=There were no utility jars selected.
-
-
-
-CreateProjectWithLinkedJarOperation_Cannot_link_utility_jar_into_a_clos_=Cannot link utility jar into a closed project.
-CopyArchiveIntoProjectOperation_Found_existing_file_0_=Found existing file "{0}".
-CreateProjectWithLinkedJarOperation_File_already_exists_0_=File already exists\: "{0}".
-CopyArchiveIntoProjectOperation_Copying_archive_into_selected_proje_=Copying archive into selected project\: "{0}".
-CreateProjectWithLinkedJarOperation_Creating_project_with_linked_archiv_=Creating project with linked archive\: "{0}".
-LinkArchiveIntoProjectOperation_Linking_archive_into_selected_proje_=Linking archive into selected project\: "{0}".
-CreateProjectWithExtractedJarOperation_Create_project_with_extracted_conte_=Create project with extracted contents\: "{0}".
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/ejbarchiveops.properties b/plugins/org.eclipse.jst.j2ee/property_files/ejbarchiveops.properties
deleted file mode 100644
index 9bb668d46..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/ejbarchiveops.properties
+++ /dev/null
@@ -1,38 +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
-###############################################################################
-#This properties file contains string for Archive operations of EARs,EJBs and Application Clients.
-
-ARCHIVE_OPERATION_SaveMofResources=Error occured saving the metadata file.
-ARCHIVE_OPERATION_SaveFile=Error occured saving the File..
-ARCHIVE_OPERATION_ProjectNature=Error getting project nature runtime..
-ARCHIVE_OPERATION_SaveManifest=Error occured saving the manifest..
-ARCHIVE_OPERATION_FileNotFound=Error: File not found
-ARCHIVE_OPERATION_FileContents=Core exception caught in gettting file contents..
-ARCHIVE_OPERATION_ErroOccured=Error occured...
-ARCHIVE_OPERATION_FilesFromProject=Unable to get files from the project..
-ARCHIVE_OPERATION_OpeningArchive=Error opening archive for export..
-ARCHIVE_OPERATION_InvalidEJBJar=The JAR file is not a valid EJB JAR
-ARCHIVE_OPERATION_InvalidImportEJBJar=The import file is not a valid EJB JAR
-ARCHIVE_OPERATION_ImportOperation=Import Operation Failed!
-EJB_IMPORT_OPERATION_STRING=Importing EJB JAR..
-EJB_IMPORT_FILE_STRING=Importing file..
-IMPORT_MOFRESOURCE_STRING=Importing meta-data..
-IMPORT_OPERATION_STRING=Importing JAR..
-ERROR_COPYING_FILES_FROM_ORIGINAL_JAR=An error occurred copying files from the original EJB JAR file
-ERROR_IMPORTING_MODULE_FILE=Error importing Module File
-Yes_UI=Yes
-No_UI=No
-Yes_To_All_UI=Yes to All
-Cancel_UI_=Cancel
-Error_exporting__UI_=Error exporting
-EJB_Jar_File_UI_=EJB JAR File
-Copy_Dep_JARS_UI=Copy Dependent JARs
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/erefvalidation.properties b/plugins/org.eclipse.jst.j2ee/property_files/erefvalidation.properties
deleted file mode 100644
index 87438d37c..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/erefvalidation.properties
+++ /dev/null
@@ -1,78 +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
-###############################################################################
-#This properties file hold all the externalised strings for eTools J2EE Validation project
-# Validation project
-#
-# Messages should be according to the format at:
-#     http://hany.austin.ibm.com/messages/index.html
-#
-# Briefly:
-#     MESSAGE_ID=<ComponentPrefix><MessageNumber><TypeCode>: <MessageText>
-#
-# The prefix for this component is:
-#     CHKJ (IBM WebSphere Validation)
-#
-# Note the ": " that appears between the type code and the message text.
-#
-# :Begin: WebSphere Quality Validation Information :Begin:
-#COMPONENTPREFIX CHKJ
-#COMPONENTNAMEFOR CHKJ IBM WebSphere Validation
-#CMVCPATHNAME ncf/src/java/com/ibm/websphere/validation/erefvalidation.properties
-# :End: WebSphere Quality Validation Information :End:
-#
-# 14-October-2001:
-#
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFNAME=CHKJ3009E: In module {1}, ''ejb-ref-name'' element in  ejb-ref: {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: In module {1}, ''ejb-ref-type'' element in ejb-ref: {0} is invalid.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: In module {1}, ''ejb-ref-type'' element in ejb-ref: {0} is missing.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: In module {1}, Home interface is missing from ejb-ref: {0} element.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: In module {1}, Remote interface is missing from ejb-ref: {0} element.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' element {0} defines the ''role-link'' element but no ''security-role'' elements in the application descriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: Duplicate ''resource-ref'' element named {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W EJB link element {0} is unresolvable in module {1} and EAR {2}.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: Duplicate ''service-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: Duplicate ''security role-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: Duplicate ''ejb-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: Duplicate ''resource environment-ref'' element named {0}.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: Duplicate ''message destination-ref'' element named {0}.
-ERROR_EAR_MISSING_MESSSAGEDESTINATION=Message destination link ''{0}'' for message destination ref ''{1}'' is unresolvable in module ''{2}'' and EAR ''{3}''.
-ERROR_UNRESOLVED_MDB_MISSING_MESSAGE_DESTINATION=Message destination link ''{0}'' of MDB ''{1}'' is unresolvable in module ''{2}'' and EAR ''{3}''.
-ERROR_EAR_MISSING_EMPTY_MESSSAGEDESTINATION=Message destination link is empty for message destination ref ''{0}'' in module ''{1}'' and EAR ''{2}''.
-ERROR_MODULE_DD_FILE_NOT_FOUND=The deployment descriptor of the module ''{0}'' cannot be loaded.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/j2ee_common.properties b/plugins/org.eclipse.jst.j2ee/property_files/j2ee_common.properties
deleted file mode 100644
index fe3870039..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/j2ee_common.properties
+++ /dev/null
@@ -1,41 +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
-###############################################################################
-ERR_SECURITY_ROLE_EMPTY=The role name cannot be empty.
-ERR_SECURITY_ROLE_EXIST=The security role named "{0}" already exists.
-ERR_JAVA_CLASS_NAME_EMPTY=The class name cannot be empty.
-ERR_JAVA_CLASS_NAME_EXIST=The class already exists in the package.
-ERR_JAVA_CLASS_FILE_NAME_EXIST=File with same name but different case exists.
-ERR_JAVA_CLASS_FOLDER_NAME_EMPTY=The source folder cannot be empty.
-ERR_JAVA_CLASS_FOLDER_PROJECT_NOT_OPEN=The project is not open.
-ERR_JAVA_CLASS_NOT_JAVA_PROJECT=Not a Java project.
-ERR_JAVA_CLASS_FOLDER_STATIC_PROJECT=Cannot be a static web project.
-ERR_JAVA_CLASS_FOLDER_NOT_SOURCE=Not a Java source folder.
-ERR_JAVA_CLASS_NAME_QUALIFIED=Do not use qualified class name.
-ERR_JAVA_CLASS_NAME_INVALID=Invalid Java class name:
-ERR_JAVA_CLASS_NAME_WARNING=Warning:
-ERR_JAVA_CLASS_SUPERCLASS_NOT_EXIST=The super class does not exist.
-ERR_JAVA_CLASS_SUPERCLASS_FINAL=The super class cannot be a final class.
-ERR_JAVA_PACAKGE_NAME_INVALID=Invalid Java package name:
-ERR_JAVA_PACKAGE_NAME_WARNING=Warning:
-ERR_BOTH_FINAL_AND_ABSTRACT=Class cannot be both final and abstract.
-WebServiceClientGenerator_UI_0=Generic J2EE Container
-ERR_SECURITY_ROLE_LIST_EMPTY=The list of security roles to be removed cannot be empty.
-
-ERR_JAVA_CLASS_FOLDER_NOT_EXIST=The source folder does not exist.
-
-ERR_EMPTY_MODULE_NAME=Module name cannot be empty.
-ERR_EMPTY_PROJECT_NAME=Project cannot be empty.
-ERR_PROJECT_NAME_EXISTS=Project name already exists.
-ERR_VERSION_NOT_SUPPORTED=This version is not supported by the server.
-ERR_NOT_SUPPORTED=Not supported by the server.
-ERR_JAVA_CLASS_FOLDER_NOT_ABSOLUTE=Source folder path must be a workspace relative absolute path.
-
-J2EE_MODULE_CLASSPATH_CONTAINER_NAME=EAR Libraries
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/j2eecreation.properties b/plugins/org.eclipse.jst.j2ee/property_files/j2eecreation.properties
deleted file mode 100644
index 933280ba0..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/j2eecreation.properties
+++ /dev/null
@@ -1,143 +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
-###############################################################################
-Creating__UI_=Creating:
-Error_creating_an_EAR_proj_UI_=Error creating an Enterprise Application project.
-JdkJarFileDoesNotExist_UI=The file {0} does not exist.
-APP_PROJECT_ERROR_EXC_=IWAE0001E An error occurred accessing the Enterprise Application project.
-UNKNOWN_UI_=??
-Creating_Java_Project_UI_=Creating Java Project
-Errors_occurred_deleting_module_dependencies_UI_=Errors occurred deleting module dependencies.
-Can_not_remove_module_dependency_from_project_UI_=Can not remove module dependency from project {0} because the project is binary.
-Errors_occurred_renaming_module_dependencies_UI_=Errors occurred renaming module dependencies.
-Can_not_rename_module_dependency_from_project_UI_=Can not rename module dependency from project {0} because the project is binary.
-
-J2EE_PROJECT_MIGRATION_TITLE_UI_=J2EE Project Migration
-ENTERPRISE_APPLICATIONS_UI_=Enterprise Applications
-WIZ_BAN_DESC_UI_=Select the {0} projects to be migrated.  If needed, the project structures will be migrated.
-ENTERPRISE_APP_PROJECTS_UI_=Enterprise application projects:
-MIGRATE_J2EE_SPEC_UI_=Migrate project from version level J2EE 1.2 to J2EE 1.3
-MIGRATE_EJB_SPEC_UI_=Migrate project from version level EJB 1.1 to EJB 2.0
-MIGRATE_MODULE_PROJECTS_UI_=Migrate module projects
-APPLICATION_CLIENTS_UI_=Application Clients
-APPLICATION_CLIENT_PROJECTS_UI_=Application client projects:
-ENTERPRISE_BEANS_BAN_UI_=Enterprise Beans
-EJB_PROJECTS_UI_=EJB projects:
-ADD_LOCAL_CLIENT_VIEWS_CHECK_UI_=Add local client views
-MIGRATE_CMP_BEANS_UI_=Migrate CMP 1.1 beans to CMP 2.0 beans
-ADD_LOCAL_CLIENT_VIEWS_BAN_UI_=Add Local Client Views
-SELECT_EJB_CLIENT_VIEWS_UI_=Select the enterprise beans that will have local client views added.
-ENTERPRISE_BEANS_LIST_UI_=Enterprise beans:
-DELETE_REM_CLIENT_VIEWS_UI_=Delete remote client views
-LOCAL_CLIENT_VIEW_SCHEME_UI_=Local client view naming scheme:
-REUSE_DELETED_CLIENT_VIEW_NAME_UI_=Reuse the deleted remote client view name
-SPECIFY_SUFFIX_UI_=Specify suffix:
-SUFFIX_EXAMPLE_UI_=(For example, enterprise bean \'foo\' will have local client views named: \'fooLocal\' and \'fooLocalHome\'.)
-MIGRATION_SUCCESS_REPORT_UI_=Migration finished successfully.
-MIGRATION_WARNINGS_REPORT_UI_=Migration finished with warnings; see log files for details.
-MIGRATION_ERRORS_REPORT_UI_=Migration finished with errors; see log files for details.
-PROJECT_STRUCTURE_SUCCESS_UI_=Project structure migration successful: {0}.
-PROJECT_STRUCTURE_FAILED_UI_=Project structure migration failed: {0}.
-PROJECT_NOT_NEED_MIGRATION_UI_=Project structure did not need migration: {0}.
-J2EE_VERSION_SUCCESS_UI_=J2EE version level migration successful: {0}.
-J2EE_VERSION_FAILED_UI_=J2EE version level migration failed: {0}.
-J2EE_VERSION_NOT_NEED_MIGRATION_UI_=J2EE version level did not need migration: {0}.
-LOCAL_CLIENT_ADD_SUCCESS_UI_=Local client views added successfully: {0}.
-LOCAL_CLIENT_ADD_FAILED_UI_=Local client views failed on add: {0}.
-LOCAL_CLIENT_VIEWS_EXIST_UI_=Local client views already exist: {0}.
-REMOTE_CLIENT_DELETE_SUCCESS_UI_=Remote client views deleted successfully: {0}.
-REMOTE_CLIENT_DELETE_FAILED_UI_=Remote client views failed on delete: {0}.
-REMOTE_CLIENT_VIEWS_NOT_EXIST_UI_=Remote client views did not exist: {0}.
-JAR_11_IMPORT_20_UI_=The 1.1 JAR is being imported into an EJB 2.0 module.  The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-CMP_11_IMPORT_20_UI_=The following CMP 1.1 beans are being imported into an EJB 2.0 module. The deployment descriptor will be converted, but the CMP beans remain version 1.1.
-OLD_PROJECT_STRUCTURE_UI_=The J2EE project {0} has an old project structure, and should be migrated.
-PROJECT_MUST_BE_SELECTED_UI_=A {0} project must be selected.
-ENTERPRISE_APPLICATION_UI_=enterprise application
-APPLICATION_CLIENT_UI_=application client
-EJB_UI_=EJB
-WEB_UI_=WEB
-EJB_MUST_BE_SELECTED_UI_=An enterprise bean must be selected.
-MIGRATE_UI_=Migrate...
-MIGRATE_J2EE_PROJECTS_UI_=Migrate J2EE Projects...
-OPEN_J2EE_MIGRATION_WIZARD_UI_=Open J2EE Migration Wizard...
-MIGRATING_PROJECT_STRUCTURES_UI_=Migrating project structure...
-MIGRATING_J2EE_VERSION_UI_=Migrating project J2EE version level...
-ADDING_LOCAL_CLIENT_VIEWS_UI_=Adding local client views...
-DELETING_REMOTE_CLIENT_VIEWS_UI_=Deleting remote client views...
-MIGRATION_NOT_NEEDED_REPORT=Migration was not needed for the selected items.
-MIGRATION_NOT_POSSIBLE_REPORT=Migration was not possible for the selected items.
-SOURCE_FOLDER_RENAME_FAILED=Unable to rename the Java source folder {0}.
-SOURCE_FOLDER_RENAME_SKIPPED=The Java source folders are not renamed when there is more than one source folder.
-WEBCONTENT_FOLDER_RENAME_FAILED=Unable to rename the web content folder {0}.
-WEBCONTENT_FOLDER_RENAME_SKIPPED=The web content folder {0} not renamed.
-WEBPROJECT_VERSION_MIGRATE_FAILED=Unable to migrate the web project version.
-ABS_PATHS_APP_EXT_REMOVED=Absolute paths were removed from the application extensions file in enterprise application project {0}.
-PROJECT_REFERENCES_UPDATED=Project references were updated in enterprise application project {0}.
-PROJECT_CLASSPATH_UPDATED=Project Java build path was updated for project {0}.
-FAILED_MIGRATING_IMPORTED_CLASSES=Unable to migrate the imported_classes JAR file.  Exception: {0}
-EXTRACTED_IMPORTED_CLASSES=Imported classes were extracted from file {0}.
-IMPORTED_CLASSES_FILE_DELETED=Imported classes file {0} was deleted.
-BACKEND_MIGRATION_FAILED=Unable to migrate the Map and Schema file structure in project {0}
-BINARY_MIGRATION_FAILED=Unable to migrate binary project {0}.
-COMPLETED_BACKEND_MIG=The backend (Map and Schema) meta-data of the {0} project migrated successfully.
-NOT_NEEDED_DEPLOYMENT_DESC_MIG=The deployment descriptor was not found in the project {0}.
-NOT_NEEDED_BACKEND_MIG=The old backend (Map and Schema) structure was not found in the project {0}.
-MIGRATION_COMPLETE=Migration Complete
-MIGRATION_ERRORS=Migration Errors
-MIGRATION_NOT_NEEDED=Migration Not Needed
-CONFIRMATION_TITLE=Confirm Migration
-OPEN_EDITORS_TITLE=Open Editors
-CONFIRM_MIGRATE_PROJECT_STRUCTURE=This will migrate the project structure for the selected items to the latest format.  Continue?
-CONFIRM_MIGRATE_J2EE_13=This will migrate the project structure for the selected items if necessary, and migrate the J2EE version of the selected items from 1.2 to 1.3.  Continue?
-INFORM_OPEN_EDITORS=Open editors exist in the workbench.  Please close all editors before running migration.
-WEBCONTENT_LIBPATH_UPDATE_FAILED=Unable to remove JAR file from classpath.
-FAILED_DEPLOY_DELETE=Failed deleting deploy code in {0} project.
-COMPLETED_DEPLOY_DELETE=Completed delete of deploy code in {0} project.
-FAILED_LOCAL_CLIENT_CREATE=Failed creating local client view for {0}.
-COMPLETED_LOCAL_CLIENT_CREATE=Completed creation of a local client view for {0}.
-COMPLETED_CMP20_CODEGEN=Completed CMP 2.0 code generation in {0} project.
-LOCAL_CLIENT_NOT_NEEDED=A local client view was not created since one already exists for {0}.
-INVALID_SELECTION_TITLE=Invalid Selection
-INFORM_PROPER_SELECTION=Selection must be one enterprise application project or any combination of EJB, web, and application client module projects.
-REQUIRED_CLIENT_VIEW_TITLE=Client View Required
-CONFIRM_CLIENT_VIEW_REQUIRED=The following beans are required to have client views because of inheritance or relationship rules.  These beans will be automatically selected and client views will be generated.
-FILES_OUT_OF_SYNC=Cannot migrate because some resources are out-of-sync with the file system in project {0}.  Refresh the project and try again.
-DeleteModuleOperation_UI_0=No Projects to delete
-ResourceReferenceDataModel_UI_0=Type must be indicated.
-ResourceReferenceDataModel_UI_1=Authentication must be indicated.
-ReferenceDataModel_UI_3=No Owner for the reference has been indicated.
-ReferenceDataModel_UI_5=Reference name cannot be empty.
-ReferenceDataModel_UI_6=Reference name already exists.
-ServiceReferenceDataModel_ERROR_8=IWAE0041E A target Web Service must be selected.
-EJBReferenceDataModel_UI_10=Selected target EJB does not have local interfaces.
-EJBReferenceDataModel_UI_11=Selected target EJB does not have remote interfaces.
-EJBReferenceDataModel_UI_12=Target bean must be selected.
-PortComponentReferenceDataModel_ERROR_4=IWAE0042E Service Endpoint Interface must be indicated.
-MessageDestReferenceDataModel_7=Type must be indicated.
-MessageDestReferenceDataModel_8=Usage must be indicated.
-MessageDestReferenceDataModel_9=Link must be unique within EAR.
-ResourceEnvironmentReferenceDataModel_2=Type must be selected.
-RenameModuleOperation_UI_0=No Projects to rename.
-ServerTargetDataModel_UI_7=There are no available target servers.
-ServerTargetDataModel_UI_8=A target server must be set.
-ServerTargetDataModel_UI_9=Invalid target server selected.
-InvalidCharsError=Invalid character #.
-Remote_cannot_be_empty_UI_=Remote interface cannot be empty.
-Home_cannot_be_empty_UI_=Home interface cannot be empty.
-Local_home_cannot_be_empty_UI_=Local home interface cannot be empty.
-Local_cannot_be_empty_UI_=Local interface cannot be empty.
-
-USE_REMOTE_FOR_DIFFERENT_EAR=Best practice is to create 'remote' reference for an EJB if it's in different EAR.
-USE_LOCAL_FOR_DIFFERENT_EAR=Best practice is to create 'local' reference for an EJB if its in same EAR.
-TARGET_ALSO_EXIST_IN_SAME_EAR=The selected  EJB was detected in ''{0}'' EAR which contains the ''{1}'' module project . Did you mean to select the EJB from the ''{0}'' EAR?
-APP_CLIENT_ONLY_HAVE_REMOTE=Application client module can only have remote references.
-J2EE_1_2_ONLY_HAVE_REMOTE=J2EE 1.2 modules can only have remote references.
-COMPONENT_ALREADYINEAR=The specified component name is already in the EAR.
-VERSION_NOT_SUPPORTED=The selected runtime does not support the version of the archive. 
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/j2eewtpplugin.properties b/plugins/org.eclipse.jst.j2ee/property_files/j2eewtpplugin.properties
deleted file mode 100644
index f333358aa..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/j2eewtpplugin.properties
+++ /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
-###############################################################################
-Could_not_find_root_object_ERROR_=IWAE0001E Could not find root object in resource: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0002E An error occurred while saving.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0003E Cannot run J2EEUIWorkingCopyManager operation because the Workspace tree is locked.
-Unable_to_save_read_only_f_ERROR_=IWAE0004E Unable to save read-only file: {0}
-The_following_resources_ne_UI_=The following resources need to be saved but are currently shared, do you want to save now?
-Cannot_load_EJBFile_because_EJBEditModel_is_null_UI_=Cannot load EJBFile because EJBEditModel is null
-WARNING_METAFOLDER_MISSING_UI_=WARNING_METAFOLDER_MISSING
-Cannot_load_EJBFile_because_ejbNature_asEJBJarFile___returns_null_UI_=Cannot load EJBFile because ejbNature.asEJBJarFile() returns null
-EJBProjectResources_getEJBJar_EJBEditModel__UI_=EJBProjectResources.getEJBJar(EJBEditModel)
-Cannot_load_EJBJar_because_model_is_null_UI_=Cannot load EJBJar because model is null
-Cannot_load_EJBFile_because_EJBNatureRuntime_is_null_UI_=Cannot load EJBFile because EJBNatureRuntime is null
-WARNING_FILE_MISSING_UI_=WARNING_FILE_MISSING
-CoreException_could_not_initialize_Web_Service_class_path_variables_ERROR_=IWAE0005E CoreException could not initialize Web Service class path variables
-__Start_build_project_INFO_=IWAE0006I : Start build project
-__Bad_builder_order_for_project_INFO_=IWAE0007I : Bad builder order for project
-__No_imported_classes_folder__quitting_INFO_=IWAE0008I : No imported classes folder, quitting
-__Full_first_build_INFO_=IWAE0009I : Full/first build
-__Considering_delta_INFO_=IWAE0010I : Considering delta
-__Delta_build_INFO_=IWAE0011I : Delta build
-Minimizing_project_UI_=Minimizing project
-No_library_folder_UI_=No library folder
-Not_a_J2EE_project_UI_=Not a J2EE project
-No_source_types_UI_=No source types
-Some_source_types_have______in_their_name_ERROR_=IWAE0012E Some source types have \'$\' in their name
-RAR_File=RAR File
-Error_opening_archive_for_export_2=Error opening archive for export
-Error_getting_project_nature_runtime_3=Error getting project nature runtime
-Error_occurred_loading_ra_xml__4=Error occurred loading ra.xml:
-Creating_Connector_Project_5=Creating Connector Project
-Error_getting_project_nature_runtime_6=Error getting project nature runtime
-Error_occurred_saving_the_manifest_7=Error occurred saving the manifest
-_UI_ParamValue_type=Param:
-J2EEModulePostImportHelper_0=WEB
-J2EEModulePostImportHelper_1=EJB
-J2EEModulePostImportHelper_2=ApplicationClient
-J2EEModulePostImportHelper_3=Connector
-J2EEDeployOperation_UI_0=Deploying selected modules
-J2EEDeployOperation_UI_1=Fatal Exception occured
-J2EEDeployOperation_UI_Null_Status=Deployed successfully.
-J2EEDeployOperation_1_UI_=Deploying {0} Using {1}
-J2EEDeployOperation_2_UI_=Deployment from {0} completed successfully
-J2EEDeployOperation_3_UI_=Deployment from {0} had errors: {1} \r\n
-J2EEDeployOperation_4_UI_=Deploying {0}
-NESTED_JAVA_OUTPUT_ERROR=Nested Java output paths defined in .wtpmodules file are not allowed.
-_UI_ParamValue_type=Param
-
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/javacodegen.properties b/plugins/org.eclipse.jst.j2ee/property_files/javacodegen.properties
deleted file mode 100644
index 94b1a7d30..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/javacodegen.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-No_source_package_fragment_EXC_=IWAE0001E No source package fragment root could be found.
-Specified_root_is_not_a_so_EXC_=IWAE0002E Specified root is not a source root.
-Project_name_not_specified_EXC_=IWAE0003E Project name not specified.
-An_analysis_import_can_onl_EXC_=IWAE0004E An analysis import can only be executed during run().
-If_this_generation_continu_WARN_=IWAE0005W If this generation continues, the Java source file \"{0}\" will be overwritten.
-Java_generation_requires_a_EXC_=IWAE0006E Java generation requires a JavaTopLevelGenerationHelper.
-The_prepare_method_can_o_EXC_=IWAE0007E The prepare() method can only be called during run().
-Member_generator_does_not__EXC_=IWAE0008E Member generator does not have a declaring type generator.
-Enclosing_compilation_unit_EXC_=IWAE0009E Enclosing compilation unit generator not found.
-Renames_of_main_types_are__EXC_=IWAE0010E Renames of main types are only supported in the Java code generation framework via a compilation unit rename.
-The_field_will_not_gen_INFO_=IWAE0011I The field \"{1}\" will not be generated because a non-generated field with the same name already exists.
-The_field_will_not_del_INFO_=IWAE0012I The field \"{0}\" will not be deleted because it is not marked generated.
-The_method_will_not_gen_INFO_=IWAE0013I The method \"{1}\" will not be generated because a non-generated method with the same signature already exists.
-The_method_will_not_del_INFO_=IWAE0014I The method \"{0}\" will not be deleted because it is not marked generated.
-The_type_will_not_gen_INFO_=IWAE0015I The type \"{1}\" will not be generated because a non-generated type with the same name already exists.
-The_type_will_not_del_INFO_=IWAE0016I The type \"{0}\" will not be deleted because it is not marked generated.
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/projectsupport.properties b/plugins/org.eclipse.jst.j2ee/property_files/projectsupport.properties
deleted file mode 100644
index 613459297..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/projectsupport.properties
+++ /dev/null
@@ -1,45 +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
-###############################################################################
-Creating_Web_Project____UI_=Creating Web Project...
-The_path_for_the_links_sta_EXC_=IWAE0001E The path for the links state file is incorrect
-Syntax_Error_in_the_links_UI_=Syntax Error in the links state file
-Error_while_saving_links_s_EXC_=IWAE0002E Error while saving links state file
-Operation_failed_due_to_SA_ERROR_=IWAE0003E Operation failed due to SAX error:
-Operation_failed_due_to_IO_ERROR_=IWAE0004E Operation failed due to IO error:
-Operation_failed_due_to_Co_ERROR_=IWAE0005E Operation failed due to Core error:
-Operation_failed_due_to_Ja_ERROR_=IWAE0006E Operation failed due to Java Model error:
-_1concat_EXC_=IWAE0007E Error occured getting web.xml: {0}
-Error_importing_Module_Fil_EXC_=IWAE0008E Error importing Module File
-Cannot_clone_TaglibInfo_1_EXC_=IWAE0009E Cannot clone TaglibInfo
-Could_not_read_TLD_15=Could not read TLD
-File_Serving_Enabler_7=File Serving Enabler
-Auto_Generated___File_Enabler_9=Auto Generated - File Enabler
-Generated_by_Web_Tooling_23=Generated by Web Tooling
-Not_a_web_project_29=Not a web project
-A_web_project_must_be_open_and_must_exist_for_properties_to_be_edited_30=A web project must be open and must exist for properties to be edited
-Invalid_Servlet_Level_set_on_WebNature_3_EXC_=IWAE0010E Invalid Servlet Level set on WebNature
-Context_Root_cannot_be_empty_2=Context Root cannot be empty
-Names_cannot_begin_or_end_with_whitespace_5=Names cannot begin or end with whitespace
-Names_cannot_contain_whitespace_=Context Root cannot contain whitespace 
-The_character_is_invalid_in_a_context_root=The character ''{0}'' is invalid in a context root.
-Folder_name_cannot_be_empty_2=Folder name cannot be empty
-Folder_names_cannot_be_equal_4=Folder names cannot be equal
-Folder_name_cannot_be_the_same_as_Java_source_folder_5=Folder name cannot be the same as Java source folder
-Folder_name_cannot_be_the_same_as_Java_class_folder_6=Folder name cannot be the same as Java class folder
-Folder_name_is_not_valid=Folder name {0} is not valid
-Could_not_rename_____2=Could not rename: ''{0}'' already exists.
-Sync_WLP_Op=Synchronizing Web Library Projects\n\t
-Target_Update_Op=Updating target server for {0}\n\t
-Set_ClassPath__UI_=Set ClassPath:
-Update_ClassPath__UI_=Update ClassPath:
-Catalog_Lib_Directory__UI_=Catalog Lib Directory:
-Sychronize_Class_Path_UI_=Sychronize Class Path
-UNABLE_TO_LOAD_MODULE_ERROR_=UNABLE_TO_LOAD_MODULE_ERROR_
diff --git a/plugins/org.eclipse.jst.j2ee/property_files/refactor.properties b/plugins/org.eclipse.jst.j2ee/property_files/refactor.properties
deleted file mode 100644
index 5999e1440..000000000
--- a/plugins/org.eclipse.jst.j2ee/property_files/refactor.properties
+++ /dev/null
@@ -1,21 +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:
-#   BEA Systems, Inc. - initial API and implementation
-###############################################################################
-#This properties file contains string for refactoring logic
-
-pre_delete_not_received_for_removed=Missed PRE_DELETE event for removed project {0}, unable to update dependencies.
-pre_delete_not_received_for_renamed=Missed PRE_DELETE event for renamed project {0}, unable to update dependencies.
-invalid_property_name=Invalid property name: {0}
-task_name=Project refactoring
-missing_natures=Refactored project does not have either the ModuleCoreNature or JavaNature
-error_reading_manifest=Error reading manifest
-error_updating_project_on_delete=Error updating dependencies for deleted J2EE project {0}
-error_updating_project_on_rename=Error updating dependencies for renamed J2EE project {0}
-error_updating_server=Error updating server {0} on refactor of project {1}
diff --git a/plugins/org.eclipse.jst.j2ee/pushforpii.xml b/plugins/org.eclipse.jst.j2ee/pushforpii.xml
deleted file mode 100644
index a27d1e144..000000000
--- a/plugins/org.eclipse.jst.j2ee/pushforpii.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<project name="Translate" default="main" basedir=".">
-
-
-	<!-- Setup temp variables -->
-	<target name="init">
-		<!-- If the user specifies a value for these variables, it overrides the values set in this target -->
-		<property name="input.dir" value="D:\NLS\Corona\TVTReturns" />
-		<property name="output.dir" value="D:\NLS\Corona\TVTProcessed" />
-		<property name="v" value="true"/>
-		<property name="WAS" value="WAS"/>
-		<property name="WSAD" value="WSAD"/>
-		<property name="product" value="${WSAD}"/>
-		
-		<taskdef name="goNative"
-                 classname="com.ibm.etools.ant.tasks.GoNative"
-                 classpath="D:\eclipse-SDK-3.0-win32\eclipse\plugins\com.ibm.rtp.tools_3.0.0\lib\tools.jar"/>
-		
-		<!-- Plugin vars -->
-		<property name="emf.workbenchui.nl1" value="com.ibm.etools.emf.workbench.ui.nl1"/>
-		<property name="j2eecore" value="com.ibm.etools.j2ee.core"/>
-		<property name="j2ee.snippets.nl1" value="com.ibm.etools.j2ee.reference.snippets.nl1"/>
-		<property name="j2ee.ui.nl1" value="com.ibm.etools.j2ee.ui.nl1"/>
-		<property name="project.interchange.nl1" value="com.ibm.etools.project.interchange.nl1"/>
-		<property name="validation.nl1" value="com.ibm.etools.validation.nl1"/>
-		<property name="validation.core" value="com.ibm.etools.validation.core"/>
-		<property name="validation.ui.nl1" value="com.ibm.etools.validation.ui.nl1"/>
-		<property name="wtp.activites.nl1" value="com.ibm.wtp.activities.nl1"/>
-		<property name="annotations.controller.nl1" value="com.ibm.wtp.annotations.controller.nl1"/>
-		<property name="annotations.core.nl1" value="com.ibm.wtp.annotations.core.nl1"/>
-		<property name="annotations.ui.nl1" value="com.ibm.wtp.annotations.ui.nl1"/>
-		<property name="wtp.common" value="com.ibm.wtp.common"/>
-		<property name="common.navigator.nl1" value="com.ibm.wtp.common.navigator.nl1"/>
-		<property name="common.ui.nl1" value="com.ibm.wtp.common.ui.nl1"/>
-		<property name="ejb.nl1" value="com.ibm.wtp.ejb.nl1"/>
-		<property name="wtp.emf" value="com.ibm.wtp.emf"/>
-		<property name="emf.workbench.edit.nl1" value="com.ibm.wtp.emf.workbench.edit.nl1"/>
-		<property name="j2ee.nl1" value="com.ibm.wtp.j2ee.nl1"/>
-		<property name="wtp.j2eeui.nl1" value="com.ibm.wtp.j2ee.ui.nl1"/>
-		<property name="emf.workbench.edit.nl1" value="com.ibm.wtp.emf.workbench.edit.nl1"/>
-		<property name="jca.nl1" value="com.ibm.wtp.jca.nl1"/>
-		<property name="web.nl1" value="com.ibm.wtp.web.nl1"/>
-		<property name="webservice.nl1" value="com.ibm.wtp.webservice.nl1"/>
-		<property name="j2ee.ui.navigator.nl1" value="com.ibm.wtp.j2ee.ui.navigator.nl1"/>
-		<property name="views.navigator.nl1" value="org.eclipse.ui.views.navigator.nl1"/>
-		<property name="workbench.navigator.nl1" value="org.eclipse.ui.workbench.navigator.nl1"/>
-		<property name="etools.ejb.ui.nl1" value="com.ibm.etools.ejb.ui.nl1"/>
-		<property name="wtp.ejb.ui.nl1" value="com.ibm.wtp.ejb.ui.nl1"/>
-		
-		
-		
-	</target>
-
-	<target name="main" depends="init">
-	
-		<!-- EMF Workbench UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.etools.emf.workbench.ui/property_files/commonappejb.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>
-			<push name="com.ibm.etools.emf.workbench.ui/property_files/commonedit.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>	
-			<push name="commonfont_windows2000.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>	
-			<push name="emfui.properties" plugin="${emf.workbenchui.nl1}/property_files_nl1"/>
-		</goNative>
-		
-		<!--  J2EE Core  -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WAS}" verbose="${v}">
-			<push name="commonarchive.properties" plugin="${j2eecore}/commonarchive"/>
-			<push name="com.ibm.etools.j2ee.core/mofj2ee/ejb.properties" plugin="${j2eecore}/mofj2ee"/>	
-			<push name="j2eeplugin.properties" plugin="${j2eecore}/mofj2ee"/>
-			<push name="j2eexml.properties" plugin="${j2eecore}/mofj2ee"/>	
-			<push name="mofj2ee.properties" plugin="${j2eecore}/mofj2ee"/>		
-			<push name="xmlparse.properties" plugin="${j2eecore}/mofj2ee"/>
-			<push name="com.ibm.etools.j2ee.core/j2ee-validation/applicationclientvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>	
-			<push name="com.ibm.etools.j2ee.core/j2ee-validation/earvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>	
-			<push name="com.ibm.etools.j2ee.core/j2ee-validation/ejbvalidator.properties" plugin="${j2eecore}/j2ee-validation"/>	
-			<push name="com.ibm.etools.j2ee.core/j2ee-validation/erefvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
-			<push name="com.ibm.etools.j2ee.core/j2ee-validation/rarvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
-			<push name="com.ibm.etools.j2ee.core/j2ee-validation/warvalidation.properties" plugin="${j2eecore}/j2ee-validation"/>
-		</goNative>
-	
-		<!--  J2EE Reference Snippets -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="ReferenceSnippetsPluginResources.properties" plugin="${j2ee.snippets.nl1}/property_files_nl1"/>	
-		</goNative>
-		
-		<!--  J2EE UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="appclientarchiveui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="appclientui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="applicationeditor.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="com.ibm.etools.j2ee.ui/property_files/commonedit.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="connectorui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="earcreationui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="ejbarchiveui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="ejbcreationui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="connectorui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="ejbextui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="ejbui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="j2eeui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="rararchiveui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="webserviceui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="webui.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="wizards.properties" plugin="${j2ee.ui.nl1}/property_files_nl1"/>
-			<push name="com.ibm.etools.j2ee.ui/plugin.properties" plugin="${j2ee.ui.nl1}"/>	
-		</goNative>
-		
-		<!--  Project Interchange -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="projectinterchange.properties" plugin="${project.interchange.nl1}/property_files_nl1"/>
-			<push name="com.ibm.etools.project.interchange/plugin.properties" plugin="${project.interchange.nl1}"/>	
-		</goNative>
-		
-		<!--  Validation -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${product}" verbose="${v}">
-			<push name="com.ibm.etools.validation/property_files/validate_base.properties" plugin="${validation.nl1}/property_files_nl1"/>
-			<push name="com.ibm.etools.validation/plugin.properties" plugin="${validation.nl1}"/>	
-		</goNative>
-		
-		<!--  Validation Core -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.etools.validation.core/property_files/validate_base.properties" plugin="${validation.core}/property_files"/>
-		</goNative>
-		
-		<!--  Validation UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="validate_ui.properties" plugin="${validation.ui.nl1}/property_files_nl1"/>
-			<push name="com.ibm.etools.validation.ui/plugin.properties" plugin="${validation.ui.nl1}"/>	
-		</goNative>
-		
-		
-		
-		<!--  WTP EMF -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="wftutils.properties" plugin="${wtp.emf}/wtpemf"/>	
-		</goNative>
-		
-		<!--  Annotation Controller -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="annotationcontroller.properties" plugin="${annotations.controller.nl1}/property_files_nl1"/>	
-		</goNative>
-		
-		<!--  Annotation Core -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="annotationcore.properties" plugin="${annotations.core.nl1}/property_files_nl1"/>	
-		</goNative>
-		
-		<!--  Annotation UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="taghandlerui.properties" plugin="${annotations.ui.nl1}/property_files_nl1"/>	
-		</goNative>
-		
-		<!--  WTP Common -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="wtp_common.properties" plugin="${wtp.common}/src"/>
-		</goNative>
-		
-		<!--  WTP Common Navigator -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="wtpnavigator.properties" plugin="${common.navigator.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.common.navigator/plugin.properties" plugin="${common.navigator.nl1}"/>	
-		</goNative>
-		
-		<!--  WTP Common UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="wtpcommonui.properties" plugin="${common.ui.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.common.ui/plugin.properties" plugin="${common.ui.nl1}"/>	
-		</goNative>
-		
-		<!--  EJB -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.wtp.ejb/property_files/ejbarchiveops.properties" plugin="${ejb.nl1}/property_files_nl1"/>	
-			<push name="ejbcodegen.properties" plugin="${ejb.nl1}/property_files_nl1"/>	
-			<push name="ejbcreation.properties" plugin="${ejb.nl1}/property_files_nl1"/>	
-			<push name="ejbproviderlibraries.properties" plugin="${ejb.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.ejb/property_files/ejbvalidator.properties" plugin="${ejb.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.ejb/plugin.properties" plugin="${ejb.nl1}"/>	
-		</goNative>
-		
-		
-		
-		
-		<!--  J2EE -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="appclientarchiveops.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="appclientcreation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="applicationclientvalidation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="applicationproviders.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="basecodegen.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.j2ee/property_files/commonedit.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="eararchiveops.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="earcreation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.j2ee/property_files/earvalidation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.j2ee/property_files/ejbarchiveops.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.j2ee/property_files/erefvalidation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="j2ee_common.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="j2eecreation.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="j2eewtpplugin.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="javacodegen.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="projectsupport.properties" plugin="${j2ee.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.j2ee/plugin.properties" plugin="${j2ee.nl1}"/>	
-		</goNative>
-		
-		<!--  WTP J2EE UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="ejb_figures.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="ejb_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="j2ee_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="jca_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="migwizards.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="web_ui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="webserviceui.properties" plugin="${wtp.j2eeui.nl1}/property_files_nl1"/>
-			<push name="com.ibm.wtp.j2ee.ui/plugin.properties" plugin="${wtp.j2eeui.nl1}"/>	
-		</goNative>
-		
-		<!--  JCA -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="rar.properties" plugin="${jca.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.jca/property_files/rarvalidation.properties" plugin="${jca.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.jca/plugin.properties" plugin="${jca.nl1}"/>	
-		</goNative>
-		
-		<!--  Web -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="ProjectSupport.properties" plugin="${web.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.web/property_files/warvalidation.properties" plugin="${web.nl1}/property_files_nl1"/>	
-			<push name="web.properties" plugin="${web.nl1}/property_files_nl1"/>	
-			<push name="webedit.properties" plugin="${web.nl1}/property_files_nl1"/>	
-			<push name="com.ibm.wtp.web/plugin.properties" plugin="${web.nl1}"/>	
-		</goNative>
-		
-		<!--  Web Services -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="webservice.properties" plugin="${webservice.nl1}/property_files_nl1"/>		
-			<push name="com.ibm.wtp.webservice/plugin.properties" plugin="${webservice.nl1}"/>	
-		</goNative>
-		
-		<!--  J2EE UI Navigator -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.wtp.j2ee.ui.navigator/plugin.properties" plugin="${j2ee.ui.navigator.nl1}"/>	
-		</goNative>
-		
-		<!-- Views Navigator -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="messages.properties" plugin="${views.navigator.nl1}/property_files_nl1"/>	
-		</goNative>
-		
-		<!-- Workbench Navigator -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="wbnavigator.properties" plugin="${workbench.navigator.nl1}/property_files_nl1"/>	
-			<push name="org.eclipse.ui.workbench.navigator/plugin.properties" plugin="${workbench.navigator.nl1}"/>		
-		</goNative>
-		
-		<!-- WTP Activities -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.wtp.activities/plugin.properties" plugin="${wtp.activites.nl1}"/>	
-		</goNative>
-		
-		<!-- Etools EJB UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.etools.ejb.ui/plugin.properties" plugin="${etools.ejb.ui.nl1}"/>	
-		</goNative>
-		
-		<!-- WTP EJB UI -->
-		<goNative archivePath="${input.dir}" archive="j2ee*" native2asciiDir="${output.dir}" fragments="false" product="${WSAD}" verbose="${v}">
-			<push name="com.ibm.wtp.ejb.ui/plugin.properties" plugin="${etools.ejb.ui.nl1}"/>	
-		</goNative>
-		
-	</target>	
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee/readme.html b/plugins/org.eclipse.jst.j2ee/readme.html
deleted file mode 100644
index cb64bc03f..000000000
--- a/plugins/org.eclipse.jst.j2ee/readme.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title></title></head>
-<body>
-<pre>
-<!-- Enter your readme text below this line.  -->
-
-
-
-
-
-
-
-
-<!-- Enter your readme text above this line.  -->
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/ProjectDependencyCache.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/ProjectDependencyCache.java
deleted file mode 100644
index 75c5e2ffe..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/ProjectDependencyCache.java
+++ /dev/null
@@ -1,150 +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.refactor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Maintains a cache of project dependencies as represented by references in the .project file.
- * 
- * XXX DependencyManagerGraph is being used instead now that inter-project dependencies have
- * dependent-module entries, however, this type of dependency representation might be useful if
- * we want to capture dependencies on projects not represented in the .component file.
- */
-public class ProjectDependencyCache {
-
-	private static ProjectDependencyCache cache;
-	
-	public synchronized static ProjectDependencyCache getCache() {
-		if (cache == null) {
-			try {
-				cache = new ProjectDependencyCache();
-			} catch (CoreException ce) {
-				Logger.getLogger().logError(ce);
-			}
-		}
-		return cache;
-	}
-	
-	/*
-	 * Map from target IProject to List of dependent IProjects
-	 */
-	private final Map dependencyCache = new HashMap();
-	
-	/*
-	 * Map from dependent IProject to List of target IProject
-	 */
-	private final Map referenceCache = new HashMap();
-	
-	/**
-	 * Creates and initializes the cache.
-	 */
-	protected ProjectDependencyCache() throws CoreException {
-		final IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			refreshDependencies(projects[i]);
-		}
-	}
-	
-	public synchronized IProject[] getDependentProjects(final IProject project) {
-		List dependencies = (List) dependencyCache.get(project);
-		if (dependencies == null) {
-			return new IProject[0];
-		}
-		return (IProject[]) dependencies.toArray(new IProject[dependencies.size()]);		
-	}
-	
-	public synchronized void refreshDependencies(final IProject project) throws CoreException {
-		List oldRefs = (List) referenceCache.get(project);
-		if (oldRefs == null) {
-			oldRefs = new ArrayList();
-		}
-		final IProject[] refProjects = project.getDescription().getReferencedProjects();
-		final List newRefs = new ArrayList();
-		for (int j = 0; j < refProjects.length; j++) {
-			addDependency(refProjects[j], project);
-			newRefs.add(refProjects[j]);
-			oldRefs.remove(refProjects[j]);
-		}
-		referenceCache.put(project, newRefs);
-		
-		// need to cull the stale refs from the reverse map
-		Iterator i = oldRefs.iterator();
-		while (i.hasNext()) {
-			removeDependency((IProject) i.next(), project);
-		}
-	}
-	
-	public synchronized void refreshDependenciesForTarget(final IProject target) throws CoreException {
-		final IProject[] dependents= getDependentProjects(target);
-		for (int i = 0; i < dependents.length; i++) {
-			refreshDependencies(dependents[i]);
-		}
-	}
-	
-	public synchronized void removeProject(final IProject project) throws CoreException {
-		// remove from the dependency cache
-		dependencyCache.remove(project);
-		// remove from the reference cache and clear the from the cache of all dependent projects
-		List dependencies = (List) referenceCache.remove(project);
-		if (dependencies != null) {
-			final Iterator i = dependencies.iterator();
-			while (i.hasNext()) {
-				removeDependency((IProject) i.next(), project); 
-			}
-		}
-	}
-	
-	public synchronized void replaceProject(final IProject originalProject, final IProject newProject) throws CoreException {
-		// rename dependencyCache entry
-		dependencyCache.put(newProject, dependencyCache.remove(originalProject));
-		
-		// rename reference cache and clear the from the cache of all dependent projects
-		List dependencies = (List) referenceCache.remove(originalProject);
-		referenceCache.put(newProject, dependencies);
-		if (dependencies != null) {
-			final Iterator i = dependencies.iterator();
-			while (i.hasNext()) {
-				final IProject ref = (IProject) i.next();
-				removeDependency(ref, originalProject); 
-				addDependency(ref, newProject);
-			}
-		}
-	}
-	
-	private void removeDependency(final IProject target, final IProject dependent) {
-		List dependentProjects = (List) dependencyCache.get(target);
-		if (dependentProjects != null) {
-			dependentProjects.remove(dependent);
-		}
-	}
-	
-	private void addDependency(final IProject target, final IProject dependent) {
-		List dependentProjects = (List) dependencyCache.get(target);
-		if (dependentProjects == null) {
-			dependentProjects = new ArrayList();
-			dependencyCache.put(target, dependentProjects);
-		}
-		if (!dependentProjects.contains(dependent)) {
-			dependentProjects.add(dependent);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/RefactorResourceHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/RefactorResourceHandler.java
deleted file mode 100644
index ba04f3ac1..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/RefactorResourceHandler.java
+++ /dev/null
@@ -1,67 +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.refactor;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Supports access to resource strings.
- */
-public class RefactorResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("refactor");//$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);
-		}
-
-	}
-
-	public static void nlsConcatenationFinder() {
-		// used to tag methods which have concatenated strings
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
deleted file mode 100644
index ae1461987..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
+++ /dev/null
@@ -1,195 +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.refactor.listeners;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ElementChangedEvent;
-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.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Implementation of <code>IElementChangedListener that updates mappings for src folders
- * in the .component file in response to changes in a project's Java classpath. 
- */
-public class J2EEElementChangedListener implements IElementChangedListener {
-
-	/**
-	 * Name of the Job family in which all component update jobs belong.
-	 */
-	public static final String PROJECT_COMPONENT_UPDATE_JOB_FAMILY =  "org.eclipse.jst.j2ee.refactor.component"; //$NON-NLS-1$
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.IElementChangedListener#elementChanged(org.eclipse.jdt.core.ElementChangedEvent)
-	 */
-	public void elementChanged(final ElementChangedEvent event) {
-		processJavaElementDelta(event.getDelta());
-	}
-	
-	private void processJavaElementDelta(final IJavaElementDelta delta) {
-		final int kind = delta.getKind();
-		if (kind == IJavaElementDelta.CHANGED) {
-			final int flags = delta.getFlags();
-			final IJavaElement element = delta.getElement();
-			if ((flags & IJavaElementDelta.F_CHILDREN) == IJavaElementDelta.F_CHILDREN) {
-				if (element instanceof IJavaModel) {
-					final IJavaElementDelta[] children = delta.getChangedChildren();
-					for (int i = 0; i < children.length; i++) {
-						// handle all of the IJavaProject children
-						processJavaElementDelta(children[i]);
-					}					
-				} else if (element instanceof IJavaProject
-						&& (flags & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0) {
-					final IJavaProject jproject = (IJavaProject) element;
-					final IProject project = jproject.getProject();
-					// make certain this is a J2EE project
-					if (ModuleCoreNature.getModuleCoreNature(project) != null) {
-						try {
-							alterMapping(delta.getAffectedChildren(), jproject, project);
-						} catch (CoreException ce) {
-							Logger.getLogger().logError(ce);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * Adds or removes a resource mapping from the .component file.
-	 */
-	private void alterMapping(final IJavaElementDelta[] children, final IJavaProject jproject,
-			final IProject project) throws CoreException {
-		List pathsToAdd = null;
-		List pathsToRemove = null;
-		for (int i = 0; i < children.length; i++) {
-			final IJavaElementDelta delta = children[i];
-			final IJavaElement element = delta.getElement();
-			if(element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT){
-				final IPackageFragmentRoot root = (IPackageFragmentRoot) element;
-				int cpeKind = IPackageFragmentRoot.K_SOURCE;
-				boolean abortAdd = false;
-				try {
-					cpeKind = root.getKind();
-				} catch (JavaModelException jme) {
-					// this is thrown if the folder corresponding to the CPE has been deleted
-					// since it could represent another error, we need to abort adding. 
-					abortAdd = true;
-				}
-				// only update if we know it is a src folder
-				if (cpeKind == IPackageFragmentRoot.K_SOURCE) {
-					// kind and flags for CP additions are somewhat sporadic; either:
-					// -kind is ADDED and flags are 0
-					//   or
-					// -kind is CHANGED and flags are F_ADDED_TO_CLASSPATH
-					int flags = delta.getFlags();
-					if (delta.getKind() == IJavaElementDelta.ADDED || 
-							(flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) == IJavaElementDelta.F_ADDED_TO_CLASSPATH) {
-						if (!abortAdd) {
-							if(pathsToAdd == null){
-								pathsToAdd = new ArrayList();
-							}
-							final IPath path = root.getPath().removeFirstSegments(1);
-							pathsToAdd.add(path);
-							// if the added src path was moved from another location, remove any mapping for that
-							// location
-							if ((flags & IJavaElementDelta.F_MOVED_FROM) == IJavaElementDelta.F_MOVED_FROM) {
-								final IJavaElement movedFromElement = delta.getMovedFromElement();
-								if(pathsToRemove == null){
-									pathsToRemove = new ArrayList();
-								}
-								pathsToRemove.add(movedFromElement.getPath().removeFirstSegments(1));
-							}
-						}
-					// getting a kind = REMOVED and flags = 0 for removal of the folder (w/o removing the CPE), probably
-				    // should not be generated
-					} else if ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) == IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) {
-						if(pathsToRemove == null){
-							pathsToRemove = new ArrayList();
-						}
-						IPath path = root.getPath().removeFirstSegments(1);
-						pathsToRemove.add(path);
-					}
-				}
-			}
-		}
-		if(pathsToAdd != null || pathsToRemove != null){
-			final List jobPathsToAdd = pathsToAdd;
-			final List jobPathsToRemove = pathsToRemove;
-			WorkspaceJob job = new WorkspaceJob("J2EEComponentMappingUpdateJob") {							
-				public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-					IVirtualFolder destFolder = getDestinationFolder(project);
-					IPath path = null;
-					if(jobPathsToAdd != null){
-						for(int i=0;i<jobPathsToAdd.size(); i++){
-							path = (IPath)jobPathsToAdd.get(i);
-							destFolder.createLink(path, 0, monitor);
-						}
-					}
-					if(jobPathsToRemove != null){
-						for(int i=0;i<jobPathsToRemove.size(); i++){
-							path = (IPath)jobPathsToRemove.get(i);
-							destFolder.removeLink(path, 0, monitor);
-						}
-					}
-					return Status.OK_STATUS;
-				}
-				public boolean belongsTo(final Object family) {
-					return PROJECT_COMPONENT_UPDATE_JOB_FAMILY.equals(family);
-				}
-			};
-			job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-			job.schedule();
-		}
-	}
-	
-	
-
-	/*
-	 * Retrieves the IVirtualFolder to which Java src folders should be mapped
-	 */
-	private IVirtualFolder getDestinationFolder(final IProject project) throws CoreException {
-		final IVirtualComponent c = ComponentCore.createComponent(project);
-		c.create(0, null);
-		final IVirtualFolder root = c.getRootFolder();
-		if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-			// web projects map to WEB-INF/classes
-			return root.getFolder(new Path(J2EEConstants.WEB_INF_CLASSES));
-		}
-		// all other J2EE project types (that are Java projects) map 
-		// Java src folders to the project root
-		return root;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
deleted file mode 100644
index 5bd474a42..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
+++ /dev/null
@@ -1,245 +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.refactor.listeners;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-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.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.jst.j2ee.refactor.operations.OptionalRefactorHandler;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectDeleteDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactoringDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRenameDataModelProvider;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Listens for project rename/delete events and, if the project had the
- * ModuleCore nature, executes the appropriate logic to update
- * project references.
-  */
-public final class ProjectRefactoringListener implements IResourceChangeListener, IResourceDeltaVisitor {
-	
-	/**
-	 * Name of the Job family in which all project rename/delete refactoring jobs belong.
-	 */
-	public static final String PROJECT_REFACTORING_JOB_FAMILY =  "org.eclipse.jst.j2ee.refactor.project"; //$NON-NLS-1$
-	
-	/*
-	 * Map from name of deleted project to ProjectRefactorMetadata instances.
-	 */
-	private final Map deletedProjectMetadata = new HashMap();
-	
-	/**
-	 * Maintains a cache of project depencencies;
-	 */
-	//private final ProjectDependencyCache cache;
-	
-	public ProjectRefactoringListener() {//final ProjectDependencyCache dependencyCache) {
-		//cache = dependencyCache;
-		// force a refresh of the DependencyGraphManager; was hitting an NPE
-		// in StructureEdit when the DGM was getting constructed during the receipt of the
-		// first pre-delete event
-		DependencyGraphManager.getInstance();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(final IResourceChangeEvent event) {
-		// need to capture PRE_DELETE events so that metadata about the
-		// deleted project can be collected and cached
-		try {
-			if (event.getType() == IResourceChangeEvent.PRE_DELETE) {
-				// for now, only dependencies on ModuleCoreNature projects
-				final IProject project = (IProject) event.getResource();
-                // ensure project is accessible and has both module core and faceted natures
-				if (ModuleCoreNature.getModuleCoreNature(project) != null
-                        && ProjectFacetsManager.create(project) != null) {
-					cacheDeletedProjectMetadata(project);
-				}
-			} else {
-				event.getDelta().accept(this);
-			}
-		} catch (CoreException ce) {
-			Logger.getLogger().logError(ce);
-		}
-	}
-	
-	private synchronized void cacheDeletedProjectMetadata(final IProject project) {
-		final ProjectRefactorMetadata metadata = new ProjectRefactorMetadata(project, ProjectRefactorMetadata.REFERER_CACHING);
-		// precompute the metadata while the project still exists
-		metadata.computeMetadata();
-		metadata.computeServers();
-		metadata.computeDependentMetadata(ProjectRefactorMetadata.REF_CACHING,
-				DependencyGraphManager.getInstance().getDependencyGraph().getReferencingComponents(project));
-		//, cache.getDependentProjects(project));
-		deletedProjectMetadata.put(project.getName(), metadata);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-	 */
-	public boolean visit(final IResourceDelta delta) throws CoreException {
-		final IResource resource = delta.getResource();
-		if (resource instanceof IWorkspaceRoot) {
-			// delta is at the workspace root so keep going
-			return true;
-		} else if (resource instanceof IProject) {
-			processProjectDelta((IProject) resource, delta);
-		}
-		return false;
-	}
-
-	/*
-	 * Process the project delta in a sync block.
-	 */
-	private synchronized void processProjectDelta(final IProject project, final IResourceDelta delta) throws CoreException {
-		final int kind = delta.getKind();
-		final int flags = delta.getFlags();
-
-		if (kind == IResourceDelta.REMOVED) {
-			if (hasDeletedRemovedFlags(flags)) {
-				// Remove all entries int the project dependency cache
-				//cache.removeProject(project);
-				// if the kind is REMOVED and there are no special flags, the project was deleted
-				ProjectRefactorMetadata metadata = (ProjectRefactorMetadata) deletedProjectMetadata.remove(project.getName()); 
-				// note: only projects with ModuleCoreNature will have cached metadata
-				if (metadata != null && OptionalRefactorHandler.getInstance().shouldRefactorDeletedProject(metadata)) {
-				    processDelete(metadata);
-				} 
-			} 
-		} else if (kind == IResourceDelta.ADDED && hasRenamedAddedFlags(flags)) { // was renamed
-			// get the original name
-			final String originalName = delta.getMovedFromPath().lastSegment();
-			//Logger.getLogger().logInfo("Added event for " + originalName + " with flags " + flags);
-			// we get PRE_DELETE events on rename so retrieve this
-			ProjectRefactorMetadata originalMetadata = (ProjectRefactorMetadata) deletedProjectMetadata.remove(originalName);
-			// get the metadata for the new project
-			final ProjectRefactorMetadata newMetadata = new ProjectRefactorMetadata(project);
-			// note: only projects with ModuleCoreNature will have cached metadata
-			if (originalMetadata != null && OptionalRefactorHandler.getInstance().shouldRefactorRenamedProject(originalMetadata)) {
-				newMetadata.computeMetadata(originalMetadata.getProject());
-				processRename(originalMetadata, newMetadata, delta);
-				// Rename all entries in the project dependency cache
-				//cache.replaceProject(originalProject, project);
-			} else {
-				// likely due to missing the pre-delete event, so set the original to a metadata based on new project
-				// and reset project to one based on original name
-				//Logger.getLogger().logWarning(RefactorResourceHandler.getString("pre_delete_not_received_for_renamed", new Object[]{originalName + " " + flags}));
-			}
-		} 
-		//else if (kind == IResourceDelta.CHANGED || kind == IResourceDelta.ADDED) { 
-		// (re)compute the dependencies
-		//cache.refreshDependencies(project);
-		//}		
-	}
-	
-	/*
-	 * Determines if the added project was renamed based on the IResourceDelta flags 
-	 */
-	private boolean hasRenamedAddedFlags(final int flags) {
-		if ((flags & IResourceDelta.DESCRIPTION) > 0
-			&& (flags & IResourceDelta.MOVED_FROM) > 0) {
-			return true;
-		}
-		return false;
-	}
-    
-    /*
-     * Determines if the removed project was deleted based on the IResourceDelta flags 
-     */
-    private boolean hasDeletedRemovedFlags(final int flags) {
-        if ((flags & IResourceDelta.MOVED_TO) == 0 
-                && (flags & IResourceDelta.REPLACED) == 0) {
-            return true;
-        }
-        return false;
-    }
-	
-	/*
-	 * Processes the renaming of a project.
-	 */
-	private void processRename(final ProjectRefactorMetadata originalMetadata, final ProjectRefactorMetadata newMetadata, final IResourceDelta delta) {
-		WorkspaceJob job = new WorkspaceJob("J2EEProjectRenameJob") {
-			public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-				final IDataModel dataModel = DataModelFactory.createDataModel(new ProjectRenameDataModelProvider());
-				dataModel.setProperty(ProjectRefactoringDataModelProvider.PROJECT_METADATA, newMetadata);
-                dataModel.setProperty(ProjectRenameDataModelProvider.ORIGINAL_PROJECT_METADATA, originalMetadata);
-                dataModel.setProperty(ProjectRenameDataModelProvider.RESOURCE_DELTA, delta);                
-				try {
-					dataModel.getDefaultOperation().execute(monitor, null);
-				} catch (Exception e) {
-					final String msg = RefactorResourceHandler.getString("error_updating_project_on_rename", new Object[]{originalMetadata.getProjectName()});
-					Logger.getLogger().logError(msg);
-					Logger.getLogger().logError(e);
-					return new Status(Status.ERROR, J2EEPlugin.PLUGIN_ID, 0, msg, e);
-				}				
-				return Status.OK_STATUS;
-			}
-			
-			public boolean belongsTo(final Object family) {
-				return PROJECT_REFACTORING_JOB_FAMILY.equals(family);
-			}
-		};
-		// XXX note: might want to consider switching to a MultiRule for optimization
-		job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		job.schedule();
-	}
-	
-	/*
-	 * Processes the deletion of a project.
-	 */
-	private void processDelete(final ProjectRefactorMetadata metadata) {
-		WorkspaceJob job = new WorkspaceJob("J2EEProjectDeleteJob") {
-			public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-				final IDataModel dataModel = DataModelFactory.createDataModel(new ProjectDeleteDataModelProvider());
-				dataModel.setProperty(ProjectRefactoringDataModelProvider.PROJECT_METADATA, metadata);
-				try {
-					dataModel.getDefaultOperation().execute(monitor, null);
-				} catch (Exception e) {
-					final String msg = RefactorResourceHandler.getString("error_updating_project_on_delete", new Object[]{metadata.getProjectName()});
-					Logger.getLogger().logError(msg);
-					Logger.getLogger().logError(e);
-					return new Status(Status.ERROR, J2EEPlugin.PLUGIN_ID, 0, msg, e);
-				}
-				return Status.OK_STATUS;
-			}
-			
-			public boolean belongsTo(final Object family) {
-				return PROJECT_REFACTORING_JOB_FAMILY.equals(family);
-			}
-		};
-		// XXX note: might want to consider switching to a MultiRule for optimization
-		job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		job.schedule();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java
deleted file mode 100644
index 2010a9fe5..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jst.j2ee.refactor.operations;
-
-/**
- * Abstract implementation of IOptionalRefactorHandler.
- */
-public abstract class AbstractOptionalRefactorHandler implements IOptionalRefactorHandler{
-	
-	public AbstractOptionalRefactorHandler(){
-		
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDeletedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorDeletedProject(final ProjectRefactorMetadata metadata) {
-        return true;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorRenamedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorRenamedProject(final ProjectRefactorMetadata metadata) {
-        return true;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnDelete(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorDependentProjectOnDelete(final ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata) {
-        return true;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnRename(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorDependentProjectOnRename(final ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata) {
-        return true;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOp.java
deleted file mode 100644
index 35b0fb979..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOp.java
+++ /dev/null
@@ -1,44 +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.refactor.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsOp;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Extension of <code>CreateReferenceComponentsOp</code> that supports the optional creation of
- * the component and project references.
- */
-public class CreateOptionalReferenceOp extends CreateReferenceComponentsOp {
-	
-	public CreateOptionalReferenceOp(final IDataModel model) {
-		super(model);
-	}
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!validateEdit().isOK())
-			return Status.CANCEL_STATUS;
-		if (model.getBooleanProperty(CreateOptionalReferenceOpDataModelProvider.CREATE_COMPONENT_REF)) {
-			addReferencedComponents(monitor);
-		}
-		if (model.getBooleanProperty(CreateOptionalReferenceOpDataModelProvider.CREATE_PROJECT_REF)) {
-			addProjectReferences();
-		}
-		return OK_STATUS;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOpDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOpDataModelProvider.java
deleted file mode 100644
index 348517b80..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/CreateOptionalReferenceOpDataModelProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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.refactor.operations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class CreateOptionalReferenceOpDataModelProvider extends	CreateReferenceComponentsDataModelProvider {
-
-	/**
-	 * Property that holds a Boolen which controls whether the component reference is
-	 * added/removed.
-	 */
-	public static final String CREATE_COMPONENT_REF = "IOptionalReferenceProperties.CREATE_COMPONENT_REF";
-	/**
-	 * Property that holds a Boolen which controls whether the .project reference is
-	 * added/removed.
-	 */
-	public static final String CREATE_PROJECT_REF = "IOptionalReferenceProperties.CREATE_PROJECT_REF";
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultOperation()
-	 */
-	public IDataModelOperation getDefaultOperation() {
-		return new CreateOptionalReferenceOp(model);
-	}
-	
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(CREATE_COMPONENT_REF);
-		propertyNames.add(CREATE_PROJECT_REF);
-		return propertyNames;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (CREATE_COMPONENT_REF.equals(propertyName) 
-				||CREATE_PROJECT_REF.equals(propertyName)) {
-			return Boolean.TRUE;
-		} 
-		return super.getDefaultProperty(propertyName);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/IOptionalRefactorHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/IOptionalRefactorHandler.java
deleted file mode 100644
index c1c447cb8..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/IOptionalRefactorHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jst.j2ee.refactor.operations;
-
-/**
- * Interface for classes that compute whether the automatically executed J2EE
- * refactoring logic should be executed when a project is deleted or renamed.
- */
-public interface IOptionalRefactorHandler {
-
-    /**
-     * Called to determine if automatic refactoring logic should be executed
-     * for a given deleted project. The project will already have been deleted.  
-     * this method is called.
-     * 
-     * @param metadata Metadata for the deleted project.
-     *  
-     * @return True to refactor, false to skip refactoring for all dependent projects.
-     */
-	public boolean shouldRefactorDeletedProject(ProjectRefactorMetadata metadata);
-    
-    /**
-     * Called to determine if automatic refactoring logic should be executed
-     * for a given renamed project. The project will already have been be renamed when
-     * this method is called.
-     * 
-     * @param metadata Metadata for the renamed project (pre-rename).
-     *  
-     * @return True to refactor, false to skip refactoring for all dependent projects.
-     */
-    public boolean shouldRefactorRenamedProject(ProjectRefactorMetadata metadata);
-
-    /**
-     * Called to determine if automatic refactoring logic should be executed
-     * on the specified dependent project when a referenced project has been deleted.
-     * The referenced project will already have been deleted when this method is called.
-     * 
-     * @param deletedMetadata Metadata for the deleted project.
-     * @param dependentMetadata Metadata for the dependent project.
-     * 
-     * @return True to refactor the dependent project.
-     */
-    public boolean shouldRefactorDependentProjectOnDelete(ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata);
-
-    /**
-     * Called to determine if automatic refactoring logic should be executed
-     * on the specified dependent project when a referenced project has been renamed.
-     * The referenced project will already have been renamed when this method is called.
-     * 
-     * @param renamedMetadata Metadata for the renamed project.
-     * @param dependentMetadata Metadata for the dependent project.
-     * 
-     * @return True to refactor the dependent project.
-     */
-    public boolean shouldRefactorDependentProjectOnRename(ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata);
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java
deleted file mode 100644
index 316739cca..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-public class OptionalRefactorHandler implements IOptionalRefactorHandler{
-
-	private static final String EXTENSION_POINT = "optionalRefactorHandler"; //$NON-NLS-1$
-	private static final String TAG_OPTIONAL_REFACTOR = "optionalRefactorHandler"; //$NON-NLS-1$
-	private static final String ATT_CLASS = "class"; //$NON-NLS-1$
-	
-	private static OptionalRefactorHandler instance = new OptionalRefactorHandler();
-	private IOptionalRefactorHandler [] handlers = null;
-	
-	private OptionalRefactorHandler () {
-		SafeRunner.run(new ISafeRunnable() {
-
-			public void handleException(Throwable exception) {
-				J2EEPlugin.logError(0, exception.getMessage(), exception);
-			}
-
-			public void run() throws Exception {
-				OptionalRefactorHandlerRegistryReader reader = new OptionalRefactorHandlerRegistryReader();
-				reader.readRegistry();
-				handlers = reader.getHandlers();
-			}
-
-		});
-	}
-	
-	public static OptionalRefactorHandler getInstance() {
-		return instance;
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDeletedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorDeletedProject(final ProjectRefactorMetadata metadata) {
-        for(int i=0;i<handlers.length; i++){
-            if(!handlers[i].shouldRefactorDeletedProject(metadata)){
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorRenamedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorRenamedProject(final ProjectRefactorMetadata metadata) {
-        for(int i=0;i<handlers.length; i++){
-            if(!handlers[i].shouldRefactorRenamedProject(metadata)){
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnDelete(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorDependentProjectOnDelete(final ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata) {
-        for(int i=0;i<handlers.length; i++){
-            if(!handlers[i].shouldRefactorDependentProjectOnDelete(deletedMetadata, dependentMetadata)){
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnRename(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
-     */
-    public boolean shouldRefactorDependentProjectOnRename(final ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata) {
-        for(int i=0;i<handlers.length; i++){
-            if(!handlers[i].shouldRefactorDependentProjectOnRename(renamedMetadata, dependentMetadata)){
-                return false;
-            }
-        }
-        return true;
-    }
-    
-
-	private class OptionalRefactorHandlerRegistryReader extends RegistryReader {
-
-		private List handlers = new ArrayList(); 
-		
-		public OptionalRefactorHandlerRegistryReader() {
-			super(J2EEPlugin.PLUGIN_ID, EXTENSION_POINT);
-		} 
-
-		/**
-		 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
-		 */
-		public boolean readElement(final IConfigurationElement element) {
-			if (TAG_OPTIONAL_REFACTOR.equals(element.getName())) {
-
-				/*
-				 * Because the only instance of this type is created from a static singleton field, and
-				 * the registry is initialized in the constructor of this type, other threads cannot
-				 * compete with readElement() for access to <i>descriptors</i>
-				 */
-				final IOptionalRefactorHandler[] handlerArray = new IOptionalRefactorHandler[1];
-
-				SafeRunner.run(new ISafeRunnable() {
-
-					public void handleException(Throwable exception) {
-						J2EEPlugin.logError(0, exception.getMessage(), exception);
-					}
-
-					public void run() throws Exception {
-						handlerArray[0] = (IOptionalRefactorHandler) element.createExecutableExtension(ATT_CLASS);
-					}
-
-				});
-
-				handlers.add(handlerArray[0]);
-				return true;
-			}
-			return false;
-		}
-		
-		public IOptionalRefactorHandler [] getHandlers() {
-			IOptionalRefactorHandler [] handlersArray = new IOptionalRefactorHandler[handlers.size()];
-			for(int i=0;i<handlersArray.length;i++){
-				handlersArray[i] = (IOptionalRefactorHandler)handlers.get(i);
-			}
-			return handlersArray;
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteDataModelProvider.java
deleted file mode 100644
index d06abeefe..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteDataModelProvider.java
+++ /dev/null
@@ -1,25 +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.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ProjectDeleteDataModelProvider extends	ProjectRefactoringDataModelProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultOperation()
-	 */
-	public IDataModelOperation getDefaultOperation() {
-		return new ProjectDeleteOperation(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteOperation.java
deleted file mode 100644
index 88c157527..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectDeleteOperation.java
+++ /dev/null
@@ -1,83 +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.refactor.operations;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>ProjectRefactorOperation</code> that contains deletion-specific logic.
- */
-public class ProjectDeleteOperation extends ProjectRefactorOperation {
-
-	public ProjectDeleteOperation(final IDataModel model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorOperation#updateProject(org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata)
-	 */
-	protected void updateProject(final ProjectRefactorMetadata refactoredMetadata) 
-		throws ExecutionException {
-	}
-
-	/**
-	 * Updates the metadata for dependent projects
-	 * @throws ExecutionException
-	 */
-	protected void updateDependentProjects(final ProjectRefactorMetadata refactoredMetadata,
-			final IProgressMonitor monitor) throws ExecutionException {
-	    // If this is not an EAR, update metadata for dependent projects
-        // (not performing any refactoring for projects that depend on EAR's right now)
-        if (!refactoredMetadata.isEAR()) {
-            super.updateDependentProjects(refactoredMetadata, monitor);
-        }
-		// update any server instance refs to the refactored project
-		super.updateServerRefs(refactoredMetadata, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorOperation#updateDependentEARProject(org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata)
-	 */
-	protected void updateDependentEARProject(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
-        if (OptionalRefactorHandler.getInstance().shouldRefactorDependentProjectOnDelete(refactoredMetadata, dependentMetadata)) {
-            final IDataModel dataModel = createDataModel(dependentMetadata, refactoredMetadata,
-                    new UpdateDependentEARonDeleteProvider());
-            dataModel.getDefaultOperation().execute(null, null);
-        }
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorOperation#updateDependentModuleProject(org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.internal.refactor.operations.ProjectRefactorMetadata)
-	 */
-	protected void updateDependentModuleProject(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
-        if (OptionalRefactorHandler.getInstance().shouldRefactorDependentProjectOnDelete(refactoredMetadata, dependentMetadata)) {
-            final IDataModel dataModel = createDataModel(dependentMetadata, refactoredMetadata,
-                    new UpdateDependentModuleonDeleteProvider());
-            dataModel.getDefaultOperation().execute(null, null);
-        }
-	}
-
-	private IDataModel createDataModel(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata,
-			final AbstractDataModelProvider provider) {
-		final IDataModel dataModel = DataModelFactory.createDataModel(provider);
-		dataModel.setProperty(PROJECT_METADATA, refactoredMetadata);
-		dataModel.setProperty(DEPENDENT_PROJECT_METADATA, dependentMetadata);
-		return dataModel;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
deleted file mode 100644
index 82e0be937..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
+++ /dev/null
@@ -1,371 +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.refactor.operations;
-
-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.Properties;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * IDataModel object property stored under the property name 
- * {@link ProjectRefactoringDataModelProvider#PROJECT_METADATA}.
- * 
- *  Note: this class is not multi-thread safe.
- */
-public class ProjectRefactorMetadata {
-	
-	public static int NON_CACHING = 0;
-	public static int REF_CACHING = 1;
-	public static int REFERER_CACHING = 2;
-	
-	private int _virtualCompCaching = NON_CACHING;
-	private final IProject _project;
-	private IServer[] servers;
-	private IVirtualComponent virtualComp = null;
-	private final List dependentMetadata = new ArrayList();
-	private boolean javaNature;
-	private boolean moduleCoreNature;
-	private IModule module;
-	private Set facets = new HashSet();
-	private final Map earToModuleURI = new HashMap();
-	
-	public ProjectRefactorMetadata(final IProject project) {
-		_project = project;
-	}
-	
-	public ProjectRefactorMetadata(final IProject project, final int virtualCompCaching) {
-		this(project);
-		_virtualCompCaching = virtualCompCaching;
-	}
-	
-	public void computeMetadata() {
-        computeMetadata(_project);
-    }
-    public void computeMetadata(final IProject oldProject) {
-		try {
-			javaNature = _project.hasNature("org.eclipse.jdt.core.javanature"); //$NON-NLS-1$
-			moduleCoreNature = ModuleCoreNature.getModuleCoreNature(_project) != null;
-			if (moduleCoreNature) {
-				if (_virtualCompCaching == REF_CACHING) {
-					virtualComp = new RefCachingVirtualComponent(ComponentCore.createComponent(_project));
-				} else if (_virtualCompCaching == REFERER_CACHING) {
-					virtualComp = new RefererCachingVirtualComponent(ComponentCore.createComponent(_project));
-				} else {
-					virtualComp = ComponentCore.createComponent(_project);			
-				}
-				final IFacetedProject facetedProject = ProjectFacetsManager.create(_project);
-				module = ServerUtil.getModule(_project);
-                // XXX Due to resource change listener order uncertainty, the project associated with the
-                // module may be either the new (correct) project or the old project so need to try both
-                if (module == null && !_project.equals(oldProject)) {
-                    module = ServerUtil.getModule(oldProject);
-                }
-                if (facetedProject != null) {
-                    facets = facetedProject.getProjectFacets();
-                }
-			}
-		} catch (CoreException ce) {
-			Logger.getLogger().logError(ce);
-		} 
-	}
-
-	public void computeServers() {
-		servers = ServerUtil.getServersByModule(module, null);
-	}
-	
-	public IServer[] getServers() {
-		return servers;
-	}
-	
-	public void computeDependentMetadata(final int virtualComponentCaching, final IProject[] dependentProjects) {
-		// get all referencing projects and execute the appropriate update operation for each one
-		ProjectRefactorMetadata metadata;
-		for (int i = 0; i < dependentProjects.length; i++) {
-			final IProject dependentProject = dependentProjects[i];
-			if (dependentProject.exists() && dependentProject.isOpen()) {
-				metadata = new ProjectRefactorMetadata(dependentProjects[i], virtualComponentCaching);
-				metadata.computeMetadata();
-				dependentMetadata.add(metadata);
-				if (metadata.isEAR()) {
-					final String uri = getModuleURI(dependentProject, virtualComp);
-					if (uri != null) {
-						earToModuleURI.put(dependentProject.getName(), uri);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * If this project is associated with the specified EAR project, retrieves the module URI for the dependency or null if
-	 * it could not be retrieved.
-	 * @param earName Name of the EAR project.
-	 * @return Module URI for the project in the context of that EAR.
-	 */
-	public String getModuleURI(final String earName) {
-		return (String) earToModuleURI.get(earName);
-	}
-	
-	private String getModuleURI(final IProject earProject, final IVirtualComponent comp) {
-		EARArtifactEdit earEdit = null;
-		try {
-			earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-			if (earEdit != null) {
-				return earEdit.getModuleURI(comp); 
-			}
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		} finally {
-			if (earEdit != null) {
-				earEdit.dispose();
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Retrieves the IProject that represents the referenced project.
-	 */
-	public IProject getProject() {
-		return _project;
-	}
-	
-	/**
-	 * Retrieves the IModule for the project, or null if no IModule representation
-	 * exists.
-	 */
-	public IModule getModule() {
-		return module;
-	}
-	
-	/**
-	 * Retrieves the project name.
-	 */
-	public String getProjectName() {
-		return _project.getName();
-	}
-	
-	/**
-	 * Retrieves all ProjectRefactorMetadata for dependent projects.
-	 * Will be empty if not computed.
-	 */
-	public ProjectRefactorMetadata[] getDependentMetadata() {
-		return (ProjectRefactorMetadata[]) dependentMetadata.toArray(new ProjectRefactorMetadata[dependentMetadata.size()]);
-	}
-	
-	/**
-	 * Returns the IVirtualComponent for the project.
-	 */
-	public IVirtualComponent getVirtualComponent() {
-		return virtualComp;
-	}
-	
-	public boolean hasJavaNature() { 
-		return javaNature;
-	}
-	
-	public boolean hasModuleCoreNature() {
-		return moduleCoreNature;
-	}
-	
-	public Set getProjectFacets() {
-		return facets;
-	}
-	
-	public boolean hasFacet(final IProjectFacet facet) {
-		 for(Iterator itr = facets.iterator(); itr.hasNext();) {
-             final IProjectFacetVersion fv  = (IProjectFacetVersion) itr.next();
-             
-             if(fv.getProjectFacet() == facet) {
-                 return true;
-             }
-         }
-         
-         return false;
-	}
-	
-	public boolean isEAR() {
-		return hasFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE)); 
-	}
-
-	public boolean isEJB() {
-		return hasFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE)); 
-	}
-	
-	public boolean isWeb() {
-		return hasFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
-	}
-	
-	public boolean isAppClient() {
-		return hasFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_APPCLIENT_MODULE)); 
-	}
-	
-	public boolean isConnector() {
-		return hasFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_CONNECTOR_MODULE));
-	}
-	
-	public boolean isUtility() {
-		return hasFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE));
-	}
-	
-	public class CachingVirtualComponent implements IVirtualComponent {
-		protected final IVirtualComponent _comp;
-		protected boolean _caching = true;
-		public CachingVirtualComponent(final IVirtualComponent comp) {
-			_comp = comp;
-		}
-		public void addReferences(IVirtualReference[] references) {
-			_comp.addReferences(references);
-		}
-		public void create(int updateFlags, IProgressMonitor aMonitor) throws CoreException {
-			_comp.create(updateFlags, aMonitor);
-		}
-		public boolean exists() {
-			return _comp.exists();
-		}
-		public IVirtualComponent getComponent() {
-			return _comp.getComponent();
-		}
-		public Properties getMetaProperties() {
-			return _comp.getMetaProperties();
-		}
-		public IPath[] getMetaResources() {
-			return _comp.getMetaResources();
-		}
-		public String getName() {
-			return _comp.getName();
-		}
-		public String getDeployedName() {
-			return _comp.getDeployedName();
-		}
-		public IProject getProject() {
-			return _comp.getProject();
-		}
-		public IVirtualReference getReference(String aComponentName) {
-			return _comp.getReference(aComponentName);
-		}
-		public IVirtualReference[] getReferences() {
-			return _comp.getReferences();
-		}
-		public void setCaching(boolean caching) {
-			_caching = caching;
-		}
-		public IVirtualComponent[] getReferencingComponents() {
-			return _comp.getReferencingComponents();
-		}
-		public IVirtualFolder getRootFolder() {
-			return _comp.getRootFolder();
-		}
-		public boolean isBinary() {
-			return _comp.isBinary();
-		}
-		public void setMetaProperties(Properties properties) {
-			_comp.setMetaProperties(properties);
-		}
-		public void setMetaProperty(String name, String value) {
-			_comp.setMetaProperty(name, value);
-		}
-		public void setMetaResources(IPath[] theMetaResourcePaths) {
-			_comp.setMetaResources(theMetaResourcePaths);
-		}
-		public void setReferences(IVirtualReference[] theReferences) {
-			_comp.setReferences(theReferences);
-		}
-		public Object getAdapter(Class adapter) {
-			return _comp.getAdapter(adapter);
-		}
-		
-		public boolean equals(Object o) {
-			return _comp.equals(o);
-		}
-		
-		public int hashCode() {
-			return _comp.hashCode();
-		}
-		
-		public String toString() {
-			return _comp.toString();
-		}
-		
-		public void removeReference(IVirtualReference aReference) {
-			((VirtualComponent)_comp).removeReference(aReference);
-		}
-	}
-	
-	public class RefCachingVirtualComponent extends CachingVirtualComponent {
-		private IVirtualReference[] cachedRefs;
-		public RefCachingVirtualComponent(final IVirtualComponent comp) {
-			super(comp);
-			cachedRefs = ((VirtualComponent)comp).getAllReferences();
-		}
-
-		public IVirtualReference getReference(String aComponentName) {
-			IVirtualReference[] refs = getReferences();
-			for (int i = 0; i < refs.length; i++) {
-				IVirtualReference reference = refs[i];
-				if (reference == null || reference.getReferencedComponent() == null) {
-					return null;
-				}
-				if (reference.getReferencedComponent().getName().equals(aComponentName))
-					return reference;
-			}
-			return null;
-		}
-		public IVirtualReference[] getReferences() {
-			if (_caching) {
-				return cachedRefs;
-			}
-			return super.getReferences();
-		}
-	}
-
-	public class RefererCachingVirtualComponent extends CachingVirtualComponent {
-		private IVirtualComponent[] cachedReferers;
-		public RefererCachingVirtualComponent(final IVirtualComponent comp) {
-			super(comp);
-			cachedReferers = comp.getReferencingComponents();
-		}
-
-		public IVirtualComponent[] getReferencingComponents() {
-			if (_caching) {
-				return cachedReferers;
-			}
-			return _comp.getReferencingComponents();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorOperation.java
deleted file mode 100644
index e428b1700..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorOperation.java
+++ /dev/null
@@ -1,199 +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.refactor.operations;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.DeletedModule;
-import org.eclipse.wst.server.core.internal.Module;
-
-/**
- * Abstract base class for project refactoring operations.
- */
-public abstract class ProjectRefactorOperation extends AbstractDataModelOperation 
-	implements ProjectRefactoringProperties {
-
-	/**
-	 * Creates a new refactoring operation for the specified data model.
-	 * @param model The data model.
-	 */
-	public ProjectRefactorOperation(final IDataModel model) {
-		super(model);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		try {
-			final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) getProjectMetadata();
-
-			// Update this project's metadata
-			if (refactoredMetadata.hasModuleCoreNature()) {
-				updateProject(refactoredMetadata);
-			}
-			
-			updateDependentProjects(refactoredMetadata, monitor);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * Updates the project's own metadata.
-	 */
-	protected abstract void updateProject(final ProjectRefactorMetadata refactoredMetadata) 
-	throws ExecutionException;
-	
-	/**
-	 * Updates the metadata for dependent projects
-	 * @throws ExecutionException
-	 */
-	protected void updateDependentProjects(final ProjectRefactorMetadata refactoredMetadata,
-			final IProgressMonitor monitor) throws ExecutionException {
-		// get the metadata for all dependent projects
-		final ProjectRefactorMetadata[] dependentMetadata = refactoredMetadata.getDependentMetadata();
-		if (monitor != null) {
-			monitor.beginTask(RefactorResourceHandler.getString("task_name"), dependentMetadata.length); 
-		}
-		ProjectRefactorMetadata metadata;
-		for (int i = 0; i < dependentMetadata.length; i++) {
-			metadata = dependentMetadata[i];
-			// if the project is an EAR, execute the update operation created by the
-			// DependentEARUpdateProvider; if the project is a non-EAR project with the
-			// module core nature, execute the appropriate update
-			if (metadata.isEAR()) {
-				updateDependentEARProject(metadata, refactoredMetadata);
-			} else if (metadata.hasModuleCoreNature()) { 
-				updateDependentModuleProject(metadata, refactoredMetadata);
-			}
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-	}
-	
-	/**
-	 * Updates any server references.
-	 */
-	protected void updateServerRefs(final ProjectRefactorMetadata originalMetadata, 
-			final ProjectRefactorMetadata newMetadata)
-		throws ExecutionException {
-		final IModule originalModule = originalMetadata.getModule();
-		if (originalModule == null) {
-			// no module for the original project, so return
-			return;
-		}
-		// Need to replace the original module with a DeletedModule
-		final IModule[] toRemove = new IModule[1];
-		toRemove[0] = new DeletedModule(originalModule.getId(), originalModule.getName(),
-				originalModule.getModuleType());
-		
-		IModule newModule = null;
-		IModule[] toAdd = new IModule[0];
-		if (newMetadata != null) {
-			newModule = newMetadata.getModule();
-			if (newModule == null) {
-				// no module for the new project, so return
-				return;
-			}
-			// XXX Due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=124292,
-			// need to ensure that the IModule for the renamed project has the
-			// id and name for the renamed IProject and not the old name
-			final IProject newProject = newMetadata.getProject();
-			final IModuleType moduleType = newModule.getModuleType();
-            ((Module) newModule).getModuleFactory().getModules();
-			newModule = new Module(((Module) newModule).getModuleFactory(), newProject.getName(), newProject.getName(), moduleType.getId(), 
-					moduleType.getVersion(), newProject);
-			toAdd = new IModule[]{newModule};
-		}
-		
-		final IServer[] server = originalMetadata.getServers();
-		IServerWorkingCopy wc = null;
-		for (int i = 0; i < server.length; i++) {
-			try {
-				wc = server[i].createWorkingCopy();
-				List list = Arrays.asList(server[i].getModules());
-				if (list.contains(originalModule)) {
-					// remove the original and potentially add a new
-					ServerUtil.modifyModules(wc, toAdd, toRemove, null);
-				}
-			} catch (CoreException ce) {
-				throw new ExecutionException(RefactorResourceHandler.getString("error_updating_server", 
-						new Object[]{server[i].getId(), originalMetadata.getProjectName()}), ce);
-			} finally {
-				try {
-					wc.saveAll(true, null);
-				} catch (CoreException ce) {
-					throw new ExecutionException(RefactorResourceHandler.getString("error_updating_server", 
-							new Object[]{server[i].getId(), originalMetadata.getProjectName()}), ce);					
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Updates the dependent EAR project to account for the refactoring of the referenced project.
-	 */
-	protected abstract void updateDependentEARProject(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException;
-	
-	/**
-	 * Updates the dependent module project to account for the refactoring of the referenced project.
-	 */
-	protected abstract void updateDependentModuleProject(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException;
-
-	/**
-	 * Retrieves the ProjectRefactorMetadata property.
-	 */
-	protected ProjectRefactorMetadata getProjectMetadata() {
-		return (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-	}
-	
-	/**
-	 * Override to disable redo support
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo()
-	 */
-	public boolean canRedo() {
-		return false;
-	}
-
-	/**
-	 * Override to disable undo support.
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo()
-	 */
-	public boolean canUndo() {
-		return false;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringDataModelProvider.java
deleted file mode 100644
index 53673ab82..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringDataModelProvider.java
+++ /dev/null
@@ -1,54 +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.refactor.operations;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public abstract class ProjectRefactoringDataModelProvider extends
-		AbstractDataModelProvider implements ProjectRefactoringProperties {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
-	 */
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_METADATA);
-		return propertyNames;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#validate(java.lang.String)
-	 */
-	public IStatus validate(String propertyName) {
-		Iterator i = getPropertyNames().iterator();
-		boolean valid = false;
-		while (i.hasNext()) {
-			if (i.next().equals(propertyName)) {
-				valid = true;
-				break;
-			}
-		}
-		if (!valid) {
-			return new Status(IStatus.ERROR, J2EEPlugin.PLUGIN_ID, IStatus.OK, 
-					RefactorResourceHandler.getString("invalid_property_name", new Object[]{propertyName}), null);
-		}
-		return OK_STATUS;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringProperties.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringProperties.java
deleted file mode 100644
index 53bf78dba..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactoringProperties.java
+++ /dev/null
@@ -1,40 +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.refactor.operations;
-
-public interface ProjectRefactoringProperties {
-
-	/**
-	 * Name of the property that holds an instance of ProjectRefactorMetadata for the
-	 * refactored project.
-	 */
-	public static final String PROJECT_METADATA = "ProjectRefactoringProperties.PROJECT_METADATA"; //$NON-NLS-1$
-	
-	/**
-	 * Name of the property that holds an instance of ProjectRefactorMetadata for the original version of
-	 * the refactored project.
-	 */
-	public static final String ORIGINAL_PROJECT_METADATA = "ProjectRefactoringProperties.ORIGINAL_PROJECT_METADATA"; //$NON-NLS-1$
-	
-    /**
-     * Name of the property that holds an instance of ProjectRefactorMetadata for the
-     * dependent project.
-     */
-    public static final String DEPENDENT_PROJECT_METADATA = "ProjectRefactoringProperties.DEPENDENT_PROJECT_METADATA"; //$NON-NLS-1$
-    
-    /**
-     * Name of the property that holds an instance of the IResourceDelta
-     */
-    public static final String RESOURCE_DELTA= "ProjectRefactoringProperties.RESOURCE_DELTA"; //$NON-NLS-1$
-
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameDataModelProvider.java
deleted file mode 100644
index 1fe5fff13..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameDataModelProvider.java
+++ /dev/null
@@ -1,37 +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.refactor.operations;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ProjectRenameDataModelProvider extends	ProjectRefactoringDataModelProvider 
-	implements ProjectRefactoringProperties {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
-	 */
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-        propertyNames.add(ORIGINAL_PROJECT_METADATA);
-        propertyNames.add(RESOURCE_DELTA);
-		return propertyNames;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getDefaultOperation()
-	 */
-	public IDataModelOperation getDefaultOperation() {
-		return new ProjectRenameOperation(model);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
deleted file mode 100644
index 438c1d44d..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
+++ /dev/null
@@ -1,133 +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.refactor.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-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.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-
-public class ProjectRenameOperation extends ProjectRefactorOperation {
-
-	public ProjectRenameOperation(final IDataModel model) {
-		super(model);
-	}
-	
-	/**
-	 * Override to return the pre-rename metadata.
-	 */
-	protected ProjectRefactorMetadata getProjectMetadata() {
-        return (ProjectRefactorMetadata) model.getProperty(ProjectRenameDataModelProvider.ORIGINAL_PROJECT_METADATA);
-	}
-	
-	/**
-	 * Updates the project's own metadata.
-	 */
-	protected void updateProject(final ProjectRefactorMetadata originalMetadata) 
-		throws ExecutionException {
-		
-		// Update the project's .component file
-		final ProjectRefactorMetadata refactoredMetadata = super.getProjectMetadata();
-		StructureEdit core = null;
-		try {
-			core = StructureEdit.getStructureEditForWrite(refactoredMetadata.getProject());
-			WorkbenchComponent component = core.getComponent();
-			// if the deploy-name had been set to the old project name, update it to 
-			// the new project name
-			if (component.getName().equals(originalMetadata.getProjectName())) {
-				component.setName(refactoredMetadata.getProjectName());
-			}
-			// if there is a context-root property that had been set to the old project name, update it to 
-			// the new project name
-			List propList = component.getProperties();
-            for (int i = 0; i < propList.size(); i++) {
-            	final Property prop = (Property) propList.get(i);
-            	if (prop.getName().equals("context-root") && prop.getValue().equals(originalMetadata.getProjectName())) {
-            		propList.remove(i);
-            		final Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
-				    newProp.setName("context-root");
-				    newProp.setValue(refactoredMetadata.getProjectName());
-				    propList.add(newProp);
-				    break;
-            	}
-            }
-		} finally {
-			if(core != null) {
-				core.saveIfNecessary(null);
-				core.dispose();
-			}
-		}	
-	}
-	
-	/**
-	 * Updates the metadata for dependent projects
-	 * @throws ExecutionException
-	 */
-	protected void updateDependentProjects(final ProjectRefactorMetadata originalMetadata,
-			final IProgressMonitor monitor) throws ExecutionException {
-	    // If this is not an EAR, update metadata for dependent projects
-        // (not performing any refactoring for projects that depend on EAR's right now)
-        if (!originalMetadata.isEAR()) {
-            super.updateDependentProjects(originalMetadata, monitor);
-        }
-		// update any server instance refs to the refactored project
-		final ProjectRefactorMetadata refactoredMetadata = super.getProjectMetadata();
-        ProjectModuleFactoryDelegate.handleGlobalProjectChange(refactoredMetadata.getProject(),
-                (IResourceDelta) model.getProperty(ProjectRenameDataModelProvider.RESOURCE_DELTA));           
-		super.updateServerRefs(originalMetadata, refactoredMetadata);
-	}
-	
-	/**
-	 * Updates the dependent EAR project to account for the renaming of the referenced project.
-	 */
-	protected void updateDependentEARProject(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata originalMetadata) throws ExecutionException {
-        if (OptionalRefactorHandler.getInstance().shouldRefactorDependentProjectOnRename(originalMetadata, dependentMetadata)) {
-		    final IDataModel dataModel = createDataModel(dependentMetadata, originalMetadata,
-		            new UpdateDependentEARonRenameProvider());
-		    dataModel.getDefaultOperation().execute(null, null);
-        }
-	}
-	
-	/**
-	 * Updates the dependent module project to account for the renaming of the referenced project.
-	 */
-	protected void updateDependentModuleProject(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata originalMetadata) throws ExecutionException {
-        if (OptionalRefactorHandler.getInstance().shouldRefactorDependentProjectOnRename(originalMetadata, dependentMetadata)) {
-            final IDataModel dataModel = createDataModel(dependentMetadata, originalMetadata,
-                    new UpdateDependentModuleonRenameProvider());
-            dataModel.getDefaultOperation().execute(null, null);
-        }
-	}
-	
-	private IDataModel createDataModel(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata originalMetadata,
-			final AbstractDataModelProvider provider) {
-		final ProjectRefactorMetadata refactoredMetadata = super.getProjectMetadata();
-		final IDataModel dataModel = DataModelFactory.createDataModel(provider);
-		dataModel.setProperty(PROJECT_METADATA, refactoredMetadata);
-		dataModel.setProperty(DEPENDENT_PROJECT_METADATA, dependentMetadata);
-		dataModel.setProperty(ORIGINAL_PROJECT_METADATA, originalMetadata);
-		return dataModel;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEARDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEARDataModelProvider.java
deleted file mode 100644
index 638200e28..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEARDataModelProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class RemoveDeletedComponentFromEARDataModelProvider extends RemoveComponentFromEnterpriseApplicationDataModelProvider {
-
-	private final ProjectRefactorMetadata _metadata;
-	public RemoveDeletedComponentFromEARDataModelProvider(final ProjectRefactorMetadata metadata) {
-		super();
-		_metadata = metadata;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (TARGET_COMPONENTS_TO_URI_MAP.equals(propertyName)) {
-			Map map = new HashMap();
-			List components = (List) getProperty(TARGET_COMPONENT_LIST);
-			for (int i = 0; i < components.size(); i++) {
-				IVirtualComponent component = (IVirtualComponent) components.get(i);
-				IProject project = component.getProject();
-				String name = component.getName();
-				if (_metadata.isWeb()) {
-					name += ".war"; //$NON-NLS-1$			
-				} else if (_metadata.isEJB()) {
-					name += ".jar"; //$NON-NLS-1$			
-				} else if (_metadata.isAppClient()) {
-					name += ".jar"; //$NON-NLS-1$			
-				} else if (_metadata.isConnector()) {
-					name += ".rar"; //$NON-NLS-1$			
-				}
-				map.put(component, name);
-			}
-			return map;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new RemoveDeletedComponentFromEAROperation(model);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEAROperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEAROperation.java
deleted file mode 100644
index 6a18b1575..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/RemoveDeletedComponentFromEAROperation.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.refactor.operations;
-
-import java.util.Map;
-
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationOperation;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class RemoveDeletedComponentFromEAROperation extends RemoveComponentFromEnterpriseApplicationOperation {
-
-	public RemoveDeletedComponentFromEAROperation(IDataModel model) {
-		super(model);
-	}
-		
-	protected String getModuleURI(final EARArtifactEdit earEdit, final IVirtualComponent targetComponent) {
-		String uri = earEdit.getModuleURI(targetComponent);
-		if (uri == null) {
-			Map compToURI = (Map) model.getProperty(RemoveDeletedComponentFromEARDataModelProvider.TARGET_COMPONENTS_TO_URI_MAP); 
-			uri = (String) compToURI.get(targetComponent);
-		}
-		return uri;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteOp.java
deleted file mode 100644
index 55a660a79..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteOp.java
+++ /dev/null
@@ -1,79 +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.refactor.operations;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * EAR project when one of the referenced projects has been deleted.
- */
-public class UpdateDependentEARonDeleteOp extends UpdateDependentProjectOp {
-
-	/**
-	 * Creates a new refactoring operation for the specified data model.
-	 * @param model The data model.
-	 */
-	public UpdateDependentEARonDeleteOp(final IDataModel model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
-		final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-		removeEARDependency(dependentMetadata, refactoredMetadata);
-		return Status.OK_STATUS;
-	}
-	
-	/**
-	 * Updates the dependent EAR project to account for the deletion of the referenced project.
-	 */	
-	protected static void removeEARDependency(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
-
-		// create IVirtualComponents for the EAR and the refactored project
-		final IVirtualComponent earComp = dependentMetadata.getVirtualComponent();
-		final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-		final IProgressMonitor monitor = new NullProgressMonitor();
-		
-		// remove the dependency on the deleted project
-		if (refactoredComp != null) {
-			final IDataModel model = DataModelFactory.createDataModel(new RemoveDeletedComponentFromEARDataModelProvider(refactoredMetadata));
-			model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-			final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-			modHandlesList.add(refactoredComp);
-			model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
-			final String moduleURI = refactoredMetadata.getModuleURI(dependentMetadata.getProjectName());
-			if (moduleURI != null) {
-				final Map compToURI = (Map) model.getProperty(RemoveDeletedComponentFromEARDataModelProvider.TARGET_COMPONENTS_TO_URI_MAP);
-				compToURI.put(refactoredComp, moduleURI); 
-				model.setProperty(RemoveDeletedComponentFromEARDataModelProvider.TARGET_COMPONENTS_TO_URI_MAP, compToURI);
-			}
-			model.getDefaultOperation().execute(monitor, null);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteProvider.java
deleted file mode 100644
index 1a4f0ca5a..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonDeleteProvider.java
+++ /dev/null
@@ -1,23 +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.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentEARonDeleteProvider extends UpdateDependentProjectDataModelProvider 
-	implements ProjectRefactoringProperties {
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new UpdateDependentEARonDeleteOp(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameOp.java
deleted file mode 100644
index de852dd24..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameOp.java
+++ /dev/null
@@ -1,98 +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.refactor.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata.RefCachingVirtualComponent;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * EAR project when a referenced project has been renamed.
- */
-public class UpdateDependentEARonRenameOp extends UpdateDependentProjectOp {
-
-	public UpdateDependentEARonRenameOp(final IDataModel model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		
-		final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
-		final ProjectRefactorMetadata originalMetadata = (ProjectRefactorMetadata) model.getProperty(ORIGINAL_PROJECT_METADATA);
-		final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-		
-		// create IVirtualComponents for the EAR and the refactored project
-		final RefCachingVirtualComponent earComp = (RefCachingVirtualComponent) dependentMetadata.getVirtualComponent();
-		final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-
-		if (refactoredComp == null) {
-			return Status.OK_STATUS;
-		}
-		
-		boolean hadModuleReference = hadReference(dependentMetadata, originalMetadata) != null;
-		boolean hadProjectReference = hadProjectReference(dependentMetadata, originalMetadata);
-		
-		// first, remove the dependency on the old project name via the 
-		// ProjectDeleteOperation
-		UpdateDependentEARonDeleteOp.removeEARDependency(dependentMetadata, originalMetadata);
-		
-		// change to use not use caching
-		earComp.setCaching(false);
-		
-		// add back a dependency on the renamed project
-		if (refactoredMetadata.hasModuleCoreNature()) {
-			// the refactored project was a module project
-			final IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-			dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp); 
-			final List depList = new ArrayList();
-			depList.add(refactoredComp);
-			dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, depList);
-			dm.getDefaultOperation().execute(monitor, null);
-		} else if (refactoredMetadata.hasJavaNature()) {
-			// the refactored project was a plain java project
-			final IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
-			migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, refactoredMetadata.getProjectName());
-			migrationdm.getDefaultOperation().execute(new NullProgressMonitor(), null);
-			final IDataModel refdm = DataModelFactory.createDataModel(new CreateOptionalReferenceOpDataModelProvider());
-			final List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-			targetCompList.add(refactoredComp);
-			refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-			refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
-			refdm.setBooleanProperty(CreateOptionalReferenceOpDataModelProvider.CREATE_COMPONENT_REF,hadModuleReference); 
-			refdm.setBooleanProperty(CreateOptionalReferenceOpDataModelProvider.CREATE_PROJECT_REF,hadProjectReference);
-			refdm.getDefaultOperation().execute(monitor, null);
-		} else {
-			throw new ExecutionException(RefactorResourceHandler.getString("missing_natures"), null);
-		}
-		return Status.OK_STATUS;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameProvider.java
deleted file mode 100644
index e9abc1bca..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentEARonRenameProvider.java
+++ /dev/null
@@ -1,23 +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.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentEARonRenameProvider extends UpdateDependentProjectRenameDataModelProvider 
-	implements ProjectRefactoringProperties {
-
-	public IDataModelOperation getDefaultOperation() {
-		return new UpdateDependentEARonRenameOp(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteOp.java
deleted file mode 100644
index 50b988b25..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteOp.java
+++ /dev/null
@@ -1,154 +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.refactor.operations;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.refactor.RefactorResourceHandler;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-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;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * module project when one of the referenced projects has been deleted.
- */
-public class UpdateDependentModuleonDeleteOp extends UpdateDependentProjectOp {
-	
-	/**
-	 * Creates a new refactoring operation for the specified data model.
-	 * @param model The data model.
-	 */
-	public UpdateDependentModuleonDeleteOp(final IDataModel model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
-		final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-		removeModuleDependency(dependentMetadata, refactoredMetadata);
-		return Status.OK_STATUS;
-	}
-	
-	/**
-	 * Updates the dependent module project to account for the deletion of the referenced project.
-	 */
-	protected static void removeModuleDependency(final ProjectRefactorMetadata dependentMetadata, 
-			final ProjectRefactorMetadata refactoredMetadata) throws ExecutionException {
-		
-		// create IVirtualComponents for the dependent and the refactored project
-		final IVirtualComponent dependentComp = dependentMetadata.getVirtualComponent();
-		final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-		final IProgressMonitor monitor = new NullProgressMonitor();
-
-		// Does the dependent project have a .component reference on the refactored project?
-		final IVirtualReference ref = hadReference(dependentMetadata, refactoredMetadata);
-		final boolean webLibDep = hasWebLibDependency(ref);
-		
-		// remove the component reference on the deleted project
-		if (refactoredComp != null) {
-			final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
-			model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, dependentComp);
-			final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-			modHandlesList.add(refactoredComp);
-			model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
-			if (webLibDep) {
-				model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,"/WEB-INF/lib"); //$NON-NLS-1$
-			}
-			model.getDefaultOperation().execute(monitor, null);
-		}
-		
-		// update the manifest
-		if (!webLibDep) {
-			updateManifestDependency(refactoredMetadata, dependentMetadata, true);
-		}
-	}
-	
-	protected static void updateManifestDependency(final ProjectRefactorMetadata refactoredMetadata,
-			final ProjectRefactorMetadata dependentMetadata, final boolean remove) throws ExecutionException {
-		final IVirtualComponent dependentComp = dependentMetadata.getVirtualComponent();
-		IProject project= dependentComp.getProject();
-		if(project.isAccessible()){
-			final String dependentProjName = dependentMetadata.getProjectName();
-			final String refactoredProjName = refactoredMetadata.getProjectName();
-			final IVirtualFile vf = dependentComp.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI) );
-			final IFile manifestmf = vf.getUnderlyingFile();
-			final IProgressMonitor monitor = new NullProgressMonitor();
-			final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
-			updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, dependentProjName);
-			updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-			updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
-			final ArchiveManifest manifest = getArchiveManifest(manifestmf);
-			String[] cp = manifest.getClassPathTokenized();
-			List cpList = new ArrayList();
-			String newCp = refactoredProjName + ".jar";//$NON-NLS-1$
-			for (int i = 0; i < cp.length; i++) {
-				if (!cp[i].equals(newCp)) {
-					cpList.add(cp[i]);
-				}
-			}
-			if (!remove) {
-				cpList.add(newCp);
-			}
-			updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
-			updateManifestDataModel.getDefaultOperation().execute(monitor, null );
-		}
-	}
-	
-	private static ArchiveManifest getArchiveManifest(final IFile manifestFile) throws ExecutionException {
-		InputStream in = null;
-		try {
-			in = manifestFile.getContents();
-			ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
-			return mf;
-		} catch (CoreException ce) {
-			throw new ExecutionException(RefactorResourceHandler.getString("error_reading_manifest"), ce);
-		} catch (IOException io) {
-			throw new ExecutionException(RefactorResourceHandler.getString("error_reading_manifest"), io);
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException weTried) {
-					//Ignore
-				}
-			}
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteProvider.java
deleted file mode 100644
index c3365c6fc..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonDeleteProvider.java
+++ /dev/null
@@ -1,23 +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.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentModuleonDeleteProvider extends UpdateDependentProjectDataModelProvider 
-	implements ProjectRefactoringProperties {
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new UpdateDependentModuleonDeleteOp(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameOp.java
deleted file mode 100644
index 422fcb5db..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameOp.java
+++ /dev/null
@@ -1,87 +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.refactor.operations;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata.RefCachingVirtualComponent;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Subclass of <code>UpdateDependentProjectOp</code> that updates a dependent
- * module project when a referenced project has been renamed.
- */
-public class UpdateDependentModuleonRenameOp extends UpdateDependentProjectOp {
-
-	public UpdateDependentModuleonRenameOp(final IDataModel model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		
-		final ProjectRefactorMetadata dependentMetadata = (ProjectRefactorMetadata) model.getProperty(DEPENDENT_PROJECT_METADATA);
-		final ProjectRefactorMetadata originalMetadata = (ProjectRefactorMetadata) model.getProperty(ORIGINAL_PROJECT_METADATA);
-		final ProjectRefactorMetadata refactoredMetadata = (ProjectRefactorMetadata) model.getProperty(PROJECT_METADATA);
-		
-		// create IVirtualComponents for the dependent project and the refactored project
-		final RefCachingVirtualComponent dependentComp = (RefCachingVirtualComponent) dependentMetadata.getVirtualComponent();
-		final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-		
-		// Does the dependent project have a component and/or project references on the refactored project?
-		final IVirtualReference ref = hadReference(dependentMetadata, originalMetadata);
-		boolean hadModuleRef = ref != null;
-		boolean hadProjectRef = hadProjectReference(dependentMetadata, originalMetadata);
-		final boolean webLibDep = hasWebLibDependency(ref);
-	
-		// first, remove the dependency on the old project name via the 
-		// ProjectDeleteOperation
-		UpdateDependentModuleonDeleteOp.removeModuleDependency(dependentMetadata, originalMetadata);
-		
-		// change to use not use caching
-		dependentComp.setCaching(false);
-		
-		// add a reference to the renamed project (need to be adding either a component or project ref)
-		if (refactoredComp != null && (hadModuleRef || hadProjectRef)) {
-			final IDataModel refdm = DataModelFactory.createDataModel(new CreateOptionalReferenceOpDataModelProvider());
-			final List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-			targetCompList.add(refactoredComp);
-			refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, dependentComp);
-			refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
-			if (webLibDep) {
-				refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,"/WEB-INF/lib"); //$NON-NLS-1$
-			}
-			refdm.setBooleanProperty(CreateOptionalReferenceOpDataModelProvider.CREATE_COMPONENT_REF,hadModuleRef); 
-			refdm.setBooleanProperty(CreateOptionalReferenceOpDataModelProvider.CREATE_PROJECT_REF,hadProjectRef);
-			refdm.getDefaultOperation().execute(monitor, null);
-		}
-	
-		// update the manifest, unless this was a web library dependency
-		if (!webLibDep) {
-			UpdateDependentModuleonDeleteOp.updateManifestDependency(refactoredMetadata, dependentMetadata, false);
-		}
-			
-		return Status.OK_STATUS;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameProvider.java
deleted file mode 100644
index 291b40c2d..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentModuleonRenameProvider.java
+++ /dev/null
@@ -1,23 +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.refactor.operations;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class UpdateDependentModuleonRenameProvider extends UpdateDependentProjectRenameDataModelProvider 
-	implements ProjectRefactoringProperties {
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new UpdateDependentModuleonRenameOp(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectDataModelProvider.java
deleted file mode 100644
index 574fd4017..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectDataModelProvider.java
+++ /dev/null
@@ -1,27 +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.refactor.operations;
-
-import java.util.Set;
-
-public abstract class UpdateDependentProjectDataModelProvider extends ProjectRefactoringDataModelProvider 
-	implements ProjectRefactoringProperties {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
-	 */
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(DEPENDENT_PROJECT_METADATA);
-		return propertyNames;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectOp.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectOp.java
deleted file mode 100644
index 82482a86c..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectOp.java
+++ /dev/null
@@ -1,108 +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.refactor.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Abstract base class for operations that update dependent projects when a 
- * referenced project is refactored.
- */
-public abstract class UpdateDependentProjectOp extends AbstractDataModelOperation 
-	implements ProjectRefactoringProperties {
-
-	/**
-	 * Creates a new refactoring operation for the specified data model.
-	 * @param model The data model.
-	 */
-	public UpdateDependentProjectOp(final IDataModel model) {
-		super(model);
-	}
-	
-	/**
-	 * Does the dependent project have a .component reference on the refactored project?
-	 * @return IVirtualReference or null if one didn't exist.
-	 */
-	protected static IVirtualReference hadReference(final ProjectRefactorMetadata dependentMetadata,
-			final ProjectRefactorMetadata refactoredMetadata) {
-		final IVirtualComponent refactoredComp = refactoredMetadata.getVirtualComponent();
-		if (refactoredComp == null) {
-			return null;
-		}
-		final IVirtualReference[] refs = dependentMetadata.getVirtualComponent().getReferences();
-		IVirtualReference ref = null;
-		for (int i = 0; i < refs.length; i++) {
-			if (refs[i].getReferencedComponent().equals(refactoredComp)) {
-				ref = refs[i];
-				break;
-			}
-		}
-		return ref;
-	}
-	
-	/**
-	 * Does the dependent project have a .project reference on the refactored project?
-	 * (dynamic project refs don't count)
-	 * @return True if a project reference exists.
-	 */
-	protected static boolean hadProjectReference(final ProjectRefactorMetadata dependentMetadata,
-			final ProjectRefactorMetadata refactoredMetadata) {
-		try {
-			final IProject[] refs = dependentMetadata.getProject().getDescription().getReferencedProjects();
-			final IProject refactoredProject= refactoredMetadata.getProject();
-			for (int i = 0; i < refs.length; i++) {
-				if (refs[i].equals(refactoredProject)) {
-					return true;
-				}
-			} 
-		} catch (CoreException ce) {
-			Logger.getLogger().logError(ce);
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns true if the dependency was a web library dependency. 
-	 * @param ref
-	 * @return
-	 */
-	protected static boolean hasWebLibDependency(final IVirtualReference ref) {
-		if (ref == null) {
-			return false;
-		}
-		return ref.getRuntimePath().equals(new Path("/WEB-INF/lib")); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Override to disable redo support
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo()
-	 */
-	public boolean canRedo() {
-		return false;
-	}
-
-	/**
-	 * Override to disable undo support.
-	 * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo()
-	 */
-	public boolean canUndo() {
-		return false;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectRenameDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectRenameDataModelProvider.java
deleted file mode 100644
index fe9d4feee..000000000
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/UpdateDependentProjectRenameDataModelProvider.java
+++ /dev/null
@@ -1,28 +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.refactor.operations;
-
-import java.util.Set;
-
-public abstract class UpdateDependentProjectRenameDataModelProvider extends ProjectRenameDataModelProvider 
-	implements ProjectRefactoringProperties {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
-	 */
-	public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(DEPENDENT_PROJECT_METADATA);
-		return propertyNames;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.genmodel b/plugins/org.eclipse.jst.j2ee/rose/moduleMap.genmodel
deleted file mode 100644
index 3c01fa09d..000000000
--- a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.genmodel
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.j2ee/earproject"
-    editDirectory="/com.ibm.etools.j2ee/applicationedit" editorDirectory="/com.ibm.etools.j2ee.editor/src"
-    modelPluginID="modulemap" modelName="Modulemap" editPluginClass="modulemap.provider.ModulemapEditPlugin"
-    editorPluginClass="com.ibm.etools.j2ee.plugin.J2EEPlugin" updateClasspath="false"
-    usedGenPackages="../../com.ibm.etools.j2ee.core/rose/j2ee.genmodel#//@genPackages.5 ../../com.ibm.etools.java.core/rose/javaModel.genmodel#//@genPackages.0 ../../com.ibm.etools.j2ee.core/rose/j2ee.genmodel#//@genPackages.1 ../../org.eclipse.emf.ecore/src/model/Ecore.genmodel#//@genPackages.0">
-  <foreignModel>moduleMap.mdl</foreignModel>
-  <foreignModel>WORKSPACE_ROOT</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Modulemap" basePackage="com.ibm.etools.ear" ecorePackage="modulemap.ecore#/">
-    <genClasses ecoreClass="modulemap.ecore#//ModuleMapping">
-      <genFeatures ecoreFeature="ecore:EAttribute modulemap.ecore#//ModuleMapping/projectName"/>
-      <genFeatures ecoreFeature="ecore:EReference modulemap.ecore#//ModuleMapping/module"/>
-    </genClasses>
-    <genClasses ecoreClass="modulemap.ecore#//EARProjectMap">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference modulemap.ecore#//EARProjectMap/mappings"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference modulemap.ecore#//EARProjectMap/utilityJARMappings"/>
-    </genClasses>
-    <genClasses ecoreClass="modulemap.ecore#//UtilityJARMapping">
-      <genFeatures ecoreFeature="ecore:EAttribute modulemap.ecore#//UtilityJARMapping/projectName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute modulemap.ecore#//UtilityJARMapping/uri"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.mdl b/plugins/org.eclipse.jst.j2ee/rose/moduleMap.mdl
deleted file mode 100644
index 71f26c9cb..000000000
--- a/plugins/org.eclipse.jst.j2ee/rose/moduleMap.mdl
+++ /dev/null
@@ -1,7323 +0,0 @@
-

-(object Petal

-    version    	44

-    _written   	"Rose 7.1.9642.27"

-    charSet    	0)

-

-(object Design "Logical View"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    quid       	"3B7045650189"

-    defaults   	(object defaults

-	rightMargin 	0.250000

-	leftMargin 	0.250000

-	topMargin  	0.250000

-	bottomMargin 	0.500000

-	pageOverlap 	0.250000

-	clipIconLabels 	TRUE

-	autoResize 	TRUE

-	snapToGrid 	TRUE

-	gridX      	16

-	gridY      	16

-	defaultFont 	(object Font

-	    size       	10

-	    face       	"Arial"

-	    bold       	FALSE

-	    italics    	FALSE

-	    underline  	FALSE

-	    strike     	FALSE

-	    color      	0

-	    default_color 	TRUE)

-	showMessageNum 	1

-	showClassOfObject 	TRUE

-	notation   	"Unified")

-    root_usecase_package 	(object Class_Category "Use Case View"

-	quid       	"3B704565018B"

-	exportControl 	"Public"

-	global     	TRUE

-	logical_models 	(list unit_reference_list)

-	logical_presentations 	(list unit_reference_list

-	    (object UseCaseDiagram "Main"

-		quid       	"3B704565019E"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    root_category 	(object Class_Category "Logical View"

-	quid       	"3B704565018A"

-	exportControl 	"Public"

-	global     	TRUE

-	subsystem  	"Component View"

-	quidu      	"3B704565018C"

-	logical_models 	(list unit_reference_list

-	    (object Class_Category "application"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\com.ibm.etools.j2ee.core\\rose\\application.cat"

-		quid       	"38C03008014E")

-	    (object Class_Category "modulemap"

-		quid       	"3B7045BB0314"

-		exportControl 	"Public"

-		logical_models 	(list unit_reference_list

-		    (object Class "ModuleMapping"

-			quid       	"3B704601006B"

-			class_attributes 	(list class_attribute_list

-			    (object ClassAttribute "projectName"

-				quid       	"3B7047D600FC"

-				type       	"String"

-				exportControl 	"Public")))

-		    (object Class "EARProjectMap"

-			quid       	"3B7046180227"

-			realized_interfaces 	(list realize_rel_list

-			    (object Realize_Relationship

-				quid       	"3B7046570029"

-				supplier   	"Logical View::modulemap::ModuleMapping"

-				quidu      	"3B704601006B")))

-		    (object Class "UtilityJARMapping"

-			quid       	"3C570595009F"

-			class_attributes 	(list class_attribute_list

-			    (object ClassAttribute "projectName"

-				quid       	"3C5705D002AD"

-				type       	"String"

-				exportControl 	"Public")

-			    (object ClassAttribute "uri"

-				quid       	"3C5705E2014A"

-				type       	"String"

-				exportControl 	"Public")))

-		    (object Association "$UNNAMED$0"

-			quid       	"3B704663024D"

-			roles      	(list role_list

-			    (object Role "mappings"

-				quid       	"3B70466402A8"

-				label      	"mappings"

-				supplier   	"Logical View::modulemap::ModuleMapping"

-				quidu      	"3B704601006B"

-				client_cardinality 	(value cardinality "0..n")

-				Containment 	"By Value"

-				is_navigable 	TRUE)

-			    (object Role "$UNNAMED$1"

-				quid       	"3B70466402B2"

-				supplier   	"Logical View::modulemap::EARProjectMap"

-				quidu      	"3B7046180227"

-				is_aggregate 	TRUE)))

-		    (object Association "$UNNAMED$2"

-			quid       	"3B70480A00E3"

-			roles      	(list role_list

-			    (object Role "module"

-				quid       	"3B70480C0117"

-				label      	"module"

-				supplier   	"Logical View::application::Module"

-				quidu      	"38C0322C0006"

-				client_cardinality 	(value cardinality "1")

-				Containment 	"By Reference"

-				is_navigable 	TRUE)

-			    (object Role "$UNNAMED$3"

-				quid       	"3B70480C012C"

-				supplier   	"Logical View::modulemap::ModuleMapping"

-				quidu      	"3B704601006B"

-				is_aggregate 	TRUE)))

-		    (object Association "$UNNAMED$4"

-			quid       	"3C5709D2010E"

-			roles      	(list role_list

-			    (object Role "utilityJARMappings"

-				quid       	"3C5709D3019B"

-				label      	"utilityJARMappings"

-				supplier   	"Logical View::modulemap::UtilityJARMapping"

-				quidu      	"3C570595009F"

-				client_cardinality 	(value cardinality "1..n")

-				Containment 	"By Value"

-				is_navigable 	TRUE)

-			    (object Role "$UNNAMED$5"

-				quid       	"3C5709D3019D"

-				supplier   	"Logical View::modulemap::EARProjectMap"

-				quidu      	"3B7046180227"

-				is_aggregate 	TRUE))))

-		logical_presentations 	(list unit_reference_list

-		    (object ClassDiagram "Main"

-			quid       	"3B7045E600D1"

-			title      	"Main"

-			zoom       	100

-			max_height 	28350

-			max_width  	21600

-			origin_x   	0

-			origin_y   	0

-			items      	(list diagram_item_list

-			    (object NoteView @1

-				location   	(1184, 1504)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				label      	(object ItemLabel

-				    Parent_View 	@1

-				    location   	(778, 1304)

-				    fill_color 	13434879

-				    nlines     	8

-				    max_width  	777

-				    label      	"These could have had a common supertype; however, we have to maintain compatilibility with existing documents from v4, so we can't change the hierarchy of ModuleMapping.  We may decide later to add a common interface.")

-				line_color 	3342489

-				fill_color 	13434879

-				width      	837

-				height     	412)

-			    (object ClassView "Class" "Logical View::application::Module" @2

-				ShowCompartmentStereotypes 	TRUE

-				IncludeAttribute 	TRUE

-				IncludeOperation 	TRUE

-				location   	(1520, 800)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				label      	(object ItemLabel

-				    Parent_View 	@2

-				    location   	(1372, 671)

-				    fill_color 	13434879

-				    nlines     	1

-				    max_width  	296

-				    justify    	0

-				    label      	"Module")

-				icon_style 	"Icon"

-				line_color 	3342489

-				fill_color 	13434879

-				quidu      	"38C0322C0006"

-				width      	314

-				height     	282

-				annotation 	8

-				autoResize 	TRUE)

-			    (object ClassView "Class" "Logical View::modulemap::ModuleMapping" @3

-				ShowCompartmentStereotypes 	TRUE

-				IncludeAttribute 	TRUE

-				IncludeOperation 	TRUE

-				location   	(1504, 256)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				label      	(object ItemLabel

-				    Parent_View 	@3

-				    location   	(1292, 175)

-				    fill_color 	13434879

-				    nlines     	1

-				    max_width  	424

-				    justify    	0

-				    label      	"ModuleMapping")

-				icon_style 	"Icon"

-				line_color 	3342489

-				fill_color 	13434879

-				quidu      	"3B704601006B"

-				width      	442

-				height     	186

-				annotation 	8

-				autoResize 	TRUE)

-			    (object AssociationViewNew "$UNNAMED$2" @4

-				location   	(1520, 504)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B70480A00E3"

-				roleview_list 	(list RoleViews

-				    (object RoleView "module" @5

-					Parent_View 	@4

-					location   	(16, 248)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					label      	(object SegLabel @6

-					    Parent_View 	@5

-					    location   	(1622, 594)

-					    font       	(object Font

-						size       	10

-						face       	"Arial"

-						bold       	FALSE

-						italics    	FALSE

-						underline  	FALSE

-						strike     	FALSE

-						color      	0

-						default_color 	TRUE)

-					    anchor     	1

-					    anchor_loc 	1

-					    nlines     	1

-					    max_width  	172

-					    justify    	0

-					    label      	"+module"

-					    pctDist    	0.587413

-					    height     	102

-					    orientation 	0)

-					stereotype 	TRUE

-					line_color 	3342489

-					quidu      	"3B70480C0117"

-					client     	@4

-					supplier   	@2

-					line_style 	3

-					origin_attachment 	(1520, 504)

-					terminal_attachment 	(1520, 659)

-					label      	(object SegLabel @7

-					    Parent_View 	@5

-					    location   	(1574, 642)

-					    font       	(object Font

-						size       	10

-						face       	"Arial"

-						bold       	FALSE

-						italics    	FALSE

-						underline  	FALSE

-						strike     	FALSE

-						color      	0

-						default_color 	TRUE)

-					    anchor     	2

-					    anchor_loc 	1

-					    nlines     	1

-					    max_width  	15

-					    justify    	0

-					    label      	"1"

-					    pctDist    	0.900000

-					    height     	54

-					    orientation 	0))

-				    (object RoleView "$UNNAMED$3" @8

-					Parent_View 	@4

-					location   	(16, 248)

-					stereotype 	TRUE

-					line_color 	3342489

-					quidu      	"3B70480C012C"

-					client     	@4

-					supplier   	@3

-					line_style 	3

-					origin_attachment 	(1520, 504)

-					terminal_attachment 	(1520, 349))))

-			    (object AttachView "" @9

-				stereotype 	TRUE

-				line_color 	3342489

-				client     	@3

-				supplier   	@1

-				line_style 	3

-				origin_attachment 	(1309, 348)

-				terminal_attachment 	(1309, 1297))

-			    (object ClassView "Class" "Logical View::modulemap::UtilityJARMapping" @10

-				ShowCompartmentStereotypes 	TRUE

-				IncludeAttribute 	TRUE

-				IncludeOperation 	TRUE

-				location   	(544, 800)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				label      	(object ItemLabel

-				    Parent_View 	@10

-				    location   	(332, 669)

-				    fill_color 	13434879

-				    nlines     	2

-				    max_width  	424

-				    justify    	0

-				    label      	"UtilityJARMapping")

-				icon_style 	"Icon"

-				line_color 	3342489

-				fill_color 	16777088

-				quidu      	"3C570595009F"

-				width      	442

-				height     	286

-				annotation 	8

-				autoResize 	TRUE)

-			    (object AttachView "" @11

-				stereotype 	TRUE

-				line_color 	3342489

-				client     	@1

-				supplier   	@10

-				vertices   	(list Points

-				    (1088, 1297)

-				    (1088, 786)

-				    (765, 786))

-				line_style 	3

-				origin_attachment 	(768, 1298)

-				terminal_attachment 	(768, 943))

-			    (object ClassView "Class" "Logical View::modulemap::EARProjectMap" @12

-				ShowCompartmentStereotypes 	TRUE

-				IncludeAttribute 	TRUE

-				IncludeOperation 	TRUE

-				location   	(544, 224)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				label      	(object ItemLabel

-				    Parent_View 	@12

-				    location   	(376, 173)

-				    fill_color 	13434879

-				    nlines     	1

-				    max_width  	336

-				    justify    	0

-				    label      	"EARProjectMap")

-				icon_style 	"Icon"

-				line_color 	3342489

-				fill_color 	13434879

-				quidu      	"3B7046180227"

-				width      	354

-				height     	126

-				annotation 	8

-				autoResize 	TRUE)

-			    (object AssociationViewNew "$UNNAMED$0" @13

-				location   	(1002, 216)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3B704663024D"

-				roleview_list 	(list RoleViews

-				    (object RoleView "mappings" @14

-					Parent_View 	@13

-					location   	(730, -24)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					label      	(object SegLabel @15

-					    Parent_View 	@14

-					    location   	(1227, 175)

-					    font       	(object Font

-						size       	10

-						face       	"Arial"

-						bold       	FALSE

-						italics    	FALSE

-						underline  	FALSE

-						strike     	FALSE

-						color      	0

-						default_color 	TRUE)

-					    anchor     	1

-					    anchor_loc 	1

-					    nlines     	1

-					    max_width  	216

-					    justify    	0

-					    label      	"+mappings"

-					    pctDist    	0.800000

-					    height     	42

-					    orientation 	0)

-					stereotype 	TRUE

-					line_color 	3342489

-					quidu      	"3B70466402A8"

-					client     	@13

-					supplier   	@3

-					line_style 	3

-					origin_attachment 	(1002, 216)

-					terminal_attachment 	(1283, 216)

-					label      	(object SegLabel @16

-					    Parent_View 	@14

-					    location   	(1255, 270)

-					    font       	(object Font

-						size       	10

-						face       	"Arial"

-						bold       	FALSE

-						italics    	FALSE

-						underline  	FALSE

-						strike     	FALSE

-						color      	0

-						default_color 	TRUE)

-					    anchor     	2

-					    anchor_loc 	1

-					    nlines     	1

-					    max_width  	15

-					    justify    	0

-					    label      	"0..n"

-					    pctDist    	0.900000

-					    height     	54

-					    orientation 	1))

-				    (object RoleView "$UNNAMED$1" @17

-					Parent_View 	@13

-					location   	(730, -24)

-					stereotype 	TRUE

-					line_color 	3342489

-					quidu      	"3B70466402B2"

-					client     	@13

-					supplier   	@12

-					line_style 	3

-					origin_attachment 	(1002, 216)

-					terminal_attachment 	(721, 216))))

-			    (object AssociationViewNew "$UNNAMED$4" @18

-				location   	(544, 471)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				stereotype 	TRUE

-				line_color 	3342489

-				quidu      	"3C5709D2010E"

-				roleview_list 	(list RoleViews

-				    (object RoleView "utilityJARMappings" @19

-					Parent_View 	@18

-					location   	(0, 247)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					label      	(object SegLabel @20

-					    Parent_View 	@19

-					    location   	(341, 571)

-					    font       	(object Font

-						size       	10

-						face       	"Arial"

-						bold       	FALSE

-						italics    	FALSE

-						underline  	FALSE

-						strike     	FALSE

-						color      	0

-						default_color 	TRUE)

-					    anchor     	1

-					    anchor_loc 	1

-					    nlines     	1

-					    max_width  	374

-					    justify    	0

-					    label      	"+utilityJARMappings"

-					    pctDist    	0.545946

-					    height     	204

-					    orientation 	1)

-					stereotype 	TRUE

-					line_color 	3342489

-					quidu      	"3C5709D3019B"

-					client     	@18

-					supplier   	@10

-					line_style 	0

-					label      	(object SegLabel @21

-					    Parent_View 	@19

-					    location   	(598, 637)

-					    font       	(object Font

-						size       	10

-						face       	"Arial"

-						bold       	FALSE

-						italics    	FALSE

-						underline  	FALSE

-						strike     	FALSE

-						color      	0

-						default_color 	TRUE)

-					    anchor     	2

-					    anchor_loc 	1

-					    nlines     	1

-					    max_width  	15

-					    justify    	0

-					    label      	"1..n"

-					    pctDist    	0.897297

-					    height     	54

-					    orientation 	0))

-				    (object RoleView "$UNNAMED$5" @22

-					Parent_View 	@18

-					location   	(0, 247)

-					stereotype 	TRUE

-					line_color 	3342489

-					quidu      	"3C5709D3019D"

-					client     	@18

-					supplier   	@12

-					line_style 	0)))))))

-	    (object Class_Category "common"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\com.ibm.etools.j2ee.core\\rose\\common.cat"

-		quid       	"38C08F0F038D")

-	    (object Class_Category "ecore"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\src\\model\\org.eclipse.emf.Ecore.cat"

-		quid       	"39A5ED04004E")

-	    (object Class_Category "java"

-		is_unit    	TRUE

-		is_loaded  	FALSE

-		file_name  	"$WORKSPACE_ROOT\\com.ibm.etools.java.core\\rose\\edocjava2.cat"

-		quid       	"36549F2C004E"))

-	logical_presentations 	(list unit_reference_list

-	    (object ClassDiagram "Main"

-		quid       	"3B7045650193"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list

-		    (object CategoryView "Logical View::application" @23

-			location   	(1136, 912)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			label      	(object ItemLabel

-			    Parent_View 	@23

-			    location   	(992, 828)

-			    fill_color 	13434879

-			    nlines     	2

-			    max_width  	288

-			    justify    	0

-			    label      	"application")

-			icon_style 	"Icon"

-			line_color 	3342489

-			fill_color 	13434879

-			quidu      	"38C03008014E"

-			width      	300

-			height     	180)))))

-    root_subsystem 	(object SubSystem "Component View"

-	quid       	"3B704565018C"

-	physical_models 	(list unit_reference_list)

-	physical_presentations 	(list unit_reference_list

-	    (object Module_Diagram "Main"

-		quid       	"3B704565019D"

-		title      	"Main"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    process_structure 	(object Processes

-	quid       	"3B704565018D"

-	ProcsNDevs 	(list

-	    (object Process_Diagram "Deployment View"

-		quid       	"3B704565018F"

-		title      	"Deployment View"

-		zoom       	100

-		max_height 	28350

-		max_width  	21600

-		origin_x   	0

-		origin_y   	0

-		items      	(list diagram_item_list))))

-    properties 	(object Properties

-	attributes 	(list Attribute_Set

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"packageName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"nsURI"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"basePackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"prefix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"classifierName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"operationName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"attributeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnique"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isID"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ecore"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"referenceName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isTransient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isChangeable"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isUnsettable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ecore"

-			name       	"isResolveProxies"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Const"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialValue"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Copyright"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"RootPackage"

-			value      	"C++ Reverse Engineered")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialHeaderIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialBodyIncludes"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"InitialCodeBody"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Inline"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"Synchronize"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"HeaderSourceFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"BodySourceFile"

-			value      	"")))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Cplusplus"

-			name       	"IsNamespace"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Cplusplus"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSI C++ Event Watcher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ANSIConvert"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"$ROSEADA83_SOURCE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassAccess"

-			value      	("ImplementationSet" 43))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationType"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"PolymorphicUnit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleAccess"

-			value      	("ImplementationSet" 45))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Discriminant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorKind"

-			value      	("ConstructorKindSet" 199))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"HandleEqualityOperation"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsTask"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"LimitedPrivate"

-				value      	200)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ConstructorKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsSubunit"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ClassParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Separate"

-				value      	223)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Spec"

-				value      	224)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"FunctionReturn"

-				value      	206)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Variant"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Representation"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"DataMemberName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada83"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada83"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada83"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"propertyId"

-		value      	"838326200")

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileExtension"

-			value      	"1.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileBackupExtension"

-			value      	"1.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SpecFileTemporaryExtension"

-			value      	"1.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileExtension"

-			value      	"2.ada")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileBackupExtension"

-			value      	"2.ad~")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"BodyFileTemporaryExtension"

-			value      	"2.ad#")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseColonNotation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateBodies"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"UseFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"$ROSEADA95_SOURCE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeName"

-			value      	"Object")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibility"

-			value      	("TypeVisibilitySet" 43))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementation"

-			value      	("TypeImplementationSet" 208))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControl"

-			value      	("TypeControlSet" 225))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlName"

-			value      	"Controlled_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementation"

-			value      	("RecordImplementationSet" 209))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordKindPackageName"

-			value      	"${class}_Record_Kinds")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsLimited"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubtype"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessType"

-			value      	("GenerateAccessTypeSet" 230))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeName"

-			value      	"Handle")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeVisibility"

-			value      	("TypeVisibilitySet" 45))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessTypeDefinition"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessClassWide"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"MaybeAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementation"

-			value      	("ParameterizedImplementationSet" 11))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParentClassName"

-			value      	"Superclass")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EnumerationLiteralPrefix"

-			value      	"A_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldPrefix"

-			value      	"The_")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfTypeName"

-			value      	"Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfTypeName"

-			value      	"Access_Array_Of_${type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayOfAccessTypeName"

-			value      	"Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AccessArrayOfAccessTypeName"

-			value      	"Access_Array_Of_${access_type}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ArrayIndexDefinition"

-			value      	"Positive range <>")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessorOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateStandardOperations"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterName"

-			value      	"This")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDefaultConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DefaultConstructorName"

-			value      	"Create")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateCopyConstructor"

-			value      	("SubprogramKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyConstructorName"

-			value      	"Copy")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDestructor"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DestructorName"

-			value      	"Free")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateTypeEquality"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeEqualityName"

-			value      	"${quote}=${quote}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineEquality"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Tagged"

-				value      	208)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Record"

-				value      	210)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Mixin"

-				value      	211)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Task"

-				value      	212)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"SingleType"

-				value      	209)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"MultipleTypes"

-				value      	213)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterizedImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Unconstrained"

-				value      	214)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Private"

-				value      	43)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"TypeControlSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"None"

-				value      	225)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InitializationOnly"

-				value      	226)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AssignmentFinalizationOnly"

-				value      	227)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"All"

-				value      	228)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Always"

-				value      	229)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Auto"

-				value      	230)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenericFormalParameters"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsPrivate"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FileName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AdditionalWiths"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsSubunit"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementation"

-			value      	("SubprogramImplementationSet" 2))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Renames"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateOverriding"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterMode"

-			value      	("ParameterModeSet" 203))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ImplicitParameterClassWide"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"EntryBarrierCondition"

-			value      	"True")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SubprogramImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Abstract"

-				value      	221)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Body"

-				value      	2)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Renaming"

-				value      	222)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Separate"

-				value      	223)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Spec"

-				value      	224)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ParameterModeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"In"

-				value      	204)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Out"

-				value      	205)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"InOut"

-				value      	203)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Access"

-				value      	220)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${supplier}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${relationship}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${attribute}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Representation"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${association}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAssociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"AssociateName"

-			value      	"Associate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineAssociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateDissociate"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"DissociateName"

-			value      	"Dissociate")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineDissociate"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"NameIfUnlabeled"

-			value      	"The_${targetClass}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementation"

-			value      	("RecordFieldImplementationSet" 216))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldName"

-			value      	"${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateGet"

-			value      	("FunctionKindSet" 199))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessGet"

-			value      	("FunctionKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GetName"

-			value      	"Get_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateSet"

-			value      	("ProcedureKindSet" 202))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"GenerateAccessSet"

-			value      	("ProcedureKindSet" 201))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SetName"

-			value      	"Set_${target}")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsAliased"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"IsConstant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementation"

-			value      	("ContainerImplementationSet" 217))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerGeneric"

-			value      	"List")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerDeclarations"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ProcedureKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Procedure"

-				value      	202)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"RecordFieldImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Component"

-				value      	216)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Discriminant"

-				value      	218)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"AccessDiscriminant"

-				value      	219)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"ContainerImplementationSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Array"

-				value      	217)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Generic"

-				value      	11)))

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"FunctionKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"Function"

-				value      	199)

-			    (object Attribute

-				tool       	"Ada95"

-				name       	"DoNotCreate"

-				value      	201)))))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Ada95"

-			name       	"Directory"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"Ada95"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IncludePath"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"WindowsShell"

-				value      	101)))))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ConstValue"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ImplementationType"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Context"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"OperationIsOneWay"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"ArrayDimensions"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"CaseSpecifier"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"IsReadOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"Order"

-			value      	"")

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"BoundedRoleType"

-			value      	("AssocTypeSet" 47))

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"CORBA"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"CORBA"

-			name       	"GenerateForwardReference"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"CORBA"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"project"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SPPackageCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedureCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyCounter"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TablePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DomainPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IndexPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"StoreProcedurePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PrimaryKeyPrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForeignKeyPrefix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDatabase"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TargetDatabase"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Location"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmSchema"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmDomainPackage"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootSchema"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRootDomainPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSchemaPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DatabaseID"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DBMS"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsView"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDomain"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsSPPackage"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Synonymns"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpace"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SelectClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdatable"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckOption"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"PersistToServer"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIdentity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"NullsAllowed"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ColumnType"

-			value      	"Native")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OID"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRelationship"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceId"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"SourceType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RIMethod"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentUpdateRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRule"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParentDeleteRuleName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrict"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildInsertRestrictName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ChildMultiplicityName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintName"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsConstraint"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ConstraintType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsTrigger"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsStoredProcedure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsCluster"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TableSpace"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"FillFactor"

-			value      	0)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"KeyList"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"CheckPredicate"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DeferalMode"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"InitialCheckTime"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"TriggerType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInsertEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsUpdateEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeleteEvent"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewTable"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefOldRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"RefNewRow"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsRow"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"WhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Language"

-			value      	"SQL")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ProcType"

-			value      	"Procedure")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsDeterministic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ParameterStyle"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ReturnedNull"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ExternalName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"default__Parameter"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"dmItem"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DMName"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsInParameter"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"IsOutParameter"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Ordinal"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"Scale"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"ForBitData"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValueType"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"DefaultValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Data Modeler"

-			name       	"OperationID"

-			value      	"")))

-	    (object Attribute

-		tool       	"Data Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Data Modeler Communicator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"framework"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Java"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"RootDir"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UsePrefixes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AutoSync"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ShowCodegenDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultAuthor"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultVersion"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocDefaultSince"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocNumAsterisks"

-			value      	0)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MaxNumChars"

-			value      	80)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VM"

-			value      	("VMType" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"Java"

-				name       	"WindowsShell"

-				value      	101)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"VMType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Sun"

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Microsoft"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"IBM"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"InstanceVariablePrefix"

-			value      	"m_")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ClassVariablePrefix"

-			value      	"s_")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultAttributeDataType"

-			value      	"int")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DefaultOperationReturnType"

-			value      	"void")

-		    (object Attribute

-			tool       	"Java"

-			name       	"NoClassCustomDlg"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GlobalImports"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceClassStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"OpenBraceMethodStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseTabs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"UseSpaces"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"SpacingItems"

-			value      	3)

-		    (object Attribute

-			tool       	"Java"

-			name       	"RoseDefaultCommentStyle"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"AsteriskCommentStyle"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavaCommentStyle"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocAuthor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocSince"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"JavadocVersion"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateDefaultConstructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ConstructorIs"

-			value      	("Ctor_Set" 62))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Ctor_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"public"

-				value      	62)

-			    (object Attribute

-				tool       	"Java"

-				name       	"protected"

-				value      	63)

-			    (object Attribute

-				tool       	"Java"

-				name       	"private"

-				value      	64)

-			    (object Attribute

-				tool       	"Java"

-				name       	"package"

-				value      	65)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFinalizer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateStaticInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateInstanceInitializer"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DisableAutoSync"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletName"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContextRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsSingleThread"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletInitParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIsSecure"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcher"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestDispatcherPath"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherInclude"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"DispatcherForward"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletgetInfo"

-			value      	"")))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Http_Servlet__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttribute"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestAttributesNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestAttributes"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameter"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletRequestParameterNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForRequestParameters"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeader"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletHeaderNames"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForHeaders"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletIntHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletDateHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletCookie"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"MethodForCookie"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"ServletContentType"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateHTML"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"Default_EJB__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Generate_XML_DD"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCmpField"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBEnvironmentProperties"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBCnxFactory"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReferences"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSecurityRoles"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBNameInJAR"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType"

-			value      	("EJBSessionType_Set" 200))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBSessionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	200)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateless"

-				value      	201)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Stateful"

-				value      	202)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType"

-			value      	("EJBTransactionType_Set" 211))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBTransactionType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	211)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	212)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType"

-			value      	("EJBPersistenceType_Set" 220))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBPersistenceType_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	""

-				value      	220)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bean"

-				value      	221)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Container"

-				value      	222)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"EJBReentrant"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"BMP_Extend_CMP"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"CmIdentification"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"Java"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Abstract"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Static"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Native"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Synchronized"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Java"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"InitialValue"

-			value      	"")

-		    (object Attribute

-			tool       	"Java"

-			name       	"Final"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Transient"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Volatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"PropertyType"

-			value      	("BeanProperty_Set" 71))

-		    (object Attribute

-			tool       	"Java"

-			name       	"BeanProperty_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Not A Property"

-				value      	71)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Simple"

-				value      	72)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Bound"

-				value      	73)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Constrained"

-				value      	74)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"IndividualChangeMgt"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write"

-			value      	("Read/Write_Set" 81))

-		    (object Attribute

-			tool       	"Java"

-			name       	"Read/Write_Set"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read & Write"

-				value      	81)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Read Only"

-				value      	82)

-			    (object Attribute

-				tool       	"Java"

-				name       	"Write Only"

-				value      	83)))

-		    (object Attribute

-			tool       	"Java"

-			name       	"GenerateFullyQualifiedTypes"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Java"

-			name       	"IsNavigable"

-			value      	TRUE)))

-	    (object Attribute

-		tool       	"Java"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"propertyId"

-		value      	"360000002")

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DDLScriptFilename"

-			value      	"DDL1.SQL")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"DropClause"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnName"

-			value      	"_ID")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"PrimaryKeyColumnType"

-			value      	"NUMBER(5,0)")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"SchemaNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TypeNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ViewNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"VarrayNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NestedTableNameSuffix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNamePrefix"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"ObjectTableNameSuffix"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSchema"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"WhereClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeLength"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypePrecision"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionTypeScale"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CollectionOfREFS"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKind"

-			value      	("MethodKindSet" 1903))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OverloadID"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsReadNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoDataState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsWriteNoProcessState"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsSelfish"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerType"

-			value      	("TriggerTypeSet" 1801))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEvent"

-			value      	("TriggerEventSet" 1601))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerText"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerReferencingNames"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEach"

-			value      	("TriggerForEachSet" 1701))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerWhenClause"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"MethodKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"MapMethod"

-				value      	1901)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"OrderMethod"

-				value      	1902)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Function"

-				value      	1903)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Procedure"

-				value      	1904)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Operator"

-				value      	1905)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Constructor"

-				value      	1906)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Destructor"

-				value      	1907)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Trigger"

-				value      	1908)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"Calculated"

-				value      	1909)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"AFTER"

-				value      	1801)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"BEFORE"

-				value      	1802)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSTEAD OF"

-				value      	1803)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerForEachSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"ROW"

-				value      	1701)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"STATEMENT"

-				value      	1702)))

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"TriggerEventSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT"

-				value      	1601)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE"

-				value      	1602)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"DELETE"

-				value      	1603)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE"

-				value      	1604)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR DELETE"

-				value      	1605)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"UPDATE OR DELETE"

-				value      	1606)

-			    (object Attribute

-				tool       	"Oracle8"

-				name       	"INSERT OR UPDATE OR DELETE"

-				value      	1607)))))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"OrderNumber"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"NullsAllowed"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Length"

-			value      	"")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Precision"

-			value      	"2")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"Scale"

-			value      	"6")

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsIndex"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"IsPrimaryKey"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CompositeUnique"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Oracle8"

-			name       	"CheckConstraint"

-			value      	"")))

-	    (object Attribute

-		tool       	"Oracle8"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"R2Editor"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"ComponentTest"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"cg"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"UseMSVC"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CommentWidth"

-			value      	60)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"compiler2.1__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue(sizeof($targetClass))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference($limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference($limit)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue(sizeof($targetClass))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue(sizeof($targetClass))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"compiler3.0__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerAnnotations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowGenerateOverNewerVersion"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileExtension"

-			value      	"h")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileBackupExtension"

-			value      	"h~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"HeaderFileTemporaryExtension"

-			value      	"h#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileExtension"

-			value      	"cpp")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileBackupExtension"

-			value      	"cp~")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeFileTemporaryExtension"

-			value      	"cp#")

-		    (object Attribute

-			tool       	"cg"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StopOnError"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ErrorLimit"

-			value      	30)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"$ROSECPP_SOURCE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BooleanType"

-			value      	"int")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowTemplates"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExplicitInstantiations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowProtectedInheritance"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByValueContainer"

-			value      	"$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OneByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByValueContainer"

-			value      	"OptionalByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OptionalByReferenceContainer"

-			value      	"$targetClass *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByValueContainer"

-			value      	"$targetClass[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedFixedByReferenceContainer"

-			value      	"$targetClass *[$limit]")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByValueContainer"

-			value      	"BoundedListByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByValueContainer"

-			value      	"BoundedSetByValue<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"BoundedByReferenceContainer"

-			value      	"BoundedListByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedBoundedByReferenceContainer"

-			value      	"BoundedSetByReference<$targetClass,$limit>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByValueContainer"

-			value      	"UnboundedListByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByValueContainer"

-			value      	"UnboundedSetByValue<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnboundedByReferenceContainer"

-			value      	"UnboundedListByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedUnboundedByReferenceContainer"

-			value      	"UnboundedSetByReference<$targetClass>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByValueContainer"

-			value      	"AssociationByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByValueContainer"

-			value      	"DictionaryByValue<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedByReferenceContainer"

-			value      	"AssociationByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"UnorderedQualifiedByReferenceContainer"

-			value      	"DictionaryByReference<$qualtype, $qualcont>")

-		    (object Attribute

-			tool       	"cg"

-			name       	"PathSeparator"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileNameFormat"

-			value      	"128vx_b")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AlwaysKeepOrphanedCode"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ImplementationType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ClassKey"

-			value      	"class")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"PutBodiesInSpec"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDefaultConstructor"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DefaultConstructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExplicitDefaultConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateCopyConstructor"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyConstructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExplicitCopyConstructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDestructor"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DestructorVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DestructorKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDestructor"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssignmentOperation"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssignmentVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssignmentKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssignmentOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEqualityOperations"

-			value      	("GenerateSet" 199))

-		    (object Attribute

-			tool       	"cg"

-			name       	"EqualityVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"EqualityKind"

-			value      	("FriendKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineEqualityOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateRelationalOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"RelationalVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"RelationalKind"

-			value      	("FriendKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineRelationalOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateStorageMgmtOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StorageMgmtVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineStorageMgmtOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSubscriptOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"SubscriptResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSubscriptOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDereferenceOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DereferenceResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineDereferenceOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateIndirectionOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionKind"

-			value      	("ThreeKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IndirectionResultType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineIndirectionOperation"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateStreamOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"StreamVisibility"

-			value      	("VisibilitySet" 45))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineStreamOperations"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ThreeKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"KindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FriendKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"DeclareAndDefine"

-				value      	199)

-			    (object Attribute

-				tool       	"cg"

-				name       	"DeclareOnly"

-				value      	205)

-			    (object Attribute

-				tool       	"cg"

-				name       	"DoNotDeclare"

-				value      	206)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"VisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExtensionlessFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InclusionProtectionSymbol"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeFormat"

-			value      	(value Text 

-|// $package

-|#include "$file"

-|

-			))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludePrecompiledHeader"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeOrder"

-			value      	"AMIR")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyle"

-			value      	("InliningStyleSet" 207))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"InClassDeclaration"

-				value      	208)

-			    (object Attribute

-				tool       	"cg"

-				name       	"FollowingClassDeclaration"

-				value      	207)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"TypesDefined"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeClosure"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CmIdentification"

-			value      	(value Text "  %X% %Q% %Z% %W%"))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CopyrightNotice"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"FileName"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AllowExtensionlessFileName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeFormat"

-			value      	(value Text 

-|// $package

-|#include "$file"

-|

-			))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeBySimpleName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludePrecompiledHeader"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeOrder"

-			value      	"AMIR")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AdditionalIncludes"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyle"

-			value      	("InliningStyleSet" 207))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InliningStyleSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"InClassDeclaration"

-				value      	208)

-			    (object Attribute

-				tool       	"cg"

-				name       	"FollowingClassDeclaration"

-				value      	207)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"TypesDefined"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"IncludeClosure"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationKind"

-			value      	("OperationKindSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationKindSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAbstractBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SpecialDeclReturnType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationIsConst"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"OperationIsExplicit"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Inline"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"EntryCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ExitCode"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"CCRegion"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"BodyAnnotations"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"Ordered"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$supplier")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$relationship")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SelectorName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SelectorType"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"HasRelTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Association"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$targetClass")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"InstanceArguments"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"NameIfUnlabeled"

-			value      	"the_$targetClass")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"InitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerClass"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerGet"

-			value      	"$data.get($keys)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"ContainerSet"

-			value      	"$data.set($keys,$value)")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedContainer"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassContainer"

-			value      	"$supplier *")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassInitialValue"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetSetByReference"

-			value      	("QualifiedGetSetByReferenceSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetSetByReferenceSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_GetSetByReference"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateQualifiedGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedGetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineQualifiedGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateQualifiedSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedSetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"QualifiedSetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineQualifiedSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberName"

-			value      	"$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtRelationshipVisibility"

-				value      	210)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassDataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetName"

-			value      	"get_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassGetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssocClassGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateAssocClassSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassSetName"

-			value      	"set_$target")

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassSetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineAssocClassSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocClassForwardReferenceOnly"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"AssocTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Array"

-				value      	24)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Sequence"

-				value      	47)))))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateDataMember"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberName"

-			value      	"$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibility"

-			value      	("DataMemberVisibilitySet" 14))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberVisibilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Public"

-				value      	45)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Protected"

-				value      	44)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Private"

-				value      	43)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Implementation"

-				value      	14)

-			    (object Attribute

-				tool       	"cg"

-				name       	"AtAttributeVisibility"

-				value      	211)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutability"

-			value      	("DataMemberMutabilitySet" 0))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberMutabilitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unrestricted"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Mutable"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Const"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberIsVolatile"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"DataMemberFieldSize"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateGetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateSetOperation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetName"

-			value      	"get_$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetName"

-			value      	"set_$attribute")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKinds"

-			value      	("GetSetKindsSet" 200))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetKindsSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"Common"

-				value      	200)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Virtual"

-				value      	201)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Abstract"

-				value      	202)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Static"

-				value      	203)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Friend"

-				value      	204)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetIsConst"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConst"

-			value      	("GetResultIsConstSet" 2))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetResultIsConstSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"False"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"True"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Same_As_Function"

-				value      	2)))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GetSetByReference"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineGet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"SetReturnsValue"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"InlineSet"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CCRegion"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Uses"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"ForwardReferenceOnly"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"BodyReferenceOnly"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Subsystem"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"Directory"

-			value      	"AUTO GENERATE")

-		    (object Attribute

-			tool       	"cg"

-			name       	"DirectoryIsOnSearchList"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"PrecompiledHeader"

-			value      	"")))

-	    (object Attribute

-		tool       	"cg"

-		name       	"default__Category"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"cg"

-			name       	"IsNamespace"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"cg"

-			name       	"Indent"

-			value      	2)

-		    (object Attribute

-			tool       	"cg"

-			name       	"CodeName"

-			value      	"")

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegions"

-			value      	("GenerateEmptyRegionSet" 3))

-		    (object Attribute

-			tool       	"cg"

-			name       	"GenerateEmptyRegionSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"cg"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Preserved"

-				value      	1)

-			    (object Attribute

-				tool       	"cg"

-				name       	"Unpreserved"

-				value      	2)

-			    (object Attribute

-				tool       	"cg"

-				name       	"All"

-				value      	3)))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Version"

-			value      	"5.0")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCClassTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCClassTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Interface_Part"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Connection_Part"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Class_Factory"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CObjectFunctionality"

-			value      	("CObjectFunctionalitySet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CObjectFunctionalitySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dynamic"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dyncreate"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Serial"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOverrideGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDataGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DATA_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateFieldGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_FIELD_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMessageGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMessageMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MESSAGE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEFactory"

-			value      	("OLEFactorySet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEFactorySet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"None"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Built_in"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Simple"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Licensed"

-				value      	3)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEName"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEClassID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOLECtlType"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLECtlType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateOLETypeLib"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibMajor"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLETypeLibMinor"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GeneratePropPageIDs"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLEPropPageIDs"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDispatchMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockProperties"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockFunctions"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DispatchDefValue"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateDispIdEnum"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISP_ID_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInterfaceMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"INTERFACE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"InitInterface"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateEventMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockEvents"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateEventSinkMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PropNotifySinks"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateConnectionMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CONNECTION_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"ConnectionPointIID"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"InheritanceType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"OLECommands"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MFCDeclares"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MFCImplements"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"ATL_Declares"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateCOMMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"COM_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateConnectionPointMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CONNECTION_POINT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateMsgMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GeneratePropertyMap"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PROPERTY_MAP_Entries"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCOperationTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCOperationTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Virtual_Override"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Message_Handler"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dispatch_Handler"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Event_Firing_Function"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Event_Sink_Handler"

-				value      	5)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Std_OLE_Method"

-				value      	6)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Command_Parser"

-				value      	7)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Get_Function"

-				value      	8)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Set_Function"

-				value      	9)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Property_Notify_Function"

-				value      	10)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Macro_Generated_Function"

-				value      	11)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_MSG_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MESSAGE_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENT_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"EVENTSINK_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"BodyImage"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Has"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"Type"

-			value      	("MSVCAttributeTypeSet" 0))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"MSVCAttributeTypeSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Normal"

-				value      	0)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Member_Property"

-				value      	1)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Get_Set_Property"

-				value      	2)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Dialog_Data"

-				value      	3)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Field_Data"

-				value      	4)

-			    (object Attribute

-				tool       	"MSVC"

-				name       	"Stock_Property"

-				value      	5)))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DISPATCH_MAP_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"DeclSpec"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"PointerBase"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"CallType"

-			value      	"")

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"StockPropertyImplementation"

-			value      	"")))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateIncludesGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_INCLUDES_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInsertLocation"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"MSVC"

-		name       	"default__Module-Body"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateIncludesGroup"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"AFX_INCLUDES_Entries"

-			value      	(value Text ""))

-		    (object Attribute

-			tool       	"MSVC"

-			name       	"GenerateInsertLocation"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"cg"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Model Integrator"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Rose Web Publisher"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"COM"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"TypeKinds"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"COM"

-				name       	"enum"

-				value      	100)

-			    (object Attribute

-				tool       	"COM"

-				name       	"record"

-				value      	101)

-			    (object Attribute

-				tool       	"COM"

-				name       	"module"

-				value      	102)

-			    (object Attribute

-				tool       	"COM"

-				name       	"interface"

-				value      	103)

-			    (object Attribute

-				tool       	"COM"

-				name       	"dispinterface"

-				value      	104)

-			    (object Attribute

-				tool       	"COM"

-				name       	"coclass"

-				value      	105)

-			    (object Attribute

-				tool       	"COM"

-				name       	"alias"

-				value      	106)

-			    (object Attribute

-				tool       	"COM"

-				name       	"union"

-				value      	107)

-			    (object Attribute

-				tool       	"COM"

-				name       	"max"

-				value      	108)

-			    (object Attribute

-				tool       	"COM"

-				name       	"(none)"

-				value      	109)))

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"kind"

-			value      	("TypeKinds" 109))

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"dllname"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"alias"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"id"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"Generate"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"COM"

-			name       	"filename"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"library"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"uuid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"version"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpstring"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpfile"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"helpcontext"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"lcid"

-			value      	"")

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"COM"

-			name       	"attributes"

-			value      	"")))

-	    (object Attribute

-		tool       	"COM"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Version Control"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"propertyId"

-		value      	"783606378")

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"InstancingSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Private"

-				value      	221)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"PublicNotCreatable"

-				value      	213)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"SingleUse"

-				value      	214)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalSingleUse"

-				value      	215)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"MultiUse"

-				value      	219)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"GlobalMultiUse"

-				value      	220)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"BaseSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	222)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"0"

-				value      	223)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"1"

-				value      	224)))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionBase"

-			value      	("BaseSet" 222))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionExplicit"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"OptionCompare"

-			value      	("CompareSet" 202))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Instancing"

-			value      	("InstancingSet" 219))

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"CompareSet"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"(none)"

-				value      	202)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Binary"

-				value      	203)

-			    (object Attribute

-				tool       	"Visual Basic"

-				name       	"Text"

-				value      	204)))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Operation"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"LibraryName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"AliasName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"IsStatic"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ReplaceExistingBody"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"DefaultBody"

-			value      	(value Text ""))))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Role"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"New"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"WithEvents"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProcedureID"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"PropertyName"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Subscript"

-			value      	"")))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Inherit"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImplementsDelegation"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"FullName"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Param"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByVal"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ByRef"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"Optional"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ParamArray"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ProjectFile"

-			value      	"")

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateCode"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"UpdateModel"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportReferences"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"QuickImport"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"Visual Basic"

-			name       	"ImportBinary"

-			value      	FALSE)))

-	    (object Attribute

-		tool       	"Visual Basic"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"VisualStudio"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"Web Modeler"

-		name       	"HiddenTool"

-		value      	FALSE)

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"propertyId"

-		value      	"809135966")

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Project"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"CreateMissingDirectories"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Editor"

-			value      	("EditorType" 100))

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"StopOnError"

-			value      	TRUE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"EditorType"

-			value      	(list Attribute_Set

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"BuiltIn"

-				value      	100)

-			    (object Attribute

-				tool       	"XML_DTD"

-				name       	"WindowsShell"

-				value      	101)))))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Class"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Entity_PublicID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"NotationValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"InternalValue"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ParameterEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ExternalEntity"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_SystemID"

-			value      	"")

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Notation_PublicID"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Attribute"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"DefaultDeclType"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"default__Module-Spec"

-		value      	(list Attribute_Set

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"Assign All"

-			value      	FALSE)

-		    (object Attribute

-			tool       	"XML_DTD"

-			name       	"ComponentPath"

-			value      	"")))

-	    (object Attribute

-		tool       	"XML_DTD"

-		name       	"HiddenTool"

-		value      	FALSE))

-	quid       	"3B704565018E"))

diff --git a/plugins/org.eclipse.jst.j2ee/rose/modulemap.ecore b/plugins/org.eclipse.jst.j2ee/rose/modulemap.ecore
deleted file mode 100644
index 00580f2bf..000000000
--- a/plugins/org.eclipse.jst.j2ee/rose/modulemap.ecore
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="modulemap"
-    nsURI="http:///modulemap.ecore" nsPrefix="modulemap">
-  <eClassifiers xsi:type="ecore:EClass" name="ModuleMapping">
-    <eReferences name="module" eType="ecore:EClass ../../com.ibm.etools.j2ee.core/rose/application.ecore#//Module"
-        lowerBound="1"/>
-    <eAttributes name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EARProjectMap">
-    <eReferences name="mappings" eType="#//ModuleMapping" upperBound="-1" containment="true"/>
-    <eReferences name="utilityJARMappings" eType="#//UtilityJARMapping" lowerBound="1"
-        upperBound="-1" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UtilityJARMapping">
-    <eAttributes name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eAttributes name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/DeployerExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/DeployerExtension.exsd
deleted file mode 100644
index 5f66b3611..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/DeployerExtension.exsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="DeployerExtension" name="J2EE Deployer Extension"/>

-      </appInfo>

-      <documentation>

-         The extension point gives the ability to extend deployer operations on J2EE artifacts, for eg, EJB deployment and Webservices deployment. Registration of the deployer is based on module type and server target.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="deployer"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="deployer">

-      <complexType>

-         <sequence>

-            <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>

-            <choice>

-               <element ref="nature"/>

-               <element ref="component"/>

-            </choice>

-         </sequence>

-         <attribute name="deployer_class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the qualified name of the class to be used as the deployer

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="runtime">

-      <complexType>

-         <attribute name="runtime_server_id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the runtime server id for this deployer

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="nature">

-      <complexType>

-         <attribute name="module_nature_id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the support module nature id

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="component">

-      <complexType>

-         <attribute name="component_type" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the supported component type for this deployer

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/EARModuleExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/EARModuleExtension.exsd
deleted file mode 100644
index cd9206d9e..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/EARModuleExtension.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="EARModuleExtension" name="EAR Module Extension"/>

-      </appInfo>

-      <documentation>

-         The api&apos;s for EJB, JCA and Web modules are defined in plugins separate from J2EE plugin. Those plugins have dependencies on the J2EE plugin, but not vice versa. In order for code defined within the J2EE plugin to access api&apos;s in these modules we need this extension point.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="earModuleExtension"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="earModuleExtension">

-      <complexType>

-         <attribute name="extensionClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The class for the module extension.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/EJBCommandExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/EJBCommandExtension.exsd
deleted file mode 100644
index 26ffe688e..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/EJBCommandExtension.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="EJBCommandExtension" name="EJB Command Extension"/>

-      </appInfo>

-      <documentation>

-         Mainly used to overwrite delete and update commands for ejb&apos;s. For eg the extension was used to overwrite delete bean command.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="command"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="command">

-      <complexType>

-         <sequence>

-            <element ref="run"/>

-         </sequence>

-         <attribute name="key" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="run">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/ExtendedModuleImport.exsd b/plugins/org.eclipse.jst.j2ee/schema/ExtendedModuleImport.exsd
deleted file mode 100644
index 5c4b01aad..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/ExtendedModuleImport.exsd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="SpecializedModuleImport" name="Specialized Module Import"/>

-      </appInfo>

-      <documentation>

-         This extension point gives the ability to treat a jar file which is not an ejb jar file as an ejb jar file during ejb jar import.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="ExtendedModuleImport"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="ExtendedModuleImport">

-      <complexType>

-         <attribute name="moduleType" type="string" use="required">

-            <annotation>

-               <documentation>

-                  moduleType attribute defines the module type.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  factoryClass is the handler class for the extension point.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/J2EEModulePostImport.exsd b/plugins/org.eclipse.jst.j2ee/schema/J2EEModulePostImport.exsd
deleted file mode 100644
index 6f17da52e..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/J2EEModulePostImport.exsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="J2EEModulePostImport" name="J2EE Module Post Import"/>

-      </appInfo>

-      <documentation>

-         This extension-point sends notification to all extensions when J2EEModules are imported. Each extension can specify a set of different module types to listen for or listen to them all.  The default is to receive notification for all module types.  Notification is sent

-to the specified class implementing com.ibm.etools.j2ee.J2EEModulePostImportHandler.

-

-Both of the following examples register for notification for all J2EEModule types, the first uses the defaults, while the second specifies each module type.  To listen for only specific module types, use the second example and specify only the types to listen to.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="postImport"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="postImport">

-      <complexType>

-         <sequence>

-            <element ref="module" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="className" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the qualified class name to call during post import

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="module">

-      <complexType>

-         <attribute name="type" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the J2EE module type to run post import on

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/WSDLServiceHelper.exsd b/plugins/org.eclipse.jst.j2ee/schema/WSDLServiceHelper.exsd
deleted file mode 100644
index 3954682a0..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/WSDLServiceHelper.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.j2ee" id="SpecializedModuleImport" name="Specialized Module Import"/>
-      </appInfo>
-      <documentation>
-         This extension point gives the ability to treat a jar file which is not an ejb jar file as an ejb jar file during ejb jar import.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="wsdlHelper"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="wsdlHelper">
-      <complexType>
-         <attribute name="helperClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  helperClass is the handler class for the extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/WebServiceClientGenerator.exsd b/plugins/org.eclipse.jst.j2ee/schema/WebServiceClientGenerator.exsd
deleted file mode 100644
index 0c14384e5..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/WebServiceClientGenerator.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="WebServiceClientGenerator" name="Web Service Client Generator"/>

-      </appInfo>

-      <documentation>

-         Extended by WAS or axis in generating web service client specific artifacts.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="generator"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="generator">

-      <complexType>

-         <sequence>

-            <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="className" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the qualifed class name to be used as the web service client generator

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="runtime">

-      <complexType>

-         <attribute name="serverTarget" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the name of runtime server target where this client generator is used

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/optionalRefactorHandler.exsd b/plugins/org.eclipse.jst.j2ee/schema/optionalRefactorHandler.exsd
deleted file mode 100644
index b672a3204..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/optionalRefactorHandler.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.j2ee" id="optionalRefactorHandler" name="optionalRefactorHandlere"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="optionalRefactorHandler">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jst.j2ee.refactor.operations.AbstractOptionalRefactorHandler"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee/schema/resourceEnvRefType.exsd b/plugins/org.eclipse.jst.j2ee/schema/resourceEnvRefType.exsd
deleted file mode 100644
index 2155bcb1a..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/resourceEnvRefType.exsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="resourceEnvRefType" name="Resource Environment Reference Type"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to add types to the drop down options available when creating or modifying Resource Environment References for a Application Client or EJB Project.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="reference"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="reference">

-      <complexType>

-         <attribute name="type" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Valid resource environment reference types.  Example: javax.jms.Topic

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="usage" use="required">

-            <annotation>

-               <documentation>

-                  The usage field is required.  Valid types are Common, EJB Jar. 

-A usage tag with the value Common indicates that the corresponding value will be avilable for all J2EE projects.

-A usage tag with the value EJB Jar indicates that the value is only applicable to EJB projects.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="Application Client">

-                  </enumeration>

-                  <enumeration value="EJB Jar">

-                  </enumeration>

-                  <enumeration value="Common">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="target-server-ids" type="string">

-            <annotation>

-               <documentation>

-                  list of target server id for this type

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of the extension:

-&lt;pre&gt;

-   &lt;extension

-         point=&quot;org.eclipse.jst.j2ee.ui.resourceEnvRefType&quot;&gt;

-      &lt;reference usage=&quot;Common&quot; type=&quot;javax.sql.DataSource&quot;/&gt;

-      &lt;reference usage=&quot;EJB Jar&quot; type=&quot;javax.jms.Topic&quot;/&gt;

-   &lt;/extension&gt;

-&lt;/pre&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         This extension point requires that the extension be defined in the plugin file of the extending plugin.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2003, 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/schema/resourceRefType.exsd b/plugins/org.eclipse.jst.j2ee/schema/resourceRefType.exsd
deleted file mode 100644
index 4101126b4..000000000
--- a/plugins/org.eclipse.jst.j2ee/schema/resourceRefType.exsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jst.j2ee">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jst.j2ee" id="resourceRefType" name="Resource Ref Type"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to add types to the drop down options available when creating or modifying Resource References for a Application Client or EJB Project.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="reference"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="reference">

-      <complexType>

-         <attribute name="type" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Valid resource reference types.  Example: javax.jms.Topic

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="usage" use="required">

-            <annotation>

-               <documentation>

-                  The usage field is required.  Valid types are Common, EJB Jar. 

-A usage tag with the value Common indicates that the corresponding value will be avilable for all J2EE projects.

-A usage tag with the value EJB Jar indicates that the value is only applicable to EJB projects.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="Application Client">

-                  </enumeration>

-                  <enumeration value="EJB Jar">

-                  </enumeration>

-                  <enumeration value="Common">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="target-server-ids" type="string">

-            <annotation>

-               <documentation>

-                  list of target server id for this resource reference target.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of the extension:

-&lt;pre&gt;

-   &lt;extension

-         point=&quot;org.eclipse.jst.j2ee.ui.resourceRefType&quot;&gt;

-      &lt;reference usage=&quot;Common&quot; type=&quot;javax.jms.Queue&quot;/&gt;    

-      &lt;reference usage=&quot;EJB Jar&quot; type=&quot;javax.resource.cci.ConnectionFactory&quot;/&gt;

-   &lt;/extension&gt; 

-&lt;/pre&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         This extension point requires that the extension be defined in the plugin file of the extending plugin.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2003, 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which accompanies 

-this distribution, and is available at &lt;a

-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.j2ee/smoke/construction3.gif b/plugins/org.eclipse.jst.j2ee/smoke/construction3.gif
deleted file mode 100644
index e558d1ad7..000000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/construction3.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/detour.gif b/plugins/org.eclipse.jst.j2ee/smoke/detour.gif
deleted file mode 100644
index bf6cd868a..000000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/detour.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/ejbrdb_smoke.html b/plugins/org.eclipse.jst.j2ee/smoke/ejbrdb_smoke.html
deleted file mode 100644
index e735fe934..000000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/ejbrdb_smoke.html
+++ /dev/null
@@ -1,787 +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="Author" content="Raymond Leung">
-   <meta name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>EJB-RDB Mapping Smoke Test</title>
-</head>
-<body>
-
-<h2>
-EJB-RDB Mapping Smoke Test (07/12/01)</h2>
-
-<h3>
-Top-down Scenario (also tests meet-in-middle functions):</h3>
-
-<ol>
-<li>
-Open an empty workbench.</li>
-
-<li>
-Import university3.jar</li>
-
-<ol TYPE=a>
-<li>
-Select Menu "File/Import".</li>
-
-<li>
-Select "EJB Jar File" as import source. Hit the "Next" button.</li>
-
-<li>
-Enter the path name to the EJB Jar file "university3.jar" or use the "browse"
-button to locate the jar file.</li>
-
-<li>
-Give an EJB Project name "University".</li>
-
-<li>
-Hit the "Finish" button to import everything in the jar file.</li>
-
-<li>
-The wizard will take a while to import the EJB jar file.</li>
-
-<li>
-Verify that a project named "University" has been created in the Navigator
-view.</li>
-</ol>
-
-<li>
-Creating a Top-Down EJB-RDB Mapping</li>
-
-<ol TYPE=a>
-<li>
-Select the "University" project, right click to bring up the pop-up menu
-and select "New/Others...".</li>
-
-<li>
-A dialogue will come up. On the left pane, select "EJB". Then on the right
-pane, select "EJB to RDB Mapping".</li>
-
-<li>
-Hit the "Next" button.</li>
-
-<li>
-Accept the default to create a Top Down mapping. Hit the "Next" button.</li>
-
-<li>
-Accept the default for Target Database etc. and hit the "Next" button to
-go to the Advanced Option page.</li>
-
-<li>
-Mark the checkboxes for "VapFaculty", "VapInstructor" and "VapPartTimeInstructor"
-and leave the checkbox for "VapSubstituteInstructor" unchecked.</li>
-
-<li>
-Hit the "Finish" button. The wizard will now create the mappings.</li>
-
-<li>
-Expand the "university" project if it is not already expanded by clicking
-on the "+" sign.</li>
-
-<li>
-Expand along the folders "University/ejbModule/META-INF". Verify that there
-is a folder "Schema".</li>
-
-<li>
-Expand the folder "Schema" and verify there is a file "Schema.dbxmi" in
-it.</li>
-
-<li>
-Verify that there is also a file "Map.mapxmi" in the "META-INF" folder.</li>
-</ol>
-
-<li>
-Open the Mapping</li>
-
-<ol TYPE=a>
-<li>
-Select the file "Map.mapxmi".</li>
-
-<li>
-Double-click on it or select the menu item "Open" in the pop-up menu.</li>
-
-<li>
-Verify that the mapping editor is launched in the main window.</li>
-
-<li>
-Verify that at the upper left of the main window, the contents of the EJB
-Jar is displayed, "VapFaculty", "VapCourse"...</li>
-
-<li>
-Verify that at the upper right of the main window, the contents contains
-a database named "SAMPLE" containing RDB Tables "VAPFACULTY", "VAPCOURSE"...</li>
-
-<li>
-Verify that below the EJB Jar and RDB Table views is the Overview of the
-mapping. Verify that both columns (EJBs and Tables) are not empty.</li>
-
-<li>
-Look for the Outline View. If it is not open, it can be opened by selecting
-from the "Perspective" menu "Perspective/Show View/Outline".</li>
-
-<li>
-Verify that the outline view is not empty. Mappings are displayed using
-the symbol "&lt;->".</li>
-</ol>
-
-<li>
-Verify that different types of attributes and nested beans are imported.</li>
-
-<ol TYPE=a>
-<li>
-Expand the "VapFaculty" EJB in the EJBs view.</li>
-
-<li>
-Verify that there is a "VapInstructor" EJB nested in it.</li>
-
-<li>
-Verify that there are attributes "hireDate", "name", "numberOfDependents",
-"salary", "facultyNumber", "address" and "deptSortKey". Verify that "facultyNumber"
-is a key.</li>
-
-<li>
-Verify that there are relationship roles "advisedStudents", "headsDepartment",
-"classes" and "department".</li>
-
-<li>
-Expand the "VapInstructor" EJB.</li>
-
-<li>
-Verify that there are two EJBs nested inside it: "VapSubstituteInstructor"
-and "VapPartTimeInstructor".</li>
-
-<li>
-Verify that there is also an attribute "terminationDate" under "VapInstructor".</li>
-</ol>
-
-<li>
-Verify that the correct leaf tables are created.</li>
-
-<ol TYPE=a>
-<li>
-Inspect the Tables view on the right hand side.</li>
-
-<li>
-Verify that there are tables "VAPFACULTY", "VAPINSTRUCTOR", "VAPPARTTIMEINSTRUCTOR".</li>
-
-<li>
-Verify that there is NO table named "VAPSUBSTITUTEINSTRUCTOR". Remember
-"VapSubstituteInstructor" wais not marked as a leaf table when the mapping
-was created.</li>
-</ol>
-
-<li>
-Verify that the various views are in sync.</li>
-
-<ol TYPE=a>
-<li>
-Collapse "VapFaculty" in the EJBs view.</li>
-
-<li>
-Select the "VapFaculty &lt;-> VAPFACULTY" item (mapping) in the Outline
-view. Verify that the corresponding items in the EJBs view, Tables view
-and Overview view are selected.</li>
-
-<li>
-Select the "VapCourse &lt;-> VAPCOURSE" item in the Outline view&nbsp;
-and verify the selected items in the other views are updated correspondingly.</li>
-
-<li>
-Now, go to the EJBs view (upper left in the main window) and select the
-"VapStudent" (single click). Verify that the "VapStudent &lt;-> VAPSTUDENT"
-item in the Outline view is selected. Also verify that "VapStudent" is
-selected in the Overview view. However, the Tables view should still stay
-on "VAPCOURSE".</li>
-
-<li>
-Now, double-click "VapStudent" in the EJBs view, verify that "VAPSTUDENT"
-in the Tables view is selected and no other selections should change.</li>
-
-<li>
-Next, select "VAPSCHEDULEDCLASS" in the Tables view (upper right in the
-main window) and verify that the selected items in the Outline view and
-Overview view change to "VapScheduledClass" and "VapScheduledClass &lt;->
-VAPSCHEDULEDCLASS" correspondingly. However, the selection in the EJBs
-view should still stay on "VapStudent".</li>
-
-<li>
-Now, double-click on "VAPSCHEDULEDCLASS" in the Tables view. verify that
-"VapSheduledClass" in the EJBs view is selected. No other selections should
-change.</li>
-
-<li>
-Now, select "VapDepartment" in the first column of the Overview view and
-verify that the corresponding items in the other views are updated.</li>
-
-<li>
-Now, select "VAPSTAFF" in the 2nd column of the Overview view and verify
-that the corresponding items in other views are updated.</li>
-</ol>
-
-<li>
-Verify nested EJB mappings</li>
-
-<ol TYPE=a>
-<li>
-Double-click on "VapFaculty" in the EJBs view. Verify that only "VAPFACULTY"
-in the Tables view is selected.</li>
-
-<li>
-Expand "VapFaculty" in the EJBs view. Double-click on "VapInstructor".
-Verify that both "VAPFACULTY" and "VAPINSTRUCTOR" are selected in the Tables
-view.</li>
-
-<li>
-Expand "VapInstructor" in the EJBs view. Double-click on "VapSubstituteInstructor".
-Verify that both "VAPFACULTY" and "VAPINSTRUCTOR" are selected in the Tables
-view, i.e. same as for "VapInstructor".</li>
-
-<li>
-Double-click on "VapPartTimeInstructor" in the EJBs view and verify that
-"VAPFACULTY", "VAPINSTRUCTOR" and "VAPPARTTIMEINSTRUCTOR" in Tables view
-are selected.</li>
-
-<li>
-Now, double-click&nbsp; on "VAPFACULTY" in Tables view. Verify that "VapFaculty",
-"VapInstructor", "VapSubstituteInstructor" and "VapPartTimeInstructor"
-in the EJBs view are selected. Also verify that the 4 corresponding mappings
-are selected in the Outline and Overview views.</li>
-
-<li>
-Double-click on "VAPINSTRUCTOR" in the Tables view. Verify that "VapInstructor",
-"VapSubstituteInstructor" and "VapPartTimeInstructor" in the EJBs view
-are selected. Also verify the 3 corresponding mappings are selected in
-the Outline and Overview views.</li>
-
-<li>
-Double-click on "VAPPARTTIMEINSTRUCTOR" in the Tables view. Verify that
-only "VapPartTimeInstructor" in the EJBs view is selected.</li>
-</ol>
-
-<li>
-Verify that deletion and undo/redo work</li>
-
-<ol TYPE=a>
-<li>
-Select "VapCourse &lt;-> VAPCOURSE" mapping in the Outline view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and select "Delete".</li>
-
-<li>
-Verify that the row corresponding to this mapping in the Overview view
-disappeared.</li>
-
-<li>
-Verify that the mapping icons for "VapFaculty" in the EJBs view and "VAPFACULTY"
-in the Tables view now have a hollow circle indicating the items are not
-mapped.</li>
-
-<li>
-From the menu bar, select "Edit/Undo Remove" to undo the deletion. Verify
-that "VapFaculty" and "VAPFACULTY" reappear in the Overview view, the mapping
-"VapFaculty &lt;-> VAPFACULTY" reappears in the Outline view and the mapping
-icons in the EJBs view and Tables view become solid again.</li>
-
-<li>
-Right-click on the "VapFaculty" item in the EJBs view to bring up the pop-up
-menu and select "Redo Remove". Verify that it goes back to the state before
-the undo step.</li>
-</ol>
-
-<li>
-Remove all tables. This is to prepare for the next two tests.</li>
-
-<ol TYPE=a>
-<li>
-Select all the tables in the Tables view by clicking on the first table
-and then holding down the shift-key and clicking on the last table.</li>
-
-<li>
-Select the "Delete" item from the "Edit" menu in the menu bar.</li>
-
-<li>
-Verify that there are no mappings, other than the root EJB &lt;-> Database
-mapping, in the Overview and Outline views.</li>
-</ol>
-
-<li>
-Verify that copy and paste works.</li>
-
-<ol TYPE=a>
-<li>
-Select "VapStaff" in the EJBs view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and select "Copy".</li>
-
-<li>
-Move over to the Tables view, right-click on "SAMPLE" and select "Paste".</li>
-
-<li>
-Verify that a table "VAPSTAFF" is created and mappings are established
-between the attributes in "VapStaff" and the columns in "VAPSTAFF".</li>
-</ol>
-
-<li>
-Verify that drag and drop works.</li>
-
-<ol TYPE=a>
-<li>
-Select "VapDepartment" in the EJBs view.</li>
-
-<li>
-Drag and drop it onto "SAMPLE" in the Tables view.</li>
-
-<li>
-Verify that a table "VAPDEPARTMENT" is created and mappings are established
-between the attributes in "VapDepartment" and the columns in "VAPDEPARTMENT".</li>
-</ol>
-
-<li>
-Verify that there are no internal errors</li>
-
-<ol TYPE=a>
-<li>
-Because the EJBs cross reference each other and these cross references
-are mapped to foreign keys in Tables, the columns and their mappings are
-not complete until tables corresponding to all the EJBs are created. Expand
-the tables "VAPSTAFF" and "VAPDEPARTMENT" and click on some of the columns
-(especially the foreigh keys) to display their properties. Verify that
-there are no internal errors or exceptions.</li>
-</ol>
-
-<li>
-Verify add/delete mapping actions are properly enabled</li>
-
-<ol TYPE=a>
-<li>
-Select "VapStaff" on the EJBs view. (single click)</li>
-
-<li>
-Select "VAPSTAFF" on the Tables view. (single click)</li>
-
-<li>
-Verify that the icons for removing/creating mappings and matching items
-are disabled.</li>
-
-<li>
-Click on the menu item "EJB to RDB Mapping Editor" in the menu bar and
-verify that all the menu items for creating/removing mappings (including
-matching items) are disabled.</li>
-
-<li>
-Expand "VapStaff" in the EJBs view and select "salary".</li>
-
-<li>
-Expand "VAPSTAFF" in the Tables view and select "SALARY".</li>
-
-<li>
-Verify that the remove mapping icon is enabled.</li>
-
-<li>
-Verify that the "Remove Mapping" menu item is enabled in the "EJB to RDB
-Mapping Editor" menu.</li>
-</ol>
-
-<li>
-Remove mappings.</li>
-
-<ol TYPE=a>
-<li>
-Remove the mapping by clicking on the remove mapping icon (the scissors
-icon).</li>
-
-<li>
-Verify that the icons for "salary" and "SALARY" have a hollow circle indicating
-there are no mappings for the two items.</li>
-
-<li>
-Verify also that the corresponding items representing the mapping were
-removed from the Overview and Outline views.</li>
-
-<li>
-Go to the Overview view and expand "VapStaff" if it is not already expanded.</li>
-
-<li>
-Select all the items under "VapStaff" (but not "VapStaff" itself) in the
-first column. Use Shift-click or Ctrl-Click.</li>
-
-<li>
-Right click to bring up the pop-up menu and select "Delete".</li>
-
-<li>
-Verify all the mappings under "VapStaff" are deleted in both the Overview
-and Outline views.</li>
-
-<li>
-Verify the columns "SALARY", "NUMBER", "NAME" etc. still exist under "VAPSTAFF"
-in the Tables view. Only the mappings were deleted, not the columns themselves.</li>
-
-<li>
-Verify all the attributes under "VapStaff" and columns under "VAPSTAFF"
-have no mappings by inspecting their icons.</li>
-</ol>
-
-<li>
-Verify that "Remove Mapping" is enabled only when there are no sub-mappings.</li>
-
-<ol TYPE=a>
-<li>
-Select "VapStaff" in the EJBs view and select "VAPSTAFF" in the Tables
-view.</li>
-
-<li>
-Verify that the "Remove Mapping", "Match by Name" and "Match by Type" icons
-and menu itmes under "EJB to RDB Mapping Editor" are enabled. Verify that
-the "Create Mapping" menu item is disabled because there is already a mapping
-between "VapStaff" and "VAPSTAFF". We only deleted the mappings between
-the attributes and columns, not between the EJB and Table.</li>
-</ol>
-
-<li>
-Rename column (Prepare for Match by Type/Name)</li>
-
-<ol TYPE=a>
-<li>
-Find the Properties view. If it is not visible, you can add it to your
-workbench through the menu "Perspective/Show View/Properties".</li>
-
-<li>
-Select the Column "SALARY" in Table "VAPSTAFF".</li>
-
-<li>
-Go to the Properties view and click on the value of the property "Name".
-This will make the string editable.</li>
-
-<li>
-Move to the end of the string and add a "2", i.e. change the name from
-"SALARY" to "SALARY2".</li>
-
-<li>
-Hit the "Enter" key and verify that the name of the column is updated on
-all the other views.</li>
-</ol>
-
-<li>
-Match by Type/Name.</li>
-
-<ol TYPE=a>
-<li>
-With "VapStaff" selected in the EJBs view and "VAPSTAFF" in the Tables
-view, click the "Match by Name" icon or select the "Match by Name" menu
-item under the "EJB to RDB Mapping Editor" menu.</li>
-
-<li>
-Verify that "number", "name", "title", and "department" are mapped.</li>
-
-<li>
-Reselect "VapStaff" in the EJBs view and "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Verify that now only the "Match by Type" icon and menu item is enabled.</li>
-
-<li>
-Click the "Match by Type" icon.</li>
-
-<li>
-Verify that the "salary" attribute under "VapStaff" is mapped.</li>
-</ol>
-
-<li>
-Verify role / foreign key mapping.</li>
-
-<ol TYPE=a>
-<li>
-Double-click on "department" under "VapStaff". Verify that the "DEPARTMENT"
-foreign key under "VAPSTAFF" in the Tables view is selected.</li>
-
-<li>
-Double-click on "DEPARTMENT" under "VAPSTAFF" in the Tables view. Verify
-that two roles are selected in the EJBs view: the "department" role under
-"VapStaff" and the "staff" (reverse) role under "VapDepartment".</li>
-</ol>
-
-<li>
-Undo the creatation of mappings.</li>
-
-<ol TYPE=a>
-<li>
-Select the "Undo" menu item under the "Edit" menu to undo the "Match by
-Type" action.</li>
-
-<li>
-Select the "Undo" menu item again to undo the "Match by Name" action.</li>
-
-<li>
-Verify that all the items under "VapStaff" and "VAPSTAFF" are not mapped
-by inspecting their icons.</li>
-</ol>
-
-<li>
-Verify that mapping icons are enabled base on types.</li>
-
-<ol TYPE=a>
-<li>
-Select "salary" under "VapStaff" in the EJBs view.</li>
-
-<li>
-Select "SALARY" under "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Verify that the "Create Mapping", "Match by Type" and "Match by Name" icons
-and menu items are enabled.</li>
-
-<li>
-Select "NUMBER" under "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Verify that the "Create Mapping", "Match by Type" and "Match by Name" icons
-and menu items are now disabled.</li>
-</ol>
-
-<li>
-Verify Redo of Match commands work.</li>
-
-<ol TYPE=a>
-<li>
-Select "Redo Match by Name" under the "Edit" menu on the menu bar.</li>
-
-<li>
-Verify that now "number", "name", "title", and "department" are mapped.</li>
-
-<li>
-Verify there are no exceptions or internal errors.</li>
-
-<li>
-Select "Redo Match by Type" under the "Edit" menu on the menu bar.</li>
-
-<li>
-Verify that now "salary" is also mapped.</li>
-</ol>
-</ol>
-
-<h3>
-Bottom-Up Scenario:</h3>
-
-<ol>
-<li>
-Open an empty workbench or close all editors and delete the "University"
-project.</li>
-
-<li>
-Create a Database by importing the univeristy3.jar, creating a top-down
-mapping and then deleting everything except the tables in the database.</li>
-
-<ol TYPE=a>
-<li>
-Import university3.jar and create a Top-Down EJB-RDB Mapping as described
-in step 2 and 3 above.</li>
-
-<li>
-Expand "University/ejbModule/META-INF" in the Navigator view.</li>
-
-<li>
-Delete everything under the "University" project except "ejbModule/META-INF/Schema/Schema.dbxmi",
-especially the "Map.mapxmi", "ejb-jar.xmi", "ibm-ejb-jar-bnd.xmi", "ibm-ejb-jar-ext.xmi"
-files under "ejbModule/META-INF".</li>
-</ol>
-
-<li>
-Create a Bottom-Up Mapping.</li>
-
-<ol TYPE=a>
-<li>
-Select the project "University" in the Navigator view.</li>
-
-<li>
-Right-click to bring up the pop-up menu. Select "Generate for enterprise
-bean(s)/Create EJB to RDB Mapping".</li>
-
-<li>
-A "Create new EJB/RDB Mapping" dialog will come up with the "Bottom Up"
-option selected.</li>
-
-<li>
-Hit the "Finish" button.</li>
-
-<li>
-Verify that "ejb-jar.xml", "ibm-ejb-jar-ext.xmi" and "Map.mapxmi" are created
-under "ejbModule/META-INF".</li>
-
-<li>
-Verify that some java files are created under the "bottom/up" folder.</li>
-</ol>
-
-<li>
-Open the mapping.</li>
-
-<ol TYPE=a>
-<li>
-Select "Map.mapxmi" and double-click on it.</li>
-
-<li>
-Expand all the EJBs and verify that all the attributes and roles are mapped
-(i.e. the icons have solid circles)</li>
-
-<li>
-Verify that all the attributes have a type.</li>
-
-<li>
-Expand the EJB "Vapstaff".</li>
-
-<li>
-Verify that the "salary" attribute has a type "java.math.BigDecimal".</li>
-
-<li>
-Verify that the "number" attribute is a key (the icon has a key).</li>
-
-<li>
-Verify that the type for "number" is "byte[]".</li>
-
-<li>
-Verify that there is a role "department" and the type is "Vapdepartment".</li>
-</ol>
-
-<li>
-Verify that tables cannot be deleted.</li>
-
-<ol TYPE=a>
-<li>
-Select the table "VAPSTAFF" in the Tables view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and verify that the "Delete" item
-is disabled.</li>
-
-<li>
-Click on the "Edit' menu on the menu bar and verify that the "Delete" item
-is disabled.</li>
-</ol>
-
-<li>
-Delete an EJB and undo.</li>
-
-<ol TYPE=a>
-<li>
-Select the EJB "Vapstaff" in the EJBs view.</li>
-
-<li>
-Right-click to bring up the pop-up menu and select "Delete" to delete the
-EJB "Vapstaff".</li>
-
-<li>
-Verify that the EJB "Vapstaff" disappears from the EJBs view.</li>
-
-<li>
-Verify that there are no mappings in the Outline and Overview views that
-reference "Vapstaff" and "VAPSTAFF".</li>
-
-<li>
-Verify that there is no mappings in the Outline and Overview views that
-reference a null object.</li>
-
-<li>
-Select "Edit/Undo Remove" from the menu bar.</li>
-
-<li>
-Verify that the EJB "Vapstaff" reappears and all the mappings between "Vapstaff"
-and "VAPSTAFF" also reappear.</li>
-</ol>
-
-<li>
-Change the name of an EJB.</li>
-
-<ol TYPE=a>
-<li>
-Open the Properties view if it is not already open by selecting "Perspective/Show
-View/Properties".</li>
-
-<li>
-Select "Vapstaff" in the EJBs view.</li>
-
-<li>
-Click on the value field of the property "Name", i.e. the string "Vapstaff".
-This should enable editing of the cell.</li>
-
-<li>
-Change the string to "Vapstaff2". Hit the enter key.</li>
-
-<li>
-Verify that "Vapstaff" is now changed to "Vapstaff2" in the EJBs view as
-well as in the Overview and Outline views.</li>
-</ol>
-
-<li>
-Change properties of an EJB attribute.</li>
-
-<ol TYPE=a>
-<li>
-Select the "salary" attribute of "Vapstaff2".</li>
-
-<li>
-Go to the Properties view and change the name to "salary2".</li>
-
-<li>
-Hit the return key and verify that "salary" is changed to "salary2" everywhere.</li>
-
-<li>
-Click on the value field for "Type" in the Properties view. The field should
-turn into a combo box with a button on the right.</li>
-
-<li>
-Click on the button to reveal the list of possible types. Select a different
-type, say, "java.lang.Integer".</li>
-
-<li>
-Verify that the type of the "salary2" is changed in all the various views.</li>
-</ol>
-
-<li>
-Order of EJBs can be re-arranged by drag-and-drop.</li>
-
-<ol TYPE=a>
-<li>
-Select the EJB "Vapstaff2" in the EJBs view.</li>
-
-<li>
-Hold down the left mouse button and drag the item away from its location.
-A horizontal line should appear as an indication the new position of the
-dragged item. Move the mouse upwards until the line indicate that "Vapstaff2"
-will be the first item in the ejb-jar. Release the mouse button.</li>
-
-<li>
-Verify that "Vapstaff2" is now the first EJB in the ejb-jar.</li>
-</ol>
-
-<li>
-EJBs can be made subtypes by drag-and-drop.</li>
-
-<ol TYPE=a>
-<li>
-Select the EJB "Vapstaff2" in the EJBs view.</li>
-
-<li>
-Hold down the left mouse button and drag and drop it onto EJB "Vapstudent".</li>
-
-<li>
-Verify that "Vapstaff2" is now an unmapped subtype of "Vapstudent".</li>
-</ol>
-
-<li>
-Verify that the content of the Database cannot be changed.</li>
-
-<ol TYPE=a>
-<li>
-Select Table "VAPSTAFF". Click the left mouse button and drag the item
-away from its current location.</li>
-
-<li>
-Verify that no horizontal line appears and the order of the tables cannot
-be changed.</li>
-</ol>
-</ol>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/slippery.gif b/plugins/org.eclipse.jst.j2ee/smoke/slippery.gif
deleted file mode 100644
index 47ef4d9d2..000000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/slippery.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee/smoke/smoke.html b/plugins/org.eclipse.jst.j2ee/smoke/smoke.html
deleted file mode 100644
index 0e3e17402..000000000
--- a/plugins/org.eclipse.jst.j2ee/smoke/smoke.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Generator" content="Lotus Word Pro">
-   <meta name="GENERATOR" content="Mozilla/4.74 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Body</title>
-</head>
-<body bgcolor="#FFFFFF">
-
-<h2>
-J2EE (EJB) Smoke Test</h2>
-
-<ol>
-<li>
-Open an empty workbench.</li>
-
-<li>
-Switch to the J2EE perspective: Perspective->Open->Other->J2EE</li>
-
-<ol>
-<li>
-Verify that the J2EE toolbar actions appear (create an EJB, create a Servlet,
-create an EJB project, create an Application Client module, create a Web
-Project, create EJB to RDB mapping, create and Enterprise Application)</li>
-
-<li>
-Verify that the J2EE view appears in the navigator frame. It will probably
-be empty.</li>
-
-<li>
-Verify that the appropriate New menu items are visible, these are the project
-actions from the toolbar, plus create a new EJB example</li>
-</ol>
-
-<li>
-Create a new EJB project for testing EJB creation. Press the "New EJB Project"
-toolbar button. Call the project "TestEJBs", use the default location,
-check the "Add to an EAR" option and call the ear "default_ear".</li>
-
-<ol>
-<li>
-Verify that a new EJB project called "TestEJBs" is created.</li>
-
-<ol>
-<li>
-The corresponding module should appear in the J2EE view in the EJB Modules
-folder. (175916 - the module does not appear until it contains at least
-one EJB.)</li>
-</ol>
-
-<li>
-Verify that a new EAR project called "default_app" is created.</li>
-
-<ol>
-<li>
-The corresponding module should appear in the J2EE view in the Enterprise
-Applications folder. It should contain the nested EJB module.</li>
-</ol>
-
-<li>
-Open "default_app" by double-clicking in the J2EE view. The EAR editor
-should be opened. Verify that the application.xml source looks good in
-the source page.</li>
-
-<li>
-Modify the module display name in the source page, switch to the General
-page and verify that the change is reflected. Verify that save is enabled
-for the application.xml. Save and close the editor. Re-open the editor
-and verify the description change.</li>
-
-<li>
-Modify the display name on the general page, and verify it in the source
-page. Save should be enabled, and the resource tab should be marked dirty
-(with a "*").</li>
-</ol>
-
-<li>
-Add a new session bean to the EJB module.</li>
-
-<ol>
-<li>
-Press the Create an Enterprise Java Bean toolbar button.&nbsp; This will
-launch the new Enterprise Java Bean wizard.&nbsp; Name the bean "Hello",
-select "Session bean" as the EJB type.&nbsp; Verify that the target project
-is already selected.</li>
-
-<br><img SRC="construction3.gif" height=43 width=49>(175845) Project selection
-is not being picked up from the J2EE view, so you'll need to manually select
-the project for now.
-<li>
-Provide the package name for the generated classes by entering "testing"
-into the first package name field.&nbsp; Verify that it propogates to the
-other fields.</li>
-
-<li>
-Press Finish to generate the Session bean classes.</li>
-
-<li>
-Open the Java perspective: Perspective->Open Perspective->Other...->Java.</li>
-
-<br><img SRC="detour.gif" height=21 width=68 align=ABSCENTER> For now this
-has to be done in the Java perspective, the generated classes will appear
-in the J2EE view under the EJB when 175608 is implemented.
-<ol>
-<li>
-In the package view, verify that the package "testing" appears under "TestEJBs\ejbModule".</li>
-
-<li>
-Verify that the files hello.java, hellobean.java, and hellohome.java exist.</li>
-
-<li>
-Switch to the J2EE view, the new EJB should appear under the "Test_EJB"
-module in "EJB Modules".</li>
-</ol>
-
-<li>
-Add a test method to Hello.&nbsp; Open the java editor on hellobean.java
-by double-clicking on it.&nbsp; Add a new method String sayHello(String)
-using the Java tooling like so:</li>
-
-<br>&nbsp;&nbsp; public String sayHello(String message) {
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return "Hello, " + message + "!";
-<br>&nbsp;&nbsp; }
-<li>
-Add the method to the remote interface.</li>
-
-<br><img SRC="detour.gif" height=21 width=68 align=ABSCENTER> This is currently
-done manually, by copying and pasting the method into the remote interface.&nbsp;
-The method in the remote interface should appear like this:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; public String sayHello(String
-message) throws java.rmi.RemoteException;
-<br>Use code assist, ctrl-Space to lookup RemoteException, to verify that
-the project's Java environment is working properly.
-<br>When 175610 is completed, there will be a "Promote to remote interface"
-menu item available on the specialized Bean class Java editor which will
-do this for you.</ol>
-
-<li>
-Open the EJB editor for "TestEJBs" by double-clicking on the module under
-"EJB Modules"</li>
-
-<ol>
-<li>
-The EJB editor should be opened. Verify that the source for the ejb-jar
-looks reasonable.</li>
-
-<br><img SRC="construction3.gif" height=43 width=49 align=TEXTTOP>(175817)
-Once we get our DTD's registered, add a step to use code-assist in the
-source page.
-<ol>
-<li>
-Verify that the EJB editor is working properly.&nbsp; Edit the display
-name field.&nbsp; When you tab out of that field, the display name in the
-J2EE view should be updated.&nbsp; Sitch to the source page and verify
-that the XML is also updated.</li>
-
-<br>Verify that source changes flow to the general page, too.&nbsp; In
-the source page, copy and paste the display-name element from the JAR to
-the Hello entity.&nbsp; The display-name element must be the first element
-under &lt;session>.&nbsp; Switch to the general tab, select Hello in the
-Enterprise Beans list, and verify the display name you entered.</ol>
-</ol>
-
-<li>
-Generate Deployed code for Hello.&nbsp; Select the project TestEJBs, pop-up
-Generate for enterprise beans...->Generate deployed code.&nbsp; Make sure
-Hello is checked on the prompter, and hit finish.</li>
-
-<ol>
-<li>
-Switch to the Java perspective, and verify that three new .java files were
-generated and do not have compile errors.&nbsp; They are EJSRemoteStatelessHello.java,
-EJBRemoteStatelessHelloHome.java, and EJSStatelessHelloHomeBean.java.</li>
-</ol>
-
-<li>
-Generate RMIC code for Hello.&nbsp; Select the project TestEJBs, pop-up
-Generate for enterprise beans...->Generate RMIC stub and tie code.&nbsp;
-Make sure Hello is checked on the prompter, and hit finish.</li>
-
-<ol>
-<li>
-Switch to the Java perspective, and verify that a whole slew of incomprehensible
-classes were generated in multiple packages, some of which have names like
-_Hello_Stub.java, and _HelloHome_stub.java.&nbsp; Check the task list and
-make sure there are no compile errors.&nbsp; Even better, make sure the
-corresponding .class files exist in \bin\....</li>
-</ol>
-
-<li>
-<img SRC="slippery.gif" height=66 width=76>Next, testing with the unit
-test environment...</li>
-
-<ol>
-<li>
-</li>
-</ol>
-</ol>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.classpath b/plugins/org.eclipse.jst.servlet.ui/.classpath
deleted file mode 100644
index 539597ffa..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="servlet_ui"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.cvsignore b/plugins/org.eclipse.jst.servlet.ui/.cvsignore
deleted file mode 100644
index a19913cde..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.servlet.ui/.project b/plugins/org.eclipse.jst.servlet.ui/.project
deleted file mode 100644
index c209be8d4..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.servlet.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.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 1deb5b0b0..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,43 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.servlet.ui,
- org.eclipse.jst.servlet.ui.internal.actions;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.deployables;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.plugin;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.wizard;x-internal:=true,
- org.eclipse.jst.servlet.ui.project.facet
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.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)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.servlet.ui/about.html b/plugins/org.eclipse.jst.servlet.ui/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.jst.servlet.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.servlet.ui/build.properties b/plugins/org.eclipse.jst.servlet.ui/build.properties
deleted file mode 100644
index cabf56b0b..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = servlet_ui/,\
-                       property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html
-src.includes = plugin.xml,\
-               plugin.properties
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadca8..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
deleted file mode 100644
index 72944e924..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif
deleted file mode 100644
index 37cb4e72c..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif b/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
deleted file mode 100644
index 31ecb7aee..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.properties b/plugins/org.eclipse.jst.servlet.ui/plugin.properties
deleted file mode 100644
index d55ad8ef1..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.properties
+++ /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
-###############################################################################
-
-pluginName=WTP Servlet UI Plug-in
-pluginVendor=Eclipse.org
-create.web.module_ui_=Create a J2EE Web Module
-create.web.project_ui_=Create a J2EE Web module
-web.actions.description_ui_=Actions for J2EE Web Development
-create_servlet_ui_=Create Java Servlet file
-war.import.description_ui_=Import an external WAR file into an Web project
-war.import.action.description_ui_=Import WAR File...
-war.export.description_ui_=Export a Web project into a WAR file
-war.export.action.description_ui_=Export WAR File...
-WarexportWizard.name=WAR file
-WarexportWizard.description=Export a Web Module into an external WAR file
-WarImportWizard.name=WAR file
-WarImportWizard.description=Import an external WAR file into a Web Project
-web.category_ui_=Web
-web.project_ui_=Dynamic Web Project
-static.web.project_ui_=Static Web Project
-new.web.project.description_ui_=Create a Dynamic Web project
-ConvertWebProjectType=Convert Web Project
-convertWebProjectTypeAction.label=Convert to a Dynamic Web project...
-ConvertWebProjectTypeAction.tooltip=Web Module Conversion Wizard
-convertToDynamic=Convert to Web Module...
-ServletWebRegionWizard.name=Servlet
-ServletWebRegionWizard.description=Create a new Servlet
-ServletWebRegionWizard.title=New Servlet
-Servlet_UI_=Servlet...
-servletAnnotationDecorator=Servlet Annotation Decorator
-servletAnnotationDecorator.description=Adds a decorator to an annotated servlet.
-web-project-wizard-name = Web Project
-web-project-wizard-description = Create a Web project
-webAppLibrariesContainerName = Web App Libraries
-
-enhanced.java.for.web.name=Enhanced Java Rendering for Web
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
deleted file mode 100644
index 81e3312e9..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-<!-- ====================================================== -->
-<!--                                                        -->
-<!-- Purpose: Extension for the J2EE ACtion Sets            -->
-<!-- Extension point: org.eclipse.ui.actionSets             -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%web.category_ui_"
-            description="%web.actions.description_ui_"
-            visible="false"
-            id="org.eclipse.jst.j2ee.J2eeMainActionSet2">
-            <action
-               label="%create.web.module_ui_"
-               icon="icons/full/ctool16/newwar_wiz.gif"
-               tooltip="%create.web.module_ui_"
-               class="org.eclipse.jst.servlet.ui.internal.actions.NewWebComponentAction"
-               toolbarPath="J2EEMain"
-               id="org.eclipse.jst.servlet.ui.internal.actions.NewWebComponent">
-         </action>
-      </actionSet>
-	</extension> 
-      
-   <!-- Web Module Wizard -->
-    <extension
-         id="J2EEUIProjectWizards"
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%web.category_ui_"
-            id="org.eclipse.wst.web.ui">
-      </category>
-      <wizard
-            name="%web.project_ui_"
-            icon="icons/full/ctool16/newwar_wiz.gif"
-            category="org.eclipse.wst.web.ui"
-            class="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"
-            project="true"
-            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
-            id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
-         <description>
-            %new.web.project.description_ui_
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-      
-      <!--new servlet contribution-->
- 	  <wizard
-            name="%ServletWebRegionWizard.name"
-            icon="icons/full/ctool16/newservlet_wiz.gif"
-            category="org.eclipse.wst.web.ui"
-            class="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard"
-            id="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
-         <description>
-            %ServletWebRegionWizard.description
-         </description>
-      </wizard>      
-    </extension>
-      
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <category
-            name="%web.category_ui_"
-            id="org.eclipse.wst.web.ui">
-      </category>         
-    <wizard
-            name="%WarImportWizard.name"
-            icon="icons/full/ctool16/importwar_wiz.gif"
-            class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"
-            category="org.eclipse.wst.web.ui"
-            id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
-         <description>
-            %WarImportWizard.description
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-      
-    </extension>
-    
-  <extension
-         point="org.eclipse.ui.exportWizards">
-     <category
-            name="%web.category_ui_"
-            id="org.eclipse.wst.web.ui">
-      </category>         
-    <wizard
-            name="%WarexportWizard.name"
-            icon="icons/full/ctool16/exportwar_wiz.gif"
-            class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"
-            category="org.eclipse.wst.web.ui"
-            id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
-         <description>
-            %WarexportWizard.description
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-    </extension>
-
-   <extension
-         point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
-      <extendableWizard
-            id="org.eclipse.jst.servlet.ui.WebModuleCreationWizard">
-      </extendableWizard>
-   </extension>
-   <extension
-		point="org.eclipse.ui.actionSets">
-		<actionSet
-			label="%ConvertWebProjectType"
-			description="%ConvertWebProjectType"
-			visible="true"
-			id="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeActionSet">
-			<action
-				label="%convertWebProjectTypeAction.label"
-				tooltip="%ConvertWebProjectTypeAction.tooltip"
-				menubarPath="project/additions"
-				class="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeAction"
-				enablesFor="1"
-				id="convertToWebModuleTypeAction">   
-				<enablement>
-					<and>
-						<objectClass name="org.eclipse.core.resources.IProject"/>
-						<!--<objectState
-	                       name="facet"
-	                       value="wst.web">
-	                     </objectState> -->
-					</and>
-				</enablement>            
-			</action>
-		</actionSet>
-	</extension>
-	
-	<extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            id = "convertToWebModuleTypeAction">
-         <menu
-               label="%static.web.project_ui_"
-               path="additions"
-               id="ConvertWebProjectType">
-            <separator
-                  name="ConvertWebProjectType">
-            </separator>
-         </menu>
-        <action
-				label="%convertWebProjectTypeAction.label"
-				tooltip="%ConvertWebProjectTypeAction.tooltip"
-				menubarPath="ConvertWebProjectType/ConvertWebProjectType"
-				class="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeAction"
-				enablesFor="1"
-				id="convertToWebModuleTypeAction">
-		</action>
-		<enablement>
-		  <adapt type="org.eclipse.core.resources.IProject">
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="wst.web" />
-					</adapt>
-		</enablement>
-      </objectContribution>  
-    </extension>
-
-  <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web resources                           -->
-<!-- ==================================================================== -->
-      <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">  
-      
-       <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webresource"
-            class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">     
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.jst.j2ee.webapplication.WebApp"/>
-           </with>
-         </enablement>
-      </moduleArtifactAdapter> 
-      
-      <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webresource2"
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">      
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.jst.server.core.Servlet"/>
-           </with>
-         </enablement>
-       </moduleArtifactAdapter>
-       
-       <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webresource3"
-            class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">     
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IProject"/>
-           </with>
-         </enablement>
-       </moduleArtifactAdapter>     
-       
-        <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webresource4"
-            class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IFile"/>
-           </with>
-         </enablement>
-       </moduleArtifactAdapter>
-
-      <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webresource5"
-            class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-          
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.jdt.core.ICompilationUnit"/>
-           </with>
-         </enablement>
-       </moduleArtifactAdapter>
-   </extension>
-   
-    <extension point="org.eclipse.core.runtime.adapters">
-         <factory
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.core.resources.IProject">
-             <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-        </factory>
-        <factory
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.jdt.core.ICompilationUnit">
-            <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-        </factory>
-        <factory
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.core.resources.IFile">
-            <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-       </factory>
-       <factory
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.jst.j2ee.webapplication.Servlet">
-             <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-       </factory>
-       <factory
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.jst.j2ee.webapplication.WebApp">
-             <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-       </factory> 
-       <factory
-             class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
-             adaptableType="org.eclipse.jst.server.core.Servlet">
-             <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
-       </factory>
-          
-   </extension>  
-  
-<!-- ====================================================== -->
-<!--           Label Decorators                             -->
-<!-- ====================================================== -->
-  
-    <extension
-         point="org.eclipse.ui.decorators">
-         <decorator
-               lightweight="true"
-               adaptable="true"
-               label="%servletAnnotationDecorator"
-               class="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator"
-               state="true"
-               location="TOP_LEFT"
-               id="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet">
-         <description>
-            %servletAnnotationDecorator.description
-         </description>
-         <enablement>
-              <objectClass
-                   name="org.eclipse.jst.j2ee.webapplication.Servlet">
-              </objectClass>
-         </enablement>
-      </decorator>
-    </extension> 
-    
-  <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-    <wizard-pages action="jst.web.install">
-      <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/>
-    </wizard-pages>
-  </extension>
-  
-  <extension point="org.eclipse.wst.common.project.facet.ui.images">
-    <image facet="jst.web" path="icons/war.gif"/>
-  </extension>
-  
-  <extension
-    point="org.eclipse.jdt.ui.classpathContainerPage">
-    <classpathContainerPage
-      name="%webAppLibrariesContainerName"
-      class="org.eclipse.jst.servlet.ui.internal.wizard.WebAppLibrariesContainerPage"
-      id="org.eclipse.jst.j2ee.internal.web.container">
-    </classpathContainerPage>
-  </extension>
-  <extension
-        point="org.eclipse.ui.navigator.navigatorContent">
-     <navigatorContent
-           activeByDefault="true"
-           contentProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaContentProvider"
-           icon="icons/full/ctool16/webjava-icon.gif"
-           id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
-           labelProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaLabelProvider"
-           name="%enhanced.java.for.web.name"
-           priority="higher">
-        <override
-              policy="InvokeOnlyIfSuppressedExtAlsoVisibleAndActive"
-              suppressedExtensionId="org.eclipse.jdt.java.ui.javaContent"/>					   
-        <triggerPoints>
-			<and>
-				<adapt
-					type="org.eclipse.core.resources.IProject">
-					<or> 
-						<test forcePluginActivation="true"
-							property="org.eclipse.wst.common.project.facet.core.projectFacet"
-							value="jst.web" />
-					</or>
-				</adapt>
-			</and>        
-        </triggerPoints>
-        <possibleChildren>
-           <or>
-              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
-              <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
-              <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
-              <instanceof value="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"/>
-              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaLibraries"/>
-           </or>
-        </possibleChildren> 
-		<actionProvider
-			class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
-			id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.actions.NewActionProvider">
-			<enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-			</enablement>
-		</actionProvider>        
-        <commonSorter
-              class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaSorter"
-              id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.sorter">
-           <parentExpression>
-              <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
-           </parentExpression>
-        </commonSorter>
- 
-		   <commonWizard
-		        type="new"
-		        wizardId="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard">
-		     <enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-		     </enablement>
-		  </commonWizard>
-		  <commonWizard
-		        type="new"
-		        wizardId="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
-		     <enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-		     </enablement>
-		  </commonWizard>
-
-   	      <commonWizard
-		        type="new"
-		        wizardId="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
-		     <enablement>
-				<instanceof
-					value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-		     </enablement>
-		  </commonWizard> 
-		    <commonWizard
-		          type="new"
-		          wizardId="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard">
-				<enablement>				        
-					<instanceof
-						value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
-			     </enablement>
-			 </commonWizard>        			 
-     </navigatorContent>
-  </extension>
-  <extension
-        point="org.eclipse.ui.navigator.viewer">
-     <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-        <includes>
-           <contentExtension pattern="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"/>
-        </includes>
-     </viewerContentBinding>
-  </extension>
-  <extension
-        point="org.eclipse.core.runtime.adapters">
-     <factory
-           adaptableType="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"
-           class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedNodeAdapterFactory">
-        <adapter type="org.eclipse.jdt.core.IJavaProject"/>
-        <adapter type="org.eclipse.jdt.core.IJavaElement"/>
-     </factory>
-  </extension>
-  
-</plugin>
diff --git a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties b/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
deleted file mode 100644
index fd2259f84..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
+++ /dev/null
@@ -1,109 +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
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Dynamic Web Project
-_2=Servlet version:
-_3=Dynamic Web Project
-_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
-_5=Web project:
-_6=WAR file:
-_7=Import a WAR file from the file system
-_8=WAR Import
-_9=WAR Export
-_10=Export Web project to the local file system.
-_11=Context Root:
-_12=Convert Simple Web to Web Module
-_13=Convert Simple Web to Web Module.
-_14=WAR Import: Web libraries
-_15=Select the web library jars from the list below to be imported as web library projects.  Unselected web libraries will be imported as jars in the WEB-INF/lib directory.
-_16=Select All
-_17=Deselect All
-
-ADD_SERVLET_WIZARD_WINDOW_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_DESC=Enter servlet deployment descriptor specific information.
-
-DEFAULT_PACKAGE=(default package)
-SELECT_CLASS_TITLE=Select Class
-MAP_CLASS_NAME_TO_CLASS_ERROR_MSG=IWAE0060E Could not uniquely map the class name to a class.
-EMPTY_LIST_MSG=Empty List
-ADD_LABEL=Add
-USE_EXISTING_SERVLET_CLASS=Use existing Servlet class
-INIT_PARAM_LABEL=Initialization Parameters:
-URL_MAPPINGS_LABEL=URL Mappings:
-CHOOSE_SERVLET_CLASS=Choose a servlet class
-
-NEW_SERVLET_WIZARD_WINDOW_TITLE=New Servlet
-NEW_SERVLET_WIZARD_PAGE_TITLE=Servlet
-NEW_SERVLET_WIZARD_PAGE_DESC=Create a new servlet.
-SERVLET_PACKAGE_LABEL=Java package:
-SERVLET_NAME_LABEL=Servlet name:
-
-ADD_BUTTON_LABEL=Add...
-EDIT_BUTTON_LABEL=Edit...
-REMOVE_BUTTON_LABEL=Remove
-URL_PATTERN_TITLE=URL Patterns
-URL_PATTERN_LABEL=Pattern:
-FOLDER_LABEL=Folder:
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class name:
-SUPERCLASS_LABEL=Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose the Web Content Folder or its subfolder
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-INTERFACE_SELECTION_DIALOG_DESC=Choose interfaces:
-INTERFACE_SELECTION_DIALOG_MSG_NONE=''{0}'' added.
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
-JAVA_CLASS_BROWER_DIALOG_TITLE=Java Class Browser
-JAVA_CLASS_BROWER_DIALOG_MESSAGE=Browse for a Java class
-
-NAME_LABEL=Name
-DESCRIPTION_LABEL=Description
-VALUE_LABEL=Value
-BROWSE_BUTTON_LABEL=Browse...
-REMOVE_BUTTON=Remove
-
-NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
-NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
-
-ImportWARAction_UI_=Import Web Module...
-ExportWARAction_UI_=Export WAR file...
-
-NO_WEB_PROJECTS=No Web Projects
-
-SERVLETS =Servlets
-
-WEB_CONT_NAME = WebAppContainerPage
-WEB_CONT_PAGE_TITLE = Web App Libraries Container
-WEB_CONT_PAGE_DESCRIPTION = This container dynamically populates classpath entries from the WEB-INF/lib and WEB-INF/classes directories of a web app.
-WEB_CONT_PAGE_COMP_LABEL = Component:
-WEBCONTENT=Web Content folder:
-
-
-Compressed_Libraries= Libraries
-Compressed_JavaResources= Java Resources{0}
-
-ConvertToWebTitle=Convert to Dynamic Web Project
-SelectWebVersion=Select a Dynamic Web module version:
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
deleted file mode 100644
index f879ea15c..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
+++ /dev/null
@@ -1,30 +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.servlet.ui;
-
-public interface IWebUIContextIds {
-
-public static final String PLUGIN_SERVLET_UI = "org.eclipse.jst.servlet.ui."; //$NON-NLS-1$
-	
-	public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE1 = PLUGIN_SERVLET_UI + "webw1000"; //$NON-NLS-1$
-	public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE2 = PLUGIN_SERVLET_UI + "webw1100"; //$NON-NLS-1$
-	public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE3 = PLUGIN_SERVLET_UI + "webw1200"; //$NON-NLS-1$
-	
-	public static final String WAR_IMPORT_PAGE1 = PLUGIN_SERVLET_UI + "webi1000"; //$NON-NLS-1$
-	public static final String WAR_IMPORT_PAGE2 = PLUGIN_SERVLET_UI + "webi1100"; //$NON-NLS-1$
-	
-	public static final String WAR_EXPORT_PAGE1 = PLUGIN_SERVLET_UI + "webe1000"; //$NON-NLS-1$
-	
-	public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1 = PLUGIN_SERVLET_UI + "srvw1050"; //$NON-NLS-1$
-	public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2 = PLUGIN_SERVLET_UI + "srvw1100"; //$NON-NLS-1$
-	public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3 = PLUGIN_SERVLET_UI + "srvw1200"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
deleted file mode 100644
index 5d8bffefe..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.actions;
-
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.jface.window.Window;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.wizard.ConvertToWebModuleTypeDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.web.ui.internal.Logger;
-/**
- * Convert a simple static web project to a J2EE Dynamic Web Project
- */
-public class ConvertToWebModuleTypeAction extends Action implements IWorkbenchWindowActionDelegate {
-
-	IStructuredSelection fSelection = null;
-	IProject project = null;
-	IWorkbenchWindow fWindow;
-
-	/**
-	 * ConvertLinksDialog constructor comment.
-	 */
-	public ConvertToWebModuleTypeAction() {
-		super();
-	}
-
-	/**
-	 * make sure a web project is selected.
-	 */
-	protected boolean isValidProject(IProject aProject) {
-		return J2EEProjectUtilities.isStaticWebProject(aProject);
-	}
-
-	/**
-	 * selectionChanged method comment.
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		boolean bEnable = false;
-		if (selection instanceof IStructuredSelection) {
-			fSelection = (IStructuredSelection) selection;
-			bEnable = validateSelected(fSelection);
-		}
-		((Action) action).setEnabled(bEnable);
-	}
-
-	/**
-	 * selectionChanged method comment.
-	 */
-	protected boolean validateSelected(ISelection selection) {
-		if (!(selection instanceof IStructuredSelection))
-			return false;
-
-		fSelection = (IStructuredSelection) selection;
-
-		Object selectedProject = fSelection.getFirstElement();
-		if (!(selectedProject instanceof IProject))
-			return false;
-
-		project = (IProject) selectedProject;
-		return isValidProject(project);
-	}
-
-	public void dispose() {
-		// Default
-	}
-
-	public void init(IWorkbenchWindow window) {
-		// Default
-	}
-
-	public void run(IAction action) {
-		try {
-			IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
-			ConvertToWebModuleTypeDialog dialog = new ConvertToWebModuleTypeDialog(window.getShell());
-			dialog.open();
-			if (dialog.getReturnCode() == Window.CANCEL)
-				return;
-			
-			doConvert(dialog.getSelectedVersion());
-			
-		} catch (Exception e) {
-			Logger.logException(e);
-		}
-	}
-	
-	protected void doConvert(String selectedVersion) throws Exception {
-		IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-		Set fixedFacets = new HashSet();
-		fixedFacets.addAll(facetedProject.getFixedProjectFacets());
-		IProjectFacet webFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
-		fixedFacets.remove(webFacet);
-		facetedProject.setFixedProjectFacets(fixedFacets);
-		IProjectFacetVersion webFv = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE).getVersion(selectedVersion);
-		IProjectFacetVersion javaFv = JavaFacetUtils.compilerLevelToFacet(JavaFacetUtils.getCompilerLevel(project));
-		IFacetedProject.Action uninstall = new IFacetedProject.Action(IFacetedProject.Action.Type.UNINSTALL, facetedProject.getInstalledVersion(webFacet), null);
-		IDataModel webModelCfg = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
-		webModelCfg.setBooleanProperty(IWebFacetInstallDataModelProperties.ADD_TO_EAR, false);
-		IFacetedProject.Action install = new IFacetedProject.Action(IFacetedProject.Action.Type.INSTALL,webFv,webModelCfg);
-		IFacetedProject.Action javaInstall = new IFacetedProject.Action(IFacetedProject.Action.Type.INSTALL, javaFv, null);
-		Set set = new HashSet();
-		set.add(uninstall);
-		set.add(install);
-		set.add(javaInstall);
-		facetedProject.modify(set, new NullProgressMonitor());
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
deleted file mode 100644
index d8ff4d85e..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.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.servlet.ui.internal.actions;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class NewWebComponentAction extends AbstractOpenWizardWorkbenchAction {
-	
-	public static String LABEL = WEBUIMessages.WEB_MODULE_WIZ_TITLE;
-	private static final String ICON = "war_wiz"; //$NON-NLS-1$
-	
-	public NewWebComponentAction() {
-		super();
-		setText(LABEL); 
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-	
-	public NewWebComponentAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
-		super(workbench, label, activatedOnTypes, acceptEmptySelection);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-	
-	public NewWebComponentAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
-		super(workbench, label, acceptEmptySelection);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	protected Wizard createWizard() {
-		return new WebProjectWizard();
-	}
-	
-	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.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
deleted file mode 100644
index aef4c0cde..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,34 +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.servlet.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.j2ee.internal.web.deployables.WebDeployableArtifactUtil;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class WebDeployableArtifactAdapterFactory 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 WebDeployableArtifactUtil.getModuleObject(obj);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java
deleted file mode 100644
index 02c34b161..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java
+++ /dev/null
@@ -1,79 +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.servlet.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-public class CompressedJavaLibraries implements ICompressedNode {
-	
-	
-	private CompressedJavaProject compressedProject;
-	private Image image;
-
-	public CompressedJavaLibraries(CompressedJavaProject compressedProject) { 
-		this.compressedProject = compressedProject;
-	}
-	
-	public Image getImage() { 
-		if(image == null) {
-			image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_LIBRARY);
-		}
-		return image;
-	}
-	
-	public String getLabel() {		
-		return WEBUIMessages.Compressed_Libraries;
-	}
-	
-	public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
-		
-		List classpathContainers = new ArrayList();
-		Object[] delegateChildren = delegateContentProvider.getChildren(compressedProject.getProject());
-		for (int i = 0; i < delegateChildren.length; i++) {
-			if (delegateChildren[i] instanceof IPackageFragmentRoot) {
-				try {
-					IClasspathEntry rawClasspathEntry = ((IPackageFragmentRoot) delegateChildren[i]).getRawClasspathEntry();
-					if (rawClasspathEntry.getEntryKind() != IClasspathEntry.CPE_CONTAINER && 
-								rawClasspathEntry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
-						classpathContainers.add(delegateChildren[i]);
-				} catch (JavaModelException e) {
-
-				}
-			} else if (!(delegateChildren[i] instanceof IJavaElement) && !(delegateChildren[i] instanceof IResource)) {
-				classpathContainers.add(delegateChildren[i]);
-			}
-		}
-		return classpathContainers.toArray();
-	}
-
-	public CompressedJavaProject getCompressedProject() {
-		return compressedProject;
-	}
-
-	public IJavaElement getJavaElement() { 
-		return null;
-	}
-	
-	
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
deleted file mode 100644
index cd2f7d516..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
+++ /dev/null
@@ -1,119 +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.servlet.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-public class CompressedJavaProject implements ICompressedNode, IAdaptable { 
-	
-	private IJavaProject project;
-	private CompressedJavaLibraries compressedLibraries;
-	private Image image; 
- 
-	public CompressedJavaProject(StructuredViewer viewer, IJavaProject project) {
-		this.project = project; 
-
-	}
-
-	public Image getImage() {
-		if(image == null)
-			image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT);
-		return image;
-	}
-
-	public String getLabel() {
-		return determineLabel();
-
-	}
-
-	public boolean isFlatteningSourceFolder() {
-		return getNonExternalSourceFolders().size() == 1;
-	}
-
-	private String determineLabel() {
-		List nonextSourceFolders = getNonExternalSourceFolders();
-		IPackageFragmentRoot singleRoot = null;
-		if (nonextSourceFolders.size() == 1) {
-			singleRoot = (IPackageFragmentRoot) nonextSourceFolders.get(0);
-		}
-		return NLS.bind(WEBUIMessages.Compressed_JavaResources, ((singleRoot != null) ? ": " + singleRoot.getElementName() : "")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public IJavaProject getProject() {
-		return project;
-	}
-
-	public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
-		
-		List nonExternalSourceFolders = getNonExternalSourceFolders();
-		if (nonExternalSourceFolders.size() == 1) {
-			Object[] sourceFolderChildren = delegateContentProvider.getChildren(nonExternalSourceFolders.get(0));
-			nonExternalSourceFolders.clear();
-			nonExternalSourceFolders.addAll(Arrays.asList(sourceFolderChildren));
-		} 
-		nonExternalSourceFolders.add(getCompressedJavaLibraries());
-		return nonExternalSourceFolders.toArray();
-	}
-
-	public List getNonExternalSourceFolders() {
-		List nonExternalSourceFolders = null;
-		IPackageFragmentRoot[] sourceFolders;
-		try {
-			sourceFolders = project.getPackageFragmentRoots();
-			nonExternalSourceFolders = new ArrayList(Arrays.asList(sourceFolders));
-			for (Iterator iter = nonExternalSourceFolders.iterator(); iter.hasNext();) {
-				IPackageFragmentRoot root = (IPackageFragmentRoot) iter.next();
-				if (root.isExternal() || root.isArchive() || root.getKind()==IPackageFragmentRoot.K_BINARY)
-					iter.remove();
-			}
-		} catch (JavaModelException e) {
-			ServletUIPlugin.log(e);
-		}
-		return nonExternalSourceFolders != null ? nonExternalSourceFolders : Collections.EMPTY_LIST;
-	}
-	
-	public CompressedJavaLibraries getCompressedJavaLibraries() {		
-		if(compressedLibraries == null) 
-			compressedLibraries = new CompressedJavaLibraries(this);
-		return compressedLibraries;
-		
-	}
-
-	public Object getAdapter(Class adapter) { 
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-
-	public IJavaElement getJavaElement() {
-		List nonExternalSourceFolders = getNonExternalSourceFolders();
-		if (nonExternalSourceFolders.size() == 1) {
-			return (IJavaElement) nonExternalSourceFolders.get(0);
-		}
-		return getProject();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java
deleted file mode 100644
index bc52d55a2..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java
+++ /dev/null
@@ -1,36 +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.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-public class CompressedJavaSorter extends ViewerSorter {
-	
-	private JavaElementSorter sorter = new JavaElementSorter();
-	
-	public int category(Object element) { 
-		if(element instanceof CompressedJavaLibraries)
-			return 1;
-		else return 0;
-	}
-	
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		if(e1 instanceof CompressedJavaLibraries)
-			return 1;
-		else if(e2 instanceof CompressedJavaLibraries)
-			return -1;
-		
-		return sorter.compare(viewer, e1, e2);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java
deleted file mode 100644
index 8328b19a9..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.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.servlet.ui.internal.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-
-// 
-public class CompressedNodeAdapterFactory implements IAdapterFactory {
-	
-	private static final Class IJAVA_PROJECT_CLASS = IJavaProject.class;
-	private static final Class IJAVA_ELEMENT_CLASS = IJavaElement.class;
-	
-	private static final Class[] ADAPTER_LIST = new Class[] { IJAVA_PROJECT_CLASS };
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if(adaptableObject instanceof CompressedJavaProject) {
-			if(adapterType == IJAVA_PROJECT_CLASS) {
-				return ((CompressedJavaProject)adaptableObject).getProject();
-			} else if (adapterType == IJAVA_ELEMENT_CLASS) {
-				return ((CompressedJavaProject)adaptableObject).getJavaElement();
-			}
-		}
-		return null;
-	}
-
-	public Class[] getAdapterList() { 
-		return ADAPTER_LIST;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java
deleted file mode 100644
index f18c5cc1b..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java
+++ /dev/null
@@ -1,48 +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.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * 
- * Provides a simple interface that is used to manipulate the rendering of Java elements to a format
- * that is friendlier for Web Projects.
- * 
- */
-public interface ICompressedNode   {
-	/**
-	 * 
-	 * @return The image to display for this node.
-	 */
-	public Image getImage();
-
-	/**
-	 * 
-	 * @return The text label to display for this node.
-	 */
-	public String getLabel();
-
-	/**
-	 * 
-	 * @param delegateContentProvider
-	 *            The content provider that should used for any children that I cannot provide
-	 *            children for.
-	 * @return The children either from me or the delegateContentProvider.
-	 */
-	public Object[] getChildren(ITreeContentProvider delegateContentProvider);
-
-	/**
-	 * 
-	 * @return The Java element associated with this node, if any.
-	 */
-	public IJavaElement getJavaElement();
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java
deleted file mode 100644
index 95e1817a8..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java
+++ /dev/null
@@ -1,234 +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.servlet.ui.internal.navigator;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.ICommonContentExtensionSite;
-import org.eclipse.ui.navigator.INavigatorContentExtension;
-import org.eclipse.ui.navigator.INavigatorContentService;
-import org.eclipse.ui.navigator.IPipelinedTreeContentProvider;
-import org.eclipse.ui.navigator.PipelinedShapeModification;
-import org.eclipse.ui.navigator.PipelinedViewerUpdate;
-
-public class WebJavaContentProvider implements IPipelinedTreeContentProvider  {
-
-	private static final Object[] NO_CHILDREN = new Object[0];
-	private static final String JAVA_EXTENSION_ID = "org.eclipse.jdt.java.ui.javaContent"; //$NON-NLS-1$
-
-	/*
-	 * JDT likes to make it interesting so just one of their viewer types is made internal To avoid
-	 * the dependency, we use some reflection here to filter the type.
-	 */
-
-	private static Class INTERNAL_CONTAINER_CLASS;
-	static {
-		try {
-			INTERNAL_CONTAINER_CLASS = Class.forName("org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"); //$NON-NLS-1$
-		} catch (Throwable t) {
-			// ignore if the class has been removed or renamed.
-			INTERNAL_CONTAINER_CLASS = null;
-		}
-	}
-
-
-	private CommonViewer commonViewer;
-	private ITreeContentProvider delegateContentProvider;
-	private final Map compressedNodes = new HashMap();
-
-	public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
-		if (aParent instanceof IJavaProject) {
-			cleanJavaContribution(theCurrentChildren);
-			theCurrentChildren.add(getCompressedNode((IJavaProject) aParent));
-		} 
-	}
-
-	private void cleanJavaContribution(Set theCurrentChildren) {
-		IJavaElement element = null;
-		for (Iterator iter = theCurrentChildren.iterator(); iter.hasNext();) {
-			Object child = (Object) iter.next();
-			if (child instanceof IResource && ((element = JavaCore.create((IResource) child)) != null) && element.exists())
-				iter.remove();
-			else if (child instanceof IJavaElement)
-				iter.remove();
-			else if (INTERNAL_CONTAINER_CLASS != null && INTERNAL_CONTAINER_CLASS.isInstance(child))
-				iter.remove();
-		}
-	}
-
-	private CompressedJavaProject getCompressedNode(IJavaProject project) {
-		CompressedJavaProject result = (CompressedJavaProject) compressedNodes.get(project);
-		if (result == null) {
-			compressedNodes.put(project, result = new CompressedJavaProject(commonViewer, project));
-		}
-		return result;
-	}
-
-	public void getPipelinedElements(Object anInput, Set theCurrentElements) { 
-
-	}
-
-	public Object getPipelinedParent(Object anObject, Object aSuggestedParent) {
-
-		if (anObject instanceof IPackageFragmentRoot) {
-			IPackageFragmentRoot root = (IPackageFragmentRoot) anObject;
-			if (!root.isExternal() && aSuggestedParent instanceof IJavaProject) {
-				return getCompressedNode((IJavaProject) aSuggestedParent);
-			}
-		} else if(INTERNAL_CONTAINER_CLASS.isInstance(anObject) && aSuggestedParent instanceof IJavaProject) {
-			return getCompressedNode( (IJavaProject) aSuggestedParent ).getCompressedJavaLibraries();
-		}
-		
-		return null;
-	}
-
-	public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) {
-		Object parent = anAddModification.getParent();
-		
-		if (parent instanceof IPackageFragmentRoot) {
-			IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) parent;
-			CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject());
-			if(compressedNode.isFlatteningSourceFolder()) {
-				anAddModification.setParent(compressedNode);
-			}
-			
-		} 
-		
-		return anAddModification;
-	}
-	
-
-	public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) {
-
-		Object parent = aRemoveModification.getParent();
-		
-		if (parent instanceof IPackageFragmentRoot) {
-			IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) parent;
-			CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject());
-			if(compressedNode.isFlatteningSourceFolder()) {
-				aRemoveModification.setParent(compressedNode);
-			}
-			
-		} 
-		
-		return aRemoveModification;
-	}
-
-	public boolean interceptRefresh(PipelinedViewerUpdate aRefreshSynchronization) {
-		
-		Set refreshTargets = aRefreshSynchronization.getRefreshTargets();
-		for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) {
-			Object refreshTarget = (Object) iter.next();
-			if (refreshTarget instanceof IPackageFragmentRoot) {
-				IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) refreshTarget;
-				CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject());
-				if(compressedNode.isFlatteningSourceFolder()) {
-					iter.remove(); // voids the iter but is okay because we're done with it
-					refreshTargets.add(compressedNode);
-					return true;
-				}
-				
-			}
-		}
-		
-		return false;
-	}
-
-
-	public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) {
-		Set refreshTargets = anUpdateSynchronization.getRefreshTargets();
-		for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) {
-			Object refreshTarget = (Object) iter.next();
-			if (refreshTarget instanceof IPackageFragmentRoot) {
-				IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) refreshTarget;
-				if (sourceFolder.getJavaProject()!=null && sourceFolder.getJavaProject().exists() && sourceFolder.getJavaProject().isOpen()) {
-					CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject());
-					if(compressedNode.isFlatteningSourceFolder()) {
-						iter.remove(); // voids the iterator; but is okay because we're done with it
-						refreshTargets.add(compressedNode);
-						return true;
-					}
-				}
-			}
-		}
-		
-		return false; 
-	}
-
-	public void init(ICommonContentExtensionSite aSite) { 
-	}
-
-	public Object[] getChildren(Object parentElement) {
-		if (delegateContentProvider != null) {
-			if (parentElement instanceof CompressedJavaProject) {
-				return ((CompressedJavaProject)parentElement).getChildren(delegateContentProvider);
-			} else if (parentElement instanceof CompressedJavaLibraries) { 
-				return ((CompressedJavaLibraries)parentElement).getChildren(delegateContentProvider);
-			}
-		}
-		return NO_CHILDREN;
-	}
-
-	public Object getParent(Object element) {
-		if (element instanceof CompressedJavaProject)
-			return ((CompressedJavaProject) element).getProject();
-		if (element instanceof CompressedJavaLibraries) 
-			return ((CompressedJavaLibraries) element).getCompressedProject();
-		return null;
-	}
-
-	public boolean hasChildren(Object element) {
-		return (element instanceof CompressedJavaProject || element instanceof CompressedJavaLibraries);
-	}
-
-	public Object[] getElements(Object inputElement) {
-		return NO_CHILDREN;
-	}
-
-	public void dispose() { 
-		compressedNodes.clear(); 
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (viewer instanceof CommonViewer) {
-			commonViewer = (CommonViewer) viewer;
-			INavigatorContentService service = commonViewer.getNavigatorContentService();
-			INavigatorContentExtension javaext = service.getContentExtensionById(JAVA_EXTENSION_ID);
-			if (javaext != null)
-				delegateContentProvider = javaext.getContentProvider();
-			compressedNodes.clear();
-		}
-
-	}
-
-	public void restoreState(IMemento aMemento) {
-
-	}
-
-	public void saveState(IMemento aMemento) {
-
-	}
-	
-	public boolean isClasspathContainer(Object o) {		
-		return INTERNAL_CONTAINER_CLASS != null && INTERNAL_CONTAINER_CLASS.isInstance(o);
-	} 
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java
deleted file mode 100644
index 388a4dcc3..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java
+++ /dev/null
@@ -1,64 +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.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.ui.ProblemsLabelDecorator;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-public class WebJavaLabelProvider implements ILabelProvider {
-	
-	private ILabelDecorator decorator = new ProblemsLabelDecorator();
-
-	public Image getImage(Object element) {
-		Image image = null;
-		if(element instanceof ICompressedNode)
-			image = ((ICompressedNode)element).getImage(); 
-		
-		IJavaElement javaElement = null;
-		if(image != null && ( javaElement = ((ICompressedNode)element).getJavaElement()) != null ) {			
-			image = decorator.decorateImage(image, javaElement);
-		}
-		return image;
-	}
-
-	public String getText(Object element) {
-		String text = null;
-		if(element instanceof ICompressedNode)
-			text = ((ICompressedNode)element).getLabel(); 
-
-		IJavaElement javaElement = null;
-		if(text != null && ( javaElement = ((ICompressedNode)element).getJavaElement()) != null ) {
-			text = decorator.decorateText(text, javaElement);
-		}
-		return text;
-	}
-
-	public void addListener(ILabelProviderListener listener) { 
-
-	}
-
-	public void dispose() { 
-		decorator.dispose();
-	}
-
-	public boolean isLabelProperty(Object element, String property) { 
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) { 
-
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
deleted file mode 100644
index 756d183ef..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
+++ /dev/null
@@ -1,63 +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.servlet.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- *
- */
-public class ServletUIPlugin extends AbstractUIPlugin {
-	
-	public static final String PLUGIN_ID = "org.eclipse.jst.servlet.ui"; //$NON-NLS-1$
-	//	The shared instance.
-	private static ServletUIPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public ServletUIPlugin() {
-		super();
-		plugin = this;
-	}
-	
-	
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ServletUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-    
-    public static void log( final Exception e )
-    {
-        final String msg = e.getMessage() + ""; //$NON-NLS-1$
-        log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
-    }
-
-    public static void log( final IStatus status )
-    {
-        getDefault().getLog().log( status );
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
deleted file mode 100644
index b904b253d..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
+++ /dev/null
@@ -1,135 +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.servlet.ui.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class WEBUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "web_ui";//$NON-NLS-1$
-
-	private WEBUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String NEW_SERVLET_WIZARD_PAGE_TITLE;
-	public static String FOLDER_LABEL;
-	public static String URL_MAPPINGS_LABEL;
-	public static String JAVA_CLASS_MODIFIERS_LABEL;
-	public static String SUPERCLASS_LABEL;
-	public static String WEB_CONT_PAGE_TITLE;
-	public static String SERVLET_PACKAGE_LABEL;
-	public static String PACKAGE_SELECTION_DIALOG_MSG_NONE;
-	public static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
-	public static String ADD_SERVLET_WIZARD_WINDOW_TITLE;
-	public static String ADD_SERVLET_WIZARD_PAGE_TITLE;
-	public static String JAVA_CLASS_MAIN_CHECKBOX_LABEL;
-	public static String EMPTY_LIST_MSG;
-	public static String ExportWARAction_UI_;
-	public static String NO_WEB_PROJECTS;
-	public static String INTERFACE_SELECTION_DIALOG_MSG_NONE;
-	public static String SUPERCLASS_SELECTION_DIALOG_TITLE;
-	public static String PACKAGE_SELECTION_DIALOG_DESC;
-	public static String JAVA_CLASS_BROWER_DIALOG_TITLE;
-	public static String CONTAINER_SELECTION_DIALOG_DESC;
-	public static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-	public static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
-	public static String URL_PATTERN_LABEL;
-	public static String CONTAINER_SELECTION_DIALOG_TITLE;
-	public static String WEB_CONT_NAME;
-	public static String URL_PATTERN_TITLE;
-	public static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
-	public static String DESCRIPTION_LABEL;
-	public static String USE_EXISTING_SERVLET_CLASS;
-	public static String JAVA_CLASS_FINAL_CHECKBOX_LABEL;
-	public static String INTERFACE_SELECTION_DIALOG_DESC;
-	public static String ADD_LABEL;
-	public static String ADD_SERVLET_WIZARD_PAGE_DESC;
-	public static String SELECT_CLASS_TITLE;
-	public static String JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-	public static String ImportWARAction_UI_;
-	public static String _9;
-	public static String JAVA_CLASS_METHOD_STUBS_LABEL;
-	public static String _8;
-	public static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
-	public static String _7;
-	public static String SERVLETS;
-	public static String _6;
-	public static String DEFAULT_PACKAGE;
-	public static String _5;
-	public static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
-	public static String BROWSE_BUTTON_LABEL;
-	public static String _4;
-	public static String REMOVE_BUTTON;
-	public static String _3;
-	public static String _2;
-	public static String _1;
-	public static String INIT_PARAM_LABEL;
-	public static String SERVLET_NAME_LABEL;
-	public static String _0;
-	public static String CLASS_NAME_LABEL;
-	public static String _17;
-	public static String _16;
-	public static String JAVA_PACKAGE_LABEL;
-	public static String _15;
-	public static String _14;
-	public static String _13;
-	public static String PACKAGE_SELECTION_DIALOG_TITLE;
-	public static String _12;
-	public static String ADD_BUTTON_LABEL;
-	public static String EDIT_BUTTON_LABEL;
-	public static String _11;
-	public static String _10;
-	public static String SUPERCLASS_SELECTION_DIALOG_DESC;
-	public static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-	public static String REMOVE_BUTTON_LABEL;
-	public static String NEW_SERVLET_WIZARD_WINDOW_TITLE;
-	public static String INTERFACE_SELECTION_DIALOG_TITLE;
-	public static String NAME_LABEL;
-	public static String VALUE_LABEL;
-	public static String WEB_CONT_PAGE_COMP_LABEL;
-	public static String CHOOSE_SERVLET_CLASS;
-	public static String NEW_SERVLET_WIZARD_PAGE_DESC;
-	public static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
-	public static String WEB_CONT_PAGE_DESCRIPTION;
-	public static String JAVA_CLASS_INTERFACES_LABEL;
-	public static String WEBCONTENT;
-	
-	public static String Compressed_Libraries;
-	public static String Compressed_JavaResources;
-	
-	public static String ConvertToWebTitle;
-	public static String SelectWebVersion;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WEBUIMessages.class);
-	}
-
-	public static final String IMAGE_LOAD_ERROR = _0;
-	public static final String WEB_MODULE_WIZ_TITLE = _1;
-	public static final String WEB_VERSION_LBL = _2;
-	public static final String WEB_PROJECT_MAIN_PG_TITLE = _3;
-	public static final String WEB_PROJECT_MAIN_PG_DESC = _4;
-	public static final String EJB_PROJECT_LBL = _5;
-	public static final String WEB_FILE_LBL = _6;
-	public static final String WEB_IMPORT_MAIN_PG_DESC = _7;
-	public static final String WEB_IMPORT_MAIN_PG_TITLE = _8;
-	public static final String WEB_EXPORT_MAIN_PG_TITLE = _9;
-	public static final String WEB_EXPORT_MAIN_PG_DESC = _10;
-	public static final String WEB_IMPORT_CONTEXT_ROOT = _11;
-	public static final String WEB_CONVERT_MAIN_PG_DESC = _12;
-	public static final String WEB_CONVERT_MAIN_PG_TITLE = _13;
-	public static final String WEB_IMPORT_WEB_LIB_PG_TITLE = _14;
-	public static final String WEB_IMPORT_WEB_LIB_PG_DESC = _15;
-	public static final String WAR_IMPORT_SELECT_ALL_LIBS_BUTTON = _16;
-	public static final String WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON = _17;
-	
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
deleted file mode 100644
index 68429c7af..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
+++ /dev/null
@@ -1,143 +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.servlet.ui.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New servlet wizard
- */
-public class AddServletWizard extends NewWebWizard {
-	private static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
-	private static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
-	private static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
-	/**
-	 * @param model
-	 */
-	public AddServletWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(IWebWizardConstants.ADD_SERVLET_WIZARD_WINDOW_TITLE);
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor("newservlet_wiz")); //$NON-NLS-1$
-	}
-	
-	public AddServletWizard() {
-	    this(null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void doAddPages() {
-		
-		NewServletClassWizardPage page1 = new NewServletClassWizardPage(
-				getDataModel(), 
-				PAGE_ONE,
-				IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
-				IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE, J2EEProjectUtilities.DYNAMIC_WEB);
-		page1.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1);
-		addPage(page1);
-		AddServletWizardPage page2 = new AddServletWizardPage(getDataModel(), PAGE_TWO);
-		page2.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2);
-		addPage(page2);
-		NewServletClassOptionsWizardPage page3 = new NewServletClassOptionsWizardPage(
-				getDataModel(), 
-				PAGE_THREE,
-				IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
-				IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE);
-		page3.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3);
-		addPage(page3);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizard#runForked()
-	 */
-	protected boolean runForked() {
-		return false;
-	}
-	
-	public boolean canFinish() {
-		return getDataModel().isValid();
-	}
-	
-	protected void postPerformFinish() throws InvocationTargetException {
-		//open new servlet class in java editor
-		WebArtifactEdit artifactEdit = null;
-		try {
-			JavaClass javaClass = null;
-			String className = getDataModel().getStringProperty(INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME);
-			IProject p = (IProject) getDataModel().getProperty(INewJavaClassDataModelProperties.PROJECT);
-			IVirtualComponent component = ComponentCore.createComponent(p);
-			boolean isServlet = getDataModel().getBooleanProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE);
-			if (isServlet) {
-				// servlet class
-				artifactEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
-				ResourceSet resourceSet = artifactEdit.getDeploymentDescriptorResource().getResourceSet();
-				javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(className,resourceSet);
-				J2EEEditorUtility.openInEditor(javaClass, p );
-			} else {
-				// jsp
-				IContainer webContent = component.getRootFolder().getUnderlyingFolder();
-				IFile file = webContent.getFile(new Path(className));
-				openEditor(file);
-			}
-		} catch (Exception cantOpen) {
-			ServletUIPlugin.log(cantOpen);
-		} finally {
-			if (artifactEdit!=null)
-				artifactEdit.dispose();
-		}	
-	}
-
-	private void openEditor(final IFile file) {
-		if (file != null) {
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-						IDE.openEditor(page, file, true);
-					}
-					catch (PartInitException e) {
-						ServletUIPlugin.log(e);
-					}
-				}
-			});
-		}
-	}
-
-	protected IDataModelProvider getDefaultProvider() {
-		return new NewServletClassDataModelProvider();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
deleted file mode 100644
index e657f2ac5..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
+++ /dev/null
@@ -1,136 +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.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Servlet Wizard Setting Page
- */
-public class AddServletWizardPage extends DataModelWizardPage {
-	final static String[] JSPEXTENSIONS = {"jsp"}; //$NON-NLS-1$
-
-	private Text displayNameText;
-
-	private StringArrayTableWizardSection urlSection;
-
-	public AddServletWizardPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setDescription(IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_DESC);
-		this.setTitle(IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return new String[]{INewServletClassDataModelProperties.DISPLAY_NAME, INewServletClassDataModelProperties.INIT_PARAM, INewServletClassDataModelProperties.URL_MAPPINGS};
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = 300;
-		composite.setLayoutData(data);
-
-		createNameDescription(composite);
-		new StringArrayTableWizardSection(composite, IWebWizardConstants.INIT_PARAM_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL, IWebWizardConstants.EDIT_BUTTON_LABEL, 
-				IWebWizardConstants.REMOVE_BUTTON_LABEL, new String[]{IWebWizardConstants.NAME_LABEL, IWebWizardConstants.VALUE_LABEL, IWebWizardConstants.DESCRIPTION_LABEL}, null,// WebPlugin.getDefault().getImage("initializ_parameter"),
-				model, INewServletClassDataModelProperties.INIT_PARAM);
-		urlSection = new StringArrayTableWizardSection(composite, IWebWizardConstants.URL_MAPPINGS_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL, IWebWizardConstants.EDIT_BUTTON_LABEL, IWebWizardConstants.REMOVE_BUTTON_LABEL,
-				new String[]{IWebWizardConstants.URL_PATTERN_LABEL}, null,// WebPlugin.getDefault().getImage("url_type"),
-				model, INewServletClassDataModelProperties.URL_MAPPINGS);
-		String text = displayNameText.getText();
-		// Set default URL Pattern
-		List input = new ArrayList();
-		input.add(new String[]{"/" + text}); //$NON-NLS-1$
-		if (urlSection != null)
-			urlSection.setInput(input);
-		displayNameText.setFocus();
-
-		IStatus projectStatus = validateProjectName();
-		if (!projectStatus.isOK()) {
-			setErrorMessage(projectStatus.getMessage());
-			composite.setEnabled(false);
-		}
-		return composite;
-	}
-
-	protected IStatus validateProjectName() {
-		// check for empty
-		if (model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME) == null || model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME).trim().length() == 0) {
-			return WTPCommonPlugin.createErrorStatus(IWebWizardConstants.NO_WEB_PROJECTS);
-		}
-		return WTPCommonPlugin.OK_STATUS;
-	}
-
-	protected void createNameDescription(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(2, false));
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		// display name
-		Label displayNameLabel = new Label(composite, SWT.LEFT);
-		displayNameLabel.setText(IWebWizardConstants.NAME_LABEL);
-		displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		displayNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String text = displayNameText.getText();
-				// Set default URL Pattern
-				List input = new ArrayList();
-				input.add(new String[]{"/" + text}); //$NON-NLS-1$
-				if (urlSection != null)
-					urlSection.setInput(input);
-			}
-
-		});
-		synchHelper.synchText(displayNameText, INewServletClassDataModelProperties.DISPLAY_NAME, null);
-
-		// description
-		Label descLabel = new Label(composite, SWT.LEFT);
-		descLabel.setText(IWebWizardConstants.DESCRIPTION_LABEL);
-		descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		synchHelper.synchText(descText, INewServletClassDataModelProperties.DESCRIPTION, null);
-	}
-
-	public String getDisplayName() {
-		return displayNameText.getText();
-	}
-	
-	public boolean canFlipToNextPage() {
-		if (model.getBooleanProperty(INewServletClassDataModelProperties.USE_EXISTING_CLASS))
-			return false;
-		return super.canFlipToNextPage();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
deleted file mode 100644
index 31c24fbba..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
+++ /dev/null
@@ -1,68 +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.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-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.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.graphics.Image;
-
-public class AvailableWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
-	public AvailableWebLibProvider() {
-	}
-
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof WARFile) {
-			Object[] array = ((WARFile) inputElement).getLibArchives().toArray();
-			Arrays.sort(array, new Comparator() {
-				public int compare(Object o1, Object o2) {
-					return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
-				}
-
-			});
-			return array;
-		}
-		return new Object[0];
-	}
-
-	public Image getColumnImage(Object element, int columnIndex) {
-		return AvailableJarsProvider.getUtilImage();
-	}
-
-	public String getColumnText(Object element, int columnIndex) {
-		File file = (File) element;
-		return file.getName();
-	}
-
-	public void dispose() {
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
deleted file mode 100644
index c6f765d0c..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
+++ /dev/null
@@ -1,78 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-public class ConvertToWebModuleTypeDialog extends Dialog {
-	
-	private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;
-	private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;
-	private static String fSelection= null;
-	private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT};
-	private int fInitialSelectionIndex = fAllowedStrings.length-1;
-	
-	public static String getSelectedVersion() {
-		return fSelection;
-	}
-
-	public ConvertToWebModuleTypeDialog(IShellProvider parentShell) {
-		super(parentShell);
-	}
-
-	public ConvertToWebModuleTypeDialog(Shell parentShell) {
-		super(parentShell);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		getShell().setText(fShellTitle);
-		
-		Composite composite = (Composite)super.createDialogArea(parent);
-		Composite innerComposite = new Composite(composite, SWT.NONE);
-		innerComposite.setLayoutData(new GridData());
-		GridLayout gl= new GridLayout();
-		gl.numColumns= 2;
-		innerComposite.setLayout(gl);
-		
-		Label label= new Label(innerComposite, SWT.NONE);
-		label.setText(fLabelText);
-		label.setLayoutData(new GridData());
-
-		final Combo combo= new Combo(innerComposite, SWT.READ_ONLY);
-		for (int i = 0; i < fAllowedStrings.length; i++) {
-			combo.add(fAllowedStrings[i]);
-		}
-		combo.select(fInitialSelectionIndex);
-		fSelection= combo.getItem(combo.getSelectionIndex());
-		GridData gd= new GridData();
-		combo.setLayoutData(gd);
-		combo.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				fSelection= combo.getItem(combo.getSelectionIndex());
-			}
-		});
-		return composite;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
deleted file mode 100644
index ad5f627eb..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
+++ /dev/null
@@ -1,92 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-
-public interface IWebWizardConstants {
-	
-	// AddServletWizard
-	public final static String ADD_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_WINDOW_TITLE;
-	public final static String ADD_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_TITLE;
-	public final static String ADD_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_DESC;
-
-	public final static String DEFAULT_PACKAGE = WEBUIMessages.DEFAULT_PACKAGE;
-	public final static String SELECT_CLASS_TITLE = WEBUIMessages.SELECT_CLASS_TITLE;
-	public final static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG = WEBUIMessages.MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
-	public final static String EMPTY_LIST_MSG = WEBUIMessages.EMPTY_LIST_MSG;
-	public final static String ADD_LABEL = WEBUIMessages.ADD_LABEL;
-	public final static String USE_EXISTING_SERVLET_CLASS = WEBUIMessages.USE_EXISTING_SERVLET_CLASS;
-	public final static String INIT_PARAM_LABEL = WEBUIMessages.INIT_PARAM_LABEL;
-	public final static String URL_MAPPINGS_LABEL = WEBUIMessages.URL_MAPPINGS_LABEL;
-	public final static String CHOOSE_SERVLET_CLASS = WEBUIMessages.CHOOSE_SERVLET_CLASS;
-	
-	// NewServletWizard
-	public final static String NEW_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_WINDOW_TITLE;
-	public final static String NEW_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_TITLE;
-	public final static String NEW_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_DESC;
-	public final static String SERVLET_PACKAGE_LABEL = WEBUIMessages.SERVLET_PACKAGE_LABEL;
-	public final static String SERVLET_NAME_LABEL = WEBUIMessages.SERVLET_NAME_LABEL;
-
-	
-	// common
-	public final static String ADD_BUTTON_LABEL = WEBUIMessages.ADD_BUTTON_LABEL;
-	public final static String EDIT_BUTTON_LABEL = WEBUIMessages.EDIT_BUTTON_LABEL;
-	public final static String REMOVE_BUTTON_LABEL = WEBUIMessages.REMOVE_BUTTON_LABEL;
-	public final static String URL_PATTERN_TITLE = WEBUIMessages.URL_PATTERN_TITLE;
-	public final static String URL_PATTERN_LABEL = WEBUIMessages.URL_PATTERN_LABEL;
-	public final static String FOLDER_LABEL = WEBUIMessages.FOLDER_LABEL;
-	public final static String JAVA_PACKAGE_LABEL = WEBUIMessages.JAVA_PACKAGE_LABEL;
-	public final static String CLASS_NAME_LABEL = WEBUIMessages.CLASS_NAME_LABEL;
-	public final static String SUPERCLASS_LABEL = WEBUIMessages.SUPERCLASS_LABEL;
-	public final static String CONTAINER_SELECTION_DIALOG_TITLE = WEBUIMessages.CONTAINER_SELECTION_DIALOG_TITLE;
-	public final static String CONTAINER_SELECTION_DIALOG_DESC = WEBUIMessages.CONTAINER_SELECTION_DIALOG_DESC;
-	public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = WEBUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
-	public final static String PACKAGE_SELECTION_DIALOG_TITLE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_TITLE;
-	public final static String PACKAGE_SELECTION_DIALOG_DESC = WEBUIMessages.PACKAGE_SELECTION_DIALOG_DESC;
-	public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE;
-	public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE;
-	public final static String SUPERCLASS_SELECTION_DIALOG_DESC = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC;
-	public final static String INTERFACE_SELECTION_DIALOG_TITLE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_TITLE;
-	public final static String INTERFACE_SELECTION_DIALOG_DESC = WEBUIMessages.INTERFACE_SELECTION_DIALOG_DESC;
-	public final static String INTERFACE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_MSG_NONE;
-	public final static String JAVA_CLASS_MODIFIERS_LABEL = WEBUIMessages.JAVA_CLASS_MODIFIERS_LABEL;
-	public final static String JAVA_CLASS_INTERFACES_LABEL = WEBUIMessages.JAVA_CLASS_INTERFACES_LABEL;
-	public final static String JAVA_CLASS_METHOD_STUBS_LABEL = WEBUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL;
-	public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
-	public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
-	public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL;
-	public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
-	public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL;
-	public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
-	public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_TITLE;
-	public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-	
-	public final static String NAME_LABEL = WEBUIMessages.NAME_LABEL;
-	public final static String DESCRIPTION_LABEL = WEBUIMessages.DESCRIPTION_LABEL;
-	public final static String VALUE_LABEL = WEBUIMessages.VALUE_LABEL;
-	public final static String EMPTY_STRING = ""; //$NON-NLS-1$
-	public final static String BROWSE_BUTTON_LABEL = WEBUIMessages.BROWSE_BUTTON_LABEL;
-	public static final String REMOVE_BUTTON = WEBUIMessages.REMOVE_BUTTON;
-    
-	public final static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-	public final static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-	
-	public final static String ImportWARAction_UI_ = WEBUIMessages.ImportWARAction_UI_;
-	public final static String ExportWARAction_UI_ = WEBUIMessages.ExportWARAction_UI_;
-	
-	public final static String NO_WEB_PROJECTS = WEBUIMessages.NO_WEB_PROJECTS;
-	
-	public static final String SERVLETS = WEBUIMessages.SERVLETS;
-	
-	public static final String CONVERT_TO_WEB_TITLE = WEBUIMessages.ConvertToWebTitle;
-	public static final String SELECT_WEB_VERSION = WEBUIMessages.SelectWebVersion;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
deleted file mode 100644
index 74f16f5e7..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,666 +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.servlet.ui.internal.wizard;
-
-/**
- * 
- */
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class MultiSelectFilteredFileSelectionDialog extends FilteredFileSelectionDialog implements SelectionListener {
-	
-
-	private static class PackageRenderer extends LabelProvider {
-		private final Image PACKAGE_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE); 
-
-		public String getText(Object element) {
-			IType type = (IType) element;
-			String p = type.getPackageFragment().getElementName();
-			if ("".equals(p)) //$NON-NLS-1$
-				p = IWebWizardConstants.DEFAULT_PACKAGE;
-			return (p + " - " + type.getPackageFragment().getParent().getPath().toString()); //$NON-NLS-1$
-		}
-		public Image getImage(Object element) {
-			return PACKAGE_ICON;
-		}
-	}
-
-	private static class TypeRenderer extends LabelProvider {
-		private final Image CLASS_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS); 
-
-		public String getText(Object element) {
-			IType e = ((IType) element);
-			return e.getElementName();
-		}
-
-		public Image getImage(Object element) {
-			return CLASS_ICON;
-		}
-
-	}
-	public final static int JSP = 0;
-	public final static int SERVLET = 1;
-	protected Button fServletButton;
-	protected Button fJSPButton;
-	protected int fSelection = -1;
-	protected PageBook fPageBook = null;
-	protected Control fJspControl = null;
-	protected Control fServletControl = null;
-	protected Composite fChild = null;
-	// construction parameters
-	protected IRunnableContext fRunnableContext;
-	protected ILabelProvider fElementRenderer;
-	protected ILabelProvider fQualifierRenderer;
-	private Object[] fElements;
-	private boolean fIgnoreCase = true;
-	private String fUpperListLabel;
-	private String fLowerListLabel;
-	// SWT widgets
-	private Table fUpperList;
-	private Table fLowerList;
-	protected Text fText;
-	private IType[] fIT;
-	private String[] fRenderedStrings;
-	private int[] fElementMap;
-	private Integer[] fQualifierMap;
-
-	private ISelectionStatusValidator fLocalValidator = null;
-	/**
-	 * MultiSelectFilteredFileSelectionDialog constructor comment.
-	 * @param parent Shell
-	 * @param title String
-	 * @param message String
-	 * @parent extensions String[]
-	 * @param allowMultiple boolean
-	 */
-	public MultiSelectFilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple, IProject project) {
-		super(parent, title, message, extensions, allowMultiple);
-		setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
-		if (title == null)
-			setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
-		if (message == null)
-			message = WebAppEditResourceHandler.getString("Select_a_file__UI_"); //$NON-NLS-1$
-		setMessage(message);
-		setExtensions(extensions);
-		addFilter(new TypedFileViewerFilter(extensions));
-		fLocalValidator = new SimpleTypedElementSelectionValidator(new Class[] { IFile.class }, allowMultiple);
-		setValidator(fLocalValidator);
-		
-		//StatusInfo currStatus = new StatusInfo();
-		//currStatus.setOK();
-		Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null);
-		
-		updateStatus(currStatus);
-		fElementRenderer = new TypeRenderer();
-		fQualifierRenderer = new PackageRenderer();
-		fRunnableContext = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-		try {
-			IJavaElement jelem = null;
-			IProject proj = null;
-			jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
-			if (jelem == null) {
-				IResource resource = (IResource) project.getAdapter(IResource.class);
-				if (resource != null) {
-					proj = resource.getProject();
-					if (proj != null) {
-						jelem = org.eclipse.jdt.core.JavaCore.create(proj);
-					}
-				}
-			}
-			IJavaProject jp = jelem.getJavaProject();
-
-			IType servletType = jp.findType("javax.servlet.Servlet"); //$NON-NLS-1$
-			// next 3 lines fix defect 177686
-			if (servletType == null) {
-				return;
-			}
-
-			ArrayList servletClasses = new ArrayList();
-			ITypeHierarchy tH = servletType.newTypeHierarchy(jp, null);
-			IType[] types = tH.getAllSubtypes(servletType);
-			for (int i = 0; i < types.length; i++) {
-				if (types[i].isClass() && !servletClasses.contains(types[i]))
-					servletClasses.add(types[i]);
-			}
-			fIT = (IType[]) servletClasses.toArray(new IType[servletClasses.size()]);
-			servletClasses = null;
-
-		} catch (Exception exc) {
-			Logger.getLogger().logError(exc);
-		}
-	}
-	
-	/**
-	 * @private
-	 */
-	protected void computeResult() {
-		if (fSelection == JSP) {
-			super.computeResult();
-		} else {
-			IType type = (IType) getWidgetSelection();
-			if (type != null) {
-				if (type == null) {
-					String title = WebAppEditResourceHandler.getString("Select_Class_UI_"); //$NON-NLS-1$ = "Select Class"
-					String message = WebAppEditResourceHandler.getString("Could_not_uniquely_map_the_ERROR_"); //$NON-NLS-1$ = "Could not uniquely map the class name to a class."
-					MessageDialog.openError(getShell(), title, message);
-					setResult(null);
-				} else {
-					java.util.List result = new ArrayList(1);
-					result.add(type);
-					setResult(result);
-				}
-			}
-		}
-	}
-	
-	public void create() {
-		super.create();
-		fText.setFocus();
-		rematch(""); //$NON-NLS-1$
-		updateOkState();
-	}
-	
-	/**
-	 * Creates and returns the contents of this dialog's 
-	 * button bar.
-	 * <p>
-	 * The <code>Dialog</code> implementation of this framework method
-	 * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
-	 * framework method to populate it. Subclasses may override.
-	 * </p>
-	 *
-	 * @param parent the parent composite to contain the button bar
-	 * @return the button bar control
-	 */
-	protected Control createButtonBar(Composite parent) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-
-		layout.numColumns = 2;
-
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite composite2 = new Composite(composite, SWT.NONE);
-
-		// create a layout with spacing and margins appropriate for the font size.
-		layout = new GridLayout();
-		layout.numColumns = 0; // this is incremented by createButton
-		layout.makeColumnsEqualWidth = true;
-		layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
-		layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
-		composite2.setLayout(layout);
-
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
-		composite2.setLayoutData(data);
-
-		composite2.setFont(parent.getFont());
-
-		// Add the buttons to the button bar.
-		super.createButtonsForButtonBar(composite2);
-
-		return composite;
-	}
-	
-	/*
-	 * @private
-	 */
-	protected Control createDialogArea(Composite parent) {
-		GridData gd = new GridData();
-
-		fChild = new Composite(parent, SWT.NONE);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
-		GridLayout gl = new GridLayout();
-		gl.numColumns = 2;
-		gl.marginHeight = 0;
-		fChild.setLayout(gl);
-
-		gd.verticalAlignment = GridData.FILL;
-		gd.grabExcessVerticalSpace = true;
-		fChild.setLayoutData(gd);
-
-		// Create the Web Type radio buttons and text fields.
-		fServletButton = new Button(fChild, SWT.RADIO);
-		fServletButton.setText(WebAppEditResourceHandler.getString("Servlet_UI_")); //$NON-NLS-1$ = Servlet
-		gd = new GridData();
-		fServletButton.setLayoutData(gd);
-		fServletButton.addSelectionListener(this);
-
-		fJSPButton = new Button(fChild, SWT.RADIO);
-		fJSPButton.setText("JSP"); //$NON-NLS-1$
-		gd = new GridData();
-		fJSPButton.setLayoutData(gd);
-		fJSPButton.addSelectionListener(this);
-
-		if (fSelection == JSP)
-			fJSPButton.setSelection(true);
-		else {
-			fServletButton.setSelection(true);
-			fSelection = SERVLET;
-		}
-
-		fPageBook = new PageBook(fChild, SWT.NONE);
-		gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.verticalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		gd.grabExcessVerticalSpace = true;
-		gd.horizontalSpan = 2;
-		fPageBook.setLayoutData(gd);
-		fJspControl = super.createDialogArea(fPageBook);
-
-		Composite composite = new Composite(fPageBook, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
-
-		Label messageLabel = new Label(composite, SWT.NONE);
-		gd = new GridData();
-		messageLabel.setLayoutData(gd);
-		messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
-
-		fText = createText(composite);
-
-		messageLabel = new Label(composite, SWT.NONE);
-		gd = new GridData();
-		messageLabel.setLayoutData(gd);
-		messageLabel.setText(WebAppEditResourceHandler.getString("Matching_servlets__2")); //$NON-NLS-1$
-
-		fUpperList = createUpperList(composite);
-
-		messageLabel = new Label(composite, SWT.NONE);
-		gd = new GridData();
-		messageLabel.setLayoutData(gd);
-		messageLabel.setText(WebAppEditResourceHandler.getString("Qualifier__3")); //$NON-NLS-1$
-
-		fLowerList = createLowerList(composite);
-
-		fServletControl = composite;
-
-		if (fSelection == JSP)
-			fPageBook.showPage(fJspControl);
-		else
-			fPageBook.showPage(fServletControl);
-		return parent;
-	}
-	
-	/**
-	 * Creates the list widget and sets layout data.
-	 * @return org.eclipse.swt.widgets.List
-	 */
-	private Table createLowerList(Composite parent) {
-		if (fLowerListLabel != null)
-			 (new Label(parent, SWT.NONE)).setText(fLowerListLabel);
-
-		Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		list.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event evt) {
-				handleLowerSelectionChanged();
-			}
-		});
-		list.addListener(SWT.MouseDoubleClick, new Listener() {
-			public void handleEvent(Event evt) {
-				handleLowerDoubleClick();
-			}
-		});
-		list.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				fQualifierRenderer.dispose();
-			}
-		});
-		GridData spec = new GridData();
-		spec.widthHint = convertWidthInCharsToPixels(50);
-		spec.heightHint = convertHeightInCharsToPixels(5);
-		spec.grabExcessVerticalSpace = true;
-		spec.grabExcessHorizontalSpace = true;
-		spec.horizontalAlignment = GridData.FILL;
-		spec.verticalAlignment = GridData.FILL;
-		list.setLayoutData(spec);
-		return list;
-	}
-	
-	/**
-	 * Creates the text widget and sets layout data.
-	 * @return org.eclipse.swt.widgets.Text
-	 */
-	private Text createText(Composite parent) {
-		Text text = new Text(parent, SWT.BORDER);
-		GridData spec = new GridData();
-		spec.grabExcessVerticalSpace = false;
-		spec.grabExcessHorizontalSpace = true;
-		spec.horizontalAlignment = GridData.FILL;
-		spec.verticalAlignment = GridData.BEGINNING;
-		text.setLayoutData(spec);
-		Listener l = new Listener() {
-			public void handleEvent(Event evt) {
-				rematch(fText.getText());
-			}
-		};
-		text.addListener(SWT.Modify, l);
-		return text;
-	}
-	
-	/**
-	 * Creates the list widget and sets layout data.
-	 * @return org.eclipse.swt.widgets.List
-	 */
-	private Table createUpperList(Composite parent) {
-		if (fUpperListLabel != null)
-			 (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
-		Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		list.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event evt) {
-				handleUpperSelectionChanged();
-			}
-		});
-		list.addListener(SWT.MouseDoubleClick, new Listener() {
-			public void handleEvent(Event evt) {
-				handleUpperDoubleClick();
-			}
-		});
-		list.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				fElementRenderer.dispose();
-			}
-		});
-		GridData spec = new GridData();
-		spec.widthHint = convertWidthInCharsToPixels(50);
-		spec.heightHint = convertHeightInCharsToPixels(15);
-		spec.grabExcessVerticalSpace = true;
-		spec.grabExcessHorizontalSpace = true;
-		spec.horizontalAlignment = GridData.FILL;
-		spec.verticalAlignment = GridData.FILL;
-		list.setLayoutData(spec);
-		return list;
-	}
-	
-	/**
-	 * @return the ID of the button that is 'pressed' on doubleClick in the lists.
-	 * By default it is the OK button.
-	 * Override to change this setting.
-	 */
-	protected int getDefaultButtonID() {
-		return IDialogConstants.OK_ID;
-	}
-	
-	public int getSelectedItem() {
-		return fSelection;
-	}
-	
-	protected Object getWidgetSelection() {
-		int i = fLowerList.getSelectionIndex();
-		if (fQualifierMap != null) {
-			if (fQualifierMap.length == 1)
-				i = 0;
-			if (i < 0) {
-				return null;
-			} 
-			Integer index = fQualifierMap[i];
-			return fElements[index.intValue()];
-		}
-		return null;
-	}
-	
-	protected final void handleLowerDoubleClick() {
-		if (getWidgetSelection() != null)
-			buttonPressed(getDefaultButtonID());
-	}
-	
-	protected final void handleLowerSelectionChanged() {
-		updateOkState();
-	}
-	
-	protected final void handleUpperDoubleClick() {
-		if (getWidgetSelection() != null)
-			buttonPressed(getDefaultButtonID());
-	}
-	
-	protected final void handleUpperSelectionChanged() {
-		int selection = fUpperList.getSelectionIndex();
-		if (selection >= 0) {
-			int i = fElementMap[selection];
-			int k = i;
-			int length = fRenderedStrings.length;
-			while (k < length && fRenderedStrings[k].equals(fRenderedStrings[i])) {
-				k++;
-			}
-			updateLowerListWidget(i, k);
-		} else
-			updateLowerListWidget(0, 0);
-	}
-	
-	public int open() {
-
-		if (fIT == null || fIT.length == 0) {
-			MessageDialog.openInformation(getShell(), WebAppEditResourceHandler.getString("Empty_List_1"), WebAppEditResourceHandler.getString("_INFO_No_servlets_exist_to_add._1"));  //$NON-NLS-2$ //$NON-NLS-1$
-			return CANCEL;
-		}
-
-		setElements(fIT);
-		setInitialSelection(""); //$NON-NLS-1$
-		return super.open();
-	}
-	
-	/**
-	 * update the list to reflect a new match string.
-	 * @param matchString java.lang.String
-	 */
-	protected final void rematch(String matchString) {
-		int k = 0;
-		String text = fText.getText();
-		StringMatcher matcher = new StringMatcher(text + "*", fIgnoreCase, false); //$NON-NLS-1$
-		String lastString = null;
-		int length = fElements.length;
-		for (int i = 0; i < length; i++) {
-			while (i < length && fRenderedStrings[i].equals(lastString))
-				i++;
-			if (i < length) {
-				lastString = fRenderedStrings[i];
-				if (matcher.match(fRenderedStrings[i])) {
-					fElementMap[k] = i;
-					k++;
-				}
-			}
-		}
-		fElementMap[k] = -1;
-
-		updateUpperListWidget(fElementMap, k);
-	}
-	
-	/**
-		 * 
-		 * @return java.lang.String[]
-		 * @param p org.eclipse.jface.elements.IIndexedProperty
-		 */
-	private String[] renderStrings(Object[] p) {
-		String[] strings = new String[p.length];
-		int size = strings.length;
-		for (int i = 0; i < size; i++) {
-			strings[i] = fElementRenderer.getText(p[i]);
-		}
-		new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
-		return strings;
-	}
-
-	public void setElements(Object[] elements) {
-		fElements = elements;
-		fElementMap = new int[fElements.length + 1];
-		fRenderedStrings = renderStrings(fElements);
-	}
-
-	public void setSelectedItem(int newSelection) {
-		fSelection = newSelection;
-	}
-
-	private void updateLowerListWidget(int from, int to) {
-		fLowerList.removeAll();
-		fQualifierMap = new Integer[to - from];
-		String[] qualifiers = new String[to - from];
-		for (int i = from; i < to; i++) {
-			// XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
-			qualifiers[i - from] = fQualifierRenderer.getText(fElements[i]);
-			fQualifierMap[i - from] = new Integer(i);
-		}
-
-		new TwoArrayQuickSorter(fIgnoreCase).sort(qualifiers, fQualifierMap);
-
-		for (int i = 0; i < to - from; i++) {
-			TableItem ti = new TableItem(fLowerList, i);
-			ti.setText(qualifiers[i]);
-			// XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
-			Image img = fQualifierRenderer.getImage(fElements[from + i]);
-			if (img != null)
-				ti.setImage(img);
-		}
-
-		if (fLowerList.getItemCount() > 0)
-			fLowerList.setSelection(0);
-		updateOkState();
-	}
-	
-	private void updateOkState() {
-		Button okButton = getOkButton();
-		if (okButton != null)
-			okButton.setEnabled(getWidgetSelection() != null);
-	}
-	
-	private void updateUpperListWidget(int[] indices, int size) {
-		fUpperList.setRedraw(false);
-		int itemCount = fUpperList.getItemCount();
-		if (size < itemCount)
-			fUpperList.remove(0, itemCount - size - 1);
-		TableItem[] items = fUpperList.getItems();
-		for (int i = 0; i < size; i++) {
-			TableItem ti = null;
-			if (i < itemCount)
-				ti = items[i];
-			else
-				ti = new TableItem(fUpperList, i);
-			ti.setText(fRenderedStrings[indices[i]]);
-			// XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
-			Image img = fElementRenderer.getImage(fElements[indices[i]]);
-			if (img != null)
-				ti.setImage(img);
-		}
-		if (fUpperList.getItemCount() > 0)
-			fUpperList.setSelection(0);
-		fUpperList.setRedraw(true);
-		handleUpperSelectionChanged();
-	}
-	
-	/**
-	 * Sent when default selection occurs in the control.
-	 * <p>
-	 * For example, on some platforms default selection occurs
-	 * in a List when the user double-clicks an item or types
-	 * return in a Text.
-	 * </p>
-	 *
-	 * @param e an event containing information about the default selection
-	 */
-	public void widgetDefaultSelected(SelectionEvent e) {
-		// Do nothing
-	}
-	
-	/**
-	 * Sent when selection occurs in the control.
-	 * <p>
-	 * For example, on some platforms selection occurs in
-	 * a List when the user selects an item or items.
-	 * </p>
-	 *
-	 * @param e an event containing information about the selection
-	 */
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == fJSPButton) {
-			fSelection = JSP;
-			fPageBook.showPage(fJspControl);
-			updateOKStatus();
-		} else if (e.widget == fServletButton) {
-			fSelection = SERVLET;
-			fPageBook.showPage(fServletControl);
-		} else
-			fSelection = -1;
-	}
-	
-	/**
-	 * @see ElementTreeSelectionDialog#updateOKStatus()
-	 */
-	protected void updateOKStatus() {
-		super.updateOKStatus();
-		Button okButton = getOkButton();
-		if (okButton != null)
-			okButton.setEnabled(fLocalValidator.validate(getResult()).isOK());
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
deleted file mode 100644
index c019b4a82..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
+++ /dev/null
@@ -1,123 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * 
- */
-public class NewServletClassOptionsWizardPage extends NewJavaClassOptionsWizardPage {
-	protected Button initButton;
-	protected Button toStringButton;
-	protected Button getInfoButton;
-	protected Button doPostButton;
-	protected Button doPutButton;
-	protected Button doDeleteButton;
-	protected Button destroyButton;
-	protected Button doGetButton;
-
-	public NewServletClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
-		super(model, pageName, pageDesc, pageTitle);
-	}
-	/**
-	 * Create the composite with all the stubs
-	 */
-	protected void createStubsComposite(Composite parent) {
-		Label stubLabel = new Label(parent, SWT.NONE);
-		stubLabel.setText(IWebWizardConstants.JAVA_CLASS_METHOD_STUBS_LABEL);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		stubLabel.setLayoutData(data);
-
-		Composite buttonCompo = new Composite(parent, SWT.NULL);
-		buttonCompo.setLayout(new GridLayout());
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		data.horizontalIndent = 15;
-		buttonCompo.setLayoutData(data);
-
-		constructorButton = new Button(buttonCompo, SWT.CHECK);
-		constructorButton.setText(IWebWizardConstants.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(constructorButton, INewJavaClassDataModelProperties.CONSTRUCTOR, null);
-
-		inheritButton = new Button(buttonCompo, SWT.CHECK);
-		inheritButton.setText(IWebWizardConstants.JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
-		synchHelper.synchCheckbox(inheritButton, INewJavaClassDataModelProperties.ABSTRACT_METHODS, null);
-		inheritButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean enable = inheritButton.getSelection();
-				initButton.setEnabled(enable);
-				toStringButton.setEnabled(enable);
-				getInfoButton.setEnabled(enable);
-				doPostButton.setEnabled(enable);
-				doPutButton.setEnabled(enable);
-				doDeleteButton.setEnabled(enable);
-				destroyButton.setEnabled(enable);
-				doGetButton.setEnabled(enable);
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-				//Do nothing
-			}
-		});
-
-		Composite comp = new Composite(buttonCompo, SWT.NULL);
-		GridLayout layout = new GridLayout(3, false);
-		layout.marginWidth = 0;
-		layout.makeColumnsEqualWidth = true;
-		comp.setLayout(layout);
-		data = new GridData(GridData.FILL_BOTH);
-		comp.setLayoutData(data);
-
-		initButton = new Button(comp, SWT.CHECK);
-		initButton.setText("init"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(initButton, INewServletClassDataModelProperties.INIT, null);
-
-		toStringButton = new Button(comp, SWT.CHECK);
-		toStringButton.setText("toString"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(toStringButton, INewServletClassDataModelProperties.TO_STRING, null);
-
-		getInfoButton = new Button(comp, SWT.CHECK);
-		getInfoButton.setText("getServletInfo"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(getInfoButton, INewServletClassDataModelProperties.GET_SERVLET_INFO, null);
-
-		doPostButton = new Button(comp, SWT.CHECK);
-		doPostButton.setText("doPost"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(doPostButton, INewServletClassDataModelProperties.DO_POST, null);
-
-		doPutButton = new Button(comp, SWT.CHECK);
-		doPutButton.setText("doPut"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(doPutButton, INewServletClassDataModelProperties.DO_PUT, null);
-
-		doDeleteButton = new Button(comp, SWT.CHECK);
-		doDeleteButton.setText("doDelete"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(doDeleteButton, INewServletClassDataModelProperties.DO_DELETE, null);
-
-		destroyButton = new Button(comp, SWT.CHECK);
-		destroyButton.setText("destroy"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(destroyButton, INewServletClassDataModelProperties.DESTROY, null);
-
-		doGetButton = new Button(comp, SWT.CHECK);
-		doGetButton.setText("doGet"); //$NON-NLS-1$
-		synchHelper.synchCheckbox(doGetButton, INewServletClassDataModelProperties.DO_GET, null);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
deleted file mode 100644
index 24cce01dc..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
+++ /dev/null
@@ -1,180 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewServletClassWizardPage extends NewJavaClassWizardPage {
-
-	private AnnotationsStandaloneGroup annotationsGroup = null;
-	private Button existingClassButton;
-	private Label existingClassLabel;
-	private Text existingClassText;
-	private Button existingButton;
-	private final static String[] JSPEXTENSIONS = { "jsp" }; //$NON-NLS-1$
-	
-	
-	public NewServletClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
-		super(model, pageName, pageDesc, pageTitle, moduleType);
-	}
-	
-	/**
-	 * Create annotations group and set default enablement
-	 */
-	private void createAnnotationsGroup(Composite parent) {
-		annotationsGroup = new AnnotationsStandaloneGroup(parent, model, J2EEProjectUtilities.EJB.equals(projectType),
-				J2EEProjectUtilities.DYNAMIC_WEB.equals(projectType));
-		if (!model.isPropertySet(IArtifactEditOperationDataModelProperties.PROJECT_NAME))
-			return;
-		IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
-		annotationsGroup.setEnablement(project);
-		// annotationsGroup.setUseAnnotations(true);
-	}
-	
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite composite = super.createTopLevelComposite(parent);
-		addSeperator(composite,3);
-		createUseExistingGroup(composite);
-		createAnnotationsGroup(composite);
-		return composite;
-	}
-
-	private void createUseExistingGroup(Composite composite) {
-		existingButton = new Button(composite, SWT.CHECK);
-		existingButton.setText(IWebWizardConstants.USE_EXISTING_SERVLET_CLASS);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 3;
-		existingButton.setLayoutData(data);
-		synchHelper.synchCheckbox(existingButton, INewServletClassDataModelProperties.USE_EXISTING_CLASS, null);
-		existingButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleExistingButtonSelected();
-			}
-		});
-		
-		existingClassLabel = new Label(composite, SWT.LEFT);
-		existingClassLabel.setText(IWebWizardConstants.CLASS_NAME_LABEL);
-		existingClassLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		existingClassLabel.setEnabled(false);
-
-		existingClassText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
-		existingClassText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		existingClassText.setEnabled(false);
-		synchHelper.synchText(existingClassText, INewJavaClassDataModelProperties.CLASS_NAME, null);
-
-		existingClassButton = new Button(composite, SWT.PUSH);
-		existingClassButton.setText(IWebWizardConstants.BROWSE_BUTTON_LABEL);
-		existingClassButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		existingClassButton.setEnabled(false);
-		existingClassButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleClassButtonSelected();
-			}
-		});
-	}
-	
-	private void handleExistingButtonSelected() {
-		boolean enable = existingButton.getSelection();
-		if (!enable) {
-			existingClassText.setText(""); //$NON-NLS-1$
-		}
-		existingClassLabel.setEnabled(enable);
-		existingClassButton.setEnabled(enable);
-		packageText.setEnabled(!enable);
-		packageButton.setEnabled(!enable);
-		packageLabel.setEnabled(!enable);
-		classText.setEnabled(!enable);
-		classText.setText(""); //$NON-NLS-1$
-		classLabel.setEnabled(!enable);
-		superText.setEnabled(!enable);
-		superButton.setEnabled(!enable);
-		superLabel.setEnabled(!enable);
-	}
-
-	private void handleClassButtonSelected() {
-		getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
-		IProject project = (IProject) model.getProperty(INewJavaClassDataModelProperties.PROJECT);
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		MultiSelectFilteredFileSelectionDialog ms = new MultiSelectFilteredFileSelectionDialog(
-				getShell(),
-				IWebWizardConstants.NEW_SERVLET_WIZARD_WINDOW_TITLE,
-				IWebWizardConstants.CHOOSE_SERVLET_CLASS, 
-				JSPEXTENSIONS, 
-				false, 
-				project);
-		IContainer root = component.getRootFolder().getUnderlyingFolder();
-		ms.setInput(root);
-		ms.open();
-		if (ms.getReturnCode() == Window.OK) {
-			String qualifiedClassName = ""; //$NON-NLS-1$
-			if (ms.getSelectedItem() == MultiSelectFilteredFileSelectionDialog.JSP) {
-				Object obj = ms.getFirstResult();
-				if (obj != null) {
-					if (obj instanceof IFile) {
-						IFile file = (IFile) obj;
-						IPath pFull = file.getFullPath();
-						IPath pBase = root.getFullPath();
-						IPath path = pFull.removeFirstSegments(pBase.segmentCount());
-						qualifiedClassName = path.makeAbsolute().toString();
-						model.setProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE, new Boolean(false));
-					}
-				}
-			} 
-			else {
-				IType type = (IType) ms.getFirstResult();
-				if (type != null) {
-					qualifiedClassName = type.getFullyQualifiedName();
-					model.setProperty(INewServletClassDataModelProperties.IS_SERVLET_TYPE, new Boolean(true));
-				}
-			}
-			existingClassText.setText(qualifiedClassName);
-		}
-		getControl().setCursor(null);
-	}
-	
-	protected IProject getExtendedSelectedProject(Object selection) {
-		if (selection instanceof WebServletGroupItemProvider) {
-			WebApp webApp = (WebApp)((WebServletGroupItemProvider)selection).getParent();
-			return ProjectUtilities.getProject(webApp);
-		}
-		else if (selection instanceof CompressedJavaProject) {
-			return ((CompressedJavaProject)selection).getProject().getProject();
-		}
-		return super.getExtendedSelectedProject(selection);
-	}
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
deleted file mode 100644
index 329ca1151..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
+++ /dev/null
@@ -1,62 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * @author jlanuti
- */
-public abstract class NewWebWizard extends DataModelWizard implements INewWizard {
-
-	/**
-	 * @param model
-	 */
-	public NewWebWizard(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * Default constructor
-	 */
-	public NewWebWizard() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		getDataModel();
-	}
-
-	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;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java
deleted file mode 100644
index a05cca457..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Implementation of a <code>ISelectionValidator</code> to validate the type
- * of an element. Empty selections are not accepted.
- */
-public class SimpleTypedElementSelectionValidator implements ISelectionStatusValidator {
-
-	private IStatus fgErrorStatus = new Status(IStatus.ERROR, ServletUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-	private IStatus fgOKStatus = new Status(IStatus.OK, ServletUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-
-	private Class[] fAcceptedTypes;
-	private boolean fAllowMultipleSelection;
-
-	/**
-	 * @param acceptedTypes
-	 *            The types accepted by the validator
-	 * @param allowMultipleSelection
-	 *            If set to <code>true</code>, the validator allows
-	 *            multiple selection.
-	 */
-	public SimpleTypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
-		org.eclipse.core.runtime.Assert.isNotNull(acceptedTypes);
-		fAcceptedTypes = acceptedTypes;
-		fAllowMultipleSelection = allowMultipleSelection;
-	}
-
-	/*
-	 * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
-	 */
-	public IStatus validate(Object[] elements) {
-		if (isValid(elements)) {
-			return fgOKStatus;
-		}
-		return fgErrorStatus;
-	}
-
-	private boolean isOfAcceptedType(Object o) {
-		for (int i = 0; i < fAcceptedTypes.length; i++) {
-			if (fAcceptedTypes[i].isInstance(o)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private boolean isValid(Object[] selection) {
-		if (selection.length == 0) {
-			return false;
-		}
-
-		if (!fAllowMultipleSelection && selection.length != 1) {
-			return false;
-		}
-
-		for (int i = 0; i < selection.length; i++) {
-			Object o = selection[i];
-			if (!isOfAcceptedType(o))  {
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java
deleted file mode 100644
index 0cf59cc6a..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *     
- *     Note: this class was copied from org.eclipse.jst.internal.ui.util
- *     It has much requested as an API since there are a dozen such copies throughout 
- *     Eclipse and related projects. (Such as, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=12214)
- *     These requests have been rejected since, all users should eventually migrate to use javax.regx
- *     counterparts instead.  
- *     
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.*;
-
-/**
- * A string pattern matcher. Supports '*' and '?' wildcards.
- */
-public class StringMatcher {
-	protected String fPattern;
-	protected int fLength; // pattern length
-	protected boolean fIgnoreWildCards;
-	protected boolean fIgnoreCase;
-	protected boolean fHasLeadingStar;
-	protected boolean fHasTrailingStar;
-	protected String fSegments[]; //the given pattern is split into * separated segments
-
-	/* boundary value beyond which we don't need to search in the text */
-	protected int fBound= 0;
-	
-
-	protected static final char fSingleWildCard= '\u0000';
-	
-	public static class Position {
-		int start; //inclusive
-		int end; //exclusive
-		public Position(int start, int end) {
-			this.start= start;
-			this.end= end;
-		}
-		public int getStart() {
-			return start;
-		}
-		public int getEnd() {
-			return end;
-		}
-	}
-	/**
-	 * StringMatcher constructor takes in a String object that is a simple 
-	 * pattern. The pattern may contain '*' for 0 and many characters and
-	 * '?' for exactly one character.  
-	 *
-	 * Literal '*' and '?' characters must be escaped in the pattern 
-	 * e.g., "\*" means literal "*", etc.
-	 *
-	 * Escaping any other character (including the escape character itself), 
-	 * just results in that character in the pattern.
-	 * e.g., "\a" means "a" and "\\" means "\"
-	 *
-	 * If invoking the StringMatcher with string literals in Java, don't forget
-	 * escape characters are represented by "\\".
-	 *
-	 * @param pattern the pattern to match text against
-	 * @param ignoreCase if true, case is ignored
-	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
-	 * 		  (everything is taken literally).
-	 */
-	public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
-		if (pattern == null)
-			throw new IllegalArgumentException();
-		fIgnoreCase= ignoreCase;
-		fIgnoreWildCards= ignoreWildCards;
-		fPattern= pattern;
-		fLength= pattern.length();
-		
-		if (fIgnoreWildCards) {
-			parseNoWildCards();
-		} else {
-			parseWildCards();
-		}
-	}
-	/**
-	 * Find the first occurrence of the pattern between <code>start</code)(inclusive) 
-	 * and <code>end</code>(exclusive).  
-	 * @param text the String object to search in 
-	 * @param start the starting index of the search range, inclusive
-	 * @param end the ending index of the search range, exclusive
-	 * @return an <code>StringMatcher.Position</code> object that keeps the starting 
-	 * (inclusive) and ending positions (exclusive) of the first occurrence of the 
-	 * pattern in the specified range of the text; return null if not found or subtext
-	 * is empty (start==end). A pair of zeros is returned if pattern is empty string
-	 * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
-	 * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
-	 */
-	public StringMatcher.Position find(String text, int start, int end) {
-		if (text == null)
-			throw new IllegalArgumentException();
-			
-		int tlen= text.length();
-		if (start < 0)
-			start= 0;
-		if (end > tlen)
-			end= tlen;
-		if (end < 0 ||start >= end )
-			return null;
-		if (fLength == 0)
-			return new Position(start, start);
-		if (fIgnoreWildCards) {
-			int x= posIn(text, start, end);
-			if (x < 0)
-				return null;
-			return new Position(x, x+fLength);
-		}
-
-		int segCount= fSegments.length;
-		if (segCount == 0)//pattern contains only '*'(s)
-			return new Position (start, end);
-					
-		int curPos= start;
-		int matchStart= -1;
-		int i;
-		for (i= 0; i < segCount && curPos < end; ++i) {
-			String current= fSegments[i];
-			int nextMatch= regExpPosIn(text, curPos, end, current);
-			if (nextMatch < 0 )
-				return null;
-			if(i == 0)
-				matchStart= nextMatch;
-			curPos= nextMatch + current.length();
-		}
-		if (i < segCount)
-			return null;
-		return new Position(matchStart, curPos);
-	}
-	/**
-	 * match the given <code>text</code> with the pattern 
-	 * @return true if matched eitherwise false
-	 * @param text a String object 
-	 */
-	public boolean match(String text) {
-		return match(text, 0, text.length());
-	}
-	/**
-	 * Given the starting (inclusive) and the ending (exclusive) positions in the   
-	 * <code>text</code>, determine if the given substring matches with aPattern  
-	 * @return true if the specified portion of the text matches the pattern
-	 * @param text a String object that contains the substring to match 
-	 * @param start marks the starting position (inclusive) of the substring
-	 * @param end marks the ending index (exclusive) of the substring 
-	 */
-	public boolean match(String text, int start, int end) {
-		if (null == text)
-			throw new IllegalArgumentException();
-			
-		if (start > end)
-			return false;
-		
-		if (fIgnoreWildCards)
-			return (end - start == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
-		int segCount= fSegments.length;
-		if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar))  // pattern contains only '*'(s)
-			return true;
-		if (start == end)
-			return fLength == 0;
-		if (fLength == 0)
-			return start == end;	
-		 
-		int tlen= text.length();
-		if (start < 0)
-			start= 0;
-		if (end > tlen)
-			end= tlen; 
-					
-		int tCurPos= start;
-		int bound= end - fBound;
-		if ( bound < 0)
-			return false;
-		int i=0;
-		String current= fSegments[i];
-		int segLength= current.length();
-
-		/* process first segment */
-		if (!fHasLeadingStar){ 
-			if(!regExpRegionMatches(text, start, current, 0, segLength)) {
-				return false;
-			} else {
-				++i;
-				tCurPos= tCurPos + segLength;
-			}
-		}
-		if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
-			// only one segment to match, no wildcards specified
-			return tCurPos == end;
-		}
-		/* process middle segments */	
-		while (i < segCount) {
-			current= fSegments[i];
-			int currentMatch;
-			int k= current.indexOf(fSingleWildCard);
-			if (k < 0) {
-				currentMatch= textPosIn(text, tCurPos, end, current);
-				if (currentMatch < 0)
-					return false;
-			} else { 
-				currentMatch= regExpPosIn(text, tCurPos, end, current);
-				if (currentMatch < 0)
-					return false;
-			}
-			tCurPos= currentMatch + current.length();
-			i++;
-		}
-
-		/* process final segment */
-		if (!fHasTrailingStar && tCurPos != end) {
-			int clen= current.length();
-			return regExpRegionMatches(text, end - clen, current, 0, clen);
-		}
-		return i == segCount ;
-	}
-
-	/**
-	 * This method parses the given pattern into segments seperated by wildcard '*' characters.
-	 * Since wildcards are not being used in this case, the pattern consists of a single segment.
-	 */
-	private void parseNoWildCards() {
-		fSegments= new String[1];
-		fSegments[0]= fPattern;
-		fBound= fLength;
-	}
-	/**
-	 * Parses the given pattern into segments seperated by wildcard '*' characters.
-	 */
-	private void parseWildCards() {
-		if(fPattern.startsWith("*"))//$NON-NLS-1$
-			fHasLeadingStar= true;
-		if(fPattern.endsWith("*")) {//$NON-NLS-1$
-			/* make sure it's not an escaped wildcard */
-			if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
-				fHasTrailingStar= true;
-			}
-		}
-
-		Vector temp= new Vector();
-
-		int pos= 0;
-		StringBuffer buf= new StringBuffer();
-		while (pos < fLength) {
-			char c= fPattern.charAt(pos++);
-			switch (c) {
-				case '\\':
-					if (pos >= fLength) {
-						buf.append(c);
-					} else {
-						char next= fPattern.charAt(pos++);
-						/* if it's an escape sequence */
-						if (next == '*' || next == '?' || next == '\\') {
-							buf.append(next);
-						} else {
-							/* not an escape sequence, just insert literally */
-							buf.append(c);
-							buf.append(next);
-						}
-					}
-				break;
-				case '*':
-					if (buf.length() > 0) {
-						/* new segment */
-						temp.addElement(buf.toString());
-						fBound += buf.length();
-						buf.setLength(0);
-					}
-				break;
-				case '?':
-					/* append special character representing single match wildcard */
-					buf.append(fSingleWildCard);
-				break;
-				default:
-					buf.append(c);
-			}
-		}
-
-		/* add last buffer to segment list */
-		if (buf.length() > 0) {
-			temp.addElement(buf.toString());
-			fBound += buf.length();
-		}
-			
-		fSegments= new String[temp.size()];
-		temp.copyInto(fSegments);
-	}
-	/** 
-	 * @param text a string which contains no wildcard
-	 * @param start the starting index in the text for search, inclusive
-	 * @param end the stopping point of search, exclusive
-	 * @return the starting index in the text of the pattern , or -1 if not found 
-	 */
-	protected int posIn(String text, int start, int end) {//no wild card in pattern
-		int max= end - fLength;
-		
-		if (!fIgnoreCase) {
-			int i= text.indexOf(fPattern, start);
-			if (i == -1 || i > max)
-				return -1;
-			return i;
-		}
-		
-		for (int i= start; i <= max; ++i) {
-			if (text.regionMatches(true, i, fPattern, 0, fLength))
-				return i;
-		}
-		
-		return -1;
-	}
-	/** 
-	 * @param text a simple regular expression that may only contain '?'(s)
-	 * @param start the starting index in the text for search, inclusive
-	 * @param end the stopping point of search, exclusive
-	 * @param p a simple regular expression that may contains '?'
-	 * @return the starting index in the text of the pattern , or -1 if not found 
-	 */
-	protected int regExpPosIn(String text, int start, int end, String p) {
-		int plen= p.length();
-		
-		int max= end - plen;
-		for (int i= start; i <= max; ++i) {
-			if (regExpRegionMatches(text, i, p, 0, plen))
-				return i;
-		}
-		return -1;
-	}
-
-	
-	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
-		while (plen-- > 0) {
-			char tchar= text.charAt(tStart++);
-			char pchar= p.charAt(pStart++);
-
-			/* process wild cards */
-			if (!fIgnoreWildCards) {
-				/* skip single wild cards */
-				if (pchar == fSingleWildCard) {
-					continue;
-				}
-			}
-			if (pchar == tchar)
-				continue;
-			if (fIgnoreCase) {
-				if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar))
-					continue;
-				// comparing after converting to upper case doesn't handle all cases;
-				// also compare after converting to lower case
-				if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar))
-					continue;
-			}
-			return false;
-		}
-		return true;
-	}
-	/** 
-	 * @param text the string to match
-	 * @param start the starting index in the text for search, inclusive
-	 * @param end the stopping point of search, exclusive
-	 * @param p a string that has no wildcard
-	 * @return the starting index in the text of the pattern , or -1 if not found 
-	 */
-	protected int textPosIn(String text, int start, int end, String p) { 
-		
-		int plen= p.length();
-		int max= end - plen;
-		
-		if (!fIgnoreCase) {
-			int i= text.indexOf(p, start);
-			if (i == -1 || i > max)
-				return -1;
-			return i;
-		}
-		
-		for (int i= start; i <= max; ++i) {
-			if (text.regionMatches(true, i, p, 0, plen))
-				return i;
-		}
-		
-		return -1;
-	}
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java
deleted file mode 100644
index bb7e4927b..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
-import org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainer;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public class WebAppLibrariesContainerPage 
-
-    extends NewElementWizardPage 
-    implements IClasspathContainerPage, IClasspathContainerPageExtension 
-    
-{
-    private IProject ownerProject;
-    private String libsProjectName;
-    private Combo projectsCombo;
-    
-    public WebAppLibrariesContainerPage() 
-    {
-        super( "WebAppLibrariesContainerPage" ); //$NON-NLS-1$
-        
-        setTitle( Resources.pageTitle );
-        setDescription( Resources.pageDescription );
-    }
-    
-    public IClasspathEntry getSelection() 
-    {
-        IPath path = new Path( WebAppLibrariesContainer.CONTAINER_ID );
-        
-        final int index = this.projectsCombo.getSelectionIndex();
-        final String selectedProjectName = this.projectsCombo.getItem( index );
-        
-        if( ! selectedProjectName.equals( this.ownerProject.getName() ) )
-        {
-            path = path.append( selectedProjectName );
-        }
-        
-        return JavaCore.newContainerEntry( path );
-    }
-
-    public void setSelection( final IClasspathEntry cpentry ) 
-    {
-        final IPath path = cpentry == null ? null : cpentry.getPath();
-        
-        if( path == null || path.segmentCount() == 1 )
-        {
-            this.libsProjectName = this.ownerProject.getName();
-        }
-        else
-        {
-            this.libsProjectName = path.segment( 1 );
-        }
-    }
-    
-    public void createControl( final Composite parent ) 
-    {
-        final Composite composite = new Composite( parent, SWT.NONE );
-        composite.setLayout( new GridLayout( 2, false ) );
-        
-        final Label label = new Label( composite, SWT.NONE );
-        label.setText( Resources.projectsLabel );
-        
-        final String[] webProjects = getWebProjects();
-        
-        this.projectsCombo = new Combo( composite, SWT.READ_ONLY );
-        this.projectsCombo.setItems( webProjects );
-        
-        if( this.ownerProject != null )
-        {
-            final int index = indexOf( webProjects, this.libsProjectName );
-            this.projectsCombo.select( index );
-        }
-        
-        final GridData gd = new GridData();
-        gd.grabExcessHorizontalSpace = true;
-        gd.minimumWidth = 100;
-        
-        this.projectsCombo.setLayoutData( gd );
-        
-        setControl( composite );
-    }
-    
-    public boolean finish() 
-    {
-        return true;
-    }
-    
-    public void initialize( final IJavaProject project, 
-                            final IClasspathEntry[] currentEntries ) 
-    {
-        this.ownerProject = project.getProject();
-    }
-    
-    private static String[] getWebProjects()
-    {
-        try
-        {
-            final Set projects
-                = ProjectFacetsManager.getFacetedProjects( WebFacetUtils.WEB_FACET );
-            
-            final String[] names = new String[ projects.size() ];
-            int i = 0;
-            
-            for( Iterator itr = projects.iterator(); itr.hasNext(); i++ )
-            {
-                final IFacetedProject fproj = (IFacetedProject) itr.next();
-                names[ i ] = fproj.getProject().getName();
-            }
-            
-            Arrays.sort( names );
-            
-            return names;
-        }
-        catch( CoreException e )
-        {
-            ServletUIPlugin.log( e.getStatus() );
-            return new String[ 0 ];
-        }
-    }
-    
-    private static int indexOf( final String[] array,
-                                final String str )
-    {
-        for( int i = 0; i < array.length; i++ )
-        {
-            if( array[ i ].equals( str ) )
-            {
-                return i;
-            }
-        }
-        
-        return -1;
-    }
-    
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-        public static String pageTitle;
-        public static String pageDescription;
-        public static String projectsLabel;
-        
-        static
-        {
-            initializeMessages( WebAppLibrariesContainerPage.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties
deleted file mode 100644
index 4ec7601a4..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-pageTitle = Web App Libraries
-pageDescription = This container dynamically manages classpath entries for types in the WEB-INF/lib and WEB-INF/classes directories.
-projectsLabel = Project:\ 
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java
deleted file mode 100644
index fd3ef7e41..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java
+++ /dev/null
@@ -1,105 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizard;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * Wizard used to create J2EE Web module structures in Eclipse Projects.
- * </p>
- * <p>
- * This wizard is not exposed as API to be extended.
- * </p>
- */
-
-/**
- * @deprecated
- * @see WebProjectWizard
- */
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class WebComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard, DoNotUseMeThisWillBeDeletedPost15 {
-	
-	/**
-	 * <p>
-	 * The Wizard ID of the ConnectorModuleCreationWizard. Used for internal purposes and activities management.
-	 * </p>
-	 */
-	public static final String WIZARD_ID =  WebComponentCreationWizard.class.getName();
-	 
-	
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, 
-	 * no model instance, and no operation instance. The model and 
-	 * operation will be created as needed.
-	 * </p>
-	 */
-	public WebComponentCreationWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls
-	 * and interface with the operation.
-	 * </p>
-	 * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
-	 */
-	public WebComponentCreationWizard(IDataModel model) {
-		super(model);
-	}
-
-	/** 
-	 * {@inheritDoc}   
-	 * 
-	 * <p>
-	 * Sets up the dialog window title and default page image. 
-	 * </p> 
-	 * 
-	 */
-	protected void doInit() {
-		setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
-		preFillSelectedEARProject();
-	} 
-	 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Adds a {@link JCAProjectCreationPage} as the {@link J2EEComponentCreationWizard#MAIN_PG}.
-	 * </p>
-	 */
-	protected void doAddPages() {
-		WebComponentCreationWizardPage page = new WebComponentCreationWizardPage(getDataModel(), MAIN_PG);
-		page.setInfopopID("org.eclipse.jst.j2ee.ui.webw1000"); //$NON-NLS-1$
-		addPage(page);
-		super.doAddPages();
-	}
-
-    protected IDataModelProvider getDefaultProvider() {
-        return new WebComponentCreationDataModelProvider();
-    } 
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java
deleted file mode 100644
index 5f3548a70..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java
+++ /dev/null
@@ -1,113 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.DataModelAnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizardPage;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- */
-public class WebComponentCreationWizardPage extends J2EEComponentCreationWizardPage implements IWebComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-	public Text contextRootNameField = null;
-	public Label contextRootLabel = null;
-    protected Text webFolderNameText = null;
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	private DataModelAnnotationsStandaloneGroup annotationsGroup;
-	
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public WebComponentCreationWizardPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(WEBUIMessages.WEB_PROJECT_MAIN_PG_TITLE);
-		setDescription(WEBUIMessages.WEB_PROJECT_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleCreationPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addToAdvancedComposite(Composite advanced) {
-		super.addToAdvancedComposite(advanced);
-		contextRootLabel = new Label(advanced, SWT.NULL);
-		contextRootLabel.setText(WEBUIMessages.WEB_IMPORT_CONTEXT_ROOT);
-		GridData data = new GridData();
-		contextRootLabel.setLayoutData(data);
-		// set up context root entry field
-
-		contextRootNameField = new Text(advanced, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		contextRootNameField.setLayoutData(data);
-		synchHelper.synchText(contextRootNameField, CONTEXT_ROOT, new Control[]{contextRootLabel});
-		
-		createSourceFolderComposite(advanced);
-		createWebContentFolderComposite(advanced);
-		createAnnotationsGroup(advanced);
-	}
-
-    protected void createWebContentFolderComposite(Composite parent) {
-		
-        Label label = new Label(parent, SWT.NONE);
-        label.setText(WEBUIMessages.WEBCONTENT);
-        GridData data = new GridData();      
-        label.setLayoutData(data);
-        // set up project name entry field
-        webFolderNameText = new Text(parent, SWT.BORDER);
-        data = new GridData(GridData.FILL_HORIZONTAL);
-        data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-        webFolderNameText.setLayoutData(data);
-        new Label(parent, SWT.NONE); // pad
-        synchHelper.synchText(webFolderNameText, WEBCONTENT_FOLDER, null);
-    }	
-    
-	private void createAnnotationsGroup(Composite parent) {
-		annotationsGroup = new DataModelAnnotationsStandaloneGroup(parent, getDataModel(), false, synchHelper);
-	}
-    protected String[] getValidationPropertyNames() {
-        String[] names = super.getValidationPropertyNames();
-        String[] allNames = new String[names.length + 3];
-        System.arraycopy(names, 0, allNames, 0, names.length);
-        allNames[names.length] = CONTEXT_ROOT;
-        allNames[names.length + 1] = IAnnotationsDataModel.USE_ANNOTATIONS;
-        allNames[names.length + 2] = WEBCONTENT_FOLDER;
-        return allNames;
-    }
-
-	public void dispose() {
-		super.dispose();
-		if (annotationsGroup != null)
-			annotationsGroup.dispose();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
deleted file mode 100644
index 7d574eca7..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
+++ /dev/null
@@ -1,66 +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.servlet.ui.internal.wizard;
-
-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.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentExportPage extends J2EEModuleExportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public WebComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
-		super(model, pageName, selection);
-		setTitle(WEBUIMessages.WEB_EXPORT_MAIN_PG_TITLE);
-		setDescription(WEBUIMessages.WEB_EXPORT_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
-		setInfopopID(IWebUIContextIds.WAR_EXPORT_PAGE1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
-	 */
-	protected String getComponentLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.WEB_PROJ_LBL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
-	 */
-	protected String[] getFilterExpression() {
-		return new String[]{"*.war"}; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
-	 */
-	protected boolean isMetaTypeSupported(Object o) {
-		return o instanceof org.eclipse.jst.j2ee.webapplication.WebApp;
-	}
-
-	protected String getCompnentID() {
-		return "JST_WEB"; //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
deleted file mode 100644
index 701660b0d..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
+++ /dev/null
@@ -1,77 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Web Application module structures 
- * from the Eclipse Workbench to a deployable Web Application 
- * Archive *.war file.  
- * </p>
- */
-public final class WebComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, 
-	 * no model instance, and no operation instance. The model and 
-	 * operation will be created as needed.
-	 * </p>
-	 */
-	public WebComponentExportWizard() {
-		super();
-	}
-	
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls
-	 * and interface with the operation.
-	 * </p>
-	 * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
-	 */
-	public WebComponentExportWizard(IDataModel model) {
-		super(model);
-	}
-    
-    protected IDataModelProvider getDefaultProvider() {
-        return new WebComponentExportDataModelProvider();
-    }
-	/**
-	 * <p>
-	 * Adds the following pages:
-	 * <ul>
-	 * 	<li> {@link WebComponentExportPage} as the main wizard page ({@link #MAIN_PG}) 
-	 * </ul>
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new WebComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
-	}
-
-	/**
-	 * {@inheritDoc}   
-	 * 
-	 * <p>
-	 * Sets up the default wizard page image. 
-	 * </p>
-	 */
-	protected void doInit() {
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
deleted file mode 100644
index 179b29c9f..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
+++ /dev/null
@@ -1,68 +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 Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportPage extends J2EEModuleImportPage {
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public WebComponentImportPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(WEBUIMessages.WEB_IMPORT_MAIN_PG_TITLE);
-		setDescription(WEBUIMessages.WEB_IMPORT_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
-		setInfopopID(IWebUIContextIds.WAR_IMPORT_PAGE1);
-	}
-
-	protected String getFileImportLabel() {
-		return WEBUIMessages.WEB_FILE_LBL;
-	}
-
-	protected String[] getFilterExpression() {
-		return new String[]{"*.war"}; //$NON-NLS-1$
-	}
-
-	protected String getProjectImportLabel() {
-		return WEBUIMessages.EJB_PROJECT_LBL;
-	}
-
-	protected void createAnnotationsStandaloneGroup(Composite composite) {
-		// TODO: implement with new import wizards
-		// new AnnotationsStandaloneGroup(composite, getWebDataModel(), false);
-	}
-
-	protected String getModuleFacetID(){
-		return J2EEProjectUtilities.DYNAMIC_WEB;
-	}	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
deleted file mode 100644
index bdd247218..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
+++ /dev/null
@@ -1,229 +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.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEImportPage;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportWebLibsPage extends J2EEImportPage {
-	private Button deselectAllButton;
-	private Button selectAllButton;
-	protected WARFile warFile;
-	public CheckboxTableViewer availableJARsViewer;
-	public boolean utilJarSelectionChanged = false;
-
-	/**
-	 * @param model
-	 * @param pageName
-	 */
-	public WebComponentImportWebLibsPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_TITLE);
-		setDescription(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		setInfopopID(IWebUIContextIds.WAR_IMPORT_PAGE2);
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		createAvailableJarsList(composite);
-		createButtonsGroup(composite);
-		return composite;
-	}
-
-	/*
-	 * Updates the enable state of the all buttons
-	 */
-	protected void updateButtonEnablements() {
-		utilJarSelectionChanged = true;
-	}
-
-	protected void createAvailableJarsList(Composite listGroup) {
-		availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gData.widthHint = 200;
-		gData.heightHint = 80;
-		availableJARsViewer.getControl().setLayoutData(gData);
-		AvailableWebLibProvider libsProvider = new AvailableWebLibProvider();
-		availableJARsViewer.setContentProvider(libsProvider);
-		availableJARsViewer.setLabelProvider(libsProvider);
-		availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				availableJARCheckStateChanged(event);
-			}
-		});
-		availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonEnablements();
-			}
-		});
-		TableLayout tableLayout = new TableLayout();
-		availableJARsViewer.getTable().setLayout(tableLayout);
-		availableJARsViewer.getTable().setHeaderVisible(false);
-		availableJARsViewer.getTable().setLinesVisible(false);
-
-		model.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (event.getPropertyName().equals(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)) {
-					availableJARsViewer.setCheckedElements(((List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)).toArray());
-				}
-			}
-		});
-	}
-
-	private void handleDeselectAllButtonPressed() {
-		ArrayList emptySelection = new ArrayList(2);
-		model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, emptySelection);
-	}
-
-	private void handleSelectAllButtonPressed() {
-		ArrayList allSelection = new ArrayList(2);
-		Object selection = null;
-		for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
-			allSelection.add(selection);
-		}
-		model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, allSelection);
-	}
-
-	protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
-		Composite buttonGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 4;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		selectAllButton = new Button(buttonGroup, SWT.PUSH);
-		selectAllButton.setText(WEBUIMessages.WAR_IMPORT_SELECT_ALL_LIBS_BUTTON);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 1;
-		gd.heightHint = SWT.DEFAULT;
-		gd.widthHint = SWT.DEFAULT;
-		selectAllButton.setLayoutData(gd);
-		selectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelectAllButtonPressed();
-			}
-		});
-
-		deselectAllButton = new Button(buttonGroup, SWT.PUSH);
-		deselectAllButton.setText(WEBUIMessages.WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = SWT.DEFAULT;
-		gd.widthHint = SWT.DEFAULT;
-		deselectAllButton.setLayoutData(gd);
-		deselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleDeselectAllButtonPressed();
-			}
-		});
-	}
-
-	private void refreshEARFileIfNecessary() {
-		if (isEARFileChanged()) {
-			warFile = (WARFile) model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-			refresh();
-		}
-	}
-
-	protected void setJARsCompositeEnabled(boolean enabled) {
-		availableJARsViewer.getTable().setEnabled(enabled);
-		availableJARsViewer.setAllChecked(false);
-		availableJARsViewer.setAllGrayed(!enabled);
-		selectAllButton.setEnabled(enabled);
-		deselectAllButton.setEnabled(enabled);
-	}
-
-	private void refresh() {
-		availableJARsViewer.setInput(warFile);
-	}
-
-	public boolean isEARFileChanged() {
-		return warFile != model.getProperty(IJ2EEComponentImportDataModelProperties.FILE);
-	}
-
-	protected void enter() {
-		super.enter();
-		refreshEARFileIfNecessary();
-	}
-
-	public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
-		model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, getJARsForProjects());
-		validatePage();
-	}
-
-	public List getJARsForProjects() {
-		refreshEARFileIfNecessary();
-		List result = new ArrayList();
-		result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
-		return result;
-	}
-
-	protected boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.length() == 0;
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{};
-	}
-
-	protected void restoreWidgetValues() {
-		// This page doesn't implement...
-	}
-
-	public void storeDefaultSettings() {
-		// This page doesn't implement...
-	}
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
deleted file mode 100644
index 4d7653b2c..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
+++ /dev/null
@@ -1,98 +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.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Web Application module structures into the Eclipse Workbench from an
- * existing Web Application *.war file.
- * </p>
- */
-public final class WebComponentImportWizard extends J2EEComponentImportWizard {
-
-	protected static final String WEB_LIBS_PG = "WEB_LIBS_PG"; //$NON-NLS-1$
-	
-	/**
-	 * <p>
-	 * The default constructor. Creates a wizard with no selection, no model instance, and no
-	 * operation instance. The model and operation will be created as needed.
-	 * </p>
-	 */
-	public WebComponentImportWizard() {
-		super();
-	}
-
-	/**
-	 * <p>
-	 * The model is used to prepopulate the wizard controls and interface with the operation.
-	 * </p>
-	 * 
-	 * @param model
-	 *            The model parameter is used to pre-populate wizard controls and interface with the
-	 *            operation
-	 */
-	public WebComponentImportWizard(IDataModel model) {
-		super(model);
-	}
-
-	/**
-	 * <p>
-	 * Adds an {@link WARImportPage} as the main wizard page ({@link #MAIN_PG}).
-	 * </p>
-	 */
-	public void doAddPages() {
-		addPage(new WebComponentImportPage(getDataModel(), MAIN_PG));
-		addPage(new WebComponentImportWebLibsPage(getDataModel(), WEB_LIBS_PG));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Sets up the dialog window title and default wizard page image.
-	 * </p>
-	 */
-	public final void doInit() {
-		setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
-		setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
-		// updateEARToModelFromSelection(getSpecificDataModel());
-	}
-
-	protected String[] getModuleValidatorStrings() {
-		return new String[]{"org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator"}; //$NON-NLS-1$
-	}
-
-
-	// protected String getFinalPerspectiveID() {
-	// // J2EEComponentCreationDataModel projCreationModel =
-	// // getSpecificDataModel().getJ2EEModuleCreationDataModel();
-	// // return projCreationModel.getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
-	// return getDataModel().getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
-	// }
-
-	protected IDataModelProvider getDefaultProvider() {
-		return new WebComponentImportDataModelProvider();
-	}
-
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_WEB);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
deleted file mode 100644
index 1150a83f8..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
+++ /dev/null
@@ -1,98 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-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.Text;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public final class WebFacetInstallPage extends J2EEModuleFacetInstallPage implements IWebFacetInstallDataModelProperties {
-	private Label contextRootLabel;
-	private Text contextRoot;
-	private Label contentDirLabel;
-	private Text contentDir;
-	private Text sourceDir;
-	private Label sourceDirLabel;
-
-	public WebFacetInstallPage() {
-		super("web.facet.install.page"); //$NON-NLS-1$
-		setTitle(Resources.pageTitle);
-		setDescription(Resources.pageDescription);
-	}
-
-	protected Composite createTopLevelComposite(final Composite parent) {
-		setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE3);
-		final Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-
-		//setupEarControl(composite);
-
-		this.contextRootLabel = new Label(composite, SWT.NONE);
-		this.contextRootLabel.setText(Resources.contextRootLabel);
-		this.contextRootLabel.setLayoutData(gdhfill());
-
-		this.contextRoot = new Text(composite, SWT.BORDER);
-		this.contextRoot.setLayoutData(gdhfill());
-		this.contextRoot.setData("label", this.contextRootLabel); //$NON-NLS-1$
-		synchHelper.synchText(contextRoot, CONTEXT_ROOT, new Control[]{contextRootLabel});
-
-		this.contentDirLabel = new Label(composite, SWT.NONE);
-		this.contentDirLabel.setText(Resources.contentDirLabel);
-		this.contentDirLabel.setLayoutData(gdhfill());
-
-		this.contentDir = new Text(composite, SWT.BORDER);
-		this.contentDir.setLayoutData(gdhfill());
-		this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
-		synchHelper.synchText(contentDir, CONFIG_FOLDER, null);
-		
-		this.sourceDirLabel = new Label(composite, SWT.NONE);
-		this.sourceDirLabel.setText(Resources.sourceDirLabel);
-		this.sourceDirLabel.setLayoutData(gdhfill());
-		
-		this.sourceDir = new Text(composite, SWT.BORDER);
-		this.sourceDir.setLayoutData(gdhfill());
-		this.sourceDir.setData("label", this.sourceDirLabel); //$NON-NLS-1$
-		synchHelper.synchText(sourceDir, SOURCE_FOLDER, null);
-
-		return composite;
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{EAR_PROJECT_NAME, CONTEXT_ROOT, CONFIG_FOLDER, SOURCE_FOLDER};
-	}
-
-	private static final class Resources extends NLS {
-		public static String pageTitle;
-		public static String pageDescription;
-		public static String contextRootLabel;
-		public static String contextRootLabelInvalid;
-		public static String contentDirLabel;
-		public static String contentDirLabelInvalid;
-		public static String sourceDirLabel;
-
-		static {
-			initializeMessages(WebFacetInstallPage.class.getName(), Resources.class);
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
deleted file mode 100644
index 997fa4dc1..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-pageTitle = Web Module
-pageDescription = Configure web module settings.
-contextRootLabel = Context Root:
-contextRootLabelInvalid = Context Root (invalid):
-contentDirLabel = Content Directory:
-contentDirLabelInvalid = Content Directory (invalid):
-sourceDirLabel = Java Source Directory:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
deleted file mode 100644
index 65f32ce67..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
+++ /dev/null
@@ -1,36 +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.servlet.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
-	public WebProjectFirstPage(IDataModel model, String pageName) {
-		super(model, pageName);
-		setTitle(WEBUIMessages.WEB_PROJECT_MAIN_PG_TITLE);
-		setDescription(WEBUIMessages.WEB_PROJECT_MAIN_PG_DESC);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
-		setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE1);
-	}
-
-	protected String getModuleFacetID() {
-		return J2EEProjectUtilities.DYNAMIC_WEB;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
deleted file mode 100644
index 2f61b9110..000000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
+++ /dev/null
@@ -1,62 +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.servlet.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class WebProjectWizard extends NewProjectDataModelFacetWizard {
-
-	public WebProjectWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
-	}
-	
-	public WebProjectWizard() {
-		super();
-		setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
-	}
-	
-	protected IDataModel createDataModel() {
-		return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
-	}
-
-	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("template.jst.web"); //$NON-NLS-1$
-	}
-
-	protected IWizardPage createFirstPage() {
-		return new WebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
-	}
-	
-	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		final Bundle bundle = Platform.getBundle("org.eclipse.jst.servlet.ui"); //$NON-NLS-1$
-		final URL url = bundle.getEntry("icons/full/ctool16/web-wiz-banner.gif"); //$NON-NLS-1$
-		return ImageDescriptor.createFromURL(url);
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_WEB);
-	}
-}
diff --git a/plugins/org.eclipse.wst.web.ui/.classpath b/plugins/org.eclipse.wst.web.ui/.classpath
deleted file mode 100644
index 36456d4a0..000000000
--- a/plugins/org.eclipse.wst.web.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="static_web_ui"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web.ui/.cvsignore b/plugins/org.eclipse.wst.web.ui/.cvsignore
deleted file mode 100644
index 389089e56..000000000
--- a/plugins/org.eclipse.wst.web.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-uisrc.zip
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.web.ui/.project b/plugins/org.eclipse.wst.web.ui/.project
deleted file mode 100644
index 3858f9051..000000000
--- a/plugins/org.eclipse.wst.web.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b702e187b..000000000
--- a/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Jul 26 13:39:02 EDT 2006
-eclipse.preferences.version=1
-encoding//static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties=8859_1
diff --git a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9a627eb35..000000000
--- a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.web.ui; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-Activator: org.eclipse.wst.web.ui.internal.WSTWebUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.web.ui.internal,
- org.eclipse.wst.web.ui.internal.wizards
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)"
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.wst.web.ui/about.html b/plugins/org.eclipse.wst.web.ui/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.wst.web.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.web.ui/build.properties b/plugins/org.eclipse.wst.web.ui/build.properties
deleted file mode 100644
index 2b7383eb2..000000000
--- a/plugins/org.eclipse.wst.web.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               .
-jars.compile.order = .
-source.. = static_web_ui/
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d1c..000000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e96177a..000000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd09048..000000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.properties b/plugins/org.eclipse.wst.web.ui/plugin.properties
deleted file mode 100644
index 5556ef53b..000000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
-
-
-
-StaticWebProject.name=Static Web Project
-StaticWebProject.description=Create a Web project for static content (HTML files) only
-
-StaticWebSettings=Simple Web
-WebProjectFeatures.name=Web Project Features
-web.category_ui_=Web
-StaticWebModule.name=Simple Web Module
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Simple Web UI Plug-in
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.xml b/plugins/org.eclipse.wst.web.ui/plugin.xml
deleted file mode 100644
index 9a44ae4a4..000000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <!-- static web project wizard -->
-   <extension
-       point="org.eclipse.ui.newWizards">
-      <category
-            name="%web.category_ui_"
-            id="org.eclipse.wst.web.ui">
-      </category>
-      <wizard
-            name="%StaticWebProject.name"
-            icon="icons/full/ctool16/newwebprj_wiz.gif"
-            category="org.eclipse.wst.web.ui"
-            class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"
-            project="true"
-            id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard">
-         <description>
-            %StaticWebProject.description
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension> -->
-   
-   <!-- the following 2 are needed to add an image for SWPs into the "Add/Remove Project" dialog -->
-	<extension point="org.eclipse.wst.server.core.moduleTypes">
-		<moduleType
-			id="web.static"
-			name="%StaticWebModule.name"/>
-	</extension>
-	<extension point="org.eclipse.wst.server.ui.serverImages">
-		<image
-			id="org.eclipse.wst.web.static"
-			typeIds="web.static"
-			icon="icons/full/obj16/web_application.gif"/>
-	</extension>
-	
-	
-<!-- ====================================================== -->
-<!-- Extension point: org.eclipse.ui.projectNatureImages    -->
-<!-- Purpose: Attach icon overlays for J2EE project natures -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.ide.projectNatureImages">
-      <image
-            icon="icons/full/ovr16/web_module_ovr.gif"
-            natureId="org.eclipse.wst.web.StaticWebNature"
-            id="org.eclipse.ui.simpleWebProjectNatureImage">
-      </image>
-   </extension>
-   
-  <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-    <wizard-pages action="wst.web.install">
-      <page class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebFacetInstallPage"/>
-    </wizard-pages>
-  </extension>
-  
-  <extension
-    point="org.eclipse.ui.ide.markerResolution">
-	<markerResolutionGenerator
-      markerType="org.eclipse.wst.common.modulecore.ModuleCoreValidatorMarker"
-      class="org.eclipse.wst.web.ui.internal.ModuleCoreValidatorMarkerResolutions">
-    </markerResolutionGenerator>
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java
deleted file mode 100644
index ade4f5ce7..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java
+++ /dev/null
@@ -1,108 +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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.web.ui"; //$NON-NLS-1$
-	/**
-	 * true if both platform and this plugin are in debug mode
-	 */
-	public static final boolean DEBUG = Platform.inDebugMode() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.web.ui/debug")); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/*
-	 * Keep our own copy in case we want to add other severity levels
-	 */
-	public static final int OK = IStatus.OK;
-	public static final int INFO = IStatus.INFO;
-	public static final int WARNING = IStatus.WARNING;
-	public static final int ERROR = IStatus.ERROR;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	private static void _log(int level, String message, Throwable exception) {
-		message = (message != null) ? message : ""; //$NON-NLS-1$
-		Status statusObj = new Status(level, PLUGIN_ID, level, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null)
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Write a message to the log with the given severity level
-	 * 
-	 * @param level
-	 *            ERROR, WARNING, INFO, OK
-	 * @param message
-	 *            message to add to the log
-	 */
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	/**
-	 * Writes a message and exception to the log with the given severity level
-	 * 
-	 * @param level
-	 *            ERROR, WARNING, INFO, OK
-	 * @param message
-	 *            message to add to the log
-	 * @param exception
-	 *            exception to add to the log
-	 */
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	/**
-	 * Writes the exception as an error in the log along with an accompanying
-	 * message
-	 * 
-	 * @param message
-	 *            message to add to the log
-	 * @param exception
-	 *            exception to add to the log
-	 */
-	public static void logException(String message, Throwable exception) {
-		_log(IStatus.ERROR, message, exception);
-	}
-
-	/**
-	 * Writes the exception as an error in the log
-	 * 
-	 * @param exception
-	 *            exception to add to the log
-	 */
-	public static void logException(Throwable exception) {
-		_log(IStatus.ERROR, exception.getMessage(), exception);
-	}
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java
deleted file mode 100644
index 6b44ee4c4..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java
+++ /dev/null
@@ -1,125 +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:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.web.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolution2;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
-import org.eclipse.wst.common.componentcore.internal.ModuleMigratorManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ModuleCoreValidatorMarkerResolutions
-
-    implements IMarkerResolutionGenerator
-    
-{
-    public IMarkerResolution[] getResolutions( IMarker marker )
-    {
-        return new IMarkerResolution[] 
-        { 
-            new ModuleCoreMigrationResolution( marker ) 
-        };
-    }
-    
-    private class ModuleCoreMigrationResolution extends WorkbenchMarkerResolution
-    
-        implements IMarkerResolution,IMarkerResolution2
-        
-    {
-        private final IMarker theMarker;
-        private final String MARKERTYPE = "org.eclipse.wst.common.modulecore.ModuleCoreValidatorMarker";
-        private final IMarker[] NO_MARKERS= new IMarker[0];
-        
-        public ModuleCoreMigrationResolution( IMarker marker )
-        {
-            this.theMarker = marker;
-        }
-        
-        public String getLabel()
-        {
-            return Resources.migrateMetaData;
-        }
-
-        
-        
-        public void run( IMarker marker )
-        {
-            
-            IProject proj = marker.getResource().getProject();
-            
-            try
-            {
-        		ModuleMigratorManager manager = ModuleMigratorManager.getManager(proj);
-        		if (!manager.isMigrating() && !ResourcesPlugin.getWorkspace().isTreeLocked()) 
-        				manager.migrateOldMetaData(proj,true);
-            }
-            catch( Exception e )
-            {
-                e.printStackTrace();
-            }
-        }
-
-		public String getDescription() {
-			return Resources.migrateMetaData;
-		}
-
-		public Image getImage() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public IMarker[] findOtherMarkers(IMarker[] markers) {
-			List marks = new ArrayList();
-			for (int i = 0; i < markers.length; i++) {
-				IMarker marker = markers[i];
-				try {
-					if (marker.getType().equals(MARKERTYPE) && !(marker.equals(theMarker)))
-						marks.add(marker);
-				} catch (CoreException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-			return (IMarker[])marks.toArray(new IMarker[marks.size()]);
-		}
-     
-    }
-
-    private static final class Resources
-    
-        extends NLS
-        
-    {
-    	public static String migrateMetaData;
-        
-        static
-        {
-            initializeMessages( ModuleCoreValidatorMarkerResolutions.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-    
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties
deleted file mode 100644
index 094e33c9c..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties
+++ /dev/null
@@ -1 +0,0 @@
-migrateMetaData=Migrate WTP metadata
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
deleted file mode 100644
index 84b5514b9..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,81 +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.wst.web.ui.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
-	public interface Keys {
-		final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-	}
-	public interface Values {
-		final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-	}
-	public interface Defaults {
-		final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
-	}
-	private Plugin owner = null;
-	private Preferences preferences = null;
-	private boolean persistOnChange = false;
-
-	public WSTWebPreferences(Plugin owner) {
-		this.owner = owner;
-	}
-	protected void initializeDefaultPreferences() {
-		getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
-	}
-
-	public String getStaticWebContentFolderName() {
-		return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
-	}
-
-	public void setStaticWebContentFolderName(String value) {
-		getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
-		firePreferenceChanged();
-	}
-
-	public void firePreferenceChanged() {
-		if (isPersistOnChange())
-			persist();
-	}
-
-	public void persist() {
-		getOwner().savePluginPreferences();
-	}
-
-	/**
-	 * @return Returns the persistOnChange.
-	 */
-	public boolean isPersistOnChange() {
-		return this.persistOnChange;
-	}
-
-	/**
-	 * @param persistOnChange
-	 *            The persistOnChange to set.
-	 */
-	public void setPersistOnChange(boolean persistOnChange) {
-		this.persistOnChange = persistOnChange;
-	}
-
-	private Preferences getPreferences() {
-		if (this.preferences == null)
-			this.preferences = getOwner().getPluginPreferences();
-		return this.preferences;
-	}
-
-	/**
-	 * @return Returns the owner.
-	 */
-	private Plugin getOwner() {
-		return this.owner;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
deleted file mode 100644
index 96aa54dc0..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
+++ /dev/null
@@ -1,117 +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.wst.web.ui.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebUIPlugin extends AbstractUIPlugin {
-    
-    public static final String PLUGIN_ID = "org.eclipse.wst.web.ui"; //$NON-NLS-1$
-    
-	// The shared instance.
-	private static WSTWebUIPlugin plugin;
-	public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
-		"icons/full/ctool16", //$NON-NLS-1$
-		"icons/full/wizban", //$NON-NLS-1$
-		"icons", //$NON-NLS-1$
-		""}; //$NON-NLS-1$
-
-	/**
-	 * The constructor.
-	 */
-	public WSTWebUIPlugin() {
-		super();
-		plugin = this;
-	}
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-	
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public ImageDescriptor getImageDescriptor(String key) {
-		ImageDescriptor imageDescriptor = null;
-		URL imageURL = getImageURL(key, getBundle());
-		if (imageURL==null)
-			imageURL = getPNGImageURL(key, getBundle());
-		if (imageURL != null)
-			imageDescriptor = ImageDescriptor.createFromURL(imageURL);
-		return imageDescriptor;
-	}
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public static URL getImageURL(String key, Bundle bundle) {
-		String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
-		IPath path = null;
-		for (int i = 0; i < ICON_DIRS.length; i++) {
-			path = new Path(ICON_DIRS[i]).append(gif);
-			if (bundle.getEntry(path.toString()) == null)
-				continue;
-			try {
-				return new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
-			} catch (MalformedURLException exception) {
-				Logger.log(Logger.WARNING, "Load_Image_Error_", exception); //$NON-NLS-1$
-				continue;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This gets a .png from the icons folder.
-	 */
-	public static URL getPNGImageURL(String key, Bundle bundle) {
-		String gif = "/" + key + ".png"; //$NON-NLS-1$ //$NON-NLS-2$
-		IPath path = null;
-		for (int i = 0; i < ICON_DIRS.length; i++) {
-			path = new Path(ICON_DIRS[i]).append(gif);
-			if (bundle.getEntry(path.toString()) == null)
-				continue;
-			try {
-				return new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
-			} catch (MalformedURLException exception) {
-				Logger.log(Logger.WARNING, "Load_Image_Error_", exception); //$NON-NLS-1$
-				continue;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WSTWebUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
deleted file mode 100644
index eadb97d21..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
+++ /dev/null
@@ -1,266 +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.wst.web.ui.internal.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-import org.eclipse.wst.common.frameworks.internal.ui.NewProjectGroup;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.ui.AddRemoveFacetsWizard;
-import org.eclipse.wst.common.project.facet.ui.PresetSelectionPanel;
-import org.eclipse.wst.common.project.facet.ui.internal.AddRemoveFacetsDataModel;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-public class DataModelFacetCreationWizardPage extends DataModelWizardPage implements IFacetProjectCreationDataModelProperties {
-
-	private static String NULL_RUNTIME = "NULL_RUNTIME"; //$NON-NLS-1$
-	private static String MRU_RUNTIME_STORE = "MRU_RUNTIME_STORE"; //$NON-NLS-1$
-	
-	protected static GridData gdhfill() {
-		return new GridData(GridData.FILL_HORIZONTAL);
-	}
-    
-    protected static GridData hspan( final GridData gd,
-                                     final int span ) 
-    {
-        gd.horizontalSpan = span;
-        return gd;
-    }
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID());
-		top.setLayout(new GridLayout());
-		top.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createProjectGroup(top);
-		createServerTargetComposite(top);
-        createPresetPanel(top);
-        return top;
-	}
-
-	protected void createPresetPanel(Composite top) {
-		final AddRemoveFacetsDataModel model
-            = ( (AddRemoveFacetsWizard) getWizard() ).getModel();
-
-        final PresetSelectionPanel ppanel 
-            = new PresetSelectionPanel( top, SWT.NONE, model );
-        
-        ppanel.setLayoutData( gdhfill() );
-        
-        ( (AddRemoveFacetsWizard) getWizard() ).syncWithPresetsModel( ppanel.getPresetsCombo() );
-	}
-	
-	public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
-		return launchNewRuntimeWizard(shell, model, null);
-	}
-	
-	public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model, String serverTypeID) {
-		DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
-		boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, serverTypeID, null);
-		if (isOK && model != null) {
-
-			DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
-			Object[] preAddition = new Object[preAdditionDescriptors.length];
-			for (int i = 0; i < preAddition.length; i++) {
-				preAddition[i] = preAdditionDescriptors[i].getPropertyValue();
-			}
-			Object[] postAddition = new Object[postAdditionDescriptors.length];
-			for (int i = 0; i < postAddition.length; i++) {
-				postAddition[i] = postAdditionDescriptors[i].getPropertyValue();
-			}
-			Object newAddition = getNewObject(preAddition, postAddition);
-
-			model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
-			if (newAddition != null)
-				model.setProperty(FACET_RUNTIME, newAddition);
-			else
-				return false;
-		}
-		return isOK;
-	}
-	
-	public boolean internalLaunchNewRuntimeWizard(Shell shell, IDataModel model) {
-		return launchNewRuntimeWizard(shell, model, getModuleTypeID());
-	}
-	
-	protected String getModuleTypeID() {
-		return null;
-	}
-	
-	protected Combo serverTargetCombo;
-	protected NewProjectGroup projectNameGroup;
-
-	public DataModelFacetCreationWizardPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-	}
-
-	protected void createServerTargetComposite(Composite parent) {
-        Group group = new Group(parent, SWT.NONE);
-        group.setText(ResourceHandler.TargetRuntime);
-        group.setLayoutData(gdhfill());
-        group.setLayout(new GridLayout(2, false));
-		serverTargetCombo = new Combo(group, SWT.BORDER | SWT.READ_ONLY);
-		serverTargetCombo.setLayoutData(gdhfill());
-		Button newServerTargetButton = new Button(group, SWT.NONE);
-		newServerTargetButton.setText(ResourceHandler.NewDotDotDot);
-		newServerTargetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!internalLaunchNewRuntimeWizard(getShell(), model)) {
-					//Bugzilla 135288
-					//setErrorMessage(ResourceHandler.InvalidServerTarget);
-				}
-			}
-		});
-		Control[] deps = new Control[]{newServerTargetButton};
-		synchHelper.synchCombo(serverTargetCombo, FACET_RUNTIME, deps);
-		if (serverTargetCombo.getSelectionIndex() == -1 && serverTargetCombo.getVisibleItemCount() != 0)
-			serverTargetCombo.select(0);
-	}
-
-	protected void createProjectGroup(Composite parent) {
-		IDataModel nestedProjectDM = model.getNestedModel(NESTED_PROJECT_DM);
-		nestedProjectDM.addListener(this);
-		projectNameGroup = new NewProjectGroup(parent, nestedProjectDM);
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{IProjectCreationPropertiesNew.PROJECT_NAME, IProjectCreationPropertiesNew.PROJECT_LOCATION, FACET_RUNTIME};
-	}
-
-	public void dispose() {
-		super.dispose();
-		if (projectNameGroup != null)
-			projectNameGroup.dispose();
-	}
-
-	public void storeDefaultSettings() {
-		IDialogSettings settings = getDialogSettings();
-		DataModelFacetCreationWizardPage.saveRuntimeSettings(settings, model);
-	}
-
-	public void restoreDefaultSettings() {
-		IDialogSettings settings = getDialogSettings();
-		DataModelFacetCreationWizardPage.restoreRuntimeSettings(settings, model);
-	}
-	
-	public static void saveRuntimeSettings(IDialogSettings settings, IDataModel model){
-		if (settings != null) {
-			String[] mruRuntimeArray = settings.getArray(MRU_RUNTIME_STORE);
-			List mruRuntimes = new ArrayList();
-			if(mruRuntimeArray != null)
-				mruRuntimes.addAll(Arrays.asList(mruRuntimeArray));
-			
-			IRuntime runtime = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
-			String runtimeName = runtime == null ? NULL_RUNTIME : runtime.getName();
-			
-			if (mruRuntimes.contains(runtimeName)) {
-				mruRuntimes.remove(runtimeName);
-			}
-			mruRuntimes.add(0, runtimeName);
-			while (mruRuntimes.size() > 5) {
-				mruRuntimes.remove(5);
-			}
-			mruRuntimeArray = new String[mruRuntimes.size()];
-			for (int i = 0; i < mruRuntimeArray.length; i++) {
-				mruRuntimeArray[i] = (String) mruRuntimes.get(i);
-			}
-			settings.put(MRU_RUNTIME_STORE, mruRuntimeArray);
-		}
-	}
-	
-	public static void restoreRuntimeSettings(IDialogSettings settings, IDataModel model){
-		if (settings != null) {
-			if (!model.isPropertySet(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)) {
-				boolean runtimeSet = false;
-				String[] mruRuntimeArray = settings.getArray(MRU_RUNTIME_STORE);
-				DataModelPropertyDescriptor[] descriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
-				List mruRuntimes = new ArrayList();
-				if (mruRuntimeArray == null) {
-					List defRuntimes = ProductManager.getDefaultRuntimes();
-					for (Iterator iter = defRuntimes.iterator(); iter.hasNext();)
-						mruRuntimes.add(((IRuntime) iter.next()).getName());
-				} else {
-					mruRuntimes.addAll(Arrays.asList(mruRuntimeArray));
-				}
-				if (!mruRuntimes.isEmpty()) {
-					for (int i = 0; i < mruRuntimes.size() && !runtimeSet; i++) {
-						for (int j = 0; j < descriptors.length-1 && !runtimeSet; j++) {
-							if (mruRuntimes.get(i).equals(descriptors[j].getPropertyDescription())) {
-								model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[j].getPropertyValue());
-								runtimeSet = true;
-							}
-						}
-						if(!runtimeSet && mruRuntimes.get(i).equals(NULL_RUNTIME)){
-							model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[descriptors.length -1].getPropertyValue());
-							runtimeSet = true;
-						}
-					}
-				}
-				if (!runtimeSet && descriptors.length > 0) {
-					model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[0].getPropertyValue());
-				}
-			}
-		}
-	}
-	
-
-	/**
-	 * Find first newObject that is not in the oldObjects array (using "==").
-	 * 
-	 * @param oldObjects
-	 * @param newObjects
-	 * @return first newObject not found in oldObjects, or <code>null</code> if all found.
-	 * 
-	 * @since 1.0.0
-	 */
-	private static Object getNewObject(Object[] oldObjects, Object[] newObjects) {
-		if (oldObjects != null && newObjects != null && oldObjects.length < newObjects.length) {
-			for (int i = 0; i < newObjects.length; i++) {
-				boolean found = false;
-				Object object = newObjects[i];
-				for (int j = 0; j < oldObjects.length; j++) {
-					if (oldObjects[j] == object) {
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-					return object;
-			}
-		}
-		if (oldObjects == null && newObjects != null && newObjects.length == 1)
-			return newObjects[0];
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java
deleted file mode 100644
index da031f5cc..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IWizardContext;
-
-public abstract class DataModelFacetInstallPage extends DataModelWizardPage implements IFacetWizardPage, IFacetInstallDataModelProperties {
-
-	public DataModelFacetInstallPage(String pageName) {
-		// TODO figure out a better way to do this without compromising the IDataModelWizard
-		// framework.
-		super(DataModelFactory.createDataModel(new AbstractDataModelProvider() {
-		}), pageName);
-	}
-
-	protected static GridData gdhfill() {
-		return new GridData(GridData.FILL_HORIZONTAL);
-	}
-
-	public void setWizardContext(IWizardContext context) {
-		// Intentionally empty
-	}
-
-	public void transferStateToConfig() {
-		// Intentionally empty
-	}
-
-	public void setConfig(final Object config) {
-		model.removeListener(this);
-		synchHelper.dispose();
-
-		model = (IDataModel) config;
-		model.addListener(this);
-		synchHelper = initializeSynchHelper(model);
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
deleted file mode 100644
index bb98c49c2..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.wst.web.ui.internal.wizards;
-
-public interface IWstWebUIContextIds {
-
-	public static final String PLUGIN_WST_WEB_UI = "org.eclipse.wst.web.ui."; //$NON-NLS-1$
-	
-	public static final String NEW_STATIC_WEB_PROJECT_PAGE1 = PLUGIN_WST_WEB_UI + "webw2000"; //$NON-NLS-1$
-	public static final String NEW_STATIC_WEB_PROJECT_PAGE2 = PLUGIN_WST_WEB_UI + "webw2100"; //$NON-NLS-1$
-	public static final String NEW_STATIC_WEB_PROJECT_PAGE3 = PLUGIN_WST_WEB_UI + "webw2200"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
deleted file mode 100644
index 09bae1ae2..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
+++ /dev/null
@@ -1,503 +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.wst.web.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelPausibleOperationImpl;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IPreset;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.ui.AddRemoveFacetsWizard;
-import org.eclipse.wst.common.project.facet.ui.internal.AbstractDataModel;
-import org.eclipse.wst.common.project.facet.ui.internal.ChangeTargetedRuntimesDataModel;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-import org.eclipse.wst.web.ui.internal.Logger;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public abstract class NewProjectDataModelFacetWizard extends AddRemoveFacetsWizard implements INewWizard, IFacetProjectCreationDataModelProperties {
-
-	protected IDataModel model = null;
-	private final IFacetedProjectTemplate template;
-	private IWizardPage[] beginingPages;
-	private IConfigurationElement configurationElement;
-
-	public NewProjectDataModelFacetWizard(IDataModel model) {
-		super(null);
-		this.model = model;
-		template = getTemplate();
-		this.setDefaultPageImageDescriptor(getDefaultPageImageDescriptor());
-	}
-
-	public NewProjectDataModelFacetWizard() {
-		super(null);
-		model = createDataModel();
-		template = getTemplate();
-		this.setDefaultPageImageDescriptor(getDefaultPageImageDescriptor());
-	}
-
-	public IDataModel getDataModel() {
-		return model;
-	}
-
-	protected abstract IDataModel createDataModel();
-
-	protected abstract ImageDescriptor getDefaultPageImageDescriptor();
-
-	protected abstract IFacetedProjectTemplate getTemplate();
-
-	/**
-	 * Returns the first page that shows up before the facets page. If multiple pages are required,
-	 * also override {@link #createBeginingPages()}.
-	 * 
-	 * @return
-	 */
-	protected abstract IWizardPage createFirstPage();
-
-	/**
-	 * Subclasses should override to add more than one page before the facets page. If only one page
-	 * is required, then use {@link #createFirstPage()}. The default implementation will return the
-	 * result of {@link #createFirstPage()}.
-	 * 
-	 * @return
-	 */
-	protected IWizardPage[] createBeginingPages() {
-		return new IWizardPage[]{createFirstPage()};
-	}
-
-	public void addPages() {
-		beginingPages = createBeginingPages();
-		for (int i = 0; i < beginingPages.length; i++) {
-			addPage(beginingPages[i]);
-		}
-
-		super.addPages();
-
-        final Set fixed = this.template.getFixedProjectFacets();
-
-        this.facetsSelectionPage.setFixedProjectFacets(fixed);
-
-        this.facetsSelectionPage.addSelectedFacetsChangedListener(new Listener() {
-            public void handleEvent(Event event) {
-                facetSelectionChangedEvent(event);
-            }
-        });
-    }
-
-	public void createPageControls(Composite container) {
-		super.createPageControls(container);
-
-        final IPreset preset = this.template.getInitialPreset();
-        final IRuntime runtime = (IRuntime) model.getProperty( FACET_RUNTIME );
-
-        if( preset == null )
-        {
-            // If no preset is specified, select the runtime and it's default
-            // facets.
-            
-            setRuntimeAndDefaultFacets( runtime );
-        }
-        else
-        {
-            // If preset is specified, select the runtime only if supports all
-            // of the facets included in the preset.
-
-            this.facetsSelectionPage.panel.selectPreset( preset );
-            
-            boolean supports = false;
-            
-            if( runtime != null )
-            {
-                supports = true;
-                
-                for( Iterator itr = preset.getProjectFacets().iterator(); itr.hasNext(); )
-                {
-                    final IProjectFacetVersion fv = (IProjectFacetVersion) itr.next();
-                    
-                    if( ! runtime.supports( fv ) )
-                    {
-                        supports = false;
-                        break;
-                    }
-                }
-            }
-            
-            final ChangeTargetedRuntimesDataModel rdm
-                = getModel().getTargetedRuntimesDataModel();
-
-            if( supports )
-            {
-                rdm.setTargetedRuntimes( Collections.singleton( runtime ) );
-            }
-            else
-            {
-                model.setProperty( FACET_RUNTIME, null );
-            }
-        }
-        
-        synchRuntimes();
-        
-        facetsSelectionPage.setInitialSelection(getFacetsFromDataModel());
-       
-	}
-
-	protected Set getFacetsFromDataModel() {
-		Set facetVersions = new HashSet();
-		FacetDataModelMap map = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
-		for (Iterator iterator = map.values().iterator(); iterator.hasNext();) {
-			IDataModel facetModel = (IDataModel) iterator.next();
-			if(facetModel.getBooleanProperty(IFacetDataModelProperties.SHOULD_EXECUTE)){
-				facetVersions.add(facetModel.getProperty(IFacetDataModelProperties.FACET_VERSION));
-			}
-		}
-		
-		FacetActionMap mapAction = (FacetActionMap) model.getProperty(FACET_ACTION_MAP);
-		for (Iterator iterator = mapAction.values().iterator(); iterator.hasNext();) {
-		    IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();            
-		    facetVersions.add(action.getProjectFacetVersion());
-		}
-		return facetVersions;
-	}
-
-	
-	public IWizardPage[] getPages() {
-		final IWizardPage[] base = super.getPages();
-		final IWizardPage[] pages = new IWizardPage[base.length + beginingPages.length];
-
-		for (int i = 0; i < beginingPages.length; i++) {
-			pages[i] = beginingPages[i];
-		}
-
-		System.arraycopy(base, 0, pages, beginingPages.length, base.length);
-
-		return pages;
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	protected void synchRuntimes() 
-    {
-        final ChangeTargetedRuntimesDataModel rdm
-            = getModel().getTargetedRuntimesDataModel();
-        
-        final Boolean[] suppressBackEvents = { Boolean.FALSE };
-        
-		model.addListener(new IDataModelListener() {
-			public void propertyChanged(DataModelEvent event) {
-				if (IDataModel.VALUE_CHG == event.getFlag() || IDataModel.DEFAULT_CHG == event.getFlag()) {
-					if (FACET_RUNTIME.equals(event.getPropertyName())) {
-                        if( ! suppressBackEvents[ 0 ].booleanValue() ) {
-                            IRuntime runtime = (IRuntime) event.getProperty();
-                            setRuntimeAndDefaultFacets( runtime );
-                        }
-					}
-				}
-			}
-		});
-
-        rdm.addListener
-        ( 
-            ChangeTargetedRuntimesDataModel.EVENT_PRIMARY_RUNTIME_CHANGED, 
-            new AbstractDataModel.IDataModelListener()
-            {
-                public void handleEvent()
-                {
-                    suppressBackEvents[ 0 ] = Boolean.TRUE;
-                    model.setProperty(FACET_RUNTIME, rdm.getPrimaryRuntime());
-                    suppressBackEvents[ 0 ] = Boolean.FALSE;
-                }
-            }
-        );
-	}
-    
-    protected void setRuntimeAndDefaultFacets( final IRuntime runtime )
-    {
-        final ChangeTargetedRuntimesDataModel rdm
-            = getModel().getTargetedRuntimesDataModel();
-
-        rdm.setTargetedRuntimes( Collections.EMPTY_SET );
-        this.facetsSelectionPage.setDefaultFacetsForRuntime( runtime );
-        
-        if( runtime != null )
-        {
-            rdm.setTargetedRuntimes( Collections.singleton( runtime ) );
-        }
-    }
-
-	public String getProjectName() {
-		return model.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-	}
-
-	protected void performFinish(final IProgressMonitor monitor)
-
-	throws CoreException
-
-	{
-		monitor.beginTask("", 10); //$NON-NLS-1$
-		storeDefaultSettings();
-		try {
-			FacetProjectCreationOperation operation = new FacetProjectCreationOperation(model);
-			this.fproj = operation.createProject(new SubProgressMonitor(monitor, 2));
-
-			super.performFinish(new SubProgressMonitor(monitor, 8));
-
-			final Set fixed = this.template.getFixedProjectFacets();
-			this.fproj.setFixedProjectFacets(fixed);
-
-            try {
-                getFacetProjectNotificationOperation().execute(new NullProgressMonitor(), null);
-            } catch (ExecutionException e) {
-                String msg = e.getMessage();
-                if( msg == null ) msg = ""; //$NON-NLS-1$
-                final IStatus st = new Status( IStatus.ERROR, WSTWebUIPlugin.PLUGIN_ID, 0, msg, e );
-                throw new CoreException( st );
-            }
-        } finally {
-			monitor.done();
-		}
-	}
-
-	public boolean performFinish() {
-		if (super.performFinish() == false) {
-			return false;
-		}
-
-		try {
-			postPerformFinish();
-		} catch (InvocationTargetException e) {
-			Logger.logException(e);
-		}
-
-		return true;
-	}
-
-	/**
-	 * <p>
-	 * Override to return the final perspective ID (if any). The final perspective ID can be
-	 * hardcoded by the subclass or determined programmatically (possibly using the value of a field
-	 * on the Wizard's WTP Operation Data Model).
-	 * </p>
-	 * <p>
-	 * The default implementation returns no perspective id unless overriden by product definition
-	 * via the "wtp.project.final.perspective" property.
-	 * </p>
-	 * 
-	 * @return Returns the ID of the Perspective which is preferred by this wizard upon completion.
-	 */
-
-	protected String getFinalPerspectiveID() {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * The configuration element is saved to use when the wizard completes in order to change the
-	 * current perspective using either (1) the value specified by {@link #getFinalPerspectiveID()}
-	 * or (2) the value specified by the finalPerspective attribute in the Wizard's configuration
-	 * element.
-	 * </p>
-	 * 
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public final void setInitializationData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) throws CoreException {
-		configurationElement = aConfigurationElement;
-		doSetInitializeData(aConfigurationElement, aPropertyName, theData);
-
-	}
-
-	/**
-	 * <p>
-	 * Override method for clients that wish to take advantage of the information provided by
-	 * {@see #setInitializationData(IConfigurationElement, String, Object)}.
-	 * </p>
-	 * 
-	 * @param aConfigurationElement
-	 *            The configuration element provided from the templated method.
-	 * @param aPropertyName
-	 *            The property name provided from the templated method.
-	 * @param theData
-	 *            The data provided from the templated method.
-	 */
-	protected void doSetInitializeData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) {
-		// Default do nothing
-	}
-
-	/**
-	 * <p>
-	 * Returns the an id component used for Activity filtering.
-	 * </p>
-	 * 
-	 * <p>
-	 * The Plugin ID is determined from the configuration element specified in
-	 * {@see #setInitializationData(IConfigurationElement, String, Object)}.
-	 * </p>
-	 * 
-	 * @return Returns the plugin id associated with this wizard
-	 */
-	public final String getPluginId() {
-		return (configurationElement != null) ? configurationElement.getDeclaringExtension().getNamespace() : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * <p>
-	 * Invoked after the user has clicked the "Finish" button of the wizard. The default
-	 * implementation will attempt to update the final perspective to the value specified by
-	 * {@link #getFinalPerspectiveID() }
-	 * </p>
-	 * 
-	 * @throws InvocationTargetException
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
-	 */
-	protected void postPerformFinish() throws InvocationTargetException {
-		if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
-			final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
-				public String getAttribute(String aName) {
-					if (aName.equals("finalPerspective")) { //$NON-NLS-1$
-						return getFinalPerspectiveID();
-					}
-					return super.getAttribute(aName);
-				}
-			};
-			BasicNewProjectResourceWizard.updatePerspective(element);
-		} else
-			BasicNewProjectResourceWizard.updatePerspective(configurationElement);
-
-		String projName = getProjectName();
-		BasicNewResourceWizard.selectAndReveal(ResourcesPlugin.getWorkspace().getRoot().getProject(projName), WSTWebUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
-	}
-
-	protected IDataModelOperation getFacetProjectNotificationOperation() {
-		return new DataModelPausibleOperationImpl(new AbstractDataModelOperation(this.model) {
-			public String getID() {
-				return NewProjectDataModelFacetWizard.class.getName();
-			}
-
-			public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				return AbstractDataModelProvider.OK_STATUS;
-			}
-		});
-	}
-
-	/**
-	 * Need to keep the model in sync with the UI. This method will pickup changes coming from the
-	 * UI and push them into the model
-	 * 
-	 * @param event
-	 */
-	protected void facetSelectionChangedEvent(Event event) {
-		Set actions = this.facetsSelectionPage.getActions();
-		Iterator iterator = actions.iterator();
-		Set activeIds = new HashSet();
-		while (iterator.hasNext()) {
-			IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();
-			String id = action.getProjectFacetVersion().getProjectFacet().getId();
-			activeIds.add(id);
-		}
-		// First handle all the actions tracked by IDataModels
-		FacetDataModelMap dataModelMap = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
-		iterator = dataModelMap.keySet().iterator();
-		while (iterator.hasNext()) {
-			String id = (String) iterator.next();
-			IDataModel configDM = (IDataModel) dataModelMap.get(id);
-			boolean active = activeIds.contains(id);
-			configDM.setBooleanProperty(IFacetDataModelProperties.SHOULD_EXECUTE, active);
-			activeIds.remove(id);
-		}
-		// Now handle the actions not tracked by IDataModels
-		FacetActionMap actionMap = (FacetActionMap) model.getProperty(FACET_ACTION_MAP);
-		actionMap.clear();
-		iterator = actions.iterator();
-		while (iterator.hasNext()) {
-			IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();
-			String id = action.getProjectFacetVersion().getProjectFacet().getId();
-			if (activeIds.contains(id)) {
-				actionMap.add(action);
-			}
-		}
-		model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
-	}
-
-	public Object getConfig(IProjectFacetVersion fv, Type type, String pjname) throws CoreException {
-		FacetDataModelMap map = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
-		IDataModel configDM = (IDataModel) map.get(fv.getProjectFacet().getId());
-		if (configDM == null) {
-			final Object config = fv.createActionConfig(type, pjname);
-			if (config == null || !(config instanceof IDataModel))
-				return null;
-			configDM = (IDataModel) config;
-			map.add(configDM);
-		}
-		configDM.setProperty(IFacetDataModelProperties.FACET_VERSION, fv);
-		return configDM;
-	}
-
-	protected void storeDefaultSettings() {
-		IWizardPage[] pages = getPages();
-		for (int i = 0; i < pages.length; i++)
-			storeDefaultSettings(pages[i], i);
-	}
-
-	/**
-	 * Subclasses may override if they need to do something special when storing the default
-	 * settings for a particular page.
-	 * 
-	 * @param page
-	 * @param pageIndex
-	 */
-	protected void storeDefaultSettings(IWizardPage page, int pageIndex) {
-		if (page instanceof DataModelWizardPage)
-			((DataModelWizardPage) page).storeDefaultSettings();
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java
deleted file mode 100644
index 2862831d4..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java
+++ /dev/null
@@ -1,123 +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.wst.web.ui.internal.wizards;
-
-import java.util.Vector;
-
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.WebPropertiesUtil;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class SimpleContextRootComposite extends Composite implements DoNotUseMeThisWillBeDeletedPost15 {
-	protected Text contextRootField;
-	private String errorMessage = null;
-
-	// listeners interested in the event when the context root
-	// value is modified.
-	private java.util.List modifyListeners;
-
-	protected Listener contextRootModifyListener = new Listener() {
-		public void handleEvent(Event e) {
-			if (contextRootField != null)
-				contextRootModified();
-		}
-	};
-
-	public SimpleContextRootComposite(Composite parent) {
-		super(parent, SWT.NONE);
-		createControls();
-		modifyListeners = new Vector(1);
-	}
-
-	protected void createControls() {
-		// container specification group
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		setLayout(layout);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		data.horizontalSpan = 2;
-		setLayoutData(data);
-
-		// New Context Root Label
-		Label contextRootLabel = new Label(this, SWT.CHECK);
-		contextRootLabel.setText(ResourceHandler.StaticContextRootComposite_Context_Root_Label); 
-
-		// New Context Root Entryfield
-		contextRootField = new Text(this, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		data.grabExcessHorizontalSpace = true;
-		contextRootField.setLayoutData(data);
-
-		contextRootField.addListener(SWT.Modify, contextRootModifyListener);
-
-	}
-
-	public String getContextRoot() {
-		return contextRootField.getText();
-	}
-
-	public void setEnabled(boolean enabled) {
-		if (contextRootField != null)
-			contextRootField.setEnabled(enabled);
-	}
-
-	protected void contextRootModified() {
-		errorMessage = WebPropertiesUtil.validateContextRoot(getContextRoot());
-		// notify listeners
-		Event e = new Event();
-		e.type = SWT.Modify;
-		e.widget = contextRootField;
-		for (int i = 0; i < modifyListeners.size(); i++) {
-			((Listener) modifyListeners.get(i)).handleEvent(e);
-		}
-	}
-
-	public void setContextRoot(String cr) {
-		contextRootField.setText(cr);
-	}
-
-	/**
-	 * There is a default context root validation listener provided by the
-	 * composite, adding external listeners will replace the default listener.
-	 */
-	public void addModifyListener(Listener l) {
-		modifyListeners.add(l);
-	}
-
-	public void removeModifyListener(Listener l) {
-		modifyListeners.remove(l);
-	}
-
-	/**
-	 * validate the context root value and return the error message
-	 */
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-
-	public boolean setFocus() {
-		return contextRootField.setFocus();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
deleted file mode 100644
index 6d9f28cad..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.swt.SWT;
-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.Text;
-import org.eclipse.wst.project.facet.ISimpleWebFacetInstallDataModelProperties;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-public class SimpleWebFacetInstallPage extends DataModelFacetInstallPage implements ISimpleWebFacetInstallDataModelProperties {
-
-	private Label configFolderLabel;
-	private Text configFolder;
-	private Label contextRootLabel;
-	private Text contextRoot;
-	
-	public SimpleWebFacetInstallPage() {
-		super("simpleweb.facet.install.page"); //$NON-NLS-1$
-		setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title);
-		setDescription(ResourceHandler.ConfigureSettings);
-	}
-
-	protected String[] getValidationPropertyNames() {
-		return new String[]{CONTENT_DIR};
-	}
-
-	protected Composite createTopLevelComposite(Composite parent) {
-		setInfopopID(IWstWebUIContextIds.NEW_STATIC_WEB_PROJECT_PAGE3);
-		final Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-		
-		this.contextRootLabel = new Label(composite, SWT.NONE);
-		this.contextRootLabel.setText(ResourceHandler.StaticContextRootComposite_Context_Root_Label);
-		this.contextRootLabel.setLayoutData(gdhfill());
-
-		this.contextRoot = new Text(composite, SWT.BORDER);
-		this.contextRoot.setLayoutData(gdhfill());
-		this.contextRoot.setData("label", this.contextRootLabel); //$NON-NLS-1$
-		synchHelper.synchText(contextRoot, CONTEXT_ROOT, new Control[]{contextRootLabel});
-		
-		configFolderLabel = new Label(composite, SWT.NONE);
-		configFolderLabel.setText(ResourceHandler.StaticWebSettingsPropertiesPage_Web_Content_Label);
-		configFolderLabel.setLayoutData(gdhfill());
-
-		configFolder = new Text(composite, SWT.BORDER);
-		configFolder.setLayoutData(gdhfill());
-		configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
-		synchHelper.synchText(configFolder, CONTENT_DIR, null);
-		
-		return composite;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java
deleted file mode 100644
index 46b7f07b6..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java
+++ /dev/null
@@ -1,73 +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.wst.web.ui.internal.wizards;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class SimpleWebModuleCreationWizard extends DataModelWizard implements IExecutableExtension, INewWizard, DoNotUseMeThisWillBeDeletedPost15 {
-
-	public SimpleWebModuleCreationWizard(IDataModel model) {
-		super(model);
-	}
-    
-    public SimpleWebModuleCreationWizard() {
-        super();
-    }
-    
-    protected IDataModelProvider getDefaultProvider() {
-        return new SimpleWebModuleCreationDataModelProvider();
-    }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void doAddPages() {
-		addPage(new SimpleWebModuleWizardBasePage(getDataModel(), "page1")); //$NON-NLS-1$
-	}
-
-    public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {   
-    }
-
-    public void init(IWorkbench workbench, IStructuredSelection selection) {
-        setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title); 
-        setDefaultPageImageDescriptor(WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz")); //$NON-NLS-1$
-    }
-
-//	protected void postPerformFinish() throws InvocationTargetException {
-//		IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();		
-//		
-//		IWizardDescriptor descriptor = newWizardRegistry.findWizard(getWizardID());
-//
-//		if(descriptor instanceof WorkbenchWizardElement)
-//			BasicNewProjectResourceWizard.updatePerspective(((WorkbenchWizardElement)descriptor).getConfigurationElement());
-//		IWorkbenchWindow window = WSTWebPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-//		IProject project = ((SimpleWebModuleCreationDataModel) model).getTargetProject();
-//		BasicNewResourceWizard.selectAndReveal(project, window);
-//	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java
deleted file mode 100644
index 36e1b4b69..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java
+++ /dev/null
@@ -1,172 +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.wst.web.ui.internal.wizards;
-
-import java.io.File;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.operation.ISimpleWebModuleCreationDataModelProperties;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-class SimpleWebModuleWizardBasePage extends DataModelWizardPage implements ISimpleWebModuleCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-	public Text projectNameField = null;
-	protected Text locationPathField = null;
-	protected Button browseButton = null;
-	//	constants
-	private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-	//	default values
-	private String defProjectNameLabel = WTPCommonUIResourceHandler.Name_;
-	private String defBrowseButtonLabel = WTPCommonUIResourceHandler.Browse_;
-	private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
-	public SimpleWebModuleWizardBasePage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setDescription(ResourceHandler.StaticWebProjectWizardBasePage_Page_Description); 
-		setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title); 
-		ImageDescriptor desc = WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz"); //$NON-NLS-1$
-		setImageDescriptor(desc);
-		setPageComplete(false);
-	}
-
-	protected void setSize(Composite composite) {
-		if (composite != null) {
-			Point minSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-			composite.setSize(minSize);
-			// set scrollbar composite's min size so page is expandable but has
-			// scrollbars when needed
-			if (composite.getParent() instanceof ScrolledComposite) {
-				ScrolledComposite sc1 = (ScrolledComposite) composite.getParent();
-				sc1.setMinSize(minSize);
-				sc1.setExpandHorizontal(true);
-				sc1.setExpandVertical(true);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return new String[]{PROJECT_NAME};
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		top.setLayout(new GridLayout());
-		top.setData(new GridData(GridData.FILL_BOTH));
-		Composite composite = new Composite(top, SWT.NONE);
-		GridLayout layout = new GridLayout(3, false);
-		composite.setLayout(layout);
-		buildComposites(composite);
-		Composite detail = new Composite(top, SWT.NONE);
-		detail.setLayout(new GridLayout());
-		detail.setData(new GridData(GridData.FILL_BOTH));
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(top, "com.ibm.etools.webtools.wizards.basic.webw1450"); //$NON-NLS-1$
-		return top;
-	}
-
-	/**
-	 * Create the controls within this composite
-	 */
-	public void buildComposites(Composite parent) {
-		createProjectNameGroup(parent);
-		createProjectLocationGroup(parent);
-		projectNameField.setFocus();
-	}
-	
-	private void createProjectLocationGroup(Composite parent) {
-		//		set up location path label
-		Label locationPathLabel = new Label(parent, SWT.NONE);
-		locationPathLabel.setText(WTPCommonUIResourceHandler.Project_location_);
-		GridData data = new GridData();
-		locationPathLabel.setLayoutData(data);
-		// set up location path entry field
-		locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		locationPathField.setLayoutData(data);
-		// set up browse button
-		browseButton = new Button(parent, SWT.PUSH);
-		browseButton.setText(defBrowseButtonLabel);
-		browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleLocationBrowseButtonPressed();
-			}
-		});
-		browseButton.setEnabled(true);
-		synchHelper.synchText(locationPathField, LOCATION, null);
-	}
-
-	/**
-	 * Open an appropriate directory browser
-	 */
-	protected void handleLocationBrowseButtonPressed() {
-		DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
-		dialog.setMessage(defDirDialogLabel);
-		String dirName = model.getStringProperty(LOCATION);
-		if ((dirName != null) && (dirName.length() != 0)) {
-			File path = new File(dirName);
-			if (path.exists()) {
-				dialog.setFilterPath(dirName);
-			}
-		}
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null) {
-			model.setProperty(LOCATION, selectedDirectory);
-		}
-	}
-	
-	private void createProjectNameGroup(Composite parent) {
-		// set up project name label
-		Label projectNameLabel = new Label(parent, SWT.NONE);
-		projectNameLabel.setText(defProjectNameLabel);
-		GridData data = new GridData();
-		projectNameLabel.setLayoutData(data);
-		// set up project name entry field
-		projectNameField = new Text(parent, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		projectNameField.setLayoutData(data);
-		new Label(parent, SWT.NONE); // pad
-		synchHelper.synchText(projectNameField, PROJECT_NAME, new Control[]{projectNameLabel});
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
deleted file mode 100644
index 30b3c1676..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebProjectFirstPage extends DataModelFacetCreationWizardPage {
-
-	public SimpleWebProjectFirstPage(IDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setDescription(ResourceHandler.StaticWebProjectWizardBasePage_Page_Description); 
-		setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title); 
-		setImageDescriptor(WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz")); //$NON-NLS-1$
-		setInfopopID(IWstWebUIContextIds.NEW_STATIC_WEB_PROJECT_PAGE1);
-	}
-	
-	protected String getModuleTypeID() {
-		return IModuleConstants.WST_WEB_MODULE;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
deleted file mode 100644
index 110289394..000000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.project.facet.SimpleWebFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebProjectWizard extends NewProjectDataModelFacetWizard {
-
-	public SimpleWebProjectWizard(IDataModel model) {
-		super(model);
-		setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
-	}
-
-	public SimpleWebProjectWizard() {
-		super();
-		setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
-	}
-
-	protected IDataModel createDataModel() {
-		return DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
-	}
-
-	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		return WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz"); //$NON-NLS-1$
-	}
-
-	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("template.wst.web"); //$NON-NLS-1$
-	}
-
-	protected IWizardPage createFirstPage() {
-		return new SimpleWebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
-	}
-	
-	protected String getFinalPerspectiveID() {
-        return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_STATICWEB);
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web/.classpath b/plugins/org.eclipse.wst.web/.classpath
deleted file mode 100644
index 2195e24c5..000000000
--- a/plugins/org.eclipse.wst.web/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="static_web_project"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web/.cvsignore b/plugins/org.eclipse.wst.web/.cvsignore
deleted file mode 100644
index 590084fe0..000000000
--- a/plugins/org.eclipse.wst.web/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.web/.project b/plugins/org.eclipse.wst.web/.project
deleted file mode 100644
index fb865482c..000000000
--- a/plugins/org.eclipse.wst.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a62bce1b5..000000000
--- a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Wed Aug 30 01:47:52 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.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=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.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.incompatibleJDKLevel=warning
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
deleted file mode 100644
index ab7ecd89f..000000000
--- a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.web; singleton:=true
-Bundle-Version: 1.1.2.qualifier
-Bundle-Activator: org.eclipse.wst.web.internal.WSTWebPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.project.facet,
- org.eclipse.wst.web.internal;x-internal:=true,
- org.eclipse.wst.web.internal.deployables;x-internal:=true,
- org.eclipse.wst.web.internal.operation;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.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.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.web/about.html b/plugins/org.eclipse.wst.web/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/plugins/org.eclipse.wst.web/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.web/build.properties b/plugins/org.eclipse.wst.web/build.properties
deleted file mode 100644
index 705850154..000000000
--- a/plugins/org.eclipse.wst.web/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html,\
-               .
-jars.compile.order = .
-src.includes = component.xml,\
-               property_files/,\
-               plugin.xml,\
-               plugin.properties
-output.. = bin/
-source.. = static_web_project/,\
-           property_files/
diff --git a/plugins/org.eclipse.wst.web/component.xml b/plugins/org.eclipse.wst.web/component.xml
deleted file mode 100644
index 89207cb8e..000000000
--- a/plugins/org.eclipse.wst.web/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.web" fragment="false"/><plugin id="org.eclipse.wst.web.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d6c..000000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e39b..000000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd09048..000000000
--- a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
diff --git a/plugins/org.eclipse.wst.web/plugin.properties b/plugins/org.eclipse.wst.web/plugin.properties
deleted file mode 100644
index 64a689115..000000000
--- a/plugins/org.eclipse.wst.web/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
-
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Simple Web Plug-in
-
-SIMPLE_WEB_LABEL=Static Web Module
-SIMPLE_WEB_DESCRIPTION=Enables the project to be deployed as a static web module.
-SIMPLE_WEB_TEMPLATE=Static Web Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/plugin.xml b/plugins/org.eclipse.wst.web/plugin.xml
deleted file mode 100644
index ba15a35e2..000000000
--- a/plugins/org.eclipse.wst.web/plugin.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin> 
-   <extension
-         point="org.eclipse.wst.server.core.moduleFactories">
-      <moduleFactory
-            projects="true"
-            class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableFactory"
-            id="org.eclipse.wst.web.internal.deployables.static">
-         <moduleType
-               versions="1.0, 1.2, 1.3, 1.4"
-               types="wst.web">
-         </moduleType>
-      </moduleFactory>
-     </extension>
-     
-    <extension
-         point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-       <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webstatic1"
-            class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IProject"/>
-           </with>
-         </enablement>
-       </moduleArtifactAdapter>
-       <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webstatic2"
-            class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IFile"/>
-           </with>
-         </enablement>
-      </moduleArtifactAdapter>   
-   </extension>
-   <extension point="org.eclipse.core.runtime.adapters">
-         <factory
-             class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter"
-             adaptableType="org.eclipse.core.resources.IProject">
-            <adapter type="org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact"/>
-        </factory>    
-   </extension> 
-   
-    <!--============================-->
-   <!-- Builder Provider registrations-->
-   <!--============================-->
-	<extension
-         point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
-     	<ProviderDefinesType
-      		providerType="wst.web.builder"
-      		providerID="org.eclipse.wst.common.componentcore.internal.builder.WorkbenchComponentBuilderDataModelProvider"/>
-		<DataModelProvider
-            class="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"
-            id="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"/>
-	</extension>
-	
-  <!-- Project Facets -->
-	<extension point="org.eclipse.wst.common.project.facet.core.facets">
-
-    <project-facet id="wst.web">
-      <label>%SIMPLE_WEB_LABEL</label>
-      <description>%SIMPLE_WEB_DESCRIPTION</description>
-      <icon>icons/full/obj16/webstatic_deploy.gif</icon>
-    </project-facet>
-
-    <project-facet-version facet="wst.web" version="1.0">
-      <action type="install" id="wst.web.install">
-        <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDelegate"/>
-        <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
-      </action>
-      <action type="uninstall" id="wst.web.uninstall">
-        <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetUninstallDelegate"/>
-        <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
-      </action>
-      <constraint>
-        <conflicts group="modules"/>
-      </constraint>
-      <group-member id="modules"/>
-    </project-facet-version>
-        
-    <template id="template.wst.web">
-      <label>%SIMPLE_WEB_TEMPLATE</label>
-      <fixed facet="wst.web"/>
-    </template>
-
-  </extension>	
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties b/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
deleted file mode 100644
index 73f230922..000000000
--- a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-StaticWebProjectCreationWizard_Wizard_Title=New Static Web Project
-StaticWebProjectWizardBasePage_Page_Description=Create a Web project for simple content (HTML files) only.
-StaticWebSettingsPropertiesPage_Web_Content_Label=Web content folder name:
-StaticContextRootComposite_Context_Root_Label=Context root
-StaticWebProjectWizardBasePage_Page_Title=Static Web Project
-StaticWebSettingsPropertiesPage_Not_available_for_closed_projects=Web settings are not available for a closed project.
-TargetRuntime=Target Runtime
-NewDotDotDot=N&ew...
-InvalidServerTarget=Invalid target server selected.
-ConfigureSettings=Configure Static Web module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
deleted file mode 100644
index 27b85249c..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-/**
- * These constants define the set of properties that this pluging expects to
- * be available via <code>IProduct.getProperty(String)</code>. The status of
- * this interface and the facilities offered is highly provisional. 
- * Productization support will be reviewed and possibly modified in future 
- * releases.
- * 
- * @see org.eclipse.core.runtime.IProduct#getProperty(String)
- */
-
-public interface IProductConstants {   
-    
-    public static final String APPLICATION_CONTENT_FOLDER = "earContent"; //$NON-NLS-1$
-	public static final String WEB_CONTENT_FOLDER = "webContent"; //$NON-NLS-1$
-	public static final String EJB_CONTENT_FOLDER = "ejbContent"; //$NON-NLS-1$
-	public static final String APP_CLIENT_CONTENT_FOLDER = "appClientContent"; //$NON-NLS-1$
-	public static final String JCA_CONTENT_FOLDER = "jcaContent"; //$NON-NLS-1$
-	public static final String DEFAULT_SOURCE_FOLDER = "defaultSource"; //$NON-NLS-1$
-	public static final String ADD_TO_EAR_BY_DEFAULT = "addToEarByDefault"; //$NON-NLS-1$
-	public static final String OUTPUT_FOLDER = "outputFolder"; //$NON-NLS-1$
-	public static final String USE_SINGLE_ROOT_STRUCTURE = "useSingleRootStructure"; //$NON-NLS-1$
-	
-	/**
-     * Alters the final perspective used by the following new project wizards
-     */
-	public static final String FINAL_PERSPECTIVE_WEB = "finalPerspectiveWeb"; //$NON-NLS-1$
-	public static final String FINAL_PERSPECTIVE_EJB = "finalPerspectiveEjb"; //$NON-NLS-1$
-	public static final String FINAL_PERSPECTIVE_EAR = "finalPerspectiveEar"; //$NON-NLS-1$
-	public static final String FINAL_PERSPECTIVE_APPCLIENT = "finalPerspectiveAppClient"; //$NON-NLS-1$
-	public static final String FINAL_PERSPECTIVE_JCA = "finalPerspectiveJca"; //$NON-NLS-1$
-	public static final String FINAL_PERSPECTIVE_UTILITY = "finalPerspectiveUtility"; //$NON-NLS-1$
-	public static final String FINAL_PERSPECTIVE_STATICWEB = "finalPerspectiveStaticWeb"; //$NON-NLS-1$
-	
-	/**
-	 * Ability to default initial runtimes chosen in wizards
-	 */
-	public static final String DEFAULT_RUNTIME_1 = "defaultRuntime1"; //$NON-NLS-1$
-	public static final String DEFAULT_RUNTIME_2 = "defaultRuntime2"; //$NON-NLS-1$
-	public static final String DEFAULT_RUNTIME_3 = "defaultRuntime3"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
deleted file mode 100644
index 4a4fddb87..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-public interface ISimpleWebFacetInstallDataModelProperties {
-
-	public static final String CONTENT_DIR = "IStaticWebFacetInstallDataModelProperties.CONTENT_DIR"; //$NON-NLS-1$
-	
-	public static final String CONTEXT_ROOT = "IStaticWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
deleted file mode 100644
index 853b6c2d6..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-public class ProductManager {
-
-	/**
-	 * Default values for WTP level product
-	 */
-	private static final String APPLICATION_CONTENT_FOLDER = "EarContent"; //$NON-NLS-1$
-	private static final String WEB_CONTENT_FOLDER = "WebContent"; //$NON-NLS-1$
-	private static final String EJB_CONTENT_FOLDER = "ejbModule"; //$NON-NLS-1$
-	private static final String APP_CLIENT_CONTENT_FOLDER = "appClientModule"; //$NON-NLS-1$
-	private static final String JCA_CONTENT_FOLDER = "connectorModule"; //$NON-NLS-1$
-	private static final String DEFAULT_SOURCE_FOLDER = "src"; //$NON-NLS-1$
-	private static final String ADD_TO_EAR_BY_DEFAULT = "false"; //$NON-NLS-1$
-	private static final String OUTPUT_FOLDER = "build/classes"; //$NON-NLS-1$
-	private static final String USE_SINGLE_ROOT_STRUCTURE = "false"; //$NON-NLS-1$
-	private static final String FINAL_PERSPECTIVE = "org.eclipse.jst.j2ee.J2EEPerspective"; //$NON-NLS-1$
-	private static final char RUNTIME_SEPARATOR = ':';
-	private static final String[] DEFAULT_RUNTIME_KEYS = 
-							new String[]{IProductConstants.DEFAULT_RUNTIME_1,
-										IProductConstants.DEFAULT_RUNTIME_2,
-										IProductConstants.DEFAULT_RUNTIME_3};
-	
-	/**
-	 * Return the value for the associated key from the Platform Product registry or return the
-	 * WTP default for the J2EE cases.
-	 * 
-	 * @param key
-	 * @return String value of product's property
-	 */
-	public static String getProperty(String key) {
-		if (key == null)
-			return null;
-		String value = null;
-		if (Platform.getProduct()!=null)
-			value = Platform.getProduct().getProperty(key);
-		if (value == null) {
-			if (key.equals(IProductConstants.APPLICATION_CONTENT_FOLDER))
-				return APPLICATION_CONTENT_FOLDER;
-			else if (key.equals(IProductConstants.WEB_CONTENT_FOLDER))
-				return WEB_CONTENT_FOLDER;
-			else if (key.equals(IProductConstants.EJB_CONTENT_FOLDER))
-				return EJB_CONTENT_FOLDER;
-			else if (key.equals(IProductConstants.APP_CLIENT_CONTENT_FOLDER))
-				return APP_CLIENT_CONTENT_FOLDER;
-			else if (key.equals(IProductConstants.JCA_CONTENT_FOLDER))
-				return JCA_CONTENT_FOLDER;
-			else if (key.equals(IProductConstants.DEFAULT_SOURCE_FOLDER))
-				return DEFAULT_SOURCE_FOLDER;
-			else if (key.equals(IProductConstants.ADD_TO_EAR_BY_DEFAULT))
-				return ADD_TO_EAR_BY_DEFAULT;
-			else if (key.equals(IProductConstants.USE_SINGLE_ROOT_STRUCTURE))
-				return USE_SINGLE_ROOT_STRUCTURE;
-			else if (key.equals(IProductConstants.OUTPUT_FOLDER))
-				return OUTPUT_FOLDER;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT))
-				return FINAL_PERSPECTIVE;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EAR))
-				return FINAL_PERSPECTIVE;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EJB))
-				return FINAL_PERSPECTIVE;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_JCA))
-				return FINAL_PERSPECTIVE;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_STATICWEB))
-				return null;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_UTILITY))
-				return FINAL_PERSPECTIVE;
-			else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_WEB))
-				return FINAL_PERSPECTIVE;
-		}
-		return value;
-	}
-	
-	public static boolean shouldAddToEARByDefault() {
-		String value = getProperty(IProductConstants.ADD_TO_EAR_BY_DEFAULT);
-		return Boolean.valueOf(value).booleanValue();
-	}
-	
-	public static boolean shouldUseSingleRootStructure() {
-		String value = getProperty(IProductConstants.USE_SINGLE_ROOT_STRUCTURE);
-		return Boolean.valueOf(value).booleanValue();
-	}
-
-	public static List/*<IRuntime>*/ getDefaultRuntimes() {
-		List theRuntimes = null;
-		Set runtimes = RuntimeManager.getRuntimes();
-		if (!runtimes.isEmpty()) {
-			IRuntime defaultRuntime = null;
-			//	First check if defaults are defined
-			for (int i = 0; i < DEFAULT_RUNTIME_KEYS.length; i++) {
-				defaultRuntime = getMatchingRuntime(DEFAULT_RUNTIME_KEYS[i], runtimes);
-				if (defaultRuntime != null) {
-					if (theRuntimes == null) {
-						theRuntimes = new ArrayList(3);
-					}
-					theRuntimes.add(defaultRuntime);
-				}
-			}
-		}
-		if (theRuntimes == null) {
-			theRuntimes = Collections.EMPTY_LIST;
-		}
-		return theRuntimes;
-	}
-	
-	private static IRuntime getMatchingRuntime(String defaultProductRuntimeProperty, Set runtimes) {
-		String defaultProductRuntimeKey = getProperty(defaultProductRuntimeProperty);
-		if (defaultProductRuntimeKey == null || defaultProductRuntimeKey.length() == 0) {
-			return null;
-		}
-		//The defaultProductRuntimeKey needs to be in the following format
-		//<facet runtime id>:<facet version>.
-		int seperatorIndex = defaultProductRuntimeKey.indexOf(RUNTIME_SEPARATOR);
-		if (seperatorIndex < 0 && seperatorIndex < defaultProductRuntimeKey.length()) {
-			//Consider throwing an exception here.
-			Logger.getLogger().logError("Invalid default product runtime id.  It should follow the format <facet runtime id>:<facet version>.  Id processed: " + defaultProductRuntimeKey);
-			return null;
-		}
-		String defaultRuntimeID = defaultProductRuntimeKey.substring(0, seperatorIndex);
-		String defaultFacetVersion = defaultProductRuntimeKey.substring(seperatorIndex + 1);
-		for (Iterator runtimeIt = runtimes.iterator(); runtimeIt.hasNext();) {
-			IRuntime runtime = (IRuntime) runtimeIt.next();
-			List runtimeComps = runtime.getRuntimeComponents();
-			if (!runtimeComps.isEmpty()) {
-				for (Iterator compsIter = runtimeComps.iterator(); compsIter.hasNext();) {
-					IRuntimeComponent runtimeComp = (IRuntimeComponent) compsIter.next();
-					if (defaultRuntimeID.equals(runtimeComp.getRuntimeComponentType().getId()) &&
-						(defaultFacetVersion.equals(runtimeComp.getRuntimeComponentVersion().getVersionString()))) {
-							return runtime;
-					}
-				}
-			}
-		}
-		//No matches found.
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
deleted file mode 100644
index 366b4dcbb..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class SimpleWebFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISimpleWebFacetInstallDataModelProperties {
-
-	public SimpleWebFacetInstallDataModelProvider() {
-		super();
-	}
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(CONTENT_DIR);
-		names.add(CONTEXT_ROOT);
-		return names;
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(CONTENT_DIR)) {
-			return "WebContent"; //$NON-NLS-1$
-		} else if (propertyName.equals(CONTEXT_ROOT)) {
-			return getProperty(FACET_PROJECT_NAME);
-		} else if (propertyName.equals(FACET_ID)) {
-			return IModuleConstants.WST_WEB_MODULE;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		if (FACET_PROJECT_NAME.equals(propertyName)) {
-			model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
-		}
-		return super.propertySet(propertyName, propertyValue);
-	}
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
deleted file mode 100644
index 6b9ee4fef..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.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.wst.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-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.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class SimpleWebFacetInstallDelegate implements IDelegate {
-
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null)
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		try {
-			IDataModel model = (IDataModel) config;
-			addNatures(project);
-			final IVirtualComponent c = ComponentCore.createComponent(project);
-			c.create(0, null);
-			final IVirtualFolder webroot = c.getRootFolder();
-			webroot.createLink(new Path("/" + model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
-			ComponentUtilities.setServerContextRoot(project,model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTEXT_ROOT));
-			try {
-				((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().logError(e);
-			}
-		} finally {
-			if (monitor != null)
-				monitor.done();
-		}
-	}
-
-	private void addNatures(final IProject project) throws CoreException {
-		final IProjectDescription desc = project.getDescription();
-		final String[] current = desc.getNatureIds();
-		final String[] replacement = new String[current.length + 1];
-		System.arraycopy(current, 0, replacement, 0, current.length);
-		replacement[current.length] = IModuleConstants.MODULE_NATURE_ID;
-		desc.setNatureIds(replacement);
-		project.setDescription(desc, null);
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 189f35eb2..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class SimpleWebFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
-	public SimpleWebFacetProjectCreationDataModelProvider() {
-		super();
-	}
-	
-	public void init() {
-		super.init();
-		FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
-		IDataModel simpleWebFacet = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
-		map.add(simpleWebFacet);
-		
-		Collection requiredFacets = new ArrayList();
-		requiredFacets.add(ProjectFacetsManager.getProjectFacet(simpleWebFacet.getStringProperty(IFacetDataModelProperties.FACET_ID)));
-		setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
deleted file mode 100644
index ffc323f3d..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
+++ /dev/null
@@ -1,44 +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.wst.project.facet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class SimpleWebFacetUninstallDelegate implements IDelegate {
-
-	public SimpleWebFacetUninstallDelegate() {
-		super();
-	}
-
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null)
-			monitor.beginTask("", 1); //$NON-NLS-1$
-		try {
-			// Remove the .component file
-			IFile file = project.getFile(StructureEdit.MODULE_META_FILE_NAME);
-			file.delete(true, monitor);
-			
-			// Remove the module core nature
-			ProjectUtilities.removeNatureFromProject(project, IModuleConstants.MODULE_NATURE_ID);
-		} finally {
-			if (monitor != null)
-				monitor.done();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
deleted file mode 100644
index 6b161603d..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Created on Dec 14, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-
-/**
- * An object which represents the user-defined contents of an extension in a plug-in manifest.
- */
-public class DelegateConfigurationElement implements IConfigurationElement {
-
-	private final IConfigurationElement delegateElement;
-	private static final String DELEGATE_NAME = "delegateConfigurationElement"; //$NON-NLS-1$ 
-	private static final String DELEGATE_NAMESPACE = "delegateConfigurationElementNamespace"; //$NON-NLS-1$ 
-	private static final String DELEGATE_NULL_STRING = "delegateConfigurationElement: NULL"; //$NON-NLS-1$ 
-
-	public DelegateConfigurationElement(IConfigurationElement aDelegate) {
-		delegateElement = aDelegate;
-	}
-
-	/**
-	 * @param propertyName
-	 * @return
-	 * @throws org.eclipse.core.runtime.CoreException
-	 */
-	public Object createExecutableExtension(String propertyName) throws CoreException {
-		if (delegateElement == null)
-			return null;
-		return delegateElement.createExecutableExtension(propertyName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (delegateElement == null)
-			return false;
-		return delegateElement.equals(obj);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String getAttribute(String name) throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return null;
-		return delegateElement.getAttribute(name);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String getAttributeAsIs(String name) throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return null;
-		return delegateElement.getAttributeAsIs(name);
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String[] getAttributeNames() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return new String[0];
-		return delegateElement.getAttributeNames();
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public IConfigurationElement[] getChildren() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return new IConfigurationElement[0];
-		return delegateElement.getChildren();
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public IConfigurationElement[] getChildren(String name) throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return new IConfigurationElement[0];
-		return delegateElement.getChildren(name);
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public IExtension getDeclaringExtension() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			throw new InvalidRegistryObjectException();
-		return delegateElement.getDeclaringExtension();
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String getName() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return DELEGATE_NAME;
-		return delegateElement.getName();
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String getNamespace() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return DELEGATE_NAMESPACE;
-		return delegateElement.getNamespace();
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public Object getParent() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return null;
-		return delegateElement.getParent();
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String getValue() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return null;
-		return delegateElement.getValue();
-	}
-
-	/**
-	 * @return
-	 * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
-	 */
-	public String getValueAsIs() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return null;
-		return delegateElement.getValueAsIs();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		if (delegateElement == null)
-			return -1;
-		return delegateElement.hashCode();
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isValid() {
-
-		if (delegateElement == null)
-			return false;
-		return delegateElement.isValid();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (delegateElement == null)
-			return DELEGATE_NULL_STRING;
-		return delegateElement.toString();
-	}
-
-	public IConfigurationElement toEquinox() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IContributor getContributor() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			throw new InvalidRegistryObjectException();
-		return delegateElement.getContributor();
-	}
-
-	public String getNamespaceIdentifier() throws InvalidRegistryObjectException {
-		if (delegateElement == null)
-			return DELEGATE_NAMESPACE;
-		return delegateElement.getNamespaceIdentifier();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
deleted file mode 100644
index e86b07bf0..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
+++ /dev/null
@@ -1,21 +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.wst.web.internal;
-
-
-public interface ISimpleWebModuleConstants
-{
-	public static final String PLUG_IN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
-	public static final String STATIC_PROJECT_TYPE = "STATIC"; //$NON-NLS-1$
-	public static final String CSS_DIRECTORY = "theme"; //$NON-NLS-1$
-	public static final String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-	public static final String LIBRARY_DIRECTORY = "lib"; //$NON-NLS-1$
-	public static final String CLASSES_DIRECTORY = "classes"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
deleted file mode 100644
index 0f4e7aab9..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
+++ /dev/null
@@ -1,13 +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.wst.web.internal;
-
-public interface IWSTWebPreferences {
-	String PREF_STATICWEBCONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
deleted file mode 100644
index 87c27dc01..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "staticwebproject";//$NON-NLS-1$
-
-	private ResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String StaticWebProjectCreationWizard_Wizard_Title;
-	public static String StaticWebProjectWizardBasePage_Page_Description;
-	public static String StaticWebSettingsPropertiesPage_Web_Content_Label;
-	public static String StaticContextRootComposite_Context_Root_Label;
-	public static String StaticWebProjectWizardBasePage_Page_Title;
-	public static String StaticWebSettingsPropertiesPage_Not_available_for_closed_projects;
-	public static String TargetRuntime;
-	public static String NewDotDotDot;
-	public static String InvalidServerTarget;
-	public static String ConfigureSettings;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ResourceHandler.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
deleted file mode 100644
index a5394d9ff..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
+++ /dev/null
@@ -1,66 +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.wst.web.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebPlugin extends Plugin
-{
-	//The shared instance.
-	private static WSTWebPlugin plugin;
-
-	private WSTWebPreferences preferences;
-	
-	public static final String PLUGIN_ID = "com.ibm.etools.webtools.staticwebproject"; //$NON-NLS-1$
-	public static final String VALIDATION_BUILDER_ID = ValidationPlugin.VALIDATION_BUILDER_ID; // plugin
-	
-	public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
-				"icons/full/ctool16", //$NON-NLS-1$
-				"icons/full/wizban", //$NON-NLS-1$
-				"icons", //$NON-NLS-1$
-				""}; //$NON-NLS-1$
-	/**
-	 * The constructor.
-	 */
-	public WSTWebPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WSTWebPlugin getDefault()
-	{
-		return plugin;
-	}
-
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	protected void initializeDefaultPluginPreferences() {
-		getWSTWebPreferences().initializeDefaultPreferences();
-	}
-	/**
-	 * @return Returns the preferences.
-	 */
-	public WSTWebPreferences getWSTWebPreferences() {
-		if (this.preferences == null)
-			this.preferences = new WSTWebPreferences(this);
-		return this.preferences;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
deleted file mode 100644
index fd5256a05..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,81 +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.wst.web.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
-	public interface Keys {
-		final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-	}
-	public interface Values {
-		final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-	}
-	public interface Defaults {
-		final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
-	}
-	private Plugin owner = null;
-	private Preferences preferences = null;
-	private boolean persistOnChange = false;
-	
-	public WSTWebPreferences(Plugin owner) {
-		this.owner = owner;
-	}
-	protected void initializeDefaultPreferences() {
-		getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
-	}
-	
-	public String getStaticWebContentFolderName() {
-		return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
-	}
-	
-	public void setStaticWebContentFolderName(String value) {
-		getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
-		firePreferenceChanged();
-	}
-	
-	public void firePreferenceChanged() {
-		if (isPersistOnChange())
-			persist();
-	}
-
-	public void persist() {
-		getOwner().savePluginPreferences();
-	}
-
-	/**
-	 * @return Returns the persistOnChange.
-	 */
-	public boolean isPersistOnChange() {
-		return this.persistOnChange;
-	}
-
-	/**
-	 * @param persistOnChange
-	 *            The persistOnChange to set.
-	 */
-	public void setPersistOnChange(boolean persistOnChange) {
-		this.persistOnChange = persistOnChange;
-	}
-
-	private Preferences getPreferences() {
-		if (this.preferences == null)
-			this.preferences = getOwner().getPluginPreferences();
-		return this.preferences;
-	}
-
-	/**
-	 * @return Returns the owner.
-	 */
-	private Plugin getOwner() {
-		return this.owner;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
deleted file mode 100644
index 6f623dc5d..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
+++ /dev/null
@@ -1,106 +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.wst.web.internal;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebPropertiesUtil {
-	private static final char[] BAD_CHARS = {'/', '\\', ':'};
-	/**
-	 * @param project
-	 *            org.eclipse.core.resources.IProject
-	 */
-	/**
-	 * Returns a error message that states whether a context root is valid or not returns null if
-	 * context root is fine
-	 * 
-	 * @return java.lang.String
-	 * @param contextRoot
-	 *            java.lang.String
-	 */
-	public static String validateContextRoot(String contextRoot) {
-
-		if (contextRoot == null)
-			return null;
-
-		String errorMessage = null;
-
-		String name = contextRoot;
-		if (name.equals("") || name == null) { //$NON-NLS-1$
-			//  this was added because the error message shouldnt be shown initially. It should be
-			// shown only if context root field is edited to
-			errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title; 
-			
-			//errorMessage = ProjectSupportResourceHandler.getString("Context_Root_cannot_be_empty_2"); //$NON-NLS-1$
-			return errorMessage;
-		}
-
-		/*******************************************************************************************
-		 * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
-		 * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
-		 * errorMessage;
-		 *  }
-		 ******************************************************************************************/
-
-		if (name.trim().equals(name)) {
-			StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
-			outer : while (stok.hasMoreTokens()) {
-				String token = stok.nextToken();
-				for (int i = 0; i < token.length(); i++) {
-					if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
-						if (Character.isWhitespace(token.charAt(i))) {
-							//Removed because context roots can contain white space
-							//errorMessage =
-							//	ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
-							// = " Context root cannot contain whitespaces."
-						} else {
-							errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title; 
-							
-							//errorMessage = ProjectSupportResourceHandler.getString("The_character_is_invalid_in_a_context_root", new Object[]{(new Character(token.charAt(i))).toString()}); //$NON-NLS-1$
-							break outer;
-						}
-					}
-				}
-			}
-		} // en/ end of if(name.trim
-		else
-			errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title; 
-			//errorMessage = ProjectSupportResourceHandler.getString("Names_cannot_begin_or_end_with_whitespace_5"); //$NON-NLS-1$
-
-		return errorMessage;
-	}
-
-
-	/**
-	 * Return true if the string contains any of the characters in the array.
-	 */
-	private static boolean contains(String str, char[] chars) {
-		for (int i = 0; i < chars.length; i++) {
-			if (str.indexOf(chars[i]) != -1)
-				return true;
-		}
-		return false;
-	}
-
-
-	public static String validateFolderName(String folderName) {
-		if (folderName.length() == 0)
-			return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title; 
-			
-			//return ProjectSupportResourceHandler.getString("Folder_name_cannot_be_empty_2"); //$NON-NLS-1$
-
-		if (contains(folderName, BAD_CHARS))
-			return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title; 
-			
-			//return ProjectSupportResourceHandler.getString("Folder_name_is_not_valid", new Object[]{folderName}); //$NON-NLS-1$
-
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
deleted file mode 100644
index 3a7a9be6f..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
+++ /dev/null
@@ -1,418 +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.wst.web.internal.deployables;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ModuleFile;
-import org.eclipse.wst.server.core.internal.ModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-public abstract class ComponentDeployable extends ProjectModule {
-
-	protected IVirtualComponent component = null;
-	protected List members = new ArrayList();
-	
-	public ComponentDeployable(IProject project) {
-		this(project,ComponentCore.createComponent(project));
-	}
-	
-	public ComponentDeployable(IProject project, IVirtualComponent aComponent) {
-		super(project);
-		this.component = aComponent;
-	}
-	
-	/**
-	 * @see org.eclipse.jst.server.core.IJ2EEModule#isBinary()
-	 */
-	public boolean isBinary() {
-		if (component==null)
-			return false;
-		return component.isBinary();
-	}
-	
-	/**
-	 * Add the resources from mr to the existing resources in Module Folder mf
-	 * @param ModuleFolder mf
-	 * @param IModuleResource[] mr
-	 */
-	private void addMembersToModuleFolder(ModuleFolder mf, IModuleResource[] mr) {
-		// If the folder is null or the resources to add are null or empty, bail and return
-		if (mf == null || mr == null || mr.length==0) 
-			return;
-		// Get the existing members in the module folder
-		IModuleResource[] mf_members = mf.members();
-		int mf_size = 0;
-		// Get the length of the existing members in the module folder
-		if (mf_members != null)
-			mf_size = mf_members.length;
-		// Create a new array to set on the module folder which will combine the existing and
-		// new module resources
-		IModuleResource[] res = new IModuleResource[mf_size + mr.length];
-		// Copy the existing members into the array if there are any
-		if (mf_members != null && mf_size > 0)
-			System.arraycopy(mf_members, 0, res, 0, mf_size);
-		// Copy the new members into the array
-		System.arraycopy(mr, 0, res, mf_size, mr.length);
-		// Set the new members array on the module folder
-		mf.setMembers(res);
-	}
-
-	 /**
-     * Returns the child modules of this module.
-     * 
-     * @return org.eclipse.wst.server.core.model.IModule[]
-     */
-    public IModule[] getChildModules() {
-        return getModules();
-    }
-    
-    public IModule[] getModules() {
-		List modules = new ArrayList();
-		if (component != null) {
-	    	IVirtualReference[] components = getReferences(component);
-	    	for (int i = 0; i < components.length; i++) {
-				IVirtualReference reference = components[i];
-				if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_USES) {
-					IVirtualComponent virtualComp = reference.getReferencedComponent();
-					IModule module = gatherModuleReference(component, virtualComp);
-					if (module != null && !modules.contains(module))
-						modules.add(module);
-				}
-			}
-		}
-        return (IModule[]) modules.toArray(new IModule[modules.size()]);
-	}
-    
-    protected IVirtualReference[] getReferences(IVirtualComponent aComponent) {
-    	return aComponent.getReferences();
-    }
-    
-    protected IModule gatherModuleReference(IVirtualComponent component, IVirtualComponent targetComponent ) {
-    	// Handle workspace project module components
-		if (targetComponent != null && targetComponent.getProject()!=component.getProject()) {
-			if (!targetComponent.isBinary())
-				return ServerUtil.getModule(targetComponent.getProject());
-		}
-		return null;
-    }
-    
-    /**
-	 * Find the module resources for a given container and path. Inserts in the java containers
-	 * at a given path if not null.
-	 * 
-	 * @param cont a container
-	 * @param path the current module relative path
-	 * @param javaPath the path where Java resources fit in the root
-	 * @param javaCont
-	 * @return a possibly-empty array of module resources
-	 * @throws CoreException
-	 */
-	protected IModuleResource[] getMembers(IContainer cont, IPath path, IPath javaPath, IContainer[] javaCont) throws CoreException {
-		IResource[] res = cont.members();
-		int size2 = res.length;
-		List list = new ArrayList(size2);
-		for (int j = 0; j < size2; j++) {
-			if (res[j] instanceof IContainer) {
-				IContainer cc = (IContainer) res[j];
-				
-				IPath newPath = path.append(cc.getName()).makeRelative();
-				// Retrieve already existing module folder if applicable
-				ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath);
-				if (mf == null) {
-					mf = new ModuleFolder(cc, cc.getName(), path);
-					ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
-					if (path.isEmpty())
-						members.add(mf);
-					else {
-						if (parent == null)
-							parent = ensureParentExists(path, cc);
-						addMembersToModuleFolder(parent, new IModuleResource[] {mf});
-					}
-				}
-				IModuleResource[] mr = getMembers(cc, newPath, javaPath, javaCont);
-				
-				if (javaPath != null && newPath.isPrefixOf(javaPath))
-					mr = handleJavaPath(path, javaPath, newPath, javaCont, mr, cc);
-
-				addMembersToModuleFolder(mf, mr);
-				
-			} else {
-				IFile f = (IFile) res[j];
-				// Handle the default package case
-				if (path.equals(javaPath)) {
-					ModuleFolder mFolder = (ModuleFolder) getExistingModuleResource(members,javaPath);
-					ModuleFile mFile = new ModuleFile(f, f.getName(), javaPath, f.getModificationStamp() + f.getLocalTimeStamp());
-					if (mFolder != null)
-						addMembersToModuleFolder(mFolder,new IModuleResource[]{mFile});
-					else
-						list.add(mFile);
-				} else {
-					ModuleFile mf = new ModuleFile(f, f.getName(), path, f.getModificationStamp() + f.getLocalTimeStamp());
-					list.add(mf);
-				}
-			}
-		}
-		IModuleResource[] mr = new IModuleResource[list.size()];
-		list.toArray(mr);
-		return mr;
-	}
-	
-	protected IModuleResource[] getMembers(IVirtualContainer cont, IPath path) throws CoreException {
-		IVirtualResource[] res = cont.members();
-		int size2 = res.length;
-		List list = new ArrayList(size2);
-		for (int j = 0; j < size2; j++) {
-			if (res[j] instanceof IVirtualContainer) {
-				IVirtualContainer cc = (IVirtualContainer) res[j];
-				// Retrieve already existing module folder if applicable
-				ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,path.append(new Path(cc.getName()).makeRelative()));
-				if (mf == null) {
-					mf = new ModuleFolder((IContainer)cc.getUnderlyingResource(), cc.getName(), path);
-					ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
-					if (path.isEmpty())
-						members.add(mf);
-					else {
-						if (parent == null)
-							parent = ensureParentExists(path, (IContainer)cc.getUnderlyingResource());
-						addMembersToModuleFolder(parent, new IModuleResource[] {mf});
-					}
-				}
-				IModuleResource[] mr = getMembers(cc, path.append(cc.getName()));
-				addMembersToModuleFolder(mf, mr);
-			} else {
-				IFile f = (IFile) res[j].getUnderlyingResource();
-				if (shouldAddComponentFile(f)) {
-					ModuleFile mf = new ModuleFile(f, f.getName(), path, f.getModificationStamp() + f.getLocalTimeStamp());
-					list.add(mf);
-				}
-			}
-		}
-		IModuleResource[] mr = new IModuleResource[list.size()];
-		list.toArray(mr);
-		return mr;
-	}
-	
-	protected ModuleFolder ensureParentExists(IPath path, IContainer cc) {
-		ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
-		if (parent == null) {
-			String folderName = path.lastSegment();
-			IPath folderPath = Path.EMPTY;
-			if (path.segmentCount()>1)
-				folderPath = path.removeLastSegments(1);
-			parent = new ModuleFolder(cc, folderName, folderPath);
-			if (path.segmentCount()>1)
-				addMembersToModuleFolder(ensureParentExists(path.removeLastSegments(1),cc), new IModuleResource[] {parent});
-			else
-				members.add(parent);
-		}
-		return parent;
-	}
-	
-	/**
-	 * This method is meant to be overridden by subclasses.  Return whether or not to add this file
-	 * to the members list.
-	 * 
-	 * @param file
-	 * @return boolean should add file?
-	 */
-	protected boolean shouldAddComponentFile(IFile file) {
-		return true;
-	}
-	
-	/**
-	 * Check the current cache to see if we already have an existing module resource for
-	 * the given path.
-	 * @param aList
-	 * @param path
-	 * @return an existing moduleResource from the cached result
-	 */
-	 
-	protected IModuleResource getExistingModuleResource(List aList, IPath path) { 
-    	// If the list is empty, return null
-    	if (aList==null || aList.isEmpty() || path == null)
-    		return null;
-    	// Otherwise recursively check to see if given resource matches current resource or if it is a child
-    	String[] pathSegments = path.segments(); 
-    	IModuleResource moduleResource = null;
-    	
-    	if(pathSegments.length == 0)
-    		return null;
-    	for (Iterator iter = aList.iterator(); iter.hasNext();) {
-    		moduleResource = (IModuleResource) iter.next();     	
-    		String[] moduleSegments = moduleResource.getModuleRelativePath().segments();
-    		// If the last segment in passed in path equals the module resource name 
-    		// and segment count is the same and the path segments start with the module path segments
-    		// then we have a match and we return the existing moduleResource
-    		if (pathSegments[pathSegments.length - 1].equals(moduleResource.getName()) && 
-		    		(moduleSegments.length + 1) == pathSegments.length && 
-		    		startsWith(moduleSegments, pathSegments))
-		    	return moduleResource; 
-    		
-    		// Otherwise, if it is a folder, check its children for the existing resource path
-    		// but only check if the beginning segments are a match
-	    	if(moduleResource instanceof IModuleFolder && 
-	    			startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length &&
-	    			moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0]))	    	  
-    			if (((IModuleFolder)moduleResource).members()!=null)
-    				return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path);		
-    	}
-    	return null;
-    }
-	
-	/**
-	 * 
-	 * @param beginningSegments
-	 * @param testSegments
-	 * @return True if beginningSegments[i] == testSegments[i] for all 0<=i<beginningSegments[i] 
-	 */
-	private boolean startsWith(String[] beginningSegments, String[] testSegments) { 
-		for(int i=0; i < beginningSegments.length; i++) {
-			if(!beginningSegments[i].equals(testSegments[i]))
-				return false;
-		}
-		return true;
-	}
-
-	protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
-		//subclasses may override
-		return new IModuleResource[]{};
-	}
-	
-	public IModuleResource[] members() throws CoreException {
-		members.clear();
-		IVirtualComponent vc = ComponentCore.createComponent(getProject());
-		if (vc != null) {
-			IVirtualFolder vFolder = vc.getRootFolder();
-			IModuleResource[] mr = getMembers(vFolder, Path.EMPTY);
-			int size = mr.length;
-			for (int j = 0; j < size; j++) {
-				members.add(mr[j]);
-			}
-			addUtilMembers(vc);
-		}
-		
-		IModuleResource[] mr = new IModuleResource[members.size()];
-		members.toArray(mr);
-		return mr;
-	}
-	
-	protected boolean shouldIncludeUtilityComponent(IVirtualComponent virtualComp, IVirtualReference[] references, ArtifactEdit edit) {
-		return virtualComp != null && virtualComp.isBinary() && virtualComp.getProject()==component.getProject();
-	}
-	
-	protected void addUtilMembers(IVirtualComponent vc) {
-		ArtifactEdit edit = null;
-		try {
-			edit = getComponentArtifactEditForRead();
-			IVirtualReference[] components = vc.getReferences();
-	    	for (int i = 0; i < components.length; i++) {
-				IVirtualReference reference = components[i];
-				IVirtualComponent virtualComp = reference.getReferencedComponent();
-				if (shouldIncludeUtilityComponent(virtualComp,components,edit)) {
-					ModuleFile mf = null;
-					String archiveName = reference.getArchiveName();
-					IPath archivePath = ((VirtualArchiveComponent)virtualComp).getWorkspaceRelativePath();
-					if (archivePath != null) { //In Workspace
-						IFile utilFile = ResourcesPlugin.getWorkspace().getRoot().getFile(archivePath);
-						String name = null != archiveName ? archiveName : utilFile.getName();
-						mf = new ModuleFile(utilFile, name, reference.getRuntimePath().makeRelative());
-					}
-					else {
-						File extFile = ((VirtualArchiveComponent)virtualComp).getUnderlyingDiskFile();
-						String name = null != archiveName ? archiveName : extFile.getName();
-						mf = new ModuleFile(extFile, name, reference.getRuntimePath().makeRelative());
-					}
-					if (mf == null)
-						continue;
-					IModuleResource moduleParent = getExistingModuleResource(members, mf.getModuleRelativePath());
-					
-					if (moduleParent != null && moduleParent instanceof ModuleFolder)
-						addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[]{mf});
-					else {
-						if (mf.getModuleRelativePath().isEmpty())
-							members.add(mf);
-						else {
-							if (moduleParent == null)
-								moduleParent = ensureParentExists(mf.getModuleRelativePath(), (IContainer)vc.getRootFolder().getUnderlyingResource());
-							addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[] {mf});
-						}
-					}
-				}
-	    	}
-		} finally {
-			if (edit!=null)
-				edit.dispose();
-		}
-	}
-	
-	protected ArtifactEdit getComponentArtifactEditForRead() {
-		return null;
-	}
-
-	protected static boolean isProjectOfType(IProject project, String typeID) {
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(project);
-		} catch (CoreException e) {
-			return false;
-		}
-		
-		if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
-			IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
-			return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the root folders for the resources in this module.
-	 * 
-	 * @return a possibly-empty array of resource folders
-	 */
-	public IContainer[] getResourceFolders() {
-		IVirtualComponent vc = ComponentCore.createComponent(getProject());
-		if (vc != null) {
-			IVirtualFolder vFolder = vc.getRootFolder();
-			if (vFolder != null)
-				return vFolder.getUnderlyingFolders();
-		}
-		return new IContainer[]{};
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
deleted file mode 100644
index 7fd5bfb59..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
+++ /dev/null
@@ -1,14 +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.wst.web.internal.deployables;
-
-public interface IStaticWebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
deleted file mode 100644
index ff4664459..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
+++ /dev/null
@@ -1,66 +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.wst.web.internal.deployables;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.util.IStaticWeb;
-
-public class StaticWebDeployable extends ComponentDeployable implements IStaticWeb {
-
-	public StaticWebDeployable(IProject project, IVirtualComponent component) {
-		super(project);
-	}
-	
-	public String getContextRoot() {
-		Properties props = component.getMetaProperties();
-		if(props.containsKey("context-root")) //$NON-NLS-1$
-			return props.getProperty("context-root"); //$NON-NLS-1$
-	    return component.getName();
-    }
-	
-	 public String getURI(IModule module) {
-	    IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
-	    String aURI = null;
-	    if (comp !=null) {
-	    	if (!comp.isBinary() && isProjectOfType(module.getProject(),IModuleConstants.WST_WEB_MODULE)) {
-        		IVirtualReference ref = component.getReference(comp.getName());
-        		aURI = ref.getRuntimePath().append(comp.getName()+".war").toString(); //$NON-NLS-1$
-        	}
-	    }
-	    	
-    	if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
-    		aURI = aURI.substring(1);
-    	return aURI;
-	 }
-	 
-	public String getVersion() {
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(component.getProject());
-			if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(IModuleConstants.WST_WEB_MODULE)) {
-				IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
-				return facetedProject.getInstalledVersion(projectFacet).getVersionString();
-			}
-		} catch (Exception e) {
-			//Ignore
-		}
-		return "1.0"; //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
deleted file mode 100644
index c9cbf0006..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
+++ /dev/null
@@ -1,132 +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.wst.web.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-
-public class StaticWebDeployableFactory extends ProjectModuleFactoryDelegate {
-	private static final String ID = "org.eclipse.wst.web.internal.deployables.static"; //$NON-NLS-1$
-	protected ArrayList moduleDelegates = new ArrayList();
-
-	/*
-	 * @see DeployableProjectFactoryDelegate#getFactoryID()
-	 */
-	public static String getFactoryId() {
-		return ID;
-	}
-	protected IModule[] createModules(ModuleCoreNature nature) {
-		IProject project = nature.getProject();
-		try {
-			IVirtualComponent comp = ComponentCore.createComponent(project);
-			return createModuleDelegates(comp);
-		} catch (Exception e) {
-			Logger.getLogger().write(e);
-		}
-		return null;
-	}
-	/**
-	 * Returns true if the project represents a deployable project of this type.
-	 * 
-	 * @param project
-	 *            org.eclipse.core.resources.IProject
-	 * @return boolean
-	 */
-	protected boolean isValidModule(IProject project) {
-		try {
-			IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-			if (facetedProject == null)
-				return false;
-			IProjectFacet webFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
-			return facetedProject.hasProjectFacet(webFacet);
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule)
-	 */
-	public ModuleDelegate getModuleDelegate(IModule module) {
-		for (Iterator iter = moduleDelegates.iterator(); iter.hasNext();) {
-			ModuleDelegate element = (ModuleDelegate) iter.next();
-			if (module == element.getModule())
-				return element;
-		}
-		return null;
-
-	}
-
-	protected IModule[] createModules(IProject project) {
-		try {
-			ModuleCoreNature nature = (ModuleCoreNature) project.getNature(IModuleConstants.MODULE_NATURE_ID);
-			if (nature != null)
-				return createModules(nature);
-		} catch (CoreException e) {
-			Logger.getLogger().write(e);
-		}
-		return null;
-	}
-
-	protected IModule[] createModuleDelegates(IVirtualComponent component) throws CoreException {
-		StaticWebDeployable moduleDelegate = null;
-		IModule module = null;
-		try {
-			if(isValidModule(component.getProject())) {
-				moduleDelegate = new StaticWebDeployable(component.getProject(),component);
-				module = createModule(component.getName(), component.getName(), IModuleConstants.WST_WEB_MODULE, moduleDelegate.getVersion(), moduleDelegate.getProject());
-				moduleDelegate.initialize(module);
-			}
-		} catch (Exception e) {
-			Logger.getLogger().write(e);
-		} finally {
-			if (module != null) {
-				if (getModuleDelegate(module) == null)
-					moduleDelegates.add(moduleDelegate);
-			}
-		}
-		if (module == null)
-			return null;
-		return new IModule[] {module};
-	}
-	
-	/**
-	 * Returns the list of resources that the module should listen to
-	 * for state changes. The paths should be project relative paths.
-	 * Subclasses can override this method to provide the paths.
-	 *
-	 * @return a possibly empty array of paths
-	 */
-	protected IPath[] getListenerPaths() {
-		return new IPath[] {
-			new Path(".project"), // nature //$NON-NLS-1$
-			new Path(StructureEdit.MODULE_META_FILE_NAME), // component
-			new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets //$NON-NLS-1$
-		};
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
deleted file mode 100644
index f29938eb6..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
+++ /dev/null
@@ -1,35 +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.wst.web.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class StaticWebDeployableObjectAdapter extends ModuleArtifactAdapterDelegate implements IAdapterFactory
-
-{
-
-	public StaticWebDeployableObjectAdapter() {
-		super();
-	}
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		return null;
-	}
-
-	public Class[] getAdapterList() {
-		return new Class[]{IStaticWebModuleArtifact.class};
-	}
-
-	public IModuleArtifact getModuleArtifact(Object obj) {
-		return StaticWebDeployableObjectAdapterUtil.getModuleObject(obj);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
deleted file mode 100644
index 8a3849af4..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
+++ /dev/null
@@ -1,120 +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.wst.web.internal.deployables;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.WebResource;
-
-public class StaticWebDeployableObjectAdapterUtil {
-
-	private final static String[] extensionsToExclude = new String[]{"sql", "xmi"}; //$NON-NLS-1$ //$NON-NLS-2$
-	static String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-
-	public static IModuleArtifact getModuleObject(Object obj) {
-		IResource resource = null;
-		if (obj instanceof IResource) {
-			resource = (IResource) obj;
-			IProject project = ProjectUtilities.getProject(resource);
-			if (project != null && !hasInterestedComponents(project))
-				return null;
-		}
-		else if (obj instanceof IAdaptable)
-			resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
-		if (resource == null)
-			return null;
-		
-		if (resource instanceof IProject) {
-			IProject project = (IProject) resource;
-			if (hasInterestedComponents(project))
-				return new WebResource(getModule(project), new Path("")); //$NON-NLS-1$
-			return null;
-			
-		}
-		IProject project = ProjectUtilities.getProject(resource);
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		// determine path
-		IPath rootPath = comp.getRootFolder().getProjectRelativePath();
-		IPath resourcePath = resource.getProjectRelativePath();
-
-		// Check to make sure the resource is under the webApplication directory
-		if (resourcePath.matchingFirstSegments(rootPath) != rootPath.segmentCount())
-			return null;
-
-		// Do not allow resource under the web-inf directory
-		resourcePath = resourcePath.removeFirstSegments(rootPath.segmentCount());
-		if (resourcePath.segmentCount() > 1 && resourcePath.segment(0).equals(INFO_DIRECTORY))
-			return null;
-
-		if (shouldExclude(resource))
-			return null;
-
-		// return Web resource type
-		return new WebResource(getModule(project), resourcePath);
-
-	}
-
-	/**
-	 * Method shouldExclude.
-	 * 
-	 * @param resource
-	 * @return boolean
-	 */
-	private static boolean shouldExclude(IResource resource) {
-		String fileExt = resource.getFileExtension();
-
-		// Exclude files of certain extensions
-		for (int i = 0; i < extensionsToExclude.length; i++) {
-			String extension = extensionsToExclude[i];
-			if (extension.equalsIgnoreCase(fileExt))
-				return true;
-		}
-		return false;
-	}
-
-	protected static IModule getModule(IProject project) {
-		if (hasInterestedComponents(project))
-			return ServerUtil.getModule(project);
-		return null;
-	}
-	
-	protected static boolean hasInterestedComponents(IProject project) {
-		return isProjectOfType(project, IModuleConstants.WST_WEB_MODULE);
-	}
-	
-	protected static boolean isProjectOfType(IProject project, String typeID) {
-		IFacetedProject facetedProject = null;
-		try {
-			facetedProject = ProjectFacetsManager.create(project);
-		} catch (CoreException e) {
-			return false;
-		}
-
-		if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
-			IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
-			return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java
deleted file mode 100644
index 5116743d3..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java
+++ /dev/null
@@ -1,28 +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.wst.web.internal.operation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface/method/field
- * 
- * @deprecated
- * 
- */
-public interface ILibModule extends DoNotUseMeThisWillBeDeletedPost15{
-	String getJarName();
-
-	String getProjectName();
-
-	String getURI();
-
-	IProject getProject();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ISimpleWebModuleCreationDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ISimpleWebModuleCreationDataModelProperties.java
deleted file mode 100644
index 28ccaae7d..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ISimpleWebModuleCreationDataModelProperties.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- * 
- */
-public interface ISimpleWebModuleCreationDataModelProperties extends IComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
-	
-	/**
-     * Optional, type String, the user defined name of web contents folder
-     */
-    public static final String WEBCONTENT_FOLDER = "IWebComponentCreationDataModelProperties.WEBCONTENT_FOLDER"; //$NON-NLS-1$  
-
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
deleted file mode 100644
index 7da8fc961..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-
-
-public interface IWebProjectPropertiesUpdateDataModelProperties {
-
-	public static final String PROJECT = "IWebProjectPropertiesUpdateDataModelProperties.PROJECT"; //$NON-NLS-1$	
-	public static final String CONTEXT_ROOT = "IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java
deleted file mode 100644
index 52fbc272d..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java
+++ /dev/null
@@ -1,76 +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.wst.web.internal.operation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.web.internal.ISimpleWebModuleConstants;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface/method/field
- * 
- * @deprecated
- * 
- */
-public class LibModule implements ILibModule, DoNotUseMeThisWillBeDeletedPost15 {
-	protected static final IPath LIB_PATH = new Path(ISimpleWebModuleConstants.INFO_DIRECTORY).append(ISimpleWebModuleConstants.LIBRARY_DIRECTORY);
-
-	private String jarName;
-	private String projectName;
-
-	public LibModule(String jarName, String projectName) {
-		this.jarName = jarName;
-		this.projectName = projectName;
-	}
-
-	/*
-	 * @see ILibModule#getJarName()
-	 */
-	public String getJarName() {
-		return jarName;
-	}
-
-	/*
-	 * @see ILibModule#getProjectName()
-	 */
-	public String getProjectName() {
-		return projectName;
-	}
-
-	/*
-	 * @see ILibModule#getProject()
-	 */
-	public IProject getProject() {
-		return (IProject) WSTWebPlugin.getWorkspace().getRoot().findMember(projectName);
-	}
-
-	/**
-	 * @see ILibModule#getURI()
-	 */
-	public String getURI() {
-		return IPath.SEPARATOR + LIB_PATH.append(getJarName()).toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj == null || !(obj instanceof ILibModule)) {
-			return false;
-		}
-		ILibModule module = (ILibModule) obj;
-		return getJarName().equals(module.getJarName()) && getProjectName().equals(module.getProjectName()) && getURI().equals(module.getURI()) && getProject().equals(module.getProject());
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModelProvider.java
deleted file mode 100644
index 8cafd0e49..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModelProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.wst.common.componentcore.datamodel.FlexibleProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.ComponentCreationDataModelProvider;
-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.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class SimpleWebModuleCreationDataModelProvider extends ComponentCreationDataModelProvider implements ISimpleWebModuleCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
-    public SimpleWebModuleCreationDataModelProvider() {
-        super();
-    }
-
-    public void init() {
-        super.init();
-    }
-
-    public IDataModelOperation getDefaultOperation() {
-    	return new StaticWebModuleCreationFacetOperation(model);
-    }
-    
-    protected EClass getComponentType() {
-    	// TODO Auto-generated method stub
-    	return null;
-    }
-    
-    protected Integer getDefaultComponentVersion() {
-    	// TODO Auto-generated method stub
-    	return null;
-    }
-    
-    protected String getComponentExtension() {
-    	return ".war"; //$NON-NLS-1$
-    }
-    
-    protected void initProjectCreationModel() {
-    	IDataModel dm = DataModelFactory.createDataModel(new FlexibleProjectCreationDataModelProvider());
-		model.addNestedModel(NESTED_PROJECT_CREATION_DM, dm);
-		model.setProperty(LOCATION, dm.getProperty(IProjectCreationProperties.PROJECT_LOCATION));
-    }
-    
-    protected List getProperties() {
-    	// TODO Auto-generated method stub
-    	return null;
-    }
-    
-    public Set getPropertyNames() {
-		Set propertyNames = super.getPropertyNames();
-		propertyNames.add(WEBCONTENT_FOLDER);
-		return propertyNames;
-	}
-    
-    public Object getDefaultProperty(String propertyName) {
-    	if (propertyName.equals(WEBCONTENT_FOLDER))
-			return "WebContent"; //$NON-NLS-1$
-		return super.getDefaultProperty(propertyName);
-    }
-    
-    public boolean propertySet(String propertyName, Object propertyValue) {
-    	boolean result = super.propertySet(propertyName, propertyValue);
-    	if (propertyName.equals(PROJECT_NAME))
-    		setProperty(COMPONENT_NAME,propertyValue);
-    	return result;
-    }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebModuleCreationFacetOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebModuleCreationFacetOperation.java
deleted file mode 100644
index 2678fb86b..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebModuleCreationFacetOperation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-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.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-import org.eclipse.wst.project.facet.ISimpleWebFacetInstallDataModelProperties;
-import org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider;
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- * 
- * @deprecated
- */
-public class StaticWebModuleCreationFacetOperation extends AbstractDataModelOperation implements DoNotUseMeThisWillBeDeletedPost15 {
-
-	public StaticWebModuleCreationFacetOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
-		IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-		String projectName = model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME);
-
-		dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
-
-		FacetDataModelMap map = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-		map.add(setupWebInstallAction());
-
-		IStatus stat = OK_STATUS;
-		try {
-			stat = dm.getDefaultOperation().execute(monitor, info);
-		} catch (ExecutionException e) {
-			Logger.getLogger().logError(e);
-		}
-		return stat;
-	}
-
-	protected IDataModel setupWebInstallAction() {
-		String versionStr = "1.0"; //$NON-NLS-1$
-		IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
-		webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME));
-		webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionStr);
-		webFacetInstallDataModel.setProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR, model.getStringProperty(ISimpleWebModuleCreationDataModelProperties.WEBCONTENT_FOLDER));
-
-		return webFacetInstallDataModel;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
deleted file mode 100644
index 9f9287b3f..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WebProjectPropertiesUpdateDataModelProvider 
- extends AbstractDataModelProvider
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
-	public WebProjectPropertiesUpdateDataModelProvider(){
-		super();
-	}
-
-	public Set getPropertyNames() {
-		Set names = super.getPropertyNames();
-		names.add(PROJECT);
-		names.add(CONTEXT_ROOT);
-		return names;
-	}
-	
-	public IDataModelOperation getDefaultOperation() {
-		return new WebProjectPropertiesUpdateOperation(model);
-	}
-	
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
deleted file mode 100644
index f56011808..000000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-
-/**
- * @version 	1.0
- * @author
- */
-public class WebProjectPropertiesUpdateOperation 
- extends  AbstractDataModelOperation 
- implements IWebProjectPropertiesUpdateDataModelProperties{
-	
-
-	public WebProjectPropertiesUpdateOperation(IDataModel model) {
-		super(model);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IProject project = (IProject)model.getProperty( IWebProjectPropertiesUpdateDataModelProperties.PROJECT );
-		String contextRoot = model.getStringProperty( IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT );
-		if (contextRoot != null) {
-			ComponentUtilities.setServerContextRoot(project, contextRoot);			
-		}
-		return OK_STATUS;
-	}
-
-}